hpatch

Author: sunnylqm

binding.gyp

@@ -5,6 +5,7 @@
       "sources": [
         "src/main.cc",
         "src/hdiff.cpp",
+        "src/hpatch.cpp",
         "HDiffPatch/libHDiffPatch/HPatch/patch.c",
         "HDiffPatch/libHDiffPatch/HDiff/diff.cpp",
         "HDiffPatch/libHDiffPatch/HDiff/private_diff/bytes_rle.cpp",

index.js

@@ -1,7 +1,3 @@
-/**
- * Created by housisong on 2021.04.06.
- */
-
 var native;
 try {
   native = require('./build/Release/hdiffpatch');
@@ -10,11 +6,25 @@ try {
 }
 exports.native = native;
 
-exports.diff = function(oldBuf, newBuf) {
-  var buffers = [];
-  native.diff(oldBuf, newBuf, function(output){
-    buffers.push(output);
+// 同步版本
+exports.diff = native.diff;
+exports.patch = native.patch;
+
+// 异步版本 (Promise)
+exports.diffAsync = function(oldBuf, newBuf) {
+  return new Promise((resolve, reject) => {
+    native.diff(oldBuf, newBuf, (err, result) => {
+      if (err) reject(err);
+      else resolve(result);
+    });
   });
+};
 
-  return Buffer.concat(buffers);
-}
+exports.patchAsync = function(oldBuf, diffBuf) {
+  return new Promise((resolve, reject) => {
+    native.patch(oldBuf, diffBuf, (err, result) => {
+      if (err) reject(err);
+      else resolve(result);
+    });
+  });
+};

index_test.js

@@ -5,6 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "node test/test.js",
+    "benchmark": "node --expose-gc test/benchmark.js",
     "prepack": "git submodule update --init --recursive"
   },
   "gypfile": true,

package.json

@@ -0,0 +1,78 @@
+/**
+ * hpatch - Apply patch to restore original data
+ * Created based on HDiffPatch library
+ */
+#include "hpatch.h"
+#include "../HDiffPatch/libHDiffPatch/HPatch/patch.h"
+#include <stdexcept>
+
+#define _CompressPlugin_lzma2
+#define _IsNeedIncludeDefaultCompressHead 0
+#include "../lzma/C/LzmaDec.h"
+#include "../lzma/C/Lzma2Dec.h"
+#include "../HDiffPatch/decompress_plugin_demo.h"
+
+// Listener for patch_single_stream_by
+struct PatchListener {
+    hpatch_TDecompress* decompressPlugin;
+    std::vector<uint8_t>* tempCache;
+};
+
+static hpatch_BOOL onDiffInfo(sspatch_listener_t* listener,
+                              const hpatch_singleCompressedDiffInfo* info,
+                              hpatch_TDecompress** out_decompressPlugin,
+                              unsigned char** out_temp_cache,
+                              unsigned char** out_temp_cacheEnd) {
+    PatchListener* self = (PatchListener*)listener->import;
+    
+    // Allocate temp cache: stepMemSize + I/O cache
+    size_t cacheSize = (size_t)info->stepMemSize + hpatch_kStreamCacheSize * 4;
+    self->tempCache->resize(cacheSize);
+    
+    *out_decompressPlugin = self->decompressPlugin;
+    *out_temp_cache = self->tempCache->data();
+    *out_temp_cacheEnd = self->tempCache->data() + cacheSize;
+    
+    return hpatch_TRUE;
+}
+
+void hpatch(const uint8_t* old, size_t oldsize,
+            const uint8_t* diff, size_t diffsize,
+            std::vector<uint8_t>& out_newBuf) {
+    
+    // Get diff info to determine output size
+    hpatch_singleCompressedDiffInfo diffInfo;
+    if (!getSingleCompressedDiffInfo_mem(&diffInfo, diff, diff + diffsize)) {
+        throw std::runtime_error("getSingleCompressedDiffInfo_mem() failed, invalid diff data!");
+    }
+    
+    // Verify old data size matches
+    if (diffInfo.oldDataSize != oldsize) {
+        throw std::runtime_error("Old data size mismatch!");
+    }
+    
+    // Allocate output buffer
+    out_newBuf.resize((size_t)diffInfo.newDataSize);
+    
+    // Setup decompressor
+    hpatch_TDecompress* decompressPlugin = &lzma2DecompressPlugin;
+    
+    // Setup listener
+    std::vector<uint8_t> tempCache;
+    PatchListener patchListener;
+    patchListener.decompressPlugin = decompressPlugin;
+    patchListener.tempCache = &tempCache;
+    
+    sspatch_listener_t listener;
+    listener.import = &patchListener;
+    listener.onDiffInfo = onDiffInfo;
+    listener.onPatchFinish = nullptr;
+    
+    // Execute patch
+    if (!patch_single_stream_by_mem(&listener,
+                                    out_newBuf.data(), out_newBuf.data() + out_newBuf.size(),
+                                    old, old + oldsize,
+                                    diff, diff + diffsize)) {
+        throw std::runtime_error("patch_single_stream_by_mem() failed!");
+    }
+}

src/hdiff.cpp

@@ -0,0 +1,16 @@
+/**
+ * hpatch - Apply patch to restore original data
+ * Created based on HDiffPatch library
+ */
+
+#ifndef HDIFFPATCH_PATCH_H
+#define HDIFFPATCH_PATCH_H
+#include <stddef.h>
+#include <stdint.h>
+#include <vector>
+
+void hpatch(const uint8_t* old, size_t oldsize,
+            const uint8_t* diff, size_t diffsize,
+            std::vector<uint8_t>& out_newBuf);
+
+#endif