@intuned/runtime-dev 1.0.0-udas.4 → 1.0.0-udas.6

package/dist/common/contextStorageStateHelpers.js

@@ -35,16 +35,24 @@ async function getContextStorageState(context) {
   };
 }
 async function setContextStorageState(context, storage) {
+  console.log("Setting storage state");
   await context.intunedSetStorageState(storage);
+  console.log("Storage state set");
   const sessionStorage = storage.sessionStorage;
+  console.log("Adding init script session");
   await context.addInitScript(storage => {
     for (const {
       origin,
       sessionStorage
     } of storage) {
       if (window.location.origin === origin) {
-        for (const item of sessionStorage) window.sessionStorage.setItem(item.name, item.value);
+        for (const item of sessionStorage) {
+          const existingItem = window.sessionStorage.getItem(item.name);
+          if (existingItem !== null) continue;
+          window.sessionStorage.setItem(item.name, item.value);
+        }
       }
     }
   }, sessionStorage);
+  console.log("Added init script session");
 }

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, checkFn: (..._: any) => Promise<boolean>, retries?: number): Promise<Result<boolean, RunAutomationError>>;

package/dist/common/runApi/index.js

@@ -64,40 +64,15 @@ async function* runApiGenerator({
     tracing,
     auth
   } = inputParseResult.data;
-  let page;
+  const abortSymbol = Symbol("abort");
+  const abortPromise = new Promise(resolve => {
+    if (!abortSignal) return;
+    abortSignal.addEventListener("abort", () => {
+      resolve(abortSymbol);
+    });
+  });
   let context;
   let downloadsPath;
-  if (runOptions.environment === "standalone") {
-    downloadsPath = (0, _downloadDirectory.getDownloadDirectoryPath)();
-    const {
-      headless,
-      proxy
-    } = runOptions;
-    console.log("Running in standalone mode", {
-      headless,
-      proxy,
-      downloadsPath
-    });
-    ({
-      page,
-      context
-    } = await (0, _getPlaywrightConstructs.getProductionPlaywrightConstructs)({
-      headless,
-      proxy,
-      downloadsPath,
-      storageState: auth === null || auth === void 0 ? void 0 : auth.session
-    }));
-    console.log("Got page and context");
-  } else {
-    const {
-      mode,
-      cdpAddress
-    } = runOptions;
-    ({
-      page,
-      context
-    } = await (0, _getPlaywrightConstructs.getPlaywrightConstructsForMode)(mode, cdpAddress, auth === null || auth === void 0 ? void 0 : auth.session));
-  }
   async function saveTraceIfNeeded({
     errorMessage
   }) {
@@ -105,46 +80,80 @@ async function* runApiGenerator({
       return;
     }
     try {
-      await context.tracing.stop({
+      var _context;
+      await ((_context = context) === null || _context === void 0 ? void 0 : _context.tracing.stop({
         path: tracing.filePath
-      });
+      }));
     } catch (error) {
       console.log(errorMessage, error === null || error === void 0 ? void 0 : error.message);
       await (0, _fsExtra.remove)(tracing.filePath);
     }
   }
-  if (tracing.enabled) {
-    console.log("Starting trace");
-    await context.tracing.start({
-      screenshots: true,
-      snapshots: true,
-      sources: true
-    });
-    traceStarted = true;
-  }
-  const abortSymbol = Symbol("abort");
-  const abortPromise = new Promise(resolve => {
-    if (!abortSignal) return;
-    abortSignal.addEventListener("abort", () => {
-      resolve(abortSymbol);
-    });
-  });
-  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);
-  }
   async function* runAutomation() {
     var _getExecutionContext;
-    (0, _cleanEnvironmentVariables.cleanEnvironmentVariables)();
+    let page;
+    const validatedModuleResult = await importUsingImportFunction(automationFunction.name, importFunction);
+    if (validatedModuleResult.isErr()) {
+      return (0, _neverthrow.err)(validatedModuleResult.error);
+    }
+    const importedModule = validatedModuleResult.value;
+    let checkFn;
     if (auth !== null && auth !== void 0 && auth.runCheck) {
       if (!auth.session) {
         return (0, _neverthrow.err)(new _errors.AuthRequiredError());
       }
+      const checkImportResult = await importUsingImportFunction(`${_constants.AUTH_SESSIONS_FOLDER_NAME}/check`, importFunction);
+      if (checkImportResult.isErr()) {
+        return (0, _neverthrow.err)(checkImportResult.error);
+      }
+      if (checkImportResult.value.type !== "async") {
+        return (0, _neverthrow.err)(new _errors.InvalidCheckError("Check function is not an async function"));
+      }
+      checkFn = checkImportResult.value.func;
+    }
+    if (auth && auth.session.type === "state") {
+      const state = auth.session.state;
+      if (state === undefined || state === null) {
+        return (0, _neverthrow.err)(new _errors.AuthRequiredError());
+      }
+    }
+    if (runOptions.environment === "standalone") {
+      downloadsPath = (0, _downloadDirectory.getDownloadDirectoryPath)();
+      const {
+        headless,
+        proxy
+      } = runOptions;
+      ({
+        page,
+        context
+      } = await (0, _getPlaywrightConstructs.getProductionPlaywrightConstructs)({
+        headless,
+        proxy,
+        downloadsPath,
+        storageState: auth === null || auth === void 0 ? void 0 : auth.session
+      }));
+    } else {
+      const {
+        mode,
+        cdpAddress
+      } = runOptions;
+      ({
+        page,
+        context
+      } = await (0, _getPlaywrightConstructs.getPlaywrightConstructsForMode)(mode, cdpAddress, auth === null || auth === void 0 ? void 0 : auth.session));
+    }
+    if (tracing.enabled) {
+      await context.tracing.start({
+        screenshots: true,
+        snapshots: true,
+        sources: true
+      });
+      traceStarted = true;
+    }
+    (0, _cleanEnvironmentVariables.cleanEnvironmentVariables)();
+    if (checkFn !== undefined) {
       console.log("Running auth check");
-      const authCheckResult = await checkAuthSessionWithRetries(page, context, importFunction, 2);
+      const authCheckResult = await checkAuthSessionWithRetries(page, context, checkFn, 2);
       if (authCheckResult.isErr()) {
         const error = authCheckResult.error;
         if (["APINotFoundError", "InvalidAPIError"].includes(error.code)) {
@@ -157,14 +166,10 @@ async function* runApiGenerator({
       }
     }
     console.log("Running automation");
-    const args = [...(automationFunction.params !== undefined ? [automationFunction.params] : []), page, context];
-    const validatedModuleResult = await importUsingImportFunction(automationFunction.name, importFunction);
-    if (validatedModuleResult.isErr()) {
-      return validatedModuleResult;
-    }
+    const automationFunctionParameters = [...(automationFunction.params !== undefined ? [automationFunction.params] : []), page, context];
     let result;
-    if (validatedModuleResult.value.type === "async-generator") {
-      const generator = validatedModuleResult.value.generator(...args);
+    if (importedModule.type === "async-generator") {
+      const generator = importedModule.generator(...automationFunctionParameters);
       let next = undefined;
       while (true) {
         const generatorResult = await generator.next(...(next ? [next] : []));
@@ -176,7 +181,7 @@ async function* runApiGenerator({
         break;
       }
     } else {
-      result = await validatedModuleResult.value.func(...args);
+      result = await importedModule.func(...automationFunctionParameters);
     }
     return (0, _neverthrow.ok)({
       result,
@@ -201,10 +206,11 @@ async function* runApiGenerator({
   } catch (error) {
     return (0, _neverthrow.err)(new _errors.AutomationError(error));
   } finally {
+    var _context2;
     await saveTraceIfNeeded({
       errorMessage: "failed to save trace"
     });
-    await context.close();
+    await ((_context2 = context) === null || _context2 === void 0 ? void 0 : _context2.close());
     if (downloadsPath !== undefined) {
       await fs.remove(downloadsPath);
     }
@@ -221,22 +227,14 @@ 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, checkFn, 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);
-  if (importResult.isErr()) {
-    return (0, _neverthrow.err)(importResult.error);
-  }
-  if (importResult.value.type !== "async") {
-    return (0, _neverthrow.err)(new _errors.InvalidCheckError("Check function is not an async function"));
-  }
-  const check = importResult.value.func;
   while (retries > tryNumber) {
-    const result = await check(page, context);
+    const result = await checkFn(page, context);
     if (result) return (0, _neverthrow.ok)(true);
     tryNumber++;
   }
@@ -262,7 +260,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) {
-    console.error(error);
     return (0, _neverthrow.err)(new _errors.ApiNotFoundError(path));
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.0.0-udas.4",
+  "version": "1.0.0-udas.6",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",