We can simplify by keying on unique_key like we're supposed to, lol

Author: nedtwigg

browser-extension/src/entrypoints/background.ts

@@ -1,5 +1,4 @@
 import type { CommentDraft, CommentEvent, CommentSpot } from '../lib/enhancer'
-import { JsonMap } from '../lib/jsonmap'
 import type { GetOpenSpotsResponse, ToBackgroundMessage } from '../lib/messages'
 import {
   CLOSE_MESSAGE_PORT,
@@ -13,41 +12,33 @@ export interface Tab {
   tabId: number
   windowId: number
 }
-export interface TabAndSpot {
-  tab: Tab
-  spot: CommentSpot
-}
 export interface CommentState {
   tab: Tab
   spot: CommentSpot
   drafts: [number, CommentDraft][]
 }
 
-export const openSpots = new JsonMap<TabAndSpot, CommentState>()
+export const openSpots = new Map<string, CommentState>()
 
 export function handleCommentEvent(message: CommentEvent, sender: any): boolean {
   if (
     (message.type === 'ENHANCED' || message.type === 'DESTROYED') &&
     sender.tab?.id &&
     sender.tab?.windowId
   ) {
-    const tab: Tab = {
-      tabId: sender.tab.id,
-      windowId: sender.tab.windowId,
-    }
-    const tabAndSpot: TabAndSpot = {
-      spot: message.spot,
-      tab,
-    }
     if (message.type === 'ENHANCED') {
+      const tab: Tab = {
+        tabId: sender.tab.id,
+        windowId: sender.tab.windowId,
+      }
       const commentState: CommentState = {
         drafts: [],
         spot: message.spot,
         tab,
       }
-      openSpots.set(tabAndSpot, commentState)
+      openSpots.set(message.spot.unique_key, commentState)
     } else if (message.type === 'DESTROYED') {
-      openSpots.delete(tabAndSpot)
+      openSpots.delete(message.spot.unique_key)
     } else {
       throw new Error(`Unhandled comment event type: ${message.type}`)
     }

browser-extension/src/lib/jsonmap.ts

@@ -28,7 +28,7 @@ describe('Background Event Handler', () => {
       expect(Array.from(openSpots)).toMatchInlineSnapshot(`
         [
           [
-            "{"spot":{"type":"TEST_SPOT","unique_key":"test-key"},"tab":{"tabId":123,"windowId":456}}",
+            "test-key",
             {
               "drafts": [],
               "spot": {