@absolutejs/absolute 0.20.0-beta.84 → 0.20.0-beta.85

package/dist/mobile/shellUpdate.js

@@ -157,17 +157,18 @@ var fileUrl = (manifestUrl, releaseId, path) => {
     throw new TypeError("Mobile update asset escaped its signed release origin.");
   return result;
 };
-var readChunks = async (reader, maximum, chunks = [], received = 0) => {
+var readChunks = async (reader, maximum, onChunk, chunks = [], received = 0) => {
   const result = await reader.read();
   if (result.done)
     return { chunks, received };
   const total = received + result.value.byteLength;
   if (total > maximum)
     throw new TypeError("Mobile update response exceeds its signed size.");
+  await onChunk?.(result.value, received);
   chunks.push(result.value);
-  return readChunks(reader, maximum, chunks, total);
+  return readChunks(reader, maximum, onChunk, chunks, total);
 };
-var readBounded = async (response, maximum) => {
+var readBounded = async (response, maximum, onChunk) => {
   const declared = Number(response.headers.get("content-length"));
   if (Number.isFinite(declared) && declared > maximum)
     throw new TypeError("Mobile update response exceeds its signed size.");
@@ -175,8 +176,9 @@ var readBounded = async (response, maximum) => {
     return new Uint8Array;
   const reader = response.body.getReader();
   let result;
+  const chunks = [];
   try {
-    result = await readChunks(reader, maximum);
+    result = await readChunks(reader, maximum, onChunk, chunks);
   } catch (error) {
     await reader.cancel().catch(() => {
       return;
@@ -185,7 +187,7 @@ var readBounded = async (response, maximum) => {
   }
   const contents = new Uint8Array(result.received);
   let offset = 0;
-  for (const chunk of result.chunks) {
+  for (const chunk of chunks) {
     contents.set(chunk, offset);
     offset += chunk.byteLength;
   }
@@ -206,49 +208,172 @@ var requireCompatible = (manifest, config) => {
   if (manifest.runtimeFingerprint !== config.runtimeFingerprint)
     throw new TypeError("Mobile update requires a different native runtime.");
 };
+var networkConcurrency = (requested) => {
+  const bounded = Math.max(1, Math.min(6, Math.floor(requested ?? 3)));
+  const navigatorValue = Reflect.get(globalThis, "navigator");
+  const connection = typeof navigatorValue === "object" && navigatorValue !== null ? Reflect.get(navigatorValue, "connection") : undefined;
+  if (typeof connection !== "object" || connection === null)
+    return bounded;
+  if (Reflect.get(connection, "saveData") === true)
+    return 1;
+  const effectiveType = Reflect.get(connection, "effectiveType");
+  if (effectiveType === "slow-2g" || effectiveType === "2g")
+    return 1;
+  if (effectiveType === "3g")
+    return Math.min(2, bounded);
+  return bounded;
+};
+var combine = (prefix, suffix) => {
+  const result = new Uint8Array(prefix.byteLength + suffix.byteLength);
+  result.set(prefix);
+  result.set(suffix, prefix.byteLength);
+  return result;
+};
+var validContentRange = (value, start, total) => value === `bytes ${start}-${total - 1}/${total}`;
+var combineSignals = (signals) => {
+  const nativeAny = Reflect.get(AbortSignal, "any");
+  if (typeof nativeAny === "function")
+    return Reflect.apply(nativeAny, AbortSignal, [signals]);
+  const controller = new AbortController;
+  const abort = () => controller.abort();
+  if (signals.some((signal) => signal.aborted))
+    abort();
+  else
+    signals.forEach((signal) => signal.addEventListener("abort", abort, { once: true }));
+  return controller.signal;
+};
 var createAbsoluteMobileUpdateClient = (options) => {
   const manifestUrl = exactManifestUrl(options.config.manifestUrl);
   const request = options.fetch ?? globalThis.fetch;
-  const downloadFiles = async (manifest, index = 0, transfer = {
-    downloadedBytes: 0,
-    downloadedFiles: 0,
-    reusedBytes: 0,
-    reusedFiles: 0,
-    totalBytes: manifest.files.reduce((total, file) => total + file.bytes, 0),
-    totalFiles: manifest.files.length
-  }) => {
-    const file = manifest.files[index];
-    if (!file)
-      return transfer;
-    const reusable = await options.store.readReusable?.(file);
-    if (reusable && reusable.byteLength === file.bytes && await options.verifier.digest(reusable) === file.sha256) {
-      await options.store.write(file, reusable);
-      return downloadFiles(manifest, index + 1, {
-        ...transfer,
-        reusedBytes: transfer.reusedBytes + reusable.byteLength,
-        reusedFiles: transfer.reusedFiles + 1
+  const downloadFiles = async (manifest) => {
+    const startedAt = performance.now();
+    const transfer = {
+      avoidedBytes: 0,
+      completedFiles: 0,
+      downloadedBytes: 0,
+      downloadedFiles: 0,
+      durationMs: 0,
+      resumedBytes: 0,
+      resumedFiles: 0,
+      reusedBytes: 0,
+      reusedFiles: 0,
+      throughputBytesPerSecond: 0,
+      totalBytes: manifest.files.reduce((total, file) => total + file.bytes, 0),
+      totalFiles: manifest.files.length
+    };
+    const updateTiming = () => {
+      transfer.durationMs = Math.max(0, performance.now() - startedAt);
+      transfer.avoidedBytes = transfer.reusedBytes + transfer.resumedBytes;
+      transfer.throughputBytesPerSecond = transfer.durationMs > 0 ? Math.round(transfer.downloadedBytes * 1000 / transfer.durationMs) : transfer.downloadedBytes;
+    };
+    const progress = () => {
+      updateTiming();
+      try {
+        options.onProgress?.({
+          ...transfer,
+          kind: "download-progress"
+        });
+      } catch {}
+    };
+    const controller = new AbortController;
+    let next = 0;
+    let firstError;
+    const downloadFile = async (file) => {
+      const staged = await options.store.readStaged?.(file);
+      if (staged?.byteLength === file.bytes && await options.verifier.digest(staged) === file.sha256) {
+        transfer.resumedBytes += staged.byteLength;
+        transfer.resumedFiles += 1;
+        transfer.completedFiles += 1;
+        progress();
+        return;
+      }
+      const reusable = await options.store.readReusable?.(file);
+      if (reusable?.byteLength === file.bytes && await options.verifier.digest(reusable) === file.sha256) {
+        await options.store.write(file, reusable);
+        transfer.reusedBytes += reusable.byteLength;
+        transfer.reusedFiles += 1;
+        transfer.completedFiles += 1;
+        progress();
+        return;
+      }
+      const candidate = await options.store.readPartial?.(file);
+      if (candidate?.byteLength === file.bytes && await options.verifier.digest(candidate) === file.sha256) {
+        await options.store.write(file, candidate);
+        transfer.resumedBytes += candidate.byteLength;
+        transfer.resumedFiles += 1;
+        transfer.completedFiles += 1;
+        progress();
+        return;
+      }
+      const partial = candidate && candidate.byteLength > 0 && candidate.byteLength < file.bytes ? candidate : new Uint8Array;
+      const headers = new Headers;
+      if (partial.byteLength > 0) {
+        headers.set("if-range", `"${file.sha256}"`);
+        headers.set("range", `bytes=${partial.byteLength}-`);
+      }
+      const asset = await request(fileUrl(manifestUrl, manifest.releaseId, file.path), {
+        cache: "no-store",
+        credentials: "omit",
+        headers,
+        redirect: "error",
+        signal: combineSignals([
+          controller.signal,
+          AbortSignal.timeout(30000)
+        ])
       });
-    }
-    const asset = await request(fileUrl(manifestUrl, manifest.releaseId, file.path), {
-      cache: "no-store",
-      credentials: "omit",
-      redirect: "error",
-      signal: AbortSignal.timeout(30000)
-    });
-    if (!asset.ok)
-      throw new TypeError(`Mobile update asset ${file.path} failed with HTTP ${asset.status}.`);
-    const contents = await readBounded(asset, file.bytes);
-    const downloadedBytes = transfer.downloadedBytes + contents.byteLength;
-    if (contents.byteLength !== file.bytes || downloadedBytes > ABSOLUTE_MOBILE_UPDATE_MAX_TOTAL_BYTES)
-      throw new TypeError(`Mobile update asset ${file.path} has an invalid size.`);
-    if (await options.verifier.digest(contents) !== file.sha256)
-      throw new TypeError(`Mobile update asset ${file.path} failed integrity verification.`);
-    await options.store.write(file, contents);
-    return downloadFiles(manifest, index + 1, {
-      ...transfer,
-      downloadedBytes,
-      downloadedFiles: transfer.downloadedFiles + 1
-    });
+      if (!asset.ok)
+        throw new TypeError(`Mobile update asset ${file.path} failed with HTTP ${asset.status}.`);
+      const ranged = asset.status === 206;
+      if (ranged && (partial.byteLength === 0 || !validContentRange(asset.headers.get("content-range"), partial.byteLength, file.bytes)))
+        throw new TypeError(`Mobile update asset ${file.path} returned an invalid byte range.`);
+      const prefix = ranged ? partial : new Uint8Array;
+      if (ranged) {
+        transfer.resumedBytes += partial.byteLength;
+        transfer.resumedFiles += 1;
+      }
+      const downloaded = await readBounded(asset, file.bytes - prefix.byteLength, options.store.appendPartial ? async (chunk, offset) => {
+        await options.store.appendPartial?.(file, chunk, prefix.byteLength + offset);
+        transfer.downloadedBytes += chunk.byteLength;
+        progress();
+      } : undefined);
+      if (!options.store.appendPartial) {
+        transfer.downloadedBytes += downloaded.byteLength;
+        progress();
+      }
+      if (transfer.downloadedBytes > ABSOLUTE_MOBILE_UPDATE_MAX_TOTAL_BYTES)
+        throw new TypeError("Mobile update exceeds the maximum transfer size.");
+      const contents = combine(prefix, downloaded);
+      if (contents.byteLength !== file.bytes)
+        throw new TypeError(`Mobile update asset ${file.path} has an invalid size.`);
+      if (await options.verifier.digest(contents) !== file.sha256)
+        throw new TypeError(`Mobile update asset ${file.path} failed integrity verification.`);
+      await options.store.write(file, contents);
+      transfer.downloadedFiles += 1;
+      transfer.completedFiles += 1;
+      progress();
+    };
+    const worker = async () => {
+      if (firstError)
+        return;
+      const index = next++;
+      const file = manifest.files[index];
+      if (!file)
+        return;
+      try {
+        await downloadFile(file);
+      } catch (error) {
+        firstError ??= error;
+        controller.abort();
+      }
+      await worker();
+    };
+    await Promise.all(Array.from({
+      length: Math.min(networkConcurrency(options.concurrency), manifest.files.length)
+    }, () => worker()));
+    if (firstError)
+      throw firstError;
+    updateTiming();
+    return transfer;
   };
   const check = async (download = false) => {
     const response = await request(manifestUrl, {
@@ -285,7 +410,10 @@ var createAbsoluteMobileUpdateClient = (options) => {
       transfer = await downloadFiles(manifest);
       await options.store.commit(manifest);
     } catch (error) {
-      await options.store.abort(manifest.releaseId);
+      if (options.store.suspend)
+        await options.store.suspend(manifest.releaseId);
+      else
+        await options.store.abort(manifest.releaseId);
       throw error;
     }
     return { kind: "downloaded", manifest, transfer };
@@ -299,10 +427,12 @@ var createAbsoluteMobileUpdateClient = (options) => {
 
 // src/mobile/shellUpdate.ts
 var STATE_KEY = "absolute.mobile.update.state.v1";
+var STAGING_KEY = "absolute.mobile.update.staging.v1";
 var INSTALLATION_KEY = "absolute.mobile.update.installation.v1";
 var RESULT_KEY = Symbol.for("absolutejs.mobile.update.result");
 var RESULTS_KEY = Symbol.for("absolutejs.mobile.update.results");
 var ROOT = "NoCloud/ionic_built_snapshots";
+var STAGING_ROOT = "NoCloud/absolute_update_staging";
 var watchdog = registerPlugin("AbsoluteMobileUpdateWatchdog");
 var base64Bytes = (value) => Uint8Array.from(atob(value), (character) => character.charCodeAt(0));
 var arrayBuffer = (value) => new Uint8Array(value).buffer;
@@ -361,6 +491,25 @@ var readState = async () => {
   }
 };
 var writeState = (state) => Preferences.set({ key: STATE_KEY, value: JSON.stringify(state) });
+var clearStagingRoot = () => Filesystem.rmdir({
+  directory: Directory.Library,
+  path: STAGING_ROOT,
+  recursive: true
+}).catch(() => {
+  return;
+});
+var readStaging = async () => {
+  const { value } = await Preferences.get({ key: STAGING_KEY });
+  if (!value)
+    return;
+  try {
+    return parseAbsoluteMobileUpdateManifest(JSON.parse(value));
+  } catch {
+    await Preferences.remove({ key: STAGING_KEY });
+    await clearStagingRoot();
+    return;
+  }
+};
 var installationId = async () => {
   const existing = await Preferences.get({ key: INSTALLATION_KEY });
   if (existing.value && /^[a-f0-9-]{36}$/u.test(existing.value))
@@ -379,6 +528,7 @@ var webView = () => {
 };
 var currentServerBasePath = () => new Promise((resolve) => webView().getServerBasePath(resolve));
 var releasePath = (releaseId) => `${ROOT}/${releaseId}`;
+var partialPath = (releaseId, file) => `${STAGING_ROOT}/${releaseId}/${file.path}.part`;
 var releaseNativePath = async (releaseId) => {
   const { uri } = await Filesystem.getUri({
     directory: Directory.Library,
@@ -396,6 +546,15 @@ var removeRelease = async (releaseId) => {
     return;
   });
 };
+var removeStaging = async (releaseId) => {
+  await Filesystem.rmdir({
+    directory: Directory.Library,
+    path: `${STAGING_ROOT}/${releaseId}`,
+    recursive: true
+  }).catch(() => {
+    return;
+  });
+};
 var filesystemBytes = async (data) => typeof data === "string" ? base64Bytes(data) : new Uint8Array(await data.arrayBuffer());
 var createStore = () => {
   let staging;
@@ -403,6 +562,10 @@ var createStore = () => {
     abort: async (releaseId) => {
       staging = undefined;
       await removeRelease(releaseId);
+      await removeStaging(releaseId);
+      const persisted = await readStaging();
+      if (persisted?.releaseId === releaseId)
+        await Preferences.remove({ key: STAGING_KEY });
       const state = await readState();
       if (state.readyRelease === releaseId || state.pendingRelease === releaseId)
         await writeState({
@@ -439,18 +602,59 @@ var createStore = () => {
         throw error;
       }
     },
+    appendPartial: async (file, contents, offset) => {
+      if (!staging || !staging.files.some((candidate) => candidate.path === file.path))
+        throw new TypeError("Mobile update partial write is outside its staging transaction.");
+      const path = partialPath(staging.releaseId, file);
+      if (offset === 0) {
+        await Filesystem.writeFile({
+          data: bytesBase64(contents),
+          directory: Directory.Library,
+          path,
+          recursive: true
+        });
+        return;
+      }
+      const stat = await Filesystem.stat({
+        directory: Directory.Library,
+        path
+      });
+      if (stat.size !== offset)
+        throw new TypeError("Mobile update partial checkpoint changed unexpectedly.");
+      await Filesystem.appendFile({
+        data: bytesBase64(contents),
+        directory: Directory.Library,
+        path
+      });
+    },
     begin: async (manifest) => {
-      await removeRelease(manifest.releaseId);
+      const persisted = await readStaging();
+      const resume = persisted?.releaseId === manifest.releaseId && persisted.signature.keyId === manifest.signature.keyId && persisted.signature.value === manifest.signature.value;
+      if (persisted && !resume)
+        await Promise.all([
+          removeRelease(persisted.releaseId),
+          removeStaging(persisted.releaseId)
+        ]);
+      if (!resume) {
+        await removeRelease(manifest.releaseId);
+        await removeStaging(manifest.releaseId);
+      }
       await Filesystem.mkdir({
         directory: Directory.Library,
         path: releasePath(manifest.releaseId),
         recursive: true
       });
+      await Preferences.set({
+        key: STAGING_KEY,
+        value: JSON.stringify(manifest)
+      });
       staging = manifest;
     },
     commit: async (manifest) => {
       if (staging?.releaseId !== manifest.releaseId)
         throw new TypeError("Mobile update staging transaction changed identity.");
+      await removeStaging(manifest.releaseId);
+      await Preferences.remove({ key: STAGING_KEY });
       const state = await readState();
       await writeState({
         activeRelease: state.activeRelease,
@@ -459,6 +663,15 @@ var createStore = () => {
       });
       staging = undefined;
     },
+    readPartial: async (file) => {
+      if (!staging)
+        return null;
+      const result = await Filesystem.readFile({
+        directory: Directory.Library,
+        path: partialPath(staging.releaseId, file)
+      }).catch(() => null);
+      return result ? filesystemBytes(result.data).catch(() => null) : null;
+    },
     readReusable: async (file) => {
       const state = await readState();
       if (!state.activeRelease)
@@ -469,6 +682,19 @@ var createStore = () => {
       }).catch(() => null);
       return result ? filesystemBytes(result.data).catch(() => null) : null;
     },
+    readStaged: async (file) => {
+      if (!staging)
+        return null;
+      const result = await Filesystem.readFile({
+        directory: Directory.Library,
+        path: `${releasePath(staging.releaseId)}/${file.path}`
+      }).catch(() => null);
+      return result ? filesystemBytes(result.data).catch(() => null) : null;
+    },
+    suspend: async (releaseId) => {
+      if (staging?.releaseId === releaseId)
+        staging = undefined;
+    },
     write: async (file, contents) => {
       if (!staging || !staging.files.some((candidate) => candidate.path === file.path))
         throw new TypeError("Mobile update write is outside its staging transaction.");
@@ -561,18 +787,25 @@ var installAbsoluteMobileShellUpdates = async (manifest) => {
       runtimeFingerprint: manifest.nativeRuntime
     },
     store,
-    verifier: createVerifier(manifest.updates.publicKeys)
+    verifier: createVerifier(manifest.updates.publicKeys),
+    onProgress: (progress) => emitUpdateResult(progress)
   });
   const activateDownloaded = async (result) => {
     if (result.kind !== "downloaded")
       return;
     emitUpdateResult({
+      avoidedBytes: result.transfer.avoidedBytes,
+      completedFiles: result.transfer.completedFiles,
       downloadedBytes: result.transfer.downloadedBytes,
       downloadedFiles: result.transfer.downloadedFiles,
+      durationMs: Math.round(result.transfer.durationMs),
       kind: "downloaded",
       releaseId: result.manifest.releaseId,
+      resumedBytes: result.transfer.resumedBytes,
+      resumedFiles: result.transfer.resumedFiles,
       reusedBytes: result.transfer.reusedBytes,
       reusedFiles: result.transfer.reusedFiles,
+      throughputBytesPerSecond: result.transfer.throughputBytesPerSecond,
       totalBytes: result.transfer.totalBytes,
       totalFiles: result.transfer.totalFiles
     });

package/dist/src/mobile/updateClient.d.ts

@@ -13,8 +13,16 @@ export type AbsoluteMobileUpdateStore = {
     activate(releaseId: string): Promise<void>;
     begin(manifest: AbsoluteMobileUpdateManifest): Promise<void>;
     commit(manifest: AbsoluteMobileUpdateManifest): Promise<void>;
+    /** Append a response chunk to persistent staging at the expected offset. */
+    appendPartial?(file: AbsoluteMobileUpdateFile, contents: Uint8Array, offset: number): Promise<void>;
+    /** Return an unverified, incomplete download from persistent staging. */
+    readPartial?(file: AbsoluteMobileUpdateFile): Promise<Uint8Array | null>;
     /** Return a locally cached candidate for this exact path, when available. */
     readReusable?(file: AbsoluteMobileUpdateFile): Promise<Uint8Array | null>;
+    /** Return an unverified completed file from a prior staging attempt. */
+    readStaged?(file: AbsoluteMobileUpdateFile): Promise<Uint8Array | null>;
+    /** End this attempt without deleting persistent staging. */
+    suspend?(releaseId: string): Promise<void>;
     write(file: AbsoluteMobileUpdateFile, contents: Uint8Array): Promise<void>;
 };
 export type AbsoluteMobileUpdateVerifier = {
@@ -23,7 +31,10 @@ export type AbsoluteMobileUpdateVerifier = {
 };
 export type AbsoluteMobileUpdateClientOptions = {
     config: AbsoluteMobileUpdateClientConfig;
+    /** Maximum parallel asset requests. Network conditions may reduce this. */
+    concurrency?: number;
     fetch?: typeof globalThis.fetch;
+    onProgress?: (progress: AbsoluteMobileUpdateProgress) => void;
     store: AbsoluteMobileUpdateStore;
     verifier: AbsoluteMobileUpdateVerifier;
 };
@@ -41,13 +52,22 @@ export type AbsoluteMobileUpdateCheckResult = {
     manifest: AbsoluteMobileUpdateManifest;
 };
 export type AbsoluteMobileUpdateTransfer = {
+    avoidedBytes: number;
+    completedFiles: number;
     downloadedBytes: number;
     downloadedFiles: number;
+    durationMs: number;
+    resumedBytes: number;
+    resumedFiles: number;
     reusedBytes: number;
     reusedFiles: number;
+    throughputBytesPerSecond: number;
     totalBytes: number;
     totalFiles: number;
 };
+export type AbsoluteMobileUpdateProgress = AbsoluteMobileUpdateTransfer & {
+    kind: 'download-progress';
+};
 export declare const createAbsoluteMobileUpdateClient: (options: AbsoluteMobileUpdateClientOptions) => {
     check: (download?: boolean) => Promise<AbsoluteMobileUpdateCheckResult>;
     activate: (releaseId: string) => Promise<void>;

package/package.json

@@ -9,7 +9,7 @@
 	"dependencies": {
 		"@absolutejs/auth": ">=0.75.0 <0.77.0",
 		"@absolutejs/beacon": ">=0.7.0-beta.4 <0.8.0",
-		"@absolutejs/deploy": "0.25.8",
+		"@absolutejs/deploy": "0.25.9",
 		"@absolutejs/devices": "0.7.0",
 		"@absolutejs/devices-capacitor": "0.8.0",
 		"@absolutejs/devices-expo": "0.0.2",
@@ -523,7 +523,7 @@
 			]
 		}
 	},
-	"version": "0.20.0-beta.84",
+	"version": "0.20.0-beta.85",
 	"workspaces": [
 		"tests/fixtures/*",
 		"tests/fixtures/_packages/*"