@livx.cc/appwrap 0.39.4 → 0.39.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livx.cc/appwrap",
-  "version": "0.39.4",
+  "version": "0.39.8",
   "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_Resources/Android/src/main/res/values-v29/styles.xml

@@ -10,6 +10,10 @@
             but the way the app is converted may lead to visual issues 
         -->
         <item name="android:forceDarkAllowed">false</item>
+
+        <!-- Draw into the display cutout/notch region so the app can be genuinely edge-to-edge
+             (paired with runtime enableEdgeToEdge + the edgeToEdge config's WebView un-boxing). -->
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
 
     <style name="AppTheme" parent="AppThemeBase29">

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

@@ -272,8 +272,11 @@ export function registerAndroidHandlers(): void {
       onSensorChanged(event: android.hardware.SensorEvent) {
         const v = event.values;
         if (event.sensor.getType() === android.hardware.Sensor.TYPE_ACCELEROMETER) {
-          // Android accelerometer already reports m/s² incl. gravity — kit contract matches.
-          lastMotion.ax = v[0]; lastMotion.ay = v[1]; lastMotion.az = v[2];
+          // NEGATE to match the kit/iOS convention: iOS CoreMotion delivers the gravity-DIRECTION
+          // vector (rest az ≈ -9.81), whereas Android's accelerometer reports the REACTION force
+          // (rest az ≈ +9.81) — the exact negation. Without this, gravity-vector tilt is inverted
+          // on every axis vs iOS (confirmed on-device: steering reversed). m/s² units already match.
+          lastMotion.ax = -v[0]; lastMotion.ay = -v[1]; lastMotion.az = -v[2];
         } else {
           lastMotion.rx = v[0]; lastMotion.ry = v[1]; lastMotion.rz = v[2];
         }
@@ -283,10 +286,14 @@ export function registerAndroidHandlers(): void {
         bridge.emit('motion.data', { ...lastMotion });
       },
     });
-    const RATE = hz > 30 ? android.hardware.SensorManager.SENSOR_DELAY_FASTEST
-                         : android.hardware.SensorManager.SENSOR_DELAY_GAME;
-    sm.registerListener(motionListener, accel, RATE);
-    if (gyro) sm.registerListener(motionListener, gyro, RATE);
+    // Register at the REQUESTED rate as an explicit sampling period (µs), NOT SENSOR_DELAY_FASTEST:
+    // on Android 12+ (API 31) any rate faster than 200 Hz — including FASTEST (0 µs) — throws
+    // SecurityException unless the app declares HIGH_SAMPLING_RATE_SENSORS. Our hz is capped at 60
+    // (≈16.7 ms), comfortably under 200 Hz, so a plain period needs no extra permission. Floor at
+    // 5 ms (200 Hz) to stay below that threshold even if the cap ever rises.
+    const periodUs = Math.max(5000, Math.round(1_000_000 / hz));
+    sm.registerListener(motionListener, accel, periodUs);
+    if (gyro) sm.registerListener(motionListener, gyro, periodUs);
   });
 
   bridge.register('motion.stop', () => {

package/runtime/app/shell/handlers-apple-signin.ts

@@ -8,22 +8,8 @@ const err = (code: string, message: string) => Object.assign(new Error(message),
 // provider the moment the JS locals fall out of scope, which silently cancels the flow mid-handshake
 // (same lesson as handlers-oauth.ts `activeSession`/`activeProvider`).
 let activeController: ASAuthorizationController | null = null;
-let activeDelegate: AppleSignInDelegate | null = null;
-let activeProvider: AppleSignInContextProvider | null = null;
-
-@NativeClass()
-class AppleSignInContextProvider extends NSObject implements ASAuthorizationControllerPresentationContextProviding {
-  static ObjCProtocols = [ASAuthorizationControllerPresentationContextProviding];
-  static new(): AppleSignInContextProvider {
-    return <AppleSignInContextProvider>super.new();
-  }
-  presentationAnchorForAuthorizationController(_controller: ASAuthorizationController): UIWindow {
-    return (
-      Utils.ios.getRootViewController()?.view?.window ??
-      UIApplication.sharedApplication.keyWindow
-    );
-  }
-}
+let activeDelegate: any = null;
+let activeProvider: any = null;
 
 /** Decode an Apple-returned NSData JWT/code blob into a UTF-8 string (identityToken/authorizationCode). */
 function dataToUtf8(data: NSData | null): string | undefined {
@@ -32,61 +18,86 @@ function dataToUtf8(data: NSData | null): string | undefined {
   return s ? String(s) : undefined;
 }
 
-@NativeClass()
-class AppleSignInDelegate extends NSObject implements ASAuthorizationControllerDelegate {
-  static ObjCProtocols = [ASAuthorizationControllerDelegate];
-  // Per-call settlement (set right after `.new()`). The shared `settle` clears the ARC refs + recovers
-  // the WebView before resolving/rejecting, so it runs exactly once per flow.
-  rawNonce = '';
-  settle!: (fn: () => void) => void;
-  resolve!: (v: unknown) => void;
-  reject!: (e: unknown) => void;
-  static new(): AppleSignInDelegate {
-    return <AppleSignInDelegate>super.new();
-  }
+// iOS-only native delegates. Defined lazily inside an isIOS-gated factory (mirrors banner.ts) so the
+// shared module can instantiate on Android — NSObject/AS* are iOS globals, and a top-level
+// `extends NSObject` would evaluate at ES-module load and crash the Android shell.
+// any: module-level holders for runtime-built ObjC subclasses; each class BODY stays fully typed.
+let AppleSignInContextProvider: any, AppleSignInDelegate: any;
+function ensureIosDelegates(): void {
+  if (!isIOS || AppleSignInDelegate) return;
 
-  authorizationControllerDidCompleteWithAuthorization(
-    _controller: ASAuthorizationController,
-    authorization: ASAuthorization
-  ): void {
-    const cred = authorization.credential as ASAuthorizationAppleIDCredential;
-    const identityToken = dataToUtf8(cred.identityToken ?? null);
-    if (!identityToken) {
-      this.settle(() => this.reject(err('NATIVE_ERROR', 'appleSignIn: Apple returned no identityToken')));
-      return;
+  @NativeClass()
+  class AppleSignInContextProviderImpl extends NSObject implements ASAuthorizationControllerPresentationContextProviding {
+    static ObjCProtocols = [ASAuthorizationControllerPresentationContextProviding];
+    static new(): AppleSignInContextProviderImpl {
+      return <AppleSignInContextProviderImpl>super.new();
     }
-    const authorizationCode = dataToUtf8(cred.authorizationCode ?? null);
-
-    // First-authorization-only profile. Apple omits name/email on subsequent sign-ins per Apple ID.
-    let name: { givenName?: string; familyName?: string; displayName?: string } | undefined;
-    if (cred.fullName) {
-      const givenName = cred.fullName.givenName || undefined;
-      const familyName = cred.fullName.familyName || undefined;
-      // OS-composed display name (locale-aware) — convenience; the consumer can also build its own.
-      const composed = NSPersonNameComponentsFormatter.localizedStringFromPersonNameComponentsStyleOptions(
-        cred.fullName,
-        NSPersonNameComponentsFormatterStyle.Default,
-        0 as NSPersonNameComponentsFormatterOptions
+    presentationAnchorForAuthorizationController(_controller: ASAuthorizationController): UIWindow {
+      return (
+        Utils.ios.getRootViewController()?.view?.window ??
+        UIApplication.sharedApplication.keyWindow
       );
-      const displayName = (composed && String(composed)) || undefined;
-      if (givenName || familyName || displayName) name = { givenName, familyName, displayName };
     }
-    const email = cred.email || undefined;
-    const user = name || email ? { ...(name ? { name } : {}), ...(email ? { email } : {}) } : undefined;
-
-    this.settle(() =>
-      this.resolve({ identityToken, authorizationCode, nonce: this.rawNonce, ...(user ? { user } : {}) })
-    );
   }
+  AppleSignInContextProvider = AppleSignInContextProviderImpl;
+
+  @NativeClass()
+  class AppleSignInDelegateImpl extends NSObject implements ASAuthorizationControllerDelegate {
+    static ObjCProtocols = [ASAuthorizationControllerDelegate];
+    // Per-call settlement (set right after `.new()`). The shared `settle` clears the ARC refs + recovers
+    // the WebView before resolving/rejecting, so it runs exactly once per flow.
+    rawNonce = '';
+    settle!: (fn: () => void) => void;
+    resolve!: (v: unknown) => void;
+    reject!: (e: unknown) => void;
+    static new(): AppleSignInDelegateImpl {
+      return <AppleSignInDelegateImpl>super.new();
+    }
+
+    authorizationControllerDidCompleteWithAuthorization(
+      _controller: ASAuthorizationController,
+      authorization: ASAuthorization
+    ): void {
+      const cred = authorization.credential as ASAuthorizationAppleIDCredential;
+      const identityToken = dataToUtf8(cred.identityToken ?? null);
+      if (!identityToken) {
+        this.settle(() => this.reject(err('NATIVE_ERROR', 'appleSignIn: Apple returned no identityToken')));
+        return;
+      }
+      const authorizationCode = dataToUtf8(cred.authorizationCode ?? null);
+
+      // First-authorization-only profile. Apple omits name/email on subsequent sign-ins per Apple ID.
+      let name: { givenName?: string; familyName?: string; displayName?: string } | undefined;
+      if (cred.fullName) {
+        const givenName = cred.fullName.givenName || undefined;
+        const familyName = cred.fullName.familyName || undefined;
+        // OS-composed display name (locale-aware) — convenience; the consumer can also build its own.
+        const composed = NSPersonNameComponentsFormatter.localizedStringFromPersonNameComponentsStyleOptions(
+          cred.fullName,
+          NSPersonNameComponentsFormatterStyle.Default,
+          0 as NSPersonNameComponentsFormatterOptions
+        );
+        const displayName = (composed && String(composed)) || undefined;
+        if (givenName || familyName || displayName) name = { givenName, familyName, displayName };
+      }
+      const email = cred.email || undefined;
+      const user = name || email ? { ...(name ? { name } : {}), ...(email ? { email } : {}) } : undefined;
+
+      this.settle(() =>
+        this.resolve({ identityToken, authorizationCode, nonce: this.rawNonce, ...(user ? { user } : {}) })
+      );
+    }
 
-  authorizationControllerDidCompleteWithError(_controller: ASAuthorizationController, error: NSError): void {
-    // ASAuthorizationError.Canceled === 1001 (user dismissed the sheet) → resolve cancelled, never throw.
-    if (error.code === ASAuthorizationError.Canceled) {
-      this.settle(() => this.resolve({ cancelled: true }));
-      return;
+    authorizationControllerDidCompleteWithError(_controller: ASAuthorizationController, error: NSError): void {
+      // ASAuthorizationError.Canceled === 1001 (user dismissed the sheet) → resolve cancelled, never throw.
+      if (error.code === ASAuthorizationError.Canceled) {
+        this.settle(() => this.resolve({ cancelled: true }));
+        return;
+      }
+      this.settle(() => this.reject(err('NATIVE_ERROR', error.localizedDescription ?? 'appleSignIn failed')));
     }
-    this.settle(() => this.reject(err('NATIVE_ERROR', error.localizedDescription ?? 'appleSignIn failed')));
   }
+  AppleSignInDelegate = AppleSignInDelegateImpl;
 }
 
 /**
@@ -112,6 +123,7 @@ class AppleSignInDelegate extends NSObject implements ASAuthorizationControllerD
  */
 export function registerAppleSignInHandlers(): void {
   if (!isIOS) return;
+  ensureIosDelegates();
 
   bridge.register(
     'appleSignIn.signIn',

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

@@ -60,88 +60,99 @@ function receiptFor(productId: string, transactionId?: string) {
 // In-flight resolvers, keyed so the single queue observer can route callbacks.
 const purchaseWaiters = new Map<string, { resolve: (r: any) => void; reject: (e: any) => void }>();
 let restoreWaiter: { receipts: any[]; resolve: (r: any[]) => void; reject: (e: any) => void } | null = null;
-const productRequests = new Set<{ request: SKProductsRequest; delegate: ProductsDelegate }>(); // keep strong refs to in-flight requests + delegates
-let observer: PaymentObserver | null = null;
-
-// SKPaymentQueue transaction observer. State (purchaseWaiters/restoreWaiter) lives at module
-// scope, so the delegate needs no instance fields.
-@NativeClass()
-class PaymentObserver extends NSObject implements SKPaymentTransactionObserver {
-  static ObjCProtocols = [SKPaymentTransactionObserver];
-  static new(): PaymentObserver {
-    return <PaymentObserver>super.new();
-  }
-  paymentQueueUpdatedTransactions(queue: SKPaymentQueue, transactions: NSArray<SKPaymentTransaction>): void {
-    const n = transactions.count;
-    for (let i = 0; i < n; i++) {
-      const t = transactions.objectAtIndex(i);
-      const pid = String(t.payment.productIdentifier);
-      switch (t.transactionState) {
-        case STATE.Purchased: {
-          queue.finishTransaction(t);
-          const r = receiptFor(pid, String(t.transactionIdentifier ?? ''));
-          bridge.emit('billing.transaction', r);
-          purchaseWaiters.get(pid)?.resolve(r);
-          purchaseWaiters.delete(pid);
-          break;
-        }
-        case STATE.Restored: {
-          queue.finishTransaction(t);
-          const r = receiptFor(pid, String(t.transactionIdentifier ?? ''));
-          if (restoreWaiter) restoreWaiter.receipts.push(r);
-          bridge.emit('billing.transaction', r);
-          break;
-        }
-        case STATE.Failed: {
-          queue.finishTransaction(t);
-          const cancelled = t.error && t.error.code === SK_ERR_CANCELLED;
-          const e = err(cancelled ? 'DENIED' : 'NATIVE_ERROR', t.error?.localizedDescription ?? 'Purchase failed');
-          purchaseWaiters.get(pid)?.reject(e);
-          purchaseWaiters.delete(pid);
-          break;
+const productRequests = new Set<{ request: SKProductsRequest; delegate: any }>(); // keep strong refs to in-flight requests + delegates
+let observer: any = null;
+
+// iOS-only StoreKit delegates. Defined lazily inside an isIOS-gated factory (mirrors banner.ts) so the
+// shared module can instantiate on Android — NSObject/SK* are iOS globals, and a top-level
+// `extends NSObject` would evaluate at ES-module load and crash the Android shell.
+// any: module-level holders for runtime-built ObjC subclasses; each class BODY stays fully typed.
+let PaymentObserver: any, ProductsDelegate: any;
+function ensureIosDelegates(): void {
+  if (!isIOS || PaymentObserver) return;
+
+  // SKPaymentQueue transaction observer. State (purchaseWaiters/restoreWaiter) lives at module
+  // scope, so the delegate needs no instance fields.
+  @NativeClass()
+  class PaymentObserverImpl extends NSObject implements SKPaymentTransactionObserver {
+    static ObjCProtocols = [SKPaymentTransactionObserver];
+    static new(): PaymentObserverImpl {
+      return <PaymentObserverImpl>super.new();
+    }
+    paymentQueueUpdatedTransactions(queue: SKPaymentQueue, transactions: NSArray<SKPaymentTransaction>): void {
+      const n = transactions.count;
+      for (let i = 0; i < n; i++) {
+        const t = transactions.objectAtIndex(i);
+        const pid = String(t.payment.productIdentifier);
+        switch (t.transactionState) {
+          case STATE.Purchased: {
+            queue.finishTransaction(t);
+            const r = receiptFor(pid, String(t.transactionIdentifier ?? ''));
+            bridge.emit('billing.transaction', r);
+            purchaseWaiters.get(pid)?.resolve(r);
+            purchaseWaiters.delete(pid);
+            break;
+          }
+          case STATE.Restored: {
+            queue.finishTransaction(t);
+            const r = receiptFor(pid, String(t.transactionIdentifier ?? ''));
+            if (restoreWaiter) restoreWaiter.receipts.push(r);
+            bridge.emit('billing.transaction', r);
+            break;
+          }
+          case STATE.Failed: {
+            queue.finishTransaction(t);
+            const cancelled = t.error && t.error.code === SK_ERR_CANCELLED;
+            const e = err(cancelled ? 'DENIED' : 'NATIVE_ERROR', t.error?.localizedDescription ?? 'Purchase failed');
+            purchaseWaiters.get(pid)?.reject(e);
+            purchaseWaiters.delete(pid);
+            break;
+          }
+          // Purchasing / Deferred: nothing to do.
         }
-        // Purchasing / Deferred: nothing to do.
       }
     }
+    paymentQueueRestoreCompletedTransactionsFinished(_queue: SKPaymentQueue): void {
+      restoreWaiter?.resolve(restoreWaiter.receipts);
+      restoreWaiter = null;
+    }
+    paymentQueueRestoreCompletedTransactionsFailedWithError(_queue: SKPaymentQueue, error: NSError): void {
+      restoreWaiter?.reject(err('NATIVE_ERROR', error?.localizedDescription ?? 'Restore failed'));
+      restoreWaiter = null;
+    }
   }
-  paymentQueueRestoreCompletedTransactionsFinished(_queue: SKPaymentQueue): void {
-    restoreWaiter?.resolve(restoreWaiter.receipts);
-    restoreWaiter = null;
-  }
-  paymentQueueRestoreCompletedTransactionsFailedWithError(_queue: SKPaymentQueue, error: NSError): void {
-    restoreWaiter?.reject(err('NATIVE_ERROR', error?.localizedDescription ?? 'Restore failed'));
-    restoreWaiter = null;
+  PaymentObserver = PaymentObserverImpl;
+
+  // SKProductsRequest delegate. Closure-captured state (resolve/reject + the strong-ref holder)
+  // is held as instance fields, assigned after new().
+  @NativeClass()
+  class ProductsDelegateImpl extends NSObject implements SKProductsRequestDelegate {
+    static ObjCProtocols = [SKProductsRequestDelegate];
+    onResolve?: (products: SKProduct[]) => void;
+    onReject?: (e: Error) => void;
+    holder?: { request: SKProductsRequest; delegate: any };
+    static new(): ProductsDelegateImpl {
+      return <ProductsDelegateImpl>super.new();
+    }
+    productsRequestDidReceiveResponse(_request: SKProductsRequest, response: SKProductsResponse): void {
+      const out: SKProduct[] = [];
+      const products = response.products;
+      for (let i = 0; i < products.count; i++) out.push(products.objectAtIndex(i));
+      if (this.holder) productRequests.delete(this.holder);
+      this.onResolve?.(out);
+    }
+    requestDidFailWithError(_request: SKRequest, error: NSError): void {
+      if (this.holder) productRequests.delete(this.holder);
+      this.onReject?.(err('NATIVE_ERROR', error?.localizedDescription ?? 'Products request failed'));
+    }
   }
+  ProductsDelegate = ProductsDelegateImpl;
 }
 
-function buildObserver(): PaymentObserver {
+function buildObserver(): any {
   return PaymentObserver.new();
 }
 
-// SKProductsRequest delegate. Closure-captured state (resolve/reject + the strong-ref holder)
-// is held as instance fields, assigned after new().
-@NativeClass()
-class ProductsDelegate extends NSObject implements SKProductsRequestDelegate {
-  static ObjCProtocols = [SKProductsRequestDelegate];
-  onResolve?: (products: SKProduct[]) => void;
-  onReject?: (e: Error) => void;
-  holder?: { request: SKProductsRequest; delegate: ProductsDelegate };
-  static new(): ProductsDelegate {
-    return <ProductsDelegate>super.new();
-  }
-  productsRequestDidReceiveResponse(_request: SKProductsRequest, response: SKProductsResponse): void {
-    const out: SKProduct[] = [];
-    const products = response.products;
-    for (let i = 0; i < products.count; i++) out.push(products.objectAtIndex(i));
-    if (this.holder) productRequests.delete(this.holder);
-    this.onResolve?.(out);
-  }
-  requestDidFailWithError(_request: SKRequest, error: NSError): void {
-    if (this.holder) productRequests.delete(this.holder);
-    this.onReject?.(err('NATIVE_ERROR', error?.localizedDescription ?? 'Products request failed'));
-  }
-}
-
 /** One SKProductsRequest → resolves the raw SKProduct objects (used by both products + purchase). */
 function requestSKProducts(ids: string[]): Promise<SKProduct[]> {
   return new Promise((resolve, reject) => {
@@ -161,6 +172,7 @@ function requestSKProducts(ids: string[]): Promise<SKProduct[]> {
 export function registerBillingHandlers(): void {
   if (!isIOS) return; // Android billing is a separate, not-yet-wired handler
 
+  ensureIosDelegates();
   observer = buildObserver();
   SKPaymentQueue.defaultQueue().addTransactionObserver(observer);