Attempt a fix for issue #25 by scanning sessions in the db and matching the tabs (if window id does not match). If this works I will get some unit tests for this scenario

Author: codedread

js/background/background.js

@@ -12,6 +12,7 @@ import { spacesService } from './spacesService.js';
 import * as common from '../common.js';
 /** @typedef {common.SessionPresence} SessionPresence */
 /** @typedef {common.Space} Space */
+/** @typedef {common.Window} Window */
 /** @typedef {import('./dbService.js').WindowBounds} WindowBounds */
 
 // eslint-disable-next-line no-unused-vars, no-var
@@ -276,7 +277,11 @@ async function processMessage(request, sender) {
         case 'requestSpaceFromWindowId':
             windowId = cleanParameter(request.windowId);
             if (windowId) {
-                return requestSpaceFromWindowId(windowId);
+                let matchByTabs = undefined;
+                if (request.matchByTabs) {
+                    matchByTabs = cleanParameter(request.matchByTabs);
+                }
+                return requestSpaceFromWindowId(windowId, matchByTabs);
             }
             return undefined;
 
@@ -786,9 +791,11 @@ async function requestCurrentSpace() {
 
 /**
  * @param {number} windowId
+ * @param {boolean|undefined} matchByTabs - Whether to match the space by tabs if matching by
+ * windowId fails. If undefined, the default is to match by windowId only.
  * @returns {Promise<Space|false>}
  */
-async function requestSpaceFromWindowId(windowId) {
+async function requestSpaceFromWindowId(windowId, matchByTabs) {
     // first check for an existing session matching this windowId
     const session = await dbService.fetchSessionByWindowId(windowId);
 
@@ -802,11 +809,37 @@ async function requestSpaceFromWindowId(windowId) {
             history: session.history,
         };
         return space;
-
-        // otherwise build a space object out of the actual window
     } else {
         try {
+            /** @type {Window} */
             const window = await chrome.windows.get(windowId, { populate: true });
+
+            if (matchByTabs) {
+                console.log(`matchByTabs=true`);
+                const allSpaces = await requestAllSpaces();
+                // If any space in the database has the exact same tabs in the exact same order as
+                // the currently-open window, then we assume the window got out of sync (due to a
+                // Chrome restart or other factors). Update the database with the new window id and
+                // return it.
+                for (const space of allSpaces) {
+                    if (
+                        space.tabs.length === window.tabs.length &&
+                        space.tabs.every((tab, index) => tab.url === window.tabs[index].url)
+                    ) {
+                        // Update the database object.
+                        const dbSession = await dbService.fetchSessionById(space.sessionId);
+                        dbSession.windowId = windowId;
+                        await dbService.updateSession(dbSession);
+
+                        // Update the space object and return it.
+                        space.windowId = windowId;
+                        console.log(`matchByTabs: Found a session and updated it.`);
+                        return space;
+                    }
+                }
+            }
+
+            // Otherwise build a space object out of the actual window.
             /** @type {Space} */
             const space = {
                 sessionId: false,
@@ -1273,9 +1306,9 @@ function calculateSessionBounds(displayBounds, sessionBounds) {
 }
 
 /**
- * Ensures the parameter is a number.
+ * Ensures the parameter is a number or boolean.
  * @param {string|number} param - The parameter to clean.
- * @returns {number} - The cleaned parameter.
+ * @returns {number|boolean} - The cleaned parameter.
  */
 function cleanParameter(param) {
     if (typeof param === 'number') {

js/background/dbService.js

@@ -1,6 +1,8 @@
 /* global db */
 
 import { db, Server } from './db.js';
+import * as common from '../common.js';
+/** @typedef {common.Tab} Tab */
 
 /**
  * @typedef WindowBounds
@@ -11,11 +13,13 @@ import { db, Server } from './db.js';
  */
 
 /**
+ * The storage format for a space in the database.
  * @typedef Session
  * @property {number} id Auto-generated indexedDb object id
+ * @property {number|false} windowId The window id associated with the session, or false.
  * @property {number} sessionHash A hash formed from the combined urls in the session window
  * @property {string} name The saved name of the session
- * @property {Array} tabs An array of chrome tab objects (often taken from the chrome window obj)
+ * @property {Array<Tab>} tabs An array of chrome tab objects (often taken from the chrome window obj)
  * @property {Array} history An array of chrome tab objects that have been removed from the session
  * @property {Date} lastAccess Timestamp that gets updated with every window focus
  * @property {WindowBounds?} windowBounds Optional saved window position and size

js/background/spacesService.js

@@ -442,7 +442,8 @@ class SpacesService {
      * @returns {Promise<Session|null>} The session object if found, null otherwise
      */
     async _getSessionByWindowIdInternal(windowId) {
-        // First check in-memory sessions (includes temporary sessions)
+        // First check in-memory sessions (includes temporary sessions). During initialization,
+        // this will be the full set of sessions from the database.
         const memorySession = this.sessions.find(session => session.windowId === windowId);
         if (memorySession) {
             return memorySession;
@@ -1195,10 +1196,10 @@ function cleanUrl(url) {
  * filterInternalWindows({ tabs: [{ url: 'https://example.com' }], type: 'normal' }) // returns false
  */
 function filterInternalWindows(curWindow) {
-    // sanity check to make sure window isnt an internal spaces window
+    // Sanity check to make sure window isn't an internal spaces window.
     if (
         curWindow.tabs.length === 1 &&
-        curWindow.tabs[0].url.indexOf(chrome.runtime.id) >= 0
+        curWindow.tabs[0].url.includes(chrome.runtime.id)
     ) {
         return true;
     }

js/common.js

@@ -9,12 +9,26 @@
  * Copyright (C) 2025 by the Contributors.
  */
 
+/**
+ * https://developer.chrome.com/docs/extensions/reference/api/tabs/#type-Tab
+ * @typedef Tab
+ * @property {string} favIconUrl The URL of the tab's favicon.
+ * @property {string} title The title of the tab.
+ * @property {string} url The URL of the tab.
+ */
+
+/**
+ * https://developer.chrome.com/docs/extensions/reference/api/windows/#type-Window
+ * @typedef Window
+ * @property {Array<Tab>} tabs The tabs in the window.
+ */
+
 /**
  * @typedef Space
  * @property {number|false} sessionId The unique identifier for the session, or false if not saved.
  * @property {number|false} windowId The ID of the window associated with the space, or false if not open.
  * @property {string|false} name The name of the space, or false if not named.
- * @property {Array<Object>} tabs Array of tab objects containing URL and other tab properties.
+ * @property {Array<Tab>} tabs Array of tab objects containing URL and other tab properties.
  * @property {Array<Object>|false} history Array of tab history objects, or false if no history.
  */
 

js/popup.js

@@ -3,6 +3,8 @@
 import { getHashVariable } from './common.js';
 import { spacesRenderer } from './spacesRenderer.js';
 import { checkSessionOverwrite, escapeHtml } from './utils.js';
+import * as common from './common.js';
+/** @typedef {common.Space} Space */
 
 const UNSAVED_SESSION = '(unnamed window)';
 const NO_HOTKEY = 'no hotkey set';
@@ -19,6 +21,7 @@ export async function handlePopupMenuClick(action) {
 }
 
 const nodes = {};
+/** @type {Space|false} */
 let globalCurrentSpace;
 let globalTabId;
 let globalUrl;
@@ -47,7 +50,11 @@ function initializePopup() {
         const action = getHashVariable('action', window.location.href);
 
         const requestSpacePromise = globalWindowId
-            ? chrome.runtime.sendMessage({ action: 'requestSpaceFromWindowId', windowId: globalWindowId })
+            ? chrome.runtime.sendMessage({
+                action: 'requestSpaceFromWindowId',
+                windowId: globalWindowId,
+                matchByTabs: true,
+            })
             : chrome.runtime.sendMessage({ action: 'requestCurrentSpace' });
 
         requestSpacePromise.then(space => {
@@ -78,11 +85,7 @@ function routeView(action) {
  */
 
 function renderCommon() {
-    document.getElementById(
-        'activeSpaceTitle'
-    ).value = globalCurrentSpace.name
-            ? globalCurrentSpace.name
-            : UNSAVED_SESSION;
+    document.getElementById('activeSpaceTitle').value = globalCurrentSpace.name ?? UNSAVED_SESSION;
 
     document.querySelector('body').onkeyup = e => {
         // listen for escape key
@@ -368,6 +371,7 @@ async function renderMoveCard() {
     }
 }
 
+// TODO: Is this used for anything anymore? When are globalTabId or globalUrl set?
 async function updateTabDetails() {
     let faviconSrc;
 

manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "Spaces",
     "description": "Intuitive tab management",
-    "version": "1.1.8.0",
+    "version": "1.1.8.1",
     "permissions": [
         "contextMenus",
         "downloads",