#19 | Asynchronous status refresh after clicking the Reload button

Author: alan-null

chromeipass/background/keepass.js

@@ -577,6 +577,13 @@ keepass.getDatabaseHash = function (tab, triggerUnlock) {
 	return keepass.databaseHash;
 };
 
+keepass.refreshStatus = function (cb) {
+	const work = keepass.isAssociated()
+		? keepass._testAssociationAsync(null, false)
+		: keepass._getDatabaseHashAsync(null, false);
+	work.finally(() => { if (cb) cb(); });
+};
+
 keepass.setVerifier = function (request, inputKey) {
 	var key = inputKey || null;
 	var id = null;

chromeipass/background/service_worker.js

@@ -76,7 +76,6 @@ chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
         const tab = sender.tab;
 
         // helpers
-        const async = () => true;
         const respondNoTab = (payload) => {
             try { sendResponse(payload); } catch (_) { }
         };
@@ -175,20 +174,28 @@ chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
                 }, { ok: false });
             }
             case 'get_status': {
-                const tId = tab && tab.id;
-                const error = (tId && page.tabs[tId] && page.tabs[tId].errorMessage) || undefined;
-                sendResponse({
-                    configured: keepass.isConfigured(),
-                    associated: keepass.isAssociated(),
-                    identifier: (keepass.databaseHash in keepass.keyRing)
-                        ? keepass.keyRing[keepass.databaseHash].id
-                        : null,
-                    keePassHttpAvailable: keepass.isKeePassHttpAvailable,
-                    databaseClosed: keepass.isDatabaseClosed,
-                    encryptionKeyUnrecognized: keepass.isEncryptionKeyUnrecognized,
-                    error
+                // Clear any stale error messages before computing status
+                if (typeof page !== 'undefined' && page.tabs) {
+                    for (const t of Object.values(page.tabs)) {
+                        if (t && 'errorMessage' in t) delete t.errorMessage;
+                    }
+                }
+                refreshStatus(async statusData => {
+                    if (!statusData.associated && statusData.configured && !statusData.databaseClosed) {
+                        // Attempt lightweight bootstrap / reassociation
+                        try {
+                            await keepass.bootstrapAssociation();
+                        } catch (e) {
+                            console.warn('Reassociation attempt failed', e);
+                        }
+                        // Refresh after attempt
+                        return refreshStatus(newStatus => {
+                            try { sendResponse(newStatus); } catch (_) { }
+                        });
+                    }
+                    try { sendResponse(statusData); } catch (_) { }
                 });
-                return;
+                return true;
             }
             case 'check_update_keepasshttp': {
                 keepass.checkForNewKeePassHttpVersion()
@@ -290,4 +297,22 @@ chrome.runtime.onInstalled.addListener(details => {
 });
 
 // Lazy on-demand init (in case worker was cold-started)
-chrome.runtime.onStartup && chrome.runtime.onStartup.addListener(() => safeInit({ reason: 'startup' }));
+chrome.runtime.onStartup && chrome.runtime.onStartup.addListener(() => safeInit({ reason: 'startup' }));
+
+function buildStatus() {
+    return {
+        configured: keepass.isConfigured(),
+        associated: keepass.isAssociated(),
+        identifier: (keepass.databaseHash in keepass.keyRing)
+            ? keepass.keyRing[keepass.databaseHash].id
+            : null,
+        keePassHttpAvailable: keepass.isKeePassHttpAvailable,
+        databaseClosed: keepass.isDatabaseClosed,
+        encryptionKeyUnrecognized: keepass.isEncryptionKeyUnrecognized,
+        error: (page.tabs && Object.values(page.tabs).find(t => t.errorMessage) || {}).errorMessage
+    };
+}
+
+function refreshStatus(cb) {
+    keepass.refreshStatus(() => cb(buildStatus()));
+}

chromeipass/popups/popup.js

@@ -106,6 +106,7 @@ document.addEventListener('DOMContentLoaded', () => {
 				if (tabs && tabs[0]) {
 					chrome.tabs.sendMessage(tabs[0].id, { action: "redetect_fields" });
 				}
+				window.close();
 			});
 		});
 	}