@openfn/ws-worker 0.7.0 → 0.8.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # ws-worker
 
+## 0.8.0
+
+### Minor Changes
+
+- 7e4c159: Rename attempts to runs
+
+### Patch Changes
+
+- Updated dependencies [7e4c159]
+  - @openfn/engine-multi@0.4.0
+
 ## 0.7.0
 
 ### Minor Changes

package/README.md

@@ -68,7 +68,7 @@ curl -X POST http://localhost:2222/claim
 
 ## Architecture
 
-Lightning is expected to maintain a queue of attempts. The Worker pulls those attempts from the queue, via websocket, and sends them off to the Engine for execution.
+Lightning is expected to maintain a queue of runs. The Worker pulls those runs from the queue, via websocket, and sends them off to the Engine for execution.
 
 While the engine executes it may need to request more information (like credentials and dataclips) and may feedback status (such as logging and runs). The Worker satisifies both these requirements.
 

package/dist/index.d.ts

@@ -42,8 +42,8 @@ interface Edge {
   enabled?: boolean;
 }
 
-// An attempt object returned by Lightning
-type Attempt = {
+// An run object returned by Lightning
+type Run = {
   id: string;
   dataclip_id: string;
   starting_node_id: string;
@@ -52,31 +52,21 @@ type Attempt = {
   jobs: Node[];
   edges: Edge[];
 
-  options?: AttemptOptions;
+  options?: RunOptions;
 };
 
-type AttemptOptions = {
-  // This is what Lightning will ssend us
-  // Note that this is the NEW terminology, so it's the timeout  for the whole "attempt"
-  runTimeout?: number;
-
-  // this is the internal old terminology, which will be deprecated soon
-  attemptTimeoutMs?: number;
-
-  attemptTimeout?: number; // deprecated
-
-  // deprecated alias for timeout. Maps to "attemptTimeout" internally
-  timeout?: number;
+type RunOptions = {
+  runTimeoutMs?: number;
 
   sanitize?: SanitizePolicies;
 };
 
-// Internal server state for each attempt
-type AttemptState = {
+// Internal server state for each run
+type RunState = {
   activeStep?: string;
   activeJob?: string;
   plan: ExecutionPlan;
-  options: AttemptOptions;
+  options: RunOptions;
   dataclips: Record<string, any>;
   // For each run, map the input ids
   // TODO better name maybe?
@@ -107,15 +97,15 @@ declare type ClaimPayload = {
     demand?: number;
 };
 declare type ClaimReply = {
-    attempts: Array<ClaimAttempt>;
+    runs: Array<ClaimRun>;
 };
-declare type ClaimAttempt = {
+declare type ClaimRun = {
     id: string;
     token: string;
 };
-declare const GET_ATTEMPT = "fetch:attempt";
-declare type GetAttemptPayload = void;
-declare type GetAttemptReply = Attempt;
+declare const GET_PLAN = "fetch:plan";
+declare type GetPlanPayload = void;
+declare type GetPlanReply = Run;
 declare const GET_CREDENTIAL = "fetch:credential";
 declare type GetCredentialPayload = {
     id: string;
@@ -126,48 +116,48 @@ declare type GetDataclipPayload = {
     id: string;
 };
 declare type GetDataClipReply = Uint8Array;
-declare const ATTEMPT_START = "attempt:start";
-declare type AttemptStartPayload = void;
-declare type AttemptStartReply = {};
-declare const ATTEMPT_COMPLETE = "attempt:complete";
-declare type AttemptCompletePayload = ExitReason & {
+declare const RUN_START = "run:start";
+declare type RunStartPayload = void;
+declare type RunStartReply = {};
+declare const RUN_COMPLETE = "run:complete";
+declare type RunCompletePayload = ExitReason & {
     final_dataclip_id?: string;
 };
-declare type AttemptCompleteReply = undefined;
-declare const ATTEMPT_LOG = "attempt:log";
-declare type AttemptLogPayload = {
+declare type RunCompleteReply = undefined;
+declare const RUN_LOG = "run:log";
+declare type RunLogPayload = {
     message: Array<string | object>;
     timestamp: string;
-    attempt_id: string;
+    run_id: string;
     level?: string;
     source?: string;
     job_id?: string;
     step_id?: string;
 };
-declare type AttemptLogReply = void;
+declare type RunLogReply = void;
 declare const STEP_START = "step:start";
 declare type StepStartPayload = {
     job_id: string;
     step_id: string;
-    attempt_id?: string;
+    run_id?: string;
     input_dataclip_id?: string;
     versions: Record<string, string>;
 };
 declare type StepStartReply = void;
 declare const STEP_COMPLETE = "step:complete";
 declare type StepCompletePayload = ExitReason & {
-    attempt_id?: string;
+    run_id?: string;
     job_id: string;
     step_id: string;
     output_dataclip?: string;
     output_dataclip_id?: string;
 };
 declare type StepCompleteReply = void;
-declare const INTERNAL_ATTEMPT_COMPLETE = "server:attempt-complete";
+declare const INTERNAL_RUN_COMPLETE = "server:run-complete";
 
 declare type Context = {
     channel: Channel;
-    state: AttemptState;
+    state: RunState;
     logger: Logger;
     engine: RuntimeEngine;
     onFinish: (result: any) => void;
@@ -194,10 +184,10 @@ interface ServerApp extends Koa {
     events: EventEmitter;
     server: Server;
     engine: RuntimeEngine;
-    execute: ({ id, token }: ClaimAttempt) => Promise<void>;
+    execute: ({ id, token }: ClaimRun) => Promise<void>;
     destroy: () => void;
     killWorkloop?: () => void;
 }
 declare function createServer(engine: RuntimeEngine, options?: ServerOptions): ServerApp;
 
-export { ATTEMPT_COMPLETE, ATTEMPT_LOG, ATTEMPT_START, AttemptCompletePayload, AttemptCompleteReply, AttemptLogPayload, AttemptLogReply, AttemptStartPayload, AttemptStartReply, CLAIM, ClaimAttempt, ClaimPayload, ClaimReply, GET_ATTEMPT, GET_CREDENTIAL, GET_DATACLIP, GetAttemptPayload, GetAttemptReply, GetCredentialPayload, GetCredentialReply, GetDataClipReply, GetDataclipPayload, INTERNAL_ATTEMPT_COMPLETE, STEP_COMPLETE, STEP_START, StepCompletePayload, StepCompleteReply, StepStartPayload, StepStartReply, createServer as default };
+export { CLAIM, ClaimPayload, ClaimReply, ClaimRun, GET_CREDENTIAL, GET_DATACLIP, GET_PLAN, GetCredentialPayload, GetCredentialReply, GetDataClipReply, GetDataclipPayload, GetPlanPayload, GetPlanReply, INTERNAL_RUN_COMPLETE, RUN_COMPLETE, RUN_LOG, RUN_START, RunCompletePayload, RunCompleteReply, RunLogPayload, RunLogReply, RunStartPayload, RunStartReply, STEP_COMPLETE, STEP_START, StepCompletePayload, StepCompleteReply, StepStartPayload, StepStartReply, createServer as default };

package/dist/index.js

@@ -9,15 +9,15 @@ import { createMockLogger as createMockLogger2 } from "@openfn/logger";
 
 // src/events.ts
 var CLAIM = "claim";
-var GET_ATTEMPT = "fetch:attempt";
+var GET_PLAN = "fetch:plan";
 var GET_CREDENTIAL = "fetch:credential";
 var GET_DATACLIP = "fetch:dataclip";
-var ATTEMPT_START = "attempt:start";
-var ATTEMPT_COMPLETE = "attempt:complete";
-var ATTEMPT_LOG = "attempt:log";
+var RUN_START = "run:start";
+var RUN_COMPLETE = "run:complete";
+var RUN_LOG = "run:log";
 var STEP_START = "step:start";
 var STEP_COMPLETE = "step:complete";
-var INTERNAL_ATTEMPT_COMPLETE = "server:attempt-complete";
+var INTERNAL_RUN_COMPLETE = "server:run-complete";
 
 // src/api/destroy.ts
 var destroy = async (app, logger) => {
@@ -32,7 +32,7 @@ var destroy = async (app, logger) => {
       });
     }),
     new Promise(async (resolve) => {
-      await waitForAttempts(app, logger);
+      await waitForRuns(app, logger);
       await app.engine.destroy();
       app.socket?.disconnect();
       resolve();
@@ -40,16 +40,16 @@ var destroy = async (app, logger) => {
   ]);
   logger.success("Server closed");
 };
-var waitForAttempts = (app, logger) => new Promise((resolve) => {
+var waitForRuns = (app, logger) => new Promise((resolve) => {
   const log = () => {
     logger.debug(
-      `Waiting for ${Object.keys(app.workflows).length} attempts to complete...`
+      `Waiting for ${Object.keys(app.workflows).length} runs to complete...`
     );
   };
-  const onAttemptComplete = () => {
+  const onRunComplete = () => {
     if (Object.keys(app.workflows).length === 0) {
-      logger.debug("All attempts completed!");
-      app.events.off(INTERNAL_ATTEMPT_COMPLETE, onAttemptComplete);
+      logger.debug("All runs completed!");
+      app.events.off(INTERNAL_RUN_COMPLETE, onRunComplete);
       resolve();
     } else {
       log();
@@ -57,7 +57,7 @@ var waitForAttempts = (app, logger) => new Promise((resolve) => {
   };
   if (Object.keys(app.workflows).length) {
     log();
-    app.events.on(INTERNAL_ATTEMPT_COMPLETE, onAttemptComplete);
+    app.events.on(INTERNAL_RUN_COMPLETE, onRunComplete);
   } else {
     resolve();
   }
@@ -67,7 +67,7 @@ var destroy_default = destroy;
 // src/util/try-with-backoff.ts
 var BACKOFF_MULTIPLIER = 1.15;
 var tryWithBackoff = (fn, opts = {}) => {
-  const { min = 1e3, max = 1e4, maxAttempts, attempts = 1 } = opts;
+  const { min = 1e3, max = 1e4, maxRuns, runs = 1 } = opts;
   let cancelled = false;
   if (!opts.isCancelled) {
     opts.isCancelled = () => cancelled;
@@ -80,16 +80,16 @@ var tryWithBackoff = (fn, opts = {}) => {
       if (opts.isCancelled()) {
         return resolve();
       }
-      if (!isNaN(maxAttempts) && attempts >= maxAttempts) {
-        return reject(new Error("max attempts exceeded"));
+      if (!isNaN(maxRuns) && runs >= maxRuns) {
+        return reject(new Error("max runs exceeded"));
       }
       setTimeout(() => {
         if (opts.isCancelled()) {
           return resolve();
         }
         const nextOpts = {
-          maxAttempts,
-          attempts: attempts + 1,
+          maxRuns,
+          runs: runs + 1,
           min: Math.min(max, min * BACKOFF_MULTIPLIER),
           max,
           isCancelled: opts.isCancelled
@@ -117,15 +117,15 @@ var claim = (app, logger = mockLogger, maxWorkers = 5) => {
     if (!app.queueChannel) {
       return reject(new Error("No websocket available"));
     }
-    logger.debug("requesting attempt...");
-    app.queueChannel.push(CLAIM, { demand: 1 }).receive("ok", ({ attempts }) => {
-      logger.debug(`pulled ${attempts.length} attempts`);
-      if (!attempts?.length) {
-        return reject(new Error("No attempts returned"));
+    logger.debug("requesting run...");
+    app.queueChannel.push(CLAIM, { demand: 1 }).receive("ok", ({ runs }) => {
+      logger.debug(`pulled ${runs.length} runs`);
+      if (!runs?.length) {
+        return reject(new Error("No runs returned"));
       }
-      attempts.forEach((attempt) => {
-        logger.debug("starting attempt", attempt.id);
-        app.execute(attempt);
+      runs.forEach((run) => {
+        logger.debug("starting run", run.id);
+        app.execute(run);
         resolve();
       });
     }).receive("error", () => {
@@ -165,7 +165,7 @@ var startWorkloop = (app, logger, minBackoff, maxBackoff, maxWorkers) => {
 };
 var workloop_default = startWorkloop;
 
-// src/util/convert-attempt.ts
+// src/util/convert-run.ts
 import crypto from "node:crypto";
 var conditions = {
   on_job_success: (upstreamId) => `Boolean(!state?.errors?.["${upstreamId}"] ?? true)`,
@@ -187,28 +187,23 @@ var mapTriggerEdgeCondition = (edge) => {
   return condition;
 };
 var mapOptions = (options) => {
-  const { attemptTimeout, timeout, runTimeout, ...opts } = options;
-  const to = runTimeout || attemptTimeout || timeout;
-  if (to) {
-    opts.attemptTimeoutMs = to;
-  }
-  return opts;
+  return options;
 };
-var convert_attempt_default = (attempt) => {
-  const options = attempt.options || {};
+var convert_run_default = (run) => {
+  const options = run.options || {};
   const plan = {
-    id: attempt.id
+    id: run.id
   };
-  if (attempt.dataclip_id) {
-    plan.initialState = attempt.dataclip_id;
+  if (run.dataclip_id) {
+    plan.initialState = run.dataclip_id;
   }
-  if (attempt.starting_node_id) {
-    plan.start = attempt.starting_node_id;
+  if (run.starting_node_id) {
+    plan.start = run.starting_node_id;
   }
   const nodes = {};
-  const edges = attempt.edges ?? [];
-  if (attempt.triggers?.length) {
-    attempt.triggers.forEach((trigger) => {
+  const edges = run.edges ?? [];
+  if (run.triggers?.length) {
+    run.triggers.forEach((trigger) => {
       const id = trigger.id || "trigger";
       nodes[id] = {
         id
@@ -225,8 +220,8 @@ var convert_attempt_default = (attempt) => {
       }
     });
   }
-  if (attempt.jobs?.length) {
-    attempt.jobs.forEach((job) => {
+  if (run.jobs?.length) {
+    run.jobs.forEach((job) => {
       const id = job.id || crypto.randomUUID();
       nodes[id] = {
         id,
@@ -277,8 +272,8 @@ var stringify_default = (obj) => stringify(obj, (_key, value) => {
   return value;
 });
 
-// src/util/create-attempt-state.ts
-var create_attempt_state_default = (plan, options = {}) => {
+// src/util/create-run-state.ts
+var create_run_state_default = (plan, options = {}) => {
   const state = {
     plan,
     lastDataclipId: "",
@@ -331,7 +326,7 @@ var isLeafNode = (state, job) => {
   const hasDownstream = Object.keys(job.next).find((id) => state.reasons[id]);
   return !hasDownstream;
 };
-var calculateAttemptExitReason = (state) => {
+var calculateRunExitReason = (state) => {
   if (state.plan && state.reasons) {
     const leafJobReasons = state.plan.jobs.filter((job) => isLeafNode(state, job)).map(({ id }) => state.reasons[id]);
     const fail = leafJobReasons.find((r) => r && r.reason === "fail");
@@ -386,7 +381,7 @@ import { timestamp } from "@openfn/logger";
 // package.json
 var package_default = {
   name: "@openfn/ws-worker",
-  version: "0.7.0",
+  version: "0.8.0",
   description: "A Websocket Worker to connect Lightning to a Runtime Engine",
   main: "dist/index.js",
   type: "module",
@@ -526,21 +521,21 @@ ${reason.error_type}: ${reason.error_message || "unknown"}`;
   });
 };
 
-// src/events/attempt-complete.ts
+// src/events/run-complete.ts
 async function onWorkflowComplete(context, _event) {
   const { state, channel, onFinish } = context;
   const result = state.dataclips[state.lastDataclipId];
-  const reason = calculateAttemptExitReason(state);
+  const reason = calculateRunExitReason(state);
   await log_final_reason_default(context, reason);
-  await sendEvent(channel, ATTEMPT_COMPLETE, {
+  await sendEvent(channel, RUN_COMPLETE, {
     final_dataclip_id: state.lastDataclipId,
     ...reason
   });
   onFinish({ reason, state: result });
 }
 
-// src/events/attempt-error.ts
-async function onAttemptError(context, event) {
+// src/events/run-error.ts
+async function onRunError(context, event) {
   const { state, channel, logger, onFinish } = context;
   try {
     const reason = calculateJobExitReason("", { data: {} }, event);
@@ -548,7 +543,7 @@ async function onAttemptError(context, event) {
       await onJobError(context, { error: event });
     }
     await log_final_reason_default(context, reason);
-    await sendEvent(channel, ATTEMPT_COMPLETE, {
+    await sendEvent(channel, RUN_COMPLETE, {
       final_dataclip_id: state.lastDataclipId,
       ...reason
     });
@@ -590,16 +585,16 @@ var throttle_default = createThrottler;
 // src/api/execute.ts
 var enc = new TextDecoder("utf-8");
 var eventMap = {
-  "workflow-start": ATTEMPT_START,
+  "workflow-start": RUN_START,
   "job-start": STEP_START,
   "job-complete": STEP_COMPLETE,
-  "workflow-log": ATTEMPT_LOG,
-  "workflow-complete": ATTEMPT_COMPLETE
+  "workflow-log": RUN_LOG,
+  "workflow-complete": RUN_COMPLETE
 };
 function execute(channel, engine, logger, plan, options = {}, onFinish = (_result) => {
 }) {
   logger.info("executing ", plan.id);
-  const state = create_attempt_state_default(plan, options);
+  const state = create_run_state_default(plan, options);
   const context = { channel, state, logger, engine, onFinish };
   const throttle = throttle_default();
   const addEvent = (eventName, handler) => {
@@ -627,7 +622,7 @@ function execute(channel, engine, logger, plan, options = {}, onFinish = (_resul
     addEvent("job-error", throttle(onJobError)),
     addEvent("workflow-log", throttle(onJobLog)),
     addEvent("workflow-complete", throttle(onWorkflowComplete)),
-    addEvent("workflow-error", throttle(onAttemptError))
+    addEvent("workflow-error", throttle(onRunError))
   );
   engine.listen(plan.id, listeners);
   const resolvers = {
@@ -645,7 +640,7 @@ function execute(channel, engine, logger, plan, options = {}, onFinish = (_resul
     try {
       engine.execute(plan, { resolvers, ...options });
     } catch (e) {
-      onAttemptError(context, {
+      onRunError(context, {
         workflowId: plan.id,
         message: e.message,
         type: e.type,
@@ -669,12 +664,12 @@ function onJobError(context, event) {
   }
 }
 function onWorkflowStart({ channel }, _event) {
-  return sendEvent(channel, ATTEMPT_START);
+  return sendEvent(channel, RUN_START);
 }
 function onJobLog({ channel, state }, event) {
   const timeInMicroseconds = BigInt(event.time) / BigInt(1e3);
   const log = {
-    attempt_id: state.plan.id,
+    run_id: state.plan.id,
     message: event.message,
     source: event.name,
     level: event.level,
@@ -683,7 +678,7 @@ function onJobLog({ channel, state }, event) {
   if (state.activeStep) {
     log.step_id = state.activeStep;
   }
-  return sendEvent(channel, ATTEMPT_LOG, log);
+  return sendEvent(channel, RUN_LOG, log);
 }
 async function loadDataclip(channel, stateId) {
   const result = await get_with_reply_default(channel, GET_DATACLIP, {
@@ -701,19 +696,19 @@ var healthcheck_default = (ctx) => {
   ctx.status = 200;
 };
 
-// src/channels/attempt.ts
-var joinAttemptChannel = (socket, token, attemptId, logger) => {
+// src/channels/run.ts
+var joinRunChannel = (socket, token, runId, logger) => {
   return new Promise((resolve, reject) => {
     let didReceiveOk = false;
-    const channelName = `attempt:${attemptId}`;
+    const channelName = `run:${runId}`;
     logger.debug("connecting to ", channelName);
     const channel = socket.channel(channelName, { token });
     channel.join().receive("ok", async (e) => {
       if (!didReceiveOk) {
         didReceiveOk = true;
         logger.success(`connected to ${channelName}`, e);
-        const { plan, options } = await loadAttempt(channel);
-        logger.debug("converted attempt as execution plan:", plan);
+        const { plan, options } = await loadRun(channel);
+        logger.debug("converted run as execution plan:", plan);
         resolve({ channel, plan, options });
       }
     }).receive("error", (err) => {
@@ -722,10 +717,10 @@ var joinAttemptChannel = (socket, token, attemptId, logger) => {
     });
   });
 };
-var attempt_default = joinAttemptChannel;
-async function loadAttempt(channel) {
-  const attemptBody = await get_with_reply_default(channel, GET_ATTEMPT);
-  return convert_attempt_default(attemptBody);
+var run_default = joinRunChannel;
+async function loadRun(channel) {
+  const runBody = await get_with_reply_default(channel, GET_PLAN);
+  return convert_run_default(runBody);
 }
 
 // src/channels/worker-queue.ts
@@ -741,7 +736,7 @@ var generateWorkerToken = async (secret, workerId, logger) => {
     logger.warn();
     logger.warn("WARNING: Worker Secret not provided!");
     logger.warn(
-      "This worker will attempt to connect to Lightning with default secret"
+      "This worker will try to connect to Lightning with default secret"
     );
     logger.warn();
   }
@@ -865,17 +860,17 @@ function createServer(engine, options = {}) {
     if (app.socket) {
       app.workflows[id] = true;
       const {
-        channel: attemptChannel,
+        channel: runChannel,
         plan,
         options: options2
-      } = await attempt_default(app.socket, token, id, logger);
+      } = await run_default(app.socket, token, id, logger);
       const onFinish = () => {
         delete app.workflows[id];
-        attemptChannel.leave();
-        app.events.emit(INTERNAL_ATTEMPT_COMPLETE);
+        runChannel.leave();
+        app.events.emit(INTERNAL_RUN_COMPLETE);
       };
       const context = execute(
-        attemptChannel,
+        runChannel,
         engine,
         logger,
         plan,
@@ -890,12 +885,12 @@ function createServer(engine, options = {}) {
   router.post("/claim", async (ctx) => {
     logger.info("triggering claim from POST request");
     return claim_default(app, logger, options.maxWorkflows).then(() => {
-      logger.info("claim complete: 1 attempt claimed");
+      logger.info("claim complete: 1 run claimed");
       ctx.body = "complete";
       ctx.status = 200;
     }).catch(() => {
-      logger.info("claim complete: no attempts");
-      ctx.body = "no attempts";
+      logger.info("claim complete: no runs");
+      ctx.body = "no runs";
       ctx.status = 204;
     });
   });
@@ -927,14 +922,14 @@ var server_default = createServer;
 // src/index.ts
 var src_default = server_default;
 export {
-  ATTEMPT_COMPLETE,
-  ATTEMPT_LOG,
-  ATTEMPT_START,
   CLAIM,
-  GET_ATTEMPT,
   GET_CREDENTIAL,
   GET_DATACLIP,
-  INTERNAL_ATTEMPT_COMPLETE,
+  GET_PLAN,
+  INTERNAL_RUN_COMPLETE,
+  RUN_COMPLETE,
+  RUN_LOG,
+  RUN_START,
   STEP_COMPLETE,
   STEP_START,
   src_default as default

package/dist/start.js

@@ -4998,15 +4998,15 @@ import { createMockLogger as createMockLogger2 } from "@openfn/logger";
 
 // src/events.ts
 var CLAIM = "claim";
-var GET_ATTEMPT = "fetch:attempt";
+var GET_PLAN = "fetch:plan";
 var GET_CREDENTIAL = "fetch:credential";
 var GET_DATACLIP = "fetch:dataclip";
-var ATTEMPT_START = "attempt:start";
-var ATTEMPT_COMPLETE = "attempt:complete";
-var ATTEMPT_LOG = "attempt:log";
+var RUN_START = "run:start";
+var RUN_COMPLETE = "run:complete";
+var RUN_LOG = "run:log";
 var STEP_START = "step:start";
 var STEP_COMPLETE = "step:complete";
-var INTERNAL_ATTEMPT_COMPLETE = "server:attempt-complete";
+var INTERNAL_RUN_COMPLETE = "server:run-complete";
 
 // src/api/destroy.ts
 var destroy = async (app, logger2) => {
@@ -5021,7 +5021,7 @@ var destroy = async (app, logger2) => {
       });
     }),
     new Promise(async (resolve5) => {
-      await waitForAttempts(app, logger2);
+      await waitForRuns(app, logger2);
       await app.engine.destroy();
       app.socket?.disconnect();
       resolve5();
@@ -5029,16 +5029,16 @@ var destroy = async (app, logger2) => {
   ]);
   logger2.success("Server closed");
 };
-var waitForAttempts = (app, logger2) => new Promise((resolve5) => {
+var waitForRuns = (app, logger2) => new Promise((resolve5) => {
   const log = () => {
     logger2.debug(
-      `Waiting for ${Object.keys(app.workflows).length} attempts to complete...`
+      `Waiting for ${Object.keys(app.workflows).length} runs to complete...`
     );
   };
-  const onAttemptComplete = () => {
+  const onRunComplete = () => {
     if (Object.keys(app.workflows).length === 0) {
-      logger2.debug("All attempts completed!");
-      app.events.off(INTERNAL_ATTEMPT_COMPLETE, onAttemptComplete);
+      logger2.debug("All runs completed!");
+      app.events.off(INTERNAL_RUN_COMPLETE, onRunComplete);
       resolve5();
     } else {
       log();
@@ -5046,7 +5046,7 @@ var waitForAttempts = (app, logger2) => new Promise((resolve5) => {
   };
   if (Object.keys(app.workflows).length) {
     log();
-    app.events.on(INTERNAL_ATTEMPT_COMPLETE, onAttemptComplete);
+    app.events.on(INTERNAL_RUN_COMPLETE, onRunComplete);
   } else {
     resolve5();
   }
@@ -5056,7 +5056,7 @@ var destroy_default = destroy;
 // src/util/try-with-backoff.ts
 var BACKOFF_MULTIPLIER = 1.15;
 var tryWithBackoff = (fn, opts = {}) => {
-  const { min = 1e3, max = 1e4, maxAttempts, attempts = 1 } = opts;
+  const { min = 1e3, max = 1e4, maxRuns, runs = 1 } = opts;
   let cancelled = false;
   if (!opts.isCancelled) {
     opts.isCancelled = () => cancelled;
@@ -5069,16 +5069,16 @@ var tryWithBackoff = (fn, opts = {}) => {
       if (opts.isCancelled()) {
         return resolve5();
       }
-      if (!isNaN(maxAttempts) && attempts >= maxAttempts) {
-        return reject(new Error("max attempts exceeded"));
+      if (!isNaN(maxRuns) && runs >= maxRuns) {
+        return reject(new Error("max runs exceeded"));
       }
       setTimeout(() => {
         if (opts.isCancelled()) {
           return resolve5();
         }
         const nextOpts = {
-          maxAttempts,
-          attempts: attempts + 1,
+          maxRuns,
+          runs: runs + 1,
           min: Math.min(max, min * BACKOFF_MULTIPLIER),
           max,
           isCancelled: opts.isCancelled
@@ -5106,15 +5106,15 @@ var claim = (app, logger2 = mockLogger, maxWorkers = 5) => {
     if (!app.queueChannel) {
       return reject(new Error("No websocket available"));
     }
-    logger2.debug("requesting attempt...");
-    app.queueChannel.push(CLAIM, { demand: 1 }).receive("ok", ({ attempts }) => {
-      logger2.debug(`pulled ${attempts.length} attempts`);
-      if (!attempts?.length) {
-        return reject(new Error("No attempts returned"));
+    logger2.debug("requesting run...");
+    app.queueChannel.push(CLAIM, { demand: 1 }).receive("ok", ({ runs }) => {
+      logger2.debug(`pulled ${runs.length} runs`);
+      if (!runs?.length) {
+        return reject(new Error("No runs returned"));
       }
-      attempts.forEach((attempt) => {
-        logger2.debug("starting attempt", attempt.id);
-        app.execute(attempt);
+      runs.forEach((run2) => {
+        logger2.debug("starting run", run2.id);
+        app.execute(run2);
         resolve5();
       });
     }).receive("error", () => {
@@ -5154,7 +5154,7 @@ var startWorkloop = (app, logger2, minBackoff2, maxBackoff2, maxWorkers) => {
 };
 var workloop_default = startWorkloop;
 
-// src/util/convert-attempt.ts
+// src/util/convert-run.ts
 import crypto2 from "node:crypto";
 var conditions = {
   on_job_success: (upstreamId) => `Boolean(!state?.errors?.["${upstreamId}"] ?? true)`,
@@ -5176,28 +5176,23 @@ var mapTriggerEdgeCondition = (edge) => {
   return condition;
 };
 var mapOptions = (options) => {
-  const { attemptTimeout, timeout, runTimeout, ...opts } = options;
-  const to = runTimeout || attemptTimeout || timeout;
-  if (to) {
-    opts.attemptTimeoutMs = to;
-  }
-  return opts;
+  return options;
 };
-var convert_attempt_default = (attempt) => {
-  const options = attempt.options || {};
+var convert_run_default = (run2) => {
+  const options = run2.options || {};
   const plan = {
-    id: attempt.id
+    id: run2.id
   };
-  if (attempt.dataclip_id) {
-    plan.initialState = attempt.dataclip_id;
+  if (run2.dataclip_id) {
+    plan.initialState = run2.dataclip_id;
   }
-  if (attempt.starting_node_id) {
-    plan.start = attempt.starting_node_id;
+  if (run2.starting_node_id) {
+    plan.start = run2.starting_node_id;
   }
   const nodes = {};
-  const edges = attempt.edges ?? [];
-  if (attempt.triggers?.length) {
-    attempt.triggers.forEach((trigger) => {
+  const edges = run2.edges ?? [];
+  if (run2.triggers?.length) {
+    run2.triggers.forEach((trigger) => {
       const id = trigger.id || "trigger";
       nodes[id] = {
         id
@@ -5214,8 +5209,8 @@ var convert_attempt_default = (attempt) => {
       }
     });
   }
-  if (attempt.jobs?.length) {
-    attempt.jobs.forEach((job) => {
+  if (run2.jobs?.length) {
+    run2.jobs.forEach((job) => {
       const id = job.id || crypto2.randomUUID();
       nodes[id] = {
         id,
@@ -5266,8 +5261,8 @@ var stringify_default = (obj) => stringify(obj, (_key, value) => {
   return value;
 });
 
-// src/util/create-attempt-state.ts
-var create_attempt_state_default = (plan, options = {}) => {
+// src/util/create-run-state.ts
+var create_run_state_default = (plan, options = {}) => {
   const state = {
     plan,
     lastDataclipId: "",
@@ -5320,7 +5315,7 @@ var isLeafNode = (state, job) => {
   const hasDownstream = Object.keys(job.next).find((id) => state.reasons[id]);
   return !hasDownstream;
 };
-var calculateAttemptExitReason = (state) => {
+var calculateRunExitReason = (state) => {
   if (state.plan && state.reasons) {
     const leafJobReasons = state.plan.jobs.filter((job) => isLeafNode(state, job)).map(({ id }) => state.reasons[id]);
     const fail = leafJobReasons.find((r) => r && r.reason === "fail");
@@ -5375,7 +5370,7 @@ import { timestamp } from "@openfn/logger";
 // package.json
 var package_default = {
   name: "@openfn/ws-worker",
-  version: "0.7.0",
+  version: "0.8.0",
   description: "A Websocket Worker to connect Lightning to a Runtime Engine",
   main: "dist/index.js",
   type: "module",
@@ -5515,21 +5510,21 @@ ${reason.error_type}: ${reason.error_message || "unknown"}`;
   });
 };
 
-// src/events/attempt-complete.ts
+// src/events/run-complete.ts
 async function onWorkflowComplete(context, _event) {
   const { state, channel, onFinish } = context;
   const result = state.dataclips[state.lastDataclipId];
-  const reason = calculateAttemptExitReason(state);
+  const reason = calculateRunExitReason(state);
   await log_final_reason_default(context, reason);
-  await sendEvent(channel, ATTEMPT_COMPLETE, {
+  await sendEvent(channel, RUN_COMPLETE, {
     final_dataclip_id: state.lastDataclipId,
     ...reason
   });
   onFinish({ reason, state: result });
 }
 
-// src/events/attempt-error.ts
-async function onAttemptError(context, event) {
+// src/events/run-error.ts
+async function onRunError(context, event) {
   const { state, channel, logger: logger2, onFinish } = context;
   try {
     const reason = calculateJobExitReason("", { data: {} }, event);
@@ -5537,7 +5532,7 @@ async function onAttemptError(context, event) {
       await onJobError(context, { error: event });
     }
     await log_final_reason_default(context, reason);
-    await sendEvent(channel, ATTEMPT_COMPLETE, {
+    await sendEvent(channel, RUN_COMPLETE, {
       final_dataclip_id: state.lastDataclipId,
       ...reason
     });
@@ -5579,16 +5574,16 @@ var throttle_default = createThrottler;
 // src/api/execute.ts
 var enc = new TextDecoder("utf-8");
 var eventMap = {
-  "workflow-start": ATTEMPT_START,
+  "workflow-start": RUN_START,
   "job-start": STEP_START,
   "job-complete": STEP_COMPLETE,
-  "workflow-log": ATTEMPT_LOG,
-  "workflow-complete": ATTEMPT_COMPLETE
+  "workflow-log": RUN_LOG,
+  "workflow-complete": RUN_COMPLETE
 };
 function execute(channel, engine, logger2, plan, options = {}, onFinish = (_result) => {
 }) {
   logger2.info("executing ", plan.id);
-  const state = create_attempt_state_default(plan, options);
+  const state = create_run_state_default(plan, options);
   const context = { channel, state, logger: logger2, engine, onFinish };
   const throttle = throttle_default();
   const addEvent = (eventName, handler) => {
@@ -5616,7 +5611,7 @@ function execute(channel, engine, logger2, plan, options = {}, onFinish = (_resu
     addEvent("job-error", throttle(onJobError)),
     addEvent("workflow-log", throttle(onJobLog)),
     addEvent("workflow-complete", throttle(onWorkflowComplete)),
-    addEvent("workflow-error", throttle(onAttemptError))
+    addEvent("workflow-error", throttle(onRunError))
   );
   engine.listen(plan.id, listeners);
   const resolvers = {
@@ -5634,7 +5629,7 @@ function execute(channel, engine, logger2, plan, options = {}, onFinish = (_resu
     try {
       engine.execute(plan, { resolvers, ...options });
     } catch (e) {
-      onAttemptError(context, {
+      onRunError(context, {
         workflowId: plan.id,
         message: e.message,
         type: e.type,
@@ -5658,12 +5653,12 @@ function onJobError(context, event) {
   }
 }
 function onWorkflowStart({ channel }, _event) {
-  return sendEvent(channel, ATTEMPT_START);
+  return sendEvent(channel, RUN_START);
 }
 function onJobLog({ channel, state }, event) {
   const timeInMicroseconds = BigInt(event.time) / BigInt(1e3);
   const log = {
-    attempt_id: state.plan.id,
+    run_id: state.plan.id,
     message: event.message,
     source: event.name,
     level: event.level,
@@ -5672,7 +5667,7 @@ function onJobLog({ channel, state }, event) {
   if (state.activeStep) {
     log.step_id = state.activeStep;
   }
-  return sendEvent(channel, ATTEMPT_LOG, log);
+  return sendEvent(channel, RUN_LOG, log);
 }
 async function loadDataclip(channel, stateId) {
   const result = await get_with_reply_default(channel, GET_DATACLIP, {
@@ -5690,19 +5685,19 @@ var healthcheck_default = (ctx) => {
   ctx.status = 200;
 };
 
-// src/channels/attempt.ts
-var joinAttemptChannel = (socket, token, attemptId, logger2) => {
+// src/channels/run.ts
+var joinRunChannel = (socket, token, runId, logger2) => {
   return new Promise((resolve5, reject) => {
     let didReceiveOk = false;
-    const channelName = `attempt:${attemptId}`;
+    const channelName = `run:${runId}`;
     logger2.debug("connecting to ", channelName);
     const channel = socket.channel(channelName, { token });
     channel.join().receive("ok", async (e) => {
       if (!didReceiveOk) {
         didReceiveOk = true;
         logger2.success(`connected to ${channelName}`, e);
-        const { plan, options } = await loadAttempt(channel);
-        logger2.debug("converted attempt as execution plan:", plan);
+        const { plan, options } = await loadRun(channel);
+        logger2.debug("converted run as execution plan:", plan);
         resolve5({ channel, plan, options });
       }
     }).receive("error", (err) => {
@@ -5711,10 +5706,10 @@ var joinAttemptChannel = (socket, token, attemptId, logger2) => {
     });
   });
 };
-var attempt_default = joinAttemptChannel;
-async function loadAttempt(channel) {
-  const attemptBody = await get_with_reply_default(channel, GET_ATTEMPT);
-  return convert_attempt_default(attemptBody);
+var run_default = joinRunChannel;
+async function loadRun(channel) {
+  const runBody = await get_with_reply_default(channel, GET_PLAN);
+  return convert_run_default(runBody);
 }
 
 // src/channels/worker-queue.ts
@@ -5730,7 +5725,7 @@ var generateWorkerToken = async (secret, workerId, logger2) => {
     logger2.warn();
     logger2.warn("WARNING: Worker Secret not provided!");
     logger2.warn(
-      "This worker will attempt to connect to Lightning with default secret"
+      "This worker will try to connect to Lightning with default secret"
     );
     logger2.warn();
   }
@@ -5854,17 +5849,17 @@ function createServer(engine, options = {}) {
     if (app.socket) {
       app.workflows[id] = true;
       const {
-        channel: attemptChannel,
+        channel: runChannel,
         plan,
         options: options2
-      } = await attempt_default(app.socket, token, id, logger2);
+      } = await run_default(app.socket, token, id, logger2);
       const onFinish = () => {
         delete app.workflows[id];
-        attemptChannel.leave();
-        app.events.emit(INTERNAL_ATTEMPT_COMPLETE);
+        runChannel.leave();
+        app.events.emit(INTERNAL_RUN_COMPLETE);
       };
       const context = execute(
-        attemptChannel,
+        runChannel,
         engine,
         logger2,
         plan,
@@ -5879,12 +5874,12 @@ function createServer(engine, options = {}) {
   router.post("/claim", async (ctx) => {
     logger2.info("triggering claim from POST request");
     return claim_default(app, logger2, options.maxWorkflows).then(() => {
-      logger2.info("claim complete: 1 attempt claimed");
+      logger2.info("claim complete: 1 run claimed");
       ctx.body = "complete";
       ctx.status = 200;
     }).catch(() => {
-      logger2.info("claim complete: no attempts");
-      ctx.body = "no attempts";
+      logger2.info("claim complete: no runs");
+      ctx.body = "no runs";
       ctx.status = 204;
     });
   });
@@ -5972,7 +5967,7 @@ var args = yargs_default(hideBin(process.argv)).command("server", "Start a ws-wo
   default: WORKER_MAX_RUN_MEMORY_MB ? parseInt(WORKER_MAX_RUN_MEMORY_MB) : 500
 }).option("max-run-duration-seconds", {
   alias: "t",
-  description: "Default attempt timeout for the server, in seconds. Env: WORKER_MAX_RUN_DURATION_SECONDS",
+  description: "Default run timeout for the server, in seconds. Env: WORKER_MAX_RUN_DURATION_SECONDS",
   type: "number",
   default: WORKER_MAX_RUN_DURATION_SECONDS || 60 * 5
 }).parse();
@@ -6016,7 +6011,7 @@ if (args.mock) {
     memoryLimitMb: args.runMemory,
     maxWorkers: args.capacity,
     statePropsToRemove: args.statePropsToRemove,
-    attemptTimeoutMs: args.maxRunDurationSeconds * 1e3
+    runTimeoutMs: args.maxRunDurationSeconds * 1e3
   };
   logger.debug("Creating runtime engine...");
   logger.debug("Engine options:", engineOptions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/ws-worker",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "A Websocket Worker to connect Lightning to a Runtime Engine",
   "main": "dist/index.js",
   "type": "module",
@@ -22,7 +22,7 @@
     "koa-logger": "^3.2.1",
     "phoenix": "^1.7.7",
     "ws": "^8.14.1",
-    "@openfn/engine-multi": "0.3.0",
+    "@openfn/engine-multi": "0.4.0",
     "@openfn/logger": "0.0.19",
     "@openfn/runtime": "0.2.5"
   },
@@ -41,7 +41,7 @@
     "tsup": "^6.2.3",
     "typescript": "^4.6.4",
     "yargs": "^17.6.2",
-    "@openfn/lightning-mock": "1.1.11"
+    "@openfn/lightning-mock": "1.2.0"
   },
   "files": [
     "dist",