Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

we actually don't need to track write requests

Browse source 
as errors will bubble up to the txn
This commit is contained in:
Bruno Windels 2020-10-01 14:31:08 +02:00
parent d5a52c32d6
commit ddb14f48bf
2 changed files with 16 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/matrix/storage/idb/Store.js
View file

@ -16,8 +16,6 @@ limitations under the License.
import {QueryTarget} from "./QueryTarget.js"; import {QueryTarget} from "./QueryTarget.js";
import {IDBRequestAttemptError} from "./error.js"; import {IDBRequestAttemptError} from "./error.js";
import {reqAsPromise} from "./utils.js";
import {StorageError} from "../common.js";
class QueryTargetWrapper { class QueryTargetWrapper {
constructor(qt) { constructor(qt) {
@ -120,14 +118,26 @@ export class Store extends QueryTarget {
} }
put(value) { put(value) {
this._transaction._addWriteRequest(this._idbStore.put(value)); // If this request fails, the error will bubble up to the transaction and abort it,
// which is the behaviour we want. Therefore, it is ok to not create a promise for this
// request and await it.
//
// Perhaps at some later point, we will want to handle an error (like ConstraintError) for
// individual write requests. In that case, we should add a method that returns a promise (e.g. putAndObserve)
// and call preventDefault on the event to prevent it from aborting the transaction
//
// Note that this can still throw synchronously, like it does for TransactionInactiveError,
// see https://www.w3.org/TR/IndexedDB-2/#transaction-lifetime-concept
this._idbStore.put(value);
} }
add(value) { add(value) {
this._transaction._addWriteRequest(this._idbStore.add(value)); // ok to not monitor result of request, see comment in `put`.
this._idbStore.add(value);
} }
delete(keyOrKeyRange) { delete(keyOrKeyRange) {
this._transaction._addWriteRequest(this._idbStore.delete(keyOrKeyRange)); // ok to not monitor result of request, see comment in `put`.
this._idbStore.delete(keyOrKeyRange);
} }
} }

31
src/matrix/storage/idb/Transaction.js
View file

@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import {IDBRequestError} from "./error.js";
import {txnAsPromise} from "./utils.js"; import {txnAsPromise} from "./utils.js";
import {StorageError} from "../common.js"; import {StorageError} from "../common.js";
import {Store} from "./Store.js"; import {Store} from "./Store.js";
@ -39,14 +38,6 @@ export class Transaction {
this._txn = txn; this._txn = txn;
this._allowedStoreNames = allowedStoreNames; this._allowedStoreNames = allowedStoreNames;
this._stores = {}; this._stores = {};
this._writeRequests = null;
}
_addWriteRequest(request) {
if (!this._writeRequests) {
this._writeRequests = [];
}
this._writeRequests.push(request);
} }
_idbStore(name) { _idbStore(name) {
@ -126,27 +117,7 @@ export class Transaction {
} }
async complete() { async complete() {
// check the write requests if we haven't failed yet return txnAsPromise(this._txn);
if (this._writeRequests) {
for (const request of this._writeRequests) {
if (request.error) {
try {
this.abort();
} catch (err) {/* ignore abort error, although it would be useful to know if the other stuff got committed or not... */}
return Promise.reject(new IDBRequestError(request, "Write request failed"));
}
}
}
const result = await txnAsPromise(this._txn);
// check the write requests if we haven't failed yet
if (this._writeRequests) {
for (const request of this._writeRequests) {
if (request.readyState !== "done") {
return Promise.reject(new IDBRequestError(request, "Request is still pending after transaction finished"));
}
}
}
return result;
} }
abort() { abort() {