react-native-bspatch 1.0.1 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-bspatch",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Premium OTA Update Solution for React Native using TurboModules and bsdiff",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

package/tools/build_ota.sh

@@ -44,11 +44,13 @@ FLAVOR="dev"
 ACTION="ota"
 PLATFORM_ARG=""
 
+PUSH_REMOTE=false
 # Arg parsing
 while [[ "$#" -gt 0 ]]; do
   case $1 in
     --platform) PLATFORM_ARG="$2"; shift ;;
     --flavor) FLAVOR="$2"; shift ;;
+    --push) PUSH_REMOTE=true ;;
     reset|base) ACTION="$1" ;;
     setup) ACTION="$1" ;;
     apk|ipa|seed) ACTION="base" ;; # Compatibility for legacy/seed actions
@@ -81,86 +83,79 @@ REGISTRY_SHARED="$ROOT/ota_registry.json"
 # ── Registry Sync ──────────────────────────────────────────────────────────
 # Skip registry sync for reset/clean actions
 if [ "$ACTION" != "reset" ]; then
-    # Download the latest ota_registry.json from server so we don't clobber other platforms
     echo "Syncing remote registry..."
 
-# Load credentials from environment variables (required for security)
-# Upload credentials are used by the build script
-BASE_URL="${OTA_BASE_URL:-https://sync-server.osp.com.vn}"
-UPCODE_USER="${OTA_UPLOAD_USER:-}"
-UPCODE_PASS="${OTA_UPLOAD_PASSWORD:-}"
-BASE_FOLDER="${OTA_FOLDER:-congplqg}"
-
-# Debug: show credentials (without exposing password)
-echo "  Using URL: $BASE_URL"
-echo "  Using User: $UPCODE_USER"
-echo "  Using Folder: $BASE_FOLDER"
-
-# Validate required credentials
-if [[ -z "$UPCODE_USER" ]] || [[ -z "$UPCODE_PASS" ]]; then
-    echo "ERROR: OTA upload credentials not set. Please set OTA_UPLOAD_USER and OTA_UPLOAD_PASSWORD in .env file."
-    echo "  OTA_UPLOAD_USER=\"your-username\""
-    echo "  OTA_UPLOAD_PASSWORD=\"your-password\""
-    echo "  Optional: OTA_BASE_URL OTA_FOLDER"
-    exit 1
-fi
-
-# Debug: show curl command for manual testing
-echo "  Login URL: ${BASE_URL}/public/authen/login"
-
-LOGIN_RES=$(curl -s -X "POST" "$BASE_URL/public/authen/login" \
-     -H 'Content-Type: application/json; charset=utf-8' \
-     -w "\n---HTTP_STATUS:%{http_code}" \
-     -d "{\"username\": \"$UPCODE_USER\", \"password\": \"$UPCODE_PASS\"}")
-
-# Extract HTTP status and response body
-HTTP_STATUS=$(echo "$LOGIN_RES" | grep -o 'HTTP_STATUS:[0-9]*' | cut -d: -f2)
-LOGIN_BODY=$(echo "$LOGIN_RES" | sed 's/---HTTP_STATUS:.*//')
-
-# Debug: show login response on error or empty
-if [ -z "$LOGIN_BODY" ] || [ "$HTTP_STATUS" != "200" ]; then
-    echo "  ⚠ Login failed - HTTP $HTTP_STATUS"
-    echo "  ⚠ Response: $LOGIN_BODY"
-fi
-
-TOKEN=$(echo "$LOGIN_BODY" | node -e "
-    try {
-        const r = JSON.parse(require('fs').readFileSync(0, 'utf8'));
-        console.log(r.data?.accessTokenInfo?.accessToken || '');
-    } catch(e) { console.log(''); }
-")
-
-if [[ -n "$TOKEN" ]]; then
-    REGISTRY_REMOTE_PATH="$BASE_FOLDER/ota_registry.json"
-    # Encode slash as %2F for MinIO API
-    ENCODED_PATH=$(python3 -c "import urllib.parse; print(urllib.parse.quote('$REGISTRY_REMOTE_PATH', safe=''))")
-    GEN_LINK_URL="$BASE_URL/api/minio/gen-download-link?pathFile=$ENCODED_PATH"
-    
-    LINK_RES=$(curl -s -X "GET" "$GEN_LINK_URL" -H "Authorization: Bearer $TOKEN")
-    REGISTRY_URL=$(echo "$LINK_RES" | node -e "
-        try {
-            const r = JSON.parse(require('fs').readFileSync(0, 'utf8'));
-            console.log(r.data || '');
-        } catch(e) { console.log(''); }
-    ")
-    
-    if [[ -n "$REGISTRY_URL" ]]; then
-        echo "  Downloading remote registry..."
-        curl -s -o "$REGISTRY_SHARED" "$REGISTRY_URL"
-        echo "  ✓ Registry synced"
+    BASE_URL="${OTA_BASE_URL:-https://sync-server.osp.com.vn}"
+    UPCODE_USER="${OTA_UPLOAD_USER:-}"
+    UPCODE_PASS="${OTA_UPLOAD_PASSWORD:-}"
+    BASE_FOLDER="${OTA_FOLDER:-ota}"
+
+    echo "  Using URL: $BASE_URL"
+    echo "  Using Folder: $BASE_FOLDER"
+
+    if [[ "$BASE_URL" == *"github"* ]] || [[ "$BASE_URL" == *"raw.githubusercontent"* ]]; then
+        echo "  Downloading remote registry from GitHub..."
+        HTTP_CODE=$(curl -s -w "%{http_code}" -o "$REGISTRY_SHARED.tmp" "$BASE_URL/$BASE_FOLDER/ota_registry.json" 2>/dev/null || true)
+        if [ "$HTTP_CODE" != "200" ]; then
+            HTTP_CODE=$(curl -s -w "%{http_code}" -o "$REGISTRY_SHARED.tmp" "$BASE_URL/ota_registry.json" 2>/dev/null || true)
+        fi
+        if [ "$HTTP_CODE" = "200" ] && [ -s "$REGISTRY_SHARED.tmp" ]; then
+            mv "$REGISTRY_SHARED.tmp" "$REGISTRY_SHARED"
+            echo "  ✓ Remote registry synced"
+        else
+            rm -f "$REGISTRY_SHARED.tmp"
+            echo "  Notice: Remote registry not found on GitHub (starting fresh with local state)."
+        fi
     else
-        echo "  ⚠ Remote registry not found (starting fresh)."
-        # Do not delete existing local registry if sync fails, just proceed
+        if [[ -n "$UPCODE_USER" ]] && [[ -n "$UPCODE_PASS" ]]; then
+            LOGIN_RES=$(curl -s -X "POST" "$BASE_URL/public/authen/login" \
+                 -H 'Content-Type: application/json; charset=utf-8' \
+                 -w "\n---HTTP_STATUS:%{http_code}" \
+                 -d "{\"username\": \"$UPCODE_USER\", \"password\": \"$UPCODE_PASS\"}")
+            HTTP_STATUS=$(echo "$LOGIN_RES" | grep -o 'HTTP_STATUS:[0-9]*' | cut -d: -f2)
+            LOGIN_BODY=$(echo "$LOGIN_RES" | sed 's/---HTTP_STATUS:.*//')
+
+            TOKEN=$(echo "$LOGIN_BODY" | node -e "
+                try {
+                    const r = JSON.parse(require('fs').readFileSync(0, 'utf8'));
+                    console.log(r.data?.accessTokenInfo?.accessToken || '');
+                } catch(e) { console.log(''); }
+            ")
+
+            if [[ -n "$TOKEN" ]]; then
+                REGISTRY_REMOTE_PATH="$BASE_FOLDER/ota_registry.json"
+                ENCODED_PATH=$(python3 -c "import urllib.parse; print(urllib.parse.quote('$REGISTRY_REMOTE_PATH', safe=''))")
+                GEN_LINK_URL="$BASE_URL/api/minio/gen-download-link?pathFile=$ENCODED_PATH"
+                LINK_RES=$(curl -s -X "GET" "$GEN_LINK_URL" -H "Authorization: Bearer $TOKEN")
+                REGISTRY_URL=$(echo "$LINK_RES" | node -e "
+                    try {
+                        const r = JSON.parse(require('fs').readFileSync(0, 'utf8'));
+                        console.log(r.data || '');
+                    } catch(e) { console.log(''); }
+                ")
+                if [[ -n "$REGISTRY_URL" ]]; then
+                    curl -s -o "$REGISTRY_SHARED" "$REGISTRY_URL"
+                    echo "  ✓ Registry synced"
+                fi
+            else
+                echo "  ⚠ MinIO login skipped. Proceeding with local state."
+            fi
+        else
+            echo "  ⚠ No MinIO credentials. Proceeding with local state."
+        fi
     fi
-else
-    echo "  ⚠ Login failed during registry sync. Proceeding with local state."
-fi
 fi
 
 # ── Helper: Download from Server ──────────────────────────────────────────────
 download_from_minio() {
   local REMOTE_PATH="$1"
   local DEST="$2"
+
+  if [[ "$BASE_URL" == *"github"* ]] || [[ "$BASE_URL" == *"raw.githubusercontent"* ]]; then
+      curl -s -f -o "$DEST" "$BASE_URL/$REMOTE_PATH" 2>/dev/null || curl -s -f -o "$DEST" "$BASE_URL/$(basename "$REMOTE_PATH")" 2>/dev/null
+      return $?
+  fi
+
   if [[ -z "$TOKEN" ]]; then return 1; fi
   
   local ENCODED_PATH=$(python3 -c "import urllib.parse; print(urllib.parse.quote('$REMOTE_PATH', safe=''))")
@@ -203,7 +198,7 @@ fi
 # ── Reset ─────────────────────────────────────────────────────────────────────
 if [ "$ACTION" = "reset" ]; then
   echo "Resetting OTA registry and clearing output..."
-  rm -f "$REGISTRY_SHARED"
+  echo '{"apps":{}}' > "$REGISTRY_SHARED"
   # Preserve base-assets manifests so the build after reset can still
   # correctly identify which assets are already bundled in the base app.
   # Only delete bundles, patches, manifests and workspace — not base-assets.
@@ -216,6 +211,11 @@ import type { OtaPatch } from 'react-native-bspatch';
 export const OTA_PATCHES: OtaPatch[] = [];
 TSEEOF
   echo "  ✓ Registry and output files cleared (base-assets preserved)"
+
+  if [ "$PUSH_REMOTE" = true ]; then
+      echo "  Syncing reset state to remote storage..."
+      bash "$SCRIPT_DIR/upload_ota_custom.sh" "$APP_VERSION" "$FLAVOR_LOWER" "0" "" "ios" "--clean-remote"
+  fi
   exit 0
 fi
 

package/tools/setup_project.js

@@ -91,44 +91,24 @@ function patchPbxproj(content) {
     // Already patched?
     if (content.includes(XCODE_BUNDLE_SYNC_MARKER)) return content;
 
-    // Find the Bundle React Native code and images shellScript value
-    // Pattern: name = "Bundle React Native code and images"; ... shellScript = "...";
-    // The shellScript ends with \n\";\n — we inject before the last closing \n\";
-    const shellScriptRegex = /(00DD1BFF1BD5951E006B06BC[^;]*?shellScript = ")([\s\S]*?)(\s*";)/m;
-    const match = content.match(shellScriptRegex);
-    if (!match) {
-        // Fallback: find by name
-        console.log('    ⚠  Could not find "Bundle React Native code and images" build phase by UUID, trying by name...');
-        // Simpler approach: find shellScript belonging to the bundle phase by name proximity
-        const nameIdx = content.indexOf('name = "Bundle React Native code and images"');
-        if (nameIdx === -1) {
-            console.log('    ⚠  Could not find build phase. Please add the bundle sync snippet manually.');
-            return content;
+    // Search by phase name
+    const nameIdx = content.indexOf('name = "Bundle React Native code and images";');
+    if (nameIdx !== -1) {
+        const shellScriptIdx = content.indexOf('shellScript = "', nameIdx);
+        if (shellScriptIdx !== -1) {
+            const endIdx = content.indexOf('";', shellScriptIdx + 15);
+            if (endIdx !== -1) {
+                return (
+                    content.slice(0, endIdx) +
+                    XCODE_BUNDLE_SYNC_SNIPPET +
+                    content.slice(endIdx)
+                );
+            }
         }
-        // Find the shellScript = "..." after this name line
-        const afterName = content.indexOf('shellScript = "', nameIdx - 500);
-        if (afterName === -1) return content;
-
-        // Find the end of this shellScript: look for \n\"; after it
-        const scriptEnd = content.indexOf('\\n";', afterName);
-        if (scriptEnd === -1) return content;
-
-        return (
-            content.slice(0, scriptEnd) +
-            XCODE_BUNDLE_SYNC_SNIPPET +
-            content.slice(scriptEnd)
-        );
     }
 
-    // Insert before the closing \n\";
-    const scriptBody = match[2];
-    // Remove trailing \n if present before closing
-    const insertPoint = match.index + match[1].length + scriptBody.length;
-    return (
-        content.slice(0, insertPoint) +
-        XCODE_BUNDLE_SYNC_SNIPPET +
-        content.slice(insertPoint)
-    );
+    console.log('    ⚠  Could not find "Bundle React Native code and images" build phase in project.pbxproj.');
+    return content;
 }
 
 // ── iOS: AppDelegate.swift ────────────────────────────────────────────────────
@@ -229,8 +209,8 @@ function main() {
     // ── iOS ──
     console.log('\n[iOS]');
 
-    // project.pbxproj
-    const pbxprojFiles = findFile(IOS_DIR, (name) => name === 'project.pbxproj');
+    // project.pbxproj (ignore CocoaPods project file)
+    const pbxprojFiles = findFile(IOS_DIR, (name, fullPath) => name === 'project.pbxproj' && !fullPath.includes('Pods'));
     if (pbxprojFiles.length === 0) {
         console.log('  ⚠  No project.pbxproj found. Is this an iOS project?');
     } else {

package/tools/upload_ota_custom.sh

@@ -42,6 +42,14 @@ if [[ ! -f "$REGISTRY_FILE" ]]; then
     exit 1
 fi
 
+# Check for clean remote flag
+CLEAN_REMOTE=false
+for ARG in "$@"; do
+    if [ "$ARG" == "--clean-remote" ]; then
+        CLEAN_REMOTE=true
+    fi
+done
+
 # ── GitHub Auto-Push Integration ──────────────────────────────────────────────
 if [[ "$BASE_URL" == *"github"* ]] || [[ "$BASE_URL" == *"raw.githubusercontent"* ]]; then
     # Parse OWNER, REPO, BRANCH from URL
@@ -84,29 +92,37 @@ if [[ "$BASE_URL" == *"github"* ]] || [[ "$BASE_URL" == *"raw.githubusercontent"
         git clone --branch "$BRANCH" --depth 1 "$GIT_REMOTE" "$GH_REPO_DIR" 2>/dev/null || git clone "$GIT_REMOTE" "$GH_REPO_DIR"
     fi
 
-    # 2. Copy generated files into storage repo
-    TARGET_RELEASE_DIR="$GH_REPO_DIR/$BASE_FOLDER/$APP_VERSION/$CHANNEL"
-    mkdir -p "$TARGET_RELEASE_DIR"
-    
-    echo "  Copying release files to storage repo..."
-    for FILE in "$OUTPUT_DIR"/*.{patch,hbc,json}; do
-        [[ -f "$FILE" ]] || continue
-        FNAME=$(basename "$FILE")
-        cp "$FILE" "$TARGET_RELEASE_DIR/$FNAME"
-    done
+    # 2. Copy generated files into storage repo (or reset remote)
+    if [ "$CLEAN_REMOTE" = true ]; then
+        echo "  Resetting remote storage state..."
+        rm -rf "$GH_REPO_DIR/$BASE_FOLDER/$APP_VERSION"
+        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
+    else
+        TARGET_RELEASE_DIR="$GH_REPO_DIR/$BASE_FOLDER/$APP_VERSION/$CHANNEL"
+        mkdir -p "$TARGET_RELEASE_DIR"
+        
+        echo "  Copying release files to storage repo..."
+        for FILE in "$OUTPUT_DIR"/*.{patch,hbc,json}; do
+            [[ -f "$FILE" ]] || continue
+            FNAME=$(basename "$FILE")
+            cp "$FILE" "$TARGET_RELEASE_DIR/$FNAME"
+        done
+
+        # Copy asset store if present
+        if [[ -d "$OUTPUT_DIR/asset-store" ]]; then
+            TARGET_ASSET_DIR="$GH_REPO_DIR/$BASE_FOLDER/assets"
+            mkdir -p "$TARGET_ASSET_DIR"
+            cp -R "$OUTPUT_DIR/asset-store/"* "$TARGET_ASSET_DIR/" 2>/dev/null || true
+        fi
 
-    # Copy asset store if present
-    if [[ -d "$OUTPUT_DIR/asset-store" ]]; then
-        TARGET_ASSET_DIR="$GH_REPO_DIR/$BASE_FOLDER/assets"
-        mkdir -p "$TARGET_ASSET_DIR"
-        cp -R "$OUTPUT_DIR/asset-store/"* "$TARGET_ASSET_DIR/" 2>/dev/null || true
+        # Copy ota_registry.json
+        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
     fi
 
-    # Copy ota_registry.json
-    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
-
     # 3. Commit and Push to GitHub
     cd "$GH_REPO_DIR"
     git config user.name "hungbv-taureau" 2>/dev/null || true
@@ -115,8 +131,12 @@ if [[ "$BASE_URL" == *"github"* ]] || [[ "$BASE_URL" == *"raw.githubusercontent"
     if git diff --staged --quiet; then
         echo "  ✓ Storage repository is up to date (no changes)."
     else
-        echo "  Committing OTA release (App: $APP_VERSION v$OTA_VERSION)..."
-        git commit -m "auto(ota): publish $PLATFORM $APP_VERSION v$OTA_VERSION ($CHANNEL)"
+        COMMIT_MSG="auto(ota): publish $PLATFORM $APP_VERSION v$OTA_VERSION ($CHANNEL)"
+        if [ "$CLEAN_REMOTE" = true ]; then
+            COMMIT_MSG="auto(ota): reset remote OTA registry and releases"
+        fi
+        echo "  Committing OTA changes ($COMMIT_MSG)..."
+        git commit -m "$COMMIT_MSG"
         echo "  Pushing to GitHub (${BRANCH})..."
         
         if git push origin "$BRANCH"; then