7zip-native 0.0.7 → 0.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "7zip-native",
-	"version": "0.0.7",
+	"version": "0.0.10",
 	"description": "Native 7zip bindings for Node.js",
 	"main": "./dist/index.cjs",
 	"type": "module",
@@ -30,6 +30,7 @@
 		"dist/",
 		"prebuilds/",
 		"native/",
+		"patches/",
 		"scripts/",
 		"vendor/7zip/",
 		"binding.gyp",
@@ -50,7 +51,7 @@
 	},
 	"scripts": {
 		"install": "node scripts/verify-prebuild.mjs",
-		"prepare": "npm run build && node scripts/clean-upstream-build.mjs",
+		"prepare": "npm run build",
 		"build": "npm run build:native && npm run eslint && npx rollup -c && npm run typecheck",
 		"build:native": "node scripts/build-native.mjs",
 		"eslint": "eslint ./src --ext .ts,.mts,.js,.mjs",
@@ -59,7 +60,8 @@
 		"benchmark": "node --experimental-strip-types bench/benchmark.mts",
 		"benchmark:concurrency": "node --experimental-strip-types bench/concurrency.mts",
 		"benchmark:folder-concurrency": "node --experimental-strip-types bench/folder-concurrency.mts",
-		"benchmark:compare": "node --experimental-strip-types bench/compare.mts"
+		"benchmark:compare": "node --experimental-strip-types bench/compare.mts",
+		"benchmark:multiprocess": "node bench/multiprocess-extract.cjs"
 	},
 	"keywords": [
 		"7zip",

package/patches/deflate-input-buffer-size.patch

@@ -0,0 +1,47 @@
+diff --git a/CPP/7zip/Archive/Archive2.def b/CPP/7zip/Archive/Archive2.def
+index 5abe81d..b96cb34 100644
+--- a/CPP/7zip/Archive/Archive2.def
++++ b/CPP/7zip/Archive/Archive2.def
+@@ -3,6 +3,7 @@ EXPORTS
+   GetHandlerProperty PRIVATE
+   GetNumberOfFormats PRIVATE
+   GetHandlerProperty2 PRIVATE
+   GetIsArc PRIVATE
++  SetDeflateInputBufferSize PRIVATE
+ 
+   GetNumberOfMethods PRIVATE
+   GetMethodProperty PRIVATE
+diff --git a/CPP/7zip/Compress/DeflateDecoder.cpp b/CPP/7zip/Compress/DeflateDecoder.cpp
+index 7993176..5f3d9d4 100644
+--- a/CPP/7zip/Compress/DeflateDecoder.cpp
++++ b/CPP/7zip/Compress/DeflateDecoder.cpp
+@@ -3,6 +3,20 @@
+ 
+ #include "DeflateDecoder.h"
+ 
++namespace {
++
++thread_local UInt32 g_deflateInputBufferSize = 1 << 15;
++
++}
++
++STDAPI SetDeflateInputBufferSize(UInt32 bufferSize)
++{
++  if (bufferSize < (1 << 12) || bufferSize > (1 << 21))
++    return E_INVALIDARG;
++  g_deflateInputBufferSize = bufferSize;
++  return S_OK;
++}
++
+ namespace NCompress {
+ namespace NDeflate {
+ namespace NDecoder {
+@@ -153,7 +167,7 @@ HRESULT CCoder::InitInStream(bool needInit)
+     // for HDD-Windows:
+     // (1 << 15) - best for reading only prefetch
+     // (1 << 22) - best for real reading / writing
+-    if (!m_InBitStream.Create(1 << 20))
++    if (!m_InBitStream.Create(g_deflateInputBufferSize))
+       return E_OUTOFMEMORY;
+     m_InBitStream.Init();
+     _needInitInStream = false;

package/scripts/build-native.mjs

@@ -1,11 +1,12 @@
 import {spawn} from 'node:child_process';
-import { copyFile, mkdir, rm } from 'node:fs/promises';
+import { copyFile, mkdir, readFile, rm } from 'node:fs/promises';
 import {createRequire} from 'node:module';
 import {availableParallelism} from 'node:os';
 import { join, resolve } from 'node:path';
 import {fileURLToPath} from 'node:url';
 
 const root = resolve(fileURLToPath(new URL('..', import.meta.url)));
+const upstreamDirectory = join(root, 'vendor', '7zip');
 const bundleDirectory = join(root, 'vendor', '7zip', 'CPP', '7zip', 'Bundles', 'Format7zF');
 const releaseDirectory = join(root, 'build', 'Release');
 const targetArch = process.env.BUILD_ARCH || process.arch;
@@ -14,6 +15,9 @@ const engineName = process.platform === 'win32'
 	? '7z.dll'
 	: process.platform === 'darwin' ? 'lib7z.dylib' : '7z.so';
 const require = createRequire(import.meta.url);
+const patchPath = join(root, 'patches', 'deflate-input-buffer-size.patch');
+const deflateSourcePath = join(upstreamDirectory, 'CPP', '7zip', 'Compress', 'DeflateDecoder.cpp');
+const archiveExportsPath = join(upstreamDirectory, 'CPP', '7zip', 'Archive', 'Archive2.def');
 
 function run(command, args, cwd, env = process.env)
 {
@@ -33,6 +37,21 @@ function run(command, args, cwd, env = process.env)
 	});
 }
 
+const deflateSource = await readFile(deflateSourcePath, 'utf8');
+const archiveExports = await readFile(archiveExportsPath, 'utf8');
+if(deflateSource.includes('SetDeflateInputBufferSize'))
+{
+	if(!archiveExports.includes('SetDeflateInputBufferSize'))
+	{
+		throw new Error('The Deflate buffer patch is only partially applied; restore vendor/7zip and rebuild');
+	}
+}
+else
+{
+	await run('git', ['-C', upstreamDirectory, 'apply', '--check', patchPath], root);
+	await run('git', ['-C', upstreamDirectory, 'apply', patchPath], root);
+}
+
 if(process.platform === 'win32')
 {
 	const upstreamArch = targetArch === 'ia32' ? 'x86' : targetArch;
@@ -46,6 +65,8 @@ else
 		'-f',
 		'makefile.gcc',
 		`-j${process.env.BUILD_JOBS ?? Math.min(availableParallelism(), 2)}`,
+		// Avoid 2 MiB aligned allocations that Electron's allocator traps on.
+		'CFLAGS_BASE2=-DZ7_NO_MADVISE',
 	];
 	const buildEnv = {...process.env};
 	if(targetArch === 'ia32')

package/vendor/7zip/CPP/7zip/Archive/Archive2.def

@@ -5,6 +5,7 @@ EXPORTS
   GetNumberOfFormats PRIVATE
   GetHandlerProperty2 PRIVATE
   GetIsArc PRIVATE
+  SetDeflateInputBufferSize PRIVATE
 
   GetNumberOfMethods PRIVATE
   GetMethodProperty PRIVATE