2.0.22

.gitignore

@@ -1,5 +1,22 @@
 .nogit/
-node_modules/
+
+# artifacts
 coverage/
 public/
 pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,5 +1,5 @@
-# gitzone standard
-image: hosttoday/ht-docker-node:npmci
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
@@ -34,48 +34,11 @@ snyk:
   - docker
   - notpriv
 
-sast:
-  stage: security
-  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
-  variables:
-    DOCKER_DRIVER: overlay2
-  allow_failure: true
-  services:
-    - docker:stable-dind
-  script:
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command npm run build
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
-        --volume "$PWD:/code"
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
-  artifacts:
-    reports:
-      sast: gl-sast-report.json
-  tags:
-  - docker
-  - priv
-
 # ====================
 # test stage
 # ====================
 
-testLTS:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
+testStable:
   stage: test
   script:
   - npmci npm prepare
@@ -85,6 +48,18 @@ testSTABLE:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - priv
+
+testBuild:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install stable
+  - npmci npm install
+  - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
   - notpriv
 
 release:
@@ -103,19 +78,12 @@ release:
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SOURCE_CODE="$PWD"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
+    - npmci command npm install -g tslint typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
   - docker
   - priv
@@ -131,13 +99,13 @@ trigger:
   - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci node install lts
+    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
     - docker
     - notpriv

license

@@ -0,0 +1,19 @@
+Copyright (c) 2018 Lossless GmbH (hello@lossless.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

npmextra.json

@@ -1,6 +1,17 @@
 {
+  "gitzone": {
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "smartlog",
+      "shortDescription": "minimalistic distributed and extensible logging tool",
+      "npmPackagename": "@pushrocks/smartlog",
+      "license": "MIT",
+      "projectDomain": "push.rocks"
+    }
+  },
   "npmci": {
     "npmGlobalTools": [],
     "npmAccessLevel": "public"
   }
-}
+}

package.json

@@ -1,27 +1,46 @@
 {
   "name": "@pushrocks/smartlog",
-  "version": "2.0.13",
+  "version": "2.0.22",
   "private": false,
-  "description": "winston based logger for large scale projects",
+  "description": "minimalistic distributed and extensible logging tool",
+  "keywords": [
+    "logging",
+    "centralized logging",
+    "json logging",
+    "scalyr",
+    "elasticsearch",
+    "logdna"
+  ],
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "author": "Lossless GmbH",
-  "license": "UNLICENSED",
+  "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
     "build": "(tsbuild)",
     "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.4",
-    "@gitzone/tsrun": "^1.1.17",
-    "@gitzone/tstest": "^1.0.18",
-    "@pushrocks/tapbundle": "^3.0.7",
-    "@types/node": "^10.12.18",
-    "tslint": "^5.12.1",
-    "tslint-config-prettier": "^1.17.0"
+    "@gitzone/tsbuild": "^2.1.24",
+    "@gitzone/tsrun": "^1.2.12",
+    "@gitzone/tstest": "^1.0.33",
+    "@pushrocks/tapbundle": "^3.2.1",
+    "@types/node": "^14.0.11",
+    "tslint": "^6.1.2",
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/smartlog-interfaces": "^2.0.5"
-  }
+    "@pushrocks/smartlog-interfaces": "^2.0.12"
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_web/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

readme.md

@@ -1,26 +1,20 @@
 # @pushrocks/smartlog
+minimalistic distributed and extensible logging tool
 
-winston based logger for large scale projects
-
-## Availabililty
-
-[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartlog)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartlog)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartlog)
-[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartlog/)
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartlog)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartlog)
+* [github.com (source mirror)](https://github.com/pushrocks/smartlog)
+* [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)
-[![npm downloads per month](https://img.shields.io/npm/dm/smartlog.svg)](https://www.npmjs.com/package/smartlog)
-[![Dependency Status](https://david-dm.org/pushrocks/smartlog.svg)](https://david-dm.org/pushrocks/smartlog)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartlog/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartlog/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/smartlog/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartlog)
-[![Known Vulnerabilities](https://snyk.io/test/npm/smartlog/badge.svg)](https://snyk.io/test/npm/smartlog)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
+[![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)
+[![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)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
 
 ## Usage
 
@@ -32,10 +26,10 @@ smartlog id s minimal logging package that provides a consistent experience acro
 import { Smartlog } from '@pushrocks/smartlog';
 const logger = new Smartlog({
   {
-    company?: 'My awesome company',
-    companyunit?: 'my awesome cloud team',
-    containerName?: 'awesome-container',
-    environment: TEnvironment: 'kubernetes-production',
+    company: 'My awesome company',
+    companyunit: 'my awesome cloud team',
+    containerName: 'awesome-container',
+    environment: 'kubernetes-production',
     runtime: 'node',
     zone: 'zone x'
   }
@@ -47,7 +41,7 @@ logger.log('silly', `a silly statement`); // log levels are shown to you by the
 There is also a default logger available that you can use:
 
 ```ts
-import {Smartlog, defaultLogger } from '@pushrocks/smartlog';
+import { Smartlog, defaultLogger } from '@pushrocks/smartlog';
 
 export class MyAwesomeClass {
   constructor(public logger: Smartlog = defaultLogger) {
@@ -58,19 +52,26 @@ export class MyAwesomeClass {
 ```
 
 ### Destinations
+
 smartlog supports different kinds of destinations.
 
 The following destinations are available:
 
-* [@pushrocks/smartlog-destination-local](https://www.npmjs.com/package/@pushrocks/smartlog-destination-local) - outputs logs to the local console in a colorful, nice to read way.
-* [@pushrocks/smartlog-destination-devtools](https://www.npmjs.com/package/@pushrocks/smartlog-destination-devtools) - outputs logs into the browser console in a colorful, nice to read way.
-* [@pushrocks/smartlog-destination-receiver](https://www.npmjs.com/package/@pushrocks/smartlog-destination-receiver) - sends logs to a smartlog receiver (more about that below)
-* [@mojoio/scalyr](https://www.npmjs.com/package/@pushrocks/smartlog-destination-receiver) - an scalyr API package that comes with a smartlog log destination included
-* [@mojoio/elasticsearch](https://www.npmjs.com/package/@mojoio/elasticsearch) - an elasticsearch API package that comes with a smartlog destination included
+- [@pushrocks/smartlog-destination-local](https://www.npmjs.com/package/@pushrocks/smartlog-destination-local) - outputs logs to the local console in a colorful, nice to read way.
+- [@pushrocks/smartlog-destination-devtools](https://www.npmjs.com/package/@pushrocks/smartlog-destination-devtools) - outputs logs into the browser console in a colorful, nice to read way.
+- [@pushrocks/smartlog-destination-receiver](https://www.npmjs.com/package/@pushrocks/smartlog-destination-receiver) - sends logs to a smartlog receiver (more about that below)
+- [@mojoio/scalyr](https://www.npmjs.com/package/@pushrocks/smartlog-destination-receiver) - an scalyr API package that comes with a smartlog log destination included
+- [@mojoio/elasticsearch](https://www.npmjs.com/package/@mojoio/elasticsearch) - an elasticsearch API package that comes with a smartlog destination included
 
-For further information read the linked docs at the top of this README.
+### Adding a log destination
+
+```
+// TBD
+```
+
+For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
 
-[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.ts

@@ -9,7 +9,12 @@ tap.test('should produce instance of Smartlog', async () => {
 });
 
 tap.test('should enable console logging', async () => {
-  defaultLogger.enableConsole();
+  defaultLogger.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');
 });
 
 tap.test('should be able to log things', async () => {

ts/smartlog.classes.smartlog.ts

@@ -1,32 +1,21 @@
 import * as plugins from './smartlog.plugins';
 
-// interfaces
-import {
-  TLogType,
-  TEnvironment,
-  ILogContext,
-  TLogLevel,
-  TRuntime,
-  ILogDestination,
-  ILogPackage
-} from '@pushrocks/smartlog-interfaces';
-
 import { LogRouter } from './smartlog.classes.logrouter';
 
 export interface ISmartlogContructorOptions {
-  logContext: ILogContext;
-  minimumLogLevel?: TLogLevel;
+  logContext: plugins.smartlogInterfaces.ILogContext;
+  minimumLogLevel?: plugins.smartlogInterfaces.TLogLevel;
 }
 
-export class Smartlog {
-  private logContext: ILogContext;
-  private minimumLogLevel: TLogLevel;
+export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
+  private logContext: plugins.smartlogInterfaces.ILogContext;
+  private minimumLogLevel: plugins.smartlogInterfaces.TLogLevel;
 
   private consoleEnabled: boolean;
 
   private logRouter = new LogRouter();
 
-  public addLogDestination(logDestinationArg: ILogDestination) {
+  public addLogDestination(logDestinationArg: plugins.smartlogInterfaces.ILogDestination) {
     this.logRouter.addLogDestination(logDestinationArg);
   }
 
@@ -42,7 +31,25 @@ export class Smartlog {
   /**
    * enables console logging
    */
-  enableConsole() {
+  public enableConsole(optionsArg?: {
+    captureAll: boolean;
+  }) {
+    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')) {
+          this.log('info', args[0]);
+          return;
+        }
+        // fileStream.write(args[0]);
+        write.apply(process.stdout, args);
+        return true;
+      };
+    }
     this.consoleEnabled = true;
   }
 
@@ -55,15 +62,23 @@ export class Smartlog {
    * @param logMessageArg - the log message
    * @param logDataArg - any additional log data
    */
-  public log(logLevelArg: TLogLevel, logMessageArg: string, logDataArg?: any) {
+  public log(
+    logLevelArg: plugins.smartlogInterfaces.TLogLevel,
+    logMessageArg: string,
+    logDataArg?: any,
+    logCorrelationIdArg: string = '123'
+  ) {
     if (this.consoleEnabled) {
-      console.log(`LOG => ${new Date().getHours()}:${new Date().getMinutes()}:${new Date().getSeconds()} => ${logLevelArg}: ${logMessageArg}`);
+      this.safeConsoleLog(
+        `${logLevelArg}: ${logMessageArg}`
+      );
     }
-    const logPackage: ILogPackage = {
+    const logPackage: plugins.smartlogInterfaces.ILogPackage = {
       timestamp: Date.now(),
       type: 'log',
       context: this.logContext,
       level: logLevelArg,
+      correlationId: logCorrelationIdArg,
       message: logMessageArg
     };
     if (logDataArg) {
@@ -72,20 +87,30 @@ export class Smartlog {
     this.logRouter.routeLog(logPackage);
   }
 
-  public increment(logLevelArg: TLogLevel, logMessageArg) {
+  public increment(
+    logLevelArg: plugins.smartlogInterfaces.TLogLevel,
+    logMessageArg: string,
+    logDataArg?: any,
+    logCorrelationIdArg: string = '123'
+  ) {
     if (this.consoleEnabled) {
-      console.log(`INCREMENT: ${logLevelArg}: ${logMessageArg}`);
+      this.safeConsoleLog(`INCREMENT: ${logLevelArg}: ${logMessageArg}`);
     }
     this.logRouter.routeLog({
       timestamp: Date.now(),
       type: 'increment',
       context: this.logContext,
       level: logLevelArg,
-      message: logMessageArg
+      message: logMessageArg,
+      correlationId: logCorrelationIdArg
     });
   }
 
-  public handleLogPackage(logPackageArg: ILogPackage) {
+  public handleLog(logPackageArg: plugins.smartlogInterfaces.ILogPackage) {
     this.logRouter.routeLog(logPackageArg);
   }
+
+  private safeConsoleLog(logLine: string) {
+    console.log(`LOG => ${new Date().getHours()}:${new Date().getMinutes()}:${new Date().getSeconds()} => ${logLine}`);
+  }
 }

ts/smartlog.plugins.ts

@@ -1 +1,3 @@
-export {};
+import * as smartlogInterfaces from '@pushrocks/smartlog-interfaces';
+
+export { smartlogInterfaces };