1.0.16

.snyk

@@ -0,0 +1,4 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.12.0
+ignore: {}
+patch: {}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojoio/logdna",
-  "version": "1.0.4",
+  "version": "1.0.16",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -127,12 +127,19 @@
       "integrity": "sha512-HbH2b6ybd1cD8VTlx5kEt4N/Vgh9TQTHKlUV4kAORFIOTJOQD5WbCMIVWo+VqYHvYQtokoYFCjM1gctp4M1aWw==",
       "requires": {
         "@pushrocks/smartlog-interfaces": "^1.0.9"
+      },
+      "dependencies": {
+        "@pushrocks/smartlog-interfaces": {
+          "version": "1.0.15",
+          "resolved": "https://registry.npmjs.org/@pushrocks/smartlog-interfaces/-/smartlog-interfaces-1.0.15.tgz",
+          "integrity": "sha512-dn9a+IhneukhtVGQG031oodOITmmQ5s5hcMThd+cMUQL3XYTbLPnZVuJfTDeWCT0iqLqrBD/qp2d1RRc3W/qIQ=="
+        }
       }
     },
     "@pushrocks/smartlog-interfaces": {
-      "version": "1.0.15",
+      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@pushrocks/smartlog-interfaces/-/smartlog-interfaces-1.0.15.tgz",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartlog-interfaces/-/smartlog-interfaces-2.0.2.tgz",
-      "integrity": "sha512-dn9a+IhneukhtVGQG031oodOITmmQ5s5hcMThd+cMUQL3XYTbLPnZVuJfTDeWCT0iqLqrBD/qp2d1RRc3W/qIQ=="
+      "integrity": "sha512-kJNQ/6kfljgtwebhoiD8WtRWfdVhOoE1nr8FoUJLlOjLphU8SPa42Hg6/yPkSTaGxWwDhk6PkMJl64O7HNjRUQ=="
     },
     "@pushrocks/smartpath": {
       "version": "4.0.1",
@@ -268,9 +275,9 @@
       "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
     },
     "@types/node": {
-      "version": "10.12.1",
+      "version": "10.12.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.2.tgz",
-      "integrity": "sha512-i1sl+WCX2OCHeUi9oi7PiCNUtYFrpWhpcx878vpeq/tlZTKzcFdHePlyFHVbWqeuKN0SRPl/9ZFDSTsfv9h7VQ=="
+      "integrity": "sha512-53ElVDSnZeFUUFIYzI8WLQ25IhWzb6vbddNp8UHlXQyU0ET2RhV5zg0NfubzU7iNMh5bBXb0htCzfvrSVNgzaQ=="
     },
     "@types/vinyl": {
       "version": "2.0.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojoio/logdna",
-  "version": "1.0.4",
+  "version": "1.0.16",
   "private": false,
   "description": "anunoffical package for the logdna api",
   "main": "dist/index.js",
@@ -17,12 +17,12 @@
     "@gitzone/tstest": "^1.0.15",
     "@pushrocks/qenv": "^2.0.2",
     "@pushrocks/tapbundle": "^3.0.7",
-    "@types/node": "^10.11.7",
+    "@types/node": "^10.12.2",
     "tslint": "^5.11.0",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@pushrocks/smartlog-interfaces": "^1.0.15",
+    "@pushrocks/smartlog-interfaces": "^2.0.2",
     "@pushrocks/smartrequest": "^1.1.14",
     "@pushrocks/smartstring": "^3.0.4",
     "@pushrocks/taskbuffer": "^2.0.5"

test/test.ts

@@ -14,21 +14,23 @@ tap.test('should create a valid logDna account', async () => {
 
 tap.test('should create a standard log message', async () => {
   testLogMessage = logdna.LogdnaMessage.fromSmartLogPackage({
-    logContext: {
+    timestamp: Date.now(),
+    type: 'log',
+    level: 'info',
+    context: {
       company: 'Lossless GmbH',
       companyunit: 'lossless.cloud',
       containerName: 'ci-mojoio-logdna',
       environment: 'test',
       runtime: 'node',
-      zone: 'ship.zone'
+      zone: 'shipzone'
     },
-    logLevel: 'info',
+    message: 'this is an awesome log message sent by the tapbundle test'
-    message: 'this is a awesome log message :)'
   });
 });
 
 tap.test('should send the message', async () => {
   await testLogDnaAccount.sendLogDnaMessage(testLogMessage);
-})
+});
 
 tap.start();

ts/index.ts

@@ -1,2 +1,2 @@
 export * from './logdna.logdnaaccount';
-export * from './logdna.classes.logmessage';
+export * from './logdna.classes.logmessage';

ts/logdna.classes.logmessage.ts

@@ -6,6 +6,11 @@ import { TLogLevel, TEnvironment, ILogPackage } from '@pushrocks/smartlog-interf
  * the constructor options for LogdnaMessage
  */
 export interface ILogdnaMessageContructorOptions {
+  /**
+   * a timestamp for then the log message was created
+   */
+  timestamp: number;
+
   /**
    * the hostname where the log message was created
    */
@@ -22,7 +27,7 @@ export interface ILogdnaMessageContructorOptions {
   ip: string;
 
   /**
-   * a text message, that is the core part 
+   * a text message, that is the core part
    */
   line: string;
 
@@ -60,24 +65,28 @@ export class LogdnaMessage {
    * create lgdna messages from smartlog package
    * @param smartlogPackageArg
    */
-  static fromSmartLogPackage (smartlogPackageArg: ILogPackage): LogdnaMessage {
+  static fromSmartLogPackage(smartlogPackageArg: ILogPackage): LogdnaMessage {
     return new LogdnaMessage({
+      timestamp: smartlogPackageArg.timestamp,
       line: smartlogPackageArg.message,
-      meta: smartlogPackageArg.logContext,
+      meta: {
-      env: smartlogPackageArg.logContext.environment,
+        ...smartlogPackageArg.context,
-      hostname: smartlogPackageArg.logContext.zone,
+        logType: smartlogPackageArg.type
-      level: smartlogPackageArg.logLevel,
+      },
-      app: smartlogPackageArg.logContext.zone,
+      env: smartlogPackageArg.context.environment,
+      hostname: smartlogPackageArg.context.zone,
+      level: smartlogPackageArg.level,
+      app: smartlogPackageArg.context.containerName,
       tags: (() => {
         const tagArray: string[] = [];
-        tagArray.push(smartlogPackageArg.logContext.company);
+        tagArray.push(smartlogPackageArg.context.company);
-        tagArray.push(smartlogPackageArg.logContext.companyunit);
+        tagArray.push(smartlogPackageArg.context.companyunit);
         return tagArray;
       })(),
       ip: '0.0.0.0',
       mac: 'aa:aa:aa:aa:aa:aa'
     });
-  };
+  }
 
   /**
    * the options of this log message
@@ -85,5 +94,5 @@ export class LogdnaMessage {
   public options: ILogdnaMessageContructorOptions;
   constructor(optionsArg: ILogdnaMessageContructorOptions) {
     this.options = optionsArg;
-  };
+  }
-}
+}

ts/logdna.logdnaaccount.ts

@@ -1,18 +1,19 @@
 import * as plugins from './logdna.plugins';
 
 import { LogdnaMessage } from './logdna.classes.logmessage';
+import { ILogPackage, ILogDestination } from '@pushrocks/smartlog-interfaces';
 
 /**
  * the main logdna account
  */
 export class LogdnaAccount {
-  apiKey: string;
+  private apiKey: string;
-  baseUrl = 'https://logs.logdna.com/logs/ingest';
+  private baseUrl = 'https://logs.logdna.com/logs/ingest';
 
   /**
    * Create basic authentication
    */
-  createBasicAuth() {
+  private createBasicAuth() {
     const userNamePasswordString = `${this.apiKey}:`;
     return `Basic ${plugins.smartstring.base64.encode(userNamePasswordString)}`;
   }
@@ -36,26 +37,28 @@ export class LogdnaAccount {
     // let construct the request uri
     const requestUrlWithParams = `${this.baseUrl}?hostname=${euc(lm.options.hostname)}&mac=${euc(
       lm.options.mac
-    )}&ip=1${euc(lm.options.ip)}&now=${Date.now()}`;
+    )}&ip=1${euc(lm.options.ip)}&now=${Date.now()}&tags=${euc(
+      (() => {
+        return lm.options.tags.reduce((reduced, newItem) => {
+          return `${reduced},${newItem}`;
+        });
+      })()
+    )}`;
 
     const requestBodyObject = {
       lines: [
         {
+          timestamp: lm.options.timestamp,
           line: lm.options.line,
           app: lm.options.app,
           level: lm.options.level,
           env: lm.options.env,
-          meta: lm.options.meta,
+          meta: lm.options.meta
-          tags: (() => {
-            return lm.options.tags.reduce((reduced, newItem) => {
-              return `${reduced},${newItem}`;
-            });
-          })()
         }
       ]
     };
 
-    console.log(requestBodyObject);
+    // console.log(requestBodyObject);
 
     // lets post the message to logdna
     await plugins.smartrequest.postJson(requestUrlWithParams, {
@@ -66,4 +69,22 @@ export class LogdnaAccount {
       requestBody: requestBodyObject
     });
   }
+
+  /**
+   * convenience function for smartlog
+   */
+  public async sendSmartlogPackage(smartlogPackageArg: ILogPackage) {
+    this.sendLogDnaMessage(LogdnaMessage.fromSmartLogPackage(smartlogPackageArg));
+  }
+
+  /**
+   * returns a smartlog compatible log destination
+   */
+  public get smartlogDestination(): ILogDestination {
+    return {
+      handleLog: logPackageArg => {
+        this.sendSmartlogPackage(logPackageArg);
+      }
+    };
+  }
 }

ts/logdna.plugins.ts

@@ -2,8 +2,4 @@ import * as smartrequest from '@pushrocks/smartrequest';
 import * as smartstring from '@pushrocks/smartstring';
 import * as smartlogInterfaces from '@pushrocks/smartlog-interfaces';
 
-export {
+export { smartrequest, smartstring, smartlogInterfaces };
-  smartrequest,
-  smartstring,
-  smartlogInterfaces
-};

ts/request.sh

@@ -1,19 +0,0 @@
-curl "https://logs.logdna.com/logs/ingest?hostname=EXAMPLE_HOST&mac=C0:FF:EE:C0:FF:EE&ip=10.0.1.101&now=$(date +%s)" \
--u INSERT_INGESTION_KEY: \
--H "Content-Type: application/json; charset=UTF-8" \
--d \
-'{ 
-   "lines": [ 
-     { 
-       "line":"This is an awesome log statement", 
-       "app":"myapp",
-       "level": "INFO",
-       "env": "production",
-       "meta": {
-         "customfield": {
-           "nestedfield": "nestedvalue"
-         }
-       }
-     }
-   ] 
-}'