3.0.3

.gitlab-ci.yml

@@ -12,6 +12,9 @@ stages:
   - release
   - metadata
 
+before_script:
+  - npm install -g @shipzone/npmci
+
 # ====================
 # security stage
 # ====================
@@ -19,23 +22,36 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-audit:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+  allow_failure: true
+
+auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -50,9 +66,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -63,9 +77,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,11 +97,12 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
-    - npmci command npm install -g tslint typescript
+    - npmci command npm install -g typescript
     - npmci npm prepare
     - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
     - lossless
     - docker
@@ -109,11 +122,10 @@ trigger:
 pages:
   stage: metadata
   script:
-    - npmci node install lts
+    - npmci node install stable 
-    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
     - lossless
     - docker

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
+      "command": "npm test",
-      "type": "node",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
+      "type": "node-terminal"
-        "${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

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

npmextra.json

@@ -3,10 +3,10 @@
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "gitscope": "push.rocks",
       "gitrepo": "smartlog",
-      "shortDescription": "minimalistic distributed and extensible logging tool",
+      "description": "minimalistic distributed and extensible logging tool",
-      "npmPackagename": "@pushrocks/smartlog",
+      "npmPackagename": "@push.rocks/smartlog",
       "license": "MIT",
       "projectDomain": "push.rocks"
     }

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@pushrocks/smartlog",
+  "name": "@push.rocks/smartlog",
-  "version": "2.0.29",
+  "version": "3.0.3",
   "private": false,
   "description": "minimalistic distributed and extensible logging tool",
   "keywords": [
@@ -18,21 +18,20 @@
   "scripts": {
     "test": "(tstest test/)",
     "build": "(tsbuild --web && tsbundle npm)",
-    "format": "(gitzone format)"
+    "format": "(gitzone format)",
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.24",
+    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tsrun": "^1.2.12",
+    "@gitzone/tsbundle": "^2.0.6",
-    "@gitzone/tstest": "^1.0.33",
+    "@gitzone/tsrun": "^1.2.17",
-    "@pushrocks/tapbundle": "^3.2.1",
+    "@gitzone/tstest": "^1.0.72",
-    "@types/node": "^14.0.13",
+    "@push.rocks/tapbundle": "^5.0.4",
-    "tslint": "^6.1.2",
+    "@types/node": "^18.6.1"
-    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@gitzone/tsbundle": "^1.0.69",
+    "@push.rocks/isounique": "^1.0.4",
-    "@pushrocks/isounique": "^1.0.4",
+    "@push.rocks/smartlog-interfaces": "^3.0.0"
-    "@pushrocks/smartlog-interfaces": "^2.0.19"
   },
   "files": [
     "ts/**/*",
@@ -45,5 +44,9 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
-  ]
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
+  ],
+  "type": "module"
 }

test/test.browser.ts

@@ -0,0 +1,48 @@
+import { expect, tap } from '@push.rocks/tapbundle';
+import * as smartlog from '../ts/index.js';
+
+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 () => {
+  testSmartLog = new smartlog.Smartlog({
+    logContext: {
+      environment: 'test',
+      runtime: 'node',
+      zone: 'gitzone',
+      company: 'Lossless GmbH',
+      companyunit: 'Lossless Cloud',
+      containerName: 'testing',
+    },
+  });
+});
+
+tap.test('should enable console logging', async () => {
+  testSmartLog.enableConsole({
+    captureAll: true,
+  });
+  console.log('this is a normal log that should be captured');
+  console.log(new Error('hi there'));
+  testSmartLog.log('info', 'this should only be printed once');
+});
+
+tap.test('should be able to log things', async () => {
+  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();

test/test.ts

@@ -1,5 +1,5 @@
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
-import * as smartlog from '../ts/index';
+import * as smartlog from '../ts/index.js';
 
 let testConsoleLog: smartlog.ConsoleLog;
 let testSmartLog: smartlog.Smartlog;
@@ -17,14 +17,14 @@ tap.test('should produce instance of Smartlog', async () => {
       zone: 'gitzone',
       company: 'Lossless GmbH',
       companyunit: 'Lossless Cloud',
-      containerName: 'testing'
+      containerName: 'testing',
-    }
+    },
   });
 });
 
 tap.test('should enable console logging', async () => {
   testSmartLog.enableConsole({
-    captureAll: true
+    captureAll: true,
   });
   console.log('this is a normal log that should be captured');
   console.log(new Error('hi there'));
@@ -40,4 +40,9 @@ tap.test('should create a log group', async () => {
   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/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@push.rocks/smartlog',
+  version: '3.0.3',
+  description: 'minimalistic distributed and extensible logging tool'
+}

ts/index.ts

@@ -1,6 +1,6 @@
-import * as plugins from './smartlog.plugins';
+import * as plugins from './smartlog.plugins.js';
-import { ConsoleLog } from './smartlog.classes.consolelog';
+import { ConsoleLog } from './smartlog.classes.consolelog.js';
-import { LogGroup } from './smartlog.classes.loggroup';
+import { LogGroup } from './smartlog.classes.loggroup.js';
-import { Smartlog } from './smartlog.classes.smartlog';
+import { Smartlog } from './smartlog.classes.smartlog.js';
 
 export { ConsoleLog, LogGroup, Smartlog };

ts/smartlog.classes.consolelog.ts

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

ts/smartlog.classes.loggroup.ts

@@ -1,5 +1,5 @@
-import * as plugins from './smartlog.plugins';
+import * as plugins from './smartlog.plugins.js';
-import { Smartlog } from './smartlog.classes.smartlog';
+import { Smartlog } from './smartlog.classes.smartlog.js';
 
 export class LogGroup {
   public smartlogRef: Smartlog;
@@ -21,7 +21,7 @@ export class LogGroup {
       type: 'none',
       group: this.groupId,
       instance: this.smartlogRef.uniInstanceId,
-      transaction: this.transactionId
+      transaction: this.transactionId,
     });
   }
 }

ts/smartlog.classes.logrouter.ts

@@ -1,21 +1,19 @@
-import * as plugins from './smartlog.plugins';
+import * as plugins from './smartlog.plugins.js';
-
-import { ILogDestination, ILogPackage } from '@pushrocks/smartlog-interfaces';
 
 export class LogRouter {
   /**
    * all log destinations
    */
-  private logDestinations: ILogDestination[] = [];
+  private logDestinations: plugins.smartlogInterfaces.ILogDestination[] = [];
 
   constructor() {}
 
-  public addLogDestination(logDestination: ILogDestination) {
+  public addLogDestination(logDestination: plugins.smartlogInterfaces.ILogDestination) {
     this.logDestinations.push(logDestination);
   }
 
   // routes the log according to added logDestinations
-  public async routeLog(logPackageArg: ILogPackage) {
+  public async routeLog(logPackageArg: plugins.smartlogInterfaces.ILogPackage) {
     for (const logDestination of this.logDestinations) {
       await logDestination.handleLog(logPackageArg);
     }

ts/smartlog.classes.smartlog.ts

@@ -1,7 +1,7 @@
-import * as plugins from './smartlog.plugins';
+import * as plugins from './smartlog.plugins.js';
 
-import { LogRouter } from './smartlog.classes.logrouter';
+import { LogRouter } from './smartlog.classes.logrouter.js';
-import { LogGroup } from '.';
+import { LogGroup } from './smartlog.classes.loggroup.js';
 
 export interface ISmartlogContructorOptions {
   logContext: plugins.smartlogInterfaces.ILogContext;
@@ -9,8 +9,8 @@ export interface ISmartlogContructorOptions {
 }
 
 export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
-  private logContext: plugins.smartlogInterfaces.ILogContext;
+  public logContext: plugins.smartlogInterfaces.ILogContext;
-  private minimumLogLevel: plugins.smartlogInterfaces.TLogLevel;
+  public minimumLogLevel: plugins.smartlogInterfaces.TLogLevel;
 
   public uniInstanceId: string = plugins.isounique.uni();
 
@@ -24,7 +24,7 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
 
   constructor(optionsArg: ISmartlogContructorOptions) {
     this.logContext = optionsArg.logContext;
-    this.minimumLogLevel = optionsArg.minimumLogLevel;
+    this.minimumLogLevel = optionsArg.minimumLogLevel || 'silly';
   }
 
   // ============
@@ -35,26 +35,32 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
    * enables console logging
    */
   public enableConsole(optionsArg?: { captureAll: boolean }) {
-    if (process && optionsArg && optionsArg.captureAll) {
+    if (globalThis.process && optionsArg && optionsArg.captureAll) {
+      const process = globalThis.process;
       const write = process.stdout.write;
-      /* import * as fs from 'fs';
+      process.stdout.write = (...args: any) => {
-      const fileStream = fs.createWriteStream(plugins.path.join(paths.nogitDir, 'output.txt'), {
+        const logString: string = args[0];
-        flags: 'a+'
+        if (!logString || typeof logString.startsWith !== 'function') {
-      }); */
+          // lets continue as planned
-      process.stdout.write = (...args) => {
+        } else if (!logString.startsWith('LOG') && typeof logString === 'string') {
-        if (!args[0].startsWith('LOG')) {
+          switch (true) {
-          this.log('info', args[0]);
+            case logString.substr(0, 20).includes('Error:'):
-          return;
+              this.log('error', logString);
+              break;
+            default:
+              this.log('info', logString);
+          }
+          return true;
         }
         // fileStream.write(args[0]);
         write.apply(process.stdout, args);
         return true;
       };
 
-      process.stderr.write = (...args) => {
+      process.stderr.write = (...args: any) => {
         if (!args[0].startsWith('LOG')) {
-          this.log('info', args[0]);
+          this.log('error', args[0]);
-          return;
+          return true;
         }
         // fileStream.write(args[0]);
         write.apply(process.stderr, args);
@@ -84,9 +90,9 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
       ...{
         id: plugins.isounique.uni(),
         type: 'none',
-        instance: this.uniInstanceId
+        instance: this.uniInstanceId,
       },
-      ...correlationArg
+      ...correlationArg,
     };
 
     if (this.consoleEnabled) {
@@ -99,7 +105,7 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
       context: this.logContext,
       level: logLevelArg,
       correlation: correlationArg,
-      message: logMessageArg
+      message: logMessageArg,
     };
     if (logDataArg) {
       logPackage.data = logDataArg;
@@ -113,7 +119,7 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
     logDataArg?: any,
     correlationArg: plugins.smartlogInterfaces.ILogCorrelation = {
       id: plugins.isounique.uni(),
-      type: 'none'
+      type: 'none',
     }
   ) {
     if (this.consoleEnabled) {
@@ -125,12 +131,12 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
       context: this.logContext,
       level: logLevelArg,
       message: logMessageArg,
-      correlation: correlationArg
+      correlation: correlationArg,
     });
   }
 
-  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) {

ts/smartlog.plugins.ts

@@ -1,4 +1,4 @@
-import * as isounique from '@pushrocks/isounique';
+import * as isounique from '@push.rocks/isounique';
-import * as smartlogInterfaces from '@pushrocks/smartlog-interfaces';
+import * as smartlogInterfaces from '@push.rocks/smartlog-interfaces';
 
 export { isounique, smartlogInterfaces };

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}