@openfn/ws-worker 1.0.0 → 1.1.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # ws-worker
 
+## 1.1.0
+
+Allow runs to use multiple versions of the same adaptor
+
+### Patch Changes
+
+- 58e0d11: Move version log to workflow start
+- Updated dependencies [4f5f1dd]
+- Updated dependencies [58e0d11]
+  - @openfn/engine-multi@1.1.0
+  - @openfn/runtime@1.1.0
+
 ## 1.0.0
 
 ### Major Changes

package/dist/index.js

@@ -29,7 +29,7 @@ var name, version, description, main, type, scripts, bin, author, license, depen
 var init_package = __esm({
   "package.json"() {
     name = "@openfn/ws-worker";
-    version = "1.0.0";
+    version = "1.1.0";
     description = "A Websocket Worker to connect Lightning to a Runtime Engine";
     main = "dist/index.js";
     type = "module";
@@ -497,6 +497,57 @@ var createThrottler = () => {
 };
 var throttle_default = createThrottler;
 
+// src/events/run-start.ts
+import { timestamp } from "@openfn/logger";
+
+// src/util/versions.ts
+import { mainSymbols } from "figures";
+var { triangleRightSmall: t } = mainSymbols;
+var versions_default = (versions) => {
+  let longest = "worker".length;
+  for (const v in versions) {
+    longest = Math.max(v.length, longest);
+  }
+  const { node, worker, compiler, runtime, engine, ...adaptors } = versions;
+  const prefix = (str2) => `    ${t} ${str2.padEnd(longest + 4, " ")}`;
+  let str = `Versions:
+${prefix("node.js")}${versions.node || "unknown"}
+${prefix("worker")}${versions.worker || "unknown"}`;
+  if (Object.keys(adaptors).length) {
+    let allAdaptors = Object.keys(adaptors);
+    str += "\n" + allAdaptors.sort().map(
+      (adaptorName) => `${prefix(adaptorName)}${adaptors[adaptorName].sort().join(", ")}`
+    ).join("\n");
+  }
+  return str;
+};
+
+// src/events/run-start.ts
+init_package();
+async function onRunStart(context, event) {
+  const { channel, state } = context;
+  const time = (timestamp() - BigInt(1e7)).toString();
+  const versionLogContext = {
+    ...context,
+    state: {
+      ...state,
+      activeStep: state.activeStep
+    }
+  };
+  const versions = {
+    worker: package_default.version,
+    ...event.versions
+  };
+  await sendEvent(channel, RUN_START, { versions });
+  const versionMessage = versions_default(versions);
+  await onJobLog(versionLogContext, {
+    time,
+    message: [versionMessage],
+    level: "info",
+    name: "VER"
+  });
+}
+
 // src/events/step-complete.ts
 import crypto3 from "node:crypto";
 
@@ -573,72 +624,17 @@ function onStepComplete({ channel, state, options }, event, error) {
 }
 
 // src/events/step-start.ts
-init_package();
 import crypto4 from "node:crypto";
-import { timestamp } from "@openfn/logger";
-
-// src/util/versions.ts
-import { mainSymbols } from "figures";
-var { triangleRightSmall: t } = mainSymbols;
-var versions_default = (stepId, versions, adaptor) => {
-  let longest = "worker".length;
-  for (const v in versions) {
-    longest = Math.max(v.length, longest);
-  }
-  const { node, worker, ...adaptors } = versions;
-  const prefix = (str2) => `    ${t} ${str2.padEnd(longest + 4, " ")}`;
-  let str = `Versions for step ${stepId}:
-${prefix("node.js")}${versions.node || "unknown"}
-${prefix("worker")}${versions.worker || "unknown"}`;
-  if (Object.keys(adaptors).length) {
-    let allAdaptors = Object.keys(adaptors);
-    if (adaptor) {
-      allAdaptors = allAdaptors.filter((name2) => adaptor.startsWith(name2));
-    }
-    str += "\n" + allAdaptors.sort().map((adaptorName) => `${prefix(adaptorName)}${adaptors[adaptorName]}`).join("\n");
-  }
-  return str;
-};
-
-// src/events/step-start.ts
 async function onStepStart(context, event) {
-  const time = (timestamp() - BigInt(1e7)).toString();
   const { channel, state } = context;
   state.activeStep = crypto4.randomUUID();
   state.activeJob = event.jobId;
-  const job = state.plan.workflow.steps.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,
-      activeStep: state.activeStep
-    }
-  };
   await sendEvent(channel, STEP_START, {
     step_id: state.activeStep,
     job_id: state.activeJob,
-    input_dataclip_id,
-    versions
-  });
-  const versionMessage = versions_default(
-    versionLogContext.state.activeStep,
-    versions,
-    job?.adaptor
-  );
-  await onJobLog(versionLogContext, {
-    time,
-    message: [versionMessage],
-    level: "info",
-    name: "VER"
+    input_dataclip_id
   });
-  return;
 }
 
 // src/util/log-final-reason.ts
@@ -733,7 +729,7 @@ function execute(channel, engine, logger, plan, input, options = {}, onFinish =
   };
   const listeners = Object.assign(
     {},
-    addEvent("workflow-start", throttle(onWorkflowStart)),
+    addEvent("workflow-start", throttle(onRunStart)),
     addEvent("job-start", throttle(onStepStart)),
     addEvent("job-complete", throttle(onStepComplete)),
     addEvent("job-error", throttle(onJobError)),
@@ -787,9 +783,6 @@ function onJobError(context, event) {
     return onStepComplete(context, event, event.error);
   }
 }
-function onWorkflowStart({ channel }, _event) {
-  return sendEvent(channel, RUN_START);
-}
 function onJobLog({ channel, state }, event) {
   const timeInMicroseconds = BigInt(event.time) / BigInt(1e3);
   const log = {

package/dist/start.js

@@ -37,7 +37,7 @@ var name, version, description, main, type, scripts, bin, author, license, depen
 var init_package = __esm({
   "package.json"() {
     name = "@openfn/ws-worker";
-    version = "1.0.0";
+    version = "1.1.0";
     description = "A Websocket Worker to connect Lightning to a Runtime Engine";
     main = "dist/index.js";
     type = "module";
@@ -5042,6 +5042,7 @@ async function createMock() {
           level: "info",
           json: true,
           message: JSON.stringify(args2),
+          name: "JOB",
           time: Date.now()
         });
       }
@@ -5487,6 +5488,57 @@ var createThrottler = () => {
 };
 var throttle_default = createThrottler;
 
+// src/events/run-start.ts
+import { timestamp } from "@openfn/logger";
+
+// src/util/versions.ts
+import { mainSymbols } from "figures";
+var { triangleRightSmall: t } = mainSymbols;
+var versions_default = (versions) => {
+  let longest = "worker".length;
+  for (const v in versions) {
+    longest = Math.max(v.length, longest);
+  }
+  const { node, worker, compiler, runtime, engine, ...adaptors } = versions;
+  const prefix = (str2) => `    ${t} ${str2.padEnd(longest + 4, " ")}`;
+  let str = `Versions:
+${prefix("node.js")}${versions.node || "unknown"}
+${prefix("worker")}${versions.worker || "unknown"}`;
+  if (Object.keys(adaptors).length) {
+    let allAdaptors = Object.keys(adaptors);
+    str += "\n" + allAdaptors.sort().map(
+      (adaptorName) => `${prefix(adaptorName)}${adaptors[adaptorName].sort().join(", ")}`
+    ).join("\n");
+  }
+  return str;
+};
+
+// src/events/run-start.ts
+init_package();
+async function onRunStart(context, event) {
+  const { channel, state } = context;
+  const time = (timestamp() - BigInt(1e7)).toString();
+  const versionLogContext = {
+    ...context,
+    state: {
+      ...state,
+      activeStep: state.activeStep
+    }
+  };
+  const versions = {
+    worker: package_default.version,
+    ...event.versions
+  };
+  await sendEvent(channel, RUN_START, { versions });
+  const versionMessage = versions_default(versions);
+  await onJobLog(versionLogContext, {
+    time,
+    message: [versionMessage],
+    level: "info",
+    name: "VER"
+  });
+}
+
 // src/events/step-complete.ts
 import crypto4 from "node:crypto";
 
@@ -5563,72 +5615,17 @@ function onStepComplete({ channel, state, options }, event, error) {
 }
 
 // src/events/step-start.ts
-init_package();
 import crypto5 from "node:crypto";
-import { timestamp } from "@openfn/logger";
-
-// src/util/versions.ts
-import { mainSymbols } from "figures";
-var { triangleRightSmall: t } = mainSymbols;
-var versions_default = (stepId, versions, adaptor) => {
-  let longest = "worker".length;
-  for (const v in versions) {
-    longest = Math.max(v.length, longest);
-  }
-  const { node, worker, ...adaptors } = versions;
-  const prefix = (str2) => `    ${t} ${str2.padEnd(longest + 4, " ")}`;
-  let str = `Versions for step ${stepId}:
-${prefix("node.js")}${versions.node || "unknown"}
-${prefix("worker")}${versions.worker || "unknown"}`;
-  if (Object.keys(adaptors).length) {
-    let allAdaptors = Object.keys(adaptors);
-    if (adaptor) {
-      allAdaptors = allAdaptors.filter((name2) => adaptor.startsWith(name2));
-    }
-    str += "\n" + allAdaptors.sort().map((adaptorName) => `${prefix(adaptorName)}${adaptors[adaptorName]}`).join("\n");
-  }
-  return str;
-};
-
-// src/events/step-start.ts
 async function onStepStart(context, event) {
-  const time = (timestamp() - BigInt(1e7)).toString();
   const { channel, state } = context;
   state.activeStep = crypto5.randomUUID();
   state.activeJob = event.jobId;
-  const job = state.plan.workflow.steps.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,
-      activeStep: state.activeStep
-    }
-  };
   await sendEvent(channel, STEP_START, {
     step_id: state.activeStep,
     job_id: state.activeJob,
-    input_dataclip_id,
-    versions
-  });
-  const versionMessage = versions_default(
-    versionLogContext.state.activeStep,
-    versions,
-    job?.adaptor
-  );
-  await onJobLog(versionLogContext, {
-    time,
-    message: [versionMessage],
-    level: "info",
-    name: "VER"
+    input_dataclip_id
   });
-  return;
 }
 
 // src/util/log-final-reason.ts
@@ -5723,7 +5720,7 @@ function execute(channel, engine, logger2, plan, input, options = {}, onFinish =
   };
   const listeners = Object.assign(
     {},
-    addEvent("workflow-start", throttle(onWorkflowStart)),
+    addEvent("workflow-start", throttle(onRunStart)),
     addEvent("job-start", throttle(onStepStart)),
     addEvent("job-complete", throttle(onStepComplete)),
     addEvent("job-error", throttle(onJobError)),
@@ -5777,9 +5774,6 @@ function onJobError(context, event) {
     return onStepComplete(context, event, event.error);
   }
 }
-function onWorkflowStart({ channel }, _event) {
-  return sendEvent(channel, RUN_START);
-}
 function onJobLog({ channel, state }, event) {
   const timeInMicroseconds = BigInt(event.time) / BigInt(1e3);
   const log = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/ws-worker",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "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.14.1",
-    "@openfn/engine-multi": "1.0.0",
+    "@openfn/engine-multi": "1.1.0",
     "@openfn/lexicon": "^1.0.0",
-    "@openfn/logger": "1.0.0",
-    "@openfn/runtime": "1.0.0"
+    "@openfn/runtime": "1.1.0",
+    "@openfn/logger": "1.0.0"
   },
   "devDependencies": {
     "@types/koa": "^2.13.5",
@@ -42,7 +42,7 @@
     "tsup": "^6.2.3",
     "typescript": "^4.6.4",
     "yargs": "^17.6.2",
-    "@openfn/lightning-mock": "2.0.0"
+    "@openfn/lightning-mock": "2.0.1"
   },
   "files": [
     "dist",