react-native-update 10.37.5 → 10.37.7

package/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';

package/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;
@@ -18,7 +19,6 @@ interface ZipFile {
 export class DownloadTask {
   private context: common.Context;
   private hash: string;
-  private readonly DOWNLOAD_CHUNK_SIZE = 4096;
   private eventHub: EventHub;
 
   constructor(context: common.Context) {
@@ -53,27 +53,104 @@ export class DownloadTask {
   private async downloadFile(params: DownloadTaskParams): Promise<void> {
     const httpRequest = http.createHttp();
     this.hash = params.hash;
+    let writer: fileIo.File | null = null;
+    let contentLength = 0;
+    let received = 0;
+    let writeError: Error | null = null;
+    let writeQueue = Promise.resolve();
+
+    const closeWriter = async () => {
+      if (writer) {
+        await fileIo.close(writer);
+        writer = null;
+      }
+    };
+
+    const dataEndPromise = new Promise<void>((resolve, reject) => {
+      httpRequest.on('dataEnd', () => {
+        writeQueue
+          .then(async () => {
+            if (writeError) {
+              throw writeError;
+            }
+            await closeWriter();
+            resolve();
+          })
+          .catch(async error => {
+            await closeWriter();
+            reject(error);
+          });
+      });
+    });
 
     try {
-      try {
-        let exists = fileIo.accessSync(params.targetFile);
-        if (exists) {
-          await fileIo.unlink(params.targetFile);
-        } else {
-          const targetDir = params.targetFile.substring(
-            0,
-            params.targetFile.lastIndexOf('/'),
-          );
-          exists = fileIo.accessSync(targetDir);
-          if (!exists) {
-            await fileIo.mkdir(targetDir);
-          }
+      let exists = fileIo.accessSync(params.targetFile);
+      if (exists) {
+        await fileIo.unlink(params.targetFile);
+      } else {
+        const targetDir = params.targetFile.substring(
+          0,
+          params.targetFile.lastIndexOf('/'),
+        );
+        exists = fileIo.accessSync(targetDir);
+        if (!exists) {
+          await fileIo.mkdir(targetDir);
         }
-      } catch (error) {
-        throw error;
       }
 
-      const response = await httpRequest.request(params.url, {
+      writer = await fileIo.open(
+        params.targetFile,
+        fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE,
+      );
+
+      httpRequest.on('headersReceive', (header: Record<string, string>) => {
+        if (!header) {
+          return;
+        }
+        const lengthKey = Object.keys(header).find(
+          key => key.toLowerCase() === 'content-length',
+        );
+        if (!lengthKey) {
+          return;
+        }
+        const length = parseInt(header[lengthKey], 10);
+        if (!Number.isNaN(length)) {
+          contentLength = length;
+        }
+      });
+
+      httpRequest.on('dataReceive', (data: ArrayBuffer) => {
+        if (writeError) {
+          return;
+        }
+        received += data.byteLength;
+        writeQueue = writeQueue.then(async () => {
+          if (!writer || writeError) {
+            return;
+          }
+          try {
+            await fileIo.write(writer.fd, data);
+          } catch (error) {
+            writeError = error as Error;
+          }
+        });
+        this.onProgressUpdate(received, contentLength);
+      });
+
+      httpRequest.on(
+        'dataReceiveProgress',
+        (data: http.DataReceiveProgressInfo) => {
+          if (data.totalSize > 0) {
+            contentLength = data.totalSize;
+          }
+          if (data.receiveSize > received) {
+            received = data.receiveSize;
+          }
+          this.onProgressUpdate(received, contentLength);
+        },
+      );
+
+      const responseCode = await httpRequest.requestInStream(params.url, {
         method: http.RequestMethod.GET,
         readTimeout: 60000,
         connectTimeout: 60000,
@@ -81,32 +158,14 @@ export class DownloadTask {
           'Content-Type': 'application/octet-stream',
         },
       });
-      if (response.responseCode > 299) {
-        throw Error(`Server error: ${response.responseCode}`);
+      if (responseCode > 299) {
+        throw Error(`Server error: ${responseCode}`);
       }
 
-      const contentLength = parseInt(response.header['content-length'] || '0');
-      const writer = await fileIo.open(
-        params.targetFile,
-        fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE,
-      );
-      let received = 0;
-      const data = response.result as ArrayBuffer;
-      const chunks = Math.ceil(data.byteLength / this.DOWNLOAD_CHUNK_SIZE);
-      for (let i = 0; i < chunks; i++) {
-        const start = i * this.DOWNLOAD_CHUNK_SIZE;
-        const end = Math.min(start + this.DOWNLOAD_CHUNK_SIZE, data.byteLength);
-        const chunk = data.slice(start, end);
-
-        await fileIo.write(writer.fd, chunk);
-        received += chunk.byteLength;
-
-        this.onProgressUpdate(received, contentLength);
-      }
-      await fileIo.close(writer);
+      await dataEndPromise;
       const stats = await fileIo.stat(params.targetFile);
       const fileSize = stats.size;
-      if (fileSize !== contentLength) {
+      if (contentLength > 0 && fileSize !== contentLength) {
         throw Error(
           `Download incomplete: expected ${contentLength} bytes but got ${stats.size} bytes`,
         );
@@ -115,6 +174,15 @@ export class DownloadTask {
       console.error('Download failed:', error);
       throw error;
     } finally {
+      try {
+        await closeWriter();
+      } catch (closeError) {
+        console.error('Failed to close file:', closeError);
+      }
+      httpRequest.off('headersReceive');
+      httpRequest.off('dataReceive');
+      httpRequest.off('dataReceiveProgress');
+      httpRequest.off('dataEnd');
       httpRequest.destroy();
     }
   }
@@ -166,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;
     }
   }
@@ -195,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;
@@ -244,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;
         }
       }
@@ -365,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;
     }
   }
@@ -406,7 +483,8 @@ export class DownloadTask {
         }
       }
     } catch (error) {
-      console.error('Cleanup failed:', error);
+      error.message = 'Cleanup failed:' + error.message;
+      console.error(error);
       throw error;
     }
   }
@@ -432,7 +510,6 @@ export class DownloadTask {
         default:
           throw Error(`Unknown task type: ${params.type}`);
       }
-
     } catch (error) {
       console.error('Task execution failed:', error.message);
       if (params.type !== DownloadTaskParams.TASK_TYPE_CLEANUP) {

package/harmony/pushy/src/main/ets/{PushyFileJSBundleProvider.ets → PushyFileJSBundleProvider.ts}

@@ -1,8 +1,7 @@
 import {
   FileJSBundle,
-  HotReloadConfig,
   JSBundleProvider,
-  JSBundleProviderError
+  JSBundleProviderError,
 } from '@rnoh/react-native-openharmony';
 import common from '@ohos.app.ability.common';
 import fs from '@ohos.file.fs';
@@ -10,7 +9,7 @@ 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 [];
   }
-}
+}

package/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);
+};

package/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/package.json

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