@openfn/ws-worker 0.1.1 → 0.1.3

package/CHANGELOG.md

@@ -1,9 +1,27 @@
 # ws-worker
 
+## 0.1.3
+
+### Patch Changes
+
+- Fix log event mapping
+- Updated dependencies
+  - @openfn/engine-multi@0.1.3
+
+## 0.1.2
+
+### Patch Changes
+
+- f241348: Make destroy async
+- Updated dependencies [d255f32]
+- Updated dependencies [f241348]
+  - @openfn/engine-multi@0.1.2
+
 ## 0.1.1
 
 ### Patch Changes
 
+- Added docker image and bin stub
 - Destroy workers on close
 - Updated dependencies
   - @openfn/engine-multi@0.1.1

package/dist/index.js

@@ -122,6 +122,17 @@ import crypto2 from "node:crypto";
 
 // src/util/convert-attempt.ts
 import crypto from "node:crypto";
+var conditions = {
+  on_job_success: "!state.errors",
+  on_job_failure: "state.errors",
+  always: null
+};
+var mapEdgeCondition = (condition) => {
+  if (condition && condition in conditions) {
+    return conditions[condition];
+  }
+  return condition;
+};
 var convert_attempt_default = (attempt) => {
   const options = attempt.options || {};
   const plan = {
@@ -167,8 +178,9 @@ var convert_attempt_default = (attempt) => {
       }
       const next = edges.filter((e) => e.source_job_id === id).reduce((obj, edge) => {
         const newEdge = {};
-        if (edge.condition) {
-          newEdge.condition = edge.condition;
+        const condition = mapEdgeCondition(edge.condition);
+        if (condition) {
+          newEdge.condition = condition;
         }
         if (edge.enabled === false) {
           newEdge.disabled = true;
@@ -245,7 +257,7 @@ function execute(channel, engine, logger, plan, options = {}) {
       addEvent("workflow-start", onWorkflowStart),
       addEvent("job-start", onJobStart),
       addEvent("job-complete", onJobComplete),
-      addEvent("log", onJobLog),
+      addEvent("workflow-log", onJobLog),
       addEvent("workflow-complete", onWorkflowComplete),
       addEvent("workflow-error", onWorkflowError)
     );
@@ -498,10 +510,10 @@ function createServer(engine, options = {}) {
       ctx.status = 204;
     });
   });
-  app.destroy = () => {
+  app.destroy = async () => {
     logger.info("Closing server...");
     server.close();
-    engine.destroy();
+    await engine.destroy();
     app.killWorkloop?.();
     logger.success("Server closed");
   };

package/dist/start.js

@@ -4913,7 +4913,7 @@ async function createMock() {
       await resolvers.credential?.(configuration);
     }
     const info = (...message) => {
-      dispatch("log", {
+      dispatch("workflow-log", {
         workflowId,
         message,
         level: "info",
@@ -5096,6 +5096,17 @@ import crypto3 from "node:crypto";
 
 // src/util/convert-attempt.ts
 import crypto2 from "node:crypto";
+var conditions = {
+  on_job_success: "!state.errors",
+  on_job_failure: "state.errors",
+  always: null
+};
+var mapEdgeCondition = (condition) => {
+  if (condition && condition in conditions) {
+    return conditions[condition];
+  }
+  return condition;
+};
 var convert_attempt_default = (attempt) => {
   const options = attempt.options || {};
   const plan = {
@@ -5141,8 +5152,9 @@ var convert_attempt_default = (attempt) => {
       }
       const next = edges.filter((e) => e.source_job_id === id).reduce((obj, edge) => {
         const newEdge = {};
-        if (edge.condition) {
-          newEdge.condition = edge.condition;
+        const condition = mapEdgeCondition(edge.condition);
+        if (condition) {
+          newEdge.condition = condition;
         }
         if (edge.enabled === false) {
           newEdge.disabled = true;
@@ -5219,7 +5231,7 @@ function execute(channel, engine, logger2, plan, options = {}) {
       addEvent("workflow-start", onWorkflowStart),
       addEvent("job-start", onJobStart),
       addEvent("job-complete", onJobComplete),
-      addEvent("log", onJobLog),
+      addEvent("workflow-log", onJobLog),
       addEvent("workflow-complete", onWorkflowComplete),
       addEvent("workflow-error", onWorkflowError)
     );
@@ -5472,10 +5484,10 @@ function createServer(engine, options = {}) {
       ctx.status = 204;
     });
   });
-  app.destroy = () => {
+  app.destroy = async () => {
     logger2.info("Closing server...");
     server.close();
-    engine.destroy();
+    await engine.destroy();
     app.killWorkloop?.();
     logger2.success("Server closed");
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/ws-worker",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "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.1",
-    "@openfn/runtime": "0.0.32",
-    "@openfn/logger": "0.0.18"
+    "@openfn/engine-multi": "0.1.3",
+    "@openfn/logger": "0.0.18",
+    "@openfn/runtime": "0.0.32"
   },
   "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.2"
+    "@openfn/lightning-mock": "1.0.4"
   },
   "files": [
     "dist",