fix: internal pages init

- increased deadline for waiting init data
- added new injection case on tab update

(resolves #1975)

src/injections/group.ts

@@ -32,7 +32,10 @@ function waitInitData(): Promise<void> {
   return new Promise((ok, err) => {
     if (window.sideberyInitData) return ok()
     window.onSideberyInitDataReady = ok
-    setTimeout(() => err('GroupPage: No initial data (sideberyInitData)'), 2000)
+    setTimeout(() => {
+      if (window.sideberyInitData) return
+      err('GroupPage: No initial data (sideberyInitData)')
+    }, 60_000)
   })
 }
 

src/injections/url.ts

@@ -15,7 +15,10 @@ function waitInitData(): Promise<void> {
   return new Promise((ok, err) => {
     if (window.sideberyInitData) return ok()
     window.onSideberyInitDataReady = ok
-    setTimeout(() => err('UrlPage: No initial data (sideberyInitData)'), 2000)
+    setTimeout(() => {
+      if (window.sideberyInitData) return
+      err('UrlPage: No initial data (sideberyInitData)')
+    }, 60_000)
   })
 }
 

src/services/tabs.bg.actions.ts

@@ -177,6 +177,7 @@ function onTabUpdated(tabId: ID, change: browser.tabs.ChangeInfo): void {
     return
   }
 
+  let groupScriptInjectionIsNeeded = false
   const tab = Tabs.byId[tabId]
   if (!tab) return
 
@@ -189,14 +190,20 @@ function onTabUpdated(tabId: ID, change: browser.tabs.ChangeInfo): void {
   }
 
   if (change.status !== undefined) {
-    if (change.status === 'complete' && tab.url[0] !== 'a' && !tab.internal) {
-      reloadTabFaviconDebounced(tab)
+    if (change.status === 'complete') {
+      if (tab.url[0] !== 'a' && !tab.internal) {
+        reloadTabFaviconDebounced(tab)
+      }
+      // Check if injection of group-page script is needed
+      if (tab.internal && !change.title && tab.title === GROUP_INITIAL_TITLE) {
+        groupScriptInjectionIsNeeded = true
+      }
     }
   }
 
-  // Inject group page script if internal page has initial title
+  // Check if injection of group-page script is needed
   if (change.title && tab.internal && !tab.discarded && change.title === GROUP_INITIAL_TITLE) {
-    injectGroupPageScript(tab.windowId, tabId)
+    groupScriptInjectionIsNeeded = true
   }
 
   if (
@@ -207,6 +214,11 @@ function onTabUpdated(tabId: ID, change: browser.tabs.ChangeInfo): void {
     Favicons.saveFavicon(tab.url, change.favIconUrl)
   }
 
+  // Inject group page script if internal page has initial title
+  if (groupScriptInjectionIsNeeded) {
+    injectGroupPageScript(tab.windowId, tabId)
+  }
+
   Object.assign(tab, change)
 
   if (WebReq.containersProxies[tab.cookieStoreId]) {