@openfn/ws-worker 1.8.0 → 1.8.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # ws-worker
 
+## 1.8.2
+
+### Patch Changes
+
+- ef1fb63: Fix an issue running collections from an auto-loaded version
+- 606f23b: Allow steps to specify their own adaptor version
+
+## 1.8.1
+
+### Patch Changes
+
+- eeb660d: Fix an issue from previous patch where initial state.configuration could be lost at the start of a step
+- Updated dependencies [eeb660d]
+  - @openfn/runtime@1.5.1
+  - @openfn/engine-multi@1.4.1
+
 ## 1.8.0
 
 ### Minor Changes

package/README.md

@@ -66,6 +66,20 @@ To manually trigger a claim, post to `/claim`:
 curl -X POST http://localhost:2222/claim
 ```
 
+## Collections
+
+To enable collections with a local lightning:
+
+```
+pnpm start -collections-url http://localhost:4000/collections
+```
+
+To use the monorepo adaptor version:
+
+```
+pnpm start --collections-version local --collections-url http://localhost:4000/collections
+```
+
 ## Architecture
 
 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.

package/dist/index.d.ts

@@ -89,7 +89,6 @@ interface ServerApp extends Koa {
     engine: RuntimeEngine;
     options: ServerOptions;
     workloop?: Workloop;
-    collectionsVersion?: string;
     execute: ({ id, token }: ClaimRun) => Promise<void>;
     destroy: () => void;
     resumeWorkloop: () => void;

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.8.0";
+    version = "1.8.2";
     description = "A Websocket Worker to connect Lightning to a Runtime Engine";
     main = "dist/index.js";
     type = "module";
@@ -364,8 +364,14 @@ var convert_lightning_plan_default = (run, options = {}) => {
       const job = step;
       if (job.expression?.match(/(collections\.)/)) {
         hasCollections = true;
-        job.adaptors ??= [];
-        job.adaptors.push(`@openfn/language-collections@${collectionsVersion2}`);
+        if (!job.adaptors?.find(
+          (v) => v.startsWith("@openfn/language-collections")
+        )) {
+          job.adaptors ??= [];
+          job.adaptors.push(
+            `@openfn/language-collections@${collectionsVersion2}`
+          );
+        }
       }
     });
     return hasCollections;
@@ -1128,7 +1134,7 @@ async function setupCollections(options, logger) {
     "npm view @openfn/language-collections@latest version"
   );
   logger.log("Using collections version from @latest: ", version2);
-  return version2;
+  return version2.trim();
 }
 function createServer(engine, options = {}) {
   const logger = options.logger || createMockLogger2();
@@ -1238,7 +1244,7 @@ function createServer(engine, options = {}) {
   app.use(router.routes());
   if (options.lightning) {
     setupCollections(options, logger).then((version2) => {
-      app.collectionsVersion = version2;
+      app.options.collectionsVersion = version2;
       connect(app, logger, options);
     });
   } else {

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.8.0";
+    version = "1.8.2";
     description = "A Websocket Worker to connect Lightning to a Runtime Engine";
     main = "dist/index.js";
     type = "module";
@@ -503,8 +503,14 @@ var convert_lightning_plan_default = (run2, options = {}) => {
       const job = step;
       if (job.expression?.match(/(collections\.)/)) {
         hasCollections = true;
-        job.adaptors ??= [];
-        job.adaptors.push(`@openfn/language-collections@${collectionsVersion2}`);
+        if (!job.adaptors?.find(
+          (v) => v.startsWith("@openfn/language-collections")
+        )) {
+          job.adaptors ??= [];
+          job.adaptors.push(
+            `@openfn/language-collections@${collectionsVersion2}`
+          );
+        }
       }
     });
     return hasCollections;
@@ -1267,7 +1273,7 @@ async function setupCollections(options, logger2) {
     "npm view @openfn/language-collections@latest version"
   );
   logger2.log("Using collections version from @latest: ", version2);
-  return version2;
+  return version2.trim();
 }
 function createServer(engine, options = {}) {
   const logger2 = options.logger || createMockLogger2();
@@ -1377,7 +1383,7 @@ function createServer(engine, options = {}) {
   app.use(router.routes());
   if (options.lightning) {
     setupCollections(options, logger2).then((version2) => {
-      app.collectionsVersion = version2;
+      app.options.collectionsVersion = version2;
       connect(app, logger2, options);
     });
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/ws-worker",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "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.0",
     "@openfn/lexicon": "^1.1.0",
     "@openfn/logger": "1.0.2",
-    "@openfn/runtime": "1.5.0"
+    "@openfn/runtime": "1.5.1",
+    "@openfn/engine-multi": "1.4.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.21"
+    "@openfn/lightning-mock": "2.0.22"
   },
   "files": [
     "dist",