quidproquo-actionprocessor-node 0.0.249 → 0.0.251

package/lib/commonjs/actionProcessor/core/customActions/getCustomActionActionProcessor.js

@@ -11,17 +11,44 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCustomActionActionProcessor = void 0;
 const quidproquo_core_1 = require("quidproquo-core");
+function getActionProcessorListLoader(dynamicModuleLoader, qpqConfig) {
+    return function loadModule(qpqFunctionRuntime) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const possibleModule = yield dynamicModuleLoader(qpqFunctionRuntime);
+                if (typeof possibleModule !== 'function') {
+                    throw new Error(`Expected module to be a function, but got ${typeof possibleModule}`);
+                }
+                const apl = yield possibleModule(qpqConfig, dynamicModuleLoader);
+                if (typeof apl !== 'object') {
+                    throw new Error(`Expected action processor list to be an object, but got ${typeof apl}`);
+                }
+                if (Object.values(apl).find((aplv) => typeof aplv !== 'function')) {
+                    throw new Error('Expected all action processors to be functions');
+                }
+                return apl;
+            }
+            catch (e) {
+                console.log(`Unable to dynamically load action processors: [${e}] ${JSON.stringify(qpqFunctionRuntime)}`);
+                throw e;
+            }
+        });
+    };
+}
 const getProcessCustomAction = (qpqConfig, dynamicModuleLoader) => __awaiter(void 0, void 0, void 0, function* () {
     try {
+        const actionProcessorListLoader = getActionProcessorListLoader(dynamicModuleLoader, qpqConfig);
         const getCustomActionProcessors = quidproquo_core_1.qpqCoreUtils.getActionProcessorSources(qpqConfig);
-        const possibleModules = yield Promise.all(getCustomActionProcessors.map((x) => dynamicModuleLoader(x)));
-        const modules = possibleModules.filter((m) => typeof m === 'function');
-        const actionProcessors = yield Promise.all(modules.flatMap((m) => m(qpqConfig, dynamicModuleLoader)));
-        const allActionProcessors = actionProcessors.reduce((acc, cur) => (Object.assign(Object.assign({}, acc), cur)), {});
-        return allActionProcessors;
+        const possibleModuleResults = yield Promise.allSettled(getCustomActionProcessors.map(actionProcessorListLoader));
+        // Filter out successfully loaded modules that are functions
+        const actionProcessorLists = possibleModuleResults
+            .filter((result) => result.status === 'fulfilled')
+            .map((result) => result.value);
+        return actionProcessorLists.reduce((acc, cur) => (Object.assign(Object.assign({}, acc), cur)), {});
     }
-    catch (_a) {
-        console.log('Unable to dynamically load action processors');
+    catch (e) {
+        // This should never get hit, but just in case
+        console.log(`Unable to dynamically load action processors: [${e}]`);
         return {};
     }
 });

package/lib/esm/actionProcessor/core/customActions/getCustomActionActionProcessor.js

@@ -1,15 +1,40 @@
 import { qpqCoreUtils } from 'quidproquo-core';
+function getActionProcessorListLoader(dynamicModuleLoader, qpqConfig) {
+    return async function loadModule(qpqFunctionRuntime) {
+        try {
+            const possibleModule = await dynamicModuleLoader(qpqFunctionRuntime);
+            if (typeof possibleModule !== 'function') {
+                throw new Error(`Expected module to be a function, but got ${typeof possibleModule}`);
+            }
+            const apl = await possibleModule(qpqConfig, dynamicModuleLoader);
+            if (typeof apl !== 'object') {
+                throw new Error(`Expected action processor list to be an object, but got ${typeof apl}`);
+            }
+            if (Object.values(apl).find((aplv) => typeof aplv !== 'function')) {
+                throw new Error('Expected all action processors to be functions');
+            }
+            return apl;
+        }
+        catch (e) {
+            console.log(`Unable to dynamically load action processors: [${e}] ${JSON.stringify(qpqFunctionRuntime)}`);
+            throw e;
+        }
+    };
+}
 const getProcessCustomAction = async (qpqConfig, dynamicModuleLoader) => {
     try {
+        const actionProcessorListLoader = getActionProcessorListLoader(dynamicModuleLoader, qpqConfig);
         const getCustomActionProcessors = qpqCoreUtils.getActionProcessorSources(qpqConfig);
-        const possibleModules = await Promise.all(getCustomActionProcessors.map((x) => dynamicModuleLoader(x)));
-        const modules = possibleModules.filter((m) => typeof m === 'function');
-        const actionProcessors = await Promise.all(modules.flatMap((m) => m(qpqConfig, dynamicModuleLoader)));
-        const allActionProcessors = actionProcessors.reduce((acc, cur) => ({ ...acc, ...cur }), {});
-        return allActionProcessors;
+        const possibleModuleResults = await Promise.allSettled(getCustomActionProcessors.map(actionProcessorListLoader));
+        // Filter out successfully loaded modules that are functions
+        const actionProcessorLists = possibleModuleResults
+            .filter((result) => result.status === 'fulfilled')
+            .map((result) => result.value);
+        return actionProcessorLists.reduce((acc, cur) => ({ ...acc, ...cur }), {});
     }
-    catch {
-        console.log('Unable to dynamically load action processors');
+    catch (e) {
+        // This should never get hit, but just in case
+        console.log(`Unable to dynamically load action processors: [${e}]`);
         return {};
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-actionprocessor-node",
-  "version": "0.0.249",
+  "version": "0.0.251",
   "description": "",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/esm/index.js",
@@ -35,15 +35,15 @@
     "@anthropic-ai/sdk": "^0.19.1",
     "axios": "^1.2.1",
     "mime-types": "^2.1.35",
-    "quidproquo-core": "0.0.249",
-    "quidproquo-webserver": "0.0.249",
+    "quidproquo-core": "0.0.251",
+    "quidproquo-webserver": "0.0.251",
     "uuid": "^9.0.0",
     "uuidv7": "^1.0.1"
   },
   "devDependencies": {
     "@types/mime-types": "^2.1.1",
     "@types/uuid": "^9.0.0",
-    "quidproquo-tsconfig": "0.0.249",
+    "quidproquo-tsconfig": "0.0.251",
     "typescript": "^4.9.3"
   }
 }