Fix errors when using the monorepo (#856)

* runtime: better detection for adaptor errors loaded from the monorepo * runtime: relax path constraint * changeset * versions: [email protected] [email protected]
OpenFn · Jan 14, 2025 · a1a071b · a1a071b
1 parent c9afba0
commit a1a071b
Show file tree

Hide file tree

Showing 16 changed files with 106 additions and 10 deletions.
diff --git a/integration-tests/execute/CHANGELOG.md b/integration-tests/execute/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @openfn/integration-tests-execute
 
+## 1.0.14
+
+### Patch Changes
+
+- Updated dependencies [70e3d7a]
+  - @openfn/runtime@1.6.1
+
 ## 1.0.13
 
 ### Patch Changes

diff --git a/integration-tests/execute/package.json b/integration-tests/execute/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@openfn/integration-tests-execute",
   "private": true,
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Job execution tests",
   "author": "Open Function Group <[email protected]>",
   "license": "ISC",

diff --git a/integration-tests/worker/CHANGELOG.md b/integration-tests/worker/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @openfn/integration-tests-worker
 
+## 1.0.74
+
+### Patch Changes
+
+- Updated dependencies [70e3d7a]
+  - @openfn/ws-worker@1.9.1
+  - @openfn/engine-multi@1.4.8
+  - @openfn/lightning-mock@2.0.29
+
 ## 1.0.73
 
 ### Patch Changes

diff --git a/integration-tests/worker/package.json b/integration-tests/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@openfn/integration-tests-worker",
   "private": true,
-  "version": "1.0.73",
+  "version": "1.0.74",
   "description": "Lightning WOrker integration tests",
   "author": "Open Function Group <[email protected]>",
   "license": "ISC",

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @openfn/cli
 
+## 1.10.1
+
+### Patch Changes
+
+- 70e3d7a: Fix error reporting when loading adaptors from the monorepo
+- Updated dependencies [70e3d7a]
+  - @openfn/runtime@1.6.1
+
 ## 1.10.0
 
 ### Minor Changes

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "description": "CLI devtools for the openfn toolchain.",
   "engines": {
     "node": ">=18",

diff --git a/packages/engine-multi/CHANGELOG.md b/packages/engine-multi/CHANGELOG.md
@@ -1,5 +1,12 @@
 # engine-multi
 
+## 1.4.8
+
+### Patch Changes
+
+- Updated dependencies [70e3d7a]
+  - @openfn/runtime@1.6.1
+
 ## 1.4.7
 
 ### Patch Changes

diff --git a/packages/engine-multi/package.json b/packages/engine-multi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/engine-multi",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "description": "Multi-process runtime engine",
   "main": "dist/index.js",
   "type": "module",

diff --git a/packages/lightning-mock/CHANGELOG.md b/packages/lightning-mock/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @openfn/lightning-mock
 
+## 2.0.29
+
+### Patch Changes
+
+- Updated dependencies [70e3d7a]
+  - @openfn/runtime@1.6.1
+  - @openfn/engine-multi@1.4.8
+
 ## 2.0.28
 
 ### Patch Changes

diff --git a/packages/lightning-mock/package.json b/packages/lightning-mock/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/lightning-mock",
-  "version": "2.0.28",
+  "version": "2.0.29",
   "private": true,
   "description": "A mock Lightning server",
   "main": "dist/index.js",

diff --git a/packages/runtime/CHANGELOG.md b/packages/runtime/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @openfn/runtime
 
+## 1.6.1
+
+### Patch Changes
+
+- 70e3d7a: Fix error reporting when loading adaptors from the monorepo
+
 ## 1.6.0
 
 ### Minor Changes

diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/runtime",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Job processing runtime.",
   "type": "module",
   "exports": {

diff --git a/packages/runtime/src/execute/expression.ts b/packages/runtime/src/execute/expression.ts
@@ -137,6 +137,7 @@ export const wrapOperation = (
     try {
       result = await fn(newState);
     } catch (e: any) {
+      console.log(e);
       if (e.stack) {
         const containsVMFrame = e.stack.match(/at vm:module\(0\)/);
 
@@ -146,11 +147,14 @@ export const wrapOperation = (
 
         let firstFrame;
 
-        // find the first error from a file or the VM
-        // (this cuts out low level language errors and stuff)
+        // find the first frame from an adaptor or the VM
+        // (this cuts out low level language errors like TypeError)
         do {
           const next = frames.shift();
-          if (/(@openfn\/language-)|(vm:module)/.test(next)) {
+          if (
+            // detect an adaptor prod, adaptor monorepo, or vm frame
+            /(@openfn\/language-)|(packages\/.+\/dist)|(vm:module)/.test(next)
+          ) {
             firstFrame = next;
             break;
           }

diff --git a/packages/runtime/test/execute/wrap-operation.test.ts b/packages/runtime/test/execute/wrap-operation.test.ts
@@ -142,3 +142,41 @@ test('rethrow a job error', async (t) => {
     message: 'x is not a function',
   });
 });
+
+test('throw an adaptor error from a prod callstack', async (t) => {
+  const op = (x: any) => {
+    return async (_s: any) => {
+      // Create something that looks like an error thrown from adaptor code
+      const e = new TypeError('x is not a function');
+      e.stack = `TypeError: x is not a function
+  at /repo/@openfn/language-common/dist/index.cjs:573:5
+  at file:///repo/openfn/kit/packages/runtime/dist/index.js:649:22
+  at async file:///repo/openfn/kit/packages/runtime/dist/index.js:614:22;`;
+      throw e;
+    };
+  };
+
+  await t.throwsAsync(() => reducer([op('jam')], {}), {
+    name: 'AdaptorError',
+    message: 'x is not a function',
+  });
+});
+
+test('throw an adaptor error from a monorepo callstack', async (t) => {
+  const op = (x: any) => {
+    return async (_s: any) => {
+      // Create something that looks like an error thrown from adaptor code
+      const e = new TypeError('x is not a function');
+      e.stack = `TypeError: x is not a function
+  at /repo/openfn/adaptors/packages/common/dist/index.cjs:573:5
+  at file:///repo/openfn/kit/packages/runtime/dist/index.js:649:22
+  at async file:///repo/openfn/kit/packages/runtime/dist/index.js:614:22;`;
+      throw e;
+    };
+  };
+
+  await t.throwsAsync(() => reducer([op('jam')], {}), {
+    name: 'AdaptorError',
+    message: 'x is not a function',
+  });
+});
diff --git a/packages/ws-worker/CHANGELOG.md b/packages/ws-worker/CHANGELOG.md
@@ -1,5 +1,14 @@
 # ws-worker
 
+## 1.9.1
+
+### Patch Changes
+
+- 70e3d7a: Fix error reporting when loading adaptors from the monorepo
+- Updated dependencies [70e3d7a]
+  - @openfn/runtime@1.6.1
+  - @openfn/engine-multi@1.4.8
+
 ## 1.9.0
 
 ### Minor Changes

diff --git a/packages/ws-worker/package.json b/packages/ws-worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/ws-worker",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "A Websocket Worker to connect Lightning to a Runtime Engine",
   "main": "dist/index.js",
   "type": "module",