@openfn/ws-worker 0.2.6 → 0.2.7

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # ws-worker
 
+## 0.2.7
+
+### Patch Changes
+
+- d542aa9: worker: leave attempt channel when finished working
+- Updated dependencies [793d523]
+- Updated dependencies [857c42b]
+- Updated dependencies [f17fb4a]
+  - @openfn/engine-multi@0.1.11
+  - @openfn/runtime@0.1.4
+
 ## 0.2.6
 
 ### Patch Changes

package/dist/index.d.ts

@@ -64,7 +64,7 @@ declare type Context = {
     channel: Channel;
     state: AttemptState;
     logger: Logger;
-    onComplete: (result: any) => void;
+    onFinish: (result: any) => void;
 };
 
 declare type CLAIM_ATTEMPT = {

package/dist/index.js

@@ -286,11 +286,11 @@ var eventMap = {
   "workflow-log": ATTEMPT_LOG,
   "workflow-complete": ATTEMPT_COMPLETE
 };
-function execute(channel, engine, logger, plan, options = {}, onComplete = (_result) => {
+function execute(channel, engine, logger, plan, options = {}, onFinish = (_result) => {
 }) {
   logger.info("executing ", plan.id);
   const state = create_attempt_state_default(plan, options);
-  const context = { channel, state, logger, onComplete };
+  const context = { channel, state, logger, onFinish };
   const addEvent = (eventName, handler) => {
     const wrappedFn = async (event) => {
       const lightningEvent = eventMap[eventName] ?? eventName;
@@ -337,7 +337,8 @@ function execute(channel, engine, logger, plan, options = {}, onComplete = (_res
       onWorkflowError(context, {
         workflowId: plan.id,
         message: e.message,
-        type: e.type
+        type: e.type,
+        severity: e.severity
       });
     }
   });
@@ -398,22 +399,27 @@ function onJobComplete({ channel, state }, event, error) {
 function onWorkflowStart({ channel }, _event) {
   return sendEvent(channel, ATTEMPT_START);
 }
-async function onWorkflowComplete({ state, channel, onComplete }, _event) {
+async function onWorkflowComplete({ state, channel, onFinish }, _event) {
   const result = state.dataclips[state.lastDataclipId];
   const reason = calculateAttemptExitReason(state);
   await sendEvent(channel, ATTEMPT_COMPLETE, {
     final_dataclip_id: state.lastDataclipId,
     ...reason
   });
-  onComplete({ reason, state: result });
+  onFinish({ reason, state: result });
 }
-async function onWorkflowError({ state, channel, onComplete }, event) {
-  const reason = calculateJobExitReason("", { data: {} }, event);
-  await sendEvent(channel, ATTEMPT_COMPLETE, {
-    final_dataclip_id: state.lastDataclipId,
-    ...reason
-  });
-  onComplete({ reason });
+async function onWorkflowError({ state, channel, logger, onFinish }, event) {
+  try {
+    const reason = calculateJobExitReason("", { data: {} }, event);
+    await sendEvent(channel, ATTEMPT_COMPLETE, {
+      final_dataclip_id: state.lastDataclipId,
+      ...reason
+    });
+    onFinish({ reason });
+  } catch (e) {
+    logger.error("ERROR in workflow-error handler:", e.message);
+    logger.error(e);
+  }
 }
 function onJobLog({ channel, state }, event) {
   const timeInMicroseconds = BigInt(event.time) / BigInt(1e3);
@@ -603,8 +609,9 @@ function createServer(engine, options = {}) {
         plan,
         options: options2
       } = await attempt_default(app.socket, token, id, logger);
-      const onComplete = () => {
+      const onFinish = () => {
         delete app.workflows[id];
+        attemptChannel.leave();
       };
       const context = execute(
         attemptChannel,
@@ -612,7 +619,7 @@ function createServer(engine, options = {}) {
         logger,
         plan,
         options2,
-        onComplete
+        onFinish
       );
       app.workflows[id] = context;
     } else {

package/dist/start.js

@@ -5274,11 +5274,11 @@ var eventMap = {
   "workflow-log": ATTEMPT_LOG,
   "workflow-complete": ATTEMPT_COMPLETE
 };
-function execute(channel, engine, logger2, plan, options = {}, onComplete = (_result) => {
+function execute(channel, engine, logger2, plan, options = {}, onFinish = (_result) => {
 }) {
   logger2.info("executing ", plan.id);
   const state = create_attempt_state_default(plan, options);
-  const context = { channel, state, logger: logger2, onComplete };
+  const context = { channel, state, logger: logger2, onFinish };
   const addEvent = (eventName, handler) => {
     const wrappedFn = async (event) => {
       const lightningEvent = eventMap[eventName] ?? eventName;
@@ -5325,7 +5325,8 @@ function execute(channel, engine, logger2, plan, options = {}, onComplete = (_re
       onWorkflowError(context, {
         workflowId: plan.id,
         message: e.message,
-        type: e.type
+        type: e.type,
+        severity: e.severity
       });
     }
   });
@@ -5386,22 +5387,27 @@ function onJobComplete({ channel, state }, event, error) {
 function onWorkflowStart({ channel }, _event) {
   return sendEvent(channel, ATTEMPT_START);
 }
-async function onWorkflowComplete({ state, channel, onComplete }, _event) {
+async function onWorkflowComplete({ state, channel, onFinish }, _event) {
   const result = state.dataclips[state.lastDataclipId];
   const reason = calculateAttemptExitReason(state);
   await sendEvent(channel, ATTEMPT_COMPLETE, {
     final_dataclip_id: state.lastDataclipId,
     ...reason
   });
-  onComplete({ reason, state: result });
+  onFinish({ reason, state: result });
 }
-async function onWorkflowError({ state, channel, onComplete }, event) {
-  const reason = calculateJobExitReason("", { data: {} }, event);
-  await sendEvent(channel, ATTEMPT_COMPLETE, {
-    final_dataclip_id: state.lastDataclipId,
-    ...reason
-  });
-  onComplete({ reason });
+async function onWorkflowError({ state, channel, logger: logger2, onFinish }, event) {
+  try {
+    const reason = calculateJobExitReason("", { data: {} }, event);
+    await sendEvent(channel, ATTEMPT_COMPLETE, {
+      final_dataclip_id: state.lastDataclipId,
+      ...reason
+    });
+    onFinish({ reason });
+  } catch (e) {
+    logger2.error("ERROR in workflow-error handler:", e.message);
+    logger2.error(e);
+  }
 }
 function onJobLog({ channel, state }, event) {
   const timeInMicroseconds = BigInt(event.time) / BigInt(1e3);
@@ -5591,8 +5597,9 @@ function createServer(engine, options = {}) {
         plan,
         options: options2
       } = await attempt_default(app.socket, token, id, logger2);
-      const onComplete = () => {
+      const onFinish = () => {
         delete app.workflows[id];
+        attemptChannel.leave();
       };
       const context = execute(
         attemptChannel,
@@ -5600,7 +5607,7 @@ function createServer(engine, options = {}) {
         logger2,
         plan,
         options2,
-        onComplete
+        onFinish
       );
       app.workflows[id] = context;
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/ws-worker",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "A Websocket Worker to connect Lightning to a Runtime Engine",
   "main": "dist/index.js",
   "type": "module",
@@ -21,9 +21,9 @@
     "koa-logger": "^3.2.1",
     "phoenix": "^1.7.7",
     "ws": "^8.14.1",
-    "@openfn/engine-multi": "0.1.10",
-    "@openfn/logger": "0.0.19",
-    "@openfn/runtime": "0.1.3"
+    "@openfn/engine-multi": "0.1.11",
+    "@openfn/runtime": "0.1.4",
+    "@openfn/logger": "0.0.19"
   },
   "devDependencies": {
     "@types/koa": "^2.13.5",
@@ -40,7 +40,7 @@
     "tsup": "^6.2.3",
     "typescript": "^4.6.4",
     "yargs": "^17.6.2",
-    "@openfn/lightning-mock": "1.0.11"
+    "@openfn/lightning-mock": "1.0.12"
   },
   "files": [
     "dist",