react-native-bspatch 1.1.4 → 2.0.1

package/tools/setup_project.js

@@ -50,6 +50,7 @@ function patchFile(filePath, label, patchFn) {
 
 // ── Constants ─────────────────────────────────────────────────────────────────
 
+// Plain shell; escaped below for the pbxproj shellScript string literal
 const XCODE_BUNDLE_SYNC_SNIPPET = [
     '',
     '# [react-native-bspatch] Sync compiled bundle to output/ for OTA builds',
@@ -57,20 +58,24 @@ const XCODE_BUNDLE_SYNC_SNIPPET = [
     'BUNDLE_RESULT="$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/main.jsbundle"',
     '',
     'if [ -f "$BUNDLE_RESULT" ]; then',
-    '  mkdir -p "$(dirname \\"$DEST_FILE\\")"',
+    '  mkdir -p "$(dirname "$DEST_FILE")"',
     '  cp "$BUNDLE_RESULT" "$DEST_FILE"',
     '  echo "Bundle synced to $DEST_FILE"',
     '  if [ "$CONFIGURATION" = "Release" ]; then',
     '    APP_VER="${MARKETING_VERSION:-1.0.0}"',
-    '    mkdir -p "$PROJECT_DIR/output"',
-    '    cp "$BUNDLE_RESULT" "$PROJECT_DIR/output/bundle_${APP_VER}_v1_ios_production.hbc"',
-    '    cp "$BUNDLE_RESULT" "$PROJECT_DIR/output/bundle_${APP_VER}_v1_ios_development.hbc" 2>/dev/null || true',
-    '    echo "[react-native-bspatch] ✓ Auto-captured iOS base bundle v1 to output/"',
+    '    # v1 = the store build; never overwrite it (delete the file to re-capture)',
+    '    for FLAVOR in development staging production; do',
+    '      DEST_V1="$PROJECT_DIR/output/bundle_${APP_VER}_v1_ios_${FLAVOR}.hbc"',
+    '      if [ ! -f "$DEST_V1" ]; then',
+    '        cp "$BUNDLE_RESULT" "$DEST_V1"',
+    '        echo "[react-native-bspatch] ✓ Auto-captured iOS base bundle v1 ($FLAVOR)"',
+    '      fi',
+    '    done',
     '  fi',
     'else',
     '  echo "Bundle not found at $BUNDLE_RESULT (skipping sync)"',
     'fi',
-].join('\\n');
+].join('\n').replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, '\\n');
 
 // The escaped version as it appears in pbxproj shellScript value
 const XCODE_BUNDLE_SYNC_MARKER = 'react-native-bspatch] Sync compiled bundle to output/';
@@ -93,7 +98,10 @@ afterEvaluate {
                         def bundleDir = file("\$buildDir/generated/assets/react/\${variant.name}")
                         def bundleFile = file("\$bundleDir/index.android.bundle")
                         def outputDir = file("\$rootDir/output")
-                        if (bundleFile.exists()) {
+                        // v1 = the store build; never overwrite it (delete the file to re-capture).
+                        // build_ota.sh runs this same bundle task for every OTA build.
+                        def destFile = file("\$outputDir/bundle_\${versionName}_v1_android_\${flavorName}.hbc")
+                        if (bundleFile.exists() && !destFile.exists()) {
                             outputDir.mkdirs()
                             def destName = "bundle_\${versionName}_v1_android_\${flavorName}.hbc"
                             copy {
@@ -113,8 +121,13 @@ afterEvaluate {
 `;
 
 function patchAppBuildGradle(content) {
-    if (content.includes(ANDROID_GRADLE_MARKER)) return content;
-    return content.trimEnd() + '\n' + ANDROID_GRADLE_SNIPPET;
+    const markerIdx = content.indexOf('// ' + ANDROID_GRADLE_MARKER);
+    if (markerIdx === -1) return content.trimEnd() + '\n' + ANDROID_GRADLE_SNIPPET;
+
+    // Replace an older snippet in place: from the marker to the afterEvaluate block's closing brace
+    const end = findClosingParen(content, content.indexOf('{', content.indexOf('afterEvaluate', markerIdx)), '{', '}');
+    if (end === -1) return content;
+    return content.slice(0, markerIdx) + ANDROID_GRADLE_SNIPPET.trim() + content.slice(end + 1);
 }
 
 const IOS_IMPORT = 'import react_native_bspatch';
@@ -134,13 +147,13 @@ const IOS_BUNDLE_URL_OVERRIDE = `
 const ANDROID_IMPORT = 'import vn.reactnativebspatch.OtaBundleResolver';
 const ANDROID_JS_BUNDLE = 'jsBundleFilePath = OtaBundleResolver.resolve(applicationContext)';
 
-function findClosingParen(source, openParenIdx) {
+function findClosingParen(source, openParenIdx, open = '(', close = ')') {
     let depth = 0;
     for (let i = openParenIdx; i < source.length; i += 1) {
         const char = source[i];
-        if (char === '(') {
+        if (char === open) {
             depth += 1;
-        } else if (char === ')') {
+        } else if (char === close) {
             depth -= 1;
             if (depth === 0) {
                 return i;
@@ -153,8 +166,14 @@ function findClosingParen(source, openParenIdx) {
 // ── iOS: project.pbxproj ─────────────────────────────────────────────────────
 
 function patchPbxproj(content) {
-    // Already patched?
-    if (content.includes(XCODE_BUNDLE_SYNC_MARKER)) return content;
+    if (content.includes(XCODE_BUNDLE_SYNC_SNIPPET)) return content;
+
+    // Older snippet present → replace it in place (it lacked the base bundle auto-capture)
+    const oldIdx = content.indexOf('\\n# [' + XCODE_BUNDLE_SYNC_MARKER);
+    if (oldIdx !== -1) {
+        const endIdx = content.indexOf('";', oldIdx);
+        return content.slice(0, oldIdx) + XCODE_BUNDLE_SYNC_SNIPPET + content.slice(endIdx);
+    }
 
     // Search by phase name
     const nameIdx = content.indexOf('name = "Bundle React Native code and images";');

package/tools/update_registry.js

@@ -85,35 +85,30 @@ if (newPatches.length > 0) {
   // We merge patches by platform to avoid overwriting between Android and iOS
   const otherPlatformPatches = flavorGroup.patches.filter(p => p.platform !== platform);
   
-  const mappedNewPatches = newPatches.map(p => {
-    // Naming convention from build_ota.sh
-    const fullBundleName = `bundle_${appVersion}_v${toOtaVersion}_${platform}_${flavor}.hbc`;
-    const manifestName = path.basename(_assetManifestFile);
-
-    let signature = undefined;
-    if (signingKey) {
-      try {
-        const patchFileCandidates = [
-          path.join(path.dirname(registryPath), p.file),
-          path.join(process.cwd(), p.file),
-        ];
-        let patchData = null;
-        for (const pfc of patchFileCandidates) {
-          if (fs.existsSync(pfc)) {
-            patchData = fs.readFileSync(pfc);
-            break;
-          }
-        }
-        if (patchData) {
-          const signer = crypto.createSign('SHA256');
-          signer.update(patchData);
-          signature = signer.sign(signingKey, 'base64');
-          console.log(`  ✓ Signed patch ${p.file} with asymmetric private key`);
-        }
-      } catch (signErr) {
-        console.warn(`  ⚠ Could not sign patch ${p.file}: ${signErr.message}`);
-      }
+  // Patches and bundles live next to the asset manifest (android/output or ios/output)
+  const outputDir = path.dirname(_assetManifestFile);
+  const fullBundleName = `bundle_${appVersion}_v${toOtaVersion}_${platform}_${flavor}.hbc`;
+  const manifestName = path.basename(_assetManifestFile);
+
+  const sign = (file) => {
+    if (!signingKey) return undefined;
+    const filePath = path.join(outputDir, file);
+    if (!fs.existsSync(filePath)) {
+      console.error(`  ❌ Cannot sign ${file}: not found at ${filePath}`);
+      process.exit(1);
     }
+    const signer = crypto.createSign('SHA256');
+    signer.update(fs.readFileSync(filePath));
+    console.log(`  ✓ Signed ${file}`);
+    return signer.sign(signingKey, 'base64');
+  };
+
+  // Signature of the resulting bundle: verified by the client on BOTH the patch
+  // path and the full-bundle fallback, so a tampered registry can't swap bundles.
+  const bundleSignature = sign(fullBundleName);
+
+  const mappedNewPatches = newPatches.map(p => {
+    const signature = sign(p.file);
 
     const patchObj = {
       id: `v${p.from}-to-v${p.to}-${flavor}-${platform}`,
@@ -132,6 +127,7 @@ if (newPatches.length > 0) {
 
     if (signature) {
       patchObj.signature = signature;
+      patchObj.bundleSignature = bundleSignature;
     }
 
     return patchObj;

package/tools/{upload_ota_custom.sh → upload_ota.sh}

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # ─────────────────────────────────────────────────────────────────────────────
-# Custom OTA Upload Script for Sync Server & GitHub Storage
+# OTA Upload Script — GitHub storage repository
 # Uploads:  1) All .patch & .hbc files  →  {baseFolder}/{appVersion}/{channel}/
 #           2) ota_registry.json         →  {baseFolder}/ota_registry.json
 # ─────────────────────────────────────────────────────────────────────────────
@@ -9,12 +9,10 @@
 # Load environment variables if .env exists
 ROOT_DIR=$(pwd)
 if [ -f "$ROOT_DIR/.env" ]; then
-    export $(grep -v '^#' "$ROOT_DIR/.env" | grep -v '^$' | xargs 2>/dev/null)
+    set -a; . "$ROOT_DIR/.env"; set +a
 fi
 
 BASE_URL="${OTA_BASE_URL:-}"
-UPCODE_USER="${OTA_UPLOAD_USER:-}"
-UPCODE_PASS="${OTA_UPLOAD_PASSWORD:-}"
 BASE_FOLDER="${OTA_FOLDER:-${6:-ota}}"
 APP_VERSION="$1"
 CHANNEL="$2"
@@ -29,7 +27,7 @@ if [[ "$PLATFORM" == "ios" ]]; then
 fi
 
 echo ""
-echo "=== Custom OTA Upload | App: $APP_VERSION | Channel: $CHANNEL | V$OTA_VERSION | Platform: $PLATFORM ==="
+echo "=== OTA Upload | App: $APP_VERSION | Channel: $CHANNEL | V$OTA_VERSION | Platform: $PLATFORM ==="
 echo "  Output dir: $OUTPUT_DIR"
 
 # Validate
@@ -50,11 +48,23 @@ for ARG in "$@"; do
     fi
 done
 
+# Files of this app version + channel only (bundle_/patch_/asset-manifest_ carry both;
+# base-assets_<platform>_<channel>.json carries just the channel)
+is_release_file() {
+    local FNAME="$1"
+    if [[ "$FNAME" == "base-assets_"*"_${CHANNEL}.json" ]]; then return 0; fi
+    [[ "$FNAME" == *"_${APP_VERSION}_"* ]] && [[ "$FNAME" == *"_${CHANNEL}."* || "$FNAME" == *"_${CHANNEL}_"* ]]
+}
+
 # ── GitHub Auto-Push Integration ──────────────────────────────────────────────
-if [[ "$BASE_URL" == *"github"* ]] || [[ "$BASE_URL" == *"raw.githubusercontent"* ]]; then
+if [[ "$BASE_URL" != "https://raw.githubusercontent.com/"* ]]; then
+    echo "ERROR: OTA_BASE_URL must be https://raw.githubusercontent.com/<owner>/<repo>/<branch>"
+    exit 1
+fi
+
     # Parse OWNER, REPO, BRANCH from URL
     # Example: https://raw.githubusercontent.com/hungbv-taureau/baseform-storage/main
-    CLEAN_URL=$(echo "$BASE_URL" | sed 's#https://raw.githubusercontent.com/##' | sed 's#https://github.com/##')
+    CLEAN_URL="${BASE_URL#https://raw.githubusercontent.com/}"
     OWNER=$(echo "$CLEAN_URL" | cut -d'/' -f1)
     REPO=$(echo "$CLEAN_URL" | cut -d'/' -f2)
     BRANCH=$(echo "$CLEAN_URL" | cut -d'/' -f3)
@@ -65,8 +75,11 @@ if [[ "$BASE_URL" == *"github"* ]] || [[ "$BASE_URL" == *"raw.githubusercontent"
     TOKEN="${GH_CLI_TOKEN:-${GH_TOKEN:-${GITHUB_TOKEN:-}}}"
     if [[ "$TOKEN" == "baseform" ]]; then TOKEN=""; fi
 
+    # Token goes in a per-command header, never into the clone's .git/config
+    GIT_AUTH=()
     if [[ -n "$TOKEN" ]]; then
-        GIT_REMOTE="https://x-access-token:${TOKEN}@github.com/${OWNER}/${REPO}.git"
+        GIT_REMOTE="https://github.com/${OWNER}/${REPO}.git"
+        GIT_AUTH=(-c "http.https://github.com/.extraheader=AUTHORIZATION: basic $(printf 'x-access-token:%s' "$TOKEN" | base64 | tr -d '\n')")
         echo "  Using authenticated gh CLI token for ${OWNER}/${REPO}"
     else
         GIT_REMOTE="git@github.com:${OWNER}/${REPO}.git"
@@ -83,19 +96,21 @@ if [[ "$BASE_URL" == *"github"* ]] || [[ "$BASE_URL" == *"raw.githubusercontent"
     if [ -d "$GH_REPO_DIR/.git" ]; then
         echo "  Syncing local storage clone with remote..."
         git -C "$GH_REPO_DIR" remote set-url origin "$GIT_REMOTE" 2>/dev/null || true
-        git -C "$GH_REPO_DIR" fetch origin "$BRANCH" 2>/dev/null || true
+        git "${GIT_AUTH[@]}" -C "$GH_REPO_DIR" fetch origin "$BRANCH" 2>/dev/null || true
         git -C "$GH_REPO_DIR" checkout "$BRANCH" 2>/dev/null || true
         git -C "$GH_REPO_DIR" reset --hard "origin/$BRANCH" 2>/dev/null || true
     else
         echo "  Cloning storage repository..."
         rm -rf "$GH_REPO_DIR"
-        git clone --branch "$BRANCH" --depth 1 "$GIT_REMOTE" "$GH_REPO_DIR" 2>/dev/null || git clone "$GIT_REMOTE" "$GH_REPO_DIR"
+        git "${GIT_AUTH[@]}" clone --branch "$BRANCH" --depth 1 "$GIT_REMOTE" "$GH_REPO_DIR" 2>/dev/null || git "${GIT_AUTH[@]}" clone "$GIT_REMOTE" "$GH_REPO_DIR" || exit 1
+        chmod 700 "$GH_REPO_DIR"
     fi
 
     # 2. Copy generated files into storage repo (or reset remote)
     if [ "$CLEAN_REMOTE" = true ]; then
-        echo "  Resetting remote storage state for channel '$CHANNEL'..."
-        rm -rf "$GH_REPO_DIR/$BASE_FOLDER/$APP_VERSION/$CHANNEL"
+        echo "  Resetting remote storage state for channel '$CHANNEL' (base bundle v1 + base-assets kept)..."
+        find "$GH_REPO_DIR/$BASE_FOLDER/$APP_VERSION/$CHANNEL" -type f \
+            -not -name "bundle_${APP_VERSION}_v1_*" -not -name 'base-assets_*' -delete 2>/dev/null || true
         mkdir -p "$GH_REPO_DIR/$BASE_FOLDER"
         cp "$REGISTRY_FILE" "$GH_REPO_DIR/$BASE_FOLDER/ota_registry.json"
         cp "$REGISTRY_FILE" "$GH_REPO_DIR/ota_registry.json" 2>/dev/null || true
@@ -104,18 +119,10 @@ if [[ "$BASE_URL" == *"github"* ]] || [[ "$BASE_URL" == *"raw.githubusercontent"
         mkdir -p "$TARGET_RELEASE_DIR"
         
         echo "  Copying release files to storage repo for channel '$CHANNEL'..."
-        for FILE in "$OUTPUT_DIR"/*_${CHANNEL}.json "$OUTPUT_DIR"/*_${CHANNEL}.hbc "$OUTPUT_DIR"/*_${CHANNEL}_*.patch "$OUTPUT_DIR"/*_${CHANNEL}.patch; do
+        for FILE in "$OUTPUT_DIR"/*.{patch,hbc,json}; do
             [[ -f "$FILE" ]] || continue
             FNAME=$(basename "$FILE")
-            if [[ "$FNAME" == "patch_"* ]] || [[ "$FNAME" == "bundle_"* ]]; then
-                if [[ "$FNAME" != *"_${APP_VERSION}_"* ]]; then
-                    continue
-                fi
-            fi
-
-            if [[ "$FNAME" != *"_${APP_VERSION}_"* ]] && [[ "$FNAME" != *"_${CHANNEL}_"* ]] && [[ "$FNAME" != "asset-manifest"* ]] && [[ "$FNAME" != "base-assets"* ]]; then
-                continue
-            fi
+            is_release_file "$FNAME" || continue
             cp "$FILE" "$TARGET_RELEASE_DIR/$FNAME"
         done
 
@@ -148,102 +155,14 @@ if [[ "$BASE_URL" == *"github"* ]] || [[ "$BASE_URL" == *"raw.githubusercontent"
         git commit -m "$COMMIT_MSG"
         echo "  Pushing to GitHub (${BRANCH})..."
         
-        if git push origin "$BRANCH"; then
+        if git "${GIT_AUTH[@]}" push origin "$BRANCH"; then
             echo "  ✓ Successfully pushed OTA release to GitHub!"
         else
-            echo "  ⚠ Git push failed. Please verify write permissions for ${OWNER}/${REPO}."
+            # Usually someone else pushed first: re-run so the registry is re-synced, never force-push
+            echo "  ❌ Git push failed (remote changed or no write access to ${OWNER}/${REPO}). Re-run the build."
+            exit 1
         fi
     fi
     cd "$ROOT_DIR"
     echo ""
     echo "=== GitHub Sync Complete ==="
-    exit 0
-fi
-
-# ── MinIO Server Integration ──────────────────────────────────────────────────
-echo "Logging in to MinIO Server..."
-LOGIN_RES=$(curl -s -X "POST" "$BASE_URL/public/authen/login" \
-     -H 'Content-Type: application/json; charset=utf-8' \
-     -d "{\"username\": \"$UPCODE_USER\", \"password\": \"$UPCODE_PASS\"}")
-
-TOKEN=$(echo "$LOGIN_RES" | node -e "
-    try {
-        const r = JSON.parse(require('fs').readFileSync(0, 'utf8'));
-        console.log(r.data?.accessTokenInfo?.accessToken || '');
-    } catch(e) { console.log(''); }
-")
-if [[ -z "$TOKEN" ]]; then
-    echo "  ⚠ Notice: Remote MinIO server login skipped."
-    echo "  ✓ Bundles & registry generated at: $OUTPUT_DIR"
-    echo "  Please commit and push local changes to your GitHub storage repository."
-    exit 0
-fi
-echo "  ✓ Login successful"
-
-remote_delete() {
-    local path=$1
-    local encoded
-    encoded=$(python3 -c "import urllib.parse; print(urllib.parse.quote('$path'))")
-    curl -s -X "DELETE" "$BASE_URL/api/minio/delete?path=$encoded" \
-         -H "Authorization: Bearer $TOKEN" > /dev/null
-}
-
-remote_upload() {
-    local local_file=$1
-    local remote_path=$2
-    echo "  uploading: $remote_path"
-    local RES
-    RES=$(curl -s -X "POST" "$BASE_URL/api/minio/upload" \
-        -H "Authorization: Bearer $TOKEN" \
-        -H 'Content-Type: multipart/form-data' \
-        -F "file=@$local_file" \
-        -F "path=$remote_path")
-    if [[ "$RES" != *"\"success\":true"* ]] && [[ "$RES" != *"\"code\":1"* ]] && [[ "$RES" != *"\"status\":200"* ]] && [[ "$RES" != *"\"code\":200"* ]]; then
-        echo "    ⚠ Upload potential issue: $RES"
-    else
-        echo "    ✓ Upload success"
-    fi
-}
-
-echo "Uploading files for channel: $CHANNEL..."
-FILE_COUNT=0
-for FILE in "$OUTPUT_DIR"/*.{patch,hbc,json}; do
-    [[ -f "$FILE" ]] || continue
-    FNAME=$(basename "$FILE")
-    if [[ "$FNAME" == "patch_"* ]] || [[ "$FNAME" == "bundle_"* ]]; then
-        if [[ "$FNAME" != *"_${APP_VERSION}_"* ]]; then
-            continue
-        fi
-    fi
-
-    if [[ "$FNAME" != *"_${APP_VERSION}_"* ]] && [[ "$FNAME" != *"_${CHANNEL}_"* ]] && [[ "$FNAME" != *"_${PLATFORM}_"* ]] && [[ "$FNAME" != "asset-manifest"* ]] && [[ "$FNAME" != "base-assets"* ]]; then
-        continue
-    fi
-
-    REMOTE_PATH="$BASE_FOLDER/$APP_VERSION/$CHANNEL/$FNAME"
-    remote_delete "$REMOTE_PATH"
-    remote_upload "$FILE" "$REMOTE_PATH"
-    FILE_COUNT=$((FILE_COUNT + 1))
-done
-
-if [[ -d "$OUTPUT_DIR/asset-store" ]]; then
-    echo "Uploading hashed assets..."
-    for FILE in "$OUTPUT_DIR/asset-store"/*; do
-        [[ -f "$FILE" ]] || continue
-        FNAME=$(basename "$FILE")
-        REMOTE_PATH="$BASE_FOLDER/assets/$FNAME"
-        remote_upload "$FILE" "$REMOTE_PATH"
-        FILE_COUNT=$((FILE_COUNT + 1))
-    done
-fi
-echo "  ✓ $FILE_COUNT file(s) uploaded (patches + bundles + assets)"
-
-echo "Uploading ota_registry.json..."
-REMOTE_REGISTRY="$BASE_FOLDER/ota_registry.json"
-remote_delete "$REMOTE_REGISTRY"
-remote_upload "$REGISTRY_FILE" "$REMOTE_REGISTRY"
-echo "  ✓ Registry uploaded"
-
-echo ""
-echo "=== Upload Complete ==="
-echo "  Registry : $REMOTE_REGISTRY"

package/lib/commonjs/crypto-js.d.js

@@ -1,2 +0,0 @@
-"use strict";
-//# sourceMappingURL=crypto-js.d.js.map

package/lib/commonjs/crypto-js.d.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sourceRoot":"../../src","sources":["crypto-js.d.ts"],"mappings":"","ignoreList":[]}

package/lib/commonjs/ota/storage/CustomStorage.js

@@ -1,160 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.CustomStorageProvider = void 0;
-var _reactNative = require("react-native");
-var _reactNativeBlobUtil = _interopRequireDefault(require("react-native-blob-util"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/** Cache tokens per server endpoint so switching configs invalidates stale tokens. */
-const tokenCache = new Map();
-/** Cache registry ETag and parsed patches to avoid redownloading unmodified manifests. */
-const registryCache = new Map();
-
-/**
- * Implementation for the custom MinIO-based storage server.
- */
-class CustomStorageProvider {
-  getEndpoint(config, key, fallback) {
-    return config.customServer?.endpoints?.[key] ?? fallback;
-  }
-  async getAccessToken(config) {
-    if (!config.customServer) {
-      throw new Error('customServer configuration missing');
-    }
-    const {
-      baseUrl,
-      username,
-      password
-    } = config.customServer;
-    const cacheKey = `${baseUrl}|${username}`;
-    const now = Date.now();
-    const cached = tokenCache.get(cacheKey);
-    if (cached && now < cached.expiresAt - 30000) {
-      return cached.token;
-    }
-    const loginPath = this.getEndpoint(config, 'login', 'public/authen/login');
-    const loginUrl = baseUrl.endsWith('/') ? `${baseUrl}${loginPath}` : `${baseUrl}/${loginPath}`;
-    try {
-      const res = await _reactNativeBlobUtil.default.fetch('POST', loginUrl, {
-        'Content-Type': 'application/json; charset=utf-8'
-      }, JSON.stringify({
-        username,
-        password
-      }));
-      const json = JSON.parse(res.data);
-      const token = json.data?.accessTokenInfo?.accessToken;
-      if (!token) throw new Error('Login failed: token not found');
-      tokenCache.set(cacheKey, {
-        token,
-        expiresAt: now + 3600000
-      }); // 1 hour
-      return token;
-    } catch (error) {
-      throw new Error(`Authentication failed: ${error.message}`);
-    }
-  }
-  async fetchManifest(config) {
-    if (!config.customServer) return config.bundledPatches || [];
-    const {
-      baseUrl,
-      channel,
-      baseFolder = 'bspatch'
-    } = config.customServer;
-    const registryPath = `${baseFolder}/ota_registry.json`;
-    const regCacheKey = `${baseUrl}|${registryPath}|${config.appVersion}|${channel}`;
-    const cachedReg = registryCache.get(regCacheKey);
-    try {
-      const token = await this.getAccessToken(config);
-      const normalizedBaseUrl = baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl;
-      const genLinkPath = this.getEndpoint(config, 'genDownloadLink', 'api/minio/gen-download-link');
-      const genLinkUrl = `${normalizedBaseUrl}/${genLinkPath}?pathFile=${encodeURIComponent(registryPath)}`;
-      const linkRes = await _reactNativeBlobUtil.default.fetch('GET', genLinkUrl, {
-        Authorization: `Bearer ${token}`
-      });
-      const linkJson = JSON.parse(linkRes.data);
-      const registryUrl = linkJson.data;
-      if (!registryUrl) throw new Error('Failed to generate registry download link');
-      const reqHeaders = {};
-      if (cachedReg?.etag) {
-        reqHeaders['If-None-Match'] = cachedReg.etag;
-      }
-      const registryRes = await _reactNativeBlobUtil.default.fetch('GET', registryUrl, reqHeaders);
-      if (registryRes.respInfo.status === 304 && cachedReg) {
-        return cachedReg.patches;
-      }
-      if (registryRes.respInfo.status !== 200) {
-        throw new Error(`Registry fetch failed with status ${registryRes.respInfo.status}`);
-      }
-      const etag = registryRes.respInfo.headers?.['etag'] || registryRes.respInfo.headers?.['ETag'];
-      if (!config.appVersion) {
-        throw new Error('[CustomStorage] config.appVersion is required to query OTA registry');
-      }
-      const registry = JSON.parse(registryRes.data);
-      const appGroup = registry?.apps?.[config.appVersion];
-      const flavorGroup = appGroup?.flavors?.[channel.toLowerCase()];
-      if (!flavorGroup || !flavorGroup.patches?.length) {
-        return config.bundledPatches || [];
-      }
-      const matchedPatches = (flavorGroup.patches || []).filter(p => p.platform === _reactNative.Platform.OS);
-      registryCache.set(regCacheKey, {
-        etag,
-        patches: matchedPatches
-      });
-      return matchedPatches;
-    } catch (error) {
-      console.warn('[CustomStorage] Manifest fetch error:', error.message);
-      return cachedReg?.patches || config.bundledPatches || [];
-    }
-  }
-  async getUpdateFileUrl(filename, config) {
-    if (!config.customServer) throw new Error('customServer config missing');
-    const {
-      baseUrl,
-      baseFolder = 'bspatch',
-      useMinio
-    } = config.customServer;
-    const normalizedBaseUrl = baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl;
-    const channel = config.customServer.channel.toLowerCase();
-    const remotePath = `${baseFolder}/${config.appVersion}/${channel}/${filename}`;
-    if (useMinio) {
-      const token = await this.getAccessToken(config);
-      const genLinkPath = this.getEndpoint(config, 'genDownloadLink', 'api/minio/gen-download-link');
-      const genLinkUrl = `${normalizedBaseUrl}/${genLinkPath}?pathFile=${encodeURIComponent(remotePath)}`;
-      const res = await _reactNativeBlobUtil.default.fetch('GET', genLinkUrl, {
-        Authorization: `Bearer ${token}`
-      });
-      const json = JSON.parse(res.data);
-      if (!json.data) throw new Error(`Failed to generate link for: ${filename}`);
-      return json.data;
-    }
-    const downloadPath = this.getEndpoint(config, 'downloadFile', 'files/downloadStreamFile');
-    return `${normalizedBaseUrl}/${downloadPath}?filepath=${encodeURIComponent(remotePath)}`;
-  }
-  async getAssetUrl(hash, ext, config) {
-    if (!config.customServer) return '';
-    const {
-      baseUrl,
-      baseFolder = 'bspatch',
-      useMinio
-    } = config.customServer;
-    const normalizedBaseUrl = baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl;
-    const filename = `${hash}.${ext}`;
-    const remotePath = `${baseFolder}/assets/${filename}`;
-    if (useMinio) {
-      const token = await this.getAccessToken(config);
-      const genLinkPath = this.getEndpoint(config, 'genDownloadLink', 'api/minio/gen-download-link');
-      const genLinkUrl = `${normalizedBaseUrl}/${genLinkPath}?pathFile=${encodeURIComponent(remotePath)}`;
-      const res = await _reactNativeBlobUtil.default.fetch('GET', genLinkUrl, {
-        Authorization: `Bearer ${token}`
-      });
-      const json = JSON.parse(res.data);
-      return json.data || '';
-    }
-    const downloadPath = this.getEndpoint(config, 'downloadFile', 'files/downloadStreamFile');
-    return `${normalizedBaseUrl}/${downloadPath}?filepath=${encodeURIComponent(remotePath)}`;
-  }
-}
-exports.CustomStorageProvider = CustomStorageProvider;
-//# sourceMappingURL=CustomStorage.js.map

package/lib/commonjs/ota/storage/CustomStorage.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_reactNative","require","_reactNativeBlobUtil","_interopRequireDefault","e","__esModule","default","tokenCache","Map","registryCache","CustomStorageProvider","getEndpoint","config","key","fallback","customServer","endpoints","getAccessToken","Error","baseUrl","username","password","cacheKey","now","Date","cached","get","expiresAt","token","loginPath","loginUrl","endsWith","res","ReactNativeBlobUtil","fetch","JSON","stringify","json","parse","data","accessTokenInfo","accessToken","set","error","message","fetchManifest","bundledPatches","channel","baseFolder","registryPath","regCacheKey","appVersion","cachedReg","normalizedBaseUrl","slice","genLinkPath","genLinkUrl","encodeURIComponent","linkRes","Authorization","linkJson","registryUrl","reqHeaders","etag","registryRes","respInfo","status","patches","headers","registry","appGroup","apps","flavorGroup","flavors","toLowerCase","length","matchedPatches","filter","p","platform","Platform","OS","console","warn","getUpdateFileUrl","filename","useMinio","remotePath","downloadPath","getAssetUrl","hash","ext","exports"],"sourceRoot":"../../../../src","sources":["ota/storage/CustomStorage.ts"],"mappings":"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","ignoreList":[]}