@intuned/runtime-dev 1.7.0-dev-52 → 1.7.0-dev-52-2

package/dist/common/contextStorageStateHelpers.d.ts

@@ -1,4 +1,4 @@
-import * as playwright from "playwright-core";
+import * as playwright from "playwright";
 interface StorageEntry {
     name: string;
     value: string;

package/dist/common/contextStorageStateHelpers.js

@@ -30,7 +30,23 @@ async function setStorageState(context, state) {
       }
     }
   }
-  if ("sessionStorage" in state && state.sessionStorage) {}
+  if ("sessionStorage" in state && state.sessionStorage) {
+    await context.addInitScript(storage => {
+      for (const {
+        origin,
+        sessionStorage
+      } of storage) {
+        if (window.location.origin === origin) {
+          for (const item of sessionStorage) {
+            const value = window.sessionStorage.getItem(item.name);
+            if (!value) {
+              window.sessionStorage.setItem(item.name, item.value);
+            }
+          }
+        }
+      }
+    }, state.sessionStorage);
+  }
   await page.close();
 }
 async function getStorageState(context) {

package/dist/common/getPlaywrightConstructs.d.ts

@@ -1,4 +1,4 @@
-import * as playwright from "playwright-core";
+import * as playwright from "playwright";
 import type { RunApiSession } from "./runApi";
 interface Proxy {
     server: string;

package/dist/common/getPlaywrightConstructs.js

@@ -7,7 +7,7 @@ exports.getPlaywrightConstructsForMode = getPlaywrightConstructsForMode;
 exports.getProductionPlaywrightConstructs = getProductionPlaywrightConstructs;
 exports.getRemotePlaywrightContext = getRemotePlaywrightContext;
 exports.loadSessionToContext = loadSessionToContext;
-var playwright = _interopRequireWildcard(require("playwright-core"));
+var playwright = _interopRequireWildcard(require("playwright"));
 var _fsExtra = _interopRequireWildcard(require("fs-extra"));
 var fs = _fsExtra;
 var _contextStorageStateHelpers = require("./contextStorageStateHelpers");
@@ -46,16 +46,15 @@ async function getProductionPlaywrightConstructs({
   const executablePath = playwright.chromium.executablePath();
   const chromium127Path = executablePath.replace("chromium-1117", "chromium-1124");
   const isChrome127There = await (0, _fsExtra.exists)(chromium127Path);
-  const userAgent = `Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${isChrome127There ? 127 : 125}.0.0.0 Safari/537.36`;
+  const userAgent = `Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/Chrome/136.0.7103.25 Safari/537.36`;
   const userDataDir = await createUserDirWithPreferences();
   const context = await playwright.chromium.launchPersistentContext(userDataDir, {
     headless,
+    viewport: null,
     ignoreDefaultArgs: [...getChromiumLaunchArgsToIgnore(), "--headless"],
     proxy,
     executablePath: isChrome127There ? chromium127Path : executablePath,
-    args: extraArgs,
-    downloadsPath,
-    userAgent
+    downloadsPath
   });
   context.once("close", async () => {
     try {
@@ -76,9 +75,13 @@ async function getProductionPlaywrightConstructs({
     });
   }
   const assetsFile = _path.default.join(__dirname, "./assets/browser_scripts.js");
+  await context.addInitScript({
+    path: assetsFile
+  });
   let page = context.pages().at(0);
   if (page) {
     const scriptString = await (0, _fsExtra.readFile)(assetsFile, "utf8");
+    await page.evaluate(scriptString);
   } else {
     page = await context.newPage();
   }
@@ -100,11 +103,15 @@ async function getPlaywrightConstructsForMode(mode, cdpAddress, authSession) {
       throw new Error("no context found");
     }
     const assetsFile = _path.default.join(__dirname, "./assets/browser_scripts.js");
+    await context.addInitScript({
+      path: assetsFile
+    });
     const pages = await context.pages();
     let page = null;
     if (pages.length > 0) {
       page = pages[0];
       const scriptString = await fs.readFile(assetsFile, "utf8");
+      await page.evaluate(scriptString);
     } else {
       page = await context.newPage();
     }
@@ -155,7 +162,7 @@ async function loadSessionToContext({
   await (0, _contextStorageStateHelpers.setStorageState)(context, sessionToLoad);
 }
 async function getRemotePlaywrightContext(cdpAddress) {
-  const playwright = await Promise.resolve().then(() => _interopRequireWildcard(require("playwright-core")));
+  const playwright = await Promise.resolve().then(() => _interopRequireWildcard(require("playwright")));
   let browser = null;
   if (!cdpAddress) {
     throw new Error("cdpAddress is required");

package/dist/common/jwtTokenManager.js

@@ -36,8 +36,7 @@ class JwtTokenManager {
     return Math.max(timeToRefresh, timeWindow);
   }
   async scheduleTokenRefresh() {
-    var _process$env$RUN_ENVI;
-    if (((_process$env$RUN_ENVI = process.env.RUN_ENVIRONMENT) === null || _process$env$RUN_ENVI === void 0 ? void 0 : _process$env$RUN_ENVI.toLowerCase()) !== "authoring") return;
+    if (process.env.RUN_ENVIRONMENT?.toLowerCase() !== "authoring") return;
     const timeToRefresh = this.timeToRefresh;
     if (timeToRefresh === undefined) return;
     if (this.tokenRefreshTimeout) clearTimeout(this.tokenRefreshTimeout);
@@ -51,8 +50,7 @@ class JwtTokenManager {
     }, timeToRefresh);
   }
   async refreshToken() {
-    var _process$env$RUN_ENVI2;
-    if (((_process$env$RUN_ENVI2 = process.env.RUN_ENVIRONMENT) === null || _process$env$RUN_ENVI2 === void 0 ? void 0 : _process$env$RUN_ENVI2.toLowerCase()) !== "authoring") return;
+    if (process.env.RUN_ENVIRONMENT?.toLowerCase() !== "authoring") return;
     const res = await this.fetchWithToken(this.refreshTokenPath, {
       method: "GET"
     });
@@ -65,7 +63,7 @@ class JwtTokenManager {
     if (newToken) this._token = newToken;
   }
   fetchWithToken(...[input, init]) {
-    const headers = new Headers(init === null || init === void 0 ? void 0 : init.headers);
+    const headers = new Headers(init?.headers);
     headers.set("Authorization", `Bearer ${this.token}`);
     return (0, _crossFetch.default)(input, {
       ...init,

package/dist/common/runApi/errors.js

@@ -22,11 +22,10 @@ const runAutomationErrorCodes = exports.runAutomationErrorCodes = [apiNotFoundEr
 class RunAutomationError {
   wrapped = false;
   get json() {
-    var _this$cause;
     return {
       code: this.code,
       details: this.details,
-      cause: (_this$cause = this.cause) === null || _this$cause === void 0 ? void 0 : _this$cause.json
+      cause: this.cause?.json
     };
   }
 }
@@ -136,10 +135,10 @@ class AutomationError extends RunAutomationError {
       };
     }
     this.statusCode = 500;
-    this.message = `[${(error === null || error === void 0 ? void 0 : error.name) ?? error}] ${error === null || error === void 0 ? void 0 : error.message}`;
+    this.message = `[${error?.name ?? error}] ${error?.message}`;
     this.details = {
-      name: error === null || error === void 0 ? void 0 : error.name,
-      message: error === null || error === void 0 ? void 0 : error.message
+      name: error?.name,
+      message: error?.message
     };
   }
 }

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

@@ -1,6 +1,6 @@
 import { Result } from "neverthrow";
 import { RunAutomationError } from "./errors";
-import { Page, BrowserContext } from "playwright-core";
+import { Page, BrowserContext } from "playwright";
 import { ExtendedRunApiParameters, RunApiResult, RunApiResultWithSessionOk } from "./types";
 export * from "./types";
 export * from "./errors";

package/dist/common/runApi/index.js

@@ -80,17 +80,15 @@ async function* runApiGenerator({
       return;
     }
     try {
-      var _context;
-      await ((_context = context) === null || _context === void 0 ? void 0 : _context.tracing.stop({
+      await context?.tracing.stop({
         path: tracing.filePath
-      }));
+      });
     } catch (error) {
-      console.log(errorMessage, error === null || error === void 0 ? void 0 : error.message);
+      console.log(errorMessage, error?.message);
       await (0, _fsExtra.remove)(tracing.filePath);
     }
   }
   async function* runAutomation() {
-    var _getExecutionContext;
     let page;
     const validatedModuleResult = await importUsingImportFunction(automationFunction.name, importFunction);
     if (validatedModuleResult.isErr()) {
@@ -98,7 +96,7 @@ async function* runApiGenerator({
     }
     const importedModule = validatedModuleResult.value;
     let checkFn;
-    if (auth !== null && auth !== void 0 && auth.runCheck) {
+    if (auth?.runCheck) {
       if (!auth.session) {
         return (0, _neverthrow.err)(new _errors.AuthRequiredError());
       }
@@ -130,7 +128,7 @@ async function* runApiGenerator({
         headless,
         proxy,
         downloadsPath,
-        storageState: auth === null || auth === void 0 ? void 0 : auth.session
+        storageState: auth?.session
       }));
     } else {
       const {
@@ -140,7 +138,7 @@ async function* runApiGenerator({
       ({
         page,
         context
-      } = await (0, _getPlaywrightConstructs.getPlaywrightConstructsForMode)(mode, cdpAddress, auth === null || auth === void 0 ? void 0 : auth.session));
+      } = await (0, _getPlaywrightConstructs.getPlaywrightConstructsForMode)(mode, cdpAddress, auth?.session));
     }
     if (tracing.enabled) {
       await context.tracing.start({
@@ -185,7 +183,7 @@ async function* runApiGenerator({
     }
     return (0, _neverthrow.ok)({
       result,
-      extendedPayloads: (_getExecutionContext = (0, _asyncLocalStorage.getExecutionContext)()) === null || _getExecutionContext === void 0 ? void 0 : _getExecutionContext.extendedPayloads,
+      extendedPayloads: (0, _asyncLocalStorage.getExecutionContext)()?.extendedPayloads,
       session: retrieveSession ? await (0, _contextStorageStateHelpers.getStorageState)(context) : undefined
     });
   }
@@ -206,11 +204,10 @@ async function* runApiGenerator({
   } catch (error) {
     return (0, _neverthrow.err)(new _errors.AutomationError(error));
   } finally {
-    var _context2;
     await saveTraceIfNeeded({
       errorMessage: "failed to save trace"
     });
-    await ((_context2 = context) === null || _context2 === void 0 ? void 0 : _context2.close());
+    await context?.close();
     if (downloadsPath !== undefined) {
       await fs.remove(downloadsPath);
     }

package/dist/runtime/executionHelpers.test.js

@@ -24,13 +24,12 @@ var _enums = require("./enums");
       runId: "test-run-id",
       extendedPayloads: []
     }, () => {
-      var _getExecutionContext, _getExecutionContext2;
-      (0, _vitest.expect)((_getExecutionContext = (0, _asyncLocalStorage.getExecutionContext)()) === null || _getExecutionContext === void 0 ? void 0 : _getExecutionContext.extendedPayloads).toEqual([]);
+      (0, _vitest.expect)((0, _asyncLocalStorage.getExecutionContext)()?.extendedPayloads).toEqual([]);
       (0, _.extendPayload)({
         api: "test-api",
         parameters: {}
       });
-      (0, _vitest.expect)((_getExecutionContext2 = (0, _asyncLocalStorage.getExecutionContext)()) === null || _getExecutionContext2 === void 0 ? void 0 : _getExecutionContext2.extendedPayloads).toEqual([{
+      (0, _vitest.expect)((0, _asyncLocalStorage.getExecutionContext)()?.extendedPayloads).toEqual([{
         api: "test-api",
         parameters: {}
       }]);
@@ -47,7 +46,7 @@ var _enums = require("./enums");
         parameters: {}
       });
       const context = (0, _asyncLocalStorage.getExecutionContext)();
-      (0, _vitest.expect)(context === null || context === void 0 ? void 0 : context.extendedPayloads).toHaveLength(4);
+      (0, _vitest.expect)(context?.extendedPayloads).toHaveLength(4);
     });
   });
 });

package/dist/runtime/extendPayload.js

@@ -16,6 +16,6 @@ function extendPayload(payload) {
     context.extendedPayloads = [...items];
     return;
   }
-  context === null || context === void 0 || context.extendedPayloads.push(...items);
+  context?.extendedPayloads.push(...items);
   (0, _extendTimeout.extendTimeout)();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.7.0-dev-52",
+  "version": "1.7.0-dev-52-2",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",
@@ -130,7 +130,6 @@
     "vitest": "^1.1.3"
   },
   "peerDependencies": {
-    "playwright": "*",
-    "playwright-core": "*"
+    "playwright": "*"
   }
 }