@openfn/ws-worker 0.2.12 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # ws-worker
 
+## 0.3.0
+
+### Minor Changes
+
+- 419d310: Throttle attempt events to better preserve their sequencing
+
+### Patch Changes
+
+- 598c669: Make edge conditions more stable if state is not passed
+- 6e906a7: Better handling of job-error
+- Updated dependencies [02ab459]
+  - @openfn/runtime@0.2.2
+  - @openfn/engine-multi@0.2.4
+
 ## 0.2.12
 
 ### Patch Changes

package/dist/index.d.ts

@@ -2,8 +2,9 @@ import { EventEmitter } from 'node:events';
 import Koa from 'koa';
 import { SanitizePolicies, Logger } from '@openfn/logger';
 import { Channel as Channel$1 } from 'phoenix';
-import { Server } from 'http';
+import { ExecutionPlan } from '@openfn/runtime';
 import { RuntimeEngine } from '@openfn/engine-multi';
+import { Server } from 'http';
 
 type ExitReasonStrings =
   | 'success'
@@ -23,7 +24,8 @@ type Node = {
   id: string;
   body?: string;
   adaptor?: string;
-  credential_id?: any; // TODO tighten this up, string or object
+  credential?: object;
+  credential_id?: string;
   type?: 'webhook' | 'cron'; // trigger only
   state?: any; // Initial state / defaults
 };
@@ -138,6 +140,7 @@ declare type RunStartPayload = {
     run_id: string;
     attempt_id?: string;
     input_dataclip_id?: string;
+    versions: Record<string, string>;
 };
 declare type RunStartReply = void;
 declare const RUN_COMPLETE = "run:complete";
@@ -155,6 +158,7 @@ declare type Context = {
     channel: Channel;
     state: AttemptState;
     logger: Logger;
+    engine: RuntimeEngine;
     onFinish: (result: any) => void;
 };
 

package/dist/index.js

@@ -165,14 +165,11 @@ var startWorkloop = (app, logger, minBackoff, maxBackoff, maxWorkers) => {
 };
 var workloop_default = startWorkloop;
 
-// src/api/execute.ts
-import crypto2 from "node:crypto";
-
 // src/util/convert-attempt.ts
 import crypto from "node:crypto";
 var conditions = {
-  on_job_success: (upstreamId) => `Boolean(!state.errors?.["${upstreamId}"] ?? true)`,
-  on_job_failure: (upstreamId) => `Boolean(state.errors && state.errors["${upstreamId}"])`,
+  on_job_success: (upstreamId) => `Boolean(!state?.errors?.["${upstreamId}"] ?? true)`,
+  on_job_failure: (upstreamId) => `Boolean(state?.errors && state.errors["${upstreamId}"])`,
   always: (_upstreamId) => null
 };
 var mapEdgeCondition = (edge) => {
@@ -219,7 +216,7 @@ var convert_attempt_default = (attempt) => {
       const id = job.id || crypto.randomUUID();
       nodes[id] = {
         id,
-        configuration: job.credential_id,
+        configuration: job.credential || job.credential_id,
         expression: job.body,
         adaptor: job.adaptor
       };
@@ -328,6 +325,203 @@ var calculateAttemptExitReason = (state) => {
   return { reason: "success", error_type: null, error_message: null };
 };
 
+// src/events/run-complete.ts
+import crypto2 from "node:crypto";
+function onRunComplete({ channel, state }, event, error) {
+  const dataclipId = crypto2.randomUUID();
+  const run_id = state.activeRun;
+  const job_id = state.activeJob;
+  if (!state.dataclips) {
+    state.dataclips = {};
+  }
+  const outputState = event.state || {};
+  state.dataclips[dataclipId] = event.state;
+  delete state.activeRun;
+  delete state.activeJob;
+  state.lastDataclipId = dataclipId;
+  event.next?.forEach((nextJobId) => {
+    state.inputDataclips[nextJobId] = dataclipId;
+  });
+  const { reason, error_message, error_type } = calculateJobExitReason(
+    job_id,
+    event.state,
+    error
+  );
+  state.reasons[job_id] = { reason, error_message, error_type };
+  const evt = {
+    run_id,
+    job_id,
+    output_dataclip_id: dataclipId,
+    output_dataclip: stringify_default(outputState),
+    reason,
+    error_message,
+    error_type,
+    mem: event.mem,
+    duration: event.duration,
+    thread_id: event.threadId
+  };
+  return sendEvent(channel, RUN_COMPLETE, evt);
+}
+
+// src/events/run-start.ts
+import crypto3 from "node:crypto";
+import { timestamp } from "@openfn/logger";
+
+// package.json
+var package_default = {
+  name: "@openfn/ws-worker",
+  version: "0.3.0",
+  description: "A Websocket Worker to connect Lightning to a Runtime Engine",
+  main: "dist/index.js",
+  type: "module",
+  scripts: {
+    test: "pnpm ava --serial",
+    "test:types": "pnpm tsc --noEmit --project tsconfig.json",
+    build: "tsup --config tsup.config.js",
+    "build:watch": "pnpm build --watch",
+    start: "ts-node-esm --transpile-only src/start.ts",
+    "start:prod": "node dist/start.js",
+    "start:watch": "nodemon -e ts,js --watch ../runtime-manager/dist --watch ./src --exec 'pnpm start'",
+    pack: "pnpm pack --pack-destination ../../dist"
+  },
+  bin: {
+    worker: "dist/start.js"
+  },
+  author: "Open Function Group <admin@openfn.org>",
+  license: "ISC",
+  dependencies: {
+    "@koa/router": "^12.0.0",
+    "@openfn/engine-multi": "workspace:*",
+    "@openfn/logger": "workspace:*",
+    "@openfn/runtime": "workspace:*",
+    "@types/koa-logger": "^3.1.2",
+    "@types/ws": "^8.5.6",
+    "fast-safe-stringify": "^2.1.1",
+    figures: "^5.0.0",
+    "human-id": "^4.1.0",
+    jose: "^4.14.6",
+    koa: "^2.13.4",
+    "koa-bodyparser": "^4.4.0",
+    "koa-logger": "^3.2.1",
+    phoenix: "^1.7.7",
+    ws: "^8.14.1"
+  },
+  devDependencies: {
+    "@openfn/lightning-mock": "workspace:*",
+    "@types/koa": "^2.13.5",
+    "@types/koa-bodyparser": "^4.3.10",
+    "@types/koa__router": "^12.0.1",
+    "@types/node": "^18.15.3",
+    "@types/nodemon": "1.19.3",
+    "@types/phoenix": "^1.6.2",
+    "@types/yargs": "^17.0.12",
+    ava: "5.1.0",
+    nodemon: "3.0.1",
+    "ts-node": "^10.9.1",
+    tslib: "^2.4.0",
+    tsup: "^6.2.3",
+    typescript: "^4.6.4",
+    yargs: "^17.6.2"
+  },
+  files: [
+    "dist",
+    "README.md",
+    "CHANGELOG.md"
+  ]
+};
+
+// src/util/versions.ts
+import { mainSymbols } from "figures";
+var { triangleRightSmall: t } = mainSymbols;
+var versions_default = (runId, versions, adaptor) => {
+  let longest = "compiler".length;
+  for (const v in versions) {
+    longest = Math.max(v.length, longest);
+  }
+  const { node, compiler, engine, worker, runtime, ...adaptors } = versions;
+  const prefix = (str2) => `    ${t} ${str2.padEnd(longest + 4, " ")}`;
+  let str = `Versions for run ${runId}:
+${prefix("node.js")}${versions.node || "unknown"}
+${prefix("worker")}${versions.worker || "unknown"}
+${prefix("engine")}${versions.engine || "unknown"}
+${prefix("runtime")}${versions.runtime || "unknown"}
+${prefix("compiler")}${versions.compiler || "unknown"}`;
+  if (Object.keys(adaptors).length) {
+    let allAdaptors = Object.keys(adaptors);
+    if (adaptor) {
+      allAdaptors = allAdaptors.filter((name) => adaptor.startsWith(name));
+    }
+    str += "\n" + allAdaptors.sort().map((adaptorName) => `${prefix(adaptorName)}${adaptors[adaptorName]}`).join("\n");
+  }
+  return str;
+};
+
+// src/events/run-start.ts
+async function onRunStart(context, event) {
+  const time = (timestamp() - BigInt(1e7)).toString();
+  const { channel, state } = context;
+  state.activeRun = crypto3.randomUUID();
+  state.activeJob = event.jobId;
+  const job = state.plan.jobs.find(({ id }) => id === event.jobId);
+  const input_dataclip_id = state.inputDataclips[event.jobId];
+  const versions = {
+    worker: package_default.version,
+    ...event.versions
+  };
+  const versionLogContext = {
+    ...context,
+    state: {
+      ...state,
+      activeRun: state.activeRun
+    }
+  };
+  await sendEvent(channel, RUN_START, {
+    run_id: state.activeRun,
+    job_id: state.activeJob,
+    input_dataclip_id,
+    versions
+  });
+  const versionMessage = versions_default(
+    versionLogContext.state.activeRun,
+    versions,
+    job?.adaptor
+  );
+  await onJobLog(versionLogContext, {
+    time,
+    message: [versionMessage],
+    level: "info",
+    name: "VER"
+  });
+  return;
+}
+
+// src/util/throttle.ts
+var createThrottler = () => {
+  const q = [];
+  let activePromise;
+  const add = (fn) => {
+    return (...args) => new Promise((resolve, reject) => {
+      q.push({ fn, args, resolve, reject });
+      shift();
+    });
+  };
+  const shift = () => {
+    if (activePromise) {
+      return;
+    }
+    const next = q.shift();
+    if (next) {
+      const { fn, args, resolve, reject } = next;
+      activePromise = fn(...args).then(resolve).catch(reject).finally(() => {
+        activePromise = void 0;
+        shift();
+      });
+    }
+  };
+  return add;
+};
+var throttle_default = createThrottler;
+
 // src/api/execute.ts
 var enc = new TextDecoder("utf-8");
 var eventMap = {
@@ -341,7 +535,8 @@ function execute(channel, engine, logger, plan, options = {}, onFinish = (_resul
 }) {
   logger.info("executing ", plan.id);
   const state = create_attempt_state_default(plan, options);
-  const context = { channel, state, logger, onFinish };
+  const context = { channel, state, logger, engine, onFinish };
+  const throttle = throttle_default();
   const addEvent = (eventName, handler) => {
     const wrappedFn = async (event) => {
       const lightningEvent = eventMap[eventName] ?? eventName;
@@ -361,13 +556,13 @@ function execute(channel, engine, logger, plan, options = {}, onFinish = (_resul
   };
   const listeners = Object.assign(
     {},
-    addEvent("workflow-start", onWorkflowStart),
-    addEvent("job-start", onJobStart),
-    addEvent("job-complete", onJobComplete),
-    addEvent("job-error", onJobError),
-    addEvent("workflow-log", onJobLog),
-    addEvent("workflow-complete", onWorkflowComplete),
-    addEvent("workflow-error", onWorkflowError)
+    addEvent("workflow-start", throttle(onWorkflowStart)),
+    addEvent("job-start", throttle(onRunStart)),
+    addEvent("job-complete", throttle(onRunComplete)),
+    addEvent("job-error", throttle(onJobError)),
+    addEvent("workflow-log", throttle(onJobLog)),
+    addEvent("workflow-complete", throttle(onWorkflowComplete)),
+    addEvent("workflow-error", throttle(onWorkflowError))
   );
   engine.listen(plan.id, listeners);
   const resolvers = {
@@ -396,59 +591,17 @@ function execute(channel, engine, logger, plan, options = {}, onFinish = (_resul
   return context;
 }
 var sendEvent = (channel, event, payload) => new Promise((resolve, reject) => {
-  channel.push(event, payload).receive("error", reject).receive("timeout", () => reject(new Error("timeout"))).receive("ok", resolve);
+  channel.push(event, payload).receive("error", reject).receive("timeout", () => {
+    reject(new Error("timeout"));
+  }).receive("ok", resolve);
 });
-function onJobStart({ channel, state }, event) {
-  state.activeRun = crypto2.randomUUID();
-  state.activeJob = event.jobId;
-  const input_dataclip_id = state.inputDataclips[event.jobId];
-  return sendEvent(channel, RUN_START, {
-    run_id: state.activeRun,
-    job_id: state.activeJob,
-    input_dataclip_id
-  });
-}
 function onJobError(context, event) {
-  const { state = {}, error, jobId } = event;
-  if (state.errors?.[jobId]?.message === error.message) {
-    onJobComplete(context, event);
+  const { state, error, jobId } = event;
+  if (state?.errors?.[jobId]?.message === error.message) {
+    return onRunComplete(context, event);
   } else {
-    onJobComplete(context, event, event.error);
-  }
-}
-function onJobComplete({ channel, state }, event, error) {
-  const dataclipId = crypto2.randomUUID();
-  const run_id = state.activeRun;
-  const job_id = state.activeJob;
-  if (!state.dataclips) {
-    state.dataclips = {};
+    return onRunComplete(context, event, event.error);
   }
-  state.dataclips[dataclipId] = event.state;
-  delete state.activeRun;
-  delete state.activeJob;
-  state.lastDataclipId = dataclipId;
-  event.next?.forEach((nextJobId) => {
-    state.inputDataclips[nextJobId] = dataclipId;
-  });
-  const { reason, error_message, error_type } = calculateJobExitReason(
-    job_id,
-    event.state,
-    error
-  );
-  state.reasons[job_id] = { reason, error_message, error_type };
-  const evt = {
-    run_id,
-    job_id,
-    output_dataclip_id: dataclipId,
-    output_dataclip: stringify_default(event.state),
-    reason,
-    error_message,
-    error_type,
-    mem: event.mem,
-    duration: event.duration,
-    thread_id: event.threadId
-  };
-  return sendEvent(channel, RUN_COMPLETE, evt);
 }
 function onWorkflowStart({ channel }, _event) {
   return sendEvent(channel, ATTEMPT_START);

package/dist/start.js

@@ -5151,14 +5151,11 @@ var startWorkloop = (app, logger2, minBackoff2, maxBackoff2, maxWorkers) => {
 };
 var workloop_default = startWorkloop;
 
-// src/api/execute.ts
-import crypto3 from "node:crypto";
-
 // src/util/convert-attempt.ts
 import crypto2 from "node:crypto";
 var conditions = {
-  on_job_success: (upstreamId) => `Boolean(!state.errors?.["${upstreamId}"] ?? true)`,
-  on_job_failure: (upstreamId) => `Boolean(state.errors && state.errors["${upstreamId}"])`,
+  on_job_success: (upstreamId) => `Boolean(!state?.errors?.["${upstreamId}"] ?? true)`,
+  on_job_failure: (upstreamId) => `Boolean(state?.errors && state.errors["${upstreamId}"])`,
   always: (_upstreamId) => null
 };
 var mapEdgeCondition = (edge) => {
@@ -5205,7 +5202,7 @@ var convert_attempt_default = (attempt) => {
       const id = job.id || crypto2.randomUUID();
       nodes[id] = {
         id,
-        configuration: job.credential_id,
+        configuration: job.credential || job.credential_id,
         expression: job.body,
         adaptor: job.adaptor
       };
@@ -5314,6 +5311,203 @@ var calculateAttemptExitReason = (state) => {
   return { reason: "success", error_type: null, error_message: null };
 };
 
+// src/events/run-complete.ts
+import crypto3 from "node:crypto";
+function onRunComplete({ channel, state }, event, error) {
+  const dataclipId = crypto3.randomUUID();
+  const run_id = state.activeRun;
+  const job_id = state.activeJob;
+  if (!state.dataclips) {
+    state.dataclips = {};
+  }
+  const outputState = event.state || {};
+  state.dataclips[dataclipId] = event.state;
+  delete state.activeRun;
+  delete state.activeJob;
+  state.lastDataclipId = dataclipId;
+  event.next?.forEach((nextJobId) => {
+    state.inputDataclips[nextJobId] = dataclipId;
+  });
+  const { reason, error_message, error_type } = calculateJobExitReason(
+    job_id,
+    event.state,
+    error
+  );
+  state.reasons[job_id] = { reason, error_message, error_type };
+  const evt = {
+    run_id,
+    job_id,
+    output_dataclip_id: dataclipId,
+    output_dataclip: stringify_default(outputState),
+    reason,
+    error_message,
+    error_type,
+    mem: event.mem,
+    duration: event.duration,
+    thread_id: event.threadId
+  };
+  return sendEvent(channel, RUN_COMPLETE, evt);
+}
+
+// src/events/run-start.ts
+import crypto4 from "node:crypto";
+import { timestamp } from "@openfn/logger";
+
+// package.json
+var package_default = {
+  name: "@openfn/ws-worker",
+  version: "0.3.0",
+  description: "A Websocket Worker to connect Lightning to a Runtime Engine",
+  main: "dist/index.js",
+  type: "module",
+  scripts: {
+    test: "pnpm ava --serial",
+    "test:types": "pnpm tsc --noEmit --project tsconfig.json",
+    build: "tsup --config tsup.config.js",
+    "build:watch": "pnpm build --watch",
+    start: "ts-node-esm --transpile-only src/start.ts",
+    "start:prod": "node dist/start.js",
+    "start:watch": "nodemon -e ts,js --watch ../runtime-manager/dist --watch ./src --exec 'pnpm start'",
+    pack: "pnpm pack --pack-destination ../../dist"
+  },
+  bin: {
+    worker: "dist/start.js"
+  },
+  author: "Open Function Group <admin@openfn.org>",
+  license: "ISC",
+  dependencies: {
+    "@koa/router": "^12.0.0",
+    "@openfn/engine-multi": "workspace:*",
+    "@openfn/logger": "workspace:*",
+    "@openfn/runtime": "workspace:*",
+    "@types/koa-logger": "^3.1.2",
+    "@types/ws": "^8.5.6",
+    "fast-safe-stringify": "^2.1.1",
+    figures: "^5.0.0",
+    "human-id": "^4.1.0",
+    jose: "^4.14.6",
+    koa: "^2.13.4",
+    "koa-bodyparser": "^4.4.0",
+    "koa-logger": "^3.2.1",
+    phoenix: "^1.7.7",
+    ws: "^8.14.1"
+  },
+  devDependencies: {
+    "@openfn/lightning-mock": "workspace:*",
+    "@types/koa": "^2.13.5",
+    "@types/koa-bodyparser": "^4.3.10",
+    "@types/koa__router": "^12.0.1",
+    "@types/node": "^18.15.3",
+    "@types/nodemon": "1.19.3",
+    "@types/phoenix": "^1.6.2",
+    "@types/yargs": "^17.0.12",
+    ava: "5.1.0",
+    nodemon: "3.0.1",
+    "ts-node": "^10.9.1",
+    tslib: "^2.4.0",
+    tsup: "^6.2.3",
+    typescript: "^4.6.4",
+    yargs: "^17.6.2"
+  },
+  files: [
+    "dist",
+    "README.md",
+    "CHANGELOG.md"
+  ]
+};
+
+// src/util/versions.ts
+import { mainSymbols } from "figures";
+var { triangleRightSmall: t } = mainSymbols;
+var versions_default = (runId, versions, adaptor) => {
+  let longest = "compiler".length;
+  for (const v in versions) {
+    longest = Math.max(v.length, longest);
+  }
+  const { node, compiler, engine, worker, runtime, ...adaptors } = versions;
+  const prefix = (str2) => `    ${t} ${str2.padEnd(longest + 4, " ")}`;
+  let str = `Versions for run ${runId}:
+${prefix("node.js")}${versions.node || "unknown"}
+${prefix("worker")}${versions.worker || "unknown"}
+${prefix("engine")}${versions.engine || "unknown"}
+${prefix("runtime")}${versions.runtime || "unknown"}
+${prefix("compiler")}${versions.compiler || "unknown"}`;
+  if (Object.keys(adaptors).length) {
+    let allAdaptors = Object.keys(adaptors);
+    if (adaptor) {
+      allAdaptors = allAdaptors.filter((name) => adaptor.startsWith(name));
+    }
+    str += "\n" + allAdaptors.sort().map((adaptorName) => `${prefix(adaptorName)}${adaptors[adaptorName]}`).join("\n");
+  }
+  return str;
+};
+
+// src/events/run-start.ts
+async function onRunStart(context, event) {
+  const time = (timestamp() - BigInt(1e7)).toString();
+  const { channel, state } = context;
+  state.activeRun = crypto4.randomUUID();
+  state.activeJob = event.jobId;
+  const job = state.plan.jobs.find(({ id }) => id === event.jobId);
+  const input_dataclip_id = state.inputDataclips[event.jobId];
+  const versions = {
+    worker: package_default.version,
+    ...event.versions
+  };
+  const versionLogContext = {
+    ...context,
+    state: {
+      ...state,
+      activeRun: state.activeRun
+    }
+  };
+  await sendEvent(channel, RUN_START, {
+    run_id: state.activeRun,
+    job_id: state.activeJob,
+    input_dataclip_id,
+    versions
+  });
+  const versionMessage = versions_default(
+    versionLogContext.state.activeRun,
+    versions,
+    job?.adaptor
+  );
+  await onJobLog(versionLogContext, {
+    time,
+    message: [versionMessage],
+    level: "info",
+    name: "VER"
+  });
+  return;
+}
+
+// src/util/throttle.ts
+var createThrottler = () => {
+  const q = [];
+  let activePromise;
+  const add = (fn) => {
+    return (...args2) => new Promise((resolve5, reject) => {
+      q.push({ fn, args: args2, resolve: resolve5, reject });
+      shift();
+    });
+  };
+  const shift = () => {
+    if (activePromise) {
+      return;
+    }
+    const next = q.shift();
+    if (next) {
+      const { fn, args: args2, resolve: resolve5, reject } = next;
+      activePromise = fn(...args2).then(resolve5).catch(reject).finally(() => {
+        activePromise = void 0;
+        shift();
+      });
+    }
+  };
+  return add;
+};
+var throttle_default = createThrottler;
+
 // src/api/execute.ts
 var enc = new TextDecoder("utf-8");
 var eventMap = {
@@ -5327,7 +5521,8 @@ function execute(channel, engine, logger2, plan, options = {}, onFinish = (_resu
 }) {
   logger2.info("executing ", plan.id);
   const state = create_attempt_state_default(plan, options);
-  const context = { channel, state, logger: logger2, onFinish };
+  const context = { channel, state, logger: logger2, engine, onFinish };
+  const throttle = throttle_default();
   const addEvent = (eventName, handler) => {
     const wrappedFn = async (event) => {
       const lightningEvent = eventMap[eventName] ?? eventName;
@@ -5347,13 +5542,13 @@ function execute(channel, engine, logger2, plan, options = {}, onFinish = (_resu
   };
   const listeners = Object.assign(
     {},
-    addEvent("workflow-start", onWorkflowStart),
-    addEvent("job-start", onJobStart),
-    addEvent("job-complete", onJobComplete),
-    addEvent("job-error", onJobError),
-    addEvent("workflow-log", onJobLog),
-    addEvent("workflow-complete", onWorkflowComplete),
-    addEvent("workflow-error", onWorkflowError)
+    addEvent("workflow-start", throttle(onWorkflowStart)),
+    addEvent("job-start", throttle(onRunStart)),
+    addEvent("job-complete", throttle(onRunComplete)),
+    addEvent("job-error", throttle(onJobError)),
+    addEvent("workflow-log", throttle(onJobLog)),
+    addEvent("workflow-complete", throttle(onWorkflowComplete)),
+    addEvent("workflow-error", throttle(onWorkflowError))
   );
   engine.listen(plan.id, listeners);
   const resolvers = {
@@ -5382,60 +5577,18 @@ function execute(channel, engine, logger2, plan, options = {}, onFinish = (_resu
   return context;
 }
 var sendEvent = (channel, event, payload) => new Promise((resolve5, reject) => {
-  channel.push(event, payload).receive("error", reject).receive("timeout", () => reject(new Error("timeout"))).receive("ok", resolve5);
+  channel.push(event, payload).receive("error", reject).receive("timeout", () => {
+    reject(new Error("timeout"));
+  }).receive("ok", resolve5);
 });
-function onJobStart({ channel, state }, event) {
-  state.activeRun = crypto3.randomUUID();
-  state.activeJob = event.jobId;
-  const input_dataclip_id = state.inputDataclips[event.jobId];
-  return sendEvent(channel, RUN_START, {
-    run_id: state.activeRun,
-    job_id: state.activeJob,
-    input_dataclip_id
-  });
-}
 function onJobError(context, event) {
-  const { state = {}, error, jobId } = event;
-  if (state.errors?.[jobId]?.message === error.message) {
-    onJobComplete(context, event);
+  const { state, error, jobId } = event;
+  if (state?.errors?.[jobId]?.message === error.message) {
+    return onRunComplete(context, event);
   } else {
-    onJobComplete(context, event, event.error);
+    return onRunComplete(context, event, event.error);
   }
 }
-function onJobComplete({ channel, state }, event, error) {
-  const dataclipId = crypto3.randomUUID();
-  const run_id = state.activeRun;
-  const job_id = state.activeJob;
-  if (!state.dataclips) {
-    state.dataclips = {};
-  }
-  state.dataclips[dataclipId] = event.state;
-  delete state.activeRun;
-  delete state.activeJob;
-  state.lastDataclipId = dataclipId;
-  event.next?.forEach((nextJobId) => {
-    state.inputDataclips[nextJobId] = dataclipId;
-  });
-  const { reason, error_message, error_type } = calculateJobExitReason(
-    job_id,
-    event.state,
-    error
-  );
-  state.reasons[job_id] = { reason, error_message, error_type };
-  const evt = {
-    run_id,
-    job_id,
-    output_dataclip_id: dataclipId,
-    output_dataclip: stringify_default(event.state),
-    reason,
-    error_message,
-    error_type,
-    mem: event.mem,
-    duration: event.duration,
-    thread_id: event.threadId
-  };
-  return sendEvent(channel, RUN_COMPLETE, evt);
-}
 function onWorkflowStart({ channel }, _event) {
   return sendEvent(channel, ATTEMPT_START);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/ws-worker",
-  "version": "0.2.12",
+  "version": "0.3.0",
   "description": "A Websocket Worker to connect Lightning to a Runtime Engine",
   "main": "dist/index.js",
   "type": "module",
@@ -14,6 +14,7 @@
     "@types/koa-logger": "^3.1.2",
     "@types/ws": "^8.5.6",
     "fast-safe-stringify": "^2.1.1",
+    "figures": "^5.0.0",
     "human-id": "^4.1.0",
     "jose": "^4.14.6",
     "koa": "^2.13.4",
@@ -21,9 +22,9 @@
     "koa-logger": "^3.2.1",
     "phoenix": "^1.7.7",
     "ws": "^8.14.1",
-    "@openfn/engine-multi": "0.2.3",
+    "@openfn/engine-multi": "0.2.4",
     "@openfn/logger": "0.0.19",
-    "@openfn/runtime": "0.2.1"
+    "@openfn/runtime": "0.2.2"
   },
   "devDependencies": {
     "@types/koa": "^2.13.5",
@@ -40,7 +41,7 @@
     "tsup": "^6.2.3",
     "typescript": "^4.6.4",
     "yargs": "^17.6.2",
-    "@openfn/lightning-mock": "1.1.5"
+    "@openfn/lightning-mock": "1.1.6"
   },
   "files": [
     "dist",