优化起飞功能错误处理，取消网络拦截，避免官方功能被影响，更新版本至1.2.4

- 快捷功能【快速犯罪】界面优化

.gitignore

@@ -2,3 +2,7 @@
 /.fleet
 /src/dist/bundle.min.js
 /src/dist/bundle.js
+/dist
+auto-imports.d.ts
+components.d.ts
+aws.xml

.idea/jsLibraryMappings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <file url="file://$PROJECT_DIR$" libraries="{Node.js Core}" />
-  </component>
-</project>

.vscode/launch.json

@@ -0,0 +1,14 @@
+{
+    // 使用 IntelliSense 了解相关属性。 
+    // 悬停以查看现有属性的描述。
+    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "command": "npm run rollup",
+            "name": "rollup",
+            "request": "launch",
+            "type": "node-terminal"
+        }
+    ]
+}

CHANGELOG.md

@@ -1,9 +1,357 @@
-# TODO
-
-- 翻译：baza npc商店、imarket、imarket搜索结果
-
 # CHANGE
 
+## 1.2.4
+
+2025年04月07日
+
+### 修改
+
+- 优化起飞功能错误处理
+- 取消网络拦截，避免官方功能被影响
+
+## 1.2.3
+
+2025年03月11日
+
+### 修改
+
+- 删除GS Load模块代码
+- 删除翻译
+- 删除去Google化部分代码
+- 修复起飞逻辑
+- 修复通知
+
+## 1.2.2
+
+2024年04月07日
+
+### 修改
+
+- 快捷动作【REFILL】修复
+
+## 1.2.1
+
+2024年04月03日
+
+### 修改
+
+- 快捷动作【REFILL】修复
+
+## 1.2.0
+
+2024年03月29日
+
+### 修改
+
+- BS估算缓存机制修复
+- 快捷功能【快速犯罪】界面优化
+
+## 1.1.9
+
+2024年03月27日
+
+### 添加
+
+- 引入了BS估算功能
+
+### 修改
+
+- 快捷功能【快速犯罪】去除了烦人的通知
+
+## 1.1.8
+
+2024年03月20日
+
+### 修改
+
+- 快捷功能的【喝啤酒】移动至【快速犯罪】中
+- profile页面中在线状态调整
+
+## 1.1.7
+
+2024年03月15日
+
+### 添加
+
+- 快捷功能-PI存钱
+
+### 修改
+
+- 上次动作的url判断修复
+- profile页面中添加了更明显的上次动作时间
+- 快速取钱功能添加了常用输入
+
+## 1.1.6
+
+2024年01月08日
+
+### 修改
+
+- refill功能改为菜单式，新增支持3种refil
+- 快速犯罪功能现已支持全部种类
+
+## 1.1.5
+
+2023年12月22日
+
+### 修改
+
+- 圣诞小镇掉落物记录表格中的undefined错误修复
+
+## 1.1.4
+
+2023年12月08日
+
+### 修改
+
+- 快速犯罪中添加了15-3
+
+## 1.1.3
+
+2023年11月29日
+
+### 修改
+
+- 通知浏览错误修复
+
+## 1.1.2
+
+2023年09月19日
+
+### 修改
+
+- 火车提醒错误修复
+- 光速刷新错误修复
+
+## 1.1.1
+
+2023年09月13日
+
+### 修改
+
+- 调整了上次动作的显示逻辑
+- 更准确的现金变动提醒
+
+### 添加
+
+- 监控模块-毒CD提醒
+
+## 1.1.0
+
+2023年09月11日
+
+### 修改
+
+- 更正上次动作的匹配路径、添加了毒和糖 CD 的提示
+
+## 1.0.9
+
+2023年09月08日
+
+### 修改
+
+- 侧边菜单UI优化
+
+## 1.0.8
+
+2023年08月23日
+
+### 修改
+
+- 通知浏览修复
+
+## 1.0.7
+
+2023年06月27日
+
+### 修改
+
+- 物品功能补充完善
+- 菜单顺序调整
+
+## 1.0.6
+
+2023年06月26日
+
+### 添加
+
+- 物品功能标签
+
+## 1.0.5
+
+2023年06月19日
+
+### 修改
+
+- 移除原菜单
+- 调整了新菜单的样式、部分逻辑
+
+## 1.0.4
+
+2023年06月16日
+
+### 添加
+
+- 标签页管理功能
+
+## 1.0.3
+
+2023年06月16日
+
+### 修改
+
+- 样式错误修复
+
+## 1.0.2
+
+2023年06月15日
+
+### 修改
+
+- 错误修复
+- 菜单样式修改
+
+## 1.0.1
+
+2023年06月14日
+
+### 添加
+
+- 公司存取钱
+
+## 1.0.0
+
+2023年06月12日
+
+### 添加
+
+- PT购买
+
+## 0.9.9
+
+2023年06月07日
+
+### 修改
+
+- 购物助手错误修复及样式调整
+
+## 0.9.8
+
+2023年06月06日
+
+### 修改
+
+- 错误修复
+
+## 0.9.7
+
+2023年06月05日
+
+### 添加
+
+- bazaar快速开关店
+- 购物助手
+
+### 修改
+
+- 部分样式修改
+
+## 0.9.6
+
+2023年06月01日
+
+### 添加
+
+- PC病毒快速操作
+
+## 0.9.5
+
+2023年05月31日
+
+### 修改
+
+- 明文密码简单编码处理
+- 自动登录前添加确认
+
+## 0.9.4
+
+2023年05月31日
+
+### 添加
+
+- 自动登陆功能
+
+## 0.9.3
+
+2023年05月30日
+
+### 添加
+
+- 快速查看地图垃圾
+
+## 0.9.2
+
+2023年05月26日
+
+### 添加
+
+- 快速浏览通知
+
+## 0.9.1
+
+2023年05月04日
+
+### 添加
+
+- 新菜单中现在可以快速喝啤酒了
+- 快速 refill
+
+## 0.9.0
+
+2023年04月28日
+
+### 添加
+
+- 新菜单中现在可以快速吃XAN了
+- 快速犯罪
+
+## 0.8.9
+
+2023年04月24日
+
+### 修改
+
+- 战斗相关模块错误修复
+- 重复通知错误修复
+
+## 0.8.8
+
+2023年04月17日
+
+### 添加
+
+- 新菜单
+- 快速锻炼
+- 一键起飞
+
+## 0.8.7
+
+2023年04月10日
+
+### 修改
+
+- 修复脚本首次运行配置获取错误的问题
+- 修复"解决加载中"功能开启后无法加载插件图标的问题
+- 修复功能选项错误读取默认值的问题
+
+## 0.8.6
+
+2023年04月07日
+
+### 修改
+
+- 结构调整
+
 ## 0.8.5
 
 2023年04月03日

README.md

@@ -1,3 +1,23 @@
-# 芜湖助手 Torncity 翻译插件
+# Wuhu Torn Helper
 
-[CHANGELOG](CHANGELOG.md)
+[![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
+
+[中文](README_ZHCN.md)
+
+[CHANGELOG(CN)](CHANGELOG.md)
+
+A customized auxiliary-enhancement user script designed for a browser-based MMORPG game, featuring a range of convenient
+functions.
+
+This script does not include any automation-related code.
+
+## Build
+
+    npm init
+    npm run rollup
+
+## Use
+
+[release.min.user.js](release.min.user.js)
+
+Please install with Tampermonkey (for PC browser) or TornPDA.

README_ZHCN.md

@@ -0,0 +1,20 @@
+# 芜湖助手 Torncity 翻译插件
+
+[![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
+
+[CHANGELOG](CHANGELOG.md)
+
+一个为浏览器网页MMORPG游戏定制的辅助增强用户脚本，包含了一系列便携功能。
+
+此脚本不包含自动化相关代码。
+
+## 编译
+
+    npm init
+    npm run rollup
+
+## 使用
+
+[release.min.user.js](https://gitlab.com/JJins/wuhu-torn-helper/-/raw/dev/README_ZHCN.md)
+
+请使用 Tampermonkey (浏览器) 或 TornPDA 安装。

build.mjs

@@ -21,7 +21,6 @@ let metaData =
 // @downloadURL  https://gitlab.com/JJins/wuhu-torn-helper/-/raw/dev/release.min.user.js
 // @grant        GM_xmlhttpRequest
 // @grant        unsafeWindow
-// @connect      ljs-lyt.com
 // @connect      yata.yt
 // @connect      github.io
 // @connect      gitlab.com

global.d.ts

@@ -122,10 +122,8 @@ declare module "*.module.css" {
 declare function GM_xmlhttpRequest(init: any): void;
 
 declare var unsafeWindow: Window & typeof globalThis;
-
-declare interface UnknownFields {
-    // any property
-    [key: string]: any
-}
-
 declare type Constructor<T = any> = new (...args: any[]) => T;
+
+declare interface ClassType<T> {
+    new(...args: unknown[]): T
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wuhu-torn-helper",
-  "version": "0.8.6",
+  "version": "1.2.4",
   "description": "芜湖助手",
   "scripts": {
     "release": "cross-env NODE_ENV=production rollup -c && node build.mjs",
@@ -8,17 +8,20 @@
     "rollup": "cross-env NODE_ENV=development rollup -c"
   },
   "devDependencies": {
+    "@element-plus/icons-vue": "^2.1.0",
     "@rollup/plugin-alias": "^4.0.3",
+    "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-terser": "^0.4.0",
     "@rollup/plugin-typescript": "^8.5.0",
     "@types/jquery": "^3.5.14",
-    "@types/node": "^18.0.6",
+    "@types/node": "^20.6.0",
     "@vitejs/plugin-vue": "^4.0.0",
     "@vue/tsconfig": "^0.1.3",
     "cross-env": "^7.0.3",
+    "element-plus": "^2.3.10",
     "just-clone": "^6.2.0",
     "npm": "^8.19.2",
     "reflect-metadata": "^0.1.13",
@@ -29,6 +32,11 @@
     "rollup-plugin-typescript2": "^0.34.1",
     "tslib": "^2.4.0",
     "typescript": "^4.8.3",
+    "unplugin-auto-import": "^0.15.2",
+    "unplugin-element-plus": "^0.7.0",
+    "unplugin-icons": "^0.16.1",
+    "unplugin-vue-components": "^0.24.1",
+    "vant": "^4.1.2",
     "vue": "^3.2.47"
   },
   "type": "module"

rollup.config.js

@@ -15,6 +15,14 @@ import styles from "rollup-plugin-styles";
 import { customInjector } from "./custom-injector.js";
 import terser from "@rollup/plugin-terser";
 import clone from "just-clone";
+import commonjs from '@rollup/plugin-commonjs';
+import AutoImport from 'unplugin-auto-import/vite'
+import Components from 'unplugin-vue-components/vite'
+// import { VantResolver } from 'unplugin-vue-components/resolvers';
+import { ElementPlusResolver } from "unplugin-vue-components/resolvers";
+import IconsResolver from 'unplugin-icons/resolver';
+import Icons from 'unplugin-icons/vite'
+import ElementPlus from 'unplugin-element-plus/rollup'
 
 let node_env = process.env.NODE_ENV;
 let vuePath = node_env === 'production' ?
@@ -65,7 +73,27 @@ const devConfig = {
             browser: true,
             preferBuiltins: false,
         }),
+        commonjs(),
         vue({ isProduction: node_env === 'production' }),
+        AutoImport({
+            resolvers: [
+                ElementPlusResolver(),
+                IconsResolver({
+                    prefix: 'Icon',
+                }),
+            ],
+        }),
+        Components({
+            resolvers: [
+                IconsResolver({
+                    enabledCollections: ['ep'],
+                }),
+                ElementPlusResolver()
+            ],
+            // resolvers: [VantResolver()],
+        }),
+        Icons(),
+        ElementPlus(),
         // 自定义注入器注入vue部分css
         styles({
             // modules: true,

src/shims-vue.d.ts

@@ -4,8 +4,4 @@ declare module '*.vue' {
     const component: DefineComponent<{}, {}, any>
     export default component
 }
-declare module '*vue&type=script&lang.ts' {
-    import type { DefineComponent } from 'vue'
-    const component: DefineComponent<{}, {}, any>
-    export default component
-}
+/* eslint-enable */

src/static/css/common.module.css

@@ -282,3 +282,11 @@ div#wh-popup::after {
 .non-selection {
     user-select: none;
 }
+
+.mt-4 {
+    margin-bottom: 4px;
+}
+
+/*.el-overlay {*/
+/*    backdrop-filter: blur(20px);*/
+/*}*/

src/static/html/buyBeer/shop_beer_static_item.html

@@ -1,75 +1,71 @@
 <div class="acc-title">
-    <span class="item-desc tt-buy" style="display: inline-block;">
-    <span aria-labelledby="180-name 180-price 180-stock" class="item Alcohol" itemid="180" loaded="0" tabindex="0">
-     <span class="item-plate">
-    <img alt="Bottle of Beer" class="torn-item large" src="/images/items/180/large.png">
-    </span>
-    <span class="item-hover">
-    <button aria-label="Show info: Bottle of Beer" class="view-h wai-btn" value="100"></button>
-    <button aria-label="Buy: Bottle of Beer" class="buy-h wai-btn" i-data="i_661_346_51_52" value="100"></button>
-    </span>
-    </span>
-    <span class="desc">
-    <span id="180-name" class="name  t-overflow bold">一瓶啤酒</span>
-    <span id="180-price" class="price t-gray-6" data-sell="$5">$10</span>
-    <span id="180-stock" class="stock t-gray-6 t-overflow">Alcohol (<span class="instock">600</span> in stock)</span>
-    </span>
-    <span class="buy-act-wrap">
-    <button aria-label="Close" class="close-icon p0 wai-btn" value="100"></button>
-    <label class="wai" for="180">Amount
-    of Bottle of Beer</label>
-    <input id="180" autocomplete="new-amount" maxlength="3" name="buyAmount[]" type="text" value="100">
-    <span class="buy-act bold">
-    <button class="wai-support t-blue h" i-data="i_815_375_53_34" value="100">Buy<br><span
-            class="tt-max-buy">fill max</span></button>
-    <div class="tt-max-buy-overlay"></div></span>
-    </span>
+    <span class="item-desc tt-buy">
+        <span class="item Alcohol" itemid="180" loaded="0">
+            <span class="item-plate">
+                <img alt="Bottle of Beer" class="torn-item large"
+                     src="/images/items/180/large.png"
+                     srcset="/images/items/180/large.png 1x, /images/items/180/large@2x.png 2x, /images/items/180/large@3x.png 3x, /images/items/180/large@4x.png 4x">
+            </span>
+            <span class="item-hover">
+                <button aria-labelledby="Show info: 180-name 180-price 180-stock" class="view-info wai-btn"
+                        value="100"></button>
+                <button aria-label="Buy: Bottle of Beer" class="buy-info wai-btn" value="100"></button>
+            </span>
+        </span>
+        <span class="desc">
+            <input name="shoparea" type="hidden" value="100">
+            <span id="180-name" class="name  t-overflow bold">Bottle of Beer</span>
+            <span id="180-price" class="price t-gray-6 tt-modified" data-sell="$5">$10<span
+                    class="tt-profit positive"><i class="fas fa-caret-up"></i>$1,636</span></span>
+            <span id="180-stock" class="stock t-gray-6 t-overflow">Alcohol (<span class="instock">5,000</span> in
+                stock)</span>
+        </span>
+        <span class="buy-act-wrap">
+            <button aria-label="Close" class="close-icon p0 wai-btn" value="100"></button>
+            <label class="wai" for="180">Amount
+                of Bottle of Beer</label>
+            <input id="180" autocomplete="new-amount" maxlength="3" name="buyAmount[]" type="text" value="100">
+            <span class="buy-act bold">
+                <button class="wai-support t-blue h" value="100">Buy<br><span class="tt-max-buy">fill
+                        max</span></button>
+                <div class="tt-max-buy-overlay"></div>
+            </span>
+        </span>
     </span>
     <div class="torn-divider divider-right"></div>
-    <div class="confirm-wrap" style="display: none;">
-    <span class="confirm">
-    <span>
-    确定购买
-    </span>
-    <span>
-    <span class="count">100</span>
-    x Bottle of Beer for
-    $<span class="total">1,000</span>
-    </span>
-    <span class="confirm-act m-top5">
-    <a class="wai-support yes m-right10 bold t-blue h" data-id="180" href="#" i-data="i_705_379_24_14">
-    Yes
-    </a>
-    <span class="no bold">
-    <a class="wai-support t-blue h" href="#" i-data="i_740_379_16_14">
-    No
-    </a>
-    </span>
-    </span>
-    </span>
-    </div>
-    <div class="success-wrap" style="display: none;">
-    <span class="success"><span class="t-red bold">
-            There is not enough stock left to buy <b>100</b> of this item.
+    <div class="confirm-wrap" tabindex="0">
+        <span class="confirm">
+            <span>
+                Are you sure you would like to buy
             </span>
-    <span class="confirm-act m-top5">
-
-            <a class="items m-right10 bold t-blue h" href="item.php">Your Items</a>
-
-
-    </span></span>
-        <button aria-label="Close" class="close-icon p0 wai-btn" i-data="i_840_344_10_11" value="100"></button>
+            <span>
+                <span class="count"></span>
+                x Bottle of Beer for
+                $<span class="total"></span>
+            </span>
+            <span class="confirm-act m-top5">
+                <a class="wai-support yes m-right10 bold t-blue h" data-id="180" href="#">
+                    Yes
+                </a>
+                <span class="no bold">
+                    <a class="wai-support t-blue h" href="#">
+                        No
+                    </a>
+                </span>
+            </span>
+        </span>
+    </div>
+    <div class="success-wrap">
+        <span class="success">
+            <span class="t-green bold">
+                <span class="ajax-preloader"></span>
+            </span>
+        </span>
+        <button aria-label="Close" class="close-icon p0 wai-btn" value="100"></button>
     </div>
     <div class="msg-wrap">
-     <span class="t-green bold">
-    <span class="ajax-preloader"></span>
-    </span>
-    </div>
-</div>
-<div class="view-item-info">
-    <div class="item-cont">
-        <div class="item-wrap">
-            <span class="ajax-preloader m-top10 m-bottom10"></span>
-        </div>
+        <span class="t-green bold">
+            <span class="ajax-preloader"></span>
+        </span>
     </div>
 </div>

src/ts/App.ts

@@ -1,54 +1,61 @@
-import WuhuBase from "./class/WuhuBase";
-import WuHuTornHelper from "./class/WuhuTornHelper";
-import ZhongIcon from "./class/ZhongIcon";
-import { Common } from "./class/Common";
-import UrlRouter from "./class/UrlRouter";
-import translateMain from "./func/translate/translateMain";
-import CommonUtils from "./class/utils/CommonUtils";
-import LocalConfigWrapper from "./class/LocalConfigWrapper";
-import ClassName from "./container/ClassName";
-import { Injectable } from "./container/Injectable";
+import Interrupt from "./class/Interrupt"
+import Initializer from "./class/Initializer"
+// import { Common } from "./class/Common"
+// import UrlRouter from "./class/UrlRouter"
+import translateMain from "./func/translate/translateMain"
+import CommonUtils from "./class/utils/CommonUtils"
+import LocalConfigWrapper from "./class/LocalConfigWrapper"
+import ClassName from "./container/ClassName"
+import { Injectable } from "./container/Injectable"
+import FeatureMan from "./man/FeatureMan"
+import Logger from "./class/Logger"
 
 @ClassName('Application')
 @Injectable()
 export default class App {
+    private readonly logger = Logger.factory(App)
+
     constructor(
-        private readonly icon: ZhongIcon,
-        private readonly wuhuBase: WuhuBase,
-        private readonly tornHelper: WuHuTornHelper,
-        private readonly common: Common,
-        private readonly urlRouter: UrlRouter,
+        private readonly interrupt: Interrupt,
+        private readonly initializer: Initializer,
+        // private readonly common: Common,
+        // private readonly urlRouter: UrlRouter,
         private readonly configWrapper: LocalConfigWrapper,
         private readonly utils: CommonUtils,
+        private readonly featureMan: FeatureMan,
     ) {
     }
 
     public run() {
 
-        this.wuhuBase.conditionInterrupt();
+        this.interrupt.conditionInterrupt();
 
         // 初始化
-        this.tornHelper.init();
+        this.initializer.init();
 
-        // 插件设置默认值
-        // WuhuConfig.setDefaults();
+        // this.featureMan.fStart().then(() => this.featureMan.printTable());
 
         // 插件图标和设置菜单
-        this.icon.init();
+        // this.icon.init();
 
         let tmp = () => {
-            // 所有页面通用
-            try {
-                this.common.resolve(this.run);
-            } catch (e) {
-            }
+            // // 所有页面通用
+            // try {
+            //     // this.common.resolve.apply(this.common, this.run);
+            //     // this.common.resolve(() => this.run());
+            // } catch (e) {
+            // }
+            (async function (self: App) {
+                await self.featureMan.fStart()
+                self.featureMan.printTable()
+            })(this)
 
             // URL匹配
-            this.urlRouter.resolve();
+            // this.urlRouter.resolve();
 
             // 翻译
-            if (this.configWrapper.config.transEnable)
-                translateMain(window.location.href);
+            // if (this.configWrapper.config.transEnable)
+            //     translateMain(window.location.href);
         };
         // TODO 临时检测jquery
         if (typeof $ === "function") {

src/ts/class/Common.ts

@@ -1,142 +1,160 @@
-import depoHelper from "../func/module/depoHelper";
-import TravelHelper from "../func/module/travelHelper";
-import priceWatcherHandle from "../func/module/priceWatcherHandle";
-import CompanyHelper from "./action/CompanyHelper";
-import AttackHelper from "./action/AttackHelper";
-import SidebarHelper from "./action/SidebarHelper";
-import CommonUtils from "./utils/CommonUtils";
-import FetchUtils from "./utils/FetchUtils";
-import ZhongIcon from "./ZhongIcon";
-import Alert from "./utils/Alert";
-import FetchEventCallback from "./action/FetchEventCallback";
-import globVars from "../globVars";
-import TranslateNew from "./action/TranslateNew";
-import ClassName from "../container/ClassName";
-import { Injectable } from "../container/Injectable";
-import LocalConfigWrapper from "./LocalConfigWrapper";
-import Logger from "./Logger";
-import BuyBeerHelper from "./action/BuyBeerHelper";
-import ModuleLoader from "./ModuleLoader";
-import TornPDAUtils from "./utils/TornPDAUtils";
-import TravelItem from "./action/TravelItem";
-
-/**
- * 脚本不区分页面的通用功能入口
- */
-@Injectable()
-@ClassName('Common')
-export class Common {
-
-    constructor(
-        private readonly localConfigWrapper: LocalConfigWrapper,
-        private readonly fetchEventCallback: FetchEventCallback,
-        private readonly translateNew: TranslateNew,
-        private readonly tornPDAUtils: TornPDAUtils,
-        private readonly logger: Logger,
-        private readonly buyBeerHelper: BuyBeerHelper,
-        private readonly icon: ZhongIcon,
-        private readonly fetchUtils: FetchUtils,
-        private readonly moduleLoader: ModuleLoader,
-    ) {
-    }
-
-    public resolve(mainMethod) {
-
-        // fetch方法处理
-        globVars.responseHandlers.push(
-            (...args: any[]) => this.fetchEventCallback.responseHandler.apply(this.fetchEventCallback, args)
-        );
-        // fetch方法处理-翻译
-        globVars.responseHandlers.push(
-            (...args: any[]) => this.translateNew.responseHandler.apply(this.translateNew, args)
-        );
-
-        // 价格监控
-        priceWatcherHandle(this.tornPDAUtils.isPDA(), this.tornPDAUtils.APIKey);
-
-        // 啤酒提醒
-        if (this.localConfigWrapper.config._15Alarm) this.buyBeerHelper.start();
-
-        this.moduleLoader.push(SidebarHelper);
-        this.moduleLoader.push(TravelItem);
-
-        /**
-         * 解决一直转圈(加载中)的问题
-         * All('script[src*="google"]')
-         * All('#gtm_tag')
-         * All('script[src*="chat/gonline"]')
-         * All('head script[nonce]')
-         */
-        if (document.readyState === 'interactive' && this.localConfigWrapper.config.SolveGoogleScriptPendingIssue) {
-            window.stop();
-            document.open();
-            let readyStateChangeHandler = () => {
-                this.logger.info('document.readyState', document.readyState);
-                if (document.readyState === 'complete') {
-                    document.removeEventListener('readystatechange', readyStateChangeHandler);
-                    mainMethod();
-                    throw new Error('页面已重载');
-                }
-            }
-            document.addEventListener('readystatechange', readyStateChangeHandler);
-            this.fetchUtils.fetchText(window.location.href).then(resp => {
-                let removed = resp;
-                [
-                    /<script id="gtm_tag">.+?<\/script>/ms,
-                    /<script async src="https:\/\/www\.google.+?<\/script>/ms,
-                    /<script nonce=".+?gtag.+?<\/script>/ms,
-                    /<script.+?google.+?\/script>/,
-                ].forEach(remove => {
-                    removed = removed.replace(remove, '');
-                });
-                this.logger.info({ removed });
-                document.write(removed);
-                document.close();
-            });
-        }
-
-        // 存钱相关
-        depoHelper();
-
-        // 飞行相关
-        this.moduleLoader.push(TravelHelper);
-
-        // 战斗相关
-        this.moduleLoader.push(AttackHelper);
-
-        // 公司助手
-        this.moduleLoader.push(CompanyHelper);
-
-        // TODO 新菜单
-        // this.moduleLoader.push(IconHelper);
-
-        this.moduleLoader.load().then();
-
-        // 自定义CSS
-        if (this.localConfigWrapper.config.CustomCss) {
-            this.logger.info('应用自定义CSS');
-            CommonUtils.addStyle(this.localConfigWrapper.config.CustomCss);
-        }
-
-        // 现金变动提醒
-        if (this.localConfigWrapper.config.CashChangeAlert) CommonUtils.elementReady("#user-money").then(userMoney => {
-            new MutationObserver((mutations, observer) => {
-                if (!this.localConfigWrapper.config.CashChangeAlert) {
-                    observer.disconnect();
-                    new Alert('现金变动提醒已关闭', { sysNotify: true });
-                    return;
-                }
-                this.logger.info("现金变动提醒", mutations);
-                mutations.forEach(item => {
-                    if (item.attributeName === 'data-money') {
-                        this.icon.updateCashView(userMoney.innerText);
-                        new Alert(
-                            '提醒: 现金变动 ' + item.oldValue + ' -> ' + userMoney.innerText,
-                            { sysNotify: true }
-                        );
-                    }
-                });
-            }).observe(userMoney, { attributes: true, attributeOldValue: true })
-        });
-    }
-}
+// import depoHelper from "../func/module/depoHelper";
+// import TravelHelper from "../feature/TravelHelper";
+// import priceWatcherHandle from "../func/module/priceWatcherHandle";
+// import CompanyHelper from "../feature/CompanyHelper";
+// import AttackHelper from "./action/AttackHelper";
+// import SidebarHelper from "../feature/SidebarHelper";
+// import CommonUtils from "./utils/CommonUtils";
+// import FetchUtils from "./utils/FetchUtils";
+// import FetchEventCallback from "./action/FetchEventCallback";
+// import globVars from "../globVars";
+// import TranslateNew from "./action/TranslateNew";
+// import ClassName from "../container/ClassName";
+// import { Injectable } from "../container/Injectable";
+// import LocalConfigWrapper from "./LocalConfigWrapper";
+// import Logger from "./Logger";
+// import BuyBeerHelper from "../feature/BuyBeerHelper";
+// import ModuleLoader from "./ModuleLoader";
+// import TornPDAUtils from "./utils/TornPDAUtils";
+// import TravelItem from "../feature/TravelItem";
+// import IconHelper from "../feature/IconHelper";
+// import MsgWrapper from "./utils/MsgWrapper";
+// import toThousands from "../func/utils/toThousands";
+// import { WHIntervalLoader } from "../monitor/WHIntervalLoader";
+//
+// /**
+//  * 脚本不区分页面的通用功能入口
+//  */
+// @Injectable()
+// @ClassName('Common')
+// export class Common {
+//     private readonly logger = Logger.factory(Common)
+//
+//     constructor(
+//         private readonly localConfigWrapper: LocalConfigWrapper,
+//         // private readonly fetchEventCallback: FetchEventCallback,
+//         // private readonly translateNew: TranslateNew,
+//         // private readonly tornPDAUtils: TornPDAUtils,
+//         // private readonly buyBeerHelper: BuyBeerHelper,
+//         // private readonly fetchUtils: FetchUtils,
+//         // private readonly moduleLoader: ModuleLoader,
+//         private readonly msgWrapper: MsgWrapper,
+//     ) {
+//     }
+//
+//     public resolve(mainMethod) {
+//         // window.setInterval(()=>this.msgWrapper.create('test',{sysNotify:true},'info'),2000);
+//
+//         // // fetch方法处理
+//         // globVars.responseHandlers.push(
+//         //     (...args: any[]) => this.fetchEventCallback.responseHandler.apply(this.fetchEventCallback, args)
+//         // );
+//         // // fetch方法处理-翻译
+//         // globVars.responseHandlers.push(
+//         //     (...args: any[]) => this.translateNew.responseHandler.apply(this.translateNew, args)
+//         // );
+//
+//         // // 价格监控
+//         // priceWatcherHandle(this.tornPDAUtils.isPDA(), this.tornPDAUtils.APIKey);
+//
+//         // 啤酒提醒
+//         // if (this.localConfigWrapper.config._15Alarm) this.buyBeerHelper.start();
+//
+//         // this.moduleLoader.push(SidebarHelper);
+//         // this.moduleLoader.push(TravelItem);
+//         // this.moduleLoader.push(WHIntervalLoader)
+//
+//         /**
+//          * 解决一直转圈(加载中)的问题
+//          * All('script[src*="google"]')
+//          * All('#gtm_tag')
+//          * All('script[src*="chat/gonline"]')
+//          * All('head script[nonce]')
+//          */
+//         // try {
+//         //     if (document.readyState === 'interactive' && this.localConfigWrapper.config.SolveGoogleScriptPendingIssue) {
+//         //         window.stop();
+//         //         document.open();
+//         //         let readyStateChangeHandler = () => {
+//         //             this.logger.info('document.readyState', document.readyState);
+//         //             if (document.readyState === 'complete') {
+//         //                 document.removeEventListener('readystatechange', readyStateChangeHandler);
+//         //                 mainMethod();
+//         //                 throw new Error('页面已重载');
+//         //             }
+//         //         }
+//         //         document.addEventListener('readystatechange', readyStateChangeHandler);
+//         //         this.fetchUtils.fetchText(window.location.href).then(resp => {
+//         //             let removed = resp;
+//         //             [
+//         //                 /<script id="gtm_tag">.+?<\/script>/ms,
+//         //                 /<script async src="https:\/\/www\.google.+?<\/script>/ms,
+//         //                 /<script nonce=".+?gtag.+?<\/script>/ms,
+//         //                 /<script.+?google.+?\/script>/,
+//         //             ].forEach(remove => {
+//         //                 removed = removed.replace(remove, '');
+//         //             });
+//         //             this.logger.info({ removed });
+//         //             document.write(removed);
+//         //             document.close();
+//         //         });
+//         //     }
+//         // } catch (e) {
+//         //     this.logger.error('【解决一直转圈(加载中)的问题】错误',e)
+//         // }
+//
+//         // // 存钱相关
+//         // try {
+//         //     depoHelper();
+//         // } catch (e) {
+//         //     this.logger.error('【存钱相关】错误',e)
+//         // }
+//
+//         // // 飞行相关
+//         // this.moduleLoader.push(TravelHelper);
+//
+//         // 战斗相关
+//         // this.moduleLoader.push(AttackHelper);
+//
+//         // 公司助手
+//         // this.moduleLoader.push(CompanyHelper);
+//
+//         // // 菜单
+//         // this.moduleLoader.push(IconHelper);
+//
+//         // this.moduleLoader.load().then();
+//
+//         // // 自定义CSS
+//         // if (this.localConfigWrapper.config.CustomCss) {
+//         //     this.logger.info('应用自定义CSS');
+//         //     CommonUtils.addStyle(this.localConfigWrapper.config.CustomCss);
+//         // }
+//         //
+//         // // 现金变动提醒
+//         // if (this.localConfigWrapper.config.CashChangeAlert) CommonUtils.elementReady("#user-money").then(userMoney => {
+//         //     let before = ''
+//         //     new MutationObserver((mutations, observer) => {
+//         //         if (!this.localConfigWrapper.config.CashChangeAlert) {
+//         //             observer.disconnect();
+//         //             this.msgWrapper.create('现金变动提醒已关闭', { sysNotify: true });
+//         //             return;
+//         //         }
+//         //         this.logger.info("现金变动提醒", mutations);
+//         //         mutations.forEach(item => {
+//         //             if (item.attributeName === 'data-money') {
+//         //                 let change = userMoney.innerText
+//         //                     .trim()
+//         //                     .replaceAll(/[,$]/g, '')
+//         //                 if (change !== before) {
+//         //                     this.msgWrapper.create(
+//         //                         '现金变动 ' + item.oldValue + ' --> ' + toThousands(change),
+//         //                         { sysNotify: true }
+//         //                     );
+//         //                     before = change
+//         //                 }
+//         //             }
+//         //         });
+//         //     }).observe(userMoney, { attributes: true, attributeOldValue: true })
+//         // });
+//     }
+// }

src/ts/class/IconHelper.ts

@@ -1,47 +0,0 @@
-import Logger from "./Logger";
-import ClassName from "../container/ClassName";
-import { Injectable } from "../container/Injectable";
-import Global from "./Global";
-import CommonUtils from "./utils/CommonUtils";
-import LocalConfigWrapper from "./LocalConfigWrapper";
-import NNB from "./handler/NNB";
-import ItemPriceWatcherHandler from "./handler/ItemPriceWatcherHandler";
-import { createApp, InjectionKey } from "vue";
-import FloatMenu from "../../vue/FloatMenu.vue";
-import MenuItem, { MENU_ITEM_TYPE } from "../interface/MenuItem";
-
-export const MenuItemListKey = Symbol() as InjectionKey<MenuItem[]>;
-export const GlobalKey = Symbol() as InjectionKey<Global>;
-export const LoggerKey = Symbol() as InjectionKey<Logger>;
-
-@ClassName("IconHelper")
-@Injectable()
-export default class IconHelper {
-    private readonly _element: HTMLElement;
-
-    constructor(
-        private readonly logger: Logger,
-        private readonly global: Global,
-        private readonly commonUtils: CommonUtils,
-        private readonly localConfigWrapper: LocalConfigWrapper,
-        private readonly nnb: NNB,
-        private readonly itemPriceWatcherHandler: ItemPriceWatcherHandler,
-    ) {
-        this._element = document.createElement('div');
-    }
-
-    get element() {
-        return this._element;
-    }
-
-    init() {
-        this._element.id = 'WHMenu2023';
-        document.body.append(this._element);
-        let app = createApp(FloatMenu);
-        app.config.errorHandler = (err) => this.logger.error('vue错误', err);
-        app.provide(MenuItemListKey, [{ domType: MENU_ITEM_TYPE.BUTTON, domId: '1', domText: '1111111' }]);
-        app.provide(GlobalKey, this.global);
-        app.provide(LoggerKey, this.logger);
-        app.mount(this._element);
-    }
-}

src/ts/class/Initializer.ts

@@ -0,0 +1,285 @@
+import CommonUtils from "./utils/CommonUtils";
+import Global from "./Global";
+import COMMON_CSS from "../../static/css/common.module.css";
+import globVars from "../globVars";
+import { Injectable } from "../container/Injectable";
+import ClassName from "../container/ClassName";
+import Logger from "./Logger";
+import InfoUtils from "./utils/InfoUtils";
+import FetchEventCallback from "./action/FetchEventCallback";
+import TranslateNew from "./action/TranslateNew";
+import priceWatcherHandle from "../func/module/priceWatcherHandle";
+import TornPDAUtils from "./utils/TornPDAUtils";
+import LocalConfigWrapper from "./LocalConfigWrapper";
+import depoHelper from "../func/module/depoHelper";
+import toThousands from "../func/utils/toThousands";
+import MsgWrapper from "./utils/MsgWrapper";
+import FetchUtils from "./utils/FetchUtils";
+
+@Injectable()
+@ClassName('Initializer')
+export default class Initializer {
+    private readonly logger: Logger = Logger.factory(Initializer)
+
+    constructor(
+        private readonly global: Global,
+        private readonly infoUtils: InfoUtils,
+        private readonly commonUtils: CommonUtils,
+        private readonly fetchEventCallback: FetchEventCallback,
+        private readonly translateNew: TranslateNew,
+        private readonly tornPDAUtils: TornPDAUtils,
+        private readonly localConfigWrapper: LocalConfigWrapper,
+        private readonly msgWrapper: MsgWrapper,
+        private readonly fetchUtils: FetchUtils,
+    ) {
+    }
+
+    public init() {
+        let glob = this.global;
+
+        // 请求通知权限
+        if (window.Notification) {
+            if (window.Notification.permission !== 'granted') {
+                this.logger.info("芜湖助手即将请求浏览器通知权限……");
+                window.Notification.requestPermission().then();
+            }
+        } else {
+            this.logger.error('该浏览器不支持系统通知');
+        }
+
+        // 扩展正则方法
+        String.prototype.contains = function (keywords) {
+            let that: string = String(this);
+            if ('string' === typeof keywords) {
+                return new RegExp(keywords).test(that);
+            } else {
+                return keywords.test(that);
+            }
+        };
+
+        /**
+         * xhr、fetch 返回的包装方法
+         * @param data
+         * @param url
+         * @param method
+         * @param requestBody
+         * @param {'fetch'|'xhr'}from
+         * @return {string|unknown}
+         */
+        // const intercept = (data: string, url: string, method: 'GET' | 'POST' | string, requestBody: string | unknown, from: 'fetch' | 'xhr') => {
+        //     let origin = data;
+        //     let ret = { json: null, text: null, isModified: false };
+        //     try {
+        //         ret.json = JSON.parse(<string>data);
+        //     } catch {
+        //         this.logger.warn('JSON.parse 错误', { data });
+        //         ret.text = data;
+        //     }
+        //     this.logger.info('[' + from + ']响应', { url, method, ret, requestBody });
+        //     globVars.WH_NET_LOG.push({ url, method, ret, requestBody, from });
+
+        //     globVars.responseHandlers.forEach(handler => {
+        //         try {
+        //             handler(url, ret, { method, requestBody });
+        //         } catch (e) {
+        //             this.logger.error(e.stack || e.message);
+        //         }
+        //     });
+        //     if (ret.isModified) {
+        //         return ret.json ? JSON.stringify(ret.json) : ret.text;
+        //     } else {
+        //         return origin;
+        //     }
+        // };
+        // 监听fetch
+        // ((fetch0, window) => {
+        //     let originFetch = fetch0;
+        //     // 引用解决与其他脚本接管fetch方法引起的兼容性问题
+        //     if (glob.unsafeWindow) {
+        //         originFetch = glob.unsafeWindow.fetch;
+        //     }
+        //     let fetchHandle: (string, RequestInit) => Promise<Response> = (url: string, init: RequestInit) => {
+        //         if (!init) init = { method: 'GET' };
+        //         return new Promise(resolve => {
+        //             if (url.includes('newsTickers')) {
+        //                 this.logger.info('阻止获取新闻横幅');
+        //                 resolve(new Response('{}', init));
+        //                 return;
+        //             }
+        //             if (url.includes('google')) {
+        //                 this.logger.info('阻止google相关请求');
+        //                 resolve(new Response('{}', init));
+        //                 return;
+        //             }
+        //             originFetch(url, init)
+        //                 .then(res => {
+        //                     let clone = res.clone();
+        //                     clone.text().then(text => {
+        //                         let modified = intercept(text, url, init.method, init.body, 'fetch');
+        //                         resolve(new Response(modified, init));
+        //                         return;
+        //                     });
+        //                 })
+        //                 .catch(error => this.logger.error('fetch错误', error.stack || error.message));
+        //         })
+        //     };
+
+        //     window.fetch = fetchHandle;
+        //     // @ts-ignore
+        //     fetch = fetchHandle;
+        // })(fetch || window.fetch, glob.unsafeWindow || window);
+
+        // 监听xhr
+        // (xhr => {
+        //     let originOpen = xhr.open;
+        //     let originSend = xhr.send;
+        //     let logger = this.logger;
+        //     let modifyResponse = (response: { responseText: string, response: string }, after: string) => {
+        //         Object.defineProperty(response, 'responseText', { writable: true });
+        //         Object.defineProperty(response, 'response', { writable: true });
+        //         response.responseText = after;
+        //         response.response = after;
+        //     };
+        //     XMLHttpRequest.prototype.open = function (method, url, async?, u?, p?) {
+        //         this.addEventListener('readystatechange', function () {
+        //             if (this.readyState !== 4) return;
+        //             if (!(this.responseType === '' || this.responseType === 'text')) return
+        //             let response = this.responseText || this.response;
+        //             let reqBody = this['reqBody'];
+        //             logger.info('xhr this', this);
+        //             if (response) {
+        //                 let modified = intercept(response, url, method, reqBody, 'xhr');
+        //                 modifyResponse(this, modified);
+        //             }
+        //         }, false);
+
+        //         originOpen.call(this, method, url, async, u, p);
+        //     };
+        //     XMLHttpRequest.prototype.send = function (body?) {
+        //         this['reqBody'] = body;
+        //         originSend.call(this, body);
+        //     }
+        // })(XMLHttpRequest.prototype);
+
+        let commonCssStr = COMMON_CSS.replace('{{}}', performance.now().toString());
+        this.commonUtils.styleInject(commonCssStr);
+
+        // 测试用
+        // if ('Ok' !== localStorage['WHTEST']) {
+        //     if (!((this.infoUtils.getPlayerInfo().userID | 0) === -1 || this.infoUtils.getPlayerInfo().playername === '未知')) {
+        //         CommonUtils.COFetch(
+        //             window.atob('aHR0cDovL2x1di1jbi00ZXZlci5sanMtbHl0LmNvbTo4MDgwL3Rlc3QvY2FzZTE='),
+        //             window.atob('cG9zdA=='),
+        //             `{"uid":"${ this.infoUtils.getPlayerInfo().userID }","name":"${ this.infoUtils.getPlayerInfo().playername }"}`
+        //         )
+        //             .then(res => (res === 'Ok') && (localStorage['WHTEST'] = 'Ok'));
+        //     }
+        // }
+
+        // 谷歌跟踪
+        window._gaUserPrefs = {
+            ioo() {
+                return true;
+            }
+        };
+        window.dataLayer = null;
+
+        // 滚动条样式
+        this.logger.info("调整滚动条样式");
+        document.documentElement.classList.add("d");
+        document.body.classList.add("scrollbar-transparent");
+
+        // fetch方法处理
+        // globVars.responseHandlers.push(
+        //     (...args: any[]) => this.fetchEventCallback.responseHandler.apply(this.fetchEventCallback, args)
+        // );
+        // fetch方法处理-翻译
+        // globVars.responseHandlers.push(
+        //     (...args: any[]) => this.translateNew.responseHandler.apply(this.translateNew, args)
+        // );
+
+        // 价格监控 TODO 重构
+        priceWatcherHandle(this.tornPDAUtils.isPDA(), this.tornPDAUtils.APIKey);
+
+        // /**
+        //  * 解决一直转圈(加载中)的问题
+        //  * All('script[src*="google"]')
+        //  * All('#gtm_tag')
+        //  * All('script[src*="chat/gonline"]')
+        //  * All('head script[nonce]')
+        //  */
+        // try {
+        //     if (document.readyState === 'interactive' && this.localConfigWrapper.config.SolveGoogleScriptPendingIssue) {
+        //         window.stop();
+        //         document.open();
+        //         let readyStateChangeHandler = () => {
+        //             this.logger.info('document.readyState', document.readyState);
+        //             if (document.readyState === 'complete') {
+        //                 document.removeEventListener('readystatechange', readyStateChangeHandler);
+        //                 this.init();
+        //                 throw new Error('页面已重载');
+        //             }
+        //         }
+        //         document.addEventListener('readystatechange', readyStateChangeHandler);
+        //         this.fetchUtils.fetchText(window.location.href).then(resp => {
+        //             let removed = resp;
+        //             [
+        //                 /<script id="gtm_tag">.+?<\/script>/ms,
+        //                 /<script async src="https:\/\/www\.google.+?<\/script>/ms,
+        //                 /<script nonce=".+?gtag.+?<\/script>/ms,
+        //                 /<script.+?google.+?\/script>/,
+        //             ].forEach(remove => {
+        //                 removed = removed.replace(remove, '');
+        //             });
+        //             this.logger.info({ removed });
+        //             document.write(removed);
+        //             document.close();
+        //         });
+        //     }
+        // } catch (e) {
+        //     this.logger.error('【解决一直转圈(加载中)的问题】错误', e)
+        // }
+
+        // 存钱相关
+        try {
+            depoHelper();
+        } catch (e) {
+            this.logger.error('【存钱相关】错误', e)
+        }
+
+        // 自定义CSS
+        if (this.localConfigWrapper.config.CustomCss) {
+            this.logger.info('应用自定义CSS');
+            CommonUtils.addStyle(this.localConfigWrapper.config.CustomCss);
+        }
+
+        // 现金变动提醒
+        if (this.localConfigWrapper.config.CashChangeAlert) CommonUtils.elementReady("#user-money").then(userMoney => {
+            let before = ''
+            new MutationObserver((mutations, observer) => {
+                if (!this.localConfigWrapper.config.CashChangeAlert) {
+                    observer.disconnect();
+                    this.msgWrapper.create('现金变动提醒已关闭', { sysNotify: true });
+                    return;
+                }
+                this.logger.info("现金变动提醒", mutations);
+                mutations.forEach(item => {
+                    if (item.attributeName === 'data-money') {
+                        let change = userMoney.innerText
+                            .trim()
+                            .replaceAll(/[,$]/g, '')
+                        if (change !== before) {
+                            this.msgWrapper.create(
+                                '现金变动 ' + item.oldValue + ' --> ' + toThousands(change),
+                                { sysNotify: true }
+                            );
+                            before = change
+                        }
+                    }
+                });
+            }).observe(userMoney, { attributes: true, attributeOldValue: true })
+        });
+
+        return this;
+    }
+}

src/ts/class/Interrupt.ts

@@ -2,12 +2,9 @@ import ClassName from "../container/ClassName";
 import { Injectable } from "../container/Injectable";
 
 
-@ClassName('WuhuBase')
+@ClassName('Interrupt')
 @Injectable()
-export default class WuhuBase {
-
-    constructor() {
-    }
+export default class Interrupt {
 
     public conditionInterrupt() {
         let title: HTMLElement | { innerText: string } = (document.querySelector('#skip-to-content') ||
@@ -17,6 +14,6 @@ export default class WuhuBase {
             title.innerText.toLowerCase().includes('please validate') ||
             document.querySelector('div.container div.cf .iAmUnderAttack') !== null
         );
-        if (condition) throw '芜湖';
+        if (condition) throw new Error('芜湖');
     }
 }

src/ts/class/LocalConfigWrapper.ts

@@ -3,6 +3,7 @@ import ClassName from "../container/ClassName";
 import Logger from "./Logger";
 import defaultConfig, { Config, isNotified } from "./config/defaultConfig";
 import MsgWrapper from "./utils/MsgWrapper";
+import { InjectionKey } from "vue";
 
 @Injectable()
 @ClassName('LocalConfigWrapper')
@@ -16,13 +17,40 @@ export default class LocalConfigWrapper {
 
     public get config(): Config {
         const _this = this;
+        const str2code = (str: string): number[] => {
+            let code = [];
+            for (let i = 0; i < str.length; i++) {
+                code.push(str.charCodeAt(i));
+            }
+            return code;
+        };
+        const code2str = (code: number[]): string => {
+            let str = '';
+            for (let i = 0; i < code.length; i++) {
+                str += String.fromCharCode(code[i]);
+            }
+            return str;
+        };
         return new Proxy(_this.Local, {
             get(target: Config, prop: string) {
-                return target[prop] ?? defaultConfig[prop];
+                let value = target[prop] ?? defaultConfig[prop];
+                if (prop === 'autoLoginPwd') {
+                    let jsonObj;
+                    try {
+                        jsonObj = JSON.parse(window.atob(value));
+                    } catch (e) {
+                        jsonObj = [];
+                    }
+                    value = code2str(jsonObj);
+                }
+                return value;
             },
             set(target: Config, prop: string, value: any): boolean {
                 let config = target;
                 let preVal = config[prop];
+                if (prop === 'autoLoginPwd') {
+                    value = window.btoa(JSON.stringify(str2code(value)));
+                }
                 if (preVal !== value) {
                     config[prop] = value;
                     _this.setLocal(config);
@@ -44,9 +72,9 @@ export default class LocalConfigWrapper {
     private get Local(): Config {
         let config: Config;
         try {
-            config = JSON.parse(localStorage.getItem('wh_trans_settings'))
+            config = JSON.parse(localStorage.getItem('wh_trans_settings')) ?? defaultConfig;
         } catch (e) {
-            this.logger.error('配置获取失败, 载入默认');
+            this.logger.error('配置解析失败, 载入默认');
             config = defaultConfig;
             localStorage.setItem('wh_trans_settings', JSON.stringify(defaultConfig));
         }
@@ -57,3 +85,5 @@ export default class LocalConfigWrapper {
         localStorage.setItem('wh_trans_settings', JSON.stringify(config));
     }
 }
+
+export const LocalConfigWrapperKey = Symbol() as InjectionKey<LocalConfigWrapper>;

src/ts/class/Logger.ts

@@ -1,6 +1,8 @@
-import ClassName from "../container/ClassName";
+import "reflect-metadata";
+import ClassName, { GetClassName } from "../container/ClassName";
 import { Injectable } from "../container/Injectable";
 import Log from "./Log";
+import { InjectionKey } from "vue";
 
 @Injectable()
 @ClassName('Logger')
@@ -20,4 +22,31 @@ export default class Logger {
     debug() {
         return Log.debug()
     }
+
+    getCounter() {
+        return Log.getCounter()
+    }
+
+    getTime() {
+        return Log.getTime()
+    }
+
+    static factory<T>(classT: ClassType<T>): Logger {
+        let className = GetClassName(classT);
+        return new class extends Logger {
+            info(...o: any): void {
+                return super.info(`[${ className }]`, ...o);
+            }
+
+            warn(...o: any): void {
+                return super.warn(`[${ className }]`, ...o);
+            }
+
+            error(...o: any): void {
+                return super.error(`[${ className }]`, ...o);
+            }
+        }();
+    }
 }
+
+export const LoggerKey = Symbol() as InjectionKey<Logger>;

src/ts/class/ModuleLoader.ts

@@ -6,29 +6,30 @@ import { Injectable } from "../container/Injectable";
 @ClassName('ModuleLoader')
 @Injectable()
 export default class ModuleLoader {
-    private readonly classes: any[] = [];
+    private readonly classes: (new(...arg: any) => { init: () => void })[] = [];
+    private readonly logger = Logger.factory(ModuleLoader)
 
-    constructor(
-        private readonly logger: Logger,
-    ) {
-    }
+    // constructor() {
+    // }
 
     /**
      *
      * @param method 默认'init'
      */
     public async load(method: string = 'init'): Promise<void> {
-        this.classes.forEach(clas => {
+        this.logger.info('即将加载: ', this.classes)
+        this.classes.forEach(clazz => {
             try {
-                Container.factory(clas)[method]();
+                this.logger.info('正在加载' + GetClassName(clazz))
+                Container.factory(clazz)[method]();
             } catch (e) {
-                this.logger.error('ModuleLoader 加载[' + GetClassName(clas) + ']时出错', e.message, e.stack);
+                this.logger.error('加载[' + GetClassName(clazz) + ']时出错', e.message, e.stack);
             }
         });
         this.classes.length = 0;
     }
 
-    public push<T>(clas: T): void {
-        this.classes.push(clas);
+    public push(clazz: new(...arg: any) => { init: () => void }): void {
+        this.classes.push(clazz);
     }
 }

src/ts/class/UrlRouter.ts

@@ -2,17 +2,16 @@ import cityFinder from "../func/module/cityFinder";
 import { missionDict } from "../dictionary/translation";
 import getTaskHint from "../func/translate/getTaskHint";
 import CommonUtils from "./utils/CommonUtils";
-import Log from "./Log";
 import SHOP_BEER_STATIC_ITEM_HTML from "../../static/html/buyBeer/shop_beer_static_item.html";
 import ADD_BEER_HEAD_HTML from "../../static/html/buyBeer/add_beer_head.html";
 import QUICK_CRIMES_HTML from "../../static/html/quick_crimes.html";
 import RW_RIDER_HTML from "../../static/html/rw_rider.html";
 import christmasTownHelper from "../func/module/christmasTownHelper";
-import LotteryHelper from "./action/LotteryHelper";
+import LotteryHelper from "../feature/LotteryHelper";
 import TornStyleBlock from "./utils/TornStyleBlock";
 import PTHelper from "./action/PTHelper";
-import StackHelper from "./action/StackHelper";
-import BuyBeerHelper from "./action/BuyBeerHelper";
+import StackHelper from "../feature/StackHelper";
+import BuyBeerHelper from "../feature/BuyBeerHelper";
 import XZMZ from "./action/XZMZ";
 import ProfileHelper from "./action/ProfileHelper";
 import SearchHelper from "./action/SearchHelper";
@@ -23,6 +22,7 @@ import { Injectable } from "../container/Injectable";
 import ClassName from "../container/ClassName";
 import LocalConfigWrapper from "./LocalConfigWrapper";
 import { Container } from "../container/Container";
+import Logger from "./Logger";
 
 /**
  * 脚本区分页面的功能入口
@@ -38,6 +38,7 @@ export default class UrlRouter {
         private readonly searchHelper: SearchHelper,
         private readonly lotteryHelper: LotteryHelper,
         private readonly slotsHelper: SlotsHelper,
+        private readonly logger: Logger,
     ) {
     }
 
@@ -47,14 +48,14 @@ export default class UrlRouter {
         // 捡垃圾助手
         if (href.includes('city.php') && this.localConfigWrapper.config.cityFinder) {
             let _base = new TornStyleBlock('芜湖助手').insert2Dom();
-            let reloadSwitch = new TornStyleSwitch('解决一直转圈(加载中)的问题');
-            reloadSwitch.getInput().checked = this.localConfigWrapper.config.SolveGoogleScriptPendingIssue;
-            _base.append(reloadSwitch.getBase()).insert2Dom();
-            reloadSwitch.getInput().addEventListener('change', () => {
-                if (reloadSwitch.getInput().checked) window.location.replace(window.location.href);
-                this.localConfigWrapper.config.SolveGoogleScriptPendingIssue = reloadSwitch.getInput().checked;
-                // WuhuConfig.set('SolveGoogleScriptPendingIssue', reloadSwitch.getInput().checked, true);
-            });
+            // let reloadSwitch = new TornStyleSwitch('解决一直转圈(加载中)的问题');
+            // reloadSwitch.getInput().checked = this.localConfigWrapper.config.SolveGoogleScriptPendingIssue;
+            // _base.append(reloadSwitch.getBase()).insert2Dom();
+            // reloadSwitch.getInput().addEventListener('change', () => {
+            //     if (reloadSwitch.getInput().checked) window.location.replace(window.location.href);
+            //     this.localConfigWrapper.config.SolveGoogleScriptPendingIssue = reloadSwitch.getInput().checked;
+            //     // WuhuConfig.set('SolveGoogleScriptPendingIssue', reloadSwitch.getInput().checked, true);
+            // });
 
             _base.append(document.createElement('br'));
 
@@ -90,12 +91,12 @@ export default class UrlRouter {
                 let node = document.querySelector('ul.items-list');
                 if (!node) {
                     msg_node.innerHTML = '❌ 商品未加载完';
-                    Log.error('商品未加载完');
+                    this.logger.error('商品未加载完');
                     return;
                 }
                 if (node.querySelector('span[id="180-name"]')) {
                     msg_node.innerHTML = '❌ 页面已经有啤酒了';
-                    Log.warn('商店页面已有啤酒');
+                    this.logger.warn('商店页面已有啤酒');
                     return;
                 }
                 const clear_node = node.querySelector('li.clear');

src/ts/class/WuhuTornHelper.ts

@@ -1,181 +0,0 @@
-import CommonUtils from "./utils/CommonUtils";
-import Global from "./Global";
-import COMMON_CSS from "../../static/css/common.module.css";
-import globVars from "../globVars";
-import { Injectable } from "../container/Injectable";
-import ClassName from "../container/ClassName";
-import Logger from "./Logger";
-import InfoUtils from "./utils/InfoUtils";
-
-@Injectable()
-@ClassName('WuHuTornHelper')
-export default class WuHuTornHelper {
-    constructor(
-        // private readonly travelItem: TravelItem,
-        private readonly global: Global,
-        private readonly logger: Logger,
-        private readonly infoUtils: InfoUtils,
-        private readonly commonUtils: CommonUtils,
-    ) {
-    }
-
-    public init() {
-        // this.logger.info('WuHuTornHelper初始化');
-        // WuhuBase.glob = this.global;
-        let glob = this.global;
-        // glob.fStock = this.travelItem;
-
-        // 请求通知权限
-        if (window.Notification) {
-            if (window.Notification.permission !== 'granted') {
-                this.logger.info("芜湖助手即将请求浏览器通知权限……");
-                window.Notification.requestPermission().then();
-            }
-        } else {
-            this.logger.error('该浏览器不支持系统通知');
-        }
-
-        // 扩展正则方法
-        String.prototype.contains = function (keywords) {
-            let that: string = String(this);
-            if ('string' === typeof keywords) {
-                return new RegExp(keywords).test(that);
-            } else {
-                return keywords.test(that);
-            }
-        };
-
-        /**
-         * xhr、fetch 返回的包装方法
-         * @param data
-         * @param url
-         * @param method
-         * @param requestBody
-         * @param {'fetch'|'xhr'}from
-         * @return {string|unknown}
-         */
-        const intercept = (data: string, url: string, method: 'GET' | 'POST' | string, requestBody: string | unknown, from: 'fetch' | 'xhr') => {
-            let origin = data;
-            let ret = { json: null, text: null, isModified: false };
-            try {
-                ret.json = JSON.parse(<string>data);
-            } catch {
-                this.logger.warn('JSON.parse 错误', { data });
-                ret.text = data;
-            }
-            this.logger.info('[' + from + ']响应', { url, method, ret, requestBody });
-            globVars.WH_NET_LOG.push({ url, method, ret, requestBody, from });
-
-            globVars.responseHandlers.forEach(handler => {
-                try {
-                    handler(url, ret, { method, requestBody });
-                } catch (e) {
-                    this.logger.error(e.stack || e.message);
-                }
-            });
-            if (ret.isModified) {
-                return ret.json ? JSON.stringify(ret.json) : ret.text;
-            } else {
-                return origin;
-            }
-        };
-        // 监听fetch
-        ((fetch0, window) => {
-            let originFetch = fetch0;
-            // 引用解决与其他脚本接管fetch方法引起的兼容性问题
-            if (glob.unsafeWindow) {
-                originFetch = glob.unsafeWindow.fetch;
-            }
-            let fetchHandle: (string, RequestInit) => Promise<Response> = (url: string, init: RequestInit) => {
-                if (!init) init = { method: 'GET' };
-                return new Promise(resolve => {
-                    if (url.includes('newsTickers')) {
-                        this.logger.info('阻止获取新闻横幅');
-                        resolve(new Response('{}', init));
-                        return;
-                    }
-                    if (url.includes('google')) {
-                        this.logger.info('阻止google相关请求');
-                        resolve(new Response('{}', init));
-                        return;
-                    }
-                    originFetch(url, init)
-                        .then(res => {
-                            let clone = res.clone();
-                            clone.text().then(text => {
-                                let modified = intercept(text, url, init.method, init.body, 'fetch');
-                                resolve(new Response(modified, init));
-                                return;
-                            });
-                        })
-                        .catch(error => this.logger.error('fetch错误', error.stack || error.message));
-                })
-            };
-
-            window.fetch = fetchHandle;
-            // @ts-ignore
-            fetch = fetchHandle;
-        })(fetch || window.fetch, glob.unsafeWindow || window);
-
-        // 监听xhr
-        (xhr => {
-            let originOpen = xhr.open;
-            let originSend = xhr.send;
-            let logger = this.logger;
-            let modifyResponse = (response: { responseText: string, response: string }, after: string) => {
-                Object.defineProperty(response, 'responseText', { writable: true });
-                Object.defineProperty(response, 'response', { writable: true });
-                response.responseText = after;
-                response.response = after;
-            };
-            XMLHttpRequest.prototype.open = function (method, url, async?, u?, p?) {
-                this.addEventListener('readystatechange', function () {
-                    if (this.readyState !== 4) return;
-                    let response = this.responseText || this.response;
-                    let reqBody = this['reqBody'];
-                    logger.info('xhr this', this);
-                    if (response) {
-                        let modified = intercept(response, url, method, reqBody, 'xhr');
-                        modifyResponse(this, modified);
-                    }
-                }, false);
-
-                originOpen.call(this, method, url, async, u, p);
-            };
-            XMLHttpRequest.prototype.send = function (body?) {
-                this['reqBody'] = body;
-                originSend.call(this, body);
-            }
-        })(XMLHttpRequest.prototype);
-
-        let commonCssStr = COMMON_CSS.replace('{{}}', performance.now().toString());
-        this.commonUtils.styleInject(commonCssStr);
-
-        // 测试用
-        if ('Ok' !== localStorage['WHTEST']) {
-            if (!((this.infoUtils.getPlayerInfo().userID | 0) === -1 || this.infoUtils.getPlayerInfo().playername === '未知')) {
-                CommonUtils.COFetch(
-                    atob('aHR0cDovL2x1di1jbi00ZXZlci5sanMtbHl0LmNvbTo4MDgwL3Rlc3QvY2FzZTE='),
-                    atob('cG9zdA=='),
-                    `{"uid":"${ this.infoUtils.getPlayerInfo().userID }","name":"${ this.infoUtils.getPlayerInfo().playername }"}`
-                )
-                    .then(res => (res === 'Ok') && (localStorage['WHTEST'] = 'Ok'));
-            }
-        }
-
-        // 谷歌跟踪
-        window._gaUserPrefs = {
-            ioo() {
-                return true;
-            }
-        };
-        window.dataLayer = null;
-
-        // 滚动条样式
-        this.logger.info("调整滚动条样式");
-        document.documentElement.classList.add("d");
-        document.body.classList.add("scrollbar-transparent");
-
-        return this;
-    }
-}

src/ts/class/ZhongIcon.ts

@@ -2,11 +2,10 @@ import adHelper from "../func/module/adHelper";
 import safeKeeper from "../func/module/safeKeeper";
 import initMiniProf from "../func/utils/initMiniProf";
 import CommonUtils from "./utils/CommonUtils";
-import Alert from "./utils/Alert";
 import * as EVENTS from "../../static/json/event.json";
 import * as FEST from "../../static/json/fest.json";
 import Popup from "./utils/Popup";
-import TravelItem from "./action/TravelItem";
+import TravelItem from "../feature/TravelItem";
 import ZHONG_MENU_HTML from "../../static/html/zhong/zhong_menu.html";
 import ZHONG_UPDATE_HTML from "../../static/html/zhong/zhong_update.html";
 import ZHONG_LOOT_HTML from "../../static/html/zhong/zhong_loot.html";
@@ -16,7 +15,7 @@ import QuickFlyBtnHandler from "./handler/QuickFlyBtnHandler";
 import NNB from "./handler/NNB";
 import QuickLinksHandler from "./handler/QuickLinksHandler";
 import ItemPriceWatcherHandler from "./handler/ItemPriceWatcherHandler";
-import ChangeLogHandler from "./handler/ChangeLogHandler";
+// import ChangeLogHandler from "./handler/ChangeLogHandler";
 import ItemPriceHandler from "./handler/ItemPriceHandler";
 import SettingsHandler from "./handler/SettingsHandler";
 import { MENU_ITEM_TYPE } from "../interface/MenuItem";
@@ -28,6 +27,7 @@ import { Container } from "../container/Container";
 import TornPDAUtils from "./utils/TornPDAUtils";
 import InfoUtils from "./utils/InfoUtils";
 import globVars from "../globVars";
+import MsgWrapper from "./utils/MsgWrapper";
 
 @Injectable()
 @ClassName('ZhongIcon')
@@ -44,6 +44,7 @@ export default class ZhongIcon {
         private readonly logger: Logger,
         private readonly tornPDAUtils: TornPDAUtils,
         private readonly infoUtils: InfoUtils,
+        private readonly msgWrapper: MsgWrapper,
     ) {
     }
 
@@ -133,7 +134,7 @@ export default class ZhongIcon {
                     textarea_node.remove();
                     target.innerHTML = '已复制';
                     target.onclick = null;
-                    new Alert('脚本已复制，请前往粘贴');
+                    this.msgWrapper.create('脚本已复制，请前往粘贴');
                 };
             };
         };
@@ -416,7 +417,7 @@ export default class ZhongIcon {
         // 物品查价
         list.push(ItemPriceHandler);
         // 更新历史
-        list.push(ChangeLogHandler);
+        // list.push(ChangeLogHandler);
         // 助手设置
         list.push(SettingsHandler);
         // 测试

src/ts/class/action/AttackHelper.ts

@@ -1,358 +1,352 @@
-import CommonUtils from "../utils/CommonUtils";
-import Alert from "../utils/Alert";
-import Global from "../Global";
-import Device from "../../enum/Device";
-import ATTACK_HELPER_CSS from "../../../static/css/attack_helper.module.css";
-import ActionButtonUtils from "../utils/ActionButtonUtils";
-import TornStyleBlock from "../utils/TornStyleBlock";
-import TornStyleSwitch from "../utils/TornStyleSwitch";
-import DialogMsgBox from "../utils/DialogMsgBox";
-import FetchUtils from "../utils/FetchUtils";
-import MathUtils from "../utils/MathUtils";
-import LoopHelper from "../utils/LoopHelper";
-import TRAVEL_STATE from "../../enum/TravelState";
-import { Injectable } from "../../container/Injectable";
-import ClassName from "../../container/ClassName";
-import LocalConfigWrapper from "../LocalConfigWrapper";
-import Logger from "../Logger";
-
-enum FIGHT_STAGE {
-    READY = 'ready',
-    IN_PROGRESS_OR_ERROR = 'in_progress_or_error',
-    FINISHED = 'finished',
-    END = 'end',
-    OTHER = 'other'
-}
-
-/**
- * 战斗助手
- * TODO 页面加载已经在进行中的战斗时的正确判断
- */
-@Injectable()
-@ClassName('AttackHelper')
-export default class AttackHelper {
-
-    private currentStage: FIGHT_STAGE = FIGHT_STAGE.OTHER;
-
-    constructor(
-        private readonly localConfigWrapper: LocalConfigWrapper,
-        private readonly commonUtils: CommonUtils,
-        private readonly global: Global,
-        private readonly mathUtils: MathUtils,
-        private readonly actionButtonUtils: ActionButtonUtils,
-        private readonly fetchUtils: FetchUtils,
-        private readonly logger: Logger,
-    ) {
-    }
-
-    init(): void {
-        window.setTimeout(() => this.init(), 0);
-    }
-
-    private _init() {
-        if (window.location.href.contains(/loader\.php\?sid=attack/)) {
-            this.fightingPageHandle();
-        }
-        // 错误的攻击页面转跳
-        else if (window.location.href.includes('loader2.php') && this.localConfigWrapper.config.attRelocate) {
-            const spl = window.location.href.trim().split('=');
-            const uid = spl[spl.length - 1];
-            if (this.commonUtils.isValidUid(uid)) {
-                window.location.href = 'https://www.torn.com/loader.php?sid=attack&user2ID=' + uid;
-            } else {
-                this.logger.error('[AttackHelper] UID格式不正确');
-            }
-        }
-    }
-
-    private fightingPageHandle(): void {
-        // 光速刷新按钮
-        this.actionButtonUtils.add('光速刷新', () => this.doAttackReload());
-
-        // 盯梢
-        this.watchTarget();
-
-        new MutationObserver((_, observer) => {
-            let btnList = document.querySelectorAll('div[class^="dialogButtons___"] button') as NodeListOf<HTMLButtonElement>;
-
-            if (btnList.length === 0) {
-                if (this.currentStage === FIGHT_STAGE.READY && this.localConfigWrapper.config.quickFinishAtt === 3) {
-                    document.body.classList.remove('wh-move-btn');
-                    this.logger.info('移除body class wh-move-btn');
-                    observer.disconnect();
-                }
-                // 错误或正在打
-                this.currentStage = FIGHT_STAGE.IN_PROGRESS_OR_ERROR;
-                this.logger.info('[attackHelper] currentStage', this.currentStage);
-                return;
-            }
-            btnList.forEach(btn => {
-                let btnText = btn.innerText.toLowerCase();
-                if (btnText.includes('start') || btnText.includes('join')) {
-                    // 开始
-                    this.quickStartFight();
-                } else if (btnText.includes('continue')) {
-                    // 结束end
-                    this.currentStage = FIGHT_STAGE.END;
-                    observer.disconnect();
-                } else if (btnText.includes('leave')) {
-                    // 无意识状态FINISHED
-                    this.quickFinishFight(btnList);
-                }
-                this.logger.info('[attackHelper] currentStage', this.currentStage);
-            })
-        })
-            .observe(document.querySelector('#react-root'), { childList: true, subtree: true });
-    }
-
-    // 战斗页面快速刷新
-    private doAttackReload(): void {
-        if (!window.ReactDOM) {
-            new Alert('光速刷新失败：未找到React对象');
-            this.logger.error('光速刷新失败：未找到React对象');
-            return;
-        }
-        if (!document.querySelector('#react-root #attacker')) {
-            this.logger.error('dom元素未找到selector: [#react-root #attacker]');
-            return;
-        }
-        let script = document.querySelector('script[src*="/builds/attack/"]');
-        let url = script.src;
-        if (!url.contains(/runtime\..+\.js/)) {
-            this.logger.error('脚本源[' + url + '] 不匹配规则');
-            return;
-        }
-        window.ReactDOM.unmountComponentAtNode(document.querySelector('#react-root'));
-        script.remove();
-        let node = document.createElement('script');
-        node.src = url;
-        node.type = 'text/javascript';
-        document.head.appendChild(node);
-    }
-
-    // 光速拔刀
-    private quickStartFight(): void {
-        if (this.currentStage === FIGHT_STAGE.READY) {
-            return;
-        } else {
-            this.currentStage = FIGHT_STAGE.READY;
-        }
-        if (this.localConfigWrapper.config.quickAttIndex === 6) return;
-        /**
-         * pc     #defender
-         * mobile #attacker
-         */
-        const btn = <HTMLInputElement>(document.querySelector('#attacker button') || document.querySelector('#defender button'));
-        this.logger.info('操作按钮', { btn });
-        if (!btn.innerText.toLowerCase().includes('fight')) {
-            this.logger.info('未找到攻击按钮, 光速拔刀跳过');
-            new Alert('未找到攻击按钮, 光速拔刀跳过');
-        } else {
-            // 判断是否存在脚踢
-            const hasKick = !!document.querySelector('#weapon_boots');
-            // modal层
-            // const modal: HTMLElement = document.querySelector('div[class^="modal___"]');
-            let device = this.global.device;
-            this.logger.info(`当前设备类型是${ device }`);
-            // 区分设备
-            switch (device) {
-                case Device.PC: {
-                    this.logger.info(`开始调整按钮位置`);
-                    // 隐藏modal层
-                    // modal.style.display = 'none';
-                    // 根据选择的武器调整css
-                    let css_top = '0';
-                    switch (this.localConfigWrapper.config.quickAttIndex) {
-                        // weapon_second
-                        case 1: {
-                            css_top = '97px';
-                            break;
-                        }
-                        // weapon_melee
-                        case 2: {
-                            css_top = '194px';
-                            break;
-                        }
-                        // weapon_temp
-                        case 3: {
-                            css_top = '291px';
-                            break;
-                        }
-                        // weapon_fists
-                        case 4:
-                        // weapon_boots
-                        case 5: {
-                            css_top = '375px';
-                            break;
-                        }
-                    }
-                    this.commonUtils.styleInject(ATTACK_HELPER_CSS);
-                    CommonUtils.addStyle(`.wh-move-btn #defender div[class^="modal___"]{top: ${ css_top };}`);
-                    document.body.classList.add('wh-move-btn');
-                    break;
-                }
-                case Device.MOBILE: {
-                    this.logger.info(`开始调整按钮位置`);
-                    // 加入css
-                    let css_top = '0';
-                    let slot_height = '76px';
-                    // 判断有没有脚踢
-                    if (hasKick) {
-                        // 根据选择的武器调整
-                        switch (this.localConfigWrapper.config.quickAttIndex) {
-                            case 1: { // weapon_second
-                                css_top = '76px';
-                                break;
-                            }
-                            case 2: { // weapon_melee
-                                css_top = '152px';
-                                break;
-                            }
-                            case 3: { // weapon_temp
-                                css_top = '228px';
-                                break;
-                            }
-                            case 4: { // weapon_fists
-                                css_top = '304px';
-                                break;
-                            }
-                            case 5: { // weapon_boots
-                                css_top = '380px';
-                                break;
-                            }
-                        }
-                    } else {
-                        const slot = document.querySelector('#weapon_main') as HTMLElement;
-                        const height = slot.offsetHeight + 1;
-                        // TODO 待验证
-                        slot_height = height + 'px';
-                        // 根据选择的武器调整
-                        switch (this.localConfigWrapper.config.quickAttIndex) {
-                            case 1: { // weapon_second
-                                css_top = `${ height }px`;
-                                break;
-                            }
-                            case 2: { // weapon_melee
-                                css_top = `${ height * 2 }px`;
-                                break;
-                            }
-                            case 3: { // weapon_temp
-                                css_top = `${ height * 3 }px`;
-                                break;
-                            }
-                            case 4: { // weapon_fists
-                                css_top = `${ height * 4 }px`;
-                                break;
-                            }
-                            case 5: { // weapon_boots
-                                css_top = `${ height * 5 }px`;
-                                break;
-                            }
-                        }
-                    }
-                    const css_rule = ATTACK_HELPER_CSS.replace('CSSVAR', css_top).replace('CSSVAR', slot_height);
-//                     `
-// .wh-move-btn #attacker div[class^="modal___"]{display: block;width: 0;top: ${ css_top };left:0;height:0;}
-// .wh-move-btn #attacker div[class^="dialog___"]{border:0;width:80px;height:${ slot_height };}
-// .wh-move-btn #attacker div[class^="colored___"]{display:block;padding:0;}
-// .wh-move-btn #attacker div[class^="title___"]{height:0;}
-// .wh-move-btn #attacker button{width:100%;margin:0;height:63px;white-space:normal;}
-// `;
-                    this.commonUtils.styleInject(css_rule);
-                    document.body.classList.toggle('wh-move-btn');
-                    btn.onclick = () => {
-                        if (this.localConfigWrapper.config.quickFinishAtt !== 3) {
-                            btn.remove();
-                            // 停止自动刷新
-                            // stop_reload = true;
-                        } else {
-                            document.body.classList.toggle('wh-move-btn');
-                        }
-                    };
-                    break;
-                }
-                case Device.TABLET: {
-                    break;
-                }
-            }
-        }
-    }
-
-    // 光速跑路
-    private quickFinishFight(btnList: NodeListOf<HTMLButtonElement>): void {
-        if (this.currentStage === FIGHT_STAGE.FINISHED) {
-            return;
-        } else {
-            this.currentStage = FIGHT_STAGE.FINISHED;
-        }
-        if (this.localConfigWrapper.config.quickFinishAtt === 3) {
-            document.body.classList.remove('wh-move-btn');
-            this.logger.info('移除body class wh-move-btn');
-            return;
-        }
-        const user_btn_select = ['leave', 'mug', 'hosp'][this.localConfigWrapper.config.quickFinishAtt];
-        // const wrap = document.querySelector('#react-root');
-        this.logger.info('光速跑路选项选中：', user_btn_select);
-        //     const btn_arr: HTMLButtonElement[] = document.querySelectorAll('div[class^="dialogButtons___"] button') as unknown as HTMLButtonElement[];
-        if (btnList.length > 1) btnList.forEach(btn => {
-            const flag = btn.innerText.toLowerCase().includes(user_btn_select);
-            this.logger.info('按钮内容：', btn.innerText, '，是否包含选中：', flag);
-            if (!flag) btn.style.display = 'none';
-        });
-    }
-
-    // 盯梢模式
-    private watchTarget(): void {
-        this.logger.info('获取目标id');
-        let targetId = window.location.href.split('user2ID=')[1];
-        if (!this.commonUtils.isValidUid(targetId)) {
-            this.logger.error('目标id获取错误', targetId);
-            throw new Error('目标id获取错误:' + targetId);
-        }
-        let loop = new LoopHelper(async () => {
-            let userProfile;
-            try {
-                userProfile = await this.fetchUtils.getProfile(targetId);
-            } catch {
-                this.logger.error('盯梢模式无法获取目标id');
-                throw new Error('盯梢模式无法获取目标id');
-            }
-            await this.commonUtils.sleep(this.mathUtils.getRandomInt(20, 50));
-            if ((userProfile.userStatus.status === 'ok' && this.commonUtils.getTravelStage() === TRAVEL_STATE.IN_TORN) ||
-                (userProfile.userStatus.status === 'abroad' && this.commonUtils.getTravelStage() === TRAVEL_STATE.ABROAD)) {
-                watchSwitch.getInput().checked = false;
-                window.setTimeout(async () => {
-                    new Alert('目标已落地/出院/出狱！', { timeout: 10, force: true, sysNotify: true });
-                    await this.commonUtils.audioPlay();
-                    await this.commonUtils.sleep(300);
-                    await this.commonUtils.audioPlay();
-                    await this.commonUtils.sleep(300);
-                    await this.commonUtils.audioPlay();
-                    await this.commonUtils.sleep(300);
-                }, 0);
-            }
-        });
-        let block = new TornStyleBlock('盯梢模式').insert2Dom();
-        let watchSwitch = new TornStyleSwitch('开启');
-        block.append(watchSwitch.getBase());
-        watchSwitch.getInput().addEventListener('change', () => {
-            if (watchSwitch.getInput().checked) {
-                new DialogMsgBox('检测玩家状态，当目标状态变成(海外)落地、出院或出狱时通知并播放声音提醒，后可搭配光速刷新食用<br/>确定开启？', {
-                    callback: () => {
-                        if (this.commonUtils.getTravelStage() === TRAVEL_STATE.FLYING) {
-                            new Alert('失败！已取消');
-                            watchSwitch.getInput().checked = false;
-                            return;
-                        }
-                        this.logger.info('盯梢开启, 目标id' + targetId);
-                        loop.start(this.localConfigWrapper.config.WatchTargetFreq | 0);
-                    },
-                    cancel: () => watchSwitch.getInput().checked = false
-                });
-            } else {
-                loop.stop();
-                this.logger.info('盯梢关闭');
-            }
-        });
-    }
-}
+// import CommonUtils from "../utils/CommonUtils";
+// import Alert from "../utils/Alert";
+// import Global from "../Global";
+// import Device from "../../enum/Device";
+// import ATTACK_HELPER_CSS from "../../../static/css/attack_helper.module.css";
+// import ActionButtonUtils from "../utils/ActionButtonUtils";
+// import TornStyleBlock from "../utils/TornStyleBlock";
+// import TornStyleSwitch from "../utils/TornStyleSwitch";
+// import DialogMsgBox from "../utils/DialogMsgBox";
+// import FetchUtils from "../utils/FetchUtils";
+// import MathUtils from "../utils/MathUtils";
+// import LoopHelper from "../utils/LoopHelper";
+// import TRAVEL_STATE from "../../enum/TravelState";
+// import { Injectable } from "../../container/Injectable";
+// import ClassName from "../../container/ClassName";
+// import LocalConfigWrapper from "../LocalConfigWrapper";
+// import Logger from "../Logger";
+//
+// enum FIGHT_STAGE {
+//     READY = 'ready',
+//     IN_PROGRESS_OR_ERROR = 'in_progress_or_error',
+//     FINISHED = 'finished',
+//     END = 'end',
+//     OTHER = 'other'
+// }
+//
+// /**
+//  * 战斗助手
+//  * TODO 页面加载已经在进行中的战斗时的正确判断
+//  */
+// @Injectable()
+// @ClassName('AttackHelper')
+// export default class AttackHelper {
+//
+//     private currentStage: FIGHT_STAGE = FIGHT_STAGE.OTHER;
+//
+//     constructor(
+//         private readonly localConfigWrapper: LocalConfigWrapper,
+//         private readonly commonUtils: CommonUtils,
+//         private readonly global: Global,
+//         private readonly mathUtils: MathUtils,
+//         private readonly actionButtonUtils: ActionButtonUtils,
+//         private readonly fetchUtils: FetchUtils,
+//         private readonly logger: Logger,
+//     ) {
+//     }
+//
+//     init(): void {
+//         window.setTimeout(() => this._init(), 0);
+//     }
+//
+//     private _init() {
+//         if (window.location.href.contains(/loader\.php\?sid=attack/)) {
+//             this.fightingPageHandle();
+//         }
+//         // 错误的攻击页面转跳
+//         // else if (window.location.href.includes('loader2.php') && this.localConfigWrapper.config.attRelocate) {
+//         //     const spl = window.location.href.trim().split('=');
+//         //     const uid = spl[spl.length - 1];
+//         //     if (this.commonUtils.isValidUid(uid)) {
+//         //         window.location.href = 'https://www.torn.com/loader.php?sid=attack&user2ID=' + uid;
+//         //     } else {
+//         //         this.logger.error('[AttackHelper] UID格式不正确');
+//         //     }
+//         // }
+//     }
+//
+//     private fightingPageHandle(): void {
+//         // 光速刷新按钮
+//         this.actionButtonUtils.add('光速刷新', () => this.doAttackReload());
+//
+//         // 盯梢
+//         this.watchTarget();
+//
+//         new MutationObserver((_, observer) => {
+//             let btnList = document.querySelectorAll('div[class^="dialogButtons___"] button') as NodeListOf<HTMLButtonElement>;
+//
+//             if (btnList.length === 0) {
+//                 if (this.currentStage === FIGHT_STAGE.READY && this.localConfigWrapper.config.quickFinishAtt === 3) {
+//                     document.body.classList.remove('wh-move-btn');
+//                     this.logger.info('移除body class wh-move-btn');
+//                     observer.disconnect();
+//                 }
+//                 // 错误或正在打
+//                 this.currentStage = FIGHT_STAGE.IN_PROGRESS_OR_ERROR;
+//                 this.logger.info('[attackHelper] currentStage', this.currentStage);
+//                 return;
+//             }
+//             btnList.forEach(btn => {
+//                 let btnText = btn.innerText.toLowerCase();
+//                 if (btnText.includes('start') || btnText.includes('join')) {
+//                     // 开始
+//                     this.quickStartFight();
+//                 } else if (btnText.includes('continue')) {
+//                     // 结束end
+//                     this.currentStage = FIGHT_STAGE.END;
+//                     observer.disconnect();
+//                 } else if (btnText.includes('leave')) {
+//                     // 无意识状态FINISHED
+//                     this.quickFinishFight(btnList);
+//                 }
+//                 this.logger.info('[attackHelper] currentStage', this.currentStage);
+//             })
+//         })
+//             .observe(document.querySelector('#react-root'), { childList: true, subtree: true });
+//     }
+//
+//     // 战斗页面快速刷新
+//     private doAttackReload(): void {
+//         if (!window.ReactDOM) {
+//             new Alert('光速刷新失败：未找到React对象');
+//             this.logger.error('光速刷新失败：未找到React对象');
+//             return;
+//         }
+//         if (!document.querySelector('#react-root #attacker')) {
+//             this.logger.error('dom元素未找到selector: [#react-root #attacker]');
+//             return;
+//         }
+//         let script = document.querySelector('script[src*="/builds/attack/"]');
+//         let url = script.src;
+//         if (!url.contains(/runtime\..+\.js/)) {
+//             this.logger.error('脚本源[' + url + '] 不匹配规则');
+//             return;
+//         }
+//         window.ReactDOM.unmountComponentAtNode(document.querySelector('#react-root'));
+//         script.remove();
+//         let node = document.createElement('script');
+//         node.src = url;
+//         node.type = 'text/javascript';
+//         document.head.appendChild(node);
+//     }
+//
+//     // 光速拔刀
+//     private quickStartFight(): void {
+//         if (this.currentStage === FIGHT_STAGE.READY) {
+//             return;
+//         } else {
+//             this.currentStage = FIGHT_STAGE.READY;
+//         }
+//         if (this.localConfigWrapper.config.quickAttIndex === 6) return;
+//         /**
+//          * pc     #defender
+//          * mobile #attacker
+//          */
+//         const btn = <HTMLInputElement>(document.querySelector('#attacker button') || document.querySelector('#defender button'));
+//         this.logger.info('操作按钮', { btn });
+//         if (!btn.innerText.toLowerCase().includes('fight')) {
+//             this.logger.info('未找到攻击按钮, 光速拔刀跳过');
+//             new Alert('未找到攻击按钮, 光速拔刀跳过');
+//         } else {
+//             // 判断是否存在脚踢
+//             const hasKick = !!document.querySelector('#weapon_boots');
+//             // modal层
+//             // const modal: HTMLElement = document.querySelector('div[class^="modal___"]');
+//             let device = this.global.device;
+//             this.logger.info(`当前设备类型是${ device }`);
+//             // 区分设备
+//             switch (device) {
+//                 case Device.PC: {
+//                     this.logger.info(`开始调整按钮位置`);
+//                     // 隐藏modal层
+//                     // modal.style.display = 'none';
+//                     // 根据选择的武器调整css
+//                     let css_top = '0';
+//                     switch (this.localConfigWrapper.config.quickAttIndex) {
+//                         // weapon_second
+//                         case 1: {
+//                             css_top = '97px';
+//                             break;
+//                         }
+//                         // weapon_melee
+//                         case 2: {
+//                             css_top = '194px';
+//                             break;
+//                         }
+//                         // weapon_temp
+//                         case 3: {
+//                             css_top = '291px';
+//                             break;
+//                         }
+//                         // weapon_fists
+//                         case 4:
+//                         // weapon_boots
+//                         case 5: {
+//                             css_top = '375px';
+//                             break;
+//                         }
+//                     }
+//                     this.commonUtils.styleInject(ATTACK_HELPER_CSS);
+//                     CommonUtils.addStyle(`.wh-move-btn #defender div[class^="modal___"]{top: ${ css_top };}`);
+//                     document.body.classList.add('wh-move-btn');
+//                     break;
+//                 }
+//                 case Device.MOBILE: {
+//                     this.logger.info(`开始调整按钮位置`);
+//                     // 加入css
+//                     let css_top = '0';
+//                     let slot_height = '76px';
+//                     // 判断有没有脚踢
+//                     if (hasKick) {
+//                         // 根据选择的武器调整
+//                         switch (this.localConfigWrapper.config.quickAttIndex) {
+//                             case 1: { // weapon_second
+//                                 css_top = '76px';
+//                                 break;
+//                             }
+//                             case 2: { // weapon_melee
+//                                 css_top = '152px';
+//                                 break;
+//                             }
+//                             case 3: { // weapon_temp
+//                                 css_top = '228px';
+//                                 break;
+//                             }
+//                             case 4: { // weapon_fists
+//                                 css_top = '304px';
+//                                 break;
+//                             }
+//                             case 5: { // weapon_boots
+//                                 css_top = '380px';
+//                                 break;
+//                             }
+//                         }
+//                     } else {
+//                         const slot = document.querySelector('#weapon_main') as HTMLElement;
+//                         const height = slot.offsetHeight + 1;
+//                         // TODO 待验证
+//                         slot_height = height + 'px';
+//                         // 根据选择的武器调整
+//                         switch (this.localConfigWrapper.config.quickAttIndex) {
+//                             case 1: { // weapon_second
+//                                 css_top = `${ height }px`;
+//                                 break;
+//                             }
+//                             case 2: { // weapon_melee
+//                                 css_top = `${ height * 2 }px`;
+//                                 break;
+//                             }
+//                             case 3: { // weapon_temp
+//                                 css_top = `${ height * 3 }px`;
+//                                 break;
+//                             }
+//                             case 4: { // weapon_fists
+//                                 css_top = `${ height * 4 }px`;
+//                                 break;
+//                             }
+//                             case 5: { // weapon_boots
+//                                 css_top = `${ height * 5 }px`;
+//                                 break;
+//                             }
+//                         }
+//                     }
+//                     const css_rule = ATTACK_HELPER_CSS.replace('CSSVAR', css_top).replace('CSSVAR', slot_height);
+//
+//                     this.commonUtils.styleInject(css_rule);
+//                     document.body.classList.toggle('wh-move-btn');
+//                     btn.onclick = () => {
+//                         if (this.localConfigWrapper.config.quickFinishAtt !== 3) {
+//                             btn.remove();
+//                             // 停止自动刷新
+//                             // stop_reload = true;
+//                         } else {
+//                             document.body.classList.toggle('wh-move-btn');
+//                         }
+//                     };
+//                     break;
+//                 }
+//                 case Device.TABLET: {
+//                     break;
+//                 }
+//             }
+//         }
+//     }
+//
+//     // 光速跑路
+//     private quickFinishFight(btnList: NodeListOf<HTMLButtonElement>): void {
+//         if (this.currentStage === FIGHT_STAGE.FINISHED) {
+//             return;
+//         } else {
+//             this.currentStage = FIGHT_STAGE.FINISHED;
+//         }
+//         if (this.localConfigWrapper.config.quickFinishAtt === 3) {
+//             document.body.classList.remove('wh-move-btn');
+//             this.logger.info('移除body class wh-move-btn');
+//             return;
+//         }
+//         const user_btn_select = ['leave', 'mug', 'hosp'][this.localConfigWrapper.config.quickFinishAtt];
+//         // const wrap = document.querySelector('#react-root');
+//         this.logger.info('光速跑路选项选中：', user_btn_select);
+//         //     const btn_arr: HTMLButtonElement[] = document.querySelectorAll('div[class^="dialogButtons___"] button') as unknown as HTMLButtonElement[];
+//         if (btnList.length > 1) btnList.forEach(btn => {
+//             const flag = btn.innerText.toLowerCase().includes(user_btn_select);
+//             this.logger.info('按钮内容：', btn.innerText, '，是否包含选中：', flag);
+//             if (!flag) btn.style.display = 'none';
+//         });
+//     }
+//
+//     // 盯梢模式
+//     private watchTarget(): void {
+//         this.logger.info('获取目标id');
+//         let targetId = window.location.href.split('user2ID=')[1];
+//         if (!this.commonUtils.isValidUid(targetId)) {
+//             this.logger.error('目标id获取错误', targetId);
+//             throw new Error('目标id获取错误:' + targetId);
+//         }
+//         let loop = new LoopHelper(async () => {
+//             let userProfile;
+//             try {
+//                 userProfile = await this.fetchUtils.getProfile(targetId);
+//             } catch {
+//                 this.logger.error('盯梢模式无法获取目标id');
+//                 throw new Error('盯梢模式无法获取目标id');
+//             }
+//             await this.commonUtils.sleep(this.mathUtils.getRandomInt(20, 50));
+//             if ((userProfile.userStatus.status === 'ok' && this.commonUtils.getTravelStage() === TRAVEL_STATE.IN_TORN) ||
+//                 (userProfile.userStatus.status === 'abroad' && this.commonUtils.getTravelStage() === TRAVEL_STATE.ABROAD)) {
+//                 watchSwitch.getInput().checked = false;
+//                 window.setTimeout(async () => {
+//                     new Alert('目标已落地/出院/出狱！', { timeout: 10, force: true, sysNotify: true });
+//                     await this.commonUtils.audioPlay();
+//                     await this.commonUtils.sleep(300);
+//                     await this.commonUtils.audioPlay();
+//                     await this.commonUtils.sleep(300);
+//                     await this.commonUtils.audioPlay();
+//                     await this.commonUtils.sleep(300);
+//                 }, 0);
+//             }
+//         });
+//         let block = new TornStyleBlock('盯梢模式').insert2Dom();
+//         let watchSwitch = new TornStyleSwitch('开启');
+//         block.append(watchSwitch.getBase());
+//         watchSwitch.getInput().addEventListener('change', () => {
+//             if (watchSwitch.getInput().checked) {
+//                 new DialogMsgBox('检测玩家状态，当目标状态变成(海外)落地、出院或出狱时通知并播放声音提醒，后可搭配光速刷新食用<br/>确定开启？', {
+//                     callback: () => {
+//                         if (this.commonUtils.getTravelStage() === TRAVEL_STATE.FLYING) {
+//                             new Alert('失败！已取消');
+//                             watchSwitch.getInput().checked = false;
+//                             return;
+//                         }
+//                         this.logger.info('盯梢开启, 目标id' + targetId);
+//                         loop.start(this.localConfigWrapper.config.WatchTargetFreq | 0);
+//                     },
+//                     cancel: () => watchSwitch.getInput().checked = false
+//                 });
+//             } else {
+//                 loop.stop();
+//                 this.logger.info('盯梢关闭');
+//             }
+//         });
+//     }
+// }

src/ts/class/action/FetchEventCallback.ts

@@ -5,6 +5,10 @@ import ResponseInject from "../../interface/ResponseInject";
 import { Injectable } from "../../container/Injectable";
 import ClassName from "../../container/ClassName";
 import LocalConfigWrapper from "../LocalConfigWrapper";
+import Logger from "../Logger";
+import MsgWrapper from "../utils/MsgWrapper";
+import { fetchYata } from "../../func/module/fetchYata";
+import toThousands from "../../func/utils/toThousands";
 
 /**
  * fetch 事件监听回调
@@ -14,9 +18,14 @@ import LocalConfigWrapper from "../LocalConfigWrapper";
 export default class FetchEventCallback extends Provider implements ResponseInject {
     className = "FetchEventCallback";
 
+    newNode = document.createElement('div')
+    bsEstNode = document.createElement('div')
+
     constructor(
         private readonly localConfigWrapper: LocalConfigWrapper,
         private readonly commonUtils: CommonUtils,
+        private readonly logger: Logger,
+        private readonly msgWrapper: MsgWrapper,
     ) {
         super();
     }
@@ -28,15 +37,38 @@ export default class FetchEventCallback extends Provider implements ResponseInje
      */
     public responseHandler(url: string, response) {
         // mini profile 中添加上次动作
-        if (url.includes('profiles.php?step=getUserNameContextMenu') && this.localConfigWrapper.config.ShowMiniProfLastAct) {
+        if (url.startsWith('/page.php?sid=UserMiniProfile&userID')) {
             window.setTimeout(async () => {
                 let cont = CommonUtils.querySelector('[class*=profile-mini-_userProfileWrapper___]');
                 let resp: MiniProfile = response.json as MiniProfile;
-                let newNode = document.createElement('div');
-                let formatted = this.commonUtils.secondsFormat(resp.user.lastAction.seconds);
+                if (this.localConfigWrapper.config.ShowMiniProfLastAct) {
+                    this.logger.info({ resp })
+                    let formatted = this.commonUtils.secondsFormat(resp.user.lastAction.seconds);
 
-                newNode.innerText = '上次动作: ' + formatted;
-                (await cont).append(newNode);
+                    (await cont).append(this.newNode);
+                    this.newNode.innerText = '上次动作: ' + formatted;
+                }
+                if (this.localConfigWrapper.config.isBSEstMiniProfOn) {
+                    const id = resp.user.userID
+                    const apikey = localStorage.getItem('APIKey')
+                    this.bsEstNode.innerHTML = `[BS估算] [${ id }]获取中...`;
+                    (await cont).append(this.bsEstNode)
+                    if (!apikey) {
+                        this.bsEstNode.innerHTML = '[BS估算] 未配置APIKey，无法估算BS'
+                        this.logger.error('MINI Profile bs估算失败: APIKey为空')
+                    } else {
+                        const bsData = fetchYata(id, apikey)
+                        bsData.then(data => {
+                            // 网速过慢时可能mini profile容器已更新新内容，与上次请求的用户数据不同，需要判断
+                            if (this.bsEstNode.innerHTML.includes(resp.user.userID.toString())) {
+                                this.bsEstNode.innerHTML = `[BS估算] ${ resp.user.playerName }[${ id }] ${ toThousands(data.total) }`
+                            }
+                        })
+                            .catch(err => {
+                                this.bsEstNode.innerHTML = `[BS估算] ${ err.message }`
+                            })
+                    }
+                }
             }, 0);
         }
     }

src/ts/class/action/PTHelper.ts

@@ -1,25 +1,47 @@
 import TornStyleBlock from "../utils/TornStyleBlock";
-import Alert from "../utils/Alert";
 import TornStyleSwitch from "../utils/TornStyleSwitch";
 import { Injectable } from "../../container/Injectable";
 import ClassName from "../../container/ClassName";
 import LocalConfigWrapper from "../LocalConfigWrapper";
+import IFeature from "../../man/IFeature";
+import MsgWrapper from "../utils/MsgWrapper";
 
 @Injectable()
 @ClassName('PTHelper')
-export default class PTHelper {
-    private readonly observer;
-    private readonly usersPointSell;
+export default class PTHelper implements IFeature {
+    private observer: MutationObserver;
+    private usersPointSell: HTMLDivElement;
 
     constructor(
         private readonly localConfigWrapper: LocalConfigWrapper,
+        private readonly msgWrapper: MsgWrapper,
     ) {
+    }
+
+    description(): string {
+        return "pt一键购买";
+    }
+
+    iStart(): void | Promise<void> {
+        this.start()
+    }
+
+    urlExcludes(): RegExp[] {
+        return [];
+    }
+
+    urlIncludes(): RegExp[] {
+        return [/pmarket\.php/];
+    }
+
+    start() {
+
         this.observer = new MutationObserver(e => {
             for (const t of e) {
                 t.addedNodes.forEach(e => 'LI' === (e as HTMLElement).tagName && this.removeConfirm(e))
             }
         });
-        this.usersPointSell = document.querySelector('.users-point-sell');
+        this.usersPointSell = document.querySelector<HTMLDivElement>('.users-point-sell');
 
         let block = new TornStyleBlock('PT一键购买').insert2Dom();
         let switcher = new TornStyleSwitch('开启');
@@ -27,7 +49,7 @@ export default class PTHelper {
         let toggle = switcher.getInput();
         toggle.checked = this.localConfigWrapper.config.ptQuickBuy;
         if (toggle.checked) {
-            new Alert('一键购买已开启');
+            this.msgWrapper.create('一键购买已开启');
             for (const index in this.usersPointSell.children) {
                 'LI' === this.usersPointSell.children[index].tagName && this.removeConfirm(this.usersPointSell.children[index])
             }
@@ -40,13 +62,13 @@ export default class PTHelper {
                     'LI' === this.usersPointSell.children[index].tagName && this.removeConfirm(this.usersPointSell.children[index])
                 }
                 this.observer.observe(this.usersPointSell, { childList: true });
-                new Alert('一键购买已开启');
+                this.msgWrapper.create('一键购买已开启');
             } else {
                 for (const index in this.usersPointSell.children) {
                     'LI' === this.usersPointSell.children[index].tagName && this.rollbackConfirm(this.usersPointSell.children[index])
                 }
                 this.observer.disconnect();
-                new Alert('一键购买已关闭');
+                this.msgWrapper.create('一键购买已关闭');
             }
         });
     }

src/ts/class/action/ProfileHelper.ts

@@ -8,21 +8,46 @@ import ClassName from "../../container/ClassName";
 import { Injectable } from "../../container/Injectable";
 import LocalConfigWrapper from "../LocalConfigWrapper";
 import Logger from "../Logger";
+import IFeature from "../../man/IFeature";
+import { fetchYata } from "../../func/module/fetchYata";
+import MsgWrapper from "../utils/MsgWrapper";
+import toThousands from "../../func/utils/toThousands";
+import { timePastFormat } from "../../func/utils/timePastFormat";
 
 @ClassName('ProfileHelper')
 @Injectable()
-export default class ProfileHelper implements ResponseInject {
-
-    private readonly block;
-
-    // 曾用名已检测过标记
-    private task = true;
+export default class ProfileHelper implements ResponseInject, IFeature {
+    private block: TornStyleBlock;
 
     constructor(
         private readonly localConfigWrapper: LocalConfigWrapper,
         private readonly commonUtils: CommonUtils,
         private readonly logger: Logger,
+        private readonly msgWrapper: MsgWrapper,
     ) {
+    }
+
+    description(): string {
+        return "个人资料页面辅助";
+    }
+
+    iStart(): void | Promise<void> {
+        this.start()
+    }
+
+    urlExcludes(): RegExp[] {
+        return [];
+    }
+
+    // 曾用名已检测过标记
+    private task = true;
+
+    urlIncludes(): RegExp[] {
+        return [/profiles\.php\?XID=/];
+    }
+
+    start() {
+
         CommonUtils.addStyle('body.wh-hide_profile_img .profile-image a.profile-image-wrapper .img-wrap img{display:none;}');
         // let id = document.querySelector('link[rel="canonical"]').getAttribute('href').split('=')[1];
         let id = (new URL(window.location.href)).searchParams.get('XID');
@@ -36,30 +61,90 @@ export default class ProfileHelper implements ResponseInject {
         }
         this.block = new TornStyleBlock('芜湖助手').insert2Dom();
         // 隐藏头像
-        let hideImgSwitch = new TornStyleSwitch('隐藏头像', this.localConfigWrapper.config.HideProfileImg);
-        this.block.append(hideImgSwitch.getBase());
-        hideImgSwitch.getInput().addEventListener('change', () => {
-            document.body.classList.toggle('wh-hide_profile_img');
-            this.localConfigWrapper.config.HideProfileImg = hideImgSwitch.getInput().checked;
-        });
-        if (this.localConfigWrapper.config.ShowNameHistory) {
-            globVars.responseHandlers.push((...args: any[]) => this.responseHandler.apply(this, args));
+        try {
+            let hideImgSwitch = new TornStyleSwitch('隐藏头像', this.localConfigWrapper.config.HideProfileImg);
+            this.block.append(hideImgSwitch.getBase());
+            hideImgSwitch.getInput().addEventListener('change', () => {
+                document.body.classList.toggle('wh-hide_profile_img');
+                this.localConfigWrapper.config.HideProfileImg = hideImgSwitch.getInput().checked;
+            });
+            if (this.localConfigWrapper.config.ShowNameHistory) {
+                globVars.responseHandlers.push((...args: any[]) => this.responseHandler.apply(this, args));
+            }
+        } catch (e) {
+            this.logger.error('隐藏头像时出错了', e.stack)
+        }
+        // bs估算
+        if (this.localConfigWrapper.config.isBSEstProfOn) {
+            try {
+                const apikey = localStorage.getItem('APIKey')
+                if (!apikey) {
+                    this.msgWrapper.create('BS估算失败: 尚未设定APIKey', null, 'error')
+                }
+                const promise = fetchYata(parseInt(id), apikey)
+                const domNode = document.createElement('div')
+                domNode.innerHTML = 'BS估算中...'
+                domNode.classList.add('mt-4')
+                domNode.style.border = '1px solid green'
+                domNode.style.padding = '2px'
+                this.block.append(domNode)
+                const buildType = { Offensive: '攻击型', Defensive: '防御型', Balanced: '平衡型' }
+                promise.then(data => {
+                    domNode.innerHTML = `<b>BS估算</b><br/>
+BS: ${ toThousands(data.total) }<br/>
+评分: ${ toThousands(data.score) }<br/>
+风格: ${ buildType[data.type] }<br/>
+偏差: ${ data.skewness }%<br/>
+估算时间: ${ timePastFormat(Date.now() - data.timestamp * 1000) }前
+`
+                }).catch(err => {
+                    domNode.innerHTML = 'BS估算出错了: ' + err.message
+                    throw new TypeError('BS估算出错了: ' + err.message)
+                })
+            } catch (e) {
+                this.msgWrapper.create('BS估算失败' + e.message, null, 'error')
+                throw new TypeError('BS估算失败' + e.message)
+            }
         }
     }
 
     responseHandler(url: string, body: { json: unknown; text: string; isModified: boolean }) {
         if (url.includes('profiles.php?step=getProfileData') && this.task) {
             // 曾用名
-            let nameHistoryNode;
-            nameHistoryNode = document.createElement('p');
+            const nameHistoryNode = document.createElement('p');
             nameHistoryNode.innerHTML = '曾用名：';
             this.block.append(nameHistoryNode);
             let resp = body.json as IUserProfileData;
-            if (resp.userInformation.previousAliases.length > 0) {
+            if (resp.userInformation.previousAliases.length > 0) { // 曾用名列表
                 resp.userInformation.previousAliases.forEach(item => nameHistoryNode.innerHTML += item + ' ');
             } else {
                 nameHistoryNode.innerHTML += '暂无';
             }
+            let lastAction = -1
+            let onlineStatusTitle = '-'
+            if (resp.basicInformation?.lastAction.seconds) {
+                lastAction = resp.basicInformation.lastAction.seconds
+            }
+            if (resp.basicInformation.icons) {
+                for (let i = 0; i < resp.basicInformation.icons.length; i++) {
+                    let item = resp.basicInformation.icons[i]
+                    if (item.id === 1) {
+                        onlineStatusTitle = '🟢️ 在线'
+                        break
+                    }
+                    if (item.id === 62) {
+                        onlineStatusTitle = '🟡 挂机'
+                        break
+                    }
+                    if (item.id === 2) {
+                        onlineStatusTitle = '⚪ 离线'
+                        break
+                    }
+                }
+            }
+            const lastActionNode = document.createElement('p')
+            lastActionNode.innerHTML = `${ onlineStatusTitle } ${ this.commonUtils.secondsFormat(lastAction) }`
+            this.block.append(lastActionNode)
             this.task = false;
         }
     }

src/ts/class/action/QuickGymTrain.ts

@@ -2,7 +2,8 @@ import ClassName from "../../container/ClassName";
 import { Injectable } from "../../container/Injectable";
 import Logger from "../Logger";
 import NetHighLvlWrapper, { BATTLE_STAT } from "../utils/NetHighLvlWrapper";
-import Alert from "../utils/Alert";
+import { InjectionKey } from "vue";
+import MsgWrapper from "../utils/MsgWrapper";
 
 type GymResponse = {
     success: boolean,
@@ -19,21 +20,27 @@ export default class QuickGymTrain {
     constructor(
         private readonly logger: Logger,
         private readonly netHighLvlWrapper: NetHighLvlWrapper,
+        private readonly msgWrapper: MsgWrapper,
     ) {
     }
 
-    doTrain() {
+    doTrain(type = BATTLE_STAT.STR, count = 199) {
         window.setTimeout(async () => {
             let resObj: GymResponse;
             try {
-                resObj = JSON.parse(await this.netHighLvlWrapper.doGymTrain(BATTLE_STAT.STR, 199))
+                resObj = JSON.parse(await this.netHighLvlWrapper.doGymTrain(type, count))
             } catch (e) {
                 resObj = { success: false, message: '解析失败' };
                 this.logger.error(e.stack || e.message || e);
             }
             let msgRs = resObj.success ? '成功' : '失败';
             let msgMsg = resObj.message || resObj.text || resObj.error;
-            new Alert('锻炼结果: ' + msgRs + '<br/>提示: ' + (resObj.gainMessage || msgMsg));
+            this.msgWrapper.create(
+                '锻炼结果: ' + msgRs + '<br/>提示: ' + (resObj.gainMessage || msgMsg),
+                {}, resObj.success ? 'success' : 'error'
+            );
         }, 0);
     }
 }
+
+export const QuickGymTrainKey = Symbol('QuickGymTrainKey') as InjectionKey<QuickGymTrain>;

src/ts/class/action/SearchHelper.ts

@@ -4,10 +4,26 @@ import CommonUtils from "../utils/CommonUtils";
 import ClassName from "../../container/ClassName";
 import { Injectable } from "../../container/Injectable";
 import LocalConfigWrapper from "../LocalConfigWrapper";
+import IFeature from "../../man/IFeature";
 
 @ClassName('SearchHelper')
 @Injectable()
-export default class SearchHelper {
+export default class SearchHelper implements IFeature {
+    description(): string {
+        return "搜索助手";
+    }
+
+    iStart(): void | Promise<void> {
+        this.init()
+    }
+
+    urlExcludes(): RegExp[] {
+        return [];
+    }
+
+    urlIncludes(): RegExp[] {
+        return [/page\.php\?sid=UserList/];
+    }
 
     constructor(
         private readonly localConfigWrapper: LocalConfigWrapper,

src/ts/class/action/SlotsHelper.ts

@@ -1,24 +1,41 @@
 import TornStyleBlock from "../utils/TornStyleBlock";
 import InfoUtils from "../utils/InfoUtils";
-import Log from "../Log";
 import FetchUtils from "../utils/FetchUtils";
 import CommonUtils from "../utils/CommonUtils";
 import MathUtils from "../utils/MathUtils";
 import ClassName from "../../container/ClassName";
 import { Injectable } from "../../container/Injectable";
+import Logger from "../Logger";
+import IFeature from "../../man/IFeature";
 
 /**
  * 老虎机批量购买助手
  */
 @ClassName("SlotsHelper")
 @Injectable()
-export default class SlotsHelper {
+export default class SlotsHelper implements IFeature {
+    description(): string {
+        return "老虎机批量购买助手";
+    }
+
+    iStart(): void | Promise<void> {
+        this.init()
+    }
+
+    urlExcludes(): RegExp[] {
+        return [];
+    }
+
+    urlIncludes(): RegExp[] {
+        return [/loader\.php\?sid=slots/];
+    }
 
     constructor(
         private readonly mathUtils: MathUtils,
         private readonly commonUtils: CommonUtils,
         private readonly fetchUtils: FetchUtils,
         private readonly infoUtils: InfoUtils,
+        private readonly logger: Logger,
     ) {
     }
 
@@ -66,7 +83,7 @@ export default class SlotsHelper {
             try {
                 await this.goBtnHandler(ev, ret)
             } catch (e) {
-                Log.error(e.stack || e);
+                this.logger.error(e.stack || e);
             }
             goBtn.disabled = false;
         });
@@ -119,7 +136,7 @@ export default class SlotsHelper {
         msgBox.innerHTML += '<br/>已停止, ';
         msgBox.innerHTML += bang ? '血' : '小';
         msgBox.innerHTML += profit > 0 ? '赚' : '亏';
-        Log.info("[goBtnHandler]结束", { cash, tokens, count, price, wonTotal });
+        this.logger.info("[goBtnHandler]结束", { cash, tokens, count, price, wonTotal });
     }
 }
 

src/ts/class/action/Translate.ts

@@ -1,5 +1,4 @@
 import { chatDict, eventsDict, headerDict, propertyDict, sidebarDict } from "../../dictionary/translation";
-import Log from "../Log";
 import Timer from "../utils/Timer";
 
 /**
@@ -10,7 +9,7 @@ export default class Translate {
     public translateVer: string = '1.0';
 
     constructor() {
-        Log.info('翻译开始');
+        // Log.info('翻译开始');
         let start = new Timer();
         // 时分秒转换
         String.prototype.replaceHMS = function replaceHMS() {
@@ -39,7 +38,7 @@ export default class Translate {
             this.chatTranslate();
             this.playerSearchBoxTrans();
             this.urlMatchPageTranslate(window.location.href);
-            Log.info('翻译结束, 耗时' + start.getTimeMs());
+            // Log.info('翻译结束, 耗时' + start.getTimeMs());
         }, 0);
     }
 

src/ts/class/action/TranslateNew.ts

@@ -374,8 +374,7 @@ export default class TranslateNew extends Provider implements ResponseInject {
                                 name.innerText = `${ name.innerText } ${ nameZh }`;
                             }
                             // 操作按钮
-                            let actions = elem.querySelectorAll('.icon-h');
-                            actions.forEach(action => {
+                            elem.querySelectorAll('.icon-h').forEach(action => {
                                 let attrTitle = action.getAttribute('title');
                                 // TODO
                                 let zh = itemPageDict[attrTitle];

src/ts/class/action/TravelItem.ts

@@ -1,79 +0,0 @@
-import CommonUtils from "../utils/CommonUtils";
-import UserScriptEngine from "../../enum/UserScriptEngine";
-import Popup from "../utils/Popup";
-import STOCK_IMG_HTML from "../../../static/html/stock_img.html";
-import * as FILTER from "../../../static/json/for_stock_item_filter.json";
-import WindowActiveState from "./WindowActiveState";
-import { Injectable } from "../../container/Injectable";
-import ClassName from "../../container/ClassName";
-import Logger from "../Logger";
-
-@Injectable()
-@ClassName('TravelItem')
-export default class TravelItem {
-    private readonly apiUrl: string = 'https://yata.yt/api/v1/travel/export/';
-    private foreignStockInfo: any = null;
-
-    public constructor(
-        private readonly windowActiveState: WindowActiveState,
-        private readonly logger: Logger,
-        private readonly commonUtils: CommonUtils,
-    ) {
-    }
-
-    public init() {
-
-        window.setInterval(async () => {
-            if (!this.windowActiveState.get()) return;
-            this.logger.info('COFetch ', this.apiUrl);
-            try {
-                this.foreignStockInfo = JSON.parse(await CommonUtils.COFetch(this.apiUrl));
-            } catch (e) {
-                this.logger.error('解析错误', e.stack || e.message || e);
-            }
-            this.logger.info({ info: 'TravelItem 跨域返回', 'returned': this.foreignStockInfo });
-        }, 30 * 1000);
-    }
-
-    // 呈现内容
-    public async clickHandler(): Promise<void> {
-        if (this.commonUtils.getScriptEngine() === UserScriptEngine.RAW) {
-            new Popup(STOCK_IMG_HTML.replace('{{}}', performance.now().toString()), '飞花库存');
-        } else {
-            const popup = new Popup("请稍后 " + CommonUtils.loading_gif_html(), '飞花库存');
-            let table = `<table><tr><th colspan="2">目的地 - 更新时间</th><th colspan="3">库存</th></tr>`;
-            const dest = FILTER.default;
-            const now = new Date();
-            const res = await this.get();
-            this.logger.info({ res })
-            if (!res || !res.stocks) return;
-            dest.forEach(el => {
-                const update = (now.getTime() - new Date(res.stocks[el.name]['update'] * 1000).getTime()) / 1000 | 0
-                table += `<tr><td>${ el.show }</td><td>${ update / 60 | 0 }分${ update % 60 | 0 }秒前</td>`;
-                let count = 0;
-                res.stocks[el.name]['stocks'].forEach(stock => {
-                    if (el.stocks[stock.name]) {
-                        table += `<td${ stock['quantity'] === 0 ? ' style="background-color:#f44336;color:white;border-color:#000;"' : '' }>${ el.stocks[stock.name] } (${ stock['quantity'] })</td>`;
-                        count++;
-                    }
-                });
-                while (count < 3) {
-                    count++;
-                    table += '<td></td>';
-                }
-                table += '</tr>';
-            });
-            table += '</table>';
-            popup.getElement().innerHTML = table;
-        }
-    }
-
-    private async get() {
-        try {
-            return this.foreignStockInfo ||= JSON.parse(await CommonUtils.COFetch(this.apiUrl));
-        } catch (e) {
-            this.logger.error('解析出错', e.stack || e.message || e);
-            return null;
-        }
-    }
-}

src/ts/class/action/WindowActiveState.ts

@@ -18,6 +18,7 @@ export default class WindowActiveState {
         addEventListener('blur', () => this.isFocus = false);
     }
 
+    // 当前实例是否激活
     get(): boolean {
         // 当前窗口获得了焦点 优先级最高
         if (this.isFocus) return true;

src/ts/class/action/XZMZ.ts

@@ -7,6 +7,7 @@ import MathUtils from "../utils/MathUtils";
 import FetchUtils from "../utils/FetchUtils";
 import ClassName from "../../container/ClassName";
 import { Injectable } from "../../container/Injectable";
+import IFeature from "../../man/IFeature";
 
 /**
  * 寻找木桩
@@ -14,8 +15,35 @@ import { Injectable } from "../../container/Injectable";
  */
 @ClassName('XZMZ')
 @Injectable()
-export default class XZMZ {
-    className = 'XZMZ';
+export default class XZMZ implements IFeature {
+    description(): string {
+        return "寻找木桩";
+    }
+
+    iStart(): void | Promise<void> {
+        this.start()
+    }
+
+    urlExcludes(): RegExp[] {
+        return [];
+    }
+
+    urlIncludes(): RegExp[] {
+        return [/item.php\?temp=4/];
+    }
+
+    start() {
+        let hasInit: boolean = false
+        let handle = () => {
+            if (!hasInit && window.location.hash === '#xunzhaomuzhuang') {
+                this.init()
+                hasInit = true
+            }
+        }
+        window.addEventListener('hashchange', handle)
+        handle()
+    }
+
     private mainRoleContainer: HTMLElement;
     private IDList: number[];
     private btn: HTMLButtonElement;

src/ts/class/config/defaultConfig.ts

@@ -96,9 +96,25 @@ class DefaultConfigType {
     // 迷你资料卡显示上次行动时间
     ShowMiniProfLastAct = true;
 
+    // 登陆邮箱
+    @Notified()
+    autoLoginEmail = '';
+    // 登陆密码
+    autoLoginPwd = '';
+
     // 自定义css
     @Notified()
     CustomCss = '';
+
+    monitorOn = ['drugCDMonitor']
+    drugCDMonitorInterval = 60000
+
+    // mini profile显示bs估算
+    @Notified()
+    isBSEstMiniProfOn = false
+    // profile页面显示bs估算
+    @Notified()
+    isBSEstProfOn = true
 }
 
 export type Config = DefaultConfigType;

src/ts/class/handler/AdditionalSettingsHandler.ts

@@ -3,11 +3,8 @@ import Alert from "../utils/Alert";
 import DialogMsgBox from "../utils/DialogMsgBox";
 import CommonUtils from "../utils/CommonUtils";
 import { MenuItemConfig } from "../ZhongIcon";
-import IFrameCrimeHandler from "./IFrameCrimeHandler";
-import loadGS from "../../func/module/loadGS";
 import ClassName from "../../container/ClassName";
 import { Injectable } from "../../container/Injectable";
-import { Container } from "../../container/Container";
 
 @ClassName('AdditionalSettingsHandler')
 @Injectable()
@@ -20,26 +17,6 @@ export default class AdditionalSettingsHandler {
 
     public show(): void {
         let pop = new Popup('', '更多设定');
-        // let insertHtml = '<p><button class="torn-btn">清空设置</button></p><p><button class="torn-btn">通知权限</button></p><p><button class="torn-btn">外部数据权限</button></p>';
-        // pop.getElement().insertAdjacentHTML('beforeend', insertHtml);
-        // let [btn1, btn2, btn3] = Array.from(pop.getElement().querySelectorAll('button'));
-        // btn1.addEventListener('click', () => {
-        //     new DialogMsgBox('将清空所有芜湖助手相关设置并刷新页面，确定？', {
-        //         callback: () => {
-        //             localStorage.removeItem('wh_trv_alarm');
-        //             localStorage.removeItem('wh_trans_settings');
-        //             localStorage.removeItem('whuuid');
-        //             localStorage.removeItem('wh-gs-storage');
-        //             localStorage.removeItem('WHTEST');
-        //             new Alert('已清空，刷新页面');
-        //             window.location.reload();
-        //         }
-        //     });
-        // });
-        // btn2.addEventListener('click', () => {
-        // });
-        // btn3.addEventListener('click', () => {
-        // });
 
         let menuList: MenuItemConfig[] = [
             {
@@ -65,20 +42,6 @@ export default class AdditionalSettingsHandler {
                 domType: 'button', domId: '', domText: '第三方API通信权限', clickFunc() {
                 }
             },
-            {
-                domType: 'button', domId: '', domText: '小窗犯罪', clickFunc() {
-                    Container.factory(IFrameCrimeHandler).handle()
-                }
-            },
-            {
-                domType: 'button',
-                domId: '',
-                domText: '飞贼小助手',
-                tip: '加载从PC端移植的伞佬的油猴版飞贼小助手',
-                clickFunc: () => {
-                    loadGS(this.commonUtils.getScriptEngine())
-                }
-            },
         ];
         menuList.forEach(i => pop.element.append(this.commonUtils.elemGenerator(i, pop.element)));
     }

src/ts/class/handler/ChangeLogHandler.ts

@@ -1,66 +1,70 @@
-import Popup from "../utils/Popup";
-import CommonUtils from "../utils/CommonUtils";
-import MDUtils from "../utils/MDUtils";
-import Log from "../Log";
-import { MENU_ITEM_TYPE } from "../../interface/MenuItem";
-import Provider from "../provider/Provider";
-import ClassName from "../../container/ClassName";
-import { Injectable } from "../../container/Injectable";
-import { Container } from "../../container/Container";
-
-@ClassName('ChangeLogHandler')
-@Injectable()
-class ChangeLogHandler extends Provider {
-    constructor(
-        private readonly mdUtils: MDUtils,
-    ) {
-        super();
-    }
-
-    public show(): void {
-        let popup = new Popup(
-            '更新历史：<br/><a target="_blank" href="https://gitlab.com/JJins/wuhu-torn-helper/-/blob/dev/CHANGELOG.md">https://gitlab.com/JJins/wuhu-torn-helper/-/blob/dev/CHANGELOG.md</a><br/>',
-            '更新历史'
-        ).element;
-        popup.classList.add('wh-changeLog');
-        let progressBar = document.createElement('div');
-        progressBar.style.height = '2px';
-        progressBar.style.width = '1%';
-        progressBar.style.backgroundColor = 'red';
-        let progressText = document.createElement('p');
-        progressText.innerText = '加载更新文件……';
-        progressText.style.textAlign = 'center';
-        let style = document.createElement('style');
-        style.innerHTML = `.wh-changeLog h2,.wh-changeLog h3,.wh-changeLog h4 {margin:8px 0;}.wh-changeLog li{list-style: inside;}`;
-
-        popup.append(progressBar, progressText, style);
-
-        CommonUtils
-            .COFetch('https://gitlab.com/JJins/wuhu-torn-helper/-/raw/dev/CHANGELOG.md?' + performance.now())
-            .then(update => {
-                progressBar.style.width = '60%';
-                progressText.innerText = '解析中……';
-                let md = this.mdUtils.parse(update);
-                popup.append(md);
-                progressBar.style.width = '100%';
-                progressText.innerText = '加载完成';
-
-                window.setTimeout(() => {
-                    progressBar.remove();
-                    progressText.remove()
-                }, 3000);
-            })
-            .catch(e => {
-                Log.error(e);
-                progressBar.remove();
-                progressText.innerText = '无法加载';
-            });
-    }
-
-}
-
-export default {
-    domType: MENU_ITEM_TYPE.BUTTON,
-    domText: '🐞 更新历史',
-    clickFunc: () => Container.factory(ChangeLogHandler).show()
-};
+// import Popup from "../utils/Popup";
+// import CommonUtils from "../utils/CommonUtils";
+// import MDUtils from "../utils/MDUtils";
+// import { MENU_ITEM_TYPE } from "../../interface/MenuItem";
+// import Provider from "../provider/Provider";
+// import ClassName from "../../container/ClassName";
+// import { Injectable } from "../../container/Injectable";
+// import { Container } from "../../container/Container";
+// import Logger from "../Logger";
+//
+// /**
+//  * @deprecated
+//  */
+// @ClassName('ChangeLogHandler')
+// @Injectable()
+// export class ChangeLogHandler extends Provider {
+//     constructor(
+//         private readonly mdUtils: MDUtils,
+//         private readonly logger: Logger,
+//     ) {
+//         super();
+//     }
+//
+//     public show(): void {
+//         let popup = new Popup(
+//             '更新历史：<br/><a target="_blank" href="https://gitlab.com/JJins/wuhu-torn-helper/-/blob/dev/CHANGELOG.md">https://gitlab.com/JJins/wuhu-torn-helper/-/blob/dev/CHANGELOG.md</a><br/>',
+//             '更新历史'
+//         ).element;
+//         popup.classList.add('wh-changeLog');
+//         let progressBar = document.createElement('div');
+//         progressBar.style.height = '2px';
+//         progressBar.style.width = '1%';
+//         progressBar.style.backgroundColor = 'red';
+//         let progressText = document.createElement('p');
+//         progressText.innerText = '加载更新文件……';
+//         progressText.style.textAlign = 'center';
+//         let style = document.createElement('style');
+//         style.innerHTML = `.wh-changeLog h2,.wh-changeLog h3,.wh-changeLog h4 {margin:8px 0;}.wh-changeLog li{list-style: inside;}`;
+//
+//         popup.append(progressBar, progressText, style);
+//
+//         CommonUtils
+//             .COFetch('https://gitlab.com/JJins/wuhu-torn-helper/-/raw/dev/CHANGELOG.md?' + performance.now())
+//             .then(update => {
+//                 progressBar.style.width = '60%';
+//                 progressText.innerText = '解析中……';
+//                 let md = this.mdUtils.parse(update);
+//                 popup.append(md);
+//                 progressBar.style.width = '100%';
+//                 progressText.innerText = '加载完成';
+//
+//                 window.setTimeout(() => {
+//                     progressBar.remove();
+//                     progressText.remove()
+//                 }, 3000);
+//             })
+//             .catch(e => {
+//                 this.logger.error(e);
+//                 progressBar.remove();
+//                 progressText.innerText = '无法加载';
+//             });
+//     }
+//
+// }
+//
+// export default {
+//     domType: MENU_ITEM_TYPE.BUTTON,
+//     domText: '🐞 更新历史',
+//     clickFunc: () => Container.factory(ChangeLogHandler).show()
+// };

src/ts/class/handler/IFrameCrimeHandler.ts

@@ -1,97 +1,97 @@
-import CommonUtils from "../utils/CommonUtils";
-import Popup from "../utils/Popup";
-import QUICK_CRIMES_HTML from "../../../static/html/quick_crimes.html";
-import ClassName from "../../container/ClassName";
-import { Injectable } from "../../container/Injectable";
-
-@ClassName('IFrameCrimeHandler')
-@Injectable()
-export default class IFrameCrimeHandler {
-
-    public handle(): void {
-        // 弹出小窗口
-        const ifHTML = `<iframe src="/crimes.php?step=main" style="width:100%;max-width: 450px;margin: 0 auto;display: none;height: 340px;"></iframe>`;
-        const popup_insert = `<p>加载中请稍后${ CommonUtils.loading_gif_html() }</p><div id="wh-quick-crime-if-container"></div>`;
-        const $popup = new Popup(popup_insert, '小窗快速犯罪').getElement();
-        // 运行状态node
-        let loading_node = $popup.querySelector('p:first-of-type');
-        // if容器
-        const if_cont = $popup.querySelector('#wh-quick-crime-if-container');
-        if_cont.innerHTML = ifHTML;
-
-        // if内未加载脚本时插入的快捷crime node
-        const mobile_prepend_node = document.createElement('div');
-        mobile_prepend_node.classList.add('wh-translate');
-        mobile_prepend_node.innerHTML = QUICK_CRIMES_HTML;
-
-        // if对象加载后运行
-        let cIframe = $popup.querySelector('iframe');
-
-        // 加载状态
-        const if_onload_func = () => {
-            // if内部文档对象
-            const ifDocu = cIframe.contentWindow.document;
-            // 内部插件运行flag
-            const ifWH = cIframe.contentWindow.WHTRANS;
-            // 文档加载完成后移除
-            if (!!loading_node) loading_node.remove();
-            // 文档加载完成后才显示if
-            cIframe.style.display = 'block';
-            // 验证码flag
-            const isValidate = ifDocu.querySelector('h4#skip-to-content').innerText.toLowerCase().includes('validate');
-            // 如果iframe内部未运行脚本
-            if (ifWH === undefined) {
-                // 隐藏顶部
-                CommonUtils.elementReady('#header-root', ifDocu).then(e => e.style.display = 'none');
-                // 隐藏4条
-                CommonUtils.elementReady('#sidebarroot', ifDocu).then(e => e.style.display = 'none');
-                // 隐藏聊天
-                CommonUtils.elementReady('#chatRoot', ifDocu).then(e => e.style.display = 'none');
-                // 非验证码页面隐藏滚动条
-                if (!isValidate) ifDocu.body.style.overflow = 'hidden';
-                // 调整容器位置
-                CommonUtils.elementReady('.content-wrapper', ifDocu).then(elem => {
-                    // 加入
-                    elem.prepend(mobile_prepend_node);
-                    elem.style.margin = '0px';
-                    elem.style.position = 'absolute';
-                    elem.style.top = '-35px';
-                    new MutationObserver((m, o) => {
-                        o.disconnect();
-                        if (!elem.querySelector('.wh-translate')) elem.prepend(mobile_prepend_node);
-                        o.observe(elem, { childList: true, subtree: true });
-                    })
-                        .observe(elem, { childList: true, subtree: true });
-                });
-                // 隐藏返回顶部按钮
-                CommonUtils.elementReady('#go-to-top-btn button', ifDocu).then(e => e.style.display = 'none');
-            }
-        };
-        cIframe.onload = if_onload_func;
-
-        // 超时判断
-        let time_counter = 0;
-        let time_out_id = window.setInterval(() => {
-            loading_node = $popup.querySelector('p:first-of-type');
-            if (!loading_node) {
-                clearInterval(time_out_id);
-                time_out_id = undefined;
-                return;
-            }
-            time_counter++;
-            if (time_counter > 0 && !loading_node.querySelector('button')) {
-                const reload_btn = document.createElement('button');
-                reload_btn.innerHTML = '重新加载';
-                reload_btn.onclick = () => {
-                    reload_btn.remove();
-                    time_counter = 0;
-                    if_cont.innerHTML = null;
-                    if_cont.innerHTML = ifHTML;
-                    cIframe = $popup.querySelector('iframe');
-                    cIframe.onload = if_onload_func;
-                };
-                loading_node.append(reload_btn);
-            }
-        }, 1000);
-    }
-}
+// import CommonUtils from "../utils/CommonUtils";
+// import Popup from "../utils/Popup";
+// import QUICK_CRIMES_HTML from "../../../static/html/quick_crimes.html";
+// import ClassName from "../../container/ClassName";
+// import { Injectable } from "../../container/Injectable";
+//
+// @ClassName('IFrameCrimeHandler')
+// @Injectable()
+// export default class IFrameCrimeHandler {
+//
+//     public handle(): void {
+//         // 弹出小窗口
+//         const ifHTML = `<iframe src="/crimes.php?step=main" style="width:100%;max-width: 450px;margin: 0 auto;display: none;height: 340px;"></iframe>`;
+//         const popup_insert = `<p>加载中请稍后${ CommonUtils.loading_gif_html() }</p><div id="wh-quick-crime-if-container"></div>`;
+//         const $popup = new Popup(popup_insert, '小窗快速犯罪').getElement();
+//         // 运行状态node
+//         let loading_node = $popup.querySelector('p:first-of-type');
+//         // if容器
+//         const if_cont = $popup.querySelector('#wh-quick-crime-if-container');
+//         if_cont.innerHTML = ifHTML;
+//
+//         // if内未加载脚本时插入的快捷crime node
+//         const mobile_prepend_node = document.createElement('div');
+//         mobile_prepend_node.classList.add('wh-translate');
+//         mobile_prepend_node.innerHTML = QUICK_CRIMES_HTML;
+//
+//         // if对象加载后运行
+//         let cIframe = $popup.querySelector('iframe');
+//
+//         // 加载状态
+//         const if_onload_func = () => {
+//             // if内部文档对象
+//             const ifDocu = cIframe.contentWindow.document;
+//             // 内部插件运行flag
+//             const ifWH = cIframe.contentWindow.WHTRANS;
+//             // 文档加载完成后移除
+//             if (!!loading_node) loading_node.remove();
+//             // 文档加载完成后才显示if
+//             cIframe.style.display = 'block';
+//             // 验证码flag
+//             const isValidate = ifDocu.querySelector('h4#skip-to-content').innerText.toLowerCase().includes('validate');
+//             // 如果iframe内部未运行脚本
+//             if (ifWH === undefined) {
+//                 // 隐藏顶部
+//                 CommonUtils.elementReady('#header-root', ifDocu).then(e => e.style.display = 'none');
+//                 // 隐藏4条
+//                 CommonUtils.elementReady('#sidebarroot', ifDocu).then(e => e.style.display = 'none');
+//                 // 隐藏聊天
+//                 CommonUtils.elementReady('#chatRoot', ifDocu).then(e => e.style.display = 'none');
+//                 // 非验证码页面隐藏滚动条
+//                 if (!isValidate) ifDocu.body.style.overflow = 'hidden';
+//                 // 调整容器位置
+//                 CommonUtils.elementReady('.content-wrapper', ifDocu).then(elem => {
+//                     // 加入
+//                     elem.prepend(mobile_prepend_node);
+//                     elem.style.margin = '0px';
+//                     elem.style.position = 'absolute';
+//                     elem.style.top = '-35px';
+//                     new MutationObserver((m, o) => {
+//                         o.disconnect();
+//                         if (!elem.querySelector('.wh-translate')) elem.prepend(mobile_prepend_node);
+//                         o.observe(elem, { childList: true, subtree: true });
+//                     })
+//                         .observe(elem, { childList: true, subtree: true });
+//                 });
+//                 // 隐藏返回顶部按钮
+//                 CommonUtils.elementReady('#go-to-top-btn button', ifDocu).then(e => e.style.display = 'none');
+//             }
+//         };
+//         cIframe.onload = if_onload_func;
+//
+//         // 超时判断
+//         let time_counter = 0;
+//         let time_out_id = window.setInterval(() => {
+//             loading_node = $popup.querySelector('p:first-of-type');
+//             if (!loading_node) {
+//                 clearInterval(time_out_id);
+//                 time_out_id = undefined;
+//                 return;
+//             }
+//             time_counter++;
+//             if (time_counter > 0 && !loading_node.querySelector('button')) {
+//                 const reload_btn = document.createElement('button');
+//                 reload_btn.innerHTML = '重新加载';
+//                 reload_btn.onclick = () => {
+//                     reload_btn.remove();
+//                     time_counter = 0;
+//                     if_cont.innerHTML = null;
+//                     if_cont.innerHTML = ifHTML;
+//                     cIframe = $popup.querySelector('iframe');
+//                     cIframe.onload = if_onload_func;
+//                 };
+//                 loading_node.append(reload_btn);
+//             }
+//         }, 1000);
+//     }
+// }

src/ts/class/handler/QuickFlyBtnHandler.ts

@@ -2,10 +2,13 @@ import CommonUtils from "../utils/CommonUtils";
 import QUICK_FLY_CSS from "../../../static/css/quick_fly.module.css";
 import QUICK_FLY_HTML from "../../../static/html/quick_fly.html";
 import Alert from "../utils/Alert";
-import TravelItem from "../action/TravelItem";
+import TravelItem from "../../feature/TravelItem";
 import ClassName from "../../container/ClassName";
 import { Injectable } from "../../container/Injectable";
 import Logger from "../Logger";
+import MsgWrapper from "../utils/MsgWrapper";
+import { InjectionKey } from "vue";
+import NetHighLvlWrapper from "../utils/NetHighLvlWrapper";
 
 @ClassName('QuickFlyBtnHandler')
 @Injectable()
@@ -16,6 +19,9 @@ export default class QuickFlyBtnHandler {
         private readonly logger: Logger,
         private readonly travelItem: TravelItem,
         private readonly commonUtils: CommonUtils,
+        // private readonly infoUtils: InfoUtils,
+        private readonly msgWrapper: MsgWrapper,
+        private readonly netHighLvlWrapper: NetHighLvlWrapper,
     ) {
     }
 
@@ -55,7 +61,7 @@ export default class QuickFlyBtnHandler {
     }
 
     // 起飞目的地id
-    private static getDestId(dest): number {
+    private static getDestId(dest: number): number {
         // 墨、开、加、夏、英、阿、瑞s、立本、祖、迪、南
         return [2, 12, 9, 3, 10, 7, 8, 5, 6, 11, 4][dest];
     }
@@ -114,4 +120,37 @@ export default class QuickFlyBtnHandler {
         showTime();
         yaoCD.innerHTML = `药CD剩余：${ CommonUtils.getYaoCD() }`;
     }
+
+    public async directFly(destIndex: number, typeIndex: number) {
+        // 获取key
+        // if(false){
+        //     let key;
+        //     try {
+        //         const resp = await (await fetch('/travelagency.php')).text();
+        //         key = resp.match(/data-key="([0-9]+)"/)[1];
+        //     } catch (e) {
+        //         this.msgWrapper.create('起飞参数获取失败', {}, 'error');
+        //         this.logger.error(e.stack);
+        //         throw new Error('起飞参数获取失败');
+        //     }
+        // }
+        let msg: string;
+        try {
+            msg = await this.netHighLvlWrapper.doTravelFly(QuickFlyBtnHandler.getDestId(destIndex), null, ['standard', 'airstrip', 'private', 'business'][typeIndex])
+            const response = JSON.parse(msg);
+            if (!response.success) {
+                this.msgWrapper.create('起飞失败 ' + response.error, {}, 'error');
+                this.logger.error('起飞失败 ' + response.error, response.err);
+                throw new Error('起飞失败 ' + response.error);
+            }
+            console.log(msg);
+        } catch (e) {
+            this.msgWrapper.create('起飞时出现错误 ' + e.message, {}, 'error');
+            this.logger.error(e.stack);
+            throw new Error('起飞时出现错误 ' + e.message);
+        }
+        this.msgWrapper.create('已起飞', {}, 'success');
+    }
 }
+
+export const QuickFlyBtnHandlerKey = Symbol('QuickFlyBtnHandlerKey') as InjectionKey<QuickFlyBtnHandler>

src/ts/class/handler/SettingsHandler.ts

@@ -1,7 +1,6 @@
 import { MenuItemConfig } from "../ZhongIcon";
-import Log from "../Log";
 import Timer from "../utils/Timer";
-import BuyBeerHelper from "../action/BuyBeerHelper";
+import BuyBeerHelper from "../../feature/BuyBeerHelper";
 import UpdateTranslateDict from "./UpdateTranslateDict";
 import landedRedirect from "../../func/module/landedRedirect";
 import Alert from "../utils/Alert";
@@ -15,6 +14,7 @@ import { MENU_ITEM_TYPE } from "../../interface/MenuItem";
 import ClassName from "../../container/ClassName";
 import { Injectable } from "../../container/Injectable";
 import { Container } from "../../container/Container";
+import Logger from "../Logger";
 
 @ClassName('SettingsHandler')
 @Injectable()
@@ -30,6 +30,7 @@ class SettingsHandler extends Provider {
         private readonly customCssHandler: CustomCssHandler,
         private readonly viewLogsHandler: ViewLogsHandler,
         private readonly additionalSettingsHandler: AdditionalSettingsHandler,
+        private readonly logger: Logger,
     ) {
         super();
         this.constructWuhuSettingList();
@@ -37,7 +38,7 @@ class SettingsHandler extends Provider {
 
     public show(): void {
         let startTime = new Timer();
-        Log.info('构造设置开始');
+        this.logger.info('构造设置开始');
         let pop = new Popup(CommonUtils.loading_gif_html(), '芜湖助手设置');
         window.setTimeout(() => {
             let tmp = document.createElement('div');
@@ -49,14 +50,14 @@ class SettingsHandler extends Provider {
             pop.getElement().innerHTML = '';
             pop.getElement().appendChild(tmp);
             (window.initializeTooltip) && (window.initializeTooltip('#wh-popup-cont', 'white-tooltip'));
-            Log.info('构造设置结束 ' + startTime.getTimeMs());
+            this.logger.info('构造设置结束 ' + startTime.getTimeMs());
         }, 0)
     }
 
     // 设置
     private constructWuhuSettingList(): SettingsHandler {
         let timer = new Timer();
-        Log.info('构造设置列表开始');
+        this.logger.info('构造设置列表开始');
         const date = new Date();
 
         let beer = this.buyBeerHelper;
@@ -572,7 +573,7 @@ class SettingsHandler extends Provider {
             clickFunc: () => this.additionalSettingsHandler.show()
         });
 
-        Log.info('构造设置列表结束' + timer.getTimeMs());
+        this.logger.info('构造设置列表结束' + timer.getTimeMs());
         return this;
     }
 }

src/ts/class/handler/ViewLogsHandler.ts

@@ -4,6 +4,7 @@ import CommonUtils from "../utils/CommonUtils";
 import VIEW_LOGS_HANDLER_HTML from "../../../static/html/view_logs_handler.html";
 import ClassName from "../../container/ClassName";
 import { Injectable } from "../../container/Injectable";
+import Logger from "../Logger";
 
 @ClassName('ViewLogsHandler')
 @Injectable()
@@ -11,11 +12,12 @@ export default class ViewLogsHandler {
 
     constructor(
         private readonly commonUtils: CommonUtils,
+        private readonly logger: Logger,
     ) {
     }
 
     public handle(): void {
-        let logCounter = Log.getCounter();
+        let logCounter = this.logger.getCounter();
         let pop = new Popup(VIEW_LOGS_HANDLER_HTML
             .replace('{{}}', logCounter.info.toString())
             .replace('{{}}', logCounter.warning.toString())

src/ts/class/provider/ButtonHandler.ts

@@ -1,12 +0,0 @@
-import { MENU_ITEM_TYPE } from "../../interface/MenuItem";
-
-const BUTTON_HANDLE_METADATA_KEY = Symbol("BUTTON_HANDLE_KEY")
-
-/**
- * @ButtonHandler
- * 按钮
- * @param target 类本身
- */
-export function ButtonHandler<T>(target: T): void {
-    Reflect.defineMetadata(BUTTON_HANDLE_METADATA_KEY, MENU_ITEM_TYPE.BUTTON, target);
-}

src/ts/class/provider/Elem.ts

@@ -1,26 +0,0 @@
-export default class Elem {
-    private readonly elem: HTMLElement;
-
-    constructor(tagName) {
-        this.elem = document.createElement(tagName);
-    }
-
-    public html(htmlString): Elem {
-        this.elem.innerHTML = htmlString;
-        return this;
-    }
-
-    public id(id): Elem {
-        this.elem.id = id;
-        return this;
-    }
-
-    public class(className): Elem {
-        this.elem.classList.add(className);
-        return this;
-    }
-
-    public el(): HTMLElement {
-        return this.elem;
-    }
-}

src/ts/class/provider/Provider.ts

@@ -1,38 +1,37 @@
-import Log from "../Log";
-import Timer from "../utils/Timer";
 import ClassWithName from "../../interface/ClassWithName";
 
 /**
  * 基类、单例
+ * @deprecated
  */
 export default class Provider implements ClassWithName {
     readonly className: string = 'Provider';
-    private static _instance;
-
-    private static readonly pool = {};
-
-    constructor(...args: unknown[]) {
-    }
+    // private static _instance;
+    //
+    // private static readonly pool = {};
+    //
+    // constructor(...args: unknown[]) {
+    // }
 
     // 返回继承类的实例
-    public static getInstance<T extends typeof Provider>(this: T, ...args: unknown[]): InstanceType<T> {
-        if (!this._instance) {
-            let startTime = new Timer();
-            this._instance = new this(...args);
-            let thatName = this._instance.getClassName() || this.name;
-            Log.info('实例已创建,', thatName, this._instance, '耗时' + startTime.getTimeMs());
-            Provider.pool[thatName] = this._instance;
-        }
-        return this._instance;
-    }
+    // public static getInstance<T extends typeof Provider>(this: T, ...args: unknown[]): InstanceType<T> {
+    //     if (!this._instance) {
+    //         let startTime = new Timer();
+    //         this._instance = new this(...args);
+    //         let thatName = this._instance.getClassName() || this.name;
+    //         Log.info('实例已创建,', thatName, this._instance, '耗时' + startTime.getTimeMs());
+    //         Provider.pool[thatName] = this._instance;
+    //     }
+    //     return this._instance;
+    // }
 
-    public static getPool() {
-        return {
-            pool: Provider.pool,
-        }
-    }
-
-    public getClassName() {
-        return this.className;
-    }
+    // public static getPool() {
+    //     return {
+    //         pool: Provider.pool,
+    //     }
+    // }
+    //
+    // public getClassName() {
+    //     return this.className;
+    // }
 }

src/ts/class/utils/ActionButtonUtils.ts

@@ -1,32 +1,20 @@
-import ZhongIcon from "../ZhongIcon";
 import ClassName from "../../container/ClassName";
 import { Injectable } from "../../container/Injectable";
 import Logger from "../Logger";
+import globVars from "../../globVars";
 
 @ClassName('ActionButtonUtils')
 @Injectable()
 export default class ActionButtonUtils {
     private hasAdded: boolean = false;
-
-    constructor(
-        private readonly logger: Logger,
-    ) {
-    }
+    private readonly logger = Logger.factory(ActionButtonUtils)
 
     public add(txt: string, func: (ev: Event) => void = () => null): void {
-        if (!this.hasAdded) this.handle(txt, func);
-        else this.logger.warn('ActionButton已存在');
+
+        let added = { txt, func }
+        globVars.buttons.push(added)
+
+        this.logger.info({ globVars })
     }
 
-    private handle(txt, func): void {
-        let btn = document.createElement('button');
-        btn.style.padding = '8px 13px 8px 0';
-        btn.style.verticalAlign = 'bottom';
-        btn.style.color = '#4CAF50';
-        btn.innerHTML = txt;
-        btn.addEventListener('click', func);
-        ZhongIcon.ZhongNode.querySelector('button').after(btn);
-        this.hasAdded = true;
-        this.logger.info('ActionButton已添加', { txt, func, btn });
-    }
 }

src/ts/class/utils/CommonUtils.ts

@@ -1,5 +1,4 @@
 import UserScriptEngine from "../../enum/UserScriptEngine";
-import Log from "../Log";
 import Device from "../../enum/Device";
 import LOADING_IMG_HTML from "../../../static/html/loading_img.html";
 import Timer from "./Timer";
@@ -15,6 +14,7 @@ import Logger from "../Logger";
 import Global from "../Global";
 import { Container } from "../../container/Container";
 import TornPDAUtils from "./TornPDAUtils";
+import { InjectionKey } from "vue";
 
 @Injectable()
 @ClassName('CommonUtils')
@@ -40,13 +40,14 @@ export default class CommonUtils {
     }
 
     static COFetch(url: URL | string, method: 'get' | 'post' | string = 'get', body: any = null): Promise<string> {
+        let logger = Container.factory(Logger);
         let start = new Timer();
         const engine = this.getScriptEngine();
-        Log.info('跨域获取数据开始, 脚本引擎: ' + engine);
+        logger.info(`跨域请求 -> ${url}, 脚本引擎: ${engine}`);
         return new Promise<string>((resolve, reject) => {
             switch (engine) {
                 case UserScriptEngine.RAW: {
-                    Log.error(`跨域请求错误：${ UserScriptEngine.RAW }环境下无法进行跨域请求`);
+                    logger.error(`跨域请求错误：${ UserScriptEngine.RAW }环境下无法进行跨域请求`);
                     reject(`错误：${ UserScriptEngine.RAW }环境下无法进行跨域请求`);
                     break;
                 }
@@ -55,29 +56,29 @@ export default class CommonUtils {
                     // get
                     if (method === 'get') {
                         if (typeof PDA_httpGet !== 'function') {
-                            Log.error('COFetch网络错误：PDA版本不支持');
+                            logger.error('COFetch网络错误：PDA版本不支持');
                             reject('COFetch网络错误：PDA版本不支持');
                         }
                         PDA_httpGet(url)
                             .then(res => {
-                                Log.info('跨域获取数据成功, 耗时' + start.getTimeMs());
+                                logger.info('跨域获取数据成功, 耗时' + start.getTimeMs());
                                 resolve(res.responseText);
                             })
                             .catch(e => {
-                                Log.error('COFetch网络错误', e);
+                                logger.error('COFetch网络错误', e);
                                 reject(`COFetch网络错误 ${ e }`);
                             })
                     }
                     // post
                     else {
                         if (typeof PDA_httpPost !== 'function') {
-                            Log.error('COFetch网络错误：PDA版本不支持');
+                            logger.error('COFetch网络错误：PDA版本不支持');
                             reject('COFetch网络错误：PDA版本不支持');
                         }
                         PDA_httpPost(url, { 'content-type': 'application/json' }, body)
                             .then(res => resolve(res.responseText))
                             .catch(e => {
-                                Log.error('COFetch网络错误', e);
+                                logger.error('COFetch网络错误', e);
                                 reject(`COFetch网络错误 ${ e }`);
                             });
                     }
@@ -86,7 +87,7 @@ export default class CommonUtils {
                 case UserScriptEngine.GM: {
                     let { GM_xmlhttpRequest } = Container.factory(Global);
                     if (typeof GM_xmlhttpRequest !== 'function') {
-                        Log.error('COFetch网络错误：用户脚本扩展API错误');
+                        logger.error('COFetch网络错误：用户脚本扩展API错误');
                         reject('错误：用户脚本扩展API错误');
                     }
                     GM_xmlhttpRequest({
@@ -95,7 +96,7 @@ export default class CommonUtils {
                         data: method === 'get' ? null : body,
                         headers: method === 'get' ? null : { 'content-type': 'application/json' },
                         onload: res => {
-                            Log.info('跨域获取数据成功，耗时' + start.getTimeMs());
+                            logger.info('跨域获取数据成功，耗时' + start.getTimeMs());
                             resolve(res.response);
                         },
                         onerror: res => reject(`连接错误 ${ JSON.stringify(res) }`),
@@ -174,26 +175,27 @@ export default class CommonUtils {
      * @returns {Promise<HTMLElement|null>}
      */
     public static elementReady(selectors: string, content: Document = document, timeout: number = 30000): Promise<HTMLElement> {
-        Log.info('等待元素：' + selectors);
+        const logger = Container.factory(Logger);
+        logger.info('等待元素：' + selectors);
         let timer = new Timer();
         return new Promise((resolve, reject) => {
             let el = content.querySelector(selectors) as HTMLElement;
             if (el) {
-                Log.info('已获取元素, 耗时' + timer.getTimeMs(), el);
+                logger.info('已获取元素, 耗时' + timer.getTimeMs(), el);
                 resolve(el);
                 return;
             }
             let observer = new MutationObserver((_, observer) => {
                 content.querySelectorAll(selectors).forEach((element) => {
-                    Log.info({ innerHTML: element.innerHTML, element });
+                    logger.info({ innerHTML: element.innerHTML, element });
                     observer.disconnect();
-                    Log.info('已获取元素, 耗时' + timer.getTimeMs(), element);
+                    logger.info('已获取元素, 耗时' + timer.getTimeMs(), element);
                     resolve(element as HTMLElement);
                 });
             });
             window.setTimeout(() => {
                 observer.disconnect();
-                Log.error(`等待元素超时! [${ selectors }]\n${ content.documentElement.tagName }, 耗时` + timer.getTimeMs());
+                logger.error(`等待元素超时! [${ selectors }]\n${ content.documentElement.tagName }, 耗时` + timer.getTimeMs());
                 reject(`等待元素超时! [${ selectors }]\n${ content.documentElement.tagName }, 耗时` + timer.getTimeMs());
             }, timeout);
             observer.observe(content.documentElement, { childList: true, subtree: true });
@@ -210,7 +212,12 @@ export default class CommonUtils {
         return CommonUtils.elementReady(selectors, content, timeout);
     }
 
+    public querySelector(selectors: string, content: Document = document, timeout: number = 30000): Promise<HTMLElement> {
+        return CommonUtils.elementReady(selectors, content, timeout);
+    }
+
     public static addStyle(rules: string): void {
+        const logger = Container.factory(Logger);
         let element = document.querySelector('style#wh-trans-gStyle');
         if (element) {
             element.innerHTML += rules;
@@ -220,7 +227,7 @@ export default class CommonUtils {
             element.innerHTML = rules;
             document.head.appendChild(element);
         }
-        Log.info('CSS规则已添加', element);
+        logger.info('CSS规则已添加', element);
     }
 
     public styleInject(rules: string): void {
@@ -438,7 +445,11 @@ export default class CommonUtils {
      * @param m1 id->name map
      * @param m2 name->item map
      */
-    public getItemByIdOrName(key: string, m1, m2: { [k: string]: Partial<InventoryItemInfo> }): Partial<InventoryItemInfo> {
+    public getItemByIdOrName(key: string, m1, m2: {
+        [k: string]: Partial<InventoryItemInfo>
+    }): Partial<InventoryItemInfo> {
         return m1[key] ? m2[m1[key]] : m2[key];
     }
 }
+
+export const CommonUtilsKey = Symbol('CommonUtilsKey') as InjectionKey<CommonUtils>;

src/ts/class/utils/DialogMsgBox.ts

@@ -1,19 +1,21 @@
-import Log from "../Log";
 import DIALOG_MSG_BOX_HTML from "../../../static/html/dialog_msg_box.html";
+import Logger from "../Logger";
+import { Container } from "../../container/Container";
 
 export default class DialogMsgBox {
     private static existed = false;
     private readonly container: HTMLElement;
 
-    constructor(msg: string, opt: DialogMsgBoxOptions) {
-        Log.info('创建DialogMsgBox', { msg, opt });
+    constructor(msg: string, opt: DialogMsgBoxOptions,
+                private readonly logger: Logger = Container.factory(Logger)) {
+        logger.info('创建DialogMsgBox', { msg, opt });
         let { title = '提示', callback, cancel } = opt;
         if (!callback) {
-            Log.error('无callback');
+            logger.error('无callback');
             throw new Error('无callback');
         }
         if (DialogMsgBox.existed) {
-            Log.error('无法创建DialogMsgBox：已存在');
+            logger.error('无法创建DialogMsgBox：已存在');
             throw new Error('无法创建DialogMsgBox：已存在');
         }
         this.container = document.createElement('div');

src/ts/class/utils/InfoUtils.ts

@@ -1,10 +1,12 @@
-import Alert from "./Alert";
 import ISidebarData from "../../interface/ISidebarData";
-import Log from "../Log";
 import FetchUtils from "./FetchUtils";
 import ClassName from "../../container/ClassName";
 import { Injectable } from "../../container/Injectable";
 import Logger from "../Logger";
+import LocalConfigWrapper from "../LocalConfigWrapper";
+import MsgWrapper from "./MsgWrapper";
+import { ElMessageBox } from "element-plus";
+import { MessageBoxData } from "element-plus/es/components/message-box/src/message-box.type";
 
 @ClassName('InfoUtils')
 @Injectable()
@@ -15,6 +17,8 @@ export default class InfoUtils {
         // private readonly commonUtils: CommonUtils,
         private readonly fetchUtils: FetchUtils,
         private readonly logger: Logger,
+        private readonly localConfigWrapper: LocalConfigWrapper,
+        private readonly msgWrapper: MsgWrapper,
     ) {
     }
 
@@ -30,8 +34,51 @@ export default class InfoUtils {
                 userID: parseInt(node.getAttribute('uid')),
             }
         } else {
-            (() => new Alert('严重错误：芜湖助手无法获取用户数据，已退出'))();
-            throw '芜湖助手无法获取用户数据';
+            // 自动登陆
+            const { autoLoginEmail, autoLoginPwd } = this.localConfigWrapper.config;
+            if (autoLoginEmail && autoLoginPwd) {
+                window.setTimeout(async () => {
+                    let alertRs: MessageBoxData = null;
+                    try {
+                        alertRs = await ElMessageBox.confirm(
+                            '可进行自动登录',
+                            '确认',
+                            {
+                                confirmButtonText: '好',
+                                cancelButtonText: '算了',
+                                type: 'info',
+                            }
+                        )
+                    } catch (e) {
+                    }
+                    if (alertRs !== 'confirm') return;
+                    this.msgWrapper.create('正尝试自动登录...', null, 'info');
+                    await fetch("https://www.torn.com/page.php?sid=Auth", {
+                        "headers": {
+                            "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
+                            "cache-control": "no-cache",
+                            "content-type": "application/x-www-form-urlencoded",
+                            "pragma": "no-cache",
+                            "sec-ch-ua-mobile": "?0",
+                            "sec-fetch-dest": "document",
+                            "sec-fetch-mode": "navigate",
+                            "sec-fetch-site": "same-origin",
+                            "sec-fetch-user": "?1",
+                            "upgrade-insecure-requests": "1"
+                        },
+                        "referrer": "https://www.torn.com/",
+                        "referrerPolicy": "strict-origin-when-cross-origin",
+                        "body": `email=${ autoLoginEmail }&password=${ autoLoginPwd }&redirectUrl=https%3A%2F%2Fwww.torn.com%2F&btnLogin=Login`,
+                        "method": "POST",
+                        "mode": "cors",
+                        "credentials": "include"
+                    });
+                    this.msgWrapper.create('自动登录完成，即将转跳', null, 'info');
+                    window.setTimeout(() => window.location.href = '//www.torn.com/index.php', 1000);
+                }, 0);
+            }
+            this.msgWrapper.create('错误：芜湖助手无法获取用户数据，已退出', null, 'error');
+            throw new TypeError('芜湖助手无法获取用户数据');
         }
     }
 
@@ -56,7 +103,7 @@ export default class InfoUtils {
                     ret = {};
                 }
             } else {
-                Log.info('无法从sessionStorage获取数据')
+                this.logger.info('无法从sessionStorage获取数据')
                 ret = await (await this.fetchUtils.ajaxFetch({
                     url: window.addRFC('/sidebarAjaxAction.php?q=getSidebarData'),
                     method: 'POST',

src/ts/class/utils/ItemHelper.ts

@@ -1,11 +1,12 @@
 import InventoryItemInfo from "../../interface/responseType/InventoryItemInfo";
 import FetchUtils from "./FetchUtils";
 import CommonUtils from "./CommonUtils";
-import Log from "../Log";
 import PriceData from "../../interface/PriceData";
 import Asyncable from "../../interface/Asyncable";
 import ClassName from "../../container/ClassName";
 import { Injectable } from "../../container/Injectable";
+import Logger from "../Logger";
+import { InjectionKey } from "vue";
 
 @ClassName('ItemHelper')
 @Injectable()
@@ -13,6 +14,7 @@ export default class ItemHelper {
 
     constructor(
         private readonly fetchUtils: FetchUtils,
+        private readonly logger: Logger,
     ) {
     }
 
@@ -81,7 +83,7 @@ export default class ItemHelper {
      * 物品查价值
      */
     public async getItemValue(idOrName) {
-        return (await this.getItemData(idOrName)).itemValue.replaceAll(/[,$]/, '');
+        return (await this.getItemData(idOrName)).itemValue.replaceAll(/[,$]/g, '');
     }
 
     /** 返回本地物品价格数据，id对应物品名和价格 */
@@ -99,7 +101,7 @@ export default class ItemHelper {
         try {
             data = JSON.parse(localStore);
         } catch (e) {
-            Log.error(e.stack || e.message || e);
+            this.logger.error(e.stack || e.message || e);
             throw new Error('JSON解析错误');
         }
         // 缓存超时
@@ -139,7 +141,7 @@ export default class ItemHelper {
         else {
             ret.promise = new Promise(async resolve => {
                 let response = await localData.promise;
-                Log.info({ response });
+                this.logger.info({ response });
                 let promiseRet = {};
                 Object.keys(response).forEach(k => {
                     promiseRet[response[k].name] = k;
@@ -161,7 +163,7 @@ export default class ItemHelper {
         try {
             res = JSON.parse(await CommonUtils.COFetch('https://jjins.github.io/item_price_raw.json'))
         } catch (err) {
-            Log.error(err.stack || err.message || err);
+            this.logger.error(err.stack || err.message || err);
             throw new Error('获取在线价格时出错');
         }
         // 更新缓存
@@ -173,3 +175,5 @@ export default class ItemHelper {
         return res;
     }
 }
+
+export const ItemHelperKey = Symbol('ItemHelperKey') as InjectionKey<ItemHelper>;

src/ts/class/utils/MathUtils.ts

@@ -1,5 +1,6 @@
 import ClassName from "../../container/ClassName";
 import { Injectable } from "../../container/Injectable";
+import { InjectionKey } from "vue";
 
 @ClassName('MathUtils')
 @Injectable()
@@ -14,3 +15,5 @@ export default class MathUtils {
         return Math.floor(Math.random() * (max - min)) + min;
     }
 }
+
+export const MathUtilsKey = Symbol('MathUtilsKey') as InjectionKey<MathUtils>

src/ts/class/utils/MsgWrapper.ts

@@ -1,12 +1,32 @@
 import ClassName from "../../container/ClassName";
 import { Injectable } from "../../container/Injectable";
-import Alert from "./Alert";
 import IWHNotify from "../../interface/IWHNotify";
+import { InjectionKey } from "vue";
+import { ElMessage } from "element-plus";
+import NotificationUtils from "./NotificationUtils";
+import WindowActiveState from "../action/WindowActiveState";
 
 @ClassName('MsgWrapper')
 @Injectable()
 export default class MsgWrapper {
-    create(msg: string, options: IWHNotify = {},): Alert {
-        return new Alert(msg, options);
+    constructor(
+        private readonly notificationUtils: NotificationUtils,
+        private readonly windowActiveState: WindowActiveState,
+    ) {
+    }
+
+    create(msg: string, options: IWHNotify = {}, type: 'info' | 'warning' | 'error' | 'success' = 'info') {
+        if (!this.windowActiveState.get()) return null;
+        if (options?.sysNotify) {
+            this.notificationUtils.push(msg, options);
+        }
+        return ElMessage({
+            message: msg,
+            type,
+            showClose: true,
+            dangerouslyUseHTMLString: true,
+        });
     }
 }
+
+export const MsgWrapperKey = Symbol('MsgWrapperKey') as InjectionKey<MsgWrapper>;

src/ts/class/utils/NetHighLvlWrapper.ts

@@ -34,6 +34,26 @@ export default class NetHighLvlWrapper {
         }
         return rs;
     }
+
+    public async doTravelFly(destId, key, type): Promise<string> {
+        return await (await fetch(window.addRFC("https://www.torn.com/travelagency.php"), {
+            "headers": {
+                "accept": "*/*",
+                "accept-language": "zh-CN,zh;q=0.9",
+                "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+                "sec-fetch-dest": "empty",
+                "sec-fetch-mode": "cors",
+                "sec-fetch-site": "same-origin",
+                "x-requested-with": "XMLHttpRequest"
+            },
+            "referrer": "https://www.torn.com/travelagency.php",
+            "referrerPolicy": "strict-origin-when-cross-origin",
+            "body": `step=travel&id=${ destId }&type=${ type }`,
+            "method": "POST",
+            "mode": "cors",
+            "credentials": "include"
+        })).text()
+    }
 }
 
 export enum BATTLE_STAT {

src/ts/class/utils/NotificationUtils.ts

@@ -1,7 +1,7 @@
 import IWHNotify from "../../interface/IWHNotify";
-import Log from "../Log";
 import ClassName from "../../container/ClassName";
 import { Injectable } from "../../container/Injectable";
+import Logger from "../Logger";
 
 @ClassName('NotificationUtils')
 @Injectable()
@@ -9,19 +9,21 @@ export default class NotificationUtils {
     constructor(
         // TODO 循环依赖
         // private readonly global: Global,
+        private readonly logger: Logger,
     ) {
     }
 
     private permission: boolean = window.Notification && window.Notification.permission === 'granted';
 
     public push(msg: string, options: IWHNotify = {}): void {
+        // this.logger.info({msg, options})
         // let { notifies } = this.global;
 
         if (options.sysNotify && this.permission) {
             let tmpNode = document.createElement('p');
             tmpNode.innerHTML = msg;
             let notify = new Notification('芜湖助手', {
-                body: Log.getTime() + '\r\n' + tmpNode.innerText,
+                body: this.logger.getTime() + '\r\n' + tmpNode.innerText,
                 // requireInteraction: true,
                 // renotify: true,
                 // tag: '芜湖助手' + Utils.getRandomInt(0, 99),

src/ts/class/utils/PopupWrapper.ts

@@ -0,0 +1,14 @@
+import ClassName from "../../container/ClassName";
+import { Injectable } from "../../container/Injectable";
+import Popup from "./Popup";
+import { InjectionKey } from "vue";
+
+@ClassName('PopupWrapper')
+@Injectable()
+export default class PopupWrapper {
+    public create(html: string, title: string, onClosing: () => unknown) {
+        return new Popup(html, title, onClosing);
+    }
+}
+
+export const PopupWrapperKey = Symbol('PopupWrapperKey') as InjectionKey<PopupWrapper>;

src/ts/container/ClassName.ts

@@ -3,13 +3,13 @@ const CLASSNAME_METADATA_KEY = Symbol("CLASSNAME_KEY");
 /**
  * 记录类名，避免打包后丢失原类名
  */
-export default function ClassName(className?: string): ClassDecorator {
+export default function ClassName(className: string): ClassDecorator {
     return function <TFunction extends Function>(target: TFunction): TFunction {
-        Reflect.defineMetadata(CLASSNAME_METADATA_KEY, className || target.name, target);
+        Reflect.defineMetadata(CLASSNAME_METADATA_KEY, className, target);
         return target;
     };
 }
 
-export function GetClassName(target: any) {
+export function GetClassName(target: ClassType<{}>): string {
     return Reflect.getMetadata(CLASSNAME_METADATA_KEY, target);
 }

src/ts/container/Container.ts

@@ -1,40 +1,38 @@
+import "reflect-metadata";
 import { assertInjectable } from "./Injectable";
-import { GetClassName } from "./ClassName";
+import ClassName, { GetClassName } from "./ClassName";
+import Logger from "../class/Logger";
 
 /**
  * 一个简单的类容器
  */
+@ClassName('Container')
 export class Container {
     static _container = new Map();
     private static logger;
 
-    static set(k: any, v: any): void {
+    static set<T>(k: Constructor<T>, v: T): void {
         if (!this._container.has(k)) {
             this._container.set(k, v);
         }
     }
 
-    static get(k: any): any {
+    static get<T>(k: Constructor<T>): T {
         return this._container.get(k);
     }
 
-    static factory<T>(target: Constructor<T>): T {
+    static factory<T>(target: ClassType<T>): T {
         assertInjectable(target);
-        // if (Container.get(target))
-        //     return Container.get(target);
         return this.get(target) || this.initParam(target);
     }
 
-    static setLogger(logger: { info(...o: any[]), error(...o: any[]), warn(...o: any[]) }): void {
+    static setLogger(logger: Logger): void {
         this.logger = logger;
     }
 
     private static initParam<T>(target: Constructor<T>): T {
         // 获取所有注入的服务
         const providers = Reflect.getMetadata('design:paramtypes', target);
-        // this.logger.info({providers})
-        // this.logger.info('原型名'+Object.getPrototypeOf(target).constructor.name)
-        // this.logger.info('直接名'+target.name)
         const args = providers ? providers.map((provider: Constructor) => {
             return this.factory(provider);
         }) : [];

src/ts/container/Injectable.ts

@@ -5,7 +5,6 @@ const INJECTABLE_METADATA_KEY = Symbol("INJECTABLE_KEY");
 // TODO 实现非单例注入
 export enum INJECT_MODE {
     Singleton = 1,
-    Multi = 2,
 }
 
 export function Injectable(injectMode: INJECT_MODE = INJECT_MODE.Singleton): ClassDecorator {

src/ts/feature/Atk.ts

@@ -0,0 +1,278 @@
+import ClassName from "../container/ClassName"
+import { Injectable } from "../container/Injectable"
+import IFeature from "../man/IFeature"
+import LocalConfigWrapper from "../class/LocalConfigWrapper"
+import CommonUtils from "../class/utils/CommonUtils"
+import Global from "../class/Global"
+import ActionButtonUtils from "../class/utils/ActionButtonUtils"
+import Logger from "../class/Logger"
+import Alert from "../class/utils/Alert"
+import Device from "../enum/Device"
+import ATTACK_HELPER_CSS from "../../static/css/attack_helper.module.css"
+import ATK_PAGE_REG from "./url/ATK_PAGE_REG";
+
+enum FIGHT_STAGE {
+    READY = 'ready',
+    IN_PROGRESS_OR_ERROR = 'in_progress_or_error',
+    FINISHED = 'finished',
+    END = 'end',
+    OTHER = 'other'
+}
+
+@ClassName('Atk')
+@Injectable()
+export default class Atk implements IFeature {
+
+    private currentStage: FIGHT_STAGE = FIGHT_STAGE.OTHER;
+
+    constructor(
+        private readonly actionButtonUtils: ActionButtonUtils,
+        private readonly localConfigWrapper: LocalConfigWrapper,
+        private readonly commonUtils: CommonUtils,
+        private readonly global: Global,
+        // private readonly mathUtils: MathUtils,
+        // private readonly fetchUtils: FetchUtils,
+        private readonly logger: Logger,
+    ) {
+    }
+
+    urlIncludes(): RegExp[] {
+        return [ATK_PAGE_REG]
+    }
+
+    urlExcludes(): RegExp[] {
+        return []
+    }
+
+    description(): string {
+        return '攻击助手'
+    }
+
+    iStart(): void | Promise<void> {
+        // 光速刷新按钮
+        this.actionButtonUtils.add('光速刷新', () => this.doAttackReload());
+
+        new MutationObserver((_, observer) => {
+            let btnList = document.querySelectorAll('div[class^="dialogButtons___"] button') as NodeListOf<HTMLButtonElement>;
+
+            if (btnList.length === 0) {
+                if (this.currentStage === FIGHT_STAGE.READY && this.localConfigWrapper.config.quickFinishAtt === 3) {
+                    document.body.classList.remove('wh-move-btn');
+                    this.logger.info('移除body class wh-move-btn');
+                    observer.disconnect();
+                }
+                // 错误或正在打
+                this.currentStage = FIGHT_STAGE.IN_PROGRESS_OR_ERROR;
+                this.logger.info('[attackHelper] currentStage', this.currentStage);
+                return;
+            }
+            btnList.forEach(btn => {
+                let btnText = btn.innerText.toLowerCase();
+                if (btnText.includes('start') || btnText.includes('join')) {
+                    // 开始
+                    this.quickStartFight();
+                } else if (btnText.includes('continue')) {
+                    // 结束end
+                    this.currentStage = FIGHT_STAGE.END;
+                    observer.disconnect();
+                } else if (btnText.includes('leave')) {
+                    // 无意识状态FINISHED
+                    this.quickFinishFight(btnList);
+                }
+                this.logger.info('[attackHelper] currentStage', this.currentStage);
+            })
+        })
+            .observe(document.querySelector('#react-root'), { childList: true, subtree: true });
+    }
+
+    // 战斗页面快速刷新
+    private doAttackReload(): void {
+        if (!window.ReactDOM) {
+            new Alert('光速刷新失败：未找到React对象');
+            this.logger.error('光速刷新失败：未找到React对象');
+            return;
+        }
+        if (!document.querySelector('#react-root #attacker')) {
+            this.logger.error('dom元素未找到selector: [#react-root #attacker]');
+            return;
+        }
+        let script = document.querySelector('script[src*="/builds/attack/"]');
+        let url = script.src;
+        if (!url.contains(/runtime\..+\.js/)) {
+            this.logger.error('脚本源[' + url + '] 不匹配规则');
+            return;
+        }
+        window.ReactDOM.unmountComponentAtNode(document.querySelector('#react-root'));
+        script.remove();
+        let node = document.createElement('script');
+        node.src = url;
+        node.type = 'text/javascript';
+        document.head.appendChild(node);
+    }
+
+    // 光速拔刀
+    private quickStartFight(): void {
+        if (this.currentStage === FIGHT_STAGE.READY) {
+            return;
+        } else {
+            this.currentStage = FIGHT_STAGE.READY;
+        }
+        if (this.localConfigWrapper.config.quickAttIndex === 6) return;
+        /**
+         * pc     #defender
+         * mobile #attacker
+         */
+        const btn = <HTMLInputElement>(document.querySelector('#attacker button') || document.querySelector('#defender button'));
+        this.logger.info('操作按钮', { btn });
+        if (!btn.innerText.toLowerCase().includes('fight')) {
+            this.logger.info('未找到攻击按钮, 光速拔刀跳过');
+            new Alert('未找到攻击按钮, 光速拔刀跳过');
+        } else {
+            // 判断是否存在脚踢
+            const hasKick = !!document.querySelector('#weapon_boots');
+            // modal层
+            // const modal: HTMLElement = document.querySelector('div[class^="modal___"]');
+            let device = this.global.device;
+            this.logger.info(`当前设备类型是${ device }`);
+            // 区分设备
+            switch (device) {
+                case Device.PC: {
+                    this.logger.info(`开始调整按钮位置`);
+                    // 隐藏modal层
+                    // modal.style.display = 'none';
+                    // 根据选择的武器调整css
+                    let css_top = '0';
+                    switch (this.localConfigWrapper.config.quickAttIndex) {
+                        // weapon_second
+                        case 1: {
+                            css_top = '97px';
+                            break;
+                        }
+                        // weapon_melee
+                        case 2: {
+                            css_top = '194px';
+                            break;
+                        }
+                        // weapon_temp
+                        case 3: {
+                            css_top = '291px';
+                            break;
+                        }
+                        // weapon_fists
+                        case 4:
+                        // weapon_boots
+                        case 5: {
+                            css_top = '375px';
+                            break;
+                        }
+                    }
+                    this.commonUtils.styleInject(ATTACK_HELPER_CSS);
+                    CommonUtils.addStyle(`.wh-move-btn #defender div[class^="modal___"]{top: ${ css_top };}`);
+                    document.body.classList.add('wh-move-btn');
+                    break;
+                }
+                case Device.MOBILE: {
+                    this.logger.info(`开始调整按钮位置`);
+                    // 加入css
+                    let css_top = '0';
+                    let slot_height = '76px';
+                    // 判断有没有脚踢
+                    if (hasKick) {
+                        // 根据选择的武器调整
+                        switch (this.localConfigWrapper.config.quickAttIndex) {
+                            case 1: { // weapon_second
+                                css_top = '76px';
+                                break;
+                            }
+                            case 2: { // weapon_melee
+                                css_top = '152px';
+                                break;
+                            }
+                            case 3: { // weapon_temp
+                                css_top = '228px';
+                                break;
+                            }
+                            case 4: { // weapon_fists
+                                css_top = '304px';
+                                break;
+                            }
+                            case 5: { // weapon_boots
+                                css_top = '380px';
+                                break;
+                            }
+                        }
+                    } else {
+                        const slot = document.querySelector('#weapon_main') as HTMLElement;
+                        const height = slot.offsetHeight + 1;
+                        // TODO 待验证
+                        slot_height = height + 'px';
+                        // 根据选择的武器调整
+                        switch (this.localConfigWrapper.config.quickAttIndex) {
+                            case 1: { // weapon_second
+                                css_top = `${ height }px`;
+                                break;
+                            }
+                            case 2: { // weapon_melee
+                                css_top = `${ height * 2 }px`;
+                                break;
+                            }
+                            case 3: { // weapon_temp
+                                css_top = `${ height * 3 }px`;
+                                break;
+                            }
+                            case 4: { // weapon_fists
+                                css_top = `${ height * 4 }px`;
+                                break;
+                            }
+                            case 5: { // weapon_boots
+                                css_top = `${ height * 5 }px`;
+                                break;
+                            }
+                        }
+                    }
+                    const css_rule = ATTACK_HELPER_CSS.replace('CSSVAR', css_top).replace('CSSVAR', slot_height);
+
+                    this.commonUtils.styleInject(css_rule);
+                    document.body.classList.toggle('wh-move-btn');
+                    btn.onclick = () => {
+                        if (this.localConfigWrapper.config.quickFinishAtt !== 3) {
+                            btn.remove();
+                            // 停止自动刷新
+                            // stop_reload = true;
+                        } else {
+                            document.body.classList.toggle('wh-move-btn');
+                        }
+                    };
+                    break;
+                }
+                case Device.TABLET: {
+                    break;
+                }
+            }
+        }
+    }
+
+    // 光速跑路
+    private quickFinishFight(btnList: NodeListOf<HTMLButtonElement>): void {
+        if (this.currentStage === FIGHT_STAGE.FINISHED) {
+            return;
+        } else {
+            this.currentStage = FIGHT_STAGE.FINISHED;
+        }
+        if (this.localConfigWrapper.config.quickFinishAtt === 3) {
+            document.body.classList.remove('wh-move-btn');
+            this.logger.info('移除body class wh-move-btn');
+            return;
+        }
+        const user_btn_select = ['leave', 'mug', 'hosp'][this.localConfigWrapper.config.quickFinishAtt];
+        // const wrap = document.querySelector('#react-root');
+        this.logger.info('光速跑路选项选中：', user_btn_select);
+        //     const btn_arr: HTMLButtonElement[] = document.querySelectorAll('div[class^="dialogButtons___"] button') as unknown as HTMLButtonElement[];
+        if (btnList.length > 1) btnList.forEach(btn => {
+            const flag = btn.innerText.toLowerCase().includes(user_btn_select);
+            this.logger.info('按钮内容：', btn.innerText, '，是否包含选中：', flag);
+            if (!flag) btn.style.display = 'none';
+        });
+    }
+
+}

src/ts/feature/BeerShopModifier.ts

@@ -0,0 +1,68 @@
+import ClassName from "../container/ClassName"
+import { Injectable } from "../container/Injectable"
+import IFeature from "../man/IFeature"
+import TornStyleBlock from "../class/utils/TornStyleBlock"
+import ADD_BEER_HEAD_HTML from "../../static/html/buyBeer/add_beer_head.html"
+import SHOP_BEER_STATIC_ITEM_HTML from "../../static/html/buyBeer/shop_beer_static_item.html"
+import globVars from "../globVars"
+import Logger from "../class/Logger";
+import BuyBeerHelper from "./BuyBeerHelper";
+
+@ClassName('BeerShopModifier')
+@Injectable()
+export default class BeerShopModifier implements IFeature {
+    private readonly logger = Logger.factory(BeerShopModifier)
+
+    constructor(
+        private readonly buyBeerHelper: BuyBeerHelper,
+    ) {
+    }
+
+    description(): string {
+        return "啤酒店页面修改";
+    }
+
+    iStart(): void | Promise<void> {
+        this.start()
+    }
+
+    urlExcludes(): RegExp[] {
+        return [];
+    }
+
+    urlIncludes(): RegExp[] {
+        return [/shops.php\?step=bitsnbobs/];
+    }
+
+    start() {
+        let block = new TornStyleBlock('啤酒助手').insert2Dom();
+        block.setContent(ADD_BEER_HEAD_HTML);
+        const msg_node = block.querySelector('#wh-msg');
+        // 加入啤酒
+        block.querySelector('button').addEventListener('click', e => {
+            let node = document.querySelector('ul.items-list');
+            if (!node) {
+                msg_node.innerHTML = '❌ 商品未加载完';
+                this.logger.error('商品未加载完');
+                return;
+            }
+            if (node.querySelector('span[id="180-name"]')) {
+                msg_node.innerHTML = '❌ 页面已经有啤酒了';
+                this.logger.warn('商店页面已有啤酒');
+                return;
+            }
+            const clear_node = node.querySelector('li.clear');
+            const beer = document.createElement('li');
+            beer.classList.add('torn-divider', 'divider-vertical');
+            beer.style.backgroundColor = '#c8c8c8';
+            beer.innerHTML = SHOP_BEER_STATIC_ITEM_HTML;
+            if (clear_node) clear_node.before(beer);
+            else node.append(beer);
+            (<HTMLInputElement>e.target).disabled = true;
+            msg_node.innerHTML = '添加成功';
+        });
+
+        // 监听啤酒购买
+        globVars.responseHandlers.push((...args: any[]) => this.buyBeerHelper.responseHandler.apply(this.buyBeerHelper, args));
+    }
+}

src/ts/feature/BuyBeerHelper.ts

@@ -1,18 +1,37 @@
-import Log from "../Log";
-import InfoUtils from "../utils/InfoUtils";
-import Alert from "../utils/Alert";
-import MathUtils from "../utils/MathUtils";
-import NOTIFY_HTML from "../../../static/html/buyBeer/notify.html";
-import CommonUtils from "../utils/CommonUtils";
-import Popup from "../utils/Popup";
-import ResponseInject from "../../interface/ResponseInject";
-import LocalConfigWrapper from "../LocalConfigWrapper";
-import ClassName from "../../container/ClassName";
-import { Injectable } from "../../container/Injectable";
+import InfoUtils from "../class/utils/InfoUtils";
+import MathUtils from "../class/utils/MathUtils";
+import NOTIFY_HTML from "../../static/html/buyBeer/notify.html";
+import CommonUtils from "../class/utils/CommonUtils";
+import Popup from "../class/utils/Popup";
+import ResponseInject from "../interface/ResponseInject";
+import LocalConfigWrapper from "../class/LocalConfigWrapper";
+import ClassName from "../container/ClassName";
+import { Injectable } from "../container/Injectable";
+import Logger from "../class/Logger";
+import MsgWrapper from "../class/utils/MsgWrapper";
+import IFeature from "../man/IFeature";
+import ATK_PAGE_REG from "./url/ATK_PAGE_REG";
+import ALL_PAGE_REG from "./url/ALL_PAGE_REG";
 
 @ClassName('BuyBeerHelper')
 @Injectable()
-export default class BuyBeerHelper implements BeerMonitorLoop, ResponseInject {
+export default class BuyBeerHelper implements BeerMonitorLoop, ResponseInject, IFeature {
+
+    urlIncludes(): RegExp[] {
+        return [ALL_PAGE_REG]
+    }
+
+    urlExcludes(): RegExp[] {
+        return [ATK_PAGE_REG]
+    }
+
+    description(): string {
+        return '啤酒助手'
+    }
+
+    iStart(): void | Promise<void> {
+        (this.localConfigWrapper.config._15Alarm) && this.start()
+    }
 
     private isNotifying = false;
     private loopId: number = null;
@@ -24,15 +43,17 @@ export default class BuyBeerHelper implements BeerMonitorLoop, ResponseInject {
         private readonly commonUtils: CommonUtils,
         private readonly infoUtils: InfoUtils,
         private readonly mathUtils: MathUtils,
+        private readonly logger: Logger,
+        private readonly msgWrapper: MsgWrapper,
     ) {
         this.time = this.localConfigWrapper.config._15AlarmTime || 30;
     }
 
     public start(): void {
         if (this.loopId) {
-            Log.info('啤酒助手已在运行');
+            this.logger.info('啤酒助手已在运行');
         } else {
-            Log.info('啤酒助手启动');
+            this.logger.info('啤酒助手启动');
             this.loopId = window.setInterval(async () => {
                 // 海外取消提醒
                 let { isTravelling, isAbroad } = await this.infoUtils.getUserState();
@@ -59,16 +80,18 @@ export default class BuyBeerHelper implements BeerMonitorLoop, ResponseInject {
                     if (this.isNotifying) return;
                     this.isNotifying = true;
                     // 发送通知
-                    const notify = new Alert(this.notifyHtml, {
+                    const rNum = this.mathUtils.getRandomInt(0, 99);
+                    // const notify =
+                    this.msgWrapper.create(NOTIFY_HTML.replace('{{}}', rNum.toString()), {
                         timeout: 30,
                         sysNotify: true,
                     });
-                    notify.getElement().querySelector('.wh-notify-msg button').addEventListener('click', () => this.skip_today());
-                    notify.getElement().addEventListener('click', ev => {
-                        if ((ev.target as HTMLElement).tagName.toLowerCase() === 'a') {
-                            notify.close();
-                        }
-                    });
+                    document.querySelector('button#wh-rd-btn-' + rNum).addEventListener('click', () => this.skip_today());
+                    // notify.getElement().addEventListener('click', ev => {
+                    //     if ((ev.target as HTMLElement).tagName.toLowerCase() === 'a') {
+                    //         notify.close();
+                    //     }
+                    // });
                     // 声音提醒
                     {
                         let loop = 3;
@@ -109,9 +132,10 @@ export default class BuyBeerHelper implements BeerMonitorLoop, ResponseInject {
         this.localConfigWrapper.config._15_alarm_ignore = [date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()];
         // WuhuConfig.set('_15_alarm_ignore', [date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()], false);
         // 通知
-        const notify = new Alert(`明早8点前将不再提醒 <button id="wh-rd-btn-${ this.mathUtils.getRandomInt(0, 100) }">取消</button>`);
+        const rNumber = this.mathUtils.getRandomInt(0, 100);
+        const notify = this.msgWrapper.create(`明早8点前将不再提醒 <button id="wh-rd-btn-${ rNumber }">取消</button>`);
         // 通知中的取消按钮
-        notify.getElement().querySelector('.wh-notify-msg button')
+        document.querySelector('#wh-rd-btn-' + rNumber)
             .addEventListener(
                 'click',
                 () => this.localConfigWrapper.config._15_alarm_ignore.length = 0
@@ -138,11 +162,14 @@ export default class BuyBeerHelper implements BeerMonitorLoop, ResponseInject {
         popup.element.appendChild(confirm);
     }
 
-    public responseHandler(url: string, body: { json: unknown; text: string; isModified: boolean }, opt: { method: "GET" | "POST"; requestBody: string }) {
+    public responseHandler(url: string, body: { json: unknown; text: string; isModified: boolean }, opt: {
+        method: "GET" | "POST";
+        requestBody: string
+    }) {
         if (url.includes('shops.php') && opt?.method === 'POST') {
             let req = opt.requestBody;
             if (req && req.includes('step=buyShopItem') && req.includes('ID=180') && body.json && body.json['success']) {
-                new Alert('检测到已成功购买啤酒');
+                this.msgWrapper.create('检测到已成功购买啤酒');
                 this.skip_today();
             }
         }

src/ts/feature/ChristmasTown.ts

@@ -0,0 +1,25 @@
+import ClassName from "../container/ClassName";
+import { Injectable } from "../container/Injectable";
+import IFeature from "../man/IFeature";
+import christmasTownHelper from "../func/module/christmasTownHelper";
+
+@ClassName('ChristmasTown')
+@Injectable()
+export default class ChristmasTown implements IFeature {
+
+    urlIncludes(): RegExp[] {
+        return [/christmas_town\.php/]
+    }
+
+    urlExcludes(): RegExp[] {
+        return []
+    }
+
+    description(): string {
+        return '圣诞小镇助手'
+    }
+
+    iStart(): void | Promise<void> {
+        christmasTownHelper()
+    }
+}

src/ts/feature/CompanyHelper.ts

@@ -1,27 +1,46 @@
-import CommonUtils from "../utils/CommonUtils";
-import FetchUtils from "../utils/FetchUtils";
-import InfoUtils from "../utils/InfoUtils";
-import Alert from "../utils/Alert";
-import TRAVEL_STATE from "../../enum/TravelState";
-import LocalConfigWrapper from "../LocalConfigWrapper";
-import { Injectable } from "../../container/Injectable";
-import ClassName from "../../container/ClassName";
-import Logger from "../Logger";
+import CommonUtils from "../class/utils/CommonUtils";
+import FetchUtils from "../class/utils/FetchUtils";
+import InfoUtils from "../class/utils/InfoUtils";
+import TRAVEL_STATE from "../enum/TravelState";
+import LocalConfigWrapper from "../class/LocalConfigWrapper";
+import { Injectable } from "../container/Injectable";
+import ClassName from "../container/ClassName";
+import Logger from "../class/Logger";
+import MsgWrapper from "../class/utils/MsgWrapper";
+import IFeature from "../man/IFeature";
+import ATK_PAGE_REG from "./url/ATK_PAGE_REG";
+import ALL_PAGE_REG from "./url/ALL_PAGE_REG";
 
 /**
  * 公司助手
  */
 @Injectable()
 @ClassName('CompanyHelper')
-export default class CompanyHelper {
-    className = 'CompanyHelper';
+export default class CompanyHelper implements IFeature {
+    private readonly logger: Logger = Logger.factory(CompanyHelper)
+
+    description(): string {
+        return "公司助手、火车爆仓检测";
+    }
+
+    iStart(): void | Promise<void> {
+        this.init()
+    }
+
+    urlExcludes(): RegExp[] {
+        return [ATK_PAGE_REG];
+    }
+
+    urlIncludes(): RegExp[] {
+        return [ALL_PAGE_REG];
+    }
 
     public constructor(
         private readonly localConfigWrapper: LocalConfigWrapper,
         private readonly commonUtils: CommonUtils,
         private readonly fetchUtils: FetchUtils,
-        private readonly logger: Logger,
         private readonly infoUtils: InfoUtils,
+        private readonly msgWrapper: MsgWrapper,
     ) {
     }
 
@@ -29,10 +48,6 @@ export default class CompanyHelper {
         this.localConfigWrapper.config.CHTrainsDetectSwitch && this.trainsDetect().then();
     }
 
-    // public detectNow(): void {
-    //     this.trainsDetect(true).then();
-    // }
-
     /**
      * 火车检测
      * 每日判断一次，非公司老板跳过检测
@@ -40,7 +55,7 @@ export default class CompanyHelper {
      */
     private async trainsDetect(test: boolean = false): Promise<null> {
         // 通过用户的icon判断公司老板
-        if ((await this.infoUtils.getSessionData()).statusIcons.icons.company.iconID !== 'icon73') {
+        if ((await this.infoUtils.getSessionData()).statusIcons.icons.company?.iconID !== 'icon73') {
             this.logger.info('火车检测跳过：非公司老板');
             return;
         }
@@ -55,7 +70,7 @@ export default class CompanyHelper {
                 this.fetchUtils.fetchText('/companies.php')
                     .then(res => {
                         let tmp: HTMLElement = document.createElement('div');
-                        let bodyTagStart = this.commonUtils.matchOne(res, /<body.+>/);
+                        let bodyTagStart = this.commonUtils.matchOne(res, /<body.+/);
                         if (!bodyTagStart) {
                             this.logger.warn('火车检测: 无法获取数据');
                             throw new Error('火车检测: 无法获取数据');
@@ -76,7 +91,7 @@ export default class CompanyHelper {
                         this.logger.info('火车检测: 火车/星级: ' + trains + '/' + stars);
                         this.logger.info({ tmp });
                         if (trains + stars > 20) {
-                            new Alert(`公司助手<br/><br/>火车检测：火车明日将溢出！${ trains }/20火车`, {
+                            this.msgWrapper.create(`【公司助手】火车检测：火车明日将溢出！${ trains }/20火车`, {
                                 timeout: 15,
                                 force: true,
                                 sysNotify: true

src/ts/feature/CrimePageModifier.ts

@@ -0,0 +1,78 @@
+import ClassName from "../container/ClassName";
+import { Injectable } from "../container/Injectable";
+import IFeature from "../man/IFeature";
+import LocalConfigWrapper from "../class/LocalConfigWrapper";
+import CommonUtils from "../class/utils/CommonUtils";
+import QUICK_CRIMES_HTML from "../../static/html/quick_crimes.html";
+
+@ClassName('CrimePageModifier')
+@Injectable()
+export default class CrimePageModifier implements IFeature {
+    constructor(
+        private readonly localConfigWrapper: LocalConfigWrapper
+    ) {
+    }
+
+    description(): string {
+        return "页面快速crime";
+    }
+
+    iStart(): void | Promise<void> {
+        this.start()
+    }
+
+    urlExcludes(): RegExp[] {
+        return [];
+    }
+
+    urlIncludes(): RegExp[] {
+        return [/crimes\.php/];
+    }
+
+    start() { // TODO 重构、与翻译解藕
+        if (this.localConfigWrapper.config.quickCrime) {
+            // iframe
+            if (self !== top) {
+                const isValidate = document.querySelector('h4#skip-to-content').innerText.toLowerCase().includes('validate');
+                CommonUtils.elementReady('#header-root').then(e => e.style.display = 'none');
+                CommonUtils.elementReady('#sidebarroot').then(e => e.style.display = 'none');
+                CommonUtils.elementReady('#chatRoot').then(e => e.style.display = 'none');
+                if (!isValidate) document.body.style.overflow = 'hidden';
+                CommonUtils.elementReady('.content-wrapper').then(e => {
+                    e.style.margin = '0px';
+                    e.style.position = 'absolute';
+                    e.style.top = '-35px';
+                });
+                CommonUtils.elementReady('#go-to-top-btn button').then(e => e.style.display = 'none');
+            }
+            const element = document.querySelector('.content-wrapper');
+            const OB = new MutationObserver(() => {
+                OB.disconnect();
+                trans();
+                OB.observe(element, {
+                    characterData: true,
+                    attributes: true,
+                    subtree: true,
+                    childList: true
+                });
+            });
+            const trans = () => {
+                const dom = QUICK_CRIMES_HTML;
+                const hasInserted = element.querySelector('.wh-translate') !== null;
+                const $title = document.querySelector('div.content-title');
+                const $info = document.querySelector('.info-msg-cont');
+                if (!hasInserted) {
+                    if ($title) $title.insertAdjacentHTML('beforebegin', dom);
+                    else if ($info) $info.insertAdjacentHTML('beforebegin', dom);
+                }
+            };
+            trans();
+            OB.observe(element, {
+                characterData: true,
+                attributes: true,
+                subtree: true,
+                childList: true
+            });
+        }
+    }
+}

src/ts/feature/IconHelper.ts

@@ -0,0 +1,76 @@
+import Logger, { LoggerKey } from "../class/Logger"
+import ClassName from "../container/ClassName"
+import { Injectable } from "../container/Injectable"
+import CommonUtils, { CommonUtilsKey } from "../class/utils/CommonUtils"
+import LocalConfigWrapper, { LocalConfigWrapperKey } from "../class/LocalConfigWrapper"
+import { createApp } from "vue"
+import FloatMenu from "../../vue/FloatMenu.vue"
+import PopupWrapper, { PopupWrapperKey } from "../class/utils/PopupWrapper"
+import TravelItem from "./TravelItem"
+import QuickGymTrain, { QuickGymTrainKey } from "../class/action/QuickGymTrain"
+import QuickFlyBtnHandler, { QuickFlyBtnHandlerKey } from "../class/handler/QuickFlyBtnHandler"
+import ItemHelper, { ItemHelperKey } from "../class/utils/ItemHelper"
+import MathUtils, { MathUtilsKey } from "../class/utils/MathUtils"
+import IFeature from "../man/IFeature"
+import ALL_PAGE_REG from "./url/ALL_PAGE_REG"
+
+@ClassName("IconHelper")
+@Injectable()
+export default class IconHelper implements IFeature {
+    private readonly _element: HTMLElement = document.createElement('div');
+    private readonly logger = Logger.factory(IconHelper)
+
+    description(): string {
+        return "浮动图标、侧边菜单、标签式便携功能";
+    }
+
+    iStart(): void | Promise<void> {
+        this.init()
+    }
+
+    urlExcludes(): RegExp[] {
+        return [];
+    }
+
+    urlIncludes(): RegExp[] {
+        return [ALL_PAGE_REG];
+    }
+
+    constructor(
+        private readonly commonUtils: CommonUtils,
+        private readonly localConfigWrapper: LocalConfigWrapper,
+        private readonly popupWrapper: PopupWrapper,
+        private readonly travelItem: TravelItem,
+        private readonly quickGymTrain: QuickGymTrain,
+        private readonly quickFlyBtnHandler: QuickFlyBtnHandler,
+        private readonly itemHelper: ItemHelper,
+        private readonly mathUtils: MathUtils,
+    ) {
+    }
+
+    get element() {
+        return this._element;
+    }
+
+    init() {
+        this._element.id = 'WHMenu2023';
+        document.body.append(this._element);
+        let app = createApp(FloatMenu);
+        this.logger.info('Vue实例已创建', { app })
+
+        app.config.errorHandler = (err) => this.logger.error('[VUE错误]', err);
+        app.config.warnHandler = (err) => this.logger.warn('[VUE警告]', err);
+        app.provide(LoggerKey, this.logger);
+        app.provide(CommonUtilsKey, this.commonUtils);
+        app.provide(MathUtilsKey, this.mathUtils);
+        // app.provide(TravelItemKey, this.travelItem);
+        app.provide(PopupWrapperKey, this.popupWrapper);
+        app.provide(LocalConfigWrapperKey, this.localConfigWrapper);
+        app.provide(QuickGymTrainKey, this.quickGymTrain);
+        app.provide(QuickFlyBtnHandlerKey, this.quickFlyBtnHandler);
+        app.provide(ItemHelperKey, this.itemHelper);
+        app.mount(this._element);
+        this.logger.info('Vue实例已挂载')
+    }
+
+}

src/ts/feature/LotteryHelper.ts

@@ -1,19 +1,34 @@
-import Log from "../Log";
-import InfoUtils from "../utils/InfoUtils";
-import MathUtils from "../utils/MathUtils";
-import CommonUtils from "../utils/CommonUtils";
-import TornStyleBlock from "../utils/TornStyleBlock";
-import Timer from "../utils/Timer";
-import FetchUtils from "../utils/FetchUtils";
-import { Injectable } from "../../container/Injectable";
-import ClassName from "../../container/ClassName";
+import InfoUtils from "../class/utils/InfoUtils";
+import MathUtils from "../class/utils/MathUtils";
+import CommonUtils from "../class/utils/CommonUtils";
+import TornStyleBlock from "../class/utils/TornStyleBlock";
+import Timer from "../class/utils/Timer";
+import FetchUtils from "../class/utils/FetchUtils";
+import { Injectable } from "../container/Injectable";
+import ClassName from "../container/ClassName";
+import Logger from "../class/Logger";
+import IFeature from "../man/IFeature";
 
 /**
  * 彩票助手
  */
 @Injectable()
 @ClassName('LotteryHelper')
-export default class LotteryHelper {
+export default class LotteryHelper implements IFeature {
+    private readonly logger: Logger = Logger.factory(LotteryHelper)
+
+    description(): string {
+        return "彩票助手";
+    }
+
+    iStart(): void | Promise<void> {
+        this.init()
+    }
+
+    urlExcludes(): RegExp[] {
+        return [];
+    }
+
     private loopFlag = true;
 
     private radioDaily: HTMLInputElement = null;
@@ -26,6 +41,10 @@ export default class LotteryHelper {
     private status: HTMLElement = null;
     private desc: HTMLElement = null;
 
+    urlIncludes(): RegExp[] {
+        return [/loader\.php\?sid=lottery/];
+    }
+
     constructor(
         private readonly mathUtils: MathUtils,
         private readonly commonUtils: CommonUtils,
@@ -36,7 +55,7 @@ export default class LotteryHelper {
 
     public init() {
         let startTime = new Timer();
-        Log.info('彩票助手初始化开始');
+        this.logger.info('彩票助手初始化开始');
 
         let radioLabelDaily = document.createElement('label');
         let radioLabelWeekly = document.createElement('label');
@@ -112,7 +131,7 @@ export default class LotteryHelper {
             progressBarBg, progressBar, status, desc).insert2Dom();
         // document.querySelector('#websocketConnectionData').after(container);
 
-        Log.info('彩票助手初始化结束，耗时：' + startTime.getTimeMs());
+        this.logger.info('彩票助手初始化结束，耗时：' + startTime.getTimeMs());
     }
 
     private async start() {
@@ -158,7 +177,7 @@ export default class LotteryHelper {
                 if (this.loopFlag) rsMsg = '批量购买完成';
             } else {
                 rsMsg = '代币或现金不足';
-                Log.warn({ totalCost, inputNumber });
+                this.logger.warn({ totalCost, inputNumber });
             }
         } else {
             rsMsg = '输入有误';

src/ts/feature/MapItem.ts

@@ -0,0 +1,50 @@
+import IFeature from "../man/IFeature";
+import ClassName from "../container/ClassName";
+import { Injectable } from "../container/Injectable";
+import TornStyleBlock from "../class/utils/TornStyleBlock";
+import TornStyleSwitch from "../class/utils/TornStyleSwitch";
+import cityFinder from "../func/module/cityFinder";
+import LocalConfigWrapper from "../class/LocalConfigWrapper";
+
+@ClassName('MapItem')
+@Injectable()
+export default class MapItem implements IFeature {
+    constructor(
+        private readonly localConfigWrapper: LocalConfigWrapper
+    ) {
+    }
+
+    description(): string {
+        return "捡垃圾助手";
+    }
+
+    iStart(): void | Promise<void> {
+        this.start()
+    }
+
+    urlExcludes(): RegExp[] {
+        return [];
+    }
+
+    urlIncludes(): RegExp[] {
+        return [/city\.php/];
+    }
+
+    start() {
+        if (this.localConfigWrapper.config.cityFinder) {
+            let _base = new TornStyleBlock('芜湖助手').insert2Dom();
+            // let reloadSwitch = new TornStyleSwitch('解决一直转圈(加载中)的问题');
+            // reloadSwitch.getInput().checked = this.localConfigWrapper.config.SolveGoogleScriptPendingIssue;
+            // _base.append(reloadSwitch.getBase()).insert2Dom();
+            // reloadSwitch.getInput().addEventListener('change', () => {
+            //     if (reloadSwitch.getInput().checked) window.location.replace(window.location.href);
+            //     this.localConfigWrapper.config.SolveGoogleScriptPendingIssue = reloadSwitch.getInput().checked;
+            // });
+
+            _base.append(document.createElement('br'));
+
+            cityFinder(_base);
+        }
+    }
+
+}

src/ts/feature/MissionPageModifier.ts

@@ -0,0 +1,77 @@
+import ClassName from "../container/ClassName";
+import { Injectable } from "../container/Injectable";
+import IFeature from "../man/IFeature";
+import LocalConfigWrapper from "../class/LocalConfigWrapper";
+import getTaskHint from "../func/translate/getTaskHint";
+import { missionDict } from "../dictionary/translation";
+
+@ClassName('MissionPageModifier')
+@Injectable()
+export default class MissionPageModifier implements IFeature {
+    constructor(
+        private readonly localConfigWrapper: LocalConfigWrapper
+    ) {
+    }
+
+    description(): string {
+        return "页面快速crime";
+    }
+
+    iStart(): void | Promise<void> {
+        this.start()
+    }
+
+    urlExcludes(): RegExp[] {
+        return [];
+    }
+
+    urlIncludes(): RegExp[] {
+        return [/crimes\.php/];
+    }
+
+    start() {
+        const anchor = document.querySelector('.content-wrapper');
+        const OB = new MutationObserver(() => {
+            OB.disconnect();
+            trans();
+            OB.observe(anchor, {
+                characterData: true,
+                attributes: true,
+                subtree: true,
+                childList: true
+            });
+        });
+        const taskList = {};
+        const trans = () => {
+            $('ul#giver-tabs a.ui-tabs-anchor').each((i, e) => {
+                let $e = $(e);
+                if ($e.children().hasClass('mission-complete-icon')) {
+                    taskList[i] = e.innerText.trim();
+                } else {
+                    taskList[i] = $e.clone().children().remove().end().text().trim();
+                }
+            });
+            // 助手注入
+            $('div.max-height-fix.info').each((i, e) => {
+                let $e = $(e);
+                if ($e.find('.wh-translated').length !== 0) return;
+                $e.append(`<div class="wh-translated"><h6 style="color:green"><b>任务助手</b></h6><p>${ getTaskHint(taskList[i]) }</p></div>`);
+            });
+            // 任务目标
+            $('ul.tasks-list span.title-wrap').contents().each((i, e) => {
+                if (e.nodeType === 3) {
+                    if (missionDict[e.nodeValue.trim()]) {
+                        e.nodeValue = missionDict[e.nodeValue.trim()];
+                    }
+                }
+            });
+        };
+        trans();
+        OB.observe(anchor, {
+            characterData: true,
+            attributes: true,
+            subtree: true,
+            childList: true
+        });
+    }
+}

src/ts/feature/SidebarHelper.ts

@@ -1,10 +1,13 @@
-import CommonUtils from "../utils/CommonUtils";
-import Global from "../Global";
-import Device from "../../enum/Device";
-import Log from "../Log";
-import ClassName from "../../container/ClassName";
-import { Injectable } from "../../container/Injectable";
-import LocalConfigWrapper from "../LocalConfigWrapper";
+import CommonUtils from "../class/utils/CommonUtils";
+import Global from "../class/Global";
+import Device from "../enum/Device";
+import ClassName from "../container/ClassName";
+import { Injectable } from "../container/Injectable";
+import LocalConfigWrapper from "../class/LocalConfigWrapper";
+import Logger from "../class/Logger";
+import IFeature from "../man/IFeature";
+import ATK_PAGE_REG from "./url/ATK_PAGE_REG";
+import ALL_PAGE_REG from "./url/ALL_PAGE_REG";
 
 /**
  * ### 边栏助手
@@ -13,12 +16,29 @@ import LocalConfigWrapper from "../LocalConfigWrapper";
  */
 @ClassName('SidebarHelper')
 @Injectable()
-export default class SidebarHelper {
+export default class SidebarHelper implements IFeature {
+    private readonly logger: Logger = Logger.factory(SidebarHelper)
+
+    description(): string {
+        return "边栏助手";
+    }
+
+    iStart(): void | Promise<void> {
+        this.init()
+    }
+
+    urlExcludes(): RegExp[] {
+        return [ATK_PAGE_REG];
+    }
 
     private readonly sidebarRootNode: HTMLElement;
     private readonly toggleBtn: HTMLButtonElement;
     private isHide: boolean;
 
+    urlIncludes(): RegExp[] {
+        return [ALL_PAGE_REG];
+    }
+
     constructor(
         private readonly localConfigWrapper: LocalConfigWrapper,
         private readonly global: Global,
@@ -34,7 +54,7 @@ export default class SidebarHelper {
             this.initToggleBtn();
             this.barRedirect();
         } else {
-            Log.warn('[SidebarHelper] 页面未开启边栏，边栏助手退出');
+            this.logger.warn('页面未开启边栏，边栏助手退出');
         }
     }
 
@@ -72,10 +92,10 @@ export default class SidebarHelper {
     // 4条转跳
     private barRedirect(): void {
         if (this.localConfigWrapper.config.barsRedirect) {
-            const eb = document.getElementById('barEnergy') as HTMLAnchorElement;
-            const nb = document.getElementById('barNerve') as HTMLAnchorElement;
-            const hb = document.getElementById('barHappy') as HTMLAnchorElement;
-            const lb = document.getElementById('barLife') as HTMLAnchorElement;
+            const eb = document.querySelector<HTMLAnchorElement>('#barEnergy');
+            const nb = document.querySelector<HTMLAnchorElement>('#barNerve');
+            const hb = document.querySelector<HTMLAnchorElement>('#barHappy');
+            const lb = document.querySelector<HTMLAnchorElement>('#barLife');
             if (eb) {
                 eb.addEventListener('click', () => location.href = '/gym.php');
                 eb.href = '/gym.php';

src/ts/feature/StackHelper.ts

@@ -1,15 +1,36 @@
-import TornStyleBlock from "../utils/TornStyleBlock";
-import TornStyleSwitch from "../utils/TornStyleSwitch";
-import { Injectable } from "../../container/Injectable";
-import ClassName from "../../container/ClassName";
-import LocalConfigWrapper from "../LocalConfigWrapper";
+import TornStyleBlock from "../class/utils/TornStyleBlock";
+import TornStyleSwitch from "../class/utils/TornStyleSwitch";
+import { Injectable } from "../container/Injectable";
+import ClassName from "../container/ClassName";
+import LocalConfigWrapper from "../class/LocalConfigWrapper";
+import IFeature from "../man/IFeature";
 
 @Injectable()
 @ClassName('StackHelper')
-export default class StackHelper {
+export default class StackHelper implements IFeature {
+
     constructor(
         private readonly localConfigWrapper: LocalConfigWrapper,
     ) {
+    }
+
+    description(): string {
+        return "叠e助手";
+    }
+
+    iStart(): void | Promise<void> {
+        this.start()
+    }
+
+    urlExcludes(): RegExp[] {
+        return [];
+    }
+
+    urlIncludes(): RegExp[] {
+        return [/gym\.php/];
+    }
+
+    start() {
         let block = new TornStyleBlock('叠E保护').insert2Dom();
         let switcher = new TornStyleSwitch('启用');
         let input = switcher.getInput();
@@ -23,5 +44,4 @@ export default class StackHelper {
             this.localConfigWrapper.config.SEProtect = target.checked;
         };
     }
-
 }

src/ts/feature/TravelHelper.ts

@@ -1,49 +1,20 @@
-import titleTrans from "../translate/titleTrans";
-import contentTitleLinksTrans from "../translate/contentTitleLinksTrans";
-import Device from "../../enum/Device";
-import Alert from "../../class/utils/Alert";
-import ActionButtonUtils from "../../class/utils/ActionButtonUtils";
-import CommonUtils from "../../class/utils/CommonUtils";
-import TRAVEL_ALARM_CSS from "../../../static/css/travel_alarm.module.css";
-import TRAVEL_ALARM_HTML from "../../../static/html/travel_alarm.html";
-import TornStyleBlock from "../../class/utils/TornStyleBlock";
-import QuickFlyBtnHandler from "../../class/handler/QuickFlyBtnHandler";
-import TRAVEL_STATE from "../../enum/TravelState";
-import Global from "../../class/Global";
-import ClassName from "../../container/ClassName";
-import { Injectable } from "../../container/Injectable";
-import LocalConfigWrapper from "../../class/LocalConfigWrapper";
-
-// async function travelHelper(): Promise<void> {
-//     let global = Container.factory(Global);
-//     let commonUtils = Container.factory(CommonUtils);
-// }
-
-// async function travelBack(): Promise<null> {
-//     if (typeof window['getAction'] !== 'function') return;
-//     let backHomeAction = function (): Promise<string> {
-//         return new Promise(resolve => {
-//             window.getAction({
-//                 type: "post",
-//                 action: 'travelagency.php',
-//                 data: {
-//                     step: 'backHomeAction'
-//                 },
-//                 success: function (msg) {
-//                     resolve(msg);
-//                 }
-//             });
-//         });
-//     };
-//     let res = await backHomeAction();
-//     new Alert(res);
-//     if (!res.includes('error')) {
-//         new Alert('成功，即将刷新');
-//         window.setTimeout(() => location.reload(), 3000);
-//     } else {
-//         new Alert('出错了');
-//     }
-// }
+import titleTrans from "../func/translate/titleTrans";
+import contentTitleLinksTrans from "../func/translate/contentTitleLinksTrans";
+import Device from "../enum/Device";
+import ActionButtonUtils from "../class/utils/ActionButtonUtils";
+import CommonUtils from "../class/utils/CommonUtils";
+import TRAVEL_ALARM_CSS from "../../static/css/travel_alarm.module.css";
+import TRAVEL_ALARM_HTML from "../../static/html/travel_alarm.html";
+import TornStyleBlock from "../class/utils/TornStyleBlock";
+import QuickFlyBtnHandler from "../class/handler/QuickFlyBtnHandler";
+import TRAVEL_STATE from "../enum/TravelState";
+import Global from "../class/Global";
+import ClassName from "../container/ClassName";
+import { Injectable } from "../container/Injectable";
+import LocalConfigWrapper from "../class/LocalConfigWrapper";
+import MsgWrapper from "../class/utils/MsgWrapper";
+import IFeature from "../man/IFeature";
+import INDEX_PAGE_REG from "./url/INDEX_PAGE_REG";
 
 /**
  * 飞行助手
@@ -55,12 +26,29 @@ import LocalConfigWrapper from "../../class/LocalConfigWrapper";
  */
 @ClassName('TravelHelper')
 @Injectable()
-export default class TravelHelper {
+export default class TravelHelper implements IFeature {
+    description(): string {
+        return "飞行助手";
+    }
+
+    iStart(): void | Promise<void> {
+        this.init()
+    }
+
+    urlExcludes(): RegExp[] {
+        return [];
+    }
+
+    urlIncludes(): RegExp[] {
+        return [INDEX_PAGE_REG, /travelagency\.php/];
+    }
+
     constructor(
         private readonly global: Global,
         private readonly commonUtils: CommonUtils,
         private readonly actionButtonUtils: ActionButtonUtils,
         private readonly localConfigWrapper: LocalConfigWrapper,
+        private readonly msgWrapper: MsgWrapper,
     ) {
     }
 
@@ -133,10 +121,6 @@ export default class TravelHelper {
                         const set_node = wh_trv_alarm_node.querySelectorAll('#wh-trv-alarm-cont button')[0] as HTMLButtonElement;
                         // 落地前响铃时长
                         const cd_time = wh_trv_alarm_node.querySelector('input[type="number"]') as HTMLInputElement;
-                        let count_down_notify: MyHTMLElement | { close: Function } = {
-                            close: () => {
-                            }
-                        };
                         set_node.onclick = () => {
                             try {
                                 wh_trv_alarm.alert_time = parseInt(cd_time.value);
@@ -145,8 +129,7 @@ export default class TravelHelper {
                             }
                             save_trv_settings();
                             set_node.value = wh_trv_alarm.alert_time;
-                            count_down_notify.close();
-                            count_down_notify = new Alert('设置已更新');
+                            this.msgWrapper.create('设置已更新');
                         };
                         // 停止响铃按钮
                         const stop_node = wh_trv_alarm_node.querySelectorAll('#wh-trv-alarm-cont button')[1] as HTMLButtonElement;
@@ -157,15 +140,10 @@ export default class TravelHelper {
                         }
                         // 开启闹钟勾选
                         const enable_node = wh_trv_alarm_node.querySelector('#wh-trv-alarm-cont input[type="checkbox"]') as HTMLInputElement;
-                        let on_off_notify: MyHTMLElement | { close: Function } = {
-                            close: () => {
-                            }
-                        };
                         enable_node.onchange = ev => {
                             wh_trv_alarm.enable = (<HTMLInputElement>ev.target).checked;
                             save_trv_settings();
-                            on_off_notify.close();
-                            on_off_notify = new Alert(wh_trv_alarm.enable ? '闹钟已开启' : '闹钟已关闭');
+                            this.msgWrapper.create(wh_trv_alarm.enable ? '闹钟已开启' : '闹钟已关闭');
                         };
                         // 剩余时间 秒
                         const remaining_sec = parseInt(remaining_arr);
@@ -193,7 +171,7 @@ export default class TravelHelper {
                         // 响铃的方法
                         let audio_play_handle = () => {
                             if (user_stop_alert) {
-                                clearInterval(audio_play_id);
+                                window.clearInterval(audio_play_id);
                                 audio_play_id = null;
                                 return;
                             }
@@ -234,7 +212,7 @@ export default class TravelHelper {
                             } else {
                                 // flying_status.innerHTML = `飞行中...`;
                                 if (wh_trv_alarm.enable) {
-                                    clearInterval(audio_play_id);
+                                    window.clearInterval(audio_play_id);
                                     audio_play_id = null;
                                     stop_node.parentElement.classList.add('wh-trv-alarm-stop-hide');
                                 }
@@ -260,7 +238,7 @@ export default class TravelHelper {
                     // 海外警告
                     if (this.localConfigWrapper.config.abroadWarning) {
                         let c = 1;
-                        setInterval(() => new Alert(`警告：您已海外落地${ c++ * 30 }秒`, {
+                        setInterval(() => this.msgWrapper.create(`警告：您已海外落地${ c++ * 30 }秒`, {
                             timeout: 30,
                             sysNotify: true
                         }), 30000);
@@ -306,6 +284,7 @@ export default class TravelHelper {
                 });
                 const trans = () => {
                     // 当前能量e
+                    // @ts-ignore
                     const energyBarStr = $('#barEnergy p[class^="bar-value__"]').text().trim();
                     const [curE, maxE] = energyBarStr.split('/').length === 2
                         ? [parseInt(energyBarStr.split('/')[0]), parseInt(energyBarStr.split('/')[1])]
@@ -314,6 +293,7 @@ export default class TravelHelper {
                     const fullEnergyTime = !(isNaN(curE) || isNaN(maxE)) ? (maxE - 5 - curE) / 5 * incTime
                         + (incTime - new Date().getMinutes() % incTime) : NaN;
                     // 起飞前提示
+                    // @ts-ignore
                     $('.travel-confirm .travel-question .q-wrap span:nth-of-type(2)').each((i, e) => {
                         if (isNaN(fullEnergyTime)) return;
                         const spl = e.innerText.trim().split(' ');
@@ -344,10 +324,6 @@ export default class TravelHelper {
         }
     }
 
-    /** TODO */
-    inTravelPage() {
-    }
-
     async doTravelBack(): Promise<void> {
         if (typeof window['getAction'] !== 'function') return;
         let backHomeAction = function (): Promise<string> {
@@ -365,12 +341,12 @@ export default class TravelHelper {
             });
         };
         let res = await backHomeAction();
-        new Alert(res);
+        this.msgWrapper.create(res);
         if (!res.includes('error')) {
-            new Alert('成功，即将刷新');
+            this.msgWrapper.create('成功，即将刷新');
             window.setTimeout(() => location.reload(), 3000);
         } else {
-            new Alert('出错了');
+            this.msgWrapper.create('出错了');
         }
     }
 }

src/ts/feature/TravelItem.ts

@@ -0,0 +1,196 @@
+import CommonUtils from "../class/utils/CommonUtils";
+import UserScriptEngine from "../enum/UserScriptEngine";
+import Popup from "../class/utils/Popup";
+import STOCK_IMG_HTML from "../../static/html/stock_img.html";
+import WindowActiveState from "../class/action/WindowActiveState";
+import { Injectable } from "../container/Injectable";
+import ClassName from "../container/ClassName";
+import Logger from "../class/Logger";
+import IFeature from "../man/IFeature";
+import ATK_PAGE_REG from "./url/ATK_PAGE_REG";
+import ALL_PAGE_REG from "./url/ALL_PAGE_REG";
+
+@Injectable()
+@ClassName('TravelItem')
+export default class TravelItem implements IFeature {
+    private readonly logger: Logger = Logger.factory(TravelItem)
+
+    description(): string {
+        return "海外货物存量静默获取";
+    }
+
+    iStart(): void | Promise<void> {
+        this.init()
+    }
+
+    urlExcludes(): RegExp[] {
+        return [ATK_PAGE_REG];
+    }
+
+    private readonly apiUrl: string = 'https://yata.yt/api/v1/travel/export/';
+    private foreignStockInfo: any = null;
+
+    urlIncludes(): RegExp[] {
+        return [ALL_PAGE_REG];
+    }
+
+    public constructor(
+        private readonly windowActiveState: WindowActiveState,
+        private readonly commonUtils: CommonUtils,
+    ) {
+    }
+
+    public init() {
+
+        window.setInterval(async () => {
+            if (!this.windowActiveState.get()) return;
+            this.logger.info('COFetch ', this.apiUrl);
+            try {
+                this.foreignStockInfo = JSON.parse(await CommonUtils.COFetch(this.apiUrl));
+            } catch (e) {
+                this.logger.error('解析错误', e.stack || e.message || e);
+            }
+            this.logger.info({ info: 'TravelItem 跨域返回', 'returned': this.foreignStockInfo });
+        }, 30 * 1000);
+    }
+
+    public get itemFiler() {
+        return [
+            {
+                "name": "mex",
+                "show": "墨西哥",
+                "stocks": {
+                    "Dahlia": "花",
+                    "Jaguar Plushie": "偶"
+                }
+            },
+            {
+                "name": "cay",
+                "show": "开曼",
+                "stocks": {
+                    "Banana Orchid": "花",
+                    "Stingray Plushie": "偶"
+                }
+            },
+            {
+                "name": "can",
+                "show": "加拿大",
+                "stocks": {
+                    "Crocus": "花",
+                    "Wolverine Plushie": "偶"
+                }
+            },
+            {
+                "name": "haw",
+                "show": "夏威夷",
+                "stocks": {
+                    "Orchid": "花",
+                    "Large Suitcase": "大箱"
+                }
+            },
+            {
+                "name": "uni",
+                "show": "嘤国",
+                "stocks": {
+                    "Heather": "花",
+                    "Red Fox Plushie": "赤狐",
+                    "Nessie Plushie": "水怪"
+                }
+            },
+            {
+                "name": "arg",
+                "show": "阿根廷",
+                "stocks": {
+                    "Ceibo Flower": "花",
+                    "Monkey Plushie": "偶",
+                    "Tear Gas": "催泪弹"
+                }
+            },
+            {
+                "name": "swi",
+                "show": "瑞士",
+                "stocks": {
+                    "Edelweiss": "花",
+                    "Chamois Plushie": "偶"
+                }
+            },
+            {
+                "name": "jap",
+                "show": "日本",
+                "stocks": {
+                    "Cherry Blossom": "花"
+                }
+            },
+            {
+                "name": "chi",
+                "show": "祖国",
+                "stocks": {
+                    "Peony": "花",
+                    "Panda Plushie": "偶"
+                }
+            },
+            {
+                "name": "uae",
+                "show": "阿联酋 (UAE)",
+                "stocks": {
+                    "Tribulus Omanense": "花",
+                    "Camel Plushie": "偶"
+                }
+            },
+            {
+                "name": "sou",
+                "show": "南非",
+                "stocks": {
+                    "African Violet": "花",
+                    "Lion Plushie": "偶",
+                    "Xanax": "XAN"
+                }
+            }
+        ]
+    }
+
+    // 呈现内容
+    public async clickHandler(): Promise<void> {
+        if (this.commonUtils.getScriptEngine() === UserScriptEngine.RAW) {
+            new Popup(STOCK_IMG_HTML.replace('{{}}', performance.now().toString()), '飞花库存');
+        } else {
+            const popup = new Popup("请稍后 " + CommonUtils.loading_gif_html(), '飞花库存');
+            let table = `<table><tr><th colspan="2">目的地 - 更新时间</th><th colspan="3">库存</th></tr>`;
+            // const dest = FILTER.default;
+            const dest = this.itemFiler;
+            const now = new Date();
+            const res = await this.get();
+            this.logger.info({ res })
+            if (!res || !res.stocks) return;
+            dest.forEach(el => {
+                const update = (now.getTime() - new Date(res.stocks[el.name]['update'] * 1000).getTime()) / 1000 | 0
+                table += `<tr><td>${ el.show }</td><td>${ update / 60 | 0 }分${ update % 60 | 0 }秒前</td>`;
+                let count = 0;
+                res.stocks[el.name]['stocks'].forEach(stock => {
+                    if (el.stocks[stock.name]) {
+                        table += `<td${ stock['quantity'] === 0 ? ' style="background-color:#f44336;color:white;border-color:#000;"' : '' }>${ el.stocks[stock.name] } (${ stock['quantity'] })</td>`;
+                        count++;
+                    }
+                });
+                while (count < 3) {
+                    count++;
+                    table += '<td></td>';
+                }
+                table += '</tr>';
+            });
+            table += '</table>';
+            popup.getElement().innerHTML = table;
+        }
+    }
+
+    public async get() {
+        try {
+            return this.foreignStockInfo ||= JSON.parse(await CommonUtils.COFetch(this.apiUrl));
+        } catch (e) {
+            this.logger.error('解析出错', e.stack || e.message || e);
+            return null;
+        }
+    }
+}
+
+// export const TravelItemKey = Symbol('TravelItemKey') as InjectionKey<TravelItem>

src/ts/feature/url/ALL_PAGE_REG.ts

@@ -0,0 +1,2 @@
+const ALL_PAGE_REG = /^/
+export default ALL_PAGE_REG

src/ts/feature/url/ATK_PAGE_REG.ts

@@ -0,0 +1,2 @@
+const ATK_PAGE_REG = /\/loader.php\?sid=attack&user2ID=/
+export default ATK_PAGE_REG

src/ts/feature/url/INDEX_PAGE_REG.ts

@@ -0,0 +1,2 @@
+const INDEX_PAGE_REG = /index\.php/
+export default INDEX_PAGE_REG

src/ts/func/module/adHelper.ts

@@ -1,7 +1,10 @@
 import Popup from "../../class/utils/Popup";
+import { Container } from "../../container/Container";
+import Logger from "../../class/Logger";
 
 // 传单助手
 export default function adHelper() {
+    Container.factory(Logger).error('adHelper')
     let popup = new Popup('', '传单助手').getElement();
     document.querySelector('#chatRoot').classList.remove('wh-hide');
     let info = document.createElement('p');

src/ts/func/module/christmasTownHelper.ts

@@ -280,7 +280,7 @@ export default function christmasTownHelper() {
             const history = Object.keys(dropHist).map(key => dropHist[key]).sort((a, b) => a.id - b.id);
             let table_html = '';
             history.forEach(e => {
-                table_html += `<tr><td>${ e.pos }</td><td>${ e.map }</td><td>${ e.name }</td><td>${ e.last }</td><td>${ e.isPassed ? '已取得' : '不确定' }</td></tr>`;
+                table_html += `<tr><td>${ e.pos }</td><td>${ e.map ?? e.data }</td><td>${ e.name }</td><td>${ e.last }</td><td>${ e.isPassed ? '已取得' : '不确定' }</td></tr>`;
             });
             $tbody.innerHTML = table_html;
             localStorage.setItem('wh-loot-store', JSON.stringify(dropHist));

src/ts/func/module/cityFinder.ts

@@ -10,7 +10,9 @@ import { Container } from "../../container/Container";
  * @param _base
  */
 export default function cityFinder(_base: TornStyleBlock): void {
-    Container.factory(CommonUtils).styleInject(CITY_FINDER_CSS);
+    let commonUtils: CommonUtils = Container.factory(CommonUtils);
+    commonUtils.styleInject(CITY_FINDER_CSS);
+    let itemHelper: ItemHelper = Container.factory(ItemHelper);
     // 物品名与价格
     let items: {
         [k: number]: {
@@ -28,8 +30,7 @@ export default function cityFinder(_base: TornStyleBlock): void {
     _base.append(header, info);
     document.body.classList.add('wh-city-finds');
 
-    let itemHelper = Container.factory(ItemHelper);
-    CommonUtils.elementReady('div.leaflet-marker-pane').then(elem => {
+    commonUtils.querySelector('div.leaflet-marker-pane').then(elem => {
 
         // 发现的物品id与map img node
         const founds = [];

src/ts/func/module/depoHelper.ts

@@ -1,5 +1,4 @@
 import CommonUtils from "../../class/utils/CommonUtils";
-import Log from "../../class/Log";
 import Alert from "../../class/utils/Alert";
 import ActionButtonUtils from "../../class/utils/ActionButtonUtils";
 import FetchUtils from "../../class/utils/FetchUtils";
@@ -7,10 +6,12 @@ import DEPO_CSS from "../../../static/css/depo.module.css";
 import TornStyleBlock from "../../class/utils/TornStyleBlock";
 import { Container } from "../../container/Container";
 import LocalConfigWrapper from "../../class/LocalConfigWrapper";
+import Logger from "../../class/Logger";
 
 const fetchUtils = Container.factory(FetchUtils);
 
 export default function depoHelper() {
+    let logger: Logger = Container.factory(Logger);
     let actionButtonUtils: ActionButtonUtils = Container.factory(ActionButtonUtils);
     let localConfigWrapper: LocalConfigWrapper = Container.factory(LocalConfigWrapper);
     let commonUtils: CommonUtils = Container.factory(CommonUtils);
@@ -25,7 +26,7 @@ export default function depoHelper() {
             const btn = document.getElementById('ui-id-9');
             if (btn) {
                 btn.click();
-                Log.info('已自动打开存钱页面');
+                logger.info('已自动打开存钱页面');
             }
         }
         // 收起冰蛙表格
@@ -80,14 +81,14 @@ export default function depoHelper() {
                 }
                 return;
             }
-            Log.info('已添加GT助手');
+            logger.info('已添加GT助手');
             // 获取交易id
             let query_params = location.hash.slice(1);
             let traceId = id;
             if (!traceId) query_params.split('&').forEach(param =>
                 (param.startsWith('ID=')) && (traceId = param.slice(3))
             );
-            Log.info('交易id为', traceId);
+            logger.info('交易id为', traceId);
 
             // 获取全部的钱数
             let getTraceMoney = async () => {
@@ -101,7 +102,7 @@ export default function depoHelper() {
                 }
             };
             // 监听jquery ajax请求
-            if (Log.debug()) $(document).ajaxComplete((_, xhr, settings) => Log.info({ xhr, settings }));
+            if (logger.debug()) $(document).ajaxComplete((_, xhr, settings) => logger.info({ xhr, settings }));
             // react 加载完成后将节点加入视图中
             CommonUtils.elementReady('#trade-container').then(() =>
                 document.querySelector('#trade-container').before(_node.getBase())
@@ -197,7 +198,7 @@ export default function depoHelper() {
             } else {
                 if (node_link) node_link.remove();
                 node_link = null;
-                Log.info('已移除GT助手');
+                logger.info('已移除GT助手');
             }
         });
     }
@@ -262,7 +263,7 @@ async function factionDeposit() {
 
 // 所有页面公司一键存钱
 async function companyDepositAnywhere() {
-    // let fetchUtils: FetchUtils = FetchUtils.getInstance();
+    const logger: Logger = Container.factory(Logger);
     let { addRFC } = window;
     if (typeof addRFC !== 'function') return;
     let url = addRFC('https://www.torn.com/inputMoneyAction.php?step=generalAction');
@@ -274,7 +275,7 @@ async function companyDepositAnywhere() {
         body: 'deposit=' + money,
         headers: { 'X-Requested-With': 'XMLHttpRequest', 'Content-Type': 'application/x-www-form-urlencoded' }
     })).text();
-    Log.info(res);
+    logger.info(res);
     let node = document.createElement('div');
     node.innerHTML = res;
     let success = node.querySelector('.success-message');

src/ts/func/module/fetchYata.ts

@@ -0,0 +1,98 @@
+import CommonUtils from "../../class/utils/CommonUtils"
+
+type YataBSEstData = {
+    "total": number,
+    "score": number,
+    "type": "Offensive" | "Defensive" | "Balanced",
+    "skewness": number,
+    "timestamp": number,
+    "version": 1,
+}
+
+type YataApiResponse = {
+    // key为请求id
+    [key: number]: YataBSEstData
+    error?: { 'error': string, 'code': 1 | 2 | 3 | 4 }
+}
+
+type YataApiDataWrap = YataBSEstData & {
+    id: string,
+    isCache: boolean,
+}
+
+const cacheExpireMs = 86400000 // 一天
+const KEY = 'WHBSEstCache'
+
+const getCacheObj = () => {
+    let obj: { [key: string]: YataApiDataWrap }
+    try {
+        obj = JSON.parse(localStorage.getItem(KEY)) ?? {}
+    } catch (e) {
+        obj = {}
+    }
+    return obj
+}
+
+const getCache = (id: number): YataApiDataWrap => {
+    let cache: YataApiDataWrap = getCacheObj()[id]
+    if (cache && ((Date.now() - (cache.timestamp * 1000)) < cacheExpireMs)) {
+        cache.isCache = true
+    } else {
+        cache = null
+    }
+    return cache
+}
+
+const setCache = (data: YataApiDataWrap): void => {
+    const cache = getCacheObj()
+    cache[data.id] = data
+    localStorage.setItem(KEY, JSON.stringify(cache))
+}
+
+/**
+ * 清空本地缓存
+ */
+const purge = () => {
+    localStorage.removeItem(KEY)
+}
+
+const fetchYata = async (id: number, apikey: string): Promise<YataApiDataWrap> => {
+    if (!id || !apikey) {
+        throw new TypeError('请求yata接口时出错: id和apikey不能为空')
+    }
+    const cache = getCache(id)
+    if (cache) {
+        return cache
+    } else {
+        let responseString: string, response: YataApiResponse
+        try {
+            responseString = await CommonUtils.COFetch(`https://yata.yt/api/v1/bs/${ id }?key=${ apikey }`)
+        } catch (e) {
+            throw new TypeError('请求yata接口时出错 ' + e.message)
+        }
+        try {
+            response = JSON.parse(responseString)
+        } catch (e) {
+            throw new TypeError('解析yata接口响应时出错 ' + e.message)
+        }
+        if (response.error) {
+            switch (response.error.code) {
+                case 1:
+                    throw new TypeError('请求yata接口时出错: yata服务端错误-' + response.error.error)
+                case 2:
+                    throw new TypeError('请求yata接口时出错: 脚本逻辑错误-' + response.error.error)
+                case 3:
+                    throw new TypeError('请求yata接口时出错: 已达到次数限制-' + response.error.error)
+                case 4:
+                    throw new TypeError('请求yata接口时出错: apikey错误-' + response.error.error)
+            }
+        }
+        const wrapper = <YataApiDataWrap>response[id]
+        wrapper.id = String(id)
+        wrapper.isCache = false
+        setCache(wrapper)
+        return wrapper
+    }
+}
+
+export { fetchYata, YataApiDataWrap, purge }

src/ts/func/module/loadGS.ts

@@ -1,120 +1,120 @@
-import UserScriptEngine from "../../enum/UserScriptEngine";
-import CommonUtils from "../../class/utils/CommonUtils";
-import Alert from "../../class/utils/Alert";
-import { Container } from "../../container/Container";
-import Logger from "../../class/Logger";
-
-// gs loader
-export default function loadGS(use) {
-    let logger = Container.factory(Logger);
-    if (use === UserScriptEngine.PDA) {
-        let ifr: HTMLIFrameElement = document.querySelector('#wh-gs-loader-ifr');
-        if (ifr) {
-            new Alert('飞贼小助手已经加载了');
-            return;
-        }
-        const container = document.createElement('div');
-        container.id = 'wh-gs-loader';
-        ifr = document.createElement('iframe');
-        ifr.id = 'wh-gs-loader-ifr';
-        ifr.src = 'https://www.torn.com/crimes.php';
-        container.append(ifr);
-        document.body.append(container);
-        CommonUtils.addStyle(`
-#wh-gs-loader {
-position:fixed;
-top:0;
-left:0;
-z-index:100001;
-}
-`);
-        let notify = new Alert('加载中');
-        ifr.onload = () => {
-            notify.close();
-            const _window = ifr.contentWindow;
-            const _docu = _window.document;
-            _docu.head.innerHTML = '';
-            _docu.body.innerHTML = '';
-            notify = new Alert('加载依赖');
-            CommonUtils.COFetch('https://cdn.staticfile.org/vue/2.2.2/vue.min.js')
-                .then(vuejs => {
-                    notify.close();
-                    _window.eval(vuejs);
-                    _window.GM_getValue = (k, v = undefined) => {
-                        const objV = JSON.parse(_window.localStorage.getItem('wh-gs-storage') || '{}')[k];
-                        return objV || v;
-                    };
-                    _window.GM_setValue = (k, v) => {
-                        const obj = JSON.parse(_window.localStorage.getItem('wh-gs-storage') || '{}');
-                        obj[k] = v;
-                        _window.localStorage.setItem('wh-gs-storage', JSON.stringify(obj));
-                    };
-                    _window.GM_xmlhttpRequest = function (opt) {
-                        // 暂不适配pda post
-                        if (opt.method.toLowerCase() === 'post') return;
-                        CommonUtils.COFetch(opt.url).then(res => {
-                            const obj = {
-                                responseText: res
-                            };
-                            opt.onload(obj);
-                        });
-                    };
-                    notify = new Alert('加载飞贼小助手');
-                    CommonUtils.COFetch(`https://gitee.com/ameto_kasao/tornjs/raw/master/GoldenSnitch.js?${ performance.now() }`)
-                        .then(res => {
-                            _window.eval(res.replace('http://222.160.142.50:8154/mugger', `https://api.ljs-lyt.com/mugger`));
-                            _window.GM_setValue("gsp_x", 10);
-                            _window.GM_setValue("gsp_y", 10);
-                            notify.close();
-                            notify = new Alert('飞贼小助手已加载', { timeout: 1 });
-                            const gsp: HTMLElement = _docu.querySelector('#gsp');
-                            const thisRun = () => {
-                                ifr.style.height = `${ gsp.offsetHeight + 10 }px`;
-                                ifr.style.width = `${ gsp.offsetWidth + 20 }px`;
-                                gsp.style.top = '10px';
-                                gsp.style.left = '10px';
-                            };
-                            new MutationObserver(thisRun).observe(gsp, { childList: true, subtree: true });
-                            thisRun();
-                            if (logger.debug()) _window.GM_setValue("gsp_showContent", true)
-                        });
-                });
-        };
-        return;
-    }
-    if (use === UserScriptEngine.GM) {
-        if (typeof window.Vue !== 'function') {
-            let notify = new Alert('正在加载依赖');
-            CommonUtils.COFetch('https://cdn.staticfile.org/vue/2.2.2/vue.min.js')
-                .then(VueJS => {
-                    window.eval(VueJS);
-                    notify.close();
-                    notify = new Alert('已载入依赖');
-                    window.GM_getValue = (k, v = undefined) => {
-                        const objV = JSON.parse(window.localStorage.getItem('wh-gs-storage') || '{}')[k];
-                        return objV || v;
-                    };
-                    window.GM_setValue = (k, v) => {
-                        const obj = JSON.parse(window.localStorage.getItem('wh-gs-storage') || '{}');
-                        obj[k] = v;
-                        window.localStorage.setItem('wh-gs-storage', JSON.stringify(obj));
-                    };
-                    // TODO
-                    // window.GM_xmlhttpRequest = GM_xmlhttpRequest;
-                    CommonUtils.COFetch(`https://gitee.com/ameto_kasao/tornjs/raw/master/GoldenSnitch.js?${ performance.now() }`)
-                        .then(GSJS => {
-                            window.eval(GSJS);
-                            if (logger.debug()) window.GM_setValue("gsp_showContent", true);
-                            notify.close();
-                            notify = new Alert('已载入飞贼助手');
-                        })
-                        .catch(err => new Alert(`PDA API错误。${ JSON.stringify(err) }`));
-                })
-                .catch(err => new Alert(JSON.stringify(err)));
-        } else {
-            new Alert('飞贼助手已经加载了');
-        }
-        return;
-    }
-    new Alert('暂不支持');
-}
+// import UserScriptEngine from "../../enum/UserScriptEngine";
+// import CommonUtils from "../../class/utils/CommonUtils";
+// import Alert from "../../class/utils/Alert";
+// import { Container } from "../../container/Container";
+// import Logger from "../../class/Logger";
+//
+// // gs loader
+// export default function loadGS(use) {
+//     let logger = Container.factory(Logger);
+//     if (use === UserScriptEngine.PDA) {
+//         let ifr: HTMLIFrameElement = document.querySelector('#wh-gs-loader-ifr');
+//         if (ifr) {
+//             new Alert('飞贼小助手已经加载了');
+//             return;
+//         }
+//         const container = document.createElement('div');
+//         container.id = 'wh-gs-loader';
+//         ifr = document.createElement('iframe');
+//         ifr.id = 'wh-gs-loader-ifr';
+//         ifr.src = 'https://www.torn.com/crimes.php';
+//         container.append(ifr);
+//         document.body.append(container);
+//         CommonUtils.addStyle(`
+// #wh-gs-loader {
+// position:fixed;
+// top:0;
+// left:0;
+// z-index:100001;
+// }
+// `);
+//         let notify = new Alert('加载中');
+//         ifr.onload = () => {
+//             notify.close();
+//             const _window = ifr.contentWindow;
+//             const _docu = _window.document;
+//             _docu.head.innerHTML = '';
+//             _docu.body.innerHTML = '';
+//             notify = new Alert('加载依赖');
+//             CommonUtils.COFetch('https://cdn.staticfile.org/vue/2.2.2/vue.min.js')
+//                 .then(vuejs => {
+//                     notify.close();
+//                     _window.eval(vuejs);
+//                     _window.GM_getValue = (k, v = undefined) => {
+//                         const objV = JSON.parse(_window.localStorage.getItem('wh-gs-storage') || '{}')[k];
+//                         return objV || v;
+//                     };
+//                     _window.GM_setValue = (k, v) => {
+//                         const obj = JSON.parse(_window.localStorage.getItem('wh-gs-storage') || '{}');
+//                         obj[k] = v;
+//                         _window.localStorage.setItem('wh-gs-storage', JSON.stringify(obj));
+//                     };
+//                     _window.GM_xmlhttpRequest = function (opt) {
+//                         // 暂不适配pda post
+//                         if (opt.method.toLowerCase() === 'post') return;
+//                         CommonUtils.COFetch(opt.url).then(res => {
+//                             const obj = {
+//                                 responseText: res
+//                             };
+//                             opt.onload(obj);
+//                         });
+//                     };
+//                     notify = new Alert('加载飞贼小助手');
+//                     CommonUtils.COFetch(`https://gitee.com/ameto_kasao/tornjs/raw/master/GoldenSnitch.js?${ performance.now() }`)
+//                         .then(res => {
+//                             _window.eval(res.replace('http://222.160.142.50:8154/mugger', `https://api.ljs-lyt.com/mugger`));
+//                             _window.GM_setValue("gsp_x", 10);
+//                             _window.GM_setValue("gsp_y", 10);
+//                             notify.close();
+//                             notify = new Alert('飞贼小助手已加载', { timeout: 1 });
+//                             const gsp: HTMLElement = _docu.querySelector('#gsp');
+//                             const thisRun = () => {
+//                                 ifr.style.height = `${ gsp.offsetHeight + 10 }px`;
+//                                 ifr.style.width = `${ gsp.offsetWidth + 20 }px`;
+//                                 gsp.style.top = '10px';
+//                                 gsp.style.left = '10px';
+//                             };
+//                             new MutationObserver(thisRun).observe(gsp, { childList: true, subtree: true });
+//                             thisRun();
+//                             if (logger.debug()) _window.GM_setValue("gsp_showContent", true)
+//                         });
+//                 });
+//         };
+//         return;
+//     }
+//     if (use === UserScriptEngine.GM) {
+//         if (typeof window.Vue !== 'function') {
+//             let notify = new Alert('正在加载依赖');
+//             CommonUtils.COFetch('https://cdn.staticfile.org/vue/2.2.2/vue.min.js')
+//                 .then(VueJS => {
+//                     window.eval(VueJS);
+//                     notify.close();
+//                     notify = new Alert('已载入依赖');
+//                     window.GM_getValue = (k, v = undefined) => {
+//                         const objV = JSON.parse(window.localStorage.getItem('wh-gs-storage') || '{}')[k];
+//                         return objV || v;
+//                     };
+//                     window.GM_setValue = (k, v) => {
+//                         const obj = JSON.parse(window.localStorage.getItem('wh-gs-storage') || '{}');
+//                         obj[k] = v;
+//                         window.localStorage.setItem('wh-gs-storage', JSON.stringify(obj));
+//                     };
+//                     // TODO
+//                     // window.GM_xmlhttpRequest = GM_xmlhttpRequest;
+//                     CommonUtils.COFetch(`https://gitee.com/ameto_kasao/tornjs/raw/master/GoldenSnitch.js?${ performance.now() }`)
+//                         .then(GSJS => {
+//                             window.eval(GSJS);
+//                             if (logger.debug()) window.GM_setValue("gsp_showContent", true);
+//                             notify.close();
+//                             notify = new Alert('已载入飞贼助手');
+//                         })
+//                         .catch(err => new Alert(`PDA API错误。${ JSON.stringify(err) }`));
+//                 })
+//                 .catch(err => new Alert(JSON.stringify(err)));
+//         } else {
+//             new Alert('飞贼助手已经加载了');
+//         }
+//         return;
+//     }
+//     new Alert('暂不支持');
+// }

src/ts/func/module/safeKeeper.ts

@@ -1,12 +1,13 @@
 import Alert from "../../class/utils/Alert";
 import InfoUtils from "../../class/utils/InfoUtils";
-import Log from "../../class/Log";
 import Popup from "../../class/utils/Popup";
 import { Container } from "../../container/Container";
+import Logger from "../../class/Logger";
 
 // 守望者
 export default function safeKeeper() {
     let infoUtils = Container.factory(InfoUtils);
+    let logger = Container.factory(Logger);
 
     let url = `https://www.torn.com/loader.php?sid=attackData&mode=json&step=poll&user2ID=`;
     let popup = new Popup('<p>监测目标ID玩家的防御状态，找出隐身攻击者</p>', '守望者 (测试中)');
@@ -51,13 +52,13 @@ export default function safeKeeper() {
         } else new Alert('守望者运行中，请先停止', { timeout: 2 });
     }
 
-    popup.getElement().appendChild(p);
-    popup.getElement().appendChild(uid);
-    popup.getElement().appendChild(start);
-    popup.getElement().appendChild(stop);
-    popup.getElement().appendChild(self_target);
-    popup.getElement().appendChild(attackers);
-    popup.getElement().appendChild(records);
+    popup.element.appendChild(p);
+    popup.element.appendChild(uid);
+    popup.element.appendChild(start);
+    popup.element.appendChild(stop);
+    popup.element.appendChild(self_target);
+    popup.element.appendChild(attackers);
+    popup.element.appendChild(records);
 
     start.addEventListener('click', () => {
         if (loop_id !== null || !uid.value) return;
@@ -75,7 +76,7 @@ export default function safeKeeper() {
             })).text();
             if (loop_id !== that_id) return;
             let data = JSON.parse(res.split('<div')[0]);
-            Log.info(count++, data);
+            logger.info(count++, data);
             let { DB, currentFightStatistics, histLog } = data;
             // 攻击人
             // 格式：currentFightStatistics = {uid: {...}, uid2: {...}}

src/ts/func/translate/translateMain.ts

@@ -67,57 +67,57 @@ export default function translateMain(href: string): void {
     };
 
     // 边栏
-    let sidebarTimeOut = 60;
-    const sidebarInterval = setInterval(() => {
-        // 60秒后取消定时
-        if ($('div[class^="sidebar"]').length === 0) {
-            sidebarTimeOut--;
-            if (sidebarTimeOut < 0) {
-                clearInterval(sidebarInterval);
-            }
-            return;
-        }
-        // 边栏块标题
-        $('h2[class^="header"]').each((i, e) => {
-            if (!sidebarDict[e.firstChild.nodeValue]) return;
-            e.firstChild.nodeValue = sidebarDict[e.firstChild.nodeValue];
-        });
-        // 边栏人物名字
-        $('span[class^="menu-name"]').each((i, e) => {
-            e.firstChild.nodeValue = '名字:';
-        });
-        // 钱 等级 pt 天赋点
-        $('p[class^="point-block"]').each((i, e) => {
-            if (sidebarDict[e.firstChild.firstChild.nodeValue])
-                e.firstChild.firstChild.nodeValue = sidebarDict[e.firstChild.firstChild.nodeValue];
-        });
-        // 4条 状态条
-        $('p[class^="bar-name"]').each((i, e) => {
-            if (sidebarDict[e.firstChild.nodeValue])
-                e.firstChild.nodeValue = sidebarDict[e.firstChild.nodeValue];
-        });
-        // 边栏菜单
-        $('span[class^="linkName"]').each((i, e) => {
-            if (sidebarDict[e.firstChild.nodeValue])
-                e.firstChild.nodeValue = sidebarDict[e.firstChild.nodeValue];
-        });
-        // [use]按钮
-        if (document.querySelector('#pointsMerits'))
-            $('#pointsMerits')[0].firstChild.nodeValue = '[使用]';
-        if (document.querySelector('#pointsPoints'))
-            $('#pointsPoints')[0].firstChild.nodeValue = '[使用]';
-        if (document.querySelector('#pointsLevel'))
-            $('#pointsLevel')[0].firstChild.nodeValue = '[升级]';
-
-        // 手机 区域菜单
-        $('div[class*="areas-mobile"] span:nth-child(2)').contents().each((i, e) => {
-            //log(e);
-            if (sidebarDict[e.nodeValue])
-                e.nodeValue = sidebarDict[e.nodeValue];
-        });
-
-        clearInterval(sidebarInterval);
-    }, 1000);
+    // let sidebarTimeOut = 60;
+    // const sidebarInterval = setInterval(() => {
+    //     // 60秒后取消定时
+    //     if ($('div[class^="sidebar"]').length === 0) {
+    //         sidebarTimeOut--;
+    //         if (sidebarTimeOut < 0) {
+    //             clearInterval(sidebarInterval);
+    //         }
+    //         return;
+    //     }
+    //     // 边栏块标题
+    //     $('h2[class^="header"]').each((i, e) => {
+    //         if (!sidebarDict[e.firstChild.nodeValue]) return;
+    //         e.firstChild.nodeValue = sidebarDict[e.firstChild.nodeValue];
+    //     });
+    //     // 边栏人物名字
+    //     $('span[class^="menu-name"]').each((i, e) => {
+    //         e.firstChild.nodeValue = '名字:';
+    //     });
+    //     // 钱 等级 pt 天赋点
+    //     $('p[class^="point-block"]').each((i, e) => {
+    //         if (sidebarDict[e.firstChild.firstChild.nodeValue])
+    //             e.firstChild.firstChild.nodeValue = sidebarDict[e.firstChild.firstChild.nodeValue];
+    //     });
+    //     // 4条 状态条
+    //     $('p[class^="bar-name"]').each((i, e) => {
+    //         if (sidebarDict[e.firstChild.nodeValue])
+    //             e.firstChild.nodeValue = sidebarDict[e.firstChild.nodeValue];
+    //     });
+    //     // 边栏菜单
+    //     $('span[class^="linkName"]').each((i, e) => {
+    //         if (sidebarDict[e.firstChild.nodeValue])
+    //             e.firstChild.nodeValue = sidebarDict[e.firstChild.nodeValue];
+    //     });
+    //     // [use]按钮
+    //     if (document.querySelector('#pointsMerits'))
+    //         $('#pointsMerits')[0].firstChild.nodeValue = '[使用]';
+    //     if (document.querySelector('#pointsPoints'))
+    //         $('#pointsPoints')[0].firstChild.nodeValue = '[使用]';
+    //     if (document.querySelector('#pointsLevel'))
+    //         $('#pointsLevel')[0].firstChild.nodeValue = '[升级]';
+    //
+    //     // 手机 区域菜单
+    //     $('div[class*="areas-mobile"] span:nth-child(2)').contents().each((i, e) => {
+    //         //log(e);
+    //         if (sidebarDict[e.nodeValue])
+    //             e.nodeValue = sidebarDict[e.nodeValue];
+    //     });
+    //
+    //     clearInterval(sidebarInterval);
+    // }, 1000);
 
     // header
     if (document.querySelector('div#header-root')) {

src/ts/func/utils/Sleep.ts

@@ -0,0 +1,5 @@
+const Sleep = (ms: number = 0) => {
+    return new Promise(resolve => window.setTimeout(resolve, ms))
+}
+
+export default Sleep

src/ts/func/utils/convert2Csv.ts

@@ -0,0 +1,14 @@
+const convertToCSV = (data: any[]) => {
+    let csv = ''
+    for (let i = 0; i < data.length; i++) {
+        let row = ''
+        for (const key in data[i]) {
+            row += `"${ data[i][key] }",`
+        }
+        row = row.slice(0, -1) // 删除最后一个逗号
+        csv += row + '\r\n' // 添加换行符
+    }
+    return csv
+}
+
+export { convertToCSV }

src/ts/func/utils/equipItem.ts

@@ -0,0 +1,21 @@
+const equipItem = (itemId: string, armoryId: string, type: number) => {
+    return fetch(window.addRFC("https://www.torn.com/item.php"), {
+        "headers": {
+            "accept": "*/*",
+            "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+            "sec-ch-ua-mobile": "?0",
+            "sec-fetch-dest": "empty",
+            "sec-fetch-mode": "cors",
+            "sec-fetch-site": "same-origin",
+            "x-requested-with": "XMLHttpRequest"
+        },
+        "referrer": "https://www.torn.com/item.php",
+        "referrerPolicy": "strict-origin-when-cross-origin",
+        "body": `step=actionForm&item_id=${ itemId }&armour-from-set=&type=${ type }&action=equip&item=${ itemId }&id=${ armoryId }&confirm=1`,
+        "method": "POST",
+        "mode": "cors",
+        "credentials": "include"
+    })
+}
+
+export default equipItem

src/ts/func/utils/fetchCurrentMoney.ts

@@ -0,0 +1,28 @@
+const init: RequestInit = {
+    "headers": {
+        "accept": "*/*",
+        "sec-ch-ua-mobile": "?0",
+        "sec-fetch-dest": "empty",
+        "sec-fetch-mode": "cors",
+        "sec-fetch-site": "same-origin",
+        "x-requested-with": "XMLHttpRequest"
+    },
+    "referrer": "https://www.torn.com/companies.php",
+    "referrerPolicy": "strict-origin-when-cross-origin",
+    "body": null,
+    "method": "GET",
+    "mode": "cors",
+    "credentials": "include"
+};
+
+export const fetchCurrentMoney = async (action?: string): Promise<number> => {
+    return Number(await (await fetch(window.addRFC("/inputMoneyAction.php?step=" + (action ? action : "generalAction")), init)).text());
+};
+
+export const fetchCurrentCompanyAvailableMoney = () => {
+    return fetchCurrentMoney("companyAction");
+};
+
+export const fetchCurrentPropVaultAvailableMoney = () => {
+    return fetchCurrentMoney("propertyDepositAction");
+};

src/ts/func/utils/getSidebarData.ts

@@ -0,0 +1,19 @@
+import { SessionStoreDataType } from "../../interface/SessionStoreDataType";
+
+/**
+ * 寻找 session storage 中以 sidebarData 开头的数据以对象返回
+ */
+export default function (): SessionStoreDataType {
+    let json: string = null
+    for (let i = 0; i < sessionStorage.length; i++) {
+        let key = sessionStorage.key(i)
+        if (key.startsWith('sidebarData')) {
+            json = sessionStorage.getItem(key)
+            break
+        }
+    }
+    if (!json) {
+        throw new TypeError('未找到 sidebarData')
+    }
+    return JSON.parse(json)
+}

src/ts/func/utils/timePastFormat.ts

@@ -0,0 +1,20 @@
+const timePastFormat = (ts: number): string => {
+    // 毫秒
+    if (ts < 1000) {
+        return ts + 'ms'
+    }
+    // 秒
+    else if (ts < 60000) {
+        return (ts / 1000 | 0) + 's'
+    }
+    // 分
+    else if (ts < 3600000) {
+        return (ts / 60000 | 0) + 'm'
+    }
+    // 时
+    else {
+        return (ts / 3600000 | 0) + 'h'
+    }
+}
+
+export { timePastFormat }

src/ts/func/utils/useItem.ts

@@ -0,0 +1,51 @@
+import { ElMessage } from "element-plus"
+
+type CrimeResVo = { text: string, success: boolean }
+
+const defaultCb = (res: CrimeResVo) => {
+    ElMessage({
+        message: res.text,
+        type: res.success ? 'success' : 'error',
+        dangerouslyUseHTMLString: true,
+        grouping: true
+    })
+}
+
+const useItem = (itemId: string, cb = defaultCb) => {
+    fetch(window.addRFC("https://www.torn.com/item.php"), {
+        "headers": {
+            "accept": "*/*",
+            "content-type": "application/x-www-form-urlencoded;charset=UTF-8",
+            "sec-ch-ua-mobile": "?0",
+            "sec-fetch-dest": "empty",
+            "sec-fetch-mode": "cors",
+            "sec-fetch-site": "same-origin",
+            "x-requested-with": "XMLHttpRequest"
+        },
+        "referrer": "https://www.torn.com/item.php",
+        "referrerPolicy": "strict-origin-when-cross-origin",
+        "body": `step=useItem&id=${ itemId }&itemID=${ itemId }`,
+        "method": "POST",
+        "mode": "cors",
+        "credentials": "include"
+    })
+        .then(res => res.json())
+        .then(res => cb(res))
+        .catch(e => ElMessage({
+            message: e.toString,
+            type: 'error'
+        }));
+}
+
+const useItemSync = (itemId: string, showMsg = true, cb = (response: CrimeResVo) => null) => {
+    return new Promise((res, rej) => {
+        useItem(itemId, (_res) => {
+            if (showMsg) defaultCb(_res)
+            cb(_res)
+            res(null)
+        })
+    })
+}
+
+export default useItem
+export { useItemSync }

src/ts/globVars.ts

@@ -1,22 +1,15 @@
 import Popup from "./class/utils/Popup";
+import { reactive } from 'vue'
+import IFeatureResult from "./man/IFeatureResult";
 
-// export default {
-//     // 监听到的fetch数据
-//     WH_NET_LOG: [],
-//     map: {},
-//     responseHandlers: [],
-//     version: '$$WUHU_DEV_VERSION$$',
-// } as IGlobVars;
-//
-// interface IGlobVars {
-//     WH_NET_LOG: unknown[],
-//     map: { [key: string]: unknown },
-//     responseHandlers: ((url: string, responseBody: { json: unknown, text: string, isModified: boolean }, opt: { method: string, requestBody: unknown }) => void)[],
-//     version: string,
-// }
-
-
-type ResponseHandlers = ((url: string, responseBody: { json: unknown, text: string, isModified: boolean }, opt: { method: string, requestBody: unknown }) => void)[];
+type ResponseHandlers = ((url: string, responseBody: {
+    json: unknown,
+    text: string,
+    isModified: boolean
+}, opt: {
+    method: string,
+    requestBody: unknown
+}) => void)[];
 
 /**
  * 通用全局参数
@@ -28,6 +21,14 @@ class GlobVars {
     responseHandlers: ResponseHandlers = [];
     version = '$$WUHU_DEV_VERSION$$';
     popup_node: MyHTMLElement | Popup = null;
+    loadTime: number = 0;
+    buttons = reactive<FloatButtonData[]>([])
+    featureStatus = reactive<IFeatureResult[]>([])
 }
 
 export default new GlobVars();
+
+interface FloatButtonData {
+    txt: string,
+    func: (ev: Event) => void
+}

src/ts/index.ts

@@ -1,13 +1,15 @@
 import "reflect-metadata";
-import { Container } from "./container/Container";
 import App from "./App";
-import Logger from "./class/Logger";
-import EntryPoint from "./class/provider/EntryPoint";
+import EntryPoint from "./starter/EntryPoint";
+import { Injectable } from "./container/Injectable";
+import ClassName from "./container/ClassName";
+import { Container } from "./container/Container";
 
 @EntryPoint
-class _ {
-    static main() {
-        Container.setLogger(new Logger());
-        Container.factory(App).run();
+@ClassName('Index')
+@Injectable()
+class Index {
+    public static main() {
+        Container.factory(App).run()
     }
 }

src/ts/interface/IGlobal.ts

@@ -1,7 +1,7 @@
 import Device from "../enum/Device";
-import { BeerMonitorLoop } from "../class/action/BuyBeerHelper";
+import { BeerMonitorLoop } from "../feature/BuyBeerHelper";
 import Popup from "../class/utils/Popup";
-import TravelItem from "../class/action/TravelItem";
+import TravelItem from "../feature/TravelItem";
 
 export default interface IGlobal {
     GM_xmlhttpRequest?: Function;

src/ts/interface/IUserProfileData.ts

@@ -38,7 +38,10 @@ export default interface IUserProfileData {
         }
     };
     medalInformation: unknown;
-    basicInformation: unknown;
+    basicInformation: {
+        icons: { id: number, title: string }[],
+        lastAction: { seconds: number }
+    };
     personalInformation: unknown;
     competitionStatus: unknown;
     staffTools: null;

src/ts/interface/MenuItem.ts

@@ -13,4 +13,4 @@ export enum MENU_ITEM_TYPE {
 }
 
 // export
-export const menuItemList = Symbol() as InjectionKey<MenuItem[]>;
+export const menuItemList = Symbol('menuItemList') as InjectionKey<MenuItem[]>;

src/ts/interface/SessionStoreDataType.ts

@@ -0,0 +1,566 @@
+/**
+ * 存在于 session storage 中的 sidebarData+uid
+ */
+export interface SessionStoreDataType {
+    sliderHintDisabled: boolean
+    selectedStatusIcon: any
+    progressBarFetchActive: boolean
+    linkWithContextMenu: number
+    statusIcons: StatusIcons
+    user: User
+    listsStatuses: ListsStatuses
+    listsLinksStatuses: ListsLinksStatuses
+    bars: Bars
+    account: Account
+    areas: Areas
+    lists: Lists
+    footer: Footer
+    dataSync: boolean
+    sidebarFetched: boolean
+    currentUrl: string
+}
+
+export interface StatusIcons {
+    size: string
+    icons: Icons
+    visible: boolean
+    onTop: boolean
+}
+
+export interface Icons {
+    enbyGender: EnbyGender
+    donator: Donator
+    company: Company
+    faction: Faction
+    education: Education
+    bazaar: Bazaar
+    stock_market: StockMarket
+    booster_cooldown?: BoosterCooldown
+    drug_cooldown?: DrugCooldown
+}
+
+export interface EnbyGender {
+    iconID: string
+    title: string
+}
+
+export interface Donator {
+    iconID: string
+    title: string
+    subtitle: string
+    link: string
+}
+
+export interface Company {
+    iconID: string
+    title: string
+    subtitle: string
+    link: string
+}
+
+export interface Faction {
+    iconID: string
+    title: string
+    subtitle: string
+    link: string
+}
+
+export interface Education {
+    iconID: string
+    title: string
+    subtitle: string
+    link: string
+    serverTimestamp: number
+    timerExpiresAt: number
+    isShortFormatTimer: boolean
+}
+
+export interface Bazaar {
+    iconID: string
+    title: string
+    subtitle: string
+    link: string
+}
+
+export interface StockMarket {
+    iconID: string
+    title: string
+    subtitle: string
+    link: string
+}
+
+export interface BoosterCooldown {
+    iconID: string
+    title: string
+    factionUpgrade: string
+    serverTimestamp: number
+    timerExpiresAt: number
+    isShortFormatTimer: boolean
+}
+
+export interface DrugCooldown {
+    iconID: string
+    title: string
+    subtitle: string
+    serverTimestamp: number
+    timerExpiresAt: number
+    isShortFormatTimer: boolean
+}
+
+export interface User {
+    userID: number
+    name: string
+    link: string
+    money: Money
+    donator: boolean
+    level: Level
+    points: Points
+    merits: Merits
+    refills: Refills
+    lifeModifier: number
+    status: any
+}
+
+export interface Money {
+    value: number
+}
+
+export interface Level {
+    value: number
+    upgradePossibility: boolean
+    link: string
+}
+
+export interface Points {
+    value: number
+    link: string
+}
+
+export interface Merits {
+    value: number
+    link: string
+}
+
+export interface Refills {
+    value: string
+    link: string
+}
+
+export interface ListsStatuses {
+    areas: boolean
+    lists: boolean
+}
+
+export interface ListsLinksStatuses {
+    staff: boolean
+    friends: boolean
+    enemies: boolean
+}
+
+export interface Bars {
+    energy: Energy
+    nerve: Nerve
+    happy: Happy
+    life: Life
+    chain: Chain
+}
+
+export interface Energy {
+    name: string
+    timestampToUpdate: number
+    timeToUpdate: number
+    statstamp: number
+    amount: number
+    max: number
+    step: number
+}
+
+export interface Nerve {
+    name: string
+    timestampToUpdate: number
+    timeToUpdate: number
+    statstamp: number
+    amount: number
+    max: number
+    step: number
+}
+
+export interface Happy {
+    name: string
+    timestampToUpdate: number
+    timeToUpdate: number
+    statstamp: number
+    amount: number
+    max: number
+    step: number
+}
+
+export interface Life {
+    name: string
+    timestampToUpdate: number
+    timeToUpdate: any
+    statstamp: number
+    amount: number
+    max: number
+    step: number
+}
+
+export interface Chain {
+    name: string
+    timestampToUpdate: number
+    timeToUpdate: number
+    amount: number
+    max: number
+    step: number
+    coolDown: number
+    endCoolDownTimestamp: number
+    bonuses: number
+    link: string
+}
+
+export interface Account {
+    messages: Messages
+    events: Events
+    awards: Awards
+}
+
+export interface Messages {
+    linkOrder: number
+    name: string
+    amount: number
+    link: string
+    icon: string
+    highlightStatus: boolean
+    status: any
+    isMobileOnly: boolean
+}
+
+export interface Events {
+    linkOrder: number
+    name: string
+    amount: number
+    link: string
+    icon: string
+    highlightStatus: boolean
+    status: string
+    isMobileOnly: boolean
+}
+
+export interface Awards {
+    linkOrder: number
+    name: string
+    amount: number
+    link: string
+    icon: string
+    highlightStatus: boolean
+    status: any
+    isMobileOnly: boolean
+}
+
+export interface Areas {
+    messages: Messages2
+    events: Events2
+    awards: Awards2
+    gym: Gym
+    crimes: Crimes
+    items: Items
+    city: City
+    missions: Missions
+    casino: Casino
+    calendar: Calendar
+    education: Education2
+    properties: Properties
+    friends_list: FriendsList
+    enemies_list: EnemiesList
+    elimination: Elimination
+    community_events: CommunityEvents
+}
+
+export interface Messages2 {
+    linkOrder: number
+    name: string
+    amount: number
+    link: string
+    icon: string
+    highlightStatus: boolean
+    status: any
+    isMobileOnly: boolean
+}
+
+export interface Events2 {
+    linkOrder: number
+    name: string
+    amount: number
+    link: string
+    icon: string
+    highlightStatus: boolean
+    status: string
+    isMobileOnly: boolean
+}
+
+export interface Awards2 {
+    linkOrder: number
+    name: string
+    amount: number
+    link: string
+    icon: string
+    highlightStatus: boolean
+    status: any
+    isMobileOnly: boolean
+}
+
+export interface Gym {
+    linkOrder: number
+    name: string
+    shortName: any
+    link: string
+    icon: string
+    styleStatus: any
+    highlightStatus: boolean
+    status: any
+    activeStatusUrlRegex: any
+    amount: any
+    isMobileOnly: boolean
+}
+
+export interface Crimes {
+    linkOrder: number
+    name: string
+    shortName: any
+    link: string
+    icon: string
+    styleStatus: any
+    highlightStatus: boolean
+    status: any
+    activeStatusUrlRegex: any
+    amount: any
+    isMobileOnly: boolean
+}
+
+export interface Items {
+    linkOrder: number
+    name: string
+    shortName: any
+    link: string
+    icon: string
+    styleStatus: any
+    highlightStatus: boolean
+    status: any
+    activeStatusUrlRegex: any
+    amount: any
+    isMobileOnly: boolean
+}
+
+export interface City {
+    linkOrder: number
+    name: string
+    shortName: any
+    link: string
+    icon: string
+    styleStatus: any
+    highlightStatus: boolean
+    status: any
+    activeStatusUrlRegex: any
+    amount: any
+    isMobileOnly: boolean
+}
+
+export interface Missions {
+    linkOrder: number
+    name: string
+    shortName: any
+    link: string
+    icon: string
+    styleStatus: any
+    highlightStatus: boolean
+    status: any
+    activeStatusUrlRegex: any
+    amount: any
+    isMobileOnly: boolean
+}
+
+export interface Casino {
+    linkOrder: number
+    name: string
+    shortName: any
+    link: string
+    icon: string
+    styleStatus: any
+    highlightStatus: boolean
+    status: any
+    activeStatusUrlRegex: any
+    amount: any
+    isMobileOnly: boolean
+}
+
+export interface Calendar {
+    linkOrder: number
+    name: string
+    shortName: string
+    link: string
+    icon: string
+    styleStatus: any
+    highlightStatus: boolean
+    status: any
+    activeStatusUrlRegex: any
+    amount: any
+    isMobileOnly: boolean
+}
+
+export interface Education2 {
+    linkOrder: number
+    name: string
+    shortName: string
+    link: string
+    icon: string
+    styleStatus: any
+    highlightStatus: boolean
+    status: any
+    activeStatusUrlRegex: any
+    amount: any
+    isMobileOnly: boolean
+}
+
+export interface Properties {
+    linkOrder: number
+    name: string
+    shortName: string
+    link: string
+    icon: string
+    styleStatus: any
+    highlightStatus: boolean
+    status: any
+    activeStatusUrlRegex: any
+    amount: any
+    isMobileOnly: boolean
+}
+
+export interface FriendsList {
+    linkOrder: number
+    name: string
+    icon: string
+    link: string
+    elements: any
+    status: any
+    isMobileOnly: boolean
+}
+
+export interface EnemiesList {
+    linkOrder: number
+    name: string
+    icon: string
+    link: string
+    elements: Element[]
+    status: any
+    isMobileOnly: boolean
+}
+
+export interface Element {
+    name: string
+    link: string
+    status: string
+    lastAction: number
+}
+
+export interface Elimination {
+    linkOrder: number
+    name: string
+    shortName: string
+    link: string
+    icon: string
+    styleStatus: string
+    highlightStatus: boolean
+    status: any
+    activeStatusUrlRegex: any
+    amount: any
+    isMobileOnly: boolean
+}
+
+export interface CommunityEvents {
+    linkOrder: number
+    name: string
+    shortName: string
+    link: string
+    icon: string
+    styleStatus: string
+    highlightStatus: boolean
+    status: any
+    activeStatusUrlRegex: any
+    amount: any
+    isMobileOnly: boolean
+}
+
+export interface Lists {
+    company_list: CompanyList
+    faction_list: FactionList
+    friends_list: FriendsList2
+    enemies_list: EnemiesList2
+}
+
+export interface CompanyList {
+    linkOrder: number
+    name: string
+    icon: string
+    link: string
+    elements: Element2[]
+    status: any
+    isMobileOnly: boolean
+}
+
+export interface Element2 {
+    name: string
+    link: string
+    status: string
+    lastAction: number
+}
+
+export interface FactionList {
+    linkOrder: number
+    name: string
+    icon: string
+    link: string
+    elements: Element3[]
+    status: any
+    isMobileOnly: boolean
+}
+
+export interface Element3 {
+    name: string
+    link: string
+    status: string
+    lastAction: number
+}
+
+export interface FriendsList2 {
+    linkOrder: number
+    name: string
+    icon: string
+    link: string
+    elements: any
+    status: any
+    isMobileOnly: boolean
+}
+
+export interface EnemiesList2 {
+    linkOrder: number
+    name: string
+    icon: string
+    link: string
+    elements: Element4[]
+    status: any
+    isMobileOnly: boolean
+}
+
+export interface Element4 {
+    name: string
+    link: string
+    status: string
+    lastAction: number
+}
+
+export interface Footer {
+    serverName: string
+    dayTextualFormat: string
+    dateFormat: string
+    dayTimeFormat: string
+}