stupidpythonbrowser 1.0.3__tar.gz → 1.0.4__tar.gz

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

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

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

@@ -3,7 +3,7 @@ PyBrowser: Native macOS Chromium/Material 3 Web Browser.
 Package Root.
 """
 
-__version__ = "1.0.3"
+__version__ = "1.0.4"
 __all__ = [
     "browser",
     "settings",

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

@@ -42,7 +42,8 @@ from pybrowser.doh_server import (
     DNS_CACHE, DNS_LOCK, STEVENBLACK_DOMAINS, BASE_ADBLOCK_DOMAINS, ADBLOCK_LOCK,
     WK_RULE_LIST, is_domain_blocked, search_blocked_domains, load_dns_cache,
     start_proxy_server, create_nw_proxy_config, load_adblock_filters_from_disk,
-    compile_webkit_adblock_rules, update_adblock_filters_from_web
+    compile_webkit_adblock_rules, update_adblock_filters_from_web,
+    clear_dns_cache_and_disk
 )
 from pybrowser.incognito import create_incognito_data_store, apply_incognito_preferences
 from pybrowser.terminal import TERMINAL_MANAGER, dispatch_to_main
@@ -113,9 +114,10 @@ def download_image_data(img_url, dest_path, webview=None, completion_callback=No
     if img_url.startswith("blob:"):
         if webview:
             dest_json = json.dumps(dest_path)
+            img_url_json = json.dumps(img_url)
             js = f"""(async () => {{
                 try {{
-                    const res = await fetch("{img_url}");
+                    const res = await fetch({img_url_json});
                     const blob = await res.blob();
                     const reader = new FileReader();
                     reader.onloadend = () => {{
@@ -131,10 +133,18 @@ def download_image_data(img_url, dest_path, webview=None, completion_callback=No
         if completion_callback: completion_callback(False)
         return False
 
+    # Bug 8 Fix: Safely resolve referer on the main thread before starting background thread
+    referer = img_url
+    if webview and Cocoa.NSThread.isMainThread():
+        try:
+            if webview.URL():
+                referer = webview.URL().absoluteString()
+        except Exception:
+            referer = img_url
+
     def worker():
         success = False
         try:
-            referer = webview.URL().absoluteString() if (webview and webview.URL()) else img_url
             req = urllib.request.Request(img_url, headers={
                 "User-Agent": SETTINGS.get_user_agent(),
                 "Accept": "image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8",
@@ -147,9 +157,10 @@ def download_image_data(img_url, dest_path, webview=None, completion_callback=No
         except Exception:
             if webview:
                 dest_json = json.dumps(dest_path)
+                img_url_json = json.dumps(img_url)
                 js = f"""(async () => {{
                     try {{
-                        const res = await fetch("{img_url}", {{ credentials: 'include' }});
+                        const res = await fetch({img_url_json}, {{ credentials: 'include' }});
                         const blob = await res.blob();
                         const reader = new FileReader();
                         reader.onloadend = () => {{
@@ -336,7 +347,9 @@ def reload_all_extensions_views():
 def init_history_db():
     try:
         with sqlite3.connect(HISTORY_FILE) as conn:
-            conn.execute("PRAGMA journal_mode=WAL; PRAGMA synchronous=NORMAL;")
+            # Bug 5 Fix: Separate into individual statements so synchronous pragma executes
+            conn.execute("PRAGMA journal_mode=WAL;")
+            conn.execute("PRAGMA synchronous=NORMAL;")
             conn.execute("""
                 CREATE TABLE IF NOT EXISTS history (
                     id INTEGER PRIMARY KEY AUTOINCREMENT, url TEXT UNIQUE, title TEXT,
@@ -472,6 +485,7 @@ document.addEventListener('volumechange', (e) => {
 }, true);
 """
 
+# Bug 9 Fix: Always report target image (or null) to clear stale context menu states
 IMAGE_CONTEXT_MENU_JS = """
 (function() {
     document.addEventListener('contextmenu', function(e) {
@@ -486,30 +500,33 @@ IMAGE_CONTEXT_MENU_JS = """
             let bg = window.getComputedStyle(el).backgroundImage;
             if (bg && bg.startsWith('url(')) imgSrc = bg.slice(4, -1).replace(/["']/g, "");
         }
-        if (imgSrc && window.webkit?.messageHandlers?.bridge) {
+        if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.bridge) {
             window.webkit.messageHandlers.bridge.postMessage({cmd: 'context_target_image', src: imgSrc});
         }
     }, true);
 })();
 """
 
+# Bug 18 Fix: Wrap keychain autosave in IIFE to protect scope
 KEYCHAIN_AUTOSAVE_JS = """
-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 && window.webkit?.messageHandlers?.bridge) {
-        window.webkit.messageHandlers.bridge.postMessage({
-            cmd: 'prompt_save_password', host: location.hostname,
-            username: user ? user.value : 'unknown', password: pw.value
-        });
-    }
-}, true);
-window.addEventListener('load', () => {
-    if (location.hostname && window.webkit?.messageHandlers?.bridge) {
-        window.webkit.messageHandlers.bridge.postMessage({cmd: 'check_autofill', host: location.hostname});
-    }
-});
+(function() {
+    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 && window.webkit?.messageHandlers?.bridge) {
+            window.webkit.messageHandlers.bridge.postMessage({
+                cmd: 'prompt_save_password', host: location.hostname,
+                username: user ? user.value : 'unknown', password: pw.value
+            });
+        }
+    }, true);
+    window.addEventListener('load', () => {
+        if (location.hostname && window.webkit?.messageHandlers?.bridge) {
+            window.webkit.messageHandlers.bridge.postMessage({cmd: 'check_autofill', host: location.hostname});
+        }
+    });
+})();
 """
 
 COSMETIC_ADBLOCK_CSS = """
@@ -638,14 +655,16 @@ class TabGroupHeaderView(Cocoa.NSView):
         hex_to_nscolor(GROUP_COLORS.get(self.group.color_name, "#5F6368")).setFill()
         path.fill()
         attrs = {Cocoa.NSFontAttributeName: Cocoa.NSFont.boldSystemFontOfSize_(11), Cocoa.NSForegroundColorAttributeName: Cocoa.NSColor.whiteColor()}
-        Cocoa.NSAttributedString.alloc().initWithString_attributes_(self.group.title, attrs).drawAtPoint_(Cocoa.NSMakePoint(6, 6))
+        # Bug 17 Fix: Guard title against None
+        title_str = self.group.title or "Group"
+        Cocoa.NSAttributedString.alloc().initWithString_attributes_(title_str, attrs).drawAtPoint_(Cocoa.NSMakePoint(6, 6))
 
     def mouseDown_(self, event):
         self.group.collapsed = not self.group.collapsed
         self.controller.relayout_tabs()
 
 # ============================================================================
-# TITLE BAR VIEW (DEDICATED TOP BAR FOR DRAGGING, EXPANDING & ZEN TRAFFIC LIGHTS)
+# TITLE BAR VIEW
 # ============================================================================
 class TitleBarView(Cocoa.NSView):
     """
@@ -719,6 +738,9 @@ class ChromeTabView(Cocoa.NSView):
             self.tracking_area = None
             self.close_btn_rect = Cocoa.NSZeroRect
             self.audio_btn_rect = Cocoa.NSZeroRect
+            # Bug 2 Fix: Track drag state for interactive tab reordering
+            self.drag_start = None
+            self.is_dragging = False
         return self
 
     def updateTrackingAreas(self):
@@ -798,10 +820,10 @@ class ChromeTabView(Cocoa.NSView):
             }
             Cocoa.NSAttributedString.alloc().initWithString_attributes_("✕", close_attrs).drawAtPoint_(Cocoa.NSMakePoint(self.close_btn_rect.origin.x + 2, self.close_btn_rect.origin.y - 1))
 
-        # Tab title
+        # Tab title (Bug 17 Fix: Ensure title is never None)
         title_x = icon_x + 20.0
         max_title_w = max(10.0, bounds.size.width - title_x - right_offset)
-        title = tab.get("title", "New Tab")
+        title = tab.get("title") or "New Tab"
         text_color = Cocoa.NSColor.labelColor() if is_active else Cocoa.NSColor.secondaryLabelColor()
         title_attrs = {
             Cocoa.NSFontAttributeName: Cocoa.NSFont.systemFontOfSize_(12),
@@ -819,6 +841,42 @@ class ChromeTabView(Cocoa.NSView):
             self.controller.toggle_mute(self.index)
             return
         self.controller.switch_to_tab(self.index)
+        # Bug 2 Fix: Initialize drag start location
+        self.drag_start = event.locationInWindow()
+        self.is_dragging = False
+
+    def mouseDragged_(self, event):
+        # Bug 2 Fix: Drag reordering logic
+        if not self.drag_start or not self.controller:
+            return
+        cur_pt = event.locationInWindow()
+        dx = cur_pt.x - self.drag_start.x
+        dy = cur_pt.y - self.drag_start.y
+        if not self.is_dragging and (abs(dx) > 5 or abs(dy) > 5):
+            self.is_dragging = True
+
+        if self.is_dragging:
+            strip = self.controller.tab_strip
+            if not strip:
+                return
+            strip_pt = strip.convertPoint_fromView_(cur_pt, None)
+            for sub in strip.subviews():
+                if isinstance(sub, ChromeTabView) and sub is not self:
+                    if Cocoa.NSPointInRect(strip_pt, sub.frame()):
+                        target_idx = sub.index
+                        if target_idx != self.index:
+                            from_idx = self.index
+                            self.controller.move_tab(from_idx, target_idx)
+                            self.drag_start = cur_pt
+                            break
+
+    def mouseUp_(self, event):
+        # Bug 2 Fix: Finalize drag and persist ordering
+        if self.is_dragging:
+            self.is_dragging = False
+            if self.controller:
+                self.controller.save_session()
+        self.drag_start = None
 
     def menuForEvent_(self, event):
         menu = Cocoa.NSMenu.alloc().init()
@@ -888,7 +946,8 @@ class BookmarksBarView(Cocoa.NSView):
         for b in bms:
             if not isinstance(b, dict) or not b.get("url"):
                 continue
-            title = b.get("title", b["url"])[:24]
+            # Bug 16 Fix: Safely handle None bookmark titles
+            title = (b.get("title") or b.get("url") or "")[:24]
             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)
@@ -1112,12 +1171,15 @@ window.writeToTerm = b => {{
         for b in bms:
             if isinstance(b, dict) and b.get("url"):
                 u = b["url"]
-                t = b.get("title", u)
+                # Bug 16 Fix: Guard title against None
+                t = b.get("title") or u or ""
                 safe_u = json.dumps(u)
+                esc_u = html.escape(u)
+                esc_t = html.escape(t)
                 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 ""
+                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>")
+                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='{esc_u}' style='color:#1a73e8;text-decoration:none;'>{esc_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' 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>"
 
@@ -1126,12 +1188,17 @@ window.writeToTerm = b => {{
         items = []
         for r in records:
             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>")
+            # Bug 16 Fix: Guard title against None and avoid backslashes inside f-string expressions
+            title_text = r[2] or r[1] or ""
+            url_str = r[1] or ""
+            esc_url = html.escape(url_str)
+            esc_title = html.escape(title_text)
+            items.append(f"<tr><td>{r[3]}</td><td><a href='{esc_url}'>{esc_title}</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=\"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=\"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>"
+        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()
@@ -1242,22 +1309,22 @@ class ChromeOmniboxField(Cocoa.NSTextField):
     def becomeFirstResponder(self):
         if self.superview():
             self.superview().setNeedsDisplay_(True)
-        self.setStringValue_(self.raw_url)
+        # Bug 1 Fix: Ensure string value is never None and eliminate infinite loop selectText
+        self.setStringValue_(self.raw_url or "")
         self.setTextColor_(Cocoa.NSColor.labelColor())
-        self.performSelector_withObject_afterDelay_("selectText:", self, 0.0)
         return objc.super(ChromeOmniboxField, self).becomeFirstResponder()
 
     def resignFirstResponder(self):
         if self.superview():
             self.superview().setNeedsDisplay_(True)
-        self.setStringValue_(self.raw_url or "")
+        # Bug 1 Fix: Do not wipe input text on resign so enter and navigation work properly
         return objc.super(ChromeOmniboxField, self).resignFirstResponder()
 
     def set_url(self, url):
-        self.raw_url = url
+        self.raw_url = url or ""
         fr = self.window().firstResponder() if self.window() else None
         if fr != self and fr != self.currentEditor():
-            self.setStringValue_(url or "")
+            self.setStringValue_(self.raw_url)
 
 class OmniboxPopupPanel(Cocoa.NSPanel):
     def canBecomeKeyWindow(self): return False
@@ -1278,7 +1345,8 @@ 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(ChromeTabView, self).updateTrackingAreas() if hasattr(objc.super(ChromeTabView, self), 'updateTrackingAreas') else None
+        # Bug 1 Fix: Use correct class in objc.super to avoid fatal TypeError
+        objc.super(OmniboxSuggestionView, self).updateTrackingAreas()
 
     def mouseMoved_(self, event):
         loc = self.convertPoint_fromView_(event.locationInWindow(), None)
@@ -1306,7 +1374,9 @@ class OmniboxSuggestionView(Cocoa.NSView):
 
             icon = "🔍" if sugg["type"] == "search" else ("🕒" if sugg["type"] == "history" else ("🔖" if sugg["type"] == "bookmark" else ("🧮" if sugg["type"] == "math" else "⚡")))
             attrs = {Cocoa.NSFontAttributeName: Cocoa.NSFont.systemFontOfSize_(13), Cocoa.NSForegroundColorAttributeName: text_color}
-            Cocoa.NSAttributedString.alloc().initWithString_attributes_(f"{icon}  {sugg['text']}", attrs).drawAtPoint_(Cocoa.NSMakePoint(12, rect.origin.y + 6))
+            # Bug 1 Fix: Ensure suggestion text is never None
+            sugg_text = sugg.get("text") or ""
+            Cocoa.NSAttributedString.alloc().initWithString_attributes_(f"{icon}  {sugg_text}", attrs).drawAtPoint_(Cocoa.NSMakePoint(12, rect.origin.y + 6))
 
 class OmniboxPanelCoordinator:
     def __init__(self, window_controller):
@@ -1341,14 +1411,15 @@ class OmniboxPanelCoordinator:
                 bms = json.load(f)
             for b in bms:
                 if isinstance(b, dict):
-                    t, u = b.get("title", ""), b.get("url", "")
+                    t, u = b.get("title") or "", b.get("url") or ""
                     if query_str.lower() in t.lower() or query_str.lower() in u.lower():
                         results.append({"type": "bookmark", "text": t or u, "url": u})
         except Exception:
             pass
 
+        # Bug 1 Fix: Safely fallback title for history autocomplete
         for h in query_history(query_str)[:4]:
-            results.append({"type": "history", "text": h[2], "url": h[1]})
+            results.append({"type": "history", "text": h[2] or h[1] or "", "url": h[1]})
 
         def fetch_remote():
             try:
@@ -1419,7 +1490,7 @@ class OmniboxPanelCoordinator:
             pb.setString_forType_(val, Cocoa.NSPasteboardTypeString)
             self.hide()
             return
-        target = sugg.get("url") or sugg.get("text")
+        target = sugg.get("url") or sugg.get("text") or ""
         self.wc.omnibox.setStringValue_(target)
         editor = self.wc.omnibox.currentEditor()
         if editor:
@@ -1434,16 +1505,33 @@ class OmniboxPanelCoordinator:
                 self.suggestion_view.selected_index = min(len(self.suggestion_view.suggestions)-1, self.suggestion_view.selected_index + 1)
                 if self.suggestion_view.selected_index >= 0:
                     s = self.suggestion_view.suggestions[self.suggestion_view.selected_index]
-                    self.wc.omnibox.setStringValue_(s.get("url") or s.get("text"))
+                    val = s.get("url") or s.get("text") or ""
+                    self.wc.omnibox.setStringValue_(val)
+                    # Bug 10 Fix: Update active field editor
+                    editor = self.wc.omnibox.currentEditor()
+                    if editor:
+                        editor.setString_(val)
+                        editor.selectAll_(None)
                 self.suggestion_view.setNeedsDisplay_(True)
                 return True
             elif sel == "moveUp:":
                 self.suggestion_view.selected_index = max(-1, self.suggestion_view.selected_index - 1)
                 if self.suggestion_view.selected_index >= 0:
                     s = self.suggestion_view.suggestions[self.suggestion_view.selected_index]
-                    self.wc.omnibox.setStringValue_(s.get("url") or s.get("text"))
+                    val = s.get("url") or s.get("text") or ""
+                    self.wc.omnibox.setStringValue_(val)
+                    # Bug 10 Fix: Update active field editor
+                    editor = self.wc.omnibox.currentEditor()
+                    if editor:
+                        editor.setString_(val)
+                        editor.selectAll_(None)
                 else:
-                    self.wc.omnibox.setStringValue_(self.typed_query)
+                    val = self.typed_query or ""
+                    self.wc.omnibox.setStringValue_(val)
+                    editor = self.wc.omnibox.currentEditor()
+                    if editor:
+                        editor.setString_(val)
+                        editor.selectAll_(None)
                 self.suggestion_view.setNeedsDisplay_(True)
                 return True
             elif sel == "insertNewline:":
@@ -1522,6 +1610,7 @@ class FindBarView(Cocoa.NSView):
 
     def onClose_(self, sender):
         self.setHidden_(True)
+        # Bug 22 Fix: Refocus webview when closing find bar
         wv = self.controller.get_active_webview()
         if wv:
             self.controller.window().makeFirstResponder_(wv)
@@ -1529,6 +1618,11 @@ class FindBarView(Cocoa.NSView):
 # ============================================================================
 # QUICK SWITCHER & MEDIA CONTROLS (PIP)
 # ============================================================================
+# Bug 15 Fix: Dedicated panel subclass allowing keyboard focus on borderless window
+class QuickSwitcherPanel(Cocoa.NSPanel):
+    def canBecomeKeyWindow(self): return True
+    def canBecomeMainWindow(self): return True
+
 class QuickSwitcherListView(Cocoa.NSView):
     def initWithFrame_controller_(self, frame, controller):
         self = objc.super(QuickSwitcherListView, self).initWithFrame_(frame)
@@ -1538,6 +1632,19 @@ class QuickSwitcherListView(Cocoa.NSView):
 
     def isFlipped(self): return True
 
+    def mouseDown_(self, event):
+        loc = self.convertPoint_fromView_(event.locationInWindow(), None)
+        idx = int(loc.y // 36)
+        if 0 <= idx < len(self.controller.filtered_tabs):
+            self.controller.selected_index = idx
+            self.setNeedsDisplay_(True)
+            t = self.controller.filtered_tabs[idx]
+            cur_idx = t["wc"].get_tab_index_by_id(t["id"])
+            if cur_idx is not None:
+                t["wc"].window().makeKeyAndOrderFront_(None)
+                t["wc"].switch_to_tab(cur_idx)
+            self.controller.window().orderOut_(None)
+
     def drawRect_(self, dirtyRect):
         for i, tab in enumerate(self.controller.filtered_tabs):
             rect = Cocoa.NSMakeRect(0, i * 36, self.bounds().size.width, 36)
@@ -1548,15 +1655,19 @@ class QuickSwitcherListView(Cocoa.NSView):
             else:
                 tc, sub_color = Cocoa.NSColor.labelColor(), Cocoa.NSColor.secondaryLabelColor()
 
+            # Bug 16 Fix: Guard title and url against None
+            title_text = (tab.get("title") or "Tab")[:60]
+            url_text = (tab.get("url") or "")[:80]
             attrs = {Cocoa.NSFontAttributeName: Cocoa.NSFont.boldSystemFontOfSize_(13), Cocoa.NSForegroundColorAttributeName: tc}
-            Cocoa.NSAttributedString.alloc().initWithString_attributes_(tab["title"][:60], attrs).drawAtPoint_(Cocoa.NSMakePoint(20, rect.origin.y + 3))
+            Cocoa.NSAttributedString.alloc().initWithString_attributes_(title_text, attrs).drawAtPoint_(Cocoa.NSMakePoint(20, rect.origin.y + 3))
             sub_attrs = {Cocoa.NSFontAttributeName: Cocoa.NSFont.systemFontOfSize_(11), Cocoa.NSForegroundColorAttributeName: sub_color}
-            Cocoa.NSAttributedString.alloc().initWithString_attributes_(tab["url"][:80], sub_attrs).drawAtPoint_(Cocoa.NSMakePoint(20, rect.origin.y + 19))
+            Cocoa.NSAttributedString.alloc().initWithString_attributes_(url_text, sub_attrs).drawAtPoint_(Cocoa.NSMakePoint(20, rect.origin.y + 19))
 
 class QuickSwitcherController(Cocoa.NSWindowController):
     def init(self):
         w, h = 600, 400
-        window = Cocoa.NSWindow.alloc().initWithContentRect_styleMask_backing_defer_(
+        # Bug 15 Fix: Use QuickSwitcherPanel so window can receive keyboard events
+        window = QuickSwitcherPanel.alloc().initWithContentRect_styleMask_backing_defer_(
             Cocoa.NSMakeRect(0, 0, w, h), Cocoa.NSWindowStyleMaskBorderless | Cocoa.NSWindowStyleMaskFullSizeContentView, Cocoa.NSBackingStoreBuffered, False
         )
         window.setOpaque_(False)
@@ -1599,8 +1710,8 @@ class QuickSwitcherController(Cocoa.NSWindowController):
                 for t in wc.tabs:
                     self.tabs.append({
                         "id": t.get("id"),
-                        "title": t.get("title", "Tab"),
-                        "url": t.get("url", ""),
+                        "title": t.get("title") or "Tab",
+                        "url": t.get("url") or "",
                         "wc": wc
                     })
         self.filtered_tabs = self.tabs.copy()
@@ -1620,7 +1731,8 @@ class QuickSwitcherController(Cocoa.NSWindowController):
     def control_textView_doCommandBySelector_(self, control, textView, commandSelector):
         sel = str(commandSelector)
         if sel == "moveDown:":
-            self.selected_index = min(len(self.filtered_tabs) - 1, self.selected_index + 1)
+            if self.filtered_tabs:
+                self.selected_index = min(len(self.filtered_tabs) - 1, self.selected_index + 1)
             self.list_view.setNeedsDisplay_(True)
             return True
         elif sel == "moveUp:":
@@ -1652,6 +1764,7 @@ class PiPPanelController(Cocoa.NSWindowController):
         window.setFloatingPanel_(True)
         window.setLevel_(Cocoa.NSFloatingWindowLevel)
         window.setReleasedWhenClosed_(False)
+        window.center()
         self = objc.super(PiPPanelController, self).initWithWindow_(window)
         if self:
             self.browser = browser_controller
@@ -1701,6 +1814,7 @@ class PiPPanelController(Cocoa.NSWindowController):
 # BROWSER WINDOW CONTROLLER
 # ============================================================================
 TITLE_BAR_H = 30
+SCRIPT_HANDLER_NAMES = ("bridge", "audio", "terminalInput", "terminalResize")
 
 class BrowserWindowController(Cocoa.NSWindowController):
     def init(self):
@@ -1947,6 +2061,16 @@ class BrowserWindowController(Cocoa.NSWindowController):
             wv.setFrame_(self.web_container.bounds())
         self.relayout_tabs()
 
+    def move_tab(self, from_idx, to_idx):
+        """Bug 2 Fix: Interactive tab reordering."""
+        if from_idx == to_idx or not (0 <= from_idx < len(self.tabs) and 0 <= to_idx < len(self.tabs)):
+            return
+        tab = self.tabs.pop(from_idx)
+        self.tabs.insert(to_idx, tab)
+        self.active_tab_index = to_idx
+        self.relayout_tabs()
+        self.save_session()
+
     def relayout_tabs(self):
         for sub in list(self.tab_strip.subviews()):
             sub.removeFromSuperview()
@@ -1956,7 +2080,8 @@ class BrowserWindowController(Cocoa.NSWindowController):
         tab_h = 28 if not is_vert else 32
         y = self.tab_strip.bounds().size.height - 38 - tab_h if is_vert else 3
 
-        vis = [t for t in self.tabs if not t.get("group_id") or not self.get_group(t["group_id"]).collapsed]
+        # Bug 3 Fix: Safely guard against orphan group IDs
+        vis = [t for t in self.tabs if not t.get("group_id") or not (self.get_group(t["group_id"]) and self.get_group(t["group_id"]).collapsed)]
         pinned_cnt = sum(1 for t in vis if t.get("pinned", False))
         tab_w = max(60, min(240, (w - x - 44 - (pinned_cnt * 36)) / max(1, len(vis) - pinned_cnt))) if not is_vert else w
 
@@ -2033,10 +2158,8 @@ class BrowserWindowController(Cocoa.NSWindowController):
 
         config.setURLSchemeHandler_forURLScheme_(InternalSchemeHandler.alloc().init(), "browser")
         uc = WebKit.WKUserContentController.alloc().init()
-        uc.addScriptMessageHandler_name_(self, "bridge")
-        uc.addScriptMessageHandler_name_(self, "audio")
-        uc.addScriptMessageHandler_name_(self, "terminalInput")
-        uc.addScriptMessageHandler_name_(self, "terminalResize")
+        for h_name in SCRIPT_HANDLER_NAMES:
+            uc.addScriptMessageHandler_name_(self, h_name)
 
         # 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))
@@ -2065,7 +2188,8 @@ class BrowserWindowController(Cocoa.NSWindowController):
                     reg = m.replace("*", ".*").replace("/", escaped_slash)
                     conds.append(f"new RegExp('^{reg}$').test(location.href)")
             cond_str = " || ".join(conds) if conds else "true"
-            wrapped = f"if ({cond_str}) {{\n" + script["code"] + "\n}}"
+            # Bug 26 Fix: Wrap in an IIFE so top-level return statements in scripts execute safely
+            wrapped = f"if ({cond_str}) {{\n(function() {{\n" + script["code"] + "\n}})();\n}}"
             uc.addUserScript_(WebKit.WKUserScript.alloc().initWithSource_injectionTime_forMainFrameOnly_(wrapped, WebKit.WKUserScriptInjectionTimeAtDocumentEnd, False))
 
         if WK_RULE_LIST and SETTINGS.settings.get("adblock_enabled", True):
@@ -2158,6 +2282,13 @@ class BrowserWindowController(Cocoa.NSWindowController):
                         wv.removeObserver_forKeyPath_(self, k)
                     except Exception:
                         pass
+                # Bug 20 Fix: Remove message handlers to eliminate retain cycles
+                uc = wv.configuration().userContentController()
+                for name in SCRIPT_HANDLER_NAMES:
+                    try:
+                        uc.removeScriptMessageHandlerForName_(name)
+                    except Exception:
+                        pass
                 if wv.superview():
                     wv.removeFromSuperview()
             if not self.tabs:
@@ -2383,6 +2514,9 @@ class BrowserWindowController(Cocoa.NSWindowController):
     def handle_escape_key(self):
         if self.find_bar and not self.find_bar.isHidden():
             self.find_bar.setHidden_(True)
+            wv = self.get_active_webview()
+            if wv:
+                self.window().makeFirstResponder_(wv)
             return
         if self.is_active_tab_terminal():
             return
@@ -2450,7 +2584,11 @@ class BrowserWindowController(Cocoa.NSWindowController):
         inc_item = menu.addItemWithTitle_action_keyEquivalent_("New Incognito Window", "onNewIncognitoWindow:", "N")
         inc_item.setKeyEquivalentModifierMask_(Cocoa.NSEventModifierFlagCommand | Cocoa.NSEventModifierFlagShift)
         inc_item.setTarget_(Cocoa.NSApp.delegate())
-        menu.addItemWithTitle_action_keyEquivalent_("New Terminal Tab", "openTerminal:", "T").setTarget_(self)
+        
+        term_item = menu.addItemWithTitle_action_keyEquivalent_("New Terminal Tab", "openTerminal:", "t")
+        term_item.setKeyEquivalentModifierMask_(Cocoa.NSEventModifierFlagCommand | Cocoa.NSEventModifierFlagOption)
+        term_item.setTarget_(self)
+        
         menu.addItem_(Cocoa.NSMenuItem.separatorItem())
         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"
@@ -2544,9 +2682,12 @@ class BrowserWindowController(Cocoa.NSWindowController):
         if not wv: return
         url = wv.URL().absoluteString() if wv.URL() else "browser://newtab"
         parsed = Foundation.NSURL.URLWithString_(url)
+        # Bug 24 Fix: Safely guard against None parsed URL
+        host_str = (parsed.host() or "Internal Page") if parsed else "Internal Page"
+        is_https = (parsed.scheme() == "https") if parsed else False
         menu = Cocoa.NSMenu.alloc().init()
-        menu.addItemWithTitle_action_keyEquivalent_(f"Host: {parsed.host() or 'Internal Page'}", "", "").setEnabled_(False)
-        menu.addItemWithTitle_action_keyEquivalent_("Connection: Secure (HTTPS)" if parsed.scheme() == "https" else "Connection: Insecure / Local", "", "").setEnabled_(False)
+        menu.addItemWithTitle_action_keyEquivalent_(f"Host: {host_str}", "", "").setEnabled_(False)
+        menu.addItemWithTitle_action_keyEquivalent_("Connection: Secure (HTTPS)" if is_https else "Connection: Insecure / Local", "", "").setEnabled_(False)
         menu.addItem_(Cocoa.NSMenuItem.separatorItem())
         menu.addItemWithTitle_action_keyEquivalent_("Copy Current URL", "onCopyUrl:", "").setTarget_(self)
         menu.popUpMenuPositioningItem_atLocation_inView_(None, Cocoa.NSMakePoint(0, 0), sender)
@@ -2591,7 +2732,8 @@ class BrowserWindowController(Cocoa.NSWindowController):
             wv = self.get_active_webview()
             if wv:
                 wv.loadRequest_(Foundation.NSURLRequest.requestWithURL_(Foundation.NSURL.URLWithString_(val)))
-                self.window().makeFirstResponder_(self.web_container)
+                # Bug 11 Fix: Transfer keyboard focus directly to active webview
+                self.window().makeFirstResponder_(wv)
 
     def controlTextDidChange_(self, notif):
         if notif.object() == self.omnibox:
@@ -2725,6 +2867,7 @@ class BrowserWindowController(Cocoa.NSWindowController):
         elif cmd == "toggle_fullscreen_terminal":
             self.toggle_tab_bar()
         elif cmd == "context_target_image":
+            # Bug 9 Fix: Store or clear target image URL
             self.last_context_image_url = body.get("src")
         elif cmd == "blob_image_data":
             data_url, dest_path = body.get("data"), body.get("path")
@@ -2758,14 +2901,23 @@ class BrowserWindowController(Cocoa.NSWindowController):
         elif cmd == "prompt_save_password":
             self.show_password_banner(body.get("host", ""), body.get("username", ""), body.get("password", ""))
         elif cmd == "check_autofill":
+            # Bug 18 & 19 Fix: Apply credentials specifically to requesting webview using safe JSON encoding
             host = body.get("host")
             saved_user = SETTINGS.settings.get("saved_logins", {}).get(host)
             if saved_user:
                 pwd = get_from_keychain(host, saved_user)
                 if pwd:
-                    wv = self.get_active_webview()
-                    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)
+                    calling_wv = message.webView()
+                    if calling_wv:
+                        pwd_json = json.dumps(pwd)
+                        user_json = json.dumps(saved_user)
+                        js = f"""(function() {{
+                            let pw = document.querySelector('input[type=password]');
+                            let user = document.querySelector('input[type=text], input[type=email]');
+                            if (pw) pw.value = {pwd_json};
+                            if (user) user.value = {user_json};
+                        }})();"""
+                        calling_wv.evaluateJavaScript_completionHandler_(js, None)
         elif cmd == "save_setting":
             raw_key, raw_val = body.get("key"), body.get("val")
             if raw_key is None:
@@ -2789,12 +2941,15 @@ class BrowserWindowController(Cocoa.NSWindowController):
                     for sub in c.tab_strip.subviews():
                         sub.setNeedsDisplay_(True)
             elif key in ("default_zoom",):
-                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)
+                try:
+                    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)
+                except (ValueError, TypeError):
+                    pass
             elif key in ("user_agent_mode", "custom_user_agent"):
                 ua = SETTINGS.get_user_agent()
                 for t in self.tabs:
@@ -2868,8 +3023,8 @@ class BrowserWindowController(Cocoa.NSWindowController):
                 FaviconCache.clear()
                 self.bookmarks_bar.reload_bookmarks()
             if "dns_cache" in targets:
-                with DNS_LOCK:
-                    DNS_CACHE.clear()
+                # Bug 12 Fix: Completely wipe in-memory and disk DNS cache
+                clear_dns_cache_and_disk()
             if "cookies_cache" in targets:
                 ds = WebKit.WKWebsiteDataStore.defaultDataStore()
                 ds.removeDataOfTypes_modifiedSince_completionHandler_(WebKit.WKWebsiteDataStore.allWebsiteDataTypes(), Foundation.NSDate.dateWithTimeIntervalSince1970_(0), lambda: None)
@@ -3047,6 +3202,9 @@ class BrowserWindowController(Cocoa.NSWindowController):
                     if not t.get("is_sleeping"):
                         t["title"] = str(obj.title())
                     break
+            # Bug 6 Fix: Update SQLite history with real page title when available
+            if not self.is_incognito and obj.URL() and SETTINGS.settings.get("history_enabled", True):
+                record_history(obj.URL().absoluteString(), str(obj.title()))
             self.relayout_tabs()
         elif keyPath == "estimatedProgress":
             self.update_progress_for_webview(obj)
@@ -3089,6 +3247,14 @@ class BrowserWindowController(Cocoa.NSWindowController):
             self.omnibox_panel.hide()
 
     def windowWillClose_(self, notif):
+        # Bug 4 Fix: Invalidate repeating NSTimer to prevent memory retain cycle
+        if hasattr(self, 'sleep_timer') and self.sleep_timer:
+            self.sleep_timer.invalidate()
+            self.sleep_timer = None
+
+        if hasattr(self, 'omnibox_panel') and self.omnibox_panel.is_visible():
+            self.omnibox_panel.hide()
+
         self.save_session()
         for t in self.tabs:
             wv = t.get("webview")
@@ -3099,6 +3265,13 @@ class BrowserWindowController(Cocoa.NSWindowController):
                         wv.removeObserver_forKeyPath_(self, k)
                     except Exception:
                         pass
+                # Bug 20 Fix: Clean up userContentController message handlers
+                uc = wv.configuration().userContentController()
+                for name in SCRIPT_HANDLER_NAMES:
+                    try:
+                        uc.removeScriptMessageHandlerForName_(name)
+                    except Exception:
+                        pass
         app_delegate = Cocoa.NSApp.delegate()
         if app_delegate and hasattr(app_delegate, "controllers") and self in app_delegate.controllers:
             app_delegate.controllers.remove(self)
@@ -3171,12 +3344,14 @@ class AppDelegate(Cocoa.NSObject):
                         # Allow Escape to pass directly into terminal tabs (vim, nano, fzf, less)
                         if wc.is_active_tab_terminal():
                             return event
+                        # Bug 22 Fix: Refocus webview when find_bar is closed via Escape
                         if wc.find_bar and not wc.find_bar.isHidden():
                             wc.find_bar.setHidden_(True)
+                            wv = wc.get_active_webview()
+                            if wv:
+                                wc.window().makeFirstResponder_(wv)
                             return None
-                        if not wc.tab_bar_visible:
-                            wc.toggle_tab_bar()
-                            return None
+                        # Bug 21 Fix: Delegate Escape to handle_escape_key() so HTML5 fullscreen exit is not bypassed
                         wc.handle_escape_key()
                         return event
 
@@ -3210,11 +3385,24 @@ class AppDelegate(Cocoa.NSObject):
         wc = BrowserWindowController.alloc().initWithIncognito_(True)
         self.controllers.append(wc)
 
+    # Bug 7 Fix: Allow opening new tabs when all windows are closed
+    def onNewTab_(self, sender=None):
+        win = Cocoa.NSApp.keyWindow()
+        wc = win.delegate() if win and isinstance(win.delegate(), BrowserWindowController) else None
+        if wc:
+            wc.onNewTab_(sender)
+        else:
+            self.onNewWindow_(sender)
+
     def onNewTerminal_(self, sender):
         win = Cocoa.NSApp.keyWindow()
         wc = win.delegate() if win and isinstance(win.delegate(), BrowserWindowController) else (self.controllers[0] if self.controllers else None)
         if wc:
             wc.add_tab("browser://terminal")
+        else:
+            self.onNewWindow_(None)
+            if self.controllers:
+                self.controllers[-1].add_tab("browser://terminal")
 
     def onCloseTab_(self, sender=None):
         win = Cocoa.NSApp.keyWindow()
@@ -3245,7 +3433,12 @@ class AppDelegate(Cocoa.NSObject):
         file_item = Cocoa.NSMenuItem.alloc().init()
         file_menu = Cocoa.NSMenu.alloc().initWithTitle_("File")
         file_menu.addItemWithTitle_action_keyEquivalent_("New Tab", "onNewTab:", "t")
-        file_menu.addItemWithTitle_action_keyEquivalent_("New Terminal Tab", "onNewTerminal:", "T").setTarget_(self)
+        
+        # Bug 27 Fix: Assign distinct shortcut Cmd+Option+T to Terminal tab so Cmd+Shift+T belongs to Reopen Closed Tab
+        term_item = file_menu.addItemWithTitle_action_keyEquivalent_("New Terminal Tab", "onNewTerminal:", "t")
+        term_item.setKeyEquivalentModifierMask_(Cocoa.NSEventModifierFlagCommand | Cocoa.NSEventModifierFlagOption)
+        term_item.setTarget_(self)
+
         file_menu.addItemWithTitle_action_keyEquivalent_("New Window", "onNewWindow:", "n").setTarget_(self)
         inc_item = file_menu.addItemWithTitle_action_keyEquivalent_("New Incognito Window", "onNewIncognitoWindow:", "N")
         inc_item.setKeyEquivalentModifierMask_(Cocoa.NSEventModifierFlagCommand | Cocoa.NSEventModifierFlagShift)
@@ -3304,7 +3497,8 @@ class AppDelegate(Cocoa.NSObject):
         for i in range(1, 10):
             win_menu.addItemWithTitle_action_keyEquivalent_(f"Tab {i}", f"onSwitchTab{i}:", str(i))
         win_menu.addItem_(Cocoa.NSMenuItem.separatorItem())
-        win_menu.addItemWithTitle_action_keyEquivalent_("Quick Switcher", "quickSwitcher:", "k")
+        qs_item = win_menu.addItemWithTitle_action_keyEquivalent_("Quick Switcher", "quickSwitcher:", "k")
+        qs_item.setTarget_(self)
         win_menu.addItemWithTitle_action_keyEquivalent_("Task Manager", "showTaskManager:", "").setTarget_(self)
         win_item.setSubmenu_(win_menu)
         main_menu.addItem_(win_item)

{stupidpythonbrowser-1.0.3 → stupidpythonbrowser-1.0.4}/pybrowser/doh_server.py

@@ -36,6 +36,9 @@ DNS_CACHE = {}
 DNS_LOCK = threading.Lock()
 DNS_CACHE_DIRTY = False
 
+_PROXY_STARTED = False
+_PROXY_START_LOCK = threading.Lock()
+
 def rebuild_active_domains():
     global ACTIVE_BLOCK_DOMAINS
     with ADBLOCK_LOCK:
@@ -92,9 +95,12 @@ def load_dns_cache():
     if os.path.exists(DNS_CACHE_FILE):
         try:
             with open(DNS_CACHE_FILE, 'r', encoding='utf-8') as f:
-                DNS_CACHE = json.load(f)
+                loaded = json.load(f)
+                with DNS_LOCK:
+                    DNS_CACHE = loaded if isinstance(loaded, dict) else {}
         except Exception:
-            DNS_CACHE = {}
+            with DNS_LOCK:
+                DNS_CACHE = {}
 
 def flush_dns_cache_to_disk():
     global DNS_CACHE_DIRTY
@@ -107,6 +113,18 @@ def flush_dns_cache_to_disk():
             except Exception:
                 pass
 
+def clear_dns_cache_and_disk():
+    """Bug 12 Fix: Clears memory cache and wipes disk persistence file completely."""
+    global DNS_CACHE, DNS_CACHE_DIRTY
+    with DNS_LOCK:
+        DNS_CACHE.clear()
+        DNS_CACHE_DIRTY = False
+        try:
+            if os.path.exists(DNS_CACHE_FILE):
+                os.remove(DNS_CACHE_FILE)
+        except Exception:
+            pass
+
 def doh_resolve(hostname):
     global DNS_CACHE_DIRTY
     now = time.time()
@@ -282,24 +300,31 @@ class DoHProxyHandler(http.server.BaseHTTPRequestHandler):
                 pass
 
 def start_proxy_server():
-    class ReusableTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
-        allow_reuse_address = True
-        daemon_threads = True
-
-        def server_bind(self):
-            if hasattr(socket, "SO_REUSEPORT"):
-                try:
-                    self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
-                except Exception:
-                    pass
-            super().server_bind()
+    # Bug 23 Fix: Prevent multiple TCP server instances & duplicate worker threads
+    global _PROXY_STARTED
+    with _PROXY_START_LOCK:
+        if _PROXY_STARTED:
+            return
 
-    try:
-        server = ReusableTCPServer(("127.0.0.1", LOCAL_PROXY_PORT), DoHProxyHandler)
-        threading.Thread(target=server.serve_forever, daemon=True).start()
-        threading.Thread(target=dns_flush_worker, daemon=True).start()
-    except Exception as e:
-        print(f"[Proxy Warning] Could not start local proxy server: {e}")
+        class ReusableTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
+            allow_reuse_address = True
+            daemon_threads = True
+
+            def server_bind(self):
+                if hasattr(socket, "SO_REUSEPORT"):
+                    try:
+                        self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
+                    except Exception:
+                        pass
+                super().server_bind()
+
+        try:
+            server = ReusableTCPServer(("127.0.0.1", LOCAL_PROXY_PORT), DoHProxyHandler)
+            threading.Thread(target=server.serve_forever, daemon=True).start()
+            threading.Thread(target=dns_flush_worker, daemon=True).start()
+            _PROXY_STARTED = True
+        except Exception as e:
+            print(f"[Proxy Warning] Could not start local proxy server: {e}")
 
 def dns_flush_worker():
     while True:

{stupidpythonbrowser-1.0.3 → stupidpythonbrowser-1.0.4}/pybrowser/incognito.py

@@ -33,4 +33,4 @@ def apply_incognito_preferences(config, shared_data_store=None):
             config.preferences().setElementFullscreenEnabled_(True)
     except Exception:
         pass
-    return config
+    return config

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

@@ -11,6 +11,7 @@ import re
 import html
 import tempfile
 import shutil
+import copy
 
 UA_PRESETS = {
     "safari_18": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Safari/605.1.15",
@@ -188,7 +189,7 @@ class SettingsManager:
             "saved_logins": {},
             "history_enabled": True
         }
-        self.settings = dict(self.defaults)
+        self.settings = copy.deepcopy(self.defaults)
         self.load()
 
     def load(self):
@@ -220,7 +221,8 @@ class SettingsManager:
             print(f"[Settings Save Error] {e}")
 
     def reset_defaults(self):
-        self.settings = dict(self.defaults)
+        # Bug 25 Fix: Deep copy to prevent mutation of defaults dictionary
+        self.settings = copy.deepcopy(self.defaults)
         self.save()
 
     def get_search_url(self, query):
@@ -696,9 +698,12 @@ def get_settings_html(sb_count, base_count, custom_count, active_rules_count):
       window.webkit.messageHandlers.bridge.postMessage({{ cmd: 'search_blocked_domains', query: q }});
     }}
   }}
-  window.renderBlockedResults = function(jsonStr) {{
-    let items = [];
-    try {{ items = JSON.parse(jsonStr); }} catch(e) {{ items = []; }}
+  // Bug 14 Fix: Accept either pre-parsed Array or JSON string safely
+  window.renderBlockedResults = function(data) {{
+    let items = Array.isArray(data) ? data : [];
+    if (!items.length && typeof data === 'string') {{
+      try {{ items = JSON.parse(data); }} catch(e) {{ items = []; }}
+    }}
     const box = document.getElementById('inspector-results');
     if (!items || items.length === 0) {{
       box.innerHTML = '<span style="color:#D93025;">No matches found. Domain is NOT currently blocked.</span>';
@@ -706,7 +711,7 @@ def get_settings_html(sb_count, base_count, custom_count, active_rules_count):
     }}
     let out = '<div style="margin-bottom:6px;font-weight:600;color:var(--primary);">' + items.length + ' Matches Found:</div>';
     items.forEach(it => {{
-      out += '<div><strong>[BLOCKED]</strong> ' + it.domain + ' <span style="opacity:0.6;">(' + it.source + ')</span></div>';
+      out += '<div><strong>[BLOCKED]</strong> ' + (it.domain || '') + ' <span style="opacity:0.6;">(' + (it.source || '') + ')</span></div>';
     }});
     box.innerHTML = out;
   }};

{stupidpythonbrowser-1.0.3 → stupidpythonbrowser-1.0.4}/pybrowser/task_manager.py

@@ -114,11 +114,15 @@ class ProcessManagerController(Cocoa.NSWindowController):
 
     def onPurgeMemory_(self, sender):
         try:
-            from pybrowser.doh_server import DNS_CACHE, DNS_LOCK
-            with DNS_LOCK:
-                DNS_CACHE.clear()
+            from pybrowser.doh_server import clear_dns_cache_and_disk
+            clear_dns_cache_and_disk()
         except Exception:
-            pass
+            try:
+                from pybrowser.doh_server import DNS_CACHE, DNS_LOCK
+                with DNS_LOCK:
+                    DNS_CACHE.clear()
+            except Exception:
+                pass
 
         try:
             from pybrowser.browser import FaviconCache
@@ -363,4 +367,4 @@ class ProcessManagerController(Cocoa.NSWindowController):
                 session = target[1]
                 if session:
                     session.close()
-                self.refresh_data()
+                self.refresh_data()

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

@@ -222,11 +222,12 @@ class TerminalSession:
         env["CARGO_HTTP_PROXY"] = proxy_url
 
         # Inject PyBrowser CLI tools into PATH
-        bin_dir = os.path.join(get_data_dir(), "bin")
-        ensure_doh_cli_helper(bin_dir, port)
-        cur_path = env.get("PATH", "/usr/bin:/bin:/usr/sbin:/sbin")
-        if bin_dir not in cur_path:
-            env["PATH"] = f"{bin_dir}:{cur_path}"
+        # $$$$$
+        # bin_dir = os.path.join(get_data_dir(), "bin")
+        # ensure_doh_cli_helper(bin_dir, port)
+        # cur_path = env.get("PATH", "/usr/bin:/bin:/usr/sbin:/sbin")
+        # if bin_dir not in cur_path:
+        #     env["PATH"] = f"{bin_dir}:{cur_path}"
 
         # PyBrowser session indicators
         env["PYBROWSER_DOH_PROXY"] = proxy_url
@@ -401,7 +402,8 @@ class TerminalSession:
 class TerminalManager:
     def __init__(self):
         self.sessions = {}
-        self.lock = threading.Lock()
+        # Bug 13 Fix: Use RLock to prevent reentrant deadlocks when session.close() calls on_close
+        self.lock = threading.RLock()
 
     def get_or_create(self, webview, cols=None, rows=None):
         with self.lock:

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

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

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

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