@intuned/runtime 1.3.0 → 1.3.2

package/dist/commands/api/run.js

@@ -48,8 +48,7 @@ async function executeCLI(apiName, mode, inputData, options) {
       session: {
         type: "file",
         path: authSessionPathToUse
-      },
-      runCheck: false
+      }
     } : undefined,
     runOptions: {
       environment: "cdp",
@@ -78,7 +77,10 @@ async function executeCLI(apiName, mode, inputData, options) {
     _Logger.logger.info(_chalk.default.underline.bgBlue.white(`Click to Open: Results saved (Run: ${options.outputFileId})`));
     fs.ensureDirSync(resultsDir);
     const path = `${resultsDir}/${options.outputFileId}.json`;
-    await fs.writeJson(path, result, {
+    await fs.writeJson(path, {
+      input: inputData,
+      output: result
+    }, {
       spaces: 2
     });
   } else {

package/dist/commands/auth-sessions/load.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var _commander = require("commander");
-var _getPlaywrightConstructs = require("../../common/getPlaywrightConstructs");
+var _playwrightContext = require("../../common/playwrightContext");
 var _settings = require("../common/utils/settings");
 var _dotenv = _interopRequireDefault(require("dotenv"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -19,8 +19,8 @@ _commander.program.description("load auth session to browser").option("--cdpAddr
   }
   const {
     context
-  } = await (0, _getPlaywrightConstructs.getRemotePlaywrightContext)(cdpAddress);
-  await (0, _getPlaywrightConstructs.loadSessionToContext)({
+  } = await (0, _playwrightContext.getRemotePlaywrightContext)(cdpAddress);
+  await (0, _playwrightContext.loadSessionToContext)({
     context,
     session: {
       type: "file",

package/dist/commands/auth-sessions/run-check.js

@@ -54,8 +54,7 @@ _commander.program.description("run auth session check").option("--cdpAddress <c
       session: {
         type: "file",
         path: authSessionPath
-      },
-      runCheck: false
+      }
     },
     importFunction: _tsNodeImport.tsNodeImport
   }));

package/dist/commands/auth-sessions/run-create.js

@@ -3,7 +3,6 @@
 
 var _commander = require("commander");
 var fs = _interopRequireWildcard(require("fs-extra"));
-var _promptly = require("promptly");
 var _fileUtils = require("../common/utils/fileUtils");
 var _settings = require("../common/utils/settings");
 var _dotenv = _interopRequireDefault(require("dotenv"));
@@ -42,7 +41,7 @@ _commander.program.description("run auth session create").option("--cdpAddress <
     throw new Error("auth session create file not found");
   }
   async function runCreate() {
-    const generator = (0, _runApi.runApiGenerator)({
+    const result = await (0, _runApi.runApi)({
       automationFunction: {
         name: `${_constants.AUTH_SESSIONS_FOLDER_NAME}/create`,
         params: inputData
@@ -55,40 +54,18 @@ _commander.program.description("run auth session create").option("--cdpAddress <
       retrieveSession: true,
       importFunction: _tsNodeImport.tsNodeImport
     });
-    let nextGeneratorParam = undefined;
-    while (true) {
-      const {
-        value,
-        done
-      } = await generator.next(...(nextGeneratorParam ? [nextGeneratorParam] : []));
-      if (done) {
-        if (value.isErr()) {
-          if (value.error instanceof _runApi.AutomationError) {
-            throw value.error.error;
-          }
-          console.error(value.error);
-          throw new Error("Error while running create");
-        }
-        const fullState = value.value.session;
-        if (pathToSave) {
-          const fullPath = (0, _fileUtils.getFullPathInProject)(pathToSave);
-          fs.ensureFileSync(fullPath);
-          await fs.writeJSON(fullPath, fullState);
-        }
-        break;
-      }
-      if (value.action === "request_more_info" && value.requestType == "multiple_choice") {
-        nextGeneratorParam = await (0, _promptly.prompt)(value.messageToUser + `, choices: ${value.choices}`, {
-          validator: input => {
-            if (!value.choices.includes(input)) {
-              throw new Error("Please type on of the allowed choices");
-            }
-            return input;
-          }
-        });
-      } else if (value.action === "request_more_info" && value.requestType == "otp") {
-        nextGeneratorParam = await (0, _promptly.prompt)(value.messageToUser, {});
+    if (result.isErr()) {
+      if (result.error instanceof _runApi.AutomationError) {
+        throw result.error.error;
       }
+      console.error(result.error);
+      throw new Error("Error while running create");
+    }
+    const fullState = result.value.session;
+    if (pathToSave) {
+      const fullPath = (0, _fileUtils.getFullPathInProject)(pathToSave);
+      fs.ensureFileSync(fullPath);
+      await fs.writeJSON(fullPath, fullState);
     }
   }
   await (0, _asyncLocalStorage.runWithContext)({

package/dist/commands/interface/run.d.ts

@@ -1 +1 @@
-export declare function runAutomationCLI(importFunction?: (path: string) => Promise<any>): void;
+export declare function runAutomationCLI<ResultType = any>(importFunction?: (path: string) => Promise<any>): void;

package/dist/commands/interface/run.js

@@ -64,15 +64,10 @@ function runAutomationCLI(importFunction) {
     const throttleTime = 60 * 1000;
     let timeoutTimestamp = Date.now();
     const client = net.createConnection(socketPath);
-    let generator = null;
     const abortController = new AbortController();
-    client.on("error", err => {
-      void generator?.throw(err).catch(() => undefined);
-    });
     const interruptSignalHandler = async () => {
       abortController.abort();
       await (0, _promises.setTimeout)(60_000);
-      void generator?.throw(new Error("Interrupted")).catch(() => undefined);
       client.end();
       process.exit(1);
     };
@@ -107,11 +102,6 @@ function runAutomationCLI(importFunction) {
         return;
       }
       if (message.type === "start") {
-        generator = (0, _runApi.runApiGenerator)({
-          ...message.parameters,
-          abortSignal: abortController.signal,
-          importFunction: importFunction ?? _defaultImport
-        });
         context = {
           extendedPayloads: [],
           runEnvironment: message.parameters.runOptions.environment === "standalone" ? _enums.RunEnvironment.DEPLOYED : _enums.RunEnvironment.IDE,
@@ -130,38 +120,18 @@ function runAutomationCLI(importFunction) {
         };
         _jwtTokenManager.backendFunctionsTokenManager.token = message.parameters.functionsToken;
         resultPromise = (0, _asyncLocalStorage.runWithContext)(context, async () => {
-          return await generator.next();
+          return await (0, _runApi.runApi)({
+            ...message.parameters,
+            abortSignal: abortController.signal,
+            importFunction: importFunction ?? _defaultImport
+          });
         });
         return;
       }
       if (message.type === "next") {
-        if (!generator) {
-          throw new Error("generator not started");
-        }
-        resultPromise = (0, _asyncLocalStorage.runWithContext)(context, async () => {
-          return await generator.next(message.parameters.value);
-        });
-        return;
+        throw new Error("next not supported anymore");
       }
     }
-    async function handleResult(generatorResult) {
-      if (!generatorResult.done) {
-        jsonUnixSocket.sendJSON({
-          type: "yield",
-          result: generatorResult.value
-        });
-        return false;
-      }
-      const result = generatorResult.value;
-      const success = result.isOk();
-      const resultToSend = success ? result.value : result.error.json;
-      jsonUnixSocket.sendJSON({
-        type: "done",
-        result: resultToSend,
-        success
-      });
-      return true;
-    }
     let receiveMessagesPromise = receiveMessages();
     while (true) {
       const messageOrResult = await Promise.race([receiveMessagesPromise.then(message => ({
@@ -199,10 +169,14 @@ function runAutomationCLI(importFunction) {
       const {
         result
       } = messageOrResult;
-      const done = await handleResult(result);
-      if (done) {
-        break;
-      }
+      const success = result.isOk();
+      const resultToSend = success ? result.value : result.error.json;
+      jsonUnixSocket.sendJSON({
+        type: "done",
+        result: resultToSend,
+        success
+      });
+      break;
     }
     if (!client.closed) {
       client.end();

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

@@ -6,19 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.deployCommand = void 0;
 var _command = require("./command");
 var _dotenv = _interopRequireDefault(require("dotenv"));
+var _save = require("../controller/save");
 var _deploy = require("../controller/deploy");
 var _helpers = require("../helpers");
-var _zod = require("zod");
+var _save2 = require("./save.command");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 _dotenv.default.config({
   path: `.env`
 });
-const deployCommandSchema = _zod.z.tuple([_zod.z.union([_zod.z.string(), _zod.z.undefined()]), _zod.z.object({
-  workspaceId: _zod.z.string().optional(),
-  apiKey: _zod.z.string().optional()
-})]);
-const deployCommand = exports.deployCommand = _command.program.command("deploy").description("Deploy an Intuned project to the platform").argument("[project-name]", "Name of the project to deploy").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 = deployCommandSchema.safeParse([inputProjectName, inputOptions]);
+const deployCommand = exports.deployCommand = _command.program.command("deploy").description("Save and deploy an Intuned project to the platform").argument("[project-name]", "Name of the project to deploy").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 = _save2.saveOrDeployCommandSchema.safeParse([inputProjectName, inputOptions]);
   if (!parseResult.success) {
     return (0, _helpers.logInvalidInput)(parseResult);
   }
@@ -26,7 +23,7 @@ const deployCommand = exports.deployCommand = _command.program.command("deploy")
   const {
     isValid,
     errorMessage
-  } = await (0, _deploy.validateIntunedProject)();
+  } = await (0, _save.validateIntunedProject)();
   if (!isValid) {
     const message = `^r^+Project to be deployed is not a valid Intuned project:^:^R ${errorMessage}:\n`;
     throw new _helpers.CLIError(message, {
@@ -37,7 +34,7 @@ const deployCommand = exports.deployCommand = _command.program.command("deploy")
   if (!_projectName) {
     throw new _helpers.CLIError("Project name is required");
   }
-  const projectNameValidation = (0, _deploy.validateProjectName)(_projectName);
+  const projectNameValidation = (0, _save.validateProjectName)(_projectName);
   if (!projectNameValidation.isValid) {
     throw new _helpers.CLIError(projectNameValidation.errorMessage);
   }

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

@@ -1,6 +1,7 @@
 export * from "./command";
 export * from "./build.command";
 export * from "./deploy.command";
+export * from "./save.command";
 export * from "./init.command";
 export * from "./run.command";
 export * from "./run_api.command";

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

@@ -36,6 +36,17 @@ Object.keys(_deploy).forEach(function (key) {
     }
   });
 });
+var _save = require("./save.command");
+Object.keys(_save).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _save[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _save[key];
+    }
+  });
+});
 var _init = require("./init.command");
 Object.keys(_init).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/dist/commands/intuned-cli/commands/run_authsession.command.d.ts

@@ -1,7 +1,8 @@
 export declare const baseRunAuthSessionCommandOptionsSchema: import("zod").ZodObject<{
     proxy: import("zod").ZodOptional<import("zod").ZodString>;
-    headless: import("zod").ZodDefault<import("zod").ZodBoolean>;
     timeout: import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodDefault<import("zod").ZodString>, import("ms").StringValue, string | undefined>, number, string | undefined>;
+    headless: import("zod").ZodDefault<import("zod").ZodBoolean>;
+} & {
     checkAttempts: import("zod").ZodDefault<import("zod").ZodNumber>;
     createAttempts: import("zod").ZodDefault<import("zod").ZodNumber>;
 }, "strip", import("zod").ZodTypeAny, {

package/dist/commands/intuned-cli/commands/save.command.d.ts

@@ -0,0 +1,12 @@
+import { z } from "zod";
+export declare const saveOrDeployCommandSchema: z.ZodTuple<[z.ZodUnion<[z.ZodString, z.ZodUndefined]>, z.ZodObject<{
+    workspaceId: z.ZodOptional<z.ZodString>;
+    apiKey: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    workspaceId?: string | undefined;
+    apiKey?: string | undefined;
+}, {
+    workspaceId?: string | undefined;
+    apiKey?: string | undefined;
+}>], null>;
+export declare const saveCommand: import("commander").Command;

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

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.saveOrDeployCommandSchema = exports.saveCommand = void 0;
+var _command = require("./command");
+var _dotenv = _interopRequireDefault(require("dotenv"));
+var _save = require("../controller/save");
+var _helpers = require("../helpers");
+var _zod = require("zod");
+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({
+  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 {
+    isValid,
+    errorMessage
+  } = await (0, _save.validateIntunedProject)();
+  if (!isValid) {
+    const message = `^r^+Project to be saved is not a valid Intuned project:^:^R ${errorMessage}:\n`;
+    throw new _helpers.CLIError(message, {
+      autoColor: false
+    });
+  }
+  const _projectName = projectName || (await (0, _helpers.getSettingIntunedJSON)("projectName"));
+  if (!_projectName) {
+    throw new _helpers.CLIError("Project name is required");
+  }
+  const projectNameValidation = (0, _save.validateProjectName)(_projectName);
+  if (!projectNameValidation.isValid) {
+    throw new _helpers.CLIError(projectNameValidation.errorMessage);
+  }
+  const auth = await (0, _helpers.getAuthCredentials)(options);
+  await (0, _save.runSaveProject)(_projectName, auth);
+}));

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

@@ -15,7 +15,7 @@ export declare const baseCommandOptionsSchema: z.ZodObject<{
     proxy?: string | undefined;
 }, {
     proxy?: string | undefined;
-    timeout?: string | undefined;
     headless?: boolean | undefined;
+    timeout?: string | undefined;
 }>;
 export type BaseCommandOptions = z.infer<typeof baseCommandOptionsSchema>;

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

@@ -84,8 +84,7 @@ _vitest.vi.mock("../../helpers", async importOriginal => {
           session: {
             type: "state",
             state: "auth"
-          },
-          runCheck: false
+          }
         },
         importFunction: _vitest.expect.anything()
       }));

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

@@ -159,8 +159,7 @@ async function attemptApi({
         session: {
           type: "state",
           state: auth
-        },
-        runCheck: false
+        }
       } : undefined,
       importFunction: _tsNodeImport.tsNodeImport,
       abortSignal

package/dist/commands/intuned-cli/controller/authSession.js

@@ -179,8 +179,7 @@ async function runCheck({
         session: {
           type: "state",
           state: auth
-        },
-        runCheck: false
+        }
       },
       importFunction: _tsNodeImport.tsNodeImport,
       abortSignal
@@ -241,7 +240,7 @@ async function runCheckWithRetries({
         return true;
       }
     } catch (error) {
-      if (error instanceof _runApi.AutomationError) {
+      if (error instanceof _runApi.RunAutomationError) {
         (0, _helpers.logAutomationError)(error);
       } else {
         throw error;
@@ -270,7 +269,7 @@ async function runCreateWithRetries({
       (0, _terminal.terminal)(`^+^gAuth session create succeeded^:\n`);
       break;
     } catch (error) {
-      if (error instanceof _runApi.AutomationError) {
+      if (error instanceof _runApi.RunAutomationError) {
         (0, _helpers.logAutomationError)(error);
       } else {
         throw error;

package/dist/commands/intuned-cli/controller/deploy.d.ts

@@ -1,15 +1,4 @@
 import { z } from "zod";
-import type { AuthCredentials, FileSystemTree } from "../types";
-export declare function convertProjectToCodeTree(projectPath: string): Promise<FileSystemTree>;
+import type { AuthCredentials } from "../types";
 export declare function runDeployProject(projectName: string, auth: AuthCredentials): Promise<void>;
 export declare const projectNameSchema: z.ZodEffects<z.ZodString, string, string>;
-export declare const validateProjectName: (projectName: string) => {
-    isValid: true;
-} | {
-    isValid: false;
-    errorMessage: string;
-};
-export declare const validateIntunedProject: () => Promise<{
-    isValid: boolean;
-    errorMessage?: string;
-}>;