react-native-update 10.60.0 → 10.61.0

package/harmony/pushy/src/main/cpp/pushy.cpp

@@ -3,10 +3,12 @@
 #include "flow_json.h"
 #include "native_config.h"
 #include "native_round.h"
+#include "round_engine.h"
 #include <js_native_api.h>
 #include <js_native_api_types.h>
 
 #include <cerrno>
+#include <exception>
 #include <cstdint>
 #include <string>
 #include <unistd.h>
@@ -19,6 +21,7 @@
 #include "install_record.h"
 #include "hbc_transform_wire.h"
 #include "patch_core.h"
+#include "resume_plan.h"
 #include "state_core.h"
 #include "state_ops.h"
 
@@ -558,8 +561,25 @@ struct AsyncCall {
   W data;
   void (*execute)(W&) = nullptr;
   void (*settle)(napi_env, napi_deferred, const W&) = nullptr;
+  // Set when execute threw: the promise rejects with it instead of settling
+  // from half-written results.
+  bool threw = false;
+  std::string failure;
 };
 
+// The message of the exception being handled, without throwing again.
+void RecordFailure(std::string* failure) noexcept {
+  try {
+    throw;
+  } catch (const std::exception& error) {
+    try {
+      *failure = error.what();
+    } catch (...) {
+    }
+  } catch (...) {
+  }
+}
+
 // Runs execute(data) on a libuv worker thread and returns a Promise that
 // settle(env, deferred, data) settles back on the JS thread. Every path
 // settles the promise exactly once and frees the call: a creation or queue
@@ -591,15 +611,30 @@ napi_value QueueWork(
           nullptr,
           resource_name,
           [](napi_env, void* raw) {
+            // A worker thread: an exception escaping here terminates the
+            // process (CODE_AUDIT 4.4).
             auto* c = static_cast<AsyncCall<W>*>(raw);
-            c->execute(c->data);
+            try {
+              c->execute(c->data);
+            } catch (...) {
+              c->threw = true;
+              RecordFailure(&c->failure);
+            }
           },
           [](napi_env cb_env, napi_status status, void* raw) {
             auto* c = static_cast<AsyncCall<W>*>(raw);
             if (status != napi_ok) {
               RejectDeferredWithMessage(cb_env, c->deferred, "async work aborted");
+            } else if (c->threw) {
+              RejectDeferredWithMessage(
+                  cb_env, c->deferred,
+                  c->failure.empty() ? "native error" : c->failure.c_str());
             } else {
-              c->settle(cb_env, c->deferred, c->data);
+              try {
+                c->settle(cb_env, c->deferred, c->data);
+              } catch (...) {
+                RejectDeferredWithMessage(cb_env, c->deferred, "native error");
+              }
             }
             napi_delete_async_work(cb_env, c->work);
             delete c;
@@ -1144,6 +1179,22 @@ napi_value CheckExtractedDirectory(napi_env env, napi_callback_info info) {
       });
 }
 
+// Every exported callback runs through Guarded: a C++ exception from the
+// shared cores (std::bad_alloc, std::length_error) must not unwind into NAPI,
+// so it becomes a JS Error instead (CODE_AUDIT 4.4).
+template <napi_value (*Callback)(napi_env, napi_callback_info)>
+napi_value Guarded(napi_env env, napi_callback_info info) {
+  try {
+    return Callback(env, info);
+  } catch (...) {
+    std::string failure;
+    RecordFailure(&failure);
+    napi_throw_error(env, nullptr,
+                     failure.empty() ? "native error" : failure.c_str());
+  }
+  return nullptr;
+}
+
 bool ExportFunction(
     napi_env env,
     napi_value exports,
@@ -1284,6 +1335,18 @@ static napi_value FlowPrepareRound(napi_env env, napi_callback_info info) {
       env, flowcore::PrepareRound(text[0], ParseFlowObject(text[1]), sample));
 }
 
+// stepRound(stateJson?, eventJson) — one step of the round driver
+// (round_engine.h); stateJson undefined/null starts fresh. Synchronous and
+// cheap: the round's IO stays in ArkTS.
+static napi_value FlowStepRound(napi_env env, napi_callback_info info) {
+  napi_value args[2] = {nullptr, nullptr};
+  std::string text[2];
+  if (!GetFlowArgs(env, info, "stepRound", 2, 0b11, args, text)) {
+    return nullptr;
+  }
+  return NewString(env, flowcore::StepRoundJson(text[0], text[1]));
+}
+
 // nextQueryStep(stateJson, responseText?) — responseText undefined/null for
 // a failed (or no) request.
 static napi_value FlowNextQueryStep(napi_env env, napi_callback_info info) {
@@ -1380,29 +1443,88 @@ static napi_value FlowNormalizeConfiguration(napi_env env,
   return NewString(env, config);
 }
 
+// ---- resumable download (patch_core/resume_plan.h) ----
+// Strings in (null/undefined read as ""), JSON text out; DownloadTask.ts
+// keeps the IO.
+
+// planRequest(sidecar, url, partialSize)
+static napi_value ResumePlanRequest(napi_env env, napi_callback_info info) {
+  napi_value args[3] = {nullptr, nullptr, nullptr};
+  std::string text[3];
+  double partial_size = 0;
+  if (!GetFlowArgs(env, info, "resumePlanRequest", 3, 0b011, args, text) ||
+      !GetFlowNumber(env, args[2], "resumePlanRequest", &partial_size)) {
+    return nullptr;
+  }
+  return NewString(env, pushy::resume::PlanRequestJson(
+                            text[0], text[1], static_cast<long long>(partial_size)));
+}
+
+// classifyResponse(status, resumeOffset, contentRange, contentEncoding,
+//                  contentLength, sidecar, url, partialSize)
+static napi_value ResumeClassifyResponse(napi_env env, napi_callback_info info) {
+  napi_value args[8] = {};
+  std::string text[8];
+  double status = 0;
+  double resume_offset = 0;
+  double content_length = 0;
+  double partial_size = 0;
+  if (!GetFlowArgs(env, info, "resumeClassifyResponse", 8, 0b01101100, args, text) ||
+      !GetFlowNumber(env, args[0], "resumeClassifyResponse", &status) ||
+      !GetFlowNumber(env, args[1], "resumeClassifyResponse", &resume_offset) ||
+      !GetFlowNumber(env, args[4], "resumeClassifyResponse", &content_length) ||
+      !GetFlowNumber(env, args[7], "resumeClassifyResponse", &partial_size)) {
+    return nullptr;
+  }
+  return NewString(env, pushy::resume::ClassifyResponseJson(
+                            static_cast<int>(status),
+                            static_cast<long long>(resume_offset), text[2], text[3],
+                            static_cast<long long>(content_length), text[5], text[6],
+                            static_cast<long long>(partial_size)));
+}
+
+// sidecar(url, etag, lastModified, previousSidecar, total)
+static napi_value ResumeSidecar(napi_env env, napi_callback_info info) {
+  napi_value args[5] = {};
+  std::string text[5];
+  double total = 0;
+  if (!GetFlowArgs(env, info, "resumeSidecar", 5, 0b01111, args, text) ||
+      !GetFlowNumber(env, args[4], "resumeSidecar", &total)) {
+    return nullptr;
+  }
+  return NewString(env, pushy::resume::SidecarJson(text[0], text[1], text[2], text[3],
+                                                   static_cast<long long>(total)));
+}
+
 napi_value Init(napi_env env, napi_value exports) {
-  if (!ExportFunction(env, exports, "syncStateWithBinaryVersion", SyncStateWithBinaryVersion) ||
-      !ExportFunction(env, exports, "runStateCore", RunStateCore) ||
-      !ExportFunction(env, exports, "applyArchiveDelta", ApplyArchiveDelta) ||
-      !ExportFunction(env, exports, "cleanupOldEntries", CleanupOldEntries) ||
-      !ExportFunction(env, exports, "sha256HexFileAsync", Sha256HexFileAsync) ||
-      !ExportFunction(env, exports, "sha256HexRawFdAsync", Sha256HexRawFdAsync) ||
-      !ExportFunction(env, exports, "isInstallComplete", InstallRecordIsComplete) ||
-      !ExportFunction(env, exports, "recordedBundleSha256", InstallRecordBundleSha256) ||
-      !ExportFunction(env, exports, "sealInstallRecord", SealInstallRecord) ||
-      !ExportFunction(env, exports, "promoteStaging", PromoteStaging) ||
-      !ExportFunction(env, exports, "checkActivation", CheckActivation) ||
-      !ExportFunction(env, exports, "checkUncompressedSize", CheckUncompressedSize) ||
-      !ExportFunction(env, exports, "planFreeSpaceProbe", PlanFreeSpaceProbe) ||
-      !ExportFunction(env, exports, "checkExtractedDirectory", CheckExtractedDirectory) ||
-      !ExportFunction(env, exports, "crc32", Crc32) ||
-      !ExportFunction(env, exports, "getSupportedDiffVersion", GetSupportedDiffVersion) ||
-      !ExportFunction(env, exports, "prepareRound", FlowPrepareRound) ||
-      !ExportFunction(env, exports, "nextQueryStep", FlowNextQueryStep) ||
-      !ExportFunction(env, exports, "handleResponse", FlowHandleResponse) ||
-      !ExportFunction(env, exports, "configsEquivalent", FlowConfigsEquivalent) ||
-      !ExportFunction(env, exports, "runnableConfig", FlowRunnableConfig) ||
-      !ExportFunction(env, exports, "normalizeConfiguration", FlowNormalizeConfiguration)) {
+  // <generated:exports> (scripts/contract.ts; bun scripts/generate-contract.ts)
+  if (!ExportFunction(env, exports, "syncStateWithBinaryVersion", Guarded<SyncStateWithBinaryVersion>) ||
+      !ExportFunction(env, exports, "runStateCore", Guarded<RunStateCore>) ||
+      !ExportFunction(env, exports, "applyArchiveDelta", Guarded<ApplyArchiveDelta>) ||
+      !ExportFunction(env, exports, "cleanupOldEntries", Guarded<CleanupOldEntries>) ||
+      !ExportFunction(env, exports, "sha256HexFileAsync", Guarded<Sha256HexFileAsync>) ||
+      !ExportFunction(env, exports, "sha256HexRawFdAsync", Guarded<Sha256HexRawFdAsync>) ||
+      !ExportFunction(env, exports, "isInstallComplete", Guarded<InstallRecordIsComplete>) ||
+      !ExportFunction(env, exports, "recordedBundleSha256", Guarded<InstallRecordBundleSha256>) ||
+      !ExportFunction(env, exports, "sealInstallRecord", Guarded<SealInstallRecord>) ||
+      !ExportFunction(env, exports, "promoteStaging", Guarded<PromoteStaging>) ||
+      !ExportFunction(env, exports, "checkActivation", Guarded<CheckActivation>) ||
+      !ExportFunction(env, exports, "checkUncompressedSize", Guarded<CheckUncompressedSize>) ||
+      !ExportFunction(env, exports, "checkExtractedDirectory", Guarded<CheckExtractedDirectory>) ||
+      !ExportFunction(env, exports, "planFreeSpaceProbe", Guarded<PlanFreeSpaceProbe>) ||
+      !ExportFunction(env, exports, "crc32", Guarded<Crc32>) ||
+      !ExportFunction(env, exports, "getSupportedDiffVersion", Guarded<GetSupportedDiffVersion>) ||
+      !ExportFunction(env, exports, "prepareRound", Guarded<FlowPrepareRound>) ||
+      !ExportFunction(env, exports, "nextQueryStep", Guarded<FlowNextQueryStep>) ||
+      !ExportFunction(env, exports, "stepRound", Guarded<FlowStepRound>) ||
+      !ExportFunction(env, exports, "handleResponse", Guarded<FlowHandleResponse>) ||
+      !ExportFunction(env, exports, "configsEquivalent", Guarded<FlowConfigsEquivalent>) ||
+      !ExportFunction(env, exports, "runnableConfig", Guarded<FlowRunnableConfig>) ||
+      !ExportFunction(env, exports, "normalizeConfiguration", Guarded<FlowNormalizeConfiguration>) ||
+      !ExportFunction(env, exports, "resumePlanRequest", Guarded<ResumePlanRequest>) ||
+      !ExportFunction(env, exports, "resumeClassifyResponse", Guarded<ResumeClassifyResponse>) ||
+      !ExportFunction(env, exports, "resumeSidecar", Guarded<ResumeSidecar>)) {
+  // </generated:exports>
     return nullptr;
   }
   return exports;

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

@@ -1,7 +1,6 @@
 import fileIo from '@ohos.file.fs';
 import statvfs from '@ohos.file.statvfs';
 import {
-  ERROR_FILE_OPERATION_FAILED,
   ERROR_DELTA_FAILED,
   createPushyError,
   getErrorMessage,
@@ -10,11 +9,13 @@ import NativePatchCore from './NativePatchCore';
 
 // 解压资源上限的计数规则(条目数、单条/总解压量、压缩比、保留名、符号链接、
 // 未知长度下载的磁盘探测计划)只在 cpp/patch_core/archive_limits.h 里实现,
-// 三端共用(这里经 NAPI)。下面只镜像本端仍需自己比较的常量,
-// scripts/check-constant-parity.js 断言与头文件一致。
+// 三端共用(这里经 NAPI)。下面只是本端仍需自己比较的常量,与头文件一样
+// 由 scripts/contract.ts 生成。
+// <generated:limits> (scripts/contract.ts; bun scripts/generate-contract.ts)
 export const MAX_ARCHIVE_BYTES = 512 * 1024 * 1024;
 export const MAX_MANIFEST_BYTES = 16 * 1024 * 1024;
 export const FREE_DISK_MARGIN_BYTES = 64 * 1024 * 1024;
+// </generated:limits>
 
 /**
  * 解压前的整包校验(zlib.getOriginalSize 给出的归档解压后总字节数):总解压
@@ -66,11 +67,14 @@ export function checkOriginalSize(
 
 /**
  * 目标所在文件系统必须还能再写 bytesToWrite + 安全余量。取不到可用空间
- * (返回 0/异常)视为未知,放行。
+ * (返回 0/异常)视为未知,放行。空间不足以 `code` 失败:错误码按阶段归类,
+ * 与 Android/iOS 一致——下载阶段 DOWNLOAD_FAILED,解压阶段 PATCH_FAILED。
+ * 换镜像的判定(IsMirrorRetryableCode)与补丁健康度遥测都按这个码聚合。
  */
 export async function ensureFreeSpace(
   target: string,
   bytesToWrite: number,
+  code: string,
 ): Promise<void> {
   let probe = target;
   while (probe.length > 1 && !fileIo.accessSync(probe)) {
@@ -92,7 +96,7 @@ export async function ensureFreeSpace(
   const needed = Math.max(0, bytesToWrite) + FREE_DISK_MARGIN_BYTES;
   if (free < needed) {
     throw createPushyError(
-      ERROR_FILE_OPERATION_FAILED,
+      code,
       `insufficient disk space: need ${needed} bytes, have ${free}`,
     );
   }