LibWeb/IndexedDB: Throw an InvalidState when handling removed items

This fixes a bunch of FIXME's,
and passes a previously crashing subtest on WPT.
https://wpt.fyi/results/IndexedDB/idbindex-rename-errors.any.html

Author: lukasxcs

Libraries/LibWeb/IndexedDB/IDBDatabase.cpp

@@ -186,6 +186,8 @@ WebIDL::ExceptionOr<void> IDBDatabase::delete_object_store(String const& name)
     // 7. Destroy store.
     database->remove_object_store(*store);
 
+    store->mark_deleted();
+
     return {};
 }
 

Libraries/LibWeb/IndexedDB/IDBIndex.cpp

@@ -66,7 +66,9 @@ WebIDL::ExceptionOr<void> IDBIndex::set_name(String const& value)
     if (!transaction->is_active())
         return WebIDL::TransactionInactiveError::create(realm, "Transaction is not active while updating index name"_utf16);
 
-    // FIXME: 6. If index or index’s object store has been deleted, throw an "InvalidStateError" DOMException.
+    // 6. If index or index’s object store has been deleted, throw an "InvalidStateError" DOMException.
+    if (index->is_deleted() || index->object_store()->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Index or index’s object store has been deleted"_utf16);
 
     // 7. If index’s name is equal to name, terminate these steps.
     if (index->name() == name)
@@ -112,9 +114,11 @@ WebIDL::ExceptionOr<GC::Ref<IDBRequest>> IDBIndex::open_cursor(JS::Value query,
     auto transaction = this->transaction();
 
     // 2. Let index be this’s index.
-    [[maybe_unused]] auto index = this->index();
+    auto index = this->index();
 
-    // FIXME: 3. If index or index’s object store has been deleted, throw an "InvalidStateError" DOMException.
+    // 3. If index or index’s object store has been deleted, throw an "InvalidStateError" DOMException.
+    if (index->is_deleted() || index->object_store()->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Index or index’s object store has been deleted"_utf16);
 
     // 4. If transaction’s state is not active, then throw a "TransactionInactiveError" DOMException.
     if (!transaction->is_active())
@@ -152,7 +156,9 @@ WebIDL::ExceptionOr<GC::Ref<IDBRequest>> IDBIndex::get(JS::Value query)
     // 2. Let index be this’s index.
     auto index = this->index();
 
-    // FIXME: 3. If index or index’s object store has been deleted, throw an "InvalidStateError" DOMException.
+    // 3. If index or index’s object store has been deleted, throw an "InvalidStateError" DOMException.
+    if (index->is_deleted() || index->object_store()->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Index or index’s object store has been deleted"_utf16);
 
     // 4. If transaction’s state is not active, then throw a "TransactionInactiveError" DOMException.
     if (!transaction->is_active())
@@ -183,7 +189,9 @@ WebIDL::ExceptionOr<GC::Ref<IDBRequest>> IDBIndex::get_key(JS::Value query)
     // 2. Let index be this’s index.
     auto index = this->index();
 
-    // FIXME: 3. If index or index’s object store has been deleted, throw an "InvalidStateError" DOMException.
+    // 3. If index or index’s object store has been deleted, throw an "InvalidStateError" DOMException.
+    if (index->is_deleted() || index->object_store()->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Index or index’s object store has been deleted"_utf16);
 
     // 4. If transaction’s state is not active, then throw a "TransactionInactiveError" DOMException.
     if (!transaction->is_active())
@@ -230,7 +238,9 @@ WebIDL::ExceptionOr<GC::Ref<IDBRequest>> IDBIndex::count(JS::Value query)
     // 2. Let index be this’s index.
     auto index = this->index();
 
-    // FIXME: 3. If index or index’s object store has been deleted, throw an "InvalidStateError" DOMException.
+    // 3. If index or index’s object store has been deleted, throw an "InvalidStateError" DOMException.
+    if (index->is_deleted() || index->object_store()->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Index or index’s object store has been deleted"_utf16);
 
     // 4. If transaction’s state is not active, then throw a "TransactionInactiveError" DOMException.
     if (!transaction->is_active())
@@ -259,9 +269,11 @@ WebIDL::ExceptionOr<GC::Ref<IDBRequest>> IDBIndex::open_key_cursor(JS::Value que
     auto transaction = this->transaction();
 
     // 2. Let index be this’s index.
-    [[maybe_unused]] auto index = this->index();
+    auto index = this->index();
 
-    // FIXME: 3. If index or index’s object store has been deleted, throw an "InvalidStateError" DOMException.
+    // 3. If index or index’s object store has been deleted, throw an "InvalidStateError" DOMException.
+    if (index->is_deleted() || index->object_store()->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Index or index’s object store has been deleted"_utf16);
 
     // 4. If transaction’s state is not active, then throw a "TransactionInactiveError" DOMException.
     if (!transaction->is_active())

Libraries/LibWeb/IndexedDB/IDBObjectStore.cpp

@@ -72,7 +72,9 @@ WebIDL::ExceptionOr<void> IDBObjectStore::set_name(String const& value)
     // 3. Let store be this’s object store.
     auto& store = m_store;
 
-    // FIXME: 4. If store has been deleted, throw an "InvalidStateError" DOMException.
+    // 4. If store has been deleted, throw an "InvalidStateError" DOMException.
+    if (store->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Object store has been deleted"_utf16);
 
     // 5. If transaction is not an upgrade transaction, throw an "InvalidStateError" DOMException.
     if (!transaction->is_upgrade_transaction())
@@ -157,7 +159,9 @@ WebIDL::ExceptionOr<GC::Ref<IDBIndex>> IDBObjectStore::create_index(String const
     if (!transaction->is_upgrade_transaction())
         return WebIDL::InvalidStateError::create(realm, "Transaction is not an upgrade transaction"_utf16);
 
-    // FIXME: 4. If store has been deleted, throw an "InvalidStateError" DOMException.
+    // 4. If store has been deleted, throw an "InvalidStateError" DOMException.
+    if (store->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Object store has been deleted"_utf16);
 
     // 5. If transaction’s state is not active, then throw a "TransactionInactiveError" DOMException.
     if (!transaction->is_active())
@@ -195,25 +199,29 @@ WebIDL::ExceptionOr<GC::Ref<IDBIndex>> IDBObjectStore::create_index(String const
 // https://w3c.github.io/IndexedDB/#dom-idbobjectstore-index
 WebIDL::ExceptionOr<GC::Ref<IDBIndex>> IDBObjectStore::index(String const& name)
 {
+    auto& realm = this->realm();
+
     // 1. Let transaction be this’s transaction.
     auto transaction = this->transaction();
 
     // 2. Let store be this’s object store.
-    [[maybe_unused]] auto store = this->store();
+    auto store = this->store();
 
-    // FIXME: 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    // 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    if (store->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Object store has been deleted"_utf16);
 
     // 4. If transaction’s state is finished, then throw an "InvalidStateError" DOMException.
     if (transaction->state() == IDBTransaction::TransactionState::Finished)
-        return WebIDL::InvalidStateError::create(realm(), "Transaction is finished"_utf16);
+        return WebIDL::InvalidStateError::create(realm, "Transaction is finished"_utf16);
 
     // 5. Let index be the index named name in this’s index set if one exists, or throw a "NotFoundError" DOMException otherwise.
     auto index = m_indexes.get(name);
     if (!index.has_value())
-        return WebIDL::NotFoundError::create(realm(), "Index not found in object store"_utf16);
+        return WebIDL::NotFoundError::create(realm, "Index not found in object store"_utf16);
 
     // 6. Return an index handle associated with index and this.
-    return IDBIndex::create(realm(), *index, *this);
+    return IDBIndex::create(realm, *index, *this);
 }
 
 // https://w3c.github.io/IndexedDB/#dom-idbobjectstore-deleteindex
@@ -231,7 +239,9 @@ WebIDL::ExceptionOr<void> IDBObjectStore::delete_index(String const& name)
     if (!transaction->is_upgrade_transaction())
         return WebIDL::InvalidStateError::create(realm, "Transaction is not an upgrade transaction"_utf16);
 
-    // FIXME: 4. If store has been deleted, throw an "InvalidStateError" DOMException.
+    // 4. If store has been deleted, throw an "InvalidStateError" DOMException.
+    if (store->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Object store has been deleted"_utf16);
 
     // 5. If transaction’s state is not active, then throw a "TransactionInactiveError" DOMException.
     if (!transaction->is_active())
@@ -248,6 +258,8 @@ WebIDL::ExceptionOr<void> IDBObjectStore::delete_index(String const& name)
     // 8. Destroy index.
     store->index_set().remove(name);
 
+    index.release_value()->mark_deleted();
+
     return {};
 }
 
@@ -262,7 +274,9 @@ WebIDL::ExceptionOr<GC::Ref<IDBRequest>> IDBObjectStore::add_or_put(GC::Ref<IDBO
     // 2. Let store be handle’s object store.
     auto& store = *handle->store();
 
-    // FIXME: 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    // 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    if (store.is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Object store has been deleted"_utf16);
 
     // 4. If transaction’s state is not active, then throw a "TransactionInactiveError" DOMException.
     if (!transaction->is_active())
@@ -370,7 +384,9 @@ WebIDL::ExceptionOr<GC::Ref<IDBRequest>> IDBObjectStore::count(Optional<JS::Valu
     // 2. Let store be this's object store.
     auto store = this->store();
 
-    // FIXME: 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    // 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    if (store->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Object store has been deleted"_utf16);
 
     // 4. If transaction’s state is not active, then throw a "TransactionInactiveError" DOMException.
     if (!transaction->is_active())
@@ -401,7 +417,9 @@ WebIDL::ExceptionOr<GC::Ref<IDBRequest>> IDBObjectStore::get(JS::Value query)
     // 2. Let store be this's object store.
     auto store = this->store();
 
-    // FIXME: 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    // 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    if (store->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Object store has been deleted"_utf16);
 
     // 4. If transaction’s state is not active, then throw a "TransactionInactiveError" DOMException.
     if (!transaction->is_active())
@@ -430,9 +448,11 @@ WebIDL::ExceptionOr<GC::Ref<IDBRequest>> IDBObjectStore::open_cursor(JS::Value q
     auto transaction = this->transaction();
 
     // 2. Let store be this's object store.
-    [[maybe_unused]] auto store = this->store();
+    auto store = this->store();
 
-    // FIXME: 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    // 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    if (store->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Object store has been deleted"_utf16);
 
     // 4. If transaction’s state is not active, then throw a "TransactionInactiveError" DOMException.
     if (!transaction->is_active())
@@ -472,7 +492,9 @@ WebIDL::ExceptionOr<GC::Ref<IDBRequest>> IDBObjectStore::delete_(JS::Value query
     // 2. Let store be this’s object store.
     auto store = this->store();
 
-    // FIXME: 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    // 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    if (store->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Object store has been deleted"_utf16);
 
     // 4. If transaction’s state is not active, then throw a "TransactionInactiveError" DOMException.
     if (!transaction->is_active())
@@ -507,7 +529,9 @@ WebIDL::ExceptionOr<GC::Ref<IDBRequest>> IDBObjectStore::clear()
     // 2. Let store be this’s object store.
     auto store = this->store();
 
-    // FIXME: 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    // 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    if (store->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Object store has been deleted"_utf16);
 
     // 4. If transaction’s state is not active, then throw a "TransactionInactiveError" DOMException.
     if (!transaction->is_active())
@@ -539,7 +563,9 @@ WebIDL::ExceptionOr<GC::Ref<IDBRequest>> IDBObjectStore::get_key(JS::Value query
     // 2. Let store be this’s object store.
     auto store = this->store();
 
-    // FIXME: 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    // 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    if (store->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Object store has been deleted"_utf16);
 
     // 4. If transaction’s state is not active, then throw a "TransactionInactiveError" DOMException.
     if (!transaction->is_active())
@@ -576,9 +602,11 @@ WebIDL::ExceptionOr<GC::Ref<IDBRequest>> IDBObjectStore::open_key_cursor(JS::Val
     auto transaction = this->transaction();
 
     // 2. Let store be this’s object store.
-    [[maybe_unused]] auto store = this->store();
+    auto store = this->store();
 
-    // FIXME: 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    // 3. If store has been deleted, throw an "InvalidStateError" DOMException.
+    if (store->is_deleted())
+        return WebIDL::InvalidStateError::create(realm, "Object store has been deleted"_utf16);
 
     // 4. If transaction’s state is not active, then throw a "TransactionInactiveError" DOMException.
     if (!transaction->is_active())

Libraries/LibWeb/IndexedDB/Internal/Index.h

@@ -45,6 +45,9 @@ class Index : public JS::Cell {
 
     HTML::SerializationRecord referenced_value(IndexRecord const& index_record) const;
 
+    [[nodiscard]] bool is_deleted() const { return m_deleted; }
+    void mark_deleted() { m_deleted = true; }
+
 protected:
     virtual void visit_edges(Visitor&) override;
 
@@ -68,6 +71,8 @@ class Index : public JS::Cell {
 
     // The keys are derived from the referenced object store’s values using a key path.
     KeyPath m_key_path;
+
+    bool m_deleted { false };
 };
 
 }

Libraries/LibWeb/IndexedDB/Internal/ObjectStore.h

@@ -54,6 +54,9 @@ class ObjectStore : public JS::Cell {
     GC::ConservativeVector<ObjectStoreRecord> first_n_in_range(GC::Ref<IDBKeyRange> range, Optional<WebIDL::UnsignedLong> count);
     GC::ConservativeVector<ObjectStoreRecord> last_n_in_range(GC::Ref<IDBKeyRange> range, Optional<WebIDL::UnsignedLong> count);
 
+    [[nodiscard]] bool is_deleted() const { return m_deleted; }
+    void mark_deleted() { m_deleted = true; }
+
 protected:
     virtual void visit_edges(Visitor&) override;
 
@@ -77,6 +80,8 @@ class ObjectStore : public JS::Cell {
 
     // An object store has a list of records
     Vector<ObjectStoreRecord> m_records;
+
+    bool m_deleted { false };
 };
 
 }