@basis-theory-labs/cli 4.0.0 → 4.1.0

package/README.md

@@ -19,7 +19,7 @@ $ npm install -g @basis-theory-labs/cli
 $ bt COMMAND
 running command...
 $ bt (--version)
-@basis-theory-labs/cli/4.0.0 linux-x64 node-v22.23.1
+@basis-theory-labs/cli/4.1.0 linux-x64 node-v22.23.1
 $ bt --help [COMMAND]
 USAGE
   $ bt COMMAND
@@ -62,7 +62,7 @@ EXAMPLES
   $ bt applications
 ```
 
-_See code: [dist/commands/applications/index.ts](https://github.com/Basis-Theory-Labs/basistheory-cli/blob/v4.0.0/dist/commands/applications/index.ts)_
+_See code: [dist/commands/applications/index.ts](https://github.com/Basis-Theory-Labs/basistheory-cli/blob/v4.1.0/dist/commands/applications/index.ts)_
 
 ## `bt applications create`
 
@@ -151,7 +151,7 @@ EXAMPLES
   $ bt proxies
 ```
 
-_See code: [dist/commands/proxies/index.ts](https://github.com/Basis-Theory-Labs/basistheory-cli/blob/v4.0.0/dist/commands/proxies/index.ts)_
+_See code: [dist/commands/proxies/index.ts](https://github.com/Basis-Theory-Labs/basistheory-cli/blob/v4.1.0/dist/commands/proxies/index.ts)_
 
 ## `bt proxies create`
 
@@ -378,7 +378,7 @@ EXAMPLES
   $ bt reactors
 ```
 
-_See code: [dist/commands/reactors/index.ts](https://github.com/Basis-Theory-Labs/basistheory-cli/blob/v4.0.0/dist/commands/reactors/index.ts)_
+_See code: [dist/commands/reactors/index.ts](https://github.com/Basis-Theory-Labs/basistheory-cli/blob/v4.1.0/dist/commands/reactors/index.ts)_
 
 ## `bt reactors create`
 
@@ -495,7 +495,7 @@ FLAGS
   -l, --logs                    Start logs server after update
   -n, --name=<value>            name of the Reactor
   -r, --code=<value>            path to JavaScript file containing the Reactor code
-  -w, --watch                   Watch for changes in informed files
+  -w, --watch                   Watch for changes in supplied code, configuration, and runtime package files
   -x, --management-key=<value>  (required) management key used for connecting with the reactor / proxy
   --[no-]async                  execute Reactor invocations asynchronously (node22 only)
   --image=<option>              runtime image (node-bt|node22)
@@ -522,6 +522,11 @@ EXAMPLES
 
     $ bt reactors update <reactor-id> --code ./reactor.js --image node22
 
+  Watch a node22 reactor for code, configuration, and dependency changes
+
+    $ bt reactors update <reactor-id> --code ./reactor.js --configuration ./config.env --package-json ./package.json \
+      --image node22 --watch
+
   Update a reactor with node22 and all runtime options
 
     $ bt reactors update <reactor-id> --name "My Reactor" --code ./reactor.js --configuration ./config.env --image \

package/dist/commands/reactors/update.js

@@ -13,13 +13,15 @@ class Update extends base_1.BaseCommand {
         var _a, _b, _c, _d;
         const { bt, args: { id }, flags, } = await this.parse(Update);
         const { name, code, 'application-id': applicationId, configuration, image, 'package-json': packageJson, timeout, 'warm-concurrency': warmConcurrency, resources, permissions, 'no-wait': noWait, async: runtimeAsync, watch, logs, } = flags;
-        const existingReactor = (0, runtime_1.hasReactorRuntimeFlags)(flags) ||
+        const existingReactor = watch ||
+            (0, runtime_1.hasReactorRuntimeFlags)(flags) ||
             (applicationId !== undefined && image === undefined)
             ? await (0, management_1.getReactor)(bt, id)
             : undefined;
         const effectiveImage = image !== null && image !== void 0 ? image : (_a = existingReactor === null || existingReactor === void 0 ? void 0 : existingReactor.runtime) === null || _a === void 0 ? void 0 : _a.image;
         const effectiveRuntimeAsync = (_c = runtimeAsync !== null && runtimeAsync !== void 0 ? runtimeAsync : (_b = existingReactor === null || existingReactor === void 0 ? void 0 : existingReactor.runtime) === null || _b === void 0 ? void 0 : _b.async) !== null && _c !== void 0 ? _c : false;
         const effectiveTimeout = timeout !== null && timeout !== void 0 ? timeout : (_d = existingReactor === null || existingReactor === void 0 ? void 0 : existingReactor.runtime) === null || _d === void 0 ? void 0 : _d.timeout;
+        const isConfigurableRuntime = !(0, runtime_2.isLegacyRuntimeImage)(effectiveImage);
         (0, runtime_1.validateReactorRuntimeFlags)(flags, effectiveImage);
         (0, runtime_1.validateReactorApplicationId)(applicationId, effectiveImage);
         if (timeout !== undefined || runtimeAsync !== undefined) {
@@ -42,36 +44,110 @@ class Update extends base_1.BaseCommand {
             runtime,
         });
         await (0, management_1.patchReactor)(bt, id, model);
-        const reactor = await (0, management_1.getReactor)(bt, id);
-        const isConfigurableRuntime = (0, runtime_2.needsPolling)(reactor.state);
-        if (!noWait) {
-            await (0, runtime_2.waitForResourceState)(bt, 'reactor', id, reactor.state);
-        }
-        this.log('Reactor updated successfully!');
-        if (logs) {
-            await (0, logs_1.showReactorLogs)(bt, id);
-        }
-        if (watch && isConfigurableRuntime) {
-            this.warn(`--watch is not supported for configurable runtimes (${runtime_2.CONFIGURABLE_RUNTIME_IMAGES.join(' | ')}). Skipping watch.`);
-        }
-        else if (watch) {
-            const entries = Object.entries({
-                code,
-                configuration,
-            }).filter(([, value]) => Boolean(value));
-            const files = entries.reduce((arr, [, file]) => [...arr, file], []);
+        const watchedEntries = Object.entries({
+            code,
+            configuration,
+            ...(isConfigurableRuntime ? { packageJson } : {}),
+        }).filter(([, value]) => Boolean(value));
+        const startWatching = (initialUpdateCompleted) => {
+            const files = watchedEntries.reduce((arr, [, file]) => [...arr, file], []);
             if (files.length) {
                 this.log(`Watching files for changes: ${files.join(', ')} `);
             }
-            entries.forEach(([prop, file]) => {
-                (0, files_1.watchForChanges)(file, async () => {
-                    core_1.ux.action.start(`Detected change in ${file}. Pushing changes`);
-                    await (0, management_1.patchReactor)(bt, id, (0, utils_1.createModelFromFlags)({
-                        [prop]: file,
-                    }));
-                    core_1.ux.action.stop('✅\t');
+            if (isConfigurableRuntime) {
+                const waitUntilReactorIsAvailable = async () => {
+                    await initialUpdateCompleted;
+                    const currentReactor = await (0, management_1.getReactor)(bt, id);
+                    if (!(0, runtime_2.needsPolling)(currentReactor.state)) {
+                        return;
+                    }
+                    try {
+                        await (0, runtime_2.waitForResourceState)(bt, 'reactor', id, currentReactor.state);
+                    }
+                    catch (error) {
+                        const latestReactor = await (0, management_1.getReactor)(bt, id);
+                        if (latestReactor.state !== 'failed' &&
+                            latestReactor.state !== 'outdated') {
+                            throw error;
+                        }
+                    }
+                };
+                const pushLatestChanges = (0, files_1.createCoalescingHandler)(async (markLatestStateCaptured) => {
+                    await waitUntilReactorIsAvailable();
+                    core_1.ux.action.start('Pushing latest watched changes');
+                    try {
+                        markLatestStateCaptured();
+                        await (0, management_1.patchReactor)(bt, id, (0, utils_1.createModelFromFlags)({
+                            code,
+                            configuration,
+                            runtime: (0, runtime_2.buildReactorRuntime)({ packageJson }),
+                        }));
+                        core_1.ux.action.stop('✅\t');
+                    }
+                    catch (error) {
+                        core_1.ux.action.stop('failed ❌');
+                        throw error;
+                    }
+                    const updatedReactor = await (0, management_1.getReactor)(bt, id);
+                    await (0, runtime_2.waitForResourceState)(bt, 'reactor', id, updatedReactor.state);
+                }, (error) => {
+                    const message = error instanceof Error ? error.message : String(error);
+                    this.warn(`Failed to push watched Reactor changes: ${message}`);
                 });
-            });
+                watchedEntries.forEach(([, file]) => {
+                    (0, files_1.watchForChanges)(file, () => {
+                        this.log(`Detected change in ${file}. Queuing latest files`);
+                        return pushLatestChanges();
+                    });
+                });
+            }
+            else {
+                watchedEntries.forEach(([prop, file]) => {
+                    (0, files_1.watchForChanges)(file, async () => {
+                        core_1.ux.action.start(`Detected change in ${file}. Pushing changes`);
+                        await (0, management_1.patchReactor)(bt, id, (0, utils_1.createModelFromFlags)({
+                            [prop]: file,
+                        }));
+                        core_1.ux.action.stop('✅\t');
+                    });
+                });
+            }
+        };
+        let initialUpdateError;
+        const completeInitialUpdate = async () => {
+            if (!noWait) {
+                try {
+                    const initialState = isConfigurableRuntime
+                        ? 'updating'
+                        : (await (0, management_1.getReactor)(bt, id)).state;
+                    await (0, runtime_2.waitForResourceState)(bt, 'reactor', id, initialState);
+                }
+                catch (error) {
+                    if (!watch || !isConfigurableRuntime) {
+                        throw error;
+                    }
+                    initialUpdateError = error;
+                    const message = error instanceof Error ? error.message : String(error);
+                    this.warn(`Initial Reactor update failed: ${message}`);
+                }
+            }
+            if (initialUpdateError) {
+                this.log('Watch remains active. Save a watched file to retry the latest snapshot.');
+            }
+            else {
+                this.log('Reactor updated successfully!');
+            }
+        };
+        const initialUpdateCompleted = completeInitialUpdate();
+        if (watch && isConfigurableRuntime) {
+            startWatching(initialUpdateCompleted);
+        }
+        await initialUpdateCompleted;
+        if (logs && !initialUpdateError) {
+            await (0, logs_1.showReactorLogs)(bt, id);
+        }
+        if (watch && !isConfigurableRuntime) {
+            startWatching();
         }
     }
 }
@@ -86,6 +162,15 @@ Update.examples = [
         description: 'Update a reactor with node22 runtime',
         command: '<%= config.bin %> <%= command.id %> <reactor-id> --code ./reactor.js --image node22',
     },
+    {
+        description: 'Watch a node22 reactor for code, configuration, and dependency changes',
+        command: '<%= config.bin %> <%= command.id %> <reactor-id> ' +
+            '--code ./reactor.js ' +
+            '--configuration ./config.env ' +
+            '--package-json ./package.json ' +
+            '--image node22 ' +
+            '--watch',
+    },
     {
         description: 'Update a reactor with node22 and all runtime options',
         command: '<%= config.bin %> <%= command.id %> <reactor-id> ' +
@@ -106,7 +191,7 @@ Update.flags = {
     ...utils_1.REACTOR_FLAGS,
     watch: core_1.Flags.boolean({
         char: 'w',
-        description: 'Watch for changes in informed files',
+        description: 'Watch for changes in supplied code, configuration, and runtime package files',
         default: false,
         required: false,
     }),

package/dist/files.d.ts

@@ -1,4 +1,5 @@
 import * as fs from 'fs';
 declare const readFileContents: (filePath: string) => string;
+declare const createCoalescingHandler: (handler: (markLatestStateCaptured: () => void) => Promise<void>, onError: (error: unknown) => void) => (() => Promise<void>);
 declare const watchForChanges: (filePath: string, handler: (contents: string) => unknown) => fs.FSWatcher;
-export { readFileContents, watchForChanges };
+export { createCoalescingHandler, readFileContents, watchForChanges };

package/dist/files.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.watchForChanges = exports.readFileContents = void 0;
+exports.watchForChanges = exports.readFileContents = exports.createCoalescingHandler = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const lodash_debounce_1 = tslib_1.__importDefault(require("lodash.debounce"));
@@ -8,6 +8,36 @@ const path = tslib_1.__importStar(require("path"));
 const readFileContents = (filePath) => fs.readFileSync(path.resolve(process.cwd(), filePath)).toString();
 exports.readFileContents = readFileContents;
 const FILE_WATCH_DEBOUNCE_DELAY = 1000;
+const createCoalescingHandler = (handler, onError) => {
+    let pending = false;
+    let running;
+    const markLatestStateCaptured = () => {
+        pending = false;
+    };
+    /* eslint-disable no-await-in-loop */
+    const drain = async () => {
+        while (pending) {
+            pending = false;
+            try {
+                await handler(markLatestStateCaptured);
+            }
+            catch (error) {
+                onError(error);
+            }
+        }
+    };
+    /* eslint-enable no-await-in-loop */
+    return () => {
+        pending = true;
+        if (!running) {
+            running = drain().finally(() => {
+                running = undefined;
+            });
+        }
+        return running;
+    };
+};
+exports.createCoalescingHandler = createCoalescingHandler;
 const watchForChanges = (filePath, handler) => {
     let lastContents = '';
     const debounced = (0, lodash_debounce_1.default)(() => {

package/dist/runtime/state.js

@@ -64,9 +64,11 @@ const waitForResourceState = async (bt, resourceType, id, initialState) => {
     }
     const deadline = Date.now() + POLL_TIMEOUT;
     const startTime = Date.now();
-    let currentState;
+    let currentState = initialState;
     const timer = createTimer(startTime, () => currentState);
-    core_1.ux.action.start('Status');
+    core_1.ux.action.start('Status', currentState
+        ? `${currentState} (${formatElapsedTime(startTime)})`
+        : undefined);
     /* eslint-disable no-await-in-loop */
     try {
         while (Date.now() < deadline) {
@@ -83,11 +85,11 @@ const waitForResourceState = async (bt, resourceType, id, initialState) => {
             currentState = resource.state;
             core_1.ux.action.status = `${currentState} (${formatElapsedTime(startTime)})`;
             if (currentState === 'active') {
-                core_1.ux.action.stop(`ready (${formatElapsedTime(startTime)})`);
+                core_1.ux.action.stop(`ready (${formatElapsedTime(startTime)}) ✅`);
                 return;
             }
             if (currentState === 'failed' || currentState === 'outdated') {
-                core_1.ux.action.stop(`failed (${formatElapsedTime(startTime)})`);
+                core_1.ux.action.stop(`failed (${formatElapsedTime(startTime)}) ❌`);
                 throw new Error(formatErrorMessage(resource, resourceType));
             }
             await new Promise((resolve) => {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.0.0",
+  "version": "4.1.0",
   "commands": {
     "applications:create": {
       "id": "applications:create",
@@ -992,6 +992,10 @@
           "description": "Update a reactor with node22 runtime",
           "command": "<%= config.bin %> <%= command.id %> <reactor-id> --code ./reactor.js --image node22"
         },
+        {
+          "description": "Watch a node22 reactor for code, configuration, and dependency changes",
+          "command": "<%= config.bin %> <%= command.id %> <reactor-id> --code ./reactor.js --configuration ./config.env --package-json ./package.json --image node22 --watch"
+        },
         {
           "description": "Update a reactor with node22 and all runtime options",
           "command": "<%= config.bin %> <%= command.id %> <reactor-id> --name \"My Reactor\" --code ./reactor.js --configuration ./config.env --image node22 --async --timeout 10 --warm-concurrency 0 --resources standard --package-json ./package.json --permissions token:read --permissions token:create"
@@ -1102,7 +1106,7 @@
           "name": "watch",
           "type": "boolean",
           "char": "w",
-          "description": "Watch for changes in informed files",
+          "description": "Watch for changes in supplied code, configuration, and runtime package files",
           "required": false,
           "allowNo": false
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basis-theory-labs/cli",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Basis Theory CLI tool",
   "author": "Davi Aquino @djejaquino",
   "bin": {