stupidpythonbrowser 1.0.1__tar.gz → 1.0.3__tar.gz

{stupidpythonbrowser-1.0.1 → stupidpythonbrowser-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stupidpythonbrowser
-Version: 1.0.1
+Version: 1.0.3
 Summary: Native macOS Chromium/Material 3 Web Browser in PyObjC & WebKit
 Author: avevall
 Classifier: Environment :: MacOS X :: Cocoa

{stupidpythonbrowser-1.0.1 → stupidpythonbrowser-1.0.3}/pybrowser/__init__.py

@@ -3,7 +3,7 @@ PyBrowser: Native macOS Chromium/Material 3 Web Browser.
 Package Root.
 """
 
-__version__ = "1.0.1"
+__version__ = "1.0.3"
 __all__ = [
     "browser",
     "settings",
@@ -11,4 +11,4 @@ __all__ = [
     "incognito",
     "task_manager",
     "terminal",
-]
+]

{stupidpythonbrowser-1.0.1 → stupidpythonbrowser-1.0.3}/pybrowser/browser.py

@@ -35,7 +35,8 @@ from pybrowser.settings import (
     SETTINGS, UA_PRESETS, DEFAULT_URL, DATA_DIR, SESSION_FILE, BOOKMARKS_FILE,
     SETTINGS_FILE, HISTORY_FILE, ADBLOCK_CACHE_FILE, DNS_CACHE_FILE, USERSCRIPTS_DIR,
     FILTER_LIST_URL, LOCAL_PROXY_PORT, BASE_ADBLOCK_DOMAINS, M3_COLORS, GROUP_COLORS,
-    validate_and_get_download_dir, get_settings_html, sanitize_suggested_filename
+    validate_and_get_download_dir, get_settings_html, sanitize_suggested_filename,
+    sanitize_for_json
 )
 from pybrowser.doh_server import (
     DNS_CACHE, DNS_LOCK, STEVENBLACK_DOMAINS, BASE_ADBLOCK_DOMAINS, ADBLOCK_LOCK,
@@ -83,11 +84,14 @@ def get_m3_color(token, view, is_incognito=False):
     return hex_to_nscolor(colors[1 if is_dark else 0])
 
 def atomic_write_json(filepath, data):
+    """Safely writes JSON to disk with recursive PyObjC sanitization to prevent TypeErrors."""
     try:
         dir_name = os.path.dirname(filepath) or "."
+        os.makedirs(dir_name, exist_ok=True)
+        sanitized = sanitize_for_json(data)
         fd, temp_path = tempfile.mkstemp(dir=dir_name)
         with os.fdopen(fd, 'w', encoding='utf-8') as f:
-            json.dump(data, f, indent=2)
+            json.dump(sanitized, f, indent=2)
         os.replace(temp_path, filepath)
     except Exception as e:
         print(f"[Atomic JSON Write Error] {e}")
@@ -398,7 +402,7 @@ class FaviconCache:
             try:
                 url = f"https://www.google.com/s2/favicons?domain={urllib.parse.quote(host)}&sz=32"
                 req = urllib.request.Request(url, headers={"User-Agent": SETTINGS.get_user_agent()})
-                with urllib.request.urlopen(req, timeout=2.5) as resp:
+                with urllib.request.urlopen(req, timeout=3.0) as resp:
                     raw = resp.read()
                     if raw:
                         img = Cocoa.NSImage.alloc().initWithData_(Foundation.NSData.dataWithBytes_length_(raw, len(raw)))
@@ -413,14 +417,58 @@ class FaviconCache:
 # ============================================================================
 # INJECTED SCRIPTS & FULLSCREEN UTILITIES
 # ============================================================================
+COMMAND_CLICK_JS = """
+(function() {
+    function findAnchor(el) {
+        while (el && el !== document) {
+            if (el.tagName === 'A' && el.href) return el;
+            el = el.parentElement;
+        }
+        return null;
+    }
+    document.addEventListener('click', function(e) {
+        if (e.metaKey || e.ctrlKey || e.button === 1) {
+            const a = findAnchor(e.target);
+            if (a && a.href && !a.href.startsWith('javascript:')) {
+                e.preventDefault();
+                e.stopPropagation();
+                if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.bridge) {
+                    window.webkit.messageHandlers.bridge.postMessage({cmd: 'open_url', url: a.href});
+                }
+            }
+        }
+    }, true);
+    document.addEventListener('auxclick', function(e) {
+        if (e.button === 1) {
+            const a = findAnchor(e.target);
+            if (a && a.href && !a.href.startsWith('javascript:')) {
+                e.preventDefault();
+                e.stopPropagation();
+                if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.bridge) {
+                    window.webkit.messageHandlers.bridge.postMessage({cmd: 'open_url', url: a.href});
+                }
+            }
+        }
+    }, true);
+})();
+"""
+
 AUDIO_MONITOR_JS = """
 document.addEventListener('play', (e) => {
-    if (e.target && !e.target.muted) window.webkit.messageHandlers.audio.postMessage({cmd:'audio_play'});
+    if (e.target && !e.target.muted && window.webkit?.messageHandlers?.audio) {
+        window.webkit.messageHandlers.audio.postMessage({cmd:'audio_play'});
+    }
+}, true);
+document.addEventListener('pause', () => {
+    if (window.webkit?.messageHandlers?.audio) window.webkit.messageHandlers.audio.postMessage({cmd:'audio_pause'});
+}, true);
+document.addEventListener('ended', () => {
+    if (window.webkit?.messageHandlers?.audio) window.webkit.messageHandlers.audio.postMessage({cmd:'audio_pause'});
 }, true);
-document.addEventListener('pause', () => window.webkit.messageHandlers.audio.postMessage({cmd:'audio_pause'}), true);
-document.addEventListener('ended', () => window.webkit.messageHandlers.audio.postMessage({cmd:'audio_pause'}), true);
 document.addEventListener('volumechange', (e) => {
-    if (e.target && e.target.muted) window.webkit.messageHandlers.audio.postMessage({cmd:'audio_pause'});
+    if (e.target && e.target.muted && window.webkit?.messageHandlers?.audio) {
+        window.webkit.messageHandlers.audio.postMessage({cmd:'audio_pause'});
+    }
 }, true);
 """
 
@@ -450,7 +498,7 @@ document.addEventListener('submit', (e) => {
     if (!e.target || !e.target.querySelector) return;
     let pw = e.target.querySelector('input[type="password"]');
     let user = e.target.querySelector('input[type="text"], input[type="email"]');
-    if (pw && pw.value) {
+    if (pw && pw.value && window.webkit?.messageHandlers?.bridge) {
         window.webkit.messageHandlers.bridge.postMessage({
             cmd: 'prompt_save_password', host: location.hostname,
             username: user ? user.value : 'unknown', password: pw.value
@@ -841,8 +889,7 @@ class BookmarksBarView(Cocoa.NSView):
             if not isinstance(b, dict) or not b.get("url"):
                 continue
             title = b.get("title", b["url"])[:24]
-            # Fixed: Removed hardcoded default 🔖 favicon prefix from bookmarks
-            btn_w = max(40, min(140, len(title) * 7.5 + 14))
+            btn_w = max(50, min(160, len(title) * 7.5 + 26))
             btn = Cocoa.NSButton.alloc().initWithFrame_(Cocoa.NSMakeRect(x, 2, btn_w, h - 4))
             btn.setTitle_(title)
             btn.setBezelStyle_(Cocoa.NSBezelStyleInline)
@@ -850,10 +897,29 @@ class BookmarksBarView(Cocoa.NSView):
             btn.setTarget_(self)
             btn.setAction_("onBookmarkClick:")
             btn.setToolTip_(b.get("url", ""))
+
+            # Dynamically query and bind favicon
+            try:
+                host = urllib.parse.urlparse(b.get("url", "")).netloc
+                if host:
+                    FaviconCache.get_favicon(host, lambda img, b_ref=btn: self._apply_button_icon(b_ref, img))
+            except Exception:
+                pass
+
             self.addSubview_(btn)
             x += btn_w + 4.0
         self.setNeedsDisplay_(True)
 
+    def _apply_button_icon(self, btn, img):
+        if img and btn:
+            try:
+                scaled = img.copy()
+                scaled.setSize_(Cocoa.NSMakeSize(14, 14))
+                btn.setImage_(scaled)
+                btn.setImagePosition_(Cocoa.NSImageLeft)
+            except Exception:
+                pass
+
     def onBookmarkClick_(self, sender):
         url = sender.toolTip()
         if url and self.controller:
@@ -968,7 +1034,6 @@ class InternalSchemeHandler(Cocoa.NSObject):
             self.active_tasks.discard(task)
 
     def get_terminal_html(self):
-        # Fullscreen responsive xterm with ResizeObserver to ensure vim/less utilize entire viewport
         bg = "#1e1e2e"
         fg = "#c792ea"
         return f"""<!DOCTYPE html><html><head><meta charset='utf-8'>
@@ -992,6 +1057,19 @@ const fit = new FitAddon.FitAddon();
 term.loadAddon(fit);
 term.open(document.getElementById('t'));
 
+// Guarantee Esc (0x1b) is sent directly to child PTY (vim/nano/fzf) without being swallowed
+term.attachCustomKeyEventHandler(e => {{
+    if (e.key === 'Escape' || e.keyCode === 27) {{
+        if (e.type === 'keydown') {{
+            if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.terminalInput) {{
+                window.webkit.messageHandlers.terminalInput.postMessage('\\x1b');
+            }}
+        }}
+        return false;
+    }}
+    return true;
+}});
+
 const postResize = () => {{
     try {{
         fit.fit();
@@ -1001,9 +1079,7 @@ const postResize = () => {{
     }} catch(e) {{}}
 }};
 
-const ro = new ResizeObserver(() => {{
-    postResize();
-}});
+const ro = new ResizeObserver(() => {{ postResize(); }});
 ro.observe(document.getElementById('t'));
 
 setTimeout(postResize, 30);
@@ -1038,22 +1114,24 @@ window.writeToTerm = b => {{
                 u = b["url"]
                 t = b.get("title", u)
                 safe_u = json.dumps(u)
-                del_call = f"window.webkit.messageHandlers.bridge.postMessage({{cmd: 'delete_bookmark', url: {safe_u}}}); setTimeout(() => location.reload(), 100);"
-                items.append(f"<li><a href='{html.escape(u)}'>{html.escape(t)}</a> <button onclick='{del_call}'>Delete</button></li>")
+                host = urllib.parse.urlparse(u).netloc
+                fav_tag = f"<img src='https://www.google.com/s2/favicons?domain={urllib.parse.quote(host)}&sz=32' width='16' height='16' style='vertical-align:middle;margin-right:8px;border-radius:3px;' onerror='this.style.display=\"none\"'>" if host else ""
+                del_call = f"if(window.webkit?.messageHandlers?.bridge) window.webkit.messageHandlers.bridge.postMessage({{cmd: 'delete_bookmark', url: {safe_u}}}); setTimeout(() => location.reload(), 100);"
+                items.append(f"<li style='display:flex;align-items:center;padding:6px 0;'><span style='flex:1;display:flex;align-items:center;'>{fav_tag}<a href='{html.escape(u)}' style='color:#1a73e8;text-decoration:none;'>{html.escape(t)}</a></span> <button onclick='{del_call}' style='margin-left:12px;padding:3px 8px;'>Delete</button></li>")
         rows = "".join(items)
-        return f"<!DOCTYPE html><html><body style='font-family:-apple-system,sans-serif;padding:30px;'><h2>Bookmarks</h2><div style='margin-bottom:15px;'><input id='t' placeholder='Title'><input id='u' placeholder='https://...'><button onclick='window.webkit.messageHandlers.bridge.postMessage({{cmd:\"add_bookmark\",title:document.getElementById(\"t\").value,url:document.getElementById(\"u\").value}});setTimeout(()=>location.reload(),100)'>Add</button></div><ul>{rows or '<li>No bookmarks</li>'}</ul></body></html>"
+        return f"<!DOCTYPE html><html><body style='font-family:-apple-system,sans-serif;padding:30px;'><h2>Bookmarks</h2><div style='margin-bottom:15px;'><input id='t' placeholder='Title' style='padding:4px 8px;margin-right:8px;'><input id='u' placeholder='https://...' style='padding:4px 8px;margin-right:8px;width:260px;'><button onclick='if(window.webkit?.messageHandlers?.bridge) window.webkit.messageHandlers.bridge.postMessage({{cmd:\"add_bookmark\",title:document.getElementById(\"t\").value,url:document.getElementById(\"u\").value}});setTimeout(()=>location.reload(),100)' style='padding:4px 12px;'>Add</button></div><ul style='list-style:none;padding:0;'>{rows or '<li>No bookmarks</li>'}</ul></body></html>"
 
     def get_history_html(self):
         records = query_history()
         items = []
         for r in records:
-            del_call = f"window.webkit.messageHandlers.bridge.postMessage({{cmd: 'delete_history_item', id: {r[0]}}}); this.closest('tr').remove();"
+            del_call = f"if(window.webkit?.messageHandlers?.bridge) window.webkit.messageHandlers.bridge.postMessage({{cmd: 'delete_history_item', id: {r[0]}}}); this.closest('tr').remove();"
             items.append(f"<tr><td>{r[3]}</td><td><a href='{html.escape(r[1])}'>{html.escape(r[2])}</a></td><td><button onclick='{del_call}'>✕</button></td></tr>")
         rows = "".join(items)
-        return f"<!DOCTYPE html><html><body style='font-family:-apple-system,sans-serif;padding:30px;'><h2>History</h2><button onclick=\"window.webkit.messageHandlers.bridge.postMessage({{cmd:'clear_browsing_data',targets:['history']}});setTimeout(()=>location.reload(),100)\">Clear All</button><table style='width:100%;margin-top:15px;'>{rows or '<tr><td>No history</td></tr>'}</table></body></html>"
+        return f"<!DOCTYPE html><html><body style='font-family:-apple-system,sans-serif;padding:30px;'><h2>History</h2><button onclick=\"if(window.webkit?.messageHandlers?.bridge) window.webkit.messageHandlers.bridge.postMessage({{cmd:'clear_browsing_data',targets:['history']}});setTimeout(()=>location.reload(),100)\">Clear All</button><table style='width:100%;margin-top:15px;'>{rows or '<tr><td>No history</td></tr>'}</table></body></html>"
 
     def get_downloads_html(self):
-        return "<!DOCTYPE html><html><body style='font-family:-apple-system,sans-serif;padding:30px;'><h2>Downloads</h2><div id='dl-list'>No active downloads.</div><script>const dls={};window.updateDownload=(id,name,path,status,progress)=>{dls[id]={name,path,status,progress};render()};function render(){const el=document.getElementById('dl-list');el.innerHTML=Object.values(dls).map(d=>`<div style='border:1px solid #ccc;padding:10px;margin-bottom:8px;'><b>${d.name}</b> (${d.status}) <button onclick=\"window.webkit.messageHandlers.bridge.postMessage({cmd:'dl_show',path:'${d.path}'})\">Show in Finder</button></div>`).join('')};window.webkit.messageHandlers.bridge.postMessage({cmd:'dl_request_sync'});</script></body></html>"
+        return "<!DOCTYPE html><html><body style='font-family:-apple-system,sans-serif;padding:30px;'><h2>Downloads</h2><div id='dl-list'>No active downloads.</div><script>const dls={};window.updateDownload=(id,name,path,status,progress)=>{dls[id]={name,path,status,progress};render()};function render(){const el=document.getElementById('dl-list');el.innerHTML=Object.values(dls).map(d=>`<div style='border:1px solid #ccc;padding:10px;margin-bottom:8px;'><b>${d.name}</b> (${d.status}) <button onclick=\"if(window.webkit?.messageHandlers?.bridge) window.webkit.messageHandlers.bridge.postMessage({cmd:'dl_show',path:'${d.path}'})\">Show in Finder</button></div>`).join('')};if(window.webkit?.messageHandlers?.bridge) window.webkit.messageHandlers.bridge.postMessage({cmd:'dl_request_sync'});</script></body></html>"
 
     def get_extensions_html(self):
         scripts = get_installed_userscripts()
@@ -1062,8 +1140,8 @@ window.writeToTerm = b => {{
             f = s["file"]
             safe_f = json.dumps(f)
             checked = "checked" if s["enabled"] else ""
-            toggle_call = f"window.webkit.messageHandlers.bridge.postMessage({{cmd: 'toggle_script', file: {safe_f}, enabled: this.checked}})"
-            del_call = f"if(confirm('Delete?')){{window.webkit.messageHandlers.bridge.postMessage({{cmd: 'delete_script', file: {safe_f}}}); setTimeout(() => location.reload(), 100);}}"
+            toggle_call = f"if(window.webkit?.messageHandlers?.bridge) window.webkit.messageHandlers.bridge.postMessage({{cmd: 'toggle_script', file: {safe_f}, enabled: this.checked}})"
+            del_call = f"if(confirm('Delete?')){{if(window.webkit?.messageHandlers?.bridge) window.webkit.messageHandlers.bridge.postMessage({{cmd: 'delete_script', file: {safe_f}}}); setTimeout(() => location.reload(), 100);}}"
             items.append(
                 f"<div style='border:1px solid #ccc;padding:10px;margin-bottom:8px;'>"
                 f"<b>{html.escape(s['name'])}</b> ({html.escape(f)}) "
@@ -1072,7 +1150,7 @@ window.writeToTerm = b => {{
                 f"</div>"
             )
         rows = "".join(items)
-        return f"<!DOCTYPE html><html><body style='font-family:-apple-system,sans-serif;padding:30px;'><h2>Extensions & Userscripts</h2><button onclick='let id=prompt(\"CRX ID or URL:\");if(id)window.webkit.messageHandlers.bridge.postMessage({{cmd:\"install_crx\",id:id}})'>Install CRX</button><div style='margin-top:15px;'>{rows or 'No userscripts installed.'}</div></body></html>"
+        return f"<!DOCTYPE html><html><body style='font-family:-apple-system,sans-serif;padding:30px;'><h2>Extensions & Userscripts</h2><button onclick='let id=prompt(\"CRX ID or URL:\");if(id && window.webkit?.messageHandlers?.bridge)window.webkit.messageHandlers.bridge.postMessage({{cmd:\"install_crx\",id:id}})'>Install CRX</button><div style='margin-top:15px;'>{rows or 'No userscripts installed.'}</div></body></html>"
 
 # ============================================================================
 # WEBKIT SUBCLASS & IMAGE CONTEXT MENU
@@ -1200,7 +1278,7 @@ class OmniboxSuggestionView(Cocoa.NSView):
         opts = Cocoa.NSTrackingMouseMoved | Cocoa.NSTrackingActiveAlways | Cocoa.NSTrackingInVisibleRect
         self.tracking_area = Cocoa.NSTrackingArea.alloc().initWithRect_options_owner_userInfo_(Cocoa.NSZeroRect, opts, self, None)
         self.addTrackingArea_(self.tracking_area)
-        objc.super(OmniboxSuggestionView, self).updateTrackingAreas()
+        objc.super(ChromeTabView, self).updateTrackingAreas() if hasattr(objc.super(ChromeTabView, self), 'updateTrackingAreas') else None
 
     def mouseMoved_(self, event):
         loc = self.convertPoint_fromView_(event.locationInWindow(), None)
@@ -1274,9 +1352,10 @@ class OmniboxPanelCoordinator:
 
         def fetch_remote():
             try:
-                url = f"http://suggestqueries.google.com/complete/search?client=chrome&q={urllib.parse.quote(query_str)}"
+                # Secured endpoint via HTTPS to avoid keystroke sniffing
+                url = f"https://suggestqueries.google.com/complete/search?client=chrome&q={urllib.parse.quote(query_str)}"
                 req = urllib.request.Request(url, headers={"User-Agent": UA_PRESETS["chrome_mac"]})
-                with urllib.request.urlopen(req, timeout=0.8) as resp:
+                with urllib.request.urlopen(req, timeout=1.0) as resp:
                     data = json.loads(resp.read().decode('utf-8'))
                     remote = [{"type": "search", "text": s, "url": s} for s in data[1][:5]]
                     if req_id == self.current_req_id:
@@ -1551,7 +1630,6 @@ class QuickSwitcherController(Cocoa.NSWindowController):
         elif sel == "insertNewline:":
             if self.filtered_tabs and self.selected_index >= 0:
                 t = self.filtered_tabs[self.selected_index]
-                # Fixed: Resolve current tab index dynamically by ID to avoid desync/crash
                 cur_idx = t["wc"].get_tab_index_by_id(t["id"])
                 if cur_idx is not None:
                     t["wc"].window().makeKeyAndOrderFront_(None)
@@ -1601,7 +1679,6 @@ class PiPPanelController(Cocoa.NSWindowController):
             self.window().makeKeyAndOrderFront_(None)
 
     def exec_js(self, js):
-        # Fixed: Prefer active window controller or stored browser controller
         app_delegate = Cocoa.NSApp.delegate()
         wc = None
         key_win = Cocoa.NSApp.keyWindow()
@@ -1770,7 +1847,6 @@ class BrowserWindowController(Cocoa.NSWindowController):
         self.home_btn.setHidden_(not SETTINGS.settings.get("show_home_button", False))
 
         omni_x = 132 if SETTINGS.settings.get("show_home_button", False) else 102
-        # Clean uniform 30px step for toolbar buttons, omnibox expands dynamically
         self.omnibox_container = Cocoa.NSView.alloc().initWithFrame_(Cocoa.NSMakeRect(omni_x, 3, max(180, w - omni_x - 162), 28))
         self.toolbar.addSubview_(self.omnibox_container)
 
@@ -1798,7 +1874,6 @@ class BrowserWindowController(Cocoa.NSWindowController):
         self.star_btn.setAutoresizingMask_(Cocoa.NSViewMinXMargin)
         self.omnibox_container.addSubview_(self.star_btn)
 
-        # Fixed: Buttons pushed cleanly to the right edge with uniform 30px spacing
         self.pip_btn = btn("⧉", w - 154, "onTogglePiP:", "Media Controls")
         self.dl_btn = btn("⬇", w - 124, "onShowDownloads:", "Downloads")
         self.share_btn = btn("↗", w - 94, "onShareCurrentPage:", "Share Page")
@@ -1853,7 +1928,6 @@ class BrowserWindowController(Cocoa.NSWindowController):
         omni_x = 132 if show_home else 102
         tb_w = self.toolbar.bounds().size.width
 
-        # Fixed: Expand Omnibox to fill empty space, eliminated gap between zen and menu buttons
         if hasattr(self, 'omnibox_container'):
             box_w = max(180, tb_w - omni_x - 162)
             self.omnibox_container.setFrame_(Cocoa.NSMakeRect(omni_x, 3, box_w, 28))
@@ -1878,7 +1952,6 @@ class BrowserWindowController(Cocoa.NSWindowController):
             sub.removeFromSuperview()
         w = self.tab_strip.bounds().size.width
         is_vert = SETTINGS.settings.get("vertical_tabs_enabled", False)
-        # Because traffic lights sit in the title bar above, horizontal tabs start cleanly at x = 8.0
         x = 8.0
         tab_h = 28 if not is_vert else 32
         y = self.tab_strip.bounds().size.height - 38 - tab_h if is_vert else 3
@@ -1965,6 +2038,8 @@ class BrowserWindowController(Cocoa.NSWindowController):
         uc.addScriptMessageHandler_name_(self, "terminalInput")
         uc.addScriptMessageHandler_name_(self, "terminalResize")
 
+        # Injected scripts: Command+click capture, audio monitoring, context menus, and fullscreen handlers
+        uc.addUserScript_(WebKit.WKUserScript.alloc().initWithSource_injectionTime_forMainFrameOnly_(COMMAND_CLICK_JS, WebKit.WKUserScriptInjectionTimeAtDocumentStart, False))
         uc.addUserScript_(WebKit.WKUserScript.alloc().initWithSource_injectionTime_forMainFrameOnly_(AUDIO_MONITOR_JS, WebKit.WKUserScriptInjectionTimeAtDocumentEnd, False))
         uc.addUserScript_(WebKit.WKUserScript.alloc().initWithSource_injectionTime_forMainFrameOnly_(IMAGE_CONTEXT_MENU_JS, WebKit.WKUserScriptInjectionTimeAtDocumentStart, False))
         uc.addUserScript_(WebKit.WKUserScript.alloc().initWithSource_injectionTime_forMainFrameOnly_(KEYCHAIN_AUTOSAVE_JS, WebKit.WKUserScriptInjectionTimeAtDocumentEnd, False))
@@ -2009,7 +2084,7 @@ class BrowserWindowController(Cocoa.NSWindowController):
             except Exception:
                 pass
 
-        initial_zoom = float(SETTINGS.settings.get("default_zoom", 0.8))
+        initial_zoom = float(SETTINGS.settings.get("default_zoom", 1.0))
         tab = {
             "id": str(uuid.uuid4()), "webview": wv, "url": url, "title": "New Tab",
             "favicon": None, "pinned": pinned, "group_id": None, "zoom": initial_zoom,
@@ -2049,8 +2124,6 @@ class BrowserWindowController(Cocoa.NSWindowController):
             self.wake_tab(index)
         wv = tab["webview"]
 
-        # Fixed: Keep webviews attached and toggle visibility with setHidden_
-        # This completely preserves DOM focus, text inputs, and render state
         for i, t in enumerate(self.tabs):
             twv = t.get("webview")
             if twv:
@@ -2066,7 +2139,6 @@ class BrowserWindowController(Cocoa.NSWindowController):
         self.update_progress_for_webview(wv)
         self.relayout_tabs()
 
-        # Fixed: Restore keyboard focus and text cursor to the active input element automatically
         self.window().makeFirstResponder_(wv)
         wv.evaluateJavaScript_completionHandler_(
             "if (document.activeElement && typeof document.activeElement.focus === 'function') { document.activeElement.focus(); }",
@@ -2258,7 +2330,7 @@ class BrowserWindowController(Cocoa.NSWindowController):
     def apply_zoom_to_webview(self, wv, tab=None):
         if not wv:
             return
-        target_zoom = tab.get("zoom", float(SETTINGS.settings.get("default_zoom", 0.8))) if tab else float(SETTINGS.settings.get("default_zoom", 0.8))
+        target_zoom = tab.get("zoom", float(SETTINGS.settings.get("default_zoom", 1.0))) if tab else float(SETTINGS.settings.get("default_zoom", 1.0))
         target_zoom = max(0.5, min(2.0, target_zoom))
         try:
             if hasattr(wv, "setAllowsMagnification_"): wv.setAllowsMagnification_(False)
@@ -2268,18 +2340,19 @@ class BrowserWindowController(Cocoa.NSWindowController):
             pass
 
     def restore_normal_zoom(self):
+        if self.is_active_tab_terminal():
+            return
         wv = self.get_active_webview()
         if wv:
-            self.apply_zoom_to_webview(wv)
+            tab = self.tabs[self.active_tab_index] if (0 <= self.active_tab_index < len(self.tabs)) else None
+            self.apply_zoom_to_webview(wv, tab)
             wv.evaluateJavaScript_completionHandler_(REFLOW_RESTORE_JS, None)
 
     def handle_fullscreen_enter(self, auto_hide_bars=True):
         if auto_hide_bars:
             if not self.tab_bar_visible:
-                # Tab was already in Zen mode before entering fullscreen
                 self.zen_auto_entered = False
             else:
-                # Tab was in normal mode, auto-enter Zen mode for fullscreen
                 self.zen_auto_entered = True
                 self.tab_bar_visible = False
                 self.relayout_views()
@@ -2292,22 +2365,27 @@ class BrowserWindowController(Cocoa.NSWindowController):
                 pass
 
     def handle_fullscreen_exit(self, restore_bars=True):
-        if restore_bars:
-            # Fixed: Only exit Zen mode if it was entered automatically by fullscreen
-            if self.zen_auto_entered:
-                self.tab_bar_visible = True
-                self.zen_auto_entered = False
-                self.relayout_views()
-            # If tab was already in Zen mode before fullscreen, keep Zen mode on!
+        if restore_bars and (self.zen_auto_entered or not self.tab_bar_visible):
+            self.tab_bar_visible = True
+            self.zen_auto_entered = False
+            self.relayout_views()
         wv = self.get_active_webview()
         if wv:
             wv.evaluateJavaScript_completionHandler_("if (window.setTerminalFullscreen) window.setTerminalFullscreen(false);", None)
         self.restore_normal_zoom()
 
+    def is_active_tab_terminal(self):
+        if 0 <= self.active_tab_index < len(self.tabs):
+            url = self.tabs[self.active_tab_index].get("url") or ""
+            return "browser://terminal" in url
+        return False
+
     def handle_escape_key(self):
         if self.find_bar and not self.find_bar.isHidden():
             self.find_bar.setHidden_(True)
             return
+        if self.is_active_tab_terminal():
+            return
         wv = self.get_active_webview()
         if not self.tab_bar_visible:
             self.handle_fullscreen_exit(restore_bars=True)
@@ -2339,21 +2417,21 @@ class BrowserWindowController(Cocoa.NSWindowController):
     def onZoomIn_(self, sender=None):
         if 0 <= self.active_tab_index < len(self.tabs):
             tab = self.tabs[self.active_tab_index]
-            z = min(2.0, round(tab.get("zoom", 0.8) + 0.1, 2))
+            z = min(2.0, round(tab.get("zoom", 1.0) + 0.1, 2))
             tab["zoom"] = z
             self.apply_zoom_to_webview(tab.get("webview"), tab)
 
     def onZoomOut_(self, sender=None):
         if 0 <= self.active_tab_index < len(self.tabs):
             tab = self.tabs[self.active_tab_index]
-            z = max(0.5, round(tab.get("zoom", 0.8) - 0.1, 2))
+            z = max(0.5, round(tab.get("zoom", 1.0) - 0.1, 2))
             tab["zoom"] = z
             self.apply_zoom_to_webview(tab.get("webview"), tab)
 
     def onResetZoom_(self, sender=None):
         if 0 <= self.active_tab_index < len(self.tabs):
             tab = self.tabs[self.active_tab_index]
-            tab["zoom"] = float(SETTINGS.settings.get("default_zoom", 0.8))
+            tab["zoom"] = float(SETTINGS.settings.get("default_zoom", 1.0))
             self.apply_zoom_to_webview(tab.get("webview"), tab)
         self.restore_normal_zoom()
 
@@ -2377,7 +2455,9 @@ class BrowserWindowController(Cocoa.NSWindowController):
         menu.addItemWithTitle_action_keyEquivalent_("Bookmark Current Page", "onBookmarkCurrentPage:", "d").setTarget_(self)
         bm_text = "Hide Bookmarks Bar" if SETTINGS.settings.get("bookmarks_bar_visible", True) else "Show Bookmarks Bar"
         menu.addItemWithTitle_action_keyEquivalent_(bm_text, "toggleBookmarksBar:", "b").setTarget_(self)
-        menu.addItemWithTitle_action_keyEquivalent_("Toggle Zen Mode", "onToggleZenMode:", "").setTarget_(self)
+        zen_item = menu.addItemWithTitle_action_keyEquivalent_("Toggle Zen Mode", "onToggleZenMode:", "\x1b")
+        zen_item.setKeyEquivalentModifierMask_(Cocoa.NSEventModifierFlagOption)
+        zen_item.setTarget_(self)
         menu.addItemWithTitle_action_keyEquivalent_("Find in Page", "onFindInPage:", "f").setTarget_(self)
         menu.addItem_(Cocoa.NSMenuItem.separatorItem())
         menu.addItemWithTitle_action_keyEquivalent_("Settings", "openSettings:", ",").setTarget_(self)
@@ -2613,10 +2693,14 @@ class BrowserWindowController(Cocoa.NSWindowController):
             return
         elif name == "terminalResize":
             b = message.body()
-            TERMINAL_MANAGER.get_or_create(message.webView(), b.get("cols"), b.get("rows"))
+            TERMINAL_MANAGER.get_or_create(
+                message.webView(),
+                b.get("cols") if hasattr(b, "get") else None,
+                b.get("rows") if hasattr(b, "get") else None
+            )
             return
         elif name == "audio":
-            b = message.body() if isinstance(message.body(), dict) else {}
+            b = message.body() if hasattr(message.body(), "get") else {}
             has_a = (b.get("cmd") == "audio_play")
             for t in self.tabs:
                 if t.get("webview") == message.webView():
@@ -2626,11 +2710,18 @@ class BrowserWindowController(Cocoa.NSWindowController):
             return
 
         body = message.body()
-        cmd = body.get("cmd") if isinstance(body, dict) else None
+        cmd = None
+        if hasattr(body, "get"):
+            cmd = body.get("cmd")
+        elif isinstance(body, dict):
+            cmd = body.get("cmd")
+        if cmd is not None:
+            cmd = str(cmd)
 
         if cmd == "open_url":
-            if body.get("url"):
-                self.add_tab(body.get("url"))
+            target_url = body.get("url")
+            if target_url:
+                self.add_tab(target_url)
         elif cmd == "toggle_fullscreen_terminal":
             self.toggle_tab_bar()
         elif cmd == "context_target_image":
@@ -2676,11 +2767,16 @@ class BrowserWindowController(Cocoa.NSWindowController):
                     if wv:
                         wv.evaluateJavaScript_completionHandler_(f"let pw = document.querySelector('input[type=password]'); let user = document.querySelector('input[type=text], input[type=email]'); if(pw) pw.value = '{pwd}'; if(user) user.value = '{saved_user}';", None)
         elif cmd == "save_setting":
-            key, val = body.get("key"), body.get("val")
+            raw_key, raw_val = body.get("key"), body.get("val")
+            if raw_key is None:
+                return
+            key = str(raw_key)
+            val = sanitize_for_json(raw_val)
             if key == "download_path":
                 val = os.path.expanduser(str(val).strip())
             SETTINGS.settings[key] = val
             SETTINGS.save()
+
             if key in ("bookmarks_bar_visible", "show_home_button", "vertical_tabs_enabled"):
                 self.relayout_views()
             elif key == "theme_mode":
@@ -2693,21 +2789,35 @@ class BrowserWindowController(Cocoa.NSWindowController):
                     for sub in c.tab_strip.subviews():
                         sub.setNeedsDisplay_(True)
             elif key in ("default_zoom",):
-                wv = self.get_active_webview()
-                if wv:
-                    self.apply_zoom_to_webview(wv)
+                new_zoom = float(val)
+                for t in self.tabs:
+                    t["zoom"] = new_zoom
+                    twv = t.get("webview")
+                    if twv:
+                        self.apply_zoom_to_webview(twv, t)
             elif key in ("user_agent_mode", "custom_user_agent"):
                 ua = SETTINGS.get_user_agent()
                 for t in self.tabs:
                     if t.get("webview"):
                         t["webview"].setCustomUserAgent_(ua)
+            elif key == "js_enabled":
+                js_flag = bool(val)
+                for t in self.tabs:
+                    twv = t.get("webview")
+                    if twv and hasattr(twv.configuration().preferences(), "setJavaScriptEnabled_"):
+                        twv.configuration().preferences().setJavaScriptEnabled_(js_flag)
+            elif key == "block_popups":
+                pop_flag = not bool(val)
+                for t in self.tabs:
+                    twv = t.get("webview")
+                    if twv and hasattr(twv.configuration().preferences(), "setJavaScriptCanOpenWindowsAutomatically_"):
+                        twv.configuration().preferences().setJavaScriptCanOpenWindowsAutomatically_(pop_flag)
             elif key == "doh_provider":
                 with DNS_LOCK:
                     DNS_CACHE.clear()
             elif key in ("adblock_enabled", "adblock_stevenblack_enabled", "adblock_base_enabled", "custom_adblock_domains"):
                 compile_webkit_adblock_rules()
         elif cmd == "choose_download_directory":
-            # Fixed: Asynchronous modal sheet targeting caller webview without blocking WebKit IPC
             calling_wv = message.webView()
             panel = Cocoa.NSOpenPanel.openPanel()
             panel.setCanChooseDirectories_(True)
@@ -2718,22 +2828,22 @@ class BrowserWindowController(Cocoa.NSWindowController):
             cur_dir = validate_and_get_download_dir()
             panel.setDirectoryURL_(Foundation.NSURL.fileURLWithPath_(cur_dir))
 
-            def on_panel_done(result):
-                if result == Cocoa.NSModalResponseOK and panel.URLs():
-                    chosen_path = panel.URLs()[0].path()
-                    if os.access(chosen_path, os.W_OK):
-                        SETTINGS.settings["download_path"] = chosen_path
-                        SETTINGS.save()
-                        if calling_wv:
-                            path_json = json.dumps(chosen_path)
-                            calling_wv.evaluateJavaScript_completionHandler_(
-                                f"if (document.getElementById('dl-path-input')) document.getElementById('dl-path-input').value = {path_json}; if (document.getElementById('dl-path-display')) document.getElementById('dl-path-display').innerText = {path_json}; showToast('Download directory updated');", None
-                            )
-                    else:
-                        if calling_wv:
-                            calling_wv.evaluateJavaScript_completionHandler_("showToast('Error: Selected directory is not writable');", None)
-
-            panel.beginSheetModalForWindow_completionHandler_(self.window(), on_panel_done)
+            res = panel.runModal()
+            if res == Cocoa.NSModalResponseOK and panel.URLs():
+                chosen_path = str(panel.URLs()[0].path())
+                if os.access(chosen_path, os.W_OK):
+                    SETTINGS.settings["download_path"] = chosen_path
+                    SETTINGS.save()
+                    if calling_wv:
+                        path_json = json.dumps(chosen_path)
+                        calling_wv.evaluateJavaScript_completionHandler_(
+                            f"if (document.getElementById('dl-path-input')) document.getElementById('dl-path-input').value = {path_json};"
+                            f"if (document.getElementById('dl-path-display')) document.getElementById('dl-path-display').innerText = {path_json};"
+                            "showToast('Download directory updated');", None
+                        )
+                else:
+                    if calling_wv:
+                        calling_wv.evaluateJavaScript_completionHandler_("showToast('Error: Selected directory is not writable');", None)
         elif cmd == "search_blocked_domains":
             matches = search_blocked_domains(body.get("query", ""), limit=100)
             json_res = json.dumps(matches)
@@ -2750,11 +2860,13 @@ class BrowserWindowController(Cocoa.NSWindowController):
                 dispatch_to_main(on_done)
             threading.Thread(target=fetch_task, daemon=True).start()
         elif cmd == "clear_browsing_data":
-            targets = body.get("targets", [])
+            raw_targets = body.get("targets", [])
+            targets = list(raw_targets) if hasattr(raw_targets, "__iter__") else []
             if "history" in targets:
                 clear_history()
             if "favicons" in targets:
                 FaviconCache.clear()
+                self.bookmarks_bar.reload_bookmarks()
             if "dns_cache" in targets:
                 with DNS_LOCK:
                     DNS_CACHE.clear()
@@ -2764,10 +2876,12 @@ class BrowserWindowController(Cocoa.NSWindowController):
         elif cmd == "reset_defaults":
             SETTINGS.reset_defaults()
             self.relayout_views()
+            def_zoom = float(SETTINGS.settings.get("default_zoom", 1.0))
             for tab in self.tabs:
+                tab["zoom"] = def_zoom
                 wv = tab.get("webview")
                 if wv:
-                    self.apply_zoom_to_webview(wv)
+                    self.apply_zoom_to_webview(wv, tab)
             wv = self.get_active_webview()
             if wv:
                 wv.reload()
@@ -2848,9 +2962,10 @@ class BrowserWindowController(Cocoa.NSWindowController):
 
     def webView_decidePolicyForNavigationAction_decisionHandler_(self, wv, action, handler):
         mods = action.modifierFlags() if hasattr(action, "modifierFlags") else 0
-        if bool(mods & Cocoa.NSEventModifierFlagCommand) and action.navigationType() == WebKit.WKNavigationTypeLinkActivated:
+        cmd_pressed = bool(mods & Cocoa.NSEventModifierFlagCommand)
+        if cmd_pressed or action.navigationType() == WebKit.WKNavigationTypeLinkActivated:
             url = action.request().URL().absoluteString() if action.request().URL() else None
-            if url:
+            if cmd_pressed and url:
                 self.add_tab(url)
                 handler(WebKit.WKNavigationActionPolicyCancel)
                 return
@@ -3025,25 +3140,45 @@ class AppDelegate(Cocoa.NSObject):
             Cocoa.NSEvent.addLocalMonitorForEventsMatchingMask_handler_(Cocoa.NSEventMaskLeftMouseDown, click_monitor)
 
             def key_monitor(event):
-                flags = event.modifierFlags()
+                raw_flags = event.modifierFlags()
+                flags = raw_flags & Cocoa.NSEventModifierFlagDeviceIndependentFlagsMask
                 cmd = bool(flags & Cocoa.NSEventModifierFlagCommand)
                 shift = bool(flags & Cocoa.NSEventModifierFlagShift)
                 opt = bool(flags & Cocoa.NSEventModifierFlagOption)
                 key = event.keyCode()
                 chars = event.charactersIgnoringModifiers().lower() if event.charactersIgnoringModifiers() else ""
-                win = Cocoa.NSApp.keyWindow()
-                wc = win.delegate() if win and isinstance(win.delegate(), BrowserWindowController) else None
 
-                if key == 53:  # Escape
+                win = event.window() or Cocoa.NSApp.keyWindow() or Cocoa.NSApp.mainWindow()
+                wc = None
+                if win and isinstance(win.delegate(), BrowserWindowController):
+                    wc = win.delegate()
+                elif hasattr(self, 'controllers') and self.controllers:
+                    for c in self.controllers:
+                        if c.window() == win:
+                            wc = c
+                            break
+                    if not wc and self.controllers:
+                        wc = self.controllers[0]
+
+                if key == 53:  # Escape key
                     if shift and not cmd and not opt:
                         self.process_manager.show()
                         return None
-                    if opt and wc:
+                    if opt and not cmd and not shift and wc:
                         wc.toggle_tab_bar()
                         return None
                     if wc:
+                        # Allow Escape to pass directly into terminal tabs (vim, nano, fzf, less)
+                        if wc.is_active_tab_terminal():
+                            return event
+                        if wc.find_bar and not wc.find_bar.isHidden():
+                            wc.find_bar.setHidden_(True)
+                            return None
+                        if not wc.tab_bar_visible:
+                            wc.toggle_tab_bar()
+                            return None
                         wc.handle_escape_key()
-                        return None
+                        return event
 
                 if cmd and shift and not opt:
                     if key == 0 or chars == 'a':
@@ -3143,8 +3278,10 @@ class AppDelegate(Cocoa.NSObject):
         view_menu.addItemWithTitle_action_keyEquivalent_("Reload Page", "onReload:", "r")
         view_menu.addItemWithTitle_action_keyEquivalent_("Focus Omnibox", "onFocusOmnibox:", "l")
         view_menu.addItemWithTitle_action_keyEquivalent_("Picture-in-Picture", "onTogglePiP:", "p")
+        zen_item = view_menu.addItemWithTitle_action_keyEquivalent_("Toggle Zen Mode", "onToggleZenMode:", "\x1b")
+        zen_item.setKeyEquivalentModifierMask_(Cocoa.NSEventModifierFlagOption)
         view_menu.addItem_(Cocoa.NSMenuItem.separatorItem())
-        view_menu.addItemWithTitle_action_keyEquivalent_("Zoom In", "onZoomIn:", "+")
+        view_menu.addItemWithTitle_action_keyEquivalent_("Zoom In", "onZoomIn:", "=")
         view_menu.addItemWithTitle_action_keyEquivalent_("Zoom Out", "onZoomOut:", "-")
         view_menu.addItemWithTitle_action_keyEquivalent_("Actual Size", "onResetZoom:", "0")
         view_menu.addItem_(Cocoa.NSMenuItem.separatorItem())

{stupidpythonbrowser-1.0.1 → stupidpythonbrowser-1.0.3}/pybrowser/settings.py

@@ -23,7 +23,7 @@ DEFAULT_URL = "https://www.google.com"
 DATA_DIR = os.path.expanduser("~/data")
 os.makedirs(DATA_DIR, exist_ok=True)
 
-_cur_dir = os.path.dirname(os.path.abspath(__file__))
+_cur_dir = os.path.dirname(os.path.abspath(__file__)) if "__file__" in globals() else os.getcwd()
 _old_candidates = [
     os.path.abspath(os.path.join(_cur_dir, "..", "browser_data")),
     os.path.abspath(os.path.join(os.getcwd(), "browser_data")),
@@ -80,6 +80,49 @@ GROUP_COLORS = {
     "Green": "#1E8E3E", "Pink": "#E52592", "Purple": "#9334E6", "Cyan": "#12B5CB"
 }
 
+def sanitize_for_json(obj):
+    """
+    Recursively converts PyObjC wrapper types (__NSCFBoolean, NSString, NSNumber,
+    NSArray, NSDictionary) into standard Python primitives for json.dump compatibility.
+    """
+    if obj is None:
+        return None
+
+    type_name = type(obj).__name__
+
+    # PyObjC booleans (__NSCFBoolean) must use boolValue() to accurately preserve False/True
+    if hasattr(obj, "boolValue") and ("Boolean" in type_name or "bool" in type_name.lower()):
+        return bool(obj.boolValue())
+
+    # Standard Python booleans
+    if isinstance(obj, bool) or type_name == "bool":
+        return bool(obj)
+
+    # Number conversion for PyObjC NSNumber (e.g. float/double or int)
+    if hasattr(obj, "doubleValue") and not isinstance(obj, (int, float, str, bytes)):
+        val = obj.doubleValue()
+        return int(val) if val.is_integer() else val
+
+    if isinstance(obj, (int, float)):
+        return obj
+
+    if isinstance(obj, (str, bytes)):
+        return str(obj)
+
+    if hasattr(obj, "items") or isinstance(obj, dict):
+        return {str(k): sanitize_for_json(v) for k, v in obj.items()}
+
+    if hasattr(obj, "__iter__") or isinstance(obj, (list, tuple, set)):
+        return [sanitize_for_json(i) for i in obj]
+
+    try:
+        if hasattr(obj, "stringValue"):
+            return str(obj.stringValue())
+    except Exception:
+        pass
+
+    return str(obj)
+
 def validate_and_get_download_dir(target_path=None):
     if not target_path:
         target_path = SETTINGS.settings.get("download_path", os.path.expanduser("~/Downloads"))
@@ -130,7 +173,7 @@ class SettingsManager:
             "vertical_tabs_collapsed": False,
             "show_home_button": False,
             "home_url": "https://www.google.com",
-            "default_zoom": 0.8,
+            "default_zoom": 1.0,
             "doh_provider": "cloudflare",
             "doh_custom_url": "",
             "custom_adblock_domains": "",
@@ -158,18 +201,20 @@ class SettingsManager:
             except Exception as e:
                 print(f"[Settings Load Warning] {e}")
         try:
-            z = float(self.settings.get("default_zoom", 0.8))
+            z = float(self.settings.get("default_zoom", 1.0))
             self.settings["default_zoom"] = max(0.5, min(2.0, z))
         except Exception:
-            self.settings["default_zoom"] = 0.8
+            self.settings["default_zoom"] = 1.0
         self.save()
 
     def save(self):
         try:
             dir_name = os.path.dirname(SETTINGS_FILE) or "."
+            os.makedirs(dir_name, exist_ok=True)
+            sanitized = sanitize_for_json(self.settings)
             fd, temp_path = tempfile.mkstemp(dir=dir_name)
             with os.fdopen(fd, 'w', encoding='utf-8') as f:
-                json.dump(self.settings, f, indent=2)
+                json.dump(sanitized, f, indent=2)
             os.replace(temp_path, SETTINGS_FILE)
         except Exception as e:
             print(f"[Settings Save Error] {e}")
@@ -199,7 +244,7 @@ class SettingsManager:
         domains = set()
         custom = self.settings.get("custom_adblock_domains", "")
         if custom:
-            for d in re.split(r'[\r\n,]+', custom):
+            for d in re.split(r'[\r\n,]+', str(custom)):
                 d = d.strip().lower()
                 if d:
                     domains.add(d)
@@ -226,7 +271,7 @@ def get_settings_html(sb_count, base_count, custom_count, active_rules_count):
     tab_action = s.get("tab_bar_double_click_action", "maximize")
     downloads_enabled = s.get("downloads_enabled", True)
     cur_dl_path = s.get("download_path", os.path.expanduser("~/Downloads"))
-    cur_zoom = str(s.get("default_zoom", 1.0))
+    cur_zoom = f"{float(s.get('default_zoom', 1.0)):.2f}"
 
     return f"""<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><title>Settings</title>
 <style>
@@ -296,7 +341,9 @@ def get_settings_html(sb_count, base_count, custom_count, active_rules_count):
       </div>
       <div id="custom-search-row" class="row" style="display: {'flex' if engine_preset == 'custom' else 'none'};">
         <div class="label-group"><div class="label-title">Custom Search URL Template</div><div class="label-desc">Use <code>%s</code> as query placeholder</div></div>
-        <input type="text" class="m3-input" style="width:280px;" value="{html.escape(custom_search_url)}" onchange="saveSetting('custom_search_url', this.value, 'Custom search URL saved')">
+        <input type="text" class="m3-input" style="width:280px;" value="{html.escape(custom_search_url)}"
+          onchange="saveSetting('custom_search_url', this.value, 'Custom search URL saved')"
+          onkeydown="if(event.key==='Enter') this.blur();">
       </div>
       <div class="row">
         <div class="label-group"><div class="label-title">Search in New Tab</div><div class="label-desc">Open Omnibox search results in a new tab</div></div>
@@ -327,13 +374,13 @@ def get_settings_html(sb_count, base_count, custom_count, active_rules_count):
         </select>
       </div>
       <div class="row">
-        <div class="label-group"><div class="label-title">Default Zoom Level</div><div class="label-desc">Default page scaling factor for new web views</div></div>
+        <div class="label-group"><div class="label-title">Default Zoom Level</div><div class="label-desc">Default page scaling factor across all web views</div></div>
         <select class="m3-select" onchange="saveSetting('default_zoom', parseFloat(this.value), 'Zoom level updated')">
           <option value="0.75" {'selected' if cur_zoom == '0.75' else ''}>75%</option>
-          <option value="0.8" {'selected' if cur_zoom in ('0.8', '0.80') else ''}>80%</option>
-          <option value="1.0" {'selected' if cur_zoom in ('1', '1.0', '1.00') else ''}>100% (Default)</option>
+          <option value="0.80" {'selected' if cur_zoom == '0.80' else ''}>80%</option>
+          <option value="1.00" {'selected' if cur_zoom in ('1.00', '1.0', '1') else ''}>100% (Default)</option>
           <option value="1.25" {'selected' if cur_zoom == '1.25' else ''}>125%</option>
-          <option value="1.5" {'selected' if cur_zoom == '1.5' else ''}>150%</option>
+          <option value="1.50" {'selected' if cur_zoom == '1.50' else ''}>150%</option>
         </select>
       </div>
       <div class="row">
@@ -359,7 +406,9 @@ def get_settings_html(sb_count, base_count, custom_count, active_rules_count):
       </div>
       <div class="row">
         <div class="label-group"><div class="label-title">Home Page URL</div><div class="label-desc">Webpage loaded on clicking home button</div></div>
-        <input type="text" class="m3-input" style="width:260px;" value="{html.escape(s.get('home_url', 'https://www.google.com'))}" onchange="saveSetting('home_url', this.value, 'Home URL saved')">
+        <input type="text" class="m3-input" style="width:260px;" value="{html.escape(s.get('home_url', 'https://www.google.com'))}"
+          onchange="saveSetting('home_url', this.value, 'Home URL saved')"
+          onkeydown="if(event.key==='Enter') this.blur();">
       </div>
     </div>
   </div>
@@ -395,6 +444,13 @@ def get_settings_html(sb_count, base_count, custom_count, active_rules_count):
           <span class="slider"></span>
         </label>
       </div>
+      <div class="row">
+        <div class="label-group"><div class="label-title">Block Unsolicited Popups</div><div class="label-desc">Prevent background scripts from opening intrusive windows</div></div>
+        <label class="switch">
+          <input type="checkbox" {'checked' if s.get('block_popups', True) else ''} onchange="saveSetting('block_popups', this.checked, 'Popup blocker toggled')">
+          <span class="slider"></span>
+        </label>
+      </div>
       <div class="row-col">
         <div class="label-group" style="max-width: 100%;">
           <div class="label-title">Rule & Domain Inspector</div>
@@ -426,7 +482,9 @@ def get_settings_html(sb_count, base_count, custom_count, active_rules_count):
       </div>
       <div id="custom-doh-row" class="row" style="display: {'flex' if doh_provider == 'custom' else 'none'};">
         <div class="label-group"><div class="label-title">Custom DoH URL</div><div class="label-desc">Must support DNS-over-HTTPS JSON API</div></div>
-        <input type="text" class="m3-input" style="width:280px;" value="{html.escape(doh_custom_url)}" placeholder="https://..." onchange="saveSetting('doh_custom_url', this.value, 'Custom DoH URL saved')">
+        <input type="text" class="m3-input" style="width:280px;" value="{html.escape(doh_custom_url)}" placeholder="https://..."
+          onchange="saveSetting('doh_custom_url', this.value, 'Custom DoH URL saved')"
+          onkeydown="if(event.key==='Enter') this.blur();">
       </div>
       <div class="row">
         <div class="label-group"><div class="label-title">HTTPS-Only Mode</div><div class="label-desc">Upgrades unencrypted HTTP requests to secure HTTPS</div></div>
@@ -444,7 +502,8 @@ def get_settings_html(sb_count, base_count, custom_count, active_rules_count):
           <div class="label-title">Custom Blocked Domains</div>
           <div class="label-desc">Add additional domains to block (comma- or line-separated)</div>
         </div>
-        <textarea class="m3-input" style="width:100%; height:75px; resize:vertical;" placeholder="adserver.com&#10;tracker.telemetry.io" onchange="saveSetting('custom_adblock_domains', this.value, 'Custom domains saved')">{html.escape(s.get('custom_adblock_domains', ''))}</textarea>
+        <textarea class="m3-input" style="width:100%; height:75px; resize:vertical;" placeholder="adserver.com&#10;tracker.telemetry.io"
+          onchange="saveSetting('custom_adblock_domains', this.value, 'Custom domains saved')">{html.escape(s.get('custom_adblock_domains', ''))}</textarea>
       </div>
     </div>
   </div>
@@ -462,7 +521,9 @@ def get_settings_html(sb_count, base_count, custom_count, active_rules_count):
       </div>
       <div id="custom-startup-row" class="row" style="display: {'flex' if startup_behavior == 'custom_url' else 'none'};">
         <div class="label-group"><div class="label-title">Startup URL</div><div class="label-desc">Webpage loaded on initial application launch</div></div>
-        <input type="text" class="m3-input" style="width:280px;" value="{html.escape(s.get('startup_url', 'https://www.google.com'))}" onchange="saveSetting('startup_url', this.value, 'Startup URL saved')">
+        <input type="text" class="m3-input" style="width:280px;" value="{html.escape(s.get('startup_url', 'https://www.google.com'))}"
+          onchange="saveSetting('startup_url', this.value, 'Startup URL saved')"
+          onkeydown="if(event.key==='Enter') this.blur();">
       </div>
       <div class="row">
         <div class="label-group"><div class="label-title">Window State on Launch</div><div class="label-desc">Window geometry upon application launch</div></div>
@@ -500,8 +561,8 @@ def get_settings_html(sb_count, base_count, custom_count, active_rules_count):
         </div>
         <div style="display:flex; gap:8px; align-items:center;">
           <input type="text" id="dl-path-input" class="m3-input" style="width:240px;" value="{html.escape(cur_dl_path)}"
-            onchange="saveSetting('download_path', this.value, 'Download path saved')"
-            onkeydown="if(event.key==='Enter') saveSetting('download_path', this.value, 'Download path saved')">
+            onchange="onDownloadInputChange(this.value)"
+            onkeydown="if(event.key==='Enter') {{ onDownloadInputChange(this.value); this.blur(); }}">
           <button class="btn" onclick="browseDownloadFolder()">Browse…</button>
         </div>
       </div>
@@ -523,7 +584,9 @@ def get_settings_html(sb_count, base_count, custom_count, active_rules_count):
       </div>
       <div id="custom-ua-row" class="row" style="display: {'flex' if ua_mode == 'custom' else 'none'};">
         <div class="label-group"><div class="label-title">Custom User-Agent Header</div><div class="label-desc">Raw User-Agent string sent with requests</div></div>
-        <input type="text" class="m3-input" style="width:280px;" value="{html.escape(s.get('custom_user_agent', ''))}" onchange="saveSetting('custom_user_agent', this.value, 'Custom User-Agent saved')">
+        <input type="text" class="m3-input" style="width:280px;" value="{html.escape(s.get('custom_user_agent', ''))}"
+          onchange="saveSetting('custom_user_agent', this.value, 'Custom User-Agent saved')"
+          onkeydown="if(event.key==='Enter') this.blur();">
       </div>
       <div class="row">
         <div class="label-group"><div class="label-title">WebGL Hardware Acceleration</div><div class="label-desc">Enable 3D canvas and accelerated GPU graphics</div></div>
@@ -583,9 +646,18 @@ def get_settings_html(sb_count, base_count, custom_count, active_rules_count):
     window._toastTimer = setTimeout(() => t.classList.remove('show'), 2400);
   }}
   function saveSetting(key, val, msg) {{
-    window.webkit.messageHandlers.bridge.postMessage({{ cmd: 'save_setting', key: key, val: val }});
+    if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.bridge) {{
+      window.webkit.messageHandlers.bridge.postMessage({{ cmd: 'save_setting', key: key, val: val }});
+    }}
     showToast(msg);
   }}
+  function onDownloadInputChange(val) {{
+    const trimmed = (val || '').trim();
+    if (!trimmed) return;
+    saveSetting('download_path', trimmed, 'Download path saved');
+    const disp = document.getElementById('dl-path-display');
+    if (disp) disp.innerText = trimmed;
+  }}
   function onSearchPresetChange(val) {{
     saveSetting('search_engine_preset', val, 'Search engine updated');
     document.getElementById('custom-search-row').style.display = (val === 'custom') ? 'flex' : 'none';
@@ -603,12 +675,16 @@ def get_settings_html(sb_count, base_count, custom_count, active_rules_count):
     document.getElementById('custom-startup-row').style.display = (val === 'custom_url') ? 'flex' : 'none';
   }}
   function browseDownloadFolder() {{
-    window.webkit.messageHandlers.bridge.postMessage({{ cmd: 'choose_download_directory' }});
+    if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.bridge) {{
+      window.webkit.messageHandlers.bridge.postMessage({{ cmd: 'choose_download_directory' }});
+    }}
   }}
   function updateAdblockFilters() {{
     const b = document.getElementById('update-filters-btn');
     b.innerText = "Syncing Lists..."; b.disabled = true;
-    window.webkit.messageHandlers.bridge.postMessage({{ cmd: 'update_adblock_filters' }});
+    if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.bridge) {{
+      window.webkit.messageHandlers.bridge.postMessage({{ cmd: 'update_adblock_filters' }});
+    }}
   }}
   function searchDomain() {{
     const q = document.getElementById('inspector-query').value.trim();
@@ -616,7 +692,9 @@ def get_settings_html(sb_count, base_count, custom_count, active_rules_count):
     const box = document.getElementById('inspector-results');
     box.style.display = 'block';
     box.innerHTML = 'Searching blocklists...';
-    window.webkit.messageHandlers.bridge.postMessage({{ cmd: 'search_blocked_domains', query: q }});
+    if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.bridge) {{
+      window.webkit.messageHandlers.bridge.postMessage({{ cmd: 'search_blocked_domains', query: q }});
+    }}
   }}
   window.renderBlockedResults = function(jsonStr) {{
     let items = [];
@@ -639,12 +717,16 @@ def get_settings_html(sb_count, base_count, custom_count, active_rules_count):
     if (document.getElementById('clr-favicons').checked) targets.push('favicons');
     if (document.getElementById('clr-dns').checked) targets.push('dns_cache');
     if (targets.length === 0) {{ showToast('Select at least one category'); return; }}
-    window.webkit.messageHandlers.bridge.postMessage({{ cmd: 'clear_browsing_data', targets: targets }});
+    if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.bridge) {{
+      window.webkit.messageHandlers.bridge.postMessage({{ cmd: 'clear_browsing_data', targets: targets }});
+    }}
     showToast('Browsing data cleared');
   }}
   function executeResetDefaults() {{
     if (confirm("Restore all browser settings to factory defaults?")) {{
-      window.webkit.messageHandlers.bridge.postMessage({{ cmd: 'reset_defaults' }});
+      if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.bridge) {{
+        window.webkit.messageHandlers.bridge.postMessage({{ cmd: 'reset_defaults' }});
+      }}
     }}
   }}
   function jumpTo(id, navBtn) {{

{stupidpythonbrowser-1.0.1 → stupidpythonbrowser-1.0.3}/pybrowser/terminal.py

@@ -322,7 +322,7 @@ class TerminalSession:
         if not self.alive or self.master_fd < 0:
             return
         try:
-            data = text.encode('utf-8')
+            data = text.encode('utf-8') if isinstance(text, str) else text
             total = 0
             while total < len(data) and self.master_fd >= 0:
                 try:

{stupidpythonbrowser-1.0.1 → stupidpythonbrowser-1.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "stupidpythonbrowser"
-version = "1.0.1"
+version = "1.0.3"
 description = "Native macOS Chromium/Material 3 Web Browser in PyObjC & WebKit"
 readme = "README.md"
 requires-python = ">=3.9"

{stupidpythonbrowser-1.0.1 → stupidpythonbrowser-1.0.3}/stupidpythonbrowser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stupidpythonbrowser
-Version: 1.0.1
+Version: 1.0.3
 Summary: Native macOS Chromium/Material 3 Web Browser in PyObjC & WebKit
 Author: avevall
 Classifier: Environment :: MacOS X :: Cocoa