@intuned/runtime-dev 0.1.0-test.43 → 0.1.0-test.45

package/InterfaceTemplate/utils.ts

@@ -1,214 +1,3 @@
-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;
@@ -216,42 +5,35 @@ export async function importModule(path: string) {
   // 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;
+  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;
 }

package/WebTemplate/controllers/authSessions/check.ts

@@ -36,7 +36,7 @@ export async function checkAuthSession({
       name: "auth-sessions/check",
     },
     runOptions: {
-      environment: "deployed",
+      environment: "standalone",
       headless: isHeadless(),
       proxy,
     },

package/WebTemplate/controllers/authSessions/create.ts

@@ -63,7 +63,7 @@ export async function createAuthSession({
         }
       : { enabled: false },
     runOptions: {
-      environment: "deployed",
+      environment: "standalone",
       headless,
       proxy,
     },

package/WebTemplate/controllers/runApi/helpers.ts

@@ -82,7 +82,7 @@ export async function runApi({
           }
         : undefined,
       runOptions: {
-        environment: "deployed",
+        environment: "standalone",
         headless,
         proxy,
       },

package/dist/commands/api/run.js

@@ -50,7 +50,7 @@ async function executeCLI(apiName, mode, inputData, options) {
       runCheck: false
     } : undefined,
     runOptions: {
-      environment: "ide",
+      environment: "cdp",
       cdpAddress: options.cdpAddress,
       mode
     },

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

@@ -32,7 +32,7 @@ _commander.program.description("run auth session check").option("--cdpAddress <c
       name: `${_constants.AUTH_SESSIONS_FOLDER_NAME}/check`
     },
     runOptions: {
-      environment: "ide",
+      environment: "cdp",
       mode,
       cdpAddress
     },

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

@@ -48,7 +48,7 @@ _commander.program.description("run auth session create").option("--cdpAddress <
         params: inputData
       },
       runOptions: {
-        environment: "ide",
+        environment: "cdp",
         mode,
         cdpAddress
       },

package/dist/commands/interface/run.js

@@ -54,7 +54,7 @@ _dotenv.default.config({
 function runAutomationCLI(importFunction) {
   _commander.program.description("run user automation and communicate using unix socket").argument("<socket-path>", "path to unix socket").action(async socketPath => {
     let context;
-    const throttleTime = 1_000;
+    const throttleTime = 60 * 1000;
     let timeoutTimestamp = Date.now();
     const client = net.createConnection(socketPath);
     let generator = null;
@@ -130,7 +130,7 @@ function runAutomationCLI(importFunction) {
         });
         context = {
           extendedPayloads: [],
-          runEnvironment: input.parameters.runOptions.environment === "deployed" ? _enums.RunEnvironment.DEPLOYED : _enums.RunEnvironment.IDE,
+          runEnvironment: input.parameters.runOptions.environment === "standalone" ? _enums.RunEnvironment.DEPLOYED : _enums.RunEnvironment.IDE,
           timeoutInfo: {
             extendTimeoutCallback: async () => {
               if (Date.now() - timeoutTimestamp < throttleTime) return;
@@ -172,7 +172,7 @@ function runAutomationCLI(importFunction) {
   _commander.program.parse(process.argv);
 }
 function getProxyUrlFromRunOptions(runOptions) {
-  if ((runOptions === null || runOptions === void 0 ? void 0 : runOptions.environment) !== "deployed") return undefined;
+  if ((runOptions === null || runOptions === void 0 ? void 0 : runOptions.environment) !== "standalone") return undefined;
   const proxy = runOptions.proxy;
   if (!proxy) return undefined;
   const url = new URL(proxy.server);

package/dist/common/runApi/index.js

@@ -67,7 +67,7 @@ async function* runApiGenerator({
   let page;
   let context;
   let downloadsPath;
-  if (runOptions.environment === "deployed") {
+  if (runOptions.environment === "standalone") {
     downloadsPath = (0, _downloadDirectory.getDownloadDirectoryPath)();
     const {
       headless,
@@ -236,7 +236,7 @@ async function checkAuthSessionWithRetries(page, context, importFunction, retrie
 }
 async function importUsingImportFunction(path, importFunction) {
   try {
-    const imported = importFunction ? await importFunction(path) : await (specifier => new Promise(r => r(specifier)).then(s => _interopRequireWildcard(require(s))))(`./${path}.ts`);
+    const imported = importFunction ? await importFunction(path) : await (specifier => new Promise(r => r(specifier)).then(s => _interopRequireWildcard(require(s))))(`../../../${path}.ts`);
     if (!imported || !imported.default || !imported.default.constructor) {
       return (0, _neverthrow.err)(new _errors.InvalidApiError("API file path does not have a default export"));
     }
@@ -254,6 +254,7 @@ async function importUsingImportFunction(path, importFunction) {
     }
     return (0, _neverthrow.err)(new _errors.InvalidApiError("API file path does not have a default async function/generator export"));
   } catch (error) {
+    console.error(error);
     return (0, _neverthrow.err)(new _errors.ApiNotFoundError(path));
   }
 }

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

@@ -520,7 +520,7 @@ export declare const runApiParametersSchema: z.ZodObject<{
         runCheck?: boolean | undefined;
     }>>;
     runOptions: z.ZodDefault<z.ZodDiscriminatedUnion<"environment", [z.ZodObject<{
-        environment: z.ZodLiteral<"deployed">;
+        environment: z.ZodLiteral<"standalone">;
         headless: z.ZodDefault<z.ZodBoolean>;
         proxy: z.ZodOptional<z.ZodObject<{
             server: z.ZodString;
@@ -536,7 +536,7 @@ export declare const runApiParametersSchema: z.ZodObject<{
             password: string;
         }>>;
     }, "strip", z.ZodTypeAny, {
-        environment: "deployed";
+        environment: "standalone";
         headless: boolean;
         proxy?: {
             server: string;
@@ -544,7 +544,7 @@ export declare const runApiParametersSchema: z.ZodObject<{
             password: string;
         } | undefined;
     }, {
-        environment: "deployed";
+        environment: "standalone";
         headless?: boolean | undefined;
         proxy?: {
             server: string;
@@ -552,16 +552,16 @@ export declare const runApiParametersSchema: z.ZodObject<{
             password: string;
         } | undefined;
     }>, z.ZodObject<{
-        environment: z.ZodLiteral<"ide">;
+        environment: z.ZodLiteral<"cdp">;
         cdpAddress: z.ZodString;
         mode: z.ZodUnion<[z.ZodLiteral<"vanilla">, z.ZodLiteral<"playwright">, z.ZodLiteral<"playwright-standalone">, z.ZodLiteral<"playwright-headless">]>;
     }, "strip", z.ZodTypeAny, {
         mode: "vanilla" | "playwright" | "playwright-standalone" | "playwright-headless";
-        environment: "ide";
+        environment: "cdp";
         cdpAddress: string;
     }, {
         mode: "vanilla" | "playwright" | "playwright-standalone" | "playwright-headless";
-        environment: "ide";
+        environment: "cdp";
         cdpAddress: string;
     }>]>>;
     retrieveSession: z.ZodDefault<z.ZodBoolean>;
@@ -577,7 +577,7 @@ export declare const runApiParametersSchema: z.ZodObject<{
         filePath: string;
     };
     runOptions: {
-        environment: "deployed";
+        environment: "standalone";
         headless: boolean;
         proxy?: {
             server: string;
@@ -586,7 +586,7 @@ export declare const runApiParametersSchema: z.ZodObject<{
         } | undefined;
     } | {
         mode: "vanilla" | "playwright" | "playwright-standalone" | "playwright-headless";
-        environment: "ide";
+        environment: "cdp";
         cdpAddress: string;
     };
     retrieveSession: boolean;
@@ -672,7 +672,7 @@ export declare const runApiParametersSchema: z.ZodObject<{
         runCheck?: boolean | undefined;
     } | undefined;
     runOptions?: {
-        environment: "deployed";
+        environment: "standalone";
         headless?: boolean | undefined;
         proxy?: {
             server: string;
@@ -681,7 +681,7 @@ export declare const runApiParametersSchema: z.ZodObject<{
         } | undefined;
     } | {
         mode: "vanilla" | "playwright" | "playwright-standalone" | "playwright-headless";
-        environment: "ide";
+        environment: "cdp";
         cdpAddress: string;
     } | undefined;
     retrieveSession?: boolean | undefined;

package/dist/common/runApi/types.js

@@ -56,7 +56,7 @@ const runApiParametersSchema = exports.runApiParametersSchema = _zod.default.obj
     runCheck: _zod.default.boolean().default(false)
   }).optional(),
   runOptions: _zod.default.discriminatedUnion("environment", [_zod.default.object({
-    environment: _zod.default.literal("deployed"),
+    environment: _zod.default.literal("standalone"),
     headless: _zod.default.boolean().default(true),
     proxy: _zod.default.object({
       server: _zod.default.string(),
@@ -64,11 +64,11 @@ const runApiParametersSchema = exports.runApiParametersSchema = _zod.default.obj
       password: _zod.default.string()
     }).optional()
   }), _zod.default.object({
-    environment: _zod.default.literal("ide"),
+    environment: _zod.default.literal("cdp"),
     cdpAddress: _zod.default.string(),
     mode: _zod.default.union([_zod.default.literal("vanilla"), _zod.default.literal("playwright"), _zod.default.literal("playwright-standalone"), _zod.default.literal("playwright-headless")])
   })]).default({
-    environment: "deployed"
+    environment: "standalone"
   }),
   retrieveSession: _zod.default.boolean().default(false)
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "0.1.0-test.43",
+  "version": "0.1.0-test.45",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",