Keyhub反屏蔽ADB;Keyhub任务识别优化

HCLonely · Dec 10, 2022 · 7b528f9 · 7b528f9 · vercel · Dec 10, 2022
1 parent 7078a09
commit 7b528f9
Show file tree

Hide file tree

Showing 19 changed files with 81 additions and 50 deletions.
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -6,7 +6,7 @@ name: Release
     paths:
       - src/**
       - .github/workflows/Release.yml
-  workflow_dispatch: {}
+  workflow_dispatch: ''
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -22,9 +22,11 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           prerelease: false
-          tag_name: v4.2.22
-          name: 4.2.22
-          body: '- Freeanywhere新增剩余Key检测功能'
+          tag_name: v4.2.23
+          name: 4.2.23
+          body: |-
+            - Keyhub反屏蔽ADB
+            - Keyhub任务识别优化
           files: |-
             dist/auto-task-v4-for-giveawaysu.user.js
             dist/auto-task-v4.compatibility.user.js

diff --git a/dist/auto-task-v4-for-giveawaysu.all.user.js b/dist/auto-task-v4-for-giveawaysu.all.user.js
diff --git a/dist/auto-task-v4-for-giveawaysu.user.js b/dist/auto-task-v4-for-giveawaysu.user.js
diff --git a/dist/auto-task-v4.all.user.js b/dist/auto-task-v4.all.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name               auto-task-v4
 // @namespace          auto-task-v4
-// @version            4.2.22
+// @version            4.2.23
 // @description        自动完成 Freeanywhere，Giveawaysu，GiveeClub，Givekey，Gleam，Indiedb，keyhub，OpiumPulses，Opquests，SweepWidget 等网站的任务。
 // @description:en     Automatically complete the tasks of FreeAnyWhere, GiveawaySu, GiveeClub, Givekey, Gleam, Indiedb, keyhub, OpiumPulses, Opquests, SweepWidget websites.
 // @author             HCLonely
@@ -8104,7 +8104,7 @@ console.log('%c%s', 'color:blue', 'Auto-Task[Load]: 脚本开始加载');
                   this.undoneTasks.extra.videoTasks.push(taskData);
                 }
               }
-            } else if (/^https?:\/\/www\.instagram\.com\/.*/.test(link) || /^https?:\/\/twitter\.com\/.*/.test(link) || /^https?:\/\/www\.twitch\.tv\/.*/.test(link) || /^https?:\/\/www\.facebook\.com\/.*/.test(link) || /^https?:\/\/www\.youtube\.com\/.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/developer\//.test(link) || /^https?:\/\/.*?\.itch\.io\/.*/.test(link) || /^https?:\/\/.*?\.itch\.io\/.*/.test(link) || /^https?:\/\/key-hub\.eu.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/app\/.*/.test(link)) {} else {
+            } else if (/^https?:\/\/www\.instagram\.com\/.*/.test(link) || /^https?:\/\/twitter\.com\/.*/.test(link) || /^https?:\/\/www\.twitch\.tv\/.*/.test(link) || /^https?:\/\/www\.facebook\.com\/.*/.test(link) || /^https?:\/\/www\.youtube\.com\/.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/developer\//.test(link) || /^https?:\/\/.*?\.itch\.io\/.*/.test(link) || /^https?:\/\/key-hub\.eu.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/app\/.*/.test(link) || /^https?:\/\/qr\.streamelements\.com\/.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/news\/app\/.*/.test(link)) {} else {
               scripts_echoLog({}).warning(`${i18n('unKnownTaskType')}: ${taskDes}(${link})`);
             }
           }
@@ -11465,6 +11465,10 @@ console.log('%c%s', 'color:blue', 'Auto-Task[Load]: 脚本开始加载');
     } else if (window.location.hostname === 'opquests.com') {
       loadScript();
     } else {
+      if (window.location.hostname === 'key-hub.eu') {
+        unsafeWindow.keyhubtracker = 1;
+        unsafeWindow.gaData = {};
+      }
       $(loadScript);
     }
   }();

diff --git a/dist/auto-task-v4.compatibility.all.user.js b/dist/auto-task-v4.compatibility.all.user.js
diff --git a/dist/auto-task-v4.compatibility.user.js b/dist/auto-task-v4.compatibility.user.js
diff --git a/dist/auto-task-v4.user.js b/dist/auto-task-v4.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name               auto-task-v4
 // @namespace          auto-task-v4
-// @version            4.2.22
+// @version            4.2.23
 // @description        自动完成 Freeanywhere，Giveawaysu，GiveeClub，Givekey，Gleam，Indiedb，keyhub，OpiumPulses，Opquests，SweepWidget 等网站的任务。
 // @description:en     Automatically complete the tasks of FreeAnyWhere, GiveawaySu, GiveeClub, Givekey, Gleam, Indiedb, keyhub, OpiumPulses, Opquests, SweepWidget websites.
 // @author             HCLonely
@@ -8085,7 +8085,7 @@ console.log('%c%s', 'color:blue', 'Auto-Task[Load]: 脚本开始加载');
                   this.undoneTasks.extra.videoTasks.push(taskData);
                 }
               }
-            } else if (/^https?:\/\/www\.instagram\.com\/.*/.test(link) || /^https?:\/\/twitter\.com\/.*/.test(link) || /^https?:\/\/www\.twitch\.tv\/.*/.test(link) || /^https?:\/\/www\.facebook\.com\/.*/.test(link) || /^https?:\/\/www\.youtube\.com\/.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/developer\//.test(link) || /^https?:\/\/.*?\.itch\.io\/.*/.test(link) || /^https?:\/\/.*?\.itch\.io\/.*/.test(link) || /^https?:\/\/key-hub\.eu.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/app\/.*/.test(link)) {} else {
+            } else if (/^https?:\/\/www\.instagram\.com\/.*/.test(link) || /^https?:\/\/twitter\.com\/.*/.test(link) || /^https?:\/\/www\.twitch\.tv\/.*/.test(link) || /^https?:\/\/www\.facebook\.com\/.*/.test(link) || /^https?:\/\/www\.youtube\.com\/.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/developer\//.test(link) || /^https?:\/\/.*?\.itch\.io\/.*/.test(link) || /^https?:\/\/key-hub\.eu.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/app\/.*/.test(link) || /^https?:\/\/qr\.streamelements\.com\/.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/news\/app\/.*/.test(link)) {} else {
               scripts_echoLog({}).warning(`${i18n('unKnownTaskType')}: ${taskDes}(${link})`);
             }
           }
@@ -11446,6 +11446,10 @@ console.log('%c%s', 'color:blue', 'Auto-Task[Load]: 脚本开始加载');
     } else if (window.location.hostname === 'opquests.com') {
       loadScript();
     } else {
+      if (window.location.hostname === 'key-hub.eu') {
+        unsafeWindow.keyhubtracker = 1;
+        unsafeWindow.gaData = {};
+      }
       $(loadScript);
     }
   }();

diff --git a/doc/docs/.vuepress/public/report.html b/doc/docs/.vuepress/public/report.html
diff --git a/doc/docs/logs/README.md b/doc/docs/logs/README.md
@@ -5,6 +5,12 @@ lang: zh-CN
 
 ## V4.2
 
+### V4.2.23
+
+[Release](https://github.com/HCLonely/auto-task-v4/releases/tag/v4.2.23)
+
+- key-hub.eu反屏蔽ADB
+
 ### V4.2.22
 
 [Release](https://github.com/HCLonely/auto-task-v4/releases/tag/v4.2.22)

diff --git a/package.json b/package.json
@@ -1,8 +1,9 @@
 {
   "name": "auto-task-v4",
-  "version": "4.2.22",
+  "version": "4.2.23",
   "change": [
-    "Freeanywhere新增剩余Key检测功能"
+    "Keyhub反屏蔽ADB",
+    "Keyhub任务识别优化"
   ],
   "description": "赠Key站自动任务脚本",
   "main": "package.json",

diff --git a/page/dist/auto-task-v4-for-giveawaysu.all.user.js b/page/dist/auto-task-v4-for-giveawaysu.all.user.js
diff --git a/page/dist/auto-task-v4-for-giveawaysu.user.js b/page/dist/auto-task-v4-for-giveawaysu.user.js
diff --git a/page/dist/auto-task-v4.all.user.js b/page/dist/auto-task-v4.all.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name               auto-task-v4
 // @namespace          auto-task-v4
-// @version            4.2.22
+// @version            4.2.23
 // @description        自动完成 Freeanywhere，Giveawaysu，GiveeClub，Givekey，Gleam，Indiedb，keyhub，OpiumPulses，Opquests，SweepWidget 等网站的任务。
 // @description:en     Automatically complete the tasks of FreeAnyWhere, GiveawaySu, GiveeClub, Givekey, Gleam, Indiedb, keyhub, OpiumPulses, Opquests, SweepWidget websites.
 // @author             HCLonely
@@ -8104,7 +8104,7 @@ console.log('%c%s', 'color:blue', 'Auto-Task[Load]: 脚本开始加载');
                   this.undoneTasks.extra.videoTasks.push(taskData);
                 }
               }
-            } else if (/^https?:\/\/www\.instagram\.com\/.*/.test(link) || /^https?:\/\/twitter\.com\/.*/.test(link) || /^https?:\/\/www\.twitch\.tv\/.*/.test(link) || /^https?:\/\/www\.facebook\.com\/.*/.test(link) || /^https?:\/\/www\.youtube\.com\/.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/developer\//.test(link) || /^https?:\/\/.*?\.itch\.io\/.*/.test(link) || /^https?:\/\/.*?\.itch\.io\/.*/.test(link) || /^https?:\/\/key-hub\.eu.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/app\/.*/.test(link)) {} else {
+            } else if (/^https?:\/\/www\.instagram\.com\/.*/.test(link) || /^https?:\/\/twitter\.com\/.*/.test(link) || /^https?:\/\/www\.twitch\.tv\/.*/.test(link) || /^https?:\/\/www\.facebook\.com\/.*/.test(link) || /^https?:\/\/www\.youtube\.com\/.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/developer\//.test(link) || /^https?:\/\/.*?\.itch\.io\/.*/.test(link) || /^https?:\/\/key-hub\.eu.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/app\/.*/.test(link) || /^https?:\/\/qr\.streamelements\.com\/.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/news\/app\/.*/.test(link)) {} else {
               scripts_echoLog({}).warning(`${i18n('unKnownTaskType')}: ${taskDes}(${link})`);
             }
           }
@@ -11465,6 +11465,10 @@ console.log('%c%s', 'color:blue', 'Auto-Task[Load]: 脚本开始加载');
     } else if (window.location.hostname === 'opquests.com') {
       loadScript();
     } else {
+      if (window.location.hostname === 'key-hub.eu') {
+        unsafeWindow.keyhubtracker = 1;
+        unsafeWindow.gaData = {};
+      }
       $(loadScript);
     }
   }();

diff --git a/page/dist/auto-task-v4.compatibility.all.user.js b/page/dist/auto-task-v4.compatibility.all.user.js
diff --git a/page/dist/auto-task-v4.compatibility.user.js b/page/dist/auto-task-v4.compatibility.user.js
diff --git a/page/dist/auto-task-v4.user.js b/page/dist/auto-task-v4.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name               auto-task-v4
 // @namespace          auto-task-v4
-// @version            4.2.22
+// @version            4.2.23
 // @description        自动完成 Freeanywhere，Giveawaysu，GiveeClub，Givekey，Gleam，Indiedb，keyhub，OpiumPulses，Opquests，SweepWidget 等网站的任务。
 // @description:en     Automatically complete the tasks of FreeAnyWhere, GiveawaySu, GiveeClub, Givekey, Gleam, Indiedb, keyhub, OpiumPulses, Opquests, SweepWidget websites.
 // @author             HCLonely
@@ -8085,7 +8085,7 @@ console.log('%c%s', 'color:blue', 'Auto-Task[Load]: 脚本开始加载');
                   this.undoneTasks.extra.videoTasks.push(taskData);
                 }
               }
-            } else if (/^https?:\/\/www\.instagram\.com\/.*/.test(link) || /^https?:\/\/twitter\.com\/.*/.test(link) || /^https?:\/\/www\.twitch\.tv\/.*/.test(link) || /^https?:\/\/www\.facebook\.com\/.*/.test(link) || /^https?:\/\/www\.youtube\.com\/.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/developer\//.test(link) || /^https?:\/\/.*?\.itch\.io\/.*/.test(link) || /^https?:\/\/.*?\.itch\.io\/.*/.test(link) || /^https?:\/\/key-hub\.eu.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/app\/.*/.test(link)) {} else {
+            } else if (/^https?:\/\/www\.instagram\.com\/.*/.test(link) || /^https?:\/\/twitter\.com\/.*/.test(link) || /^https?:\/\/www\.twitch\.tv\/.*/.test(link) || /^https?:\/\/www\.facebook\.com\/.*/.test(link) || /^https?:\/\/www\.youtube\.com\/.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/developer\//.test(link) || /^https?:\/\/.*?\.itch\.io\/.*/.test(link) || /^https?:\/\/key-hub\.eu.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/app\/.*/.test(link) || /^https?:\/\/qr\.streamelements\.com\/.*/.test(link) || /^https?:\/\/store\.steampowered\.com\/news\/app\/.*/.test(link)) {} else {
               scripts_echoLog({}).warning(`${i18n('unKnownTaskType')}: ${taskDes}(${link})`);
             }
           }
@@ -11446,6 +11446,10 @@ console.log('%c%s', 'color:blue', 'Auto-Task[Load]: 脚本开始加载');
     } else if (window.location.hostname === 'opquests.com') {
       loadScript();
     } else {
+      if (window.location.hostname === 'key-hub.eu') {
+        unsafeWindow.keyhubtracker = 1;
+        unsafeWindow.gaData = {};
+      }
       $(loadScript);
     }
   }();

diff --git a/page/package.json b/page/package.json
@@ -1,8 +1,9 @@
 {
   "name": "auto-task-v4",
-  "version": "4.2.22",
+  "version": "4.2.23",
   "change": [
-    "Freeanywhere新增剩余Key检测功能"
+    "Keyhub反屏蔽ADB",
+    "Keyhub任务识别优化"
   ],
   "description": "赠Key站自动任务脚本",
   "main": "package.json",

diff --git a/src/index.ts b/src/index.ts
@@ -1,7 +1,7 @@
 /*
  * @Author       : HCLonely
  * @Date         : 2021-10-26 15:44:54
- * @LastEditTime : 2022-10-07 10:18:58
+ * @LastEditTime : 2022-12-10 09:55:22
  * @LastEditors  : HCLonely
  * @FilePath     : /auto-task-new/src/index.ts
  * @Description  : 入口文件
@@ -232,5 +232,9 @@ if (window.location.hostname === 'discord.com') {
 } else if (window.location.hostname === 'opquests.com') {
   loadScript();
 } else {
+  if (window.location.hostname === 'key-hub.eu') {
+    unsafeWindow.keyhubtracker = 1;
+    unsafeWindow.gaData = {};
+  }
   $(loadScript);
 }
diff --git a/src/scripts/website/keyhub.ts b/src/scripts/website/keyhub.ts
@@ -1,7 +1,7 @@
 /*
  * @Author       : HCLonely
  * @Date         : 2021-11-11 14:02:46
- * @LastEditTime : 2022-08-17 16:28:50
+ * @LastEditTime : 2022-12-10 10:07:31
  * @LastEditors  : HCLonely
  * @FilePath     : /auto-task-new/src/scripts/website/keyhub.ts
  * @Description  : https://key-hub.eu/
@@ -131,9 +131,10 @@ class Keyhub extends Website {
           /^https?:\/\/www\.youtube\.com\/.*/.test(link) ||
           /^https?:\/\/store\.steampowered\.com\/developer\//.test(link) ||
           /^https?:\/\/.*?\.itch\.io\/.*/.test(link) ||
-          /^https?:\/\/.*?\.itch\.io\/.*/.test(link) ||
           /^https?:\/\/key-hub\.eu.*/.test(link) ||
-          /^https?:\/\/store\.steampowered\.com\/app\/.*/.test(link)
+          /^https?:\/\/store\.steampowered\.com\/app\/.*/.test(link) ||
+          /^https?:\/\/qr\.streamelements\.com\/.*/.test(link) ||
+          /^https?:\/\/store\.steampowered\.com\/news\/app\/.*/.test(link)
         ) {
           // skip
         } else {