@openfn/ws-worker 0.2.2 → 0.2.4

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # ws-worker
 
+## 0.2.4
+
+### Patch Changes
+
+- Updated dependencies [419f276]
+- Updated dependencies [0e66f5a]
+  - @openfn/runtime@0.1.2
+  - @openfn/engine-multi@0.1.9
+
+## 0.2.3
+
+### Patch Changes
+
+- 7d350d9: Only consider leaf nodes when calculating attempt fail reasons
+
 ## 0.2.2
 
 ### Patch Changes

package/dist/index.js

@@ -216,7 +216,7 @@ var stringify_default = (obj) => stringify(obj, (_key, value) => {
 });
 
 // src/api/reasons.ts
-var calculateJobExitReason = (jobId, state, error) => {
+var calculateJobExitReason = (jobId, state = { data: {} }, error) => {
   let reason = "success";
   let error_type = null;
   let error_message = null;
@@ -231,12 +231,14 @@ var calculateJobExitReason = (jobId, state, error) => {
   return { reason, error_type, error_message };
 };
 var calculateAttemptExitReason = (state) => {
-  if (state.reasons) {
-    const fail = Object.values(state.reasons).find(
-      ({ reason }) => reason === "fail"
-    );
-    return fail || { reason: "success", error_type: null, error_message: null };
+  if (state.plan && state.reasons) {
+    const leafJobReasons = state.plan.jobs.filter(({ next }) => !next || Object.keys(next).length == 0).map(({ id }) => state.reasons[id]);
+    const fail = leafJobReasons.find((r) => r && r.reason === "fail");
+    if (fail) {
+      return fail;
+    }
   }
+  return { reason: "success", error_type: null, error_message: null };
 };
 
 // src/api/execute.ts
@@ -339,21 +341,25 @@ function onJobComplete({ channel, state }, event, error) {
   state.lastDataclipId = dataclipId;
   delete state.activeRun;
   delete state.activeJob;
-  const { reason, error_message, error_type } = calculateJobExitReason(
-    job_id,
-    event.state,
-    error
-  );
-  state.reasons[job_id] = { reason, error_message, error_type };
-  return sendEvent(channel, RUN_COMPLETE, {
-    run_id,
-    job_id,
-    output_dataclip_id: dataclipId,
-    output_dataclip: stringify_default(event.state),
-    reason,
-    error_message,
-    error_type
-  });
+  try {
+    const { reason, error_message, error_type } = calculateJobExitReason(
+      job_id,
+      event.state,
+      error
+    );
+    state.reasons[job_id] = { reason, error_message, error_type };
+    return sendEvent(channel, RUN_COMPLETE, {
+      run_id,
+      job_id,
+      output_dataclip_id: dataclipId,
+      output_dataclip: stringify_default(event.state),
+      reason,
+      error_message,
+      error_type
+    });
+  } catch (e) {
+    console.log(e);
+  }
 }
 function onWorkflowStart({ channel }, _event) {
   return sendEvent(channel, ATTEMPT_START);

package/dist/start.js

@@ -5198,7 +5198,7 @@ var stringify_default = (obj) => stringify(obj, (_key, value) => {
 });
 
 // src/api/reasons.ts
-var calculateJobExitReason = (jobId, state, error) => {
+var calculateJobExitReason = (jobId, state = { data: {} }, error) => {
   let reason = "success";
   let error_type = null;
   let error_message = null;
@@ -5213,12 +5213,14 @@ var calculateJobExitReason = (jobId, state, error) => {
   return { reason, error_type, error_message };
 };
 var calculateAttemptExitReason = (state) => {
-  if (state.reasons) {
-    const fail = Object.values(state.reasons).find(
-      ({ reason }) => reason === "fail"
-    );
-    return fail || { reason: "success", error_type: null, error_message: null };
+  if (state.plan && state.reasons) {
+    const leafJobReasons = state.plan.jobs.filter(({ next }) => !next || Object.keys(next).length == 0).map(({ id }) => state.reasons[id]);
+    const fail = leafJobReasons.find((r) => r && r.reason === "fail");
+    if (fail) {
+      return fail;
+    }
   }
+  return { reason: "success", error_type: null, error_message: null };
 };
 
 // src/api/execute.ts
@@ -5321,21 +5323,25 @@ function onJobComplete({ channel, state }, event, error) {
   state.lastDataclipId = dataclipId;
   delete state.activeRun;
   delete state.activeJob;
-  const { reason, error_message, error_type } = calculateJobExitReason(
-    job_id,
-    event.state,
-    error
-  );
-  state.reasons[job_id] = { reason, error_message, error_type };
-  return sendEvent(channel, RUN_COMPLETE, {
-    run_id,
-    job_id,
-    output_dataclip_id: dataclipId,
-    output_dataclip: stringify_default(event.state),
-    reason,
-    error_message,
-    error_type
-  });
+  try {
+    const { reason, error_message, error_type } = calculateJobExitReason(
+      job_id,
+      event.state,
+      error
+    );
+    state.reasons[job_id] = { reason, error_message, error_type };
+    return sendEvent(channel, RUN_COMPLETE, {
+      run_id,
+      job_id,
+      output_dataclip_id: dataclipId,
+      output_dataclip: stringify_default(event.state),
+      reason,
+      error_message,
+      error_type
+    });
+  } catch (e) {
+    console.log(e);
+  }
 }
 function onWorkflowStart({ channel }, _event) {
   return sendEvent(channel, ATTEMPT_START);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/ws-worker",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "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.8",
+    "@openfn/engine-multi": "0.1.9",
     "@openfn/logger": "0.0.19",
-    "@openfn/runtime": "0.1.1"
+    "@openfn/runtime": "0.1.2"
   },
   "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.9"
+    "@openfn/lightning-mock": "1.0.10"
   },
   "files": [
     "dist",