@intuned/runtime-dev 0.1.0-test.21 → 0.1.0-test.22

package/WebTemplate/controllers/authSessions/check.ts

@@ -33,7 +33,7 @@ export async function checkAuthSession({
 
   const result = await runApi<boolean>({
     automationFunction: {
-      module: await importModule("auth-sessions/check"),
+      name: "auth-sessions/check",
     },
     runOptions: {
       environment: "deployed",
@@ -47,6 +47,7 @@ export async function checkAuthSession({
       },
       runCheck: false,
     },
+    importFunction: importModule,
   });
   if (result.isErr()) {
     return result.error.apiResponse;

package/WebTemplate/controllers/authSessions/create.ts

@@ -53,7 +53,7 @@ export async function createAuthSession({
     unknown
   >({
     automationFunction: {
-      module: await importModule("auth-sessions/create"),
+      name: "auth-sessions/create",
       params: parameters,
     },
     tracing: saveTrace
@@ -69,6 +69,7 @@ export async function createAuthSession({
     },
     abortSignal: abortController.signal,
     retrieveSession: true,
+    importFunction: importModule,
   });
 
   const result = await createGenerator.next();

package/WebTemplate/controllers/runApi/helpers.ts

@@ -68,7 +68,7 @@ export async function runApi({
   const resultWithTimeout = await waitWithExtendableTimeout({
     promise: runApiInternal({
       automationFunction: {
-        module: await importModule(`api/${functionName}`),
+        name: `api/${functionName}`,
         params,
       },
       auth: isAuthSessionEnabled
@@ -93,6 +93,7 @@ export async function runApi({
         : { enabled: false },
       functionsToken,
       abortSignal: abortController.signal,
+      importFunction: importModule,
     }),
     initialTimeout: requestTimeout,
     abortController,

package/dist/commands/api/run.js

@@ -17,7 +17,6 @@ var _nanoid = require("nanoid");
 var _chalk = _interopRequireDefault(require("chalk"));
 var _runApi = require("../../common/runApi");
 var _tsNodeImport = require("../common/tsNodeImport");
-var _fileUtils = require("../common/utils/fileUtils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -38,11 +37,9 @@ async function executeCLI(apiName, mode, inputData, options) {
       throw new Error("Auth session is not enabled but auth session provided. To use auth session please enable it in Intuned.json");
     }
   }
-  const apiFilePath = (0, _fileUtils.getFullPathInProject)("api", `${apiName}.ts`);
-  const runApiModule = await (0, _tsNodeImport.tsNodeImport)(apiFilePath);
   const runApiResult = await (0, _runApi.runApi)({
     automationFunction: {
-      module: runApiModule,
+      name: `api/${apiName}`,
       params: inputData
     },
     auth: authSessionPathToUse ? {
@@ -56,7 +53,8 @@ async function executeCLI(apiName, mode, inputData, options) {
       environment: "ide",
       cdpAddress: options.cdpAddress,
       mode
-    }
+    },
+    importFunction: _tsNodeImport.tsNodeImport
   });
   if (runApiResult.isErr()) {
     if (runApiResult.error instanceof _runApi.AutomationError) {

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

@@ -27,10 +27,9 @@ _commander.program.description("run auth session check").option("--cdpAddress <c
   if (!fs.exists(checkFilePath)) {
     throw new Error("auth session check file not found");
   }
-  const checkModule = await (0, _tsNodeImport.tsNodeImport)(checkFilePath);
   const runApiResult = await (0, _runApi.runApi)({
     automationFunction: {
-      module: checkModule
+      name: `${_constants.AUTH_SESSIONS_FOLDER_NAME}/check`
     },
     runOptions: {
       environment: "ide",
@@ -43,7 +42,8 @@ _commander.program.description("run auth session check").option("--cdpAddress <c
         path: authSessionPath
       },
       runCheck: false
-    }
+    },
+    importFunction: _tsNodeImport.tsNodeImport
   });
   if (runApiResult.isErr()) {
     throw new Error(runApiResult.error);

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

@@ -41,11 +41,10 @@ _commander.program.description("run auth session create").option("--cdpAddress <
   if (!fs.exists(createFilePath)) {
     throw new Error("auth session create file not found");
   }
-  const createModule = await (0, _tsNodeImport.tsNodeImport)(createFilePath);
   async function runCreate() {
     const generator = (0, _runApi.runApiGenerator)({
       automationFunction: {
-        module: createModule,
+        name: `${_constants.AUTH_SESSIONS_FOLDER_NAME}/create`,
         params: inputData
       },
       runOptions: {
@@ -53,7 +52,8 @@ _commander.program.description("run auth session create").option("--cdpAddress <
         mode,
         cdpAddress
       },
-      retrieveSession: true
+      retrieveSession: true,
+      importFunction: _tsNodeImport.tsNodeImport
     });
     let nextGeneratorParam = undefined;
     while (true) {

package/dist/commands/interface/run.js

@@ -11,17 +11,12 @@ var _enums = require("src/runtime/enums");
 var _unixSocket = require("../common/utils/unixSocket");
 var _promises = require("timers/promises");
 var _jwtTokenManager = require("src/common/jwtTokenManager");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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 }; }
 const startRunApiSchema = _zod.default.object({
   type: _zod.default.literal("start"),
   parameters: _runApi.runApiParametersSchema.extend({
-    automationFunction: _runApi.runApiParametersSchema.shape.automationFunction.omit({
-      module: true
-    }).extend({
-      name: _zod.default.string()
-    }),
     retrieveSession: _zod.default.boolean(),
     context: _zod.default.object({
       jobId: _zod.default.string().optional(),
@@ -127,11 +122,8 @@ function main(importFunction) {
       if (input.type === "start") {
         const gen = (0, _runApi.runApiGenerator)({
           ...input.parameters,
-          automationFunction: {
-            ...input.parameters.automationFunction,
-            module: importFunction ? await importFunction(input.parameters.automationFunction.name) : await (specifier => new Promise(r => r(`${specifier}`)).then(s => _interopRequireWildcard(require(s))))(input.parameters.automationFunction.name)
-          },
-          abortSignal: abortController.signal
+          abortSignal: abortController.signal,
+          importFunction
         });
         generator = gen;
         context = {

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

@@ -9,4 +9,4 @@ export declare function runApiGenerator<ResultType = any, _YieldType = any, _Nex
 }): AsyncGenerator<_YieldType, RunApiResult<ResultType, RunApiResultWithSessionOk>, _NextType>;
 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, retries?: number): Promise<Result<boolean, RunAutomationError>>;
+export declare function checkAuthSessionWithRetries(page: Page, context: BrowserContext, importFunction: ExtendedRunApiParameters["importFunction"], retries?: number): Promise<Result<boolean, RunAutomationError>>;

package/dist/common/runApi/index.js

@@ -49,6 +49,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 async function* runApiGenerator({
   retrieveSession = false,
   abortSignal,
+  importFunction,
   ...input
 }) {
   let traceStarted = false;
@@ -131,7 +132,7 @@ async function* runApiGenerator({
         return (0, _neverthrow.err)(new _errors.AuthRequiredError());
       }
       console.log("Running auth check");
-      const authCheckResult = await checkAuthSessionWithRetries(page, context, 2);
+      const authCheckResult = await checkAuthSessionWithRetries(page, context, importFunction, 2);
       if (authCheckResult.isErr()) {
         const error = authCheckResult.error;
         if (["APINotFoundError", "InvalidAPIError"].includes(error.code)) {
@@ -144,7 +145,7 @@ async function* runApiGenerator({
       }
     }
     const args = [...(automationFunction.params ? [automationFunction.params] : []), page, context];
-    const validatedModuleResult = await validateModule(automationFunction.module);
+    const validatedModuleResult = await importUsingImportFunction(automationFunction.name, importFunction);
     if (validatedModuleResult.isErr()) {
       return validatedModuleResult;
     }
@@ -206,13 +207,13 @@ async function runApi(params) {
   }
   return (0, _neverthrow.err)(new _errors.InvalidApiError("Expected API to be async function, got async generator"));
 }
-async function checkAuthSessionWithRetries(page, context, retries = 3) {
+async function checkAuthSessionWithRetries(page, context, importFunction, retries = 3) {
   if (retries === 0) {
     return (0, _neverthrow.ok)(false);
   }
   let tryNumber = 0;
   console.log("Checking auth session with retries", `${_constants.AUTH_SESSIONS_FOLDER_NAME}/check`);
-  const importResult = await validateModule(`${_constants.AUTH_SESSIONS_FOLDER_NAME}/check`);
+  const importResult = await importUsingImportFunction(`${_constants.AUTH_SESSIONS_FOLDER_NAME}/check`, importFunction);
   if (importResult.isErr()) {
     return (0, _neverthrow.err)(importResult.error);
   }
@@ -227,21 +228,33 @@ async function checkAuthSessionWithRetries(page, context, retries = 3) {
   }
   return (0, _neverthrow.ok)(false);
 }
-async function validateModule(moduleToValidate) {
-  if (!moduleToValidate || !moduleToValidate.default || !moduleToValidate.default.constructor) {
-    return (0, _neverthrow.err)(new _errors.InvalidApiError("API file path does not have a default export"));
-  }
-  if (moduleToValidate.default.constructor.name === "AsyncGeneratorFunction") {
-    return (0, _neverthrow.ok)({
-      type: "async-generator",
-      generator: moduleToValidate.default
-    });
-  }
-  if (moduleToValidate.default.constructor.name === "AsyncFunction") {
-    return (0, _neverthrow.ok)({
-      type: "async",
-      func: moduleToValidate.default
-    });
+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);
+    if (!imported || !imported.default || !imported.default.constructor) {
+      return (0, _neverthrow.err)(new _errors.InvalidApiError("API file path does not have a default export"));
+    }
+    if (imported.default.constructor.name === "AsyncGeneratorFunction") {
+      return (0, _neverthrow.ok)({
+        type: "async-generator",
+        generator: imported.default
+      });
+    }
+    if (imported.default.constructor.name === "AsyncFunction") {
+      return (0, _neverthrow.ok)({
+        type: "async",
+        func: imported.default
+      });
+    }
+    return (0, _neverthrow.err)(new _errors.InvalidApiError("API file path does not have a default async function/generator export"));
+  } catch (error) {
+    if (error.message.includes("Unknown variable dynamic import")) {
+      return (0, _neverthrow.err)(new _errors.ApiNotFoundError(path));
+    }
+    if ((error === null || error === void 0 ? void 0 : error.code) === "ERR_MODULE_NOT_FOUND") {
+      console.log("API not found", error);
+      return (0, _neverthrow.err)(new _errors.ApiNotFoundError(path));
+    }
+    throw error;
   }
-  return (0, _neverthrow.err)(new _errors.InvalidApiError(`API file path does not have a default async function/generator export. Got ${moduleToValidate.default.constructor.name}`));
 }

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

@@ -127,23 +127,13 @@ export declare const runApiSessionSchema: z.ZodDiscriminatedUnion<"type", [z.Zod
 export declare const runApiParametersSchema: z.ZodObject<{
     functionsToken: z.ZodOptional<z.ZodString>;
     automationFunction: z.ZodObject<{
-        module: z.ZodObject<{
-            default: z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>;
-        }, "strip", z.ZodTypeAny, {
-            default: (...args: unknown[]) => unknown;
-        }, {
-            default: (...args: unknown[]) => unknown;
-        }>;
+        name: z.ZodString;
         params: z.ZodOptional<z.ZodAny>;
     }, "strip", z.ZodTypeAny, {
-        module: {
-            default: (...args: unknown[]) => unknown;
-        };
+        name: string;
         params?: any;
     }, {
-        module: {
-            default: (...args: unknown[]) => unknown;
-        };
+        name: string;
         params?: any;
     }>;
     tracing: z.ZodDefault<z.ZodOptional<z.ZodDiscriminatedUnion<"enabled", [z.ZodObject<{
@@ -370,9 +360,7 @@ export declare const runApiParametersSchema: z.ZodObject<{
     retrieveSession: z.ZodDefault<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     automationFunction: {
-        module: {
-            default: (...args: unknown[]) => unknown;
-        };
+        name: string;
         params?: any;
     };
     tracing: {
@@ -428,9 +416,7 @@ export declare const runApiParametersSchema: z.ZodObject<{
     } | undefined;
 }, {
     automationFunction: {
-        module: {
-            default: (...args: unknown[]) => unknown;
-        };
+        name: string;
         params?: any;
     };
     functionsToken?: string | undefined;
@@ -489,6 +475,7 @@ export type RunApiSession = z.infer<typeof runApiSessionSchema>;
 export type RunApiParameters = z.input<typeof runApiParametersSchema>;
 export type ExtendedRunApiParameters = RunApiParameters & {
     abortSignal?: AbortSignal;
+    importFunction?: (name: string) => Promise<any> | undefined;
 };
 export type RunApiResultOk<R = any> = {
     result: R;

package/dist/common/runApi/types.js

@@ -16,11 +16,7 @@ const runApiSessionSchema = exports.runApiSessionSchema = _zod.default.discrimin
 const runApiParametersSchema = exports.runApiParametersSchema = _zod.default.object({
   functionsToken: _zod.default.string().optional(),
   automationFunction: _zod.default.object({
-    module: _zod.default.object({
-      default: _zod.default.function()
-    }, {
-      required_error: "API handler must have a default export function"
-    }),
+    name: _zod.default.string(),
     params: _zod.default.any().optional()
   }),
   tracing: _zod.default.discriminatedUnion("enabled", [_zod.default.object({

package/package.json

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