qpdf-compress 0.6.3 → 0.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qpdf-compress",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Native PDF compression for Node.js, powered by QPDF",
   "license": "Apache-2.0",
   "type": "module",
@@ -96,7 +96,7 @@
     "eslint-plugin-prettier": "^5.5.5",
     "husky": "^9.1.7",
     "lint-staged": "^16.4.0",
-    "node-gyp": "^11.0.0",
+    "node-gyp": "^13.0.0",
     "prettier": "^3.8.1",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.57.2",

package/scripts/download-qpdf.mjs

@@ -132,6 +132,19 @@ if (process.platform === 'win32') {
       `-DVCPKG_TARGET_TRIPLET=${triplet}`,
     );
 
+    // qpdf locates zlib via pkg-config first, then falls back to find_path/
+    // find_library. The GitHub Windows image no longer ships pkg-config and the
+    // fallback misses the vcpkg tree, so point qpdf's ZLIB_*_PATH cache vars
+    // straight at the vcpkg-installed static zlib (mirrors LIBJPEG_*_PATH).
+    const vcpkgInstalled = join(vcpkgRoot, 'installed', triplet);
+    const zlibLib = ['zlib.lib', 'zs.lib', 'zlibstatic.lib']
+      .map((n) => join(vcpkgInstalled, 'lib', n))
+      .find((p) => existsSync(p));
+    cmakeArgs.push(`-DZLIB_H_PATH:PATH=${join(vcpkgInstalled, 'include')}`);
+    if (zlibLib) {
+      cmakeArgs.push(`-DZLIB_LIB_PATH:FILEPATH=${zlibLib}`);
+    }
+
     // cross-compile for ARM64 when triplet indicates it
     if (triplet.startsWith('arm64')) {
       cmakeArgs.push('-A', 'arm64');
@@ -200,13 +213,23 @@ if (process.platform === 'win32') {
   ];
 
   const vcpkgLibDir = candidateLibDirs.find((d) => existsSync(d));
-  if (vcpkgLibDir) {
-    const src = join(vcpkgLibDir, 'zlib.lib');
-    if (existsSync(src)) {
-      cpSync(src, join(depsDir, 'lib', 'zlib.lib'));
-      console.log('Copied vcpkg zlib.lib');
-    }
+  if (!vcpkgLibDir) {
+    console.error('vcpkg lib dir not found; checked:', candidateLibDirs);
+    process.exit(1);
+  }
+  // vcpkg's static zlib lib name varies across versions (zlib.lib / zs.lib /
+  // zlibstatic.lib); copy whichever exists to the zlib.lib name binding.gyp links.
+  const zlibNames = ['zlib.lib', 'zs.lib', 'zlibstatic.lib'];
+  const zlibSrc = zlibNames.map((n) => join(vcpkgLibDir, n)).find((p) => existsSync(p));
+  if (!zlibSrc) {
+    console.error(
+      `zlib static lib not found in ${vcpkgLibDir}. Contents:`,
+      readdirSync(vcpkgLibDir),
+    );
+    process.exit(1);
   }
+  cpSync(zlibSrc, join(depsDir, 'lib', 'zlib.lib'));
+  console.log(`Copied ${zlibSrc} -> deps/qpdf/lib/zlib.lib`);
 }
 
 // step 5: clean up source and build dirs

package/src/qpdf_addon.cc

@@ -306,12 +306,11 @@ static Napi::Value Compress(const Napi::CallbackInfo &info) {
 
 static Napi::Object Init(Napi::Env env, Napi::Object exports) {
   auto *addonData = new AddonData();
+  // SetInstanceData installs a finalizer that deletes addonData on env teardown,
+  // so the cleanup hook must NOT delete it again (double free); it only flips the
+  // alive flag so in-flight workers bail out.
   env.SetInstanceData(addonData);
-  auto envAlive = addonData->envAlive;
-  env.AddCleanupHook([addonData]() {
-    addonData->envAlive->store(false);
-    delete addonData;
-  });
+  env.AddCleanupHook([addonData]() { addonData->envAlive->store(false); });
 
   exports.Set("compress", Napi::Function::New(env, Compress));
   return exports;