@openfn/ws-worker 1.8.6 → 1.8.9

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # ws-worker
 
+## 1.8.9
+
+### Patch Changes
+
+- Fix version loading paths
+
+## 1.8.8
+
+### Patch Changes
+
+- Fix version number readout
+
+## 1.8.7
+
+### Patch Changes
+
+- Ensure support for node 18,20 and 22.
+
+  This update ensures compatibility with node 18 LTS, 20 LTS, and 22.12.
+
+  Most of the changes are in the build and test suites and have only minor impact on production code. No issues are anticipated as as result of this change.
+
+  Prior releases may fail on node version >=20.
+
+  Support for node 18 will be removed in late 2025.
+
+- Updated dependencies
+- Updated dependencies [8904af2]
+  - @openfn/engine-multi@1.4.6
+  - @openfn/runtime@1.5.4
+  - @openfn/logger@1.0.3
+  - @openfn/lexicon@1.1.0
+
 ## 1.8.6
 
 ### Patch Changes

package/dist/index.d.ts

@@ -8,7 +8,7 @@ import { ExecutionPlan, Lazy, State } from '@openfn/lexicon';
 import { Channel as Channel$1 } from 'phoenix';
 import { Server } from 'http';
 
-declare type Workloop = {
+type Workloop = {
     stop: (reason?: string) => void;
     isStopped: () => boolean;
 };
@@ -46,12 +46,12 @@ interface Channel extends Channel$1 {
   // join: () => ReceiveHook;
 }
 
-declare type WorkerRunOptions = ExecuteOptions & {
+type WorkerRunOptions = ExecuteOptions & {
     outputDataclips?: boolean;
     payloadLimitMb?: number;
 };
 
-declare type Context = {
+type Context = {
     channel: Channel;
     state: RunState;
     logger: Logger;
@@ -60,7 +60,7 @@ declare type Context = {
     onFinish: (result: any) => void;
 };
 
-declare type ServerOptions = {
+type ServerOptions = {
     maxWorkflows?: number;
     port?: number;
     lightning?: string;
@@ -105,13 +105,13 @@ declare const RUN_LOG = "run:log";
 declare const STEP_START = "step:start";
 declare const STEP_COMPLETE = "step:complete";
 declare const INTERNAL_RUN_COMPLETE = "server:run-complete";
-declare type QueueEvents = {
+type QueueEvents = {
     [CLAIM]: l.ClaimPayload;
 };
-declare type QueueEventReplies = {
+type QueueEventReplies = {
     [CLAIM]: l.ClaimReply;
 };
-declare type RunEvents = {
+type RunEvents = {
     [GET_PLAN]: l.GetPlanPayload;
     [GET_CREDENTIAL]: l.GetCredentialPayload;
     [GET_DATACLIP]: l.GetDataclipPayload;
@@ -121,7 +121,7 @@ declare type RunEvents = {
     [STEP_START]: l.StepStartPayload;
     [STEP_COMPLETE]: l.StepCompletePayload;
 };
-declare type RunReplies = {
+type RunReplies = {
     [GET_PLAN]: l.GetPlanReply;
     [GET_CREDENTIAL]: l.GetCredentialReply;
     [GET_DATACLIP]: l.GetDataClipReply;

package/dist/index.js

@@ -1,110 +1,3 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-};
-var __export = (target, all) => {
-  for (var name2 in all)
-    __defProp(target, name2, { get: all[name2], enumerable: true });
-};
-
-// package.json
-var package_exports = {};
-__export(package_exports, {
-  author: () => author,
-  bin: () => bin,
-  default: () => package_default,
-  dependencies: () => dependencies,
-  description: () => description,
-  devDependencies: () => devDependencies,
-  files: () => files,
-  license: () => license,
-  main: () => main,
-  name: () => name,
-  scripts: () => scripts,
-  type: () => type,
-  version: () => version
-});
-var name, version, description, main, type, scripts, bin, author, license, dependencies, devDependencies, files, package_default;
-var init_package = __esm({
-  "package.json"() {
-    name = "@openfn/ws-worker";
-    version = "1.8.6";
-    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/lexicon": "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.15.9",
-      koa: "^2.13.4",
-      "koa-bodyparser": "^4.4.0",
-      "koa-logger": "^3.2.1",
-      phoenix: "1.7.10",
-      ws: "^8.18.0"
-    };
-    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"
-    ];
-    package_default = {
-      name,
-      version,
-      description,
-      main,
-      type,
-      scripts,
-      bin,
-      author,
-      license,
-      dependencies,
-      devDependencies,
-      files
-    };
-  }
-});
-
 // src/server.ts
 import { EventEmitter as EventEmitter2 } from "node:events";
 import { promisify } from "node:util";
@@ -344,12 +237,12 @@ var convert_lightning_plan_default = (run, options = {}) => {
   const appendLocalVersions = (job) => {
     if (monorepoPath && job.adaptors) {
       for (const adaptor of job.adaptors) {
-        const { name: name2, version: version2 } = getNameAndVersion(adaptor);
+        const { name, version: version2 } = getNameAndVersion(adaptor);
         if (monorepoPath && version2 === "local") {
-          const shortName = name2.replace("@openfn/language-", "");
+          const shortName = name.replace("@openfn/language-", "");
           const localPath = path.resolve(monorepoPath, "packages", shortName);
           job.linker ??= {};
-          job.linker[name2] = {
+          job.linker[name] = {
             path: localPath,
             version: "local"
           };
@@ -548,10 +441,14 @@ var createThrottler = () => {
   const q = [];
   let activePromise;
   const add = (fn) => {
-    return (...args) => new Promise((resolve, reject) => {
-      q.push({ fn, args, resolve, reject });
-      shift();
-    });
+    return (...args) => (
+      // the wrapped function is a deferred promise
+      // that will reject or resolve as usual
+      new Promise((resolve, reject) => {
+        q.push({ fn, args, resolve, reject });
+        shift();
+      })
+    );
   };
   const shift = () => {
     if (activePromise) {
@@ -598,8 +495,31 @@ ${prefix("worker")}${versions.worker || "unknown"}`;
   return str;
 };
 
+// src/util/load-version.ts
+import fs from "fs";
+import path2 from "node:path";
+import { fileURLToPath } from "node:url";
+var version = "";
+function getVersion() {
+  if (!version) {
+    let nextPath = path2.dirname(fileURLToPath(import.meta.url));
+    while (nextPath) {
+      const pkgPath = path2.resolve(nextPath, "package.json");
+      try {
+        fs.statSync(pkgPath);
+        nextPath = pkgPath;
+        break;
+      } catch (e) {
+        nextPath = path2.dirname(nextPath);
+      }
+    }
+    const pkg = JSON.parse(fs.readFileSync(nextPath, "utf-8"));
+    version = pkg.version;
+  }
+  return version;
+}
+
 // src/events/run-start.ts
-init_package();
 async function onRunStart(context, event) {
   const { channel, state, options = {} } = context;
   const time = (timestamp() - BigInt(1e7)).toString();
@@ -611,15 +531,17 @@ async function onRunStart(context, event) {
     }
   };
   const versions = {
-    worker: package_default.version,
+    worker: await getVersion(),
     ...event.versions
   };
   await sendEvent(channel, RUN_START, {
     versions,
+    /// use the engine time in run start
     timestamp: timeInMicroseconds(event.time)
   });
   if ("payloadLimitMb" in options) {
     await onJobLog(versionLogContext, {
+      // use the fake time in the log
       time,
       message: [`Payload limit: ${options.payloadLimitMb}mb`],
       level: "info",
@@ -862,12 +784,16 @@ function execute(channel, engine, logger, plan, input, options = {}, onFinish =
     addEvent("job-complete", throttle(onStepComplete)),
     addEvent("job-error", throttle(onJobError)),
     addEvent("workflow-log", throttle(onJobLog)),
+    // This will also resolve the promise
     addEvent("workflow-complete", throttle(onWorkflowComplete)),
     addEvent("workflow-error", throttle(onRunError))
+    // TODO send autoinstall logs
   );
   engine.listen(plan.id, listeners);
   const resolvers = {
     credential: (id) => loadCredential(channel, id)
+    // TODO not supported right now
+    // dataclip: (id: string) => loadDataclip(channel, id),
   };
   setTimeout(async () => {
     let loadedInput = input;
@@ -1017,11 +943,10 @@ var worker_token_default = generateWorkerToken;
 var connectToWorkerQueue = (endpoint, serverId, secret, timeout = 10, logger, SocketConstructor = PhxSocket) => {
   const events = new EventEmitter();
   worker_token_default(secret, serverId, logger).then(async (token) => {
-    const pkg = await Promise.resolve().then(() => (init_package(), package_exports));
     const params = {
       token,
       api_version: API_VERSION,
-      worker_version: pkg.default.version
+      worker_version: await getVersion()
     };
     const socket = new SocketConstructor(endpoint, {
       params,
@@ -1119,7 +1044,7 @@ async function setupCollections(options, logger) {
       "WARNING: no collections URL provided. Collections service will not be enabled."
     );
     logger.warn(
-      "Pass --collections-version or set WORKER_COLLECTIONS_URL to set the url"
+      "Pass --collections-url or set WORKER_COLLECTIONS_URL to set the url"
     );
     return;
   }

package/dist/start.js

@@ -1,6 +1,4 @@
 #!/usr/bin/env node
-var __defProp = Object.defineProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
 }) : x)(function(x) {
@@ -8,110 +6,6 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
     return require.apply(this, arguments);
   throw new Error('Dynamic require of "' + x + '" is not supported');
 });
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-};
-var __export = (target, all) => {
-  for (var name2 in all)
-    __defProp(target, name2, { get: all[name2], enumerable: true });
-};
-
-// package.json
-var package_exports = {};
-__export(package_exports, {
-  author: () => author,
-  bin: () => bin,
-  default: () => package_default,
-  dependencies: () => dependencies,
-  description: () => description,
-  devDependencies: () => devDependencies,
-  files: () => files,
-  license: () => license,
-  main: () => main,
-  name: () => name,
-  scripts: () => scripts,
-  type: () => type,
-  version: () => version
-});
-var name, version, description, main, type, scripts, bin, author, license, dependencies, devDependencies, files, package_default;
-var init_package = __esm({
-  "package.json"() {
-    name = "@openfn/ws-worker";
-    version = "1.8.6";
-    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/lexicon": "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.15.9",
-      koa: "^2.13.4",
-      "koa-bodyparser": "^4.4.0",
-      "koa-logger": "^3.2.1",
-      phoenix: "1.7.10",
-      ws: "^8.18.0"
-    };
-    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"
-    ];
-    package_default = {
-      name,
-      version,
-      description,
-      main,
-      type,
-      scripts,
-      bin,
-      author,
-      license,
-      dependencies,
-      devDependencies,
-      files
-    };
-  }
-});
 
 // src/start.ts
 import createLogger from "@openfn/logger";
@@ -153,11 +47,11 @@ async function createMock() {
   const activeWorkflows = {};
   const bus = new EventEmitter();
   const listeners = {};
-  const dispatch = (type2, args2) => {
+  const dispatch = (type, args2) => {
     if (args2.workflowId) {
-      listeners[args2.workflowId]?.[type2]?.(args2);
+      listeners[args2.workflowId]?.[type]?.(args2);
     }
-    bus.emit(type2, args2);
+    bus.emit(type, args2);
   };
   const on = (event, fn) => bus.on(event, fn);
   const once = (event, fn) => bus.once(event, fn);
@@ -201,8 +95,8 @@ async function createMock() {
       ...options,
       globals: helpers,
       callbacks: {
-        notify: (name2, payload) => {
-          dispatch(name2, {
+        notify: (name, payload) => {
+          dispatch(name, {
             workflowId: id,
             threadId,
             ...payload
@@ -483,12 +377,12 @@ var convert_lightning_plan_default = (run2, options = {}) => {
   const appendLocalVersions = (job) => {
     if (monorepoPath && job.adaptors) {
       for (const adaptor of job.adaptors) {
-        const { name: name2, version: version2 } = getNameAndVersion(adaptor);
+        const { name, version: version2 } = getNameAndVersion(adaptor);
         if (monorepoPath && version2 === "local") {
-          const shortName = name2.replace("@openfn/language-", "");
+          const shortName = name.replace("@openfn/language-", "");
           const localPath = path.resolve(monorepoPath, "packages", shortName);
           job.linker ??= {};
-          job.linker[name2] = {
+          job.linker[name] = {
             path: localPath,
             version: "local"
           };
@@ -687,10 +581,14 @@ var createThrottler = () => {
   const q = [];
   let activePromise;
   const add = (fn) => {
-    return (...args2) => new Promise((resolve5, reject) => {
-      q.push({ fn, args: args2, resolve: resolve5, reject });
-      shift();
-    });
+    return (...args2) => (
+      // the wrapped function is a deferred promise
+      // that will reject or resolve as usual
+      new Promise((resolve5, reject) => {
+        q.push({ fn, args: args2, resolve: resolve5, reject });
+        shift();
+      })
+    );
   };
   const shift = () => {
     if (activePromise) {
@@ -737,8 +635,31 @@ ${prefix("worker")}${versions.worker || "unknown"}`;
   return str;
 };
 
+// src/util/load-version.ts
+import fs from "fs";
+import path2 from "node:path";
+import { fileURLToPath } from "node:url";
+var version = "";
+function getVersion() {
+  if (!version) {
+    let nextPath = path2.dirname(fileURLToPath(import.meta.url));
+    while (nextPath) {
+      const pkgPath = path2.resolve(nextPath, "package.json");
+      try {
+        fs.statSync(pkgPath);
+        nextPath = pkgPath;
+        break;
+      } catch (e) {
+        nextPath = path2.dirname(nextPath);
+      }
+    }
+    const pkg = JSON.parse(fs.readFileSync(nextPath, "utf-8"));
+    version = pkg.version;
+  }
+  return version;
+}
+
 // src/events/run-start.ts
-init_package();
 async function onRunStart(context, event) {
   const { channel, state, options = {} } = context;
   const time = (timestamp() - BigInt(1e7)).toString();
@@ -750,15 +671,17 @@ async function onRunStart(context, event) {
     }
   };
   const versions = {
-    worker: package_default.version,
+    worker: await getVersion(),
     ...event.versions
   };
   await sendEvent(channel, RUN_START, {
     versions,
+    /// use the engine time in run start
     timestamp: timeInMicroseconds(event.time)
   });
   if ("payloadLimitMb" in options) {
     await onJobLog(versionLogContext, {
+      // use the fake time in the log
       time,
       message: [`Payload limit: ${options.payloadLimitMb}mb`],
       level: "info",
@@ -1001,12 +924,16 @@ function execute(channel, engine, logger2, plan, input, options = {}, onFinish =
     addEvent("job-complete", throttle(onStepComplete)),
     addEvent("job-error", throttle(onJobError)),
     addEvent("workflow-log", throttle(onJobLog)),
+    // This will also resolve the promise
     addEvent("workflow-complete", throttle(onWorkflowComplete)),
     addEvent("workflow-error", throttle(onRunError))
+    // TODO send autoinstall logs
   );
   engine.listen(plan.id, listeners);
   const resolvers = {
     credential: (id) => loadCredential(channel, id)
+    // TODO not supported right now
+    // dataclip: (id: string) => loadDataclip(channel, id),
   };
   setTimeout(async () => {
     let loadedInput = input;
@@ -1156,11 +1083,10 @@ var worker_token_default = generateWorkerToken;
 var connectToWorkerQueue = (endpoint, serverId, secret, timeout = 10, logger2, SocketConstructor = PhxSocket) => {
   const events = new EventEmitter2();
   worker_token_default(secret, serverId, logger2).then(async (token) => {
-    const pkg = await Promise.resolve().then(() => (init_package(), package_exports));
     const params = {
       token,
       api_version: API_VERSION,
-      worker_version: pkg.default.version
+      worker_version: await getVersion()
     };
     const socket = new SocketConstructor(endpoint, {
       params,
@@ -1258,7 +1184,7 @@ async function setupCollections(options, logger2) {
       "WARNING: no collections URL provided. Collections service will not be enabled."
     );
     logger2.warn(
-      "Pass --collections-version or set WORKER_COLLECTIONS_URL to set the url"
+      "Pass --collections-url or set WORKER_COLLECTIONS_URL to set the url"
     );
     return;
   }
@@ -1526,6 +1452,8 @@ var UI = class {
     });
     return lines;
   }
+  // if the full 'source' can render in
+  // the target line, do so.
   renderInline(source, previousLine) {
     const match = source.match(/^ */);
     const leadingWhitespace = match ? match[0].length : 0;
@@ -1696,7 +1624,7 @@ function ui(opts) {
   });
 }
 
-// ../../node_modules/.pnpm/escalade@3.1.1/node_modules/escalade/sync/index.mjs
+// ../../node_modules/.pnpm/escalade@3.2.0/node_modules/escalade/sync/index.mjs
 import { dirname, resolve } from "path";
 import { readdirSync, statSync } from "fs";
 function sync_default(start, callback) {
@@ -1718,7 +1646,7 @@ function sync_default(start, callback) {
 // ../../node_modules/.pnpm/yargs@17.7.2/node_modules/yargs/lib/platform-shims/esm.mjs
 import { inspect } from "util";
 import { readFileSync as readFileSync3 } from "fs";
-import { fileURLToPath } from "url";
+import { fileURLToPath as fileURLToPath2 } from "url";
 
 // ../../node_modules/.pnpm/yargs-parser@21.1.1/node_modules/yargs-parser/build/lib/index.js
 import { format } from "util";
@@ -2567,26 +2495,26 @@ var YargsParser = class {
         return defaultForType(guessType2(key));
       }
     }
-    function defaultForType(type2) {
+    function defaultForType(type) {
       const def = {
         [DefaultValuesForTypeKey.BOOLEAN]: true,
         [DefaultValuesForTypeKey.STRING]: "",
         [DefaultValuesForTypeKey.NUMBER]: void 0,
         [DefaultValuesForTypeKey.ARRAY]: []
       };
-      return def[type2];
+      return def[type];
     }
     function guessType2(key) {
-      let type2 = DefaultValuesForTypeKey.BOOLEAN;
+      let type = DefaultValuesForTypeKey.BOOLEAN;
       if (checkAllAliases(key, flags.strings))
-        type2 = DefaultValuesForTypeKey.STRING;
+        type = DefaultValuesForTypeKey.STRING;
       else if (checkAllAliases(key, flags.numbers))
-        type2 = DefaultValuesForTypeKey.NUMBER;
+        type = DefaultValuesForTypeKey.NUMBER;
       else if (checkAllAliases(key, flags.bools))
-        type2 = DefaultValuesForTypeKey.BOOLEAN;
+        type = DefaultValuesForTypeKey.BOOLEAN;
       else if (checkAllAliases(key, flags.arrays))
-        type2 = DefaultValuesForTypeKey.ARRAY;
-      return type2;
+        type = DefaultValuesForTypeKey.ARRAY;
+      return type;
     }
     function isUndefined(num) {
       return num === void 0;
@@ -2681,11 +2609,13 @@ var parser = new YargsParser({
   format,
   normalize,
   resolve: resolve2,
-  require: (path2) => {
+  // TODO: figure  out a  way to combine ESM and CJS coverage, such  that
+  // we can exercise all the lines below:
+  require: (path3) => {
     if (typeof __require !== "undefined") {
-      return __require(path2);
-    } else if (path2.match(/\.json$/)) {
-      return JSON.parse(readFileSync(path2, "utf8"));
+      return __require(path3);
+    } else if (path3.match(/\.json$/)) {
+      return JSON.parse(readFileSync(path3, "utf8"));
     } else {
       throw Error("only .json config files are supported in ESM");
     }
@@ -2928,7 +2858,7 @@ var REQUIRE_ERROR = "require is not supported by ESM";
 var REQUIRE_DIRECTORY_ERROR = "loading a directory of commands is not supported yet for ESM";
 var __dirname;
 try {
-  __dirname = fileURLToPath(import.meta.url);
+  __dirname = fileURLToPath2(import.meta.url);
 } catch (e) {
   __dirname = process.cwd();
 }
@@ -2960,7 +2890,7 @@ var esm_default = {
   process: {
     argv: () => process.argv,
     cwd: process.cwd,
-    emitWarning: (warning, type2) => process.emitWarning(warning, type2),
+    emitWarning: (warning, type) => process.emitWarning(warning, type),
     execPath: () => process.execPath,
     exit: process.exit,
     nextTick: process.nextTick,
@@ -3058,7 +2988,7 @@ function argsert(arg1, arg2, arg3) {
     parsed.demanded.forEach((demanded) => {
       const arg = args2.shift();
       const observedType = guessType(arg);
-      const matchingTypes = demanded.cmd.filter((type2) => type2 === observedType || type2 === "*");
+      const matchingTypes = demanded.cmd.filter((type) => type === observedType || type === "*");
       if (matchingTypes.length === 0)
         argumentTypeError(observedType, demanded.cmd, position);
       position += 1;
@@ -3068,7 +2998,7 @@ function argsert(arg1, arg2, arg3) {
         return;
       const arg = args2.shift();
       const observedType = guessType(arg);
-      const matchingTypes = optional.cmd.filter((type2) => type2 === observedType || type2 === "*");
+      const matchingTypes = optional.cmd.filter((type) => type === observedType || type === "*");
       if (matchingTypes.length === 0)
         argumentTypeError(observedType, optional.cmd, position);
       position += 1;
@@ -3190,8 +3120,8 @@ function isFunction(arg) {
 function whichModule(exported) {
   if (typeof __require === "undefined")
     return null;
-  for (let i = 0, files2 = Object.keys(__require.cache), mod; i < files2.length; i++) {
-    mod = __require.cache[files2[i]];
+  for (let i = 0, files = Object.keys(__require.cache), mod; i < files.length; i++) {
+    mod = __require.cache[files[i]];
     if (mod.exports === exported)
       return mod;
   }
@@ -3231,7 +3161,7 @@ var CommandInstance = class {
     };
     this.shim.requireDirectory({ require: req, filename: callerFile }, dir, opts);
   }
-  addHandler(cmd, description2, builder, handler, commandMiddleware, deprecated) {
+  addHandler(cmd, description, builder, handler, commandMiddleware, deprecated) {
     let aliases = [];
     const middlewares = commandMiddlewareFactory(commandMiddleware);
     handler = handler || (() => {
@@ -3251,7 +3181,7 @@ var CommandInstance = class {
       this.addHandler(command2, this.extractDesc(cmd), cmd.builder, cmd.handler, cmd.middlewares, cmd.deprecated);
       return;
     } else if (isCommandBuilderDefinition(builder)) {
-      this.addHandler([cmd].concat(aliases), description2, builder.builder, builder.handler, builder.middlewares, builder.deprecated);
+      this.addHandler([cmd].concat(aliases), description, builder.builder, builder.handler, builder.middlewares, builder.deprecated);
       return;
     }
     if (typeof cmd === "string") {
@@ -3275,12 +3205,12 @@ var CommandInstance = class {
       aliases.forEach((alias) => {
         this.aliasMap[alias] = parsedCommand.cmd;
       });
-      if (description2 !== false) {
-        this.usage.command(cmd, description2, isDefault, aliases, deprecated);
+      if (description !== false) {
+        this.usage.command(cmd, description, isDefault, aliases, deprecated);
       }
       this.handlers[parsedCommand.cmd] = {
         original: cmd,
-        description: description2,
+        description,
         handler,
         builder: builder || {},
         middlewares,
@@ -3539,8 +3469,8 @@ var CommandInstance = class {
   commandFromFilename(filename) {
     return this.shim.path.basename(filename, this.shim.path.extname(filename));
   }
-  extractDesc({ describe, description: description2, desc }) {
-    for (const test of [describe, description2, desc]) {
+  extractDesc({ describe, description, desc }) {
+    for (const test of [describe, description, desc]) {
       if (typeof test === "string" || test === false)
         return test;
       assertNotStrictEqual(test, true, this.shim);
@@ -3681,14 +3611,14 @@ function usage(yargs, shim3) {
   };
   let usages = [];
   let usageDisabled = false;
-  self.usage = (msg, description2) => {
+  self.usage = (msg, description) => {
     if (msg === null) {
       usageDisabled = true;
       usages = [];
       return self;
     }
     usageDisabled = false;
-    usages.push([msg, description2 || ""]);
+    usages.push([msg, description || ""]);
     return self;
   };
   self.getUsage = () => {
@@ -3701,18 +3631,18 @@ function usage(yargs, shim3) {
     return __("Positionals:");
   };
   let examples = [];
-  self.example = (cmd, description2) => {
-    examples.push([cmd, description2 || ""]);
+  self.example = (cmd, description) => {
+    examples.push([cmd, description || ""]);
   };
   let commands = [];
-  self.command = function command2(cmd, description2, isDefault, aliases, deprecated = false) {
+  self.command = function command2(cmd, description, isDefault, aliases, deprecated = false) {
     if (isDefault) {
       commands = commands.map((cmdArray) => {
         cmdArray[2] = false;
         return cmdArray;
       });
     }
-    commands.push([cmd, description2 || "", isDefault, aliases, deprecated]);
+    commands.push([cmd, description || "", isDefault, aliases, deprecated]);
   };
   self.getCommands = () => commands;
   let descriptions = {};
@@ -3885,25 +3815,25 @@ function usage(yargs, shim3) {
       normalizedKeys.forEach((key) => {
         const kswitch = switches[key];
         let desc = descriptions[key] || "";
-        let type2 = null;
+        let type = null;
         if (desc.includes(deferY18nLookupPrefix))
           desc = __(desc.substring(deferY18nLookupPrefix.length));
         if (options.boolean.includes(key))
-          type2 = `[${__("boolean")}]`;
+          type = `[${__("boolean")}]`;
         if (options.count.includes(key))
-          type2 = `[${__("count")}]`;
+          type = `[${__("count")}]`;
         if (options.string.includes(key))
-          type2 = `[${__("string")}]`;
+          type = `[${__("string")}]`;
         if (options.normalize.includes(key))
-          type2 = `[${__("string")}]`;
+          type = `[${__("string")}]`;
         if (options.array.includes(key))
-          type2 = `[${__("array")}]`;
+          type = `[${__("array")}]`;
         if (options.number.includes(key))
-          type2 = `[${__("number")}]`;
+          type = `[${__("number")}]`;
         const deprecatedExtra = (deprecated) => typeof deprecated === "string" ? `[${__("deprecated: %s", deprecated)}]` : `[${__("deprecated")}]`;
         const extra = [
           key in deprecatedOptions ? deprecatedExtra(deprecatedOptions[key]) : null,
-          type2,
+          type,
           key in demandedOptions ? `[${__("required")}]` : null,
           options.choices && options.choices[key] ? `[${__("choices:")} ${self.stringifiedValues(options.choices[key])}]` : null,
           defaultString(options.default[key], options.defaultDescription[key])
@@ -4022,8 +3952,8 @@ function usage(yargs, shim3) {
     emit(self.help());
   };
   self.functionDescription = (fn) => {
-    const description2 = fn.name ? shim3.Parser.decamelize(fn.name, "-") : __("generated-value");
-    return ["(", description2, ")"].join("");
+    const description = fn.name ? shim3.Parser.decamelize(fn.name, "-") : __("generated-value");
+    return ["(", description, ")"].join("");
   };
   self.stringifiedValues = function stringifiedValues(values, separator) {
     let string = "";
@@ -4379,10 +4309,10 @@ var Completion = class {
   }
   generateCompletionScript($0, cmd) {
     let script = this.zshShell ? completionZshTemplate : completionShTemplate;
-    const name2 = this.shim.path.basename($0);
+    const name = this.shim.path.basename($0);
     if ($0.match(/\.js$/))
       $0 = `./${$0}`;
-    script = script.replace(/{{app_name}}/g, name2);
+    script = script.replace(/{{app_name}}/g, name);
     script = script.replace(/{{completion_command}}/g, cmd);
     return script.replace(/{{app_path}}/g, $0);
   }
@@ -5063,13 +4993,13 @@ var YargsInstance = class {
       __classPrivateFieldGet(this, _YargsInstance_completion, "f").registerFunction(fn);
     return this;
   }
-  command(cmd, description2, builder, handler, middlewares, deprecated) {
-    argsert("<string|array|object> [string|boolean] [function|object] [function] [array] [boolean|string]", [cmd, description2, builder, handler, middlewares, deprecated], arguments.length);
-    __classPrivateFieldGet(this, _YargsInstance_command, "f").addHandler(cmd, description2, builder, handler, middlewares, deprecated);
+  command(cmd, description, builder, handler, middlewares, deprecated) {
+    argsert("<string|array|object> [string|boolean] [function|object] [function] [array] [boolean|string]", [cmd, description, builder, handler, middlewares, deprecated], arguments.length);
+    __classPrivateFieldGet(this, _YargsInstance_command, "f").addHandler(cmd, description, builder, handler, middlewares, deprecated);
     return this;
   }
-  commands(cmd, description2, builder, handler, middlewares, deprecated) {
-    return this.command(cmd, description2, builder, handler, middlewares, deprecated);
+  commands(cmd, description, builder, handler, middlewares, deprecated) {
+    return this.command(cmd, description, builder, handler, middlewares, deprecated);
   }
   commandDir(dir, opts) {
     argsert("<string> [object]", [dir, opts], arguments.length);
@@ -5154,10 +5084,10 @@ var YargsInstance = class {
     __classPrivateFieldGet(this, _YargsInstance_options, "f").deprecatedOptions[option] = message;
     return this;
   }
-  describe(keys, description2) {
-    argsert("<object|string|array> [string]", [keys, description2], arguments.length);
+  describe(keys, description) {
+    argsert("<object|string|array> [string]", [keys, description], arguments.length);
     this[kSetKey](keys, true);
-    __classPrivateFieldGet(this, _YargsInstance_usage, "f").describe(keys, description2);
+    __classPrivateFieldGet(this, _YargsInstance_usage, "f").describe(keys, description);
     return this;
   }
   detectLocale(detect) {
@@ -5181,12 +5111,12 @@ var YargsInstance = class {
   epilog(msg) {
     return this.epilogue(msg);
   }
-  example(cmd, description2) {
-    argsert("<string|array> [string]", [cmd, description2], arguments.length);
+  example(cmd, description) {
+    argsert("<string|array> [string]", [cmd, description], arguments.length);
     if (Array.isArray(cmd)) {
       cmd.forEach((exampleParams) => this.example(...exampleParams));
     } else {
-      __classPrivateFieldGet(this, _YargsInstance_usage, "f").example(cmd, description2);
+      __classPrivateFieldGet(this, _YargsInstance_usage, "f").example(cmd, description);
     }
     return this;
   }
@@ -5671,12 +5601,12 @@ var YargsInstance = class {
     __classPrivateFieldGet(this, _YargsInstance_shim, "f").y18n.updateLocale(obj);
     return this;
   }
-  usage(msg, description2, builder, handler) {
-    argsert("<string|null|undefined> [string|boolean] [function|object] [function]", [msg, description2, builder, handler], arguments.length);
-    if (description2 !== void 0) {
+  usage(msg, description, builder, handler) {
+    argsert("<string|null|undefined> [string|boolean] [function|object] [function]", [msg, description, builder, handler], arguments.length);
+    if (description !== void 0) {
       assertNotStrictEqual(msg, null, __classPrivateFieldGet(this, _YargsInstance_shim, "f"));
       if ((msg || "").match(/^\$0( |$)/)) {
-        return this.command(msg, description2, builder, handler);
+        return this.command(msg, description, builder, handler);
       } else {
         throw new YError(".usage() description must start with $0 if being used as alias for .command()");
       }
@@ -5767,9 +5697,9 @@ var YargsInstance = class {
     });
     delete __classPrivateFieldGet(this, _YargsInstance_usage, "f").getDescriptions()[optionKey];
   }
-  [kEmitWarning](warning, type2, deduplicationId) {
+  [kEmitWarning](warning, type, deduplicationId) {
     if (!__classPrivateFieldGet(this, _YargsInstance_emittedWarnings, "f")[deduplicationId]) {
-      __classPrivateFieldGet(this, _YargsInstance_shim, "f").process.emitWarning(warning, type2);
+      __classPrivateFieldGet(this, _YargsInstance_shim, "f").process.emitWarning(warning, type);
       __classPrivateFieldGet(this, _YargsInstance_emittedWarnings, "f")[deduplicationId] = true;
     }
   }
@@ -5861,24 +5791,24 @@ var YargsInstance = class {
     __classPrivateFieldGet(this, _YargsInstance_pkgs, "f")[npath] = obj || {};
     return __classPrivateFieldGet(this, _YargsInstance_pkgs, "f")[npath];
   }
-  [kPopulateParserHintArray](type2, keys) {
+  [kPopulateParserHintArray](type, keys) {
     keys = [].concat(keys);
     keys.forEach((key) => {
       key = this[kSanitizeKey](key);
-      __classPrivateFieldGet(this, _YargsInstance_options, "f")[type2].push(key);
+      __classPrivateFieldGet(this, _YargsInstance_options, "f")[type].push(key);
     });
   }
-  [kPopulateParserHintSingleValueDictionary](builder, type2, key, value) {
-    this[kPopulateParserHintDictionary](builder, type2, key, value, (type3, key2, value2) => {
-      __classPrivateFieldGet(this, _YargsInstance_options, "f")[type3][key2] = value2;
+  [kPopulateParserHintSingleValueDictionary](builder, type, key, value) {
+    this[kPopulateParserHintDictionary](builder, type, key, value, (type2, key2, value2) => {
+      __classPrivateFieldGet(this, _YargsInstance_options, "f")[type2][key2] = value2;
     });
   }
-  [kPopulateParserHintArrayDictionary](builder, type2, key, value) {
-    this[kPopulateParserHintDictionary](builder, type2, key, value, (type3, key2, value2) => {
-      __classPrivateFieldGet(this, _YargsInstance_options, "f")[type3][key2] = (__classPrivateFieldGet(this, _YargsInstance_options, "f")[type3][key2] || []).concat(value2);
+  [kPopulateParserHintArrayDictionary](builder, type, key, value) {
+    this[kPopulateParserHintDictionary](builder, type, key, value, (type2, key2, value2) => {
+      __classPrivateFieldGet(this, _YargsInstance_options, "f")[type2][key2] = (__classPrivateFieldGet(this, _YargsInstance_options, "f")[type2][key2] || []).concat(value2);
     });
   }
-  [kPopulateParserHintDictionary](builder, type2, key, value, singleKeyHandler) {
+  [kPopulateParserHintDictionary](builder, type, key, value, singleKeyHandler) {
     if (Array.isArray(key)) {
       key.forEach((k) => {
         builder(k, value);
@@ -5888,7 +5818,7 @@ var YargsInstance = class {
         builder(k, key[k]);
       }
     } else {
-      singleKeyHandler(type2, this[kSanitizeKey](key), value);
+      singleKeyHandler(type, this[kSanitizeKey](key), value);
     }
   }
   [kSanitizeKey](key) {
@@ -6412,6 +6342,7 @@ function engineReady(engine) {
     logger,
     secret: args.secret,
     noLoop: !args.loop,
+    // TODO need to feed this through properly
     backoff: {
       min: minBackoff,
       max: maxBackoff
@@ -6461,16 +6392,43 @@ if (args.mock) {
     engineReady(engine);
   });
 }
-/**
- * @fileoverview Main entrypoint for libraries using yargs-parser in Node.js
- * CJS and ESM environments.
- *
- * @license
- * Copyright (c) 2016, Contributors
- * SPDX-License-Identifier: ISC
- */
-/**
- * @license
- * Copyright (c) 2016, Contributors
- * SPDX-License-Identifier: ISC
- */
+/*! Bundled license information:
+
+yargs-parser/build/lib/string-utils.js:
+  (**
+   * @license
+   * Copyright (c) 2016, Contributors
+   * SPDX-License-Identifier: ISC
+   *)
+
+yargs-parser/build/lib/tokenize-arg-string.js:
+  (**
+   * @license
+   * Copyright (c) 2016, Contributors
+   * SPDX-License-Identifier: ISC
+   *)
+
+yargs-parser/build/lib/yargs-parser-types.js:
+  (**
+   * @license
+   * Copyright (c) 2016, Contributors
+   * SPDX-License-Identifier: ISC
+   *)
+
+yargs-parser/build/lib/yargs-parser.js:
+  (**
+   * @license
+   * Copyright (c) 2016, Contributors
+   * SPDX-License-Identifier: ISC
+   *)
+
+yargs-parser/build/lib/index.js:
+  (**
+   * @fileoverview Main entrypoint for libraries using yargs-parser in Node.js
+   * CJS and ESM environments.
+   *
+   * @license
+   * Copyright (c) 2016, Contributors
+   * SPDX-License-Identifier: ISC
+   *)
+*/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/ws-worker",
-  "version": "1.8.6",
+  "version": "1.8.9",
   "description": "A Websocket Worker to connect Lightning to a Runtime Engine",
   "main": "dist/index.js",
   "type": "module",
@@ -22,10 +22,10 @@
     "koa-logger": "^3.2.1",
     "phoenix": "1.7.10",
     "ws": "^8.18.0",
-    "@openfn/engine-multi": "1.4.5",
+    "@openfn/engine-multi": "1.4.6",
     "@openfn/lexicon": "^1.1.0",
-    "@openfn/logger": "1.0.2",
-    "@openfn/runtime": "1.5.3"
+    "@openfn/logger": "1.0.3",
+    "@openfn/runtime": "1.5.4"
   },
   "devDependencies": {
     "@types/koa": "^2.13.5",
@@ -37,12 +37,11 @@
     "@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",
-    "@openfn/lightning-mock": "2.0.26"
+    "@openfn/lightning-mock": "2.0.27"
   },
   "files": [
     "dist",
@@ -54,7 +53,7 @@
     "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": "node --loader @swc-node/register/esm 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"