@rocicorp/zero-sqlite3 1.0.15 → 1.0.17

package/deps/sqlite3/sqlite3ext.h

@@ -368,6 +368,10 @@ struct sqlite3_api_routines {
   int (*set_clientdata)(sqlite3*, const char*, void*, void(*)(void*));
   /* Version 3.50.0 and later */
   int (*setlk_timeout)(sqlite3*,int,int);
+  /* Version 3.51.0 and later */
+  int (*set_errmsg)(sqlite3*,int,const char*);
+  int (*db_status64)(sqlite3*,int,sqlite3_int64*,sqlite3_int64*,int);
+  
 };
 
 /*
@@ -703,6 +707,9 @@ typedef int (*sqlite3_loadext_entry)(
 #define sqlite3_set_clientdata         sqlite3_api->set_clientdata
 /* Version 3.50.0 and later */
 #define sqlite3_setlk_timeout          sqlite3_api->setlk_timeout
+/* Version 3.51.0 and later */
+#define sqlite3_set_errmsg             sqlite3_api->set_errmsg
+#define sqlite3_db_status64            sqlite3_api->db_status64
 #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
 
 #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)

package/lib/database.js

@@ -84,6 +84,7 @@ Database.prototype.exec = wrappers.exec;
 Database.prototype.close = wrappers.close;
 Database.prototype.defaultSafeIntegers = wrappers.defaultSafeIntegers;
 Database.prototype.unsafeMode = wrappers.unsafeMode;
+Database.prototype.loadExtension = wrappers.loadExtension;
 Database.prototype[util.inspect] = require('./methods/inspect');
 
 // Export SQLITE_SCANSTAT_* constants from native addon

package/lib/index.d.ts

@@ -96,7 +96,7 @@ declare namespace BetterSqlite3 {
                 result?: ((total: T) => unknown) | undefined;
             },
         ): this;
-        loadExtension(path: string): this;
+        loadExtension(path: string, entryPoint?: string): this;
         close(): this;
         defaultSafeIntegers(toggleState?: boolean): this;
         backup(destinationFile: string, options?: Database.BackupOptions): Promise<Database.BackupMetadata>;

package/lib/methods/wrappers.js

@@ -25,6 +25,11 @@ exports.unsafeMode = function unsafeMode(...args) {
 	return this;
 };
 
+exports.loadExtension = function loadExtension(...args) {
+	this[cppdb].loadExtension(...args);
+	return this;
+};
+
 exports.getters = {
 	name: {
 		get: function name() { return this[cppdb].name; },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocicorp/zero-sqlite3",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "better-sqlite3 on bedrock",
   "homepage": "https://github.com/rocicorp/zero-sqlite3",
   "author": "Rocicorp",
@@ -20,7 +20,7 @@
     "shell.js"
   ],
   "engines": {
-    "node": "20.x || 22.x || 23.x || 24.x",
+    "node": "20.x || 22.x || 23.x || 24.x || 25.x",
     "bun": ">=1.1.0"
   },
   "types": "lib/index.d.ts",
@@ -30,7 +30,7 @@
   },
   "overrides": {
     "prebuild": {
-      "node-abi": "4.13.1"
+      "node-abi": "^4.25.0"
     }
   },
   "devDependencies": {

package/src/better_sqlite3.cpp

@@ -46,7 +46,12 @@ class Backup;
 #include "objects/statement-iterator.cpp"
 
 NODE_MODULE_INIT(/* exports, context */) {
+    #if defined(NODE_MODULE_VERSION) && NODE_MODULE_VERSION >= 140
+    // Use Isolate::GetCurrent as stated in deprecation message within v8_context.h 13.9.72320122
+	v8::Isolate* isolate = v8::Isolate::GetCurrent();
+	#else
 	v8::Isolate* isolate = context->GetIsolate();
+	#endif
 	v8::HandleScope scope(isolate);
 	Addon::ConfigureURI();
 
@@ -62,7 +67,7 @@ NODE_MODULE_INIT(/* exports, context */) {
 	exports->Set(context, InternalizedFromLatin1(isolate, "Backup"), Backup::Init(isolate, data)).FromJust();
 	exports->Set(context, InternalizedFromLatin1(isolate, "setErrorConstructor"), v8::FunctionTemplate::New(isolate, Addon::JS_setErrorConstructor, data)->GetFunction(context).ToLocalChecked()).FromJust();
 
-	// Export SQLITE_SCANSTAT_* constants
+  // Export SQLITE_SCANSTAT_* constants
 	exports->Set(context, InternalizedFromLatin1(isolate, "SQLITE_SCANSTAT_NLOOP"), v8::Int32::New(isolate, SQLITE_SCANSTAT_NLOOP)).FromJust();
 	exports->Set(context, InternalizedFromLatin1(isolate, "SQLITE_SCANSTAT_NVISIT"), v8::Int32::New(isolate, SQLITE_SCANSTAT_NVISIT)).FromJust();
 	exports->Set(context, InternalizedFromLatin1(isolate, "SQLITE_SCANSTAT_EST"), v8::Int32::New(isolate, SQLITE_SCANSTAT_EST)).FromJust();

package/src/objects/database.cpp

@@ -132,6 +132,7 @@ INIT(Database::Init) {
 	SetPrototypeMethod(isolate, data, t, "function", JS_function);
 	SetPrototypeMethod(isolate, data, t, "aggregate", JS_aggregate);
 	SetPrototypeMethod(isolate, data, t, "table", JS_table);
+	SetPrototypeMethod(isolate, data, t, "loadExtension", JS_loadExtension);
 	SetPrototypeMethod(isolate, data, t, "close", JS_close);
 	SetPrototypeMethod(isolate, data, t, "defaultSafeIntegers", JS_defaultSafeIntegers);
 	SetPrototypeMethod(isolate, data, t, "unsafeMode", JS_unsafeMode);
@@ -171,7 +172,9 @@ NODE_METHOD(Database::JS_new) {
 	sqlite3_busy_timeout(db_handle, timeout);
 	sqlite3_limit(db_handle, SQLITE_LIMIT_LENGTH, MAX_BUFFER_SIZE < MAX_STRING_SIZE ? MAX_BUFFER_SIZE : MAX_STRING_SIZE);
 	sqlite3_limit(db_handle, SQLITE_LIMIT_SQL_LENGTH, MAX_STRING_SIZE);
-	int status = sqlite3_db_config(db_handle, SQLITE_DBCONFIG_DEFENSIVE, 1, NULL);
+	int status = sqlite3_db_config(db_handle, SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION, 1, NULL);
+	assert(status == SQLITE_OK);
+	status = sqlite3_db_config(db_handle, SQLITE_DBCONFIG_DEFENSIVE, 1, NULL);
 	assert(status == SQLITE_OK); ((void)status);
 
 	if (node::Buffer::HasInstance(buffer) && !Deserialize(buffer.As<v8::Object>(), addon, db_handle, readonly)) {
@@ -206,6 +209,28 @@ NODE_METHOD(Database::JS_prepare) {
 	if (!maybeStatement.IsEmpty()) info.GetReturnValue().Set(maybeStatement.ToLocalChecked());
 }
 
+NODE_METHOD(Database::JS_loadExtension) {
+	Database* db = Unwrap<Database>(info.This());
+	REQUIRE_ARGUMENT_STRING(first, v8::Local<v8::String> filename);
+	v8::Local<v8::String> entryPoint;
+	if (info.Length() > 1) { REQUIRE_ARGUMENT_STRING(second, entryPoint); }
+	REQUIRE_DATABASE_OPEN(db);
+	REQUIRE_DATABASE_NOT_BUSY(db);
+	REQUIRE_DATABASE_NO_ITERATORS(db);
+	UseIsolate;
+	char* error;
+	int status = sqlite3_load_extension(
+		db->db_handle,
+		*v8::String::Utf8Value(isolate, filename),
+		entryPoint.IsEmpty() ? NULL : *v8::String::Utf8Value(isolate, entryPoint),
+		&error
+	);
+	if (status != SQLITE_OK) {
+		ThrowSqliteError(db->addon, error, status);
+	}
+	sqlite3_free(error);
+}
+
 NODE_METHOD(Database::JS_exec) {
 	Database* db = Unwrap<Database>(info.This());
 	REQUIRE_ARGUMENT_STRING(first, v8::Local<v8::String> source);
@@ -383,10 +408,10 @@ NODE_METHOD(Database::JS_unsafeMode) {
 }
 
 NODE_GETTER(Database::JS_open) {
-	info.GetReturnValue().Set(Unwrap<Database>(info.This())->open);
+	info.GetReturnValue().Set(Unwrap<Database>(PROPERTY_HOLDER(info))->open);
 }
 
 NODE_GETTER(Database::JS_inTransaction) {
-	Database* db = Unwrap<Database>(info.This());
+	Database* db = Unwrap<Database>(PROPERTY_HOLDER(info));
 	info.GetReturnValue().Set(db->open && !static_cast<bool>(sqlite3_get_autocommit(db->db_handle)));
 }

package/src/objects/database.hpp

@@ -75,6 +75,7 @@ private:
 	static NODE_METHOD(JS_function);
 	static NODE_METHOD(JS_aggregate);
 	static NODE_METHOD(JS_table);
+	static NODE_METHOD(JS_loadExtension);
 	static NODE_METHOD(JS_close);
 	static NODE_METHOD(JS_defaultSafeIntegers);
 	static NODE_METHOD(JS_unsafeMode);

package/src/objects/statement.cpp

@@ -450,7 +450,7 @@ NODE_METHOD(Statement::JS_columns) {
 		);
 		columns.emplace_back(
 			v8::Object::New(isolate,
-				v8::Object::New(isolate)->GetPrototype(),
+				GET_PROTOTYPE(v8::Object::New(isolate)),
 				keys.data(),
 				values.data(),
 				keys.size()
@@ -546,6 +546,6 @@ NODE_METHOD(Statement::JS_scanStatusReset) {
 }
 
 NODE_GETTER(Statement::JS_busy) {
-	Statement* stmt = Unwrap<Statement>(info.This());
+	Statement* stmt = Unwrap<Statement>(PROPERTY_HOLDER(info));
 	info.GetReturnValue().Set(stmt->alive && stmt->locked);
 }

package/src/util/binder.cpp

@@ -33,10 +33,10 @@ private:
 	};
 
 	static bool IsPlainObject(v8::Isolate* isolate, v8::Local<v8::Object> obj) {
-		v8::Local<v8::Value> proto = obj->GetPrototype();
+		v8::Local<v8::Value> proto = GET_PROTOTYPE(obj);
 		v8::Local<v8::Context> ctx = obj->GetCreationContext().ToLocalChecked();
 		ctx->Enter();
-		v8::Local<v8::Value> baseProto = v8::Object::New(isolate)->GetPrototype();
+		v8::Local<v8::Value> baseProto = GET_PROTOTYPE(v8::Object::New(isolate));
 		ctx->Exit();
 		return proto->StrictEquals(baseProto) || proto->StrictEquals(v8::Null(isolate));
 	}

package/src/util/data.cpp

@@ -146,7 +146,7 @@ namespace Data {
 		}
 		return v8::Object::New(
 			isolate,
-			v8::Object::New(isolate)->GetPrototype(),
+			GET_PROTOTYPE(v8::Object::New(isolate)),
 			keys.data(),
 			values.data(),
 			column_count

package/src/util/macros.cpp

@@ -4,6 +4,26 @@
 #define NODE_GETTER(name) void name(v8::Local<v8::Name> _, const v8::PropertyCallbackInfo<v8::Value>& info)
 #define INIT(name) v8::Local<v8::Function> name(v8::Isolate* isolate, v8::Local<v8::External> data)
 
+#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >= 13
+// v8::Object::GetPrototype has been deprecated. See http://crbug.com/333672197
+#define GET_PROTOTYPE(obj) ((obj)->GetPrototypeV2())
+#else
+#define GET_PROTOTYPE(obj) ((obj)->GetPrototype())
+#endif
+
+// PropertyCallbackInfo::This() and Holder() were removed; use HolderV2().
+// Tracking bug for V8 API removals: http://crbug.com/333672197
+// V8 head has since restored Holder() and deprecated HolderV2():
+//   https://chromium.googlesource.com/v8/v8/+/main/include/v8-function-callback.h
+//   V8_INLINE Local<Object> Holder() const;
+//   V8_DEPRECATE_SOON("Use Holder().")
+//   V8_INLINE Local<Object> HolderV2() const;
+#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >= 13
+#define PROPERTY_HOLDER(info) (info).HolderV2()
+#else
+#define PROPERTY_HOLDER(info) (info).This()
+#endif
+
 #define EasyIsolate v8::Isolate* isolate = v8::Isolate::GetCurrent()
 #define OnlyIsolate info.GetIsolate()
 #define OnlyContext isolate->GetCurrentContext()

package/src/util/row-builder.cpp

@@ -33,7 +33,7 @@ public:
 		}
 
 		return v8::Object::New(isolate,
-			v8::Object::New(isolate)->GetPrototype(),
+			GET_PROTOTYPE(v8::Object::New(isolate)),
 			keys.data(),
 			values.data(),
 			column_count

package/deps/patches/1208.patch

@@ -1,15 +0,0 @@
-diff --git a/deps/sqlite3/sqlite3.c b/deps/sqlite3/sqlite3.c
-index b1a807f..38bd1e6 100644
---- a/deps/sqlite3/sqlite3.c
-+++ b/deps/sqlite3/sqlite3.c
-@@ -24887,8 +24887,8 @@ static const struct {
-   /* 1 */ { 6, "minute",   7.7379e+12,        60.0  },
-   /* 2 */ { 4, "hour",     1.2897e+11,      3600.0  },
-   /* 3 */ { 3, "day",      5373485.0,      86400.0  },
--  /* 4 */ { 5, "month",    176546.0,  30.0*86400.0  },
--  /* 5 */ { 4, "year",     14713.0,  365.0*86400.0  },
-+  /* 4 */ { 5, "month",    176546.0,     2592000.0  },
-+  /* 5 */ { 4, "year",     14713.0,     31536000.0  },
- };
- 
- /*