Compatibility with node 20.x.x

pniewiejski · web-flow · commit f7c98c2c7768 · 2024-01-19T15:22:03.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
+.idea/
 build/
 lib/compress-buffer/compress-buffer-bindings.node
 .lock-wscript
 nbproject/
 node_modules/*
+package-lock.json
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+4.0.0: Nov 02, 2023
+* compatibility with node 20.x.x
+
 1.2.0: Mar 22, 2013
 * compatibility with node 0.10.0 (converted to GYP)
 
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "bugs": {
     "url": "http://github.com/egorFiNE/node-compress-buffer/issues"
   },
-  "version": "3.0.0",
+  "version": "4.0.0",
   "author": "Egor Egorov",
   "repository": {
     "type": "git",
diff --git a/src/compress-buffer.cc b/src/compress-buffer.cc
@@ -15,6 +15,14 @@
 #define WBITS 16+MAX_WBITS
 #define WBITS_RAW -15
 
+#ifdef Z_LARGE64 // zlib defines different functions depending on architecture.
+    #pragma message "Z_LARGE64 defined using crc32_combine64"
+    #define ZLIB_CRC32_COMBINE(crc1, crc2, len2) crc32_combine64((crc1), (crc2), (len2))
+#else
+    #define ZLIB_CRC32_COMBINE(crc1, crc2, len2) crc32_combine((crc1), (crc2), (len2))
+    #pragma message "Z_LARGE64 NOT defined using crc32_combine"
+#endif
+
 #define CHUNK 1024*100
 #define HEADER_SIZE 10
 #define FOOTER_SIZE 8
@@ -426,7 +434,8 @@ namespace node_compress_buffer {
             unsigned long tmpCrc = reverseBytes((unsigned char *) node::Buffer::Data(bufCrc));
             unsigned long tmpLen = meta->Get(ctx, Nan::New(SYM_LENGTH)).ToLocalChecked()->Uint32Value(ctx).FromJust();
 
-            crc = crc32_combine(crc, tmpCrc, tmpLen);
+            crc = ZLIB_CRC32_COMBINE(crc, tmpCrc, tmpLen);
+
             tot += tmpLen;
         }
 
diff --git a/test/node-compress-buffer-test.js b/test/node-compress-buffer-test.js
@@ -1,8 +1,8 @@
-util = require('util');
-fs = require('fs');
-crypto=require('crypto');
-compress = require('../index').compress;
-uncompress = require('../index').uncompress;
+const util = require('util');
+const fs = require('fs');
+const crypto = require('crypto');
+const compress = require('../index').compress;
+const uncompress = require('../index').uncompress;
 
 function md5(data) {
 	var md5=crypto.createHash('md5');
