fix: the data of virtual site (#668)

Author: sheepzh

src/database/site-database.ts

@@ -204,17 +204,17 @@ class SiteDatabase extends BaseDatabase {
      *
      * @since 1.6.0
      */
-    addChangeListener(listener: (oldAndNew: [timer.site.SiteInfo, timer.site.SiteInfo][]) => void) {
+    addChangeListener(listener: (oldAndNew: [timer.site.SiteInfo?, timer.site.SiteInfo?][]) => void) {
         const storageListener = (
             changes: { [key: string]: chrome.storage.StorageChange },
             _areaName: chrome.storage.AreaName,
         ) => {
-            const changedSites: [timer.site.SiteInfo, timer.site.SiteInfo][] = Object.entries(changes)
+            const changedSites: [timer.site.SiteInfo?, timer.site.SiteInfo?][] = Object.entries(changes)
                 .filter(([k]) => k.startsWith(DB_KEY_PREFIX))
-                .map(([k, v]) => {
+                .map(([k, { oldValue, newValue }]) => {
                     const siteKey = cvt2SiteKey(k)
-                    const oldVal = cvt2SiteInfo(siteKey, v?.oldValue as _Entry)
-                    const newVal = cvt2SiteInfo(siteKey, v?.newValue as _Entry)
+                    const oldVal = oldValue ? cvt2SiteInfo(siteKey, oldValue as _Entry) : undefined
+                    const newVal = newValue ? cvt2SiteInfo(siteKey, newValue as _Entry) : undefined
                     return [oldVal, newVal]
                 })
             changedSites.length && listener?.(changedSites)

src/pages/app/components/Report/common.ts

@@ -92,7 +92,10 @@ const cvt2SiteQuery = (
     { dateRange: date, mergeDate, siteMerge, query, cateIds, readRemote: inclusiveRemote }: ReportFilterOption,
     { prop, order }: ReportSort,
 ): SiteQuery => ({
-    date, mergeDate, mergeHost: siteMerge === 'domain', query, cateIds, inclusiveRemote,
+    date, mergeDate,
+    mergeHost: siteMerge === 'domain',
+    query, cateIds, inclusiveRemote,
+    virtual: true,
     sortKey: prop,
     sortDirection: cvtOrderDir(order),
 })

src/service/components/virtual-site-holder.ts

@@ -17,7 +17,7 @@ class VirtualSiteHolder {
         siteDatabase.addChangeListener(oldAndNew => oldAndNew.forEach(([oldVal, newVal]) => {
             if (!newVal) {
                 // deleted
-                delete this.hostSiteRegMap[oldVal.host]
+                oldVal?.host && delete this.hostSiteRegMap[oldVal.host]
             } else {
                 this.updateRegularExp(newVal)
             }

src/util/pattern.ts

@@ -204,5 +204,5 @@ export function compileAntPattern(antPattern: string): RegExp {
         patternStr = patternStr.substring(0, patternStr.length - 3) + ".*"
     }
 
-    return new RegExp("^(.+://)?" + patternStr + "/?(\\?.*)?$")
+    return new RegExp("^(.+://)?" + patternStr + "/?([\\?#].*)?$")
 }