@absolutejs/absolute 0.20.0-beta.96 → 0.20.0-beta.98

package/dist/mobile/index.js

@@ -28301,7 +28301,10 @@ var androidManifest2 = `${XML_HEADER2}<manifest xmlns:android="http://schemas.an
 `;
 var androidModule2 = `${HEADER2}package expo.modules.absoluteactivityresultrecovery
 
+import android.app.Activity
+import android.content.Context
 import android.content.Intent
+import android.provider.MediaStore
 import android.util.Log
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
@@ -28317,16 +28320,58 @@ object AbsoluteActivityResultRecoveryState {
   var applicationRuntimeReady = false
 
   private val pendingActivityResults = ArrayDeque<AbsolutePendingActivityResult>()
+  private var pendingCancellations = 0
+
+  private const val preferencesName = "absolutejs.activity-result-recovery"
+  private const val pickerRequestCodeKey = "picker-request-code"
+
+  @Synchronized
+  fun registerPickerRequest(context: Context, requestCode: Int, intent: Intent) {
+    val action = intent.action
+    val isPicker = action == MediaStore.ACTION_IMAGE_CAPTURE ||
+      action == MediaStore.ACTION_VIDEO_CAPTURE ||
+      action == MediaStore.ACTION_PICK_IMAGES ||
+      action == Intent.ACTION_PICK ||
+      action == Intent.ACTION_GET_CONTENT ||
+      action == Intent.ACTION_OPEN_DOCUMENT ||
+      action?.endsWith(".PICK") == true ||
+      intent.type?.startsWith("image/") == true ||
+      intent.hasExtra(MediaStore.EXTRA_OUTPUT)
+    if (!isPicker) return
+    context.getSharedPreferences(preferencesName, Context.MODE_PRIVATE)
+      .edit()
+      .putInt(pickerRequestCodeKey, requestCode)
+      .apply()
+  }
 
   @Synchronized
-  fun enqueueActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+  fun consumePickerCancellation(context: Context, requestCode: Int, resultCode: Int): Boolean {
+	val preferences = context.getSharedPreferences(preferencesName, Context.MODE_PRIVATE)
+	val pickerRequestCode = preferences.getInt(pickerRequestCodeKey, Int.MIN_VALUE)
+	if (pickerRequestCode != requestCode) return false
+	preferences.edit().remove(pickerRequestCodeKey).apply()
+	return resultCode == Activity.RESULT_CANCELED
+  }
+
+  @Synchronized
+  fun enqueueActivityResult(requestCode: Int, resultCode: Int, data: Intent?, pickerCancelled: Boolean) {
     if (pendingActivityResults.size == 8) pendingActivityResults.removeFirst()
     pendingActivityResults.addLast(
       AbsolutePendingActivityResult(requestCode, resultCode, data?.let(::Intent))
     )
+	if (pickerCancelled && pendingCancellations < 8) {
+	  pendingCancellations += 1
+	}
 	Log.d("AbsoluteJS", "Queued early Android activity result; pending=" + pendingActivityResults.size)
   }
 
+  @Synchronized
+  fun takePendingCancellation(): Boolean {
+    if (pendingCancellations == 0) return false
+    pendingCancellations -= 1
+	return true
+  }
+
   @Synchronized
   fun hasPendingActivityResults() = pendingActivityResults.isNotEmpty()
 
@@ -28347,6 +28392,10 @@ class AbsoluteActivityResultRecoveryModule : Module() {
       AbsoluteActivityResultRecoveryState.applicationRuntimeReady = true
 	  Log.d("AbsoluteJS", "Expo application runtime ready for Android activity results")
     }
+
+	Function("takePendingCancellation") {
+	  AbsoluteActivityResultRecoveryState.takePendingCancellation()
+	}
   }
 }
 `;
@@ -28354,6 +28403,7 @@ var runtime = `${HEADER2}import { requireNativeModule } from 'expo-modules-core'
 
 type AbsoluteActivityResultRecoveryNative = {
 	markApplicationRuntimeReady(): void;
+	takePendingCancellation(): boolean;
 };
 
 const native = requireNativeModule<AbsoluteActivityResultRecoveryNative>(
@@ -28362,6 +28412,9 @@ const native = requireNativeModule<AbsoluteActivityResultRecoveryNative>(
 
 export const markAbsoluteApplicationRuntimeReady = () =>
 	native.markApplicationRuntimeReady();
+
+export const takeAbsoluteActivityResultCancellation = () =>
+	native.takePendingCancellation();
 `;
 var absoluteExpoActivityResultRecoveryFiles = (project) => new Map([
   [
@@ -28474,7 +28527,7 @@ var packageDependencies = (plan) => Object.fromEntries(plan.requiredPackages.map
 var expoPackage = (auth, sync, devices, updates) => ({
   dependencies: {
     "@absolutejs/devices": "0.7.0",
-    "@absolutejs/devices-expo": "0.0.9",
+    "@absolutejs/devices-expo": "0.0.11",
     ...auth ? {
       "@absolutejs/auth": ABSOLUTE_EXPO_AUTH_CORE_VERSION,
       [ABSOLUTE_EXPO_AUTH_PACKAGE]: ABSOLUTE_EXPO_AUTH_VERSION
@@ -28720,6 +28773,7 @@ const withAbsoluteActivityResultRecovery = config => withMainActivity(config, va
 		'import android.os.Bundle',
 		'import android.os.Handler',
 		'import android.os.Looper',
+		'import android.util.Log',
 		'import expo.modules.absoluteactivityresultrecovery.AbsoluteActivityResultRecoveryState'
 	].join('\\n'));
 	source = source.replace(CLASS_ANCHOR, \`\${CLASS_ANCHOR}
@@ -28741,12 +28795,19 @@ const withAbsoluteActivityResultRecovery = config => withMainActivity(config, va
     }
   }
 
+  @Suppress("DEPRECATION")
+  override fun startActivityForResult(intent: Intent, requestCode: Int, options: Bundle?) {
+	AbsoluteActivityResultRecoveryState.registerPickerRequest(applicationContext, requestCode, intent)
+	super.startActivityForResult(intent, requestCode, options)
+  }
+
   override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+	val pickerCancelled = AbsoluteActivityResultRecoveryState.consumePickerCancellation(applicationContext, requestCode, resultCode)
 		if (AbsoluteActivityResultRecoveryState.applicationRuntimeReady) {
       super.onActivityResult(requestCode, resultCode, data)
       return
     }
-	AbsoluteActivityResultRecoveryState.enqueueActivityResult(requestCode, resultCode, data)
+	AbsoluteActivityResultRecoveryState.enqueueActivityResult(requestCode, resultCode, data, pickerCancelled)
     absoluteActivityResultHandler.removeCallbacks(absoluteReplayActivityResults)
     absoluteActivityResultHandler.postDelayed(absoluteReplayActivityResults, 250)
   }
@@ -28762,7 +28823,9 @@ const withAbsoluteActivityResultRecovery = config => withMainActivity(config, va
 
   override fun onDestroy() {
     absoluteActivityResultHandler.removeCallbacks(absoluteReplayActivityResults)
+	AbsoluteActivityResultRecoveryState.applicationRuntimeReady = false
     super.onDestroy()
+	Log.d("AbsoluteJS", "Expo activity-result recovery activity destroyed")
   }
 \`);
 	value.modResults.contents = source;
@@ -28986,6 +29049,7 @@ const absoluteExpoPushOptions = {
 };` : "";
   return `${EXPO_GENERATED_HEADER}import { installDeviceAdapter } from '@absolutejs/devices/runtime';
 import { createExpoDeviceAdapter } from '@absolutejs/devices-expo';
+import { takeAbsoluteActivityResultCancellation } from './AbsoluteActivityResultRecovery';
 ${push ? "import { absoluteExpoAuth } from './AbsoluteAuth';" : ""}
 ${imports.join(`
 `)}
@@ -28995,6 +29059,7 @@ ${pushSource}
 export const absoluteExpoDeviceCapabilities = ${JSON.stringify(plan.capabilities)} as const;
 export const absoluteExpoDevices = createExpoDeviceAdapter({
 	storagePrefix: ${JSON.stringify(`absolutejs.${config.appId}.`)},
+	takeActivityResultCancellation: takeAbsoluteActivityResultCancellation,
 	${entries}
 });
 installDeviceAdapter(absoluteExpoDevices);
@@ -31271,6 +31336,97 @@ var startAbsoluteExpoDevSession = async (options) => {
     throw error;
   }
 };
+// src/mobile/expoAndroidQuality.ts
+var KIB_PER_MIB = 1024;
+var XML_BOUND_BOTTOM_INDEX = 4;
+var XML_BOUND_LEFT_INDEX = 1;
+var XML_BOUND_RIGHT_INDEX = 3;
+var XML_BOUND_TOP_INDEX = 2;
+var DEFAULT_ABSOLUTE_EXPO_ANDROID_QUALITY_BUDGETS = {
+  bridgeP95Ms: 500,
+  coldLaunchMs: 25000,
+  hmrP95Ms: 1e4,
+  maxMemoryGrowthMiB: 160,
+  maxTotalPssMiB: 700,
+  minTouchTargetDp: 44,
+  warmLaunchMs: 5000
+};
+var requiredInteger = (source, name) => {
+  const match = new RegExp(`^${name}:\\s*(\\d+)$`, "mu").exec(source);
+  const value = Number(match?.[1]);
+  if (!Number.isSafeInteger(value))
+    throw new TypeError(`Android launch output is missing ${name}.`);
+  return value;
+};
+var optionalInteger = (source, name) => {
+  const match = new RegExp(`^${name}:\\s*(\\d+)$`, "mu").exec(source);
+  if (!match)
+    return;
+  const value = Number(match[1]);
+  if (!Number.isSafeInteger(value))
+    throw new TypeError(`Android launch output has invalid ${name}.`);
+  return value;
+};
+var parseAbsoluteExpoAndroidLaunchTiming = (source) => ({
+  launchState: /^LaunchState:\s*(\S+)$/mu.exec(source)?.[1],
+  thisTimeMs: optionalInteger(source, "ThisTime"),
+  totalTimeMs: requiredInteger(source, "TotalTime"),
+  waitTimeMs: requiredInteger(source, "WaitTime")
+});
+var parseAbsoluteExpoAndroidMemory = (source) => {
+  const summary = /^\s*TOTAL PSS:\s*(\d+)/mu.exec(source)?.[1];
+  const table = /^\s*TOTAL\s+(\d+)\s+/mu.exec(source)?.[1];
+  const totalPssKiB = Number(summary ?? table);
+  if (!Number.isSafeInteger(totalPssKiB) || totalPssKiB < 0)
+    throw new TypeError("Android meminfo output is missing total PSS.");
+  return { totalPssKiB };
+};
+var decodeXml = (value) => value.replaceAll("&quot;", '"').replaceAll("&apos;", "'").replaceAll("&lt;", "<").replaceAll("&gt;", ">").replaceAll("&amp;", "&");
+var nodeAttributes = (source) => Object.fromEntries([...source.matchAll(/([\w:-]+)="([^"]*)"/gu)].map(([, name = "", value = ""]) => [name, decodeXml(value)]));
+var nodeBounds = (source) => {
+  const match = /^\[(\d+),(\d+)\]\[(\d+),(\d+)\]$/u.exec(source);
+  if (!match)
+    return { bottom: 0, left: 0, right: 0, top: 0 };
+  return {
+    bottom: Number(match[XML_BOUND_BOTTOM_INDEX]),
+    left: Number(match[XML_BOUND_LEFT_INDEX]),
+    right: Number(match[XML_BOUND_RIGHT_INDEX]),
+    top: Number(match[XML_BOUND_TOP_INDEX])
+  };
+};
+var absoluteAndroidNodeLabel = (node) => node.contentDescription.trim() || node.text.trim();
+var absoluteAndroidTouchTargetDp = (node, density) => {
+  if (!Number.isFinite(density) || density <= 0)
+    throw new TypeError("Android display density must be positive.");
+  return {
+    height: (node.bounds.bottom - node.bounds.top) / density,
+    width: (node.bounds.right - node.bounds.left) / density
+  };
+};
+var absolutePercentile = (values, ratio) => {
+  if (values.length === 0)
+    throw new TypeError("A percentile requires at least one measurement.");
+  if (!Number.isFinite(ratio) || ratio < 0 || ratio > 1)
+    throw new TypeError("A percentile ratio must be between zero and one.");
+  const ordered = [...values].sort((left, right) => left - right);
+  const index = Math.ceil(ratio * ordered.length) - 1;
+  return ordered[Math.max(0, index)] ?? 0;
+};
+var absolutePssMiB = (memory) => memory.totalPssKiB / KIB_PER_MIB;
+var parseAbsoluteAndroidAccessibilityHierarchy = (source) => [...source.matchAll(/<node\s+([^>]*?)\/?>(?:<\/node>)?/gu)].map(([, raw = ""]) => {
+  const attributes = nodeAttributes(raw);
+  return {
+    bounds: nodeBounds(attributes.bounds ?? ""),
+    className: attributes.class ?? "",
+    clickable: attributes.clickable === "true",
+    contentDescription: attributes["content-desc"] ?? "",
+    enabled: attributes.enabled === "true",
+    packageName: attributes.package ?? "",
+    resourceId: attributes["resource-id"] ?? "",
+    text: attributes.text ?? "",
+    visible: attributes["visible-to-user"] !== "false"
+  };
+});
 // src/mobile/expoNativeWatcher.ts
 import { watch as watch2 } from "fs";
 import { access as access12, readdir as readdir5, readFile as readFile16 } from "fs/promises";
@@ -40729,8 +40885,11 @@ export {
   ANDROID_ASSOCIATION_PATH,
   APPLE_ASSOCIATION_PATH,
   AbsoluteMobilePageProtocolError,
+  DEFAULT_ABSOLUTE_EXPO_ANDROID_QUALITY_BUDGETS,
   DEFAULT_MOBILE_UPDATE_REGISTRY_MODULE,
   MOBILE_PAGE_REQUEST_HEADERS,
+  absoluteAndroidNodeLabel,
+  absoluteAndroidTouchTargetDp,
   absoluteDeviceNativeRequirements,
   absoluteExpoExecutable,
   absoluteExpoNativeObservabilityFiles,
@@ -40738,6 +40897,8 @@ export {
   absoluteIosDeviceAcceptanceCommands,
   absoluteMobilePreviewDocument,
   absoluteMobileUpdateSigningPayload,
+  absolutePercentile,
+  absolutePssMiB,
   absoluteRemoteMacSshBase,
   absoluteRemoteProjectSyncCommands,
   absoluteRemoteReleaseInputSyncCommands,
@@ -40853,7 +41014,10 @@ export {
   normalizeAbsoluteMobileUpdatePath,
   openAbsoluteMobileSheet,
   pairAbsoluteRemoteMac,
+  parseAbsoluteAndroidAccessibilityHierarchy,
   parseAbsoluteAndroidInstalledApp,
+  parseAbsoluteExpoAndroidLaunchTiming,
+  parseAbsoluteExpoAndroidMemory,
   parseAbsoluteExpoBridgeMessage,
   parseAbsoluteExpoUpdateDescriptor,
   parseAbsoluteIosHmrLog,
@@ -40931,5 +41095,5 @@ export {
   writeAbsoluteMobileUpdateRegistry
 };
 
-//# debugId=60D5DDBF8A7817D064756E2164756E21
+//# debugId=35DF25B2FF31C85164756E2164756E21
 //# sourceMappingURL=index.js.map