@intuned/runtime-dev 1.0.6-playwright-1.46.0 → 1.0.6-test-ping.0

package/InterfaceTemplate/utils.ts

@@ -1,4 +1,7 @@
-export async function importModule(path: string) {
+import type { ImportFunction } from "@intuned/runtime/dist/common/runApi";
+import { err, ok } from "neverthrow";
+
+export const importModule: ImportFunction = async (path: string) => {
   const [folderName, ...functionNameParts] = path.split("/");
   const functionNameDepth = functionNameParts.length;
 
@@ -6,34 +9,53 @@ export async function importModule(path: string) {
   // 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
   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"
-      );
+  try {
+    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:
+        return err({
+          type: "other",
+          error: new Error(
+            `intuned supports maximum 5 levels of depth in the api folder`
+          ),
+        });
+    }
+    return ok(imported);
+  } catch (e: any) {
+    if (
+      "message" in e &&
+      typeof e.message === "string" &&
+      e.message.includes("Unknown variable dynamic import")
+    ) {
+      return err({
+        type: "not_found",
+      });
+    }
+    return err({
+      type: "other",
+      error: e,
+    });
   }
-  return imported;
-}
+};

package/dist/commands/common/tsNodeImport.d.ts

@@ -1 +1,2 @@
-export declare function tsNodeImport(apiName: string): Promise<any>;
+import { ExtendedRunApiParameters } from "../../common/runApi/types";
+export declare const tsNodeImport: ExtendedRunApiParameters["importFunction"];

package/dist/commands/common/tsNodeImport.js

@@ -3,11 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.tsNodeImport = tsNodeImport;
+exports.tsNodeImport = void 0;
+var _neverthrow = require("neverthrow");
 var _fileUtils = require("./utils/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 && {}.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 tsNodeImport(apiName) {
+const tsNodeImport = async apiName => {
   require("ts-node").register({
     transpileOnly: true,
     compilerOptions: {
@@ -15,6 +16,19 @@ async function tsNodeImport(apiName) {
     }
   });
   const path = (0, _fileUtils.getFullPathInProject)(...apiName.split("/"));
-  const imported = await (specifier => new Promise(r => r(`${specifier}`)).then(s => _interopRequireWildcard(require(s))))(path);
-  return imported;
-}
+  try {
+    const imported = await (specifier => new Promise(r => r(`${specifier}`)).then(s => _interopRequireWildcard(require(s))))(path);
+    return (0, _neverthrow.ok)(imported);
+  } catch (e) {
+    if ("code" in e && e.code === "MODULE_NOT_FOUND") {
+      return (0, _neverthrow.err)({
+        type: "not_found"
+      });
+    }
+    return (0, _neverthrow.err)({
+      type: "other",
+      error: e
+    });
+  }
+};
+exports.tsNodeImport = tsNodeImport;

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

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import * as net from "net";
 export declare class JSONUnixSocket {
     private readonly socket;

package/dist/commands/interface/run.js

@@ -15,9 +15,10 @@ var _unixSocket = require("../common/utils/unixSocket");
 var _promises = require("timers/promises");
 var _jwtTokenManager = require("../../common/jwtTokenManager");
 var _formatZodError = require("../../common/formatZodError");
+var _neverthrow = require("neverthrow");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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 && {}.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(e) { return e && e.__esModule ? e : { default: e }; }
 const startRunApiSchema = _zod.default.object({
   type: _zod.default.literal("start"),
   parameters: _runApi.runApiParametersSchema.extend({
@@ -47,7 +48,11 @@ const tokenUpdateSchema = _zod.default.object({
     functionsToken: _zod.default.string()
   })
 });
-const inputSchema = _zod.default.union([startRunApiSchema, nextRunApiSchema, abortRunApiSchema, tokenUpdateSchema]);
+const pingSchema = _zod.default.object({
+  type: _zod.default.literal("ping"),
+  parameters: _zod.default.object({}).optional()
+});
+const inputSchema = _zod.default.union([startRunApiSchema, nextRunApiSchema, abortRunApiSchema, tokenUpdateSchema, pingSchema]);
 _dotenv.default.config({
   path: `.env`
 });
@@ -105,7 +110,7 @@ function runAutomationCLI(importFunction) {
         generator = (0, _runApi.runApiGenerator)({
           ...message.parameters,
           abortSignal: abortController.signal,
-          importFunction
+          importFunction: importFunction ?? _defaultImport
         });
         context = {
           extendedPayloads: [],
@@ -180,6 +185,12 @@ function runAutomationCLI(importFunction) {
           });
           break;
         }
+        if (message.type === "ping") {
+          jsonUnixSocket.sendJSON({
+            type: "pong"
+          });
+          break;
+        }
         await handleMessage(message);
         receiveMessagesPromise = receiveMessages();
         continue;
@@ -209,6 +220,22 @@ function getProxyUrlFromRunOptions(runOptions) {
   url.password = proxy.password;
   return url.toString();
 }
+const _defaultImport = async path => {
+  try {
+    const imported = await (specifier => new Promise(r => r(specifier)).then(s => _interopRequireWildcard(require(s))))(`../../../${path}.ts`);
+    return (0, _neverthrow.ok)(imported);
+  } catch (e) {
+    if ("code" in e && e.code === "MODULE_NOT_FOUND") {
+      return (0, _neverthrow.err)({
+        type: "not_found"
+      });
+    }
+    return (0, _neverthrow.err)({
+      type: "other",
+      error: e
+    });
+  }
+};
 if (require.main === module) {
   runAutomationCLI();
 }

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

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { AsyncLocalStorage } from "async_hooks";
 import { Payload, RunInfo } from "../../runtime/export";
 export declare const asyncLocalStorage: AsyncLocalStorage<InternalRunInfo>;

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

@@ -10,3 +10,4 @@ export declare function runApiGenerator<ResultType = any, _YieldType = any, _Nex
 export declare function runApiGenerator<ResultType = any, _YieldType = any, _NextType = any>(params: ExtendedRunApiParameters): AsyncGenerator<_YieldType, RunApiResult<ResultType>, _NextType>;
 export declare function runApi<ResultType = any>(params: ExtendedRunApiParameters): Promise<RunApiResult<ResultType>>;
 export declare function checkAuthSessionWithRetries(page: Page, context: BrowserContext, checkFn: (..._: any) => Promise<boolean>, retries?: number): Promise<Result<boolean, RunAutomationError>>;
+export type ImportFunction = ExtendedRunApiParameters["importFunction"];

package/dist/common/runApi/index.js

@@ -242,7 +242,14 @@ async function checkAuthSessionWithRetries(page, context, checkFn, retries = 3)
 }
 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 importedResult = await importFunction(path);
+    if (importedResult.isErr()) {
+      if (importedResult.error.type === "not_found") {
+        return (0, _neverthrow.err)(new _errors.ApiNotFoundError(path));
+      }
+      return (0, _neverthrow.err)(new _errors.AutomationError(importedResult.error.error));
+    }
+    const imported = importedResult.value;
     if (!imported || !imported.default || !imported.default.constructor) {
       return (0, _neverthrow.err)(new _errors.InvalidApiError("API file path does not have a default export"));
     }
@@ -260,6 +267,6 @@ 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) {
-    return (0, _neverthrow.err)(new _errors.ApiNotFoundError(path));
+    return (0, _neverthrow.err)(new _errors.AutomationError(error));
   }
 }

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

@@ -545,12 +545,12 @@ export declare const runApiParametersSchema: z.ZodObject<{
         } | undefined;
     }, {
         environment: "standalone";
+        headless?: boolean | undefined;
         proxy?: {
             server: string;
             username: string;
             password: string;
         } | undefined;
-        headless?: boolean | undefined;
     }>, z.ZodObject<{
         environment: z.ZodLiteral<"cdp">;
         cdpAddress: z.ZodString;
@@ -673,12 +673,12 @@ export declare const runApiParametersSchema: z.ZodObject<{
     } | undefined;
     runOptions?: {
         environment: "standalone";
+        headless?: boolean | undefined;
         proxy?: {
             server: string;
             username: string;
             password: string;
         } | undefined;
-        headless?: boolean | undefined;
     } | {
         mode: "vanilla" | "playwright" | "playwright-standalone" | "playwright-headless";
         environment: "cdp";
@@ -688,9 +688,15 @@ export declare const runApiParametersSchema: z.ZodObject<{
 }>;
 export type RunApiSession = z.infer<typeof runApiSessionSchema>;
 export type RunApiParameters = z.input<typeof runApiParametersSchema>;
+export type ImportFunctionError = {
+    type: "not_found";
+} | {
+    type: "other";
+    error: any;
+};
 export type ExtendedRunApiParameters = RunApiParameters & {
     abortSignal?: AbortSignal;
-    importFunction?: (name: string) => Promise<any> | undefined;
+    importFunction: (name: string) => Promise<Result<any, ImportFunctionError>>;
 };
 export type RunApiResultOk<R = any> = {
     result: R;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.0.6-playwright-1.46.0",
+  "version": "1.0.6-test-ping.0",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",
@@ -81,7 +81,7 @@
     "ms": "^2.1.3",
     "nanoid": "3",
     "neverthrow": "^6.1.0",
-    "playwright": "1.46.0",
+    "playwright": "1.44.1",
     "playwright-extra": "^4.3.6",
     "prettier": "^2.8.0",
     "promptly": "^3.2.0",