@ricsam/isolate-client 0.1.19 → 0.1.21

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/isolate-client",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "type": "commonjs"
 }

package/dist/mjs/connection.mjs

@@ -17,6 +17,7 @@ import {
   deserializeResponse
 } from "@ricsam/isolate-protocol";
 import {
+  defaultPlaywrightHandler,
   getDefaultPlaywrightHandlerMetadata
 } from "@ricsam/isolate-playwright/client";
 var isolateWsCallbacks = new Map;
@@ -152,6 +153,7 @@ async function connect(options = {}) {
             testEnvironmentOption = true;
           }
         }
+        const playwrightOption = runtimeOptions.playwright?.timeout !== undefined ? { timeout: runtimeOptions.playwright.timeout } : undefined;
         const requestId = st.nextRequestId++;
         const request = {
           type: MessageType.CREATE_RUNTIME,
@@ -161,6 +163,7 @@ async function connect(options = {}) {
             cwd: runtimeOptions.cwd,
             callbacks,
             testEnvironment: testEnvironmentOption,
+            playwright: playwrightOption,
             namespaceId
           }
         };
@@ -471,7 +474,32 @@ function isBenignDisposeError(error) {
   const message = error instanceof Error ? error.message : String(error ?? "");
   return /isolate not owned by this connection|isolate not found|not connected|connection closed/i.test(message);
 }
+function normalizePlaywrightOptions(playwrightOptions) {
+  if (!playwrightOptions || playwrightOptions.timeout === undefined) {
+    return playwrightOptions;
+  }
+  const metadata = getDefaultPlaywrightHandlerMetadata(playwrightOptions.handler);
+  if (!metadata?.page) {
+    return playwrightOptions;
+  }
+  const currentTimeout = metadata.options?.timeout ?? 30000;
+  if (currentTimeout === playwrightOptions.timeout) {
+    return playwrightOptions;
+  }
+  return {
+    ...playwrightOptions,
+    handler: defaultPlaywrightHandler(metadata.page, {
+      ...metadata.options,
+      timeout: playwrightOptions.timeout
+    })
+  };
+}
 async function createRuntime(state, options = {}, namespaceId) {
+  const normalizedPlaywrightOptions = normalizePlaywrightOptions(options.playwright);
+  const runtimeOptionsForReconnect = normalizedPlaywrightOptions === options.playwright ? options : {
+    ...options,
+    playwright: normalizedPlaywrightOptions
+  };
   const callbacks = {};
   if (options.console) {
     callbacks.console = registerConsoleCallbacks(state, options.console);
@@ -493,8 +521,8 @@ async function createRuntime(state, options = {}, namespaceId) {
   const networkRequests = [];
   const networkResponses = [];
   const pageListenerCleanups = [];
-  if (options.playwright) {
-    playwrightHandler = options.playwright.handler;
+  if (normalizedPlaywrightOptions) {
+    playwrightHandler = normalizedPlaywrightOptions.handler;
     if (!playwrightHandler) {
       throw new Error("playwright.handler is required when using playwright options");
     }
@@ -513,18 +541,18 @@ async function createRuntime(state, options = {}, namespaceId) {
           timestamp: Date.now()
         };
         browserConsoleLogs.push(entry);
-        if (options.playwright.onEvent) {
-          options.playwright.onEvent({
+        if (normalizedPlaywrightOptions.onEvent) {
+          normalizedPlaywrightOptions.onEvent({
             type: "browserConsoleLog",
             ...entry
           });
         }
-        if (options.playwright.console && options.console?.onEntry) {
+        if (normalizedPlaywrightOptions.console && options.console?.onEntry) {
           options.console.onEntry({
             type: "browserOutput",
             ...entry
           });
-        } else if (options.playwright.console) {
+        } else if (normalizedPlaywrightOptions.console) {
           const prefix = entry.level === "error" ? "[browser:error]" : "[browser]";
           console.log(prefix, entry.stdout);
         }
@@ -537,8 +565,8 @@ async function createRuntime(state, options = {}, namespaceId) {
           timestamp: Date.now()
         };
         networkRequests.push(info);
-        if (options.playwright.onEvent) {
-          options.playwright.onEvent({
+        if (normalizedPlaywrightOptions.onEvent) {
+          normalizedPlaywrightOptions.onEvent({
             type: "networkRequest",
             ...info
           });
@@ -552,8 +580,8 @@ async function createRuntime(state, options = {}, namespaceId) {
           timestamp: Date.now()
         };
         networkResponses.push(info);
-        if (options.playwright.onEvent) {
-          options.playwright.onEvent({
+        if (normalizedPlaywrightOptions.onEvent) {
+          normalizedPlaywrightOptions.onEvent({
             type: "networkResponse",
             ...info
           });
@@ -566,7 +594,7 @@ async function createRuntime(state, options = {}, namespaceId) {
     }
     callbacks.playwright = {
       handlerCallbackId,
-      console: options.playwright.console && !options.console?.onEntry
+      console: normalizedPlaywrightOptions.console && !options.console?.onEntry
     };
   }
   let testEnvironmentOption;
@@ -594,6 +622,7 @@ async function createRuntime(state, options = {}, namespaceId) {
       testEnvironmentOption = true;
     }
   }
+  const playwrightOption = normalizedPlaywrightOptions?.timeout !== undefined ? { timeout: normalizedPlaywrightOptions.timeout } : undefined;
   const requestId = state.nextRequestId++;
   const request = {
     type: MessageType.CREATE_RUNTIME,
@@ -603,6 +632,7 @@ async function createRuntime(state, options = {}, namespaceId) {
       cwd: options.cwd,
       callbacks,
       testEnvironment: testEnvironmentOption,
+      playwright: playwrightOption,
       namespaceId
     }
   };
@@ -612,7 +642,7 @@ async function createRuntime(state, options = {}, namespaceId) {
   if (namespaceId != null) {
     state.namespacedRuntimes.set(namespaceId, {
       isolateId,
-      runtimeOptions: options
+      runtimeOptions: runtimeOptionsForReconnect
     });
   }
   const wsCommandCallbacks = new Set;
@@ -825,7 +855,7 @@ async function createRuntime(state, options = {}, namespaceId) {
     }
   };
   const testEnvironmentEnabled = !!options.testEnvironment;
-  const playwrightEnabled = !!options.playwright;
+  const playwrightEnabled = !!normalizedPlaywrightOptions;
   const testEnvironmentHandle = {
     async runTests(timeout) {
       if (!testEnvironmentEnabled) {
@@ -1664,4 +1694,4 @@ export {
   connect
 };
 
-//# debugId=7EA890CF5E7314ED64756E2164756E21
+//# debugId=17E01CA2373935E664756E2164756E21