@ricsam/isolate-client 0.1.10 → 0.1.12

package/dist/mjs/connection.mjs

@@ -397,6 +397,10 @@ async function createRuntime(state, options = {}, namespaceId) {
     callbacks.custom = registerCustomFunctions(state, options.customFunctions);
   }
   let playwrightHandler;
+  const browserConsoleLogs = [];
+  const networkRequests = [];
+  const networkResponses = [];
+  const pageListenerCleanups = [];
   if (options.playwright) {
     playwrightHandler = createPlaywrightHandler(options.playwright.page, {
       timeout: options.playwright.timeout,
@@ -408,65 +412,67 @@ async function createRuntime(state, options = {}, namespaceId) {
       const result2 = await playwrightHandler(op);
       return JSON.stringify(result2);
     });
-    const hasOnEvent = !!options.playwright.onEvent;
-    const hasConsoleHandler = options.playwright.console && options.console?.onEntry;
-    let browserConsoleLogCallbackId;
-    if (hasOnEvent || hasConsoleHandler) {
-      browserConsoleLogCallbackId = registerEventCallback(state, (entry) => {
-        const browserEntry = entry;
-        if (options.playwright.onEvent) {
-          options.playwright.onEvent({
-            type: "browserConsoleLog",
-            level: browserEntry.level,
-            stdout: browserEntry.stdout,
-            timestamp: browserEntry.timestamp
-          });
-        }
-        if (options.playwright.console && options.console?.onEntry) {
-          options.console.onEntry({
-            type: "browserOutput",
-            level: browserEntry.level,
-            stdout: browserEntry.stdout,
-            timestamp: browserEntry.timestamp
-          });
-        }
-      });
-    }
-    let networkRequestCallbackId;
-    if (hasOnEvent) {
-      networkRequestCallbackId = registerEventCallback(state, (info) => {
-        const reqInfo = info;
+    const page = options.playwright.page;
+    const onConsole = (msg) => {
+      const entry = {
+        level: msg.type(),
+        stdout: msg.text(),
+        timestamp: Date.now()
+      };
+      browserConsoleLogs.push(entry);
+      if (options.playwright.onEvent) {
+        options.playwright.onEvent({
+          type: "browserConsoleLog",
+          ...entry
+        });
+      }
+      if (options.playwright.console && options.console?.onEntry) {
+        options.console.onEntry({
+          type: "browserOutput",
+          ...entry
+        });
+      } else if (options.playwright.console) {
+        const prefix = entry.level === "error" ? "[browser:error]" : "[browser]";
+        console.log(prefix, entry.stdout);
+      }
+    };
+    const onRequest = (request2) => {
+      const info = {
+        url: request2.url(),
+        method: request2.method(),
+        headers: request2.headers(),
+        timestamp: Date.now()
+      };
+      networkRequests.push(info);
+      if (options.playwright.onEvent) {
         options.playwright.onEvent({
           type: "networkRequest",
-          url: reqInfo.url,
-          method: reqInfo.method,
-          headers: reqInfo.headers,
-          postData: reqInfo.postData,
-          resourceType: reqInfo.resourceType,
-          timestamp: reqInfo.timestamp
+          ...info
         });
-      });
-    }
-    let networkResponseCallbackId;
-    if (hasOnEvent) {
-      networkResponseCallbackId = registerEventCallback(state, (info) => {
-        const resInfo = info;
+      }
+    };
+    const onResponse = (response) => {
+      const info = {
+        url: response.url(),
+        status: response.status(),
+        headers: response.headers(),
+        timestamp: Date.now()
+      };
+      networkResponses.push(info);
+      if (options.playwright.onEvent) {
         options.playwright.onEvent({
           type: "networkResponse",
-          url: resInfo.url,
-          status: resInfo.status,
-          statusText: resInfo.statusText,
-          headers: resInfo.headers,
-          timestamp: resInfo.timestamp
+          ...info
         });
-      });
-    }
+      }
+    };
+    page.on("console", onConsole);
+    page.on("request", onRequest);
+    page.on("response", onResponse);
+    pageListenerCleanups.push(() => page.removeListener("console", onConsole), () => page.removeListener("request", onRequest), () => page.removeListener("response", onResponse));
     callbacks.playwright = {
       handlerCallbackId,
-      console: options.playwright.console && !options.console?.onEntry,
-      onBrowserConsoleLogCallbackId: browserConsoleLogCallbackId,
-      onNetworkRequestCallbackId: networkRequestCallbackId,
-      onNetworkResponseCallbackId: networkResponseCallbackId
+      console: options.playwright.console && !options.console?.onEntry
     };
   }
   let testEnvironmentOption;
@@ -724,29 +730,23 @@ async function createRuntime(state, options = {}, namespaceId) {
     }
   };
   const playwrightHandle = {
-    async getCollectedData() {
+    getCollectedData() {
       if (!playwrightEnabled) {
         throw new Error("Playwright not configured. Provide playwright.page in createRuntime options.");
       }
-      const reqId = state.nextRequestId++;
-      const req = {
-        type: MessageType.GET_COLLECTED_DATA,
-        requestId: reqId,
-        isolateId
+      return {
+        browserConsoleLogs: [...browserConsoleLogs],
+        networkRequests: [...networkRequests],
+        networkResponses: [...networkResponses]
       };
-      return sendRequest(state, req);
     },
-    async clearCollectedData() {
+    clearCollectedData() {
       if (!playwrightEnabled) {
         throw new Error("Playwright not configured. Provide playwright.page in createRuntime options.");
       }
-      const reqId = state.nextRequestId++;
-      const req = {
-        type: MessageType.CLEAR_COLLECTED_DATA,
-        requestId: reqId,
-        isolateId
-      };
-      await sendRequest(state, req);
+      browserConsoleLogs.length = 0;
+      networkRequests.length = 0;
+      networkResponses.length = 0;
     }
   };
   return {
@@ -773,6 +773,9 @@ async function createRuntime(state, options = {}, namespaceId) {
       await sendRequest(state, req);
     },
     dispose: async () => {
+      for (const cleanup of pageListenerCleanups) {
+        cleanup();
+      }
       isolateWsCallbacks.delete(isolateId);
       const reqId = state.nextRequestId++;
       const req = {
@@ -1279,4 +1282,4 @@ export {
   connect
 };
 
-//# debugId=8CFFE73BFF63A58464756E2164756E21
+//# debugId=9932655385124AD564756E2164756E21