@openfn/ws-worker 1.1.6 → 1.1.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ws-worker
 
+## 1.1.7
+
+### Patch Changes
+
+- bdff4b2: Fix an issue where workers may not be returned to the pool if run:complete throws
+
 ## 1.1.6
 
 ### Patch Changes

package/dist/index.js

@@ -29,7 +29,7 @@ var name, version, description, main, type, scripts, bin, author, license, depen
 var init_package = __esm({
   "package.json"() {
     name = "@openfn/ws-worker";
-    version = "1.1.6";
+    version = "1.1.7";
     description = "A Websocket Worker to connect Lightning to a Runtime Engine";
     main = "dist/index.js";
     type = "module";
@@ -233,9 +233,11 @@ var claim = (app, logger = mockLogger, options = {}) => {
     const { maxWorkers = 5 } = options;
     const activeWorkers = Object.keys(app.workflows).length;
     if (activeWorkers >= maxWorkers) {
+      logger.debug("skipping claim attempt: server at capacity");
       return reject(new Error("Server at capacity"));
     }
     if (!app.queueChannel) {
+      logger.debug("skipping claim attempt: websocket unavailable");
       return reject(new Error("No websocket available"));
     }
     logger.debug("requesting run...");
@@ -656,14 +658,21 @@ ${reason.error_type}: ${reason.error_message || "unknown"}`;
 
 // src/events/run-complete.ts
 async function onWorkflowComplete(context, _event) {
-  const { state, channel, onFinish } = context;
+  const { state, channel, onFinish, logger } = context;
   const result = state.dataclips[state.lastDataclipId];
   const reason = calculateRunExitReason(state);
   await log_final_reason_default(context, reason);
-  await sendEvent(channel, RUN_COMPLETE, {
-    final_dataclip_id: state.lastDataclipId,
-    ...reason
-  });
+  try {
+    await sendEvent(channel, RUN_COMPLETE, {
+      final_dataclip_id: state.lastDataclipId,
+      ...reason
+    });
+  } catch (e) {
+    logger.error(
+      `${state.plan.id} failed to send ${RUN_COMPLETE} event. This run will be lost!`
+    );
+    logger.error(e);
+  }
   onFinish({ reason, state: result });
 }
 
@@ -831,6 +840,16 @@ var joinRunChannel = (socket, token, runId, logger) => {
     }).receive("error", (err) => {
       logger.error(`error connecting to ${channelName}`, err);
       reject(err);
+    }).receive("timeout", (err) => {
+      logger.error(`Timeout for ${channelName}`, err);
+      reject(err);
+    });
+    channel.onClose(() => {
+      logger.debug(`Leaving ${channelName}`);
+    });
+    channel.onError((e) => {
+      logger.debug(`Error in ${channelName}`);
+      logger.debug(e);
     });
   });
 };
@@ -997,6 +1016,7 @@ function createServer(engine, options = {}) {
         input
       } = await run_default(app.socket, token, id, logger);
       const onFinish = () => {
+        logger.debug(`workflow ${id} complete: releasing worker`);
         delete app.workflows[id];
         runChannel.leave();
         app.events.emit(INTERNAL_RUN_COMPLETE);

package/dist/start.js

@@ -37,7 +37,7 @@ var name, version, description, main, type, scripts, bin, author, license, depen
 var init_package = __esm({
   "package.json"() {
     name = "@openfn/ws-worker";
-    version = "1.1.6";
+    version = "1.1.7";
     description = "A Websocket Worker to connect Lightning to a Runtime Engine";
     main = "dist/index.js";
     type = "module";
@@ -5224,9 +5224,11 @@ var claim = (app, logger2 = mockLogger, options = {}) => {
     const { maxWorkers = 5 } = options;
     const activeWorkers = Object.keys(app.workflows).length;
     if (activeWorkers >= maxWorkers) {
+      logger2.debug("skipping claim attempt: server at capacity");
       return reject(new Error("Server at capacity"));
     }
     if (!app.queueChannel) {
+      logger2.debug("skipping claim attempt: websocket unavailable");
       return reject(new Error("No websocket available"));
     }
     logger2.debug("requesting run...");
@@ -5647,14 +5649,21 @@ ${reason.error_type}: ${reason.error_message || "unknown"}`;
 
 // src/events/run-complete.ts
 async function onWorkflowComplete(context, _event) {
-  const { state, channel, onFinish } = context;
+  const { state, channel, onFinish, logger: logger2 } = context;
   const result = state.dataclips[state.lastDataclipId];
   const reason = calculateRunExitReason(state);
   await log_final_reason_default(context, reason);
-  await sendEvent(channel, RUN_COMPLETE, {
-    final_dataclip_id: state.lastDataclipId,
-    ...reason
-  });
+  try {
+    await sendEvent(channel, RUN_COMPLETE, {
+      final_dataclip_id: state.lastDataclipId,
+      ...reason
+    });
+  } catch (e) {
+    logger2.error(
+      `${state.plan.id} failed to send ${RUN_COMPLETE} event. This run will be lost!`
+    );
+    logger2.error(e);
+  }
   onFinish({ reason, state: result });
 }
 
@@ -5822,6 +5831,16 @@ var joinRunChannel = (socket, token, runId, logger2) => {
     }).receive("error", (err) => {
       logger2.error(`error connecting to ${channelName}`, err);
       reject(err);
+    }).receive("timeout", (err) => {
+      logger2.error(`Timeout for ${channelName}`, err);
+      reject(err);
+    });
+    channel.onClose(() => {
+      logger2.debug(`Leaving ${channelName}`);
+    });
+    channel.onError((e) => {
+      logger2.debug(`Error in ${channelName}`);
+      logger2.debug(e);
     });
   });
 };
@@ -5988,6 +6007,7 @@ function createServer(engine, options = {}) {
         input
       } = await run_default(app.socket, token, id, logger2);
       const onFinish = () => {
+        logger2.debug(`workflow ${id} complete: releasing worker`);
         delete app.workflows[id];
         runChannel.leave();
         app.events.emit(INTERNAL_RUN_COMPLETE);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/ws-worker",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "A Websocket Worker to connect Lightning to a Runtime Engine",
   "main": "dist/index.js",
   "type": "module",
@@ -23,8 +23,8 @@
     "phoenix": "1.7.10",
     "ws": "^8.14.1",
     "@openfn/engine-multi": "1.1.6",
-    "@openfn/logger": "1.0.1",
     "@openfn/lexicon": "^1.0.1",
+    "@openfn/logger": "1.0.1",
     "@openfn/runtime": "1.1.2"
   },
   "devDependencies": {