@livx.cc/appwrap 0.47.3 → 0.48.1

package/runtime-desktop/chrome/appwrap-browser-chrome.html

@@ -40,11 +40,12 @@
     background: var(--field-bg); color: var(--fg); font-size: 13px; outline: none;
   }
   #addr:focus { border-color: #4c8bf5; }
-  #profile {
+  #profile, #newprof {
     flex: none; height: 28px; max-width: 160px;
     border: 1px solid var(--field-border); border-radius: 7px;
     background: var(--field-bg); color: var(--fg); font-size: 12px; padding: 0 4px;
   }
+  #newprof:focus { border-color: #4c8bf5; outline: none; }
 </style>
 </head>
 <body>
@@ -55,10 +56,17 @@
     <input id="addr" type="text" spellcheck="false" autocomplete="off"
            placeholder="Enter address (e.g. 127.0.0.1:3000)" />
     <select id="profile" title="Profile"></select>
+    <input id="newprof" type="text" spellcheck="false" autocomplete="off"
+           placeholder="profile name — Enter" style="display:none" />
   </div>
 <script>
 (function () {
-  var id = new URLSearchParams(location.search).get('id') || '';
+  // id + profile arrive via hash fragment (#id=…&profile=…) — a query (?…) breaks Tauri's App-asset
+  // resolution. Read hash first, fall back to search for robustness.
+  var hp = new URLSearchParams(location.hash.replace(/^#/, ''));
+  var sp = new URLSearchParams(location.search);
+  var id = hp.get('id') || sp.get('id') || '';
+  var initProfile = hp.get('profile') || sp.get('profile') || 'default';
   function invoke(cmd, args) {
     var core = window.__TAURI__ && window.__TAURI__.core;
     if (!core) return Promise.reject(new Error('Tauri core unavailable'));
@@ -85,17 +93,71 @@
     if (url) invoke('browser_tab_navigate', { id: id, url: url });
   });
 
+  var NEW_PROFILE = '__new__';   // sentinel option: reveal an inline input, then switch to the name
+  var current = initProfile;     // the profile actually shown (to revert the <select> on cancel)
+  var newprof = document.getElementById('newprof');
+
+  function addProfileOption(name) {
+    if (!name) return;
+    for (var i = 0; i < profileSel.options.length; i++) {
+      if (profileSel.options[i].value === name) return;   // already listed
+    }
+    var opt = document.createElement('option');
+    opt.value = name; opt.textContent = name;
+    profileSel.insertBefore(opt, profileSel.lastChild);   // before the "+ New profile…" item
+  }
+
+  function switchProfile(name) {
+    // Switching recreates the webview with a fresh, isolated store; the name is persisted on first
+    // use (uuid_for) so it reappears in the list next launch.
+    addProfileOption(name);
+    profileSel.value = name;
+    current = name;
+    invoke('browser_subwindow_switch_profile', { id: id, profileId: name });
+  }
+
+  // Inline "+ New profile" flow — WKWebView has no window.prompt (no text-input panel delegate), so
+  // reveal a small input instead of prompting. Enter commits, Escape/empty-blur cancels.
+  function beginNewProfile() {
+    profileSel.style.display = 'none';
+    newprof.style.display = '';
+    newprof.value = '';
+    newprof.focus();
+  }
+  function endNewProfile(commit) {
+    if (newprof.style.display === 'none') return;   // already closed (guard double-fire)
+    var name = (newprof.value || '').trim();
+    newprof.style.display = 'none';
+    profileSel.style.display = '';
+    profileSel.value = current;                     // reset the sentinel selection
+    if (commit && name && name !== current) switchProfile(name);
+  }
+  newprof.addEventListener('keydown', function (e) {
+    if (e.key === 'Enter') endNewProfile(true);
+    else if (e.key === 'Escape') endNewProfile(false);
+  });
+  newprof.addEventListener('blur', function () { endNewProfile(true); });
+
   profileSel.addEventListener('change', function () {
-    invoke('browser_subwindow_switch_profile', { id: id, profileId: profileSel.value });
+    var val = profileSel.value;
+    if (val === NEW_PROFILE) { beginNewProfile(); return; }
+    current = val;
+    invoke('browser_subwindow_switch_profile', { id: id, profileId: val });
   });
 
-  // Populate the profile dropdown.
+  // Populate the profile dropdown, then append the "+ New profile…" sentinel.
   invoke('browser_list_profiles').then(function (profiles) {
     (profiles || ['default']).forEach(function (p) {
       var opt = document.createElement('option');
       opt.value = p; opt.textContent = p;
       profileSel.appendChild(opt);
     });
+    var add = document.createElement('option');
+    add.value = NEW_PROFILE; add.textContent = '+ New profile…';
+    profileSel.appendChild(add);
+    // Reflect the window's ACTUAL mounted profile (may be non-default on a restored window).
+    addProfileOption(initProfile);
+    profileSel.value = initProfile;
   }).catch(function (e) { console.error('list profiles failed', e); });
 
   // Keep the address bar in sync with the controlled webview (skip while the user is editing it).
@@ -112,8 +174,11 @@
       } catch (_) {}
     }).catch(function () {});
   }
-  setInterval(poll, 1000);
+  var pollTimer = setInterval(poll, 1000);
   poll();
+  // Stop polling as the window unloads — a poll's current_url eval racing the native teardown blocks
+  // the closing window (the webview is gone, so the eval never resolves). Fixes the close-hang.
+  window.addEventListener('pagehide', function () { clearInterval(pollTimer); });
 })();
 </script>
 </body>

package/runtime-desktop/crates/webview-control/src/lib.rs

@@ -90,7 +90,8 @@ pub enum Mount {
 #[cfg(target_os = "macos")]
 pub use wkwebview_backend::{
     close, create_profile_window, create_webview, devtools_enabled, eval_async, go_back, go_forward,
-    inject_script, install_message_handler, list_webviews, navigate, profile_webview, reload,
+    inject_script, install_message_handler, install_named_message_handler, list_webviews, navigate,
+    profile_webview, reload,
     set_inspectable, set_mount, snapshot, user_close, CreateResult, CreateSpec, MessageSink,
     WebviewInfo,
 };

package/runtime-desktop/crates/webview-control/src/wkwebview_backend.rs

@@ -123,19 +123,28 @@ define_class!(
 /// the legacy tauri-window path — the profile-window path installs it on the config's UCC before
 /// creation). The UCC retains the handler, so no external retention is needed here. Main-thread only.
 pub unsafe fn install_message_handler(wk: *mut WKWebView, mtm: MainThreadMarker, on_message: MessageSink) {
+    install_named_message_handler(wk, mtm, "bridgeShim", on_message);
+}
+
+/// Install a WKScriptMessageHandler under `name` on a WKWebView, so page JS reaches native via
+/// `webkit.messageHandlers.<name>.postMessage(str)`. Origin-agnostic and NOT command-ACL-gated —
+/// the ONLY reliable page→native path for a REMOTE-served page (Tauri command IPC is ACL-blocked
+/// for remote origins; ws/http/custom-scheme are mixed-content-blocked from https). Main-thread only.
+pub unsafe fn install_named_message_handler(
+    wk: *mut WKWebView,
+    mtm: MainThreadMarker,
+    name: &str,
+    on_message: MessageSink,
+) {
     let wk = &*wk;
     let handler = MsgHandler::alloc(mtm).set_ivars(MsgHandlerIvars { on_message });
     let handler: Retained<MsgHandler> = msg_send![super(handler), init];
     let ucc = wk.configuration().userContentController();
-    // Idempotent per UCC: WKUserContentController throws NSInvalidArgumentException if a handler is
-    // already registered for a name. A window can already carry `bridgeShim` (a second plugin
-    // attaching onMessage, a browser tab, or the env-gated bridge). removeScriptMessageHandlerForName
-    // is safe when none is present, so remove-then-add makes re-install a no-op instead of a crash.
-    ucc.removeScriptMessageHandlerForName(&NSString::from_str("bridgeShim"));
-    ucc.addScriptMessageHandler_name(
-        ProtocolObject::from_ref(&*handler),
-        &NSString::from_str("bridgeShim"),
-    );
+    // Idempotent per UCC: addScriptMessageHandler throws NSInvalidArgumentException if `name` is
+    // already registered; remove-then-add makes re-install a no-op instead of a crash.
+    let ns_name = NSString::from_str(name);
+    ucc.removeScriptMessageHandlerForName(&ns_name);
+    ucc.addScriptMessageHandler_name(ProtocolObject::from_ref(&*handler), &ns_name);
 }
 
 /// A manually-created profile window. Strong refs kept alive until close (or windowWillClose).
@@ -305,6 +314,10 @@ pub fn create_webview(
 
     let cfg = unsafe { WKWebViewConfiguration::new(mtm) };
     unsafe { cfg.setWebsiteDataStore(&store) };
+    // Allow programmatic window.open (the createWebViewWithConfiguration UI-delegate below hosts the
+    // child popup). Without this WKWebView blocks any window.open NOT fired synchronously in a click —
+    // which silently kills OAuth "Sign in with Google/…" popups that open AFTER an async round-trip.
+    unsafe { cfg.preferences().setJavaScriptCanOpenWindowsAutomatically(true) };
 
     // bridgeShim message handler + content bundle (documentStart) on this cfg's UCC.
     let ucc = unsafe { cfg.userContentController() };