react-native-bspatch 3.0.6 → 3.1.0

package/src/ota/otaCore.ts

@@ -206,14 +206,18 @@ export const fetchOtaManifest = (config: OtaConfig): Promise<OtaPatch[]> =>
 
 const ASSET_STORE_DIR = `${ReactNativeBlobUtil.fs.dirs.DocumentDir}/ota/assets`;
 
+/** Relative path inside the version dir: no absolute paths, no `..` segments. */
+const isSafeRelativePath = (p: string): boolean =>
+    /^[A-Za-z0-9_\-.@/]+$/.test(p) && !p.startsWith('/') && !p.split('/').includes('..');
+
 /**
- * Downloads and syncs assets from the content-addressed asset store.
- * Only downloads assets that are not already cached locally.
- *
- * @param assetManifestUrl URL to the asset-manifest.json for this version
- * @param config OTA configuration
- * @param log Logger instance
- * @param onStatus Status update callback
+ * Downloads this version's assets and places each one next to the bundle, at the
+ * path React Native resolves by default for a bundle loaded from a file:
+ *   Android: ota/vN/drawable-xxhdpi/foo.png, ota/vN/raw/bar.glb
+ *   iOS:     ota/vN/assets/src/images/foo@2x.png
+ * So images resolve correctly from the very first render, with no JS source
+ * transformer (which raced the first render). Files are fetched once per content
+ * hash into ota/assets/ and copied from there for later versions.
  */
 const downloadAndSyncAssets = async (
     assetManifestUrl: string,
@@ -227,168 +231,94 @@ const downloadAndSyncAssets = async (
     ) => void,
     onProgress: (percent: number) => void,
 ): Promise<void> => {
+    const fs = ReactNativeBlobUtil.fs;
     onStatus(OtaStatus.SYNCING_ASSETS, 'Syncing assets...');
-
     const versionDir = `${OTA_DIR}/v${version}`;
-    const manifestPath = `${versionDir}/asset-manifest-v${version}.json`;
 
-    // Ensure asset store dir exists
-    if (!(await ReactNativeBlobUtil.fs.exists(ASSET_STORE_DIR))) {
-        await ReactNativeBlobUtil.fs.mkdir(ASSET_STORE_DIR);
-    }
-
-    // Fetch the asset manifest
     let assets: OtaAsset[] = [];
     try {
-        if (__DEV__) {
-            console.log(
-                `[otaCore] Fetching asset manifest from: ${assetManifestUrl}`,
-            );
-        }
         const resp = await ReactNativeBlobUtil.config({
             followRedirect: true,
             timeout: 10000,
-        }).fetch('GET', assetManifestUrl, {
-            'Cache-Control': 'no-cache',
-        });
-
+        }).fetch('GET', assetManifestUrl, { 'Cache-Control': 'no-cache' });
         if (resp.respInfo.status !== 200) {
-            throw new Error(
-                `Manifest fetch failed with status ${resp.respInfo.status}`,
-            );
+            throw new Error(`status ${resp.respInfo.status}`);
         }
-
-        // Save manifest to disk for future reloads (AssetResolver needs it)
-        if (!(await ReactNativeBlobUtil.fs.exists(versionDir))) {
-            await ReactNativeBlobUtil.fs.mkdir(versionDir);
-        }
-
-        const manifestData =
-            typeof resp.data === 'string'
-                ? resp.data
-                : JSON.stringify(resp.data);
-        await ReactNativeBlobUtil.fs.writeFile(
-            manifestPath,
-            manifestData,
-            'utf8',
-        );
-        if (__DEV__) {
-            console.log(`[otaCore] Saved asset manifest to: ${manifestPath}`);
-        }
-
-        const manifest = JSON.parse(manifestData);
-        // Hash/ext become file names: reject anything that isn't a plain sha256 + extension
+        const manifest = typeof resp.data === 'string' ? JSON.parse(resp.data) : resp.data;
+        // Hash/ext/path become file names: reject anything unexpected
         assets = (manifest.assets || []).filter(
             (a: any) =>
                 /^[a-f0-9]{64}$/i.test(a.hash) &&
-                /^[a-z0-9]+$/i.test(a.ext),
+                /^[a-z0-9]+$/i.test(a.ext) &&
+                typeof a.originalPath === 'string' &&
+                isSafeRelativePath(a.originalPath),
         );
     } catch (e) {
-        // Fatal: activating the bundle without its manifest leaves images unresolved
+        // Fatal: activating the bundle without its assets leaves images blank
         throw new Error(`Failed to fetch asset manifest: ${(e as Error).message}`);
     }
+    if (assets.length === 0) return;
 
-    if (assets.length === 0) {
-        if (__DEV__) {
-            console.log('[otaCore] No new assets to sync for this version.');
-        }
-        return;
-    }
-
-    // Only notify UI now that we actually have assets to download
     onStatus(OtaStatus.SYNCING_ASSETS, `Syncing ${assets.length} asset(s)...`);
+    // One promise per dir: parallel workers would otherwise race mkdir (EEXIST)
+    const dirs = new Map<string, Promise<void>>();
+    const ensureDir = (dir: string): Promise<void> => {
+        if (!dirs.has(dir)) {
+            dirs.set(dir, fs.exists(dir).then(ok => (ok ? undefined : fs.mkdir(dir))));
+        }
+        return dirs.get(dir)!;
+    };
+    await ensureDir(ASSET_STORE_DIR);
 
     let processed = 0;
     let downloaded = 0;
-    let cached = 0;
     let failed = 0;
-
-    const updateProgress = () => {
-        processed++;
-        const percent = Math.round((processed / assets.length) * 100);
-        onProgress(percent);
-    };
-
-    // Concurrency-limited download queue
-    const maxConcurrency = 6; // Optimal for most mobile networks
     let index = 0;
 
-    const downloadNext = async (): Promise<void> => {
-        if (index >= assets.length) return;
-
-        const asset = assets[index++];
-        const filename = `${asset.hash}.${asset.ext}`;
-        const localPath = `${ASSET_STORE_DIR}/${filename}`;
-
-        // Check if already cached
-        if (await ReactNativeBlobUtil.fs.exists(localPath)) {
-            cached++;
-            updateProgress();
-            await downloadNext(); // Start next download
-            return;
-        }
-
-        // Download missing asset
-        onStatus(
-            OtaStatus.SYNCING_ASSETS,
-            `Syncing assets (${processed + 1}/${assets.length})...`,
-        );
-        try {
-            const storage = getStorage(config);
-            const assetUrl = await storage.getAssetUrl(
-                asset.hash,
-                asset.ext,
-                config,
-            );
-            if (!assetUrl) {
-                if (__DEV__) {
-                    console.warn(
-                        `[otaCore] Could not get URL for asset ${filename}`,
-                    );
+    const worker = async (): Promise<void> => {
+        while (index < assets.length) {
+            const asset = assets[index++];
+            const storePath = getLocalAssetPath(asset.hash, asset.ext);
+            try {
+                if (!(await fs.exists(storePath))) {
+                    const url = await getStorage(config).getAssetUrl(asset.hash, asset.ext, config);
+                    if (!url) throw new Error('no URL');
+                    await downloadWithRetry(url, storePath, config, () => {});
+                    if (!(await verifyHash(storePath, asset.hash))) {
+                        await fs.unlink(storePath).catch(() => {});
+                        throw new Error('hash mismatch');
+                    }
+                    downloaded++;
                 }
-            } else {
-                await downloadWithRetry(assetUrl, localPath, config, () => {});
-                if (!(await verifyHash(localPath, asset.hash))) {
-                    await ReactNativeBlobUtil.fs.unlink(localPath).catch(() => {});
-                    throw new Error('hash mismatch');
+                const dest = `${versionDir}/${asset.originalPath}`;
+                const parts = asset.originalPath.split('/').slice(0, -1);
+                for (let i = 1; i <= parts.length; i++) {
+                    await ensureDir(`${versionDir}/${parts.slice(0, i).join('/')}`);
                 }
-                downloaded++;
-                log.emit(OtaEvent.DOWNLOAD_SUCCESS, {
-                    message: `Asset downloaded: ${filename}`,
-                });
-            }
-        } catch (e) {
-            if (__DEV__) {
-                console.warn(
-                    `[otaCore] Failed to download asset ${filename}:`,
-                    e,
-                );
+                if (await fs.exists(dest)) await fs.unlink(dest);
+                await fs.cp(storePath, dest);
+            } catch (e) {
+                if (__DEV__) {
+                    console.warn(`[otaCore] Asset ${asset.originalPath} failed:`, e);
+                }
+                failed++; // keep going, fail the sync at the end
             }
-            failed++; // keep going, fail the sync at the end
-        } finally {
-            updateProgress();
-            await downloadNext(); // Start next download
+            processed++;
+            onProgress(Math.round((processed / assets.length) * 100));
         }
     };
 
-    // Start initial batch of downloads
-    const initialWorkers = Math.min(maxConcurrency, assets.length);
-    const workers = Array(initialWorkers)
-        .fill(null)
-        .map(() => downloadNext());
-    await Promise.all(workers);
+    // Concurrency-limited queue: 6 parallel requests suit most mobile networks
+    await Promise.all(Array.from({ length: Math.min(6, assets.length) }, worker));
 
     if (failed > 0) {
         throw new Error(`${failed} asset(s) failed to download`);
     }
-
-    onStatus(
-        OtaStatus.SYNCING_ASSETS,
-        `Assets synced (${downloaded} new, ${cached} cached)`,
-    );
-    console.log(
-        `[otaCore] Assets: ${downloaded} downloaded, ${cached} from cache`,
-    );
+    log.emit(OtaEvent.DOWNLOAD_SUCCESS, {
+        version,
+        message: `Assets: ${assets.length} placed, ${downloaded} downloaded`,
+    });
+    onStatus(OtaStatus.SYNCING_ASSETS, `Assets synced (${downloaded} new)`);
 };
 
 /**

package/lib/commonjs/ota/otaAssetResolver.js

@@ -1,141 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.resetOtaAssetResolver = exports.initOtaAssetResolver = void 0;
-var _reactNative = require("react-native");
-var _reactNativeBlobUtil = _interopRequireDefault(require("react-native-blob-util"));
-var _NativeBsPatch = _interopRequireDefault(require("../NativeBsPatch"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const ASSET_STORE_DIR = `${_reactNativeBlobUtil.default.fs.dirs.DocumentDir}/ota/assets`;
-let assetManifest = null;
-let assetMap = new Map();
-let assetList = [];
-let assetLookupCache = new Map();
-let isPatched = false;
-
-/**
- * Internal logger with native bridge integration.
- */
-const log = msg => {
-  const formatted = `[otaAssetResolver] ${msg}`;
-  console.log(formatted);
-  if (_NativeBsPatch.default?.logNative) {
-    _NativeBsPatch.default.logNative(formatted);
-  }
-};
-
-/**
- * Initializes the OTA asset resolver for a specific version.
- * Loads the asset manifest and prepares an O(1) lookup map for intercepted image requests.
- *
- * @param version - The OTA version number to load assets from.
- */
-const initOtaAssetResolver = async version => {
-  const otaDir = `${_reactNativeBlobUtil.default.fs.dirs.DocumentDir}/ota`;
-  const versionDir = `${otaDir}/v${version}`;
-  const manifestPath = `${versionDir}/asset-manifest-v${version}.json`;
-  try {
-    if (await _reactNativeBlobUtil.default.fs.exists(manifestPath)) {
-      const content = await _reactNativeBlobUtil.default.fs.readFile(manifestPath, 'utf8');
-      assetManifest = JSON.parse(content);
-
-      // Pre-compute normalized paths for O(1) lookup to prevent JS thread blocking during render
-      const map = new Map();
-      const list = assetManifest.assets || [];
-      list.forEach(a => {
-        const normPath = a.originalPath.toLowerCase().replace(/\//g, '_').replace(/^(assets_)+/, '');
-        a._normPath = normPath; // cache for fast fallback
-        map.set(normPath, a);
-      });
-      assetMap = map;
-      assetList = list;
-      assetLookupCache = new Map();
-      log(`Initialized version ${version} (${list.length} assets, mapped for O(1) lookup)`);
-      patchAssetResolver();
-    } else {
-      log(`Manifest NOT found at: ${manifestPath}`);
-    }
-  } catch (e) {
-    log(`Failed to load manifest: ${e.message}`);
-  }
-};
-
-/**
- * Patches React Native's Image.resolveAssetSource to intercept and redirect
- * asset requests to the locally downloaded OTA asset store.
- */
-exports.initOtaAssetResolver = initOtaAssetResolver;
-const patchAssetResolver = () => {
-  if (isPatched) return;
-  isPatched = true;
-  const resolveAssetSource = _reactNative.Image.resolveAssetSource;
-  if (resolveAssetSource && typeof resolveAssetSource.setCustomSourceTransformer === 'function') {
-    resolveAssetSource.setCustomSourceTransformer(resolver => {
-      // Get the default resolution result
-      const res = resolver.defaultAsset();
-      if (!res || !assetManifest) return res;
-      const uri = res.uri;
-
-      // Skip remote or data URIs
-      // Note: We DO NOT skip 'file://' because local bundles use it for relative asset resolution.
-      if (!uri || uri.startsWith('http') || uri.startsWith('data')) {
-        return res;
-      }
-      const normUri = uri.toLowerCase().replace(/\//g, '_').replace(/^(assets_)+/, '');
-      const cached = assetLookupCache.get(normUri);
-
-      // 1. Fast cached lookup from previous exact/fuzzy resolution
-      let found = cached === undefined ? undefined : cached;
-
-      // 2. Fast O(1) Map lookup
-      if (found === undefined) {
-        found = assetMap.get(normUri) ?? undefined;
-      }
-
-      // 3. Fallback O(N) fuzzy matching (without regex overhead)
-      if (found === undefined) {
-        found = assetList.find(a => {
-          return a._normPath.endsWith(normUri) || normUri.endsWith(a._normPath);
-        });
-        assetLookupCache.set(normUri, found ?? null);
-      }
-      if (found) {
-        const localPath = `${ASSET_STORE_DIR}/${found.hash}.${found.ext}`;
-        // iOS & Android: requires file:// prefix for absolute filesystem paths
-        const finalUri = `file://${localPath}`;
-        log(`REDIRECTED: ${uri} -> ${found.hash} (Local: ${finalUri})`);
-        return {
-          ...res,
-          uri: finalUri
-        };
-      }
-
-      // Diagnostic logging for missed assets that appear to be internal resources
-      if (uri.includes('assets')) {
-        log(`MISS: ${uri} (Not found in manifest)`);
-      }
-      return res;
-    });
-    log('Successfully attached CustomSourceTransformer.');
-  } else {
-    log('ERROR: setCustomSourceTransformer is not available in this React Native version.');
-  }
-};
-
-/**
- * Resets the OTA asset resolver state.
- * Call this before a major app upgrade or when unmounting the OTA context.
- * Clears cached manifest data and resets the transformer patch guard so
- * `initOtaAssetResolver` can re-patch cleanly on next call.
- */
-const resetOtaAssetResolver = () => {
-  assetManifest = null;
-  assetMap = new Map();
-  assetList = [];
-  assetLookupCache = new Map();
-  isPatched = false;
-};
-exports.resetOtaAssetResolver = resetOtaAssetResolver;
-//# sourceMappingURL=otaAssetResolver.js.map

package/lib/commonjs/ota/otaAssetResolver.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_reactNative","require","_reactNativeBlobUtil","_interopRequireDefault","_NativeBsPatch","e","__esModule","default","ASSET_STORE_DIR","ReactNativeBlobUtil","fs","dirs","DocumentDir","assetManifest","assetMap","Map","assetList","assetLookupCache","isPatched","log","msg","formatted","console","NativeBsPatch","logNative","initOtaAssetResolver","version","otaDir","versionDir","manifestPath","exists","content","readFile","JSON","parse","map","list","assets","forEach","a","normPath","originalPath","toLowerCase","replace","_normPath","set","length","patchAssetResolver","message","exports","resolveAssetSource","Image","setCustomSourceTransformer","resolver","res","defaultAsset","uri","startsWith","normUri","cached","get","found","undefined","find","endsWith","localPath","hash","ext","finalUri","includes","resetOtaAssetResolver"],"sourceRoot":"../../../src","sources":["ota/otaAssetResolver.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ota/otaAssetResolver.js

@@ -1,134 +0,0 @@
-"use strict";
-
-import { Image } from 'react-native';
-import ReactNativeBlobUtil from 'react-native-blob-util';
-import NativeBsPatch from '../NativeBsPatch';
-const ASSET_STORE_DIR = `${ReactNativeBlobUtil.fs.dirs.DocumentDir}/ota/assets`;
-let assetManifest = null;
-let assetMap = new Map();
-let assetList = [];
-let assetLookupCache = new Map();
-let isPatched = false;
-
-/**
- * Internal logger with native bridge integration.
- */
-const log = msg => {
-  const formatted = `[otaAssetResolver] ${msg}`;
-  console.log(formatted);
-  if (NativeBsPatch?.logNative) {
-    NativeBsPatch.logNative(formatted);
-  }
-};
-
-/**
- * Initializes the OTA asset resolver for a specific version.
- * Loads the asset manifest and prepares an O(1) lookup map for intercepted image requests.
- *
- * @param version - The OTA version number to load assets from.
- */
-export const initOtaAssetResolver = async version => {
-  const otaDir = `${ReactNativeBlobUtil.fs.dirs.DocumentDir}/ota`;
-  const versionDir = `${otaDir}/v${version}`;
-  const manifestPath = `${versionDir}/asset-manifest-v${version}.json`;
-  try {
-    if (await ReactNativeBlobUtil.fs.exists(manifestPath)) {
-      const content = await ReactNativeBlobUtil.fs.readFile(manifestPath, 'utf8');
-      assetManifest = JSON.parse(content);
-
-      // Pre-compute normalized paths for O(1) lookup to prevent JS thread blocking during render
-      const map = new Map();
-      const list = assetManifest.assets || [];
-      list.forEach(a => {
-        const normPath = a.originalPath.toLowerCase().replace(/\//g, '_').replace(/^(assets_)+/, '');
-        a._normPath = normPath; // cache for fast fallback
-        map.set(normPath, a);
-      });
-      assetMap = map;
-      assetList = list;
-      assetLookupCache = new Map();
-      log(`Initialized version ${version} (${list.length} assets, mapped for O(1) lookup)`);
-      patchAssetResolver();
-    } else {
-      log(`Manifest NOT found at: ${manifestPath}`);
-    }
-  } catch (e) {
-    log(`Failed to load manifest: ${e.message}`);
-  }
-};
-
-/**
- * Patches React Native's Image.resolveAssetSource to intercept and redirect
- * asset requests to the locally downloaded OTA asset store.
- */
-const patchAssetResolver = () => {
-  if (isPatched) return;
-  isPatched = true;
-  const resolveAssetSource = Image.resolveAssetSource;
-  if (resolveAssetSource && typeof resolveAssetSource.setCustomSourceTransformer === 'function') {
-    resolveAssetSource.setCustomSourceTransformer(resolver => {
-      // Get the default resolution result
-      const res = resolver.defaultAsset();
-      if (!res || !assetManifest) return res;
-      const uri = res.uri;
-
-      // Skip remote or data URIs
-      // Note: We DO NOT skip 'file://' because local bundles use it for relative asset resolution.
-      if (!uri || uri.startsWith('http') || uri.startsWith('data')) {
-        return res;
-      }
-      const normUri = uri.toLowerCase().replace(/\//g, '_').replace(/^(assets_)+/, '');
-      const cached = assetLookupCache.get(normUri);
-
-      // 1. Fast cached lookup from previous exact/fuzzy resolution
-      let found = cached === undefined ? undefined : cached;
-
-      // 2. Fast O(1) Map lookup
-      if (found === undefined) {
-        found = assetMap.get(normUri) ?? undefined;
-      }
-
-      // 3. Fallback O(N) fuzzy matching (without regex overhead)
-      if (found === undefined) {
-        found = assetList.find(a => {
-          return a._normPath.endsWith(normUri) || normUri.endsWith(a._normPath);
-        });
-        assetLookupCache.set(normUri, found ?? null);
-      }
-      if (found) {
-        const localPath = `${ASSET_STORE_DIR}/${found.hash}.${found.ext}`;
-        // iOS & Android: requires file:// prefix for absolute filesystem paths
-        const finalUri = `file://${localPath}`;
-        log(`REDIRECTED: ${uri} -> ${found.hash} (Local: ${finalUri})`);
-        return {
-          ...res,
-          uri: finalUri
-        };
-      }
-
-      // Diagnostic logging for missed assets that appear to be internal resources
-      if (uri.includes('assets')) {
-        log(`MISS: ${uri} (Not found in manifest)`);
-      }
-      return res;
-    });
-    log('Successfully attached CustomSourceTransformer.');
-  } else {
-    log('ERROR: setCustomSourceTransformer is not available in this React Native version.');
-  }
-};
-
-/**
- * Resets the OTA asset resolver state.
- * Call this before a major app upgrade or when unmounting the OTA context.
- * Clears cached manifest data and resets the transformer patch guard so
- * `initOtaAssetResolver` can re-patch cleanly on next call.
- */
-export const resetOtaAssetResolver = () => {
-  assetManifest = null;
-  assetMap = new Map();
-  assetList = [];
-  assetLookupCache = new Map();
-  isPatched = false;
-};
-//# sourceMappingURL=otaAssetResolver.js.map

package/lib/module/ota/otaAssetResolver.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["Image","ReactNativeBlobUtil","NativeBsPatch","ASSET_STORE_DIR","fs","dirs","DocumentDir","assetManifest","assetMap","Map","assetList","assetLookupCache","isPatched","log","msg","formatted","console","logNative","initOtaAssetResolver","version","otaDir","versionDir","manifestPath","exists","content","readFile","JSON","parse","map","list","assets","forEach","a","normPath","originalPath","toLowerCase","replace","_normPath","set","length","patchAssetResolver","e","message","resolveAssetSource","setCustomSourceTransformer","resolver","res","defaultAsset","uri","startsWith","normUri","cached","get","found","undefined","find","endsWith","localPath","hash","ext","finalUri","includes","resetOtaAssetResolver"],"sourceRoot":"../../../src","sources":["ota/otaAssetResolver.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/ota/otaAssetResolver.d.ts

@@ -1,15 +0,0 @@
-/**
- * Initializes the OTA asset resolver for a specific version.
- * Loads the asset manifest and prepares an O(1) lookup map for intercepted image requests.
- *
- * @param version - The OTA version number to load assets from.
- */
-export declare const initOtaAssetResolver: (version: number) => Promise<void>;
-/**
- * Resets the OTA asset resolver state.
- * Call this before a major app upgrade or when unmounting the OTA context.
- * Clears cached manifest data and resets the transformer patch guard so
- * `initOtaAssetResolver` can re-patch cleanly on next call.
- */
-export declare const resetOtaAssetResolver: () => void;
-//# sourceMappingURL=otaAssetResolver.d.ts.map

package/lib/typescript/ota/otaAssetResolver.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"otaAssetResolver.d.ts","sourceRoot":"","sources":["../../../src/ota/otaAssetResolver.ts"],"names":[],"mappings":"AAkCA;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAAU,SAAS,MAAM,KAAG,OAAO,CAAC,IAAI,CAsCxE,CAAC;AAwFF;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,QAAO,IAMxC,CAAC"}