feat: apply HDIFF13 stream-format bundle patches

hpatch_by_file now sniffs the patch header and dispatches: single format
(HDIFFSF20) keeps the existing path byte-for-byte; HDIFF13 (diffStream
output, served only on the capability-gated v2 track for large bundles)
applies via patch_decompress_with_cache with the same streaming memory
profile (decompress cache + IO buffers, old loaded to memory only when
<= 8MB). Works transparently under the HBC transform flow since that
path also funnels through hpatch_by_file.

Tests: stream-format apply and transform+stream e2e added to
patch_core_test (fixtures generated by node-hdiffpatch and round-trip
verified in JS first). Android prebuilt .so rebuilt for all ABIs.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: sunnylqm

android/jni/hpatch.c

@@ -105,10 +105,57 @@ int hpatch_by_mem(const uint8_t* old,size_t oldsize,uint8_t* newBuf,size_t newsi
     return hpatch_by_stream(&oldStream,hpatch_FALSE,&patStream,&newStream,patInfo);
 }
 
+// HDIFF13(diffStream 产物,v2 轨道的大 bundle patch):流式应用,
+// 内存 = 解压缓存 + IO 缓冲(+ old ≤ 8MB 时的整载优化),与 single 路径同级。
+static int hpatch_v13_by_stream(const hpatch_TStreamInput* old,hpatch_BOOL isLoadOldAllToMem,
+                                const hpatch_TStreamInput* pat,hpatch_TStreamOutput* out_new){
+    int     result=kHPatch_ok;
+    int     _isInClear=hpatch_FALSE;
+    hpatch_TDecompress* decompressPlugin=0;
+    uint8_t* temp_cache=0;
+    size_t temp_cache_size;
+    hpatch_compressedDiffInfo patInfo;
+    hpatch_TStreamInput _old;
+    {// info
+        _check(getCompressedDiffInfo(&patInfo,pat),kHPatch_error_info);
+        _check(old->streamSize==patInfo.oldDataSize,kHPatch_error_old_size);
+        _check(out_new->streamSize>=patInfo.newDataSize,kHPatch_error_new_size);
+        out_new->streamSize=patInfo.newDataSize;
+        if (strlen(patInfo.compressType)>0){
+            decompressPlugin=getDecompressPlugin(patInfo.compressType);
+            _check(decompressPlugin,kHPatch_error_compressType);
+        }
+    }
+    {// mem
+        size_t mem_size;
+        size_t oldSize=(size_t)old->streamSize;
+        isLoadOldAllToMem=isLoadOldAllToMem&&(old->streamSize<=kMaxLoadMemOldSize);
+        temp_cache_size=hpatch_kStreamCacheSize*8+hpatch_kFileIOBufBetterSize*3;
+        mem_size=temp_cache_size+(isLoadOldAllToMem?oldSize:0);
+        temp_cache=malloc(mem_size);
+        _check(temp_cache,kHPatch_error_malloc);
+        if (isLoadOldAllToMem){//load old to mem
+            uint8_t* oldMem=temp_cache+temp_cache_size;
+            _check(old->read(old,0,oldMem,oldMem+oldSize),kHPatch_error_old_fread);
+            mem_as_hStreamInput(&_old,oldMem,oldMem+oldSize);
+            old=&_old;
+        }
+    }
+
+    _check(patch_decompress_with_cache(out_new,old,pat,decompressPlugin,
+               temp_cache,temp_cache+temp_cache_size),kHPatch_error_patch);
+
+_clear:
+    _isInClear=hpatch_TRUE;
+    if (temp_cache){ free(temp_cache); temp_cache=0; }
+    return result;
+}
+
 int hpatch_by_file(const char* oldfile, const char* newfile, const char* patchfile){
     int     result=kHPatch_ok;
     int     _isInClear=hpatch_FALSE;
     int     patch_result;
+    hpatch_singleCompressedDiffInfo singleInfo;
     hpatch_TFileStreamInput oldStream;
     hpatch_TFileStreamInput patStream;
     hpatch_TFileStreamOutput newStream;
@@ -120,7 +167,13 @@ int hpatch_by_file(const char* oldfile, const char* newfile, const char* patchfi
     _check(hpatch_TFileStreamInput_open(&patStream,patchfile),kHPatch_error_pat_fopen);
     _check(hpatch_TFileStreamOutput_open(&newStream,newfile,~(hpatch_StreamPos_t)0),kHPatch_error_new_fopen);
 
-    patch_result=hpatch_by_stream(&oldStream.base,hpatch_TRUE,&patStream.base,&newStream.base,0);
+    // 按 patch 头自动分派格式:single(HDIFFSF20,现状)或 stream(HDIFF13,
+    // v2 轨道大 bundle)。老客户端只会收到 single;能力门控在服务端。
+    if (getSingleCompressedDiffInfo(&singleInfo,&patStream.base,0)){
+        patch_result=hpatch_by_stream(&oldStream.base,hpatch_TRUE,&patStream.base,&newStream.base,&singleInfo);
+    }else{
+        patch_result=hpatch_v13_by_stream(&oldStream.base,hpatch_TRUE,&patStream.base,&newStream.base);
+    }
     if (patch_result!=kHPatch_ok){
         _check(!oldStream.fileError,kHPatch_error_old_fread);
         _check(!patStream.fileError,kHPatch_error_pat_fread);

android/lib/arm64-v8a/librnupdate.so

@@ -210,6 +210,49 @@ void TestApplyPatchWithHbcTransformRejectsBadMeta() {
       "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");
+}
+
 void TestApplyPatchFromFileSourceMergesAndCopies() {
   TempDir temp;
   const std::string source = JoinPath(temp.path, "origin");
@@ -687,6 +730,8 @@ int main(int argc, char** argv) {
     g_fixtures_dir = argv[1];
   }
   const std::vector<std::pair<std::string, void (*)()>> tests = {
+      {"ApplyStreamFormatBundlePatch", TestApplyStreamFormatBundlePatch},
+      {"ApplyStreamFormatWithHbcTransform", TestApplyStreamFormatWithHbcTransform},
       {"ApplyPatchWithHbcTransform", TestApplyPatchWithHbcTransform},
       {"ApplyPatchWithHbcTransformRejectsBadMeta", TestApplyPatchWithHbcTransformRejectsBadMeta},
       {"ApplyPatchFromFileSourceMergesAndCopies", TestApplyPatchFromFileSourceMergesAndCopies},