Fix some bugs in Safari (#152)

Author: sheepzh

src/background/badge-text-manager.ts

@@ -50,16 +50,29 @@ async function updateFocus(host?: string) {
     if (!host) {
         host = await findActiveHost()
     }
-    const milliseconds = host ? (await timerDb.get(host, new Date)).focus : undefined
+    const milliseconds = host ? (await timerDb.get(host, new Date())).focus : undefined
     setBadgeText(milliseconds)
 }
 
+const ALARM_NAME = 'timer-badge-text-manager-alarm'
+const ALARM_INTERVAL = 1000
+function createAlarm(beforeAction?: () => void) {
+    beforeAction?.()
+    chrome.alarms.create(ALARM_NAME, { when: Date.now() + ALARM_INTERVAL })
+}
+
 class BadgeTextManager {
     timer: NodeJS.Timer
     isPaused: boolean
 
     async init() {
-        this.timer = setInterval(() => !this.isPaused && updateFocus(), 1000)
+        createAlarm()
+        chrome.alarms.onAlarm.addListener(alarm => {
+            if (ALARM_NAME === alarm.name) {
+                createAlarm(() => !this.isPaused && updateFocus())
+            }
+        })
+        // this.timer = setInterval(() => !this.isPaused && updateFocus(), 1000)
 
         const option: Partial<timer.option.AllOption> = await optionService.getAllOption()
         this.pauseOrResumeAccordingToOption(!!option.displayBadgeText)

src/background/browser-action-menu-manager.ts

@@ -1,4 +1,4 @@
-/**
+/**
  * Copyright (c) 2021 Hengyang Zhang
  * 
  * This software is released under the MIT License.
@@ -8,6 +8,7 @@
 import { OPTION_ROUTE } from "../app/router/constants"
 import { getAppPageUrl, SOURCE_CODE_PAGE, TU_CAO_PAGE } from "@util/constant/url"
 import { t2Chrome } from "@util/i18n/chrome/t"
+import { IS_SAFARI } from "@util/constant/environment"
 
 const APP_PAGE_URL = getAppPageUrl(true)
 
@@ -19,30 +20,39 @@ const baseProps: Partial<chrome.contextMenus.CreateProperties> = {
     visible: true
 }
 
+function titleOf(prefixEmoji: string, title: string) {
+    if (IS_SAFARI) {
+        // Emoji does not work in Safari's context menu
+        return title
+    } else {
+        return `${prefixEmoji} ${title}`
+    }
+}
+
 const allFunctionProps: chrome.contextMenus.CreateProperties = {
     id: chrome.runtime.id + '_timer_menu_item_app_link',
-    title: '🏷️ ' + t2Chrome(msg => msg.contextMenus.allFunctions),
+    title: titleOf('🏷️', t2Chrome(msg => msg.contextMenus.allFunctions)),
     onclick: () => chrome.tabs.create({ url: APP_PAGE_URL }),
     ...baseProps
 }
 
 const optionPageProps: chrome.contextMenus.CreateProperties = {
     id: chrome.runtime.id + '_timer_menu_item_option_link',
-    title: '🥰 ' + t2Chrome(msg => msg.contextMenus.optionPage),
+    title: titleOf('🥰', t2Chrome(msg => msg.contextMenus.optionPage)),
     onclick: () => chrome.tabs.create({ url: APP_PAGE_URL + '#' + OPTION_ROUTE }),
     ...baseProps
 }
 
 const repoPageProps: chrome.contextMenus.CreateProperties = {
     id: chrome.runtime.id + '_timer_menu_item_repo_link',
-    title: '🍻 ' + t2Chrome(msg => msg.contextMenus.repoPage),
+    title: titleOf('🍻', t2Chrome(msg => msg.contextMenus.repoPage)),
     onclick: () => chrome.tabs.create({ url: SOURCE_CODE_PAGE }),
     ...baseProps
 }
 
 const feedbackPageProps: chrome.contextMenus.CreateProperties = {
     id: chrome.runtime.id + '_timer_menu_item_feedback_link',
-    title: '😿 ' + t2Chrome(msg => msg.contextMenus.feedbackPage),
+    title: titleOf('😿', t2Chrome(msg => msg.contextMenus.feedbackPage)),
     onclick: () => chrome.tabs.create({ url: TU_CAO_PAGE }),
     ...baseProps
 }

src/util/constant/environment.ts

@@ -20,7 +20,8 @@ if (/Firefox[\/\s](\d+\.\d+)/.test(userAgent)) {
 } else if (userAgent.includes("Opera") || userAgent.includes("OPR")) {
     // The Opera implements the chrome
     isOpera = true
-} else if (userAgent.includes('Safari')) {
+} else if (userAgent.includes('Safari') && !userAgent.includes('Chrome')) {
+    // Chrome on macOs includes 'Safari'
     isSafari = true
 } else if (userAgent.includes('Chrome')) {
     isChrome = true

src/util/pattern.ts

@@ -18,6 +18,7 @@ export function isBrowserUrl(url: string) {
         // Firefox addons' pages
         || /^moz-extension:/.test(url)
         || /^edge.*?:\/\/.*$/.test(url)
+        || /^safari.*?:\/\/.*/.test(url)
 }
 
 const isNotValidPort = (portStr: string) => {