@intuned/runtime-dev 0.1.0-test.37 → 0.1.0-test.4

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

@@ -1,5 +1,5 @@
 import { RunAutomationResponse } from "./types";
-import { RunErrorOptions } from "../../runtime/export";
+import { RunErrorOptions } from "src/runtime/export";
 export declare const apiNotFoundErrorCode = "APINotFoundError";
 export declare const invalidApiErrorCode = "InvalidAPIError";
 export declare const invalidCheckErrorCode = "InvalidCheckError";
@@ -9,8 +9,7 @@ export declare const authCheckNotFoundErrorCode = "AuthCheckNotFoundError";
 export declare const authCheckFailedErrorCode = "AuthCheckFailedError";
 export declare const maxLevelsExceededErrorCode = "MaxLevelsExceededError";
 export declare const automationError = "AutomationError";
-export declare const internalInvalidInputErrorCode = "InternalInvalidInputError";
-export declare const runAutomationErrorCodes: readonly ["APINotFoundError", "InvalidAPIError", "InvalidCheckError", "AbortedError", "AuthRequiredError", "AuthCheckNotFoundError", "AuthCheckFailedError", "MaxLevelsExceededError", "AutomationError", "InternalInvalidInputError"];
+export declare const runAutomationErrorCodes: readonly ["APINotFoundError", "InvalidAPIError", "InvalidCheckError", "AbortedError", "AuthRequiredError", "AuthCheckNotFoundError", "AuthCheckFailedError", "MaxLevelsExceededError", "AutomationError"];
 export type RunAutomationErrorCode = (typeof runAutomationErrorCodes)[number];
 export declare abstract class RunAutomationError<T = any> {
     code: RunAutomationErrorCode;
@@ -21,7 +20,7 @@ export declare abstract class RunAutomationError<T = any> {
     details?: T;
     get apiResponse(): RunAutomationResponse;
     get json(): {
-        code: "APINotFoundError" | "InvalidAPIError" | "InvalidCheckError" | "AbortedError" | "AuthRequiredError" | "AuthCheckNotFoundError" | "AuthCheckFailedError" | "MaxLevelsExceededError" | "AutomationError" | "InternalInvalidInputError";
+        code: "APINotFoundError" | "InvalidAPIError" | "InvalidCheckError" | "AbortedError" | "AuthRequiredError" | "AuthCheckNotFoundError" | "AuthCheckFailedError" | "MaxLevelsExceededError" | "AutomationError";
         details: T | undefined;
         cause: any;
     };
@@ -70,7 +69,3 @@ export declare class AutomationError extends RunAutomationError<{
     error: any;
     constructor(error: any);
 }
-export declare class InternalInvalidInputError extends RunAutomationError {
-    constructor(message: string, details?: any);
-    get apiResponse(): RunAutomationResponse;
-}

package/dist/common/runApi/errors.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.runAutomationErrorCodes = exports.maxLevelsExceededErrorCode = exports.invalidCheckErrorCode = exports.invalidApiErrorCode = exports.internalInvalidInputErrorCode = exports.automationError = exports.authRequiredErrorCode = exports.authCheckNotFoundErrorCode = exports.authCheckFailedErrorCode = exports.apiNotFoundErrorCode = exports.abortedErrorCode = exports.RunAutomationError = exports.MaxLevelsExceededError = exports.InvalidCheckError = exports.InvalidApiError = exports.InternalInvalidInputError = exports.AutomationError = exports.AuthRequiredError = exports.AuthCheckNotFoundError = exports.AuthCheckFailedError = exports.ApiNotFoundError = exports.AbortedError = void 0;
+exports.runAutomationErrorCodes = exports.maxLevelsExceededErrorCode = exports.invalidCheckErrorCode = exports.invalidApiErrorCode = exports.automationError = exports.authRequiredErrorCode = exports.authCheckNotFoundErrorCode = exports.authCheckFailedErrorCode = exports.apiNotFoundErrorCode = exports.abortedErrorCode = exports.RunAutomationError = exports.MaxLevelsExceededError = exports.InvalidCheckError = exports.InvalidApiError = exports.AutomationError = exports.AuthRequiredError = exports.AuthCheckNotFoundError = exports.AuthCheckFailedError = exports.ApiNotFoundError = exports.AbortedError = void 0;
 var _runtime = require("../../runtime");
 var playwright = _interopRequireWildcard(require("@intuned/playwright-core"));
 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); }
@@ -17,8 +17,7 @@ const authCheckNotFoundErrorCode = exports.authCheckNotFoundErrorCode = "AuthChe
 const authCheckFailedErrorCode = exports.authCheckFailedErrorCode = "AuthCheckFailedError";
 const maxLevelsExceededErrorCode = exports.maxLevelsExceededErrorCode = "MaxLevelsExceededError";
 const automationError = exports.automationError = "AutomationError";
-const internalInvalidInputErrorCode = exports.internalInvalidInputErrorCode = "InternalInvalidInputError";
-const runAutomationErrorCodes = exports.runAutomationErrorCodes = [apiNotFoundErrorCode, invalidApiErrorCode, invalidCheckErrorCode, abortedErrorCode, authRequiredErrorCode, authCheckNotFoundErrorCode, authCheckFailedErrorCode, maxLevelsExceededErrorCode, automationError, internalInvalidInputErrorCode];
+const runAutomationErrorCodes = exports.runAutomationErrorCodes = [apiNotFoundErrorCode, invalidApiErrorCode, invalidCheckErrorCode, abortedErrorCode, authRequiredErrorCode, authCheckNotFoundErrorCode, authCheckFailedErrorCode, maxLevelsExceededErrorCode, automationError];
 class RunAutomationError {
   wrapped = false;
   get apiResponse() {
@@ -93,7 +92,6 @@ class AuthRequiredError extends RunAutomationError {
     this.code = authRequiredErrorCode;
     this.statusCode = 401;
     this.message = "Authentication is required";
-    this.wrapped = true;
   }
 }
 exports.AuthRequiredError = AuthRequiredError;
@@ -112,7 +110,6 @@ class AuthCheckFailedError extends RunAutomationError {
     this.code = authCheckFailedErrorCode;
     this.statusCode = 401;
     this.message = "auth session check failed";
-    this.wrapped = true;
   }
   get apiResponse() {
     return {
@@ -172,24 +169,4 @@ class AutomationError extends RunAutomationError {
     };
   }
 }
-exports.AutomationError = AutomationError;
-class InternalInvalidInputError extends RunAutomationError {
-  constructor(message, details) {
-    super();
-    this.code = internalInvalidInputErrorCode;
-    this.statusCode = 500;
-    this.message = message;
-    this.details = details;
-  }
-  get apiResponse() {
-    return {
-      status: 500,
-      body: {
-        error: "InternalServerError",
-        message: `Internal error: ${this.message}. Please report this issue to the Intuned team.`,
-        details: this.details
-      }
-    };
-  }
-}
-exports.InternalInvalidInputError = InternalInvalidInputError;
+exports.AutomationError = AutomationError;

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, importFunction: ExtendedRunApiParameters["importFunction"], retries?: number): Promise<Result<boolean, RunAutomationError>>;
+export declare function checkAuthSessionWithRetries(page: Page, context: BrowserContext, retries?: number): Promise<Result<boolean, RunAutomationError>>;

package/dist/common/runApi/index.js

@@ -15,6 +15,7 @@ var _downloadDirectory = require("../../runtime/downloadDirectory");
 var _asyncLocalStorage = require("../asyncLocalStorage");
 var _fsExtra = _interopRequireWildcard(require("fs-extra"));
 var fs = _fsExtra;
+var _jwtTokenManager = require("../jwtTokenManager");
 var _contextStorageStateHelpers = require("../contextStorageStateHelpers");
 var _neverthrow = require("neverthrow");
 var _errors = require("./errors");
@@ -43,32 +44,26 @@ 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({
   retrieveSession = false,
   abortSignal,
-  importFunction,
   ...input
 }) {
   let traceStarted = false;
-  const inputParseResult = _types.runApiParametersSchema.safeParse(input);
-  if (!inputParseResult.success) {
-    return (0, _neverthrow.err)(new _errors.InternalInvalidInputError("Input validation failed", (0, _formatZodError.formatZodError)(inputParseResult.error)));
-  }
   const {
     automationFunction,
     runOptions,
     tracing,
-    auth
+    auth,
+    functionsToken
   } = _types.runApiParametersSchema.parse(input);
+  _jwtTokenManager.backendFunctionsTokenManager.token = functionsToken;
+  const downloadsPath = (0, _downloadDirectory.getDownloadDirectoryPath)();
   let page;
   let context;
-  let downloadsPath;
   if (runOptions.environment === "deployed") {
-    downloadsPath = (0, _downloadDirectory.getDownloadDirectoryPath)();
     const {
       headless,
       proxy
@@ -92,6 +87,10 @@ async function* runApiGenerator({
       context
     } = await (0, _getPlaywrightConstructs.getPlaywrightConstructsForMode)(mode, cdpAddress, auth === null || auth === void 0 ? void 0 : auth.session));
   }
+  const executionContext = (0, _asyncLocalStorage.getExecutionContext)();
+  if (!executionContext) {
+    throw "";
+  }
   async function saveTraceIfNeeded({
     errorMessage
   }) {
@@ -123,20 +122,18 @@ async function* runApiGenerator({
     });
   });
   if (auth && auth.session.type === "state") {
-    const state = auth.session.state;
-    if (state === undefined || state === null) {
-      return (0, _neverthrow.err)(new _errors.AuthRequiredError());
-    }
-    await (0, _contextStorageStateHelpers.setContextStorageState)(context, state);
+    await (0, _contextStorageStateHelpers.setContextStorageState)(context, auth.session.state);
   }
   async function* runAutomation() {
     var _getExecutionContext;
     if (auth !== null && auth !== void 0 && auth.runCheck) {
       if (!auth.session) {
-        return (0, _neverthrow.err)(new _errors.AuthRequiredError());
+        return (0, _neverthrow.err)({
+          code: "AuthRequiredError"
+        });
       }
       console.log("Running auth check");
-      const authCheckResult = await checkAuthSessionWithRetries(page, context, importFunction, 2);
+      const authCheckResult = await checkAuthSessionWithRetries(page, context, 2);
       if (authCheckResult.isErr()) {
         const error = authCheckResult.error;
         if (["APINotFoundError", "InvalidAPIError"].includes(error.code)) {
@@ -145,18 +142,20 @@ async function* runApiGenerator({
         return authCheckResult;
       }
       if (!authCheckResult.value) {
-        return (0, _neverthrow.err)(new _errors.AuthCheckFailedError());
+        return (0, _neverthrow.err)({
+          code: "AuthCheckFailedError"
+        });
       }
     }
-    (0, _cleanEnvironmentVariables.cleanEnvironmentVariables)();
-    const args = [...(automationFunction.params !== undefined ? [automationFunction.params] : []), page, context];
-    const validatedModuleResult = await importUsingImportFunction(automationFunction.name, importFunction);
-    if (validatedModuleResult.isErr()) {
-      return validatedModuleResult;
+    console.log("Running function", automationFunction.name);
+    const args = [...(automationFunction.params ? [automationFunction.params] : []), page, context];
+    const importResult = await importFunction(automationFunction.name);
+    if (importResult.isErr()) {
+      return importResult;
     }
     let result;
-    if (validatedModuleResult.value.type === "async-generator") {
-      const generator = validatedModuleResult.value.generator(...args);
+    if (importResult.value.type === "async-generator") {
+      const generator = importResult.value.generator(...args);
       let next = undefined;
       while (true) {
         const generatorResult = await generator.next(...(next ? [next] : []));
@@ -168,7 +167,7 @@ async function* runApiGenerator({
         break;
       }
     } else {
-      result = await validatedModuleResult.value.func(...args);
+      result = await importResult.value.func(...args);
     }
     return (0, _neverthrow.ok)({
       result,
@@ -191,15 +190,14 @@ async function* runApiGenerator({
       return result.value;
     }
   } catch (error) {
+    console.log("run errored", error);
     return (0, _neverthrow.err)(new _errors.AutomationError(error));
   } finally {
     await saveTraceIfNeeded({
       errorMessage: "failed to save trace"
     });
     await context.close();
-    if (downloadsPath !== undefined) {
-      await fs.remove(downloadsPath);
-    }
+    await fs.remove(downloadsPath);
   }
 }
 async function runApi(params) {
@@ -213,13 +211,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, importFunction, retries = 3) {
+async function checkAuthSessionWithRetries(page, context, 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 importUsingImportFunction(`${_constants.AUTH_SESSIONS_FOLDER_NAME}/check`, importFunction);
+  const importResult = await importFunction(`${_constants.AUTH_SESSIONS_FOLDER_NAME}/check`);
   if (importResult.isErr()) {
     return (0, _neverthrow.err)(importResult.error);
   }
@@ -234,9 +232,33 @@ async function checkAuthSessionWithRetries(page, context, importFunction, retrie
   }
   return (0, _neverthrow.ok)(false);
 }
-async function importUsingImportFunction(path, importFunction) {
+async function importFunction(path) {
+  const functionNameParts = path.split("/");
+  const functionNameDepth = functionNameParts.length;
   try {
-    const imported = importFunction ? await importFunction(path) : await (specifier => new Promise(r => r(specifier)).then(s => _interopRequireWildcard(require(s))))(`./${path}.ts`);
+    let imported = undefined;
+    switch (functionNameDepth) {
+      case 1:
+        imported = await (specifier => new Promise(r => r(specifier)).then(s => _interopRequireWildcard(require(s))))(`${functionNameParts[0]}.ts`);
+        break;
+      case 2:
+        imported = await (specifier => new Promise(r => r(specifier)).then(s => _interopRequireWildcard(require(s))))(`${functionNameParts[0]}/${functionNameParts[1]}.ts`);
+        break;
+      case 3:
+        imported = await (specifier => new Promise(r => r(specifier)).then(s => _interopRequireWildcard(require(s))))(`${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}.ts`);
+        break;
+      case 4:
+        imported = await (specifier => new Promise(r => r(specifier)).then(s => _interopRequireWildcard(require(s))))(`${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}/${functionNameParts[3]}.ts`);
+        break;
+      case 5:
+        imported = await (specifier => new Promise(r => r(specifier)).then(s => _interopRequireWildcard(require(s))))(`${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}/${functionNameParts[3]}/${functionNameParts[4]}.ts`);
+        break;
+      case 6:
+        imported = await (specifier => new Promise(r => r(specifier)).then(s => _interopRequireWildcard(require(s))))(`${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}/${functionNameParts[3]}/${functionNameParts[4]}/${functionNameParts[5]}.ts`);
+        break;
+      default:
+        return (0, _neverthrow.err)(new _errors.MaxLevelsExceededError(5));
+    }
     if (!imported || !imported.default || !imported.default.constructor) {
       return (0, _neverthrow.err)(new _errors.InvalidApiError("API file path does not have a default export"));
     }