@hot-updater/cli-tools 0.35.12 → 0.36.1

package/dist/index.mjs

@@ -36,7 +36,7 @@ import { parseSync } from "oxc-parser";
 import { loadConfig as loadConfig$1 } from "unconfig";
 import { brotliDecompressSync, createBrotliCompress as createBrotliCompress$1 } from "node:zlib";
 import { getManifestFileHash, stripBundleArtifactMetadata } from "@hot-updater/core";
-import { createUUIDv7, detectCompressionFormat } from "@hot-updater/plugin-core";
+import { createBundleStorageKey, createStorageRootUriWithPath, createUUIDv7, detectCompressionFormat, getContentAddressedAssetStoragePath, getManifestAssetDownloadPath, resolveManifestAssetStorageUri } from "@hot-updater/plugin-core";
 import { transformSync } from "oxc-transform";
 //#endregion
 //#region src/colors.ts
@@ -43875,7 +43875,6 @@ const getRelativeStorageDir = (relativePath) => {
 	const dirname = path$1.posix.dirname(normalized);
 	return dirname === "." ? "" : dirname;
 };
-const isBundleAsset = (relativePath) => /(^|\/)[^/]+\.(ios|android)\.bundle$/.test(relativePath.replace(/\\/g, "/"));
 function resolvePreparedUploadPath(rootDir, assetPath) {
 	const normalizedAssetPath = assetPath.replaceAll("\\", "/");
 	const outputPath = path$1.resolve(rootDir, "upload-artifacts", `${normalizedAssetPath}.br`);
@@ -43884,19 +43883,20 @@ function resolvePreparedUploadPath(rootDir, assetPath) {
 	return outputPath;
 }
 async function prepareManifestAssetUploadFile({ assetPath, sourcePath, workDir }) {
-	if (!isBundleAsset(assetPath)) return sourcePath;
+	if (getManifestAssetDownloadPath(assetPath) === assetPath) return sourcePath;
 	const uploadPath = resolvePreparedUploadPath(workDir, assetPath);
 	await fs$3.mkdir(path$1.dirname(uploadPath), { recursive: true });
 	await pipeline$1(createReadStream(sourcePath), createBrotliCompress$1(), createWriteStream$1(uploadPath));
 	return uploadPath;
 }
-const replaceStorageUriLeaf = (storageUri, nextLeaf) => {
-	const storageUrl = new URL(storageUri);
-	const normalizedPath = storageUrl.pathname.replace(/\/+$/, "");
-	const lastSlashIndex = normalizedPath.lastIndexOf("/");
-	storageUrl.pathname = `${lastSlashIndex >= 0 ? normalizedPath.slice(0, lastSlashIndex) : ""}/${nextLeaf}`;
-	return storageUrl.toString();
-};
+async function prepareContentAddressedUploadFile({ sourcePath, storagePath, workDir }) {
+	const filename = path$1.posix.basename(storagePath);
+	if (path$1.basename(sourcePath) === filename) return sourcePath;
+	const uploadPath = path$1.join(workDir, "upload-artifacts", "content-addressed", filename);
+	await fs$3.mkdir(path$1.dirname(uploadPath), { recursive: true });
+	await fs$3.copyFile(sourcePath, uploadPath);
+	return uploadPath;
+}
 function resolveExtractedPath(rootDir, entryName) {
 	const normalizedEntryName = entryName.replaceAll("\\", "/");
 	const entryPath = path$1.resolve(rootDir, normalizedEntryName);
@@ -44037,26 +44037,39 @@ async function createCopiedBundleArchive({ bundle, config, nextBundleId, storage
 		const signingKeyPath = config.signing?.enabled && config.signing.privateKeyPath ? config.signing.privateKeyPath : null;
 		const nextFileHash = signingKeyPath ? await signFileHash(fileHash, signingKeyPath) : fileHash;
 		const nextManifestFileHash = signingKeyPath ? await signFileHash(manifestHash, signingKeyPath) : manifestHash;
-		const archiveUpload = await storagePlugin.profiles.node.upload(nextBundleId, outputArchivePath);
+		const archiveUpload = await storagePlugin.profiles.node.upload(createBundleStorageKey(nextBundleId), outputArchivePath);
 		uploadedStorageUris.push(archiveUpload.storageUri);
-		const manifestUpload = await storagePlugin.profiles.node.upload(nextBundleId, manifestPath);
+		const manifestUpload = await storagePlugin.profiles.node.upload(createBundleStorageKey(nextBundleId), manifestPath);
 		uploadedStorageUris.push(manifestUpload.storageUri);
+		const assetBaseStorageUri = createStorageRootUriWithPath(manifestUpload.storageUri, nextBundleId, "assets");
 		const assetPaths = Object.keys(manifest.assets ?? {}).sort((left, right) => left.localeCompare(right));
 		for (const assetPath of assetPaths) {
-			const uploadKey = [
-				nextBundleId,
-				"files",
-				getRelativeStorageDir(assetPath)
-			].filter(Boolean).join("/");
+			const asset = manifest.assets?.[assetPath];
+			if (!asset?.fileHash) throw new Error(`Manifest file hash not found for ${assetPath}`);
 			const uploadPath = await prepareManifestAssetUploadFile({
 				assetPath,
 				sourcePath: path$1.join(extractDir, assetPath),
 				workDir
 			});
-			const assetUpload = await storagePlugin.profiles.node.upload(uploadKey, uploadPath);
-			uploadedStorageUris.push(assetUpload.storageUri);
+			const uploadName = getManifestAssetDownloadPath(assetPath);
+			const storagePath = getContentAddressedAssetStoragePath({
+				assetPath: uploadName,
+				fileHash: asset.fileHash
+			});
+			const storageUri = resolveManifestAssetStorageUri({
+				assetBaseStorageUri,
+				assetPath: uploadName,
+				fileHash: asset.fileHash
+			});
+			if (!await storagePlugin.profiles.node.exists(storageUri)) {
+				const contentAddressedUploadPath = await prepareContentAddressedUploadFile({
+					sourcePath: uploadPath,
+					storagePath,
+					workDir
+				});
+				await storagePlugin.profiles.node.upload(getRelativeStorageDir(storagePath) ? `assets/${getRelativeStorageDir(storagePath)}` : "assets", contentAddressedUploadPath);
+			}
 		}
-		const assetBaseStorageUri = replaceStorageUriLeaf(manifestUpload.storageUri, "files");
 		return {
 			bundle: {
 				...bundle,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/cli-tools",
-  "version": "0.35.12",
+  "version": "0.36.1",
   "type": "module",
   "engines": {
     "node": ">=20.19.0"
@@ -49,8 +49,8 @@
     "oxc-parser": "0.141.0",
     "oxc-transform": "0.141.0",
     "unconfig": "7.5.0",
-    "@hot-updater/core": "0.35.12",
-    "@hot-updater/plugin-core": "0.35.12"
+    "@hot-updater/core": "0.36.1",
+    "@hot-updater/plugin-core": "0.36.1"
   },
   "devDependencies": {
     "@clack/prompts": "1.7.0",
@@ -64,7 +64,7 @@
     "tar": "^7.5.16",
     "verkit": "0.3.2",
     "workspace-tools": "^0.41.7",
-    "@hot-updater/test-utils": "0.35.12"
+    "@hot-updater/test-utils": "0.36.1"
   },
   "inlinedDependencies": {
     "@babel/code-frame": "7.29.0",