better-sqlite3-multiple-ciphers 8.5.3-beta.0 → 8.6.0

package/README.md

@@ -17,10 +17,10 @@ The fastest and simplest library for SQLite3 in Node.js. This particular fork su
 ## Current versions
 
 - ### Stable
-  - **better-sqlite3-multiple-ciphers** - [`8.5.2`](https://github.com/m4heshd/better-sqlite3-multiple-ciphers/releases/tag/v8.5.2)
-  - **better-sqlite3** - [`8.5.2`](https://github.com/JoshuaWise/better-sqlite3/releases/tag/v8.5.2)
-  - **SQLite** - [`3.42.0`](https://www.sqlite.org/releaselog/3_42_0.html)
-  - **SQLite3 Multiple Ciphers** - [`1.6.3`](https://github.com/utelle/SQLite3MultipleCiphers/releases/tag/v1.6.3)
+  - **better-sqlite3-multiple-ciphers** - [`8.6.0`](https://github.com/m4heshd/better-sqlite3-multiple-ciphers/releases/tag/v8.6.0)
+  - **better-sqlite3** - [`8.6.0`](https://github.com/JoshuaWise/better-sqlite3/releases/tag/v8.6.0)
+  - **SQLite** - [`3.43.0`](https://www.sqlite.org/releaselog/3_43_0.html)
+  - **SQLite3 Multiple Ciphers** - [`1.6.4`](https://github.com/utelle/SQLite3MultipleCiphers/releases/tag/v1.6.4)
 
 - ### Beta
   - **better-sqlite3-multiple-ciphers** - [`8.5.3-beta.0`](https://github.com/m4heshd/better-sqlite3-multiple-ciphers/releases/tag/v8.5.3-beta.0)

package/deps/copy.js

@@ -18,9 +18,14 @@ if (process.argv[3]) {
 }
 
 for (const { filename, optional } of files) {
-	if (optional && !fs.existsSync(path.join(source, filename))) {
+	const sourceFilepath = path.join(source, filename);
+	const destFilepath = path.join(dest, filename);
+
+	if (optional && !fs.existsSync(sourceFilepath)) {
 		continue;
 	}
-	fs.accessSync(path.join(source, filename));
-	fs.copyFileSync(path.join(source, filename), path.join(dest, filename));
+
+	fs.accessSync(sourceFilepath);
+	fs.mkdirSync(path.dirname(destFilepath), { recursive: true });
+	fs.copyFileSync(sourceFilepath, destFilepath);
 }

package/deps/defines.gypi

@@ -9,6 +9,7 @@
     'HAVE_UINT16_T=1',
     'HAVE_UINT32_T=1',
     'HAVE_UINT8_T=1',
+    'HAVE_USLEEP=1',
     'SQLITE_DEFAULT_CACHE_SIZE=-16000',
     'SQLITE_DEFAULT_FOREIGN_KEYS=1',
     'SQLITE_DEFAULT_MEMSTATUS=0',
@@ -26,7 +27,6 @@
     'SQLITE_ENABLE_RTREE',
     'SQLITE_ENABLE_STAT4',
     'SQLITE_ENABLE_UPDATE_DELETE_LIMIT',
-    'SQLITE_INTROSPECTION_PRAGMAS',
     'SQLITE_LIKE_DOESNT_MATCH_BLOBS',
     'SQLITE_OMIT_DEPRECATED',
     'SQLITE_OMIT_GET_TABLE',

package/deps/download.sh

@@ -47,7 +47,6 @@ SQLITE_ENABLE_MATH_FUNCTIONS
 SQLITE_ENABLE_RTREE
 SQLITE_ENABLE_STAT4
 SQLITE_ENABLE_UPDATE_DELETE_LIMIT
-SQLITE_INTROSPECTION_PRAGMAS
 SQLITE_LIKE_DOESNT_MATCH_BLOBS
 SQLITE_OMIT_DEPRECATED
 SQLITE_OMIT_GET_TABLE

package/lib/database.js

@@ -33,22 +33,28 @@ function Database(filenameGiven, options) {
 	const fileMustExist = util.getBooleanOption(options, 'fileMustExist');
 	const timeout = 'timeout' in options ? options.timeout : 5000;
 	const verbose = 'verbose' in options ? options.verbose : null;
-	const nativeBindingPath = 'nativeBinding' in options ? options.nativeBinding : null;
+	const nativeBinding = 'nativeBinding' in options ? options.nativeBinding : null;
 
 	// Validate interpreted options
 	if (readonly && anonymous && !buffer) throw new TypeError('In-memory/temporary databases cannot be readonly');
 	if (!Number.isInteger(timeout) || timeout < 0) throw new TypeError('Expected the "timeout" option to be a positive integer');
 	if (timeout > 0x7fffffff) throw new RangeError('Option "timeout" cannot be greater than 2147483647');
 	if (verbose != null && typeof verbose !== 'function') throw new TypeError('Expected the "verbose" option to be a function');
-	if (nativeBindingPath != null && typeof nativeBindingPath !== 'string') throw new TypeError('Expected the "nativeBinding" option to be a string');
+	if (nativeBinding != null && typeof nativeBinding !== 'string' && typeof nativeBinding !== 'object') throw new TypeError('Expected the "nativeBinding" option to be a string or addon object');
 
 	// Load the native addon
 	let addon;
-	if (nativeBindingPath == null) {
+	if (nativeBinding == null) {
 		addon = DEFAULT_ADDON || (DEFAULT_ADDON = require('bindings')('better_sqlite3.node'));
+	} else if (typeof nativeBinding === 'string') {
+		// See <https://webpack.js.org/api/module-variables/#__non_webpack_require__-webpack-specific>
+		const requireFunc = typeof __non_webpack_require__ === 'function' ? __non_webpack_require__ : require;
+		addon = requireFunc(path.resolve(nativeBinding).replace(/(\.node)?$/, '.node'));
 	} else {
-		addon = require(path.resolve(nativeBindingPath).replace(/(\.node)?$/, '.node'));
+		// See <https://github.com/WiseLibs/better-sqlite3/issues/972>
+		addon = nativeBinding;
 	}
+
 	if (!addon.isInitialized) {
 		addon.setErrorConstructor(SqliteError);
 		addon.isInitialized = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-sqlite3-multiple-ciphers",
-  "version": "8.5.3-beta.0",
+  "version": "8.6.0",
   "description": "better-sqlite3 with multiple-cipher encryption support",
   "homepage": "https://github.com/m4heshd/better-sqlite3-multiple-ciphers",
   "author": "Mahesh Bandara Wijerathna (m4heshd) <m4heshd@gmail.com>",
@@ -19,19 +19,19 @@
   ],
   "dependencies": {
     "bindings": "^1.5.0",
-    "prebuild-install": "^7.1.0"
+    "prebuild-install": "^7.1.1"
   },
   "devDependencies": {
     "@types/node": "20.4.9",
-    "chai": "^4.3.6",
-    "cli-color": "^2.0.2",
-    "fs-extra": "^10.1.0",
+    "chai": "^4.3.8",
+    "cli-color": "^2.0.3",
+    "fs-extra": "^11.1.1",
     "mocha": "^10.2.0",
-    "node-gyp": "8.4.1",
+    "node-gyp": "9.4.0",
     "nodemark": "^0.3.0",
     "prebuild": "^11.0.4",
-    "sqlite": "^4.1.1",
-    "sqlite3": "^5.0.8"
+    "sqlite": "^5.0.1",
+    "sqlite3": "^5.1.6"
   },
   "overrides": {
     "prebuild": {

package/src/better_sqlite3.cpp

@@ -2,6 +2,17 @@
 //
 
 #include "better_sqlite3.hpp"
+#line 161 "./src/util/macros.lzz"
+#ifndef V8_COMPRESS_POINTERS_IN_SHARED_CAGE
+#define SAFE_NEW_BUFFER(env, data, length, finalizeCallback, finalizeHint) node::Buffer::New(env, data, length, finalizeCallback, finalizeHint)
+#else
+static inline v8::MaybeLocal<v8::Object> BufferSandboxNew(v8::Isolate* isolate, char* data, size_t length, void (*finalizeCallback)(char*, void*), void* finalizeHint) {
+	v8::MaybeLocal<v8::Object> buffer = node::Buffer::Copy(isolate, data, length);
+	finalizeCallback(data, finalizeHint);
+	return buffer;
+}
+#define SAFE_NEW_BUFFER(env, data, length, finalizeCallback, finalizeHint) BufferSandboxNew(env, data, length, finalizeCallback, finalizeHint)
+#endif
 #line 39 "./src/util/binder.lzz"
 	static bool IsPlainObject(v8::Isolate* isolate, v8::Local<v8::Object> obj) {
 		v8::Local<v8::Value> proto = obj->GetPrototype();
@@ -617,7 +628,7 @@ void Database::JS_serialize (v8::FunctionCallbackInfo <v8 :: Value> const & info
                 }
 
                 info.GetReturnValue().Set(
-                        node::Buffer::New(isolate, reinterpret_cast<char*>(data), length, FreeSerialization, NULL).ToLocalChecked()
+                        SAFE_NEW_BUFFER(isolate, reinterpret_cast<char*>(data), length, FreeSerialization, NULL).ToLocalChecked()
                 );
 }
 #line 337 "./src/objects/database.lzz"