react-native-update 10.38.5 → 10.39.0-beta.1

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/harmony/pushy/src/main/ets/DownloadTask.ts

@@ -68,7 +68,13 @@ export class DownloadTask {
     }
 
     if (!fileIo.accessSync(path)) {
-      await fileIo.mkdir(path);
+      try {
+        await fileIo.mkdir(path);
+      } catch (error) {
+        if (!fileIo.accessSync(path)) {
+          throw error;
+        }
+      }
     }
   }
 
@@ -99,22 +105,14 @@ export class DownloadTask {
   }
 
   private async listEntryNames(directory: string): Promise<string[]> {
-    const entryNames: string[] = [];
     const files = await fileIo.listFile(directory);
+    const validFiles = files.filter(file => file !== '.' && file !== '..');
 
-    for (const file of files) {
-      if (file === '.' || file === '..') {
-        continue;
-      }
-
-      const filePath = `${directory}/${file}`;
-      const stat = await fileIo.stat(filePath);
-      if (!stat.isDirectory()) {
-        entryNames.push(file);
-      }
-    }
+    const stats = await Promise.all(
+      validFiles.map(file => fileIo.stat(`${directory}/${file}`)),
+    );
 
-    return entryNames;
+    return validFiles.filter((_, index) => !stats[index].isDirectory());
   }
 
   private async writeFileContent(
@@ -432,11 +430,10 @@ export class DownloadTask {
     await this.recreateDirectory(params.unzipDirectory);
 
     await zlib.decompressFile(params.targetFile, params.unzipDirectory);
-    const entryNames = await this.listEntryNames(params.unzipDirectory);
-    const manifestArrays = await this.readManifestArrays(
-      params.unzipDirectory,
-      true,
-    );
+    const [entryNames, manifestArrays] = await Promise.all([
+      this.listEntryNames(params.unzipDirectory),
+      this.readManifestArrays(params.unzipDirectory, true),
+    ]);
 
     NativePatchCore.buildArchivePatchPlan(
       ARCHIVE_PATCH_TYPE_FROM_PACKAGE,
@@ -475,11 +472,10 @@ export class DownloadTask {
     await this.recreateDirectory(params.unzipDirectory);
 
     await zlib.decompressFile(params.targetFile, params.unzipDirectory);
-    const entryNames = await this.listEntryNames(params.unzipDirectory);
-    const manifestArrays = await this.readManifestArrays(
-      params.unzipDirectory,
-      false,
-    );
+    const [entryNames, manifestArrays] = await Promise.all([
+      this.listEntryNames(params.unzipDirectory),
+      this.readManifestArrays(params.unzipDirectory, false),
+    ]);
 
     const plan = NativePatchCore.buildArchivePatchPlan(
       ARCHIVE_PATCH_TYPE_FROM_PPK,
@@ -524,23 +520,36 @@ export class DownloadTask {
             .replace('resources/base/media/', '')
             .split('.')[0];
           const mediaBuffer = await resourceManager.getMediaByName(mediaName);
-          const [firstTarget, ...restTargets] = targets;
-          await this.writeFileContent(firstTarget, mediaBuffer.buffer);
-          for (const target of restTargets) {
-            await this.copySandboxFile(firstTarget, target);
+          const parentDirs = [
+            ...new Set(
+              targets.map(t => t.substring(0, t.lastIndexOf('/'))).filter(Boolean),
+            ),
+          ];
+          for (const dir of parentDirs) {
+            await this.ensureDirectory(dir);
           }
+          await Promise.all(
+            targets.map(target => this.writeFileContent(target, mediaBuffer.buffer)),
+          );
           continue;
         }
         const fromContent = await resourceManager.getRawFd(currentFrom);
         const [firstTarget, ...restTargets] = targets;
-        await this.ensureParentDirectory(firstTarget);
+        const parentDirs = [
+          ...new Set(
+            targets.map(t => t.substring(0, t.lastIndexOf('/'))).filter(Boolean),
+          ),
+        ];
+        for (const dir of parentDirs) {
+          await this.ensureDirectory(dir);
+        }
         if (fileIo.accessSync(firstTarget)) {
           await fileIo.unlink(firstTarget);
         }
         saveFileToSandbox(fromContent, firstTarget);
-        for (const target of restTargets) {
-          await this.copySandboxFile(firstTarget, target);
-        }
+        await Promise.all(
+          restTargets.map(target => this.copySandboxFile(firstTarget, target)),
+        );
       }
     } catch (error) {
       error.message =

package/harmony/pushy/src/main/ets/PushyPackage.ets

@@ -0,0 +1,16 @@
+import {
+  RNOHPackage,
+  UITurboModule,
+  UITurboModuleContext,
+} from '@rnoh/react-native-openharmony';
+import { PushyTurboModule } from './PushyTurboModule';
+
+export class PushyPackage extends RNOHPackage {
+  override getUITurboModuleFactoryByNameMap(): Map<
+    string,
+    (ctx: UITurboModuleContext) => UITurboModule | null
+  > {
+    return new Map<string, (ctx: UITurboModuleContext) => UITurboModule>()
+      .set(PushyTurboModule.NAME, (ctx) => new PushyTurboModule(ctx));
+  }
+}

package/harmony/pushy/src/main/ets/PushyPackageCompat.ts

@@ -0,0 +1,16 @@
+import {
+  RNPackage,
+  UITurboModule,
+  UITurboModuleContext,
+} from '@rnoh/react-native-openharmony/ts';
+import { PushyTurboModule } from './PushyTurboModule';
+
+export class PushyPackage extends RNPackage {
+  override getUITurboModuleFactoryByNameMap(): Map<
+    string,
+    (ctx: UITurboModuleContext) => UITurboModule | null
+  > {
+    return new Map<string, (ctx: UITurboModuleContext) => UITurboModule>()
+      .set(PushyTurboModule.NAME, (ctx) => new PushyTurboModule(ctx));
+  }
+}

package/harmony/pushy/src/main/ets/PushyTurboModule.ts

@@ -1,6 +1,6 @@
 import {
-  TurboModule,
-  TurboModuleContext,
+  UITurboModule,
+  UITurboModuleContext,
 } from '@rnoh/react-native-openharmony/ts';
 import common from '@ohos.app.ability.common';
 import { bundleManager } from '@kit.AbilityKit';
@@ -12,11 +12,13 @@ import { util } from '@kit.ArkTS';
 
 const TAG = 'PushyTurboModule';
 
-export class PushyTurboModule extends TurboModule {
+export class PushyTurboModule extends UITurboModule {
+  public static readonly NAME = 'Pushy';
+
   mUiCtx: common.UIAbilityContext;
   context: UpdateContext;
 
-  constructor(protected ctx: TurboModuleContext) {
+  constructor(protected ctx: UITurboModuleContext) {
     super(ctx);
     logger.debug(TAG, ',PushyTurboModule constructor');
     this.mUiCtx = ctx.uiAbilityContext;

package/harmony/pushy/src/main/ets/UpdateModuleImpl.ts

@@ -1,4 +1,4 @@
-import bundleManager from '@ohos.bundle.bundleManager';
+import { bundleManager } from '@kit.AbilityKit';
 import common from '@ohos.app.ability.common';
 import { UpdateContext } from './UpdateContext';
 import logger from './Logger';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.38.5",
+  "version": "10.39.0-beta.1",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {

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/utils.ts

@@ -124,12 +124,6 @@ export const fetchWithTimeout = (
   });
 };
 
-// export const isAndroid70AndBelow = () => {
-//   // android 7.0 and below devices do not support letsencrypt cert
-//   // https://letsencrypt.org/2023/07/10/cross-sign-expiration/
-//   return Platform.OS === 'android' && Platform.Version <= 24;
-// };
-
 export const enhancedFetch = async (
   url: string,
   params: Parameters<typeof fetch>[1],

package/harmony/pushy/src/main/ets/PushyPackage.ts

@@ -1,22 +0,0 @@
-import { RNPackage, TurboModulesFactory } from '@rnoh/react-native-openharmony/ts';
-import type { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
-import { PushyTurboModule } from './PushyTurboModule';
-
-class PushyTurboModulesFactory extends TurboModulesFactory {
-  createTurboModule(name: string): TurboModule | null {
-    if (name === 'Pushy') {
-      return new PushyTurboModule(this.ctx);
-    }
-    return null;
-  }
-
-  hasTurboModule(name: string): boolean {
-    return name === 'Pushy';
-  }
-}
-
-export class PushyPackage extends RNPackage {
-  createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
-    return new PushyTurboModulesFactory(ctx);
-  }
-}