codehooks-js 1.3.19 → 1.3.20

package/index.js

@@ -76,9 +76,14 @@ class Codehooks {
     this.queues[topic] = hook;
   };
 
-  worker = (name, ...hook) => {
-    this.workers[name] = hook;
-    this.queues[name] = hook; // legacy support
+  worker = async (name, hook, options={}) => {
+    this.workers[name] = [hook];
+    this.queues[name] = [hook]; // legacy support
+    
+    // add option to key-value store if options is not empty
+    if (Object.keys(options).length > 0) {
+      this.set(`queue_worker:${name}`, options);
+    }
   };
 
   job = (cronExpression, ...hook) => {

package/package.json

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

package/types/index.d.ts

@@ -891,31 +891,38 @@ export class Codehooks {
   ) => void;
   /**
    * Add application worker function
-   * @param {object} name a unique worker name or JSON configuration
-   * @param  {...function(httpRequest, httpResponse, function(string):void)} hook - callback function(s) with parameters (req, res, [next])
+   * @param {string} name - Unique worker name
+   * @param {function} hook - Worker callback function with parameters (req, res, [next])
+   * @param {Record<string, any>} options - Optional configuration stored in key-value store under `worker:${name}` key in keyspace '_codehooks_worker_settings'
+   * 
    * @example
-   * app.worker('myworker', (data, job) => {
-   *  const {body:{payload}} = data
-   *  //console.debug('worker payload data', payload)
-   *  // do stuff with payload data
-   *  job.end()
+   * // Simple worker
+   * await app.worker('myworker', (req, res) => {
+   *  const {body:{payload}} = req
+   *  console.log('worker payload data', payload)
+   *  res.end()
    *})
+   * 
    * @example
-   * app.worker({name: 'myworker', workers: 5}, (data, job) => {
-   *  const {body:{payload}} = data
-   *  //console.debug('worker payload data', payload)
-   *  // do stuff with payload data
-   *  job.end()
-   *})
+   * // Worker with configuration stored in KV store
+   * await app.worker('myworker', (req, res) => {
+   *   const {body:{payload}} = req
+   *   console.log('Processing:', payload)
+   *   res.end()
+   * }, {
+   *   workers: 2,
+   *   timeout: 30000
+   * })
    */
   worker: (
-    name: string | object,
-    ...hook: ((
+    name: string,
+    hook: (
       request: httpRequest,
       response: httpResponse,
-      next: nextFunction
-    ) => any)[]
-  ) => void;
+      next?: nextFunction
+    ) => any,
+    options?: Record<string, any>
+  ) => Promise<void>;
   /**
    * Create cron background jobs
    * @example

package/workflow/engine.mjs

@@ -345,6 +345,11 @@ class Workflow extends EventEmitter {
                                 return;
                             }
 
+                            // Additional safety check to prevent enqueueing null or invalid steps
+                            if (nextStep === null || nextStep === undefined || nextStep === 'null') {
+                                throw new Error(`Invalid nextStep value: ${nextStep}. This should have been caught earlier.`);
+                            }
+
                             // Enqueue the next step, single or parallel                            
                             if (Array.isArray(nextStep)) {
                                 const now = new Date().toISOString();
@@ -429,7 +434,8 @@ class Workflow extends EventEmitter {
         // Validate each step in the definition
         for (const [stepName, step] of Object.entries(definition)) {
             try {
-                if (stepName !== undefined) {
+                // Skip null, undefined, or invalid step names
+                if (stepName !== undefined && stepName !== null && stepName !== 'null' && stepName.trim() !== '') {
                     console.debug('registering queue for step', `${this.#queuePrefix}_${name}_${stepName}`);
                     app.worker(`${this.#queuePrefix}_${name}_${stepName}`, async (req, res) => {
                         try {
@@ -555,6 +561,12 @@ class Workflow extends EventEmitter {
         if (!state) {
             throw new Error(`No steps found with instanceId: ${instanceId}`);
         }
+        
+        // Check if the workflow has already completed
+        if (state.nextStep === null) {
+            throw new Error(`Workflow ${instanceId} has already completed and cannot be continued`);
+        }
+        
         if (reset) {
             // reset the step count
             // update all step counts to 0