codehooks-js 1.3.12 → 1.3.14

package/README.md

@@ -317,6 +317,5 @@ await conn.set('key', 'value', { ttl: 3600000 }); // 1 hour TTL
 5. **Real-time communication** via Server-Sent Events
 6. **Workflow engine** for complex step-based applications
 7. **Auto-generated CRUD APIs** with schema validation
-8. **Template rendering** system
-9. **Singleton pattern** for global application state
-10. **Datastore** with MongoDB-like query syntax, key-value operations, and queue management
+8. **Datastore** with MongoDB-like query syntax, key-value operations, and queue management
+9. **Security & Authentication** with JWKS support and custom auth middleware for secure API endpoints

package/index.js

@@ -1,6 +1,6 @@
 import {agg} from './aggregation/index.mjs';
 import {crudlify as crud} from './crudlify/index.mjs';
-import {serveStatic as ws, render as renderView} from './webserver.mjs';
+import {serveStatic as ws, render as renderView, internalFetch} from './webserver.mjs';
 import Workflow from './workflow/engine.mjs';
 
 function createRoute(str) {
@@ -116,9 +116,13 @@ class Codehooks {
       res.status(200).json({...data});      
     })
   }
+
+  internalFetch = (url, options = {}) => {
+    return internalFetch(url, options);
+  }
   
   createWorkflow = (name, description, steps, options={}) => {
-    const wf = new Workflow(name, description, steps, options);
+    const wf = new Workflow(name, description, steps, options, Codehooks.getInstance());
     wf.register(this);
     return wf;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codehooks-js",
-  "version": "1.3.12",
+  "version": "1.3.14",
   "type": "module",
   "description": "Codehooks.io official library - provides express.JS like syntax",
   "main": "index.js",
@@ -43,10 +43,9 @@
     "mongodb"
   ],
   "dependencies": {
-    "cron-parser": "^4.7.1",
     "lodash": "^4.17.21",
     "mime": "^3.0.0",
-    "node-cron": "^3.0.2"
+    "node-fetch": "^2.6.1"
   },
   "devDependencies": {
     "@types/mime": "^3.0.4",

package/types/index.d.ts

@@ -1048,6 +1048,13 @@ export class Codehooks {
    * @returns Promise with the registered workflow name
    */
   registerWorkflow: (name: string, description: string, steps: WorkflowDefinition) => Promise<string>;
+  /**
+   * Fetch data from another Codehooks API
+   * @param url - URL to fetch from, e.g. http://myapi-ffee.codehooks.io/dev/api/myroute
+   * @param options - Fetch options
+   * @returns Promise with the fetched data
+   */
+  internalFetch: (url: string, options?: any) => Promise<any>;
 }
 declare const _coho: Codehooks;
 

package/webserver.mjs

@@ -1,4 +1,6 @@
 import mime from 'mime';
+import fetch from 'node-fetch';
+import { URL } from 'url';
 
 // old and new style support
 function promisify(cb, fn) {
@@ -222,4 +224,30 @@ async function handlebars(viewFile, data, settings, cb) {
         console.error('Handle bars engine error:', err)
         cb(err);
     }
-}
+}
+
+// Generic fetch wrapper that routes through apigateway-service
+export const internalFetch = (url, options = {}) => {
+    // Parse the original URL to extract domain and path
+    
+    const urlObj = new URL(url);
+    const originalHost = urlObj.host;
+    const pathAndQuery = urlObj.pathname + urlObj.search;
+    
+    // Replace domain with apigateway-service
+    const proxyUrl = `http://apigateway-service:8888${pathAndQuery}`;
+    
+    // Merge headers with original host
+    const headers = {
+      ...options.headers,
+      'host': originalHost
+    };
+    
+    // Create new options with updated headers
+    const newOptions = {
+      ...options,
+      headers
+    };
+    
+    return fetch(proxyUrl, newOptions);
+  };

package/workflow/engine.mjs

@@ -5,6 +5,7 @@ The engine manages step transitions, state persistence, and event handling for w
 
 import { EventEmitter } from 'events';
 
+
 /**
  * Workflow class that manages step-based workflows
  * @extends EventEmitter
@@ -32,7 +33,7 @@ class Workflow extends EventEmitter {
      * @param {Object} definition - Object containing step definitions
      * @param {Object} options - Optional configuration options
      */
-    constructor(name, description, definition, options = {}) {
+    constructor(name, description, definition, options = {}, app) {
         super();
         this.#definitions = new Map();
         this.#name = name;
@@ -227,7 +228,7 @@ class Workflow extends EventEmitter {
     async handleNextStep(stepsName, nextStep, newState, instanceId, options) {
         
         // open the connection to the database
-        const connection = await Datastore.open();            
+        const connection = await DB.open();            
 
         // Handle single next step
         this.emit('stepStarted', { workflowName: stepsName, step: nextStep, state: newState, instanceId });
@@ -439,7 +440,8 @@ class Workflow extends EventEmitter {
                             //res.end();
                         } catch (error) {
                             const { stepsName, goto, state, instanceId, options } = req.body.payload;
-                            const connection = await Datastore.open();
+                            console.debug('DB in workflow 1', DB);
+                            const connection = await DB.open();
                             await connection.updateOne(this.#collectionName,
                                 { _id: instanceId },
                                 { $set: { lastError: error, updatedAt: new Date().toISOString() } });
@@ -489,8 +491,8 @@ class Workflow extends EventEmitter {
                     reject(new Error('No start step defined in workflow'));
                     return;
                 }
-
-                const connection = await Datastore.open();
+                console.debug('DB in workflow', DB);
+                const connection = await DB.open();
                 // Create a new workflow state in the database
                 const newState = await connection.insertOne(this.#collectionName,
                     { ...initialState, nextStep: firstStepName, createdAt: new Date().toISOString(), workflowName: this.#name, stepCount: {  } });
@@ -518,7 +520,7 @@ class Workflow extends EventEmitter {
      */
     async updateState(instanceId, state, options={continue: true}) {
         this.emit('stepsStateUpdating', { name: this.#name, instanceId, state });
-        const connection = await Datastore.open();
+        const connection = await DB.open();
         return new Promise(async (resolve, reject) => {
             const doc = await connection.updateOne(this.#collectionName, 
                 { _id: instanceId }, 
@@ -537,7 +539,7 @@ class Workflow extends EventEmitter {
      * @returns {Promise<void>}
      */
     async setState(instanceId, { _id, state }) {
-        const connection = await Datastore.open();
+        const connection = await DB.open();
         await connection.replaceOne(this.#collectionName, { _id: _id }, { ...state });
     }
 
@@ -548,7 +550,7 @@ class Workflow extends EventEmitter {
      * @throws {Error} If steps instance not found
      */
     async continue(instanceId, reset=false) {
-        const connection = await Datastore.open();
+        const connection = await DB.open();
         const state = await connection.findOne(this.#collectionName, { _id: instanceId });
         if (!state) {
             throw new Error(`No steps found with instanceId: ${instanceId}`);
@@ -586,7 +588,7 @@ class Workflow extends EventEmitter {
      * @returns {Promise<Array<{qId: string}>>} Array of results containing queue IDs for continued workflows
      */
     async continueAllTimedOut() {
-        const db = await Datastore.open();
+        const db = await DB.open();
         const timedOutWorkflows = await db.collection(this.#collectionName).find({nextStep: {$ne: null}}).toArray();
         const now = new Date();
         const results = [];
@@ -611,7 +613,7 @@ class Workflow extends EventEmitter {
      */
     async getStepsStatus(id) {
         return new Promise(async (resolve, reject) => {
-            const connection = await Datastore.open();
+            const connection = await DB.open();
             const state = await connection.findOne(this.#collectionName, { _id: id });
             resolve(state);
         });
@@ -624,7 +626,7 @@ class Workflow extends EventEmitter {
      */
     async getInstances(filter) {
         return new Promise(async (resolve, reject) => {
-            const connection = await Datastore.open();
+            const connection = await DB.open();
             const states = await connection.find(this.#collectionName, filter).toArray();
             console.debug('listSteps', this.#collectionName, filter, states.length);
             resolve(states);
@@ -639,7 +641,7 @@ class Workflow extends EventEmitter {
     async cancelSteps(id) {
         this.emit('cancelled', { id });
         return new Promise(async (resolve, reject) => {
-            const connection = await Datastore.open();
+            const connection = await DB.open();
             const state = await connection.updateOne(this.#collectionName, 
                 { _id: id }, 
                 { $set: { status: 'cancelled' } });    
@@ -713,7 +715,7 @@ class Workflow extends EventEmitter {
      * @returns {Promise<Array<Object>>} Array of workflow instances with timed out steps
      */
     async findTimedOutSteps(filter = {}) {
-        const db = await Datastore.open();
+        const db = await DB.open();
         const workflows = await db.getMany(this.#collectionName, {"nextStep": {$ne: null}}).toArray();
         if (workflows.length > 0) {
             console.debug('TimedOutSteps', workflows.length);

package/types/cronjob.d.mts

@@ -1,2 +0,0 @@
-export default function run(cronexpr: any, theFunc: any): void;
-//# sourceMappingURL=cronjob.d.mts.map

package/types/cronjob.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cronjob.d.mts","sourceRoot":"","sources":["../cronjob.mjs"],"names":[],"mappings":"AAMA,+DA6BC"}