@hot-updater/bare 0.32.0 → 0.33.1

package/dist/index.cjs

@@ -22,6 +22,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
+let crypto = require("crypto");
 let fs_promises = require("fs/promises");
 fs_promises = __toESM(fs_promises);
 let path = require("path");
@@ -621,7 +622,7 @@ const fallbackSymbols = {
 const figures = isUnicodeSupported() ? mainSymbols : fallbackSymbols;
 Object.entries(specialMainSymbols);
 //#endregion
-//#region ../../node_modules/.pnpm/yoctocolors@2.1.1/node_modules/yoctocolors/base.js
+//#region ../../node_modules/.pnpm/yoctocolors@2.1.2/node_modules/yoctocolors/base.js
 const hasColors = node_tty.default?.WriteStream?.prototype?.hasColors?.() ?? false;
 const format = (open, close) => {
 	if (!hasColors) return (input) => input;
@@ -633,8 +634,9 @@ const format = (open, close) => {
 		if (index === -1) return openCode + string + closeCode;
 		let result = openCode;
 		let lastIndex = 0;
+		const replaceCode = (close === 22 ? closeCode : "") + openCode;
 		while (index !== -1) {
-			result += string.slice(lastIndex, index) + openCode;
+			result += string.slice(lastIndex, index) + replaceCode;
 			lastIndex = index + closeCode.length;
 			index = string.indexOf(closeCode, lastIndex);
 		}
@@ -3034,7 +3036,7 @@ function parseMilliseconds(milliseconds) {
 	throw new TypeError("Expected a finite number or bigint");
 }
 //#endregion
-//#region ../../node_modules/.pnpm/pretty-ms@9.2.0/node_modules/pretty-ms/index.js
+//#region ../../node_modules/.pnpm/pretty-ms@9.3.0/node_modules/pretty-ms/index.js
 const isZero = (value) => value === 0 || value === 0n;
 const pluralize = (word, count) => count === 1 || count === 1n ? word : `${word}s`;
 const SECOND_ROUNDING_EPSILON = 1e-7;
@@ -3083,7 +3085,7 @@ function prettyMilliseconds(milliseconds, options) {
 		add(Number(parsed.hours), "hour", "h");
 	}
 	add(Number(parsed.minutes), "minute", "m");
-	if (!options.hideSeconds) if (options.separateMilliseconds || options.formatSubMilliseconds || !options.colonNotation && milliseconds < 1e3) {
+	if (!options.hideSeconds) if (options.separateMilliseconds || options.formatSubMilliseconds || !options.colonNotation && milliseconds < 1e3 && !options.subSecondsAsDecimals) {
 		const seconds = Number(parsed.seconds);
 		const milliseconds = Number(parsed.milliseconds);
 		const microseconds = Number(parsed.microseconds);
@@ -6317,12 +6319,111 @@ async function compileHermes({ cwd, sourcemap, inputJsFile }) {
 }
 //#endregion
 //#region src/bare.ts
+const BARE_BUILD_CACHE_VERSION = 1;
+function hashText(value) {
+	return (0, crypto.createHash)("sha256").update(value).digest("hex");
+}
+async function pathExists(filePath) {
+	try {
+		await fs_promises.default.access(filePath);
+		return true;
+	} catch {
+		return false;
+	}
+}
+function resolveCacheRoot(cwd) {
+	const cacheDir = process.env.HOT_UPDATER_BARE_BUILD_CACHE_DIR?.trim();
+	if (!cacheDir) return null;
+	return path.default.resolve(cwd, cacheDir);
+}
+function resolveCacheKey({ enableHermes, entryFile, platform, resetCache, sourcemap }) {
+	const inputKey = process.env.HOT_UPDATER_BARE_BUILD_CACHE_KEY?.trim();
+	if (!inputKey) return null;
+	return hashText(JSON.stringify({
+		cacheVersion: BARE_BUILD_CACHE_VERSION,
+		enableHermes,
+		entryFile,
+		inputKey,
+		platform,
+		resetCache,
+		sourcemap
+	}));
+}
+function resolveCachePaths({ cwd, enableHermes, entryFile, platform, resetCache, sourcemap }) {
+	const root = resolveCacheRoot(cwd);
+	const key = resolveCacheKey({
+		enableHermes,
+		entryFile,
+		platform,
+		resetCache,
+		sourcemap
+	});
+	if (!root || !key) return null;
+	const entryDir = path.default.join(root, key);
+	return {
+		entryDir,
+		filesDir: path.default.join(entryDir, "files"),
+		key,
+		manifestPath: path.default.join(entryDir, "manifest.json"),
+		root
+	};
+}
+async function restoreBundleBuildFromCache({ buildPath, cachePaths }) {
+	if (!await pathExists(cachePaths.manifestPath)) return null;
+	try {
+		const metadata = JSON.parse(await fs_promises.default.readFile(cachePaths.manifestPath, "utf8"));
+		await fs_promises.default.cp(cachePaths.filesDir, buildPath, { recursive: true });
+		_hot_updater_cli_tools.log.normal(`[bare] reused build cache ${cachePaths.key.slice(0, 12)}\n`);
+		return { stdout: typeof metadata.stdout === "string" ? metadata.stdout : null };
+	} catch {
+		return null;
+	}
+}
+async function saveBundleBuildToCache({ buildPath, cachePaths, stdout }) {
+	if (await pathExists(cachePaths.manifestPath)) return;
+	const tempDir = path.default.join(cachePaths.root, `${cachePaths.key}.${process.pid}.${Date.now()}.tmp`);
+	await fs_promises.default.rm(tempDir, {
+		recursive: true,
+		force: true
+	});
+	await fs_promises.default.mkdir(path.default.dirname(tempDir), { recursive: true });
+	await fs_promises.default.cp(buildPath, path.default.join(tempDir, "files"), { recursive: true });
+	await fs_promises.default.writeFile(path.default.join(tempDir, "manifest.json"), `${JSON.stringify({
+		cacheVersion: BARE_BUILD_CACHE_VERSION,
+		stdout
+	})}\n`);
+	try {
+		await fs_promises.default.rename(tempDir, cachePaths.entryDir);
+		_hot_updater_cli_tools.log.normal(`[bare] saved build cache ${cachePaths.key.slice(0, 12)}\n`);
+	} catch {
+		await fs_promises.default.rm(tempDir, {
+			recursive: true,
+			force: true
+		});
+	}
+}
 const runBundle = async ({ entryFile, cwd, platform, buildPath, sourcemap, enableHermes, resetCache }) => {
 	const reactNativePath = require.resolve("react-native/package.json", { paths: [cwd] });
 	const cliPath = path.default.join(path.default.dirname(reactNativePath), "cli.js");
 	const filename = `index.${platform}`;
 	const bundleOutput = path.default.join(buildPath, `${filename}.bundle`);
 	const bundleId = (0, uuidv7.uuidv7)();
+	const cachePaths = resolveCachePaths({
+		cwd,
+		enableHermes,
+		entryFile,
+		platform,
+		resetCache,
+		sourcemap
+	});
+	const cached = cachePaths ? await restoreBundleBuildFromCache({
+		buildPath,
+		cachePaths
+	}) : null;
+	if (cached) return {
+		bundleId,
+		stdout: cached.stdout
+	};
 	const args = [
 		"bundle",
 		"--assets-dest",
@@ -6355,11 +6456,21 @@ const runBundle = async ({ entryFile, cwd, platform, buildPath, sourcemap, enabl
 			inputJsFile: bundleOutput,
 			sourcemap
 		});
+		if (cachePaths) await saveBundleBuildToCache({
+			buildPath,
+			cachePaths,
+			stdout: hermesVersion
+		});
 		return {
 			bundleId,
 			stdout: hermesVersion
 		};
 	}
+	if (cachePaths) await saveBundleBuildToCache({
+		buildPath,
+		cachePaths,
+		stdout: null
+	});
 	return {
 		bundleId,
 		stdout: null

package/dist/index.mjs

@@ -1,4 +1,5 @@
 import { createRequire } from "node:module";
+import { createHash } from "crypto";
 import fs from "fs/promises";
 import path from "path";
 import { getReactNativeMetadatas, log } from "@hot-updater/cli-tools";
@@ -616,7 +617,7 @@ const fallbackSymbols = {
 const figures = isUnicodeSupported() ? mainSymbols : fallbackSymbols;
 Object.entries(specialMainSymbols);
 //#endregion
-//#region ../../node_modules/.pnpm/yoctocolors@2.1.1/node_modules/yoctocolors/base.js
+//#region ../../node_modules/.pnpm/yoctocolors@2.1.2/node_modules/yoctocolors/base.js
 const hasColors = tty?.WriteStream?.prototype?.hasColors?.() ?? false;
 const format = (open, close) => {
 	if (!hasColors) return (input) => input;
@@ -628,8 +629,9 @@ const format = (open, close) => {
 		if (index === -1) return openCode + string + closeCode;
 		let result = openCode;
 		let lastIndex = 0;
+		const replaceCode = (close === 22 ? closeCode : "") + openCode;
 		while (index !== -1) {
-			result += string.slice(lastIndex, index) + openCode;
+			result += string.slice(lastIndex, index) + replaceCode;
 			lastIndex = index + closeCode.length;
 			index = string.indexOf(closeCode, lastIndex);
 		}
@@ -3029,7 +3031,7 @@ function parseMilliseconds(milliseconds) {
 	throw new TypeError("Expected a finite number or bigint");
 }
 //#endregion
-//#region ../../node_modules/.pnpm/pretty-ms@9.2.0/node_modules/pretty-ms/index.js
+//#region ../../node_modules/.pnpm/pretty-ms@9.3.0/node_modules/pretty-ms/index.js
 const isZero = (value) => value === 0 || value === 0n;
 const pluralize = (word, count) => count === 1 || count === 1n ? word : `${word}s`;
 const SECOND_ROUNDING_EPSILON = 1e-7;
@@ -3078,7 +3080,7 @@ function prettyMilliseconds(milliseconds, options) {
 		add(Number(parsed.hours), "hour", "h");
 	}
 	add(Number(parsed.minutes), "minute", "m");
-	if (!options.hideSeconds) if (options.separateMilliseconds || options.formatSubMilliseconds || !options.colonNotation && milliseconds < 1e3) {
+	if (!options.hideSeconds) if (options.separateMilliseconds || options.formatSubMilliseconds || !options.colonNotation && milliseconds < 1e3 && !options.subSecondsAsDecimals) {
 		const seconds = Number(parsed.seconds);
 		const milliseconds = Number(parsed.milliseconds);
 		const microseconds = Number(parsed.microseconds);
@@ -6312,12 +6314,111 @@ async function compileHermes({ cwd, sourcemap, inputJsFile }) {
 }
 //#endregion
 //#region src/bare.ts
+const BARE_BUILD_CACHE_VERSION = 1;
+function hashText(value) {
+	return createHash("sha256").update(value).digest("hex");
+}
+async function pathExists(filePath) {
+	try {
+		await fs.access(filePath);
+		return true;
+	} catch {
+		return false;
+	}
+}
+function resolveCacheRoot(cwd) {
+	const cacheDir = process.env.HOT_UPDATER_BARE_BUILD_CACHE_DIR?.trim();
+	if (!cacheDir) return null;
+	return path.resolve(cwd, cacheDir);
+}
+function resolveCacheKey({ enableHermes, entryFile, platform, resetCache, sourcemap }) {
+	const inputKey = process.env.HOT_UPDATER_BARE_BUILD_CACHE_KEY?.trim();
+	if (!inputKey) return null;
+	return hashText(JSON.stringify({
+		cacheVersion: BARE_BUILD_CACHE_VERSION,
+		enableHermes,
+		entryFile,
+		inputKey,
+		platform,
+		resetCache,
+		sourcemap
+	}));
+}
+function resolveCachePaths({ cwd, enableHermes, entryFile, platform, resetCache, sourcemap }) {
+	const root = resolveCacheRoot(cwd);
+	const key = resolveCacheKey({
+		enableHermes,
+		entryFile,
+		platform,
+		resetCache,
+		sourcemap
+	});
+	if (!root || !key) return null;
+	const entryDir = path.join(root, key);
+	return {
+		entryDir,
+		filesDir: path.join(entryDir, "files"),
+		key,
+		manifestPath: path.join(entryDir, "manifest.json"),
+		root
+	};
+}
+async function restoreBundleBuildFromCache({ buildPath, cachePaths }) {
+	if (!await pathExists(cachePaths.manifestPath)) return null;
+	try {
+		const metadata = JSON.parse(await fs.readFile(cachePaths.manifestPath, "utf8"));
+		await fs.cp(cachePaths.filesDir, buildPath, { recursive: true });
+		log.normal(`[bare] reused build cache ${cachePaths.key.slice(0, 12)}\n`);
+		return { stdout: typeof metadata.stdout === "string" ? metadata.stdout : null };
+	} catch {
+		return null;
+	}
+}
+async function saveBundleBuildToCache({ buildPath, cachePaths, stdout }) {
+	if (await pathExists(cachePaths.manifestPath)) return;
+	const tempDir = path.join(cachePaths.root, `${cachePaths.key}.${process.pid}.${Date.now()}.tmp`);
+	await fs.rm(tempDir, {
+		recursive: true,
+		force: true
+	});
+	await fs.mkdir(path.dirname(tempDir), { recursive: true });
+	await fs.cp(buildPath, path.join(tempDir, "files"), { recursive: true });
+	await fs.writeFile(path.join(tempDir, "manifest.json"), `${JSON.stringify({
+		cacheVersion: BARE_BUILD_CACHE_VERSION,
+		stdout
+	})}\n`);
+	try {
+		await fs.rename(tempDir, cachePaths.entryDir);
+		log.normal(`[bare] saved build cache ${cachePaths.key.slice(0, 12)}\n`);
+	} catch {
+		await fs.rm(tempDir, {
+			recursive: true,
+			force: true
+		});
+	}
+}
 const runBundle = async ({ entryFile, cwd, platform, buildPath, sourcemap, enableHermes, resetCache }) => {
 	const reactNativePath = __require.resolve("react-native/package.json", { paths: [cwd] });
 	const cliPath = path.join(path.dirname(reactNativePath), "cli.js");
 	const filename = `index.${platform}`;
 	const bundleOutput = path.join(buildPath, `${filename}.bundle`);
 	const bundleId = uuidv7();
+	const cachePaths = resolveCachePaths({
+		cwd,
+		enableHermes,
+		entryFile,
+		platform,
+		resetCache,
+		sourcemap
+	});
+	const cached = cachePaths ? await restoreBundleBuildFromCache({
+		buildPath,
+		cachePaths
+	}) : null;
+	if (cached) return {
+		bundleId,
+		stdout: cached.stdout
+	};
 	const args = [
 		"bundle",
 		"--assets-dest",
@@ -6350,11 +6451,21 @@ const runBundle = async ({ entryFile, cwd, platform, buildPath, sourcemap, enabl
 			inputJsFile: bundleOutput,
 			sourcemap
 		});
+		if (cachePaths) await saveBundleBuildToCache({
+			buildPath,
+			cachePaths,
+			stdout: hermesVersion
+		});
 		return {
 			bundleId,
 			stdout: hermesVersion
 		};
 	}
+	if (cachePaths) await saveBundleBuildToCache({
+		buildPath,
+		cachePaths,
+		stdout: null
+	});
 	return {
 		bundleId,
 		stdout: null

package/package.json

@@ -1,13 +1,16 @@
 {
   "name": "@hot-updater/bare",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "React Native OTA solution for self-hosted",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.cts",
   "license": "MIT",
-  "repository": "https://github.com/gronxb/hot-updater",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/gronxb/hot-updater"
+  },
   "author": "gronxb <gron1gh1@gmail.com> (https://github.com/gronxb)",
   "bugs": {
     "url": "https://github.com/gronxb/hot-updater/issues"
@@ -22,8 +25,8 @@
   ],
   "dependencies": {
     "uuidv7": "^1.0.2",
-    "@hot-updater/plugin-core": "0.32.0",
-    "@hot-updater/cli-tools": "0.32.0"
+    "@hot-updater/cli-tools": "0.33.1",
+    "@hot-updater/plugin-core": "0.33.1"
   },
   "devDependencies": {
     "@types/node": "^20",
@@ -54,14 +57,14 @@
       "3.1.1",
       "4.0.0"
     ],
-    "pretty-ms": "9.2.0",
+    "pretty-ms": "9.3.0",
     "shebang-command": "2.0.0",
     "shebang-regex": "3.0.0",
     "signal-exit": "4.1.0",
     "strip-final-newline": "4.0.0",
     "unicorn-magic": "0.3.0",
     "which": "2.0.2",
-    "yoctocolors": "2.1.1"
+    "yoctocolors": "2.1.2"
   },
   "scripts": {
     "build": "tsdown",