@nextop-os/browser-node 0.0.26 → 0.0.28

package/dist/electron-main/index.js

@@ -1,11 +1,11 @@
+import {
+  isBrowserSessionPartitionAllowed,
+  resolveBrowserSessionPartition
+} from "../chunk-UTXZLRPE.js";
 import {
   normalizeBrowserComparableUrl,
   resolveBrowserNavigationUrl
 } from "../chunk-2ZAMKGGP.js";
-import {
-  isBrowserSessionPartitionAllowed,
-  resolveBrowserSessionPartition
-} from "../chunk-OTK5YBCK.js";
 
 // src/electron-main/loopbackPreviewProxy.ts
 import {
@@ -13,12 +13,8 @@ import {
   request as httpRequest
 } from "http";
 import { request as httpsRequest } from "https";
-import { createRequire } from "module";
 import { pipeline } from "stream";
-var require2 = createRequire(import.meta.url);
-var wsModule = require2("ws");
-var WebSocket = wsModule;
-var { WebSocketServer } = wsModule;
+import WebSocket, { WebSocketServer } from "ws";
 var defaultLoopbackPreviewCacheTtlMs = 3e4;
 var loopbackHostPattern = /^(localhost|127(?:\.\d{1,3}){0,3})$/i;
 var loopbackPreviewProxyBypassRules = "*;<-loopback>;https://*;wss://*";
@@ -463,6 +459,26 @@ function normalizeWebSocketCloseCode(code) {
 var browserPreviewMaxWidth = 260;
 var browserPreviewMaxHeight = 170;
 var abortedNavigationErrorCode = -3;
+function canGuestGoBack(contents) {
+  return contents.navigationHistory?.canGoBack() ?? contents.canGoBack();
+}
+function canGuestGoForward(contents) {
+  return contents.navigationHistory?.canGoForward() ?? contents.canGoForward();
+}
+function goGuestBack(contents) {
+  if (contents.navigationHistory) {
+    contents.navigationHistory.goBack();
+    return;
+  }
+  contents.goBack();
+}
+function goGuestForward(contents) {
+  if (contents.navigationHistory) {
+    contents.navigationHistory.goForward();
+    return;
+  }
+  contents.goForward();
+}
 function resolveBrowserNodeUrlError(resolved) {
   if (resolved.errorCode === "invalid-url") {
     return { code: "invalid-url" };
@@ -500,6 +516,28 @@ function resizeBrowserPreviewImage(image) {
 function isAbortedNavigationError(input) {
   return input.errorCode === abortedNavigationErrorCode || input.errorDescription === "ERR_ABORTED";
 }
+function resolveBrowserNavigationOrigin(url) {
+  const resolved = resolveBrowserNavigationUrl(url);
+  if (!resolved.url) {
+    return null;
+  }
+  try {
+    return new URL(resolved.url).origin;
+  } catch {
+    return null;
+  }
+}
+function isBrowserNavigationAllowedByPolicy(input) {
+  if (!input.policy) {
+    return true;
+  }
+  if (input.policy.mode === "same-origin") {
+    const policyOrigin = resolveBrowserNavigationOrigin(input.policy.originUrl);
+    const nextOrigin = resolveBrowserNavigationOrigin(input.url);
+    return policyOrigin !== null && nextOrigin !== null && policyOrigin === nextOrigin;
+  }
+  return true;
+}
 async function applyPreferredColorSchemeToGuest(session, logger, syncPreferredColorScheme, scheme) {
   const contents = session.contents;
   if (!contents || contents.isDestroyed() || !syncPreferredColorScheme || scheme === null || session.appliedColorScheme === scheme) {
@@ -540,6 +578,12 @@ function createBrowserGuestManager({
       if (input?.sessionMode !== void 0) {
         existing.sessionMode = input.sessionMode;
       }
+      if (input?.sessionPartition !== void 0) {
+        existing.sessionPartition = input.sessionPartition;
+      }
+      if (input?.navigationPolicy !== void 0) {
+        existing.navigationPolicy = input.navigationPolicy;
+      }
       if (input?.url !== void 0) {
         existing.desiredUrl = input.url;
       }
@@ -551,9 +595,11 @@ function createBrowserGuestManager({
       desiredUrl: input?.url ?? "about:blank",
       lifecycle: "cold",
       listeners: [],
+      navigationPolicy: input?.navigationPolicy ?? null,
       nodeId,
       profileId: input?.profileId ?? null,
       sessionMode: input?.sessionMode ?? "shared",
+      sessionPartition: input?.sessionPartition ?? null,
       webContentsId: null
     };
     sessions.set(nodeId, session);
@@ -562,8 +608,8 @@ function createBrowserGuestManager({
   const publishState = (session) => {
     const contents = session.contents && !session.contents.isDestroyed() ? session.contents : null;
     emit({
-      canGoBack: contents ? contents.canGoBack() : false,
-      canGoForward: contents ? contents.canGoForward() : false,
+      canGoBack: contents ? canGuestGoBack(contents) : false,
+      canGoForward: contents ? canGuestGoForward(contents) : false,
       isAttachedToWindow: Boolean(contents),
       isLoading: contents ? contents.isLoading() : false,
       isOccluded: session.lifecycle === "cold",
@@ -613,10 +659,22 @@ function createBrowserGuestManager({
     const onFailLoad = (...args) => {
       const errorCode = typeof args[1] === "number" ? args[1] : void 0;
       const errorDescription = typeof args[2] === "string" ? args[2] : void 0;
+      const validatedUrl = typeof args[3] === "string" ? args[3] : void 0;
+      const isMainFrame = typeof args[4] === "boolean" ? args[4] : void 0;
       if (isAbortedNavigationError({ errorCode, errorDescription })) {
         publishState(session);
         return;
       }
+      logger?.warn?.("Browser Node guest navigation failed", {
+        currentUrl: contents.getURL(),
+        desiredUrl: session.desiredUrl,
+        errorCode,
+        errorDescription,
+        isMainFrame,
+        nodeId: session.nodeId,
+        validatedUrl,
+        webContentsId: session.webContentsId
+      });
       emit({
         code: "navigation-failed",
         diagnosticMessage: errorDescription,
@@ -627,12 +685,26 @@ function createBrowserGuestManager({
       publishState(session);
     };
     const onDestroyed = () => detachGuest(session);
+    const onWillNavigate = (...args) => {
+      const event = args[0] && typeof args[0] === "object" && "preventDefault" in args[0] ? args[0] : null;
+      const url = typeof args[1] === "string" ? args[1] : "";
+      if (url.length === 0 || isBrowserNavigationAllowedByPolicy({
+        policy: session.navigationPolicy,
+        url
+      })) {
+        return;
+      }
+      event?.preventDefault?.();
+      openExternalFromGuest(url);
+      publishState(session);
+    };
     const records = [
       { event: "did-start-loading", listener: onStateChange },
       { event: "did-stop-loading", listener: onStateChange },
       { event: "did-navigate", listener: onStateChange },
       { event: "did-navigate-in-page", listener: onStateChange },
       { event: "page-title-updated", listener: onStateChange },
+      { event: "will-navigate", listener: onWillNavigate },
       { event: "did-fail-load", listener: onFailLoad },
       { event: "destroyed", listener: onDestroyed }
     ];
@@ -657,14 +729,35 @@ function createBrowserGuestManager({
       publishState(session);
       return;
     }
+    if (!isBrowserNavigationAllowedByPolicy({
+      policy: session.navigationPolicy,
+      url: resolved.url
+    })) {
+      openExternalFromGuest(resolved.url);
+      publishState(session);
+      return;
+    }
     const currentComparable = normalizeBrowserComparableUrl(contents.getURL());
     const nextComparable = normalizeBrowserComparableUrl(resolved.url);
     if (currentComparable && currentComparable === nextComparable) {
       publishState(session);
       return;
     }
-    await contents.loadURL(resolved.url);
-    publishState(session);
+    try {
+      await contents.loadURL(resolved.url);
+    } catch (error) {
+      logger?.warn?.("Browser Node guest loadURL failed", {
+        currentUrl: contents.getURL(),
+        desiredUrl: session.desiredUrl,
+        error: error instanceof Error ? error.message : String(error),
+        nodeId: session.nodeId,
+        resolvedUrl: resolved.url,
+        webContentsId: session.webContentsId
+      });
+      throw error;
+    } finally {
+      publishState(session);
+    }
   };
   const openExternalFromGuest = (url) => {
     const resolved = resolveBrowserNavigationUrl(url);
@@ -686,8 +779,10 @@ function createBrowserGuestManager({
         throw new Error("Browser Node rejected navigation URL");
       }
       const session = getSession(input.nodeId, {
+        navigationPolicy: input.navigationPolicy,
         profileId: input.profileId,
         sessionMode: input.sessionMode,
+        sessionPartition: input.sessionPartition,
         url: resolved.url
       });
       session.lifecycle = "active";
@@ -721,8 +816,8 @@ function createBrowserGuestManager({
       }
       const contents = session.contents && !session.contents.isDestroyed() ? session.contents : null;
       return {
-        canGoBack: contents ? contents.canGoBack() : false,
-        canGoForward: contents ? contents.canGoForward() : false,
+        canGoBack: contents ? canGuestGoBack(contents) : false,
+        canGoForward: contents ? canGuestGoForward(contents) : false,
         currentUrl: contents ? contents.getURL() : null,
         desiredUrl: session.desiredUrl,
         isAttachedToWindow: Boolean(contents),
@@ -731,6 +826,7 @@ function createBrowserGuestManager({
         nodeId: session.nodeId,
         profileId: session.profileId,
         sessionMode: session.sessionMode,
+        sessionPartition: session.sessionPartition,
         title: contents ? contents.getTitle() : null,
         webContentsDestroyed: session.contents ? session.contents.isDestroyed() : null,
         webContentsId: session.webContentsId
@@ -738,15 +834,15 @@ function createBrowserGuestManager({
     },
     goBack(input) {
       const contents = sessions.get(input.nodeId)?.contents;
-      if (contents && !contents.isDestroyed() && contents.canGoBack()) {
-        contents.goBack();
+      if (contents && !contents.isDestroyed() && canGuestGoBack(contents)) {
+        goGuestBack(contents);
       }
       return Promise.resolve();
     },
     goForward(input) {
       const contents = sessions.get(input.nodeId)?.contents;
-      if (contents && !contents.isDestroyed() && contents.canGoForward()) {
-        contents.goForward();
+      if (contents && !contents.isDestroyed() && canGuestGoForward(contents)) {
+        goGuestForward(contents);
       }
       return Promise.resolve();
     },
@@ -755,22 +851,29 @@ function createBrowserGuestManager({
       if (!resolved.url) {
         throw new Error("Browser Node rejected navigation URL");
       }
-      const session = getSession(input.nodeId, { url: resolved.url });
+      const session = getSession(input.nodeId, {
+        navigationPolicy: input.navigationPolicy,
+        url: resolved.url
+      });
       session.lifecycle = "active";
       await loadDesiredUrl(session);
     },
     async prepareSession(input) {
       await prepareSession?.(input);
       getSession(input.nodeId, {
+        navigationPolicy: input.navigationPolicy,
         profileId: input.profileId,
-        sessionMode: input.sessionMode
+        sessionMode: input.sessionMode,
+        sessionPartition: input.sessionPartition
       });
     },
     async registerGuest(input) {
       await prepareSession?.({
         nodeId: input.nodeId,
         profileId: input.profileId,
-        sessionMode: input.sessionMode
+        sessionMode: input.sessionMode,
+        sessionPartition: input.sessionPartition,
+        navigationPolicy: input.navigationPolicy
       });
       const contents = resolveWebContents(input.webContentsId);
       if (!contents || contents.isDestroyed()) {
@@ -785,8 +888,10 @@ function createBrowserGuestManager({
         );
       }
       const session = getSession(input.nodeId, {
+        navigationPolicy: input.navigationPolicy,
         profileId: input.profileId,
-        sessionMode: input.sessionMode
+        sessionMode: input.sessionMode,
+        sessionPartition: input.sessionPartition
       });
       if (session.webContentsId === input.webContentsId && session.contents === contents) {
         publishState(session);
@@ -836,12 +941,17 @@ function registerBrowserNodeElectronMain(input) {
   const managersByWindow = /* @__PURE__ */ new WeakMap();
   const loopbackPreviewProxy = input.loopbackPreviewRouting !== void 0 ? createBrowserNodeLoopbackPreviewProxy({
     logger: input.logger,
-    resolveSession: async ({ profileId, sessionMode }) => {
+    resolveSession: async ({
+      profileId,
+      sessionMode,
+      sessionPartition
+    }) => {
       const { session } = await import("electron");
       return session.fromPartition(
         resolveBrowserSessionPartition({
           profileId,
-          sessionMode
+          sessionMode,
+          sessionPartition
         })
       );
     },
@@ -938,10 +1048,14 @@ function registerBrowserNodeElectronMain(input) {
 }
 
 // src/electron-main/webviewSecurity.ts
-function isBrowserNodeWebviewAttach(params) {
-  return params["data-browser-node-webview"] === "true" || isBrowserSessionPartitionAllowed(params.partition);
+function isBrowserNodeInitialWebviewUrl(url) {
+  return (url ?? "").trim() === "about:blank";
+}
+function isBrowserNodeWebviewAttach(params, allowedSessionPartitions) {
+  return params["data-browser-node-webview"] === "true" || isBrowserSessionPartitionAllowed(params.partition, allowedSessionPartitions);
 }
 function enforceBrowserWebviewSecurity({
+  allowedSessionPartitions,
   params,
   resolvePreload,
   webPreferences
@@ -955,20 +1069,24 @@ function enforceBrowserWebviewSecurity({
   webPreferences.webSecurity = true;
   delete webPreferences.preload;
   const partition = params.partition;
-  if (!partition || !isBrowserSessionPartitionAllowed(partition)) {
+  if (!partition || !isBrowserSessionPartitionAllowed(partition, allowedSessionPartitions)) {
     return {
       allowed: false,
       reason: "Unsupported Browser Node session partition"
     };
   }
-  const resolved = resolveBrowserNavigationUrl(params.src ?? "about:blank");
-  if (!resolved.url) {
-    return {
-      allowed: false,
-      reason: "Unsupported browser URL"
-    };
+  if (isBrowserNodeInitialWebviewUrl(params.src)) {
+    params.src = "about:blank";
+  } else {
+    const resolved = resolveBrowserNavigationUrl(params.src ?? "about:blank");
+    if (!resolved.url) {
+      return {
+        allowed: false,
+        reason: "Unsupported browser URL"
+      };
+    }
+    params.src = resolved.url;
   }
-  params.src = resolved.url;
   const preload = resolvePreload?.({ params: { ...params } });
   const resolvedPreload = typeof preload === "string" ? preload.trim() : "";
   if (resolvedPreload.length > 0) {
@@ -977,20 +1095,28 @@ function enforceBrowserWebviewSecurity({
   return { allowed: true, reason: null };
 }
 function installBrowserWebviewSecurity({
+  allowedSessionPartitions,
   contents,
   logger,
   onGuestAttached,
   openExternal,
   resolvePreload,
-  shouldHandleWebview = isBrowserNodeWebviewAttach
+  shouldHandleWebview
 }) {
   let pendingBrowserAttachCount = 0;
   const handleWillAttachWebview = (event, webPreferences, params) => {
-    if (!shouldHandleWebview(params)) {
+    const shouldHandle = shouldHandleWebview?.(params) ?? isBrowserNodeWebviewAttach(params, allowedSessionPartitions);
+    logger?.debug?.("Browser Node webview will attach", {
+      partition: params.partition ?? null,
+      shouldHandle,
+      src: params.src ?? null
+    });
+    if (!shouldHandle) {
       return;
     }
     pendingBrowserAttachCount += 1;
     const result = enforceBrowserWebviewSecurity({
+      allowedSessionPartitions,
       params,
       resolvePreload,
       webPreferences
@@ -999,14 +1125,27 @@ function installBrowserWebviewSecurity({
       pendingBrowserAttachCount = Math.max(0, pendingBrowserAttachCount - 1);
       logger?.warn?.("Browser Node webview blocked", { reason: result.reason });
       event.preventDefault();
+      return;
     }
+    logger?.debug?.("Browser Node webview attach allowed", {
+      partition: params.partition ?? null,
+      src: params.src ?? null
+    });
   };
   const handleDidAttachWebview = (_event, guestContents) => {
     if (pendingBrowserAttachCount <= 0) {
+      logger?.debug?.("Browser Node webview did attach ignored", {
+        guestWebContentsId: guestContents.id ?? null,
+        pendingBrowserAttachCount
+      });
       return;
     }
     pendingBrowserAttachCount -= 1;
     onGuestAttached?.(guestContents);
+    logger?.debug?.("Browser Node webview guest attached", {
+      guestWebContentsId: guestContents.id ?? null,
+      pendingBrowserAttachCount
+    });
     guestContents.setWindowOpenHandler(({ url }) => {
       const resolved = resolveBrowserNavigationUrl(url);
       if (resolved.url) {