react-native-update 10.59.2 → 10.60.0

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

@@ -37,11 +37,6 @@ interface RestartWant {
   abilityName?: string;
 }
 
-// applicationContext.restartApp 是 API 12 才有的可选能力,按结构探测。
-interface RestartableApplicationContext {
-  restartApp?: (want: RestartWant) => void;
-}
-
 interface RestartEventEmitter {
   emit(event: string, payload: Object): void;
 }
@@ -122,13 +117,10 @@ export class PushyTurboModule extends UITurboModule {
       abilityName: this.mUiCtx.abilityInfo?.name,
     };
     try {
-      const applicationContext =
-        this.mUiCtx.getApplicationContext() as unknown as RestartableApplicationContext;
-      if (applicationContext && typeof applicationContext.restartApp === 'function') {
-        logger.debug(TAG, 'restartAbility via applicationContext.restartApp');
-        applicationContext.restartApp(want);
-        return;
-      }
+      // applicationContext.restartApp exists since API 12, the HAR's minimum.
+      logger.debug(TAG, 'restartAbility via applicationContext.restartApp');
+      this.mUiCtx.getApplicationContext().restartApp(want);
+      return;
     } catch (e) {
       logger.error(TAG, `restartAbility via restartApp failed: ${getErrorMessage(e)}`);
     }
@@ -206,23 +198,17 @@ export class PushyTurboModule extends UITurboModule {
       uuid,
       supportedDiffVersion: NativePatchCore.getSupportedDiffVersion(),
     };
-    const logResult = {
-      downloadRootDir: result.downloadRootDir,
-      currentVersionInfo: result.currentVersionInfo,
-      packageVersion: result.packageVersion,
-      currentVersion: result.currentVersion,
-      buildTime: result.buildTime,
-      isUsingBundleUrl: result.isUsingBundleUrl,
-      isFirstTime: result.isFirstTime,
-      rolledBackVersion: result.rolledBackVersion,
-      uuidSet: !!result.uuid,
-    };
-    logger.info(TAG, `,getConstants result: ${JSON.stringify(logResult)}`);
+    // The install uuid stays out of the logs; only whether it is set.
+    const { uuid: _uuid, ...logResult } = result;
+    logger.info(
+      TAG,
+      `,getConstants result: ${JSON.stringify({ ...logResult, uuidSet: !!uuid })}`,
+    );
     return result;
   }
 
   // 以下方法在 JS spec(src/NativePushy.ts)里都返回 Promise,C++ 方法表
-  // (PushyTurboModule.cpp)相应用 PUSHY_ASYNC_METHOD 注册:同步注册会把
+  // (PushyTurboModule.cpp 的 PUSHY_METHODS)相应登记为 ASYNC:同步注册会把
   // ArkTS 的 Promise 变成空对象、把 reject 丢成 ArkTS 侧的 unhandled rejection。
   // 每个拒绝都带稳定错误码(ErrorCodes.ts):`code` 属性 + `[CODE] ` 消息前缀。
 

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

@@ -1,34 +1,115 @@
 import resourceManager from '@ohos.resourceManager';
-import fs, { ReadOptions } from '@ohos.file.fs';
+import fs from '@ohos.file.fs';
+import logger from './Logger';
+import { getErrorMessage } from './ErrorCodes';
 
-const COPY_BUFFER_SIZE = 64 * 1024;
+const TAG = 'SaveFile';
+// 每次 read/write 都是一次工作线程往返:块大一些,几 MB 的 bundle 只需
+// 十几次往返;内存上限仍是一个块。
+const COPY_BUFFER_SIZE = 512 * 1024;
 
-export const saveFileToSandbox = (
+// resourceManager 按文件名跟踪 rawfile descriptor(closeRawFd 只收名字):
+// 同名的 getRawFd/closeRawFd 若交错,一方的 close 可能在另一方读到一半时
+// 关掉它的 fd。同名访问按到达顺序串行(不同名互不影响)。
+const rawFdChains = new Map<string, Promise<void>>();
+
+/**
+ * 打开 rawfile descriptor 交给 job,job 结束(无论成败)后关闭。同名串行。
+ * descriptor 指向 HAP 内 [offset, offset + length) 区间,job 只能按 offset
+ * 定位读取。
+ */
+export async function withRawFd<T>(
+  manager: resourceManager.ResourceManager,
+  name: string,
+  job: (descriptor: resourceManager.RawFileDescriptor) => Promise<T>,
+): Promise<T> {
+  const previous = rawFdChains.get(name) ?? Promise.resolve();
+  let release: () => void = () => {};
+  const held = new Promise<void>(resolve => {
+    release = resolve;
+  });
+  const tail = previous.then(() => held);
+  rawFdChains.set(name, tail);
+  try {
+    await previous;
+    const descriptor = await manager.getRawFd(name);
+    try {
+      return await job(descriptor);
+    } finally {
+      try {
+        await manager.closeRawFd(name);
+      } catch (closeError) {
+        logger.error(
+          TAG,
+          `Failed to close raw fd for ${name}: ${getErrorMessage(closeError)}`,
+        );
+      }
+    }
+  } finally {
+    release();
+    if (rawFdChains.get(name) === tail) {
+      rawFdChains.delete(name);
+    }
+  }
+}
+
+/** 把 buffer 的前 length 字节完整写入 fd(处理短写)。 */
+export async function writeFully(
+  fd: number,
+  buffer: ArrayBuffer,
+  length: number,
+): Promise<void> {
+  let written = 0;
+  while (written < length) {
+    const chunk = written === 0 ? buffer : buffer.slice(written, length);
+    const count = await fs.write(fd, chunk, { length: length - written });
+    if (count <= 0) {
+      throw new Error(`Short write: ${written}/${length} bytes`);
+    }
+    written += count;
+  }
+}
+
+/** 文件存在则删除(删除失败照常抛出)。 */
+export async function unlinkIfExists(path: string): Promise<void> {
+  if (fs.accessSync(path)) {
+    await fs.unlink(path);
+  }
+}
+
+/**
+ * 把 rawfile descriptor 指向的区间异步拷贝到沙箱文件(覆盖)。全程异步
+ * fileIo:调用方在 UI 线程(TurboModule),同步 IO 会冻结界面。读到预期
+ * 长度之前遇到 EOF 视为错误。
+ */
+export async function saveFileToSandbox(
   from: resourceManager.RawFileDescriptor,
   toPath: string,
-) => {
-  let to = fs.openSync(toPath, fs.OpenMode.READ_WRITE | fs.OpenMode.CREATE);
-
-  const buffer = new ArrayBuffer(COPY_BUFFER_SIZE);
-  let currentOffset = from.offset;
+): Promise<void> {
+  const to = await fs.open(
+    toPath,
+    fs.OpenMode.WRITE_ONLY | fs.OpenMode.CREATE | fs.OpenMode.TRUNC,
+  );
+  const buffer = new ArrayBuffer(
+    Math.max(1, Math.min(COPY_BUFFER_SIZE, from.length)),
+  );
+  let position = from.offset;
   let remaining = from.length;
 
   try {
     while (remaining > 0) {
-      const readOption: ReadOptions = {
-        offset: currentOffset,
-        length: Math.min(COPY_BUFFER_SIZE, remaining),
-      };
-      const readLength = fs.readSync(from.fd, buffer, readOption);
+      const readLength = await fs.read(from.fd, buffer, {
+        offset: position,
+        length: Math.min(buffer.byteLength, remaining),
+      });
       if (readLength <= 0) {
         throw new Error(`Unexpected EOF while copying resource to ${toPath}`);
       }
-
-      fs.writeSync(to.fd, buffer, { length: readLength });
-      currentOffset += readLength;
+      await writeFully(to.fd, buffer, readLength);
+      position += readLength;
       remaining -= readLength;
     }
   } finally {
-    fs.close(to);
+    await fs.close(to);
   }
-};
+}