pirST
diff --git a/‎background.js‎
2.03 KB b/‎background.js‎
2.03 KB
diff --git a/‎pac.template‎
Lines changed: 20 additions & 14 deletions b/‎pac.template‎
Lines changed: 20 additions & 14 deletions
diff --git a/‎popup.html‎
412 Bytes b/‎popup.html‎
412 Bytes
diff --git a/‎popup.js‎
922 Bytes b/‎popup.js‎
922 Bytes
@@ -1,19 +1,18 @@
 
-const direct_list_map = new Set(/*{{DIRECT_LIST}}*/);
-const proxy_list_map = new Set(/*{{PROXY_LIST}}*/);
+const suffixMap = new Map(/*{{SUFFIX_LIST}}*/);
 
 function FindProxyForURL(url, host) {
 
-    function searchSuffix( set , str) {
-        if (set.length === 0) return false;
-        if (str.length === 0) return true;
-    
-        for (var i = -1; i > -(str.length+1); i--) {
-            console.log(str.slice(i,str.length));
-            if (set.has(str.slice(i,str.length))) 
-                return true;
+    function searchSuffix(map, str) {
+       if (map.length === 0 || str.length === 0) return "";
+
+        for (var i = -1; i > -(str.length + 1); i--) {
+            console.log(str.slice(i, str.length));
+            if (map.has(str.slice(i, str.length)))
+                // return map.get(str.slice(i, str.length));
+                return str.slice(i, str.length)
         }
-        return false;
+        return "";
     }
 
     // Local addresses always DIRECT
@@ -26,7 +25,14 @@ function FindProxyForURL(url, host) {
         return "DIRECT";
     }
 
-    if (searchSuffix(direct_list_map, host)) return "DIRECT";
-    if (searchSuffix(proxy_list_map, host)) return /*{{PROXY_RETURN}}*/;
-    return /*{{DEFAULT_ACTION}}*/;
+    const suffix = searchSuffix(suffixMap,host);
+    if (suffix){
+        const proxy = suffixMap.get(suffix);
+        if (proxy)
+            return proxy
+        else
+            return /*{{CURRENT_PROXY}}*/;
+    }
+    else
+        return /*{{DEFAULT_ACTION}}*/;
 }