@intuned/runtime-dev 0.1.0-test.35 → 0.1.0-test.36

package/InterfaceTemplate/index.ts

@@ -1 +1,5 @@
 import { runAutomationCLI } from "@intuned/runtime/dist/commands/interface/run";
+
+import { importModule } from "./utils";
+
+runAutomationCLI(importModule);

package/InterfaceTemplate/utils.ts

@@ -0,0 +1,257 @@
+import * as playwright from "@intuned/playwright-core";
+import { Handler, Response } from "@tinyhttp/app";
+import * as path from "path";
+import { getExecutionContext } from "@intuned/runtime";
+import { setTimeout } from "timers/promises";
+
+export class FunctionNotFoundError extends Error {
+  functionName: string;
+  path: string;
+  constructor(functionName: string, path: string) {
+    const message = `function ${functionName} not found in ${path}`;
+    super(message);
+    this.functionName = functionName;
+    this.path = path;
+    this.name = "FunctionNotFound";
+    Object.setPrototypeOf(this, FunctionNotFoundError.prototype);
+  }
+}
+
+export function getIsRetryableError(error: any) {
+  if (error?.message) {
+    return error.message.includes("ERR_NETWORK_CHANGED");
+  }
+  return false;
+}
+
+export function getErrorResponse(error: any): {
+  status: number;
+  body: any;
+} {
+  if (error instanceof FunctionNotFoundError) {
+    return {
+      status: 404,
+      body: {
+        message: error.message,
+        error: error.name,
+      },
+    };
+  }
+  if (error instanceof playwright.errors.TimeoutError) {
+    return {
+      status: 500,
+      body: { message: error.message, error: error.name },
+    };
+  }
+  /**
+   * here we use error.constructor.name instead of error instanceof RunError
+   * this is because the error is thrown by importing the runner from the api code on intuned app
+   * the definition of class RunError which is imported from here is different than the class RunError
+   * imported from the user.
+   */
+  if (error.constructor.name === "RunError") {
+    return {
+      status: 200,
+      body: {
+        status: error.options.status_code ?? 500,
+        message: error.message,
+        error: error.options.error_code ?? error.name,
+        intunedOptions: error.options,
+      },
+    };
+  }
+  return {
+    status: 500,
+    body: { error: error?.name ?? error, message: error?.message },
+  };
+}
+
+export function handlePlaywrightExecutionError(error: any, res: Response) {
+  const { status, body } = getErrorResponse(error);
+  return res.status(status).json(body);
+}
+
+type EventTraceEvent = {
+  type: "event";
+  time: number;
+  class: string;
+  method: string;
+  params: any;
+  pageId?: string;
+};
+
+type AppHandlerParams = Parameters<Handler>;
+
+export function errorRetryMiddleware(handler: Handler) {
+  return async (...args: AppHandlerParams) => {
+    let attempts = 1;
+    const [req, res, next] = args;
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+      try {
+        await handler(req, res, next);
+        break;
+      } catch (error) {
+        console.log(error?.name, error?.message);
+        if (!getIsRetryableError(error) || attempts >= 3) {
+          return handlePlaywrightExecutionError(error, res);
+        }
+        attempts++;
+      }
+    }
+  };
+}
+
+export function getTraceFilePath(runId: string, attemptNumber?: string) {
+  const fileName = `${runId}${attemptNumber ? `_${attemptNumber}` : ""}`;
+  return path.join(process.env.TRACES_DIRECTORY ?? "", `${fileName}.zip`);
+}
+
+export interface ProxyConfig {
+  username: string;
+  server: string;
+  password: string;
+}
+
+export function proxyToUrl(proxy: ProxyConfig) {
+  const url = new URL(proxy.server);
+  url.username = proxy.username;
+  url.password = proxy.password;
+  return url.toString();
+}
+
+export function isJobRunMachine() {
+  return process.env.JOB_ID && process.env.JOB_RUN_ID;
+}
+
+export function isHeadless() {
+  return process.env.INTUNED_PLAYWRIGHT_HEADLESS !== "0";
+}
+
+export abstract class AsyncRunEndpointController {
+  private static activeRequests: Set<string> = new Set();
+
+  static isRunning(taskToken: string) {
+    return this.activeRequests.has(taskToken);
+  }
+
+  static addRequest(taskToken: string) {
+    this.activeRequests.add(taskToken);
+  }
+
+  static removeRequest(taskToken: string) {
+    this.activeRequests.delete(taskToken);
+  }
+
+  static get activeRequestsCount() {
+    return this.activeRequests.size;
+  }
+}
+
+export async function waitWithExtendableTimeout<T>({
+  initialTimeout,
+  promise,
+  abortController,
+}: {
+  initialTimeout: number;
+  promise: Promise<T>;
+  abortController?: AbortController;
+}): Promise<
+  | {
+      timedOut: true;
+    }
+  | {
+      timedOut: false;
+      result: T;
+    }
+> {
+  const context = getExecutionContext()!;
+  if (context.timeoutInfo) {
+    context.timeoutInfo.timeoutTimestamp = Date.now() + initialTimeout;
+  }
+  const timerSymbol = Symbol("timer");
+  if (!context) {
+    const result = await Promise.race([
+      promise,
+      setTimeout(initialTimeout, timerSymbol),
+    ]);
+    if (result === timerSymbol) {
+      abortController?.abort("Timed out");
+      return { timedOut: true };
+    }
+    return { timedOut: false, result };
+  }
+
+  let taskTimeout = initialTimeout;
+  while (true as boolean) {
+    const result = await Promise.race([
+      promise,
+      setTimeout(taskTimeout, timerSymbol),
+    ]);
+
+    if (result !== timerSymbol) {
+      break;
+    }
+
+    const remainingTime =
+      (context.timeoutInfo?.timeoutTimestamp ?? 0) - Date.now();
+    if (remainingTime < 0) {
+      abortController?.abort("Timed out");
+      return { timedOut: true };
+    }
+
+    taskTimeout = remainingTime;
+  }
+
+  return {
+    timedOut: false,
+    result: await promise,
+  };
+}
+
+export async function importModule(path: string) {
+  const [folderName, ...functionNameParts] = path.split("/");
+  const functionNameDepth = functionNameParts.length;
+
+  // string literals should be inline
+  // currently we support only 5 levels of depth
+  // rollup dynamic import does not support multiple levels of dynamic imports so we need to specify the possible paths explicitly
+  try {
+    let imported: any = undefined;
+    switch (functionNameDepth) {
+      case 1:
+        imported = await import(`./${folderName}/${functionNameParts[0]}.ts`);
+        break;
+      case 2:
+        imported = await import(
+          `./${folderName}/${functionNameParts[0]}/${functionNameParts[1]}.ts`
+        );
+        break;
+      case 3:
+        imported = await import(
+          `./${folderName}/${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}.ts`
+        );
+        break;
+      case 4:
+        imported = await import(
+          `./${folderName}/${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}/${functionNameParts[3]}.ts`
+        );
+        break;
+      case 5:
+        imported = await import(
+          `./${folderName}/${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}/${functionNameParts[3]}/${functionNameParts[4]}.ts`
+        );
+        break;
+      default:
+        throw new Error(
+          "intuned supports maximum 5 levels of depth in the api folder"
+        );
+    }
+    return imported;
+  } catch (error: any) {
+    if (error.message.includes("Unknown variable dynamic import")) {
+      throw new FunctionNotFoundError("", path);
+    }
+    throw error;
+  }
+}

package/WebTemplate/utils.ts

@@ -210,9 +210,6 @@ export async function waitWithExtendableTimeout<T>({
 }
 
 export async function importModule(path: string) {
-  // cleanup environment variables before running the user code
-  // cleanEnvironmentVariables();
-
   const [folderName, ...functionNameParts] = path.split("/");
   const functionNameDepth = functionNameParts.length;
 

package/bin/intuned-api-run

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-void import("../dist/commands/api/run.js");
+require("../dist/commands/api/run.js");

package/bin/intuned-auth-session-check

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-void import("../dist/commands/auth-sessions/run-check.js");
+require("../dist/commands/auth-sessions/run-check.js");

package/bin/intuned-auth-session-create

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-void import("../dist/commands/auth-sessions/run-create.js");
+require("../dist/commands/auth-sessions/run-create.js");

package/bin/intuned-auth-session-load

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-void import("../dist/commands/auth-sessions/load.js");
+require("../dist/commands/auth-sessions/load.js");

package/bin/intuned-auth-session-refresh

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-void import("../dist/commands/auth-sessions/run-refresh.js");
+require("../dist/commands/auth-sessions/run-refresh.js");

package/bin/intuned-browser-save-state

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-void import("../dist/commands/browser/save-state.js");
+require("../dist/commands/browser/save-state.js");

package/bin/intuned-browser-start

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-void import("../dist/commands/browser/start-browser.js");
+require("../dist/commands/browser/start-browser.js");

package/bin/intuned-build

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-void import("../dist/commands/build.js");
+require("../dist/commands/build.js");

package/bin/intuned-ts-check

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-void import("../dist/commands/ts-check.js");
+require("../dist/commands/ts-check.js");

package/dist/commands/api/run.js

@@ -60,8 +60,8 @@ async function executeCLI(apiName, mode, inputData, options) {
     if (runApiResult.error instanceof _runApi.AutomationError) {
       throw runApiResult.error.error;
     }
-    console.error("An error occurred while running the API", runApiResult.error);
-    return;
+    console.error(runApiResult.error);
+    throw new Error("An error occurred while running the API");
   }
   const {
     result,

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

@@ -46,7 +46,11 @@ _commander.program.description("run auth session check").option("--cdpAddress <c
     importFunction: _tsNodeImport.tsNodeImport
   });
   if (runApiResult.isErr()) {
-    throw new Error(runApiResult.error);
+    if (runApiResult.error instanceof _runApi.AutomationError) {
+      throw runApiResult.error.error;
+    }
+    console.error(runApiResult.error);
+    throw new Error("Error running auth session check");
   }
   const result = runApiResult.value.result;
   console.log("check result", result);

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

@@ -63,8 +63,11 @@ _commander.program.description("run auth session create").option("--cdpAddress <
       } = await generator.next(...(nextGeneratorParam ? [nextGeneratorParam] : []));
       if (done) {
         if (value.isErr()) {
-          console.log(value.error);
-          throw new Error(value.error);
+          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) {

package/dist/commands/build.js

@@ -10,7 +10,7 @@ var _pluginDynamicImportVars = _interopRequireDefault(require("@rollup/plugin-dy
 var _pluginJson = _interopRequireDefault(require("@rollup/plugin-json"));
 var fs = _interopRequireWildcard(require("fs-extra"));
 var path = _interopRequireWildcard(require("path"));
-var _webTemplate = require("./common/utils/webTemplate.js");
+var _template = require("./common/utils/template");
 var _dotenv = _interopRequireDefault(require("dotenv"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -21,18 +21,20 @@ function isThirdPartyWarning(warning) {
   return false;
 }
 _dotenv.default.config();
-_commander.program.description("build the intuned server").addArgument(new _commander.Argument("<mode>", "mode of execution").choices(["vanilla", "playwright"]).default("playwright").argOptional()).argument("[outfile]", "output bundle", "./output/bundle_v2.js").allowUnknownOption().action(async (mode, outfile) => {
-  await (0, _webTemplate.moveWebTemplateFiles)();
+_commander.program.description("build the intuned server").addArgument(new _commander.Argument("<mode>", "mode of execution").choices(["vanilla", "playwright"]).default("playwright").argOptional()).argument("[outfile]", "output bundle", "./output/bundle_v2.js").option("--template", "template to use", "WebTemplate").allowUnknownOption().action(async (mode, outfile, {
+  template
+}) => {
+  await (0, _template.moveTemplateFiles)(template);
   const currentTemplateTsConfig = path.resolve(path.dirname(__filename), "..", "..", "template.tsconfig.json");
-  await fs.copy(currentTemplateTsConfig, "./intuned/WebTemplate/tsconfig.json");
-  await build(outfile, mode);
+  await fs.copy(currentTemplateTsConfig, `./intuned/${template}/tsconfig.json`);
+  await build(outfile, mode, template);
 });
-async function build(outfile, mode) {
+async function build(outfile, mode, template) {
   let bundle = null;
   let buildFailed = false;
   try {
     bundle = await (0, _rollup.rollup)({
-      input: `./intuned/WebTemplate/index.${mode}.ts`,
+      input: `./intuned/${template}/index.${mode}.ts`,
       output: {
         globals: {
           crypto: "crypto"
@@ -42,9 +44,9 @@ async function build(outfile, mode) {
         exportConditions: ["node"],
         preferBuiltins: true
       }), (0, _pluginTypescript.default)({
-        tsconfig: "./intuned/WebTemplate/tsconfig.json"
+        tsconfig: `./intuned/${template}/tsconfig.json`
       }), (0, _pluginCommonjs.default)({
-        include: ["node_modules/**", "intuned/WebTemplate/**", "dist", "../typescript-sdk/**", "../typescript-runtime/**"],
+        include: ["node_modules/**", `intuned/${template}/**`, "dist", "../typescript-sdk/**", "../typescript-runtime/**"],
         extensions: [".js"],
         ignoreGlobal: false,
         sourceMap: false,

package/dist/commands/common/browserUtils.js

@@ -11,7 +11,7 @@ exports.startOrRestartBrowser = startOrRestartBrowser;
 var _child_process = require("child_process");
 var playwright = _interopRequireWildcard(require("@intuned/playwright-core"));
 var fs = _interopRequireWildcard(require("fs-extra"));
-var _fileUtils = require("./utils/fileUtils.js");
+var _fileUtils = require("./utils/fileUtils");
 var _contextStorageStateHelpers = require("../../common/contextStorageStateHelpers");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

package/dist/commands/common/getFirstLineNumber.test.js

@@ -1,14 +1,14 @@
 "use strict";
 
 var _vitest = require("vitest");
-var _getFirstLineNumber = _interopRequireDefault(require("./getFirstLineNumber.js"));
+var _getFirstLineNumber = _interopRequireDefault(require("./getFirstLineNumber"));
 var fs = _interopRequireWildcard(require("fs"));
 var path = _interopRequireWildcard(require("path"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 (0, _vitest.describe)("getFirstLineNumber", () => {
-  const testFilesDir = path.join(path.dirname(__filename), "testFiles");
+  const testFilesDir = path.join(__dirname, "testFiles");
   const createTestFile = (fileName, content) => {
     const filePath = path.join(testFilesDir, fileName);
     fs.writeFileSync(filePath, content);

package/dist/commands/common/utils/settings.js

@@ -4,15 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getSettings = getSettings;
-var _fileUtils = require("./fileUtils.js");
+var _fileUtils = require("./fileUtils");
 var _settingsSchema = require("../../../common/settingsSchema");
-var _fsExtra = require("fs-extra");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 async function getSettings() {
   const settingsFilePath = (0, _fileUtils.getFullPathInProject)("Intuned.json");
   console.log("loading settings");
-  const settings = await (0, _fsExtra.readJSON)(settingsFilePath);
-  if (settings) {
-    const parsed = _settingsSchema.settingsSchema.safeParse(settings);
+  const settings = await (specifier => new Promise(r => r(`${specifier}`)).then(s => _interopRequireWildcard(require(s))))(settingsFilePath);
+  if (settings.default) {
+    const parsed = _settingsSchema.settingsSchema.safeParse(settings.default);
     if (parsed.success) {
       return parsed.data;
     } else {

package/dist/commands/common/utils/template.d.ts

@@ -0,0 +1,2 @@
+export type TemplateName = "WebTemplate" | "InterfaceTemplate";
+export declare const moveTemplateFiles: (templateName: TemplateName) => Promise<void>;

package/dist/commands/common/utils/{webTemplate.js → template.js}

@@ -3,18 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.moveWebTemplateFiles = void 0;
+exports.moveTemplateFiles = void 0;
 var fs = _interopRequireWildcard(require("fs-extra"));
 var path = _interopRequireWildcard(require("path"));
-var _fileUtils = require("./fileUtils.js");
+var _fileUtils = require("./fileUtils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const moveWebTemplateFiles = async () => {
+const moveTemplateFiles = async templateName => {
   await fs.remove("./intuned");
   await fs.ensureDir("./intuned");
-  const currentFileLocation = path.resolve(path.dirname(__filename), "..", "..", "..", "..", "WebTemplate");
-  await fs.copy(`${currentFileLocation}`, "./intuned/WebTemplate", {
-    filter: (src, dest) => {
+  const currentFileLocation = path.resolve(__dirname, "..", "..", "..", "..", templateName);
+  await fs.copy(`${currentFileLocation}`, `./intuned/${templateName}`, {
+    filter: (src, _) => {
       if (src.includes(".d.ts")) {
         return false;
       }
@@ -25,7 +25,7 @@ const moveWebTemplateFiles = async () => {
   const pathsIgnoreList = [(0, _fileUtils.getFullPathInProject)("intuned"), (0, _fileUtils.getFullPathInProject)("node_modules"), (0, _fileUtils.getFullPathInProject)("package.json"), (0, _fileUtils.getFullPathInProject)("yarn.lock"), (0, _fileUtils.getFullPathInProject)(".env")];
   const filesToCopy = filesAndFolders.filter(file => !pathsIgnoreList.includes(file.fullPath));
   for (const file of filesToCopy) {
-    await fs.copy(file.fullPath, `./intuned/WebTemplate/${file.name}`);
+    await fs.copy(file.fullPath, `./intuned/${templateName}/${file.name}`);
   }
 };
-exports.moveWebTemplateFiles = moveWebTemplateFiles;
+exports.moveTemplateFiles = moveTemplateFiles;

package/dist/commands/interface/run.js

@@ -11,11 +11,11 @@ var _asyncLocalStorage = require("../../common/asyncLocalStorage");
 var net = _interopRequireWildcard(require("net"));
 var _zod = _interopRequireDefault(require("zod"));
 var _runApi = require("../../common/runApi");
-var _enums = require("src/runtime/enums");
+var _enums = require("../../runtime/enums");
 var _unixSocket = require("../common/utils/unixSocket");
 var _promises = require("timers/promises");
-var _jwtTokenManager = require("src/common/jwtTokenManager");
-var _formatZodError = require("src/common/formatZodError");
+var _jwtTokenManager = require("../../common/jwtTokenManager");
+var _formatZodError = require("../../common/formatZodError");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/dist/commands/ts-check.js

@@ -5,17 +5,19 @@ var ts = _interopRequireWildcard(require("typescript"));
 var _commander = require("commander");
 var fs = _interopRequireWildcard(require("fs-extra"));
 var path = _interopRequireWildcard(require("path"));
-var _webTemplate = require("./common/utils/webTemplate.js");
+var _template = require("./common/utils/template");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-_commander.program.description("Check TypeScript types in the project").allowUnknownOption().action(async () => {
-  await (0, _webTemplate.moveWebTemplateFiles)();
-  const templateTsConfig = path.resolve(path.dirname(__filename), "..", "..", "template.tsconfig.json");
-  await fs.copy(templateTsConfig, "./intuned/WebTemplate/tsconfig.json");
-  checkTypes();
+_commander.program.description("Check TypeScript types in the project").option("--template", "template to use", "WebTemplate").allowUnknownOption().action(async ({
+  template
+}) => {
+  await (0, _template.moveTemplateFiles)(template);
+  const templateTsConfig = path.resolve(__dirname, "..", "..", "template.tsconfig.json");
+  await fs.copy(templateTsConfig, `./intuned/${template}/tsconfig.json`);
+  checkTypes(template);
 });
-function checkTypes() {
-  const configPath = ts.findConfigFile("./intuned/WebTemplate", ts.sys.fileExists, "tsconfig.json");
+function checkTypes(template) {
+  const configPath = ts.findConfigFile(`./intuned/${template}`, ts.sys.fileExists, "tsconfig.json");
   if (!configPath) {
     console.error("Could not find a valid 'tsconfig.json'.");
     process.exit(1);

package/dist/common/Logger/Logger/index.d.ts

@@ -1,4 +1,4 @@
-import { LogEntry, LogMetadata } from "./types.js";
+import { LogEntry, LogMetadata } from "./types";
 declare class Logger {
     logFunction(entry: LogEntry): void;
     private log;

package/dist/common/Logger/index.d.ts

@@ -1,4 +1,4 @@
-import { LogEntry, LogMetadata } from "./types.js";
+import { LogEntry, LogMetadata } from "./types";
 declare class Logger {
     logFunction(entry: LogEntry): void;
     private log;

package/dist/common/getPlaywrightConstructs.d.ts

@@ -1,5 +1,5 @@
 import * as playwright from "@intuned/playwright-core";
-import type { RunApiSession } from "./runApi/index.js";
+import type { RunApiSession } from "./runApi";
 interface Proxy {
     server: string;
     username: string;

package/dist/common/getPlaywrightConstructs.js

@@ -10,7 +10,7 @@ exports.loadSessionToContext = loadSessionToContext;
 var playwright = _interopRequireWildcard(require("@intuned/playwright-core"));
 var _fsExtra = _interopRequireWildcard(require("fs-extra"));
 var fs = _fsExtra;
-var _contextStorageStateHelpers = require("./contextStorageStateHelpers.js");
+var _contextStorageStateHelpers = require("./contextStorageStateHelpers");
 var _path = _interopRequireWildcard(require("path"));
 var _fileUtils = require("../commands/common/utils/fileUtils");
 var _waitOn = _interopRequireDefault(require("wait-on"));
@@ -75,7 +75,7 @@ async function getProductionPlaywrightConstructs({
       session: storageState
     });
   }
-  const assetsFile = _path.default.join(_path.default.dirname(__filename), "./assets/browser_scripts.js");
+  const assetsFile = _path.default.join(__dirname, "./assets/browser_scripts.js");
   await context.addInitScript({
     path: assetsFile
   });
@@ -103,7 +103,7 @@ async function getPlaywrightConstructsForMode(mode, cdpAddress, authSession) {
     if (!context) {
       throw new Error("no context found");
     }
-    const assetsFile = _path.default.join(_path.default.dirname(__filename), "./assets/browser_scripts.js");
+    const assetsFile = _path.default.join(__dirname, "./assets/browser_scripts.js");
     await context.addInitScript({
       path: assetsFile
     });

package/dist/common/runApi/errors.d.ts

@@ -1,5 +1,5 @@
-import { RunAutomationResponse } from "./types.js";
-import { RunErrorOptions } from "src/runtime/export";
+import { RunAutomationResponse } from "./types";
+import { RunErrorOptions } from "../../runtime/export";
 export declare const apiNotFoundErrorCode = "APINotFoundError";
 export declare const invalidApiErrorCode = "InvalidAPIError";
 export declare const invalidCheckErrorCode = "InvalidCheckError";

package/dist/common/runApi/index.d.ts

@@ -1,9 +1,9 @@
 import { Result } from "neverthrow";
-import { RunAutomationError } from "./errors.js";
+import { RunAutomationError } from "./errors";
 import { Page, BrowserContext } from "@intuned/playwright-core";
-import { ExtendedRunApiParameters, RunApiResult, RunApiResultWithSessionOk } from "./types.js";
-export * from "./types.js";
-export * from "./errors.js";
+import { ExtendedRunApiParameters, RunApiResult, RunApiResultWithSessionOk } from "./types";
+export * from "./types";
+export * from "./errors";
 export declare function runApiGenerator<ResultType = any, _YieldType = any, _NextType = any>(params: ExtendedRunApiParameters & {
     retrieveSession: true;
 }): AsyncGenerator<_YieldType, RunApiResult<ResultType, RunApiResultWithSessionOk>, _NextType>;

package/dist/common/runApi/index.js

@@ -17,7 +17,7 @@ var _fsExtra = _interopRequireWildcard(require("fs-extra"));
 var fs = _fsExtra;
 var _contextStorageStateHelpers = require("../contextStorageStateHelpers");
 var _neverthrow = require("neverthrow");
-var _errors = require("./errors.js");
+var _errors = require("./errors");
 Object.keys(_errors).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -31,7 +31,7 @@ Object.keys(_errors).forEach(function (key) {
 });
 var _constants = require("../constants");
 var _getPlaywrightConstructs = require("../getPlaywrightConstructs");
-var _types = require("./types.js");
+var _types = require("./types");
 Object.keys(_types).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -44,6 +44,7 @@ Object.keys(_types).forEach(function (key) {
   });
 });
 var _formatZodError = require("../formatZodError");
+var _cleanEnvironmentVariables = require("../cleanEnvironmentVariables");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 async function* runApiGenerator({
@@ -147,7 +148,8 @@ async function* runApiGenerator({
         return (0, _neverthrow.err)(new _errors.AuthCheckFailedError());
       }
     }
-    const args = [...(automationFunction.params ? [automationFunction.params] : []), page, context];
+    (0, _cleanEnvironmentVariables.cleanEnvironmentVariables)();
+    const args = [...(automationFunction.params !== undefined ? [automationFunction.params] : []), page, context];
     const validatedModuleResult = await importUsingImportFunction(automationFunction.name, importFunction);
     if (validatedModuleResult.isErr()) {
       return validatedModuleResult;
@@ -189,7 +191,6 @@ async function* runApiGenerator({
       return result.value;
     }
   } catch (error) {
-    console.log("run errored", error);
     return (0, _neverthrow.err)(new _errors.AutomationError(error));
   } finally {
     await saveTraceIfNeeded({

package/dist/common/runApi/types.d.ts

@@ -1,7 +1,7 @@
 import type { IntunedStorageState } from "../contextStorageStateHelpers";
 import type { Payload } from "../../runtime/export";
 import type { Result } from "neverthrow";
-import type { RunAutomationError } from "./errors.js";
+import type { RunAutomationError } from "./errors";
 import z from "zod";
 export interface PayloadToAppend {
     apiName: string;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { extendPayload, extendTimeout, runInfo, RunError, requestMultipleChoice, requestOTP, } from "./runtime/index.js";
-export { runWithContext, getExecutionContext, } from "./common/asyncLocalStorage/index.js";
-export { getDownloadDirectoryPath } from "./runtime/downloadDirectory.js";
-export { getProductionPlaywrightConstructs } from "./common/getPlaywrightConstructs.js";
+export { extendPayload, extendTimeout, runInfo, RunError, requestMultipleChoice, requestOTP, } from "./runtime";
+export { runWithContext, getExecutionContext, } from "./common/asyncLocalStorage";
+export { getDownloadDirectoryPath } from "./runtime/downloadDirectory";
+export { getProductionPlaywrightConstructs } from "./common/getPlaywrightConstructs";

package/dist/index.js

@@ -6,19 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "RunError", {
   enumerable: true,
   get: function () {
-    return _index.RunError;
+    return _runtime.RunError;
   }
 });
 Object.defineProperty(exports, "extendPayload", {
   enumerable: true,
   get: function () {
-    return _index.extendPayload;
+    return _runtime.extendPayload;
   }
 });
 Object.defineProperty(exports, "extendTimeout", {
   enumerable: true,
   get: function () {
-    return _index.extendTimeout;
+    return _runtime.extendTimeout;
   }
 });
 Object.defineProperty(exports, "getDownloadDirectoryPath", {
@@ -30,7 +30,7 @@ Object.defineProperty(exports, "getDownloadDirectoryPath", {
 Object.defineProperty(exports, "getExecutionContext", {
   enumerable: true,
   get: function () {
-    return _index2.getExecutionContext;
+    return _asyncLocalStorage.getExecutionContext;
   }
 });
 Object.defineProperty(exports, "getProductionPlaywrightConstructs", {
@@ -42,28 +42,28 @@ Object.defineProperty(exports, "getProductionPlaywrightConstructs", {
 Object.defineProperty(exports, "requestMultipleChoice", {
   enumerable: true,
   get: function () {
-    return _index.requestMultipleChoice;
+    return _runtime.requestMultipleChoice;
   }
 });
 Object.defineProperty(exports, "requestOTP", {
   enumerable: true,
   get: function () {
-    return _index.requestOTP;
+    return _runtime.requestOTP;
   }
 });
 Object.defineProperty(exports, "runInfo", {
   enumerable: true,
   get: function () {
-    return _index.runInfo;
+    return _runtime.runInfo;
   }
 });
 Object.defineProperty(exports, "runWithContext", {
   enumerable: true,
   get: function () {
-    return _index2.runWithContext;
+    return _asyncLocalStorage.runWithContext;
   }
 });
-var _index = require("./runtime/index.js");
-var _index2 = require("./common/asyncLocalStorage/index.js");
-var _downloadDirectory = require("./runtime/downloadDirectory.js");
-var _getPlaywrightConstructs = require("./common/getPlaywrightConstructs.js");
+var _runtime = require("./runtime");
+var _asyncLocalStorage = require("./common/asyncLocalStorage");
+var _downloadDirectory = require("./runtime/downloadDirectory");
+var _getPlaywrightConstructs = require("./common/getPlaywrightConstructs");

package/dist/runtime/RunError.d.ts

@@ -1,4 +1,4 @@
-import { RunErrorOptions } from "./export.js";
+import { RunErrorOptions } from "./export";
 export declare class RunError extends Error {
     options: RunErrorOptions;
     constructor(message: string, options?: RunErrorOptions);

package/dist/runtime/executionHelpers.test.js

@@ -2,8 +2,8 @@
 
 var _vitest = require("vitest");
 var _asyncLocalStorage = require("../common/asyncLocalStorage");
-var _index = require("./index.js");
-var _enums = require("./enums.js");
+var _ = require(".");
+var _enums = require("./enums");
 (0, _vitest.describe)("Execution Helpers", () => {
   (0, _vitest.it)("should be able to get execution info", () => {
     (0, _asyncLocalStorage.runWithContext)({
@@ -11,7 +11,7 @@ var _enums = require("./enums.js");
       runId: "test-run-id",
       extendedPayloads: []
     }, () => {
-      (0, _vitest.expect)((0, _index.runInfo)().runId).toEqual("test-run-id");
+      (0, _vitest.expect)((0, _.runInfo)().runId).toEqual("test-run-id");
     });
   });
   (0, _vitest.it)("should be able to mutate extendedPayloads and get the accmulated value at the end ", () => {
@@ -26,7 +26,7 @@ var _enums = require("./enums.js");
     }, () => {
       var _getExecutionContext, _getExecutionContext2;
       (0, _vitest.expect)((_getExecutionContext = (0, _asyncLocalStorage.getExecutionContext)()) === null || _getExecutionContext === void 0 ? void 0 : _getExecutionContext.extendedPayloads).toEqual([]);
-      (0, _index.extendPayload)({
+      (0, _.extendPayload)({
         api: "test-api",
         parameters: {}
       });
@@ -34,15 +34,15 @@ var _enums = require("./enums.js");
         api: "test-api",
         parameters: {}
       }]);
-      (0, _index.extendPayload)({
+      (0, _.extendPayload)({
         api: "test-api",
         parameters: {}
       });
-      (0, _index.extendPayload)({
+      (0, _.extendPayload)({
         api: "test-api",
         parameters: {}
       });
-      (0, _index.extendPayload)({
+      (0, _.extendPayload)({
         api: "test-api",
         parameters: {}
       });

package/dist/runtime/export.d.ts

@@ -1,4 +1,4 @@
-import { RunEnvironment } from "./enums.js";
+import { RunEnvironment } from "./enums";
 
 /**
  * ## Description

package/dist/runtime/extendPayload.d.ts

@@ -1,2 +1,2 @@
-import { Payload } from "./export.js";
+import { Payload } from "./export";
 export declare function extendPayload(payload: Payload | Payload[]): void;

package/dist/runtime/extendPayload.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.extendPayload = extendPayload;
 var _asyncLocalStorage = require("../common/asyncLocalStorage");
-var _extendTimeout = require("./extendTimeout.js");
+var _extendTimeout = require("./extendTimeout");
 function extendPayload(payload) {
   const context = (0, _asyncLocalStorage.getExecutionContext)();
   if (!context) {

package/dist/runtime/index.d.ts

@@ -1,7 +1,7 @@
-export { extendPayload } from "./extendPayload.js";
-export { extendTimeout } from "./extendTimeout.js";
-export { runInfo } from "./runInfo.js";
-export { RunError } from "./RunError.js";
-export { requestMultipleChoice, requestOTP } from "./requestMoreInfo.js";
-export type { RequestMoreInfoDetails } from "./requestMoreInfo.js";
-export { getDownloadDirectoryPath } from "./downloadDirectory.js";
+export { extendPayload } from "./extendPayload";
+export { extendTimeout } from "./extendTimeout";
+export { runInfo } from "./runInfo";
+export { RunError } from "./RunError";
+export { requestMultipleChoice, requestOTP } from "./requestMoreInfo";
+export type { RequestMoreInfoDetails } from "./requestMoreInfo";
+export { getDownloadDirectoryPath } from "./downloadDirectory";

package/dist/runtime/index.js

@@ -45,9 +45,9 @@ Object.defineProperty(exports, "runInfo", {
     return _runInfo.runInfo;
   }
 });
-var _extendPayload = require("./extendPayload.js");
-var _extendTimeout = require("./extendTimeout.js");
-var _runInfo = require("./runInfo.js");
-var _RunError = require("./RunError.js");
-var _requestMoreInfo = require("./requestMoreInfo.js");
-var _downloadDirectory = require("./downloadDirectory.js");
+var _extendPayload = require("./extendPayload");
+var _extendTimeout = require("./extendTimeout");
+var _runInfo = require("./runInfo");
+var _RunError = require("./RunError");
+var _requestMoreInfo = require("./requestMoreInfo");
+var _downloadDirectory = require("./downloadDirectory");

package/dist/runtime/runInfo.d.ts

@@ -1,2 +1,2 @@
-import { RunInfo } from "./export.js";
+import { RunInfo } from "./export";
 export declare function runInfo(): RunInfo;

package/dist/runtime/runInfo.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.runInfo = runInfo;
 var _asyncLocalStorage = require("../common/asyncLocalStorage");
-var _enums = require("./enums.js");
+var _enums = require("./enums");
 function runInfo() {
   const context = (0, _asyncLocalStorage.getExecutionContext)();
   if (!context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "0.1.0-test.35",
+  "version": "0.1.0-test.36",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",
@@ -12,7 +12,8 @@
     "./dist/common/jwtTokenManager": "./dist/common/jwtTokenManager.js",
     "./dist/common/asyncLocalStorage": "./dist/common/asyncLocalStorage/index.js",
     "./dist/common/cleanEnvironmentVariables": "./dist/common/cleanEnvironmentVariables.js",
-    "./dist/common/constants": "./dist/common/constants.js"
+    "./dist/common/constants": "./dist/common/constants.js",
+    "./dist/commands/interface/run": "./dist/commands/interface/run.js"
   },
   "types": "./dist/index.d.ts",
   "author": "Intuned Team",

package/tsconfig.json

@@ -3,7 +3,7 @@
     "target": "es2021",
     "module": "esnext",
     "esModuleInterop": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "outDir": "./dist",
     "strict": false,
@@ -12,8 +12,7 @@
     "sourceMap": false,
     "declaration": true,
     "emitDeclarationOnly": false,
-    "skipLibCheck": true,
-    "baseUrl": "./"
+    "skipLibCheck": true
   },
   "include": [
     "src/**/*.ts",

package/dist/commands/common/utils/webTemplate.d.ts

@@ -1 +0,0 @@
-export declare const moveWebTemplateFiles: () => Promise<void>;