1.0.28

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojoio/elasticsearch",
-  "version": "1.0.24",
+  "version": "1.0.28",
   "private": false,
   "description": "log to elasticsearch in a kibana compatible format",
   "main": "dist/index.js",
@@ -13,22 +13,22 @@
     "build": "(tsbuild)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
+    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tsrun": "^1.1.13",
+    "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.15",
+    "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/qenv": "^2.0.2",
+    "@pushrocks/qenv": "^4.0.6",
-    "@pushrocks/tapbundle": "^3.0.7",
+    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^10.12.2",
+    "@types/node": "^12.12.5",
-    "tslint": "^5.11.0",
+    "tslint": "^5.20.0",
-    "tslint-config-prettier": "^1.15.0"
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/lik": "^3.0.2",
+    "@pushrocks/lik": "^3.0.11",
-    "@pushrocks/smartdelay": "^2.0.2",
+    "@pushrocks/smartdelay": "^2.0.3",
-    "@pushrocks/smartlog-interfaces": "^2.0.2",
+    "@pushrocks/smartlog-interfaces": "^2.0.9",
-    "@pushrocks/smartpromise": "^2.0.5",
+    "@pushrocks/smartpromise": "^3.0.6",
-    "@pushrocks/smarttime": "^3.0.2",
+    "@pushrocks/smarttime": "^3.0.12",
-    "@types/elasticsearch": "^5.0.28",
+    "@types/elasticsearch": "^5.0.35",
-    "elasticsearch": "^15.2.0"
+    "elasticsearch": "^16.5.0"
   }
 }

test/test.ts

@@ -10,11 +10,9 @@ tap.test('first test', async () => {
   testElasticLog = new elasticsearch.ElasticSearch({
     indexPrefix: 'smartlog',
     indexRetention: 7,
-    domain: process.env.ELK_DOMAIN,
+    domain: testQenv.getEnvVarOnDemand('ELK_DOMAIN'),
-    port: parseInt(process.env.ELK_PORT, 10),
+    port: parseInt(testQenv.getEnvVarOnDemand('ELK_PORT'), 10),
-    ssl: true,
+    ssl: true
-    user: process.env.ELK_USER,
-    pass: process.env.ELK_PASS
   });
   expect(testElasticLog).to.be.instanceOf(elasticsearch.ElasticSearch);
 });
@@ -32,7 +30,7 @@ tap.test('should send a message to Elasticsearch', async () => {
       runtime: 'node',
       zone: 'ship.zone'
     },
-    message: 'hi, this is a testMessage'
+    message: 'GET https://myroute.to.a.cool.destination/sorare?hello=there'
   });
 });
 

ts/elasticsearch.classes.elasticindex.ts

@@ -23,53 +23,37 @@ export class ElasticIndex {
         format: 'json',
         bytes: 'm'
       },
-      async (err, response: any[]) => {
+      async (err, responseArg: any[]) => {
-        // lets delete indexes that violate the retention
+        if(err) {
-        const filteredIndices = response.filter(indexObjectArg => {
+          console.log(err);
-          return indexObjectArg.index.startsWith('smartlog');
+          return;
-        });
-        const filteredIndexNames = filteredIndices.map(indexObjectArg => {
-          return indexObjectArg.index;
-        });
-        const todayAsUnix: number = Date.now();
-        const rententionPeriodAsUnix: number = plugins.smarttime.units.days(
-          this.elasticSearchRef.indexRetention
-        );
-        console.log(filteredIndexNames);
-        for (const indexName of filteredIndexNames) {
-          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;
-          }
         }
 
-        // console.log(response);
+        // lets delete indexes that violate the retention
-        const index = response.find(indexObject => {
+        if(Array.isArray(responseArg)) {
-          return indexObject.index === indexArg;
+          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: '2',
+              
+              waitForActiveShards: '1',
               index: indexArg
             },
             (error, response) => {
@@ -85,4 +69,38 @@ export class ElasticIndex {
     );
     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.elasticsearch.ts

@@ -35,7 +35,7 @@ export class ElasticSearch<T> {
    */
   constructor(optionsArg: IElasticSearchConstructorOptions) {
     this.client = new ElasticClient({
-      host: this.computeHostString(optionsArg)
+      host: this.computeHostString(optionsArg),
       // log: 'trace'
     });
     this.indexPrefix = optionsArg.indexPrefix;
@@ -56,6 +56,7 @@ export class ElasticSearch<T> {
     } else {
       hostString = `http://${hostString}`;
     }
+    console.log(hostString);
     return hostString;
   }