@absolutejs/absolute 0.20.0-beta.100 → 0.20.0-beta.102

package/dist/cli/{compile-9y36k8z1.js → compile-4xbpm6hf.js}

@@ -15,7 +15,7 @@ import {
   createIslandRegistryDefinitionPlugin,
   finalizeAbsoluteMobileCompatibilityBuild,
   resolveServerBundleExternals
-} from "./index-0bcf7pdw.js";
+} from "./index-6ff78meg.js";
 import {
   loadIslandRegistryBuildInfo
 } from "./index-bzs19w3r.js";
@@ -36,7 +36,7 @@ import"./index-w5vswatm.js";
 import {
   normalizeAbsoluteMobileConfig
 } from "./index-rd2hbttb.js";
-import"./index-qd6mqgsc.js";
+import"./index-d5fr1xp3.js";
 import {
   ABSOLUTE_NATIVE_AUTH_CLIENTS_ENV,
   installAbsoluteMobileAuthEnvironment

package/dist/cli/{dev-tn9yfehm.js → dev-m4r4zs2k.js}

@@ -1286,8 +1286,8 @@ var loadAbsoluteMobileDevModules = async () => {
     expoNativeWatcher
   ] = await Promise.all([
     import("./config-vy04mqce.js"),
-    import("./expoProject-ceey4cfg.js"),
-    import("./expoDevController-mxd3h52y.js"),
+    import("./expoProject-780thyfd.js"),
+    import("./expoDevController-zz516pdd.js"),
     import("./nativeAuth-zx4tsb1f.js"),
     import("./androidEmulatorController-nybhzc6c.js"),
     import("./emulatorDoctor-y2nqmaha.js"),

package/dist/cli/{expoDevController-mxd3h52y.js → expoDevController-zz516pdd.js}

@@ -7,7 +7,7 @@ import {
   parseBootedAbsoluteExpoIosSimulators,
   planAbsoluteExpoDevSession,
   startAbsoluteExpoDevSession
-} from "./index-kr23b0fp.js";
+} from "./index-28nxv57v.js";
 import"./index-j66p8hn5.js";
 import"./index-knt92dm8.js";
 import"./index-t84wxk1p.js";

package/dist/cli/{expoProject-ceey4cfg.js → expoProject-780thyfd.js}

@@ -2,7 +2,7 @@
 import {
   syncAbsoluteExpoWebAssets,
   writeAbsoluteExpoProject
-} from "./index-qd6mqgsc.js";
+} from "./index-d5fr1xp3.js";
 import"./index-ar4gz15x.js";
 import"./index-mywsk201.js";
 export {

package/dist/cli/{index-kr23b0fp.js → index-28nxv57v.js}

@@ -218,6 +218,8 @@ var encodedWindowsExpoAndroidCommand = (project, androidRoot, appId, args, captu
     "$env:GRADLE_OPTS = (($env:GRADLE_OPTS + ' -Dorg.gradle.daemon=false').Trim())",
     "$autolinkingCache = Join-Path $mappedProject 'android\\build\\generated\\autolinking'",
     "if ([IO.Directory]::Exists($autolinkingCache)) { [IO.Directory]::Delete($autolinkingCache, $true) }",
+    "$reactGeneratedResources = Join-Path $mappedProject 'android\\app\\build\\generated\\res\\react'",
+    "if ([IO.Directory]::Exists($reactGeneratedResources)) { [IO.Directory]::Delete($reactGeneratedResources, $true) }",
     ...mode === "development" ? [
       "$expo = Join-Path $mappedProject 'node_modules\\.bin\\expo.exe'",
       "& $expo @expoArguments",

package/dist/cli/{index-0bcf7pdw.js → index-6ff78meg.js}

@@ -10,7 +10,7 @@ import {
   resolveAbsoluteMobileUpdateRuntime,
   syncAbsoluteExpoWebAssets,
   writeAbsoluteExpoProject
-} from "./index-qd6mqgsc.js";
+} from "./index-d5fr1xp3.js";
 
 // src/build/islandRegistryTransform.ts
 import { basename } from "path";

package/dist/cli/{index-qd6mqgsc.js → index-d5fr1xp3.js}

@@ -13,7 +13,6 @@ import {
 // src/mobile/expoProject.ts
 import {
   access,
-  cp,
   mkdir,
   mkdtemp,
   readdir,
@@ -1533,6 +1532,15 @@ class AbsoluteActivityResultRecoveryModule : Module() {
 	  Log.d("AbsoluteJS", "Expo application runtime ready for Android activity results")
     }
 
+    Function("markEmbeddedWebReady") {
+	  Log.i("AbsoluteJS", "Expo embedded web content ready")
+    }
+
+    Function("markEmbeddedWebPhase") { phase: String ->
+	  val allowed = setOf("assets-start", "assets-ready", "assets-root-failed", "assets-directory-failed", "assets-destination-failed", "assets-module-failed", "assets-source-failed", "assets-download-failed", "assets-copy-failed", "assets-read-failed", "assets-write-failed", "assets-finalize-failed", "assets-unexpected-failed", "devices-start", "devices-ready", "devices-failed")
+	  if (allowed.contains(phase)) Log.i("AbsoluteJS", "Expo embedded web phase: " + phase)
+    }
+
 	Function("takePendingCancellation") {
 	  AbsoluteActivityResultRecoveryState.takePendingCancellation()
 	}
@@ -1543,6 +1551,8 @@ var runtime = `${HEADER2}import { requireNativeModule } from 'expo-modules-core'
 
 type AbsoluteActivityResultRecoveryNative = {
 	markApplicationRuntimeReady(): void;
+	markEmbeddedWebPhase(phase: AbsoluteEmbeddedWebPhase): void;
+	markEmbeddedWebReady(): void;
 	takePendingCancellation(): boolean;
 };
 
@@ -1553,6 +1563,30 @@ const native = requireNativeModule<AbsoluteActivityResultRecoveryNative>(
 export const markAbsoluteApplicationRuntimeReady = () =>
 	native.markApplicationRuntimeReady();
 
+export const markAbsoluteEmbeddedWebReady = () =>
+	native.markEmbeddedWebReady();
+
+export type AbsoluteEmbeddedWebPhase =
+	| 'assets-start'
+	| 'assets-ready'
+	| 'assets-root-failed'
+	| 'assets-directory-failed'
+	| 'assets-destination-failed'
+	| 'assets-module-failed'
+	| 'assets-source-failed'
+	| 'assets-download-failed'
+	| 'assets-copy-failed'
+	| 'assets-read-failed'
+	| 'assets-write-failed'
+	| 'assets-finalize-failed'
+	| 'assets-unexpected-failed'
+	| 'devices-start'
+	| 'devices-ready'
+	| 'devices-failed';
+
+export const markAbsoluteEmbeddedWebPhase = (phase: AbsoluteEmbeddedWebPhase) =>
+	native.markEmbeddedWebPhase(phase);
+
 export const takeAbsoluteActivityResultCancellation = () =>
 	native.takePendingCancellation();
 `;
@@ -2364,10 +2398,11 @@ var webHostSource = (config, auth, sync) => {
   return `${EXPO_GENERATED_HEADER}import * as Linking from 'expo-linking';
 import { router, usePathname } from 'expo-router';
 import { useEffect, useMemo, useRef, useState } from 'react';
-import { ActivityIndicator, BackHandler, Platform, StyleSheet, View } from 'react-native';
+import { ActivityIndicator, BackHandler, Platform, Pressable, StyleSheet, Text, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { WebView, type WebViewMessageEvent } from 'react-native-webview';
 import { materializeAbsoluteWebBundle } from './webAssets';
+import { markAbsoluteEmbeddedWebPhase, markAbsoluteEmbeddedWebReady } from './AbsoluteActivityResultRecovery';
 import { createExpoDevicesBridgeHost } from '@absolutejs/devices-expo/bridge';
 import { absoluteExpoDevices, beforeAbsoluteExpoDeviceSignOut } from './AbsoluteDevices';
 ${auth ? "import { absoluteExpoAuth, getAbsoluteExpoAuthPrincipal, startAbsoluteExpoAuth } from './AbsoluteAuth';" : ""}
@@ -2531,7 +2566,10 @@ export function AbsoluteWebHost({ path }: AbsoluteWebHostProps = {}) {
 	const canGoBack = useRef(false);
 	const [runtimeReady, setRuntimeReady] = useState(!AUTH_ENABLED && !SYNC_ENABLED);
 	const [devicesReady, setDevicesReady] = useState(false);
+	const [startupError, setStartupError] = useState<'assets' | 'devices'>();
+	const [startupRevision, setStartupRevision] = useState(0);
 	const activeWebPath = useRef(pathname);
+	const embeddedReadyReported = useRef(false);
 	const webSource = useMemo(() => indexUri ? { uri: indexUri } : undefined, [indexUri]);
 
 	useEffect(() => {
@@ -2565,8 +2603,18 @@ export function AbsoluteWebHost({ path }: AbsoluteWebHostProps = {}) {
 			setIndexUri(target.href);
 			return;
 		}
-		void materializeAbsoluteWebBundle().then(uri => setIndexUri(uri + '?absolutePath=' + encodeURIComponent(pathname)));
-	}, [pathname]);
+		markAbsoluteEmbeddedWebPhase('assets-start');
+		void materializeAbsoluteWebBundle().then(uri => {
+			markAbsoluteEmbeddedWebPhase('assets-ready');
+			setIndexUri(uri + '?absolutePath=' + encodeURIComponent(pathname));
+		}).catch(error => {
+			const phase = error instanceof Error && (error.message === 'assets-root-failed' || error.message === 'assets-directory-failed' || error.message === 'assets-destination-failed' || error.message === 'assets-module-failed' || error.message === 'assets-source-failed' || error.message === 'assets-download-failed' || error.message === 'assets-copy-failed' || error.message === 'assets-read-failed' || error.message === 'assets-write-failed' || error.message === 'assets-finalize-failed')
+				? error.message
+				: 'assets-unexpected-failed';
+			markAbsoluteEmbeddedWebPhase(phase);
+			setStartupError('assets');
+		});
+	}, [pathname, startupRevision]);
 	useEffect(() => {
 		webView.current?.injectJavaScript(hostMetricsScript(safeAreaInsets));
 	}, [safeAreaInsets.bottom, safeAreaInsets.left, safeAreaInsets.right, safeAreaInsets.top]);
@@ -2586,13 +2634,19 @@ export function AbsoluteWebHost({ path }: AbsoluteWebHostProps = {}) {
 	};
 	useEffect(() => {
 		let active = true;
+		markAbsoluteEmbeddedWebPhase('devices-start');
 		void createExpoDevicesBridgeHost(absoluteExpoDevices, (event, payload) => {
 			if (!active) return;
 			respond({ event, format: BRIDGE_FORMAT, kind: 'event', path: activeWebPath.current, payload });
 		}).then(host => {
 			if (!active) return void Promise.resolve(host.close()).catch(() => undefined);
 			devicesBridge.current = host;
+			markAbsoluteEmbeddedWebPhase('devices-ready');
 			setDevicesReady(true);
+		}).catch(() => {
+			if (!active) return;
+			markAbsoluteEmbeddedWebPhase('devices-failed');
+			setStartupError('devices');
 		});
 		return () => {
 			active = false;
@@ -2600,7 +2654,7 @@ export function AbsoluteWebHost({ path }: AbsoluteWebHostProps = {}) {
 			devicesBridge.current = undefined;
 			if (host) void Promise.resolve(host.close()).catch(() => undefined);
 		};
-	}, []);
+	}, [startupRevision]);
 	const hasOrigin = (source: string, origin: string) => {
 		try { return new URL(source).origin === origin; } catch { return false; }
 	};
@@ -2613,6 +2667,10 @@ export function AbsoluteWebHost({ path }: AbsoluteWebHostProps = {}) {
 		if (message.kind === 'event' && (message.event === 'navigation' || message.event === 'ready')) {
 			const target = new URL(message.path, PRODUCTION_ORIGIN);
 			if (target.origin !== PRODUCTION_ORIGIN) return;
+			if (message.event === 'ready' && !DEV_ORIGIN && !embeddedReadyReported.current) {
+				embeddedReadyReported.current = true;
+				markAbsoluteEmbeddedWebReady();
+			}
 			if (isNativeRoute(target.pathname)) router.push(message.path as never);
 			else activeWebPath.current = message.path;
 			return;
@@ -2652,6 +2710,15 @@ export function AbsoluteWebHost({ path }: AbsoluteWebHostProps = {}) {
 		}
 	};
 
+	if (startupError) return <View style={styles.loading}>
+		<Text accessibilityRole="alert" style={styles.error}>Embedded content could not start.</Text>
+		<Pressable accessibilityRole="button" onPress={() => {
+			setStartupError(undefined);
+			setIndexUri(undefined);
+			setDevicesReady(false);
+			setStartupRevision(value => value + 1);
+		}} style={styles.retry}><Text>Try again</Text></Pressable>
+	</View>;
 	if (!webSource || !runtimeReady || !devicesReady) return <View style={styles.loading}><ActivityIndicator /></View>;
 	return <WebView
 		allowFileAccess
@@ -2677,7 +2744,7 @@ export function AbsoluteWebHost({ path }: AbsoluteWebHostProps = {}) {
 	/>;
 }
 
-const styles = StyleSheet.create({ loading: { alignItems: 'center', flex: 1, justifyContent: 'center' }, web: { flex: 1 } });
+const styles = StyleSheet.create({ error: { marginBottom: 12 }, loading: { alignItems: 'center', flex: 1, justifyContent: 'center' }, retry: { borderWidth: 1, paddingHorizontal: 16, paddingVertical: 12 }, web: { flex: 1 } });
 `;
 };
 var webRouteSource = `${EXPO_GENERATED_HEADER}import { AbsoluteWebHost } from '../src/generated/AbsoluteWebHost';
@@ -3125,35 +3192,72 @@ var installStagedDirectory = async (staging, destination) => {
     throw error;
   }
 };
-var assetModuleSource = (assets, bundleId, manifest) => `${EXPO_GENERATED_HEADER}import { Asset } from 'expo-asset';
+var assetModuleSource = (assets, archiveAsset, bundleId, manifest) => `${EXPO_GENERATED_HEADER}import { Asset } from 'expo-asset';
 import { Directory, File, Paths } from 'expo-file-system';
+import { copyAsync as copyLegacyAsync } from 'expo-file-system/legacy';
 
 ${nativeDataManifestTypeSource}
 declare const require: (path: string) => number;
 const BUNDLE_ID = ${JSON.stringify(bundleId)};
 export const ABSOLUTE_MOBILE_MANIFEST: AbsoluteMobileManifest = ${JSON.stringify(manifest)};
+const ARCHIVE_MODULE = require(${JSON.stringify(archiveAsset)});
 const ASSETS = [
-${assets.map(({ asset, path }) => `	{ module: require(${JSON.stringify(asset)}), path: ${JSON.stringify(path)} }`).join(`,
+${assets.map((entry) => `	${JSON.stringify(entry)}`).join(`,
 `)}
 ] as const;
 
 export const materializeAbsoluteWebBundle = async () => {
-	const root = new Directory(Paths.document, 'absolutejs-web', BUNDLE_ID);
-	root.create({ idempotent: true, intermediates: true });
+	let root: Directory;
+	try {
+		root = new Directory(Paths.document, 'absolutejs-web', BUNDLE_ID);
+		root.create({ idempotent: true, intermediates: true });
+	} catch { throw new Error('assets-root-failed'); }
+	let archive: File;
+	try { archive = new File(root, '.absolutejs-bundle.absasset'); }
+	catch { throw new Error('assets-destination-failed'); }
+	if (!archive.exists) {
+		let asset: Asset;
+		try { asset = Asset.fromModule(ARCHIVE_MODULE); }
+		catch { throw new Error('assets-module-failed'); }
+		try { if (!asset.localUri) asset = await asset.downloadAsync(); }
+		catch { throw new Error('assets-download-failed'); }
+		if (!asset.localUri) throw new Error('assets-download-failed');
+		let source: File;
+		try { source = new File(asset.localUri); }
+		catch { throw new Error('assets-source-failed'); }
+		try { await source.copy(archive); }
+		catch {
+			try { await copyLegacyAsync({ from: asset.localUri, to: archive.uri }); }
+			catch { throw new Error('assets-copy-failed'); }
+		}
+	}
+	let contents: Uint8Array;
+	try { contents = await archive.bytes(); }
+	catch { throw new Error('assets-read-failed'); }
 	for (const entry of ASSETS) {
 		const parts = entry.path.split('/');
 		const name = parts.pop();
-		if (!name) throw new Error('AbsoluteJS embedded asset path is invalid.');
-		const directory = new Directory(root, ...parts);
-		directory.create({ idempotent: true, intermediates: true });
-		const destination = new File(directory, name);
-		if (destination.exists) continue;
-		const asset = await Asset.fromModule(entry.module).downloadAsync();
-		if (!asset.localUri) throw new Error('Expo did not materialize an embedded AbsoluteJS asset.');
-		new File(asset.localUri).copy(destination);
+		if (!name) throw new Error('assets-directory-failed');
+		let directory: Directory;
+		try {
+			directory = new Directory(root, ...parts);
+			directory.create({ idempotent: true, intermediates: true });
+		}
+		catch { throw new Error('assets-directory-failed'); }
+		let destination: File;
+		try {
+			destination = new File(directory, name);
+			if (destination.exists && destination.size === entry.length) continue;
+			if (destination.exists) destination.delete();
+		} catch { throw new Error('assets-destination-failed'); }
+		try { destination.write(contents.slice(entry.offset, entry.offset + entry.length)); }
+		catch { throw new Error('assets-write-failed'); }
 	}
+	try { archive.delete(); }
+	catch { throw new Error('assets-finalize-failed'); }
 
-	return new File(root, 'index.html').uri;
+	try { return new File(root, 'index.html').uri; }
+	catch { throw new Error('assets-finalize-failed'); }
 };
 `;
 var syncAbsoluteExpoWebAssets = async (config) => {
@@ -3181,22 +3285,28 @@ var syncAbsoluteExpoWebAssets = async (config) => {
   await mkdir(dirname2(destination), { recursive: true });
   const staging = await mkdtemp(join5(dirname2(destination), `.${basename(destination)}.stage-`));
   let assets;
+  let archiveAsset;
   try {
-    assets = await Promise.all(files.map(async (source, index) => {
-      const name = `${String(index).padStart(6, "0")}${EXPO_ASSET_EXTENSION}`;
-      await cp(source, join5(staging, name));
-      return {
-        asset: portableRelative(join5(config.nativeProjectDirectory, "src", "generated"), join5(destination, name)),
-        path: relative2(config.bundleDirectory, source).replaceAll("\\", "/")
+    let offset = 0;
+    assets = filesWithContents.map(({ contents, file }) => {
+      const entry = {
+        length: contents.byteLength,
+        offset,
+        path: relative2(config.bundleDirectory, file).replaceAll("\\", "/")
       };
-    }));
+      offset += contents.byteLength;
+      return entry;
+    });
+    const name = `bundle${EXPO_ASSET_EXTENSION}`;
+    await writeFile(join5(staging, name), Buffer.concat(filesWithContents.map(({ contents }) => contents)));
+    archiveAsset = portableRelative(join5(config.nativeProjectDirectory, "src", "generated"), join5(destination, name));
     await installStagedDirectory(staging, destination);
   } catch (error) {
     await rm(staging, { force: true, recursive: true });
     throw error;
   }
   const generated = join5(config.nativeProjectDirectory, "src", "generated", "webAssets.ts");
-  await writeManagedFile(generated, assetModuleSource(assets, bundleId, nativeDataManifest), true);
+  await writeManagedFile(generated, assetModuleSource(assets, archiveAsset, bundleId, nativeDataManifest), true);
   return { appBuild, assets: assets.length, bundleId, path: destination };
 };
 

package/dist/cli/{index-fdycyj4v.js → index-rvpd4w9t.js}

@@ -6,7 +6,7 @@ import {
   createIslandRegistryDefinitionPlugin,
   finalizeAbsoluteMobileCompatibilityBuild,
   resolveServerBundleExternals
-} from "./index-0bcf7pdw.js";
+} from "./index-6ff78meg.js";
 import {
   loadIslandRegistryBuildInfo
 } from "./index-bzs19w3r.js";

package/dist/cli/index.js

@@ -58,7 +58,7 @@ if (command === "dev") {
   }
   const positionalArgs = stripNamedArgs("--config", "--android-device", "--ios-device").filter((arg) => arg !== "--no-mobile" && arg !== "--eager");
   const serverEntry = positionalArgs[0] ?? DEFAULT_SERVER_ENTRY;
-  const { dev } = await import("./dev-tn9yfehm.js");
+  const { dev } = await import("./dev-m4r4zs2k.js");
   await dev(serverEntry, configPath, {
     androidDevice,
     eager: args.includes("--eager"),
@@ -71,7 +71,7 @@ if (command === "dev") {
   const configPath = parseNamedArg("--config");
   const positionalArgs = stripNamedArgs("--outdir", "--config").filter((arg) => arg !== "--prebuilt");
   const serverEntry = positionalArgs[0] ?? DEFAULT_SERVER_ENTRY;
-  const { start } = await import("./start-10dfrjvd.js");
+  const { start } = await import("./start-nmyy64tr.js");
   await start(serverEntry, outdir, configPath, {
     prebuilt: args.includes("--prebuilt")
   });
@@ -81,7 +81,7 @@ if (command === "dev") {
   const configPath = parseNamedArg("--config");
   const positionalArgs = stripNamedArgs("--outdir", "--config");
   const serverEntry = positionalArgs[0] ?? DEFAULT_SERVER_ENTRY;
-  const { start } = await import("./start-10dfrjvd.js");
+  const { start } = await import("./start-nmyy64tr.js");
   await start(serverEntry, outdir, configPath, { prepareOnly: true });
 } else if (command === "build") {
   sendTelemetryEvent("cli:command", { command });
@@ -197,13 +197,13 @@ if (command === "dev") {
   const configPath = parseNamedArg("--config");
   const positionalArgs = stripNamedArgs("--outdir", "--outfile", "--config");
   const serverEntry = positionalArgs[0] ?? DEFAULT_SERVER_ENTRY;
-  const { compile } = await import("./compile-9y36k8z1.js");
+  const { compile } = await import("./compile-4xbpm6hf.js");
   await compile(serverEntry, outdir, outfile, configPath);
 } else if (command === "mobile") {
   sendTelemetryEvent("cli:command", {
     command: `mobile:${workspaceCommand ?? "unknown"}`
   });
-  const { runMobile } = await import("./mobile-qfckt3vc.js");
+  const { runMobile } = await import("./mobile-6xe6zysv.js");
   try {
     await runMobile(args);
   } catch (error) {