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

package/dist/mobile/index.js

@@ -20137,6 +20137,7 @@ var MOBILE_UPDATE_REGISTRY_FORMAT = 1, DEFAULT_PREFIX = "absolutejs/mobile-updat
   const releaseRoot = (manifest) => `${root(manifest.appId)}/releases/${manifest.releaseId}`;
   const manifestKey = (manifest) => `${releaseRoot(manifest)}/update.json`;
   const fileKey = (manifest, file) => `${releaseRoot(manifest)}/files/${file.path}`;
+  const contentBlobKey = (appId, sha2563) => `${root(appId)}/blobs/${sha2563}`;
   const tombstoneKey = (appId, releaseId) => `${root(appId)}/gc/${releaseId}.json`;
   const channelKey = (appId, channel) => {
     if (!APP_ID.test(appId) || !NAME.test(channel))
@@ -20283,9 +20284,19 @@ var MOBILE_UPDATE_REGISTRY_FORMAT = 1, DEFAULT_PREFIX = "absolutejs/mobile-updat
     const releasePrefix = `${appRoot}releases/`;
     const channelPrefix = `${appRoot}channels/`;
     const markerPrefix = `${appRoot}gc/`;
+    const blobPrefix = `${appRoot}blobs/`;
     const objectKeysByRelease = new Map;
     const objectBytesByRelease = new Map;
+    const objectKeysByDigest = new Map;
+    const objectBytesByDigest = new Map;
     for (const blobObject of objects) {
+      if (blobObject.key.startsWith(blobPrefix)) {
+        const sha2563 = blobObject.key.slice(blobPrefix.length);
+        if (HASH.test(sha2563)) {
+          objectKeysByDigest.set(sha2563, blobObject.key);
+          objectBytesByDigest.set(sha2563, blobObject.size);
+        }
+      }
       if (!blobObject.key.startsWith(releasePrefix))
         continue;
       const suffix = blobObject.key.slice(releasePrefix.length);
@@ -20364,20 +20375,28 @@ var MOBILE_UPDATE_REGISTRY_FORMAT = 1, DEFAULT_PREFIX = "absolutejs/mobile-updat
         releaseId: manifest.releaseId
       };
     }).toSorted((left, right) => right.createdAt.localeCompare(left.createdAt));
+    const protectedReleaseIds = new Set(releases.filter((release) => release.protectedBy.length > 0).map((release) => release.releaseId));
+    const protectedDigests = new Set(manifests.filter((manifest) => protectedReleaseIds.has(manifest.releaseId)).flatMap((manifest) => manifest.files.map((file) => file.sha256)));
+    const reclaimableContentBytes = [...objectBytesByDigest].filter(([sha2563]) => !protectedDigests.has(sha2563)).reduce((total, [, bytes]) => total + bytes, 0);
+    const contentBlobBytes = [...objectBytesByDigest.values()].reduce((total, bytes) => total + bytes, 0);
     const releaseBytes = releases.reduce((total, release) => total + release.bytes, 0);
     const totalBytes = objects.reduce((total, object22) => total + object22.size, 0);
     return {
       objectKeysByRelease,
+      objectKeysByDigest,
       report: {
         appId: input.appId,
         channelCount: channels.length,
-        reclaimableBytes: releases.filter((release) => release.protectedBy.length === 0).reduce((total, release) => total + release.bytes, 0),
+        contentBlobBytes,
+        contentBlobCount: objectKeysByDigest.size,
+        reclaimableBytes: releases.filter((release) => release.protectedBy.length === 0).reduce((total, release) => total + release.bytes, 0) + reclaimableContentBytes,
+        reclaimableContentBytes,
         releaseBytes,
         releaseCount: releases.length,
         releases,
         totalBytes,
         totalObjectCount: objects.length,
-        untrackedBytes: totalBytes - releaseBytes
+        untrackedBytes: totalBytes - releaseBytes - contentBlobBytes
       }
     };
   };
@@ -20389,7 +20408,8 @@ var MOBILE_UPDATE_REGISTRY_FORMAT = 1, DEFAULT_PREFIX = "absolutejs/mobile-updat
       marked: [],
       reclaimedBytes: 0,
       restored: [],
-      swept: []
+      swept: [],
+      sweptContentBlobs: []
     };
     if (input.apply !== true)
       return result;
@@ -20447,6 +20467,21 @@ var MOBILE_UPDATE_REGISTRY_FORMAT = 1, DEFAULT_PREFIX = "absolutejs/mobile-updat
       result.reclaimedBytes += candidate.bytes;
       result.swept.push(release.releaseId);
     }
+    const afterReleaseSweep = await inventory(input);
+    const referencedDigests = new Set;
+    for (const release of afterReleaseSweep.report.releases) {
+      const manifest = await readManifest(input.appId, release.releaseId);
+      for (const file of manifest?.manifest.files ?? [])
+        referencedDigests.add(file.sha256);
+    }
+    for (const [sha2563, key] of afterReleaseSweep.objectKeysByDigest) {
+      if (referencedDigests.has(sha2563))
+        continue;
+      const head = await options.store.head(key);
+      await remove(key);
+      result.reclaimedBytes += head?.size ?? 0;
+      result.sweptContentBlobs.push(sha2563);
+    }
     return result;
   };
   return {
@@ -20463,8 +20498,16 @@ var MOBILE_UPDATE_REGISTRY_FORMAT = 1, DEFAULT_PREFIX = "absolutejs/mobile-updat
         throw new MobileUpdateRegistryError("Local mobile update manifest changed");
       const existing = await readManifest(manifest.appId, manifest.releaseId);
       let reused = existing !== null;
+      let storedBytes = 0;
+      let storedFiles = 0;
+      let reusedBytes = 0;
+      let reusedFiles = 0;
       if (existing && JSON.stringify(existing.manifest) !== JSON.stringify(manifest))
         throw new MobileUpdateRegistryError("Published mobile update is immutable");
+      if (existing) {
+        reusedBytes = manifest.files.reduce((total, file) => total + file.bytes, 0);
+        reusedFiles = manifest.files.length;
+      }
       if (!existing) {
         for (const file of manifest.files) {
           const local = path.join(localRoot, "files", file.path);
@@ -20473,18 +20516,24 @@ var MOBILE_UPDATE_REGISTRY_FORMAT = 1, DEFAULT_PREFIX = "absolutejs/mobile-updat
             throw new MobileUpdateRegistryError(`Mobile update file ${file.path} size changed`);
           if (await fileDigest(Bun.file(local)) !== file.sha256)
             throw new MobileUpdateRegistryError(`Mobile update file ${file.path} integrity failed`);
-          const key = fileKey(manifest, file);
+          const key = contentBlobKey(manifest.appId, file.sha256);
           const stored = await options.store.head(key);
           if (!stored) {
             await options.store.put(key, Bun.file(local).stream(), {
               cacheControl: "public, max-age=31536000, immutable",
               contentType: "application/octet-stream",
               maxBytes: file.bytes,
-              metadata: { releaseid: manifest.releaseId, sha256: file.sha256 },
+              metadata: { sha256: file.sha256 },
               signal: input.signal
             });
-          } else if (stored.size !== file.bytes || stored.metadata?.sha256 !== file.sha256 || (stored.metadata?.releaseid ?? stored.metadata?.releaseId) !== manifest.releaseId)
-            throw new MobileUpdateRegistryError("Stored mobile update file identity changed");
+            storedBytes += file.bytes;
+            storedFiles += 1;
+          } else if (stored.size !== file.bytes || stored.metadata?.sha256 !== file.sha256)
+            throw new MobileUpdateRegistryError("Stored mobile update content identity changed");
+          else {
+            reusedBytes += file.bytes;
+            reusedFiles += 1;
+          }
         }
         const bytes = json(manifest);
         await options.store.put(manifestKey(manifest), bytes, {
@@ -20508,8 +20557,12 @@ var MOBILE_UPDATE_REGISTRY_FORMAT = 1, DEFAULT_PREFIX = "absolutejs/mobile-updat
       return {
         appId: manifest.appId,
         channel: manifest.channel,
+        storedBytes,
+        storedFiles,
         releaseId: manifest.releaseId,
         reused,
+        reusedBytes,
+        reusedFiles,
         rollout: input.rollout,
         stage: "published"
       };
@@ -20558,14 +20611,16 @@ var MOBILE_UPDATE_REGISTRY_FORMAT = 1, DEFAULT_PREFIX = "absolutejs/mobile-updat
       const file = release.manifest.files.find((candidate) => candidate.path === requested);
       if (!file)
         return null;
-      const key = fileKey(release.manifest, file);
+      const legacyKey = fileKey(release.manifest, file);
+      const legacyHead = await options.store.head(legacyKey);
+      const key = legacyHead ? legacyKey : contentBlobKey(release.manifest.appId, file.sha256);
       const [bytes, head] = await Promise.all([
         options.store.get(key),
-        options.store.head(key)
+        legacyHead ? Promise.resolve(legacyHead) : options.store.head(key)
       ]);
       if (!bytes || !head)
         return null;
-      if (bytes.byteLength !== file.bytes || head.size !== file.bytes || head.metadata?.sha256 !== file.sha256 || (head.metadata?.releaseid ?? head.metadata?.releaseId) !== release.manifest.releaseId || digest(bytes) !== file.sha256)
+      if (bytes.byteLength !== file.bytes || head.size !== file.bytes || head.metadata?.sha256 !== file.sha256 || legacyHead && (head.metadata?.releaseid ?? head.metadata?.releaseId) !== release.manifest.releaseId || digest(bytes) !== file.sha256)
         throw new MobileUpdateRegistryError("Stored mobile update file integrity failed");
       return { bytes, file };
     }
@@ -38702,10 +38757,26 @@ var requireCompatible = (manifest, config) => {
 var createAbsoluteMobileUpdateClient = (options) => {
   const manifestUrl = exactManifestUrl(options.config.manifestUrl);
   const request = options.fetch ?? globalThis.fetch;
-  const downloadFiles = async (manifest, index = 0, received = 0) => {
+  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 received;
+      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 asset2 = await request(fileUrl(manifestUrl, manifest.releaseId, file.path), {
       cache: "no-store",
       credentials: "omit",
@@ -38715,13 +38786,17 @@ var createAbsoluteMobileUpdateClient = (options) => {
     if (!asset2.ok)
       throw new TypeError(`Mobile update asset ${file.path} failed with HTTP ${asset2.status}.`);
     const contents = await readBounded(asset2, file.bytes);
-    const total = received + contents.byteLength;
-    if (contents.byteLength !== file.bytes || total > ABSOLUTE_MOBILE_UPDATE_MAX_TOTAL_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, total);
+    return downloadFiles(manifest, index + 1, {
+      ...transfer,
+      downloadedBytes,
+      downloadedFiles: transfer.downloadedFiles + 1
+    });
   };
   const check = async (download = false) => {
     const response = await request(manifestUrl, {
@@ -38753,14 +38828,15 @@ var createAbsoluteMobileUpdateClient = (options) => {
     if (!download)
       return { kind: "update-available", manifest };
     await options.store.begin(manifest);
+    let transfer;
     try {
-      await downloadFiles(manifest);
+      transfer = await downloadFiles(manifest);
       await options.store.commit(manifest);
     } catch (error) {
       await options.store.abort(manifest.releaseId);
       throw error;
     }
-    return { kind: "downloaded", manifest };
+    return { kind: "downloaded", manifest, transfer };
   };
   return {
     check,
@@ -38888,6 +38964,7 @@ var lifecycleMethod = (publisher, name) => {
     throw new TypeError(`Mobile update registry does not support ${name}. Re-run \`absolute mobile update provision --force\` after upgrading @absolutejs/deploy.`);
   return method;
 };
+var validOptionalCounters = (values) => values.every((value) => value === undefined) || values.every((value) => Number.isSafeInteger(value) && (value ?? -1) >= 0);
 var validateStorageIdentity = (result, appId) => {
   if (!object5(result) || result.appId !== appId || !Array.isArray(result.releases) || ![
     result.channelCount,
@@ -38897,7 +38974,11 @@ var validateStorageIdentity = (result, appId) => {
     result.totalBytes,
     result.totalObjectCount,
     result.untrackedBytes
-  ].every((value) => Number.isSafeInteger(value) && value >= 0))
+  ].every((value) => Number.isSafeInteger(value) && value >= 0) || !validOptionalCounters([
+    result.contentBlobBytes,
+    result.contentBlobCount,
+    result.reclaimableContentBytes
+  ]))
     throw new TypeError("Mobile update registry returned an invalid storage report.");
   return result;
 };
@@ -38917,7 +38998,7 @@ var pruneAbsoluteMobileUpdates = async (options) => {
     ...options.signal ? { signal: options.signal } : {}
   });
   validateStorageIdentity(result, options.appId);
-  if (!Array.isArray(result.marked) || !Array.isArray(result.restored) || !Array.isArray(result.swept) || typeof result.dryRun !== "boolean" || !Number.isSafeInteger(result.reclaimedBytes) || result.reclaimedBytes < 0)
+  if (!Array.isArray(result.marked) || !Array.isArray(result.restored) || !Array.isArray(result.swept) || result.sweptContentBlobs !== undefined && !Array.isArray(result.sweptContentBlobs) || typeof result.dryRun !== "boolean" || !Number.isSafeInteger(result.reclaimedBytes) || result.reclaimedBytes < 0)
     throw new TypeError("Mobile update registry returned an invalid collection report.");
   return result;
 };
@@ -38963,7 +39044,12 @@ var publishAbsoluteMobileUpdate = async (options) => {
     rollout: options.rollout,
     signal: options.signal
   });
-  if (result.appId !== manifest.appId || result.channel !== manifest.channel || result.releaseId !== manifest.releaseId || result.rollout !== options.rollout || result.stage !== "published" || typeof result.reused !== "boolean")
+  if (result.appId !== manifest.appId || result.channel !== manifest.channel || result.releaseId !== manifest.releaseId || result.rollout !== options.rollout || result.stage !== "published" || typeof result.reused !== "boolean" || !validOptionalCounters([
+    result.storedBytes,
+    result.storedFiles,
+    result.reusedBytes,
+    result.reusedFiles
+  ]))
     throw new TypeError("Mobile update registry returned a different publication identity.");
   return result;
 };
@@ -39247,5 +39333,5 @@ export {
   writeAbsoluteMobileUpdateRegistry
 };
 
-//# debugId=FB53026A710DD13464756E2164756E21
+//# debugId=A051836D5390197D64756E2164756E21
 //# sourceMappingURL=index.js.map