react-native-update 10.44.0 → 10.46.0

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

@@ -69,7 +69,7 @@ const FILE_COPY_BUFFER_SIZE = 64 * 1024;
 
 export class DownloadTask {
   private context: common.Context;
-  private hash: string;
+  private hash = '';
   private eventHub: EventHub;
 
   constructor(context: common.Context) {
@@ -244,7 +244,7 @@ export class DownloadTask {
         bundleOutputPath: outputFile,
         enableMerge: false,
       });
-    } catch (error) {
+    } catch (error: any) {
       error.message = `Failed to process bundle patch: ${error.message}`;
       throw error;
     } finally {
@@ -395,17 +395,18 @@ export class DownloadTask {
         fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE,
       );
 
-      httpRequest.on('headersReceive', (header: Record<string, string>) => {
+      httpRequest.on('headersReceive', (header: Object) => {
         if (!header) {
           return;
         }
-        const lengthKey = Object.keys(header).find(
+        const headers = header as Record<string, string>;
+        const lengthKey = Object.keys(headers).find(
           key => key.toLowerCase() === 'content-length',
         );
         if (!lengthKey) {
           return;
         }
-        const length = parseInt(header[lengthKey], 10);
+        const length = parseInt(headers[lengthKey], 10);
         if (!Number.isNaN(length)) {
           contentLength = length;
         }
@@ -606,9 +607,11 @@ export class DownloadTask {
         }
 
         if (currentFrom.startsWith('resources/base/media/')) {
+          // Strip only the final extension: 'icon.round.png' -> 'icon.round',
+          // not 'icon' (getMediaByName expects the full resource name).
           const mediaName = currentFrom
             .replace('resources/base/media/', '')
-            .split('.')[0];
+            .replace(/\.[^.]+$/, '');
           const mediaBuffer = await resourceManager.getMediaByName(mediaName);
           const parentDirs = [
             ...new Set(
@@ -649,7 +652,7 @@ export class DownloadTask {
           }
         }
       }
-    } catch (error) {
+    } catch (error: any) {
       error.message =
         'Copy from resource failed:' +
         currentFrom +
@@ -670,7 +673,7 @@ export class DownloadTask {
         params.originHash || '',
         3,
       );
-    } catch (error) {
+    } catch (error: any) {
       error.message = 'Cleanup failed:' + error.message;
       console.error(error);
       throw error;
@@ -698,7 +701,7 @@ export class DownloadTask {
         default:
           throw Error(`Unknown task type: ${params.type}`);
       }
-    } catch (error) {
+    } catch (error: any) {
       console.error('Task execution failed:', error.message);
       if (params.type !== DownloadTaskParams.TASK_TYPE_CLEANUP) {
         try {
@@ -707,7 +710,7 @@ export class DownloadTask {
           } else {
             await this.removeDirectory(params.unzipDirectory);
           }
-        } catch (cleanupError) {
+        } catch (cleanupError: any) {
           console.error('Cleanup after error failed:', cleanupError.message);
         }
       }

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

@@ -50,10 +50,6 @@ export interface FileSourcePatchRequest {
 }
 
 interface NativePatchCoreBindings {
-  hdiffPatch(
-    origin: Uint8Array,
-    patch: Uint8Array,
-  ): ArrayBuffer | Uint8Array;
   syncStateWithBinaryVersion(
     packageVersion: string,
     buildTime: string,

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

@@ -468,13 +468,22 @@ export class UpdateContext {
   public getBundleUrl() {
     UpdateContext.isUsingBundleUrl = true;
     this.trace('getBundleUrl:enter');
+    const stateBeforeLaunch = this.getStateSnapshot();
     const launchState = NativePatchCore.runStateCore(
       STATE_OP_RESOLVE_LAUNCH,
-      this.getStateSnapshot(),
+      stateBeforeLaunch,
       '',
       UpdateContext.ignoreRollback,
       true,
     );
+    if (launchState.didRollback) {
+      // The crash-protection rollback: the new version never called
+      // markSuccess. Keep this visible in release logs.
+      console.error(
+        `Version ${stateBeforeLaunch.currentVersion} was not marked as successful,` +
+          ` rolled back to ${launchState.currentVersion}`,
+      );
+    }
     if (launchState.didRollback || launchState.consumedFirstTime) {
       this.persistState(launchState, {
         markFirstLoadMarker: launchState.consumedFirstTime,
@@ -490,7 +499,12 @@ export class UpdateContext {
     );
 
     let version = launchState.loadVersion || '';
-    while (version) {
+    // Guard the rollback chain against cycles: a corrupted state returning an
+    // already-visited version would otherwise spin this loop forever during
+    // startup (Android has the same guard).
+    const visitedVersions = new Set<string>();
+    while (version && !visitedVersions.has(version)) {
+      visitedVersions.add(version);
       const bundleFile = this.getBundlePath(version);
       try {
         if (!fileIo.accessSync(bundleFile)) {
@@ -514,7 +528,11 @@ export class UpdateContext {
   }
 
   private rollBack(): string {
+    const stateBefore = this.getStateSnapshot();
     const nextState = this.runStateOperation(STATE_OP_ROLLBACK);
+    console.error(
+      `Rolling back version ${stateBefore.currentVersion} to ${nextState.currentVersion}`,
+    );
     return nextState.currentVersion || '';
   }