dsh-builtin-browser 0.1.19 → 0.1.21

package/src/browser-electron/host-main.ts

@@ -327,8 +327,11 @@ function windowFor(windowId: string | undefined): HostWindow {
   // regaining focus (alt-tab, click) does not automatically refocus any view
   // (electron#28163) — the last addChildView keeps the focus. Restore the view
   // the human was last using (click steering via wireFocusRouting), falling
-  // back to the visible page view.
+  // back to the visible page view. Windows-only: on macOS/Linux the OS routes
+  // keyboard input to the clicked view natively, and forcing focus() on window
+  // focus fights the platform — it can leave page inputs untypeable (issue #7).
   w.on('focus', () => {
+    if (process.platform !== 'win32') return
     const last = win.lastFocusedViewId
     const wc = last === TOOLBAR_FOCUS ? win.toolbarView?.webContents
       : last !== undefined ? win.views.get(last)?.webContentsView.webContents
@@ -361,8 +364,14 @@ function layoutWindow(win: HostWindow): void {
  * regaining focus does not refocus any view, electron#28163). Focusing the
  * clicked view on mousedown makes the toolbar and pages behave like a real
  * browser: click the URL bar and type, click the page and type/scroll.
+ *
+ * Windows-only by design (issue #7): macOS/Linux already route keyboard input
+ * to the clicked view natively; calling webContents.focus() from inside the
+ * mousedown input-event there interferes with native click-to-focus and can
+ * leave login/page inputs unable to receive typed characters.
  */
 function wireFocusRouting(win: HostWindow, view: WebContentsView, focusKey: string): void {
+  if (process.platform !== 'win32') return
   view.webContents.on('input-event', (_event, input) => {
     if (input.type !== 'mouseDown') return
     win.lastFocusedViewId = focusKey
@@ -498,17 +507,36 @@ async function handle(op: string, msg: { id: number; viewId?: string; windowId?:
       case 'createView': {
         const viewId = msg.viewId
         if (viewId === undefined) throw new Error('createView missing viewId')
+        // Idempotent against a duplicate createView for the same id (e.g. two
+        // concurrent parent-side recoveries after a host death): re-creating
+        // would stack a second WebContentsView in the window and leak the
+        // first — the duplicate call simply confirms the existing view.
+        if (windowOfView(viewId) !== undefined) {
+          reply(msg.id, { ok: true })
+          return
+        }
         const assignment = assignments.get(viewId)
         const win = windowFor(assignment?.windowId)
         const view = new WebContentsView()
-        // Route popups (window.open / target=_blank) back into THIS view
-        // instead of letting Electron open untracked native windows that would
-        // diverge from the session/tab model.
+        // Route popups (window.open / target=_blank) into the session/tab
+        // model instead of letting Electron open untracked native windows.
         view.webContents.setWindowOpenHandler(({ url }) => {
-          // HTTP(S) popups (target=_blank, ads): redirect into this view
-          // instead of opening an untracked native window.
+          // HTTP(S) popups open as a NEW TAB of this view's session: the
+          // parent (provider) owns the session model and its newTab action
+          // creates the tab in the same window, navigates it, and records it
+          // in the session history. Overriding THIS view with loadURL()
+          // destroyed the opener page — pages that need their opener context
+          // (portal dashboards carrying token/referer to the new window)
+          // lost it and the target page then 403'd (issue #8); the tab strip
+          // now keeps the original page alive like a real browser.
           if (/^https?:/i.test(url)) {
-            void view.webContents.loadURL(url).catch(() => { /* navigation failures surface on the next snapshot */ })
+            if (win.windowId !== SHARED_WINDOW_ID) {
+              sendUserAction({ type: 'newTab', windowId: win.windowId, url })
+            } else {
+              // Ungrouped view (no live session to attach a tab to,
+              // defensive only): fall back to navigating this view.
+              void view.webContents.loadURL(url).catch(() => { /* navigation failures surface on the next snapshot */ })
+            }
             return { action: 'deny' }
           }
           // Non-HTTP popups (OAuth redirects, mailto:, custom schemes):