@ikonintegration/ikapi 3.1.27 → 3.1.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikonintegration/ikapi",
-  "version": "3.1.27",
+  "version": "3.1.30",
   "description": "",
   "main": "index.js",
   "module": "main.js",

package/src/BaseEvent/IKProcess.js

@@ -28,14 +28,16 @@ export default class IKProcess {
   //Main interface
   async execute(executionFunc) {
     this.logger.debug("Starting main process code");
+    //Tracker
+    if (this.allowExecutionIdentification && this.tracker) this.tracker.resetExecutionTrace();
     //Connect DB
     if (this.db) await this.db.connect();
-    //program loop
+    //Program loop
     setInterval( async () => {
       await this._execute(executionFunc);
     }, this.interval);
-    //
-    if (this.allowExecutionIdentification && this.tracker) await this.tracker.stopTracking();
+    //Tracker
+    if (this.allowExecutionIdentification && this.tracker) await this.tracker.trackExecAndDrain();
   }
   //Executions
   async _execute(executionFunc) {

package/src/BaseEvent/IKTransaction.js

@@ -53,6 +53,8 @@ export default class IKTransaction {
     try { //Execute
       this.logger.debug("Starting main request code");
       this._resp = await executionFunc(this);
+      //Tracker after successful execution (before succeeding the context, which will cause things to die)
+      if (this.tracker) await this.tracker.trackExecAndDrain();
       //Answer client
       if (this._resp && this._resp instanceof IKResponse) {
         await this._resp.build(this._context, this, this._syncReturn);
@@ -102,8 +104,8 @@ export default class IKTransaction {
     try {
       await safeExecution();
       await this.logger.flushLogs();
-      //Tracker
-      if (this.tracker) await this.tracker.stopTracking();
+      //Tracker (if not tracked yet -- exception case)
+      if (this.tracker) await this.tracker.trackExecAndDrain();
     } catch (e) {
       this.logger.error('Exception when flushing logs.');
       this.logger.exception(e);

package/src/Tracker/IKExecutionTracker.js

@@ -8,7 +8,9 @@ export default class IKExecutionTracker {
   constructor(config, context, db) {
     this.context = context;
     this.db = db;
+    this.config = config;
     this.startedOn = Date.now();
+    this.drainedExecution = false;
     if (config) this.client = this._getClient(config);
     this.claimers = {};
   }
@@ -16,6 +18,10 @@ export default class IKExecutionTracker {
   appendClaimer(value, key) { this.claimers[value] = key; }
   appendEvent(event) { this.client.appendEvent(event); }
   //
+  resetExecutionTrace() { 
+    this.startedOn = Date.now(); 
+    this.drainedExecution = false;
+  }
   async quickDrain() {
     try {
       //Check for client and claimers
@@ -24,8 +30,11 @@ export default class IKExecutionTracker {
       await this.client.drain(this.claimers);
     } catch (e) { console.error(`Error while draining tracker events: ${e}`); }
   }
-  async stopTracking() {
+  async trackExecAndDrain() {
     try {
+      //Check 
+      if (this.drainedExecution) return;
+      this.drainedExecution = true;
       //Check for client and claimers
       if (!this.client || Object.keys(this.claimers).length == 0) return; //disabled
       //detect execution and log (ECS or lambda)