2.0.2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apiclient.xyz/elasticsearch",
-  "version": "1.0.52",
+  "version": "2.0.2",
   "private": false,
   "description": "log to elasticsearch in a kibana compatible format",
   "main": "dist_ts/index.js",

test/test.nonci.ts

@@ -49,10 +49,22 @@ tap.test('should create an ElasticDoc instance', async () => {
 });
 
 tap.test('should add and update documents in a piping session', async () => {
-  await testElasticDoc.startPipingSession();
-  await testElasticDoc.pipeDocument('1', { name: 'doc1' });
-  await testElasticDoc.pipeDocument('2', { name: 'doc2' });
-  await testElasticDoc.pipeDocument('1', { name: 'updated doc1' });
+  await testElasticDoc.startPipingSession({});
+  await testElasticDoc.pipeDocument({
+    docId: '1',
+    timestamp: new Date().toISOString(),
+    doc: { name: 'doc1' }
+  });
+  await testElasticDoc.pipeDocument({
+    docId: '2',
+    timestamp: new Date().toISOString(),
+    doc: { name: 'doc2' }
+  });
+  await testElasticDoc.pipeDocument({
+    docId: '1',
+    timestamp: new Date().toISOString(),
+    doc: { name: 'updated doc1' }
+  });
 });
 
 tap.test('should delete documents not part of the piping session', async () => {

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@apiclient.xyz/elasticsearch',
-  version: '1.0.52',
+  version: '2.0.2',
   description: 'log to elasticsearch in a kibana compatible format'
 }

ts/els.classes.elasticdoc.ts

@@ -14,13 +14,19 @@ export interface ISnapshot {
   aggregationData: any;
 }
 
-export type SnapshotProcessor = (iterator: AsyncIterable<any>, prevSnapshot: ISnapshot | null) => Promise<ISnapshot>;
+export type SnapshotProcessor = (
+  iterator: AsyncIterable<any>,
+  prevSnapshot: ISnapshot | null
+) => Promise<ISnapshot>;
 
 export class ElasticDoc {
   public client: ElasticClient;
   public index: string;
   private sessionDocs: Set<string> = new Set();
-  
+  private indexInitialized: boolean = false;
+  private latestTimestamp: string | null = null; // Store the latest timestamp
+  private onlyNew: boolean = false; // Whether to only pipe new docs
+
   private BATCH_SIZE = 1000;
 
   constructor(options: IElasticDocConstructorOptions) {
@@ -31,23 +37,89 @@ export class ElasticDoc {
     this.index = options.index;
   }
 
-  async startPipingSession() {
-    this.sessionDocs.clear();
+  private async ensureIndexExists(doc: any) {
+    if (!this.indexInitialized) {
+      const { body: indexExists } = await this.client.indices.exists({ index: this.index });
+      if (!indexExists) {
+        const mappings = this.createMappingsFromDoc(doc);
+        await this.client.indices.create({
+          index: this.index,
+          body: {
+            mappings,
+            settings: {
+              // You can define the settings according to your requirements here
+            },
+          },
+        });
+      }
+      this.indexInitialized = true;
+    }
   }
 
-  async pipeDocument(docId: string, doc: any) {
+  private createMappingsFromDoc(doc: any): any {
+    const properties: any = {};
+    for (const key in doc) {
+      if (key === '@timestamp') {
+        properties[key] = { type: 'date' };
+        continue;
+      }
+      properties[key] = { type: typeof doc[key] === 'number' ? 'float' : 'text' };
+    }
+    return { properties };
+  }
+
+  async startPipingSession(options: { onlyNew?: boolean }) {
+    this.sessionDocs.clear();
+    this.onlyNew = options.onlyNew;
+    if (this.onlyNew) {
+      // Retrieve and store the latest timestamp
+      const response = await this.client.search({
+        index: this.index,
+        sort: '@timestamp:desc',
+        size: 1,
+      });
+      const hit = response.body.hits.hits[0];
+      this.latestTimestamp = hit?._source?.['@timestamp'] || null;
+      if (this.latestTimestamp) {
+        console.log(`Working in "onlyNew" mode. Hence we are omitting documents prior to ${this.latestTimestamp}`);
+      } else {
+        `Working in "onlyNew" mode, but no documents found in index ${this.index}. Hence processing all documents now.`
+      }
+    }
+  }
+
+  async pipeDocument(optionsArg: { docId: string; timestamp?: string | number; doc: any }) {
+    // If 'onlyNew' is true, compare the document timestamp with the latest timestamp
+    if (this.onlyNew) {
+      if (this.latestTimestamp && optionsArg.timestamp <= this.latestTimestamp) {
+        // Omit the document
+        return;
+      }
+    }
+
+    await this.ensureIndexExists(optionsArg.doc);
+
+    const documentBody = {
+      ...optionsArg.doc,
+      ...(optionsArg.timestamp && { '@timestamp': optionsArg.timestamp }),
+    };
+
     await this.client.index({
       index: this.index,
-      id: docId,
-      body: doc,
+      id: optionsArg.docId,
+      body: documentBody,
     });
-    this.sessionDocs.add(docId);
+    this.sessionDocs.add(optionsArg.docId);
   }
 
   async endPipingSession() {
     const allDocIds: string[] = [];
     const responseQueue = [];
-    let response = await this.client.search({ index: this.index, scroll: '1m', size: this.BATCH_SIZE });
+    let response = await this.client.search({
+      index: this.index,
+      scroll: '1m',
+      size: this.BATCH_SIZE,
+    });
     while (true) {
       response.body.hits.hits.forEach((hit: any) => allDocIds.push(hit._id));
       if (!response.body.hits.hits.length) {
@@ -81,35 +153,35 @@ export class ElasticDoc {
 
   async takeSnapshot(processIterator: SnapshotProcessor) {
     const snapshotIndex = `${this.index}_snapshots`;
-  
+
     const { body: indexExists } = await this.client.indices.exists({ index: snapshotIndex });
     if (!indexExists) {
-      await this.client.indices.create({ 
+      await this.client.indices.create({
         index: snapshotIndex,
         body: {
           mappings: {
             properties: {
               date: {
-                type: 'date'
+                type: 'date',
               },
               aggregationData: {
                 type: 'object',
-                enabled: true
-              }
-            }
-          }
-        }
+                enabled: true,
+              },
+            },
+          },
+        },
       });
     }
-  
+
     const documentIterator = this.getDocumentIterator();
-  
+
     const newSnapshot = await processIterator(documentIterator, await this.getLastSnapshot());
-  
+
     await this.storeSnapshot(newSnapshot);
   }
 
-private async getLastSnapshot(): Promise<ISnapshot | null> {
+  private async getLastSnapshot(): Promise<ISnapshot | null> {
     const snapshotIndex = `${this.index}_snapshots`;
     const { body: indexExists } = await this.client.indices.exists({ index: snapshotIndex });
 
@@ -120,7 +192,7 @@ private async getLastSnapshot(): Promise<ISnapshot | null> {
     const response = await this.client.search({
       index: snapshotIndex,
       sort: 'date:desc',
-      size: 1
+      size: 1,
     });
 
     if (response.body.hits.hits.length > 0) {
@@ -134,9 +206,12 @@ private async getLastSnapshot(): Promise<ISnapshot | null> {
     }
   }
 
-
   private async *getDocumentIterator() {
-    let response = await this.client.search({ index: this.index, scroll: '1m', size: this.BATCH_SIZE });
+    let response = await this.client.search({
+      index: this.index,
+      scroll: '1m',
+      size: this.BATCH_SIZE,
+    });
     while (true) {
       for (const hit of response.body.hits.hits) {
         yield hit._source;

ts/els.classes.fastpush.ts

@@ -1,5 +1,10 @@
 import { Client as ElasticClient } from '@elastic/elasticsearch';
 
+interface FastPushOptions {
+  deleteOldData?: boolean;     // Clear the index
+  deleteIndex?: boolean;       // Delete the entire index
+}
+
 export class FastPush {
   private client: ElasticClient;
 
@@ -10,22 +15,34 @@ export class FastPush {
     });
   }
 
-  async pushToIndex(indexName: string, docArray: any[]) {
+  async pushToIndex(indexName: string, docArray: any[], options?: FastPushOptions) {
     if (docArray.length === 0) return;
 
-    // Check if index exists
     const { body: indexExists } = await this.client.indices.exists({ index: indexName });
 
-    if (!indexExists) {
+    if (indexExists) {
+      if (options?.deleteIndex) {
+        await this.client.indices.delete({ index: indexName });
+      } else if (options?.deleteOldData) {
+        await this.client.deleteByQuery({
+          index: indexName,
+          body: {
+            query: {
+              match_all: {}
+            }
+          }
+        });
+      }
+    }
+
+    if (!indexExists || options?.deleteIndex) {
       // Create index with mappings (for simplicity, we use dynamic mapping)
       await this.client.indices.create({
         index: indexName,
         body: {
           mappings: {
-            dynamic: "true",
-            properties: {
-              // If there's a need for specific mappings, they can be added here
-            },
+            dynamic: "true"
+            // ... other specific mappings
           },
         },
       });
@@ -45,3 +62,7 @@ export class FastPush {
     await this.client.bulk({ body: bulkBody });
   }
 }
+
+// Usage example:
+// const fastPush = new FastPush('http://localhost:9200', { username: 'elastic', password: 'password' });
+// fastPush.pushToIndex('my_index', [{ name: 'John', age: 30 }, { name: 'Jane', age: 25 }], { deleteOldData: true });