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

package/dist/cli/index.js

@@ -203,7 +203,7 @@ if (command === "dev") {
   sendTelemetryEvent("cli:command", {
     command: `mobile:${workspaceCommand ?? "unknown"}`
   });
-  const { runMobile } = await import("./mobile-9dx39bd3.js");
+  const { runMobile } = await import("./mobile-pdck6a35.js");
   try {
     await runMobile(args);
   } catch (error) {

package/dist/cli/{mobile-9dx39bd3.js → mobile-pdck6a35.js}

@@ -21994,6 +21994,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 (!object3(result) || result.appId !== appId || !Array.isArray(result.releases) || ![
     result.channelCount,
@@ -22003,7 +22004,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;
 };
@@ -22023,7 +22028,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;
 };
@@ -22069,7 +22074,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;
 };
@@ -22832,6 +22842,8 @@ var publishMobileUpdate = async (args) => {
     rollout: updateRollout(args, 0.05)
   });
   console.log(`${result.reused ? "Reused" : "Published"} mobile update ${result.releaseId} to ${result.channel} at ${Math.round(result.rollout * 100)}%.`);
+  if (result.storedBytes !== undefined && result.reusedBytes !== undefined && result.storedFiles !== undefined && result.reusedFiles !== undefined)
+    console.log(`Stored ${formatBytes(result.storedBytes)} in ${result.storedFiles} new content blobs; reused ${formatBytes(result.reusedBytes)} across ${result.reusedFiles} files.`);
   return result;
 };
 var promoteMobileUpdate = async (args) => {
@@ -22889,6 +22901,8 @@ var mobileUpdateRetention = (args) => {
 };
 var printMobileUpdateStorage = (report) => {
   console.log(`${report.appId}: ${report.releaseCount} releases use ${formatBytes(report.releaseBytes)}; ${formatBytes(report.reclaimableBytes)} is eligible across ${report.totalObjectCount} stored objects.`);
+  if (typeof report.contentBlobCount === "number" && typeof report.contentBlobBytes === "number" && typeof report.reclaimableContentBytes === "number" && report.contentBlobCount > 0)
+    console.log(`  Shared content: ${report.contentBlobCount} blobs use ${formatBytes(report.contentBlobBytes)}; ${formatBytes(report.reclaimableContentBytes)} becomes reclaimable with the eligible releases.`);
   for (const release of report.releases) {
     let state = "eligible";
     if (release.protectedBy.length > 0)

package/dist/index.js

@@ -12455,6 +12455,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, file2) => `${releaseRoot(manifest)}/files/${file2.path}`;
+  const contentBlobKey = (appId, sha256) => `${root(appId)}/blobs/${sha256}`;
   const tombstoneKey = (appId, releaseId) => `${root(appId)}/gc/${releaseId}.json`;
   const channelKey = (appId, channel) => {
     if (!APP_ID.test(appId) || !NAME.test(channel))
@@ -12601,9 +12602,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 sha256 = blobObject.key.slice(blobPrefix.length);
+        if (HASH.test(sha256)) {
+          objectKeysByDigest.set(sha256, blobObject.key);
+          objectBytesByDigest.set(sha256, blobObject.size);
+        }
+      }
       if (!blobObject.key.startsWith(releasePrefix))
         continue;
       const suffix = blobObject.key.slice(releasePrefix.length);
@@ -12682,20 +12693,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((file2) => file2.sha256)));
+    const reclaimableContentBytes = [...objectBytesByDigest].filter(([sha256]) => !protectedDigests.has(sha256)).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
       }
     };
   };
@@ -12707,7 +12726,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;
@@ -12765,6 +12785,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 file2 of manifest?.manifest.files ?? [])
+        referencedDigests.add(file2.sha256);
+    }
+    for (const [sha256, key] of afterReleaseSweep.objectKeysByDigest) {
+      if (referencedDigests.has(sha256))
+        continue;
+      const head = await options.store.head(key);
+      await remove(key);
+      result.reclaimedBytes += head?.size ?? 0;
+      result.sweptContentBlobs.push(sha256);
+    }
     return result;
   };
   return {
@@ -12781,8 +12816,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, file2) => total + file2.bytes, 0);
+        reusedFiles = manifest.files.length;
+      }
       if (!existing) {
         for (const file2 of manifest.files) {
           const local = path.join(localRoot, "files", file2.path);
@@ -12791,18 +12834,24 @@ var MOBILE_UPDATE_REGISTRY_FORMAT = 1, DEFAULT_PREFIX = "absolutejs/mobile-updat
             throw new MobileUpdateRegistryError(`Mobile update file ${file2.path} size changed`);
           if (await fileDigest(Bun.file(local)) !== file2.sha256)
             throw new MobileUpdateRegistryError(`Mobile update file ${file2.path} integrity failed`);
-          const key = fileKey(manifest, file2);
+          const key = contentBlobKey(manifest.appId, file2.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: file2.bytes,
-              metadata: { releaseid: manifest.releaseId, sha256: file2.sha256 },
+              metadata: { sha256: file2.sha256 },
               signal: input.signal
             });
-          } else if (stored.size !== file2.bytes || stored.metadata?.sha256 !== file2.sha256 || (stored.metadata?.releaseid ?? stored.metadata?.releaseId) !== manifest.releaseId)
-            throw new MobileUpdateRegistryError("Stored mobile update file identity changed");
+            storedBytes += file2.bytes;
+            storedFiles += 1;
+          } else if (stored.size !== file2.bytes || stored.metadata?.sha256 !== file2.sha256)
+            throw new MobileUpdateRegistryError("Stored mobile update content identity changed");
+          else {
+            reusedBytes += file2.bytes;
+            reusedFiles += 1;
+          }
         }
         const bytes = json(manifest);
         await options.store.put(manifestKey(manifest), bytes, {
@@ -12826,8 +12875,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"
       };
@@ -12876,14 +12929,16 @@ var MOBILE_UPDATE_REGISTRY_FORMAT = 1, DEFAULT_PREFIX = "absolutejs/mobile-updat
       const file2 = release.manifest.files.find((candidate) => candidate.path === requested);
       if (!file2)
         return null;
-      const key = fileKey(release.manifest, file2);
+      const legacyKey = fileKey(release.manifest, file2);
+      const legacyHead = await options.store.head(legacyKey);
+      const key = legacyHead ? legacyKey : contentBlobKey(release.manifest.appId, file2.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 !== file2.bytes || head.size !== file2.bytes || head.metadata?.sha256 !== file2.sha256 || (head.metadata?.releaseid ?? head.metadata?.releaseId) !== release.manifest.releaseId || digest(bytes) !== file2.sha256)
+      if (bytes.byteLength !== file2.bytes || head.size !== file2.bytes || head.metadata?.sha256 !== file2.sha256 || legacyHead && (head.metadata?.releaseid ?? head.metadata?.releaseId) !== release.manifest.releaseId || digest(bytes) !== file2.sha256)
         throw new MobileUpdateRegistryError("Stored mobile update file integrity failed");
       return { bytes, file: file2 };
     }
@@ -44809,5 +44864,5 @@ export {
   wrapPageHandlerWithStreamingSlots
 };
 
-//# debugId=F0D48E431F12D4EB64756E2164756E21
+//# debugId=CE82990F0B81B09764756E2164756E21
 //# sourceMappingURL=index.js.map