@livx.cc/appwrap 0.28.0 → 0.28.2

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

@@ -2,8 +2,6 @@ import { Utils, isAndroid, isIOS } from '@nativescript/core';
 import { bridge } from './bridge';
 import { startActivityForResult } from './android-helpers';
 
-declare const android: any, java: any;
-
 const err = (code: string, message: string) => Object.assign(new Error(message), { code });
 
 type Dir = 'documents' | 'data' | 'cache';
@@ -152,6 +150,46 @@ function iosStat(full: string, name: string): any {
   };
 }
 
+/**
+ * Delegate for UIDocumentPickerViewController. Captures the resolve callback as an instance field
+ * (the original closed over `resolve`); both selectors funnel into it.
+ */
+@NativeClass()
+class DocumentPickerDelegate extends NSObject implements UIDocumentPickerDelegate {
+  static ObjCProtocols = [UIDocumentPickerDelegate];
+  onPick!: (out: any[]) => void;
+
+  static new(): DocumentPickerDelegate {
+    return <DocumentPickerDelegate>super.new();
+  }
+
+  documentPickerDidPickDocumentsAtURLs(_controller: UIDocumentPickerViewController, urls: NSArray<NSURL>): void {
+    const out: any[] = [];
+    for (let i = 0; i < urls.count; i++) {
+      const url = urls.objectAtIndex(i);
+      const scoped = url.startAccessingSecurityScopedResource?.();
+      try {
+        const data = NSData.dataWithContentsOfURL(url);
+        if (data) {
+          out.push({
+            name: url.lastPathComponent,
+            mimeType: mimeForUrlIos(url),
+            size: data.length,
+            base64: data.base64EncodedStringWithOptions(0 as unknown as NSDataBase64EncodingOptions),
+          });
+        }
+      } finally {
+        if (scoped) url.stopAccessingSecurityScopedResource?.();
+      }
+    }
+    this.onPick(out);
+  }
+
+  documentPickerWasCancelled(_controller: UIDocumentPickerViewController): void {
+    this.onPick([]);
+  }
+}
+
 /**
  * iOS document picker via UIDocumentPickerViewController. Reads each chosen URL's bytes (under a
  * security-scoped access window) and returns them base64-inline. DEVICE-GATED — the delegate
@@ -163,6 +201,7 @@ function pickFileIos(types: string[] | undefined, multiple: boolean): Promise<an
       try {
         const utis = NSMutableArray.new();
         // Map common MIME/extension hints to UTTypes; default to "any item".
+        // interop: UTType/UTTypeItem live in UniformTypeIdentifiers, not referenced by references.d.ts.
         (types ?? []).forEach((t) => {
           const ut = (UTType as any).typeWithMIMEType?.(t) ?? (UTType as any).typeWithFilenameExtension?.(t.replace(/^\./, ''));
           if (ut) utis.addObject(ut);
@@ -172,37 +211,9 @@ function pickFileIos(types: string[] | undefined, multiple: boolean): Promise<an
         const picker = UIDocumentPickerViewController.alloc().initForOpeningContentTypes(utis as any);
         picker.allowsMultipleSelection = multiple;
 
-        const DelegateClass = (NSObject as any).extend(
-          {
-            documentPickerDidPickDocumentsAtURLs(_p: any, urls: any) {
-              const out: any[] = [];
-              for (let i = 0; i < urls.count; i++) {
-                const url = urls.objectAtIndex(i);
-                const scoped = url.startAccessingSecurityScopedResource?.();
-                try {
-                  const data = NSData.dataWithContentsOfURL(url);
-                  if (data) {
-                    out.push({
-                      name: url.lastPathComponent,
-                      mimeType: mimeForUrlIos(url),
-                      size: data.length,
-                      base64: data.base64EncodedStringWithOptions(0 as unknown as NSDataBase64EncodingOptions),
-                    });
-                  }
-                } finally {
-                  if (scoped) url.stopAccessingSecurityScopedResource?.();
-                }
-              }
-              resolve(out);
-            },
-            documentPickerWasCancelled() {
-              resolve([]);
-            },
-          },
-          { protocols: [UIDocumentPickerDelegate] }
-        );
-        const delegate = DelegateClass.new();
-        (picker as any)._appwrapDelegate = delegate; // retain past the present call
+        const delegate = DocumentPickerDelegate.new();
+        delegate.onPick = resolve;
+        (picker as any)._appwrapDelegate = delegate; // interop: retain delegate past the present call (no typed slot)
         picker.delegate = delegate;
         Utils.ios.getRootViewController().presentViewControllerAnimatedCompletion(picker, true, null);
       } catch (e: any) {
@@ -212,25 +223,26 @@ function pickFileIos(types: string[] | undefined, multiple: boolean): Promise<an
   });
 }
 
-function mimeForUrlIos(url: any): string {
+function mimeForUrlIos(url: NSURL): string {
+  // interop: UTType lives in UniformTypeIdentifiers, not referenced by references.d.ts.
   const ut = (UTType as any).typeWithFilenameExtension?.(url.pathExtension);
   return ut?.preferredMIMEType ?? 'application/octet-stream';
 }
 
 // ───────────────────────────── Android ─────────────────────────────
 
-function androidBaseDir(dir: Dir): any {
+function androidBaseDir(dir: Dir): java.io.File {
   const ctx = Utils.android.getApplicationContext();
   if (dir === 'cache') return ctx.getCacheDir();
   if (dir === 'documents') return ctx.getExternalFilesDir(null) ?? ctx.getFilesDir();
   return ctx.getFilesDir(); // 'data'
 }
 
-function androidFile(path: string, dir: Dir): any {
+function androidFile(path: string, dir: Dir): java.io.File {
   return new java.io.File(androidBaseDir(dir), safeRelPath(path));
 }
 
-function readBytesAndroid(file: any): any {
+function readBytesAndroid(file: java.io.File): androidNative.Array<number> {
   const fis = new java.io.FileInputStream(file);
   const baos = new java.io.ByteArrayOutputStream();
   const buf = Array.create('byte', 8192);
@@ -298,7 +310,7 @@ function registerAndroidFs(): void {
   bridge.register('fs.pickFile', ({ types, multiple }: any) => pickFileAndroid(types, !!multiple));
 }
 
-function writeAndroid(file: any, data: string, encoding: string, append: boolean): void {
+function writeAndroid(file: java.io.File, data: string, encoding: string, append: boolean): void {
   const bytes = encoding === 'base64'
     ? android.util.Base64.decode(String(data ?? ''), android.util.Base64.DEFAULT)
     : new java.lang.String(String(data ?? '')).getBytes('UTF-8');
@@ -307,7 +319,7 @@ function writeAndroid(file: any, data: string, encoding: string, append: boolean
   fos.close();
 }
 
-function androidStat(file: any, name: string): any {
+function androidStat(file: java.io.File, name: string): any {
   const isDir = file.isDirectory();
   return {
     name,
@@ -338,7 +350,7 @@ async function pickFileAndroid(types: string[] | undefined, multiple: boolean):
   const { resultCode, intent: result } = await startActivityForResult(intent);
   if (resultCode !== android.app.Activity.RESULT_OK || !result) return [];
 
-  const uris: any[] = [];
+  const uris: android.net.Uri[] = [];
   const clip = result.getClipData?.();
   if (clip) for (let i = 0; i < clip.getItemCount(); i++) uris.push(clip.getItemAt(i).getUri());
   else if (result.getData()) uris.push(result.getData());
@@ -361,7 +373,7 @@ async function pickFileAndroid(types: string[] | undefined, multiple: boolean):
   });
 }
 
-function queryDisplayName(cr: any, uri: any): string {
+function queryDisplayName(cr: android.content.ContentResolver, uri: android.net.Uri): string {
   const cursor = cr.query(uri, [android.provider.OpenableColumns.DISPLAY_NAME], null, null, null);
   let name = 'file';
   if (cursor) {

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

@@ -2,9 +2,7 @@ import { Utils, isAndroid, isIOS } from '@nativescript/core';
 import { bridge } from './bridge';
 import { requestPermissions, startActivityForResult } from './android-helpers';
 
-declare const android: any;
-declare const cc: any; // generated from the HealthConnectBridge.kt shim (overrides/)
-declare const CMPedometer: any; // CoreMotion (already linked via CMMotionManager in handlers-parity)
+declare const cc: any; // no NS types: generated Kotlin HealthConnectBridge (HealthConnectBridge.kt shim, overrides/)
 
 const err = (code: string, message: string) => Object.assign(new Error(message), { code });
 
@@ -39,7 +37,8 @@ function registerIos(): void {
     new Promise((resolve) => {
       if (!HKHealthStore.isHealthDataAvailable()) { resolve(false); return; }
       const readSet = NSSet.setWithObject(stepType);
-      store.requestAuthorizationToShareTypesReadTypesCompletion(null, readSet, (ok: boolean, e: any) => {
+      // null typesToShare (read-only request) — SDK types the param as a non-nullable NSSet.
+      store.requestAuthorizationToShareTypesReadTypesCompletion(null as any, readSet, (ok: boolean, e: NSError) => {
         Utils.dispatchToMainThread(() => resolve(!!ok && !e));
       });
     })
@@ -54,9 +53,12 @@ function registerIos(): void {
   // WKWebView response delivery (evaluateJavaScript) is main-thread.
   bridge.register('health.count', () =>
     new Promise((resolve, reject) => {
-      const predicate = HKQuery.predicateForSamplesWithStartDateEndDateOptions(startOfToday(), NSDate.date(), 0);
+      // NS marshals NSDate→the SDK's `Date` param type; options 0 = HKQueryOptions.None.
+      const predicate = HKQuery.predicateForSamplesWithStartDateEndDateOptions(
+        startOfToday() as unknown as Date, NSDate.date() as unknown as Date, HKQueryOptions.None
+      );
       const q = HKStatisticsQuery.alloc().initWithQuantityTypeQuantitySamplePredicateOptionsCompletionHandler(
-        stepType, predicate, HKStatisticsOptions.CumulativeSum, (_q: any, stats: any, e: any) => {
+        stepType, predicate, HKStatisticsOptions.CumulativeSum, (_q: HKStatisticsQuery, stats: HKStatistics, e: NSError) => {
           Utils.dispatchToMainThread(() => {
             if (e) { reject(err('NATIVE_ERROR', e.localizedDescription ?? 'health query failed')); return; }
             const sum = stats && stats.sumQuantity ? stats.sumQuantity() : null;
@@ -72,17 +74,19 @@ function registerIos(): void {
   // aggregate. Caller uses HealthKit as the periodic source-of-truth and these live deltas in between.
   // Emits `health.liveStep` { steps } (today's pedometer total since local midnight). iPhone-only
   // (no Watch), which is fine: it's the live driver; HealthKit re-anchors the authoritative total.
-  let pedometer: any = null;
+  let pedometer: CMPedometer | null = null;
   let anchorDay = -1; // local day-of-month the current stream is anchored to (for midnight re-anchor)
   const localDay = () => new Date().getDate();
   const startStream = () => {
+    if (!pedometer) return;
     anchorDay = localDay();
-    pedometer.startPedometerUpdatesFromDateWithHandler(startOfToday(), (data: any, e: any) => {
+    // startOfToday() returns an NSDate; the SDK types `start` as JS Date but NativeScript marshals it.
+    pedometer.startPedometerUpdatesFromDateWithHandler(startOfToday() as unknown as Date, (data: CMPedometerData, e: NSError) => {
       if (e || !data) return;
       // Midnight self-heal: CMPedometer counts since the FIXED anchor date, so after local midnight
       // numberOfSteps still includes yesterday. When the day rolls over, restart from the new
       // midnight (re-anchors to 0) so the live count stays "today only".
-      if (localDay() !== anchorDay) { Utils.dispatchToMainThread(() => { pedometer.stopPedometerUpdates(); startStream(); bridge.emit('health.liveStep', { steps: 0 }); }); return; }
+      if (localDay() !== anchorDay) { Utils.dispatchToMainThread(() => { pedometer?.stopPedometerUpdates(); startStream(); bridge.emit('health.liveStep', { steps: 0 }); }); return; }
       const steps = Math.round(num(data.numberOfSteps));
       Utils.dispatchToMainThread(() => bridge.emit('health.liveStep', { steps }));
     });
@@ -91,9 +95,12 @@ function registerIos(): void {
     if (typeof CMPedometer === 'undefined' || !CMPedometer.isStepCountingAvailable())
       throw err('UNSUPPORTED', 'Pedometer (live step counting) unavailable on this device');
     // Motion & Fitness denied/restricted → surface it so the caller can fall back to HealthKit instead
-    // of silently receiving no events. (2 = denied, 1 = restricted per CMAuthorizationStatus.)
-    const auth = typeof CMPedometer.authorizationStatus === 'function' ? CMPedometer.authorizationStatus() : 0;
-    if (auth === 2 || auth === 1) throw err('DENIED', 'Motion & Fitness access is off for live step counting');
+    // of silently receiving no events.
+    const auth = typeof CMPedometer.authorizationStatus === 'function'
+      ? CMPedometer.authorizationStatus()
+      : CMAuthorizationStatus.NotDetermined;
+    if (auth === CMAuthorizationStatus.Denied || auth === CMAuthorizationStatus.Restricted)
+      throw err('DENIED', 'Motion & Fitness access is off for live step counting');
     if (pedometer) return; // already streaming
     pedometer = CMPedometer.new();
     startStream();
@@ -117,29 +124,30 @@ function registerAndroid(): void {
   };
 
   // ── sensor fallback (TYPE_STEP_COUNTER) — when Health Connect isn't available ──
-  let sensorManager: any = null;
-  let listener: any = null;
+  let sensorManager: android.hardware.SensorManager | null = null;
+  let listener: android.hardware.SensorEventListener | null = null;
   let baseline: number | null = null;
   let latest: number | null = null;
   let registered = false;
   const ensureSensor = () => {
-    if (!sensorManager) sensorManager = ctx().getSystemService(android.content.Context.SENSOR_SERVICE);
+    // getSystemService is typed `any` by the SDK; narrow to the concrete manager.
+    if (!sensorManager) sensorManager = ctx().getSystemService(android.content.Context.SENSOR_SERVICE) as android.hardware.SensorManager;
   };
   const stopSensor = () => {
-    if (registered) { sensorManager.unregisterListener(listener); registered = false; }
+    if (registered && sensorManager && listener) { sensorManager.unregisterListener(listener); registered = false; }
   };
   const startSensor = () => {
     ensureSensor();
-    const sensor = sensorManager.getDefaultSensor(android.hardware.Sensor.TYPE_STEP_COUNTER);
+    const sensor = sensorManager!.getDefaultSensor(android.hardware.Sensor.TYPE_STEP_COUNTER);
     if (!sensor) throw err('UNSUPPORTED', 'No step-counter sensor on this device');
     stopSensor();
     baseline = null;
     latest = null;
     listener = new android.hardware.SensorEventListener({
-      onSensorChanged: (ev: any) => { const v = num(ev.values[0]); latest = v; if (baseline == null) baseline = v; },
+      onSensorChanged: (ev: android.hardware.SensorEvent) => { const v = num(ev.values[0]); latest = v; if (baseline == null) baseline = v; },
       onAccuracyChanged: () => {},
     });
-    sensorManager.registerListener(listener, sensor, android.hardware.SensorManager.SENSOR_DELAY_NORMAL);
+    sensorManager!.registerListener(listener, sensor, android.hardware.SensorManager.SENSOR_DELAY_NORMAL);
     registered = true;
   };
   const sensorCount = () => ({ steps: baseline != null && latest != null ? Math.max(0, Math.round(latest - baseline)) : 0 });

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

@@ -1,30 +1,22 @@
 import { Utils, isIOS } from '@nativescript/core';
 import { bridge } from './bridge';
 
-// AVAudioSession globals (NS resolves these from the AVFoundation metadata at runtime).
-declare const AVAudioSession: any;
-declare const AVAudioSessionCategoryPlayAndRecord: string;
-declare const AVAudioSessionPortBuiltInReceiver: string;
-declare const AVAudioSessionRouteChangeNotification: string;
-declare const AVAudioSessionPortOverride: any;
-declare const NSNotificationCenter: any;
-
 let routeObserverArmed = false;
 
 /** List the current output port types (e.g. "Receiver", "Speaker", "BluetoothA2DP"). */
-function outputPortTypes(session: any): string[] {
+function outputPortTypes(session: AVAudioSession): string[] {
   const outputs = session.currentRoute?.outputs;
   const types: string[] = [];
   for (let i = 0; i < (outputs?.count ?? 0); i++) types.push(String(outputs.objectAtIndex(i).portType));
   return types;
 }
 
-function isOnBuiltInReceiver(session: any): boolean {
+function isOnBuiltInReceiver(session: AVAudioSession): boolean {
   return outputPortTypes(session).indexOf(AVAudioSessionPortBuiltInReceiver) !== -1;
 }
 
 /** Whether the session can record (PlayAndRecord) — i.e. we're (or about to be) in a call. */
-function isRecordCategory(session: any): boolean {
+function isRecordCategory(session: AVAudioSession): boolean {
   return String(session.category) === String(AVAudioSessionCategoryPlayAndRecord);
 }
 
@@ -33,7 +25,7 @@ function forceSpeakerIfReceiverDuringCall(): void {
   const session = AVAudioSession.sharedInstance();
   if (!isRecordCategory(session) || !isOnBuiltInReceiver(session)) return; // not a call, or already speaker/headset/BT
   try {
-    session.overrideOutputAudioPortError(AVAudioSessionPortOverride.Speaker, null);
+    session.overrideOutputAudioPortError(AVAudioSessionPortOverride.Speaker);
   } catch {
     /* benign — route may have changed again under us */
   }
@@ -60,6 +52,7 @@ function observeAudioRouteForSpeaker(): void {
  */
 export function registerMediaHandlers(): void {
   // DIAGNOSTIC: surface the WKWebView UIDelegate status to the page (on-screen log).
+  // no NS types: __appwrapWebviewDiag is an ad-hoc diagnostic stashed on global by the WKWebView UIDelegate.
   bridge.register('debug.webviewInfo', () => ({ diag: (global as any).__appwrapWebviewDiag ?? 'n/a (android/web)' }));
 
   // Auto loudspeaker for in-WebView WebRTC calls. When getUserMedia is live, WebKit drives the
@@ -120,7 +113,8 @@ export function registerMediaHandlers(): void {
     } else {
       category = AVAudioSessionCategoryPlayback; // ignores the silent switch
     }
-    session.setCategoryModeOptionsError(category, avMode, options as any, null as any);
-    session.setActiveError(true, null as any);
+    // options is an OR-combined flag mask; the bitwise result widens to number, so cast back to the enum.
+    session.setCategoryModeOptionsError(category, avMode, options as AVAudioSessionCategoryOptions);
+    session.setActiveError(true);
   });
 }

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

@@ -2,17 +2,28 @@ import { Application, Utils, isAndroid, isIOS } from '@nativescript/core';
 import { bridge } from './bridge';
 import { setDeepLinkInterceptor } from './events';
 
-// AuthenticationServices globals (NS auto-links the framework via metadata when referenced).
-declare const ASWebAuthenticationSession: any;
-declare const ASWebAuthenticationPresentationContextProviding: any;
-declare const android: any, androidx: any;
+declare const androidx: any; // no NS types: androidx
 
 const err = (code: string, message: string) => Object.assign(new Error(message), { code });
 
 // Keep strong refs while the sheet is up — ARC frees the session + its context provider the moment
 // the JS locals fall out of scope, which silently cancels the flow mid-handshake.
-let activeSession: any = null;
-let activeProvider: any = null;
+let activeSession: ASWebAuthenticationSession | null = null;
+let activeProvider: ASWebAuthenticationPresentationContextProviding | null = null;
+
+@NativeClass()
+class OAuthPresentationContextProvider extends NSObject implements ASWebAuthenticationPresentationContextProviding {
+  static ObjCProtocols = [ASWebAuthenticationPresentationContextProviding];
+  static new(): OAuthPresentationContextProvider {
+    return <OAuthPresentationContextProvider>super.new();
+  }
+  presentationAnchorForWebAuthenticationSession(_session: ASWebAuthenticationSession): UIWindow {
+    return (
+      Utils.ios.getRootViewController()?.view?.window ??
+      UIApplication.sharedApplication.keyWindow
+    );
+  }
+}
 
 /**
  * System-browser OAuth (iOS ASWebAuthenticationSession). Runs the provider's auth page in the
@@ -37,7 +48,7 @@ export function registerOAuthHandlers(): void {
           const session = ASWebAuthenticationSession.alloc().initWithURLCallbackURLSchemeCompletionHandler(
             NSURL.URLWithString(target),
             scheme,
-            (callbackURL: any, error: any) => {
+            (callbackURL: NSURL, error: NSError) => {
               activeSession = null;
               activeProvider = null;
               if (error) {
@@ -50,18 +61,7 @@ export function registerOAuthHandlers(): void {
             }
           );
 
-          const ProviderClass = (NSObject as any).extend(
-            {
-              presentationAnchorForWebAuthenticationSession(_session: any): any {
-                return (
-                  Utils.ios.getRootViewController()?.view?.window ??
-                  UIApplication.sharedApplication.keyWindow
-                );
-              },
-            },
-            { protocols: [ASWebAuthenticationPresentationContextProviding] }
-          );
-          activeProvider = ProviderClass.new();
+          activeProvider = OAuthPresentationContextProvider.new();
           session.presentationContextProvider = activeProvider;
           session.prefersEphemeralWebBrowserSession = !!ephemeral;
           activeSession = session;