react-native-update 10.26.0 → 10.26.3

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

@@ -65,9 +65,13 @@ export class DownloadTask {
             0,
             params.targetFile.lastIndexOf('/'),
           );
-          await fileIo.mkdir(targetDir);
+          const exists = fileIo.accessSync(targetDir);
+          if(!exists){
+            await fileIo.mkdir(targetDir);
+          }
         }
       } catch (error) {
+        throw error;
       }
 
       const response = await httpRequest.request(params.url, {
@@ -78,12 +82,11 @@ export class DownloadTask {
           'Content-Type': 'application/octet-stream',
         },
       });
-
       if (response.responseCode > 299) {
         throw new Error(`Server error: ${response.responseCode}`);
       }
 
-      const contentLength = parseInt(response.header['Content-Length'] || '0');
+      const contentLength = parseInt(response.header['content-length'] || '0');
       const writer = await fileIo.open(
         params.targetFile,
         fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE,
@@ -102,8 +105,12 @@ export class DownloadTask {
         this.onProgressUpdate(received, contentLength);
       }
       await fileIo.close(writer);
-      const stat = await fileIo.stat(params.targetFile);
-      const fileSize = stat.size;
+      const stats = await fileIo.stat(params.targetFile);
+      const fileSize = stats.size;
+      if (fileSize !== contentLength) {
+        throw new Error(`Download incomplete: expected ${contentLength} bytes but got ${stats.size} bytes`);
+      }
+
     } catch (error) {
       console.error('Download failed:', error);
       throw error;
@@ -113,7 +120,7 @@ export class DownloadTask {
   }
 
   private onProgressUpdate(received: number, total: number): void {
-    this.eventHub.emit('downloadProgress', {
+    this.eventHub.emit('RCTPushyDownloadProgress', {
       received,
       total,
       hash: this.hash,
@@ -288,8 +295,8 @@ export class DownloadTask {
         }
       }
 
-       if(entry.filename !== '.DS_Store'){
-        await zip.decompressFile(entry.filename, params.unzipDirectory);
+      if(fn !== '.DS_Store'){
+        await zip.decompressFile(fn, params.unzipDirectory);
       }
     }
 
@@ -491,4 +498,4 @@ export class DownloadTask {
       params.listener?.onDownloadFailed(error);
     }
   }
-}
+}

package/harmony/src/main/ets/EventHub.ts

@@ -3,6 +3,7 @@ type EventCallback = (data: any) => void;
 export class EventHub {
   private static instance: EventHub;
   private listeners: Map<string, Set<EventCallback>>;
+  private rnInstance: any;
 
   private constructor() {
     this.listeners = new Map();
@@ -27,12 +28,12 @@ export class EventHub {
   }
 
   public emit(event: string, data: any): void {
-    this.listeners.get(event)?.forEach(callback => {
-      try {
-        callback(data);
-      } catch (error) {
-        console.error(`Error in event listener for ${event}:`, error);
-      }
-    });
+    if (this.rnInstance) {
+      this.rnInstance.emitDeviceEvent(event, data);
+    }
+  }
+
+  setRNInstance(instance: any) {
+    this.rnInstance = instance;
   }
 }

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

@@ -7,6 +7,7 @@ import { BusinessError } from '@ohos.base';
 import logger from './Logger';
 import { UpdateModuleImpl } from './UpdateModuleImpl';
 import { UpdateContext } from './UpdateContext';
+import { EventHub } from './EventHub';
 
 const TAG = "PushyTurboModule"
 
@@ -18,9 +19,8 @@ export class PushyTurboModule extends TurboModule {
     super(ctx);
     logger.debug(TAG, ",PushyTurboModule constructor");
     this.mUiCtx = ctx.uiAbilityContext
-    let rnInstance = ctx.rnInstance
     this.context = new UpdateContext(this.mUiCtx)
-    // rnInstance.emitDeviceEvent("Pushy",{code: err.code, message: err.message});
+    EventHub.getInstance().setRNInstance(ctx.rnInstance)
   }
 
 

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

@@ -31,11 +31,14 @@ export class UpdateContext {
             this.preferences = preferences.getPreferencesSync(this.context, {name:'update'});
             const packageVersion =  this.getPackageVersion();
             const storedVersion =  this.preferences.getSync('packageVersion', '');
-            if (packageVersion !== storedVersion) {
-                 this.preferences.clear();
-                 this.preferences.putSync('packageVersion', packageVersion);
-                 this.preferences.flush();
-                 this.cleanUp();
+            if(!storedVersion){
+                this.preferences.putSync('packageVersion', packageVersion);
+                this.preferences.flush();
+            } else if (storedVersion && packageVersion !== storedVersion) {
+                this.preferences.clear();
+                this.preferences.putSync('packageVersion', packageVersion);
+                this.preferences.flush();
+                this.cleanUp();
             }
         } catch (e) {
             console.error('Failed to init preferences:', e);
@@ -137,8 +140,9 @@ export class UpdateContext {
             params.unzipDirectory = `${this.rootDir}/${hash}`;
 
             const downloadTask = new DownloadTask(this.context);
-            await downloadTask.execute(params);
+            return  await downloadTask.execute(params);
         } catch (e) {
+            throw e;
             console.error('Failed to download APK patch:', e);
         }
     }
@@ -152,14 +156,13 @@ export class UpdateContext {
 
             const lastVersion = this.getKv('currentVersion');
             this.setKv('currentVersion', hash);
-
             if (lastVersion && lastVersion !== hash) {
                 this.setKv('lastVersion', lastVersion);
             }
 
              this.setKv('firstTime', 'true');
              this.setKv('firstTimeOk', 'false');
-             this.setKv('rolledBackVersion', null);
+             this.setKv('rolledBackVersion', "");
         } catch (e) {
             console.error('Failed to switch version:', e);
         }
@@ -211,7 +214,7 @@ export class UpdateContext {
     }
 
     public getCurrentVersion() : string {
-        const currentVersion = this.preferences.getSync('currentVersion', '') as string;
+        const currentVersion = this.getKv('currentVersion');
         return currentVersion;
     }
 

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

@@ -56,7 +56,7 @@ export class UpdateModuleImpl {
     options: { updateUrl: string; hash: string }
   ): Promise<void> {
     try {
-      await updateContext.downloadPatchFromPackage(options.updateUrl, options.hash, {
+     return await updateContext.downloadPatchFromPackage(options.updateUrl, options.hash, {
         onDownloadCompleted: (params: DownloadTaskParams) => {
           return Promise.resolve();
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.26.0",
+  "version": "10.26.3",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {

package/src/client.ts

@@ -9,7 +9,11 @@ import {
   promiseAny,
   testUrls,
 } from './utils';
-import { EmitterSubscription, Platform } from 'react-native';
+import {
+  EmitterSubscription,
+  Platform,
+  DeviceEventEmitter,
+} from 'react-native';
 import { PermissionsAndroid } from './permissions';
 import {
   PushyModule,
@@ -350,14 +354,26 @@ export class Pushy {
       return;
     }
     if (onDownloadProgress) {
-      Pushy.progressHandlers[hash] = pushyNativeEventEmitter.addListener(
-        'RCTPushyDownloadProgress',
-        progressData => {
-          if (progressData.hash === hash) {
-            onDownloadProgress(progressData);
-          }
-        },
-      );
+      // @ts-expect-error harmony not in existing platforms
+      if (Platform.OS === 'harmony') {
+        Pushy.progressHandlers[hash] = DeviceEventEmitter.addListener(
+          'RCTPushyDownloadProgress',
+          progressData => {
+            if (progressData.hash === hash) {
+              onDownloadProgress(progressData);
+            }
+          },
+        );
+      } else {
+        Pushy.progressHandlers[hash] = pushyNativeEventEmitter.addListener(
+          'RCTPushyDownloadProgress',
+          progressData => {
+            if (progressData.hash === hash) {
+              onDownloadProgress(progressData);
+            }
+          },
+        );
+      }
     }
     let succeeded = '';
     this.report({ type: 'downloading' });

package/src/core.ts

@@ -4,7 +4,9 @@ const {
   version: v,
 } = require('react-native/Libraries/Core/ReactNativeVersion');
 const RNVersion = `${v.major}.${v.minor}.${v.patch}`;
-const isTurboModuleEnabled = (global as any).__turboModuleProxy != null;
+const isTurboModuleEnabled =
+  // https://github.com/facebook/react-native/pull/48362
+  (global as any).__turboModuleProxy || (global as any).RN$Bridgeless;
 
 export const PushyModule =
   Platform.OS === 'web'

package/src/provider.tsx

@@ -247,7 +247,9 @@ export const UpdateProvider = ({
     }
     const { checkStrategy, dismissErrorAfter, autoMarkSuccess } = options;
     if (autoMarkSuccess) {
-      markSuccess();
+      setTimeout(() => {
+        markSuccess();
+      }, 1000);
     }
     if (checkStrategy === 'both' || checkStrategy === 'onAppResume') {
       stateListener.current = AppState.addEventListener(
@@ -276,7 +278,7 @@ export const UpdateProvider = ({
 
   const parseTestPayload = useCallback(
     (payload: UpdateTestPayload) => {
-      if (payload && payload.type && payload.type.startsWith('__rnUpdate')) {
+      if (payload && payload.type && payload.type.startsWith('__rnPushy')) {
         const logger = options.logger || (() => {});
         options.logger = ({ type, data }) => {
           logger({ type, data });