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

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

@@ -291,9 +291,16 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
     // e.g., "res/drawable-xxhdpi-v4/img.png" → "res/drawable-xxhdpi/img.png"
     private static final Pattern VERSION_QUALIFIER_PATTERN =
         Pattern.compile("-v\\d+(?=/)");
+    // AAB internal paths are prefixed with "base/" (e.g., "base/res/drawable-xxhdpi/img.png")
+    // which does not exist in standard APK layout
+    private static final String AAB_BASE_PREFIX = "base/";
 
     private String normalizeResPath(String path) {
-        return VERSION_QUALIFIER_PATTERN.matcher(path).replaceAll("");
+        String result = path;
+        if (result.startsWith(AAB_BASE_PREFIX)) {
+            result = result.substring(AAB_BASE_PREFIX.length());
+        }
+        return VERSION_QUALIFIER_PATTERN.matcher(result).replaceAll("");
     }
 
     private String findDrawableFallback(String originalToPath, HashMap<String, String> copiesMap, HashMap<String, ZipEntry> availableEntries, HashMap<String, String> normalizedEntryMap) {

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.39.0-beta.0",
+  "version": "10.39.0-beta.2",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {
@@ -78,4 +78,4 @@
     "ts-jest": "^29.4.6",
     "typescript": "^5.6.3"
   }
-}
+}

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/android/bin/.settings/org.eclipse.buildship.core.prefs

@@ -1,13 +0,0 @@
-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/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);
-  }
-}