react-native-update 10.38.4 → 10.39.0-beta.0

package/android/bin/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,13 @@
+arguments=--init-script /var/folders/l6/0fn3x28s5s585ld3p04gsy1h0000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/l6/0fn3x28s5s585ld3p04gsy1h0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(8.9))
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=/Users/sunny/.sdkman/candidates/java/17.0.9-zulu/zulu-17.jdk/Contents/Home
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true

package/android/src/main/java/cn/reactnative/modules/update/DownloadTask.java

@@ -29,6 +29,8 @@ import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.zip.ZipEntry;
 import java.util.HashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import okio.BufferedSink;
 import okio.BufferedSource;
@@ -285,7 +287,16 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
         }
     }
 
-    private String findDrawableFallback(String originalToPath, HashMap<String, String> copiesMap, HashMap<String, ZipEntry> availableEntries) {
+    // Pattern to strip -vN version qualifiers from resource directory paths
+    // e.g., "res/drawable-xxhdpi-v4/img.png" → "res/drawable-xxhdpi/img.png"
+    private static final Pattern VERSION_QUALIFIER_PATTERN =
+        Pattern.compile("-v\\d+(?=/)");
+
+    private String normalizeResPath(String path) {
+        return VERSION_QUALIFIER_PATTERN.matcher(path).replaceAll("");
+    }
+
+    private String findDrawableFallback(String originalToPath, HashMap<String, String> copiesMap, HashMap<String, ZipEntry> availableEntries, HashMap<String, String> normalizedEntryMap) {
         // 检查是否是 drawable 路径
         if (!originalToPath.contains("drawable")) {
             return null;
@@ -309,13 +320,22 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
             // 检查这个 key 是否在 copies 映射中
             if (copiesMap.containsKey(fallbackToPath)) {
                 String fallbackFromPath = copiesMap.get(fallbackToPath);
-                // 检查对应的 value 路径是否在 APK 中存在
+                // 检查对应的 value 路径是否在 APK 中存在（精确匹配）
                 if (availableEntries.containsKey(fallbackFromPath)) {
                     if (UpdateContext.DEBUG) {
                         Log.d("react-native-update", "Found fallback for " + originalToPath + ": " + fallbackToPath + " -> " + fallbackFromPath);
                     }
                     return fallbackFromPath;
                 }
+                // 尝试版本限定符无关匹配（APK ↔ AAB 兼容）
+                String normalizedFallback = normalizeResPath(fallbackFromPath);
+                String actualEntry = normalizedEntryMap.get(normalizedFallback);
+                if (actualEntry != null) {
+                    if (UpdateContext.DEBUG) {
+                        Log.d("react-native-update", "Found normalized fallback for " + originalToPath + ": " + fallbackToPath + " -> " + actualEntry);
+                    }
+                    return actualEntry;
+                }
             }
         }
         
@@ -369,6 +389,14 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
             }
         }
         
+        // 构建规范化路径映射，用于 APK ↔ AAB 版本限定符无关匹配
+        // 例如 "res/drawable-xxhdpi-v4/img.png" → "res/drawable-xxhdpi/img.png"
+        HashMap<String, String> normalizedEntryMap = new HashMap<>();
+        for (String entryName : availableEntries.keySet()) {
+            String normalized = normalizeResPath(entryName);
+            normalizedEntryMap.putIfAbsent(normalized, entryName);
+        }
+        
         // 使用基础 APK 的 ZipFile 作为主要操作对象
         SafeZipFile zipFile = zipFileMap.get(context.getPackageResourcePath());
         
@@ -387,7 +415,21 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
             ZipEntry ze = availableEntries.get(fromPath);
             String actualSourcePath = fromPath;
             
-            // 如果文件不存在，尝试 fallback
+            // 如果精确匹配找不到，尝试版本限定符无关匹配（APK ↔ AAB 兼容）
+            // 例如 __diff.json 中的 "res/drawable-xxhdpi-v4/img.png" 匹配设备上的 "res/drawable-xxhdpi/img.png"
+            if (ze == null) {
+                String normalizedFrom = normalizeResPath(fromPath);
+                String actualEntry = normalizedEntryMap.get(normalizedFrom);
+                if (actualEntry != null) {
+                    ze = availableEntries.get(actualEntry);
+                    actualSourcePath = actualEntry;
+                    if (UpdateContext.DEBUG) {
+                        Log.d("react-native-update", "Normalized match: " + fromPath + " -> " + actualEntry);
+                    }
+                }
+            }
+            
+            // 如果仍然找不到，尝试 drawable 密度降级 fallback
             if (ze == null) {
                 if (UpdateContext.DEBUG) {
                     Log.d("react-native-update", "File not found in APK: " + fromPath + ", trying fallback");
@@ -405,28 +447,10 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
                     if (UpdateContext.DEBUG) {
                         Log.d("react-native-update", "Found toPath: " + toPath + " for fromPath: " + fromPath);
                     }
-                    String fallbackFromPath = findDrawableFallback(toPath, copiesMap, availableEntries);
+                    String fallbackFromPath = findDrawableFallback(toPath, copiesMap, availableEntries, normalizedEntryMap);
                     if (fallbackFromPath != null) {
                         ze = availableEntries.get(fallbackFromPath);
                         actualSourcePath = fallbackFromPath;
-                        // 确保 fallback 路径也在 entryToZipFileMap 中
-                        if (!entryToZipFileMap.containsKey(fallbackFromPath)) {
-                            // 查找包含该 fallback 路径的 ZipFile
-                            for (String apkPath : apkPaths) {
-                                SafeZipFile testZipFile = zipFileMap.get(apkPath);
-                                if (testZipFile != null) {
-                                    try {
-                                        ZipEntry testEntry = testZipFile.getEntry(fallbackFromPath);
-                                        if (testEntry != null) {
-                                            entryToZipFileMap.put(fallbackFromPath, testZipFile);
-                                            break;
-                                        }
-                                    } catch (Exception e) {
-                                        // 继续查找
-                                    }
-                                }
-                            }
-                        }
                         if (UpdateContext.DEBUG) {
                             Log.w("react-native-update", "Using fallback: " + fallbackFromPath + " for " + fromPath);
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.38.4",
+  "version": "10.39.0-beta.0",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {
@@ -78,4 +78,4 @@
     "ts-jest": "^29.4.6",
     "typescript": "^5.6.3"
   }
-}
+}

package/react-native-update.podspec

@@ -91,9 +91,8 @@ Pod::Spec.new do |s|
   s.source = { :git => 'https://github.com/reactnativecn/react-native-update.git', :tag => '#{s.version}' }
 
   s.libraries = 'bz2', 'z'
-  s.vendored_libraries = 'RCTPushy/libRCTPushy.a'
   s.pod_target_xcconfig = { 
-    'USER_HEADER_SEARCH_PATHS' => "#{podspec_dir}/ios", 
+    'USER_HEADER_SEARCH_PATHS' => "#{podspec_dir}/ios \"$(PODS_ROOT)/Headers/Public/SSZipArchive\" \"$(PODS_ROOT)/Headers/Public/React-Codegen/RCTPushySpec\"", 
     "DEFINES_MODULE" => "YES" 
   }
   s.resource = 'ios/pushy_build_time.txt'

package/src/client.ts

@@ -22,6 +22,7 @@ import {
   ClientOptions,
   EventType,
   ProgressData,
+  UpdateCheckState,
   UpdateServerConfig,
 } from './type';
 import {
@@ -207,6 +208,16 @@ export class Pushy {
       throw e;
     }
   };
+  notifyAfterCheckUpdate = (state: UpdateCheckState) => {
+    const { afterCheckUpdate } = this.options;
+    if (!afterCheckUpdate) {
+      return;
+    }
+    // 这里仅做状态通知，不阻塞原有检查流程
+    Promise.resolve(afterCheckUpdate(state)).catch((error: any) => {
+      log('afterCheckUpdate failed:', error?.message || error);
+    });
+  };
   getCheckUrl = (endpoint: string) => {
     return `${endpoint}/checkUpdate/${this.options.appKey}`;
   };
@@ -329,9 +340,11 @@ export class Pushy {
   };
   checkUpdate = async (extra?: Record<string, any>) => {
     if (!this.assertDebug('checkUpdate()')) {
+      this.notifyAfterCheckUpdate({ status: 'skipped' });
       return;
     }
     if (!assertWeb()) {
+      this.notifyAfterCheckUpdate({ status: 'skipped' });
       return;
     }
     if (
@@ -339,6 +352,7 @@ export class Pushy {
       (await this.options.beforeCheckUpdate()) === false
     ) {
       log('beforeCheckUpdate returned false, skipping check');
+      this.notifyAfterCheckUpdate({ status: 'skipped' });
       return;
     }
     const now = Date.now();
@@ -347,7 +361,9 @@ export class Pushy {
       this.lastChecking &&
       now - this.lastChecking < 1000 * 5
     ) {
-      return await this.lastRespJson;
+      const result = await this.lastRespJson;
+      this.notifyAfterCheckUpdate({ status: 'completed', result });
+      return result;
     }
     this.lastChecking = now;
     const fetchBody = {
@@ -387,6 +403,7 @@ export class Pushy {
 
       log('checking result:', result);
 
+      this.notifyAfterCheckUpdate({ status: 'completed', result });
       return result;
     } catch (e: any) {
       this.lastRespJson = previousRespJson;
@@ -396,6 +413,7 @@ export class Pushy {
         type: 'errorChecking',
         message: errorMessage,
       });
+      this.notifyAfterCheckUpdate({ status: 'error', error: e });
       this.throwIfEnabled(e);
       return previousRespJson ? await previousRespJson : emptyObj;
     }

package/src/provider.tsx

@@ -165,6 +165,7 @@ export const UpdateProvider = ({
     async ({ extra }: { extra?: Partial<{ toHash: string }> } = {}) => {
       const now = Date.now();
       if (lastChecking.current && now - lastChecking.current < 1000) {
+        client.notifyAfterCheckUpdate({ status: 'skipped' });
         return;
       }
       lastChecking.current = now;

package/src/type.ts

@@ -35,6 +35,13 @@ export interface ProgressData {
   total: number;
 }
 
+// 用于描述一次检查结束后的最终状态，便于业务侧感知成功、跳过或失败
+export interface UpdateCheckState {
+  status: 'completed' | 'skipped' | 'error';
+  result?: CheckResult;
+  error?: Error;
+}
+
 export type EventType =
   | 'rollback'
   | 'errorChecking'
@@ -98,6 +105,8 @@ export interface ClientOptions {
   debug?: boolean;
   throwError?: boolean;
   beforeCheckUpdate?: () => Promise<boolean> | boolean;
+  // 每次检查结束后都会触发，不影响原有检查流程
+  afterCheckUpdate?: (state: UpdateCheckState) => Promise<void> | void;
   beforeDownloadUpdate?: (info: CheckResult) => Promise<boolean> | boolean;
   afterDownloadUpdate?: (info: CheckResult) => Promise<boolean> | boolean;
   onPackageExpired?: (info: CheckResult) => Promise<boolean> | boolean;