upgrade 0.10.21 (#153)

* 规则列表添加颜色区块，加以区分不同区间规则和修改规则区间相关描述 * 添加新规则例子和改进规则列表区块颜色 * change description
justjavac · Feb 5, 2023 · f8980d7 · f8980d7
1 parent 603d7e3
commit f8980d7
Show file tree

Hide file tree

Showing 16 changed files with 507 additions and 19 deletions.
diff --git a/CHANGELOG-0.10.x.md b/CHANGELOG-0.10.x.md
@@ -4,6 +4,16 @@
 
 ## [一个完整的 测试环境例子 可用于查看优秀的源码 ](https://github.com/jingjingxyk/extension-v3-test)
 
+## CHANGELOG for 0.10.21 [2023-02-05 13:22:30 +0800]
+
+> 1. 默认候选项新增域名`developer.android.com`
+> 1. 默认候选项新增域名`lh3.googleusercontent.com`
+> 1. 默认候选项新增域名`cdn.sstatic.net`
+> 1. 默认候选项新增域名`imgur.com`
+> 1. 重定向例子 `golang.org/dl/`
+> 1. 重定向例子 `commondatastorage.googleapis.com/chromium-browser-snapshots`
+> 1. 规则列表区块颜色调整，用于区分不同的规则区间
+
 ## CHANGELOG for 0.10.20 [2023-01-30 23:12:54 +0800]
 
 > 1. 移除无效的静态资源库 [辉哥博客&蓝易云安全](https://www.haah.net/archives/7885.html)

diff --git a/extension-v2/js/background.js b/extension-v2/js/background.js
@@ -337,6 +337,7 @@ chrome.webRequest.onBeforeRequest.addListener(
       "ajax.aspnetcdn.com/ajax/jquery.ui/$1/$2"
     );
     url = url.replace("developers.google.com", "developers.google.cn");
+    // url = url.replace("developer.android.com", "developer.android.google.cn");
     return { redirectUrl: url };
   },
   {

diff --git a/extension/manifest.json b/extension/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Replace Google CDN",
-  "version": "0.10.20",
+  "version": "0.10.21",
   "manifest_version": 3,
   "icons": {
     "128": "icons/128.png"

diff --git a/extension/options_ui/README.md b/extension/options_ui/README.md
@@ -125,7 +125,14 @@ chrome.declarativeNetRequest.updateDynamicRules(
 |    9    |             cdnjs.cloudflare.com             | 默认未启用 |
 |   10    |               cdn.jsdelivr.net               |    启用    |
 |   11    |           translate.googleapis.com           | 默认未启用 |
-|   12    |               www.gstatic.com                |    启用    |
+|   12    |               www.gstatic.com                | 默认未启用 |
+|   13    |            developer.android.com             | 默认未启用 |
+|   14    |          lh3.googleusercontent.com           | 默认未启用 |
+|   15    |               cdn.sstatic.net                | 默认未启用 |
+|   16    |                  imgur.com                   | 默认未启用 |
+|   17    |            developers.google.com             |    启用    |
+
+> 默认未启用的规则，如何启用？ 答：在默认候选项选选项中，选中规则即启用规，规则列表可以看到启用的规则
 
 ## 演示地址的规则来源
 

diff --git a/extension/options_ui/css/app.css b/extension/options_ui/css/app.css
@@ -24,6 +24,9 @@ ul {
   margin-bottom: 0;
   border-radius: 0.25rem;
 }
+.default-redirect-domains li {
+  list-style: none !important;
+}
 li {
   list-style: decimal;
   font-size: 1.2rem;
@@ -181,20 +184,32 @@ font-size: 1.3rem;
 }
 
 /*
-  配色参考： https://c.runoob.com/more/colorpad/tradcnc.html
-
+   配色参考：
+   https://c.runoob.com/more/colorpad/tradcnc.html
+   https://chromiumdash.appspot.com/schedule
  */
 
 .single_rule {
+  /*
   background-color: #732e7e;
+   */
+  background-color: rgb(156, 39, 176);
 }
 
 .self_define_special_rule {
+  /*
   background-color: #808883;
+
+   */
+  background-color: rgb(0, 150, 136);
 }
 
 .self_define_rule {
+  /*
   background-color: #9db1a0;
+  background-color: #4c8bf5;
+   */
+  background-color: rgb(3, 169, 244);
 }
 
 .sync_remote_static_rule {
@@ -211,13 +226,14 @@ font-size: 1.3rem;
 
 .all_dynamic_rule_test {
   /*
-    background-color: #1a638a;
-    background-color: #10da5a;
-    background-color: #04a4ff;
-    background-color: #027a7a;
-    background-color: #9c27b0;
-    background-color: #8b8bdd;
-    background-color: #efefef;
-    background-color: #bd7a07;
-  */
+  background-color: #eee;
+  background-color: #1a638a;
+  background-color: #10da5a;
+  background-color: #04a4ff;
+  background-color: #027a7a;
+  background-color: #9c27b0;
+  background-color: #8b8bdd;
+  background-color: #efefef;
+  background-color: #bd7a07;
+*/
 }
diff --git a/extension/options_ui/index.html b/extension/options_ui/index.html
@@ -17,10 +17,10 @@ <h2>默认侯选项切换 ：</h2>
           ><span class="placeholder-box"></span>
           <span class="notice">备注：选中候选项 即 自动完成选项切换</span>
           <span class="default-notice"
-            >默认配置信息：
+            >默认配置信息和原理：
             https://github.com/justjavac/ReplaceGoogleCDN/tree/master/extension/options_ui</span
           >
-          <ol class="default-redirect-domains"></ol>
+          <ul class="default-redirect-domains"></ul>
           <select
             class="default-redirect-domians-options form-select"
             size="10"

diff --git a/extension/options_ui/js/component/default-domains.js b/extension/options_ui/js/component/default-domains.js
@@ -42,14 +42,38 @@ let default_domains = {
     id: 10,
     domain: "cdn.jsdelivr.net",
   },
+  /*
   "translate.googleapis.com": {
     id: 11,
     domain: "translate.googleapis.com",
   },
+   */
   "www.gstatic.com": {
     id: 12,
     domain: "www.gstatic.com",
   },
+  "developer.android.com": {
+    id: 13,
+    domain: "developer.android.com",
+  },
+  "lh3.googleusercontent.com": {
+    id: 14,
+    domain: "lh3.googleusercontent.com",
+  },
+  "cdn.sstatic.net": {
+    id: 15,
+    domain: "cdn.sstatic.net",
+  },
+  "imgur.com": {
+    id: 16,
+    domain: "imgur.com",
+  },
+  /*
+  "developers.google.com": {
+    id: 17,
+    domain: "developers.google.com",
+  },
+   */
 };
 
 let reset_default_domain_app = () => {
@@ -61,7 +85,9 @@ let reset_default_domain_app = () => {
       chrome.declarativeNetRequest.updateDynamicRules(
         {
           addRules: [],
-          removeRuleIds: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
+          removeRuleIds: [
+            1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+          ],
         },
         (parameter) => {
           console.log(parameter);
@@ -76,7 +102,7 @@ let default_domains_app = () => {
   let list = "";
   for (let i in default_domains) {
     //console.log(i, default_domains[i]);
-    list += `<li data-id="${default_domains[i].id}" data-domain="${default_domains[i].domain}">${i}</li>`;
+    list += `<li data-id="${default_domains[i].id}" data-domain="${default_domains[i].domain}">${default_domains[i].id}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${i}</li>`;
   }
   let default_domains_list = document.querySelector(
     ".default-redirect-domains"

diff --git a/extension/rules/example-no-use/commondatastorage.googleapis.com.json b/extension/rules/example-no-use/commondatastorage.googleapis.com.json
@@ -0,0 +1,33 @@
+[
+  {
+    "id": 1,
+    "priority": 100,
+    "action": {
+      "type": "redirect",
+      "redirect": {
+        "regexSubstitution": "https://registry.npmmirror.com/-/binary/chromium-browser-snapshots/\\1"
+      }
+    },
+    "condition": {
+      "regexFilter": "^https://commondatastorage\\.googleapis\\.com/chromium-browser-snapshots/(.*?)",
+      "requestDomains": ["commondatastorage.googleapis.com"],
+      "resourceTypes": [
+        "main_frame",
+        "sub_frame",
+        "stylesheet",
+        "script",
+        "image",
+        "font",
+        "object",
+        "xmlhttprequest",
+        "ping",
+        "csp_report",
+        "media",
+        "websocket",
+        "webtransport",
+        "webbundle",
+        "other"
+      ]
+    }
+  }
+]
diff --git a/extension/rules/example-no-use/golang.org.json b/extension/rules/example-no-use/golang.org.json
@@ -0,0 +1,70 @@
+[
+  {
+    "id": 1,
+    "priority": 100,
+    "action": {
+      "type": "redirect",
+      "redirect": {
+        "transform": {
+          "scheme": "https",
+          "host": "golang.google.cn"
+        }
+      }
+    },
+    "condition": {
+      "urlFilter": "golang.org/dl/",
+      "requestDomains": ["golang.org"],
+      "resourceTypes": [
+        "main_frame",
+        "sub_frame",
+        "stylesheet",
+        "script",
+        "image",
+        "font",
+        "object",
+        "xmlhttprequest",
+        "ping",
+        "csp_report",
+        "media",
+        "websocket",
+        "webtransport",
+        "webbundle",
+        "other"
+      ]
+    }
+  },
+  {
+    "id": 2,
+    "priority": 100,
+    "action": {
+      "type": "redirect",
+      "redirect": {
+        "transform": {
+          "scheme": "https",
+          "host": "go.dev"
+        }
+      }
+    },
+    "condition": {
+      "urlFilter": "golang.org/dl/",
+      "requestDomains": ["golang.org"],
+      "resourceTypes": [
+        "main_frame",
+        "sub_frame",
+        "stylesheet",
+        "script",
+        "image",
+        "font",
+        "object",
+        "xmlhttprequest",
+        "ping",
+        "csp_report",
+        "media",
+        "websocket",
+        "webtransport",
+        "webbundle",
+        "other"
+      ]
+    }
+  }
+]
diff --git a/extension/rules/mirrors/cdn.sstatic.net.json b/extension/rules/mirrors/cdn.sstatic.net.json
@@ -0,0 +1,36 @@
+[
+  {
+    "action": {
+      "redirect": {
+        "transform": {
+          "host": "sstatic.net",
+          "scheme": "https"
+        }
+      },
+      "type": "redirect"
+    },
+    "condition": {
+      "requestDomains": ["cdn.sstatic.net"],
+      "resourceTypes": [
+        "main_frame",
+        "sub_frame",
+        "stylesheet",
+        "script",
+        "image",
+        "font",
+        "object",
+        "xmlhttprequest",
+        "ping",
+        "csp_report",
+        "media",
+        "websocket",
+        "webtransport",
+        "webbundle",
+        "other"
+      ],
+      "urlFilter": "cdn.sstatic.net"
+    },
+    "id": 20019,
+    "priority": 2
+  }
+]
diff --git a/extension/rules/mirrors/developer.android.com.json b/extension/rules/mirrors/developer.android.com.json
@@ -0,0 +1,36 @@
+[
+  {
+    "id": 2,
+    "priority": 100,
+    "action": {
+      "type": "redirect",
+      "redirect": {
+        "transform": {
+          "scheme": "https",
+          "host": "developer.android.google.cn"
+        }
+      }
+    },
+    "condition": {
+      "urlFilter": "developer.android.com",
+      "requestDomains": ["developer.android.com"],
+      "resourceTypes": [
+        "main_frame",
+        "sub_frame",
+        "stylesheet",
+        "script",
+        "image",
+        "font",
+        "object",
+        "xmlhttprequest",
+        "ping",
+        "csp_report",
+        "media",
+        "websocket",
+        "webtransport",
+        "webbundle",
+        "other"
+      ]
+    }
+  }
+]