@intuned/runtime-dev 1.2.1-hooks.0 → 1.2.1-hooks.1

package/dist/common/getPlaywrightConstructs.js

@@ -33,10 +33,14 @@ async function createUserDirWithPreferences() {
   await (0, _fsExtra.writeFile)((0, _path.join)(defaultDir, "Preferences"), JSON.stringify(preferences));
   return userDir;
 }
-async function loadGetDeployedPageAndContextHook(importFunction) {
-  const result = await importFunction("hooks/createDeployedContextAndPage");
+async function loadInitializeContextHook(importFunction) {
+  const result = await importFunction("hooks/initializeContext");
   if (result.isErr()) {
-    throw result.error;
+    if (result.error.type === "not_found") {
+      return null;
+    }
+    console.error("Error loading initializeBrowser hook");
+    throw result.error.error;
   }
   return result.value.default;
 }
@@ -51,13 +55,14 @@ async function getProductionPlaywrightConstructs({
   let page;
   let hook = null;
   if (importFunction) {
-    hook = await loadGetDeployedPageAndContextHook(importFunction);
+    hook = await loadInitializeContextHook(importFunction);
   }
   if (hook) {
     ({
       page,
       context
     } = await hook({
+      type: "launch",
       proxy,
       headless
     }));
@@ -108,27 +113,23 @@ async function getProductionPlaywrightConstructs({
     context
   };
 }
-async function loadGetIDEPageAndContextHook(importFunction) {
-  const result = await importFunction("hooks/createDeployedContextAndPage");
-  if (result.isErr()) {
-    throw result.error;
-  }
-  return result.value.default;
-}
 async function getPlaywrightConstructsForMode(mode, cdpAddress, authSession, importFunction) {
   let hook = null;
   if (importFunction) {
-    hook = await loadGetIDEPageAndContextHook(importFunction);
+    hook = await loadInitializeContextHook(importFunction);
   }
   if (mode == "playwright-standalone") {
     if (!cdpAddress) {
       throw new Error("cdpAddress is required");
     }
     let context;
+    let page = null;
     if (hook) {
       ({
-        context
+        context,
+        page
       } = await hook({
+        type: "cdp",
         cdpAddress
       }));
     } else {
@@ -143,14 +144,15 @@ async function getPlaywrightConstructsForMode(mode, cdpAddress, authSession, imp
     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();
+    const pages = context.pages();
+    if (!page) {
+      if (pages.length > 0) {
+        page = pages[0];
+        const scriptString = await fs.readFile(assetsFile, "utf8");
+        await page.evaluate(scriptString);
+      } else {
+        page = await context.newPage();
+      }
     }
     if (authSession) {
       await loadSessionToContext({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.2.1-hooks.0",
+  "version": "1.2.1-hooks.1",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",