1.0.28

.gitlab-ci.yml

@@ -26,6 +26,7 @@ mirror:
 snyk:
   stage: security
   script:
+    - npmci npm prepare
     - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
     - npmci command snyk test
@@ -36,21 +37,11 @@ snyk:
 # ====================
 # test stage
 # ====================
-testLEGACY:
-  stage: test
-  script:
-  - npmci node install legacy
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-  allow_failure: true
 
 testLTS:
   stage: test
   script:
+  - npmci npm prepare
   - npmci node install lts
   - npmci npm install
   - npmci npm test
@@ -62,6 +53,7 @@ testLTS:
 testSTABLE:
   stage: test
   script:
+  - npmci npm prepare
   - npmci node install stable
   - npmci npm install
   - npmci npm test
@@ -118,6 +110,7 @@ pages:
   stage: metadata
   script:
     - npmci command npm install -g typedoc typescript
+    - npmci npm prepare
     - npmci npm install
     - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
   tags:
@@ -130,13 +123,3 @@ pages:
     paths:
     - public
   allow_failure: true
-
-windowsCompatibility:
-  image: stefanscherer/node-windows:10-build-tools
-  stage: metadata
-  script:
-  - npm install & npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - windows
-  allow_failure: true

.snyk

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

dist/elasticlog.classes.elasticlog.d.ts

@@ -1,31 +0,0 @@
-import { Client as ElasticClient } from 'elasticsearch';
-import { ILogContext } from 'smartlog-interfaces';
-import { LogScheduler } from './elasticlog.classes.logscheduler';
-export interface IStandardLogParams {
-    message: string;
-    severity: string;
-}
-export interface IElasticLogConstructorOptions {
-    port: number;
-    domain: string;
-    ssl: boolean;
-    user?: string;
-    pass?: string;
-    logContext: ILogContext;
-}
-export declare class ElasticLog<T> {
-    client: ElasticClient;
-    logContext: ILogContext;
-    logScheduler: LogScheduler;
-    /**
-     * sets up an instance of Elastic log
-     * @param optionsArg
-     */
-    constructor(optionsArg: IElasticLogConstructorOptions);
-    /**
-     * computes the host string from the constructor options
-     * @param optionsArg
-     */
-    private computeHostString(optionsArg);
-    log(logObject: IStandardLogParams, scheduleOverwrite?: boolean): Promise<void>;
-}

dist/elasticlog.classes.elasticlog.js

@@ -1,77 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-// interfaces
-const elasticsearch_1 = require("elasticsearch");
-// other classes
-const elasticlog_classes_logscheduler_1 = require("./elasticlog.classes.logscheduler");
-class ElasticLog {
-    /**
-     * sets up an instance of Elastic log
-     * @param optionsArg
-     */
-    constructor(optionsArg) {
-        this.logScheduler = new elasticlog_classes_logscheduler_1.LogScheduler(this);
-        this.logContext = optionsArg.logContext;
-        this.client = new elasticsearch_1.Client({
-            host: this.computeHostString(optionsArg),
-            log: 'trace'
-        });
-    }
-    /**
-     * computes the host string from the constructor options
-     * @param optionsArg
-     */
-    computeHostString(optionsArg) {
-        let hostString = `${optionsArg.domain}:${optionsArg.port}`;
-        if (optionsArg.user && optionsArg.pass) {
-            hostString = `${optionsArg.user}:${optionsArg.pass}@${hostString}`;
-        }
-        if (optionsArg.ssl) {
-            hostString = `https://${hostString}`;
-        }
-        else {
-            hostString = `http://${hostString}`;
-        }
-        return hostString;
-    }
-    log(logObject, scheduleOverwrite = false) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const now = new Date();
-            if (this.logScheduler.logsScheduled && !scheduleOverwrite) {
-                this.logScheduler.scheduleLog(logObject);
-                return;
-            }
-            this.client.index({
-                index: `logs-${now.getFullYear()}.${('0' + (now.getMonth() + 1)).slice(-2)}.${now.getDate()}`,
-                type: 'log',
-                body: {
-                    '@timestamp': now.toISOString(),
-                    zone: this.logContext.zone,
-                    container: this.logContext.containerName,
-                    environment: this.logContext.environment,
-                    severity: logObject.severity,
-                    message: logObject.message
-                }
-            }, (error, response) => {
-                if (error) {
-                    console.log('ElasticLog encountered an error:');
-                    console.log(error);
-                    this.logScheduler.addFailedLog(logObject);
-                }
-                else {
-                    console.log(`ElasticLog: ${logObject.message}`);
-                }
-            });
-        });
-    }
-}
-exports.ElasticLog = ElasticLog;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWxhc3RpY2xvZy5jbGFzc2VzLmVsYXN0aWNsb2cuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9lbGFzdGljbG9nLmNsYXNzZXMuZWxhc3RpY2xvZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEsYUFBYTtBQUNiLGlEQUF3RDtBQUd4RCxnQkFBZ0I7QUFDaEIsdUZBQWlFO0FBZ0JqRTtJQUtFOzs7T0FHRztJQUNILFlBQVksVUFBeUM7UUFOckQsaUJBQVksR0FBRyxJQUFJLDhDQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7UUFPcEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUMsVUFBVSxDQUFDO1FBQ3hDLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxzQkFBYSxDQUFDO1lBQzlCLElBQUksRUFBRSxJQUFJLENBQUMsaUJBQWlCLENBQUMsVUFBVSxDQUFDO1lBQ3hDLEdBQUcsRUFBRSxPQUFPO1NBQ2IsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVEOzs7T0FHRztJQUNLLGlCQUFpQixDQUFDLFVBQXlDO1FBQ2pFLElBQUksVUFBVSxHQUFHLEdBQUcsVUFBVSxDQUFDLE1BQU0sSUFBSSxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDM0QsRUFBRSxDQUFDLENBQUMsVUFBVSxDQUFDLElBQUksSUFBSSxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztZQUN2QyxVQUFVLEdBQUcsR0FBRyxVQUFVLENBQUMsSUFBSSxJQUFJLFVBQVUsQ0FBQyxJQUFJLElBQUksVUFBVSxFQUFFLENBQUM7UUFDckUsQ0FBQztRQUNELEVBQUUsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ25CLFVBQVUsR0FBRyxXQUFXLFVBQVUsRUFBRSxDQUFDO1FBQ3ZDLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLFVBQVUsR0FBRyxVQUFVLFVBQVUsRUFBRSxDQUFDO1FBQ3RDLENBQUM7UUFDRCxNQUFNLENBQUMsVUFBVSxDQUFDO0lBQ3BCLENBQUM7SUFFSyxHQUFHLENBQUMsU0FBNkIsRUFBRSxpQkFBaUIsR0FBRyxLQUFLOztZQUNoRSxNQUFNLEdBQUcsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ3ZCLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsYUFBYSxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxDQUFDO2dCQUMxRCxJQUFJLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQztnQkFDekMsTUFBTSxDQUFDO1lBQ1QsQ0FBQztZQUNELElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUNmO2dCQUNFLEtBQUssRUFBRSxRQUFRLEdBQUcsQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FDcEUsQ0FBQyxDQUFDLENBQ0gsSUFBSSxHQUFHLENBQUMsT0FBTyxFQUFFLEVBQUU7Z0JBQ3BCLElBQUksRUFBRSxLQUFLO2dCQUNYLElBQUksRUFBRTtvQkFDSixZQUFZLEVBQUUsR0FBRyxDQUFDLFdBQVcsRUFBRTtvQkFDL0IsSUFBSSxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSTtvQkFDMUIsU0FBUyxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsYUFBYTtvQkFDeEMsV0FBVyxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsV0FBVztvQkFDeEMsUUFBUSxFQUFFLFNBQVMsQ0FBQyxRQUFRO29CQUM1QixPQUFPLEVBQUUsU0FBUyxDQUFDLE9BQU87aUJBQzNCO2FBQ0YsRUFDRCxDQUFDLEtBQUssRUFBRSxRQUFRLEVBQUUsRUFBRTtnQkFDbEIsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztvQkFDVixPQUFPLENBQUMsR0FBRyxDQUFDLGtDQUFrQyxDQUFDLENBQUM7b0JBQ2hELE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUM7b0JBQ25CLElBQUksQ0FBQyxZQUFZLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxDQUFDO2dCQUM1QyxDQUFDO2dCQUFDLElBQUksQ0FBQyxDQUFDO29CQUNOLE9BQU8sQ0FBQyxHQUFHLENBQUMsZUFBZSxTQUFTLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztnQkFDbEQsQ0FBQztZQUNILENBQUMsQ0FDRixDQUFDO1FBQ0osQ0FBQztLQUFBO0NBQ0Y7QUFsRUQsZ0NBa0VDIn0=

dist/elasticlog.classes.logscheduler.d.ts

@@ -1,11 +0,0 @@
-import { ElasticLog, IStandardLogParams } from './elasticlog.classes.elasticlog';
-export declare class LogScheduler {
-    elasticLogRef: ElasticLog<any>;
-    logsScheduled: boolean;
-    logStorage: any[];
-    constructor(elasticLogRefArg: ElasticLog<any>);
-    addFailedLog(objectArg: any | IStandardLogParams): void;
-    scheduleLog(logObject: any): void;
-    setRetry(): void;
-    deferSend(): void;
-}

dist/elasticlog.classes.logscheduler.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class LogScheduler {
-    constructor(elasticLogRefArg) {
-        this.logsScheduled = false;
-        this.logStorage = [];
-        this.elasticLogRef = elasticLogRefArg;
-    }
-    addFailedLog(objectArg) {
-        this.logStorage.push(objectArg);
-        this.setRetry();
-    }
-    scheduleLog(logObject) {
-        this.logStorage.push(logObject);
-    }
-    setRetry() {
-        setTimeout(() => {
-            const oldStorage = this.logStorage;
-            this.logStorage = [];
-            for (let logObject of oldStorage) {
-                this.elasticLogRef.log(logObject, true);
-            }
-            if (this.logStorage.length === 0) {
-                console.log('ElasticLog retry success!!!');
-                this.logsScheduled = false;
-            }
-            else {
-                console.log('ElasticLog retry failed');
-                this.setRetry();
-            }
-        }, 5000);
-    }
-    deferSend() {
-        if (!this.logsScheduled) {
-            console.log('Retry ElasticLog in 5 seconds!');
-            this.logsScheduled = true;
-            this.setRetry();
-        }
-    }
-}
-exports.LogScheduler = LogScheduler;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWxhc3RpY2xvZy5jbGFzc2VzLmxvZ3NjaGVkdWxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2VsYXN0aWNsb2cuY2xhc3Nlcy5sb2dzY2hlZHVsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFFQTtJQUtFLFlBQVksZ0JBQWlDO1FBSDdDLGtCQUFhLEdBQUcsS0FBSyxDQUFDO1FBQ3RCLGVBQVUsR0FBVSxFQUFFLENBQUM7UUFHckIsSUFBSSxDQUFDLGFBQWEsR0FBRyxnQkFBZ0IsQ0FBQztJQUN4QyxDQUFDO0lBRUQsWUFBWSxDQUFDLFNBQW1DO1FBQzlDLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ2hDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUNsQixDQUFDO0lBQ0QsV0FBVyxDQUFDLFNBQWM7UUFDeEIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDbEMsQ0FBQztJQUVELFFBQVE7UUFDTixVQUFVLENBQUMsR0FBRyxFQUFFO1lBQ2QsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQztZQUNuQyxJQUFJLENBQUMsVUFBVSxHQUFHLEVBQUUsQ0FBQztZQUNyQixHQUFHLENBQUMsQ0FBQyxJQUFJLFNBQVMsSUFBSSxVQUFVLENBQUMsQ0FBQyxDQUFDO2dCQUNqQyxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLENBQUM7WUFDMUMsQ0FBQztZQUNELEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ2pDLE9BQU8sQ0FBQyxHQUFHLENBQUMsNkJBQTZCLENBQUMsQ0FBQztnQkFDM0MsSUFBSSxDQUFDLGFBQWEsR0FBRyxLQUFLLENBQUM7WUFDN0IsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNOLE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLENBQUMsQ0FBQztnQkFDdkMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ2xCLENBQUM7UUFDSCxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDWCxDQUFDO0lBRUQsU0FBUztRQUNQLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7WUFDeEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1lBQzlDLElBQUksQ0FBQyxhQUFhLEdBQUcsSUFBSSxDQUFDO1lBQzFCLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNsQixDQUFDO0lBQ0gsQ0FBQztDQUNGO0FBekNELG9DQXlDQyJ9

dist/elasticlog.plugins.d.ts

@@ -1,4 +0,0 @@
-import * as elasticsearch from 'elasticsearch';
-import * as smartdelay from 'smartdelay';
-import * as smartlogInterfaces from 'smartlog-interfaces';
-export { elasticsearch, smartdelay, smartlogInterfaces };

dist/elasticlog.plugins.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const elasticsearch = require("elasticsearch");
-exports.elasticsearch = elasticsearch;
-const smartdelay = require("smartdelay");
-exports.smartdelay = smartdelay;
-const smartlogInterfaces = require("smartlog-interfaces");
-exports.smartlogInterfaces = smartlogInterfaces;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWxhc3RpY2xvZy5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvZWxhc3RpY2xvZy5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0NBQStDO0FBR3RDLHNDQUFhO0FBRnRCLHlDQUF5QztBQUVqQixnQ0FBVTtBQURsQywwREFBMEQ7QUFDdEIsZ0RBQWtCIn0=

dist/index.d.ts

@@ -1 +0,0 @@
-export * from './elasticlog.classes.elasticlog';

dist/index.js

@@ -1,7 +0,0 @@
-"use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./elasticlog.classes.elasticlog"));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHFEQUFnRCJ9

npmextra.json

@@ -1,5 +1,6 @@
 {
   "npmci": {
-    "npmGlobalTools": []
+    "npmGlobalTools": [],
+    "npmAccessLevel": "public"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@pushrocks/elasticlog",
+  "name": "@mojoio/elasticsearch",
-  "version": "1.0.10",
+  "version": "1.0.28",
   "private": false,
   "description": "log to elasticsearch in a kibana compatible format",
   "main": "dist/index.js",
@@ -10,19 +10,25 @@
   "scripts": {
     "test": "(tstest test/)",
     "format": "(gitzone format)",
-    "build": "echo \"Not needed for now\""
+    "build": "(tsbuild)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
+    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tsrun": "^1.1.12",
+    "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.13",
+    "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.0.5",
+    "@pushrocks/qenv": "^4.0.6",
-    "qenv": "^1.1.7"
+    "@pushrocks/tapbundle": "^3.0.13",
+    "@types/node": "^12.12.5",
+    "tslint": "^5.20.0",
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.2",
+    "@pushrocks/lik": "^3.0.11",
-    "@pushrocks/smartlog-interfaces": "^1.0.9",
+    "@pushrocks/smartdelay": "^2.0.3",
-    "@types/elasticsearch": "^5.0.25",
+    "@pushrocks/smartlog-interfaces": "^2.0.9",
-    "elasticsearch": "^15.1.1"
+    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smarttime": "^3.0.12",
+    "@types/elasticsearch": "^5.0.35",
+    "elasticsearch": "^16.5.0"
   }
 }

test/test.ts

@@ -1,32 +1,36 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import { Qenv } from 'qenv';
+import { Qenv } from '@pushrocks/qenv';
-import * as elasticlog from '../ts/index';
+import * as elasticsearch from '../ts/index';
 
 const testQenv = new Qenv('./', './.nogit/');
 
-let testElasticLog: elasticlog.ElasticLog<any>;
+let testElasticLog: elasticsearch.ElasticSearch<any>;
 
 tap.test('first test', async () => {
-  testElasticLog = new elasticlog.ElasticLog({
+  testElasticLog = new elasticsearch.ElasticSearch({
-    domain: process.env.ELK_DOMAIN,
+    indexPrefix: 'smartlog',
-    port: parseInt(process.env.ELK_PORT, 10),
+    indexRetention: 7,
-    ssl: true,
+    domain: testQenv.getEnvVarOnDemand('ELK_DOMAIN'),
-    user: process.env.ELK_USER,
+    port: parseInt(testQenv.getEnvVarOnDemand('ELK_PORT'), 10),
-    pass: process.env.ELK_PASS,
+    ssl: true
-    logContext: {
-      company: 'Lossless GmbH',
-      runtime: 'node',
-      containerName: 'testContainer',
-      environment: 'test'
-    }
   });
-  expect(testElasticLog).to.be.instanceOf(elasticlog.ElasticLog);
+  expect(testElasticLog).to.be.instanceOf(elasticsearch.ElasticSearch);
 });
 
-tap.skip.test('should send a message to Elasticsearch', async () => {
+tap.test('should send a message to Elasticsearch', async () => {
   testElasticLog.log({
-    severity: 'log',
+    timestamp: Date.now(),
-    message: 'hi, this is a testMessage'
+    type: 'increment',
+    level: 'info',
+    context: {
+      company: 'Lossless GmbH',
+      companyunit: 'lossless.cloud',
+      containerName: 'testcontainer',
+      environment: 'test',
+      runtime: 'node',
+      zone: 'ship.zone'
+    },
+    message: 'GET https://myroute.to.a.cool.destination/sorare?hello=there'
   });
 });
 

ts/elasticlog.classes.elasticlog.ts

@@ -1,88 +0,0 @@
-// interfaces
-import { Client as ElasticClient } from 'elasticsearch';
-import { ILogContext } from '@pushrocks/smartlog-interfaces';
-
-// other classes
-import { LogScheduler } from './elasticlog.classes.logscheduler';
-
-export interface IStandardLogParams {
-  message: string;
-  severity: string;
-}
-
-export interface IElasticLogConstructorOptions {
-  port: number;
-  domain: string;
-  ssl: boolean;
-  user?: string;
-  pass?: string;
-  logContext: ILogContext;
-}
-
-export class ElasticLog<T> {
-  client: ElasticClient;
-  logContext: ILogContext;
-  logScheduler = new LogScheduler(this);
-
-  /**
-   * sets up an instance of Elastic log
-   * @param optionsArg
-   */
-  constructor(optionsArg: IElasticLogConstructorOptions) {
-    this.logContext = optionsArg.logContext;
-    this.client = new ElasticClient({
-      host: this.computeHostString(optionsArg),
-      log: 'trace'
-    });
-  }
-
-  /**
-   * computes the host string from the constructor options
-   * @param optionsArg
-   */
-  private computeHostString(optionsArg: IElasticLogConstructorOptions): string {
-    let hostString = `${optionsArg.domain}:${optionsArg.port}`;
-    if (optionsArg.user && optionsArg.pass) {
-      hostString = `${optionsArg.user}:${optionsArg.pass}@${hostString}`;
-    }
-    if (optionsArg.ssl) {
-      hostString = `https://${hostString}`;
-    } else {
-      hostString = `http://${hostString}`;
-    }
-    return hostString;
-  }
-
-  async log(logObject: IStandardLogParams, scheduleOverwrite = false) {
-    const now = new Date();
-    if (this.logScheduler.logsScheduled && !scheduleOverwrite) {
-      this.logScheduler.scheduleLog(logObject);
-      return;
-    }
-    this.client.index(
-      {
-        index: `logs-${now.getFullYear()}.${('0' + (now.getMonth() + 1)).slice(
-          -2
-        )}.${now.getDate()}`,
-        type: 'log',
-        body: {
-          '@timestamp': now.toISOString(),
-          zone: this.logContext.zone,
-          container: this.logContext.containerName,
-          environment: this.logContext.environment,
-          severity: logObject.severity,
-          message: logObject.message
-        }
-      },
-      (error, response) => {
-        if (error) {
-          console.log('ElasticLog encountered an error:');
-          console.log(error);
-          this.logScheduler.addFailedLog(logObject);
-        } else {
-          console.log(`ElasticLog: ${logObject.message}`);
-        }
-      }
-    );
-  }
-}

ts/elasticlog.classes.logscheduler.ts

@@ -1,44 +0,0 @@
-import { ElasticLog, IStandardLogParams } from './elasticlog.classes.elasticlog';
-
-export class LogScheduler {
-  elasticLogRef: ElasticLog<any>;
-  logsScheduled = false;
-  logStorage: any[] = [];
-
-  constructor(elasticLogRefArg: ElasticLog<any>) {
-    this.elasticLogRef = elasticLogRefArg;
-  }
-
-  addFailedLog(objectArg: any | IStandardLogParams) {
-    this.logStorage.push(objectArg);
-    this.setRetry();
-  }
-  scheduleLog(logObject: any) {
-    this.logStorage.push(logObject);
-  }
-
-  setRetry() {
-    setTimeout(() => {
-      const oldStorage = this.logStorage;
-      this.logStorage = [];
-      for (let logObject of oldStorage) {
-        this.elasticLogRef.log(logObject, true);
-      }
-      if (this.logStorage.length === 0) {
-        console.log('ElasticLog retry success!!!');
-        this.logsScheduled = false;
-      } else {
-        console.log('ElasticLog retry failed');
-        this.setRetry();
-      }
-    }, 5000);
-  }
-
-  deferSend() {
-    if (!this.logsScheduled) {
-      console.log('Retry ElasticLog in 5 seconds!');
-      this.logsScheduled = true;
-      this.setRetry();
-    }
-  }
-}

ts/elasticlog.plugins.ts

@@ -1,4 +0,0 @@
-import * as elasticsearch from 'elasticsearch';
-import * as smartdelay from 'smartdelay';
-import * as smartlogInterfaces from 'smartlog-interfaces';
-export { elasticsearch, smartdelay, smartlogInterfaces };

ts/elasticsearch.classes.elasticindex.ts

@@ -0,0 +1,106 @@
+import * as plugins from './elasticsearch.plugins';
+import { ElasticSearch } from './elasticsearch.classes.elasticsearch';
+import { ILogPackage } from '@pushrocks/smartlog-interfaces';
+
+import { Stringmap } from '@pushrocks/lik';
+
+export class ElasticIndex {
+  private stringmap = new Stringmap();
+  private elasticSearchRef: ElasticSearch<any>;
+
+  constructor(elasticSearchInstanceArg: ElasticSearch<ILogPackage>) {
+    this.elasticSearchRef = elasticSearchInstanceArg;
+  }
+
+  public async ensureIndex(indexArg: string) {
+    const done = plugins.smartpromise.defer();
+    if (this.stringmap.checkString(indexArg)) {
+      done.resolve();
+      return;
+    }
+    this.elasticSearchRef.client.cat.indices(
+      {
+        format: 'json',
+        bytes: 'm'
+      },
+      async (err, responseArg: any[]) => {
+        if(err) {
+          console.log(err);
+          return;
+        }
+
+        // lets delete indexes that violate the retention
+        if(Array.isArray(responseArg)) {
+          const filteredIndices = responseArg.filter(indexObjectArg => {
+            return indexObjectArg.index.startsWith('smartlog');
+          });
+          const filteredIndexNames = filteredIndices.map(indexObjectArg => {
+            return indexObjectArg.index;
+          });
+          this.deleteOldIndices(filteredIndexNames);
+        }
+
+        let index = null;
+        
+        if(Array.isArray(responseArg)) {
+          index = responseArg.find(indexObject => {
+            return indexObject.index === indexArg;
+          });
+        }
+
+        if (!index) {
+          const done2 = plugins.smartpromise.defer();
+          this.elasticSearchRef.client.indices.create(
+            {
+              
+              waitForActiveShards: '1',
+              index: indexArg
+            },
+            (error, response) => {
+              // console.lof(response)
+              done2.resolve();
+            }
+          );
+          await done2.promise;
+        }
+        this.stringmap.addString(indexArg);
+        done.resolve();
+      }
+    );
+    await done.promise;
+  }
+
+  public createNewIndex(indexNameArg: string) {
+
+  }
+
+  public async deleteOldIndices(indicesArray: string[]) {
+    const todayAsUnix: number = Date.now();
+        const rententionPeriodAsUnix: number = plugins.smarttime.units.days(
+          this.elasticSearchRef.indexRetention
+        );
+    for (const indexName of indicesArray) {
+      const regexResult = /^smartlog-([0-9]*)\.([0-9]*)\.([0-9]*)$/.exec(indexName);
+      const dateAsUnix: number = new Date(
+        `${regexResult[1]}-${regexResult[2]}-${regexResult[3]}`
+      ).getTime();
+      if (todayAsUnix - rententionPeriodAsUnix > dateAsUnix) {
+        console.log(`found old index ${indexName}`);
+        const done2 = plugins.smartpromise.defer();
+        this.elasticSearchRef.client.indices.delete(
+          {
+            index: indexName
+          },
+          (err2, response2) => {
+            if (err2) {
+              console.log(err2);
+            }
+            console.log(`deleted ${indexName}`);
+            done2.resolve();
+          }
+        );
+        await done2.promise;
+      }
+    }
+  }
+}

ts/elasticsearch.classes.elasticscheduler.ts

@@ -0,0 +1,44 @@
+import { ElasticSearch, IStandardLogParams } from './elasticsearch.classes.elasticsearch';
+
+export class ElasticScheduler {
+  elasticSearchRef: ElasticSearch<any>;
+  docsScheduled = false;
+  docsStorage: any[] = [];
+
+  constructor(elasticLogRefArg: ElasticSearch<any>) {
+    this.elasticSearchRef = elasticLogRefArg;
+  }
+
+  public addFailedDoc(objectArg: any | IStandardLogParams) {
+    this.docsStorage.push(objectArg);
+    this.setRetry();
+  }
+  public scheduleDoc(logObject: any) {
+    this.docsStorage.push(logObject);
+  }
+
+  public setRetry() {
+    setTimeout(() => {
+      const oldStorage = this.docsStorage;
+      this.docsStorage = [];
+      for (let logObject of oldStorage) {
+        this.elasticSearchRef.log(logObject, true);
+      }
+      if (this.docsStorage.length === 0) {
+        console.log('ElasticLog retry success!!!');
+        this.docsScheduled = false;
+      } else {
+        console.log('ElasticLog retry failed');
+        this.setRetry();
+      }
+    }, 5000);
+  }
+
+  public deferSend() {
+    if (!this.docsScheduled) {
+      console.log('Retry ElasticLog in 5 seconds!');
+      this.docsScheduled = true;
+      this.setRetry();
+    }
+  }
+}

ts/elasticsearch.classes.elasticsearch.ts

@@ -0,0 +1,105 @@
+// interfaces
+import { Client as ElasticClient } from 'elasticsearch';
+import { ILogContext, ILogPackage, ILogDestination } from '@pushrocks/smartlog-interfaces';
+
+// other classes
+import { ElasticScheduler } from './elasticsearch.classes.elasticscheduler';
+import { ElasticIndex } from './elasticsearch.classes.elasticindex';
+
+export interface IStandardLogParams {
+  message: string;
+  severity: string;
+}
+
+export interface IElasticSearchConstructorOptions {
+  indexPrefix: string;
+  indexRetention: number;
+  port: number;
+  domain: string;
+  ssl: boolean;
+  user?: string;
+  pass?: string;
+}
+
+export class ElasticSearch<T> {
+  public client: ElasticClient;
+  public elasticScheduler = new ElasticScheduler(this);
+  public elasticIndex: ElasticIndex = new ElasticIndex(this);
+
+  public indexPrefix: string;
+  public indexRetention: number;
+
+  /**
+   * sets up an instance of Elastic log
+   * @param optionsArg
+   */
+  constructor(optionsArg: IElasticSearchConstructorOptions) {
+    this.client = new ElasticClient({
+      host: this.computeHostString(optionsArg),
+      // log: 'trace'
+    });
+    this.indexPrefix = optionsArg.indexPrefix;
+    this.indexRetention = optionsArg.indexRetention;
+  }
+
+  /**
+   * computes the host string from the constructor options
+   * @param optionsArg
+   */
+  private computeHostString(optionsArg: IElasticSearchConstructorOptions): string {
+    let hostString = `${optionsArg.domain}:${optionsArg.port}`;
+    if (optionsArg.user && optionsArg.pass) {
+      hostString = `${optionsArg.user}:${optionsArg.pass}@${hostString}`;
+    }
+    if (optionsArg.ssl) {
+      hostString = `https://${hostString}`;
+    } else {
+      hostString = `http://${hostString}`;
+    }
+    console.log(hostString);
+    return hostString;
+  }
+
+  public async log(logPackageArg: ILogPackage, scheduleOverwrite = false) {
+    const now = new Date();
+    const indexToUse = `${this.indexPrefix}-${now.getFullYear()}.${(
+      '0' +
+      (now.getMonth() + 1)
+    ).slice(-2)}.${('0' + now.getDate()).slice(-2)}`;
+
+    if (this.elasticScheduler.docsScheduled && !scheduleOverwrite) {
+      this.elasticScheduler.scheduleDoc(logPackageArg);
+      return;
+    }
+
+    await this.elasticIndex.ensureIndex(indexToUse);
+
+    this.client.index(
+      {
+        index: indexToUse,
+        type: 'log',
+        body: {
+          '@timestamp': new Date(logPackageArg.timestamp).toISOString(),
+          ...logPackageArg
+        }
+      },
+      (error, response) => {
+        if (error) {
+          console.log('ElasticLog encountered an error:');
+          console.log(error);
+          this.elasticScheduler.addFailedDoc(logPackageArg);
+        } else {
+          // console.log(`ElasticLog: ${logPackageArg.message}`);
+        }
+      }
+    );
+  }
+
+  get logDestination(): ILogDestination {
+    return {
+      handleLog: (smartlogPackageArg: ILogPackage) => {
+        this.log(smartlogPackageArg);
+      }
+    };
+  }
+}

ts/elasticsearch.plugins.ts

@@ -0,0 +1,8 @@
+import * as elasticsearch from 'elasticsearch';
+import * as lik from '@pushrocks/lik';
+import * as smartdelay from '@pushrocks/smartdelay';
+import * as smartlogInterfaces from '@pushrocks/smartlog-interfaces';
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as smarttime from '@pushrocks/smarttime';
+
+export { elasticsearch, lik, smartdelay, smartlogInterfaces, smartpromise, smarttime };

ts/index.ts

@@ -1 +1 @@
-export * from './elasticlog.classes.elasticlog';
+export * from './elasticsearch.classes.elasticsearch';

tslint.json

@@ -1,3 +1,17 @@
 {
-    "extends": "tslint-config-standard"
+  "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"
 }