fix harmony file io

Author: sunnylqm

harmony/pushy/BuildProfile.ets

@@ -1,7 +1,9 @@
 /**
  * Use these variables when you tailor your ArkTS code. They must be of the const type.
  */
-export const HAR_VERSION = '3.1.0-0.0.7';
+import packageJson from '../../package.json'
+
+export const HAR_VERSION = packageJson.version;
 export const BUILD_MODE_NAME = 'debug';
 export const DEBUG = true;
 export const TARGET_NAME = 'default';

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

@@ -5,6 +5,7 @@ import { zlib } from '@kit.BasicServicesKit';
 import { EventHub } from './EventHub';
 import { DownloadTaskParams } from './DownloadTaskParams';
 import Pushy from 'librnupdate.so';
+import { saveFileToSandbox } from './SaveFile';
 
 interface ZipEntry {
   filename: string;
@@ -233,7 +234,8 @@ export class DownloadTask {
 
       return { entries };
     } catch (error) {
-      console.error('Failed to process unzipped files:', error);
+      error.message = 'Failed to process unzipped files:' + error.message;
+      console.error(error);
       throw error;
     }
   }
@@ -262,10 +264,6 @@ export class DownloadTask {
 
         const copies = obj.copies as Record<string, string>;
         for (const [to, rawPath] of Object.entries(copies)) {
-          if (!rawPath.startsWith('resources/rawfile/')) {
-            // skip other resource
-            continue;
-          }
           let from = rawPath.replace('resources/rawfile/', '');
           if (from === '') {
             from = to;
@@ -311,7 +309,7 @@ export class DownloadTask {
           await fileIo.close(writer);
           continue;
         } catch (error) {
-          console.error('Failed to process bundle patch:', error);
+          error.message = 'Failed to process bundle patch:' + error.message;
           throw error;
         }
       }
@@ -432,15 +430,27 @@ export class DownloadTask {
 
       for (const [from, targets] of copyList.entries()) {
         currentFrom = from;
-        const fromContent = await resourceManager.getRawFileContent(from);
+        if (from.startsWith('resources/base/media/')) {
+          const mediaName = from
+            .replace('resources/base/media/', '')
+            .split('.')[0];
+          const mediaBuffer = await resourceManager.getMediaByName(mediaName);
+          for (const target of targets) {
+            const fileStream = fileIo.createStreamSync(target, 'w+');
+            fileStream.writeSync(mediaBuffer);
+            fileStream.close();
+          }
+          continue;
+        }
+        const fromContent = await resourceManager.getRawFd(from);
         for (const target of targets) {
-          const fileStream = fileIo.createStreamSync(target, 'w+');
-          fileStream.writeSync(fromContent.buffer);
-          fileStream.close();
+          saveFileToSandbox(fromContent, target);
         }
       }
     } catch (error) {
-      console.error('Copy from resource failed:', currentFrom, error.message);
+      error.message =
+        'Copy from resource failed:' + currentFrom + ',' + error.message;
+      console.error(error);
       throw error;
     }
   }
@@ -473,7 +483,8 @@ export class DownloadTask {
         }
       }
     } catch (error) {
-      console.error('Cleanup failed:', error);
+      error.message = 'Cleanup failed:' + error.message;
+      console.error(error);
       throw error;
     }
   }

…c/main/ets/PushyFileJSBundleProvider.ets …rc/main/ets/PushyFileJSBundleProvider.tsharmony/pushy/src/main/ets/PushyFileJSBundleProvider.ets renamed to harmony/pushy/src/main/ets/PushyFileJSBundleProvider.ts harmony/pushy/src/main/ets/PushyFileJSBundleProvider.ets renamed to harmony/pushy/src/main/ets/PushyFileJSBundleProvider.ts

@@ -1,16 +1,15 @@
 import {
   FileJSBundle,
-  HotReloadConfig,
   JSBundleProvider,
-  JSBundleProviderError
+  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 path: string = ''
+  private path: string = '';
 
   constructor(context: common.UIAbilityContext) {
     super();
@@ -26,24 +25,26 @@ export class PushyFileJSBundleProvider extends JSBundleProvider {
     if (!this.path) {
       throw new JSBundleProviderError({
         whatHappened: 'No pushy bundle found. using default bundle',
-        howCanItBeFixed: ['']
-      })
+        howCanItBeFixed: [''],
+      });
     }
     try {
       await fs.access(this.path, fs.OpenMode.READ_ONLY);
       return {
-        filePath: this.path
-      }
+        filePath: this.path,
+      };
     } catch (error) {
       throw new JSBundleProviderError({
         whatHappened: `Couldn't load JSBundle from ${this.path}`,
         extraData: error,
-        howCanItBeFixed: [`Check if a bundle exists at "${this.path}" on your device.`]
-      })
+        howCanItBeFixed: [
+          `Check if a bundle exists at "${this.path}" on your device.`,
+        ],
+      });
     }
   }
 
   getAppKeys(): string[] {
     return [];
   }
-}
+}

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

@@ -0,0 +1,34 @@
+import resourceManager from '@ohos.resourceManager';
+import fs, { ReadOptions } from '@ohos.file.fs';
+
+export const saveFileToSandbox = (
+  from: resourceManager.RawFileDescriptor,
+  toPath: string,
+) => {
+  let to = fs.openSync(toPath, fs.OpenMode.READ_WRITE | fs.OpenMode.CREATE);
+
+  let bufferSize = 30000;
+  let buffer = new ArrayBuffer(bufferSize); // 创建buffer缓冲区
+  // 要copy的文件的offset和length
+  let currentOffset = from.offset;
+  let readOption: ReadOptions = {
+    offset: currentOffset, // 期望读取文件的位置。可选，默认从当前位置开始读
+    length: bufferSize, // 每次期望读取数据的长度。可选，默认缓冲区长度
+  };
+  // 后面len会一直减，直到没有
+  while (true) {
+    // 读取buffer容量的内容
+    let readLength = fs.readSync(from.fd, buffer, readOption);
+    // 写入buffer容量的内容
+    fs.writeSync(to.fd, buffer, { length: readLength });
+    // 判断后续内容，修改读文件的参数
+    // buffer没读满代表文件读完了
+    if (readLength < bufferSize) {
+      break;
+    }
+    if (readOption.offset) {
+      readOption.offset += readLength;
+    }
+  }
+  fs.close(to);
+};

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

@@ -69,7 +69,7 @@ export class UpdateModuleImpl {
   ): Promise<boolean> {
     const hash = options.hash;
     if (!hash) {
-      throw Error('hash不能为空');
+      throw Error('empty hash');
     }
 
     try {
@@ -87,7 +87,7 @@ export class UpdateModuleImpl {
       return true;
     } catch (error) {
       logger.error(TAG, `markSuccess failed: ${error}`);
-      throw Error(`执行报错: ${error.message}`);
+      throw error;
     }
   }
 

package.json

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