2.0.35

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
+dist_*/
-dist_serve/
-dist_ts_web/
 
 # custom

.gitlab-ci.yml

@@ -4,7 +4,7 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 cache:
   paths:
     - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
   - security
@@ -20,17 +20,20 @@ mirror:
   script:
     - npmci git mirror
   tags:
+    - lossless
     - docker
     - notpriv
 
-snyk:
+audit:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -47,6 +50,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
     - docker
     - priv
 
@@ -59,6 +63,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -70,6 +75,7 @@ release:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -85,6 +91,7 @@ codequality:
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
+    - lossless
     - docker
     - priv
 
@@ -95,6 +102,7 @@ trigger:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -107,6 +115,7 @@ pages:
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

@@ -1,5 +1,6 @@
 {
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartlog",
-  "version": "2.0.23",
+  "version": "2.0.35",
   "private": false,
   "description": "minimalistic distributed and extensible logging tool",
   "keywords": [
@@ -11,13 +11,13 @@
     "elasticsearch",
     "logdna"
   ],
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)",
+    "build": "(tsbuild --web && tsbundle npm)",
     "format": "(gitzone format)"
   },
   "devDependencies": {
@@ -25,19 +25,21 @@
     "@gitzone/tsrun": "^1.2.12",
     "@gitzone/tstest": "^1.0.33",
     "@pushrocks/tapbundle": "^3.2.1",
-    "@types/node": "^14.0.11",
+    "@types/node": "^14.0.13",
     "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
+    "@gitzone/tsbundle": "^1.0.69",
     "@pushrocks/isounique": "^1.0.4",
-    "@pushrocks/smartlog-interfaces": "^2.0.15"
+    "@pushrocks/smartlog-interfaces": "^2.0.20"
   },
   "files": [
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",

readme.md

@@ -8,13 +8,20 @@ minimalistic distributed and extensible logging tool
 * [docs (typedoc)](https://pushrocks.gitlab.io/smartlog/)
 
 ## Status for master
-[![build status](https://gitlab.com/pushrocks/smartlog/badges/master/build.svg)](https://gitlab.com/pushrocks/smartlog/commits/master)
+
-[![coverage report](https://gitlab.com/pushrocks/smartlog/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartlog/commits/master)
+Status Category | Status Badge
-[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartlog.svg)](https://www.npmjs.com/package/@pushrocks/smartlog)
+-- | --
-[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartlog/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartlog)
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartlog/badges/master/pipeline.svg)](https://lossless.cloud)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartlog/badges/master/coverage.svg)](https://lossless.cloud)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartlog)](https://lossless.cloud)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartlog)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartlog)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartlog)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartlog)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
@@ -69,6 +76,10 @@ The following destinations are available:
 // TBD
 ```
 
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

test/test.ts

@@ -1,24 +1,48 @@
 import { expect, tap } from '@pushrocks/tapbundle';
 import * as smartlog from '../ts/index';
 
-let defaultLogger: smartlog.Smartlog;
+let testConsoleLog: smartlog.ConsoleLog;
+let testSmartLog: smartlog.Smartlog;
+
+tap.test('should produce a valid ConsoleLog instance', async () => {
+  testConsoleLog = new smartlog.ConsoleLog();
+  testConsoleLog.log('ok', 'this is ok');
+});
 
 tap.test('should produce instance of Smartlog', async () => {
-  defaultLogger = smartlog.defaultLogger;
+  testSmartLog = new smartlog.Smartlog({
-  expect(defaultLogger).to.be.instanceOf(smartlog.Smartlog);
+    logContext: {
+      environment: 'test',
+      runtime: 'node',
+      zone: 'gitzone',
+      company: 'Lossless GmbH',
+      companyunit: 'Lossless Cloud',
+      containerName: 'testing'
+    }
+  });
 });
 
 tap.test('should enable console logging', async () => {
-  defaultLogger.enableConsole({
+  testSmartLog.enableConsole({
     captureAll: true
   });
   console.log('this is a normal log that should be captured');
   console.log(new Error('hi there'));
-  defaultLogger.log('info', 'this should only be printed once');
+  testSmartLog.log('info', 'this should only be printed once');
 });
 
 tap.test('should be able to log things', async () => {
-  defaultLogger.log('silly', 'hi');
+  testSmartLog.log('silly', 'hi');
+});
+
+tap.test('should create a log group', async () => {
+  const logGroup = testSmartLog.createLogGroup('some cool transaction');
+  logGroup.log('info', 'this is logged from a log group');
+});
+
+tap.test('should catch error', async () => {
+  console.error(new Error('hey'));
+  // throw new Error('hey');
 });
 
 tap.start();

ts/index.ts

@@ -1,16 +1,6 @@
 import * as plugins from './smartlog.plugins';
+import { ConsoleLog } from './smartlog.classes.consolelog';
+import { LogGroup } from './smartlog.classes.loggroup';
 import { Smartlog } from './smartlog.classes.smartlog';
-const defaultLogger: Smartlog = new Smartlog({
-  logContext: {
-    company: 'undefined',
-    companyunit: 'undefefined',
-    containerName: 'undefined',
-    environment: 'local',
-    runtime: 'node',
-    zone: 'undefined'
-  }
-});
 
-defaultLogger.enableConsole();
+export { ConsoleLog, LogGroup, Smartlog };
-
-export { Smartlog, defaultLogger };

ts/smartlog.classes.consolelog.ts

@@ -0,0 +1,15 @@
+import * as plugins from './smartlog.plugins';
+
+/**
+ * a console log optimized for smartlog
+ */
+export class ConsoleLog {
+  public log(
+    logLevelArg: plugins.smartlogInterfaces.TLogLevel,
+    logMessageArg: string,
+    dataArg?: any,
+    correlationArg?: plugins.smartlogInterfaces.ILogCorrelation
+  ) {
+    console.log(`__# ${logLevelArg}: ${logMessageArg}`);
+  }
+}

ts/smartlog.classes.loggroup.ts

@@ -0,0 +1,27 @@
+import * as plugins from './smartlog.plugins';
+import { Smartlog } from './smartlog.classes.smartlog';
+
+export class LogGroup {
+  public smartlogRef: Smartlog;
+  public transactionId: string;
+  public groupId = plugins.isounique.uni();
+
+  constructor(smartlogInstance: Smartlog, transactionIdArg: string) {
+    this.smartlogRef = smartlogInstance;
+    this.transactionId = transactionIdArg;
+  }
+
+  public log(
+    logLevelArg: plugins.smartlogInterfaces.TLogLevel,
+    logMessageArg: string,
+    logDataArg?: any
+  ) {
+    this.smartlogRef.log(logLevelArg, logMessageArg, logDataArg, {
+      id: plugins.isounique.uni(),
+      type: 'none',
+      group: this.groupId,
+      instance: this.smartlogRef.uniInstanceId,
+      transaction: this.transactionId
+    });
+  }
+}

ts/smartlog.classes.logrouter.ts

@@ -15,9 +15,9 @@ export class LogRouter {
   }
 
   // routes the log according to added logDestinations
-  routeLog(logPackageArg: ILogPackage) {
+  public async routeLog(logPackageArg: ILogPackage) {
     for (const logDestination of this.logDestinations) {
-      logDestination.handleLog(logPackageArg);
+      await logDestination.handleLog(logPackageArg);
     }
   }
 }

ts/smartlog.classes.smartlog.ts

@@ -1,6 +1,7 @@
 import * as plugins from './smartlog.plugins';
 
 import { LogRouter } from './smartlog.classes.logrouter';
+import { LogGroup } from '.';
 
 export interface ISmartlogContructorOptions {
   logContext: plugins.smartlogInterfaces.ILogContext;
@@ -11,6 +12,8 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
   private logContext: plugins.smartlogInterfaces.ILogContext;
   private minimumLogLevel: plugins.smartlogInterfaces.TLogLevel;
 
+  public uniInstanceId: string = plugins.isounique.uni();
+
   private consoleEnabled: boolean;
 
   private logRouter = new LogRouter();
@@ -31,24 +34,39 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
   /**
    * enables console logging
    */
-  public enableConsole(optionsArg?: {
+  public enableConsole(optionsArg?: { captureAll: boolean }) {
-    captureAll: boolean;
+    if (process && optionsArg && optionsArg.captureAll) {
-  }) {
-    if (optionsArg && optionsArg.captureAll) {
       const write = process.stdout.write;
       /* import * as fs from 'fs';
       const fileStream = fs.createWriteStream(plugins.path.join(paths.nogitDir, 'output.txt'), {
         flags: 'a+'
       }); */
       process.stdout.write = (...args) => {
-        if (!args[0].startsWith('LOG')) {
+        const logString: string = args[0];
-          this.log('info', args[0]);
+        if (!logString.startsWith('LOG') && typeof logString === 'string') {
+          switch(true) {
+            case logString.substr(0, 20).includes('Error:'):
+              this.log('error', logString);
+              break;
+            default:
+              this.log('info', logString);
+          }
           return;
         }
         // fileStream.write(args[0]);
         write.apply(process.stdout, args);
         return true;
       };
+
+      process.stderr.write = (...args) => {
+        if (!args[0].startsWith('LOG')) {
+          this.log('error', args[0]);
+          return;
+        }
+        // fileStream.write(args[0]);
+        write.apply(process.stderr, args);
+        return true;
+      };
     }
     this.consoleEnabled = true;
   }
@@ -63,20 +81,25 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
    * @param logDataArg - any additional log data
    * @param correlationArg - info about corrleations
    */
-  public log(
+  public async log(
     logLevelArg: plugins.smartlogInterfaces.TLogLevel,
     logMessageArg: string,
     logDataArg?: any,
-    correlationArg: plugins.smartlogInterfaces.ILogCorrelation = {
+    correlationArg?: plugins.smartlogInterfaces.ILogCorrelation
-      id: plugins.isounique.uni(),
-      type: 'none'
-    }
   ) {
+    correlationArg = {
+      ...{
+        id: plugins.isounique.uni(),
+        type: 'none',
+        instance: this.uniInstanceId
+      },
+      ...correlationArg
+    };
+
     if (this.consoleEnabled) {
-      this.safeConsoleLog(
+      this.safeConsoleLog(`${logLevelArg}: ${logMessageArg}`);
-        `${logLevelArg}: ${logMessageArg}`
-      );
     }
+
     const logPackage: plugins.smartlogInterfaces.ILogPackage = {
       timestamp: Date.now(),
       type: 'log',
@@ -88,7 +111,7 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
     if (logDataArg) {
       logPackage.data = logDataArg;
     }
-    this.logRouter.routeLog(logPackage);
+    await this.logRouter.routeLog(logPackage);
   }
 
   public increment(
@@ -113,11 +136,17 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
     });
   }
 
-  public handleLog(logPackageArg: plugins.smartlogInterfaces.ILogPackage) {
+  public async handleLog(logPackageArg: plugins.smartlogInterfaces.ILogPackage) {
-    this.logRouter.routeLog(logPackageArg);
+    await this.logRouter.routeLog(logPackageArg);
   }
 
   private safeConsoleLog(logLine: string) {
-    console.log(`LOG => ${new Date().getHours()}:${new Date().getMinutes()}:${new Date().getSeconds()} => ${logLine}`);
+    console.log(
+      `LOG => ${new Date().getHours()}:${new Date().getMinutes()}:${new Date().getSeconds()} => ${logLine}`
+    );
+  }
+
+  public createLogGroup(transactionId: string = 'none') {
+    return new LogGroup(this, transactionId);
   }
 }