Merge pull request #23 from cloudoptlab/fix/2.x/bug-fixes

Fix/2.x/bug fixes

Author: T-baby

_locales/en/messages.json

@@ -426,5 +426,14 @@
     },
     "popupMoreSubtitle": {
         "message": "Click to go to detailed settings"
+    },
+    "memoryOptimized": {
+        "message": "Memory usage has been optimized"
+    },
+    "memoryOptimizedSub": {
+        "message": "Cloudopt Adblocker intelligently optimizes tabs that have not been accessed for a long time and releases memory"
+    },
+    "memoryOptimizedReturn": {
+        "message": "Resume Now"
     }
 }

_locales/ko/messages.json

@@ -426,5 +426,14 @@
     },
     "popupMoreSubtitle": {
         "message": "자세한 설정을 보려면 설정 페이지로 이동하십시오."
+    },
+    "memoryOptimized": {
+        "message": "메모리 사용이 최적화되었습니다"
+    },
+    "memoryOptimizedSub": {
+        "message": "Cloudopt Adblocker는 오랫동안 액세스하지 않은 탭을 지능적으로 최적화하고 메모리를 해제합니다."
+    },
+    "memoryOptimizedReturn": {
+        "message": "지금 재개"
     }
 }

_locales/zh_CN/messages.json

@@ -426,5 +426,14 @@
     },
     "popupMoreSubtitle": {
         "message": "点击前往设置页面进行详细设置"
+    },
+    "memoryOptimized": {
+        "message": "内存占用已被优化"
+    },
+    "memoryOptimizedSub": {
+        "message": "Cloudopt Adblocker 会智能优化长时间未被访问的标签页并释放内存"
+    },
+    "memoryOptimizedReturn": {
+        "message": "立即恢复"
     }
 }

_locales/zh_TW/messages.json

@@ -426,5 +426,14 @@
     },
     "popupMoreSubtitle": {
         "message": "点击前往设置页面进行详细设置"
+    },
+    "memoryOptimized": {
+        "message": "內存佔用已被優化"
+    },
+    "memoryOptimizedSub": {
+        "message": "Cloudopt Adblocker 會智能優化長時間未被訪問的標籤頁並釋放內存"
+    },
+    "memoryOptimizedReturn": {
+        "message": "立即恢復"
     }
 }

image/md-icon-pause.svg

@@ -106,48 +106,58 @@ class AdguardEngine implements IAdblockEngine {
     private config: coreConfig.Config
     private state: EngineState = EngineState.NOT_STARTED
 
+    constructor() {
+        const _this = this
+        message.addListener({
+            type: 'refresh-config',
+            callback: (msg, sender, sendResponse) => {
+                _this.refresh()
+                sendResponse({})
+                return true
+            },
+        })
+
+        window.adguardApi.onFilterDownloadSuccess.addListener(() => {
+            store.set('latest_filters_updated_at', Date.now())
+        })
+
+        message.addListener({
+            type: 'assistant-create-rule',
+            async callback(msg) {
+                _this.config = await coreConfig.get()
+                _this.config.customRule.push(msg.ruleText)
+                await coreConfig.set(_this.config)
+                _this.refresh()
+            },
+        })
+
+        message.addListener({
+            type: 'check-filters-update',
+            async callback(msg, sender, sendResponse) {
+                if (_this.state !== EngineState.NOT_STARTED) {
+                    _this.start()
+                }
+                _this.config = await coreConfig.get()
+                if (!_this.config.adblockActivating) {
+                    _this.stop()
+                }
+                window.adguardApi.checkFiltersUpdates(() => {
+                    store.set('latest_filters_updated_at', Date.now())
+                    sendResponse('true')
+                }, () => {
+                    sendResponse('false')
+                })
+            },
+        })
+    }
+
     public start(): boolean {
         if (this.state === EngineState.STARTED) {
             return true
         } else if (this.state === EngineState.NOT_STARTED) {
-            message.addListener({
-                type: 'assistant-create-rule',
-                async callback(msg) {
-                    this.config = await coreConfig.get()
-                    this.config.customRule.push(msg.ruleText)
-                    await coreConfig.set(this.config)
-                    this.refresh()
-                },
-            })
-
-            message.addListener({
-                type: 'refresh-config',
-                callback: (msg, sender, sendResponse) => {
-                    this.refresh()
-                    sendResponse({})
-                    return true
-                },
-            })
-
-            message.addListener({
-                type: 'check-filters-update',
-                callback(msg, sender, sendResponse) {
-                    window.adguardApi.checkFiltersUpdates(() => {
-                        store.set('latest_filters_updated_at', Date.now())
-                        sendResponse('true')
-                    }, () => {
-                        sendResponse('false')
-                    })
-                },
-            })
-
             this.startTabsBlockCount()
         }
 
-        window.adguardApi.onFilterDownloadSuccess.addListener(() => {
-            store.set('latest_filters_updated_at', Date.now())
-        })
-
         store.get('firstAutoAddAllowList').then((isFirst) => {
             if (!isFirst) {
                 autoAddallowListAds()
@@ -162,21 +172,28 @@ class AdguardEngine implements IAdblockEngine {
 
     public async refresh(): Promise<boolean> {
         this.config = await coreConfig.get()
-        if (!this.config.adblockActivating && this.state === EngineState.STARTED) {
-            return this.stop()
+        if (!this.config.adblockActivating) {
+            if (this.state === EngineState.STARTED) {
+                return this.stop()
+            } else {
+                return true
+            }
         }
+
         if (this.state === EngineState.NOT_STARTED) {
-            return this.start()
+            this.start()
+        } else { // started, reconfigure adugard
+            window.adguardApi.stop(() => {
+                const adguardConfig = getAdguardConfig(this.config)
+                if (adguardConfig.filters.length > 0) {
+                    window.adguardApi.start(adguardConfig, () => {
+                        logger.debug('Adguard api started.')
+                        this.customSubscription()
+                    })
+                }
+            })
         }
-        window.adguardApi.stop(() => {
-            const adguardConfig = getAdguardConfig(this.config)
-            if (adguardConfig.filters.length > 0) {
-                window.adguardApi.start(adguardConfig, () => {
-                    logger.debug('Adguard api started.')
-                    this.customSubscription()
-                })
-            }
-        })
+
         this.state = EngineState.STARTED
         return true
     }

src/background/adguardEngine/index.ts

@@ -56,11 +56,7 @@ export async function start() {
     activateEvent()
 
     adblockEngine = new adguardEngine()
-    config.get().then((cfg) => {
-        if (cfg.adblockActivating) {
-            adblockEngine.start()
-        }
-    })
+    adblockEngine.refresh()
 }
 
 start()