use latest rnoh package

.gitignore

@@ -57,3 +57,6 @@ Example/harmony_use_pushy/libs
 harmony/package
 **/oh_modules
 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

.gitmodules

@@ -4,9 +4,3 @@
 [submodule "android/jni/HDiffPatch"]
 	path = android/jni/HDiffPatch
 	url = https://github.com/sisong/HDiffPatch.git
-[submodule "harmony/pushy/src/main/cpp/HDiffPatch"]
-	path = harmony/pushy/src/main/cpp/HDiffPatch
-	url = https://github.com/sisong/HDiffPatch.git
-[submodule "harmony/pushy/src/main/cpp/lzma"]
-	path = harmony/pushy/src/main/cpp/lzma
-	url = https://github.com/sisong/lzma.git

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/build-profile.json5

@@ -10,8 +10,9 @@
         buildOption: {
           strictMode: {
             caseSensitiveCheck: true,
-            useNormalizedOHMUrl: true,
+            useNormalizedOHMUrl: true
           },
+          "nativeCompiler": "BiSheng"
         },
       },
     ],
@@ -37,13 +38,7 @@
     },
     {
       name: 'pushy',
-      srcPath: '../../../harmony/pushy',
-      targets: [
-        {
-          name: 'default',
-          applyToProducts: ['default'],
-        },
-      ],
+      srcPath: '../node_modules/react-native-update/harmony/pushy',
     },
   ],
 }

Example/harmony_use_pushy/harmony/entry/oh-package.json5

@@ -6,7 +6,7 @@
   author: '',
   license: '',
   dependencies: {
-    '@rnoh/react-native-openharmony': '0.72.38',
+    '@rnoh/react-native-openharmony': '0.72.96',
     pushy: 'file:../../node_modules/react-native-update/harmony/pushy',
   },
 }

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/harmony/entry/src/main/ets/pages/Index.ets

@@ -54,7 +54,6 @@ struct Index {
             enableCAPIArchitecture: true,
             arkTsComponentNames: arkTsComponentNames,
           },
-          initialProps: { "foo": "bar" } as Record<string, string>,
           appKey: "harmony_use_pushy",
           wrappedCustomRNComponentBuilder: wrappedCustomRNComponentBuilder,
           onSetUp: (rnInstance) => {

Example/harmony_use_pushy/harmony/entry/src/main/resources/rawfile/meta.json

@@ -1,4 +0,0 @@
-{
-    "pushy_build_time": "2025-04-30T02:46:33.340Z",
-    "versionName": "1.0.0"
-}

Example/harmony_use_pushy/harmony/oh-package-lock.json5

@@ -1,23 +1,16 @@
 {
   "meta": {
-    "stableOrder": true
+    "stableOrder": true,
+    "enableUnifiedLockfile": false
   },
   "lockfileVersion": 3,
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
   "specifiers": {
-    "@ohos/hamock@1.0.0": "@ohos/hamock@1.0.0",
     "@ohos/hypium@1.0.19": "@ohos/hypium@1.0.19"
   },
   "packages": {
-    "@ohos/hamock@1.0.0": {
-      "name": "@ohos/hamock",
-      "version": "1.0.0",
-      "integrity": "sha512-K6lDPYc6VkKe6ZBNQa9aoG+ZZMiwqfcR/7yAVFSUGIuOAhPvCJAo9+t1fZnpe0dBRBPxj2bxPPbKh69VuyAtDg==",
-      "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hamock/-/hamock-1.0.0.har",
-      "registryType": "ohpm"
-    },
     "@ohos/hypium@1.0.19": {
-      "name": "@ohos/hypium",
+      "name": "",
       "version": "1.0.19",
       "integrity": "sha512-cEjDgLFCm3cWZDeRXk7agBUkPqjWxUo6AQeiu0gEkb3J8ESqlduQLSIXeo3cCsm8U/asL7iKjF85ZyOuufAGSQ==",
       "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.19.har",

Example/harmony_use_pushy/harmony/oh-package.json5

@@ -1,20 +1,18 @@
 {
-  "modelVersion": "5.0.0",
-  "description": "Please describe the basic information.",
-  "dependencies": {
+  modelVersion: '5.0.0',
+  description: 'Please describe the basic information.',
+  dependencies: {},
+  devDependencies: {
+    '@ohos/hypium': '1.0.19'
   },
-  "devDependencies": {
-    "@ohos/hypium": "1.0.19",
-    "@ohos/hamock": "1.0.0"
+  arkTs: {
+    compilerOptions: {
+      noImplicitAny: false,
+      suppressImplicitAnyIndexErrors: true,
+      strict: false,
+    },
   },
-  "arkTs": {
-    "compilerOptions": {
-      "noImplicitAny": false,
-      "suppressImplicitAnyIndexErrors": true,
-      "strict": false
-    }
+  overrides: {
+    '@rnoh/react-native-openharmony': '0.72.96',
   },
-  "overrides": {
-    "@rnoh/react-native-openharmony": "0.72.38"
-  }
 }

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.35.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

harmony/pushy/oh-package-lock.json5

@@ -6,14 +6,14 @@
   "lockfileVersion": 3,
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
   "specifiers": {
-    "@rnoh/react-native-openharmony@0.72.38": "@rnoh/react-native-openharmony@0.72.38"
+    "@rnoh/react-native-openharmony@^0.72.96": "@rnoh/react-native-openharmony@0.72.96"
   },
   "packages": {
-    "@rnoh/react-native-openharmony@0.72.38": {
+    "@rnoh/react-native-openharmony@0.72.96": {
       "name": "",
-      "version": "0.72.38",
-      "integrity": "sha512-br5SIrbB0OarSLirenleE7eTOX1lNccMJ7nb/G7qWTyJ7kW4DalmTXVKYpoT2qaOLls1uEE7McD1OjbZZM9jug==",
-      "resolved": "https://ohpm.openharmony.cn/ohpm/@rnoh/react-native-openharmony/-/react-native-openharmony-0.72.38.har",
+      "version": "0.72.96",
+      "integrity": "sha512-gBbm8LLyqi5UE7qHWdZYeQnjyncfEpCczKZUP/9M2U1Z7exR0Kya8PMKMwr1ta5ujy7w/hZVC2LomEV4QvBeqA==",
+      "resolved": "https://ohpm.openharmony.cn/ohpm/@rnoh/react-native-openharmony/-/react-native-openharmony-0.72.96.har",
       "registryType": "ohpm"
     }
   }

harmony/pushy/oh-package.json5

@@ -1,13 +1,13 @@
 {
-  "license": "MIT",
-  "types": "",
-  "devDependencies": {},
-  "name": "pushy",
-  "description": "",
-  "main": "index.ets",
-  "version": "3.1.0-0.0.7",
-  "dependencies": {
-    "@rnoh/react-native-openharmony":"^0.72.38"
+  license: 'MIT',
+  types: '',
+  devDependencies: {},
+  name: 'pushy',
+  description: '',
+  main: 'index.ets',
+  version: '10.35.1',
+  dependencies: {
+    '@rnoh/react-native-openharmony': '^0.72.96',
   },
-  "modelVersion": "5.0.0"
+  modelVersion: '5.0.0',
 }

harmony/pushy/src/main/cpp/CMakeLists.txt

@@ -1,11 +1,13 @@
 cmake_minimum_required(VERSION 3.13)
 project(rnupdate)
 
-set(HDIFFPATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR}/HDiffPatch)
-set(LZMA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lzma)
+# Point to android/jni directory for shared source code
+set(ANDROID_JNI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../../node_modules/react-native-update/android/jni)
+set(HDIFFPATCH_DIR ${ANDROID_JNI_DIR}/HDiffPatch)
+set(LZMA_DIR ${ANDROID_JNI_DIR}/lzma)
 set(HDP_SOURCES
      ${CMAKE_CURRENT_SOURCE_DIR}/pushy.c
-     ${CMAKE_CURRENT_SOURCE_DIR}/hpatch.c
+     ${ANDROID_JNI_DIR}/hpatch.c
      ${HDIFFPATCH_DIR}/libHDiffPatch/HPatch/patch.c
      ${HDIFFPATCH_DIR}/file_for_patch.c
      ${LZMA_DIR}/C/LzmaDec.c
@@ -20,6 +22,7 @@ add_library(rnupdate SHARED
 
 target_include_directories(rnupdate PRIVATE
      ${CMAKE_CURRENT_SOURCE_DIR}
+     ${ANDROID_JNI_DIR}
      ${HDIFFPATCH_DIR}
      ${HDIFFPATCH_DIR}/libHDiffPatch/HPatch
      ${LZMA_DIR}/C

harmony/pushy/src/main/cpp/hpatch.c

@@ -1,137 +0,0 @@
-// hpatch.c
-// Copyright 2021 housisong, All rights reserved
-#include "hpatch.h"
-#include "HDiffPatch/libHDiffPatch/HPatch/patch.h"
-#include "HDiffPatch/file_for_patch.h"
-
-//#define _CompressPlugin_zlib
-//#define _CompressPlugin_bz2
-#define _CompressPlugin_lzma
-#define _CompressPlugin_lzma2
-#define _IsNeedIncludeDefaultCompressHead 0
-#include "lzma/C/LzmaDec.h"
-#include "lzma/C/Lzma2Dec.h"
-#include "HDiffPatch/decompress_plugin_demo.h"
-
-#define kMaxLoadMemOldSize ((1<<20)*8)
-
-#define  _check(v,errorType) do{ \
-    if (!(v)){ if (result==kHPatch_ok) result=errorType; if (!_isInClear){ goto _clear; }; } }while(0)
-
-int hpatch_getInfo_by_mem(hpatch_singleCompressedDiffInfo* out_patinfo,
-                          const uint8_t* pat,size_t patsize){
-    hpatch_TStreamInput patStream;
-    mem_as_hStreamInput(&patStream,pat,pat+patsize);
-    if (!getSingleCompressedDiffInfo(out_patinfo,&patStream,0))
-        return kHPatch_error_info;//data error;
-    return kHPatch_ok; //ok
-}
-
-static hpatch_TDecompress* getDecompressPlugin(const char* compressType){
-#ifdef  _CompressPlugin_zlib
-    if (zlibDecompressPlugin.is_can_open(compressType))
-        return &zlibDecompressPlugin;
-#endif
-#ifdef  _CompressPlugin_bz2
-    if (bz2DecompressPlugin.is_can_open(compressType))
-        return &bz2DecompressPlugin;
-#endif
-#ifdef  _CompressPlugin_lzma
-    if (lzmaDecompressPlugin.is_can_open(compressType))
-        return &lzmaDecompressPlugin;
-#endif
-#ifdef  _CompressPlugin_lzma2
-    if (lzma2DecompressPlugin.is_can_open(compressType))
-        return &lzma2DecompressPlugin;
-#endif
-    return 0;
-}
-static int hpatch_by_stream(const hpatch_TStreamInput* old,hpatch_BOOL isLoadOldAllToMem,const hpatch_TStreamInput* pat,
-                            hpatch_TStreamOutput* out_new,const hpatch_singleCompressedDiffInfo* patInfo){
-    int     result=kHPatch_ok;
-    int     _isInClear=hpatch_FALSE;
-    hpatch_TDecompress* decompressPlugin=0;
-    uint8_t* temp_cache=0;
-    size_t temp_cache_size;
-    hpatch_singleCompressedDiffInfo _patinfo;
-    hpatch_TStreamInput _old;
-    {// info
-        if (!patInfo){
-            _check(getSingleCompressedDiffInfo(&_patinfo,pat,0),kHPatch_error_info);
-            patInfo=&_patinfo;
-        }
-        _check(old->streamSize==patInfo->oldDataSize,kHPatch_error_old_size);
-        _check(out_new->streamSize>=patInfo->newDataSize,kHPatch_error_new_size);
-        out_new->streamSize=patInfo->newDataSize;
-        if (strlen(patInfo->compressType)>0){
-            decompressPlugin=getDecompressPlugin(patInfo->compressType);
-            _check(decompressPlugin,kHPatch_error_compressType);
-        }
-    }
-    {// mem
-        size_t mem_size;
-        size_t oldSize=(size_t)old->streamSize;
-        isLoadOldAllToMem=isLoadOldAllToMem&&(old->streamSize<=kMaxLoadMemOldSize);
-        temp_cache_size=patInfo->stepMemSize+hpatch_kFileIOBufBetterSize*3;
-        mem_size=temp_cache_size+(isLoadOldAllToMem?oldSize:0);
-        temp_cache=malloc(mem_size);
-        _check(temp_cache,kHPatch_error_malloc);
-        if (isLoadOldAllToMem){//load old to mem
-            uint8_t* oldMem=temp_cache+temp_cache_size;
-            _check(old->read(old,0,oldMem,oldMem+oldSize),kHPatch_error_old_fread);
-            mem_as_hStreamInput(&_old,oldMem,oldMem+oldSize);
-            old=&_old;
-        }
-    }
-
-    _check(patch_single_compressed_diff(out_new,old,pat,patInfo->diffDataPos,
-               patInfo->uncompressedSize,decompressPlugin,patInfo->coverCount,
-               patInfo->stepMemSize,temp_cache,temp_cache+temp_cache_size),kHPatch_error_patch);
-
-_clear:
-    _isInClear=hpatch_TRUE;
-    if (temp_cache){ free(temp_cache); temp_cache=0; }
-    return result;
-}
-
-int hpatch_by_mem(const uint8_t* old,size_t oldsize,uint8_t* newBuf,size_t newsize,
-                  const uint8_t* pat,size_t patsize,const hpatch_singleCompressedDiffInfo* patInfo){
-    hpatch_TStreamInput oldStream;
-    hpatch_TStreamInput patStream;
-    hpatch_TStreamOutput newStream;
-    mem_as_hStreamInput(&oldStream,old,old+oldsize);
-    mem_as_hStreamInput(&patStream,pat,pat+patsize);
-    mem_as_hStreamOutput(&newStream,newBuf,newBuf+newsize);
-    return hpatch_by_stream(&oldStream,hpatch_FALSE,&patStream,&newStream,patInfo);
-}
-
-int hpatch_by_file(const char* oldfile, const char* newfile, const char* patchfile){
-    int     result=kHPatch_ok;
-    int     _isInClear=hpatch_FALSE;
-    int     patch_result;
-    hpatch_TFileStreamInput oldStream;
-    hpatch_TFileStreamInput patStream;
-    hpatch_TFileStreamOutput newStream;
-    hpatch_TFileStreamInput_init(&oldStream);
-    hpatch_TFileStreamInput_init(&patStream);
-    hpatch_TFileStreamOutput_init(&newStream);
-
-    _check(hpatch_TFileStreamInput_open(&oldStream,oldfile),kHPatch_error_old_fopen);
-    _check(hpatch_TFileStreamInput_open(&patStream,patchfile),kHPatch_error_pat_fopen);
-    _check(hpatch_TFileStreamOutput_open(&newStream,newfile,~(hpatch_StreamPos_t)0),kHPatch_error_new_fopen);
-
-    patch_result=hpatch_by_stream(&oldStream.base,hpatch_TRUE,&patStream.base,&newStream.base,0);
-    if (patch_result!=kHPatch_ok){
-        _check(!oldStream.fileError,kHPatch_error_old_fread);
-        _check(!patStream.fileError,kHPatch_error_pat_fread);
-        _check(!newStream.fileError,kHPatch_error_new_fwrite);
-        _check(hpatch_FALSE,patch_result);
-    }
-
-_clear:
-    _isInClear=hpatch_TRUE;
-    _check(hpatch_TFileStreamInput_close(&oldStream),kHPatch_error_old_fclose);
-    _check(hpatch_TFileStreamInput_close(&patStream),kHPatch_error_pat_fclose);
-    _check(hpatch_TFileStreamOutput_close(&newStream),kHPatch_error_new_fclose);
-    return result;
-}

harmony/pushy/src/main/cpp/hpatch.h

@@ -1,44 +0,0 @@
-// hpatch.h
-// import HDiffPatch, support patchData created by "hdiffz -SD -c-lzma2 oldfile newfile patchfile"
-// Copyright 2021 housisong, All rights reserved
-
-#ifndef HDIFFPATCH_PATCH_H
-#define HDIFFPATCH_PATCH_H
-# include <stdint.h> //for uint8_t
-#include "HDiffPatch/libHDiffPatch/HPatch/patch_types.h" //for hpatch_singleCompressedDiffInfo
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//result
-enum {
-    kHPatch_ok                  = 0,
-    kHPatch_error_malloc        =-1,
-    kHPatch_error_info          =-2,
-    kHPatch_error_compressType  =-3,
-    kHPatch_error_patch         =-4,
-    kHPatch_error_old_fopen     =-5,
-    kHPatch_error_old_fread     =-6,
-    kHPatch_error_old_fclose    =-7,
-    kHPatch_error_pat_fopen     =-8,
-    kHPatch_error_pat_fread     =-9,
-    kHPatch_error_pat_fclose    =-10,
-    kHPatch_error_new_fopen     =-11,
-    kHPatch_error_new_fwrite    =-12,
-    kHPatch_error_new_fclose    =-13,
-    kHPatch_error_old_size      =-14,
-    kHPatch_error_new_size      =-15,
-};
-
-int hpatch_getInfo_by_mem(hpatch_singleCompressedDiffInfo* out_patinfo,
-                          const uint8_t* pat,size_t patsize);
-
-//patInfo can NULL
-int hpatch_by_mem(const uint8_t* old,size_t oldsize, uint8_t* newBuf,size_t newsize,
-                  const uint8_t* pat,size_t patsize,const hpatch_singleCompressedDiffInfo* patInfo);
-int hpatch_by_file(const char* oldfile, const char* newfile, const char* patchfile);
-
-#ifdef __cplusplus
-}
-#endif
-#endif //HDIFFPATCH_PATCH_H

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,45 @@
-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> {
+    if (!this.path) {
+      throw new JSBundleProviderError({
+        whatHappened: 'No pushy bundle found. using default bundle',
+      })
+    }
     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,50 +24,60 @@ 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 uuid = preferencesManager.getSync('uuid', '') 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 packageVersion = '';
+    try {
+      const bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleFlags);
+      packageVersion = bundleInfo?.versionName || 'Unknown';
+    } catch (error) {
+      console.error('Failed to get bundle info:', error);
+    }
 
-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 uuid = preferencesManager.getSync('uuid', '') 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 packageVersion = '';
-  try {
-    const bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleFlags);
-    packageVersion = bundleInfo?.versionName || 'Unknown';
-  } catch (error) {
-    console.error('Failed to get bundle info:', error);
+    if (isFirstTime) {
+      preferencesManager.deleteSync('isFirstTime');
+    }
+
+    if (rolledBackVersion) {
+      preferencesManager.deleteSync('rolledBackVersion');
+    }
+
+    return {
+      downloadRootDir: `${context.filesDir}/_update`,
+      currentVersionInfo,
+      packageVersion,
+      currentVersion,
+      buildTime,
+      isUsingBundleUrl,
+      isFirstTime,
+      rolledBackVersion,
+      uuid,
+    };
   }
 
-  if (isFirstTime) {
-    preferencesManager.deleteSync('isFirstTime');
-  }
-
-  if (rolledBackVersion) {
-    preferencesManager.deleteSync('rolledBackVersion');
-  }
-
-  return {
-    downloadRootDir: `${context.filesDir}/_update`,
-    currentVersionInfo,
-    packageVersion,
-    currentVersion,
-    buildTime,
-    isUsingBundleUrl,
-    isFirstTime,
-    rolledBackVersion,
-    uuid,
-  };
-}
-
-
-  setLocalHashInfo(hash: string, info: string): boolean  {
+  setLocalHashInfo(hash: string, info: string): boolean {
     logger.debug(TAG, ',call setLocalHashInfo');
     return UpdateModuleImpl.setLocalHashInfo(this.context, hash, info);
   }
@@ -75,9 +86,9 @@ getConstants(): Object {
     return UpdateModuleImpl.getLocalHashInfo(this.context, hash);
   }
 
-  async setUuid(uuid: string): Promise<boolean>  {
+  async setUuid(uuid: string): Promise<boolean> {
     logger.debug(TAG, ',call setUuid');
-    return UpdateModuleImpl.setUuid(this.context,uuid);
+    return UpdateModuleImpl.setUuid(this.context, uuid);
   }
 
   async reloadUpdate(options: { hash: string }): Promise<void> {
@@ -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;
     }
   }
 
@@ -188,18 +189,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() {
     UpdateContext.isUsingBundleUrl = true;
     const currentVersion = this.getCurrentVersion();
     if (!currentVersion) {
-      return defaultAssetsUrl;
+      return '';
     }
     if (!this.isFirstTime()) {
       if (!this.preferences.getSync('firstTimeOk', true)) {
@@ -221,7 +215,7 @@ export class UpdateContext {
         version = this.rollBack();
       }
     }
-    return defaultAssetsUrl;
+    return '';
   }
 
   getPackageVersion(): string {

package.json

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

react-native-update.podspec

@@ -105,18 +105,17 @@ Pod::Spec.new do |s|
 
   # Conditionally add Expo dependency
   if valid_expo_project
-    s.public_header_files = ['ios/ImportReact.h']
     s.dependency 'ExpoModulesCore'
   end
 
   s.subspec 'RCTPushy' do |ss|
-    ss.source_files = ['ios/RCTPushy/**/*.{h,m,mm,c}',
+    ss.source_files = ['ios/**/*.{h,m,mm,c}',
                        'android/jni/hpatch.{h,c}',
                        'android/jni/HDiffPatch/libHDiffPatch/HPatch/*.{h,c}',
                        'android/jni/HDiffPatch/file_for_patch.{h,c}',
                        'android/jni/lzma/C/LzmaDec.{h,c}',
                        'android/jni/lzma/C/Lzma2Dec.{h,c}']
-    ss.public_header_files = ['ios/RCTPushy/**/*.h']
+    ss.public_header_files = ['ios/**/*.h']
   end
 
   # Conditionally add Expo subspec and check ExpoModulesCore version

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;