@hot-updater/expo 1.0.0-rc.0 → 1.0.0-rc.2

package/dist/index.cjs

@@ -46,6 +46,7 @@ let node_fs = require("node:fs");
 let node_stream_promises = require("node:stream/promises");
 let node_stream = require("node:stream");
 let node_buffer = require("node:buffer");
+let expo_config_js = require("expo/config.js");
 let uuidv7 = require("uuidv7");
 //#region ../../node_modules/.pnpm/is-plain-obj@4.1.0/node_modules/is-plain-obj/index.js
 function isPlainObject(value) {
@@ -6266,6 +6267,26 @@ const runExpoPrebuild = async ({ platform }) => {
 };
 //#endregion
 //#region src/expo.ts
+const getHotUpdaterExpoPluginProps = (plugins) => {
+	const entry = plugins?.find((plugin) => Array.isArray(plugin) && (plugin[0] === "@hot-updater/expo" || plugin[0] === "@hot-updater/expo/app.plugin.js"));
+	if (!entry || !Array.isArray(entry)) return void 0;
+	const props = entry[1];
+	return typeof props === "object" && props !== null ? props : void 0;
+};
+const getExpoFingerprintExtraSources = (cwd) => {
+	const { exp } = (0, expo_config_js.getConfig)(cwd, { skipSDKVersionRequirement: true });
+	const publicKeyPath = getHotUpdaterExpoPluginProps(exp.plugins)?.publicKeyPath;
+	if (publicKeyPath === void 0) return [];
+	if (typeof publicKeyPath !== "string" || !publicKeyPath.trim()) throw new Error("@hot-updater/expo publicKeyPath must be a non-empty path.");
+	return [publicKeyPath];
+};
+const getExpoBundleSigningPublicKey = async (cwd) => {
+	const { exp } = (0, expo_config_js.getConfig)(cwd, { skipSDKVersionRequirement: true });
+	const publicKeyPath = getHotUpdaterExpoPluginProps(exp.plugins)?.publicKeyPath;
+	if (publicKeyPath === void 0) return null;
+	if (typeof publicKeyPath !== "string" || !publicKeyPath.trim()) throw new Error("@hot-updater/expo publicKeyPath must be a non-empty path.");
+	return { publicKey: await (0, _hot_updater_cli_tools.readBundleSigningPublicKeyFile)(publicKeyPath, { cwd }) };
+};
 const isHermesEnabled = (cwd, platform) => {
 	try {
 		const appJsonPath = path.default.join(cwd, "app.json");
@@ -6333,9 +6354,13 @@ const expo = (config = {
 }) => ({ cwd }) => {
 	const { outDir = "dist", sourcemap = false, resetCache = true } = config;
 	return {
-		nativeBuild: { prebuild: async ({ platform }) => {
-			await runExpoPrebuild({ platform });
-		} },
+		nativeBuild: {
+			getBundleSigningPublicKey: () => getExpoBundleSigningPublicKey(cwd),
+			getFingerprintExtraSources: async () => getExpoFingerprintExtraSources(cwd),
+			prebuild: async ({ platform }) => {
+				await runExpoPrebuild({ platform });
+			}
+		},
 		build: async ({ platform }) => {
 			const buildPath = path.default.join(cwd, outDir);
 			await fs.default.promises.rm(buildPath, {
@@ -6361,3 +6386,5 @@ const expo = (config = {
 };
 //#endregion
 exports.expo = expo;
+exports.getExpoBundleSigningPublicKey = getExpoBundleSigningPublicKey;
+exports.getExpoFingerprintExtraSources = getExpoFingerprintExtraSources;

package/dist/index.d.cts

@@ -1,6 +1,10 @@
 import { BasePluginArgs, BuildPlugin, BuildPluginConfig } from "@hot-updater/plugin-core";
 
 //#region src/expo.d.ts
+declare const getExpoFingerprintExtraSources: (cwd: string) => string[];
+declare const getExpoBundleSigningPublicKey: (cwd: string) => Promise<{
+  readonly publicKey: string;
+} | null>;
 interface ExpoPluginConfig extends BuildPluginConfig {
   /**
    * @default false
@@ -17,4 +21,4 @@ declare const expo: (config?: ExpoPluginConfig) => ({
   cwd
 }: BasePluginArgs) => BuildPlugin;
 //#endregion
-export { ExpoPluginConfig, expo };
+export { ExpoPluginConfig, expo, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources };

package/dist/index.d.mts

@@ -1,6 +1,10 @@
 import { BasePluginArgs, BuildPlugin, BuildPluginConfig } from "@hot-updater/plugin-core";
 
 //#region src/expo.d.ts
+declare const getExpoFingerprintExtraSources: (cwd: string) => string[];
+declare const getExpoBundleSigningPublicKey: (cwd: string) => Promise<{
+  readonly publicKey: string;
+} | null>;
 interface ExpoPluginConfig extends BuildPluginConfig {
   /**
    * @default false
@@ -17,4 +21,4 @@ declare const expo: (config?: ExpoPluginConfig) => ({
   cwd
 }: BasePluginArgs) => BuildPlugin;
 //#endregion
-export { ExpoPluginConfig, expo };
+export { ExpoPluginConfig, expo, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources };

package/dist/index.mjs

@@ -4,7 +4,7 @@ import fs from "fs";
 import * as path$2 from "path";
 import path from "path";
 import { compileHermes } from "@hot-updater/bare";
-import { log, p } from "@hot-updater/cli-tools";
+import { log, p, readBundleSigningPublicKeyFile } from "@hot-updater/cli-tools";
 import { fileURLToPath } from "node:url";
 import { ChildProcess, execFile, spawn, spawnSync } from "node:child_process";
 import { StringDecoder } from "node:string_decoder";
@@ -20,6 +20,7 @@ import { appendFileSync, createReadStream, createWriteStream, readFileSync, stat
 import { finished } from "node:stream/promises";
 import { Duplex, PassThrough, Readable, Transform, Writable, getDefaultHighWaterMark } from "node:stream";
 import { Buffer as Buffer$1 } from "node:buffer";
+import { getConfig } from "expo/config.js";
 import { uuidv7 } from "uuidv7";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
@@ -6264,6 +6265,26 @@ const runExpoPrebuild = async ({ platform }) => {
 };
 //#endregion
 //#region src/expo.ts
+const getHotUpdaterExpoPluginProps = (plugins) => {
+	const entry = plugins?.find((plugin) => Array.isArray(plugin) && (plugin[0] === "@hot-updater/expo" || plugin[0] === "@hot-updater/expo/app.plugin.js"));
+	if (!entry || !Array.isArray(entry)) return void 0;
+	const props = entry[1];
+	return typeof props === "object" && props !== null ? props : void 0;
+};
+const getExpoFingerprintExtraSources = (cwd) => {
+	const { exp } = getConfig(cwd, { skipSDKVersionRequirement: true });
+	const publicKeyPath = getHotUpdaterExpoPluginProps(exp.plugins)?.publicKeyPath;
+	if (publicKeyPath === void 0) return [];
+	if (typeof publicKeyPath !== "string" || !publicKeyPath.trim()) throw new Error("@hot-updater/expo publicKeyPath must be a non-empty path.");
+	return [publicKeyPath];
+};
+const getExpoBundleSigningPublicKey = async (cwd) => {
+	const { exp } = getConfig(cwd, { skipSDKVersionRequirement: true });
+	const publicKeyPath = getHotUpdaterExpoPluginProps(exp.plugins)?.publicKeyPath;
+	if (publicKeyPath === void 0) return null;
+	if (typeof publicKeyPath !== "string" || !publicKeyPath.trim()) throw new Error("@hot-updater/expo publicKeyPath must be a non-empty path.");
+	return { publicKey: await readBundleSigningPublicKeyFile(publicKeyPath, { cwd }) };
+};
 const isHermesEnabled = (cwd, platform) => {
 	try {
 		const appJsonPath = path.join(cwd, "app.json");
@@ -6331,9 +6352,13 @@ const expo = (config = {
 }) => ({ cwd }) => {
 	const { outDir = "dist", sourcemap = false, resetCache = true } = config;
 	return {
-		nativeBuild: { prebuild: async ({ platform }) => {
-			await runExpoPrebuild({ platform });
-		} },
+		nativeBuild: {
+			getBundleSigningPublicKey: () => getExpoBundleSigningPublicKey(cwd),
+			getFingerprintExtraSources: async () => getExpoFingerprintExtraSources(cwd),
+			prebuild: async ({ platform }) => {
+				await runExpoPrebuild({ platform });
+			}
+		},
 		build: async ({ platform }) => {
 			const buildPath = path.join(cwd, outDir);
 			await fs.promises.rm(buildPath, {
@@ -6358,4 +6383,4 @@ const expo = (config = {
 	};
 };
 //#endregion
-export { expo };
+export { expo, getExpoBundleSigningPublicKey, getExpoFingerprintExtraSources };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/expo",
-  "version": "1.0.0-rc.0",
+  "version": "1.0.0-rc.2",
   "description": "Hot Updater build and config plugin for Expo",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -28,16 +28,16 @@
     "@babel/core": "7.26.0",
     "@babel/types": "7.26.0",
     "uuidv7": "^1.0.2",
-    "@hot-updater/bare": "1.0.0-rc.0",
-    "@hot-updater/cli-tools": "1.0.0-rc.0",
-    "@hot-updater/plugin-core": "1.0.0-rc.0"
+    "@hot-updater/cli-tools": "1.0.0-rc.1",
+    "@hot-updater/bare": "1.0.0-rc.1",
+    "@hot-updater/plugin-core": "1.0.0-rc.1"
   },
   "devDependencies": {
     "@types/node": "^20",
     "expo": "^50.0.0",
     "execa": "9.5.2",
     "vitest": "4.1.4",
-    "hot-updater": "1.0.0-rc.0"
+    "hot-updater": "1.0.0-rc.2"
   },
   "exports": {
     ".": {

package/plugin/build/withHotUpdater.js

@@ -4,28 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPublicKeyFromConfig = void 0;
-const node_crypto_1 = require("node:crypto");
-const promises_1 = require("node:fs/promises");
-const path_1 = __importDefault(require("path"));
 const config_plugins_1 = require("expo/config-plugins");
 const package_json_1 = __importDefault(require("../../package.json"));
 const transformers_1 = require("./transformers");
 const loadCliTools = () => import("@hot-updater/cli-tools");
 const loadHotUpdater = () => import("hot-updater");
-const canonicalizeRsaSpkiPublicKey = (publicKeyPem) => {
-    const trimmed = publicKeyPem.trim();
-    if (!trimmed.startsWith("-----BEGIN PUBLIC KEY-----") ||
-        !trimmed.endsWith("-----END PUBLIC KEY-----") ||
-        trimmed.includes("PRIVATE KEY")) {
-        throw new Error("not spki");
-    }
-    const publicKey = (0, node_crypto_1.createPublicKey)(trimmed);
-    if (publicKey.asymmetricKeyType !== "rsa" ||
-        (publicKey.asymmetricKeyDetails?.modulusLength ?? 0) < 2048) {
-        throw new Error("not rsa");
-    }
-    return publicKey.export({ format: "pem", type: "spki" }).toString().trim();
-};
 const ANDROID_META_DATA_KEYS = {
     channel: "com.hotupdater.CHANNEL",
     fingerprintHash: "com.hotupdater.FINGERPRINT_HASH",
@@ -60,46 +43,27 @@ const upsertAndroidMetaData = (application, name, value) => {
     application["meta-data"] = metaData;
 };
 let fingerprintCache = null;
-const getFingerprint = async () => {
-    if (fingerprintCache) {
-        return fingerprintCache;
+const getFingerprint = async (publicKeyPath) => {
+    const cached = fingerprintCache;
+    if (cached && cached.publicKeyPath === publicKeyPath) {
+        return cached.value;
     }
     const { createFingerprintJSON, generateFingerprints } = await loadHotUpdater();
-    fingerprintCache = await generateFingerprints();
-    await createFingerprintJSON(fingerprintCache);
-    return fingerprintCache;
+    const value = await generateFingerprints(publicKeyPath === undefined ? [] : [publicKeyPath]);
+    fingerprintCache = { publicKeyPath, value };
+    await createFingerprintJSON(value);
+    return value;
 };
-/** Uses public-key-only configuration, or the v0 local key sources when omitted. */
-const getPublicKeyFromConfig = async (signingConfig) => {
-    if (!signingConfig ||
-        ("enabled" in signingConfig && !signingConfig.enabled)) {
+/** Reads the native trust anchor configured by the Expo app. */
+const getPublicKeyFromConfig = async (publicKeyPath, projectRoot = process.cwd()) => {
+    if (publicKeyPath === undefined)
         return null;
-    }
-    // Retain the v0 EAS key source only for local configs without an explicit pin.
-    if ("enabled" in signingConfig && signingConfig.publicKeyPath === undefined) {
-        const envPrivateKey = process.env.HOT_UPDATER_PRIVATE_KEY;
-        if (envPrivateKey) {
-            try {
-                const pem = envPrivateKey.includes("-----BEGIN")
-                    ? envPrivateKey
-                    : await (0, promises_1.readFile)(path_1.default.resolve(process.cwd(), envPrivateKey), "utf8");
-                return canonicalizeRsaSpkiPublicKey((0, node_crypto_1.createPublicKey)((0, node_crypto_1.createPrivateKey)(pem))
-                    .export({ format: "pem", type: "spki" })
-                    .toString());
-            }
-            catch {
-                // As in v0, try the configured local files if the environment source fails.
-            }
-        }
-    }
     try {
-        const { getBundleSigningPublicKey } = await loadCliTools();
-        return ((await getBundleSigningPublicKey(signingConfig, { cwd: process.cwd() }))?.trim() ?? null);
+        const { readBundleSigningPublicKeyFile } = await loadCliTools();
+        return (await readBundleSigningPublicKeyFile(publicKeyPath, { cwd: projectRoot })).trim();
     }
     catch {
-        throw new Error(signingConfig.publicKeyPath !== undefined
-            ? "[hot-updater] Failed to load publicKeyPath for bundle signing."
-            : "[hot-updater] Failed to load public key for bundle signing.");
+        throw new Error("[hot-updater] Failed to load publicKeyPath for bundle signing.");
     }
 };
 exports.getPublicKeyFromConfig = getPublicKeyFromConfig;
@@ -138,9 +102,9 @@ const withHotUpdaterConfigAsync = (props) => (config) => {
         return hotUpdaterConfigPromise;
     };
     let publicKeyPromise;
-    const getPublicKey = async () => {
+    const getPublicKey = async (projectRoot) => {
         if (!publicKeyPromise) {
-            publicKeyPromise = getHotUpdaterConfig().then(($config) => (0, exports.getPublicKeyFromConfig)($config.signing));
+            publicKeyPromise = (0, exports.getPublicKeyFromConfig)(props.publicKeyPath, projectRoot);
         }
         return publicKeyPromise;
     };
@@ -150,11 +114,11 @@ const withHotUpdaterConfigAsync = (props) => (config) => {
         let fingerprintHash = null;
         const hotUpdaterConfig = await getHotUpdaterConfig();
         if (hotUpdaterConfig.updateStrategy !== "appVersion") {
-            const fingerprint = await getFingerprint();
+            const fingerprint = await getFingerprint(props.publicKeyPath);
             fingerprintHash = fingerprint.ios.hash;
         }
         // Load public key if signing is enabled
-        const publicKey = await getPublicKey();
+        const publicKey = await getPublicKey(cfg.modRequest.projectRoot);
         cfg.modResults.HOT_UPDATER_CHANNEL = channel;
         if (fingerprintHash) {
             cfg.modResults.HOT_UPDATER_FINGERPRINT_HASH = fingerprintHash;
@@ -172,11 +136,11 @@ const withHotUpdaterConfigAsync = (props) => (config) => {
         let fingerprintHash = null;
         const hotUpdaterConfig = await getHotUpdaterConfig();
         if (hotUpdaterConfig.updateStrategy !== "appVersion") {
-            const fingerprint = await getFingerprint();
+            const fingerprint = await getFingerprint(props.publicKeyPath);
             fingerprintHash = fingerprint.android.hash;
         }
         // Load public key if signing is enabled
-        const publicKey = await getPublicKey();
+        const publicKey = await getPublicKey(cfg.modRequest.projectRoot);
         const application = cfg.modResults.manifest.application?.[0];
         if (!application) {
             return cfg;
@@ -186,7 +150,7 @@ const withHotUpdaterConfigAsync = (props) => (config) => {
             upsertAndroidMetaData(application, ANDROID_META_DATA_KEYS.fingerprintHash, fingerprintHash);
         }
         if (publicKey) {
-            upsertAndroidMetaData(application, ANDROID_META_DATA_KEYS.publicKey, publicKey);
+            upsertAndroidMetaData(application, ANDROID_META_DATA_KEYS.publicKey, config_plugins_1.XML.escapeAndroidString(publicKey));
         }
         else {
             removeAndroidMetaData(application, ANDROID_META_DATA_KEYS.publicKey);