88#include " node.h"
99#include " node_errors.h"
1010#include " node_mem-inl.h"
11+ #include " node_realm-inl.h"
1112#include " path.h"
1213#include " simdutf.h"
1314#include " sqlite3.h"
@@ -98,6 +99,14 @@ static void ThrowQuotaExceededException(Local<Context> context) {
9899 isolate->ThrowException (exception);
99100}
100101
102+ BindingData::BindingData (Realm* realm, Local<Object> wrap)
103+ : BaseObject(realm, wrap) {}
104+
105+ void BindingData::MemoryInfo (MemoryTracker* tracker) const {
106+ tracker->TrackField (" local_storage" , local_storage);
107+ tracker->TrackField (" session_storage" , session_storage);
108+ }
109+
101110Storage::Storage (Environment* env,
102111 Local<Object> object,
103112 std::string_view location)
@@ -117,7 +126,8 @@ void Storage::MemoryInfo(MemoryTracker* tracker) const {
117126 tracker->TrackField (" location" , location_);
118127}
119128
120- Maybe<void > Storage::Open () {
129+ conn_unique_ptr Storage::OpenConnection (std::string_view location,
130+ std::string* error) {
121131 static const int kCurrentSchemaVersion = 1 ;
122132 static constexpr std::string_view get_schema_version_sql =
123133 " SELECT schema_version FROM nodejs_webstorage_state" ;
@@ -180,21 +190,24 @@ Maybe<void> Storage::Open() {
180190 " "
181191 " INSERT OR IGNORE INTO nodejs_webstorage_state (total_size) VALUES (0);" ;
182192
183- sqlite3* db = db_.get ();
184- if (db != nullptr ) {
185- return JustVoid ();
186- }
187-
188- int r = sqlite3_open (location_.c_str (), &db);
193+ sqlite3* db = nullptr ;
194+ std::string loc (location);
195+ int r = sqlite3_open (loc.c_str (), &db);
189196 // Adopt the connection before anything below can return early, so that a
190197 // failure does not leak it. sqlite3_open() allocates a connection to be
191198 // closed even when it fails. This is declared ahead of the statement below
192199 // so that the statement is finalized first; sqlite3_close() fails while a
193200 // statement is still open, and conn_deleter treats that as fatal.
194201 auto conn = conn_unique_ptr (db);
195- CHECK_ERROR_OR_THROW (env (), r, SQLITE_OK , Nothing<void >());
202+ if (r != SQLITE_OK ) {
203+ if (error != nullptr ) *error = sqlite3_errstr (r);
204+ return nullptr ;
205+ }
196206 r = sqlite3_exec (db, init_sql_v0.data (), nullptr , nullptr , nullptr );
197- CHECK_ERROR_OR_THROW (env (), r, SQLITE_OK , Nothing<void >());
207+ if (r != SQLITE_OK ) {
208+ if (error != nullptr ) *error = sqlite3_errstr (r);
209+ return nullptr ;
210+ }
198211
199212 // Get the current schema version, used to determine schema migrations.
200213 sqlite3_stmt* s = nullptr ;
@@ -204,22 +217,30 @@ Maybe<void> Storage::Open() {
204217 &s,
205218 nullptr );
206219 auto stmt = stmt_unique_ptr (s);
207- CHECK_ERROR_OR_THROW (env (), r, SQLITE_OK , Nothing<void >());
208- CHECK_ERROR_OR_THROW (
209- env (), sqlite3_step (stmt.get ()), SQLITE_ROW , Nothing<void >());
210- CHECK_COLUMN_TYPE_OR_THROW (env (),
211- stmt.get (),
212- 0 ,
213- SQLITE_INTEGER ,
214- " expected schema_version to be an integer" ,
215- Nothing<void >());
220+ if (r != SQLITE_OK ) {
221+ if (error != nullptr ) *error = sqlite3_errstr (r);
222+ return nullptr ;
223+ }
224+ r = sqlite3_step (stmt.get ());
225+ if (r != SQLITE_ROW ) {
226+ if (error != nullptr ) *error = sqlite3_errstr (r);
227+ return nullptr ;
228+ }
229+ if (sqlite3_column_type (stmt.get (), 0 ) != SQLITE_INTEGER ) {
230+ if (error != nullptr ) {
231+ *error = " localStorage database is malformed: "
232+ " expected schema_version to be an integer" ;
233+ }
234+ return nullptr ;
235+ }
216236 int schema_version = sqlite3_column_int (stmt.get (), 0 );
217237 stmt = nullptr ; // Force finalization.
218238
219239 if (schema_version > kCurrentSchemaVersion ) {
220- THROW_ERR_INVALID_STATE (
221- env (), " localStorage was created with a newer version of Node.js" );
222- return Nothing<void >();
240+ if (error != nullptr ) {
241+ *error = " localStorage was created with a newer version of Node.js" ;
242+ }
243+ return nullptr ;
223244 }
224245
225246 if (schema_version < kCurrentSchemaVersion ) {
@@ -229,10 +250,25 @@ Maybe<void> Storage::Open() {
229250 std::to_string (kCurrentSchemaVersion ) + " ;" ;
230251 r = sqlite3_exec (
231252 db, set_user_version_sql.c_str (), nullptr , nullptr , nullptr );
232- CHECK_ERROR_OR_THROW (env (), r, SQLITE_OK , Nothing<void >());
253+ if (r != SQLITE_OK ) {
254+ if (error != nullptr ) *error = sqlite3_errstr (r);
255+ return nullptr ;
256+ }
233257 }
234258
235- db_ = std::move (conn);
259+ return conn;
260+ }
261+
262+ Maybe<void > Storage::Open () {
263+ if (db_ != nullptr ) {
264+ return JustVoid ();
265+ }
266+ std::string error;
267+ db_ = OpenConnection (location_, &error);
268+ if (db_ == nullptr ) {
269+ THROW_ERR_INVALID_STATE (env (), " %s" , error.c_str ());
270+ return Nothing<void >();
271+ }
236272 return JustVoid ();
237273}
238274
@@ -255,7 +291,15 @@ void Storage::New(const FunctionCallbackInfo<Value>& args) {
255291 ToNamespacedPath (env, &location);
256292 }
257293
258- new Storage (env, args.This (), location.ToStringView ());
294+ Storage* storage = new Storage (env, args.This (), location.ToStringView ());
295+ // The inspector subclasses pass whether this is localStorage, which the
296+ // location cannot tell: --localstorage-file=:memory: is valid too.
297+ BindingData* binding_data = realm->GetBindingData <BindingData>();
298+ if (binding_data != nullptr && args[2 ]->IsBoolean ()) {
299+ auto & slot = args[2 ]->IsTrue () ? binding_data->local_storage
300+ : binding_data->session_storage ;
301+ slot = BaseObjectWeakPtr<Storage>(storage);
302+ }
259303}
260304
261305Maybe<void > Storage::Clear () {
@@ -310,23 +354,18 @@ MaybeLocal<Array> Storage::Enumerate() {
310354 return Array::New (env ()->isolate (), values.data (), values.size ());
311355}
312356
313- std::optional<std::unordered_map<std::u16string, std::u16string>>
314- Storage::GetAll () {
315- if (!Open ().IsJust ()) {
316- return std::nullopt ;
317- }
318-
357+ static std::optional<Storage::StorageMap> ReadAllFromDb (sqlite3* db) {
319358 static constexpr std::string_view sql =
320359 " SELECT key, value FROM nodejs_webstorage" ;
321360 sqlite3_stmt* s = nullptr ;
322- int r = sqlite3_prepare_v2 (db_. get () , sql.data (), sql.size (), &s, nullptr );
361+ int r = sqlite3_prepare_v2 (db , sql.data (), sql.size (), &s, nullptr );
323362 auto stmt = stmt_unique_ptr (s);
324363 // Unlike the other accessors, this one has no JavaScript caller to throw at,
325364 // so every failure below is reported to the inspector agent instead.
326365 if (r != SQLITE_OK ) {
327366 return std::nullopt ;
328367 }
329- std::unordered_map<std::u16string, std::u16string> result;
368+ Storage::StorageMap result;
330369 while ((r = sqlite3_step (stmt.get ())) == SQLITE_ROW ) {
331370 if (sqlite3_column_type (stmt.get (), 0 ) != SQLITE_BLOB ||
332371 sqlite3_column_type (stmt.get (), 1 ) != SQLITE_BLOB ) {
@@ -350,6 +389,25 @@ Storage::GetAll() {
350389 return result;
351390}
352391
392+ std::optional<Storage::StorageMap> Storage::GetAll (std::string* error) {
393+ if (db_ == nullptr ) {
394+ db_ = OpenConnection (location_, error);
395+ if (db_ == nullptr ) {
396+ return std::nullopt ;
397+ }
398+ }
399+ return ReadAllFromDb (db_.get ());
400+ }
401+
402+ std::optional<Storage::StorageMap> Storage::ReadAllFromFile (
403+ std::string_view location, std::string* error) {
404+ conn_unique_ptr conn = OpenConnection (location, error);
405+ if (conn == nullptr ) {
406+ return std::nullopt ;
407+ }
408+ return ReadAllFromDb (conn.get ());
409+ }
410+
353411MaybeLocal<Value> Storage::Length () {
354412 if (!Open ().IsJust ()) {
355413 return {};
@@ -762,8 +820,13 @@ static void Initialize(Local<Object> target,
762820 Local<Value> unused,
763821 Local<Context> context,
764822 void * priv) {
765- Environment* env = Environment::GetCurrent (context);
823+ Realm* realm = Realm::GetCurrent (context);
824+ Environment* env = realm->env ();
766825 Isolate* isolate = env->isolate ();
826+ Realm* principal = env->principal_realm ();
827+ if (principal->GetBindingData <BindingData>() == nullptr ) {
828+ principal->AddBindingData <BindingData>(target);
829+ }
767830 auto ctor_tmpl = NewFunctionTemplate (isolate, Storage::New);
768831 auto inst_tmpl = ctor_tmpl->InstanceTemplate ();
769832
0 commit comments