react-native-bspatch 3.0.1 → 3.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-bspatch",
-  "version": "3.0.1",
+  "version": "3.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

@@ -98,16 +98,18 @@ if [ "$ACTION" = "setup" ]; then
 fi
 
 # ── Build environment ──────────────────────────────────────────────────────
-echo "Preparing build environment..."
-# Kill any existing Metro processes to prevent file locks
-pkill -f "react-native/local-cli/cli.js" || true
-pkill -f "metro-config/src/index.js" || true
-
-# Manually clear metro cache if it exists (robust vs ENOTEMPTY error)
-METRO_CACHE_DIR=$(node -e "console.log(require('os').tmpdir())")/metro-cache
-if [ -d "$METRO_CACHE_DIR" ]; then
-  echo "  Cleaning Metro cache..."
-  rm -rf "$METRO_CACHE_DIR"
+if [ "$ACTION" = "ota" ]; then
+  echo "Preparing build environment..."
+  # Kill any existing Metro processes to prevent file locks
+  pkill -f "react-native/local-cli/cli.js" || true
+  pkill -f "metro-config/src/index.js" || true
+
+  # Manually clear metro cache if it exists (robust vs ENOTEMPTY error)
+  METRO_CACHE_DIR=$(node -e "console.log(require('os').tmpdir())")/metro-cache
+  if [ -d "$METRO_CACHE_DIR" ]; then
+    echo "  Cleaning Metro cache..."
+    rm -rf "$METRO_CACHE_DIR"
+  fi
 fi
 
 mkdir -p "$ROOT/android/output"
@@ -123,8 +125,7 @@ if [ "$ACTION" != "setup" ]; then
     BASE_URL="${OTA_BASE_URL:-}"
     BASE_FOLDER="${OTA_FOLDER:-ota}"
 
-    echo "  Using URL: $BASE_URL"
-    echo "  Using Folder: $BASE_FOLDER"
+    echo "  Storage: ${OTA_R2_BUCKET:+R2 $OTA_R2_BUCKET → }$BASE_URL/$BASE_FOLDER"
 
     if [[ -n "${OTA_R2_BUCKET:-}" ]]; then
         R2_URL="https://${OTA_R2_ACCOUNT_ID:?set OTA_R2_ACCOUNT_ID}.r2.cloudflarestorage.com/${OTA_R2_BUCKET}"
@@ -234,7 +235,9 @@ fi
 # Confirm in a terminal (Enter keeps the detected version); CI / -y / --release-version skip it
 if [ -t 0 ] && [ "$CONFIRM_VERSION" = true ] && [ -z "$APP_VERSION_ARG" ]; then
   echo ""
-  read -r -p "  Release version for ${PLATFORM_ARG:-android + ios} [${APP_VERSION:-none detected}]: " INPUT_VERSION
+  if [ "$ACTION" = "reset" ]; then PROMPT_WHAT="Release version to RESET ($FLAVOR_LOWER, android + ios)"
+  else PROMPT_WHAT="Release version for ${PLATFORM_ARG:-android + ios} ($FLAVOR_LOWER)"; fi
+  read -r -p "  $PROMPT_WHAT [${APP_VERSION:-none detected}]: " INPUT_VERSION
   INPUT_VERSION="${INPUT_VERSION// /}"
   APP_VERSION="${INPUT_VERSION:-$APP_VERSION}"
 fi

package/tools/upload_ota.sh

@@ -10,7 +10,7 @@
 ROOT_DIR=$(pwd)
 
 BASE_URL="${OTA_BASE_URL:-}"
-BASE_FOLDER="${OTA_FOLDER:-${6:-ota}}"
+BASE_FOLDER="${OTA_FOLDER:-ota}"
 APP_VERSION="$1"
 CHANNEL="$2"
 OTA_VERSION="$3"
@@ -26,7 +26,7 @@ fi
 
 # Validate
 if [[ -z "$APP_VERSION" || -z "$OTA_VERSION" ]]; then
-    echo "Usage: $0 <app_version> <channel> <ota_version> <bundle_path> [platform] [base_folder]"
+    echo "Usage: $0 <app_version> <channel> <ota_version> <bundle_path> [platform] [--clean-remote]"
     exit 1
 fi
 if [[ ! -f "$REGISTRY_FILE" ]]; then
@@ -67,11 +67,15 @@ if [[ -n "${OTA_R2_BUCKET:-}" ]]; then
 
     echo "      → Cloudflare R2: $OTA_R2_BUCKET/$RELEASE_PREFIX"
     if [ "$CLEAN_REMOTE" = true ]; then
-        echo "  Deleting $RELEASE_PREFIX/ ..."
+        echo "      Deleting $RELEASE_PREFIX/ ..."
         # ponytail: one ListObjectsV2 page (1000 keys); a release+channel holds far fewer
-        for KEY in $(r2 -f "$R2_URL?list-type=2&prefix=$RELEASE_PREFIX/" | grep -o '<Key>[^<]*</Key>' | sed 's/<[^>]*>//g'); do
-            r2 -f -X DELETE "$R2_URL/$KEY" -o /dev/null && echo "  ✗ $KEY"
+        LISTING=$(r2 -f "$R2_URL?list-type=2&prefix=$RELEASE_PREFIX/") || { echo "  ❌ Listing $RELEASE_PREFIX/ failed"; exit 1; }
+        DELETED=0
+        for KEY in $(echo "$LISTING" | grep -o '<Key>[^<]*</Key>' | sed 's/<[^>]*>//g'); do
+            r2 -f -X DELETE "$R2_URL/$KEY" -o /dev/null || { echo "  ❌ Delete failed: $KEY"; exit 1; }
+            echo "      ✗ $KEY"; DELETED=$((DELETED + 1))
         done
+        echo "      ✓ $DELETED object(s) deleted"
     else
         # Only this version's files: earlier bundles/patches are already uploaded and never change
         RELEASE_FILES=()