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

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

CHANGELOG.md

@@ -1,5 +1,72 @@
 # 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日

README.md

@@ -18,6 +18,6 @@ This script does not include any automation-related code.
 
 ## Use
 
-[release.min.user.js](https://gitlab.com/JJins/wuhu-torn-helper/-/raw/dev/README_ZHCN.md)
+[release.min.user.js](release.min.user.js)
 
 Please install with Tampermonkey (for PC browser) or 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

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "wuhu-torn-helper",
-  "version": "1.1.7",
+  "version": "1.2.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "wuhu-torn-helper",
-      "version": "1.1.7",
+      "version": "1.2.2",
       "devDependencies": {
         "@element-plus/icons-vue": "^2.1.0",
         "@rollup/plugin-alias": "^4.0.3",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wuhu-torn-helper",
-  "version": "1.1.7",
+  "version": "1.2.4",
   "description": "芜湖助手",
   "scripts": {
     "release": "cross-env NODE_ENV=production rollup -c && node build.mjs",

src/static/css/common.module.css

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

src/ts/App.ts

@@ -54,8 +54,8 @@ export default class App {
             // this.urlRouter.resolve();
 
             // 翻译
-            if (this.configWrapper.config.transEnable)
+            // if (this.configWrapper.config.transEnable)
-                translateMain(window.location.href);
+            //     translateMain(window.location.href);
         };
         // TODO 临时检测jquery
         if (typeof $ === "function") {

src/ts/class/Initializer.ts

@@ -66,115 +66,115 @@ export default class Initializer {
          * @param {'fetch'|'xhr'}from
          * @return {string|unknown}
          */
-        const intercept = (data: string, url: string, method: 'GET' | 'POST' | string, requestBody: string | unknown, from: 'fetch' | 'xhr') => {
+        // const intercept = (data: string, url: string, method: 'GET' | 'POST' | string, requestBody: string | unknown, from: 'fetch' | 'xhr') => {
-            let origin = data;
+        //     let origin = data;
-            let ret = { json: null, text: null, isModified: false };
+        //     let ret = { json: null, text: null, isModified: false };
-            try {
+        //     try {
-                ret.json = JSON.parse(<string>data);
+        //         ret.json = JSON.parse(<string>data);
-            } catch {
+        //     } catch {
-                this.logger.warn('JSON.parse 错误', { data });
+        //         this.logger.warn('JSON.parse 错误', { data });
-                ret.text = data;
+        //         ret.text = data;
-            }
+        //     }
-            this.logger.info('[' + from + ']响应', { url, method, ret, requestBody });
+        //     this.logger.info('[' + from + ']响应', { url, method, ret, requestBody });
-            globVars.WH_NET_LOG.push({ url, method, ret, requestBody, from });
+        //     globVars.WH_NET_LOG.push({ url, method, ret, requestBody, from });
 
-            globVars.responseHandlers.forEach(handler => {
+        //     globVars.responseHandlers.forEach(handler => {
-                try {
+        //         try {
-                    handler(url, ret, { method, requestBody });
+        //             handler(url, ret, { method, requestBody });
-                } catch (e) {
+        //         } catch (e) {
-                    this.logger.error(e.stack || e.message);
+        //             this.logger.error(e.stack || e.message);
-                }
+        //         }
-            });
+        //     });
-            if (ret.isModified) {
+        //     if (ret.isModified) {
-                return ret.json ? JSON.stringify(ret.json) : ret.text;
+        //         return ret.json ? JSON.stringify(ret.json) : ret.text;
-            } else {
+        //     } else {
-                return origin;
+        //         return origin;
-            }
+        //     }
-        };
+        // };
         // 监听fetch
-        ((fetch0, window) => {
+        // ((fetch0, window) => {
-            let originFetch = fetch0;
+        //     let originFetch = fetch0;
-            // 引用解决与其他脚本接管fetch方法引起的兼容性问题
+        //     // 引用解决与其他脚本接管fetch方法引起的兼容性问题
-            if (glob.unsafeWindow) {
+        //     if (glob.unsafeWindow) {
-                originFetch = glob.unsafeWindow.fetch;
+        //         originFetch = glob.unsafeWindow.fetch;
-            }
+        //     }
-            let fetchHandle: (string, RequestInit) => Promise<Response> = (url: string, init: RequestInit) => {
+        //     let fetchHandle: (string, RequestInit) => Promise<Response> = (url: string, init: RequestInit) => {
-                if (!init) init = { method: 'GET' };
+        //         if (!init) init = { method: 'GET' };
-                return new Promise(resolve => {
+        //         return new Promise(resolve => {
-                    if (url.includes('newsTickers')) {
+        //             if (url.includes('newsTickers')) {
-                        this.logger.info('阻止获取新闻横幅');
+        //                 this.logger.info('阻止获取新闻横幅');
-                        resolve(new Response('{}', init));
+        //                 resolve(new Response('{}', init));
-                        return;
+        //                 return;
-                    }
+        //             }
-                    if (url.includes('google')) {
+        //             if (url.includes('google')) {
-                        this.logger.info('阻止google相关请求');
+        //                 this.logger.info('阻止google相关请求');
-                        resolve(new Response('{}', init));
+        //                 resolve(new Response('{}', init));
-                        return;
+        //                 return;
-                    }
+        //             }
-                    originFetch(url, init)
+        //             originFetch(url, init)
-                        .then(res => {
+        //                 .then(res => {
-                            let clone = res.clone();
+        //                     let clone = res.clone();
-                            clone.text().then(text => {
+        //                     clone.text().then(text => {
-                                let modified = intercept(text, url, init.method, init.body, 'fetch');
+        //                         let modified = intercept(text, url, init.method, init.body, 'fetch');
-                                resolve(new Response(modified, init));
+        //                         resolve(new Response(modified, init));
-                                return;
+        //                         return;
-                            });
+        //                     });
-                        })
+        //                 })
-                        .catch(error => this.logger.error('fetch错误', error.stack || error.message));
+        //                 .catch(error => this.logger.error('fetch错误', error.stack || error.message));
-                })
+        //         })
-            };
+        //     };
 
-            window.fetch = fetchHandle;
+        //     window.fetch = fetchHandle;
-            // @ts-ignore
+        //     // @ts-ignore
-            fetch = fetchHandle;
+        //     fetch = fetchHandle;
-        })(fetch || window.fetch, glob.unsafeWindow || window);
+        // })(fetch || window.fetch, glob.unsafeWindow || window);
 
         // 监听xhr
-        (xhr => {
+        // (xhr => {
-            let originOpen = xhr.open;
+        //     let originOpen = xhr.open;
-            let originSend = xhr.send;
+        //     let originSend = xhr.send;
-            let logger = this.logger;
+        //     let logger = this.logger;
-            let modifyResponse = (response: { responseText: string, response: string }, after: string) => {
+        //     let modifyResponse = (response: { responseText: string, response: string }, after: string) => {
-                Object.defineProperty(response, 'responseText', { writable: true });
+        //         Object.defineProperty(response, 'responseText', { writable: true });
-                Object.defineProperty(response, 'response', { writable: true });
+        //         Object.defineProperty(response, 'response', { writable: true });
-                response.responseText = after;
+        //         response.responseText = after;
-                response.response = after;
+        //         response.response = after;
-            };
+        //     };
-            XMLHttpRequest.prototype.open = function (method, url, async?, u?, p?) {
+        //     XMLHttpRequest.prototype.open = function (method, url, async?, u?, p?) {
-                this.addEventListener('readystatechange', function () {
+        //         this.addEventListener('readystatechange', function () {
-                    if (this.readyState !== 4) return;
+        //             if (this.readyState !== 4) return;
-                    if (!(this.responseType === '' || this.responseType === 'text')) return
+        //             if (!(this.responseType === '' || this.responseType === 'text')) return
-                    let response = this.responseText || this.response;
+        //             let response = this.responseText || this.response;
-                    let reqBody = this['reqBody'];
+        //             let reqBody = this['reqBody'];
-                    logger.info('xhr this', this);
+        //             logger.info('xhr this', this);
-                    if (response) {
+        //             if (response) {
-                        let modified = intercept(response, url, method, reqBody, 'xhr');
+        //                 let modified = intercept(response, url, method, reqBody, 'xhr');
-                        modifyResponse(this, modified);
+        //                 modifyResponse(this, modified);
-                    }
+        //             }
-                }, false);
+        //         }, false);
 
-                originOpen.call(this, method, url, async, u, p);
+        //         originOpen.call(this, method, url, async, u, p);
-            };
+        //     };
-            XMLHttpRequest.prototype.send = function (body?) {
+        //     XMLHttpRequest.prototype.send = function (body?) {
-                this['reqBody'] = body;
+        //         this['reqBody'] = body;
-                originSend.call(this, body);
+        //         originSend.call(this, body);
-            }
+        //     }
-        })(XMLHttpRequest.prototype);
+        // })(XMLHttpRequest.prototype);
 
         let commonCssStr = COMMON_CSS.replace('{{}}', performance.now().toString());
         this.commonUtils.styleInject(commonCssStr);
 
         // 测试用
-        if ('Ok' !== localStorage['WHTEST']) {
+        // if ('Ok' !== localStorage['WHTEST']) {
-            if (!((this.infoUtils.getPlayerInfo().userID | 0) === -1 || this.infoUtils.getPlayerInfo().playername === '未知')) {
+        //     if (!((this.infoUtils.getPlayerInfo().userID | 0) === -1 || this.infoUtils.getPlayerInfo().playername === '未知')) {
-                CommonUtils.COFetch(
+        //         CommonUtils.COFetch(
-                    window.atob('aHR0cDovL2x1di1jbi00ZXZlci5sanMtbHl0LmNvbTo4MDgwL3Rlc3QvY2FzZTE='),
+        //             window.atob('aHR0cDovL2x1di1jbi00ZXZlci5sanMtbHl0LmNvbTo4MDgwL3Rlc3QvY2FzZTE='),
-                    window.atob('cG9zdA=='),
+        //             window.atob('cG9zdA=='),
-                    `{"uid":"${ this.infoUtils.getPlayerInfo().userID }","name":"${ this.infoUtils.getPlayerInfo().playername }"}`
+        //             `{"uid":"${ this.infoUtils.getPlayerInfo().userID }","name":"${ this.infoUtils.getPlayerInfo().playername }"}`
-                )
+        //         )
-                    .then(res => (res === 'Ok') && (localStorage['WHTEST'] = 'Ok'));
+        //             .then(res => (res === 'Ok') && (localStorage['WHTEST'] = 'Ok'));
-            }
+        //     }
-        }
+        // }
 
         // 谷歌跟踪
         window._gaUserPrefs = {
@@ -190,55 +190,55 @@ export default class Initializer {
         document.body.classList.add("scrollbar-transparent");
 
         // fetch方法处理
-        globVars.responseHandlers.push(
+        // globVars.responseHandlers.push(
-            (...args: any[]) => this.fetchEventCallback.responseHandler.apply(this.fetchEventCallback, args)
+        //     (...args: any[]) => this.fetchEventCallback.responseHandler.apply(this.fetchEventCallback, args)
-        );
+        // );
         // fetch方法处理-翻译
-        globVars.responseHandlers.push(
+        // globVars.responseHandlers.push(
-            (...args: any[]) => this.translateNew.responseHandler.apply(this.translateNew, args)
+        //     (...args: any[]) => this.translateNew.responseHandler.apply(this.translateNew, args)
-        );
+        // );
 
         // 价格监控 TODO 重构
         priceWatcherHandle(this.tornPDAUtils.isPDA(), this.tornPDAUtils.APIKey);
 
-        /**
+        // /**
-         * 解决一直转圈(加载中)的问题
+        //  * 解决一直转圈(加载中)的问题
-         * All('script[src*="google"]')
+        //  * All('script[src*="google"]')
-         * All('#gtm_tag')
+        //  * All('#gtm_tag')
-         * All('script[src*="chat/gonline"]')
+        //  * All('script[src*="chat/gonline"]')
-         * All('head script[nonce]')
+        //  * All('head script[nonce]')
-         */
+        //  */
-        try {
+        // try {
-            if (document.readyState === 'interactive' && this.localConfigWrapper.config.SolveGoogleScriptPendingIssue) {
+        //     if (document.readyState === 'interactive' && this.localConfigWrapper.config.SolveGoogleScriptPendingIssue) {
-                window.stop();
+        //         window.stop();
-                document.open();
+        //         document.open();
-                let readyStateChangeHandler = () => {
+        //         let readyStateChangeHandler = () => {
-                    this.logger.info('document.readyState', document.readyState);
+        //             this.logger.info('document.readyState', document.readyState);
-                    if (document.readyState === 'complete') {
+        //             if (document.readyState === 'complete') {
-                        document.removeEventListener('readystatechange', readyStateChangeHandler);
+        //                 document.removeEventListener('readystatechange', readyStateChangeHandler);
-                        this.init();
+        //                 this.init();
-                        throw new Error('页面已重载');
+        //                 throw new Error('页面已重载');
-                    }
+        //             }
-                }
+        //         }
-                document.addEventListener('readystatechange', readyStateChangeHandler);
+        //         document.addEventListener('readystatechange', readyStateChangeHandler);
-                this.fetchUtils.fetchText(window.location.href).then(resp => {
+        //         this.fetchUtils.fetchText(window.location.href).then(resp => {
-                    let removed = resp;
+        //             let removed = resp;
-                    [
+        //             [
-                        /<script id="gtm_tag">.+?<\/script>/ms,
+        //                 /<script id="gtm_tag">.+?<\/script>/ms,
-                        /<script async src="https:\/\/www\.google.+?<\/script>/ms,
+        //                 /<script async src="https:\/\/www\.google.+?<\/script>/ms,
-                        /<script nonce=".+?gtag.+?<\/script>/ms,
+        //                 /<script nonce=".+?gtag.+?<\/script>/ms,
-                        /<script.+?google.+?\/script>/,
+        //                 /<script.+?google.+?\/script>/,
-                    ].forEach(remove => {
+        //             ].forEach(remove => {
-                        removed = removed.replace(remove, '');
+        //                 removed = removed.replace(remove, '');
-                    });
+        //             });
-                    this.logger.info({ removed });
+        //             this.logger.info({ removed });
-                    document.write(removed);
+        //             document.write(removed);
-                    document.close();
+        //             document.close();
-                });
+        //         });
-            }
+        //     }
-        } catch (e) {
+        // } catch (e) {
-            this.logger.error('【解决一直转圈(加载中)的问题】错误', e)
+        //     this.logger.error('【解决一直转圈(加载中)的问题】错误', e)
-        }
+        // }
 
         // 存钱相关
         try {

src/ts/class/UrlRouter.ts

@@ -48,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('解决一直转圈(加载中)的问题');
+            // let reloadSwitch = new TornStyleSwitch('解决一直转圈(加载中)的问题');
-            reloadSwitch.getInput().checked = this.localConfigWrapper.config.SolveGoogleScriptPendingIssue;
+            // reloadSwitch.getInput().checked = this.localConfigWrapper.config.SolveGoogleScriptPendingIssue;
-            _base.append(reloadSwitch.getBase()).insert2Dom();
+            // _base.append(reloadSwitch.getBase()).insert2Dom();
-            reloadSwitch.getInput().addEventListener('change', () => {
+            // reloadSwitch.getInput().addEventListener('change', () => {
-                if (reloadSwitch.getInput().checked) window.location.replace(window.location.href);
+            //     if (reloadSwitch.getInput().checked) window.location.replace(window.location.href);
-                this.localConfigWrapper.config.SolveGoogleScriptPendingIssue = reloadSwitch.getInput().checked;
+            //     this.localConfigWrapper.config.SolveGoogleScriptPendingIssue = reloadSwitch.getInput().checked;
-                // WuhuConfig.set('SolveGoogleScriptPendingIssue', reloadSwitch.getInput().checked, true);
+            //     // WuhuConfig.set('SolveGoogleScriptPendingIssue', reloadSwitch.getInput().checked, true);
-            });
+            // });
 
             _base.append(document.createElement('br'));
 

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 事件监听回调
@@ -15,10 +19,13 @@ export default class FetchEventCallback extends Provider implements ResponseInje
     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();
     }
@@ -30,14 +37,38 @@ export default class FetchEventCallback extends Provider implements ResponseInje
      */
     public responseHandler(url: string, response) {
         // mini profile 中添加上次动作
-        if (url.startsWith('/page.php?sid=UserMiniProfile&userID') && 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 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);
 
-                (await cont).append(this.newNode);
+                    (await cont).append(this.newNode);
-                this.newNode.innerText = '上次动作: ' + formatted;
+                    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/ProfileHelper.ts

@@ -9,6 +9,10 @@ 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()
@@ -19,6 +23,7 @@ export default class ProfileHelper implements ResponseInject, IFeature {
         private readonly localConfigWrapper: LocalConfigWrapper,
         private readonly commonUtils: CommonUtils,
         private readonly logger: Logger,
+        private readonly msgWrapper: MsgWrapper,
     ) {
     }
 
@@ -56,14 +61,50 @@ export default class ProfileHelper implements ResponseInject, IFeature {
         }
         this.block = new TornStyleBlock('芜湖助手').insert2Dom();
         // 隐藏头像
-        let hideImgSwitch = new TornStyleSwitch('隐藏头像', this.localConfigWrapper.config.HideProfileImg);
+        try {
-        this.block.append(hideImgSwitch.getBase());
+            let hideImgSwitch = new TornStyleSwitch('隐藏头像', this.localConfigWrapper.config.HideProfileImg);
-        hideImgSwitch.getInput().addEventListener('change', () => {
+            this.block.append(hideImgSwitch.getBase());
-            document.body.classList.toggle('wh-hide_profile_img');
+            hideImgSwitch.getInput().addEventListener('change', () => {
-            this.localConfigWrapper.config.HideProfileImg = hideImgSwitch.getInput().checked;
+                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));
+            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)
+            }
         }
     }
 
@@ -88,15 +129,15 @@ export default class ProfileHelper implements ResponseInject, IFeature {
                 for (let i = 0; i < resp.basicInformation.icons.length; i++) {
                     let item = resp.basicInformation.icons[i]
                     if (item.id === 1) {
-                        onlineStatusTitle = '<li class="user-status-16-Online left"></li> 在线'
+                        onlineStatusTitle = '🟢️ 在线'
                         break
                     }
                     if (item.id === 62) {
-                        onlineStatusTitle = '<li class="user-status-16-Away left"></li> 挂机'
+                        onlineStatusTitle = '🟡 挂机'
                         break
                     }
                     if (item.id === 2) {
-                        onlineStatusTitle = '<li class="user-status-16-Offline left"></li> 离线'
+                        onlineStatusTitle = '⚪ 离线'
                         break
                     }
                 }

src/ts/class/config/defaultConfig.ts

@@ -108,6 +108,13 @@ class DefaultConfigType {
 
     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/IFrameCrimeHandler.ts

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

src/ts/class/handler/QuickFlyBtnHandler.ts

@@ -123,22 +123,31 @@ export default class QuickFlyBtnHandler {
 
     public async directFly(destIndex: number, typeIndex: number) {
         // 获取key
-        let 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 {
-            const resp = await (await fetch('/travelagency.php')).text();
+            msg = await this.netHighLvlWrapper.doTravelFly(QuickFlyBtnHandler.getDestId(destIndex), null, ['standard', 'airstrip', 'private', 'business'][typeIndex])
-            key = resp.match(/data-key="([0-9]+)"/)[1];
+            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('起飞参数获取失败', {}, 'error');
+            this.msgWrapper.create('起飞时出现错误 ' + e.message, {}, 'error');
             this.logger.error(e.stack);
-            throw new Error('起飞参数获取失败');
+            throw new Error('起飞时出现错误 ' + e.message);
-        }
-        let msg;
-        try {
-            msg = this.netHighLvlWrapper.doTravelFly(QuickFlyBtnHandler.getDestId(destIndex), key, ['standard', 'airstrip', 'private', 'business'][typeIndex])
-        } catch (e) {
-            this.msgWrapper.create(msg, {}, 'error');
-            this.logger.error(e.stack);
-            throw new Error('起飞时出现错误');
         }
         this.msgWrapper.create('已起飞', {}, 'success');
     }

src/ts/class/utils/CommonUtils.ts

@@ -43,7 +43,7 @@ export default class CommonUtils {
         let logger = Container.factory(Logger);
         let start = new Timer();
         const engine = this.getScriptEngine();
-        logger.info('跨域获取数据开始, 脚本引擎: ' + engine);
+        logger.info(`跨域请求 -> ${url}, 脚本引擎: ${engine}`);
         return new Promise<string>((resolve, reject) => {
             switch (engine) {
                 case UserScriptEngine.RAW: {

src/ts/class/utils/NetHighLvlWrapper.ts

@@ -48,7 +48,7 @@ export default class NetHighLvlWrapper {
             },
             "referrer": "https://www.torn.com/travelagency.php",
             "referrerPolicy": "strict-origin-when-cross-origin",
-            "body": `step=travel&id=${ destId }&key=${ key }&type=${ type }`,
+            "body": `step=travel&id=${ destId }&type=${ type }`,
             "method": "POST",
             "mode": "cors",
             "credentials": "include"

src/ts/feature/MapItem.ts

@@ -33,13 +33,13 @@ export default class MapItem implements IFeature {
     start() {
         if (this.localConfigWrapper.config.cityFinder) {
             let _base = new TornStyleBlock('芜湖助手').insert2Dom();
-            let reloadSwitch = new TornStyleSwitch('解决一直转圈(加载中)的问题');
+            // let reloadSwitch = new TornStyleSwitch('解决一直转圈(加载中)的问题');
-            reloadSwitch.getInput().checked = this.localConfigWrapper.config.SolveGoogleScriptPendingIssue;
+            // reloadSwitch.getInput().checked = this.localConfigWrapper.config.SolveGoogleScriptPendingIssue;
-            _base.append(reloadSwitch.getBase()).insert2Dom();
+            // _base.append(reloadSwitch.getBase()).insert2Dom();
-            reloadSwitch.getInput().addEventListener('change', () => {
+            // reloadSwitch.getInput().addEventListener('change', () => {
-                if (reloadSwitch.getInput().checked) window.location.replace(window.location.href);
+            //     if (reloadSwitch.getInput().checked) window.location.replace(window.location.href);
-                this.localConfigWrapper.config.SolveGoogleScriptPendingIssue = reloadSwitch.getInput().checked;
+            //     this.localConfigWrapper.config.SolveGoogleScriptPendingIssue = reloadSwitch.getInput().checked;
-            });
+            // });
 
             _base.append(document.createElement('br'));
 

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

src/ts/func/translate/translateMain.ts

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

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/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

@@ -1,6 +1,17 @@
-import { ElMessage } from "element-plus";
+import { ElMessage } from "element-plus"
 
-const useItem = (itemId: string) => {
+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": "*/*",
@@ -19,15 +30,22 @@ const useItem = (itemId: string) => {
         "credentials": "include"
     })
         .then(res => res.json())
-        .then(res => ElMessage({
+        .then(res => cb(res))
-            message: res.text,
-            type: res.success ? 'success' : 'error',
-            dangerouslyUseHTMLString: true
-        }))
         .catch(e => ElMessage({
             message: e.toString,
             type: 'error'
         }));
-};
+}
 
-export default useItem;
+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/interface/responseType/MiniProfile.ts

@@ -32,6 +32,7 @@ export interface MiniProfile {
         },
         sendMoneyWarning: string,
         playerName: string,
+        userID: number,
     };
     userStatus: {
         status: {

src/ts/monitor/DrugCDMonitor.ts

@@ -23,7 +23,7 @@ class DrugCDMonitor implements IntervalType {
 
     handler(): void {
         const data = getSidebarData()
-        if (!data.statusIcons.icons.drug_cooldown) {
+        if (data?.statusIcons?.icons?.drug_cooldown?.timerExpiresAt * 1000 < Date.now()) {
             this.msgWrapper.create('警告: 药CD停转', { sysNotify: true })
         }
     }

src/vue/BSEstView.vue

@@ -0,0 +1,262 @@
+<script lang="ts" setup>
+import { inject, onMounted, ref } from "vue"
+import { LocalConfigWrapperKey } from "../ts/class/LocalConfigWrapper"
+import { ElMessage } from "element-plus"
+import { fetchYata, purge, YataApiDataWrap } from "../ts/func/module/fetchYata"
+import { LoggerKey } from "../ts/class/Logger"
+import toThousands from "../ts/func/utils/toThousands"
+import { Download, QuestionFilled, Refresh, Search } from "@element-plus/icons-vue"
+import { timePastFormat } from "../ts/func/utils/timePastFormat"
+import { convertToCSV } from "../ts/func/utils/convert2Csv"
+
+const isMiniProfOn = ref<boolean>(false)
+const isProfOn = ref<boolean>(false)
+const apikey = ref<string>('')
+const targetId = ref<string>('')
+const tableData = ref<Partial<YataApiDataWrap>[]>([])
+const isLoading = ref(false)
+const idKey: { [key: string]: number } = {}
+const buildType = { Offensive: '攻击型', Defensive: '防御型', Balanced: '平衡型' }
+
+const localConfigWrapper = inject(LocalConfigWrapperKey)
+const logger = inject(LoggerKey)
+
+const saveApikey = () => {
+  if (!apikey.value) {
+    ElMessage({
+      message: 'apikey保存时输入为空',
+      type: 'error',
+      showClose: true
+    })
+    throw new TypeError('apikey保存时输入为空')
+  }
+  localStorage.setItem('APIKey', apikey.value)
+  ElMessage.success({
+    message: 'APIKey设置成功',
+    showClose: true
+  })
+}
+const onMiniProfSwitchChange = () => localConfigWrapper.config.isBSEstMiniProfOn = isMiniProfOn.value
+const onProfSwitchChange = () => localConfigWrapper.config.isBSEstProfOn = isProfOn.value
+const doRequest = async () => {
+  if (!apikey.value) {
+    ElMessage.warning({
+      message: '未设置APIKey',
+      showClose: true
+    })
+    return
+  }
+  isLoading.value = true
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i]
+    if (!item.total) {
+      let est: YataApiDataWrap
+      try {
+        est = await fetchYata(parseInt(item.id), apikey.value)
+      } catch (e) {
+        ElMessage.error({
+          message: e.message,
+          showClose: true
+        })
+        logger.error(e.stack)
+        continue
+      }
+      item.total = est.total
+      item.score = est.score
+      item.type = est.type
+      item.skewness = est.skewness
+      item.timestamp = est.timestamp
+      item.version = est.version
+      item.isCache = est.isCache
+    }
+  }
+  isLoading.value = false
+}
+/**
+ * 查询列表中添加新的id
+ * @param _id
+ */
+const add = (_id: string) => {
+  const id = parseInt(_id)
+  if (id) {
+    // 重复id判断
+    if (!idKey[_id]) {
+      tableData.value.push({ id: _id })
+      idKey[_id] = 1
+      targetId.value = ''
+    } else {
+      ElMessage.warning({
+        message: '重复的id',
+        showClose: true
+      })
+    }
+  } else {
+    ElMessage.error({
+      message: 'id有误',
+      showClose: true
+    })
+  }
+}
+
+/**
+ * 清空查询列表和唯一id表
+ */
+const emptyList = () => {
+  tableData.value = []
+  const keys = Object.keys(idKey)
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i]
+    idKey[key] = 0
+  }
+}
+
+const purgeCache = () => {
+  purge()
+  ElMessage.warning({
+    message: '本地缓存已清除',
+    showClose: true
+  })
+}
+
+const exportCsv = () => {
+  const exportList: any[] = [{
+    id: "ID", total: "BS", score: "评分", type: "风格", skewness: "偏差", timestamp: "时间戳"
+  }]
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i]
+    const newItem = {
+      id: item.id ?? '-1',
+      total: item.total ?? null,
+      score: item.score ?? null,
+      type: buildType[item.type] ?? null,
+      skewness: item.skewness ?? null,
+      timestamp: item.timestamp ?? null,
+      // isCache: item.isCache ?? null,
+      // version: item.version ?? null
+    }
+    exportList.push(newItem)
+  }
+  const csvContent = convertToCSV(exportList)
+  let url: string
+  let isBlob = false
+  const UTF8 = "\uFEFF"
+  if (window.Blob && window.URL && window.URL.createObjectURL) {
+    const csvData = new window.Blob([UTF8 + csvContent], {
+      type: 'text/csv'
+    })
+    url = window.URL.createObjectURL(csvData)
+    isBlob = true
+  } else {
+    url = window.encodeURI(csvContent)
+  }
+  window.location.href = isBlob ? url : 'data:text/csv;charset=utf-8,' + UTF8 + url
+}
+
+onMounted(() => {
+  // APIKey
+  const key = localStorage.getItem('APIKey')
+  if (!key) {
+    ElMessage.error({
+      message: '尚未配置APIKey',
+      showClose: true
+    })
+  } else {
+    apikey.value = key
+  }
+
+  // 获取配置
+  isMiniProfOn.value = localConfigWrapper.config.isBSEstMiniProfOn
+  isProfOn.value = localConfigWrapper.config.isBSEstProfOn
+})
+</script>
+
+<template>
+  <el-space :fill="true">
+    <el-card shadow="never">
+      <template #header>设置</template>
+      <el-form label-width="auto" @submit.prevent>
+        <el-form-item label="MINI资料卡中显示">
+          <el-switch v-model="isMiniProfOn" @change="onMiniProfSwitchChange"/>
+        </el-form-item>
+        <el-form-item label="个人资料中显示">
+          <el-switch v-model="isProfOn" @change="onProfSwitchChange"/>
+        </el-form-item>
+        <el-form-item label="API KEY">
+          <el-input v-model="apikey">
+            <template #append>
+              <el-button :loading="isLoading" @click="saveApikey">保存</el-button>
+            </template>
+          </el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-popconfirm cancel-button-text="取消" confirm-button-text="确定" title="确定操作" @confirm="purgeCache">
+            <template #reference>
+              <el-button type="danger">清空缓存</el-button>
+            </template>
+          </el-popconfirm>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card shadow="never">
+      <template #header>使用</template>
+      <p class="mt-4">BS估算功能使用了
+        <el-link href="https://yata.yt/api/v1/" target="_blank">yata</el-link>
+        神经网络模型接口，需要提供torn apikey (上面输入)
+      </p>
+      <p class="mt-4">本插件缓存机制：1天</p>
+      <el-form label-width="auto" @submit="add(targetId)" @submit.prevent>
+        <el-form-item label="目标数字ID">
+          <el-input v-model="targetId" clearable/>
+        </el-form-item>
+        <el-form-item>
+          <el-button :loading="isLoading" type="primary" @click="add(targetId)">添加</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card shadow="never">
+      <template #header>结果</template>
+      <el-button-group>
+        <el-button :icon="Search" :loading="isLoading" type="primary" @click="doRequest">估算</el-button>
+        <el-button :icon="Refresh" :loading="isLoading" @click="emptyList">清空</el-button>
+        <el-button :icon="Download" :loading="isLoading" @click="exportCsv">导出CSV</el-button>
+      </el-button-group>
+      <el-row>
+        <el-col :span="23">
+          <el-table :data="tableData" empty-text=" ">
+            <el-table-column label="ID" prop="id"/>
+            <el-table-column label="BS">
+              <template #default="scope">
+                {{ toThousands(scope.row.total) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="评分" prop="score"/>
+            <el-table-column label="风格">
+              <template #default="scope">
+                {{ buildType[scope.row.type] }}
+              </template>
+            </el-table-column>
+            <el-table-column>
+              <template #header>
+                <el-tooltip content="越低越准" effect="light" placement="top">
+                  <span>偏差<el-icon><QuestionFilled/></el-icon></span>
+                </el-tooltip>
+              </template>
+              <template #default="scope">
+                {{ scope.row.skewness }}%
+              </template>
+            </el-table-column>
+            <el-table-column label="时间">
+              <template #default="scope">
+                {{ timePastFormat(Date.now() - scope.row.timestamp * 1000) }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+      </el-row>
+    </el-card>
+  </el-space>
+</template>
+
+<style scoped>
+
+</style>

src/vue/EventsViewer.vue

@@ -4,7 +4,7 @@ import { LoggerKey } from "../ts/class/Logger"
 
 const logger = inject(LoggerKey)
 const loading = ref(true)
-const doFetch = () => fetch("https://www.torn.com/page.php", {
+const doFetch = () => fetch(window.addRFC("https://www.torn.com/page.php?sid=eventsData"), {
   "headers": {
     "accept": "*/*",
     "sec-ch-ua-mobile": "?0",

src/vue/FloatMenu.vue

@@ -3,14 +3,14 @@
     <el-button-group class="wh-menu-button" style="z-index: 1000000;">
       <el-button circle @click="expanded = !expanded">
         <el-icon>
-          <MoonNight />
+          <MoonNight/>
         </el-icon>
       </el-button>
       <el-button v-for="item in globVars.buttons" @click="item.func">{{ item.txt }}</el-button>
       <el-button v-if="editableTabs.length > 0" circle @click="showDrawer">
         <el-badge :value="editableTabs.length" type="primary">
           <el-icon>
-            <CopyDocument />
+            <CopyDocument/>
           </el-icon>
         </el-badge>
       </el-button>
@@ -18,12 +18,12 @@
     <el-dialog v-model="drawer" :fullscreen="isMobilePhone" :lock-scroll="true" width="65%">
       <el-tabs v-model="editableTabsValue" closable style="margin-top: -1em" type="border-card" @tab-remove="removeTab">
         <el-tab-pane v-for="item in editableTabs" :key="item.name" :label="item.title" :name="item.name">
-          <component :is="item.content" />
+          <component :is="item.content"/>
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
     <el-drawer v-model="expanded" :show-close="false" :size="isMobilePhone ? '85%' : '30%'" class="whDrawer"
-      :with-header="false" direction="rtl">
+               :with-header="false" direction="rtl">
       <el-card :body-style="{ 'padding': '0' }" class="innerCard" style="margin-bottom: 0.5em">
         <template #header>
           <div>快捷动作</div>
@@ -69,11 +69,11 @@
               <el-icon>♻️</el-icon>
               <span>REFILL</span>
             </template>
-            <el-menu-item @click="handleRefil('energyrefill2')">能量E
+            <el-menu-item @click="handleRefil('refillEnergy')">能量E
             </el-menu-item>
-            <el-menu-item @click="handleRefil('nerverefill2')">犯罪N
+            <el-menu-item @click="handleRefil('refillNerve')">犯罪N
             </el-menu-item>
-            <el-menu-item @click="handleRefil('casinotokens2')">赌场代币
+            <el-menu-item @click="handleRefil('refillCasinoTokens')">赌场代币
             </el-menu-item>
           </el-sub-menu>
         </el-menu>
@@ -101,13 +101,13 @@
             <el-tooltip content="更新？" placement="bottom-start">
               <el-button link @click="menuClick({ title: '关于助手', template: UpdateDate })">芜湖助手
                 <el-icon>
-                  <Refresh />
+                  <Refresh/>
                 </el-icon>
               </el-button>
             </el-tooltip>
             <el-tag size="small" type="info">{{
-              globVars.version.startsWith('$') ? 'dev' : 'v' + globVars.version
+                globVars.version.startsWith('$') ? 'dev' : 'v' + globVars.version
-            }}
+              }}
             </el-tag>
           </el-col>
         </el-row>
@@ -159,6 +159,7 @@ import QuickCrime from "./QuickCrime.vue"
 import UpdateDate from "./UpdateScript.vue"
 import VirusProgramming from "./VirusProgramming.vue"
 import PropertyVault from "./PropertyVault.vue";
+import BSEstView from "./BSEstView.vue";
 
 const logger = inject(LoggerKey)
 const quickGymTrain = inject(QuickGymTrainKey)
@@ -175,42 +176,6 @@ const menuItemList: MenuItem[] = [
       ElMessage({ message: '毒 CD: ' + cd + 'h', showClose: true })
     },
   },
-  {
-    title: '🍺 喝啤酒',
-    handler: () => {
-      useItem('180')
-      const sidebarData = getSidebarData()
-      const nerve = sidebarData.bars.nerve.amount
-      const cd = (sidebarData.statusIcons.icons.booster_cooldown?.timerExpiresAt - sidebarData.statusIcons.icons.booster_cooldown?.serverTimestamp) / 3600 | 0
-      ElMessage({ message: 'N: ' + nerve + ', CD: ' + cd + 'h', showClose: true })
-    },
-  },
-  // {
-  //   title: '♻️ REFILL',
-  //   handler: () => fetch(window.addRFC("https://www.torn.com/points.php?step=pointsbuy&action=energyrefill2"), {
-  //     "headers": {
-  //       "accept": "text/plain, */*; q=0.01",
-  //       "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/points.php",
-  //     "referrerPolicy": "strict-origin-when-cross-origin",
-  //     "body": null,
-  //     "method": "GET",
-  //     "mode": "cors",
-  //     "credentials": "include"
-  //   })
-  //       .then(res => res.json())
-  //       .then(res => ElMessage({
-  //         message: `<p>${ res.msg }</p><p>剩余refill: ${ res["refills"] }</p>`,
-  //         type: res.state === 'done' ? 'success' : 'error',
-  //         dangerouslyUseHTMLString: true
-  //       }))
-  //       .catch(e => ElMessage.error(e.toString)),
-  // },
   {
     title: '🚓 快速犯罪',
     template: QuickCrime,
@@ -243,6 +208,10 @@ const menuItemList: MenuItem[] = [
     title: '📦 物品',
     template: InventoryView,
   },
+  {
+    title: '🎯 BS估算',
+    template: BSEstView,
+  },
   {
     title: '🫵 关闭店铺(双击开启)',
     handler: () => bazaarControl.method(),
@@ -304,30 +273,39 @@ const editableTabsValue = ref('')
 const editableTabs = shallowRef([])
 
 // refil
-const handleRefil = (method: 'nerverefill2' | 'energyrefill2' | 'casinotokens2') => {
+const handleRefil = (method: 'refillEnergy' | 'refillNerve' | 'refillCasinoTokens') => {
-  fetch(window.addRFC('https://www.torn.com/points.php?step=pointsbuy&action=' + method), {
+  fetch(window.addRFC("https://www.torn.com/page.php?sid=pointsBuildingExchange"), {
     "headers": {
-      "accept": "text/plain, */*; q=0.01",
+      "accept": "*/*",
-      "sec-ch-ua-mobile": "?0",
+      "accept-language": "zh-CN,zh;q=0.9",
       "sec-fetch-dest": "empty",
       "sec-fetch-mode": "cors",
       "sec-fetch-site": "same-origin",
       "x-requested-with": "XMLHttpRequest"
     },
-    "referrer": "https://www.torn.com/points.php",
+    "referrer": "https://www.torn.com/page.php?sid=points",
     "referrerPolicy": "strict-origin-when-cross-origin",
-    "body": null,
+    "body": (() => {
-    "method": "GET",
+      const data = new FormData();
+      data.append('key', method);
+      return data;
+    })(),
+    "method": "POST",
     "mode": "cors",
     "credentials": "include"
   })
-    .then(res => res.json())
+      .then(res => res.json())
-    .then(res => ElMessage({
+      .catch(e => ElMessage.error('REFILL异常: ' + e.toString))
-      message: `<p>${res.msg}</p><p>剩余次数: ${res["refills"]}</p>`,
+      .then(res => {
-      type: res.state === 'done' ? 'success' : 'error',
+        ElMessage({
-      dangerouslyUseHTMLString: true
+          message: res.success ?
-    }))
+              `<p>成功</p><p>剩余次数: ${ res["specialRefills"] }  剩余点数: ${ res['points'] }</p>` :
-    .catch(e => ElMessage.error(e.toString))
+              `REFILL异常: ${ res.error }`,
+          type: res.success ? 'success' : 'error',
+          dangerouslyUseHTMLString: true
+        })
+        throw new TypeError('REFILL异常: ' + res.error)
+      })
 }
 
 // fast travel
@@ -414,25 +392,25 @@ const travelConfirm = (destIndex: number, typeIndex: number) => {
   const destName = travelData[destIndex].cName;
   const typeName = ['普通飞机', 'PI飞机', '股票飞机', '商务飞机(机票或内衣店)'][typeIndex];
   ElMessageBox.confirm(
-    '即将使用「' + typeName + '」飞往「' + destName + '」',
+      '即将使用「' + typeName + '」飞往「' + destName + '」',
-    '确认',
+      '确认',
-    {
+      {
-      confirmButtonText: '好',
-      cancelButtonText: '算了',
-      type: 'info',
-    }
-  )
-    .then(async () => {
-      await quickFlyBtnHandler.directFly(destIndex, typeIndex);
-      ElMessageBox.confirm('是否转跳页面？', '确认', {
         confirmButtonText: '好',
         cancelButtonText: '算了',
-        type: 'info'
+        type: 'info',
       }
-      ).then(() => window.location.href = 'https://www.torn.com')
+  )
-        .catch(() => null);
+      .then(async () => {
-    })
+        await quickFlyBtnHandler.directFly(destIndex, typeIndex);
-    .catch(() => null);
+        ElMessageBox.confirm('是否转跳页面？', '确认', {
+              confirmButtonText: '好',
+              cancelButtonText: '算了',
+              type: 'info'
+            }
+        ).then(() => window.location.href = 'https://www.torn.com')
+            .catch(() => null);
+      })
+      .catch(() => null);
 };
 
 const bazaarControl = {
@@ -442,23 +420,23 @@ const bazaarControl = {
     let response;
     try {
       response = await (await fetch(
-        "https://www.torn.com/bazaar.php?sid=bazaarData&step=" + (isClose ? "closeBazaar" : "openBazaar"),
+          "https://www.torn.com/bazaar.php?sid=bazaarData&step=" + (isClose ? "closeBazaar" : "openBazaar"),
-        {
+          {
-          "headers": {
+            "headers": {
-            "accept": "*/*",
+              "accept": "*/*",
-            "sec-ch-ua-mobile": "?0",
+              "sec-ch-ua-mobile": "?0",
-            "sec-fetch-dest": "empty",
+              "sec-fetch-dest": "empty",
-            "sec-fetch-mode": "cors",
+              "sec-fetch-mode": "cors",
-            "sec-fetch-site": "same-origin",
+              "sec-fetch-site": "same-origin",
-            "x-requested-with": "XMLHttpRequest"
+              "x-requested-with": "XMLHttpRequest"
-          },
+            },
-          "referrer": "https://www.torn.com/bazaar.php",
+            "referrer": "https://www.torn.com/bazaar.php",
-          "referrerPolicy": "strict-origin-when-cross-origin",
+            "referrerPolicy": "strict-origin-when-cross-origin",
-          "body": null,
+            "body": null,
-          "method": "GET",
+            "method": "GET",
-          "mode": "cors",
+            "mode": "cors",
-          "credentials": "include"
+            "credentials": "include"
-        }
+          }
       )).json();
     } catch (e) {
       logger.error(e.stack);

src/vue/MarketHelper.vue

@@ -67,6 +67,7 @@ import { itemNameDict } from "../ts/dictionary/translation";
 import toThousands from "../ts/func/utils/toThousands";
 import Sleep from "../ts/func/utils/Sleep";
 import { MathUtilsKey } from "../ts/class/utils/MathUtils";
+import { timePastFormat } from "../ts/func/utils/timePastFormat";
 
 const logger = inject(LoggerKey);
 const itemHelper = inject(ItemHelperKey);
@@ -90,25 +91,6 @@ const itemOnList = ref<ItemInfo[]>([]);
 const listLoading = ref<boolean>(false);
 const currentTs = ref<number>(Date.now());
 
-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';
-    }
-};
-
 const doGetIMarketList = async (id: number) => {
     itemOnList.value = [];
     listLoading.value = true;

src/vue/QuickCrime.vue

@@ -1,37 +1,62 @@
 <template>
-  <el-space direction="vertical">
+  <!--  <el-row>-->
-    <el-row>
+  <!--    <el-col :span="12">-->
+  <div class="mt-4">
+    <el-space>
       <el-button-group>
         <el-button @click="doCrime(11, 'warehouse')">烧仓库</el-button>
         <el-button @click="doCrime(15, 'napcop')">做15-3</el-button>
         <el-button @click="doCrime(18, 'hackbank')">做18-1</el-button>
       </el-button-group>
-    </el-row>
+      <!--    </el-col>-->
-    <el-row>
+      <!--    <el-col :span="12">-->
-      <el-cascader :options="CrimeData" :show-all-levels="false" clearable v-model="crimeSelected" placeholder="选择其他" />
+      <el-button type="primary" @click="doYouLikeABeer()">🍺 你喜欢啤酒吗</el-button>
-      <el-button :disabled="!(crimeSelected && crimeSelected.length)" @click="doCrime(crimeSelected[0], crimeSelected[1])"
+    </el-space>
-        type="danger" round :icon="Coffee">做</el-button>
+  </div>
-    </el-row>
+  <!--    </el-col>-->
-  </el-space>
+  <!--  </el-row>-->
+  <!--  <el-row>-->
+  <div class="mt-4">
+    <el-space>
+    <el-cascader v-model="crimeSelected" :options="CrimeData" :show-all-levels="false" clearable
+                 placeholder="选择其他"/>
+    <el-button :disabled="!(crimeSelected && crimeSelected.length)"
+               :icon="Coffee"
+               round type="danger" @click="doCrime(crimeSelected[0], crimeSelected[1])">做
+    </el-button>
+    </el-space>
+  </div>
+  <!--  </el-row>-->
+  <div class="mt-4">
+    <el-space>
+    <el-tag type="primary">NERVE {{ nerve }}</el-tag>
+    <el-tag type="danger">CD {{ boostCoolDown }}</el-tag>
+    </el-space>
+  </div>
+  <div v-if="responseHtmlString" v-html="responseHtmlString"></div>
   <div v-if="results" v-html="results"></div>
-  <el-skeleton v-if="loading" :rows="3" animated />
+  <el-skeleton v-if="loading" :rows="3" animated/>
 </template>
 
 <script lang="ts" setup>
-import { Coffee } from "@element-plus/icons-vue";
+import { Coffee } from "@element-plus/icons-vue"
-import { ElMessage } from "element-plus";
+import { inject, onBeforeUnmount, onMounted, ref } from 'vue'
-import { inject, ref } from 'vue';
+import { LoggerKey } from "../ts/class/Logger"
-import { LoggerKey } from "../ts/class/Logger";
+import { CrimeData } from "./data/CrimeData"
-import { CrimeData } from "./data/CrimeData";
+import { useItemSync } from "../ts/func/utils/useItem"
+import getSidebarData from "../ts/func/utils/getSidebarData"
 
-const logger = inject(LoggerKey);
+const logger = inject(LoggerKey)
-const results = ref("");
+const results = ref("")
-const loading = ref(false);
+const loading = ref(false)
 const crimeSelected = ref(null)
+const responseHtmlString = ref('')
+const boostCoolDown = ref(0)
+const nerve = ref(0)
 
 const doCrime = async (nerve, crime: "hackbank" | "warehouse" | 'napcop') => {
-  loading.value = true;
+  loading.value = true
-  results.value = '';
+  results.value = ''
   try {
     results.value = await (await fetch(window.addRFC("https://www.torn.com/crimes.php?step=docrime4&timestamp=" + Date.now()), {
       "headers": {
@@ -45,27 +70,52 @@ const doCrime = async (nerve, crime: "hackbank" | "warehouse" | 'napcop') => {
       },
       "referrer": "https://www.torn.com/crimes.php",
       "referrerPolicy": "strict-origin-when-cross-origin",
-      "body": `nervetake=${nerve}&crime=${crime}`,
+      "body": `nervetake=${ nerve }&crime=${ crime }`,
       "method": "POST",
       "mode": "cors",
       "credentials": "include"
-    })).text();
+    })).text()
   } catch (e) {
-    logger.error(e.stack);
+    logger.error(e.stack)
-    results.value = e.message;
+    results.value = e.message
   }
-  let err;
+  let err: string
   try {
-    err = JSON.parse(results.value).error;
+    err = JSON.parse(results.value).error
   } catch (e) {
   }
   if (err) {
-    results.value = '出错了';
+    results.value = '错误: ' + err
-    ElMessage.error('错误: ' + err);
+    // ElMessage.error('错误: ' + err)
-    logger.error(err);
+    logger.error(err)
   }
-  loading.value = false;
+  loading.value = false
-};
+  updateData()
+}
+
+const doYouLikeABeer = async () => {
+  await useItemSync('180', false, (res) => {
+        responseHtmlString.value = res.text
+        updateData()
+      }
+  )
+}
+
+const updateData = () => {
+  const sidebarData = getSidebarData()
+  nerve.value = sidebarData.bars.nerve.amount
+  boostCoolDown.value = (sidebarData.statusIcons.icons.booster_cooldown?.timerExpiresAt - sidebarData.statusIcons.icons.booster_cooldown?.serverTimestamp) / 3600 | 0
+}
+
+let intervalId = 0
+onMounted(() => {
+  updateData()
+  intervalId = window.setInterval(() => updateData(), 60000)
+})
+
+onBeforeUnmount(() => {
+  if (intervalId) window.clearInterval(intervalId)
+})
 </script>
 
 <style scoped></style>