fix: invalidate cache on restart after upgrade, Firefox loads scripts…

… from the startup cache (closes #359)
onemen · Nov 13, 2024 · 52218e0 · 52218e0
1 parent 371e595
commit 52218e0
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/addon/bootstrap.js b/addon/bootstrap.js
@@ -77,6 +77,8 @@ function restartApplication() {
   return undefined;
 }
 
+let invalidateCachesOnRestart = false;
+
 /** @type {Bootstarp.showRestartNotification} */
 function showRestartNotification(verb, window) {
   if (!window.gBrowser.selectedBrowser) {
@@ -92,13 +94,16 @@ function showRestartNotification(verb, window) {
       label: 'Restart Now',
       accessKey: 'R',
       callback() {
+        Services.appinfo.invalidateCachesOnRestart();
         restartApplication();
       }
     },
     [{
       label: 'Not Now',
       accessKey: 'N',
-      callback: () => { },
+      callback: () => {
+        invalidateCachesOnRestart = true;
+      },
     }],
     {
       popupIconURL: 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIgogICAgIHdpZHRoPSI2NCIgaGVpZ2h0PSI2NCIgdmlld0JveD0iMCAwIDY0IDY0Ij4KICA8ZGVmcz4KICAgIDxzdHlsZT4KICAgICAgLnN0eWxlLXB1enpsZS1waWVjZSB7CiAgICAgICAgZmlsbDogdXJsKCcjZ3JhZGllbnQtbGluZWFyLXB1enpsZS1waWVjZScpOwogICAgICAgIGZpbGwtb3BhY2l0eTogLjI1OwogICAgICB9CiAgICAgIC5zdHlsZS1wdXp6bGUtcGllY2Utb3V0bGluZSB7CiAgICAgICAgZmlsbDogbm9uZTsKICAgICAgICBzdHJva2Utd2lkdGg6IDI7CiAgICAgICAgc3Ryb2tlOiAjNTJiMzNlOwogICAgICAgIHN0cm9rZS1kYXNoYXJyYXk6IDQgMjsKICAgICAgfQogICAgICAuc3R5bGUtYmFkZ2Utc2hhZG93IHsKICAgICAgICBmaWxsOiAjMGQxMzFhOwogICAgICAgIGZpbGwtb3BhY2l0eTogLjE1OwogICAgICB9CiAgICAgIC5zdHlsZS1iYWRnZS1iYWNrZ3JvdW5kIHsKICAgICAgICBmaWxsOiAjZmZmOwogICAgICB9CiAgICAgIC5zdHlsZS1iYWRnZS1pbnNpZGUgewogICAgICAgIGZpbGw6ICMwMGExZTU7CiAgICAgIH0KICAgICAgLnN0eWxlLWJhZGdlLWljb24gewogICAgICAgIGZpbGw6ICNmZmY7CiAgICAgIH0KICAgIDwvc3R5bGU+CiAgICA8bGluZWFyR3JhZGllbnQgaWQ9ImdyYWRpZW50LWxpbmVhci1wdXp6bGUtcGllY2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj4KICAgICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2Y2M1MiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzYwYmY0YyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8L2xpbmVhckdyYWRpZW50PgogIDwvZGVmcz4KICA8cGF0aCBjbGFzcz0ic3R5bGUtcHV6emxlLXBpZWNlIiBkPSJNNDIsNjJjMi4yLDAsNC0xLjgsNC00bDAtMTQuMmMwLDAsMC40LTMuNywyLjgtMy43YzIuNCwwLDIuMiwzLjksNi43LDMuOWMyLjMsMCw2LjItMS4yLDYuMi04LjIgYzAtNy0zLjktNy45LTYuMi03LjljLTQuNSwwLTQuMywzLjctNi43LDMuN2MtMi40LDAtMi44LTMuOC0yLjgtMy44VjIyYzAtMi4yLTEuOC00LTQtNEgzMS41YzAsMC0zLjQtMC42LTMuNC0zIGMwLTIuNCwzLjgtMi42LDMuOC03LjFjMC0yLjMtMS4zLTUuOS04LjMtNS45cy04LDMuNi04LDUuOWMwLDQuNSwzLjQsNC43LDMuNCw3LjFjMCwyLjQtMy40LDMtMy40LDNINmMtMi4yLDAtNCwxLjgtNCw0bDAsNy44IGMwLDAtMC40LDYsNC40LDZjMy4xLDAsMy4yLTQuMSw3LjMtNC4xYzIsMCw0LDEuOSw0LDZjMCw0LjItMiw2LjMtNCw2LjNjLTQsMC00LjItNC4xLTcuMy00LjFjLTQuOCwwLTQuNCw1LjgtNC40LDUuOEwyLDU4IGMwLDIuMiwxLjgsNCw0LDRIMTljMCwwLDYuMywwLjQsNi4zLTQuNGMwLTMuMS00LTMuNi00LTcuN2MwLTIsMi4yLTQuNSw2LjQtNC41YzQuMiwwLDYuNiwyLjUsNi42LDQuNWMwLDQtMy45LDQuNi0zLjksNy43IGMwLDQuOSw2LjMsNC40LDYuMyw0LjRINDJ6Ii8+CiAgPHBhdGggY2xhc3M9InN0eWxlLXB1enpsZS1waWVjZS1vdXRsaW5lIiBkPSJNMjMuNiwzYzYuMywwLDcuMywzLDcuMyw0LjljMCwyLjItMSwzLjEtMiw0Yy0wLjgsMC44LTEuOCwxLjYtMS44LDMuMWMwLDIuNiwyLjcsMy43LDQuMyw0bDAuMSwwaDAuMUg0MiBjMS43LDAsMywxLjQsMywzdjUuOHYwbDAsMGMwLjIsMS43LDEuMiw0LjcsMy44LDQuN2MxLjUsMCwyLjMtMC45LDMtMS44YzAuOC0xLDEuNi0xLjksMy43LTEuOWMzLjUsMCw1LjIsMi4yLDUuMiw2LjkgYzAsNi4yLTMuMiw3LjItNS4yLDcuMmMtMi4xLDAtMi45LTEtMy43LTJjLTAuNy0wLjktMS41LTEuOS0zLTEuOWMtMi42LDAtMy42LDIuOS0zLjgsNC42bDAsMGwwLDBMNDUsNThjMCwxLjYtMS4zLDMtMywzaC01LjJsMCwwIGwwLDBjMCwwLTAuMSwwLTAuMywwYy00LjUsMC00LjktMi40LTQuOS0zLjRjMC0xLDAuNS0xLjYsMS41LTIuNmMxLjEtMS4xLDIuNC0yLjUsMi40LTUuMWMwLTMuMy0zLjktNS41LTcuNi01LjUgYy00LjYsMC03LjQsMi44LTcuNCw1LjVjMCwyLjYsMS40LDQsMi41LDUuMWMxLDEsMS41LDEuNiwxLjUsMi42YzAsMy4xLTMuNCwzLjQtNC45LDMuNGMtMC4yLDAtMC4zLDAtMC4zLDBsMCwwaDBINiBjLTEuNiwwLTMtMS4zLTMtM2wwLTEyLjJsMCwwbDAsMGMwLDAtMC4xLTIuNSwxLjEtMy45YzAuNi0wLjYsMS4zLTAuOSwyLjMtMC45YzAuOSwwLDEuNSwwLjUsMi4zLDEuNWMxLDEuMiwyLjMsMi42LDQuOSwyLjYgYzMuMywwLDUtMy42LDUtNy4zYzAtMy40LTEuNi03LTUtN2MtMi42LDAtMy45LDEuNC00LjksMi42Yy0wLjksMS0xLjQsMS41LTIuMywxLjVjLTEsMC0xLjctMC4zLTIuMy0wLjlDMi44LDMyLjYsMywyOS45LDMsMjkuOSBsMCwwbDAsMEwzLDIyYzAtMS43LDEuMy0zLDMtM2g5LjdoMC4xbDAuMSwwYzEuNi0wLjMsNC4zLTEuNCw0LjMtNGMwLTEuNC0wLjktMi4zLTEuNi0zLjFjLTAuOS0xLTEuOC0xLjktMS44LTQuMSBDMTYuNiw0LjYsMTguOSwzLDIzLjYsMyIvPgogIDxzdmcgd2lkdGg9IjMyIiBoZWlnaHQ9IjMyIiB4PSIzMiIgeT0iMCI+CiAgICA8ZWxsaXBzZSBjbGFzcz0ic3R5bGUtYmFkZ2Utc2hhZG93IiAgICAgcng9IjE0IiByeT0iMTUiIGN4PSIxNiIgY3k9IjE3IiAvPgogICAgPGNpcmNsZSAgY2xhc3M9InN0eWxlLWJhZGdlLWJhY2tncm91bmQiIHI9IjE1IiAgY3k9IjE1IiBjeD0iMTYiIC8+CiAgICA8Y2lyY2xlICBjbGFzcz0ic3R5bGUtYmFkZ2UtaW5zaWRlIiAgICAgcj0iMTIiICBjeT0iMTUiIGN4PSIxNiIgLz4KICAgIDxwYXRoICAgIGNsYXNzPSJzdHlsZS1iYWRnZS1pY29uIiBkPSJNMjEsMTVoLTZsMi40LTIuNGMtMC42LTAuNC0xLjItMC42LTEuOS0wLjZjLTIsMC0zLjUsMS42LTMuNSwzLjUgYzAsMiwxLjYsMy41LDMuNSwzLjVjMSwwLDItMC41LDIuNi0xLjJsMS43LDFjLTEsMS4zLTIuNiwyLjEtNC4zLDIuMWMtMywwLTUuNS0yLjUtNS41LTUuNWMwLTMsMi41LTUuNSw1LjUtNS41IGMxLjMsMCwyLjQsMC40LDMuMywxLjJMMjEsOVYxNXoiLz4KICA8L3N2Zz4KPC9zdmc+Cg==',
@@ -217,6 +222,9 @@ function shutdown(data, reason) {
     showRestartNotification("disabled", window);
   } else if (reason === ADDON_UNINSTALL /* && window.Tabmix */) {
     showRestartNotification("uninstalled", window);
+  } else if (invalidateCachesOnRestart) {
+    Services.appinfo.invalidateCachesOnRestart();
+    invalidateCachesOnRestart = false;
   }
 
   TabmixWidgets.destroy(reason === ADDON_UNINSTALL);