@homeofthings/sqlite3 7.0.2 → 7.0.3

package/README.md

@@ -18,7 +18,7 @@ Asynchronous, non-blocking [SQLite3](https://sqlite.org/) bindings for [Node.js]
 
 # Features
 
- - Bundles SQLite v3.53.1, or you can build using a local SQLite (or SqlCipher,...)
+ - Bundles SQLite v3.53.2, or you can build using a local SQLite (or SqlCipher,...)
  - Straightforward query and parameter binding interface
  - Full Buffer/Blob support
  - Extensive debugging support via [verbose mode](docs/API.md#verbose-mode)
@@ -43,7 +43,7 @@ yarn add @homeofthings/sqlite3
 
 ### Prebuilt binaries
 
-`@homeofthings/sqlite3` uses [Node-API](https://nodejs.org/api/n-api.html) so prebuilt binaries do not need to be built for specific Node versions. Prebuilt binaries are built as NAPI-version-agnostic (`@homeofthings+sqlite3.*.node`) using the `--napi` flag, and work on any Node.js version that supports the NAPI version used at compile time. Requires Node.js v20.17.0 or later.
+`@homeofthings/sqlite3` uses [Node-API](https://nodejs.org/api/n-api.html) so prebuilt binaries do not need to be built for specific Node versions. Prebuilt binaries are built as NAPI-version-agnostic (`@homeofthings+sqlite3.*.node`) using the `--napi` flag, and work on any Node.js version that supports the NAPI version used at compile time. Requires Node.js v22.1.0 or later.
 
 Prebuilt binaries are bundled inside the npm package using [`prebuildify`](https://github.com/prebuild/prebuildify) and loaded at runtime by [`node-gyp-build`](https://github.com/prebuild/node-gyp-build). No separate download step is needed — `npm install` just works. The following targets are currently provided:
 

package/deps/common-sqlite.gypi

@@ -1,6 +1,6 @@
 {
   'variables': {
-      'sqlite_version%':'3530100',
+      'sqlite_version%':'3530200',
       "toolset%":'',
   },
   'target_defaults': {

package/deps/extract.js

@@ -0,0 +1,130 @@
+#!/usr/bin/env node
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const zlib = require('zlib');
+
+const LOCAL_FILE_HEADER_SIG = 0x04034b50;
+const COMPRESSION_STORE = 0;
+const COMPRESSION_DEFLATE = 8;
+
+function extractZip(zipPath, destDir) {
+    const data = fs.readFileSync(zipPath);
+    let offset = 0;
+    let entries = 0;
+
+    // Detect top-level directory prefix to strip (e.g., "sqlite-amalgamation-3530100/")
+    let prefixToStrip = '';
+    let firstEntry = true;
+
+    while (offset < data.length) {
+        const sig = data.readUInt32LE(offset);
+        if (sig !== LOCAL_FILE_HEADER_SIG) {
+            break;
+        }
+
+        const compressionMethod = data.readUInt16LE(offset + 8);
+        const compressedSize = data.readUInt32LE(offset + 18);
+        const fileNameLength = data.readUInt16LE(offset + 26);
+        const extraFieldLength = data.readUInt16LE(offset + 28);
+
+        const fileName = data.toString('utf8', offset + 30, offset + 30 + fileNameLength);
+        const dataOffset = offset + 30 + fileNameLength + extraFieldLength;
+        const compressedData = data.subarray(dataOffset, dataOffset + compressedSize);
+
+        // Detect top-level directory prefix from first entry
+        if (firstEntry && fileName.includes('/')) {
+            prefixToStrip = fileName.substring(0, fileName.indexOf('/') + 1);
+            firstEntry = false;
+        }
+
+        // Strip prefix from filename
+        let outFileName = fileName;
+        if (prefixToStrip && outFileName.startsWith(prefixToStrip)) {
+            outFileName = outFileName.substring(prefixToStrip.length);
+        }
+
+        let fileData;
+        if (compressionMethod === COMPRESSION_STORE) {
+            fileData = compressedData;
+        } else if (compressionMethod === COMPRESSION_DEFLATE) {
+            fileData = zlib.inflateRawSync(compressedData);
+        } else {
+            throw new Error(`Unsupported compression method ${compressionMethod} for file ${fileName}`);
+        }
+
+        if (outFileName && !outFileName.endsWith('/')) {
+            const outPath = path.join(destDir, outFileName);
+          const resolvedDest = path.resolve(destDir);
+          const resolvedOut = path.resolve(outPath);
+          if (!resolvedOut.startsWith(resolvedDest + path.sep)) {
+            throw new Error(`Zip Slip detected: ${outFileName} resolves outside destination directory`);
+          }
+            const dir = path.dirname(outPath);
+            if (!fs.existsSync(dir)) {
+                fs.mkdirSync(dir, { recursive: true });
+            }
+            fs.writeFileSync(outPath, fileData);
+            entries++;
+        }
+
+        offset = dataOffset + compressedSize;
+    }
+
+    if (entries === 0) {
+        throw new Error('No files extracted — zip may be corrupted or empty');
+    }
+
+    return entries;
+}
+
+function main() {
+    const archivePath = path.resolve(process.argv[2]);
+    const destDir = path.resolve(process.argv[3]);
+
+    if (!archivePath || !destDir) {
+        console.error('Usage: extract.js <archive_path> <dest_dir>');
+        process.exit(1);
+    }
+
+    // Resolve archive path relative to script directory if not absolute
+    const zipFile = path.isAbsolute(archivePath)
+        ? archivePath
+        : path.join(__dirname, archivePath);
+
+    // Compute extraction directory: destDir + archive basename without .zip
+    const archiveName = path.basename(archivePath, '.zip');
+    const extractDir = path.join(destDir, archiveName);
+    const stampFile = path.join(extractDir, '.extract-stamp');
+
+    if (fs.existsSync(stampFile)) {
+        console.log(`[extract] Already extracted: ${extractDir}`);
+        process.exit(0);
+    }
+
+    if (!fs.existsSync(zipFile)) {
+        console.error(`[extract] ERROR: Zip file not found: ${zipFile}`);
+        process.exit(1);
+    }
+
+    if (fs.existsSync(extractDir)) {
+        console.log(`[extract] Removing stale extraction directory: ${extractDir}`);
+        fs.rmSync(extractDir, { recursive: true, force: true });
+    }
+
+    console.log(`[extract] Extracting ${path.basename(zipFile)}...`);
+    fs.mkdirSync(extractDir, { recursive: true });
+
+    try {
+        const entries = extractZip(zipFile, extractDir);
+        fs.writeFileSync(stampFile, `Extracted from ${path.basename(zipFile)}\n`);
+        console.log(`[extract] Extraction complete: ${entries} file(s) extracted to ${extractDir}`);
+    } catch (err) {
+        console.error(`[extract] ERROR: ${err.message}`);
+        fs.rmSync(extractDir, { recursive: true, force: true });
+        process.exit(1);
+    }
+}
+
+main();

package/deps/sqlite3.gyp

@@ -47,15 +47,40 @@
   },
 
   'targets': [
+    {
+      'target_name': 'action_before_build',
+      'type': 'none',
+      'hard_dependency': 1,
+      'actions': [
+        {
+          'action_name': 'unpack_sqlite_dep',
+          'inputs': [
+            './sqlite-amalgamation-<@(sqlite_version).zip'
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/sqlite-amalgamation-<@(sqlite_version)/sqlite3.c'
+          ],
+          'action': ['node', './extract.js', './sqlite-amalgamation-<@(sqlite_version).zip', '<(SHARED_INTERMEDIATE_DIR)']
+        }
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)/sqlite-amalgamation-<@(sqlite_version)/',
+        ]
+      },
+    },
     {
       'target_name': 'sqlite3',
       'type': 'static_library',
-      'include_dirs': [ './sqlite-amalgamation-<@(sqlite_version)/' ],
+      'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/sqlite-amalgamation-<@(sqlite_version)/' ],
+      'dependencies': [
+        'action_before_build'
+      ],
       'sources': [
-        './sqlite-amalgamation-<@(sqlite_version)/sqlite3.c'
+        '<(SHARED_INTERMEDIATE_DIR)/sqlite-amalgamation-<@(sqlite_version)/sqlite3.c'
       ],
       'direct_dependent_settings': {
-        'include_dirs': [ './sqlite-amalgamation-<@(sqlite_version)/' ],
+        'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/sqlite-amalgamation-<@(sqlite_version)/' ],
         'defines': [
           'SQLITE_THREADSAFE=1',
           'HAVE_USLEEP=1',
@@ -81,6 +106,9 @@
         'SQLITE_ENABLE_DBSTAT_VTAB=1',
         'SQLITE_ENABLE_MATH_FUNCTIONS'
       ],
+      'export_dependent_settings': [
+        'action_before_build',
+      ],
       'conditions': [
         ["sqlite_magic != ''", {
             'defines': [
@@ -90,4 +118,4 @@
       ],
     }
   ]
-}
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@homeofthings/sqlite3",
   "description": "Asynchronous, non-blocking SQLite3 bindings",
-  "version": "7.0.2",
+  "version": "7.0.3",
   "homepage": "https://github.com/gms1/node-sqlite3",
   "author": {
     "name": "Mapbox",
@@ -40,17 +40,17 @@
     "url": "https://github.com/gms1/node-sqlite3.git"
   },
   "dependencies": {
-    "node-addon-api": "^8.7.0",
+    "node-addon-api": "^8.8.0",
     "node-gyp-build": "^4.8.4"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "eslint": "^10.3.0",
+    "eslint": "^10.4.1",
     "globals": "^17.6.0",
-    "mocha": "11.7.5",
+    "mocha": "11.7.6",
     "nyc": "^18.0.0",
     "prebuildify": "^6.0.1",
-    "tinybench": "^6.0.1"
+    "tinybench": "^6.0.2"
   },
   "peerDependencies": {
     "node-gyp": "12.x"
@@ -64,7 +64,7 @@
     "node-gyp": "12.x"
   },
   "engines": {
-    "node": ">=20.17.0"
+    "node": ">=22.1.0"
   },
   "scripts": {
     "install": "node-gyp-build",