@intuned/runtime-dev 1.3.4-dev.4 → 1.3.4-enhancements.1

package/dist/commands/intuned-cli/commands/save.command.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.saveOrDeployCommandSchema = exports.saveCommand = void 0;
+exports.saveOrDeployOptionsSchema = exports.saveOrDeployArgsSchema = exports.saveCommand = void 0;
 var _command = require("./command");
 var _dotenv = _interopRequireDefault(require("dotenv"));
 var _save = require("../controller/save");
@@ -13,16 +13,12 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 _dotenv.default.config({
   path: `.env`
 });
-const saveOrDeployCommandSchema = exports.saveOrDeployCommandSchema = _zod.z.tuple([_zod.z.union([_zod.z.string(), _zod.z.undefined()]), _zod.z.object({
+const saveOrDeployArgsSchema = exports.saveOrDeployArgsSchema = _zod.z.tuple([_zod.z.union([_zod.z.string(), _zod.z.undefined()])]);
+const saveOrDeployOptionsSchema = exports.saveOrDeployOptionsSchema = _zod.z.object({
   workspaceId: _zod.z.string().optional(),
   apiKey: _zod.z.string().optional()
-})]);
-const saveCommand = exports.saveCommand = _command.program.command("save").description("Save an Intuned project to the platform without deploying it").argument("[project-name]", "Name of the project to save").option("-w, --workspace-id <id>", "Your Intuned workspace ID").option("-k, --api-key <key>", "Your Intuned API key").action((0, _helpers.withErrorLogging)(async (inputProjectName, inputOptions) => {
-  const parseResult = saveOrDeployCommandSchema.safeParse([inputProjectName, inputOptions]);
-  if (!parseResult.success) {
-    return (0, _helpers.logInvalidInput)(parseResult);
-  }
-  const [projectName, options] = parseResult.data;
+});
+const saveCommand = exports.saveCommand = _command.program.command("save").description("Save an Intuned project to the platform without deploying it").argument("[project-name]", "Name of the project to save").option("-w, --workspace-id <id>", "Your Intuned workspace ID").option("-k, --api-key <key>", "Your Intuned API key").action((0, _helpers.cliCommandWrapper)(saveOrDeployArgsSchema, saveOrDeployOptionsSchema, async ([projectName], options) => {
   const {
     isValid,
     errorMessage
@@ -33,7 +29,7 @@ const saveCommand = exports.saveCommand = _command.program.command("save").descr
       autoColor: false
     });
   }
-  const _projectName = projectName || (await (0, _helpers.getSettingIntunedJSON)("projectName"));
+  const _projectName = projectName || (await (0, _helpers.loadIntunedJson)()).projectName;
   if (!_projectName) {
     throw new _helpers.CLIError("Project name is required");
   }

package/dist/commands/intuned-cli/commands/types.d.ts

@@ -1,3 +1,4 @@
+import { Command } from "commander";
 import ms from "ms";
 import { z } from "zod";
 export declare const authSessionCheckAttemptsSchema: z.ZodDefault<z.ZodNumber>;
@@ -5,17 +6,26 @@ export declare const authSessionCreateAttemptsSchema: z.ZodDefault<z.ZodNumber>;
 export declare const proxySchema: z.ZodOptional<z.ZodString>;
 export declare const timeoutSchema: z.ZodEffects<z.ZodEffects<z.ZodDefault<z.ZodString>, ms.StringValue, string | undefined>, number, string | undefined>;
 export declare const headlessSchema: z.ZodDefault<z.ZodBoolean>;
+export declare const traceSchema: z.ZodDefault<z.ZodBoolean>;
+export declare const keepBrowserOpenSchema: z.ZodDefault<z.ZodBoolean>;
 export declare const baseCommandOptionsSchema: z.ZodObject<{
     proxy: z.ZodOptional<z.ZodString>;
     timeout: z.ZodEffects<z.ZodEffects<z.ZodDefault<z.ZodString>, ms.StringValue, string | undefined>, number, string | undefined>;
     headless: z.ZodDefault<z.ZodBoolean>;
+    trace: z.ZodDefault<z.ZodBoolean>;
+    keepBrowserOpen: z.ZodDefault<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     headless: boolean;
+    keepBrowserOpen: boolean;
     timeout: number;
+    trace: boolean;
     proxy?: string | undefined;
 }, {
     proxy?: string | undefined;
     timeout?: string | undefined;
     headless?: boolean | undefined;
+    trace?: boolean | undefined;
+    keepBrowserOpen?: boolean | undefined;
 }>;
 export type BaseCommandOptions = z.infer<typeof baseCommandOptionsSchema>;
+export declare function withBaseOptions(command: Command): Command;

package/dist/commands/intuned-cli/commands/types.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.timeoutSchema = exports.proxySchema = exports.headlessSchema = exports.baseCommandOptionsSchema = exports.authSessionCreateAttemptsSchema = exports.authSessionCheckAttemptsSchema = void 0;
+exports.traceSchema = exports.timeoutSchema = exports.proxySchema = exports.keepBrowserOpenSchema = exports.headlessSchema = exports.baseCommandOptionsSchema = exports.authSessionCreateAttemptsSchema = exports.authSessionCheckAttemptsSchema = void 0;
+exports.withBaseOptions = withBaseOptions;
 var _ms = _interopRequireDefault(require("ms"));
 var _zod = require("zod");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -14,8 +15,15 @@ const timeoutSchema = exports.timeoutSchema = _zod.z.string().default("10 mins")
   return (0, _ms.default)(val) !== undefined;
 }, "--timeout must be a valid integer or ms-formatted string").transform(val => (0, _ms.default)(val));
 const headlessSchema = exports.headlessSchema = _zod.z.boolean().default(false);
+const traceSchema = exports.traceSchema = _zod.z.boolean().default(false);
+const keepBrowserOpenSchema = exports.keepBrowserOpenSchema = _zod.z.boolean().default(false);
 const baseCommandOptionsSchema = exports.baseCommandOptionsSchema = _zod.z.object({
   proxy: proxySchema,
   timeout: timeoutSchema,
-  headless: headlessSchema
-});
+  headless: headlessSchema,
+  trace: traceSchema,
+  keepBrowserOpen: keepBrowserOpenSchema
+});
+function withBaseOptions(command) {
+  return command.option("--proxy <url>", "Proxy URL to use for browser").option("--timeout <time>", "Timeout for each attempt - milliseconds or ms-formatted string", "10 mins").option("--headless", "Run the attempts in a headless browser (default: false). This will not open a browser window.").option("--trace", "Capture a trace of each attempt, useful for debugging.").option("--keep-browser-open", "Keep the last browser open after the command completes, useful for debugging.");
+}

package/dist/commands/intuned-cli/controller/__test__/api.test.js

@@ -7,6 +7,7 @@ var _helpers = require("../../helpers");
 var _neverthrow = require("neverthrow");
 var _runApi = require("../../../../common/runApi");
 var _fsExtra = require("fs-extra");
+var _browser = require("../../helpers/browser");
 function getTerminal() {
   return new Proxy(() => ({}), {
     get: () => getTerminal(),
@@ -14,7 +15,8 @@ function getTerminal() {
   });
 }
 _vitest.vi.mock("fs-extra", () => ({
-  writeJSON: _vitest.vi.fn()
+  writeJSON: _vitest.vi.fn(),
+  exists: _vitest.vi.fn().mockResolvedValue(true)
 }));
 _vitest.vi.mock("../authSession", async importOriginal => {
   const original = await importOriginal();
@@ -33,6 +35,23 @@ _vitest.vi.mock("../../../../common/runApi", async importOriginal => {
 _vitest.vi.mock("../../helpers/terminal", () => ({
   terminal: getTerminal()
 }));
+_vitest.vi.mock("../../helpers/proxy", async () => {
+  return {
+    parseUrlProxy: _vitest.vi.fn()
+  };
+});
+_vitest.vi.mock("../../helpers/browser", async importOriginal => {
+  const original = await importOriginal();
+  return {
+    getCLIRunOptions: _vitest.vi.fn(({
+      keepBrowserOpen: _,
+      ...rest
+    }) => original.getCLIRunOptions({
+      keepBrowserOpen: false,
+      ...rest
+    }))
+  };
+});
 _vitest.vi.mock("../../helpers", async importOriginal => {
   const original = await importOriginal();
   return {
@@ -41,7 +60,7 @@ _vitest.vi.mock("../../helpers", async importOriginal => {
     assertApiFileExists: _vitest.vi.fn(),
     withCLIContext: _vitest.vi.fn(fn => fn()),
     withTimeout: _vitest.vi.fn(fn => fn()),
-    parseUrlProxy: _vitest.vi.fn(),
+    withCLITrace: _vitest.vi.fn(original.withCLITrace),
     registerGetAuthSessionParameters: _vitest.vi.fn()
   };
 });
@@ -55,10 +74,58 @@ _vitest.vi.mock("../../helpers", async importOriginal => {
         apiName: "testApi",
         inputData: {},
         headless: false,
-        timeout: 6000
+        timeout: 6000,
+        keepBrowserOpen: false
       });
       (0, _vitest.expect)(_helpers.withTimeout).toHaveBeenCalledWith(_vitest.expect.any(Function), 6000);
     });
+    (0, _vitest.it)("uses tracing wrapper with trace id", async () => {
+      await (0, _api._attemptApi)({
+        apiName: "testApi",
+        inputData: {},
+        headless: false,
+        timeout: 6000,
+        keepBrowserOpen: false
+      });
+      (0, _vitest.expect)(_helpers.withCLITrace).toHaveBeenCalledWith(_vitest.expect.any(Function), undefined);
+      _vitest.vi.mocked(_helpers.withCLITrace).mockClear();
+      _vitest.vi.mocked(_runApi.runApi).mockClear();
+      await (0, _api._attemptApi)({
+        apiName: "testApi",
+        inputData: {},
+        headless: false,
+        timeout: 6000,
+        keepBrowserOpen: false,
+        traceId: "trace-id"
+      });
+      (0, _vitest.expect)(_helpers.withCLITrace).toHaveBeenCalledWith(_vitest.expect.any(Function), "trace-id");
+    });
+    (0, _vitest.it)("uses cli browser helper", async () => {
+      await (0, _api._attemptApi)({
+        apiName: "testApi",
+        inputData: {},
+        headless: false,
+        timeout: 6000,
+        keepBrowserOpen: false
+      });
+      (0, _vitest.expect)(_browser.getCLIRunOptions).toHaveBeenCalledWith(_vitest.expect.objectContaining({
+        headless: false,
+        keepBrowserOpen: false
+      }));
+      _vitest.vi.mocked(_helpers.withCLITrace).mockClear();
+      _vitest.vi.mocked(_runApi.runApi).mockClear();
+      await (0, _api._attemptApi)({
+        apiName: "testApi",
+        inputData: {},
+        headless: true,
+        timeout: 6000,
+        keepBrowserOpen: true
+      });
+      (0, _vitest.expect)(_browser.getCLIRunOptions).toHaveBeenCalledWith(_vitest.expect.objectContaining({
+        headless: true,
+        keepBrowserOpen: true
+      }));
+    });
     (0, _vitest.it)("calls runApi with correct parameters and parses proxy", async () => {
       _vitest.vi.mocked(_helpers.parseUrlProxy).mockReturnValueOnce("parsed-proxy");
       await (0, _api._attemptApi)({
@@ -67,7 +134,8 @@ _vitest.vi.mock("../../helpers", async importOriginal => {
         headless: "headless",
         auth: "auth",
         proxy: "proxy",
-        timeout: 999999999
+        timeout: 999999999,
+        keepBrowserOpen: false
       });
       (0, _vitest.expect)(_helpers.parseUrlProxy).toHaveBeenCalledWith("proxy");
       (0, _vitest.expect)(_runApi.runApi).toHaveBeenCalledWith(_vitest.expect.objectContaining({
@@ -99,7 +167,8 @@ _vitest.vi.mock("../../helpers", async importOriginal => {
         inputData: "inputData",
         headless: "headless",
         auth: "auth",
-        timeout: 999999999
+        timeout: 999999999,
+        keepBrowserOpen: false
       });
       (0, _vitest.expect)(result).toEqual({
         result: "result",
@@ -114,11 +183,37 @@ _vitest.vi.mock("../../helpers", async importOriginal => {
         inputData: "inputData",
         headless: "headless",
         auth: "auth",
-        timeout: 999999999
+        timeout: 999999999,
+        keepBrowserOpen: false
       })).rejects.toThrow(error);
     });
   });
   (0, _vitest.describe)("executeRunApiCLI", () => {
+    (0, _vitest.it)("enables tracing correctly", async () => {
+      await (0, _api.executeRunApiCLI)({
+        apiName: "testApi",
+        inputData: {},
+        retries: 1,
+        trace: false
+      });
+      (0, _vitest.expect)(_runApi.runApi).toHaveBeenCalledWith(_vitest.expect.objectContaining({
+        tracing: {
+          enabled: false
+        }
+      }));
+      _vitest.vi.mocked(_runApi.runApi).mockClear();
+      await (0, _api.executeRunApiCLI)({
+        apiName: "testApi",
+        inputData: {},
+        retries: 1,
+        trace: true
+      });
+      (0, _vitest.expect)(_runApi.runApi).toHaveBeenCalledWith(_vitest.expect.objectContaining({
+        tracing: _vitest.expect.objectContaining({
+          enabled: true
+        })
+      }));
+    });
     (0, _vitest.it)("calls attemptApi once if success", async () => {
       await (0, _api.executeRunApiCLI)({
         apiName: "testApi",
@@ -172,12 +267,12 @@ _vitest.vi.mock("../../helpers", async importOriginal => {
         retries: 10
       });
       (0, _vitest.expect)(_authSession.executeRunValidateAuthSessionCLI).toBeCalledTimes(2);
-      (0, _vitest.expect)(_authSession.executeRunValidateAuthSessionCLI).toHaveBeenCalledWith({
+      (0, _vitest.expect)(_authSession.executeRunValidateAuthSessionCLI).toHaveBeenCalledWith(_vitest.expect.objectContaining({
         id: "authSessionId",
         autoRecreate: false,
         checkRetries: 1,
         createRetries: 2
-      });
+      }));
     });
     (0, _vitest.it)("doesn't validate auth session if not provided", async () => {
       _vitest.vi.mocked(_runApi.runApi).mockResolvedValue((0, _neverthrow.ok)({
@@ -203,12 +298,12 @@ _vitest.vi.mock("../../helpers", async importOriginal => {
         },
         retries: 10
       })).rejects.toThrow("Auth session validation failed");
-      (0, _vitest.expect)(_authSession.executeRunValidateAuthSessionCLI).toHaveBeenCalledWith({
+      (0, _vitest.expect)(_authSession.executeRunValidateAuthSessionCLI).toHaveBeenCalledWith(_vitest.expect.objectContaining({
         id: "authSessionId",
         autoRecreate: false,
         checkRetries: 1,
         createRetries: 2
-      });
+      }));
       (0, _vitest.expect)(_runApi.runApi).not.toHaveBeenCalled();
     });
     (0, _vitest.it)("writes result to file if outputFile is provided", async () => {
@@ -237,6 +332,29 @@ _vitest.vi.mock("../../helpers", async importOriginal => {
     });
   });
   (0, _vitest.describe)("executeAttemptApiCLI", () => {
+    (0, _vitest.it)("enables tracing correctly", async () => {
+      await (0, _api.executeAttemptApiCLI)({
+        apiName: "testApi",
+        inputData: {},
+        trace: false
+      });
+      (0, _vitest.expect)(_runApi.runApi).toHaveBeenCalledWith(_vitest.expect.objectContaining({
+        tracing: {
+          enabled: false
+        }
+      }));
+      _vitest.vi.mocked(_runApi.runApi).mockClear();
+      await (0, _api.executeAttemptApiCLI)({
+        apiName: "testApi",
+        inputData: {},
+        trace: true
+      });
+      (0, _vitest.expect)(_runApi.runApi).toHaveBeenCalledWith(_vitest.expect.objectContaining({
+        tracing: _vitest.expect.objectContaining({
+          enabled: true
+        })
+      }));
+    });
     (0, _vitest.it)("calls attemptApi once", async () => {
       await (0, _api.executeAttemptApiCLI)({
         apiName: "testApi",