Fix bugs in fullscreen (#234)

Author: sheepzh

src/background/timer/server.ts

@@ -42,7 +42,7 @@ async function sendLimitedMessage(item: timer.limit.Item[]) {
     const tabs = await listTabs({ status: 'complete' })
     tabs.forEach(tab => sendMsg2Tab(tab.id, 'limitTimeMeet', item)
         .then(() => console.log(`Processed limit rules: rule=${JSON.stringify(item)}`))
-        .catch(err => console.error(`Failed to execute limit rule: rule=${JSON.stringify(item)}, msg=${err.msg}`))
+        .catch(() => {/*Ignored*/ })
     )
 }
 

src/content-script/index.ts

@@ -14,13 +14,14 @@ import printInfo from "./printer"
 const host = document?.location?.host
 const url = document?.location?.href
 
+const FLAG_ID = '__TIMER_INJECTION_FLAG__' + chrome.runtime.id
+
 function getOrSetFlag(): boolean {
-    const flagId = '__TIMER_INJECTION_FLAG__'
-    const pre = document?.getElementById(flagId)
+    const pre = document?.getElementById(FLAG_ID)
     if (!pre) {
         const flag = document?.createElement('a')
-        flag.style.visibility = 'hidden'
-        flag && (flag.id = flagId)
+        flag.style && (flag.style.visibility = 'hidden')
+        flag && (flag.id = FLAG_ID)
         document?.body?.appendChild(flag)
     }
     return !!pre

src/content-script/limit.ts

@@ -30,7 +30,7 @@ class _Modal {
             ...maskStyle,
             ...filterStyle[filterType || 'translucent']
         }
-        Object.assign(this.mask.style, realMaskStyle)
+        Object.assign(this.mask.style || {}, realMaskStyle)
     }
 
     showModal(showDelay: boolean) {
@@ -50,7 +50,7 @@ class _Modal {
             // Only delay-allowed rules exist, can delay
             // @since 0.4.0
             const link = document.createElement('a')
-            Object.assign(link.style, linkStyle)
+            Object.assign(link.style || {}, linkStyle)
             link.setAttribute('href', 'javascript:void(0)')
             const text = t(msg => msg.more5Minutes)
             link.innerText = text
@@ -131,9 +131,10 @@ function exitScreen(): Promise<void> {
         return Promise.resolve()
     }
     return new Promise<void>(resolve => {
-        const exitFullscreen = document.exitFullscreen
-        if (exitFullscreen) {
-            exitFullscreen().then(resolve).catch(() => console.log("Failed to exit fullscreen"))
+        if (document.exitFullscreen) {
+            document.exitFullscreen()
+                .then(resolve)
+                .catch(e => console.warn("Failed to exit fullscreen", e))
         } else {
             resolve()
         }
@@ -142,7 +143,7 @@ function exitScreen(): Promise<void> {
 
 function link2Setup(url: string): HTMLParagraphElement {
     const link = document.createElement('a')
-    Object.assign(link.style, linkStyle)
+    Object.assign(link.style || {}, linkStyle)
     link.setAttribute('href', 'javascript:void(0)')
     const text = t(msg => msg.timeLimitMsg)
         .replace('{appName}', t2Chrome(msg => msg.meta.name))