react-native-update 10.46.0 → 10.48.0

package/cpp/patch_core/tests/hbc_transform_test.cpp

@@ -0,0 +1,229 @@
+// hbc_transform 宿主机测试:
+// 1) 与 JS 参考实现(react-native-update-cli src/utils/hbcTransform.ts)
+//    做 golden 对拍——fixtures/*.t.hbc 由 JS 实现生成;
+// 2) 可逆性 property check;
+// 3) 非法输入/非法描述表拒绝(buffer 必须保持原样)。
+#include "../hbc_transform.h"
+
+#include <cstdio>
+#include <cstring>
+#include <fstream>
+#include <string>
+#include <vector>
+
+namespace {
+
+using pushy::hbc::HbcDeltaField;
+using pushy::hbc::HbcLayoutDesc;
+using pushy::hbc::HbcSectionDesc;
+using pushy::hbc::TransformHbcInPlace;
+
+int g_failures = 0;
+
+#define CHECK(cond)                                                       \
+  do {                                                                    \
+    if (!(cond)) {                                                        \
+      std::fprintf(stderr, "FAIL %s:%d: %s\n", __FILE__, __LINE__, #cond); \
+      ++g_failures;                                                       \
+    }                                                                     \
+  } while (0)
+
+std::vector<uint8_t> ReadFileOrDie(const std::string& path) {
+  std::ifstream in(path, std::ios::binary);
+  if (!in) {
+    std::fprintf(stderr, "cannot open fixture: %s\n", path.c_str());
+    std::exit(1);
+  }
+  return std::vector<uint8_t>(
+      (std::istreambuf_iterator<char>(in)), std::istreambuf_iterator<char>());
+}
+
+// ---- 布局描述表(测试用常量;生产路径从 patch 元数据的 wire 格式构建)----
+// 与 CLI 的 HBC_LAYOUTS 逐字段对应。counts 槽位约定:0 = fileLength,
+// 最后一个 = debugInfoOffset。
+
+const HbcDeltaField kFuncOffset25[] = {{0, 0, 25}};
+const HbcDeltaField kFuncOffsets25x2[] = {{0, 0, 25}, {8, 0, 25}};
+const HbcDeltaField kStringOffset23[] = {{0, 1, 23}};
+const HbcDeltaField kPairOffset32[] = {{0, 0, 32}};
+
+// v87~v96:19 个计数槽
+// [0]fileLength [1]globalCodeIndex [2]functionCount [3]stringKindCount
+// [4]identifierCount [5]stringCount [6]overflowStringCount
+// [7]stringStorageSize [8]bigIntCount [9]bigIntStorageSize [10]regExpCount
+// [11]regExpStorageSize [12]arrayBufferSize [13]objKeyBufferSize
+// [14]objValueBufferSize [15]segmentID [16]cjsModuleCount
+// [17]functionSourceCount [18]debugInfoOffset
+const HbcSectionDesc kSectionsV96[] = {
+    {2, 16, kFuncOffsets25x2, 2}, // functionHeaders
+    {3, 4, nullptr, 0}, // stringKinds
+    {4, 4, nullptr, 0}, // identifierHashes
+    {5, 4, kStringOffset23, 1}, // smallStringTable
+    {6, 8, kPairOffset32, 1}, // overflowStringTable
+    {7, 1, nullptr, 0}, // stringStorage
+    {12, 1, nullptr, 0}, // arrayBuffer
+    {13, 1, nullptr, 0}, // objKeyBuffer
+    {14, 1, nullptr, 0}, // objValueBuffer
+    {8, 8, kPairOffset32, 1}, // bigIntTable
+    {9, 1, nullptr, 0}, // bigIntStorage
+    {10, 8, kPairOffset32, 1}, // regExpTable
+    {11, 1, nullptr, 0}, // regExpStorage
+    {16, 8, nullptr, 0}, // cjsModuleTable
+    {17, 8, nullptr, 0}, // functionSourceTable
+};
+const HbcLayoutDesc kLayoutV96 = {19, kSectionsV96, 15};
+
+// v98 早期变体(Static Hermes,19 槽):SmallFuncHeader 12B、
+// objShapeTable 取代 objValueBuffer
+const HbcSectionDesc kSectionsV98[] = {
+    {2, 12, kFuncOffset25, 1}, // functionHeaders
+    {3, 4, nullptr, 0}, // stringKinds
+    {4, 4, nullptr, 0}, // identifierHashes
+    {5, 4, kStringOffset23, 1}, // smallStringTable
+    {6, 8, kPairOffset32, 1}, // overflowStringTable
+    {7, 1, nullptr, 0}, // stringStorage
+    {12, 1, nullptr, 0}, // literalValueBuffer
+    {13, 1, nullptr, 0}, // objKeyBuffer
+    {14, 8, kPairOffset32, 1}, // objShapeTable
+    {8, 8, kPairOffset32, 1}, // bigIntTable
+    {9, 1, nullptr, 0}, // bigIntStorage
+    {10, 8, kPairOffset32, 1}, // regExpTable
+    {11, 1, nullptr, 0}, // regExpStorage
+    {16, 8, nullptr, 0}, // cjsModuleTable
+    {17, 8, nullptr, 0}, // functionSourceTable
+};
+const HbcLayoutDesc kLayoutV98 = {19, kSectionsV98, 15};
+
+// v98 晚期变体(生产主流,20 槽):槽 15 = numStringSwitchImms,
+// 其后 segmentID/cjs/functionSource/debugInfo 依次后移一位
+const HbcSectionDesc kSectionsV98Late[] = {
+    {2, 12, kFuncOffset25, 1}, // functionHeaders
+    {3, 4, nullptr, 0}, // stringKinds
+    {4, 4, nullptr, 0}, // identifierHashes
+    {5, 4, kStringOffset23, 1}, // smallStringTable
+    {6, 8, kPairOffset32, 1}, // overflowStringTable
+    {7, 1, nullptr, 0}, // stringStorage
+    {12, 1, nullptr, 0}, // literalValueBuffer
+    {13, 1, nullptr, 0}, // objKeyBuffer
+    {14, 8, kPairOffset32, 1}, // objShapeTable
+    {8, 8, kPairOffset32, 1}, // bigIntTable
+    {9, 1, nullptr, 0}, // bigIntStorage
+    {10, 8, kPairOffset32, 1}, // regExpTable
+    {11, 1, nullptr, 0}, // regExpStorage
+    {17, 8, nullptr, 0}, // cjsModuleTable
+    {18, 8, nullptr, 0}, // functionSourceTable
+};
+const HbcLayoutDesc kLayoutV98Late = {20, kSectionsV98Late, 15};
+
+void TestGoldenPair(
+    const std::string& dir,
+    const char* plainName,
+    const char* goldenName,
+    const HbcLayoutDesc& layout) {
+  const std::vector<uint8_t> plain = ReadFileOrDie(dir + plainName);
+  const std::vector<uint8_t> golden = ReadFileOrDie(dir + goldenName);
+  CHECK(plain.size() == golden.size());
+
+  // T(plain) == golden(与 JS 实现逐字节一致)
+  std::vector<uint8_t> forward = plain;
+  CHECK(TransformHbcInPlace(forward.data(), forward.size(), layout, false));
+  CHECK(forward == golden);
+  CHECK(forward != plain); // 确实改写了字节
+
+  // T⁻¹(golden) == plain
+  std::vector<uint8_t> backward = golden;
+  CHECK(TransformHbcInPlace(backward.data(), backward.size(), layout, true));
+  CHECK(backward == plain);
+}
+
+void TestRejections(const std::string& dir) {
+  const std::vector<uint8_t> good = ReadFileOrDie(dir + "v98.hbc");
+
+  // 太短
+  {
+    std::vector<uint8_t> buf(good.begin(), good.begin() + 64);
+    CHECK(!TransformHbcInPlace(buf.data(), buf.size(), kLayoutV98, false));
+  }
+  // 坏 magic → 拒绝且 buffer 不被修改
+  {
+    std::vector<uint8_t> buf = good;
+    buf[0] ^= 0xff;
+    const std::vector<uint8_t> before = buf;
+    CHECK(!TransformHbcInPlace(buf.data(), buf.size(), kLayoutV98, false));
+    CHECK(buf == before);
+  }
+  // fileLength 与实际大小不符(截断)
+  {
+    std::vector<uint8_t> buf(good.begin(), good.end() - 8);
+    const std::vector<uint8_t> before = buf;
+    CHECK(!TransformHbcInPlace(buf.data(), buf.size(), kLayoutV98, false));
+    CHECK(buf == before);
+  }
+  // 计数爆表 → 段越界
+  {
+    std::vector<uint8_t> buf = good;
+    buf[32 + 2 * 4] = 0xff;
+    buf[32 + 2 * 4 + 1] = 0xff;
+    buf[32 + 2 * 4 + 2] = 0xff;
+    buf[32 + 2 * 4 + 3] = 0x0f;
+    const std::vector<uint8_t> before = buf;
+    CHECK(!TransformHbcInPlace(buf.data(), buf.size(), kLayoutV98, false));
+    CHECK(buf == before);
+  }
+  // 非法描述表:countIndex 越界
+  {
+    std::vector<uint8_t> buf = good;
+    const HbcSectionDesc bad[] = {{99, 4, nullptr, 0}};
+    const HbcLayoutDesc badLayout = {19, bad, 1};
+    CHECK(!TransformHbcInPlace(buf.data(), buf.size(), badLayout, false));
+  }
+  // 非法描述表:差分字段超出条目
+  {
+    std::vector<uint8_t> buf = good;
+    const HbcDeltaField badField[] = {{4, 0, 32}}; // byte 4 + 4 > entrySize 4
+    const HbcSectionDesc bad[] = {{5, 4, badField, 1}};
+    const HbcLayoutDesc badLayout = {19, bad, 1};
+    CHECK(!TransformHbcInPlace(buf.data(), buf.size(), badLayout, false));
+  }
+  // 非法描述表:位域越过 32 位
+  {
+    std::vector<uint8_t> buf = good;
+    const HbcDeltaField badField[] = {{0, 8, 25}};
+    const HbcSectionDesc bad[] = {{5, 4, badField, 1}};
+    const HbcLayoutDesc badLayout = {19, bad, 1};
+    CHECK(!TransformHbcInPlace(buf.data(), buf.size(), badLayout, false));
+  }
+}
+
+} // namespace
+
+int main(int argc, char** argv) {
+  std::string fixturesDir = "cpp/patch_core/tests/fixtures/";
+  if (argc > 1) {
+    fixturesDir = argv[1];
+    if (!fixturesDir.empty() && fixturesDir.back() != '/') {
+      fixturesDir += '/';
+    }
+  }
+
+  TestGoldenPair(fixturesDir, "v96.hbc", "v96.t.hbc", kLayoutV96);
+  TestGoldenPair(fixturesDir, "v98.hbc", "v98.t.hbc", kLayoutV98);
+  TestGoldenPair(fixturesDir, "v98b.hbc", "v98b.t.hbc", kLayoutV98Late);
+  TestRejections(fixturesDir);
+
+  // 变体互斥:19 槽布局作用于 20 槽文件(或反之)必须被结构校验拒绝
+  {
+    std::vector<uint8_t> late = ReadFileOrDie(fixturesDir + "v98b.hbc");
+    CHECK(!TransformHbcInPlace(late.data(), late.size(), kLayoutV98, false));
+    std::vector<uint8_t> early = ReadFileOrDie(fixturesDir + "v98.hbc");
+    CHECK(
+        !TransformHbcInPlace(early.data(), early.size(), kLayoutV98Late, false));
+  }
+
+  if (g_failures > 0) {
+    std::fprintf(stderr, "hbc_transform_test: %d failure(s)\n", g_failures);
+    return 1;
+  }
+  std::printf("hbc_transform_test: all checks passed\n");
+  return 0;
+}

package/cpp/patch_core/tests/patch_core_test.cpp

@@ -137,6 +137,146 @@ void ExpectEq(const std::string& left, const std::string& right, const std::stri
   }
 }
 
+std::string g_fixtures_dir = "cpp/patch_core/tests/fixtures";
+
+// 变换域 bundle patch 端到端:真实 hpatch + wire 元数据 → T(origin) →
+// hpatch → T⁻¹,结果必须与新 bundle 逐字节一致(fixtures 由 CLI 的 JS
+// 实现生成,同时充当跨实现 golden)。
+void TestApplyPatchWithHbcTransform() {
+  TempDir temp;
+  const std::string origin = JoinPath(g_fixtures_dir, "v96.hbc");
+  const std::string patch = JoinPath(g_fixtures_dir, "v96.tpatch.bin");
+  const std::string expected = ReadFile(JoinPath(g_fixtures_dir, "v96b.hbc"));
+  const std::string meta = ReadFile(JoinPath(g_fixtures_dir, "v96.meta.json"));
+  Expect(!expected.empty() && !meta.empty(), "hbc fixtures must exist");
+
+  FileSourcePatchOptions options;
+  options.source_root = JoinPath(temp.path, "src");
+  options.target_root = JoinPath(temp.path, "dst");
+  options.origin_bundle_path = origin;
+  options.bundle_patch_path = patch;
+  options.bundle_output_path = JoinPath(temp.path, "out/index.bundlejs");
+  options.enable_merge = false;
+  options.bundle_hbc_transform_meta = meta;
+
+  Status status = ApplyPatchFromFileSource(options);
+  Expect(status.ok, "hbc transform patch should succeed: " + status.message);
+  ExpectEq(
+      ReadFile(options.bundle_output_path).size() == expected.size()
+          ? std::string("same-size")
+          : std::string("size-mismatch"),
+      "same-size",
+      "restored bundle size");
+  Expect(
+      ReadFile(options.bundle_output_path) == expected,
+      "restored bundle must equal new bundle byte-for-byte");
+
+  // 临时文件必须被清理
+  Expect(
+      !Exists(options.bundle_output_path + ".hbct-origin") &&
+          !Exists(options.bundle_output_path + ".hbct-patched"),
+      "hbc transform temp files must be removed");
+}
+
+void TestApplyPatchWithHbcTransformRejectsBadMeta() {
+  TempDir temp;
+  FileSourcePatchOptions options;
+  options.source_root = JoinPath(temp.path, "src");
+  options.target_root = JoinPath(temp.path, "dst");
+  options.origin_bundle_path = JoinPath(g_fixtures_dir, "v96.hbc");
+  options.bundle_patch_path = JoinPath(g_fixtures_dir, "v96.tpatch.bin");
+  options.bundle_output_path = JoinPath(temp.path, "out/index.bundlejs");
+  options.enable_merge = false;
+
+  // 不可解析的元数据 → 失败(绝不能忽略元数据直接 hpatch)
+  options.bundle_hbc_transform_meta = "not json";
+  Expect(
+      !ApplyPatchFromFileSource(options).ok,
+      "malformed hbcTransform metadata must fail");
+  Expect(!Exists(options.bundle_output_path), "no output on failure");
+
+  // 不支持的变换规范版本 → 失败(调用方回退整包)
+  std::string meta = ReadFile(JoinPath(g_fixtures_dir, "v96.meta.json"));
+  const std::string needle = "\"v\":1";
+  const size_t pos = meta.find(needle);
+  Expect(pos != std::string::npos, "meta fixture must contain v:1");
+  meta.replace(pos, needle.size(), "\"v\":9");
+  options.bundle_hbc_transform_meta = meta;
+  Status status = ApplyPatchFromFileSource(options);
+  Expect(!status.ok, "unsupported hbcTransform version must fail");
+  Expect(
+      status.message.find("Unsupported hbcTransform version") !=
+          std::string::npos,
+      "error should identify unsupported version: " + status.message);
+}
+
+// HDIFF13(diffStream)格式:hpatch_by_file 按 magic 自动分派,
+// v2 轨道的大 bundle patch 走此路径。fixtures 由 node-hdiffpatch 生成并
+// 已在 JS 侧验证过 round-trip。
+void TestApplyStreamFormatBundlePatch() {
+  TempDir temp;
+  FileSourcePatchOptions options;
+  options.source_root = JoinPath(temp.path, "src");
+  options.target_root = JoinPath(temp.path, "dst");
+  options.origin_bundle_path = JoinPath(g_fixtures_dir, "v96.hbc");
+  options.bundle_patch_path = JoinPath(g_fixtures_dir, "v96.streampatch.bin");
+  options.bundle_output_path = JoinPath(temp.path, "out/index.bundlejs");
+  options.enable_merge = false;
+
+  Status status = ApplyPatchFromFileSource(options);
+  Expect(status.ok, "stream-format patch should apply: " + status.message);
+  Expect(
+      ReadFile(options.bundle_output_path) ==
+          ReadFile(JoinPath(g_fixtures_dir, "v96b.hbc")),
+      "stream-format restored bundle must equal new bundle");
+}
+
+void TestApplyStreamFormatWithHbcTransform() {
+  TempDir temp;
+  FileSourcePatchOptions options;
+  options.source_root = JoinPath(temp.path, "src");
+  options.target_root = JoinPath(temp.path, "dst");
+  options.origin_bundle_path = JoinPath(g_fixtures_dir, "v96.hbc");
+  options.bundle_patch_path = JoinPath(g_fixtures_dir, "v96.tstreampatch.bin");
+  options.bundle_output_path = JoinPath(temp.path, "out/index.bundlejs");
+  options.enable_merge = false;
+  options.bundle_hbc_transform_meta =
+      ReadFile(JoinPath(g_fixtures_dir, "v96.meta.json"));
+
+  Status status = ApplyPatchFromFileSource(options);
+  Expect(
+      status.ok,
+      "transform + stream-format patch should apply: " + status.message);
+  Expect(
+      ReadFile(options.bundle_output_path) ==
+          ReadFile(JoinPath(g_fixtures_dir, "v96b.hbc")),
+      "transform+stream restored bundle must equal new bundle");
+}
+
+// HDIFFSF20 允许 compressedSize==0 表示 diff payload 为 RAW。node-hdiffpatch
+// 2.x 的 v5 writer 在这种小 diff 上仍会保留 lzma2 标签,客户端必须按
+// compressedSize 判定是否解压,不能只看 compressType。
+void TestApplySingleFormatRawStoredWithLzma2Label() {
+  TempDir temp;
+  FileSourcePatchOptions options;
+  options.source_root = JoinPath(temp.path, "src");
+  options.target_root = JoinPath(temp.path, "dst");
+  options.origin_bundle_path = JoinPath(g_fixtures_dir, "rawstored.old.bin");
+  options.bundle_patch_path =
+      JoinPath(g_fixtures_dir, "rawstored.lzma2label.patch.bin");
+  options.bundle_output_path = JoinPath(temp.path, "out/index.bundlejs");
+  options.enable_merge = false;
+
+  Status status = ApplyPatchFromFileSource(options);
+  Expect(
+      status.ok,
+      "raw-stored single-format patch should apply: " + status.message);
+  Expect(
+      ReadFile(options.bundle_output_path) ==
+          ReadFile(JoinPath(g_fixtures_dir, "rawstored.new.bin")),
+      "raw-stored single-format restored bundle must equal new bundle");
+}
+
 void TestApplyPatchFromFileSourceMergesAndCopies() {
   TempDir temp;
   const std::string source = JoinPath(temp.path, "origin");
@@ -609,8 +749,17 @@ void TestStateCoreSwitchToSameVersion() {
 
 }  // namespace
 
-int main() {
+int main(int argc, char** argv) {
+  if (argc > 1) {
+    g_fixtures_dir = argv[1];
+  }
   const std::vector<std::pair<std::string, void (*)()>> tests = {
+      {"ApplyStreamFormatBundlePatch", TestApplyStreamFormatBundlePatch},
+      {"ApplyStreamFormatWithHbcTransform", TestApplyStreamFormatWithHbcTransform},
+      {"ApplySingleFormatRawStoredWithLzma2Label",
+       TestApplySingleFormatRawStoredWithLzma2Label},
+      {"ApplyPatchWithHbcTransform", TestApplyPatchWithHbcTransform},
+      {"ApplyPatchWithHbcTransformRejectsBadMeta", TestApplyPatchWithHbcTransformRejectsBadMeta},
       {"ApplyPatchFromFileSourceMergesAndCopies", TestApplyPatchFromFileSourceMergesAndCopies},
       {"ApplyPatchMergeHardLinksUnchangedFiles", TestApplyPatchMergeHardLinksUnchangedFiles},
       {"ApplyPatchMergeFallsBackToByteCopy", TestApplyPatchMergeFallsBackToByteCopy},

package/cpp/patch_core/update_core_android.cpp

@@ -4,6 +4,7 @@
 #include <vector>
 
 #include "archive_patch_core.h"
+#include "hbc_transform_wire.h"
 #include "jni_util.h"
 #include "state_core.h"
 #include "state_ops.h"
@@ -289,6 +290,15 @@ jobject MakeStateResult(
 
 }  // namespace
 
+// 客户端可消费的 diff 轨道版本(能力上报,而非 SDK 版本映射);JS 层经
+// getConstants 暴露,随 checkUpdate 以 diffV 上报,服务端据此下发 v2 轨道。
+extern "C" JNIEXPORT jint JNICALL
+Java_cn_reactnative_modules_update_NativeUpdateCore_getSupportedDiffVersion(
+    JNIEnv*,
+    jclass) {
+  return static_cast<jint>(pushy::hbc::kSupportedDiffVersion);
+}
+
 extern "C" JNIEXPORT jobject JNICALL
 Java_cn_reactnative_modules_update_UpdateContext_syncStateWithBinaryVersion(
     JNIEnv* env,

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

@@ -34,6 +34,8 @@ else()
     set(HDP_SOURCES
          ${CMAKE_CURRENT_SOURCE_DIR}/pushy.cpp
          ${PATCH_CORE_DIR}/archive_patch_core.cpp
+         ${PATCH_CORE_DIR}/hbc_transform.cpp
+         ${PATCH_CORE_DIR}/hbc_transform_wire.cpp
          ${PATCH_CORE_DIR}/patch_core.cpp
          ${PATCH_CORE_DIR}/state_core.cpp
          ${ANDROID_JNI_DIR}/hpatch.c

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

@@ -6,6 +6,7 @@
 #include <vector>
 
 #include "archive_patch_core.h"
+#include "hbc_transform_wire.h"
 #include "patch_core.h"
 #include "state_core.h"
 #include "state_ops.h"
@@ -686,6 +687,7 @@ napi_value ApplyPatchFromFileSource(napi_env env, napi_callback_info info) {
   std::string bundle_patch_path;
   std::string bundle_output_path;
   std::string merge_source_subdir;
+  std::string bundle_hbc_transform_meta;
   bool enable_merge = true;
 
   if (!GetOptionalStringArrayProperty(env, args[0], "copyFroms", &copy_froms) ||
@@ -697,6 +699,8 @@ napi_value ApplyPatchFromFileSource(napi_env env, napi_callback_info info) {
       !GetOptionalStringProperty(env, args[0], "bundlePatchPath", &bundle_patch_path) ||
       !GetOptionalStringProperty(env, args[0], "bundleOutputPath", &bundle_output_path) ||
       !GetOptionalStringProperty(env, args[0], "mergeSourceSubdir", &merge_source_subdir) ||
+      !GetOptionalStringProperty(
+          env, args[0], "bundleHbcTransformMeta", &bundle_hbc_transform_meta) ||
       !GetOptionalBoolProperty(env, args[0], "enableMerge", true, &enable_merge)) {
     return nullptr;
   }
@@ -713,6 +717,7 @@ napi_value ApplyPatchFromFileSource(napi_env env, napi_callback_info info) {
   work_data->options.bundle_patch_path = bundle_patch_path;
   work_data->options.bundle_output_path = bundle_output_path;
   work_data->options.merge_source_subdir = merge_source_subdir;
+  work_data->options.bundle_hbc_transform_meta = bundle_hbc_transform_meta;
   work_data->options.enable_merge = enable_merge;
 
   napi_value promise = nullptr;
@@ -876,13 +881,25 @@ bool ExportFunction(
 
 }  // namespace
 
+
+// 原生 patch 内核可消费的 diff 轨道版本(2 = hdiffv2 轨道)
+static napi_value GetSupportedDiffVersion(napi_env env, napi_callback_info) {
+  napi_value result = nullptr;
+  napi_create_uint32(
+      env,
+      static_cast<uint32_t>(pushy::hbc::kSupportedDiffVersion),
+      &result);
+  return result;
+}
+
 napi_value Init(napi_env env, napi_value exports) {
   if (!ExportFunction(env, exports, "syncStateWithBinaryVersion", SyncStateWithBinaryVersion) ||
       !ExportFunction(env, exports, "runStateCore", RunStateCore) ||
       !ExportFunction(env, exports, "buildArchivePatchPlan", BuildArchivePatchPlan) ||
       !ExportFunction(env, exports, "buildCopyGroups", BuildCopyGroups) ||
       !ExportFunction(env, exports, "applyPatchFromFileSource", ApplyPatchFromFileSource) ||
-      !ExportFunction(env, exports, "cleanupOldEntries", CleanupOldEntries)) {
+      !ExportFunction(env, exports, "cleanupOldEntries", CleanupOldEntries) ||
+      !ExportFunction(env, exports, "getSupportedDiffVersion", GetSupportedDiffVersion)) {
     return nullptr;
   }
   return exports;

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

@@ -16,6 +16,9 @@ export interface PatchManifestArrays {
   copyFroms: string[];
   copyTos: string[];
   deletes: string[];
+  // __diff.json 中对应 bundle patch 条目的 hbcTransform 元数据(原始 JSON
+  // 字符串);为空时 native 走现状路径
+  hbcTransformMeta: string;
 }
 
 export function parseManifestToArrays(
@@ -44,10 +47,23 @@ export function parseManifestToArrays(
     copyTos.push(to);
   }
 
+  const hbcTransform = manifest.hbcTransform as
+    | Record<string, object>
+    | undefined;
+  const hbcTransformEntry =
+    hbcTransform && typeof hbcTransform === 'object'
+      ? hbcTransform[HARMONY_BUNDLE_PATCH_ENTRY]
+      : undefined;
+  const hbcTransformMeta =
+    hbcTransformEntry && typeof hbcTransformEntry === 'object'
+      ? JSON.stringify(hbcTransformEntry)
+      : '';
+
   return {
     copyFroms,
     copyTos,
     deletes,
+    hbcTransformMeta,
   };
 }
 
@@ -214,6 +230,7 @@ export class DownloadTask {
         copyFroms: [],
         copyTos: [],
         deletes: [],
+        hbcTransformMeta: '',
       };
     }
 
@@ -229,6 +246,7 @@ export class DownloadTask {
     workingDirectory: string,
     bundlePatchPath: string,
     outputFile: string,
+    hbcTransformMeta = '',
   ): Promise<void> {
     const originBundlePath = `${workingDirectory}/${TEMP_ORIGIN_BUNDLE_ENTRY}`;
     try {
@@ -243,6 +261,7 @@ export class DownloadTask {
         bundlePatchPath,
         bundleOutputPath: outputFile,
         enableMerge: false,
+        bundleHbcTransformMeta: hbcTransformMeta,
       });
     } catch (error: any) {
       error.message = `Failed to process bundle patch: ${error.message}`;
@@ -534,6 +553,7 @@ export class DownloadTask {
       params.unzipDirectory,
       bundlePatchPath,
       `${params.unzipDirectory}/bundle.harmony.js`,
+      manifestArrays.hbcTransformMeta,
     );
     await this.copyFromResource(
       NativePatchCore.buildCopyGroups(
@@ -580,6 +600,7 @@ export class DownloadTask {
       bundleOutputPath: `${params.unzipDirectory}/bundle.harmony.js`,
       mergeSourceSubdir: plan.mergeSourceSubdir,
       enableMerge: plan.enableMerge,
+      bundleHbcTransformMeta: manifestArrays.hbcTransformMeta,
     });
     console.info('Patch from PPK completed');
     try {

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

@@ -47,6 +47,8 @@ export interface FileSourcePatchRequest {
   bundleOutputPath: string;
   mergeSourceSubdir?: string;
   enableMerge?: boolean;
+  /** __diff.json 中该 bundle patch 条目的 hbcTransform 元数据(原始 JSON) */
+  bundleHbcTransformMeta?: string;
 }
 
 interface NativePatchCoreBindings {
@@ -78,6 +80,8 @@ interface NativePatchCoreBindings {
     keepPrevious: string,
     maxAgeDays: number,
   ): Promise<void>;
+  /** 原生 patch 内核可消费的 diff 轨道版本(2 = hdiffv2 轨道) */
+  getSupportedDiffVersion(): number;
 }
 
 export default NativeUpdateCore as unknown as NativePatchCoreBindings;

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

@@ -5,6 +5,7 @@ import {
 import common from '@ohos.app.ability.common';
 import { bundleManager } from '@kit.AbilityKit';
 import logger from './Logger';
+import NativePatchCore from './NativePatchCore';
 import { UpdateContext } from './UpdateContext';
 import { EventHub } from './EventHub';
 
@@ -150,6 +151,7 @@ export class PushyTurboModule extends UITurboModule {
       isFirstTime,
       rolledBackVersion,
       uuid,
+      supportedDiffVersion: NativePatchCore.getSupportedDiffVersion(),
     };
     const logResult = {
       downloadRootDir: result.downloadRootDir,
@@ -231,6 +233,16 @@ export class PushyTurboModule extends UITurboModule {
     }
   }
 
+  async resetToPackagedBundle(): Promise<void> {
+    logger.debug(TAG, ',call resetToPackagedBundle');
+    try {
+      this.context.resetToPackagedBundle();
+    } catch (error) {
+      logger.error(TAG, `resetToPackagedBundle failed: ${getErrorMessage(error)}`);
+      throw Error(`resetToPackagedBundle failed: ${getErrorMessage(error)}`);
+    }
+  }
+
   async downloadPatchFromPpk(options: {
     updateUrl: string;
     hash: string;

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

@@ -372,6 +372,52 @@ export class UpdateContext {
     });
   }
 
+  /**
+   * 恢复到二进制内置包：清空整个更新状态机（下次启动即回内置 bundle）并删除
+   * 全部已下载版本。仅保留 uuid —— 它标识安装实例、用于灰度分桶，reset 不应改变。
+   */
+  public resetToPackagedBundle(): void {
+    this.trace('resetToPackagedBundle:before');
+    const state = this.getStateSnapshot();
+    const resetState: StateCoreResult = {
+      packageVersion: state.packageVersion,
+      buildTime: state.buildTime,
+      currentVersion: '',
+      lastVersion: '',
+      firstTime: false,
+      firstTimeOk: true,
+      rolledBackVersion: '',
+    };
+    // 删除已下载版本的 hash_* 元信息（不走 clear()：它是异步的，且会连带清掉
+    // uuid —— 见 syncStateWithBinaryVersion 的注释）。getAllSync 在旧 SDK 上
+    // 可能不存在，此时残留的 hash_* 只是无害孤儿数据，不影响 reset 语义。
+    const prefsWithGetAll = this.preferences as preferences.Preferences & {
+      getAllSync?: () => Record<string, unknown>;
+    };
+    if (typeof prefsWithGetAll.getAllSync === 'function') {
+      try {
+        const all = prefsWithGetAll.getAllSync();
+        for (const key of Object.keys(all)) {
+          if (key.startsWith('hash_')) {
+            this.preferences.deleteSync(key);
+          }
+        }
+      } catch (e: any) {
+        console.error('Failed to clear hash info on reset:', e);
+      }
+    }
+    this.persistState(resetState, { clearFirstLoadMarker: true });
+    UpdateContext.ignoreRollback = false;
+
+    // maxAgeDays=0 且不保留任何版本：全量删除下载目录内容（后台线程，尽力而为）
+    NativePatchCore.cleanupOldEntries(this.rootDir, '', '', 0).catch(
+      (error: Object) => {
+        console.error('reset cleanup failed:', error);
+      },
+    );
+    this.trace('resetToPackagedBundle:after');
+  }
+
   public async downloadFullUpdate(url: string, hash: string): Promise<void> {
     try {
       const params = this.createTaskParams(