@openfn/ws-worker 1.5.1 → 1.6.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # ws-worker
 
+## 1.6.0
+
+### Minor Changes
+
+- eaa3859: Include timestamps in key events
+
+### Patch Changes
+
+- Updated dependencies [870a836]
+- Updated dependencies [44f7f57]
+  - @openfn/engine-multi@1.2.2
+  - @openfn/lexicon@1.1.0
+  - @openfn/runtime@1.4.1
+
 ## 1.5.1
 
 ### Patch 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.5.1";
+    version = "1.6.0";
     description = "A Websocket Worker to connect Lightning to a Runtime Engine";
     main = "dist/index.js";
     type = "module";
@@ -508,6 +508,9 @@ var createThrottler = () => {
 };
 var throttle_default = createThrottler;
 
+// src/util/timestamp.ts
+var timeInMicroseconds = (time) => time && (BigInt(time) / BigInt(1e3)).toString();
+
 // src/events/run-start.ts
 import { timestamp } from "@openfn/logger";
 
@@ -549,7 +552,10 @@ async function onRunStart(context, event) {
     worker: package_default.version,
     ...event.versions
   };
-  await sendEvent(channel, RUN_START, { versions });
+  await sendEvent(channel, RUN_START, {
+    versions,
+    timestamp: timeInMicroseconds(event.time)
+  });
   if ("payloadLimitMb" in options) {
     await onJobLog(versionLogContext, {
       time,
@@ -642,7 +648,8 @@ async function onStepComplete(context, event, error) {
     job_id,
     mem: event.mem,
     duration: event.duration,
-    thread_id: event.threadId
+    thread_id: event.threadId,
+    timestamp: timeInMicroseconds(event.time)
   };
   try {
     if (!options || options.outputDataclips !== false) {
@@ -679,7 +686,8 @@ async function onStepStart(context, event) {
   await sendEvent(channel, STEP_START, {
     step_id: state.activeStep,
     job_id: state.activeJob,
-    input_dataclip_id
+    input_dataclip_id,
+    timestamp: timeInMicroseconds(event.time)
   });
 }
 
@@ -701,7 +709,7 @@ ${reason.error_type}: ${reason.error_message || "unknown"}`;
 };
 
 // src/events/run-complete.ts
-async function onWorkflowComplete(context, _event) {
+async function onWorkflowComplete(context, event) {
   const { state, channel, onFinish, logger } = context;
   const result = state.dataclips[state.lastDataclipId];
   const reason = calculateRunExitReason(state);
@@ -709,6 +717,7 @@ async function onWorkflowComplete(context, _event) {
   try {
     await sendEvent(channel, RUN_COMPLETE, {
       final_dataclip_id: state.lastDataclipId,
+      timestamp: timeInMicroseconds(event.time),
       ...reason
     });
   } catch (e) {
@@ -837,7 +846,6 @@ function onJobError(context, event) {
   }
 }
 function onJobLog({ channel, state, options }, event) {
-  const timeInMicroseconds = BigInt(event.time) / BigInt(1e3);
   let message = event.message;
   try {
     if (typeof event.message === "string") {
@@ -857,7 +865,7 @@ function onJobLog({ channel, state, options }, event) {
     message,
     source: event.name,
     level: event.level,
-    timestamp: timeInMicroseconds.toString()
+    timestamp: timeInMicroseconds(event.time)
   };
   if (state.activeStep) {
     log.step_id = state.activeStep;

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.5.1";
+    version = "1.6.0";
     description = "A Websocket Worker to connect Lightning to a Runtime Engine";
     main = "dist/index.js";
     type = "module";
@@ -647,6 +647,9 @@ var createThrottler = () => {
 };
 var throttle_default = createThrottler;
 
+// src/util/timestamp.ts
+var timeInMicroseconds = (time) => time && (BigInt(time) / BigInt(1e3)).toString();
+
 // src/events/run-start.ts
 import { timestamp } from "@openfn/logger";
 
@@ -688,7 +691,10 @@ async function onRunStart(context, event) {
     worker: package_default.version,
     ...event.versions
   };
-  await sendEvent(channel, RUN_START, { versions });
+  await sendEvent(channel, RUN_START, {
+    versions,
+    timestamp: timeInMicroseconds(event.time)
+  });
   if ("payloadLimitMb" in options) {
     await onJobLog(versionLogContext, {
       time,
@@ -781,7 +787,8 @@ async function onStepComplete(context, event, error) {
     job_id,
     mem: event.mem,
     duration: event.duration,
-    thread_id: event.threadId
+    thread_id: event.threadId,
+    timestamp: timeInMicroseconds(event.time)
   };
   try {
     if (!options || options.outputDataclips !== false) {
@@ -818,7 +825,8 @@ async function onStepStart(context, event) {
   await sendEvent(channel, STEP_START, {
     step_id: state.activeStep,
     job_id: state.activeJob,
-    input_dataclip_id
+    input_dataclip_id,
+    timestamp: timeInMicroseconds(event.time)
   });
 }
 
@@ -840,7 +848,7 @@ ${reason.error_type}: ${reason.error_message || "unknown"}`;
 };
 
 // src/events/run-complete.ts
-async function onWorkflowComplete(context, _event) {
+async function onWorkflowComplete(context, event) {
   const { state, channel, onFinish, logger: logger2 } = context;
   const result = state.dataclips[state.lastDataclipId];
   const reason = calculateRunExitReason(state);
@@ -848,6 +856,7 @@ async function onWorkflowComplete(context, _event) {
   try {
     await sendEvent(channel, RUN_COMPLETE, {
       final_dataclip_id: state.lastDataclipId,
+      timestamp: timeInMicroseconds(event.time),
       ...reason
     });
   } catch (e) {
@@ -976,7 +985,6 @@ function onJobError(context, event) {
   }
 }
 function onJobLog({ channel, state, options }, event) {
-  const timeInMicroseconds = BigInt(event.time) / BigInt(1e3);
   let message = event.message;
   try {
     if (typeof event.message === "string") {
@@ -996,7 +1004,7 @@ function onJobLog({ channel, state, options }, event) {
     message,
     source: event.name,
     level: event.level,
-    timestamp: timeInMicroseconds.toString()
+    timestamp: timeInMicroseconds(event.time)
   };
   if (state.activeStep) {
     log.step_id = state.activeStep;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/ws-worker",
-  "version": "1.5.1",
+  "version": "1.6.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.2.1",
-    "@openfn/lexicon": "^1.0.2",
-    "@openfn/logger": "1.0.1",
-    "@openfn/runtime": "1.4.1"
+    "@openfn/engine-multi": "1.2.2",
+    "@openfn/lexicon": "^1.1.0",
+    "@openfn/runtime": "1.4.1",
+    "@openfn/logger": "1.0.1"
   },
   "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.15"
+    "@openfn/lightning-mock": "2.0.16"
   },
   "files": [
     "dist",