signalapp/better-sqlite3
signalapp/better-sqlite3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

src: final fixes for Electron 29

Browse Source
This commit is contained in:
Fedor Indutny 2024-02-22 13:03:47 -08:00
parent 53f4c04f91
commit 903bcd399a
9 changed files with 59 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
src/better_sqlite3.cpp
View File

@ -65,50 +65,6 @@ namespace Data
#line 70 "./src/util/data.lzz"
static char const RAW = 3;
}
#line 34 "./src/util/object_wrap.lzz"
ObjectWrapForElectron22::ObjectWrapForElectron22 ()
#line 34 "./src/util/object_wrap.lzz"
{
refs_ = 0;
}
#line 39 "./src/util/object_wrap.lzz"
ObjectWrapForElectron22::~ ObjectWrapForElectron22 ()
#line 39 "./src/util/object_wrap.lzz"
{
if (persistent().IsEmpty())
return;
persistent().ClearWeak();
persistent().Reset();
}
#line 98 "./src/util/object_wrap.lzz"
void ObjectWrapForElectron22::Ref ()
#line 98 "./src/util/object_wrap.lzz"
{
assert(!persistent().IsEmpty());
persistent().ClearWeak();
refs_++;
}
#line 113 "./src/util/object_wrap.lzz"
void ObjectWrapForElectron22::Unref ()
#line 113 "./src/util/object_wrap.lzz"
{
assert(!persistent().IsEmpty());
assert(!persistent().IsWeak());
assert(refs_ > 0);
if (--refs_ == 0)
MakeWeak();
}
#line 124 "./src/util/object_wrap.lzz"
void ObjectWrapForElectron22::WeakCallback (v8::WeakCallbackInfo <ObjectWrapForElectron22> const & data)
#line 125 "./src/util/object_wrap.lzz"
{
ObjectWrapForElectron22* wrap = data.GetParameter();
assert(wrap->refs_ == 0);
wrap->handle_.Reset();
delete wrap;
}
#line 136 "./src/util/object_wrap.lzz"
uint16_t ObjectWrapForElectron22::kNodeEmbedderId = 0x90de;
#line 37 "./src/util/macros.lzz"
void ThrowError (char const * message)
#line 37 "./src/util/macros.lzz"
@ -129,15 +85,13 @@ v8::Local <v8::FunctionTemplate> NewConstructorTemplate (v8::Isolate * isolate,
#line 110 "./src/util/macros.lzz"
{
v8::Local<v8::FunctionTemplate> t = v8::FunctionTemplate::New(isolate, func, data);
t->InstanceTemplate()->SetInternalFieldCount(2);
t->InstanceTemplate()->SetInternalFieldCount(1);
t->SetClassName(InternalizedFromLatin1(isolate, name));
return t;
}
#line 118 "./src/util/macros.lzz"
#line 116 "./src/util/macros.lzz"
void SetPrototypeMethod (v8::Isolate * isolate, v8::Local <v8::External> data, v8::Local <v8::FunctionTemplate> recv, char const * name, v8::FunctionCallback func)
#line 124 "./src/util/macros.lzz"
#line 122 "./src/util/macros.lzz"
{
v8::HandleScope scope(isolate);
recv->PrototypeTemplate()->Set(
@ -145,9 +99,9 @@ void SetPrototypeMethod (v8::Isolate * isolate, v8::Local <v8::External> data, v
v8::FunctionTemplate::New(isolate, func, data, v8::Signature::New(isolate, recv))
);
}
#line 131 "./src/util/macros.lzz"
#line 129 "./src/util/macros.lzz"
void SetPrototypeSymbolMethod (v8::Isolate * isolate, v8::Local <v8::External> data, v8::Local <v8::FunctionTemplate> recv, v8::Local <v8::Symbol> symbol, v8::FunctionCallback func)
#line 137 "./src/util/macros.lzz"
#line 135 "./src/util/macros.lzz"
{
v8::HandleScope scope(isolate);
recv->PrototypeTemplate()->Set(
@ -155,9 +109,9 @@ void SetPrototypeSymbolMethod (v8::Isolate * isolate, v8::Local <v8::External> d
v8::FunctionTemplate::New(isolate, func, data, v8::Signature::New(isolate, recv))
);
}
#line 144 "./src/util/macros.lzz"
#line 142 "./src/util/macros.lzz"
void SetPrototypeGetter (v8::Isolate * isolate, v8::Local <v8::External> data, v8::Local <v8::FunctionTemplate> recv, char const * name, v8::AccessorGetterCallback func)
#line 150 "./src/util/macros.lzz"
#line 148 "./src/util/macros.lzz"
{
v8::HandleScope scope(isolate);
recv->InstanceTemplate()->SetAccessor(
@ -459,7 +413,7 @@ Database::~ Database ()
#line 128 "./src/objects/database.lzz"
Database::Database (v8::Isolate * isolate, Addon * addon, sqlite3 * db_handle, v8::Local <v8::Value> logger)
#line 133 "./src/objects/database.lzz"
: ObjectWrapForElectron22 (), db_handle (db_handle), open (true), busy (false), safe_ints (false), unsafe_mode (false), was_js_error (false), has_logger (logger->IsFunction()), iterators (0), addon (addon), logger (isolate, logger), stmts (), backups ()
: node::ObjectWrap (), db_handle (db_handle), open (true), busy (false), safe_ints (false), unsafe_mode (false), was_js_error (false), has_logger (logger->IsFunction()), iterators (0), addon (addon), logger (isolate, logger), stmts (), backups ()
#line 146 "./src/objects/database.lzz"
{
assert(db_handle != NULL);
@ -577,7 +531,7 @@ void Database::JS_prepare (v8::FunctionCallbackInfo <v8 :: Value> const & info)
void Database::JS_exec (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 253 "./src/objects/database.lzz"
{
Database* db = ObjectWrapForElectron22 :: Unwrap <Database>(info.This());
Database* db = node :: ObjectWrap :: Unwrap <Database>(info.This());
if ( info . Length ( ) <= ( 0 ) || ! info [ 0 ] -> IsString ( ) ) return ThrowTypeError ( "Expected " "first" " argument to be " "a string" ) ; v8 :: Local < v8 :: String > source = ( info [ 0 ] . As < v8 :: String > ( ) ) ;
if ( ! db -> open ) return ThrowTypeError ( "The database connection is not open" ) ;
if ( db -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ;
@ -639,7 +593,7 @@ void Database::JS_backup (v8::FunctionCallbackInfo <v8 :: Value> const & info)
void Database::JS_serialize (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 311 "./src/objects/database.lzz"
{
Database* db = ObjectWrapForElectron22 :: Unwrap <Database>(info.This());
Database* db = node :: ObjectWrap :: Unwrap <Database>(info.This());
if ( info . Length ( ) <= ( 0 ) || ! info [ 0 ] -> IsString ( ) ) return ThrowTypeError ( "Expected " "first" " argument to be " "a string" ) ; v8 :: Local < v8 :: String > attachedName = ( info [ 0 ] . As < v8 :: String > ( ) ) ;
if ( ! db -> open ) return ThrowTypeError ( "The database connection is not open" ) ;
if ( db -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ;
@ -663,7 +617,7 @@ void Database::JS_serialize (v8::FunctionCallbackInfo <v8 :: Value> const & info
void Database::JS_function (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 333 "./src/objects/database.lzz"
{
Database* db = ObjectWrapForElectron22 :: Unwrap <Database>(info.This());
Database* db = node :: ObjectWrap :: Unwrap <Database>(info.This());
if ( info . Length ( ) <= ( 0 ) || ! info [ 0 ] -> IsFunction ( ) ) return ThrowTypeError ( "Expected " "first" " argument to be " "a function" ) ; v8 :: Local < v8 :: Function > fn = ( info [ 0 ] . As < v8 :: Function > ( ) ) ;
if ( info . Length ( ) <= ( 1 ) || ! info [ 1 ] -> IsString ( ) ) return ThrowTypeError ( "Expected " "second" " argument to be " "a string" ) ; v8 :: Local < v8 :: String > nameString = ( info [ 1 ] . As < v8 :: String > ( ) ) ;
if ( info . Length ( ) <= ( 2 ) || ! info [ 2 ] -> IsInt32 ( ) ) return ThrowTypeError ( "Expected " "third" " argument to be " "a 32-bit signed integer" ) ; int argc = ( info [ 2 ] . As < v8 :: Int32 > ( ) ) -> Value ( ) ;
@ -689,7 +643,7 @@ void Database::JS_function (v8::FunctionCallbackInfo <v8 :: Value> const & info)
void Database::JS_aggregate (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 357 "./src/objects/database.lzz"
{
Database* db = ObjectWrapForElectron22 :: Unwrap <Database>(info.This());
Database* db = node :: ObjectWrap :: Unwrap <Database>(info.This());
if ( info . Length ( ) <= ( 0 ) ) return ThrowTypeError ( "Expected a " "first" " argument" ) ; v8 :: Local < v8 :: Value > start = info [ 0 ] ;
if ( info . Length ( ) <= ( 1 ) || ! info [ 1 ] -> IsFunction ( ) ) return ThrowTypeError ( "Expected " "second" " argument to be " "a function" ) ; v8 :: Local < v8 :: Function > step = ( info [ 1 ] . As < v8 :: Function > ( ) ) ;
if ( info . Length ( ) <= ( 2 ) ) return ThrowTypeError ( "Expected a " "third" " argument" ) ; v8 :: Local < v8 :: Value > inverse = info [ 2 ] ;
@ -720,7 +674,7 @@ void Database::JS_aggregate (v8::FunctionCallbackInfo <v8 :: Value> const & info
void Database::JS_table (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 386 "./src/objects/database.lzz"
{
Database* db = ObjectWrapForElectron22 :: Unwrap <Database>(info.This());
Database* db = node :: ObjectWrap :: Unwrap <Database>(info.This());
if ( info . Length ( ) <= ( 0 ) || ! info [ 0 ] -> IsFunction ( ) ) return ThrowTypeError ( "Expected " "first" " argument to be " "a function" ) ; v8 :: Local < v8 :: Function > factory = ( info [ 0 ] . As < v8 :: Function > ( ) ) ;
if ( info . Length ( ) <= ( 1 ) || ! info [ 1 ] -> IsString ( ) ) return ThrowTypeError ( "Expected " "second" " argument to be " "a string" ) ; v8 :: Local < v8 :: String > nameString = ( info [ 1 ] . As < v8 :: String > ( ) ) ;
if ( info . Length ( ) <= ( 2 ) || ! info [ 2 ] -> IsBoolean ( ) ) return ThrowTypeError ( "Expected " "third" " argument to be " "a boolean" ) ; bool eponymous = ( info [ 2 ] . As < v8 :: Boolean > ( ) ) -> Value ( ) ;
@ -742,7 +696,7 @@ void Database::JS_table (v8::FunctionCallbackInfo <v8 :: Value> const & info)
void Database::JS_loadExtension (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 406 "./src/objects/database.lzz"
{
Database* db = ObjectWrapForElectron22 :: Unwrap <Database>(info.This());
Database* db = node :: ObjectWrap :: Unwrap <Database>(info.This());
v8::Local<v8::String> entryPoint;
if ( info . Length ( ) <= ( 0 ) || ! info [ 0 ] -> IsString ( ) ) return ThrowTypeError ( "Expected " "first" " argument to be " "a string" ) ; v8 :: Local < v8 :: String > filename = ( info [ 0 ] . As < v8 :: String > ( ) ) ;
if (info.Length() > 1) { if ( info . Length ( ) <= ( 1 ) || ! info [ 1 ] -> IsString ( ) ) return ThrowTypeError ( "Expected " "second" " argument to be " "a string" ) ; entryPoint = ( info [ 1 ] . As < v8 :: String > ( ) ) ; }
@ -766,7 +720,7 @@ void Database::JS_loadExtension (v8::FunctionCallbackInfo <v8 :: Value> const &
void Database::JS_close (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 428 "./src/objects/database.lzz"
{
Database* db = ObjectWrapForElectron22 :: Unwrap <Database>(info.This());
Database* db = node :: ObjectWrap :: Unwrap <Database>(info.This());
if (db->open) {
if ( db -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ;
if ( db -> iterators ) return ThrowTypeError ( "This database connection is busy executing a query" ) ;
@ -778,7 +732,7 @@ void Database::JS_close (v8::FunctionCallbackInfo <v8 :: Value> const & info)
void Database::JS_defaultSafeIntegers (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 438 "./src/objects/database.lzz"
{
Database* db = ObjectWrapForElectron22 :: Unwrap <Database>(info.This());
Database* db = node :: ObjectWrap :: Unwrap <Database>(info.This());
if (info.Length() == 0) db->safe_ints = true;
else { if ( info . Length ( ) <= ( 0 ) || ! info [ 0 ] -> IsBoolean ( ) ) return ThrowTypeError ( "Expected " "first" " argument to be " "a boolean" ) ; db -> safe_ints = ( info [ 0 ] . As < v8 :: Boolean > ( ) ) -> Value ( ) ; }
}
@ -786,7 +740,7 @@ void Database::JS_defaultSafeIntegers (v8::FunctionCallbackInfo <v8 :: Value> co
void Database::JS_unsafeMode (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 444 "./src/objects/database.lzz"
{
Database* db = ObjectWrapForElectron22 :: Unwrap <Database>(info.This());
Database* db = node :: ObjectWrap :: Unwrap <Database>(info.This());
if (info.Length() == 0) db->unsafe_mode = true;
else { if ( info . Length ( ) <= ( 0 ) || ! info [ 0 ] -> IsBoolean ( ) ) return ThrowTypeError ( "Expected " "first" " argument to be " "a boolean" ) ; db -> unsafe_mode = ( info [ 0 ] . As < v8 :: Boolean > ( ) ) -> Value ( ) ; }
sqlite3_db_config(db->db_handle, SQLITE_DBCONFIG_DEFENSIVE, static_cast<int>(!db->unsafe_mode), NULL);
@ -797,7 +751,7 @@ void Database::JS_createFTS5Tokenizer (v8::FunctionCallbackInfo <v8 :: Value> co
{
v8 :: Isolate * isolate = info . GetIsolate ( ) ;
Database* db = ObjectWrapForElectron22 :: Unwrap <Database>(info.This());
Database* db = node :: ObjectWrap :: Unwrap <Database>(info.This());
if ( info . Length ( ) <= ( 0 ) || ! info [ 0 ] -> IsString ( ) ) return ThrowTypeError ( "Expected " "first" " argument to be " "a string" ) ; v8 :: Local < v8 :: String > name = ( info [ 0 ] . As < v8 :: String > ( ) ) ;
if ( info . Length ( ) <= ( 1 ) || ! info [ 1 ] -> IsFunction ( ) ) return ThrowTypeError ( "Expected " "second" " argument to be " "a function" ) ; v8 :: Local < v8 :: Function > create_instance_fn = ( info [ 1 ] . As < v8 :: Function > ( ) ) ;
@ -860,13 +814,13 @@ void Database::JS_signalTokenize (v8::FunctionCallbackInfo <v8 :: Value> const &
void Database::JS_open (v8::Local <v8 :: String> _, v8::PropertyCallbackInfo <v8 :: Value> const & info)
#line 517 "./src/objects/database.lzz"
{
info.GetReturnValue().Set( ObjectWrapForElectron22 :: Unwrap <Database>(info.This())->open);
info.GetReturnValue().Set( node :: ObjectWrap :: Unwrap <Database>(info.This())->open);
}
#line 521 "./src/objects/database.lzz"
void Database::JS_inTransaction (v8::Local <v8 :: String> _, v8::PropertyCallbackInfo <v8 :: Value> const & info)
#line 521 "./src/objects/database.lzz"
{
Database* db = ObjectWrapForElectron22 :: Unwrap <Database>(info.This());
Database* db = node :: ObjectWrap :: Unwrap <Database>(info.This());
info.GetReturnValue().Set(db->open && !static_cast<bool>(sqlite3_get_autocommit(db->db_handle)));
}
#line 526 "./src/objects/database.lzz"
@ -964,7 +918,7 @@ Statement::Extras::Extras (sqlite3_uint64 id)
#line 61 "./src/objects/statement.lzz"
Statement::Statement (Database * db, sqlite3_stmt * handle, sqlite3_uint64 id, bool returns_data)
#line 66 "./src/objects/statement.lzz"
: ObjectWrapForElectron22 (), db (db), handle (handle), extras (new Extras(id)), alive (true), locked (false), bound (false), has_bind_map (false), safe_ints (db->GetState()->safe_ints), mode (Data::FLAT), returns_data (returns_data)
: node::ObjectWrap (), db (db), handle (handle), extras (new Extras(id)), alive (true), locked (false), bound (false), has_bind_map (false), safe_ints (db->GetState()->safe_ints), mode (Data::FLAT), returns_data (returns_data)
#line 77 "./src/objects/statement.lzz"
{
assert(db != NULL);
@ -982,7 +936,7 @@ void Statement::JS_new (v8::FunctionCallbackInfo <v8 :: Value> const & info)
return ThrowTypeError("Statements can only be constructed by the db.prepare() method");
}
assert(info.IsConstructCall());
Database* db = ObjectWrapForElectron22 :: Unwrap <Database>(addon->privileged_info->This());
Database* db = node :: ObjectWrap :: Unwrap <Database>(addon->privileged_info->This());
if ( ! db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ;
if ( db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ;
@ -1043,7 +997,7 @@ void Statement::JS_new (v8::FunctionCallbackInfo <v8 :: Value> const & info)
void Statement::JS_run (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 149 "./src/objects/statement.lzz"
{
Statement * stmt = ObjectWrapForElectron22 :: Unwrap < Statement > ( info . This ( ) ) ; ( ( void ) 0 ) ; sqlite3_stmt * handle = stmt -> handle ; Database * db = stmt -> db ; if ( ! db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ; if ( db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ; if ( stmt -> locked ) return ThrowTypeError ( "This statement is busy executing a query" ) ; if ( ! db -> GetState ( ) -> unsafe_mode ) { if ( db -> GetState ( ) -> iterators ) return ThrowTypeError ( "This database connection is busy executing a query" ) ; } ( ( void ) 0 ) ; const bool bound = stmt -> bound ; if ( ! bound ) { Binder binder ( handle ) ; if ( ! binder . Bind ( info , info . Length ( ) , stmt ) ) { sqlite3_clear_bindings ( handle ) ; return ; } ( ( void ) 0 ) ; } else if ( info . Length ( ) > 0 ) { return ThrowTypeError ( "This statement already has bound parameters" ) ; } ( ( void ) 0 ) ; db -> GetState ( ) -> busy = true ; v8 :: Isolate * isolate = info . GetIsolate ( ) ; if ( db -> Log ( isolate , handle ) ) { db -> GetState ( ) -> busy = false ; db -> ThrowDatabaseError ( ) ; if ( ! bound ) { sqlite3_clear_bindings ( handle ) ; } return ; } ( ( void ) 0 ) ;
Statement * stmt = node :: ObjectWrap :: Unwrap < Statement > ( info . This ( ) ) ; ( ( void ) 0 ) ; sqlite3_stmt * handle = stmt -> handle ; Database * db = stmt -> db ; if ( ! db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ; if ( db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ; if ( stmt -> locked ) return ThrowTypeError ( "This statement is busy executing a query" ) ; if ( ! db -> GetState ( ) -> unsafe_mode ) { if ( db -> GetState ( ) -> iterators ) return ThrowTypeError ( "This database connection is busy executing a query" ) ; } ( ( void ) 0 ) ; const bool bound = stmt -> bound ; if ( ! bound ) { Binder binder ( handle ) ; if ( ! binder . Bind ( info , info . Length ( ) , stmt ) ) { sqlite3_clear_bindings ( handle ) ; return ; } ( ( void ) 0 ) ; } else if ( info . Length ( ) > 0 ) { return ThrowTypeError ( "This statement already has bound parameters" ) ; } ( ( void ) 0 ) ; db -> GetState ( ) -> busy = true ; v8 :: Isolate * isolate = info . GetIsolate ( ) ; if ( db -> Log ( isolate , handle ) ) { db -> GetState ( ) -> busy = false ; db -> ThrowDatabaseError ( ) ; if ( ! bound ) { sqlite3_clear_bindings ( handle ) ; } return ; } ( ( void ) 0 ) ;
sqlite3* db_handle = db->GetHandle();
int total_changes_before = sqlite3_total_changes(db_handle);
@ -1068,7 +1022,7 @@ void Statement::JS_run (v8::FunctionCallbackInfo <v8 :: Value> const & info)
void Statement::JS_get (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 172 "./src/objects/statement.lzz"
{
Statement * stmt = ObjectWrapForElectron22 :: Unwrap < Statement > ( info . This ( ) ) ; if ( ! stmt -> returns_data ) return ThrowTypeError ( "This statement does not return data. Use run() instead" ) ; sqlite3_stmt * handle = stmt -> handle ; Database * db = stmt -> db ; if ( ! db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ; if ( db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ; if ( stmt -> locked ) return ThrowTypeError ( "This statement is busy executing a query" ) ; const bool bound = stmt -> bound ; if ( ! bound ) { Binder binder ( handle ) ; if ( ! binder . Bind ( info , info . Length ( ) , stmt ) ) { sqlite3_clear_bindings ( handle ) ; return ; } ( ( void ) 0 ) ; } else if ( info . Length ( ) > 0 ) { return ThrowTypeError ( "This statement already has bound parameters" ) ; } ( ( void ) 0 ) ; db -> GetState ( ) -> busy = true ; v8 :: Isolate * isolate = info . GetIsolate ( ) ; if ( db -> Log ( isolate , handle ) ) { db -> GetState ( ) -> busy = false ; db -> ThrowDatabaseError ( ) ; if ( ! bound ) { sqlite3_clear_bindings ( handle ) ; } return ; } ( ( void ) 0 ) ;
Statement * stmt = node :: ObjectWrap :: Unwrap < Statement > ( info . This ( ) ) ; if ( ! stmt -> returns_data ) return ThrowTypeError ( "This statement does not return data. Use run() instead" ) ; sqlite3_stmt * handle = stmt -> handle ; Database * db = stmt -> db ; if ( ! db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ; if ( db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ; if ( stmt -> locked ) return ThrowTypeError ( "This statement is busy executing a query" ) ; const bool bound = stmt -> bound ; if ( ! bound ) { Binder binder ( handle ) ; if ( ! binder . Bind ( info , info . Length ( ) , stmt ) ) { sqlite3_clear_bindings ( handle ) ; return ; } ( ( void ) 0 ) ; } else if ( info . Length ( ) > 0 ) { return ThrowTypeError ( "This statement already has bound parameters" ) ; } ( ( void ) 0 ) ; db -> GetState ( ) -> busy = true ; v8 :: Isolate * isolate = info . GetIsolate ( ) ; if ( db -> Log ( isolate , handle ) ) { db -> GetState ( ) -> busy = false ; db -> ThrowDatabaseError ( ) ; if ( ! bound ) { sqlite3_clear_bindings ( handle ) ; } return ; } ( ( void ) 0 ) ;
int status = sqlite3_step(handle);
if (status == SQLITE_ROW) {
v8::Local<v8::Value> result = Data::GetRowJS(isolate, isolate -> GetCurrentContext ( ) , handle, stmt->safe_ints, stmt->mode);
@ -1085,7 +1039,7 @@ void Statement::JS_get (v8::FunctionCallbackInfo <v8 :: Value> const & info)
void Statement::JS_all (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 187 "./src/objects/statement.lzz"
{
Statement * stmt = ObjectWrapForElectron22 :: Unwrap < Statement > ( info . This ( ) ) ; if ( ! stmt -> returns_data ) return ThrowTypeError ( "This statement does not return data. Use run() instead" ) ; sqlite3_stmt * handle = stmt -> handle ; Database * db = stmt -> db ; if ( ! db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ; if ( db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ; if ( stmt -> locked ) return ThrowTypeError ( "This statement is busy executing a query" ) ; const bool bound = stmt -> bound ; if ( ! bound ) { Binder binder ( handle ) ; if ( ! binder . Bind ( info , info . Length ( ) , stmt ) ) { sqlite3_clear_bindings ( handle ) ; return ; } ( ( void ) 0 ) ; } else if ( info . Length ( ) > 0 ) { return ThrowTypeError ( "This statement already has bound parameters" ) ; } ( ( void ) 0 ) ; db -> GetState ( ) -> busy = true ; v8 :: Isolate * isolate = info . GetIsolate ( ) ; if ( db -> Log ( isolate , handle ) ) { db -> GetState ( ) -> busy = false ; db -> ThrowDatabaseError ( ) ; if ( ! bound ) { sqlite3_clear_bindings ( handle ) ; } return ; } ( ( void ) 0 ) ;
Statement * stmt = node :: ObjectWrap :: Unwrap < Statement > ( info . This ( ) ) ; if ( ! stmt -> returns_data ) return ThrowTypeError ( "This statement does not return data. Use run() instead" ) ; sqlite3_stmt * handle = stmt -> handle ; Database * db = stmt -> db ; if ( ! db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ; if ( db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ; if ( stmt -> locked ) return ThrowTypeError ( "This statement is busy executing a query" ) ; const bool bound = stmt -> bound ; if ( ! bound ) { Binder binder ( handle ) ; if ( ! binder . Bind ( info , info . Length ( ) , stmt ) ) { sqlite3_clear_bindings ( handle ) ; return ; } ( ( void ) 0 ) ; } else if ( info . Length ( ) > 0 ) { return ThrowTypeError ( "This statement already has bound parameters" ) ; } ( ( void ) 0 ) ; db -> GetState ( ) -> busy = true ; v8 :: Isolate * isolate = info . GetIsolate ( ) ; if ( db -> Log ( isolate , handle ) ) { db -> GetState ( ) -> busy = false ; db -> ThrowDatabaseError ( ) ; if ( ! bound ) { sqlite3_clear_bindings ( handle ) ; } return ; } ( ( void ) 0 ) ;
v8 :: Local < v8 :: Context > ctx = isolate -> GetCurrentContext ( ) ;
v8::Local<v8::Array> result = v8::Array::New(isolate, 0);
uint32_t row_count = 0;
@ -1120,7 +1074,7 @@ void Statement::JS_iterate (v8::FunctionCallbackInfo <v8 :: Value> const & info)
void Statement::JS_bind (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 218 "./src/objects/statement.lzz"
{
Statement* stmt = ObjectWrapForElectron22 :: Unwrap <Statement>(info.This());
Statement* stmt = node :: ObjectWrap :: Unwrap <Statement>(info.This());
if (stmt->bound) return ThrowTypeError("The bind() method can only be invoked once per statement object");
if ( ! stmt -> db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ;
if ( stmt -> db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ;
@ -1133,7 +1087,7 @@ void Statement::JS_bind (v8::FunctionCallbackInfo <v8 :: Value> const & info)
void Statement::JS_pluck (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 229 "./src/objects/statement.lzz"
{
Statement* stmt = ObjectWrapForElectron22 :: Unwrap <Statement>(info.This());
Statement* stmt = node :: ObjectWrap :: Unwrap <Statement>(info.This());
if (!stmt->returns_data) return ThrowTypeError("The pluck() method is only for statements that return data");
if ( stmt -> db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ;
if ( stmt -> locked ) return ThrowTypeError ( "This statement is busy executing a query" ) ;
@ -1146,7 +1100,7 @@ void Statement::JS_pluck (v8::FunctionCallbackInfo <v8 :: Value> const & info)
void Statement::JS_expand (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 240 "./src/objects/statement.lzz"
{
Statement* stmt = ObjectWrapForElectron22 :: Unwrap <Statement>(info.This());
Statement* stmt = node :: ObjectWrap :: Unwrap <Statement>(info.This());
if (!stmt->returns_data) return ThrowTypeError("The expand() method is only for statements that return data");
if ( stmt -> db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ;
if ( stmt -> locked ) return ThrowTypeError ( "This statement is busy executing a query" ) ;
@ -1159,7 +1113,7 @@ void Statement::JS_expand (v8::FunctionCallbackInfo <v8 :: Value> const & info)
void Statement::JS_raw (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 251 "./src/objects/statement.lzz"
{
Statement* stmt = ObjectWrapForElectron22 :: Unwrap <Statement>(info.This());
Statement* stmt = node :: ObjectWrap :: Unwrap <Statement>(info.This());
if (!stmt->returns_data) return ThrowTypeError("The raw() method is only for statements that return data");
if ( stmt -> db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ;
if ( stmt -> locked ) return ThrowTypeError ( "This statement is busy executing a query" ) ;
@ -1172,7 +1126,7 @@ void Statement::JS_raw (v8::FunctionCallbackInfo <v8 :: Value> const & info)
void Statement::JS_safeIntegers (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 262 "./src/objects/statement.lzz"
{
Statement* stmt = ObjectWrapForElectron22 :: Unwrap <Statement>(info.This());
Statement* stmt = node :: ObjectWrap :: Unwrap <Statement>(info.This());
if ( stmt -> db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ;
if ( stmt -> locked ) return ThrowTypeError ( "This statement is busy executing a query" ) ;
if (info.Length() == 0) stmt->safe_ints = true;
@ -1183,7 +1137,7 @@ void Statement::JS_safeIntegers (v8::FunctionCallbackInfo <v8 :: Value> const &
void Statement::JS_columns (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 271 "./src/objects/statement.lzz"
{
Statement* stmt = ObjectWrapForElectron22 :: Unwrap <Statement>(info.This());
Statement* stmt = node :: ObjectWrap :: Unwrap <Statement>(info.This());
if (!stmt->returns_data) return ThrowTypeError("The columns() method is only for statements that return data");
if ( ! stmt -> db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ;
if ( stmt -> db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ;
@ -1228,7 +1182,7 @@ void Statement::JS_columns (v8::FunctionCallbackInfo <v8 :: Value> const & info)
void Statement::JS_busy (v8::Local <v8 :: String> _, v8::PropertyCallbackInfo <v8 :: Value> const & info)
#line 314 "./src/objects/statement.lzz"
{
Statement* stmt = ObjectWrapForElectron22 :: Unwrap <Statement>(info.This());
Statement* stmt = node :: ObjectWrap :: Unwrap <Statement>(info.This());
info.GetReturnValue().Set(stmt->alive && stmt->locked);
}
#line 4 "./src/objects/statement-iterator.lzz"
@ -1248,7 +1202,7 @@ StatementIterator::~ StatementIterator ()
#line 19 "./src/objects/statement-iterator.lzz"
StatementIterator::StatementIterator (Statement * stmt, bool bound)
#line 19 "./src/objects/statement-iterator.lzz"
: ObjectWrapForElectron22 (), stmt (stmt), handle (stmt->handle), db_state (stmt->db->GetState()), bound (bound), safe_ints (stmt->safe_ints), mode (stmt->mode), alive (true), logged (!db_state->has_logger)
: node::ObjectWrap (), stmt (stmt), handle (stmt->handle), db_state (stmt->db->GetState()), bound (bound), safe_ints (stmt->safe_ints), mode (stmt->mode), alive (true), logged (!db_state->has_logger)
#line 27 "./src/objects/statement-iterator.lzz"
{
assert(stmt != NULL);
@ -1271,7 +1225,7 @@ void StatementIterator::JS_new (v8::FunctionCallbackInfo <v8 :: Value> const & i
StatementIterator* iter;
{
const v8 :: FunctionCallbackInfo < v8 :: Value > & info = *addon->privileged_info;
Statement * stmt = ObjectWrapForElectron22 :: Unwrap < Statement > ( info . This ( ) ) ; if ( ! stmt -> returns_data ) return ThrowTypeError ( "This statement does not return data. Use run() instead" ) ; sqlite3_stmt * handle = stmt -> handle ; Database * db = stmt -> db ; if ( ! db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ; if ( db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ; if ( stmt -> locked ) return ThrowTypeError ( "This statement is busy executing a query" ) ; if ( db -> GetState ( ) -> iterators == USHRT_MAX ) return ThrowRangeError ( "Too many active database iterators" ) ; const bool bound = stmt -> bound ; if ( ! bound ) { Binder binder ( handle ) ; if ( ! binder . Bind ( info , info . Length ( ) , stmt ) ) { sqlite3_clear_bindings ( handle ) ; return ; } ( ( void ) 0 ) ; } else if ( info . Length ( ) > 0 ) { return ThrowTypeError ( "This statement already has bound parameters" ) ; } ( ( void ) 0 ) ;
Statement * stmt = node :: ObjectWrap :: Unwrap < Statement > ( info . This ( ) ) ; if ( ! stmt -> returns_data ) return ThrowTypeError ( "This statement does not return data. Use run() instead" ) ; sqlite3_stmt * handle = stmt -> handle ; Database * db = stmt -> db ; if ( ! db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ; if ( db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ; if ( stmt -> locked ) return ThrowTypeError ( "This statement is busy executing a query" ) ; if ( db -> GetState ( ) -> iterators == USHRT_MAX ) return ThrowRangeError ( "Too many active database iterators" ) ; const bool bound = stmt -> bound ; if ( ! bound ) { Binder binder ( handle ) ; if ( ! binder . Bind ( info , info . Length ( ) , stmt ) ) { sqlite3_clear_bindings ( handle ) ; return ; } ( ( void ) 0 ) ; } else if ( info . Length ( ) > 0 ) { return ThrowTypeError ( "This statement already has bound parameters" ) ; } ( ( void ) 0 ) ;
iter = new StatementIterator(stmt, bound);
}
v8 :: Isolate * isolate = info . GetIsolate ( ) ;
@ -1285,7 +1239,7 @@ void StatementIterator::JS_new (v8::FunctionCallbackInfo <v8 :: Value> const & i
void StatementIterator::JS_next (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 57 "./src/objects/statement-iterator.lzz"
{
StatementIterator* iter = ObjectWrapForElectron22 :: Unwrap <StatementIterator>(info.This());
StatementIterator* iter = node :: ObjectWrap :: Unwrap <StatementIterator>(info.This());
if ( iter -> db_state -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ;
if (iter->alive) iter->Next(info);
else info.GetReturnValue().Set(DoneRecord( info . GetIsolate ( ) , iter->db_state->addon));
@ -1294,7 +1248,7 @@ void StatementIterator::JS_next (v8::FunctionCallbackInfo <v8 :: Value> const &
void StatementIterator::JS_return (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 64 "./src/objects/statement-iterator.lzz"
{
StatementIterator* iter = ObjectWrapForElectron22 :: Unwrap <StatementIterator>(info.This());
StatementIterator* iter = node :: ObjectWrap :: Unwrap <StatementIterator>(info.This());
if ( iter -> db_state -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ;
if (iter->alive) iter->Return(info);
else info.GetReturnValue().Set(DoneRecord( info . GetIsolate ( ) , iter->db_state->addon));
@ -1389,7 +1343,7 @@ Backup::~ Backup ()
#line 35 "./src/objects/backup.lzz"
Backup::Backup (Database * db, sqlite3 * dest_handle, sqlite3_backup * backup_handle, sqlite3_uint64 id, bool unlink)
#line 41 "./src/objects/backup.lzz"
: ObjectWrapForElectron22 (), db (db), dest_handle (dest_handle), backup_handle (backup_handle), id (id), alive (true), unlink (unlink)
: node::ObjectWrap (), db (db), dest_handle (dest_handle), backup_handle (backup_handle), id (id), alive (true), unlink (unlink)
#line 48 "./src/objects/backup.lzz"
{
assert(db != NULL);
@ -1404,7 +1358,7 @@ void Backup::JS_new (v8::FunctionCallbackInfo <v8 :: Value> const & info)
Addon * addon = static_cast < Addon * > ( info . Data ( ) . As < v8 :: External > ( ) -> Value ( ) ) ;
if (!addon->privileged_info) return ThrowTypeError("Disabled constructor");
assert(info.IsConstructCall());
Database* db = ObjectWrapForElectron22 :: Unwrap <Database>(addon->privileged_info->This());
Database* db = node :: ObjectWrap :: Unwrap <Database>(addon->privileged_info->This());
if ( ! db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ;
if ( db -> GetState ( ) -> busy ) return ThrowTypeError ( "This database connection is busy executing a query" ) ;
@ -1446,7 +1400,7 @@ void Backup::JS_new (v8::FunctionCallbackInfo <v8 :: Value> const & info)
void Backup::JS_transfer (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 98 "./src/objects/backup.lzz"
{
Backup* backup = ObjectWrapForElectron22 :: Unwrap <Backup>(info.This());
Backup* backup = node :: ObjectWrap :: Unwrap <Backup>(info.This());
if ( info . Length ( ) <= ( 0 ) || ! info [ 0 ] -> IsInt32 ( ) ) return ThrowTypeError ( "Expected " "first" " argument to be " "a 32-bit signed integer" ) ; int pages = ( info [ 0 ] . As < v8 :: Int32 > ( ) ) -> Value ( ) ;
if ( ! backup -> db -> GetState ( ) -> open ) return ThrowTypeError ( "The database connection is not open" ) ;
assert(backup->db->GetState()->busy == false);
@ -1474,7 +1428,7 @@ void Backup::JS_transfer (v8::FunctionCallbackInfo <v8 :: Value> const & info)
void Backup::JS_close (v8::FunctionCallbackInfo <v8 :: Value> const & info)
#line 124 "./src/objects/backup.lzz"
{
Backup* backup = ObjectWrapForElectron22 :: Unwrap <Backup>(info.This());
Backup* backup = node :: ObjectWrap :: Unwrap <Backup>(info.This());
assert(backup->db->GetState()->busy == false);
if (backup->alive) backup->db->RemoveBackup(backup);
backup->CloseHandles();

108
src/better_sqlite3.hpp
View File

@ -14,6 +14,7 @@
#include <algorithm>
#include <sqlite3.h>
#include <node.h>
#include <node_object_wrap.h>
#include <node_buffer.h>
#include <uv.h>
#include "signal-tokenizer.h"
@ -22,46 +23,6 @@ template <class T> using CopyablePersistent = v8::Global<T>;
#line 36 "./src/util/binder.lzz"
static bool IsPlainObject(v8::Isolate* isolate, v8::Local<v8::Object> obj);
#define LZZ_INLINE inline
#line 32 "./src/util/object_wrap.lzz"
class ObjectWrapForElectron22
{
#line 33 "./src/util/object_wrap.lzz"
public:
#line 34 "./src/util/object_wrap.lzz"
ObjectWrapForElectron22 ();
#line 39 "./src/util/object_wrap.lzz"
virtual ~ ObjectWrapForElectron22 ();
#line 47 "./src/util/object_wrap.lzz"
template <typename T>
#line 48 "./src/util/object_wrap.lzz"
static T * Unwrap (v8::Local <v8::Object> handle);
#line 61 "./src/util/object_wrap.lzz"
v8::Local <v8::Object> handle ();
#line 66 "./src/util/object_wrap.lzz"
v8::Local <v8::Object> handle (v8::Isolate * isolate);
#line 72 "./src/util/object_wrap.lzz"
v8::Persistent <v8::Object> & persistent ();
#line 77 "./src/util/object_wrap.lzz"
protected:
#line 78 "./src/util/object_wrap.lzz"
void Wrap (v8::Local <v8::Object> handle);
#line 90 "./src/util/object_wrap.lzz"
void MakeWeak ();
#line 98 "./src/util/object_wrap.lzz"
virtual void Ref ();
#line 113 "./src/util/object_wrap.lzz"
virtual void Unref ();
#line 121 "./src/util/object_wrap.lzz"
int refs_;
#line 123 "./src/util/object_wrap.lzz"
private:
#line 124 "./src/util/object_wrap.lzz"
static void WeakCallback (v8::WeakCallbackInfo <ObjectWrapForElectron22> const & data);
#line 133 "./src/util/object_wrap.lzz"
v8::Persistent <v8::Object> handle_;
#line 136 "./src/util/object_wrap.lzz"
static uint16_t kNodeEmbedderId;
};
#line 16 "./src/util/macros.lzz"
v8::Local <v8::String> StringFromUtf8 (v8::Isolate * isolate, char const * data, int length);
#line 19 "./src/util/macros.lzz"
@ -90,11 +51,11 @@ template <typename T>
void FREE_ARRAY (T * array_pointer);
#line 105 "./src/util/macros.lzz"
v8::Local <v8::FunctionTemplate> NewConstructorTemplate (v8::Isolate * isolate, v8::Local <v8::External> data, v8::FunctionCallback func, char const * name);
#line 118 "./src/util/macros.lzz"
#line 116 "./src/util/macros.lzz"
void SetPrototypeMethod (v8::Isolate * isolate, v8::Local <v8::External> data, v8::Local <v8::FunctionTemplate> recv, char const * name, v8::FunctionCallback func);
#line 131 "./src/util/macros.lzz"
#line 129 "./src/util/macros.lzz"
void SetPrototypeSymbolMethod (v8::Isolate * isolate, v8::Local <v8::External> data, v8::Local <v8::FunctionTemplate> recv, v8::Local <v8::Symbol> symbol, v8::FunctionCallback func);
#line 144 "./src/util/macros.lzz"
#line 142 "./src/util/macros.lzz"
void SetPrototypeGetter (v8::Isolate * isolate, v8::Local <v8::External> data, v8::Local <v8::FunctionTemplate> recv, char const * name, v8::AccessorGetterCallback func);
#line 1 "./src/util/constants.lzz"
class CS
@ -209,7 +170,7 @@ class SignalTokenizerModule;
#line 26 "./src/better_sqlite3.lzz"
class Backup;
#line 1 "./src/objects/database.lzz"
class Database : public ObjectWrapForElectron22
class Database : public node::ObjectWrap
{
#line 2 "./src/objects/database.lzz"
public:
@ -359,7 +320,7 @@ private:
std::set <Backup*, CompareBackup> backups;
};
#line 1 "./src/objects/statement.lzz"
class Statement : public ObjectWrapForElectron22
class Statement : public node::ObjectWrap
{
#line 1 "./src/objects/statement.lzz"
friend class StatementIterator;
@ -437,7 +398,7 @@ private:
bool const returns_data;
};
#line 1 "./src/objects/statement-iterator.lzz"
class StatementIterator : public ObjectWrapForElectron22
class StatementIterator : public node::ObjectWrap
{
#line 2 "./src/objects/statement-iterator.lzz"
public:
@ -487,7 +448,7 @@ private:
bool logged;
};
#line 1 "./src/objects/backup.lzz"
class Backup : public ObjectWrapForElectron22
class Backup : public node::ObjectWrap
{
#line 2 "./src/objects/backup.lzz"
public:
@ -932,59 +893,6 @@ struct Addon
#line 104 "./src/better_sqlite3.lzz"
static uv_key_t thread_key;
};
#line 47 "./src/util/object_wrap.lzz"
template <typename T>
#line 48 "./src/util/object_wrap.lzz"
LZZ_INLINE T * ObjectWrapForElectron22::Unwrap (v8::Local <v8::Object> handle)
#line 48 "./src/util/object_wrap.lzz"
{
assert(!handle.IsEmpty());
assert(handle->InternalFieldCount() > 1);
void* ptr = handle->GetAlignedPointerFromInternalField(1);
ObjectWrapForElectron22* wrap = static_cast<ObjectWrapForElectron22*>(ptr);
return static_cast<T*>(wrap);
}
#line 61 "./src/util/object_wrap.lzz"
LZZ_INLINE v8::Local <v8::Object> ObjectWrapForElectron22::handle ()
#line 61 "./src/util/object_wrap.lzz"
{
return handle(v8::Isolate::GetCurrent());
}
#line 66 "./src/util/object_wrap.lzz"
LZZ_INLINE v8::Local <v8::Object> ObjectWrapForElectron22::handle (v8::Isolate * isolate)
#line 66 "./src/util/object_wrap.lzz"
{
return v8::Local<v8::Object>::New(isolate, persistent());
}
#line 72 "./src/util/object_wrap.lzz"
LZZ_INLINE v8::Persistent <v8::Object> & ObjectWrapForElectron22::persistent ()
#line 72 "./src/util/object_wrap.lzz"
{
return handle_;
}
#line 78 "./src/util/object_wrap.lzz"
LZZ_INLINE void ObjectWrapForElectron22::Wrap (v8::Local <v8::Object> handle)
#line 78 "./src/util/object_wrap.lzz"
{
assert(persistent().IsEmpty());
assert(handle->InternalFieldCount() > 1);
handle->SetAlignedPointerInInternalField(0, &kNodeEmbedderId);
handle->SetAlignedPointerInInternalField(1, this);
persistent().Reset(v8::Isolate::GetCurrent(), handle);
MakeWeak();
}
#line 90 "./src/util/object_wrap.lzz"
LZZ_INLINE void ObjectWrapForElectron22::MakeWeak ()
#line 90 "./src/util/object_wrap.lzz"
{
persistent().SetWeak(this, WeakCallback, v8::WeakCallbackType::kParameter);
}
#line 16 "./src/util/macros.lzz"
LZZ_INLINE v8::Local <v8::String> StringFromUtf8 (v8::Isolate * isolate, char const * data, int length)
#line 16 "./src/util/macros.lzz"

2
src/better_sqlite3.lzz
View File

@ -9,12 +9,12 @@
#include <algorithm>
#include <sqlite3.h>
#include <node.h>
#include <node_object_wrap.h>
#include <node_buffer.h>
#include <uv.h>
#include "signal-tokenizer.h"
#end
#insert "util/object_wrap.lzz"
#insert "util/macros.lzz"
#insert "util/query-macros.lzz"
#insert "util/constants.lzz"

4
src/objects/backup.lzz
View File

@ -1,4 +1,4 @@
class Backup : public ObjectWrapForElectron22 {
class Backup : public node::ObjectWrap {
public:
INIT(Init) {
@ -39,7 +39,7 @@ private:
sqlite3_uint64 id,
bool unlink
) :
ObjectWrapForElectron22(),
node::ObjectWrap(),
db(db),
dest_handle(dest_handle),
backup_handle(backup_handle),

4
src/objects/database.lzz
View File

@ -1,4 +1,4 @@
class Database : public ObjectWrapForElectron22 {
class Database : public node::ObjectWrap {
public:
INIT(Init) {
@ -131,7 +131,7 @@ private:
sqlite3* db_handle,
v8::Local<v8::Value> logger
) :
ObjectWrapForElectron22(),
node::ObjectWrap(),
db_handle(db_handle),
open(true),
busy(false),

4
src/objects/statement-iterator.lzz
View File

@ -1,4 +1,4 @@
class StatementIterator : public ObjectWrapForElectron22 {
class StatementIterator : public node::ObjectWrap {
public:
INIT(Init) {
@ -16,7 +16,7 @@ public:
private:
explicit StatementIterator(Statement* stmt, bool bound) : ObjectWrapForElectron22(),
explicit StatementIterator(Statement* stmt, bool bound) : node::ObjectWrap(),
stmt(stmt),
handle(stmt->handle),
db_state(stmt->db->GetState()),

4
src/objects/statement.lzz
View File

@ -1,4 +1,4 @@
class Statement : public ObjectWrapForElectron22 { friend class StatementIterator;
class Statement : public node::ObjectWrap { friend class StatementIterator;
public:
INIT(Init) {
@ -64,7 +64,7 @@ private:
sqlite3_uint64 id,
bool returns_data
) :
ObjectWrapForElectron22(),
node::ObjectWrap(),
db(db),
handle(handle),
extras(new Extras(id)),

6
src/util/macros.lzz
View File

@ -11,7 +11,7 @@
#define UseIsolate v8::Isolate* isolate = OnlyIsolate
#define UseContext v8::Local<v8::Context> ctx = OnlyContext
#define UseAddon Addon* addon = OnlyAddon
#define Unwrap ObjectWrapForElectron22::Unwrap
#define Unwrap node::ObjectWrap::Unwrap
inline v8::Local<v8::String> StringFromUtf8(v8::Isolate* isolate, const char* data, int length) {
return v8::String::NewFromUtf8(isolate, data, v8::NewStringType::kNormal, length).ToLocalChecked();
@ -109,9 +109,7 @@ v8::Local<v8::FunctionTemplate> NewConstructorTemplate(
const char* name
) {
v8::Local<v8::FunctionTemplate> t = v8::FunctionTemplate::New(isolate, func, data);
// SIGNAL CHANGES BEGIN
t->InstanceTemplate()->SetInternalFieldCount(2);
// SIGNAL CHANGES END
t->InstanceTemplate()->SetInternalFieldCount(1);
t->SetClassName(InternalizedFromLatin1(isolate, name));
return t;
}

138
src/util/object_wrap.lzz
View File

@ -1,138 +0,0 @@
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.
// Original code taken from:
// https://github.com/nodejs/node/blob/4166d40d0873b6d8a0c7291872c8d20dc680b1d7/src/node_object_wrap.h
// The code for ObjectWrapForElectron22 is identical to node::ObjectWrap, except
// it requires two internal fields on the object. First field is set to a
// pointer to kNodeEmbedderId, and the second to the actual object pointer.
// This fixes intermittent crashes on Electron 22-x-y.
//
// See: https://github.com/nodejs/node/pull/43521
class ObjectWrapForElectron22 {
public:
ObjectWrapForElectron22() {
refs_ = 0;
}
virtual ~ObjectWrapForElectron22() {
if (persistent().IsEmpty())
return;
persistent().ClearWeak();
persistent().Reset();
}
template <class T>
static inline T* Unwrap(v8::Local<v8::Object> handle) {
assert(!handle.IsEmpty());
assert(handle->InternalFieldCount() > 1);
// Cast to ObjectWrapForElectron22 before casting to T. A direct cast from void
// to T won't work right when T has more than one base class.
// SIGNAL CHANGES BEGIN
void* ptr = handle->GetAlignedPointerFromInternalField(1);
// SIGNAL CHANGES END
ObjectWrapForElectron22* wrap = static_cast<ObjectWrapForElectron22*>(ptr);
return static_cast<T*>(wrap);
}
inline v8::Local<v8::Object> handle() {
return handle(v8::Isolate::GetCurrent());
}
inline v8::Local<v8::Object> handle(v8::Isolate* isolate) {
return v8::Local<v8::Object>::New(isolate, persistent());
}
// NOLINTNEXTLINE(runtime/v8_persistent)
inline v8::Persistent<v8::Object>& persistent() {
return handle_;
}
protected:
inline void Wrap(v8::Local<v8::Object> handle) {
assert(persistent().IsEmpty());
assert(handle->InternalFieldCount() > 1);
// SIGNAL CHANGES BEGIN
handle->SetAlignedPointerInInternalField(0, &kNodeEmbedderId);
handle->SetAlignedPointerInInternalField(1, this);
// SIGNAL CHANGES END
persistent().Reset(v8::Isolate::GetCurrent(), handle);
MakeWeak();
}
inline void MakeWeak() {
persistent().SetWeak(this, WeakCallback, v8::WeakCallbackType::kParameter);
}
/* Ref() marks the object as being attached to an event loop.
* Refed objects will not be garbage collected, even if
* all references are lost.
*/
virtual void Ref() {
assert(!persistent().IsEmpty());
persistent().ClearWeak();
refs_++;
}
/* Unref() marks an object as detached from the event loop. This is its
* default state. When an object with a "weak" reference changes from
* attached to detached state it will be freed. Be careful not to access
* the object after making this call as it might be gone!
* (A "weak reference" means an object that only has a
* persistent handle.)
*
* DO NOT CALL THIS FROM DESTRUCTOR
*/
virtual void Unref() {
assert(!persistent().IsEmpty());
assert(!persistent().IsWeak());
assert(refs_ > 0);
if (--refs_ == 0)
MakeWeak();
}
int refs_; // ro
private:
static void WeakCallback(
const v8::WeakCallbackInfo<ObjectWrapForElectron22>& data) {
ObjectWrapForElectron22* wrap = data.GetParameter();
assert(wrap->refs_ == 0);
wrap->handle_.Reset();
delete wrap;
}
// NOLINTNEXTLINE(runtime/v8_persistent)
v8::Persistent<v8::Object> handle_;
// SIGNAL CHANGES BEGIN
static uint16_t kNodeEmbedderId = 0x90de;
// SIGNAL CHANGES END
};