scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-04 02:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Keep pending removals live during asynchronous teardown

Browse source
This commit is contained in:
MinhHaDuong 2026-09-22 11:37:07 +02:00
parent c1bf7a4865
commit 66c1f8a898
2 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/scripts/fetch_xulrunner
View file

@ -464,29 +464,23 @@ function modify_omni {
# The Add-ons window can retain the old add-on wrapper after a replacement.
# Finalizing that wrapper's pending uninstall would remove the new copy by ID.
replace_line ' disconnectedCallback\(\) \{' ' async disconnectedCallback() {' $file
remove_line ' this.pendingUninstallAddons.clear\(\);' $file
replace_line ' for \(const addon of this.pendingUninstallAddons\) \{' \
' const pendingUninstalls = [...this.pendingUninstallAddons];
this.pendingUninstallAddons.clear();
for (let i = 0; i < pendingUninstalls.length; i++) {
const addon = pendingUninstalls[i];' $file
' for (const addon of [...this.pendingUninstallAddons]) {' $file
replace_line ' if \(isPending\(addon, "uninstall"\)\) \{' \
' let current;
try {
current = await AddonManager.getAddonByID(addon.id);
} catch (error) {
console.error(error);
this.pendingUninstallAddons.add(addon);
}
if (this.isConnected) {
for (const pending of pendingUninstalls.slice(i)) {
if (isPending(pending, "uninstall")) {
this.pendingUninstallAddons.add(pending);
}
}
return;
}
if (current === addon && isPending(current, "uninstall")) {' $file
if (this.isConnected) {
return;
}
if (this.pendingUninstallAddons.has(addon) && current === addon && isPending(current, "uninstall")) {' $file
replace_line ' addon.uninstall\(\);' \
' addon.uninstall();
this.pendingUninstallAddons.delete(addon);' $file
replace_line ' onInstalled\(addon\) \{' ' onInstalled(addon) {
if (!isPending(addon, "uninstall")) {
for (const pending of this.pendingUninstallAddons) {

18
app/scripts/tests/addon-list-pending-uninstall.test.mjs
View file

@ -76,7 +76,7 @@ test('a reconnect during lookup leaves newly queued removals intact', async () =
const list = createList(() => new Promise(resolve => { resolveLookup = resolve; }));
list.pendingUninstallAddons.add(old);
const teardown = list.disconnectedCallback();
assert.equal(list.pendingUninstallAddons.size, 0);
assert.equal(list.pendingUninstallAddons.has(old), true);
list.isConnected = true;
list.pendingUninstallAddons.add(fresh);
resolveLookup(old);
@ -85,6 +85,22 @@ test('a reconnect during lookup leaves newly queued removals intact', async () =
assert.equal(list.pendingUninstallAddons.has(fresh), true);
});
test('install notification during lookup removes the stale entry before reconnect', async () => {
let resolveLookup;
let uninstalls = 0;
const old = { id: 'plugin@test', pendingUninstall: true, uninstall: () => uninstalls++ };
const replacement = { id: old.id, pendingUninstall: false };
const list = createList(() => new Promise(resolve => { resolveLookup = resolve; }));
list.pendingUninstallAddons.add(old);
const teardown = list.disconnectedCallback();
list.onInstalled(replacement);
list.isConnected = true;
resolveLookup(replacement);
await teardown;
assert.equal(uninstalls, 0);
assert.equal(list.pendingUninstallAddons.has(old), false);
});
test('a reconnect mid-loop preserves the unprocessed pending removal', async () => {
let resolveSecond;
let firstUninstalls = 0;