fix filejsbundleprovider

.gitignore

@@ -59,3 +59,4 @@ harmony/package
 harmony/pushy/.preview
 Example/harmony_use_pushy/harmony/entry/src/main/resources/rawfile/meta.json
 **/.hvigor
+Example/harmony_use_pushy/harmony/entry/src/main/cpp/generated

Example/harmony_use_pushy/App.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable react/no-unstable-nested-components */
 /* eslint-disable react-native/no-inline-styles */
 import React, {useState} from 'react';
 import {StyleSheet, Text, View, TouchableOpacity, Image} from 'react-native';
@@ -6,7 +5,7 @@ import {StyleSheet, Text, View, TouchableOpacity, Image} from 'react-native';
 import TestConsole from './TestConsole';
 
 import _updateConfig from './update.json';
-import {PushyProvider, Pushy, usePushy} from 'react-native-update';
+import {UpdateProvider, Pushy, useUpdate} from 'react-native-update';
 const {appKey} = _updateConfig.harmony;
 
 function App() {
@@ -20,7 +19,7 @@ function App() {
     packageVersion,
     currentHash,
     progress: {received, total} = {},
-  } = usePushy();
+  } = useUpdate();
   const [useDefaultAlert, setUseDefaultAlert] = useState(false);
   const [showTestConsole, setShowTestConsole] = useState(false);
   const [showUpdateBanner, setShowUpdateBanner] = useState(false);
@@ -41,6 +40,7 @@ function App() {
   return (
     <View style={styles.container}>
       <Text style={styles.welcome}>欢迎使用Pushy热更新服务</Text>
+      {/* <Image source={require('./gmail.png')} style={styles.image} /> */}
       {/* <Text style={styles.welcome}>😁hdiffFromAPP更新成功！！！</Text> */}
       {/* <Text style={styles.welcome}>😁hdiffFromPPk更新成功！！！</Text> */}
       <View style={{flexDirection: 'row'}}>
@@ -166,7 +166,7 @@ function App() {
                 style={{marginRight: 20}}>
                 <Text style={{color: '#2196F3'}}>下次再说</Text>
               </TouchableOpacity>
-              <TouchableOpacity onPress={switchVersion}>
+              <TouchableOpacity onPress={() => switchVersion()}>
                 <Text style={{color: '#2196F3'}}>立即重启</Text>
               </TouchableOpacity>
             </View>
@@ -204,18 +204,22 @@ const styles = StyleSheet.create({
     color: '#333333',
     marginBottom: 5,
   },
-  image: {},
+  image: {
+    width: 109,
+    height: 40,
+  },
 });
 
 const pushyClient = new Pushy({
   appKey,
   debug: true,
+  updateStrategy: null,
 });
 
 export default function Root() {
   return (
-    <PushyProvider client={pushyClient}>
+    <UpdateProvider client={pushyClient}>
       <App />
-    </PushyProvider>
+    </UpdateProvider>
   );
 }

Example/harmony_use_pushy/Gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby ">= 2.6.10"
-
-gem 'cocoapods', '~> 1.12'

Example/harmony_use_pushy/harmony/entry/src/main/cpp/generated/RNOHGeneratedPackage.h

@@ -1,65 +0,0 @@
-/**
- * This code was generated by "react-native codegen-harmony"
- *
- * Do not edit this file as changes may cause incorrect behavior and will be
- * lost once the code is regenerated.
- *
- * @generatorVersion: 1
- */
-
-#pragma once
-
-#include "RNOH/Package.h"
-#include "RNOH/ArkTSTurboModule.h"
-
-namespace rnoh {
-
-class RNOHGeneratedPackageTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
-  public:
-    SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override {
-        return nullptr;
-    };
-};
-
-class GeneratedEventEmitRequestHandler : public EventEmitRequestHandler {
-  public:
-    void handleEvent(Context const &ctx) override {
-        auto eventEmitter = ctx.shadowViewRegistry->getEventEmitter<facebook::react::EventEmitter>(ctx.tag);
-        if (eventEmitter == nullptr) {
-            return;
-        }
-
-        std::vector<std::string> supportedEventNames = {
-        };
-        if (std::find(supportedEventNames.begin(), supportedEventNames.end(), ctx.eventName) != supportedEventNames.end()) {
-            eventEmitter->dispatchEvent(ctx.eventName, ArkJS(ctx.env).getDynamic(ctx.payload));
-        }    
-    }
-};
-
-class RNOHGeneratedPackage : public Package {
-  public:
-    RNOHGeneratedPackage(Package::Context ctx) : Package(ctx){};
-
-    std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override {
-        return std::make_unique<RNOHGeneratedPackageTurboModuleFactoryDelegate>();
-    }
-
-    std::vector<facebook::react::ComponentDescriptorProvider> createComponentDescriptorProviders() override {
-        return {
-        };
-    }
-
-    ComponentJSIBinderByString createComponentJSIBinderByName() override {
-        return {
-        };
-    };
-
-    EventEmitRequestHandlers createEventEmitRequestHandlers() override {
-        return {
-            std::make_shared<GeneratedEventEmitRequestHandler>(),
-        };
-    }
-};
-
-} // namespace rnoh

Example/harmony_use_pushy/package.json

@@ -18,7 +18,7 @@
     "@react-native-oh/react-native-harmony": "^0.72.59",
     "react": "18.2.0",
     "react-native": "0.72.5",
-    "react-native-update": "latest"
+    "react-native-update": "^10.34.9"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

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

@@ -57,7 +57,7 @@ export class DownloadTask {
 
     try {
       try {
-        const exists = fileIo.accessSync(params.targetFile);
+        let exists = fileIo.accessSync(params.targetFile);
         if (exists) {
           await fileIo.unlink(params.targetFile);
         } else {
@@ -65,7 +65,7 @@ export class DownloadTask {
             0,
             params.targetFile.lastIndexOf('/'),
           );
-          const exists = fileIo.accessSync(targetDir);
+          exists = fileIo.accessSync(targetDir);
           if (!exists) {
             await fileIo.mkdir(targetDir);
           }

harmony/pushy/src/main/ets/PushyFileJSBundleProvider.ets

@@ -1,49 +1,41 @@
-import { HotReloadConfig, JSBundleProvider, JSBundleProviderError, JSPackagerClientConfig } from '@rnoh/react-native-openharmony';
-import fileIo from '@ohos.file.fs';
+import {
+  FileJSBundle,
+  HotReloadConfig,
+  JSBundleProvider,
+  JSBundleProviderError
+} from '@rnoh/react-native-openharmony';
 import common from '@ohos.app.ability.common';
+import fs from '@ohos.file.fs';
 import { UpdateContext } from './UpdateContext';
 
 export class PushyFileJSBundleProvider extends JSBundleProvider {
   private updateContext: UpdateContext;
-  private filePath: string = ''
+  private path: string = ''
 
   constructor(context: common.UIAbilityContext) {
     super();
     this.updateContext = new UpdateContext(context);
+    this.path = this.updateContext.getBundleUrl();
   }
+
   getURL(): string {
-    return this.updateContext.getBundleUrl()?.substring(1);
+    return this.path;
   }
 
-  async getBundle(): Promise<ArrayBuffer> {
+  async getBundle(): Promise<FileJSBundle> {
     try {
-      this.filePath =  this.updateContext.getBundleUrl();
-      const res = fileIo.accessSync(this.filePath);
-      if (res) {
-        const file = fileIo.openSync(this.filePath, fileIo.OpenMode.READ_ONLY);
-        try {
-          const stat = await fileIo.stat(this.filePath);
-          const fileSize = stat.size;
-          const buffer = new ArrayBuffer(fileSize);
-          const bytesRead = fileIo.readSync(file.fd, buffer, {
-            offset: 0,
-            length: fileSize
-          });
-          
-          if (bytesRead !== fileSize) {
-            throw new Error(`Failed to read entire file: read ${bytesRead} of ${fileSize} bytes`);
-          }
-          return buffer;
-        } finally {
-          fileIo.closeSync(file.fd);
+      const status = await fs.access(this.path, fs.OpenMode.READ_ONLY);
+      if (status) {
+        return {
+          filePath: this.path
         }
       }
       throw new Error('Update bundle not found');
     } catch (error) {
       throw new JSBundleProviderError({
-        whatHappened: `Couldn't load JSBundle from ${this.filePath}`,
+        whatHappened: `Couldn't load JSBundle from ${this.path}`,
         extraData: error,
-        howCanItBeFixed: [`Check if a bundle exists at "${this.filePath}" on your device.`]
+        howCanItBeFixed: [`Check if a bundle exists at "${this.path}" on your device.`]
       })
     }
   }

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

@@ -1,9 +1,10 @@
-import { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
+import {
+  TurboModule,
+  TurboModuleContext,
+} from '@rnoh/react-native-openharmony/ts';
 import common from '@ohos.app.ability.common';
 import dataPreferences from '@ohos.data.preferences';
 import { bundleManager } from '@kit.AbilityKit';
-import abilityAccessCtrl, { Permissions } from '@ohos.abilityAccessCtrl';
-import { BusinessError } from '@ohos.base';
 import logger from './Logger';
 import { UpdateModuleImpl } from './UpdateModuleImpl';
 import { UpdateContext } from './UpdateContext';
@@ -23,19 +24,30 @@ export class PushyTurboModule extends TurboModule {
     EventHub.getInstance().setRNInstance(ctx.rnInstance);
   }
 
-
   getConstants(): Object {
     logger.debug(TAG, ',call getConstants');
     const context = this.mUiCtx;
-  const preferencesManager = dataPreferences.getPreferencesSync(context,{ name: 'update' });
-  const isFirstTime = preferencesManager.getSync('isFirstTime', false) as boolean;
-  const rolledBackVersion = preferencesManager.getSync('rolledBackVersion', '') as string;
+    const preferencesManager = dataPreferences.getPreferencesSync(context, {
+      name: 'update',
+    });
+    const isFirstTime = preferencesManager.getSync(
+      'isFirstTime',
+      false,
+    ) as boolean;
+    const rolledBackVersion = preferencesManager.getSync(
+      'rolledBackVersion',
+      '',
+    ) as string;
     const uuid = preferencesManager.getSync('uuid', '') as string;
-  const currentVersion = preferencesManager.getSync('currentVersion', '') as string;
+    const currentVersion = preferencesManager.getSync(
+      'currentVersion',
+      '',
+    ) as string;
     const currentVersionInfo = this.context.getKv(`hash_${currentVersion}`);
     const buildTime = preferencesManager.getSync('buildTime', '') as string;
     const isUsingBundleUrl = this.context.getIsUsingBundleUrl();
-  let bundleFlags = bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION;
+    let bundleFlags =
+      bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION;
     let packageVersion = '';
     try {
       const bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleFlags);
@@ -65,7 +77,6 @@ getConstants(): Object {
     };
   }
 
-
   setLocalHashInfo(hash: string, info: string): boolean {
     logger.debug(TAG, ',call setLocalHashInfo');
     return UpdateModuleImpl.setLocalHashInfo(this.context, hash, info);
@@ -95,31 +106,45 @@ getConstants(): Object {
     return UpdateModuleImpl.markSuccess(this.context);
   }
 
-  async downloadPatchFromPpk(options: { updateUrl: string; hash: string; originHash: string }): Promise<void> {
+  async downloadPatchFromPpk(options: {
+    updateUrl: string;
+    hash: string;
+    originHash: string;
+  }): Promise<void> {
     logger.debug(TAG, ',call downloadPatchFromPpk');
     return UpdateModuleImpl.downloadPatchFromPpk(this.context, options);
   }
 
-  async downloadPatchFromPackage(options: { updateUrl: string; hash: string }): Promise<void>  {
+  async downloadPatchFromPackage(options: {
+    updateUrl: string;
+    hash: string;
+  }): Promise<void> {
     logger.debug(TAG, ',call downloadPatchFromPackage');
     return UpdateModuleImpl.downloadPatchFromPackage(this.context, options);
   }
 
-  async downloadFullUpdate(options: { updateUrl: string; hash: string }): Promise<void> {
+  async downloadFullUpdate(options: {
+    updateUrl: string;
+    hash: string;
+  }): Promise<void> {
     logger.debug(TAG, ',call downloadFullUpdate');
     return UpdateModuleImpl.downloadFullUpdate(this.context, options);
   }
 
-  async downloadAndInstallApk(options: { url: string; target: string; hash: string }): Promise<void> {
+  async downloadAndInstallApk(options: {
+    url: string;
+    target: string;
+    hash: string;
+  }): Promise<void> {
     logger.debug(TAG, ',call downloadAndInstallApk');
     return UpdateModuleImpl.downloadAndInstallApk(this.mUiCtx, options);
   }
 
-  addListener(eventName: string): void {
+  addListener(_eventName: string): void {
     logger.debug(TAG, ',call addListener');
   }
 
-  removeListeners(count: number): void {
+  removeListeners(_count: number): void {
     logger.debug(TAG, ',call removeListeners');
   }
 }

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

@@ -101,6 +101,7 @@ export class UpdateContext {
       params.hash = hash;
       params.listener = listener;
       params.targetFile = `${this.rootDir}/${hash}.ppk`;
+      params.unzipDirectory = `${this.rootDir}/${hash}`;
       const downloadTask = new DownloadTask(this.context);
       await downloadTask.execute(params);
     } catch (e) {
@@ -162,8 +163,8 @@ export class UpdateContext {
       const downloadTask = new DownloadTask(this.context);
       return await downloadTask.execute(params);
     } catch (e) {
-      throw e;
       console.error('Failed to download APK patch:', e);
+      throw e;
     }
   }
 
@@ -191,11 +192,11 @@ export class UpdateContext {
   public static getBundleUrl(
     context: common.UIAbilityContext,
     defaultAssetsUrl?: string,
-  ): string {
+  ) {
     return new UpdateContext(context).getBundleUrl(defaultAssetsUrl);
   }
 
-  public getBundleUrl(defaultAssetsUrl?: string): string {
+  public getBundleUrl(defaultAssetsUrl?: string) {
     UpdateContext.isUsingBundleUrl = true;
     const currentVersion = this.getCurrentVersion();
     if (!currentVersion) {

package.json

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

src/core.ts

@@ -47,7 +47,7 @@ export const currentVersionInfo = _currentVersionInfo;
 
 export const isFirstTime: boolean = PushyConstants.isFirstTime;
 export const rolledBackVersion: string = PushyConstants.rolledBackVersion;
-export const isRolledBack: boolean = typeof rolledBackVersion === 'string';
+export const isRolledBack: boolean = !!rolledBackVersion;
 
 export const buildTime: string = PushyConstants.buildTime;
 let uuid = PushyConstants.uuid;