@livx.cc/appwrap 0.61.17 → 0.61.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livx.cc/appwrap",
-  "version": "0.61.17",
+  "version": "0.61.19",
   "description": "Wrap any PWA into a native app with native capabilities (appwrap runtime + @livx.cc/native-kit).",
   "license": "MIT",
   "author": "Elya Livshitz",

package/runtime/app/shell/handlers-webview.ts

@@ -18,6 +18,8 @@ const KVO_KEYS = ['URL', 'title', 'canGoBack', 'canGoForward', 'loading'];
  *   webview.nav   {op:'back'|'forward'|'reload'|'go', url?}
  *   webview.hide / webview.show {top?,bottom?}  — keep state, reveal/cover the page beneath (show re-insets)
  *   webview.close                               — tear down; emits `webview.closed`
+ *   webview.cookies {cookies: Cookie[]}         — write cookies into the overlay's (persistent) jar; resolves {set}
+ *                                                 once all are stored (Bare Remote's opt-in "sign in like the Mac")
  * Events: `webview.state` {url,title,canGoBack,canGoForward,loading} on every navigation change.
  *
  * Swipe back/forward on, target=_blank/window.open loads in place (shared ios-ui-delegate), keyboard +
@@ -26,6 +28,14 @@ const KVO_KEYS = ['URL', 'title', 'canGoBack', 'canGoForward', 'loading'];
  * WebView's box (re-applied when it re-lays out), cookies via the process-wide CookieManager (persistent),
  * getUserMedia via the shared permission handler, _blank in place (no multiple-window support).
  */
+/** A cookie as data (Bare's desktop `remote.cookies` shape); `expires` = unix seconds, absent = session cookie. */
+type Cookie = { name: string; value: string; domain: string; path?: string; secure?: boolean; httpOnly?: boolean; expires?: number | null; sameSite?: string | null };
+const cookieList = (p: { cookies?: Cookie[] } | null): Cookie[] => {
+  const l = p?.cookies;
+  if (!Array.isArray(l)) throw err('NATIVE_ERROR', 'webview.cookies: cookies[] required');
+  return l.filter((c) => c && c.name && c.domain);
+};
+
 export function registerWebViewHandlers(): void {
   if (isIOS) registerIos();
   else if (isAndroid) registerAndroid();
@@ -160,6 +170,31 @@ function registerIos(): void {
     return { open: !!wv };
   }));
   bridge.register('webview.close', () => onMain(() => { destroy(); }));
+
+  bridge.register('webview.cookies', (p: { cookies?: Cookie[] } | null) => {
+    const list = cookieList(p);
+    return onMain(() => new Promise<{ set: number }>((resolve) => {
+      const jar = WKWebsiteDataStore.defaultDataStore().httpCookieStore;
+      let left = list.length, set = 0;
+      const done = () => { if (--left <= 0) resolve({ set }); };
+      if (!left) return resolve({ set });
+      for (const c of list) {
+        const props = NSMutableDictionary.new<string, any>();
+        props.setObjectForKey(c.name, NSHTTPCookieName);
+        props.setObjectForKey(c.value ?? '', NSHTTPCookieValue);
+        props.setObjectForKey(c.domain, NSHTTPCookieDomain);
+        props.setObjectForKey(c.path || '/', NSHTTPCookiePath);
+        if (c.secure) props.setObjectForKey('TRUE', NSHTTPCookieSecure);
+        if (c.httpOnly) props.setObjectForKey('TRUE', 'HttpOnly'); // no public constant; the key CFNetwork reads
+        if (c.expires) props.setObjectForKey(NSDate.dateWithTimeIntervalSince1970(c.expires), NSHTTPCookieExpires);
+        if (c.sameSite === 'lax') props.setObjectForKey(NSHTTPCookieSameSiteLax, NSHTTPCookieSameSitePolicy);
+        else if (c.sameSite === 'strict') props.setObjectForKey(NSHTTPCookieSameSiteStrict, NSHTTPCookieSameSitePolicy);
+        const cookie = NSHTTPCookie.cookieWithProperties(props);
+        if (!cookie) { console.warn(`[webview] cookie skipped (invalid): ${c.name} @ ${c.domain}`); done(); continue; }
+        jar.setCookieCompletionHandler(cookie, () => { set++; done(); });
+      }
+    }));
+  });
 }
 
 function registerAndroid(): void {
@@ -302,4 +337,23 @@ function registerAndroid(): void {
     return { open: !!wv };
   }));
   bridge.register('webview.close', () => onMain(() => { destroy(); }));
+
+  bridge.register('webview.cookies', (p: { cookies?: Cookie[] } | null) => {
+    const list = cookieList(p);
+    return onMain(() => new Promise<{ set: number }>((resolve) => {
+      const cm = android.webkit.CookieManager.getInstance();
+      let left = list.length, set = 0;
+      const done = () => { if (--left <= 0) { cm.flush(); resolve({ set }); } };
+      if (!left) return resolve({ set });
+      for (const c of list) {
+        const path = c.path || '/', host = c.domain.replace(/^\./, '');
+        const attrs = [`${c.name}=${c.value ?? ''}`, ...(c.domain.startsWith('.') ? [`Domain=${c.domain}`] : []), `Path=${path}`,
+          ...(c.secure ? ['Secure'] : []), ...(c.httpOnly ? ['HttpOnly'] : []),
+          ...(c.expires ? [`Expires=${new Date(c.expires * 1000).toUTCString()}`] : []),
+          ...(c.sameSite ? [`SameSite=${c.sameSite}`] : [])];
+        cm.setCookie(`${c.secure ? 'https' : 'http'}://${host}${path}`, attrs.join('; '),
+          new android.webkit.ValueCallback<java.lang.Boolean>({ onReceiveValue: (ok) => { if (ok) set++; done(); } }));
+      }
+    }));
+  });
 }

package/runtime/app/shell/keyboard.ts

@@ -205,22 +205,33 @@ function armIosKeyboardObservers(): void {
   armScrollClamp();
 }
 
+/** The page's colour where the keyboard meets it: the first opaque background up from the element at the
+ *  bottom-centre (then body/html). A transparent body (rgba(0,0,0,0)) must not read as black. */
+const BOTTOM_BG_JS = `(() => {
+  const op = (c) => c && !/^rgba\\(.*,\\s*0\\)$/.test(c) && c !== 'transparent';
+  for (let e = document.elementFromPoint(innerWidth / 2, innerHeight - 2); e; e = e.parentElement) { const c = getComputedStyle(e).backgroundColor; if (op(c)) return c; }
+  for (const e of [document.body, document.documentElement]) { const c = e && getComputedStyle(e).backgroundColor; if (op(c)) return c; }
+  return '';
+})()`;
+
 /**
- * Sample the page's background color once per keyboard-show and paint the webview + its window with
+ * Sample the page's bottom background color once per keyboard-show and paint the webview + its window with
  * it (Capacitor's autoBackdropColor) so there are no white flashes during the resize.
  */
 function syncBackdropColor(): void {
   try {
     const wk = bridge.getWebView()?.ios as WKWebView | undefined;
     if (!wk) return;
-    wk.evaluateJavaScriptCompletionHandler('window.getComputedStyle(document.body).backgroundColor', (result: any) => {
+    wk.evaluateJavaScriptCompletionHandler(BOTTOM_BG_JS, (result: any) => {
       const m = /rgba?\(\s*(\d+)[,\s]+(\d+)[,\s]+(\d+)/.exec(String(result ?? ''));
       if (!m) return;
       Utils.dispatchToMainThread(() => {
         const w = bridge.getWebView()?.ios as WKWebView | undefined;
         if (!w) return;
         const color = UIColor.colorWithRedGreenBlueAlpha(+m[1] / 255, +m[2] / 255, +m[3] / 255, 1);
-        w.backgroundColor = color;
+        // The keyboard's rounded corners (iOS 26) show whatever native view is behind the webview — paint
+        // the whole chain up to the window, not only the webview + window (a dark host view showed through).
+        for (let v: UIView | null = w; v; v = v.superview) v.backgroundColor = color;
         if (w.window) w.window.backgroundColor = color;
         if (SHELL_CONFIG.debug) appwrapNativeLog(`[native:keyboard] backdrop ← rgb(${m[1]},${m[2]},${m[3]})`);
       });