codehooks-js 1.3.9 → 1.3.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codehooks-js",
-  "version": "1.3.9",
+  "version": "1.3.11",
   "type": "module",
   "description": "Codehooks.io official library - provides express.JS like syntax",
   "main": "index.js",

package/types/index.d.ts

@@ -1113,7 +1113,11 @@ export type WorkflowEvents = {
 /**
  * Definition of a workflow step function
  */
-export type WorkflowDefinition = Record<string, (state: any, callback: (nextStep: string | string[] | null, newState: any, options?: any) => void) => Promise<void>>;
+export type WorkflowDefinition = Record<string, (
+    state: any, 
+    callback: (nextStep: string | string[] | null, newState: any, options?: any) => void,
+    waiterFunction?: (waiter?: any) => void
+) => Promise<void>>;
 
 /**
  * Configuration options for a workflow step

package/workflow/engine.mjs

@@ -254,13 +254,25 @@ class Workflow extends EventEmitter {
             const func = this.getDefinition(stepsName, nextStep);
 
             // Wrap the callback in a Promise to ensure proper async handling
-            await new Promise(async (resolve, reject) => {
+            return await new Promise(async (resolve, reject) => {
                 // check if the step count is greater than the max step count
                 if (newState.stepCount[nextStep].visits > this.getMaxStepCount()) {
                     reject(new Error(`Step ${nextStep} has been executed ${newState.stepCount[nextStep].visits} times, which is greater than the maximum step count of ${this.getMaxStepCount()}`));
                     return;
                 }
                 try {
+                    const waiterFunction = async (state) => {
+                        if (state) {
+                            console.debug('waiter', state);
+                            await connection.updateOne(this.#collectionName,
+                                { _id: instanceId },
+                                { $set: { ...state, updatedAt: new Date().toISOString() } });                            
+                            resolve();
+                            return;
+                        } else {
+                            resolve(); // no state update
+                        }
+                    }
                     await func({...newState, instanceId: newState._id}, async (nextStep, userState, options) => {
                         try {
                             // Protect system-level properties
@@ -370,7 +382,8 @@ class Workflow extends EventEmitter {
                             console.error('error', error.message);
                             reject(error);
                         }
-                    });
+                    }, waiterFunction);
+                    //resolve();
                 } catch (error) {
                     console.error('Error executing step function:', error);
                     reject(error);
@@ -432,6 +445,8 @@ class Workflow extends EventEmitter {
                             const { stepsName, goto, state, instanceId, options } = req.body.payload;
                             console.debug('dequeue step', stepName, instanceId);
                             const qid = await this.handleNextStep(stepsName, goto, state, instanceId, options);
+                            //console.debug('Worker qid', qid);
+                            //res.end();
                         } catch (error) {
                             const { stepsName, goto, state, instanceId, options } = req.body.payload;
                             const connection = await Datastore.open();
@@ -441,6 +456,7 @@ class Workflow extends EventEmitter {
                             console.error('Error in function: ' + stepName, error);
                             this.emit('error', error);
                         } finally {
+                            //console.debug('Worker res.end', stepName);
                             res.end();
                         }
                     });
@@ -549,7 +565,7 @@ class Workflow extends EventEmitter {
                 { _id: instanceId }, 
                 { $set: { ...state, updatedAt: new Date().toISOString() } });
             if (options.continue) {
-                await this.continue(stepsName, instanceId);
+                await this.continue(stepsName, instanceId, false);
             } 
             resolve({ ...doc });                       
         });