@openfn/ws-worker 1.22.0 → 1.22.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # ws-worker
 
+## 1.22.1
+
+### Patch Changes
+
+- 6fd3942: Fix an issue where unhandled errors could trigger a worker crash after a compilation error.
+- 32b43cb: When reporting compilation errors, prefer the step name to the id
+- Updated dependencies [6fd3942]
+- Updated dependencies [32b43cb]
+  - @openfn/engine-multi@1.10.5
+
 ## 1.22.0
 
 ### Minor Changes

package/dist/index.js

@@ -40,13 +40,12 @@ var destroy = async (app, logger) => {
         resolve();
       });
     }),
-    new Promise(async (resolve) => {
+    (async () => {
       await waitForRunsAndClaims(app, logger);
       app.queueChannel?.leave();
       await app.engine.destroy();
       app.socket?.disconnect();
-      resolve();
-    })
+    })()
   ]);
   logger.success("Server closed");
 };
@@ -508,36 +507,35 @@ var tryWithBackoff = (fn, opts = {}) => {
   if (!opts.isCancelled) {
     opts.isCancelled = () => cancelled;
   }
-  const promise = new Promise(async (resolve, reject) => {
+  const run = async () => {
     try {
       await fn();
-      resolve();
     } catch (e) {
       if (e?.abort) {
         cancelled = true;
-        return reject();
+        throw e;
       }
       if (opts.isCancelled()) {
-        return resolve();
+        return;
       }
       if (!isNaN(maxRuns) && runs >= maxRuns) {
-        return reject(new Error("max runs exceeded"));
+        throw new Error("max runs exceeded");
       }
-      setTimeout(() => {
-        if (opts.isCancelled()) {
-          return resolve();
-        }
-        const nextOpts = {
-          maxRuns,
-          runs: runs + 1,
-          min: Math.min(max, min * BACKOFF_MULTIPLIER),
-          max,
-          isCancelled: opts.isCancelled
-        };
-        tryWithBackoff(fn, nextOpts).then(resolve).catch(reject);
-      }, min);
+      await new Promise((resolve) => setTimeout(resolve, min));
+      if (opts.isCancelled()) {
+        return;
+      }
+      const nextOpts = {
+        maxRuns,
+        runs: runs + 1,
+        min: Math.min(max, min * BACKOFF_MULTIPLIER),
+        max,
+        isCancelled: opts.isCancelled
+      };
+      return tryWithBackoff(fn, nextOpts);
     }
-  });
+  };
+  const promise = run();
   promise.cancel = () => {
     cancelled = true;
   };
@@ -585,16 +583,13 @@ async function onRunLog(context, events) {
     };
     return sendEvent(context, RUN_LOG_BATCH, payload);
   } else {
-    return new Promise(async (resolve) => {
-      for (const log of logs) {
-        const payload = {
-          run_id: `${state.plan.id}`,
-          ...log
-        };
-        await sendEvent(context, RUN_LOG, payload);
-      }
-      resolve();
-    });
+    for (const log of logs) {
+      const payload = {
+        run_id: `${state.plan.id}`,
+        ...log
+      };
+      await sendEvent(context, RUN_LOG, payload);
+    }
   }
 }
 

package/dist/start.js

@@ -189,13 +189,12 @@ var destroy = async (app, logger2) => {
         resolve5();
       });
     }),
-    new Promise(async (resolve5) => {
+    (async () => {
       await waitForRunsAndClaims(app, logger2);
       app.queueChannel?.leave();
       await app.engine.destroy();
       app.socket?.disconnect();
-      resolve5();
-    })
+    })()
   ]);
   logger2.success("Server closed");
 };
@@ -657,36 +656,35 @@ var tryWithBackoff = (fn, opts = {}) => {
   if (!opts.isCancelled) {
     opts.isCancelled = () => cancelled;
   }
-  const promise = new Promise(async (resolve5, reject) => {
+  const run2 = async () => {
     try {
       await fn();
-      resolve5();
     } catch (e) {
       if (e?.abort) {
         cancelled = true;
-        return reject();
+        throw e;
       }
       if (opts.isCancelled()) {
-        return resolve5();
+        return;
       }
       if (!isNaN(maxRuns) && runs >= maxRuns) {
-        return reject(new Error("max runs exceeded"));
+        throw new Error("max runs exceeded");
       }
-      setTimeout(() => {
-        if (opts.isCancelled()) {
-          return resolve5();
-        }
-        const nextOpts = {
-          maxRuns,
-          runs: runs + 1,
-          min: Math.min(max, min * BACKOFF_MULTIPLIER),
-          max,
-          isCancelled: opts.isCancelled
-        };
-        tryWithBackoff(fn, nextOpts).then(resolve5).catch(reject);
-      }, min);
+      await new Promise((resolve5) => setTimeout(resolve5, min));
+      if (opts.isCancelled()) {
+        return;
+      }
+      const nextOpts = {
+        maxRuns,
+        runs: runs + 1,
+        min: Math.min(max, min * BACKOFF_MULTIPLIER),
+        max,
+        isCancelled: opts.isCancelled
+      };
+      return tryWithBackoff(fn, nextOpts);
     }
-  });
+  };
+  const promise = run2();
   promise.cancel = () => {
     cancelled = true;
   };
@@ -734,16 +732,13 @@ async function onRunLog(context, events) {
     };
     return sendEvent(context, RUN_LOG_BATCH, payload);
   } else {
-    return new Promise(async (resolve5) => {
-      for (const log of logs) {
-        const payload = {
-          run_id: `${state.plan.id}`,
-          ...log
-        };
-        await sendEvent(context, RUN_LOG, payload);
-      }
-      resolve5();
-    });
+    for (const log of logs) {
+      const payload = {
+        run_id: `${state.plan.id}`,
+        ...log
+      };
+      await sendEvent(context, RUN_LOG, payload);
+    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/ws-worker",
-  "version": "1.22.0",
+  "version": "1.22.1",
   "description": "A Websocket Worker to connect Lightning to a Runtime Engine",
   "main": "dist/index.js",
   "type": "module",
@@ -23,10 +23,10 @@
     "koa-logger": "^3.2.1",
     "phoenix": "1.7.10",
     "ws": "^8.18.3",
-    "@openfn/engine-multi": "1.10.4",
-    "@openfn/logger": "1.1.1",
+    "@openfn/engine-multi": "1.10.5",
     "@openfn/lexicon": "^1.4.1",
-    "@openfn/runtime": "1.8.4"
+    "@openfn/runtime": "1.8.4",
+    "@openfn/logger": "1.1.1"
   },
   "devDependencies": {
     "@types/koa": "^2.15.0",
@@ -43,7 +43,7 @@
     "tsup": "^6.7.0",
     "typescript": "^4.9.5",
     "yargs": "^17.7.2",
-    "@openfn/lightning-mock": "2.4.5"
+    "@openfn/lightning-mock": "2.4.7"
   },
   "files": [
     "dist",