@basis-theory-labs/cli 1.5.1 → 1.6.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/1.5.1 linux-x64 node-v18.16.1
+@basis-theory-labs/cli/1.6.0 linux-x64 node-v18.16.1
 $ bt --help [COMMAND]
 USAGE
   $ bt COMMAND
@@ -55,7 +55,7 @@ EXAMPLES
   $ bt proxies
 ```
 
-_See code: [dist/commands/proxies/index.ts](https://github.com/Basis-Theory-Labs/basistheory-cli/blob/v1.5.1/dist/commands/proxies/index.ts)_
+_See code: [dist/commands/proxies/index.ts](https://github.com/Basis-Theory-Labs/basistheory-cli/blob/v1.6.0/dist/commands/proxies/index.ts)_
 
 ## `bt proxies create`
 
@@ -138,7 +138,7 @@ Updates an existing Pre-Configured Proxy. Requires `proxy:update` Management App
 ```
 USAGE
   $ bt proxies update ID -x <value> [-n <value>] [-u <value>] [-q <value>] [-s <value>] [-i <value>] [-c <value>]
-    [-a] [-w]
+    [-a] [-w] [-l]
 
 ARGUMENTS
   ID  Proxy id to update
@@ -148,6 +148,7 @@ FLAGS
                                          true
   -c, --configuration=<value>            path to configuration file (.env format) to use in the Proxy
   -i, --application-id=<value>           application ID to use in the Proxy
+  -l, --logs                             Start logs server after update
   -n, --name=<value>                     name of the Proxy
   -q, --request-transform-code=<value>   path to JavaScript file containing a Request Transform code
   -s, --response-transform-code=<value>  path to JavaScript file containing a Response Transform code
@@ -187,7 +188,7 @@ EXAMPLES
   $ bt reactors
 ```
 
-_See code: [dist/commands/reactors/index.ts](https://github.com/Basis-Theory-Labs/basistheory-cli/blob/v1.5.1/dist/commands/reactors/index.ts)_
+_See code: [dist/commands/reactors/index.ts](https://github.com/Basis-Theory-Labs/basistheory-cli/blob/v1.6.0/dist/commands/reactors/index.ts)_
 
 ## `bt reactors logs [ID]`
 

package/dist/base.d.ts

@@ -3,10 +3,11 @@ import { Command } from '@oclif/core';
 import type { ArgOutput, FlagOutput, Input, ParserOutput } from '@oclif/core/lib/interfaces/parser';
 export declare abstract class BaseCommand extends Command {
     static baseFlags: {
-        'management-key': import("@oclif/core/lib/interfaces/parser").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'api-base-url': import("@oclif/core/lib/interfaces/parser").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'management-key': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'api-base-url': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     protected parse<F extends FlagOutput, B extends FlagOutput, A extends ArgOutput>(options?: Input<F, B, A>, argv?: string[]): Promise<ParserOutput<F, B, A> & {
         bt: IBasisTheory;
     }>;
+    protected catch(err: unknown): Promise<unknown>;
 }

package/dist/base.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseCommand = void 0;
 const basis_theory_js_1 = require("@basis-theory/basis-theory-js");
+const common_1 = require("@basis-theory/basis-theory-js/common");
 const core_1 = require("@oclif/core");
 class BaseCommand extends core_1.Command {
     async parse(options, argv) {
@@ -24,6 +25,12 @@ class BaseCommand extends core_1.Command {
             bt,
         };
     }
+    catch(err) {
+        if (err instanceof common_1.BasisTheoryApiError) {
+            this.logJson(err.data);
+        }
+        return super.catch(err);
+    }
 }
 exports.BaseCommand = BaseCommand;
 BaseCommand.baseFlags = {

package/dist/commands/proxies/index.js

@@ -28,14 +28,10 @@ class Proxies extends base_1.BaseCommand {
                     name: 'Delete',
                     value: 'delete',
                 },
-                {
-                    name: 'Exit',
-                    value: 'exit',
-                },
             ],
         });
         if (action === 'details') {
-            this.log(JSON.stringify(proxy, undefined, 2));
+            this.logJson(proxy);
             return undefined;
         }
         if (action === 'logs') {

package/dist/commands/proxies/update.d.ts

@@ -5,6 +5,7 @@ export default class Update extends BaseCommand {
     static examples: string[];
     static flags: {
         watch: import("@oclif/core/lib/interfaces/parser").BooleanFlag<boolean>;
+        logs: import("@oclif/core/lib/interfaces/parser").BooleanFlag<boolean>;
         name: import("@oclif/core/lib/interfaces/parser").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'destination-url': import("@oclif/core/lib/interfaces/parser").OptionFlag<import("url").URL | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'request-transform-code': import("@oclif/core/lib/interfaces/parser").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;

package/dist/commands/proxies/update.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const base_1 = require("../../base");
 const files_1 = require("../../files");
+const logs_1 = require("../../logs");
 const management_1 = require("../../proxies/management");
 const utils_1 = require("../../proxies/utils");
 class Update extends base_1.BaseCommand {
     async run() {
         var _a, _b;
-        const { bt, args: { id }, flags: { name, 'destination-url': destinationUrl, 'response-transform-code': responseTransformCode, 'request-transform-code': requestTransformCode, 'application-id': applicationId, configuration, 'require-auth': requireAuth, watch, }, metadata, } = await this.parse(Update);
+        const { bt, args: { id }, flags: { name, 'destination-url': destinationUrl, 'response-transform-code': responseTransformCode, 'request-transform-code': requestTransformCode, 'application-id': applicationId, configuration, 'require-auth': requireAuth, watch, logs, }, metadata, } = await this.parse(Update);
         const model = (0, utils_1.createModelFromFlags)({
             name,
             destinationUrl: destinationUrl === null || destinationUrl === void 0 ? void 0 : destinationUrl.toString(),
@@ -22,20 +23,24 @@ class Update extends base_1.BaseCommand {
         });
         await (0, management_1.patchProxy)(bt, id, model);
         this.log('Proxy updated successfully!');
+        if (logs) {
+            await (0, logs_1.showProxyLogs)(bt, id);
+        }
         if (watch) {
-            const files = [
+            const entries = Object.entries({
                 requestTransformCode,
                 responseTransformCode,
                 configuration,
-            ].filter((flag) => flag);
+            }).filter(([, value]) => Boolean(value));
+            const files = entries.reduce((arr, [, file]) => [...arr, file], []);
             if (files.length) {
                 this.log(`Watching files for changes: ${files.join(', ')} `);
             }
-            files.forEach((file) => {
+            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.patchProxy)(bt, id, (0, utils_1.createModelFromFlags)({
-                        responseTransformCode,
+                        [prop]: file,
                     }));
                     core_1.ux.action.stop('✅\t');
                 });
@@ -59,6 +64,12 @@ Update.flags = {
         default: false,
         required: false,
     }),
+    logs: core_1.Flags.boolean({
+        char: 'l',
+        description: 'Start logs server after update',
+        default: false,
+        required: false,
+    }),
 };
 Update.args = {
     id: core_1.Args.string({

package/dist/commands/reactors/index.js

@@ -24,14 +24,10 @@ class Reactors extends base_1.BaseCommand {
                     value: 'logs',
                     description: 'See Reactor real-time logs',
                 },
-                {
-                    name: 'Exit',
-                    value: 'exit',
-                },
             ],
         });
         if (action === 'details') {
-            this.log(JSON.stringify(reactor, undefined, 2));
+            this.logJson(reactor);
             return undefined;
         }
         if (action === 'logs') {

package/dist/logs/server.d.ts

@@ -1,2 +1,2 @@
-declare const createLogServer: (port: number) => Promise<string>;
+declare const createLogServer: (_port: number) => Promise<string>;
 export { createLogServer };

package/dist/logs/server.js

@@ -4,6 +4,7 @@ exports.createLogServer = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const cloudflared_1 = require("cloudflared");
+const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
 const fs = tslib_1.__importStar(require("node:fs"));
 const pino_1 = tslib_1.__importDefault(require("pino"));
 const http_1 = require("./http");
@@ -21,7 +22,11 @@ const runTunnel = async (port) => {
     debug(`tunnel started at ${url}`);
     return url;
 };
-const createLogServer = async (port) => {
+const createLogServer = async (_port) => {
+    const port = await (0, detect_port_1.default)(_port);
+    if (port !== _port) {
+        core_1.ux.log(`Port ${_port} was occupied, using port ${port}.`);
+    }
     core_1.ux.action.start('Starting log server');
     const logger = (0, pino_1.default)({
         transport: {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.1",
+  "version": "1.6.0",
   "commands": {
     "proxies:create": {
       "id": "proxies:create",
@@ -292,6 +292,14 @@
           "description": "Watch for changes in informed files",
           "required": false,
           "allowNo": false
+        },
+        "logs": {
+          "name": "logs",
+          "type": "boolean",
+          "char": "l",
+          "description": "Start logs server after update",
+          "required": false,
+          "allowNo": false
         }
       },
       "args": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basis-theory-labs/cli",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "Basis Theory CLI tool",
   "author": "Davi Aquino @djejaquino",
   "bin": {
@@ -27,6 +27,7 @@
     "@oclif/plugin-plugins": "^2.4.7",
     "cloudflared": "^0.4.0",
     "debug": "^4.3.4",
+    "detect-port": "^1.5.1",
     "dotenv": "^16.3.1",
     "fastify": "^4.19.2",
     "lodash.debounce": "^4.0.8",
@@ -46,6 +47,7 @@
     "@semantic-release/release-notes-generator": "^11.0.3",
     "@types/chai": "^4",
     "@types/debug": "^4.1.8",
+    "@types/detect-port": "^1.3.3",
     "@types/lodash.debounce": "^4.0.7",
     "@types/mocha": "^9.0.0",
     "@types/node": "^16.18.36",