stupidpythonbrowser 1.0.2__tar.gz → 1.0.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stupidpythonbrowser
-Version: 1.0.2
+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.2 → stupidpythonbrowser-1.0.3}/pybrowser/__init__.py

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

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

@@ -455,12 +455,20 @@ COMMAND_CLICK_JS = """
 
 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);
 """
 
@@ -490,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
@@ -1108,22 +1116,22 @@ window.writeToTerm = b => {{
                 safe_u = json.dumps(u)
                 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"window.webkit.messageHandlers.bridge.postMessage({{cmd: 'delete_bookmark', url: {safe_u}}}); setTimeout(() => location.reload(), 100);"
+                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' style='padding:4px 8px;margin-right:8px;'><input id='u' placeholder='https://...' style='padding:4px 8px;margin-right:8px;width:260px;'><button onclick='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>"
+        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()
@@ -1132,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)}) "
@@ -1142,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
@@ -1270,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)
@@ -2685,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():
@@ -2698,7 +2710,13 @@ 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":
             target_url = body.get("url")
@@ -2749,8 +2767,11 @@ 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")
-            val = sanitize_for_json(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
@@ -2809,7 +2830,7 @@ class BrowserWindowController(Cocoa.NSWindowController):
 
             res = panel.runModal()
             if res == Cocoa.NSModalResponseOK and panel.URLs():
-                chosen_path = panel.URLs()[0].path()
+                chosen_path = str(panel.URLs()[0].path())
                 if os.access(chosen_path, os.W_OK):
                     SETTINGS.settings["download_path"] = chosen_path
                     SETTINGS.save()
@@ -2839,7 +2860,8 @@ 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:

{stupidpythonbrowser-1.0.2 → 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")),
@@ -87,29 +87,40 @@ def sanitize_for_json(obj):
     """
     if obj is None:
         return None
-    # Check booleans explicitly first because bool subclasses int in Python
+
     type_name = type(obj).__name__
-    if isinstance(obj, bool) or "Boolean" in type_name or type_name == "bool":
+
+    # 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:
-        # Number conversion for PyObjC NSNumber
-        if hasattr(obj, "boolValue") and ("Boolean" in type_name or "bool" in str(type(obj)).lower()):
-            return bool(obj.boolValue())
-        if hasattr(obj, "doubleValue"):
-            val = obj.doubleValue()
-            return int(val) if val.is_integer() else val
         if hasattr(obj, "stringValue"):
             return str(obj.stringValue())
     except Exception:
         pass
+
     return str(obj)
 
 def validate_and_get_download_dir(target_path=None):
@@ -635,7 +646,9 @@ 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) {{
@@ -662,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();
@@ -675,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 = [];
@@ -698,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.2 → stupidpythonbrowser-1.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "stupidpythonbrowser"
-version = "1.0.2"
+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.2 → stupidpythonbrowser-1.0.3}/stupidpythonbrowser.egg-info/PKG-INFO

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