working at a basic level

Author: nedtwigg

browser-extension/src/entrypoints/background.ts

@@ -46,19 +46,25 @@ export function handleCommentEvent(message: CommentEvent, sender: any): void {
   }
 }
 
-export function handlePopupMessage(message: any, sender: any, sendResponse: (response: any) => void): void {
+export function handlePopupMessage(message: any, _sender: any, sendResponse: (response: any) => void): void {
   if (message.type === 'GET_OPEN_SPOTS') {
     const spots: CommentState[] = []
     for (const [, commentState] of openSpots) {
       spots.push(commentState)
     }
     sendResponse({ spots })
+  } else if (message.type === 'SWITCH_TO_TAB') {
+    browser.windows.update(message.windowId, { focused: true }).then(() => {
+      return browser.tabs.update(message.tabId, { active: true })
+    }).catch(error => {
+      console.error('Error switching to tab:', error)
+    })
   }
 }
 
 export default defineBackground(() => {
   browser.runtime.onMessage.addListener((message, sender, sendResponse) => {
-    if (message.type === 'GET_OPEN_SPOTS') {
+    if (message.type === 'GET_OPEN_SPOTS' || message.type === 'SWITCH_TO_TAB') {
       handlePopupMessage(message, sender, sendResponse)
       return true
     } else {

browser-extension/src/entrypoints/popup/main.ts

@@ -5,11 +5,9 @@ import { logger } from '../../lib/logger'
 
 // Test basic DOM access
 try {
-  const app = document.getElementById('app')
+  const app = document.getElementById('app')!!
   logger.debug('Found app element:', app)
-  if (app) {
-    app.innerHTML = '<div>Script is running...</div>'
-  }
+  app.innerHTML = '<div>Script is running...</div>'
 } catch (error) {
   logger.error('Error accessing DOM:', error)
 }
@@ -28,9 +26,14 @@ async function getOpenSpots(): Promise<CommentState[]> {
   }
 }
 
-async function switchToTab(tabId: number, windowId: number): Promise<void> {
-  await browser.windows.update(windowId, { focused: true })
-  await browser.tabs.update(tabId, { active: true })
+function switchToTab(tabId: number, windowId: number): void {
+  // Send message to background script to handle tab switching
+  // This avoids the popup context being destroyed before completion
+  browser.runtime.sendMessage({
+    type: 'SWITCH_TO_TAB',
+    tabId,
+    windowId
+  })
   window.close()
 }
 
@@ -40,23 +43,18 @@ function createSpotElement(commentState: CommentState): HTMLElement {
 
   logger.debug('Creating spot element for:', commentState.spot)
   const enhancer = enhancers.enhancerFor(commentState.spot)
-  logger.debug('Found enhancer:', enhancer)
+  if (!enhancer) {
+    logger.error('No enhancer found for:', commentState.spot)
+    logger.error('Only have enhancers for:', enhancers.byType)
+  }
 
   const title = document.createElement('div')
   title.className = 'spot-title'
-
-  if (enhancer) {
-    title.textContent = enhancer.tableTitle(commentState.spot)
-  } else {
-    title.textContent = `${commentState.spot.type} (${commentState.spot.unique_key})`
-  }
-
+  title.textContent = enhancer.tableTitle(commentState.spot)
   item.appendChild(title)
-
   item.addEventListener('click', () => {
     switchToTab(commentState.tab.tabId, commentState.tab.windowId)
   })
-
   return item
 }
 

browser-extension/src/lib/enhancer.ts

@@ -43,5 +43,4 @@ export interface CommentEnhancer<Spot extends CommentSpot = CommentSpot> {
 
   tableIcon(spot: Spot): string
   tableTitle(spot: Spot): string
-  buildUrl(spot: Spot): string
 }

browser-extension/src/lib/registries.ts

@@ -13,7 +13,7 @@ export interface EnhancedTextarea<T extends CommentSpot = CommentSpot> {
 export class EnhancerRegistry {
   private enhancers = new Set<CommentEnhancer>()
   private preparedEnhancers = new Set<CommentEnhancer>()
-  private byType = new Map<string, CommentEnhancer>()
+  byType = new Map<string, CommentEnhancer>()
 
   constructor() {
     // Register all available handlers
@@ -23,7 +23,7 @@ export class EnhancerRegistry {
 
   private register<T extends CommentSpot>(enhancer: CommentEnhancer<T>): void {
     this.enhancers.add(enhancer)
-    for (const spotType in enhancer.forSpotTypes()) {
+    for (const spotType of enhancer.forSpotTypes()) {
       this.byType.set(spotType, enhancer)
     }
   }

browser-extension/wxt.config.ts

@@ -11,7 +11,7 @@ export default defineConfig({
       128: '/icons/icon-128.png',
     },
     name: 'Gitcasso',
-    permissions: ['activeTab'],
+    permissions: ['activeTab', 'tabs'],
     version: '1.0.0',
   },
   modules: ['@wxt-dev/webextension-polyfill'],