@hot-updater/cli-tools 0.30.12 → 0.31.1

package/dist/index.d.mts

@@ -1,7 +1,8 @@
 import { Readable } from "stream";
 import { Key as Key$1 } from "node:readline";
 import { Readable as Readable$1, Writable } from "node:stream";
-import { Bundle, ConfigInput, DatabasePlugin, Platform, RequiredDeep, StoragePlugin } from "@hot-updater/plugin-core";
+import * as _$_hot_updater_core0 from "@hot-updater/core";
+import { Bundle, ConfigInput, DatabasePlugin, NodeStoragePlugin, Platform, RequiredDeep } from "@hot-updater/plugin-core";
 
 //#region src/BuildLogger.d.ts
 type LinePattern = string | RegExp;
@@ -366,14 +367,6 @@ declare const makeEnv: (newEnvVars: Record<string, EnvVarValue>, filePath?: stri
   preserveKeys?: string[];
 }) => Promise<string>;
 //#endregion
-//#region ../core/dist/index.d.mts
-//#endregion
-//#region src/types.d.ts
-type Platform$1 = "ios" | "android";
-type BundleMetadata = {
-  app_version?: string;
-};
-//#endregion
 //#region src/promoteBundle.d.ts
 declare const LEGACY_BUNDLE_ERROR = "This OTA bundle was created by a version that does not support manifest.json. Copy bundle is not available.";
 interface PromoteBundleInput {
@@ -385,7 +378,7 @@ interface PromoteBundleInput {
 interface PromoteBundleDependencies {
   config: ConfigResponse;
   databasePlugin: DatabasePlugin;
-  storagePlugin: StoragePlugin | null;
+  storagePlugin: NodeStoragePlugin | null;
 }
 declare function createCopiedBundleArchive({
   bundle,
@@ -397,23 +390,34 @@ declare function createCopiedBundleArchive({
   bundle: Bundle;
   config: ConfigResponse;
   nextBundleId: string;
-  storagePlugin: StoragePlugin;
+  storagePlugin: NodeStoragePlugin;
   targetChannel: string;
 }): Promise<{
-  id: string;
-  channel: string;
-  storageUri: string;
-  fileHash: string;
-  platform: Platform$1;
-  shouldForceUpdate: boolean;
-  enabled: boolean;
-  gitCommitHash: string | null;
-  message: string | null;
-  targetAppVersion: string | null;
-  fingerprintHash: string | null;
-  metadata?: BundleMetadata;
-  rolloutCohortCount?: number | null;
-  targetCohorts?: string[] | null;
+  bundle: {
+    id: string;
+    channel: string;
+    storageUri: string;
+    fileHash: string;
+    metadata: _$_hot_updater_core0.BundleMetadata | undefined;
+    assetBaseStorageUri: string;
+    patches: never[];
+    patchBaseBundleId: null;
+    manifestFileHash: string;
+    manifestStorageUri: string;
+    patchBaseFileHash: null;
+    patchFileHash: null;
+    patchStorageUri: null;
+    platform: _$_hot_updater_core0.Platform;
+    shouldForceUpdate: boolean;
+    enabled: boolean;
+    gitCommitHash: string | null;
+    message: string | null;
+    targetAppVersion: string | null;
+    fingerprintHash: string | null;
+    rolloutCohortCount?: number | null;
+    targetCohorts?: string[] | null;
+  };
+  uploadedStorageUris: string[];
 }>;
 declare function promoteBundle({
   action,

package/dist/index.mjs

@@ -34,6 +34,7 @@ import { Buffer as Buffer$2 } from "node:buffer";
 import ts from "typescript";
 import { loadConfig as loadConfig$1 } from "unconfig";
 import { brotliDecompressSync } from "node:zlib";
+import { getManifestFileHash, stripBundleArtifactMetadata } from "@hot-updater/core";
 import { createUUIDv7, detectCompressionFormat } from "@hot-updater/plugin-core";
 import { transformSync } from "oxc-transform";
 //#endregion
@@ -42930,6 +42931,10 @@ const getDefaultConfig = () => {
 		updateStrategy: "appVersion",
 		compressStrategy: "zip",
 		fingerprint: { extraSources: [] },
+		patch: {
+			enabled: true,
+			maxBaseBundles: 3
+		},
 		console: { port: 1422 },
 		platform: getDefaultPlatformConfig(),
 		nativeBuild: {
@@ -43064,6 +43069,18 @@ function getArchiveFilename(storageUri) {
 	const { pathname } = new URL(storageUri);
 	return path$1.basename(pathname) || "bundle.zip";
 }
+const getRelativeStorageDir = (relativePath) => {
+	const normalized = relativePath.replace(/\\/g, "/");
+	const dirname = path$1.posix.dirname(normalized);
+	return dirname === "." ? "" : dirname;
+};
+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();
+};
 function resolveExtractedPath(rootDir, entryName) {
 	const normalizedEntryName = entryName.replaceAll("\\", "/");
 	const entryPath = path$1.resolve(rootDir, normalizedEntryName);
@@ -43071,11 +43088,25 @@ function resolveExtractedPath(rootDir, entryName) {
 	if (relativePath.startsWith("..") || path$1.isAbsolute(relativePath) || normalizedEntryName.startsWith("/")) throw new Error(`Invalid archive entry path: ${entryName}`);
 	return entryPath;
 }
-async function downloadArchive(fileUrl, archivePath) {
+async function downloadArchive(storageUri, storagePlugin, archivePath) {
+	const protocol = new URL(storageUri).protocol.replace(":", "");
+	if (protocol === "http" || protocol === "https") {
+		const archiveBuffer = await downloadFromUrl(storageUri);
+		await fs$3.writeFile(archivePath, archiveBuffer);
+		return;
+	}
+	await downloadFromStorage(storageUri, storagePlugin, archivePath);
+}
+async function downloadFromUrl(fileUrl) {
 	const response = await fetch(fileUrl);
 	if (!response.ok) throw new Error(`Failed to download bundle archive: ${response.statusText}`);
-	const archiveBuffer = Buffer.from(await response.arrayBuffer());
-	await fs$3.writeFile(archivePath, archiveBuffer);
+	return new Uint8Array(await response.arrayBuffer());
+}
+async function downloadFromStorage(storageUri, storagePlugin, filePath) {
+	if (!storagePlugin) throw new Error("Storage plugin is not configured");
+	const protocol = new URL(storageUri).protocol.replace(":", "");
+	if (storagePlugin.supportedProtocol !== protocol) throw new Error(`No storage plugin for protocol: ${protocol}`);
+	await storagePlugin.profiles.node.downloadFile(storageUri, filePath);
 }
 async function extractZipArchive(archivePath, extractDir) {
 	const zip = await import_lib.default.loadAsync(await fs$3.readFile(archivePath));
@@ -43165,41 +43196,68 @@ async function rewriteManifestBundleId(extractDir, nextBundleId) {
 	const manifest = JSON.parse(await fs$3.readFile(manifestPath, "utf8"));
 	manifest.bundleId = nextBundleId;
 	await fs$3.writeFile(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
-}
-async function resolveBundleDownloadUrl(storageUri, storagePlugin) {
-	const protocol = new URL(storageUri).protocol.replace(":", "");
-	if (protocol === "http" || protocol === "https") return storageUri;
-	if (!storagePlugin) throw new Error("Storage plugin is not configured");
-	if (storagePlugin.supportedProtocol !== protocol) throw new Error(`No storage plugin for protocol: ${protocol}`);
-	const { fileUrl } = await storagePlugin.getDownloadUrl(storageUri);
-	if (!fileUrl) throw new Error("Storage plugin returned empty fileUrl");
-	return fileUrl;
+	return {
+		manifest,
+		manifestPath
+	};
 }
 async function createCopiedBundleArchive({ bundle, config, nextBundleId, storagePlugin, targetChannel }) {
-	const downloadUrl = await resolveBundleDownloadUrl(bundle.storageUri, storagePlugin);
 	const archiveFilename = getArchiveFilename(bundle.storageUri);
 	const workDir = await fs$3.mkdtemp(path$1.join(os.tmpdir(), "hot-updater-console-promote-"));
 	const sourceArchivePath = path$1.join(workDir, archiveFilename);
 	const extractDir = path$1.join(workDir, "bundle");
 	const outputArchivePath = path$1.join(workDir, archiveFilename);
+	const uploadedStorageUris = [];
 	await fs$3.mkdir(extractDir, { recursive: true });
 	try {
-		await downloadArchive(downloadUrl, sourceArchivePath);
+		await downloadArchive(bundle.storageUri, storagePlugin, sourceArchivePath);
 		const format = await extractArchive(sourceArchivePath, extractDir);
-		await rewriteManifestBundleId(extractDir, nextBundleId);
+		const { manifest, manifestPath } = await rewriteManifestBundleId(extractDir, nextBundleId);
 		await fs$3.rm(sourceArchivePath, { force: true });
 		await createArchiveFromDirectory(extractDir, outputArchivePath, format);
 		const fileHash = await getFileHash(outputArchivePath);
-		if (isSignedFileHash(bundle.fileHash) && !config.signing?.enabled) throw new Error("Cannot copy a signed bundle without signing.privateKeyPath in hot-updater.config.ts");
-		const nextFileHash = config.signing?.enabled && config.signing.privateKeyPath ? await signFileHash(fileHash, config.signing.privateKeyPath) : fileHash;
-		const { storageUri } = await storagePlugin.upload(nextBundleId, outputArchivePath);
+		const manifestHash = await getFileHash(manifestPath);
+		if ([bundle.fileHash, getManifestFileHash(bundle)].filter((hash) => Boolean(hash)).some((hash) => isSignedFileHash(hash)) && !config.signing?.privateKeyPath) throw new Error("Cannot copy a signed bundle without signing.privateKeyPath in hot-updater.config.ts");
+		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);
+		uploadedStorageUris.push(archiveUpload.storageUri);
+		const manifestUpload = await storagePlugin.profiles.node.upload(nextBundleId, manifestPath);
+		uploadedStorageUris.push(manifestUpload.storageUri);
+		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 assetUpload = await storagePlugin.profiles.node.upload(uploadKey, path$1.join(extractDir, assetPath));
+			uploadedStorageUris.push(assetUpload.storageUri);
+		}
+		const assetBaseStorageUri = replaceStorageUriLeaf(manifestUpload.storageUri, "files");
 		return {
-			...bundle,
-			id: nextBundleId,
-			channel: targetChannel,
-			storageUri,
-			fileHash: nextFileHash
+			bundle: {
+				...bundle,
+				id: nextBundleId,
+				channel: targetChannel,
+				storageUri: archiveUpload.storageUri,
+				fileHash: nextFileHash,
+				metadata: stripBundleArtifactMetadata(bundle.metadata),
+				assetBaseStorageUri,
+				patches: [],
+				patchBaseBundleId: null,
+				manifestFileHash: nextManifestFileHash,
+				manifestStorageUri: manifestUpload.storageUri,
+				patchBaseFileHash: null,
+				patchFileHash: null,
+				patchStorageUri: null
+			},
+			uploadedStorageUris
 		};
+	} catch (error) {
+		await deleteUploadedCopy(storagePlugin, uploadedStorageUris);
+		throw error;
 	} finally {
 		await fs$3.rm(workDir, {
 			recursive: true,
@@ -43207,10 +43265,10 @@ async function createCopiedBundleArchive({ bundle, config, nextBundleId, storage
 		});
 	}
 }
-async function deleteUploadedCopy(storagePlugin, storageUri) {
-	if (!storageUri) return;
-	try {
-		await storagePlugin.delete(storageUri);
+async function deleteUploadedCopy(storagePlugin, storageUris) {
+	if (storageUris.length === 0) return;
+	for (const storageUri of new Set(storageUris)) try {
+		await storagePlugin.profiles.node.delete(storageUri);
 	} catch (error) {
 		console.error("Failed to delete uploaded bundle copy:", error);
 	}
@@ -43230,21 +43288,21 @@ async function promoteBundle({ action, bundleId, nextBundleId, targetChannel },
 	}
 	if (!deps.storagePlugin) throw new Error("Storage plugin is not configured");
 	const resolvedNextBundleId = nextBundleId?.trim() || createUUIDv7();
-	const copiedBundle = await createCopiedBundleArchive({
+	const { bundle: copiedBundle, uploadedStorageUris } = await createCopiedBundleArchive({
 		bundle,
 		config: deps.config,
 		nextBundleId: resolvedNextBundleId,
 		storagePlugin: deps.storagePlugin,
 		targetChannel: normalizedTargetChannel
 	});
-	let uploadedStorageUri = copiedBundle.storageUri;
+	let shouldCleanupUploadedCopy = true;
 	try {
 		await deps.databasePlugin.appendBundle(copiedBundle);
 		await deps.databasePlugin.commitBundle();
-		uploadedStorageUri = null;
+		shouldCleanupUploadedCopy = false;
 		return copiedBundle;
 	} catch (error) {
-		await deleteUploadedCopy(deps.storagePlugin, uploadedStorageUri);
+		if (shouldCleanupUploadedCopy) await deleteUploadedCopy(deps.storagePlugin, uploadedStorageUris);
 		throw error;
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/cli-tools",
-  "version": "0.30.12",
+  "version": "0.31.1",
   "type": "module",
   "engines": {
     "node": ">=20.19.0"
@@ -46,7 +46,8 @@
     "oxc-transform": "0.121.0",
     "typescript": "6.0.2",
     "unconfig": "7.5.0",
-    "@hot-updater/plugin-core": "0.30.12"
+    "@hot-updater/core": "0.31.1",
+    "@hot-updater/plugin-core": "0.31.1"
   },
   "devDependencies": {
     "@clack/prompts": "1.0.1",
@@ -61,7 +62,7 @@
     "semver": "^7.6.3",
     "tar": "^7.5.1",
     "workspace-tools": "^0.36.4",
-    "@hot-updater/test-utils": "0.30.12"
+    "@hot-updater/test-utils": "0.31.1"
   },
   "inlinedDependencies": {
     "@babel/code-frame": "7.29.0",
@@ -78,7 +79,7 @@
     "ansi-align": "3.0.1",
     "ansi-regex": [
       "5.0.1",
-      "6.1.0"
+      "6.2.2"
     ],
     "ansi-styles": "6.2.1",
     "boxen": "8.0.1",