improve notify

Author: garywill

background.html

@@ -8,6 +8,7 @@
     <script src="common.js"></script>
     <script src="off_handler.js"></script>
     <script src="ipaddr.js"></script>
+    <script src="showNotify.js"></script>
     <script src="background.js"></script>
     <script src="menu.js"></script>
   </body>

g_background.js

@@ -112,26 +112,6 @@ async function onBeforeRequest(details)
 
 }
 
-async function showNotify(origin, target)
-{
-    if ( ( await get_settings_local() ) ['notify'] === true) 
-    {
-        chrome.notifications.create({
-            "type": "basic",
-            "iconUrl": 'icon.png', 
-            "title": `${origin} - ${addon_name}`, 
-            "message": 
-`Blocked:
-
-from page: ${origin}
-to fetch : ${target}` ,
-        });    
-    }
-    async function get_settings_local()
-    {
-        return ( await browser.storage.local.get() ) ;
-    }
-}
 
 function isLan(parsed_ip)
 {

options.html

@@ -14,7 +14,8 @@
 
         <div>
             <input type="checkbox" id="checkbox-notify" >
-                Notify when web wants to access private network
+                Notify when web wants to access private network 
+                <span style="text-decoration: underline;">(need restart/reenable)</span>
 <!--                 <span style="text-decoration: underline;">(need restart/reenable)</span> -->
             </input>
         </div>

showNotify.js

@@ -0,0 +1,100 @@
+
+let notify_enabled = -1;
+
+async function showNotify(origin, target)
+{
+    if ( notify_enabled === -1) {
+        notify_enabled = ( await get_settings_local() ) ['notify'] ;
+    }
+
+    if (!notify_enabled===true)
+        return;
+    
+    newNotifyCome({origin, target}); 
+    
+    async function get_settings_local()
+    {
+        return ( await browser.storage.local.get() ) ;
+    }
+}
+
+
+function batchPopupSystemNotify(arr) 
+{
+    if (! arr.length > 0)
+        return;
+    
+    
+    const origin = arr[0].origin; 
+    const target = arr[0].target; 
+    
+    var notifyText = '';
+    
+    notifyText = 
+`Blocked:
+    
+from page: ${origin}
+to fetch : ${target}`  ;
+
+    if (arr.length >= 2)
+        notifyText += `\n\n... and other ${arr.length-1}`
+
+    popupSystemNotify(notifyText);
+}
+
+function popupSystemNotify(notifyText) 
+{
+    chrome.notifications.create({
+        "type": "basic",
+        "iconUrl": 'icon.png', 
+        "title": `${addon_name}`, 
+        "message": notifyText, 
+    });       
+}
+
+let fifo = [];
+let fifo_locked = false;
+let timerId = null;
+
+async function newNotifyCome(notification) {
+    const origin = notification.origin;
+    const target = notification.target;
+    
+    function sleep(ms) {
+        return new Promise(resolve => setTimeout(resolve, ms));
+    }
+    
+    for (var n=0; n<200;n++) {
+        if (!fifo_locked) {
+            fifo_locked = true;
+            
+            if (timerId === null) { 
+                batchPopupSystemNotify( [ { origin, target } ] ); 
+                timerId = setTimeout(onNotifyTimerout, 5000); 
+            } else {
+                fifo.push(notification);
+            }
+            
+            fifo_locked = false;
+            return;
+        } else {
+            await sleep(10);
+        }
+    }
+    
+    console.warn("fifo_locked. Failed to wait until unlock");
+}
+
+function onNotifyTimerout() {
+    fifo_locked = true;
+    
+    if (fifo.length > 0) {
+        batchPopupSystemNotify(fifo); 
+        fifo = []; 
+    }
+    
+    clearTimeout(timerId); // 清除定时器
+    timerId = null;
+    
+    fifo_locked = false;
+};