From ce6e73dfb4d2331c5eb77af3bc43812cfb2bf395 Mon Sep 17 00:00:00 2001 From: star knight <64941905+starknt@users.noreply.github.com> Date: Tue, 19 Nov 2024 01:59:04 +0800 Subject: [PATCH] =?UTF-8?q?upgrade:=20=E6=B8=85=E7=90=86=E5=92=8C=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E4=BE=9D=E8=B5=96=20(#396)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 17 +- eslint.config.js | 28 ++ package.json | 12 +- packages/cli/LICENSE | 373 ++++++++++++++++++ packages/cli/cli.js | 3 + packages/cli/package.json | 23 ++ packages/{core/start => cli/src}/banner.txt | 0 packages/{core/start => cli/src}/index.js | 8 +- packages/{core/start => cli/src}/mitmproxy.js | 2 +- .../{core/start => cli/src}/user_config.json5 | 0 packages/core/.babelrc | 3 - packages/core/.eslintignore | 1 - packages/core/package.json | 60 +-- packages/core/src/utils/util.log.js | 15 +- packages/core/src/utils/util.logger.js | 30 ++ packages/gui/babel.config.js | 2 +- packages/gui/package.json | 63 +-- packages/gui/src/background.js | 2 +- packages/gui/src/utils/util.log.js | 16 +- packages/gui/src/view/App.vue | 2 +- packages/gui/vue.config.js | 8 +- packages/mitmproxy/package.json | 57 +-- packages/mitmproxy/src/lib/choice/index.js | 9 +- packages/mitmproxy/src/lib/dns/base.js | 9 +- .../mitmproxy/src/lib/proxy/tls/tlsUtils.js | 4 +- packages/mitmproxy/src/utils/util.log.js | 12 +- 26 files changed, 535 insertions(+), 224 deletions(-) create mode 100644 eslint.config.js create mode 100644 packages/cli/LICENSE create mode 100755 packages/cli/cli.js create mode 100644 packages/cli/package.json rename packages/{core/start => cli/src}/banner.txt (100%) rename packages/{core/start => cli/src}/index.js (78%) rename packages/{core/start => cli/src}/mitmproxy.js (94%) rename packages/{core/start => cli/src}/user_config.json5 (100%) delete mode 100644 packages/core/.babelrc delete mode 100644 packages/core/.eslintignore create mode 100644 packages/core/src/utils/util.logger.js diff --git a/README.md b/README.md index d5178ca..39170af 100644 --- a/README.md +++ b/README.md @@ -347,18 +347,14 @@ npm config delete https-proxy #### 1）安装 `nodejs` -推荐安装 nodejs `16.x.x` 的版本，其他版本未做测试 +推荐安装 nodejs `22.x.x` 的版本，其他版本未做测试 -#### 2）安装 `lerna` +#### 2）安装 `pnpm` 运行如下命令即可安装所需依赖： -> 注：lerna指定为6.x版本，更高版本会导致打包失败（不兼容导致） - ```shell -npm install -g cnpm --registry=https://registry.npmmirror.com - -cnpm install -g lerna@6 +npm install -g pnpm --registry=https://registry.npmmirror.com ``` @@ -372,11 +368,8 @@ git clone https://github.com/docmirror/dev-sidecar cd dev-sidecar -# 注意不要使用 `npm install` 来安装依赖，因为 `lerna bootstrap` 会自动安装依赖 -lerna bootstrap -# 如果 `lerna bootstrap` 有报错，可以尝试执行如下两行命令，用yarn替换掉npm： -#cnpm install -g yarn -#lerna bootstrap --npm-client=yarn +# 注意不要使用 `npm install` 来安装依赖，因为 `pnpm` 会自动安装依赖 +pnpm install # 运行DevSidecar cd packages/gui diff --git a/eslint.config.js b/eslint.config.js new file mode 100644 index 0000000..46f5abf --- /dev/null +++ b/eslint.config.js @@ -0,0 +1,28 @@ +import antfu from '@antfu/eslint-config' + +export default antfu( + { + vue: { + vueVersion: 2, + }, + rules: { + 'style/brace-style': ['error', '1tbs'], + 'style/space-before-function-paren': ['error', 'always'], + 'import/newline-after-import': 'off', + 'import/first': 'off', + 'perfectionist/sort-imports': 'off', + 'node/prefer-global/buffer': 'off', + 'node/prefer-global/process': 'off', + 'no-console': 'off', + }, + ignores: [ + '**/build/*', + '**/dist_electron', + ], + formatters: { + css: true, + html: true, + markdown: 'prettier', + }, + }, +) diff --git a/package.json b/package.json index e98972b..cd139d1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,17 @@ { "name": "dev-sidecar-parent", + "type": "module", "private": false, "packageManager": "pnpm@9.13.2", "author": "Greper", - "license": "MPL-2.0" + "license": "MPL-2.0", + "scripts": { + "lint": "eslint .", + "lint:fix": "eslint . --fix" + }, + "devDependencies": { + "@antfu/eslint-config": "^3.9.1", + "eslint": "^9.15.0", + "eslint-plugin-format": "^0.1.2" + } } diff --git a/packages/cli/LICENSE b/packages/cli/LICENSE new file mode 100644 index 0000000..a612ad9 --- /dev/null +++ b/packages/cli/LICENSE @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/packages/cli/cli.js b/packages/cli/cli.js new file mode 100755 index 0000000..8fa39e7 --- /dev/null +++ b/packages/cli/cli.js @@ -0,0 +1,3 @@ +#!/usr/bin/env node + +require('./src') diff --git a/packages/cli/package.json b/packages/cli/package.json new file mode 100644 index 0000000..24e5bea --- /dev/null +++ b/packages/cli/package.json @@ -0,0 +1,23 @@ +{ + "name": "@docmirror/dev-sidecar-cli", + "version": "1.8.9", + "private": false, + "description": "给开发者的加速代理工具", + "author": "docmirror.cn", + "license": "MPL-2.0", + "keywords": [ + "dev-sidecar", + "github加速", + "google加速", + "代理" + ], + "main": "src/index.js", + "bin": "./cli.js", + "scripts": { + "start": "node ./src" + }, + "dependencies": { + "@docmirror/dev-sidecar": "workspace:*", + "@docmirror/mitmproxy": "workspace:*" + } +} diff --git a/packages/core/start/banner.txt b/packages/cli/src/banner.txt similarity index 100% rename from packages/core/start/banner.txt rename to packages/cli/src/banner.txt diff --git a/packages/core/start/index.js b/packages/cli/src/index.js similarity index 78% rename from packages/core/start/index.js rename to packages/cli/src/index.js index 125e4be..ac7a269 100644 --- a/packages/core/start/index.js +++ b/packages/cli/src/index.js @@ -1,14 +1,14 @@ const fs = require('node:fs') -const DevSidecar = require('../index') +const DevSidecar = require('@docmirror/dev-sidecar') const jsonApi = require('@docmirror/mitmproxy/src/json') // 启动服务 -const mitmproxyPath = './start/mitmproxy' +const mitmproxyPath = './mitmproxy' async function startup () { - const banner = fs.readFileSync('./start/banner.txt') + const banner = fs.readFileSync('./banner.txt') console.log(banner.toString()) - const configPath = './start/user_config.json5' + const configPath = './user_config.json5' if (fs.existsSync(configPath)) { const file = fs.readFileSync(configPath) const userConfig = jsonApi.parse(file.toString()) diff --git a/packages/core/start/mitmproxy.js b/packages/cli/src/mitmproxy.js similarity index 94% rename from packages/core/start/mitmproxy.js rename to packages/cli/src/mitmproxy.js index a86035d..f02a1df 100644 --- a/packages/core/start/mitmproxy.js +++ b/packages/cli/src/mitmproxy.js @@ -2,7 +2,7 @@ const fs = require('node:fs') const path = require('node:path') const server = require('@docmirror/mitmproxy') const jsonApi = require('@docmirror/mitmproxy/src/json') -const log = require('../src/utils/util.log') +const log = require('@docmirror/mitmproxy/src/utils/util.log') const home = process.env.USER_HOME || process.env.HOME || 'C:/Users/Administrator/' diff --git a/packages/core/start/user_config.json5 b/packages/cli/src/user_config.json5 similarity index 100% rename from packages/core/start/user_config.json5 rename to packages/cli/src/user_config.json5 diff --git a/packages/core/.babelrc b/packages/core/.babelrc deleted file mode 100644 index ae733f4..0000000 --- a/packages/core/.babelrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "presets": ["es2020","stage-4"] -} \ No newline at end of file diff --git a/packages/core/.eslintignore b/packages/core/.eslintignore deleted file mode 100644 index 3d9ba84..0000000 --- a/packages/core/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -./src/test diff --git a/packages/core/package.json b/packages/core/package.json index 587e942..629e825 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -13,71 +13,19 @@ ], "main": "src/index.js", "scripts": { - "start": "node ./start", "test": "mocha" }, "dependencies": { - "@docmirror/mitmproxy": "workspace:*", - "agentkeepalive": "^2.1.1", - "babel-preset-es2020": "^1.0.2", - "charset": "^1.0.0", - "child_process": "^1.0.2", - "colors": "^1.1.2", - "commander": "^2.9.0", - "debug": "^4.1.1", - "dns-over-http": "^0.2.0", - "dns-over-tls": "^0.0.8", "fix-path": "^3.0.0", - "iconv-lite": "^0.4.13", - "is-browser": "^2.1.0", - "jschardet": "^1.4.1", - "json5": "^2.2.3", + "iconv-lite": "^0.6.3", "lodash": "^4.17.20", - "log4js": "^6.3.0", - "lru-cache": "^6.0.0", - "mkdirp": "^0.5.1", - "node-cmd": "^3.0.0", - "node-forge": "^0.8.2", + "log4js": "^6.9.1", "node-powershell": "^4.0.0", - "require-context": "^1.1.0", "spawn-sync": "^2.0.0", - "through2": "^2.0.1", - "tunnel-agent": "^0.4.3", - "util": "^0.12.3", - "validator": "^13.1.17", - "winreg": "^1.2.4" + "winreg": "^1.2.5" }, "devDependencies": { - "@vue/cli-plugin-eslint": "^4.5.0", - "@vue/eslint-config-standard": "^5.1.2", - "babel-eslint": "^10.1.0", "chai": "^4.3.4", - "eslint": "^6.7.2", - "eslint-plugin-import": "^2.20.2", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-promise": "^4.2.1", - "eslint-plugin-standard": "^4.0.0", - "eslint-plugin-vue": "^6.2.2", "mocha": "^8.2.1" - }, - "eslintConfig": { - "root": true, - "env": { - "node": true - }, - "extends": [ - "plugin:vue/essential", - "@vue/standard" - ], - "parserOptions": { - "parser": "babel-eslint" - }, - "rules": {} - }, - "browserslist": [ - "> 1%", - "last 2 versions", - "not dead" - ], - "gitHead": "30ecf21cb001fb8d821e575d476ca0ffb4ff086e" + } } diff --git a/packages/core/src/utils/util.log.js b/packages/core/src/utils/util.log.js index 306d04c..20e1078 100644 --- a/packages/core/src/utils/util.log.js +++ b/packages/core/src/utils/util.log.js @@ -1,17 +1,4 @@ -const path = require('path') -const log4js = require('log4js') -const config = require('../config/index') +const log4js = require('./util.logger') -const level = process.env.NODE_ENV === 'development' ? 'debug' : 'info' - -function getDefaultConfigBasePath () { - return config.server.setting.userBasePath -} - -const filename = path.join(getDefaultConfigBasePath(), '/logs/core.log') -log4js.configure({ - appenders: { std: { type: 'stdout' }, file: { type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename } }, - categories: { default: { appenders: ['file', 'std'], level } }, -}) const logger = log4js.getLogger('core') module.exports = logger diff --git a/packages/core/src/utils/util.logger.js b/packages/core/src/utils/util.logger.js new file mode 100644 index 0000000..6d15c06 --- /dev/null +++ b/packages/core/src/utils/util.logger.js @@ -0,0 +1,30 @@ +const path = require('node:path') +const log4js = require('log4js') +const config = require('../config/index') + +const level = process.env.NODE_ENV === 'development' ? 'debug' : 'info' + +function getDefaultConfigBasePath () { + return config.server.setting.userBasePath +} + +const coreLogFilename = path.join(getDefaultConfigBasePath(), '/logs/core.log') +const guiLogFilename = path.join(getDefaultConfigBasePath(), '/logs/gui.log') +const serverLogFilename = path.join(getDefaultConfigBasePath(), '/logs/server.log') + +log4js.configure({ + appenders: { + std: { type: 'stdout' }, + core: { type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename: coreLogFilename }, + gui: { type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename: guiLogFilename }, + server: { level: 'debug', type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename: serverLogFilename }, + }, + categories: { + default: { appenders: ['std'], level }, + core: { appenders: ['core', 'std'], level }, + gui: { appenders: ['gui', 'std'], level }, + server: { appenders: ['server', 'std'], level }, + }, +}) + +module.exports = log4js diff --git a/packages/gui/babel.config.js b/packages/gui/babel.config.js index df19538..0a932f1 100644 --- a/packages/gui/babel.config.js +++ b/packages/gui/babel.config.js @@ -1,5 +1,5 @@ module.exports = { presets: [ - '@vue/cli-plugin-babel/preset', + '@vue/babel-preset-jsx', ], } diff --git a/packages/gui/package.json b/packages/gui/package.json index 145f67d..6e963d0 100644 --- a/packages/gui/package.json +++ b/packages/gui/package.json @@ -8,7 +8,6 @@ }, "license": "MPL-2.0", "homepage": "https://github.com/docmirror/dev-sidecar", - "main": "background.js", "scripts": { "serve": "vue-cli-service serve", "lint": "vue-cli-service lint", @@ -25,67 +24,35 @@ "@docmirror/mitmproxy": "workspace:*", "@mihomo-party/sysproxy": "^2.0.4", "@natmri/platform-napi": "^0.0.7", - "adm-zip": "^0.5.5", - "ant-design-vue": "^1.6.5", - "compressing": "^1.5.1", - "core-js": "^3.6.5", + "adm-zip": "^0.5.16", + "ant-design-vue": "^1.7.8", "electron-baidu-tongji": "^1.0.5", - "electron-reload": "^1.5.0", - "electron-store": "^6.0.1", "electron-sudo": "^4.0.12", - "electron-updater": "^4.3.5", - "es-abstract": "^1.17.7", - "extract-zip": "^2.0.1", - "iconv-lite": "^0.6.2", + "electron-updater": "^6.3.9", "json5": "^2.2.3", "lodash": "^4.17.20", - "log4js": "^6.3.0", "request-progress": "^3.0.0", - "sass": "^1.27.1", - "sass-loader": "^10.0.4", - "vue": "^2.6.11", + "sass": "^1.81.0", + "sass-loader": "^16.0.3", + "vue": "^2.7.16", "vue-json-editor-fix-cn": "^1.4.3", - "vue-router": "^3.4.8" + "vue-router": "^3.6.5" }, "devDependencies": { - "@vue/cli-plugin-babel": "^4.5.0", - "@vue/cli-plugin-eslint": "^4.5.0", - "@vue/cli-service": "^4.5.0", - "@vue/eslint-config-standard": "^5.1.2", - "babel-eslint": "^10.1.0", - "electron": "^17.4.11", + "@babel/plugin-syntax-jsx": "^7.25.9", + "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0", + "@vue/babel-preset-jsx": "^1.4.0", + "@vue/cli-plugin-babel": "^5.0.8", + "@vue/cli-service": "^5.0.8", + "electron": "^19.1.9", "electron-builder": "^25.0.6", - "electron-devtools-installer": "^3.1.0", "electron-icon-builder": "^2.0.1", - "eslint": "^6.7.2", - "eslint-plugin-import": "^2.20.2", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-promise": "^4.2.1", - "eslint-plugin-standard": "^4.0.0", - "eslint-plugin-vue": "^6.2.2", "json5-loader": "^4.0.1", - "vue-cli-plugin-electron-builder": "^2.1.1", - "vue-template-compiler": "^2.6.11" - }, - "eslintConfig": { - "root": true, - "env": { - "node": true - }, - "extends": [ - "plugin:vue/essential", - "@vue/standard" - ], - "parserOptions": { - "parser": "babel-eslint" - }, - "rules": {} + "vue-cli-plugin-electron-builder": "^3.0.0-alpha.4" }, "browserslist": [ "> 1%", "last 2 versions", "not dead" - ], - "__npminstall_done": false, - "gitHead": "30ecf21cb001fb8d821e575d476ca0ffb4ff086e" + ] } diff --git a/packages/gui/src/background.js b/packages/gui/src/background.js index bbd30a3..00af78b 100644 --- a/packages/gui/src/background.js +++ b/packages/gui/src/background.js @@ -372,7 +372,7 @@ if (app.getLoginItemSettings().wasOpenedAsHidden) { startHideWindow = false } } -log.info('start hide window:', startHideWindow, ', app.getLoginItemSettings() = ', jsonApi.stringify2(app.getLoginItemSettings())) +log.info('startHideWindow = ', startHideWindow, ', app.getLoginItemSettings() = ', jsonApi.stringify2(app.getLoginItemSettings())) // 禁止双开 const isFirstInstance = app.requestSingleInstanceLock() diff --git a/packages/gui/src/utils/util.log.js b/packages/gui/src/utils/util.log.js index a744d88..cdf77c9 100644 --- a/packages/gui/src/utils/util.log.js +++ b/packages/gui/src/utils/util.log.js @@ -1,17 +1,5 @@ -const path = require('path') -const DevSidecar = require('@docmirror/dev-sidecar') -const log4js = require('log4js') +const log4js = require('@docmirror/dev-sidecar/src/utils/util.logger') -const level = process.env.NODE_ENV === 'development' ? 'debug' : 'info' - -const getDefaultConfigBasePath = function () { - return DevSidecar.api.config.get().server.setting.userBasePath -} - -const filename = path.join(getDefaultConfigBasePath(), '/logs/gui.log') -log4js.configure({ - appenders: { std: { type: 'stdout' }, file: { type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename } }, - categories: { default: { appenders: ['file', 'std'], level } }, -}) const logger = log4js.getLogger('gui') + module.exports = logger diff --git a/packages/gui/src/view/App.vue b/packages/gui/src/view/App.vue index 2e0d1ea..e58fb93 100644 --- a/packages/gui/src/view/App.vue +++ b/packages/gui/src/view/App.vue @@ -119,7 +119,7 @@ body { padding: 5px; border-bottom: #eee solid 1px; height: 60px; - background-image: url('/logo/logo-lang.svg'); + background-image: url('../../public/logo/logo-lang.svg'); background-size: auto 50px; background-repeat: no-repeat; background-position: 5px center; diff --git a/packages/gui/vue.config.js b/packages/gui/vue.config.js index dcc7f25..20a833f 100644 --- a/packages/gui/vue.config.js +++ b/packages/gui/vue.config.js @@ -1,11 +1,12 @@ const path = require('node:path') +const { defineConfig } = require('@vue/cli-service') const webpack = require('webpack') const publishUrl = process.env.VUE_APP_PUBLISH_URL const publishProvider = process.env.VUE_APP_PUBLISH_PROVIDER console.log('Publish url:', publishUrl) -module.exports = { +module.exports = defineConfig({ pages: { index: { entry: 'src/main.js', @@ -32,6 +33,9 @@ module.exports = { }, pluginOptions: { electronBuilder: { + mainProcessFile: './src/background.js', + // Ref: https://github.com/nklayman/vue-cli-plugin-electron-builder/issues/1891 + customFileProtocol: './', externals: [ '@mihomo-party/sysproxy', '@mihomo-party/sysproxy-win32-ia32-msvc', @@ -111,4 +115,4 @@ module.exports = { }, }, }, -} +}) diff --git a/packages/mitmproxy/package.json b/packages/mitmproxy/package.json index 2e921ad..f5a17cf 100644 --- a/packages/mitmproxy/package.json +++ b/packages/mitmproxy/package.json @@ -11,61 +11,22 @@ "main": "src/index.js", "scripts": {}, "dependencies": { - "agentkeepalive": "^2.1.1", - "axios": "^0.21.1", + "@docmirror/dev-sidecar": "workspace:*", + "agentkeepalive": "^4.5.0", + "axios": "^1.7.7", "baidu-aip-sdk": "^4.16.16", - "child_process": "^1.0.2", - "colors": "^1.1.2", - "commander": "^2.9.0", - "crypto-js": "^4.0.0", - "debug": "^4.1.1", "dns-over-http": "^0.2.0", "dns-over-tls": "^0.0.9", "is-browser": "^2.1.0", "json5": "^2.2.3", "lodash": "^4.17.20", - "log4js": "^6.3.0", - "lru-cache": "^6.0.0", - "mkdirp": "^0.5.1", - "node-cmd": "^3.0.0", - "node-forge": "^0.8.2", - "require-context": "^1.1.0", + "lru-cache": "^7.15.0", + "node-forge": "^1.3.1", "stream-throttle": "^0.1.3", - "through2": "^2.0.1", - "tunnel-agent": "^0.4.3", - "util": "^0.12.3", - "validator": "^13.1.17" + "through2": "^4.0.2", + "tunnel-agent": "^0.6.0" }, "devDependencies": { - "@vue/cli-plugin-babel": "^4.5.0", - "@vue/cli-plugin-eslint": "^4.5.0", - "@vue/eslint-config-standard": "^5.1.2", - "babel-eslint": "^10.1.0", - "eslint": "^6.7.2", - "eslint-plugin-import": "^2.20.2", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-promise": "^4.2.1", - "eslint-plugin-standard": "^4.0.0", - "eslint-plugin-vue": "^6.2.2" - }, - "eslintConfig": { - "root": true, - "env": { - "node": true - }, - "extends": [ - "plugin:vue/essential", - "@vue/standard" - ], - "parserOptions": { - "parser": "babel-eslint" - }, - "rules": {} - }, - "browserslist": [ - "> 1%", - "last 2 versions", - "not dead" - ], - "gitHead": "30ecf21cb001fb8d821e575d476ca0ffb4ff086e" + "crypto-js": "^4.2.0" + } } diff --git a/packages/mitmproxy/src/lib/choice/index.js b/packages/mitmproxy/src/lib/choice/index.js index 701dbd8..734fc94 100644 --- a/packages/mitmproxy/src/lib/choice/index.js +++ b/packages/mitmproxy/src/lib/choice/index.js @@ -1,11 +1,16 @@ -const LRU = require('lru-cache') +const LRUCache = require('lru-cache') const log = require('../../utils/util.log') const cacheSize = 1024 class ChoiceCache { constructor () { - this.cache = new LRU(cacheSize) + this.cache = new LRUCache({ + maxSize: cacheSize, + sizeCalculation: () => { + return 1 + }, + }) } get (key) { diff --git a/packages/mitmproxy/src/lib/dns/base.js b/packages/mitmproxy/src/lib/dns/base.js index 46c74b0..d2dcf48 100644 --- a/packages/mitmproxy/src/lib/dns/base.js +++ b/packages/mitmproxy/src/lib/dns/base.js @@ -1,4 +1,4 @@ -const LRU = require('lru-cache') +const LRUCache = require('lru-cache') const log = require('../../utils/util.log') const { DynamicChoice } = require('../choice/index') @@ -23,7 +23,12 @@ class IpCache extends DynamicChoice { module.exports = class BaseDNS { constructor () { - this.cache = new LRU(cacheSize) + this.cache = new LRUCache({ + maxSize: cacheSize, + sizeCalculation: () => { + return 1 + }, + }) } count (hostname, ip, isError = true) { diff --git a/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js b/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js index d2df029..d2efe3e 100644 --- a/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js +++ b/packages/mitmproxy/src/lib/proxy/tls/tlsUtils.js @@ -1,7 +1,6 @@ const fs = require('node:fs') const path = require('node:path') const _ = require('lodash') -const mkdirp = require('mkdirp') const forge = require('node-forge') const log = require('../../../utils/util.log') const config = require('../common/config') @@ -253,8 +252,7 @@ utils.initCA = function ({ caCertPath, caKeyPath }) { const certPem = pki.certificateToPem(caCert) const keyPem = pki.privateKeyToPem(cakey) - - mkdirp.sync(path.dirname(caCertPath)) + fs.mkdirSync(path.dirname(caCertPath), { recursive: true }) fs.writeFileSync(caCertPath, certPem) fs.writeFileSync(caKeyPath, keyPem) log.info('生成证书文件成功，共2个文件:', caCertPath, caKeyPath) diff --git a/packages/mitmproxy/src/utils/util.log.js b/packages/mitmproxy/src/utils/util.log.js index c9117f9..cb9a3e4 100644 --- a/packages/mitmproxy/src/utils/util.log.js +++ b/packages/mitmproxy/src/utils/util.log.js @@ -1,13 +1,5 @@ -const path = require('path') -const log4js = require('log4js') -const proxyConfig = require('../lib/proxy/common/config') +const log4js = require('@docmirror/dev-sidecar/src/utils/util.logger') -const level = process.env.NODE_ENV === 'development' ? 'debug' : 'info' - -const filename = path.join(proxyConfig.getDefaultCABasePath(), '/logs/server.log') -log4js.configure({ - appenders: { std: { type: 'stdout', level: 'debug' }, file: { level: 'debug', type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename } }, - categories: { default: { appenders: ['file', 'std'], level } }, -}) const logger = log4js.getLogger('server') + module.exports = logger