scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-09-28 01:31:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrate Zotero.Promise#timeout() in db.js

Browse source
This commit is contained in:
Abe Jellinek 2025-07-03 10:59:28 -04:00 • committed by Dan Stillman
parent 8fb3e6d1a9
commit e2bcf90856
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
chrome/content/zotero/xpcom/db.js
View file

@ -436,7 +436,13 @@ Zotero.DBConnection.prototype.executeTransaction = async function (func, options
try {
while (this._transactionID) {
await this.waitForTransaction(id).timeout(options.waitTimeout || 30000);
await Promise.race([
this.waitForTransaction(id),
new Promise((resolve, reject) => setTimeout(
() => reject(new Zotero.DBConnection.TimeoutError()),
options.waitTimeout || 30000
))
]);
}
startedTransaction = true;
this._transactionID = id;
@ -523,7 +529,7 @@ Zotero.DBConnection.prototype.executeTransaction = async function (func, options
return result;
}
catch (e) {
if (e.name == "TimeoutError") {
if (e instanceof Zotero.DBConnection.TimeoutError) {
Zotero.debug(`Timed out waiting for transaction ${id}`, 1);
}
else {
@ -1489,3 +1495,5 @@ Zotero.DBConnection.prototype._debug = function (str, level) {
var prefix = this._dbName == 'zotero' ? '' : '[' + this._dbName + '] ';
Zotero.debug(prefix + str, level);
}
Zotero.DBConnection.TimeoutError = class extends Error {};