Compare commits
109 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1a7b3c7294 | ||
|
|
4678fc7dde | ||
|
|
9f492fad49 | ||
|
|
bd0a959e18 | ||
|
|
dd605e2610 | ||
|
|
9910f6b817 | ||
|
|
991897aff4 | ||
|
|
3cde019208 | ||
|
|
2f6efbed63 | ||
|
|
5cff4e299b | ||
|
|
bce33639da | ||
|
|
366c465cad | ||
|
|
acc6e05bdc | ||
|
|
4ce15577cd | ||
|
|
98fa4d5e65 | ||
|
|
7fe94076c7 | ||
|
|
b8b0c8fa63 | ||
|
|
e585e87bec | ||
|
|
6a4924bb16 | ||
|
|
ab0d516d91 | ||
|
|
b756ae39d0 | ||
|
|
c15c38ea8f | ||
|
|
743963318f | ||
|
|
ed3fc50858 | ||
|
|
5b886fe6be | ||
|
|
7074bbc405 | ||
|
|
ef314c1707 | ||
|
|
a3e7626dd9 | ||
|
|
5cb5d74eed | ||
|
|
6eee10d46d | ||
|
|
2d95f2b0d6 | ||
|
|
ec41bb9c70 | ||
|
|
2d1780b1cf | ||
|
|
d9ce99887c | ||
|
|
9b9cc90414 | ||
|
|
c1eb539a5c | ||
|
|
e1793f57ef | ||
|
|
dbd09a8743 | ||
|
|
0d189ca617 | ||
|
|
dc9bcc40ee | ||
|
|
4991f7ff39 | ||
|
|
a393b8b122 | ||
|
|
c73b354386 | ||
|
|
392ecee3ff | ||
|
|
bae721c49e | ||
|
|
4e806e21a6 | ||
|
|
ec0fdf83b2 | ||
|
|
cb94d8414f | ||
|
|
8890051c17 | ||
|
|
cf00c9476f | ||
|
|
b2a24c7abd | ||
|
|
732a1f4694 | ||
|
|
4c5aa7084e | ||
|
|
fe1fea671c | ||
|
|
04c754c0ac | ||
|
|
754c22c84e | ||
|
|
629331870b | ||
|
|
78774315cb | ||
|
|
36b9c07928 | ||
|
|
40a818630d | ||
|
|
568511a4cf | ||
|
|
109fb39e09 | ||
|
|
68450d2042 | ||
|
|
8a052bbed6 | ||
|
|
3afbb56640 | ||
|
|
c0ad84a491 | ||
|
|
c72f17605c | ||
|
|
42fbee0cdb | ||
|
|
e9b7ec735f | ||
|
|
743788135f | ||
|
|
8ea3e6fa26 | ||
|
|
f23c83e681 | ||
|
|
b615bda17e | ||
|
|
f7c7cd1d3c | ||
|
|
c7e7be4379 | ||
|
|
d63d49f246 | ||
|
|
dad94edb20 | ||
|
|
7108d5f3ab | ||
|
|
ef47a74920 | ||
|
|
a43dab8057 | ||
|
|
f44039b628 | ||
|
|
08fa5205b0 | ||
|
|
b91daebd92 | ||
|
|
9cd6c5c624 | ||
|
|
650e017b72 | ||
|
|
18f9d6dec5 | ||
|
|
4df6571ad9 | ||
|
|
0f5923a10a | ||
|
|
bcdae1169e | ||
|
|
f260d5df49 | ||
|
|
808b861dd1 | ||
|
|
17f1c487a8 | ||
|
|
8dc2c1a38f | ||
|
|
220a494692 | ||
|
|
db6bc10196 | ||
|
|
1880363aeb | ||
|
|
19c7b59883 | ||
|
|
749df89229 | ||
|
|
444f2172fa | ||
|
|
77a77c0ea7 | ||
|
|
dbf380a0d1 | ||
|
|
ade34f5217 | ||
|
|
e89607799a | ||
|
|
d05d8d6a9e | ||
|
|
b6aa50d3dc | ||
|
|
9df361935f | ||
|
|
98b8a122b6 | ||
|
|
c7232522ee | ||
|
|
5280f1d745 |
25
.github/workflows/ci.yml
vendored
25
.github/workflows/ci.yml
vendored
@@ -10,7 +10,7 @@ jobs:
|
|||||||
release:
|
release:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [windows-latest, macos-11]
|
os: [windows-latest, ubuntu-latest, macos-latest]
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
if: |
|
if: |
|
||||||
startsWith(github.repository, 'zzzgydi') &&
|
startsWith(github.repository, 'zzzgydi') &&
|
||||||
@@ -34,6 +34,12 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
node-version: 14
|
node-version: 14
|
||||||
|
|
||||||
|
- name: Install Dependencies (ubuntu only)
|
||||||
|
if: matrix.os == 'ubuntu-latest'
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
|
||||||
|
|
||||||
- name: Get yarn cache dir path
|
- name: Get yarn cache dir path
|
||||||
id: yarn-cache-dir-path
|
id: yarn-cache-dir-path
|
||||||
run: echo "::set-output name=dir::$(yarn cache dir)"
|
run: echo "::set-output name=dir::$(yarn cache dir)"
|
||||||
@@ -53,9 +59,9 @@ jobs:
|
|||||||
yarn run check
|
yarn run check
|
||||||
|
|
||||||
- name: Tauri build
|
- name: Tauri build
|
||||||
uses: tauri-apps/tauri-action@b9ce5d7dc68082d21d30a60103b0ab8c5ddae3a1
|
uses: tauri-apps/tauri-action@0e558392ccadcb49bcc89e7df15a400e8f0c954d
|
||||||
# enable cache even though failed
|
# enable cache even though failed
|
||||||
continue-on-error: true
|
# continue-on-error: true
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
||||||
@@ -63,13 +69,20 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
tagName: v__VERSION__
|
tagName: v__VERSION__
|
||||||
releaseName: "Clash Verge v__VERSION__"
|
releaseName: "Clash Verge v__VERSION__"
|
||||||
releaseBody: "Clash Verge now supports Windows and macos."
|
releaseBody: "More new features are now supported."
|
||||||
releaseDraft: false
|
releaseDraft: false
|
||||||
prerelease: true
|
prerelease: true
|
||||||
|
|
||||||
|
- name: Green zip bundle
|
||||||
|
if: matrix.os == 'windows-latest'
|
||||||
|
run: |
|
||||||
|
yarn run green
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
release-update:
|
release-update:
|
||||||
needs: release
|
needs: release
|
||||||
runs-on: macos-11
|
runs-on: macos-latest
|
||||||
if: |
|
if: |
|
||||||
startsWith(github.repository, 'zzzgydi') &&
|
startsWith(github.repository, 'zzzgydi') &&
|
||||||
startsWith(github.ref, 'refs/tags/v')
|
startsWith(github.ref, 'refs/tags/v')
|
||||||
@@ -91,7 +104,7 @@ jobs:
|
|||||||
${{ runner.os }}-yarn-
|
${{ runner.os }}-yarn-
|
||||||
|
|
||||||
- name: Yarn install
|
- name: Yarn install
|
||||||
run: yarn
|
run: yarn install
|
||||||
|
|
||||||
- name: Release update.json
|
- name: Release update.json
|
||||||
run: yarn run release
|
run: yarn run release
|
||||||
|
|||||||
18
README.md
18
README.md
@@ -11,7 +11,17 @@ A <a href="https://github.com/Dreamacro/clash">Clash</a> GUI based on <a href="h
|
|||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
Now it's no different from the others, maybe fewer. (WIP)
|
- Full `clash` config supported, Partial `clash premium` config supported.
|
||||||
|
- Profiles management and enhancement (by yaml and Javascript).
|
||||||
|
- System proxy setting and guard.
|
||||||
|
|
||||||
|
## Install
|
||||||
|
|
||||||
|
Download from [release](https://github.com/zzzgydi/clash-verge/releases). Supports Windows x64, Linux x86_64 and macOS 11+
|
||||||
|
|
||||||
|
Or you can build it yourself. Supports Windows, Linux and macOS 10.15+
|
||||||
|
|
||||||
|
Notes: If you could not start the app on Windows, please check that you have [Webview2](https://developer.microsoft.com/en-us/microsoft-edge/webview2/#download-section) installed.
|
||||||
|
|
||||||
## Development
|
## Development
|
||||||
|
|
||||||
@@ -33,6 +43,12 @@ Then run
|
|||||||
yarn dev
|
yarn dev
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Or you can build it
|
||||||
|
|
||||||
|
```shell
|
||||||
|
yarn build
|
||||||
|
```
|
||||||
|
|
||||||
## Todos
|
## Todos
|
||||||
|
|
||||||
> This keng is a little big...
|
> This keng is a little big...
|
||||||
|
|||||||
46
UPDATELOG.md
Normal file
46
UPDATELOG.md
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
## v0.0.25
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- update clash core version
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- app updater error
|
||||||
|
- display window controllers on Linux
|
||||||
|
|
||||||
|
### Notes
|
||||||
|
|
||||||
|
If you can't update the app properly, please consider downloading the latest version from github release.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## v0.0.24
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- Connections page
|
||||||
|
- add wintun.dll (Windows)
|
||||||
|
- supports create local profile with selected file (Windows)
|
||||||
|
- system tray enable set system proxy
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- open dir error
|
||||||
|
- auto launch path (Windows)
|
||||||
|
- fix some clash config error
|
||||||
|
- reduce the impact of the enhanced mode
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## v0.0.23
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- i18n supports
|
||||||
|
- Remote profile User Agent supports
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- clash config file case ignore
|
||||||
|
- clash `external-controller` only port
|
||||||
26
package.json
26
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "clash-verge",
|
"name": "clash-verge",
|
||||||
"version": "0.0.18",
|
"version": "0.0.25",
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "tauri dev",
|
"dev": "tauri dev",
|
||||||
@@ -10,29 +10,33 @@
|
|||||||
"web:build": "tsc && vite build",
|
"web:build": "tsc && vite build",
|
||||||
"web:serve": "vite preview",
|
"web:serve": "vite preview",
|
||||||
"check": "node scripts/check.mjs",
|
"check": "node scripts/check.mjs",
|
||||||
|
"green": "node scripts/green.mjs",
|
||||||
"publish": "node scripts/publish.mjs",
|
"publish": "node scripts/publish.mjs",
|
||||||
"release": "node scripts/release.mjs",
|
"release": "node scripts/release.mjs",
|
||||||
"prepare": "husky install"
|
"prepare": "husky install"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/react": "^11.7.0",
|
"@emotion/react": "^11.8.1",
|
||||||
"@emotion/styled": "^11.6.0",
|
"@emotion/styled": "^11.8.1",
|
||||||
"@mui/icons-material": "^5.4.1",
|
"@mui/icons-material": "^5.4.4",
|
||||||
"@mui/material": "^5.4.1",
|
"@mui/material": "^5.4.4",
|
||||||
"@tauri-apps/api": "^1.0.0-rc.1",
|
"@tauri-apps/api": "^1.0.0-rc.2",
|
||||||
"ahooks": "^3.1.9",
|
"ahooks": "^3.1.13",
|
||||||
"axios": "^0.26.0",
|
"axios": "^0.26.0",
|
||||||
"dayjs": "^1.10.7",
|
"dayjs": "^1.10.8",
|
||||||
|
"i18next": "^21.6.14",
|
||||||
"react": "^17.0.2",
|
"react": "^17.0.2",
|
||||||
"react-dom": "^17.0.2",
|
"react-dom": "^17.0.2",
|
||||||
"react-router-dom": "^6.2.1",
|
"react-i18next": "^11.15.6",
|
||||||
|
"react-router-dom": "^6.2.2",
|
||||||
"react-virtuoso": "^2.7.0",
|
"react-virtuoso": "^2.7.0",
|
||||||
"recoil": "^0.6.1",
|
"recoil": "^0.6.1",
|
||||||
|
"snarkdown": "^2.0.0",
|
||||||
"swr": "^1.2.1"
|
"swr": "^1.2.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@actions/github": "^5.0.0",
|
"@actions/github": "^5.0.0",
|
||||||
"@tauri-apps/cli": "^1.0.0-rc.5",
|
"@tauri-apps/cli": "^1.0.0-rc.7",
|
||||||
"@types/fs-extra": "^9.0.13",
|
"@types/fs-extra": "^9.0.13",
|
||||||
"@types/js-cookie": "^3.0.1",
|
"@types/js-cookie": "^3.0.1",
|
||||||
"@types/react": "^17.0.0",
|
"@types/react": "^17.0.0",
|
||||||
@@ -45,7 +49,7 @@
|
|||||||
"pretty-quick": "^3.1.3",
|
"pretty-quick": "^3.1.3",
|
||||||
"sass": "^1.49.7",
|
"sass": "^1.49.7",
|
||||||
"typescript": "^4.5.5",
|
"typescript": "^4.5.5",
|
||||||
"vite": "^2.8.0"
|
"vite": "^2.8.6"
|
||||||
},
|
},
|
||||||
"prettier": {
|
"prettier": {
|
||||||
"tabWidth": 2,
|
"tabWidth": 2,
|
||||||
|
|||||||
@@ -6,10 +6,7 @@ import fetch from "node-fetch";
|
|||||||
import { execSync } from "child_process";
|
import { execSync } from "child_process";
|
||||||
|
|
||||||
const cwd = process.cwd();
|
const cwd = process.cwd();
|
||||||
|
const FORCE = process.argv.includes("--force");
|
||||||
const CLASH_URL_PREFIX =
|
|
||||||
"https://github.com/Dreamacro/clash/releases/download/premium/";
|
|
||||||
const CLASH_LATEST_DATE = "2022.01.27";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get the correct clash release infomation
|
* get the correct clash release infomation
|
||||||
@@ -17,11 +14,16 @@ const CLASH_LATEST_DATE = "2022.01.27";
|
|||||||
function resolveClash() {
|
function resolveClash() {
|
||||||
const { platform, arch } = process;
|
const { platform, arch } = process;
|
||||||
|
|
||||||
|
const CLASH_URL_PREFIX =
|
||||||
|
"https://github.com/Dreamacro/clash/releases/download/premium/";
|
||||||
|
const CLASH_LATEST_DATE = "2022.03.21";
|
||||||
|
|
||||||
// todo
|
// todo
|
||||||
const map = {
|
const map = {
|
||||||
"win32-x64": "clash-windows-386",
|
"win32-x64": "clash-windows-amd64",
|
||||||
"darwin-x64": "clash-darwin-amd64",
|
"darwin-x64": "clash-darwin-amd64",
|
||||||
"darwin-arm64": "clash-darwin-arm64",
|
"darwin-arm64": "clash-darwin-arm64",
|
||||||
|
"linux-x64": "clash-linux-amd64",
|
||||||
};
|
};
|
||||||
|
|
||||||
const name = map[`${platform}-${arch}`];
|
const name = map[`${platform}-${arch}`];
|
||||||
@@ -51,7 +53,7 @@ async function resolveSidecar() {
|
|||||||
const sidecarPath = path.join(sidecarDir, sidecarFile);
|
const sidecarPath = path.join(sidecarDir, sidecarFile);
|
||||||
|
|
||||||
await fs.mkdirp(sidecarDir);
|
await fs.mkdirp(sidecarDir);
|
||||||
if (await fs.pathExists(sidecarPath)) return;
|
if (!FORCE && (await fs.pathExists(sidecarPath))) return;
|
||||||
|
|
||||||
// download sidecar
|
// download sidecar
|
||||||
const binInfo = resolveClash();
|
const binInfo = resolveClash();
|
||||||
@@ -82,13 +84,55 @@ async function resolveSidecar() {
|
|||||||
console.log(`[INFO]: gunzip finished`);
|
console.log(`[INFO]: gunzip finished`);
|
||||||
execSync(`chmod 755 ${sidecarPath}`);
|
execSync(`chmod 755 ${sidecarPath}`);
|
||||||
console.log(`[INFO]: chmod binary finished`);
|
console.log(`[INFO]: chmod binary finished`);
|
||||||
});
|
})
|
||||||
|
.on("error", (error) => console.error(error));
|
||||||
}
|
}
|
||||||
|
|
||||||
// delete temp dir
|
// delete temp dir
|
||||||
await fs.remove(tempDir);
|
await fs.remove(tempDir);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* only Windows
|
||||||
|
* get the wintun.dll (not required)
|
||||||
|
*/
|
||||||
|
async function resolveWintun() {
|
||||||
|
const { platform } = process;
|
||||||
|
|
||||||
|
if (platform !== "win32") return;
|
||||||
|
|
||||||
|
const url = "https://www.wintun.net/builds/wintun-0.14.1.zip";
|
||||||
|
|
||||||
|
const tempDir = path.join(cwd, "pre-dev-temp-1");
|
||||||
|
const tempZip = path.join(tempDir, "wintun.zip");
|
||||||
|
|
||||||
|
const wintunPath = path.join(tempDir, "wintun/bin/amd64/wintun.dll");
|
||||||
|
const targetPath = path.join(cwd, "src-tauri/resources", "wintun.dll");
|
||||||
|
|
||||||
|
if (!FORCE && (await fs.pathExists(targetPath))) return;
|
||||||
|
|
||||||
|
await fs.mkdirp(tempDir);
|
||||||
|
|
||||||
|
if (!(await fs.pathExists(tempZip))) {
|
||||||
|
await downloadFile(url, tempZip);
|
||||||
|
}
|
||||||
|
|
||||||
|
// unzip
|
||||||
|
const zip = new AdmZip(tempZip);
|
||||||
|
zip.extractAllTo(tempDir, true);
|
||||||
|
|
||||||
|
if (!(await fs.pathExists(wintunPath))) {
|
||||||
|
throw new Error(`path not found "${wintunPath}"`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// move wintun.dll to resources
|
||||||
|
await fs.rename(wintunPath, targetPath);
|
||||||
|
// delete temp dir
|
||||||
|
await fs.remove(tempDir);
|
||||||
|
|
||||||
|
console.log(`[INFO]: resolve wintun.dll finished`);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get the Country.mmdb (not required)
|
* get the Country.mmdb (not required)
|
||||||
*/
|
*/
|
||||||
@@ -98,7 +142,7 @@ async function resolveMmdb() {
|
|||||||
|
|
||||||
const resDir = path.join(cwd, "src-tauri", "resources");
|
const resDir = path.join(cwd, "src-tauri", "resources");
|
||||||
const resPath = path.join(resDir, "Country.mmdb");
|
const resPath = path.join(resDir, "Country.mmdb");
|
||||||
if (await fs.pathExists(resPath)) return;
|
if (!FORCE && (await fs.pathExists(resPath))) return;
|
||||||
await fs.mkdirp(resDir);
|
await fs.mkdirp(resDir);
|
||||||
await downloadFile(url, resPath);
|
await downloadFile(url, resPath);
|
||||||
}
|
}
|
||||||
@@ -121,4 +165,5 @@ async function downloadFile(url, path) {
|
|||||||
|
|
||||||
/// main
|
/// main
|
||||||
resolveSidecar().catch(console.error);
|
resolveSidecar().catch(console.error);
|
||||||
|
resolveWintun().catch(console.error);
|
||||||
resolveMmdb().catch(console.error);
|
resolveMmdb().catch(console.error);
|
||||||
|
|||||||
56
scripts/green.mjs
Normal file
56
scripts/green.mjs
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
import fs from "fs-extra";
|
||||||
|
import path from "path";
|
||||||
|
import AdmZip from "adm-zip";
|
||||||
|
import { createRequire } from "module";
|
||||||
|
import { getOctokit, context } from "@actions/github";
|
||||||
|
|
||||||
|
/// Script for ci
|
||||||
|
/// 打包绿色版/便携版 (only Windows)
|
||||||
|
async function resolveGreen() {
|
||||||
|
if (process.platform !== "win32") return;
|
||||||
|
|
||||||
|
const releaseDir = "./src-tauri/target/release";
|
||||||
|
|
||||||
|
if (!(await fs.pathExists(releaseDir))) {
|
||||||
|
throw new Error("could not found the release dir");
|
||||||
|
}
|
||||||
|
|
||||||
|
const zip = new AdmZip();
|
||||||
|
|
||||||
|
zip.addLocalFile(path.join(releaseDir, "Clash Verge.exe"));
|
||||||
|
zip.addLocalFile(path.join(releaseDir, "clash.exe"));
|
||||||
|
zip.addLocalFolder(path.join(releaseDir, "resources"), "resources");
|
||||||
|
|
||||||
|
const require = createRequire(import.meta.url);
|
||||||
|
const packageJson = require("../package.json");
|
||||||
|
const { version } = packageJson;
|
||||||
|
|
||||||
|
const zipFile = `Clash.Verge_${version}_x64_green.zip`;
|
||||||
|
zip.writeZip(zipFile);
|
||||||
|
|
||||||
|
console.log("[INFO]: create green zip successfully");
|
||||||
|
|
||||||
|
// push release assets
|
||||||
|
if (process.env.GITHUB_TOKEN === undefined) {
|
||||||
|
throw new Error("GITHUB_TOKEN is required");
|
||||||
|
}
|
||||||
|
|
||||||
|
const options = { owner: context.repo.owner, repo: context.repo.repo };
|
||||||
|
const github = getOctokit(process.env.GITHUB_TOKEN);
|
||||||
|
|
||||||
|
const { data: release } = await github.rest.repos.getReleaseByTag({
|
||||||
|
...options,
|
||||||
|
tag: `v${version}`,
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log(release.name);
|
||||||
|
|
||||||
|
await github.rest.repos.uploadReleaseAsset({
|
||||||
|
...options,
|
||||||
|
release_id: release.id,
|
||||||
|
name: zipFile,
|
||||||
|
data: zip.toBuffer(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
resolveGreen().catch(console.error);
|
||||||
@@ -1,9 +1,11 @@
|
|||||||
import fs from "fs-extra";
|
import fs from "fs-extra";
|
||||||
import { createRequire } from "module";
|
import { createRequire } from "module";
|
||||||
import { execSync } from "child_process";
|
import { execSync } from "child_process";
|
||||||
|
import { resolveUpdateLog } from "./updatelog.mjs";
|
||||||
|
|
||||||
const require = createRequire(import.meta.url);
|
const require = createRequire(import.meta.url);
|
||||||
|
|
||||||
|
// publish
|
||||||
async function resolvePublish() {
|
async function resolvePublish() {
|
||||||
const flag = process.argv[2] ?? "patch";
|
const flag = process.argv[2] ?? "patch";
|
||||||
const packageJson = require("../package.json");
|
const packageJson = require("../package.json");
|
||||||
@@ -26,6 +28,10 @@ async function resolvePublish() {
|
|||||||
packageJson.version = nextVersion;
|
packageJson.version = nextVersion;
|
||||||
tauriJson.package.version = nextVersion;
|
tauriJson.package.version = nextVersion;
|
||||||
|
|
||||||
|
// 发布更新前先写更新日志
|
||||||
|
const nextTag = `v${nextVersion}`;
|
||||||
|
await resolveUpdateLog(nextTag);
|
||||||
|
|
||||||
await fs.writeFile(
|
await fs.writeFile(
|
||||||
"./package.json",
|
"./package.json",
|
||||||
JSON.stringify(packageJson, undefined, 2)
|
JSON.stringify(packageJson, undefined, 2)
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
import fetch from "node-fetch";
|
import fetch from "node-fetch";
|
||||||
import { getOctokit, context } from "@actions/github";
|
import { getOctokit, context } from "@actions/github";
|
||||||
|
import { resolveUpdateLog } from "./updatelog.mjs";
|
||||||
|
|
||||||
const UPDATE_TAG_NAME = "updater";
|
const UPDATE_TAG_NAME = "updater";
|
||||||
const UPDATE_JSON_FILE = "update.json";
|
const UPDATE_JSON_FILE = "update.json";
|
||||||
|
const UPDATE_JSON_PROXY = "update-proxy.json";
|
||||||
|
|
||||||
/// generate update.json
|
/// generate update.json
|
||||||
/// upload to update tag's release asset
|
/// upload to update tag's release asset
|
||||||
@@ -33,10 +35,11 @@ async function resolveRelease() {
|
|||||||
|
|
||||||
const updateData = {
|
const updateData = {
|
||||||
name: tag.name,
|
name: tag.name,
|
||||||
notes: latestRelease.body, // use the release body directly
|
notes: await resolveUpdateLog(tag.name), // use updatelog.md
|
||||||
pub_date: new Date().toISOString(),
|
pub_date: new Date().toISOString(),
|
||||||
platforms: {
|
platforms: {
|
||||||
win64: { signature: "", url: "" },
|
win64: { signature: "", url: "" },
|
||||||
|
linux: { signature: "", url: "" },
|
||||||
darwin: { signature: "", url: "" },
|
darwin: { signature: "", url: "" },
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -48,29 +51,41 @@ async function resolveRelease() {
|
|||||||
if (/\.msi\.zip$/.test(name)) {
|
if (/\.msi\.zip$/.test(name)) {
|
||||||
updateData.platforms.win64.url = browser_download_url;
|
updateData.platforms.win64.url = browser_download_url;
|
||||||
}
|
}
|
||||||
// darwin url
|
|
||||||
if (/\.app\.tar\.gz$/.test(name)) {
|
|
||||||
updateData.platforms.darwin.url = browser_download_url;
|
|
||||||
}
|
|
||||||
// win64 signature
|
// win64 signature
|
||||||
if (/\.msi\.zip\.sig$/.test(name)) {
|
if (/\.msi\.zip\.sig$/.test(name)) {
|
||||||
updateData.platforms.win64.signature = await getSignature(
|
updateData.platforms.win64.signature = await getSignature(
|
||||||
browser_download_url
|
browser_download_url
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// darwin url
|
||||||
|
if (/\.app\.tar\.gz$/.test(name)) {
|
||||||
|
updateData.platforms.darwin.url = browser_download_url;
|
||||||
|
}
|
||||||
// darwin signature
|
// darwin signature
|
||||||
if (/\.app\.tar\.gz\.sig$/.test(name)) {
|
if (/\.app\.tar\.gz\.sig$/.test(name)) {
|
||||||
updateData.platforms.darwin.signature = await getSignature(
|
updateData.platforms.darwin.signature = await getSignature(
|
||||||
browser_download_url
|
browser_download_url
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// linux url
|
||||||
|
if (/\.AppImage\.tar\.gz$/.test(name)) {
|
||||||
|
updateData.platforms.linux.url = browser_download_url;
|
||||||
|
}
|
||||||
|
// linux signature
|
||||||
|
if (/\.AppImage\.tar\.gz\.sig$/.test(name)) {
|
||||||
|
updateData.platforms.linux.signature = await getSignature(
|
||||||
|
browser_download_url
|
||||||
|
);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
await Promise.allSettled(promises);
|
await Promise.allSettled(promises);
|
||||||
console.log(updateData);
|
console.log(updateData);
|
||||||
|
|
||||||
// maybe should test the signature as well
|
// maybe should test the signature as well
|
||||||
const { darwin, win64 } = updateData.platforms;
|
const { darwin, win64, linux } = updateData.platforms;
|
||||||
if (!darwin.url) {
|
if (!darwin.url) {
|
||||||
console.log(`[Error]: failed to parse release for darwin`);
|
console.log(`[Error]: failed to parse release for darwin`);
|
||||||
delete updateData.platforms.darwin;
|
delete updateData.platforms.darwin;
|
||||||
@@ -79,6 +94,24 @@ async function resolveRelease() {
|
|||||||
console.log(`[Error]: failed to parse release for win64`);
|
console.log(`[Error]: failed to parse release for win64`);
|
||||||
delete updateData.platforms.win64;
|
delete updateData.platforms.win64;
|
||||||
}
|
}
|
||||||
|
if (!linux.url) {
|
||||||
|
console.log(`[Error]: failed to parse release for linux`);
|
||||||
|
delete updateData.platforms.linux;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 生成一个代理github的更新文件
|
||||||
|
// 使用 https://hub.fastgit.xyz/ 做github资源的加速
|
||||||
|
const updateDataNew = JSON.parse(JSON.stringify(updateData));
|
||||||
|
|
||||||
|
Object.keys(updateDataNew.platforms).forEach((key) => {
|
||||||
|
if (updateDataNew.platforms[key]) {
|
||||||
|
updateDataNew.platforms[key].url = updateDataNew.platforms[
|
||||||
|
key
|
||||||
|
].url.replace("https://github.com/", "https://hub.fastgit.xyz/");
|
||||||
|
} else {
|
||||||
|
console.log(`[Error]: updateDataNew.platforms.${key} is null`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// update the update.json
|
// update the update.json
|
||||||
const { data: updateRelease } = await github.rest.repos.getReleaseByTag({
|
const { data: updateRelease } = await github.rest.repos.getReleaseByTag({
|
||||||
@@ -86,22 +119,36 @@ async function resolveRelease() {
|
|||||||
tag: UPDATE_TAG_NAME,
|
tag: UPDATE_TAG_NAME,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// delete the old assets
|
||||||
for (let asset of updateRelease.assets) {
|
for (let asset of updateRelease.assets) {
|
||||||
if (asset.name === UPDATE_JSON_FILE) {
|
if (asset.name === UPDATE_JSON_FILE) {
|
||||||
await github.rest.repos.deleteReleaseAsset({
|
await github.rest.repos.deleteReleaseAsset({
|
||||||
...options,
|
...options,
|
||||||
asset_id: asset.id,
|
asset_id: asset.id,
|
||||||
});
|
});
|
||||||
break;
|
}
|
||||||
|
|
||||||
|
if (asset.name === UPDATE_JSON_PROXY) {
|
||||||
|
await github.rest.repos
|
||||||
|
.deleteReleaseAsset({ ...options, asset_id: asset.id })
|
||||||
|
.catch(console.error); // do not break the pipeline
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// upload assets
|
||||||
await github.rest.repos.uploadReleaseAsset({
|
await github.rest.repos.uploadReleaseAsset({
|
||||||
...options,
|
...options,
|
||||||
release_id: updateRelease.id,
|
release_id: updateRelease.id,
|
||||||
name: UPDATE_JSON_FILE,
|
name: UPDATE_JSON_FILE,
|
||||||
data: JSON.stringify(updateData, null, 2),
|
data: JSON.stringify(updateData, null, 2),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
await github.rest.repos.uploadReleaseAsset({
|
||||||
|
...options,
|
||||||
|
release_id: updateRelease.id,
|
||||||
|
name: UPDATE_JSON_PROXY,
|
||||||
|
data: JSON.stringify(updateDataNew, null, 2),
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// get the signature file content
|
// get the signature file content
|
||||||
|
|||||||
44
scripts/updatelog.mjs
Normal file
44
scripts/updatelog.mjs
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
import fs from "fs-extra";
|
||||||
|
import path from "path";
|
||||||
|
|
||||||
|
const UPDATE_LOG = "UPDATELOG.md";
|
||||||
|
|
||||||
|
// parse the UPDATELOG.md
|
||||||
|
export async function resolveUpdateLog(tag) {
|
||||||
|
const cwd = process.cwd();
|
||||||
|
|
||||||
|
const reTitle = /^## v[\d\.]+/;
|
||||||
|
const reEnd = /^---/;
|
||||||
|
|
||||||
|
const file = path.join(cwd, UPDATE_LOG);
|
||||||
|
|
||||||
|
if (!(await fs.pathExists(file))) {
|
||||||
|
throw new Error("could not found UPDATELOG.md");
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await fs.readFile(file).then((d) => d.toString("utf8"));
|
||||||
|
|
||||||
|
const map = {};
|
||||||
|
let p = "";
|
||||||
|
|
||||||
|
data.split("\n").forEach((line) => {
|
||||||
|
if (reTitle.test(line)) {
|
||||||
|
p = line.slice(3).trim();
|
||||||
|
if (!map[p]) {
|
||||||
|
map[p] = [];
|
||||||
|
} else {
|
||||||
|
throw new Error(`Tag ${p} dup`);
|
||||||
|
}
|
||||||
|
} else if (reEnd.test(line)) {
|
||||||
|
p = "";
|
||||||
|
} else if (p) {
|
||||||
|
map[p].push(line);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!map[tag]) {
|
||||||
|
throw new Error(`could not found "${tag}" in UPDATELOG.md`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return map[tag].join("\n").trim();
|
||||||
|
}
|
||||||
2
src-tauri/.gitignore
vendored
2
src-tauri/.gitignore
vendored
@@ -2,5 +2,5 @@
|
|||||||
# will have compiled files and executables
|
# will have compiled files and executables
|
||||||
/target/
|
/target/
|
||||||
WixTools
|
WixTools
|
||||||
resources/Country.mmdb
|
resources
|
||||||
sidecar
|
sidecar
|
||||||
|
|||||||
573
src-tauri/Cargo.lock
generated
573
src-tauri/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -10,18 +10,20 @@ edition = "2021"
|
|||||||
build = "build.rs"
|
build = "build.rs"
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
tauri-build = { version = "1.0.0-rc.3", features = [] }
|
tauri-build = { version = "1.0.0-rc.4", features = [] }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
anyhow = "1.0"
|
||||||
dirs = "4.0.0"
|
dirs = "4.0.0"
|
||||||
dunce = "1.0.2"
|
dunce = "1.0.2"
|
||||||
|
nanoid = "0.4.0"
|
||||||
chrono = "0.4.19"
|
chrono = "0.4.19"
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
serde_yaml = "0.8"
|
serde_yaml = "0.8"
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
tauri = { version = "1.0.0-rc.3", features = ["shell-all", "system-tray", "updater", "window-all"] }
|
tauri = { version = "1.0.0-rc.4", features = ["process-all", "shell-all", "system-tray", "updater", "window-all"] }
|
||||||
tauri-plugin-shadows = { git = "https://github.com/tauri-apps/tauri-plugin-shadows", features = ["tauri-impl"] }
|
window-shadows = { git = "https://github.com/tauri-apps/window-shadows" }
|
||||||
tauri-plugin-vibrancy = { git = "https://github.com/tauri-apps/tauri-plugin-vibrancy", features = ["tauri-impl"] }
|
window-vibrancy = { git = "https://github.com/tauri-apps/window-vibrancy" }
|
||||||
|
|
||||||
reqwest = { version = "0.11", features = ["json"] }
|
reqwest = { version = "0.11", features = ["json"] }
|
||||||
tokio = { version = "1", features = ["full"] }
|
tokio = { version = "1", features = ["full"] }
|
||||||
@@ -38,3 +40,4 @@ winreg = { version = "0.10", features = ["transactions"] }
|
|||||||
[features]
|
[features]
|
||||||
default = [ "custom-protocol" ]
|
default = [ "custom-protocol" ]
|
||||||
custom-protocol = [ "tauri/custom-protocol" ]
|
custom-protocol = [ "tauri/custom-protocol" ]
|
||||||
|
verge-dev = []
|
||||||
|
|||||||
BIN
src-tauri/icons/icon-shrink.png
Normal file
BIN
src-tauri/icons/icon-shrink.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
Binary file not shown.
@@ -1,29 +1,26 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
core::{ClashInfo, ProfileItem, Profiles, VergeConfig},
|
core::{ClashInfo, PrfItem, PrfOption, Profiles, VergeConfig},
|
||||||
states::{ClashState, ProfilesState, VergeState},
|
states::{ClashState, ProfilesState, VergeState},
|
||||||
utils::{dirs::app_home_dir, fetch::fetch_profile, sysopt::SysProxyConfig},
|
utils::{dirs, sysopt::SysProxyConfig},
|
||||||
};
|
};
|
||||||
|
use crate::{ret_err, wrap_err};
|
||||||
|
use anyhow::Result;
|
||||||
use serde_yaml::Mapping;
|
use serde_yaml::Mapping;
|
||||||
use std::{path::PathBuf, process::Command};
|
use std::{path::PathBuf, process::Command};
|
||||||
use tauri::{api, State};
|
use tauri::{api, Manager, State};
|
||||||
|
|
||||||
/// get all profiles from `profiles.yaml`
|
/// get all profiles from `profiles.yaml`
|
||||||
/// do not acquire the lock of ProfileLock
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn get_profiles(profiles_state: State<'_, ProfilesState>) -> Result<Profiles, String> {
|
pub fn get_profiles<'a>(profiles_state: State<'_, ProfilesState>) -> Result<Profiles, String> {
|
||||||
match profiles_state.0.lock() {
|
let profiles = profiles_state.0.lock().unwrap();
|
||||||
Ok(profiles) => Ok(profiles.clone()),
|
Ok(profiles.clone())
|
||||||
Err(_) => Err("failed to get profiles lock".into()),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// synchronize data irregularly
|
/// synchronize data irregularly
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn sync_profiles(profiles_state: State<'_, ProfilesState>) -> Result<(), String> {
|
pub fn sync_profiles(profiles_state: State<'_, ProfilesState>) -> Result<(), String> {
|
||||||
match profiles_state.0.lock() {
|
let mut profiles = profiles_state.0.lock().unwrap();
|
||||||
Ok(mut profiles) => profiles.sync_file(),
|
wrap_err!(profiles.sync_file())
|
||||||
Err(_) => Err("failed to get profiles lock".into()),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// import the profile from url
|
/// import the profile from url
|
||||||
@@ -31,148 +28,185 @@ pub fn sync_profiles(profiles_state: State<'_, ProfilesState>) -> Result<(), Str
|
|||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn import_profile(
|
pub async fn import_profile(
|
||||||
url: String,
|
url: String,
|
||||||
with_proxy: bool,
|
option: Option<PrfOption>,
|
||||||
profiles_state: State<'_, ProfilesState>,
|
profiles_state: State<'_, ProfilesState>,
|
||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
let result = fetch_profile(&url, with_proxy).await?;
|
let item = wrap_err!(PrfItem::from_url(&url, None, None, option).await)?;
|
||||||
|
|
||||||
let mut profiles = profiles_state.0.lock().unwrap();
|
let mut profiles = profiles_state.0.lock().unwrap();
|
||||||
profiles.import_from_url(url, result)
|
wrap_err!(profiles.append_item(item))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// new a profile
|
/// new a profile
|
||||||
/// append a temp profile item file to the `profiles` dir
|
/// append a temp profile item file to the `profiles` dir
|
||||||
/// view the temp profile file by using vscode or other editor
|
/// view the temp profile file by using vscode or other editor
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn new_profile(
|
pub async fn create_profile(
|
||||||
name: String,
|
item: PrfItem, // partial
|
||||||
desc: String,
|
file_data: Option<String>,
|
||||||
profiles_state: State<'_, ProfilesState>,
|
profiles_state: State<'_, ProfilesState>,
|
||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
|
let item = wrap_err!(PrfItem::from(item, file_data).await)?;
|
||||||
let mut profiles = profiles_state.0.lock().unwrap();
|
let mut profiles = profiles_state.0.lock().unwrap();
|
||||||
profiles.append_item(name, desc)?;
|
|
||||||
Ok(())
|
wrap_err!(profiles.append_item(item))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Update the profile
|
/// Update the profile
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn update_profile(
|
pub async fn update_profile(
|
||||||
index: usize,
|
index: String,
|
||||||
with_proxy: bool,
|
option: Option<PrfOption>,
|
||||||
clash_state: State<'_, ClashState>,
|
clash_state: State<'_, ClashState>,
|
||||||
profiles_state: State<'_, ProfilesState>,
|
profiles_state: State<'_, ProfilesState>,
|
||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
// maybe we can get the url from the web app directly
|
let (url, opt) = {
|
||||||
let url = match profiles_state.0.lock() {
|
// must release the lock here
|
||||||
Ok(mut profile) => {
|
let profiles = profiles_state.0.lock().unwrap();
|
||||||
let items = profile.items.take().unwrap_or(vec![]);
|
let item = wrap_err!(profiles.get_item(&index))?;
|
||||||
if index >= items.len() {
|
|
||||||
return Err("the index out of bound".into());
|
// check the profile type
|
||||||
|
if let Some(typ) = item.itype.as_ref() {
|
||||||
|
if *typ != "remote" {
|
||||||
|
ret_err!(format!("could not update the `{typ}` profile"));
|
||||||
}
|
}
|
||||||
let url = match &items[index].url {
|
|
||||||
Some(u) => u.clone(),
|
|
||||||
None => return Err("failed to update profile for `invalid url`".into()),
|
|
||||||
};
|
|
||||||
profile.items = Some(items);
|
|
||||||
url
|
|
||||||
}
|
}
|
||||||
Err(_) => return Err("failed to get profiles lock".into()),
|
|
||||||
|
if item.url.is_none() {
|
||||||
|
ret_err!("failed to get the item url");
|
||||||
|
}
|
||||||
|
|
||||||
|
(item.url.clone().unwrap(), item.option.clone())
|
||||||
};
|
};
|
||||||
|
|
||||||
let result = fetch_profile(&url, with_proxy).await?;
|
let fetch_opt = PrfOption::merge(opt, option);
|
||||||
|
let item = wrap_err!(PrfItem::from_url(&url, None, None, fetch_opt).await)?;
|
||||||
|
|
||||||
match profiles_state.0.lock() {
|
let mut profiles = profiles_state.0.lock().unwrap();
|
||||||
Ok(mut profiles) => {
|
wrap_err!(profiles.update_item(index.clone(), item))?;
|
||||||
profiles.update_item(index, result)?;
|
|
||||||
|
|
||||||
// reactivate the profile
|
// reactivate the profile
|
||||||
let current = profiles.current.clone().unwrap_or(0);
|
if Some(index) == profiles.get_current() {
|
||||||
if current == index {
|
let clash = clash_state.0.lock().unwrap();
|
||||||
let clash = clash_state.0.lock().unwrap();
|
wrap_err!(clash.activate(&profiles, false))?;
|
||||||
profiles.activate(&clash)
|
|
||||||
} else {
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(_) => Err("failed to get profiles lock".into()),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// change the current profile
|
/// change the current profile
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn select_profile(
|
pub fn select_profile(
|
||||||
index: usize,
|
index: String,
|
||||||
clash_state: State<'_, ClashState>,
|
clash_state: State<'_, ClashState>,
|
||||||
profiles_state: State<'_, ProfilesState>,
|
profiles_state: State<'_, ProfilesState>,
|
||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
let mut profiles = profiles_state.0.lock().unwrap();
|
let mut profiles = profiles_state.0.lock().unwrap();
|
||||||
|
wrap_err!(profiles.put_current(index))?;
|
||||||
|
|
||||||
match profiles.put_current(index) {
|
let clash = clash_state.0.lock().unwrap();
|
||||||
Ok(()) => {
|
wrap_err!(clash.activate(&profiles, false))
|
||||||
let clash = clash_state.0.lock().unwrap();
|
}
|
||||||
profiles.activate(&clash)
|
|
||||||
}
|
/// change the profile chain
|
||||||
Err(err) => Err(err),
|
#[tauri::command]
|
||||||
}
|
pub fn change_profile_chain(
|
||||||
|
chain: Option<Vec<String>>,
|
||||||
|
app_handle: tauri::AppHandle,
|
||||||
|
clash_state: State<'_, ClashState>,
|
||||||
|
profiles_state: State<'_, ProfilesState>,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let mut clash = clash_state.0.lock().unwrap();
|
||||||
|
let mut profiles = profiles_state.0.lock().unwrap();
|
||||||
|
|
||||||
|
profiles.put_chain(chain);
|
||||||
|
clash.set_window(app_handle.get_window("main"));
|
||||||
|
|
||||||
|
wrap_err!(clash.activate_enhanced(&profiles, false))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// manually exec enhanced profile
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn enhance_profiles(
|
||||||
|
app_handle: tauri::AppHandle,
|
||||||
|
clash_state: State<'_, ClashState>,
|
||||||
|
profiles_state: State<'_, ProfilesState>,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let mut clash = clash_state.0.lock().unwrap();
|
||||||
|
let profiles = profiles_state.0.lock().unwrap();
|
||||||
|
|
||||||
|
clash.set_window(app_handle.get_window("main"));
|
||||||
|
|
||||||
|
wrap_err!(clash.activate_enhanced(&profiles, false))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// delete profile item
|
/// delete profile item
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn delete_profile(
|
pub fn delete_profile(
|
||||||
index: usize,
|
index: String,
|
||||||
clash_state: State<'_, ClashState>,
|
clash_state: State<'_, ClashState>,
|
||||||
profiles_state: State<'_, ProfilesState>,
|
profiles_state: State<'_, ProfilesState>,
|
||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
let mut profiles = profiles_state.0.lock().unwrap();
|
let mut profiles = profiles_state.0.lock().unwrap();
|
||||||
match profiles.delete_item(index) {
|
|
||||||
Ok(change) => match change {
|
if wrap_err!(profiles.delete_item(index))? {
|
||||||
true => {
|
let clash = clash_state.0.lock().unwrap();
|
||||||
let clash = clash_state.0.lock().unwrap();
|
wrap_err!(clash.activate(&profiles, false))?;
|
||||||
profiles.activate(&clash)
|
|
||||||
}
|
|
||||||
false => Ok(()),
|
|
||||||
},
|
|
||||||
Err(err) => Err(err),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// patch the profile config
|
/// patch the profile config
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn patch_profile(
|
pub fn patch_profile(
|
||||||
index: usize,
|
index: String,
|
||||||
profile: ProfileItem,
|
profile: PrfItem,
|
||||||
profiles_state: State<'_, ProfilesState>,
|
profiles_state: State<'_, ProfilesState>,
|
||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
match profiles_state.0.lock() {
|
let mut profiles = profiles_state.0.lock().unwrap();
|
||||||
Ok(mut profiles) => profiles.patch_item(index, profile),
|
wrap_err!(profiles.patch_item(index, profile))
|
||||||
Err(_) => Err("can not get profiles lock".into()),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// run vscode command to edit the profile
|
/// run vscode command to edit the profile
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn view_profile(index: usize, profiles_state: State<'_, ProfilesState>) -> Result<(), String> {
|
pub fn view_profile(index: String, profiles_state: State<'_, ProfilesState>) -> Result<(), String> {
|
||||||
let mut profiles = profiles_state.0.lock().unwrap();
|
let profiles = profiles_state.0.lock().unwrap();
|
||||||
let items = profiles.items.take().unwrap_or(vec![]);
|
let item = wrap_err!(profiles.get_item(&index))?;
|
||||||
|
|
||||||
if index >= items.len() {
|
let file = item.file.clone();
|
||||||
profiles.items = Some(items);
|
if file.is_none() {
|
||||||
return Err("the index out of bound".into());
|
ret_err!("the file is null");
|
||||||
}
|
}
|
||||||
|
|
||||||
let file = items[index].file.clone().unwrap_or("".into());
|
let path = dirs::app_profiles_dir().join(file.unwrap());
|
||||||
profiles.items = Some(items);
|
|
||||||
|
|
||||||
let path = app_home_dir().join("profiles").join(file);
|
|
||||||
if !path.exists() {
|
if !path.exists() {
|
||||||
return Err("the file not found".into());
|
ret_err!("the file not found");
|
||||||
}
|
}
|
||||||
|
|
||||||
// use vscode first
|
// use vscode first
|
||||||
if let Ok(code) = which::which("code") {
|
if let Ok(code) = which::which("code") {
|
||||||
return match Command::new(code).arg(path).spawn() {
|
#[cfg(target_os = "windows")]
|
||||||
Ok(_) => Ok(()),
|
{
|
||||||
Err(_) => Err("failed to open file by VScode".into()),
|
use std::os::windows::process::CommandExt;
|
||||||
};
|
|
||||||
|
if let Err(err) = Command::new(code)
|
||||||
|
.creation_flags(0x08000000)
|
||||||
|
.arg(path)
|
||||||
|
.spawn()
|
||||||
|
{
|
||||||
|
log::error!("{err}");
|
||||||
|
return Err("failed to open file by VScode".into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(target_os = "windows"))]
|
||||||
|
if let Err(err) = Command::new(code).arg(path).spawn() {
|
||||||
|
log::error!("{err}");
|
||||||
|
return Err("failed to open file by VScode".into());
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
open_path_cmd(path, "failed to open file by `open`")
|
open_path_cmd(path, "failed to open file by `open`")
|
||||||
@@ -187,23 +221,15 @@ pub fn restart_sidecar(
|
|||||||
let mut clash = clash_state.0.lock().unwrap();
|
let mut clash = clash_state.0.lock().unwrap();
|
||||||
let mut profiles = profiles_state.0.lock().unwrap();
|
let mut profiles = profiles_state.0.lock().unwrap();
|
||||||
|
|
||||||
match clash.restart_sidecar(&mut profiles) {
|
wrap_err!(clash.restart_sidecar(&mut profiles))
|
||||||
Ok(_) => Ok(()),
|
|
||||||
Err(err) => {
|
|
||||||
log::error!("{}", err);
|
|
||||||
Err(err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// get the clash core info from the state
|
/// get the clash core info from the state
|
||||||
/// the caller can also get the infomation by clash's api
|
/// the caller can also get the infomation by clash's api
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn get_clash_info(clash_state: State<'_, ClashState>) -> Result<ClashInfo, String> {
|
pub fn get_clash_info(clash_state: State<'_, ClashState>) -> Result<ClashInfo, String> {
|
||||||
match clash_state.0.lock() {
|
let clash = clash_state.0.lock().unwrap();
|
||||||
Ok(clash) => Ok(clash.info.clone()),
|
Ok(clash.info.clone())
|
||||||
Err(_) => Err("failed to get clash lock".into()),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// update the clash core config
|
/// update the clash core config
|
||||||
@@ -219,26 +245,21 @@ pub fn patch_clash_config(
|
|||||||
let mut clash = clash_state.0.lock().unwrap();
|
let mut clash = clash_state.0.lock().unwrap();
|
||||||
let mut verge = verge_state.0.lock().unwrap();
|
let mut verge = verge_state.0.lock().unwrap();
|
||||||
let mut profiles = profiles_state.0.lock().unwrap();
|
let mut profiles = profiles_state.0.lock().unwrap();
|
||||||
clash.patch_config(payload, &mut verge, &mut profiles)
|
wrap_err!(clash.patch_config(payload, &mut verge, &mut profiles))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// get the system proxy
|
/// get the system proxy
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn get_sys_proxy() -> Result<SysProxyConfig, String> {
|
pub fn get_sys_proxy() -> Result<SysProxyConfig, String> {
|
||||||
match SysProxyConfig::get_sys() {
|
wrap_err!(SysProxyConfig::get_sys())
|
||||||
Ok(value) => Ok(value),
|
|
||||||
Err(err) => Err(err.to_string()),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// get the current proxy config
|
/// get the current proxy config
|
||||||
/// which may not the same as system proxy
|
/// which may not the same as system proxy
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn get_cur_proxy(verge_state: State<'_, VergeState>) -> Result<Option<SysProxyConfig>, String> {
|
pub fn get_cur_proxy(verge_state: State<'_, VergeState>) -> Result<Option<SysProxyConfig>, String> {
|
||||||
match verge_state.0.lock() {
|
let verge = verge_state.0.lock().unwrap();
|
||||||
Ok(verge) => Ok(verge.cur_sysproxy.clone()),
|
Ok(verge.cur_sysproxy.clone())
|
||||||
Err(_) => Err("failed to get verge lock".into()),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// get the verge config
|
/// get the verge config
|
||||||
@@ -259,23 +280,34 @@ pub fn get_verge_config(verge_state: State<'_, VergeState>) -> Result<VergeConfi
|
|||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn patch_verge_config(
|
pub fn patch_verge_config(
|
||||||
payload: VergeConfig,
|
payload: VergeConfig,
|
||||||
|
app_handle: tauri::AppHandle,
|
||||||
clash_state: State<'_, ClashState>,
|
clash_state: State<'_, ClashState>,
|
||||||
verge_state: State<'_, VergeState>,
|
verge_state: State<'_, VergeState>,
|
||||||
profiles_state: State<'_, ProfilesState>,
|
profiles_state: State<'_, ProfilesState>,
|
||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
let tun_mode = payload.enable_tun_mode.clone();
|
let tun_mode = payload.enable_tun_mode.clone();
|
||||||
|
let system_proxy = payload.enable_system_proxy.clone();
|
||||||
let mut verge = verge_state.0.lock().unwrap();
|
|
||||||
verge.patch_config(payload)?;
|
|
||||||
|
|
||||||
// change tun mode
|
// change tun mode
|
||||||
if tun_mode.is_some() {
|
if tun_mode.is_some() {
|
||||||
let mut clash = clash_state.0.lock().unwrap();
|
let mut clash = clash_state.0.lock().unwrap();
|
||||||
let profiles = profiles_state.0.lock().unwrap();
|
let profiles = profiles_state.0.lock().unwrap();
|
||||||
|
|
||||||
clash.tun_mode(tun_mode.unwrap())?;
|
wrap_err!(clash.tun_mode(tun_mode.unwrap()))?;
|
||||||
clash.update_config();
|
clash.update_config();
|
||||||
profiles.activate(&clash)?;
|
wrap_err!(clash.activate(&profiles, false))?;
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut verge = verge_state.0.lock().unwrap();
|
||||||
|
wrap_err!(verge.patch_config(payload))?;
|
||||||
|
|
||||||
|
// change system tray
|
||||||
|
if system_proxy.is_some() {
|
||||||
|
app_handle
|
||||||
|
.tray_handle()
|
||||||
|
.get_item("system_proxy")
|
||||||
|
.set_selected(system_proxy.unwrap())
|
||||||
|
.unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -290,36 +322,67 @@ pub fn kill_sidecars() {
|
|||||||
/// open app config dir
|
/// open app config dir
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn open_app_dir() -> Result<(), String> {
|
pub fn open_app_dir() -> Result<(), String> {
|
||||||
let app_dir = app_home_dir();
|
let app_dir = dirs::app_home_dir();
|
||||||
open_path_cmd(app_dir, "failed to open app dir")
|
open_path_cmd(app_dir, "failed to open app dir")
|
||||||
}
|
}
|
||||||
|
|
||||||
/// open logs dir
|
/// open logs dir
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn open_logs_dir() -> Result<(), String> {
|
pub fn open_logs_dir() -> Result<(), String> {
|
||||||
let log_dir = app_home_dir().join("logs");
|
let log_dir = dirs::app_logs_dir();
|
||||||
open_path_cmd(log_dir, "failed to open logs dir")
|
open_path_cmd(log_dir, "failed to open logs dir")
|
||||||
}
|
}
|
||||||
|
|
||||||
/// get open/explorer command
|
/// use the os default open command to open file or dir
|
||||||
fn open_path_cmd(dir: PathBuf, err_str: &str) -> Result<(), String> {
|
fn open_path_cmd(path: PathBuf, err_str: &str) -> Result<(), String> {
|
||||||
|
let result;
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
{
|
{
|
||||||
use std::os::windows::process::CommandExt;
|
use std::os::windows::process::CommandExt;
|
||||||
|
|
||||||
match Command::new("explorer")
|
result = Command::new("explorer")
|
||||||
.creation_flags(0x08000000)
|
.creation_flags(0x08000000)
|
||||||
.arg(dir)
|
.arg(&path)
|
||||||
.spawn()
|
.spawn();
|
||||||
{
|
}
|
||||||
Ok(_) => Ok(()),
|
|
||||||
Err(_) => Err(err_str.into()),
|
#[cfg(target_os = "macos")]
|
||||||
|
{
|
||||||
|
result = Command::new("open").arg(&path).spawn();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
{
|
||||||
|
result = Command::new("xdg-open").arg(&path).spawn();
|
||||||
|
}
|
||||||
|
|
||||||
|
match result {
|
||||||
|
Ok(child) => match child.wait_with_output() {
|
||||||
|
Ok(out) => {
|
||||||
|
// 退出码不为0 不一定没有调用成功
|
||||||
|
// 因此仅做warn log且不返回错误
|
||||||
|
if let Some(code) = out.status.code() {
|
||||||
|
if code != 0 {
|
||||||
|
log::warn!("failed to open {:?} (code {})", &path, code);
|
||||||
|
log::warn!(
|
||||||
|
"open cmd stdout: {}, stderr: {}",
|
||||||
|
String::from_utf8_lossy(&out.stdout),
|
||||||
|
String::from_utf8_lossy(&out.stderr),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(err) => {
|
||||||
|
log::error!("failed to open {:?} for {err}", &path);
|
||||||
|
return Err(err_str.into());
|
||||||
|
}
|
||||||
|
},
|
||||||
|
Err(err) => {
|
||||||
|
log::error!("failed to open {:?} for {err}", &path);
|
||||||
|
return Err(err_str.into());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(not(target_os = "windows"))]
|
return Ok(());
|
||||||
match Command::new("open").arg(dir).spawn() {
|
|
||||||
Ok(_) => Ok(()),
|
|
||||||
Err(_) => Err(err_str.into()),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,13 @@
|
|||||||
use super::{Profiles, Verge};
|
use super::{PrfEnhancedResult, Profiles, Verge};
|
||||||
use crate::utils::{config, dirs};
|
use crate::utils::{config, dirs, help};
|
||||||
|
use anyhow::{bail, Result};
|
||||||
|
use reqwest::header::HeaderMap;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_yaml::{Mapping, Value};
|
use serde_yaml::{Mapping, Value};
|
||||||
|
use std::{collections::HashMap, time::Duration};
|
||||||
use tauri::api::process::{Command, CommandChild, CommandEvent};
|
use tauri::api::process::{Command, CommandChild, CommandEvent};
|
||||||
|
use tauri::Window;
|
||||||
|
use tokio::time::sleep;
|
||||||
|
|
||||||
#[derive(Default, Debug, Clone, Deserialize, Serialize)]
|
#[derive(Default, Debug, Clone, Deserialize, Serialize)]
|
||||||
pub struct ClashInfo {
|
pub struct ClashInfo {
|
||||||
@@ -19,7 +24,6 @@ pub struct ClashInfo {
|
|||||||
pub secret: Option<String>,
|
pub secret: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct Clash {
|
pub struct Clash {
|
||||||
/// maintain the clash config
|
/// maintain the clash config
|
||||||
pub config: Mapping,
|
pub config: Mapping,
|
||||||
@@ -29,23 +33,38 @@ pub struct Clash {
|
|||||||
|
|
||||||
/// clash sidecar
|
/// clash sidecar
|
||||||
pub sidecar: Option<CommandChild>,
|
pub sidecar: Option<CommandChild>,
|
||||||
|
|
||||||
|
/// save the main window
|
||||||
|
pub window: Option<Window>,
|
||||||
}
|
}
|
||||||
|
|
||||||
static CLASH_CONFIG: &str = "config.yaml";
|
|
||||||
|
|
||||||
// todo: be able to change config field
|
|
||||||
impl Clash {
|
impl Clash {
|
||||||
pub fn new() -> Clash {
|
pub fn new() -> Clash {
|
||||||
let config = Clash::get_config();
|
let config = Clash::read_config();
|
||||||
let info = Clash::get_info(&config);
|
let info = Clash::get_info(&config);
|
||||||
|
|
||||||
Clash {
|
Clash {
|
||||||
config,
|
config,
|
||||||
info,
|
info,
|
||||||
sidecar: None,
|
sidecar: None,
|
||||||
|
window: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// get clash config
|
||||||
|
fn read_config() -> Mapping {
|
||||||
|
config::read_yaml::<Mapping>(dirs::clash_path())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// save the clash config
|
||||||
|
fn save_config(&self) -> Result<()> {
|
||||||
|
config::save_yaml(
|
||||||
|
dirs::clash_path(),
|
||||||
|
&self.config,
|
||||||
|
Some("# Default Config For Clash Core\n\n"),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
/// parse the clash's config.yaml
|
/// parse the clash's config.yaml
|
||||||
/// get some information
|
/// get some information
|
||||||
fn get_info(clash_config: &Mapping) -> ClashInfo {
|
fn get_info(clash_config: &Mapping) -> ClashInfo {
|
||||||
@@ -76,7 +95,18 @@ impl Clash {
|
|||||||
|
|
||||||
let server = match clash_config.get(&key_server) {
|
let server = match clash_config.get(&key_server) {
|
||||||
Some(value) => match value {
|
Some(value) => match value {
|
||||||
Value::String(val_str) => Some(val_str.clone()),
|
Value::String(val_str) => {
|
||||||
|
// `external-controller` could be
|
||||||
|
// "127.0.0.1:9090" or ":9090"
|
||||||
|
// Todo: maybe it could support single port
|
||||||
|
let server = val_str.clone();
|
||||||
|
let server = match server.starts_with(":") {
|
||||||
|
true => format!("127.0.0.1{server}"),
|
||||||
|
false => server,
|
||||||
|
};
|
||||||
|
|
||||||
|
Some(server)
|
||||||
|
}
|
||||||
_ => None,
|
_ => None,
|
||||||
},
|
},
|
||||||
_ => None,
|
_ => None,
|
||||||
@@ -99,8 +129,13 @@ impl Clash {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// save the main window
|
||||||
|
pub fn set_window(&mut self, win: Option<Window>) {
|
||||||
|
self.window = win;
|
||||||
|
}
|
||||||
|
|
||||||
/// run clash sidecar
|
/// run clash sidecar
|
||||||
pub fn run_sidecar(&mut self) -> Result<(), String> {
|
pub fn run_sidecar(&mut self) -> Result<()> {
|
||||||
let app_dir = dirs::app_home_dir();
|
let app_dir = dirs::app_home_dir();
|
||||||
let app_dir = app_dir.as_os_str().to_str().unwrap();
|
let app_dir = app_dir.as_os_str().to_str().unwrap();
|
||||||
|
|
||||||
@@ -113,138 +148,296 @@ impl Clash {
|
|||||||
tauri::async_runtime::spawn(async move {
|
tauri::async_runtime::spawn(async move {
|
||||||
while let Some(event) = rx.recv().await {
|
while let Some(event) = rx.recv().await {
|
||||||
match event {
|
match event {
|
||||||
CommandEvent::Stdout(line) => log::info!("[stdout]: {}", line),
|
CommandEvent::Stdout(line) => log::info!("[clash]: {}", line),
|
||||||
CommandEvent::Stderr(err) => log::error!("[stderr]: {}", err),
|
CommandEvent::Stderr(err) => log::error!("[clash]: {}", err),
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
Err(err) => Err(err.to_string()),
|
Err(err) => bail!(err.to_string()),
|
||||||
},
|
},
|
||||||
Err(err) => Err(err.to_string()),
|
Err(err) => bail!(err.to_string()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// drop clash sidecar
|
/// drop clash sidecar
|
||||||
pub fn drop_sidecar(&mut self) -> Result<(), String> {
|
pub fn drop_sidecar(&mut self) -> Result<()> {
|
||||||
if let Some(sidecar) = self.sidecar.take() {
|
if let Some(sidecar) = self.sidecar.take() {
|
||||||
if let Err(err) = sidecar.kill() {
|
sidecar.kill()?;
|
||||||
return Err(format!("failed to drop clash for \"{}\"", err));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// restart clash sidecar
|
/// restart clash sidecar
|
||||||
/// should reactivate profile after restart
|
/// should reactivate profile after restart
|
||||||
pub fn restart_sidecar(&mut self, profiles: &mut Profiles) -> Result<(), String> {
|
pub fn restart_sidecar(&mut self, profiles: &mut Profiles) -> Result<()> {
|
||||||
self.update_config();
|
self.update_config();
|
||||||
self.drop_sidecar()?;
|
self.drop_sidecar()?;
|
||||||
self.run_sidecar()?;
|
self.run_sidecar()?;
|
||||||
profiles.activate(&self)
|
self.activate(profiles, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// update the clash info
|
/// update the clash info
|
||||||
pub fn update_config(&mut self) {
|
pub fn update_config(&mut self) {
|
||||||
self.config = Clash::get_config();
|
self.config = Clash::read_config();
|
||||||
self.info = Clash::get_info(&self.config);
|
self.info = Clash::get_info(&self.config);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// get clash config
|
|
||||||
fn get_config() -> Mapping {
|
|
||||||
config::read_yaml::<Mapping>(dirs::app_home_dir().join(CLASH_CONFIG))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// save the clash config
|
|
||||||
fn save_config(&self) -> Result<(), String> {
|
|
||||||
config::save_yaml(
|
|
||||||
dirs::app_home_dir().join(CLASH_CONFIG),
|
|
||||||
&self.config,
|
|
||||||
Some("# Default Config For Clash Core\n\n"),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// patch update the clash config
|
/// patch update the clash config
|
||||||
pub fn patch_config(
|
pub fn patch_config(
|
||||||
&mut self,
|
&mut self,
|
||||||
patch: Mapping,
|
patch: Mapping,
|
||||||
verge: &mut Verge,
|
verge: &mut Verge,
|
||||||
profiles: &mut Profiles,
|
profiles: &mut Profiles,
|
||||||
) -> Result<(), String> {
|
) -> Result<()> {
|
||||||
for (key, value) in patch.iter() {
|
let mix_port_key = Value::from("mixed-port");
|
||||||
|
let mut port = None;
|
||||||
|
|
||||||
|
for (key, value) in patch.into_iter() {
|
||||||
let value = value.clone();
|
let value = value.clone();
|
||||||
let key_str = key.as_str().clone().unwrap_or("");
|
|
||||||
|
|
||||||
// restart the clash
|
// check whether the mix_port is changed
|
||||||
if key_str == "mixed-port" {
|
if key == mix_port_key {
|
||||||
self.restart_sidecar(profiles)?;
|
if value.is_number() {
|
||||||
|
port = value.as_i64().as_ref().map(|n| n.to_string());
|
||||||
let port = if value.is_number() {
|
|
||||||
match value.as_i64().clone() {
|
|
||||||
Some(num) => Some(format!("{num}")),
|
|
||||||
None => None,
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
match value.as_str().clone() {
|
port = value.as_str().as_ref().map(|s| s.to_string());
|
||||||
Some(num) => Some(num.into()),
|
}
|
||||||
None => None,
|
|
||||||
}
|
|
||||||
};
|
|
||||||
verge.init_sysproxy(port);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if self.config.contains_key(key) {
|
self.config.insert(key.clone(), value);
|
||||||
self.config[key] = value;
|
|
||||||
} else {
|
|
||||||
self.config.insert(key.clone(), value);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
self.save_config()
|
|
||||||
|
self.save_config()?;
|
||||||
|
|
||||||
|
if let Some(port) = port {
|
||||||
|
self.restart_sidecar(profiles)?;
|
||||||
|
verge.init_sysproxy(Some(port));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// enable tun mode
|
/// enable tun mode
|
||||||
/// only revise the config and restart the
|
/// only revise the config and restart the
|
||||||
pub fn tun_mode(&mut self, enable: bool) -> Result<(), String> {
|
pub fn tun_mode(&mut self, enable: bool) -> Result<()> {
|
||||||
let tun_key = Value::String("tun".into());
|
// Windows 需要wintun.dll文件
|
||||||
let tun_val = self.config.get(&tun_key);
|
#[cfg(target_os = "windows")]
|
||||||
|
if enable {
|
||||||
let mut new_val = Mapping::new();
|
let wintun_dll = dirs::app_home_dir().join("wintun.dll");
|
||||||
|
if !wintun_dll.exists() {
|
||||||
if tun_val.is_some() && tun_val.as_ref().unwrap().is_mapping() {
|
bail!("failed to enable TUN for missing `wintun.dll`");
|
||||||
new_val = tun_val.as_ref().unwrap().as_mapping().unwrap().clone();
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
macro_rules! revise {
|
macro_rules! revise {
|
||||||
($map: expr, $key: expr, $val: expr) => {
|
($map: expr, $key: expr, $val: expr) => {
|
||||||
let ret_key = Value::String($key.into());
|
let ret_key = Value::String($key.into());
|
||||||
if $map.contains_key(&ret_key) {
|
$map.insert(ret_key, Value::from($val));
|
||||||
$map[&ret_key] = $val;
|
|
||||||
} else {
|
|
||||||
$map.insert(ret_key, $val);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// if key not exists then append value
|
||||||
macro_rules! append {
|
macro_rules! append {
|
||||||
($map: expr, $key: expr, $val: expr) => {
|
($map: expr, $key: expr, $val: expr) => {
|
||||||
let ret_key = Value::String($key.into());
|
let ret_key = Value::String($key.into());
|
||||||
if !$map.contains_key(&ret_key) {
|
if !$map.contains_key(&ret_key) {
|
||||||
$map.insert(ret_key, $val);
|
$map.insert(ret_key, Value::from($val));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
revise!(new_val, "enable", Value::from(enable));
|
// tun config
|
||||||
append!(new_val, "stack", Value::from("gvisor"));
|
let tun_val = self.config.get(&Value::from("tun"));
|
||||||
append!(new_val, "auto-route", Value::from(true));
|
let mut new_tun = Mapping::new();
|
||||||
append!(new_val, "auto-detect-interface", Value::from(true));
|
|
||||||
|
|
||||||
revise!(self.config, "tun", Value::from(new_val));
|
if tun_val.is_some() && tun_val.as_ref().unwrap().is_mapping() {
|
||||||
|
new_tun = tun_val.as_ref().unwrap().as_mapping().unwrap().clone();
|
||||||
|
}
|
||||||
|
|
||||||
|
revise!(new_tun, "enable", enable);
|
||||||
|
append!(new_tun, "stack", "gvisor");
|
||||||
|
append!(new_tun, "dns-hijack", vec!["198.18.0.2:53"]);
|
||||||
|
append!(new_tun, "auto-route", true);
|
||||||
|
append!(new_tun, "auto-detect-interface", true);
|
||||||
|
|
||||||
|
revise!(self.config, "tun", new_tun);
|
||||||
|
|
||||||
|
// dns config
|
||||||
|
let dns_val = self.config.get(&Value::from("dns"));
|
||||||
|
let mut new_dns = Mapping::new();
|
||||||
|
|
||||||
|
if dns_val.is_some() && dns_val.as_ref().unwrap().is_mapping() {
|
||||||
|
new_dns = dns_val.as_ref().unwrap().as_mapping().unwrap().clone();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 借鉴cfw的默认配置
|
||||||
|
revise!(new_dns, "enable", enable);
|
||||||
|
append!(new_dns, "enhanced-mode", "fake-ip");
|
||||||
|
append!(
|
||||||
|
new_dns,
|
||||||
|
"nameserver",
|
||||||
|
vec!["114.114.114.114", "223.5.5.5", "8.8.8.8"]
|
||||||
|
);
|
||||||
|
append!(new_dns, "fallback", vec![] as Vec<&str>);
|
||||||
|
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
append!(
|
||||||
|
new_dns,
|
||||||
|
"fake-ip-filter",
|
||||||
|
vec![
|
||||||
|
"dns.msftncsi.com",
|
||||||
|
"www.msftncsi.com",
|
||||||
|
"www.msftconnecttest.com"
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
|
revise!(self.config, "dns", new_dns);
|
||||||
|
|
||||||
self.save_config()
|
self.save_config()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// activate the profile
|
||||||
|
/// generate a new profile to the temp_dir
|
||||||
|
/// then put the path to the clash core
|
||||||
|
fn _activate(info: ClashInfo, config: Mapping, window: Option<Window>) -> Result<()> {
|
||||||
|
let temp_path = dirs::profiles_temp_path();
|
||||||
|
config::save_yaml(temp_path.clone(), &config, Some("# Clash Verge Temp File"))?;
|
||||||
|
|
||||||
|
tauri::async_runtime::spawn(async move {
|
||||||
|
let server = info.server.unwrap();
|
||||||
|
let server = format!("http://{server}/configs");
|
||||||
|
|
||||||
|
let mut headers = HeaderMap::new();
|
||||||
|
headers.insert("Content-Type", "application/json".parse().unwrap());
|
||||||
|
|
||||||
|
if let Some(secret) = info.secret.as_ref() {
|
||||||
|
let secret = format!("Bearer {}", secret.clone()).parse().unwrap();
|
||||||
|
headers.insert("Authorization", secret);
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut data = HashMap::new();
|
||||||
|
data.insert("path", temp_path.as_os_str().to_str().unwrap());
|
||||||
|
|
||||||
|
// retry 5 times
|
||||||
|
for _ in 0..5 {
|
||||||
|
match reqwest::ClientBuilder::new().no_proxy().build() {
|
||||||
|
Ok(client) => {
|
||||||
|
let builder = client.put(&server).headers(headers.clone()).json(&data);
|
||||||
|
|
||||||
|
match builder.send().await {
|
||||||
|
Ok(resp) => {
|
||||||
|
if resp.status() != 204 {
|
||||||
|
log::error!("failed to activate clash for status \"{}\"", resp.status());
|
||||||
|
}
|
||||||
|
|
||||||
|
// emit the window to update something
|
||||||
|
if let Some(window) = window {
|
||||||
|
window.emit("verge://refresh-clash-config", "yes").unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
// do not retry
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Err(err) => log::error!("failed to activate for `{err}`"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(err) => log::error!("failed to activate for `{err}`"),
|
||||||
|
}
|
||||||
|
sleep(Duration::from_millis(500)).await;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// enhanced profiles mode
|
||||||
|
/// only change the enhanced profiles
|
||||||
|
pub fn activate_enhanced(&self, profiles: &Profiles, delay: bool) -> Result<()> {
|
||||||
|
if self.window.is_none() {
|
||||||
|
bail!("failed to get the main window");
|
||||||
|
}
|
||||||
|
|
||||||
|
let win = self.window.clone().unwrap();
|
||||||
|
let event_name = help::get_uid("e");
|
||||||
|
let event_name = format!("enhanced-cb-{event_name}");
|
||||||
|
|
||||||
|
let info = self.info.clone();
|
||||||
|
let mut config = self.config.clone();
|
||||||
|
|
||||||
|
// generate the payload
|
||||||
|
let payload = profiles.gen_enhanced(event_name.clone())?;
|
||||||
|
let window = self.window.clone();
|
||||||
|
|
||||||
|
win.once(&event_name, move |event| {
|
||||||
|
if let Some(result) = event.payload() {
|
||||||
|
let result: PrfEnhancedResult = serde_json::from_str(result).unwrap();
|
||||||
|
|
||||||
|
if let Some(data) = result.data {
|
||||||
|
// all of these can not be revised by script
|
||||||
|
// http/https/socks port should be under control
|
||||||
|
let not_allow = vec![
|
||||||
|
"port",
|
||||||
|
"socks-port",
|
||||||
|
"mixed-port",
|
||||||
|
"allow-lan",
|
||||||
|
"mode",
|
||||||
|
"external-controller",
|
||||||
|
"secret",
|
||||||
|
"log-level",
|
||||||
|
];
|
||||||
|
|
||||||
|
for (key, value) in data.into_iter() {
|
||||||
|
key.as_str().map(|key_str| {
|
||||||
|
// change to lowercase
|
||||||
|
let mut key_str = String::from(key_str);
|
||||||
|
key_str.make_ascii_lowercase();
|
||||||
|
|
||||||
|
// filter
|
||||||
|
if !not_allow.contains(&&*key_str) {
|
||||||
|
config.insert(Value::String(key_str), value);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
log::info!("profile enhanced status {}", result.status);
|
||||||
|
|
||||||
|
Self::_activate(info, config, window).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(error) = result.error {
|
||||||
|
log::error!("{error}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
tauri::async_runtime::spawn(async move {
|
||||||
|
// wait the window setup during resolve app
|
||||||
|
if delay {
|
||||||
|
sleep(Duration::from_secs(2)).await;
|
||||||
|
}
|
||||||
|
win.emit("script-handler", payload).unwrap();
|
||||||
|
});
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// activate the profile
|
||||||
|
/// auto activate enhanced profile
|
||||||
|
pub fn activate(&self, profiles: &Profiles, delay: bool) -> Result<()> {
|
||||||
|
let gen_map = profiles.gen_activate()?;
|
||||||
|
let info = self.info.clone();
|
||||||
|
let mut config = self.config.clone();
|
||||||
|
|
||||||
|
for (key, value) in gen_map.into_iter() {
|
||||||
|
config.insert(key, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
Self::_activate(info, config, self.window.clone())?;
|
||||||
|
self.activate_enhanced(profiles, delay)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for Clash {
|
impl Default for Clash {
|
||||||
@@ -256,7 +449,7 @@ impl Default for Clash {
|
|||||||
impl Drop for Clash {
|
impl Drop for Clash {
|
||||||
fn drop(&mut self) {
|
fn drop(&mut self) {
|
||||||
if let Err(err) = self.drop_sidecar() {
|
if let Err(err) = self.drop_sidecar() {
|
||||||
log::error!("{}", err);
|
log::error!("{err}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,53 +1,60 @@
|
|||||||
use super::{Clash, ClashInfo};
|
use crate::utils::{config, dirs, help, tmpl};
|
||||||
use crate::utils::{config, dirs, tmpl};
|
use anyhow::{bail, Context, Result};
|
||||||
use reqwest::header::HeaderMap;
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_yaml::{Mapping, Value};
|
use serde_yaml::{Mapping, Value};
|
||||||
use std::collections::HashMap;
|
use std::{fs, io::Write};
|
||||||
use std::env::temp_dir;
|
|
||||||
use std::fs::{remove_file, File};
|
|
||||||
use std::io::Write;
|
|
||||||
use std::path::PathBuf;
|
|
||||||
use std::time::{SystemTime, UNIX_EPOCH};
|
|
||||||
|
|
||||||
/// Define the `profiles.yaml` schema
|
#[derive(Debug, Clone, Deserialize, Serialize)]
|
||||||
#[derive(Default, Debug, Clone, Deserialize, Serialize)]
|
pub struct PrfItem {
|
||||||
pub struct Profiles {
|
pub uid: Option<String>,
|
||||||
/// current profile's name
|
|
||||||
pub current: Option<usize>,
|
|
||||||
|
|
||||||
/// profile list
|
/// profile item type
|
||||||
pub items: Option<Vec<ProfileItem>>,
|
/// enum value: remote | local | script | merge
|
||||||
}
|
#[serde(rename = "type")]
|
||||||
|
pub itype: Option<String>,
|
||||||
|
|
||||||
#[derive(Default, Debug, Clone, Deserialize, Serialize)]
|
|
||||||
pub struct ProfileItem {
|
|
||||||
/// profile name
|
/// profile name
|
||||||
pub name: Option<String>,
|
pub name: Option<String>,
|
||||||
|
|
||||||
/// profile description
|
/// profile description
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
pub desc: Option<String>,
|
pub desc: Option<String>,
|
||||||
|
|
||||||
/// profile file
|
/// profile file
|
||||||
pub file: Option<String>,
|
pub file: Option<String>,
|
||||||
/// current mode
|
|
||||||
pub mode: Option<String>,
|
|
||||||
/// source url
|
/// source url
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
pub url: Option<String>,
|
pub url: Option<String>,
|
||||||
|
|
||||||
/// selected infomation
|
/// selected infomation
|
||||||
pub selected: Option<Vec<ProfileSelected>>,
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
/// user info
|
pub selected: Option<Vec<PrfSelected>>,
|
||||||
pub extra: Option<ProfileExtra>,
|
|
||||||
|
/// subscription user info
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub extra: Option<PrfExtra>,
|
||||||
|
|
||||||
/// updated time
|
/// updated time
|
||||||
pub updated: Option<usize>,
|
pub updated: Option<usize>,
|
||||||
|
|
||||||
|
/// some options of the item
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub option: Option<PrfOption>,
|
||||||
|
|
||||||
|
/// the file data
|
||||||
|
#[serde(skip)]
|
||||||
|
pub file_data: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default, Debug, Clone, Deserialize, Serialize)]
|
#[derive(Default, Debug, Clone, Deserialize, Serialize)]
|
||||||
pub struct ProfileSelected {
|
pub struct PrfSelected {
|
||||||
pub name: Option<String>,
|
pub name: Option<String>,
|
||||||
pub now: Option<String>,
|
pub now: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default, Debug, Clone, Copy, Deserialize, Serialize)]
|
#[derive(Default, Debug, Clone, Copy, Deserialize, Serialize)]
|
||||||
pub struct ProfileExtra {
|
pub struct PrfExtra {
|
||||||
pub upload: usize,
|
pub upload: usize,
|
||||||
pub download: usize,
|
pub download: usize,
|
||||||
pub total: usize,
|
pub total: usize,
|
||||||
@@ -55,329 +62,609 @@ pub struct ProfileExtra {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default, Debug, Clone, Deserialize, Serialize)]
|
#[derive(Default, Debug, Clone, Deserialize, Serialize)]
|
||||||
/// the result from url
|
pub struct PrfOption {
|
||||||
pub struct ProfileResponse {
|
/// for `remote` profile's http request
|
||||||
pub name: String,
|
/// see issue #13
|
||||||
pub file: String,
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
pub data: String,
|
pub user_agent: Option<String>,
|
||||||
pub extra: Option<ProfileExtra>,
|
|
||||||
|
/// for `remote` profile
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub with_proxy: Option<bool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
static PROFILE_YAML: &str = "profiles.yaml";
|
impl PrfOption {
|
||||||
static PROFILE_TEMP: &str = "clash-verge-runtime.yaml";
|
pub fn merge(one: Option<Self>, other: Option<Self>) -> Option<Self> {
|
||||||
|
if one.is_some() && other.is_some() {
|
||||||
|
let mut one = one.unwrap();
|
||||||
|
let other = other.unwrap();
|
||||||
|
|
||||||
|
if let Some(val) = other.user_agent {
|
||||||
|
one.user_agent = Some(val);
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(val) = other.with_proxy {
|
||||||
|
one.with_proxy = Some(val);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Some(one);
|
||||||
|
}
|
||||||
|
|
||||||
|
if one.is_none() {
|
||||||
|
return other;
|
||||||
|
}
|
||||||
|
|
||||||
|
return one;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for PrfItem {
|
||||||
|
fn default() -> Self {
|
||||||
|
PrfItem {
|
||||||
|
uid: None,
|
||||||
|
itype: None,
|
||||||
|
name: None,
|
||||||
|
desc: None,
|
||||||
|
file: None,
|
||||||
|
url: None,
|
||||||
|
selected: None,
|
||||||
|
extra: None,
|
||||||
|
updated: None,
|
||||||
|
option: None,
|
||||||
|
file_data: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PrfItem {
|
||||||
|
/// From partial item
|
||||||
|
/// must contain `itype`
|
||||||
|
pub async fn from(item: PrfItem, file_data: Option<String>) -> Result<PrfItem> {
|
||||||
|
if item.itype.is_none() {
|
||||||
|
bail!("type should not be null");
|
||||||
|
}
|
||||||
|
|
||||||
|
match item.itype.unwrap().as_str() {
|
||||||
|
"remote" => {
|
||||||
|
if item.url.is_none() {
|
||||||
|
bail!("url should not be null");
|
||||||
|
}
|
||||||
|
let url = item.url.as_ref().unwrap().as_str();
|
||||||
|
let name = item.name;
|
||||||
|
let desc = item.desc;
|
||||||
|
PrfItem::from_url(url, name, desc, item.option).await
|
||||||
|
}
|
||||||
|
"local" => {
|
||||||
|
let name = item.name.unwrap_or("Local File".into());
|
||||||
|
let desc = item.desc.unwrap_or("".into());
|
||||||
|
PrfItem::from_local(name, desc, file_data)
|
||||||
|
}
|
||||||
|
"merge" => {
|
||||||
|
let name = item.name.unwrap_or("Merge".into());
|
||||||
|
let desc = item.desc.unwrap_or("".into());
|
||||||
|
PrfItem::from_merge(name, desc)
|
||||||
|
}
|
||||||
|
"script" => {
|
||||||
|
let name = item.name.unwrap_or("Script".into());
|
||||||
|
let desc = item.desc.unwrap_or("".into());
|
||||||
|
PrfItem::from_script(name, desc)
|
||||||
|
}
|
||||||
|
typ @ _ => bail!("invalid type \"{typ}\""),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// ## Local type
|
||||||
|
/// create a new item from name/desc
|
||||||
|
pub fn from_local(name: String, desc: String, file_data: Option<String>) -> Result<PrfItem> {
|
||||||
|
let uid = help::get_uid("l");
|
||||||
|
let file = format!("{uid}.yaml");
|
||||||
|
|
||||||
|
Ok(PrfItem {
|
||||||
|
uid: Some(uid),
|
||||||
|
itype: Some("local".into()),
|
||||||
|
name: Some(name),
|
||||||
|
desc: Some(desc),
|
||||||
|
file: Some(file),
|
||||||
|
url: None,
|
||||||
|
selected: None,
|
||||||
|
extra: None,
|
||||||
|
option: None,
|
||||||
|
updated: Some(help::get_now()),
|
||||||
|
file_data: Some(file_data.unwrap_or(tmpl::ITEM_LOCAL.into())),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// ## Remote type
|
||||||
|
/// create a new item from url
|
||||||
|
pub async fn from_url(
|
||||||
|
url: &str,
|
||||||
|
name: Option<String>,
|
||||||
|
desc: Option<String>,
|
||||||
|
option: Option<PrfOption>,
|
||||||
|
) -> Result<PrfItem> {
|
||||||
|
let with_proxy = match option.as_ref() {
|
||||||
|
Some(opt) => opt.with_proxy.unwrap_or(false),
|
||||||
|
None => false,
|
||||||
|
};
|
||||||
|
let user_agent = match option.as_ref() {
|
||||||
|
Some(opt) => opt.user_agent.clone(),
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut builder = reqwest::ClientBuilder::new();
|
||||||
|
|
||||||
|
if !with_proxy {
|
||||||
|
builder = builder.no_proxy();
|
||||||
|
}
|
||||||
|
if let Some(user_agent) = user_agent {
|
||||||
|
builder = builder.user_agent(user_agent);
|
||||||
|
}
|
||||||
|
|
||||||
|
let resp = builder.build()?.get(url).send().await?;
|
||||||
|
let header = resp.headers();
|
||||||
|
|
||||||
|
// parse the Subscription Userinfo
|
||||||
|
let extra = match header.get("Subscription-Userinfo") {
|
||||||
|
Some(value) => {
|
||||||
|
let sub_info = value.to_str().unwrap_or("");
|
||||||
|
|
||||||
|
Some(PrfExtra {
|
||||||
|
upload: help::parse_str(sub_info, "upload=").unwrap_or(0),
|
||||||
|
download: help::parse_str(sub_info, "download=").unwrap_or(0),
|
||||||
|
total: help::parse_str(sub_info, "total=").unwrap_or(0),
|
||||||
|
expire: help::parse_str(sub_info, "expire=").unwrap_or(0),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
|
|
||||||
|
let uid = help::get_uid("r");
|
||||||
|
let file = format!("{uid}.yaml");
|
||||||
|
let name = name.unwrap_or(uid.clone());
|
||||||
|
let data = resp.text_with_charset("utf-8").await?;
|
||||||
|
|
||||||
|
Ok(PrfItem {
|
||||||
|
uid: Some(uid),
|
||||||
|
itype: Some("remote".into()),
|
||||||
|
name: Some(name),
|
||||||
|
desc,
|
||||||
|
file: Some(file),
|
||||||
|
url: Some(url.into()),
|
||||||
|
selected: None,
|
||||||
|
extra,
|
||||||
|
option,
|
||||||
|
updated: Some(help::get_now()),
|
||||||
|
file_data: Some(data),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// ## Merge type (enhance)
|
||||||
|
/// create the enhanced item by using `merge` rule
|
||||||
|
pub fn from_merge(name: String, desc: String) -> Result<PrfItem> {
|
||||||
|
let uid = help::get_uid("m");
|
||||||
|
let file = format!("{uid}.yaml");
|
||||||
|
|
||||||
|
Ok(PrfItem {
|
||||||
|
uid: Some(uid),
|
||||||
|
itype: Some("merge".into()),
|
||||||
|
name: Some(name),
|
||||||
|
desc: Some(desc),
|
||||||
|
file: Some(file),
|
||||||
|
url: None,
|
||||||
|
selected: None,
|
||||||
|
extra: None,
|
||||||
|
option: None,
|
||||||
|
updated: Some(help::get_now()),
|
||||||
|
file_data: Some(tmpl::ITEM_MERGE.into()),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// ## Script type (enhance)
|
||||||
|
/// create the enhanced item by using javascript(browserjs)
|
||||||
|
pub fn from_script(name: String, desc: String) -> Result<PrfItem> {
|
||||||
|
let uid = help::get_uid("s");
|
||||||
|
let file = format!("{uid}.js"); // js ext
|
||||||
|
|
||||||
|
Ok(PrfItem {
|
||||||
|
uid: Some(uid),
|
||||||
|
itype: Some("script".into()),
|
||||||
|
name: Some(name),
|
||||||
|
desc: Some(desc),
|
||||||
|
file: Some(file),
|
||||||
|
url: None,
|
||||||
|
selected: None,
|
||||||
|
extra: None,
|
||||||
|
option: None,
|
||||||
|
updated: Some(help::get_now()),
|
||||||
|
file_data: Some(tmpl::ITEM_SCRIPT.into()),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
///
|
||||||
|
/// ## Profiles Config
|
||||||
|
///
|
||||||
|
/// Define the `profiles.yaml` schema
|
||||||
|
///
|
||||||
|
#[derive(Default, Debug, Clone, Deserialize, Serialize)]
|
||||||
|
pub struct Profiles {
|
||||||
|
/// same as PrfConfig.current
|
||||||
|
current: Option<String>,
|
||||||
|
|
||||||
|
/// same as PrfConfig.chain
|
||||||
|
chain: Option<Vec<String>>,
|
||||||
|
|
||||||
|
/// profile list
|
||||||
|
items: Option<Vec<PrfItem>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
macro_rules! patch {
|
||||||
|
($lv: expr, $rv: expr, $key: tt) => {
|
||||||
|
if ($rv.$key).is_some() {
|
||||||
|
$lv.$key = $rv.$key;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
impl Profiles {
|
impl Profiles {
|
||||||
/// read the config from the file
|
/// read the config from the file
|
||||||
pub fn read_file() -> Self {
|
pub fn read_file() -> Self {
|
||||||
config::read_yaml::<Profiles>(dirs::app_home_dir().join(PROFILE_YAML))
|
let mut profiles = config::read_yaml::<Self>(dirs::profiles_path());
|
||||||
|
|
||||||
|
if profiles.items.is_none() {
|
||||||
|
profiles.items = Some(vec![]);
|
||||||
|
}
|
||||||
|
|
||||||
|
profiles.items.as_mut().map(|items| {
|
||||||
|
for mut item in items.iter_mut() {
|
||||||
|
if item.uid.is_none() {
|
||||||
|
item.uid = Some(help::get_uid("d"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
profiles
|
||||||
}
|
}
|
||||||
|
|
||||||
/// save the config to the file
|
/// save the config to the file
|
||||||
pub fn save_file(&self) -> Result<(), String> {
|
pub fn save_file(&self) -> Result<()> {
|
||||||
config::save_yaml(
|
config::save_yaml(
|
||||||
dirs::app_home_dir().join(PROFILE_YAML),
|
dirs::profiles_path(),
|
||||||
self,
|
self,
|
||||||
Some("# Profiles Config for Clash Verge\n\n"),
|
Some("# Profiles Config for Clash Verge\n\n"),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// sync the config between file and memory
|
/// sync the config between file and memory
|
||||||
pub fn sync_file(&mut self) -> Result<(), String> {
|
pub fn sync_file(&mut self) -> Result<()> {
|
||||||
let data = config::read_yaml::<Self>(dirs::app_home_dir().join(PROFILE_YAML));
|
let data = Self::read_file();
|
||||||
if data.current.is_none() {
|
if data.current.is_none() && data.items.is_none() {
|
||||||
Err("failed to read profiles.yaml".into())
|
bail!("failed to read profiles.yaml");
|
||||||
} else {
|
|
||||||
self.current = data.current;
|
|
||||||
self.items = data.items;
|
|
||||||
Ok(())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
self.current = data.current;
|
||||||
|
self.chain = data.chain;
|
||||||
|
self.items = data.items;
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// import the new profile from the url
|
/// get the current uid
|
||||||
/// and update the config file
|
pub fn get_current(&self) -> Option<String> {
|
||||||
pub fn import_from_url(&mut self, url: String, result: ProfileResponse) -> Result<(), String> {
|
self.current.clone()
|
||||||
// save the profile file
|
|
||||||
let path = dirs::app_home_dir().join("profiles").join(&result.file);
|
|
||||||
let file_data = result.data.as_bytes();
|
|
||||||
File::create(path).unwrap().write(file_data).unwrap();
|
|
||||||
|
|
||||||
// update `profiles.yaml`
|
|
||||||
let data = Profiles::read_file();
|
|
||||||
let mut items = data.items.unwrap_or(vec![]);
|
|
||||||
|
|
||||||
let now = SystemTime::now()
|
|
||||||
.duration_since(UNIX_EPOCH)
|
|
||||||
.unwrap()
|
|
||||||
.as_secs();
|
|
||||||
|
|
||||||
items.push(ProfileItem {
|
|
||||||
name: Some(result.name),
|
|
||||||
desc: Some("imported url".into()),
|
|
||||||
file: Some(result.file),
|
|
||||||
mode: Some(format!("rule")),
|
|
||||||
url: Some(url),
|
|
||||||
selected: Some(vec![]),
|
|
||||||
extra: result.extra,
|
|
||||||
updated: Some(now as usize),
|
|
||||||
});
|
|
||||||
|
|
||||||
self.items = Some(items);
|
|
||||||
if data.current.is_none() {
|
|
||||||
self.current = Some(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
self.save_file()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// set the current and save to file
|
/// only change the main to the target id
|
||||||
pub fn put_current(&mut self, index: usize) -> Result<(), String> {
|
pub fn put_current(&mut self, uid: String) -> Result<()> {
|
||||||
let items = self.items.take().unwrap_or(vec![]);
|
if self.items.is_none() {
|
||||||
|
self.items = Some(vec![]);
|
||||||
if index >= items.len() {
|
|
||||||
return Err("the index out of bound".into());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
self.items = Some(items);
|
let items = self.items.as_ref().unwrap();
|
||||||
self.current = Some(index);
|
let some_uid = Some(uid.clone());
|
||||||
self.save_file()
|
|
||||||
|
for each in items.iter() {
|
||||||
|
if each.uid == some_uid {
|
||||||
|
self.current = some_uid;
|
||||||
|
return self.save_file();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bail!("invalid uid \"{uid}\"");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// just change the `chain`
|
||||||
|
pub fn put_chain(&mut self, chain: Option<Vec<String>>) {
|
||||||
|
self.chain = chain;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// find the item by the uid
|
||||||
|
pub fn get_item(&self, uid: &String) -> Result<&PrfItem> {
|
||||||
|
if self.items.is_some() {
|
||||||
|
let items = self.items.as_ref().unwrap();
|
||||||
|
let some_uid = Some(uid.clone());
|
||||||
|
|
||||||
|
for each in items.iter() {
|
||||||
|
if each.uid == some_uid {
|
||||||
|
return Ok(each);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bail!("failed to get the item by \"{}\"", uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// append new item
|
/// append new item
|
||||||
/// return the new item's index
|
/// if the file_data is some
|
||||||
pub fn append_item(&mut self, name: String, desc: String) -> Result<(usize, PathBuf), String> {
|
/// then should save the data to file
|
||||||
|
pub fn append_item(&mut self, mut item: PrfItem) -> Result<()> {
|
||||||
|
if item.uid.is_none() {
|
||||||
|
bail!("the uid should not be null");
|
||||||
|
}
|
||||||
|
|
||||||
|
// save the file data
|
||||||
|
// move the field value after save
|
||||||
|
if let Some(file_data) = item.file_data.take() {
|
||||||
|
if item.file.is_none() {
|
||||||
|
bail!("the file should not be null");
|
||||||
|
}
|
||||||
|
|
||||||
|
let file = item.file.clone().unwrap();
|
||||||
|
let path = dirs::app_profiles_dir().join(&file);
|
||||||
|
|
||||||
|
fs::File::create(path)
|
||||||
|
.context(format!("failed to create file \"{}\"", file))?
|
||||||
|
.write(file_data.as_bytes())
|
||||||
|
.context(format!("failed to write to file \"{}\"", file))?;
|
||||||
|
}
|
||||||
|
|
||||||
|
if self.items.is_none() {
|
||||||
|
self.items = Some(vec![]);
|
||||||
|
}
|
||||||
|
|
||||||
|
self.items.as_mut().map(|items| items.push(item));
|
||||||
|
self.save_file()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// update the item's value
|
||||||
|
pub fn patch_item(&mut self, uid: String, item: PrfItem) -> Result<()> {
|
||||||
let mut items = self.items.take().unwrap_or(vec![]);
|
let mut items = self.items.take().unwrap_or(vec![]);
|
||||||
|
|
||||||
// create a new profile file
|
for mut each in items.iter_mut() {
|
||||||
let now = SystemTime::now()
|
if each.uid == Some(uid.clone()) {
|
||||||
.duration_since(UNIX_EPOCH)
|
patch!(each, item, itype);
|
||||||
.unwrap()
|
patch!(each, item, name);
|
||||||
.as_secs();
|
patch!(each, item, desc);
|
||||||
let file = format!("{}.yaml", now);
|
patch!(each, item, file);
|
||||||
let path = dirs::app_home_dir().join("profiles").join(&file);
|
patch!(each, item, url);
|
||||||
|
patch!(each, item, selected);
|
||||||
|
patch!(each, item, extra);
|
||||||
|
patch!(each, item, updated);
|
||||||
|
patch!(each, item, option);
|
||||||
|
|
||||||
match File::create(&path).unwrap().write(tmpl::ITEM_CONFIG) {
|
|
||||||
Ok(_) => {
|
|
||||||
items.push(ProfileItem {
|
|
||||||
name: Some(name),
|
|
||||||
desc: Some(desc),
|
|
||||||
file: Some(file),
|
|
||||||
mode: None,
|
|
||||||
url: None,
|
|
||||||
selected: Some(vec![]),
|
|
||||||
extra: None,
|
|
||||||
updated: Some(now as usize),
|
|
||||||
});
|
|
||||||
|
|
||||||
let index = items.len();
|
|
||||||
self.items = Some(items);
|
self.items = Some(items);
|
||||||
Ok((index, path))
|
return self.save_file();
|
||||||
}
|
|
||||||
Err(_) => Err("failed to create file".into()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// update the target profile
|
|
||||||
/// and save to config file
|
|
||||||
/// only support the url item
|
|
||||||
pub fn update_item(&mut self, index: usize, result: ProfileResponse) -> Result<(), String> {
|
|
||||||
let mut items = self.items.take().unwrap_or(vec![]);
|
|
||||||
|
|
||||||
let now = SystemTime::now()
|
|
||||||
.duration_since(UNIX_EPOCH)
|
|
||||||
.unwrap()
|
|
||||||
.as_secs() as usize;
|
|
||||||
|
|
||||||
// update file
|
|
||||||
let file_path = &items[index].file.as_ref().unwrap();
|
|
||||||
let file_path = dirs::app_home_dir().join("profiles").join(file_path);
|
|
||||||
let file_data = result.data.as_bytes();
|
|
||||||
File::create(file_path).unwrap().write(file_data).unwrap();
|
|
||||||
|
|
||||||
items[index].name = Some(result.name);
|
|
||||||
items[index].extra = result.extra;
|
|
||||||
items[index].updated = Some(now);
|
|
||||||
|
|
||||||
self.items = Some(items);
|
|
||||||
self.save_file()
|
|
||||||
}
|
|
||||||
|
|
||||||
/// patch item
|
|
||||||
pub fn patch_item(&mut self, index: usize, profile: ProfileItem) -> Result<(), String> {
|
|
||||||
let mut items = self.items.take().unwrap_or(vec![]);
|
|
||||||
if index >= items.len() {
|
|
||||||
return Err("index out of bound".into());
|
|
||||||
}
|
|
||||||
|
|
||||||
if profile.name.is_some() {
|
|
||||||
items[index].name = profile.name;
|
|
||||||
}
|
|
||||||
if profile.file.is_some() {
|
|
||||||
items[index].file = profile.file;
|
|
||||||
}
|
|
||||||
if profile.mode.is_some() {
|
|
||||||
items[index].mode = profile.mode;
|
|
||||||
}
|
|
||||||
if profile.url.is_some() {
|
|
||||||
items[index].url = profile.url;
|
|
||||||
}
|
|
||||||
if profile.selected.is_some() {
|
|
||||||
items[index].selected = profile.selected;
|
|
||||||
}
|
|
||||||
if profile.extra.is_some() {
|
|
||||||
items[index].extra = profile.extra;
|
|
||||||
}
|
|
||||||
|
|
||||||
self.items = Some(items);
|
|
||||||
self.save_file()
|
|
||||||
}
|
|
||||||
|
|
||||||
/// delete the item
|
|
||||||
pub fn delete_item(&mut self, index: usize) -> Result<bool, String> {
|
|
||||||
let mut current = self.current.clone().unwrap_or(0);
|
|
||||||
let mut items = self.items.clone().unwrap_or(vec![]);
|
|
||||||
|
|
||||||
if index >= items.len() {
|
|
||||||
return Err("index out of bound".into());
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut rm_item = items.remove(index);
|
|
||||||
|
|
||||||
// delete the file
|
|
||||||
if let Some(file) = rm_item.file.take() {
|
|
||||||
let file_path = dirs::app_home_dir().join("profiles").join(file);
|
|
||||||
|
|
||||||
if file_path.exists() {
|
|
||||||
if let Err(err) = remove_file(file_path) {
|
|
||||||
log::error!("{err}");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut should_change = false;
|
|
||||||
|
|
||||||
if current == index {
|
|
||||||
current = 0;
|
|
||||||
should_change = true;
|
|
||||||
} else if current > index {
|
|
||||||
current = current - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
self.current = Some(current);
|
|
||||||
self.items = Some(items);
|
self.items = Some(items);
|
||||||
|
bail!("failed to found the uid \"{uid}\"")
|
||||||
match self.save_file() {
|
|
||||||
Ok(_) => Ok(should_change),
|
|
||||||
Err(err) => Err(err),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// activate current profile
|
/// be used to update the remote item
|
||||||
pub fn activate(&self, clash: &Clash) -> Result<(), String> {
|
/// only patch `updated` `extra` `file_data`
|
||||||
let current = self.current.unwrap_or(0);
|
pub fn update_item(&mut self, uid: String, mut item: PrfItem) -> Result<()> {
|
||||||
match self.items.clone() {
|
if self.items.is_none() {
|
||||||
Some(items) => {
|
self.items = Some(vec![]);
|
||||||
if current >= items.len() {
|
}
|
||||||
return Err("the index out of bound".into());
|
|
||||||
}
|
|
||||||
|
|
||||||
let profile = items[current].clone();
|
// find the item
|
||||||
let clash_config = clash.config.clone();
|
let _ = self.get_item(&uid)?;
|
||||||
let clash_info = clash.info.clone();
|
|
||||||
tauri::async_runtime::spawn(async move {
|
self.items.as_mut().map(|items| {
|
||||||
let mut count = 5; // retry times
|
let some_uid = Some(uid.clone());
|
||||||
let mut err = String::from("");
|
|
||||||
while count > 0 {
|
for mut each in items.iter_mut() {
|
||||||
match activate_profile(&profile, &clash_config, &clash_info).await {
|
if each.uid == some_uid {
|
||||||
Ok(_) => return,
|
each.extra = item.extra;
|
||||||
Err(e) => err = e,
|
each.updated = item.updated;
|
||||||
}
|
|
||||||
count -= 1;
|
// save the file data
|
||||||
|
// move the field value after save
|
||||||
|
if let Some(file_data) = item.file_data.take() {
|
||||||
|
let file = each.file.take();
|
||||||
|
let file = file.unwrap_or(item.file.take().unwrap_or(format!("{}.yaml", &uid)));
|
||||||
|
|
||||||
|
// the file must exists
|
||||||
|
each.file = Some(file.clone());
|
||||||
|
|
||||||
|
let path = dirs::app_profiles_dir().join(&file);
|
||||||
|
|
||||||
|
fs::File::create(path)
|
||||||
|
.unwrap()
|
||||||
|
.write(file_data.as_bytes())
|
||||||
|
.unwrap();
|
||||||
}
|
}
|
||||||
log::error!("failed to activate for `{}`", err);
|
|
||||||
});
|
|
||||||
|
|
||||||
Ok(())
|
break;
|
||||||
}
|
}
|
||||||
None => Err("empty profiles".into()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// put the profile to clash
|
|
||||||
pub async fn activate_profile(
|
|
||||||
profile_item: &ProfileItem,
|
|
||||||
clash_config: &Mapping,
|
|
||||||
clash_info: &ClashInfo,
|
|
||||||
) -> Result<(), String> {
|
|
||||||
// temp profile's path
|
|
||||||
let temp_path = temp_dir().join(PROFILE_TEMP);
|
|
||||||
|
|
||||||
// generate temp profile
|
|
||||||
{
|
|
||||||
let file_name = match profile_item.file.clone() {
|
|
||||||
Some(file_name) => file_name,
|
|
||||||
None => return Err("profile item should have `file` field".into()),
|
|
||||||
};
|
|
||||||
|
|
||||||
let file_path = dirs::app_home_dir().join("profiles").join(file_name);
|
|
||||||
if !file_path.exists() {
|
|
||||||
return Err(format!(
|
|
||||||
"profile `{}` not exists",
|
|
||||||
file_path.as_os_str().to_str().unwrap()
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
// begin to generate the new profile config
|
|
||||||
let def_config = config::read_yaml::<Mapping>(file_path.clone());
|
|
||||||
|
|
||||||
// use the clash config except 5 keys below
|
|
||||||
let mut new_config = clash_config.clone();
|
|
||||||
|
|
||||||
// Only the following fields are allowed:
|
|
||||||
// proxies/proxy-providers/proxy-groups/rule-providers/rules
|
|
||||||
let valid_keys = vec![
|
|
||||||
"proxies",
|
|
||||||
"proxy-providers",
|
|
||||||
"proxy-groups",
|
|
||||||
"rule-providers",
|
|
||||||
"rules",
|
|
||||||
];
|
|
||||||
valid_keys.iter().for_each(|key| {
|
|
||||||
let key = Value::String(key.to_string());
|
|
||||||
if def_config.contains_key(&key) {
|
|
||||||
let value = def_config[&key].clone();
|
|
||||||
new_config.insert(key, value);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
config::save_yaml(
|
self.save_file()
|
||||||
temp_path.clone(),
|
|
||||||
&new_config,
|
|
||||||
Some("# Clash Verge Temp File"),
|
|
||||||
)?
|
|
||||||
};
|
|
||||||
|
|
||||||
let server = format!("http://{}/configs", clash_info.server.clone().unwrap());
|
|
||||||
|
|
||||||
let mut headers = HeaderMap::new();
|
|
||||||
headers.insert("Content-Type", "application/json".parse().unwrap());
|
|
||||||
|
|
||||||
if let Some(secret) = clash_info.secret.clone() {
|
|
||||||
headers.insert(
|
|
||||||
"Authorization",
|
|
||||||
format!("Bearer {}", secret).parse().unwrap(),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut data = HashMap::new();
|
/// delete item
|
||||||
data.insert("path", temp_path.as_os_str().to_str().unwrap());
|
/// if delete the current then return true
|
||||||
|
pub fn delete_item(&mut self, uid: String) -> Result<bool> {
|
||||||
|
let current = self.current.as_ref().unwrap_or(&uid);
|
||||||
|
let current = current.clone();
|
||||||
|
|
||||||
let client = match reqwest::ClientBuilder::new().no_proxy().build() {
|
let mut items = self.items.take().unwrap_or(vec![]);
|
||||||
Ok(c) => c,
|
let mut index = None;
|
||||||
Err(_) => return Err("failed to create http::put".into()),
|
|
||||||
};
|
// get the index
|
||||||
match client.put(server).headers(headers).json(&data).send().await {
|
for i in 0..items.len() {
|
||||||
Ok(_) => Ok(()),
|
if items[i].uid == Some(uid.clone()) {
|
||||||
Err(err) => Err(format!("request failed `{}`", err.to_string())),
|
index = Some(i);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(index) = index {
|
||||||
|
items.remove(index).file.map(|file| {
|
||||||
|
let path = dirs::app_profiles_dir().join(file);
|
||||||
|
if path.exists() {
|
||||||
|
let _ = fs::remove_file(path);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// delete the original uid
|
||||||
|
if current == uid {
|
||||||
|
self.current = match items.len() > 0 {
|
||||||
|
true => items[0].uid.clone(),
|
||||||
|
false => None,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
self.items = Some(items);
|
||||||
|
self.save_file()?;
|
||||||
|
Ok(current == uid)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// only generate config mapping
|
||||||
|
pub fn gen_activate(&self) -> Result<Mapping> {
|
||||||
|
let config = Mapping::new();
|
||||||
|
|
||||||
|
if self.current.is_none() || self.items.is_none() {
|
||||||
|
return Ok(config);
|
||||||
|
}
|
||||||
|
|
||||||
|
let current = self.current.clone().unwrap();
|
||||||
|
|
||||||
|
for item in self.items.as_ref().unwrap().iter() {
|
||||||
|
if item.uid == Some(current.clone()) {
|
||||||
|
let file_path = match item.file.clone() {
|
||||||
|
Some(file) => dirs::app_profiles_dir().join(file),
|
||||||
|
None => bail!("failed to get the file field"),
|
||||||
|
};
|
||||||
|
|
||||||
|
if !file_path.exists() {
|
||||||
|
bail!("failed to read the file \"{}\"", file_path.display());
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut new_config = Mapping::new();
|
||||||
|
let def_config = config::read_yaml::<Mapping>(file_path.clone());
|
||||||
|
|
||||||
|
// Only the following fields are allowed:
|
||||||
|
// proxies/proxy-providers/proxy-groups/rule-providers/rules
|
||||||
|
let valid_keys = vec![
|
||||||
|
"proxies",
|
||||||
|
"proxy-providers",
|
||||||
|
"proxy-groups",
|
||||||
|
"rule-providers",
|
||||||
|
"rules",
|
||||||
|
];
|
||||||
|
|
||||||
|
for (key, value) in def_config.into_iter() {
|
||||||
|
key.as_str().map(|key_str| {
|
||||||
|
// change to lowercase
|
||||||
|
let mut key_str = String::from(key_str);
|
||||||
|
key_str.make_ascii_lowercase();
|
||||||
|
|
||||||
|
if valid_keys.contains(&&*key_str) {
|
||||||
|
new_config.insert(Value::String(key_str), value);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(new_config);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bail!("failed to found the uid \"{current}\"");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// gen the enhanced profiles
|
||||||
|
pub fn gen_enhanced(&self, callback: String) -> Result<PrfEnhanced> {
|
||||||
|
let current = self.gen_activate()?;
|
||||||
|
|
||||||
|
let chain = match self.chain.as_ref() {
|
||||||
|
Some(chain) => chain
|
||||||
|
.iter()
|
||||||
|
.map(|uid| self.get_item(uid))
|
||||||
|
.filter(|item| item.is_ok())
|
||||||
|
.map(|item| item.unwrap())
|
||||||
|
.map(|item| PrfData::from_item(item))
|
||||||
|
.filter(|o| o.is_some())
|
||||||
|
.map(|o| o.unwrap())
|
||||||
|
.collect::<Vec<PrfData>>(),
|
||||||
|
None => vec![],
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(PrfEnhanced {
|
||||||
|
current,
|
||||||
|
chain,
|
||||||
|
callback,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Default, Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct PrfEnhanced {
|
||||||
|
current: Mapping,
|
||||||
|
|
||||||
|
chain: Vec<PrfData>,
|
||||||
|
|
||||||
|
callback: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Default, Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct PrfEnhancedResult {
|
||||||
|
pub data: Option<Mapping>,
|
||||||
|
|
||||||
|
pub status: String,
|
||||||
|
|
||||||
|
pub error: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Default, Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct PrfData {
|
||||||
|
item: PrfItem,
|
||||||
|
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
merge: Option<Mapping>,
|
||||||
|
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
script: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PrfData {
|
||||||
|
pub fn from_item(item: &PrfItem) -> Option<PrfData> {
|
||||||
|
match item.itype.as_ref() {
|
||||||
|
Some(itype) => {
|
||||||
|
let file = item.file.clone()?;
|
||||||
|
let path = dirs::app_profiles_dir().join(file);
|
||||||
|
|
||||||
|
if !path.exists() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
match itype.as_str() {
|
||||||
|
"script" => Some(PrfData {
|
||||||
|
item: item.clone(),
|
||||||
|
script: Some(fs::read_to_string(path).unwrap_or("".into())),
|
||||||
|
merge: None,
|
||||||
|
}),
|
||||||
|
"merge" => Some(PrfData {
|
||||||
|
item: item.clone(),
|
||||||
|
merge: Some(config::read_yaml::<Mapping>(path)),
|
||||||
|
script: None,
|
||||||
|
}),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => None,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
|
use crate::log_if_err;
|
||||||
use crate::{
|
use crate::{
|
||||||
core::Clash,
|
core::Clash,
|
||||||
utils::{config, dirs, sysopt::SysProxyConfig},
|
utils::{config, dirs, sysopt::SysProxyConfig},
|
||||||
};
|
};
|
||||||
|
use anyhow::{bail, Result};
|
||||||
use auto_launch::{AutoLaunch, AutoLaunchBuilder};
|
use auto_launch::{AutoLaunch, AutoLaunchBuilder};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
@@ -10,6 +12,9 @@ use tauri::{async_runtime::Mutex, utils::platform::current_exe};
|
|||||||
/// ### `verge.yaml` schema
|
/// ### `verge.yaml` schema
|
||||||
#[derive(Default, Debug, Clone, Deserialize, Serialize)]
|
#[derive(Default, Debug, Clone, Deserialize, Serialize)]
|
||||||
pub struct VergeConfig {
|
pub struct VergeConfig {
|
||||||
|
// i18n
|
||||||
|
pub language: Option<String>,
|
||||||
|
|
||||||
/// `light` or `dark`
|
/// `light` or `dark`
|
||||||
pub theme_mode: Option<String>,
|
pub theme_mode: Option<String>,
|
||||||
|
|
||||||
@@ -39,17 +44,15 @@ pub struct VergeConfig {
|
|||||||
pub proxy_guard_duration: Option<u64>,
|
pub proxy_guard_duration: Option<u64>,
|
||||||
}
|
}
|
||||||
|
|
||||||
static VERGE_CONFIG: &str = "verge.yaml";
|
|
||||||
|
|
||||||
impl VergeConfig {
|
impl VergeConfig {
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
config::read_yaml::<VergeConfig>(dirs::app_home_dir().join(VERGE_CONFIG))
|
config::read_yaml::<VergeConfig>(dirs::verge_path())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Save Verge App Config
|
/// Save Verge App Config
|
||||||
pub fn save_file(&self) -> Result<(), String> {
|
pub fn save_file(&self) -> Result<()> {
|
||||||
config::save_yaml(
|
config::save_yaml(
|
||||||
dirs::app_home_dir().join(VERGE_CONFIG),
|
dirs::verge_path(),
|
||||||
self,
|
self,
|
||||||
Some("# The Config for Clash Verge App\n\n"),
|
Some("# The Config for Clash Verge App\n\n"),
|
||||||
)
|
)
|
||||||
@@ -59,13 +62,18 @@ impl VergeConfig {
|
|||||||
/// Verge App abilities
|
/// Verge App abilities
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct Verge {
|
pub struct Verge {
|
||||||
|
/// manage the verge config
|
||||||
pub config: VergeConfig,
|
pub config: VergeConfig,
|
||||||
|
|
||||||
pub old_sysproxy: Option<SysProxyConfig>,
|
/// current system proxy setting
|
||||||
|
|
||||||
pub cur_sysproxy: Option<SysProxyConfig>,
|
pub cur_sysproxy: Option<SysProxyConfig>,
|
||||||
|
|
||||||
pub auto_launch: Option<AutoLaunch>,
|
/// record the original system proxy
|
||||||
|
/// recover it when exit
|
||||||
|
old_sysproxy: Option<SysProxyConfig>,
|
||||||
|
|
||||||
|
/// helps to auto launch the app
|
||||||
|
auto_launch: Option<AutoLaunch>,
|
||||||
|
|
||||||
/// record whether the guard async is running or not
|
/// record whether the guard async is running or not
|
||||||
guard_state: Arc<Mutex<bool>>,
|
guard_state: Arc<Mutex<bool>>,
|
||||||
@@ -125,45 +133,37 @@ impl Verge {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// init the auto launch
|
/// init the auto launch
|
||||||
pub fn init_launch(&mut self) {
|
pub fn init_launch(&mut self) -> Result<()> {
|
||||||
let app_exe = current_exe().unwrap();
|
let app_exe = current_exe().unwrap();
|
||||||
let app_exe = dunce::canonicalize(app_exe).unwrap();
|
let app_exe = dunce::canonicalize(app_exe).unwrap();
|
||||||
let app_name = app_exe.file_stem().unwrap().to_str().unwrap();
|
let app_name = app_exe.file_stem().unwrap().to_str().unwrap();
|
||||||
let app_path = app_exe.as_os_str().to_str().unwrap();
|
let app_path = app_exe.as_os_str().to_str().unwrap();
|
||||||
|
|
||||||
|
// fix issue #26
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
let app_path = format!("\"{app_path}\"");
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
let app_path = app_path.as_str();
|
||||||
|
|
||||||
let auto = AutoLaunchBuilder::new()
|
let auto = AutoLaunchBuilder::new()
|
||||||
.set_app_name(app_name)
|
.set_app_name(app_name)
|
||||||
.set_app_path(app_path)
|
.set_app_path(app_path)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
self.auto_launch = Some(auto);
|
if let Some(enable) = self.config.enable_auto_launch.as_ref() {
|
||||||
}
|
// fix issue #26
|
||||||
|
if *enable {
|
||||||
/// sync the startup when run the app
|
auto.enable()?;
|
||||||
pub fn sync_launch(&self) -> Result<(), String> {
|
|
||||||
let enable = self.config.enable_auto_launch.clone().unwrap_or(false);
|
|
||||||
if !enable {
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
|
|
||||||
if self.auto_launch.is_none() {
|
|
||||||
return Err("should init the auto launch first".into());
|
|
||||||
}
|
|
||||||
|
|
||||||
let auto_launch = self.auto_launch.clone().unwrap();
|
|
||||||
|
|
||||||
let is_enabled = auto_launch.is_enabled().unwrap_or(false);
|
|
||||||
if !is_enabled {
|
|
||||||
if let Err(_) = auto_launch.enable() {
|
|
||||||
return Err("failed to enable auto-launch".into());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
self.auto_launch = Some(auto);
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// update the startup
|
/// update the startup
|
||||||
fn update_launch(&mut self, enable: bool) -> Result<(), String> {
|
fn update_launch(&mut self, enable: bool) -> Result<()> {
|
||||||
let conf_enable = self.config.enable_auto_launch.clone().unwrap_or(false);
|
let conf_enable = self.config.enable_auto_launch.clone().unwrap_or(false);
|
||||||
|
|
||||||
if enable == conf_enable {
|
if enable == conf_enable {
|
||||||
@@ -172,25 +172,22 @@ impl Verge {
|
|||||||
|
|
||||||
let auto_launch = self.auto_launch.clone().unwrap();
|
let auto_launch = self.auto_launch.clone().unwrap();
|
||||||
|
|
||||||
let result = match enable {
|
match enable {
|
||||||
true => auto_launch.enable(),
|
true => auto_launch.enable()?,
|
||||||
false => auto_launch.disable(),
|
false => auto_launch.disable()?,
|
||||||
};
|
};
|
||||||
|
|
||||||
match result {
|
Ok(())
|
||||||
Ok(_) => Ok(()),
|
|
||||||
Err(err) => {
|
|
||||||
log::error!("{err}");
|
|
||||||
Err("failed to set system startup info".into())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// patch verge config
|
/// patch verge config
|
||||||
/// There should be only one update at a time here
|
/// There should be only one update at a time here
|
||||||
/// so call the save_file at the end is savely
|
/// so call the save_file at the end is savely
|
||||||
pub fn patch_config(&mut self, patch: VergeConfig) -> Result<(), String> {
|
pub fn patch_config(&mut self, patch: VergeConfig) -> Result<()> {
|
||||||
// only change it
|
// only change it
|
||||||
|
if patch.language.is_some() {
|
||||||
|
self.config.language = patch.language;
|
||||||
|
}
|
||||||
if patch.theme_mode.is_some() {
|
if patch.theme_mode.is_some() {
|
||||||
self.config.theme_mode = patch.theme_mode;
|
self.config.theme_mode = patch.theme_mode;
|
||||||
}
|
}
|
||||||
@@ -218,7 +215,7 @@ impl Verge {
|
|||||||
self.cur_sysproxy = Some(sysproxy);
|
self.cur_sysproxy = Some(sysproxy);
|
||||||
|
|
||||||
log::error!("failed to set system proxy");
|
log::error!("failed to set system proxy");
|
||||||
return Err("failed to set system proxy".into());
|
bail!("failed to set system proxy");
|
||||||
}
|
}
|
||||||
self.cur_sysproxy = Some(sysproxy);
|
self.cur_sysproxy = Some(sysproxy);
|
||||||
}
|
}
|
||||||
@@ -237,7 +234,7 @@ impl Verge {
|
|||||||
self.cur_sysproxy = Some(sysproxy);
|
self.cur_sysproxy = Some(sysproxy);
|
||||||
|
|
||||||
log::error!("failed to set system proxy");
|
log::error!("failed to set system proxy");
|
||||||
return Err("failed to set system proxy".into());
|
bail!("failed to set system proxy");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -291,7 +288,7 @@ impl Verge {
|
|||||||
loop {
|
loop {
|
||||||
sleep(Duration::from_secs(wait_secs)).await;
|
sleep(Duration::from_secs(wait_secs)).await;
|
||||||
|
|
||||||
log::debug!("[Guard]: heartbeat detection");
|
log::debug!("guard heartbeat detection");
|
||||||
|
|
||||||
let verge = Verge::new();
|
let verge = Verge::new();
|
||||||
|
|
||||||
@@ -307,7 +304,7 @@ impl Verge {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
log::info!("[Guard]: try to guard proxy");
|
log::info!("try to guard proxy");
|
||||||
|
|
||||||
let clash = Clash::new();
|
let clash = Clash::new();
|
||||||
|
|
||||||
@@ -316,12 +313,9 @@ impl Verge {
|
|||||||
let bypass = verge.config.system_proxy_bypass.clone();
|
let bypass = verge.config.system_proxy_bypass.clone();
|
||||||
let sysproxy = SysProxyConfig::new(true, port.clone(), bypass);
|
let sysproxy = SysProxyConfig::new(true, port.clone(), bypass);
|
||||||
|
|
||||||
if let Err(err) = sysproxy.set_sys() {
|
log_if_err!(sysproxy.set_sys());
|
||||||
log::error!("[Guard]: {err}");
|
|
||||||
log::error!("[Guard]: fail to set system proxy");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
None => log::error!("[Guard]: fail to parse clash port"),
|
None => log::error!("fail to parse clash port"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,10 @@ mod core;
|
|||||||
mod states;
|
mod states;
|
||||||
mod utils;
|
mod utils;
|
||||||
|
|
||||||
use crate::utils::{resolve, server};
|
use crate::{
|
||||||
|
core::VergeConfig,
|
||||||
|
utils::{resolve, server},
|
||||||
|
};
|
||||||
use tauri::{
|
use tauri::{
|
||||||
api, CustomMenuItem, Manager, SystemTray, SystemTrayEvent, SystemTrayMenu, SystemTrayMenuItem,
|
api, CustomMenuItem, Manager, SystemTray, SystemTrayEvent, SystemTrayMenu, SystemTrayMenuItem,
|
||||||
};
|
};
|
||||||
@@ -19,18 +22,20 @@ fn main() -> std::io::Result<()> {
|
|||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
let menu = SystemTrayMenu::new()
|
let tray_menu = SystemTrayMenu::new()
|
||||||
.add_item(CustomMenuItem::new("open_window", "Show"))
|
.add_item(CustomMenuItem::new("open_window", "Show"))
|
||||||
|
.add_item(CustomMenuItem::new("system_proxy", "System Proxy"))
|
||||||
.add_item(CustomMenuItem::new("restart_clash", "Restart Clash"))
|
.add_item(CustomMenuItem::new("restart_clash", "Restart Clash"))
|
||||||
.add_native_item(SystemTrayMenuItem::Separator)
|
.add_native_item(SystemTrayMenuItem::Separator)
|
||||||
.add_item(CustomMenuItem::new("quit", "Quit").accelerator("CmdOrControl+Q"));
|
.add_item(CustomMenuItem::new("quit", "Quit").accelerator("CmdOrControl+Q"));
|
||||||
|
|
||||||
tauri::Builder::default()
|
#[allow(unused_mut)]
|
||||||
|
let mut builder = tauri::Builder::default()
|
||||||
.manage(states::VergeState::default())
|
.manage(states::VergeState::default())
|
||||||
.manage(states::ClashState::default())
|
.manage(states::ClashState::default())
|
||||||
.manage(states::ProfilesState::default())
|
.manage(states::ProfilesState::default())
|
||||||
.setup(|app| Ok(resolve::resolve_setup(app)))
|
.setup(|app| Ok(resolve::resolve_setup(app)))
|
||||||
.system_tray(SystemTray::new().with_menu(menu))
|
.system_tray(SystemTray::new().with_menu(tray_menu))
|
||||||
.on_system_tray_event(move |app_handle, event| match event {
|
.on_system_tray_event(move |app_handle, event| match event {
|
||||||
SystemTrayEvent::MenuItemClick { id, .. } => match id.as_str() {
|
SystemTrayEvent::MenuItemClick { id, .. } => match id.as_str() {
|
||||||
"open_window" => {
|
"open_window" => {
|
||||||
@@ -39,18 +44,38 @@ fn main() -> std::io::Result<()> {
|
|||||||
window.show().unwrap();
|
window.show().unwrap();
|
||||||
window.set_focus().unwrap();
|
window.set_focus().unwrap();
|
||||||
}
|
}
|
||||||
|
"system_proxy" => {
|
||||||
|
let verge_state = app_handle.state::<states::VergeState>();
|
||||||
|
let mut verge = verge_state.0.lock().unwrap();
|
||||||
|
|
||||||
|
let old_value = verge.config.enable_system_proxy.clone().unwrap_or(false);
|
||||||
|
let new_value = !old_value;
|
||||||
|
|
||||||
|
match verge.patch_config(VergeConfig {
|
||||||
|
enable_system_proxy: Some(new_value),
|
||||||
|
..VergeConfig::default()
|
||||||
|
}) {
|
||||||
|
Ok(_) => {
|
||||||
|
app_handle
|
||||||
|
.tray_handle()
|
||||||
|
.get_item(id.as_str())
|
||||||
|
.set_selected(new_value)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
// update verge config
|
||||||
|
let window = app_handle.get_window("main").unwrap();
|
||||||
|
window.emit("verge://refresh-verge-config", "yes").unwrap();
|
||||||
|
}
|
||||||
|
Err(err) => log::error!("{err}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
"restart_clash" => {
|
"restart_clash" => {
|
||||||
let clash_state = app_handle.state::<states::ClashState>();
|
let clash_state = app_handle.state::<states::ClashState>();
|
||||||
let profiles_state = app_handle.state::<states::ProfilesState>();
|
let profiles_state = app_handle.state::<states::ProfilesState>();
|
||||||
let mut clash = clash_state.0.lock().unwrap();
|
let mut clash = clash_state.0.lock().unwrap();
|
||||||
let mut profiles = profiles_state.0.lock().unwrap();
|
let mut profiles = profiles_state.0.lock().unwrap();
|
||||||
match clash.restart_sidecar(&mut profiles) {
|
|
||||||
Ok(_) => {
|
crate::log_if_err!(clash.restart_sidecar(&mut profiles));
|
||||||
let window = app_handle.get_window("main").unwrap();
|
|
||||||
window.emit("restart_clash", "yes").unwrap();
|
|
||||||
}
|
|
||||||
Err(err) => log::error!("{}", err),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
"quit" => {
|
"quit" => {
|
||||||
resolve::resolve_reset(app_handle);
|
resolve::resolve_reset(app_handle);
|
||||||
@@ -59,13 +84,12 @@ fn main() -> std::io::Result<()> {
|
|||||||
}
|
}
|
||||||
_ => {}
|
_ => {}
|
||||||
},
|
},
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
SystemTrayEvent::LeftClick { .. } => {
|
SystemTrayEvent::LeftClick { .. } => {
|
||||||
if cfg![target_os = "windows"] {
|
let window = app_handle.get_window("main").unwrap();
|
||||||
let window = app_handle.get_window("main").unwrap();
|
window.unminimize().unwrap();
|
||||||
window.unminimize().unwrap();
|
window.show().unwrap();
|
||||||
window.show().unwrap();
|
window.set_focus().unwrap();
|
||||||
window.set_focus().unwrap();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
_ => {}
|
_ => {}
|
||||||
})
|
})
|
||||||
@@ -84,16 +108,37 @@ fn main() -> std::io::Result<()> {
|
|||||||
cmds::get_verge_config,
|
cmds::get_verge_config,
|
||||||
cmds::patch_verge_config,
|
cmds::patch_verge_config,
|
||||||
// profile
|
// profile
|
||||||
cmds::new_profile,
|
|
||||||
cmds::view_profile,
|
cmds::view_profile,
|
||||||
cmds::patch_profile,
|
cmds::patch_profile,
|
||||||
|
cmds::create_profile,
|
||||||
cmds::import_profile,
|
cmds::import_profile,
|
||||||
cmds::update_profile,
|
cmds::update_profile,
|
||||||
cmds::delete_profile,
|
cmds::delete_profile,
|
||||||
cmds::select_profile,
|
cmds::select_profile,
|
||||||
cmds::get_profiles,
|
cmds::get_profiles,
|
||||||
cmds::sync_profiles,
|
cmds::sync_profiles,
|
||||||
])
|
cmds::enhance_profiles,
|
||||||
|
cmds::change_profile_chain
|
||||||
|
]);
|
||||||
|
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
{
|
||||||
|
use tauri::{Menu, MenuItem, Submenu};
|
||||||
|
|
||||||
|
let submenu_file = Submenu::new(
|
||||||
|
"File",
|
||||||
|
Menu::new()
|
||||||
|
.add_native_item(MenuItem::Undo)
|
||||||
|
.add_native_item(MenuItem::Redo)
|
||||||
|
.add_native_item(MenuItem::Copy)
|
||||||
|
.add_native_item(MenuItem::Paste)
|
||||||
|
.add_native_item(MenuItem::Cut)
|
||||||
|
.add_native_item(MenuItem::SelectAll),
|
||||||
|
);
|
||||||
|
builder = builder.menu(Menu::new().add_submenu(submenu_file));
|
||||||
|
}
|
||||||
|
|
||||||
|
builder
|
||||||
.build(tauri::generate_context!())
|
.build(tauri::generate_context!())
|
||||||
.expect("error while running tauri application")
|
.expect("error while running tauri application")
|
||||||
.run(|app_handle, e| match e {
|
.run(|app_handle, e| match e {
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
use anyhow::{Context, Result};
|
||||||
use serde::{de::DeserializeOwned, Serialize};
|
use serde::{de::DeserializeOwned, Serialize};
|
||||||
use std::{fs, path::PathBuf};
|
use std::{fs, path::PathBuf};
|
||||||
|
|
||||||
@@ -7,26 +8,16 @@ pub fn read_yaml<T: DeserializeOwned + Default>(path: PathBuf) -> T {
|
|||||||
serde_yaml::from_str::<T>(&yaml_str).unwrap_or(T::default())
|
serde_yaml::from_str::<T>(&yaml_str).unwrap_or(T::default())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// - save the data to the file
|
/// save the data to the file
|
||||||
/// - can set `prefix` string to add some comments
|
/// can set `prefix` string to add some comments
|
||||||
pub fn save_yaml<T: Serialize>(
|
pub fn save_yaml<T: Serialize>(path: PathBuf, data: &T, prefix: Option<&str>) -> Result<()> {
|
||||||
path: PathBuf,
|
let data_str = serde_yaml::to_string(data)?;
|
||||||
data: &T,
|
|
||||||
prefix: Option<&str>,
|
|
||||||
) -> Result<(), String> {
|
|
||||||
match serde_yaml::to_string(data) {
|
|
||||||
Ok(data_str) => {
|
|
||||||
let yaml_str = match prefix {
|
|
||||||
Some(prefix) => format!("{}{}", prefix, data_str),
|
|
||||||
None => data_str,
|
|
||||||
};
|
|
||||||
|
|
||||||
let path_str = path.as_os_str().to_string_lossy().to_string();
|
let yaml_str = match prefix {
|
||||||
match fs::write(path, yaml_str.as_bytes()) {
|
Some(prefix) => format!("{prefix}{data_str}"),
|
||||||
Ok(_) => Ok(()),
|
None => data_str,
|
||||||
Err(_) => Err(format!("can not save file `{}`", path_str)),
|
};
|
||||||
}
|
|
||||||
}
|
let path_str = path.as_os_str().to_string_lossy().to_string();
|
||||||
Err(_) => Err("can not convert the data to yaml".into()),
|
fs::write(path, yaml_str.as_bytes()).context(format!("failed to save file \"{path_str}\""))
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,26 @@
|
|||||||
|
use std::env::temp_dir;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
use tauri::{
|
use tauri::{
|
||||||
api::path::{home_dir, resource_dir},
|
api::path::{home_dir, resource_dir},
|
||||||
Env, PackageInfo,
|
Env, PackageInfo,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#[cfg(not(feature = "verge-dev"))]
|
||||||
|
static APP_DIR: &str = "clash-verge";
|
||||||
|
#[cfg(feature = "verge-dev")]
|
||||||
|
static APP_DIR: &str = "clash-verge-dev";
|
||||||
|
|
||||||
|
static CLASH_CONFIG: &str = "config.yaml";
|
||||||
|
static VERGE_CONFIG: &str = "verge.yaml";
|
||||||
|
static PROFILE_YAML: &str = "profiles.yaml";
|
||||||
|
static PROFILE_TEMP: &str = "clash-verge-runtime.yaml";
|
||||||
|
|
||||||
/// get the verge app home dir
|
/// get the verge app home dir
|
||||||
pub fn app_home_dir() -> PathBuf {
|
pub fn app_home_dir() -> PathBuf {
|
||||||
home_dir()
|
home_dir()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.join(Path::new(".config"))
|
.join(Path::new(".config"))
|
||||||
.join(Path::new("clash-verge"))
|
.join(Path::new(APP_DIR))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// get the resources dir
|
/// get the resources dir
|
||||||
@@ -18,3 +29,29 @@ pub fn app_resources_dir(package_info: &PackageInfo) -> PathBuf {
|
|||||||
.unwrap()
|
.unwrap()
|
||||||
.join("resources")
|
.join("resources")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// profiles dir
|
||||||
|
pub fn app_profiles_dir() -> PathBuf {
|
||||||
|
app_home_dir().join("profiles")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// logs dir
|
||||||
|
pub fn app_logs_dir() -> PathBuf {
|
||||||
|
app_home_dir().join("logs")
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn clash_path() -> PathBuf {
|
||||||
|
app_home_dir().join(CLASH_CONFIG)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn verge_path() -> PathBuf {
|
||||||
|
app_home_dir().join(VERGE_CONFIG)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn profiles_path() -> PathBuf {
|
||||||
|
app_home_dir().join(PROFILE_YAML)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn profiles_temp_path() -> PathBuf {
|
||||||
|
temp_dir().join(PROFILE_TEMP)
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,102 +0,0 @@
|
|||||||
use crate::core::{ProfileExtra, ProfileResponse};
|
|
||||||
use std::{
|
|
||||||
str::FromStr,
|
|
||||||
time::{SystemTime, UNIX_EPOCH},
|
|
||||||
};
|
|
||||||
|
|
||||||
/// parse the string
|
|
||||||
fn parse_string<T: FromStr>(target: &str, key: &str) -> Option<T> {
|
|
||||||
match target.find(key) {
|
|
||||||
Some(idx) => {
|
|
||||||
let idx = idx + key.len();
|
|
||||||
let value = &target[idx..];
|
|
||||||
match match value.split(';').nth(0) {
|
|
||||||
Some(value) => value.trim().parse(),
|
|
||||||
None => value.trim().parse(),
|
|
||||||
} {
|
|
||||||
Ok(r) => Some(r),
|
|
||||||
Err(_) => None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
None => None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// fetch and parse the profile url
|
|
||||||
/// maybe it contains some Subscription infomations, maybe not
|
|
||||||
pub async fn fetch_profile(url: &str, with_proxy: bool) -> Result<ProfileResponse, String> {
|
|
||||||
let builder = reqwest::ClientBuilder::new();
|
|
||||||
let client = match with_proxy {
|
|
||||||
true => builder.build(),
|
|
||||||
false => builder.no_proxy().build(),
|
|
||||||
};
|
|
||||||
|
|
||||||
let resp = match client.unwrap().get(url).send().await {
|
|
||||||
Ok(res) => res,
|
|
||||||
Err(_) => return Err("failed to create https client".into()),
|
|
||||||
};
|
|
||||||
|
|
||||||
let header = resp.headers();
|
|
||||||
|
|
||||||
// parse the Subscription Userinfo
|
|
||||||
let extra = match header.get("Subscription-Userinfo") {
|
|
||||||
Some(value) => {
|
|
||||||
let sub_info = value.to_str().unwrap_or("");
|
|
||||||
|
|
||||||
Some(ProfileExtra {
|
|
||||||
upload: parse_string(sub_info, "upload=").unwrap_or(0),
|
|
||||||
download: parse_string(sub_info, "download=").unwrap_or(0),
|
|
||||||
total: parse_string(sub_info, "total=").unwrap_or(0),
|
|
||||||
expire: parse_string(sub_info, "expire=").unwrap_or(0),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
None => None,
|
|
||||||
};
|
|
||||||
|
|
||||||
let file = {
|
|
||||||
let now = SystemTime::now()
|
|
||||||
.duration_since(UNIX_EPOCH)
|
|
||||||
.unwrap()
|
|
||||||
.as_secs();
|
|
||||||
format!("{}.yaml", now)
|
|
||||||
};
|
|
||||||
|
|
||||||
let name = match header.get("Content-Disposition") {
|
|
||||||
Some(name) => {
|
|
||||||
let name = name.to_str().unwrap();
|
|
||||||
parse_string::<String>(name, "filename=").unwrap_or(file.clone())
|
|
||||||
}
|
|
||||||
None => file.clone(),
|
|
||||||
};
|
|
||||||
|
|
||||||
// get the data
|
|
||||||
match resp.text_with_charset("utf-8").await {
|
|
||||||
Ok(data) => Ok(ProfileResponse {
|
|
||||||
file,
|
|
||||||
name,
|
|
||||||
data,
|
|
||||||
extra,
|
|
||||||
}),
|
|
||||||
Err(_) => Err("failed to parse the response data".into()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_parse_value() {
|
|
||||||
let test_1 = "upload=111; download=2222; total=3333; expire=444";
|
|
||||||
let test_2 = "attachment; filename=Clash.yaml";
|
|
||||||
|
|
||||||
assert_eq!(parse_string::<usize>(test_1, "upload=").unwrap(), 111);
|
|
||||||
assert_eq!(parse_string::<usize>(test_1, "download=").unwrap(), 2222);
|
|
||||||
assert_eq!(parse_string::<usize>(test_1, "total=").unwrap(), 3333);
|
|
||||||
assert_eq!(parse_string::<usize>(test_1, "expire=").unwrap(), 444);
|
|
||||||
assert_eq!(
|
|
||||||
parse_string::<String>(test_2, "filename=").unwrap(),
|
|
||||||
format!("Clash.yaml")
|
|
||||||
);
|
|
||||||
|
|
||||||
assert_eq!(parse_string::<usize>(test_1, "aaa="), None);
|
|
||||||
assert_eq!(parse_string::<usize>(test_1, "upload1="), None);
|
|
||||||
assert_eq!(parse_string::<usize>(test_1, "expire1="), None);
|
|
||||||
assert_eq!(parse_string::<usize>(test_2, "attachment="), None);
|
|
||||||
}
|
|
||||||
94
src-tauri/src/utils/help.rs
Normal file
94
src-tauri/src/utils/help.rs
Normal file
@@ -0,0 +1,94 @@
|
|||||||
|
use nanoid::nanoid;
|
||||||
|
use std::str::FromStr;
|
||||||
|
use std::time::{SystemTime, UNIX_EPOCH};
|
||||||
|
|
||||||
|
pub fn get_now() -> usize {
|
||||||
|
SystemTime::now()
|
||||||
|
.duration_since(UNIX_EPOCH)
|
||||||
|
.unwrap()
|
||||||
|
.as_secs() as _
|
||||||
|
}
|
||||||
|
|
||||||
|
const ALPHABET: [char; 62] = [
|
||||||
|
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
|
||||||
|
'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B',
|
||||||
|
'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
|
||||||
|
'V', 'W', 'X', 'Y', 'Z',
|
||||||
|
];
|
||||||
|
|
||||||
|
/// generate the uid
|
||||||
|
pub fn get_uid(prefix: &str) -> String {
|
||||||
|
let id = nanoid!(11, &ALPHABET);
|
||||||
|
format!("{prefix}{id}")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// parse the string
|
||||||
|
/// xxx=123123; => 123123
|
||||||
|
pub fn parse_str<T: FromStr>(target: &str, key: &str) -> Option<T> {
|
||||||
|
match target.find(key) {
|
||||||
|
Some(idx) => {
|
||||||
|
let idx = idx + key.len();
|
||||||
|
let value = &target[idx..];
|
||||||
|
match match value.split(';').nth(0) {
|
||||||
|
Some(value) => value.trim().parse(),
|
||||||
|
None => value.trim().parse(),
|
||||||
|
} {
|
||||||
|
Ok(r) => Some(r),
|
||||||
|
Err(_) => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[macro_export]
|
||||||
|
macro_rules! log_if_err {
|
||||||
|
($result: expr) => {
|
||||||
|
if let Err(err) = $result {
|
||||||
|
log::error!("{err}");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// wrap the anyhow error
|
||||||
|
/// transform the error to String
|
||||||
|
#[macro_export]
|
||||||
|
macro_rules! wrap_err {
|
||||||
|
($stat: expr) => {
|
||||||
|
match $stat {
|
||||||
|
Ok(a) => Ok(a),
|
||||||
|
Err(err) => {
|
||||||
|
log::error!("{}", err.to_string());
|
||||||
|
Err(format!("{}", err.to_string()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// return the string literal error
|
||||||
|
#[macro_export]
|
||||||
|
macro_rules! ret_err {
|
||||||
|
($str: expr) => {
|
||||||
|
return Err($str.into())
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_parse_value() {
|
||||||
|
let test_1 = "upload=111; download=2222; total=3333; expire=444";
|
||||||
|
let test_2 = "attachment; filename=Clash.yaml";
|
||||||
|
|
||||||
|
assert_eq!(parse_str::<usize>(test_1, "upload=").unwrap(), 111);
|
||||||
|
assert_eq!(parse_str::<usize>(test_1, "download=").unwrap(), 2222);
|
||||||
|
assert_eq!(parse_str::<usize>(test_1, "total=").unwrap(), 3333);
|
||||||
|
assert_eq!(parse_str::<usize>(test_1, "expire=").unwrap(), 444);
|
||||||
|
assert_eq!(
|
||||||
|
parse_str::<String>(test_2, "filename=").unwrap(),
|
||||||
|
format!("Clash.yaml")
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(parse_str::<usize>(test_1, "aaa="), None);
|
||||||
|
assert_eq!(parse_str::<usize>(test_1, "upload1="), None);
|
||||||
|
assert_eq!(parse_str::<usize>(test_1, "expire1="), None);
|
||||||
|
assert_eq!(parse_str::<usize>(test_2, "attachment="), None);
|
||||||
|
}
|
||||||
@@ -1,5 +1,3 @@
|
|||||||
extern crate serde_yaml;
|
|
||||||
|
|
||||||
use crate::utils::{dirs, tmpl};
|
use crate::utils::{dirs, tmpl};
|
||||||
use chrono::Local;
|
use chrono::Local;
|
||||||
use log::LevelFilter;
|
use log::LevelFilter;
|
||||||
@@ -7,7 +5,7 @@ use log4rs::append::console::ConsoleAppender;
|
|||||||
use log4rs::append::file::FileAppender;
|
use log4rs::append::file::FileAppender;
|
||||||
use log4rs::config::{Appender, Config, Root};
|
use log4rs::config::{Appender, Config, Root};
|
||||||
use log4rs::encode::pattern::PatternEncoder;
|
use log4rs::encode::pattern::PatternEncoder;
|
||||||
use std::fs::{self, File};
|
use std::fs;
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use tauri::PackageInfo;
|
use tauri::PackageInfo;
|
||||||
@@ -33,7 +31,7 @@ fn init_log(log_dir: &PathBuf) {
|
|||||||
.build(
|
.build(
|
||||||
Root::builder()
|
Root::builder()
|
||||||
.appenders(["stdout", "file"])
|
.appenders(["stdout", "file"])
|
||||||
.build(LevelFilter::Debug),
|
.build(LevelFilter::Info),
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
@@ -48,13 +46,13 @@ fn init_config(app_dir: &PathBuf) -> std::io::Result<()> {
|
|||||||
let profile_path = app_dir.join("profiles.yaml");
|
let profile_path = app_dir.join("profiles.yaml");
|
||||||
|
|
||||||
if !clash_path.exists() {
|
if !clash_path.exists() {
|
||||||
File::create(clash_path)?.write(tmpl::CLASH_CONFIG)?;
|
fs::File::create(clash_path)?.write(tmpl::CLASH_CONFIG)?;
|
||||||
}
|
}
|
||||||
if !verge_path.exists() {
|
if !verge_path.exists() {
|
||||||
File::create(verge_path)?.write(tmpl::VERGE_CONFIG)?;
|
fs::File::create(verge_path)?.write(tmpl::VERGE_CONFIG)?;
|
||||||
}
|
}
|
||||||
if !profile_path.exists() {
|
if !profile_path.exists() {
|
||||||
File::create(profile_path)?.write(tmpl::PROFILES_CONFIG)?;
|
fs::File::create(profile_path)?.write(tmpl::PROFILES_CONFIG)?;
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -63,19 +61,19 @@ fn init_config(app_dir: &PathBuf) -> std::io::Result<()> {
|
|||||||
pub fn init_app(package_info: &PackageInfo) {
|
pub fn init_app(package_info: &PackageInfo) {
|
||||||
// create app dir
|
// create app dir
|
||||||
let app_dir = dirs::app_home_dir();
|
let app_dir = dirs::app_home_dir();
|
||||||
let log_dir = app_dir.join("logs");
|
let log_dir = dirs::app_logs_dir();
|
||||||
let profiles_dir = app_dir.join("profiles");
|
let profiles_dir = dirs::app_profiles_dir();
|
||||||
|
|
||||||
let res_dir = dirs::app_resources_dir(package_info);
|
let res_dir = dirs::app_resources_dir(package_info);
|
||||||
|
|
||||||
if !app_dir.exists() {
|
if !app_dir.exists() {
|
||||||
fs::create_dir(&app_dir).unwrap();
|
fs::create_dir_all(&app_dir).unwrap();
|
||||||
}
|
}
|
||||||
if !log_dir.exists() {
|
if !log_dir.exists() {
|
||||||
fs::create_dir(&log_dir).unwrap();
|
fs::create_dir_all(&log_dir).unwrap();
|
||||||
}
|
}
|
||||||
if !profiles_dir.exists() {
|
if !profiles_dir.exists() {
|
||||||
fs::create_dir(&profiles_dir).unwrap();
|
fs::create_dir_all(&profiles_dir).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
init_log(&log_dir);
|
init_log(&log_dir);
|
||||||
@@ -89,4 +87,14 @@ pub fn init_app(package_info: &PackageInfo) {
|
|||||||
if !mmdb_path.exists() && mmdb_tmpl.exists() {
|
if !mmdb_path.exists() && mmdb_tmpl.exists() {
|
||||||
fs::copy(mmdb_tmpl, mmdb_path).unwrap();
|
fs::copy(mmdb_tmpl, mmdb_path).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// copy the wintun.dll
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
{
|
||||||
|
let wintun_path = app_dir.join("wintun.dll");
|
||||||
|
let wintun_tmpl = res_dir.join("wintun.dll");
|
||||||
|
if !wintun_path.exists() && wintun_tmpl.exists() {
|
||||||
|
fs::copy(wintun_tmpl, wintun_path).unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
pub mod config;
|
pub mod config;
|
||||||
pub mod dirs;
|
pub mod dirs;
|
||||||
pub mod fetch;
|
pub mod help;
|
||||||
pub mod init;
|
pub mod init;
|
||||||
pub mod resolve;
|
pub mod resolve;
|
||||||
pub mod server;
|
pub mod server;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
use super::{init, server};
|
use super::{init, server};
|
||||||
use crate::{core::Profiles, states};
|
use crate::{core::Profiles, log_if_err, states};
|
||||||
use tauri::{App, AppHandle, Manager};
|
use tauri::{App, AppHandle, Manager};
|
||||||
|
|
||||||
/// handle something when start app
|
/// handle something when start app
|
||||||
@@ -21,14 +21,12 @@ pub fn resolve_setup(app: &App) {
|
|||||||
let mut verge = verge_state.0.lock().unwrap();
|
let mut verge = verge_state.0.lock().unwrap();
|
||||||
let mut profiles = profiles_state.0.lock().unwrap();
|
let mut profiles = profiles_state.0.lock().unwrap();
|
||||||
|
|
||||||
if let Err(err) = clash.run_sidecar() {
|
log_if_err!(clash.run_sidecar());
|
||||||
log::error!("{err}");
|
|
||||||
}
|
|
||||||
|
|
||||||
*profiles = Profiles::read_file();
|
*profiles = Profiles::read_file();
|
||||||
if let Err(err) = profiles.activate(&clash) {
|
|
||||||
log::error!("{err}");
|
clash.set_window(app.get_window("main"));
|
||||||
}
|
log_if_err!(clash.activate(&profiles, true));
|
||||||
|
|
||||||
verge.init_sysproxy(clash.info.port.clone());
|
verge.init_sysproxy(clash.info.port.clone());
|
||||||
// enable tun mode
|
// enable tun mode
|
||||||
@@ -40,10 +38,14 @@ pub fn resolve_setup(app: &App) {
|
|||||||
clash.tun_mode(true).unwrap();
|
clash.tun_mode(true).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
verge.init_launch();
|
log_if_err!(verge.init_launch());
|
||||||
if let Err(err) = verge.sync_launch() {
|
|
||||||
log::error!("{err}");
|
verge.config.enable_system_proxy.map(|enable| {
|
||||||
}
|
log_if_err!(app
|
||||||
|
.tray_handle()
|
||||||
|
.get_item("system_proxy")
|
||||||
|
.set_selected(enable));
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/// reset system proxy
|
/// reset system proxy
|
||||||
@@ -60,12 +62,12 @@ fn resolve_window(app: &App) {
|
|||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
{
|
{
|
||||||
use tauri_plugin_shadows::Shadows;
|
use window_shadows::set_shadow;
|
||||||
use tauri_plugin_vibrancy::Vibrancy;
|
use window_vibrancy::apply_blur;
|
||||||
|
|
||||||
window.set_decorations(false).unwrap();
|
window.set_decorations(false).unwrap();
|
||||||
window.set_shadow(true);
|
set_shadow(&window, true).unwrap();
|
||||||
window.apply_blur();
|
apply_blur(&window, None).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
|
|||||||
@@ -4,7 +4,10 @@ use port_scanner::local_port_available;
|
|||||||
use tauri::{AppHandle, Manager};
|
use tauri::{AppHandle, Manager};
|
||||||
use warp::Filter;
|
use warp::Filter;
|
||||||
|
|
||||||
|
#[cfg(not(feature = "verge-dev"))]
|
||||||
const SERVER_PORT: u16 = 33333;
|
const SERVER_PORT: u16 = 33333;
|
||||||
|
#[cfg(feature = "verge-dev")]
|
||||||
|
const SERVER_PORT: u16 = 11233;
|
||||||
|
|
||||||
/// check whether there is already exists
|
/// check whether there is already exists
|
||||||
pub fn check_singleton() -> Result<(), ()> {
|
pub fn check_singleton() -> Result<(), ()> {
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
|
use anyhow::Result;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::io;
|
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
static DEFAULT_BYPASS: &str = "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*;<local>";
|
static DEFAULT_BYPASS: &str = "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*;<local>";
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
static DEFAULT_BYPASS: &str = "localhost,127.0.0.1/8,::1";
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
static DEFAULT_BYPASS: &str =
|
static DEFAULT_BYPASS: &str =
|
||||||
"192.168.0.0/16\n10.0.0.0/8\n172.16.0.0/12\n127.0.0.1\nlocalhost\n*.local\ntimestamp.apple.com\n";
|
"192.168.0.0/16\n10.0.0.0/8\n172.16.0.0/12\n127.0.0.1\nlocalhost\n*.local\ntimestamp.apple.com\n";
|
||||||
@@ -34,10 +36,12 @@ impl SysProxyConfig {
|
|||||||
bypass: bypass.unwrap_or(DEFAULT_BYPASS.into()),
|
bypass: bypass.unwrap_or(DEFAULT_BYPASS.into()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
|
impl SysProxyConfig {
|
||||||
/// Get the windows system proxy config
|
/// Get the windows system proxy config
|
||||||
pub fn get_sys() -> io::Result<Self> {
|
pub fn get_sys() -> Result<Self> {
|
||||||
use winreg::enums::*;
|
use winreg::enums::*;
|
||||||
use winreg::RegKey;
|
use winreg::RegKey;
|
||||||
|
|
||||||
@@ -54,9 +58,30 @@ impl SysProxyConfig {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "macos")]
|
/// Set the windows system proxy config
|
||||||
|
pub fn set_sys(&self) -> Result<()> {
|
||||||
|
use winreg::enums::*;
|
||||||
|
use winreg::RegKey;
|
||||||
|
let hkcu = RegKey::predef(HKEY_CURRENT_USER);
|
||||||
|
let cur_var = hkcu.open_subkey_with_flags(
|
||||||
|
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Internet Settings",
|
||||||
|
KEY_SET_VALUE,
|
||||||
|
)?;
|
||||||
|
|
||||||
|
let enable: u32 = if self.enable { 1u32 } else { 0u32 };
|
||||||
|
|
||||||
|
cur_var.set_value("ProxyEnable", &enable)?;
|
||||||
|
cur_var.set_value("ProxyServer", &self.server)?;
|
||||||
|
cur_var.set_value("ProxyOverride", &self.bypass)?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
impl SysProxyConfig {
|
||||||
/// Get the macos system proxy config
|
/// Get the macos system proxy config
|
||||||
pub fn get_sys() -> io::Result<Self> {
|
pub fn get_sys() -> Result<Self> {
|
||||||
use std::process::Command;
|
use std::process::Command;
|
||||||
|
|
||||||
let http = macproxy::get_proxy(&["-getwebproxy", MACOS_SERVICE])?;
|
let http = macproxy::get_proxy(&["-getwebproxy", MACOS_SERVICE])?;
|
||||||
@@ -82,63 +107,59 @@ impl SysProxyConfig {
|
|||||||
let bypass_output = Command::new("networksetup")
|
let bypass_output = Command::new("networksetup")
|
||||||
.args(["-getproxybypassdomains", MACOS_SERVICE])
|
.args(["-getproxybypassdomains", MACOS_SERVICE])
|
||||||
.output()?;
|
.output()?;
|
||||||
let bypass = std::str::from_utf8(&bypass_output.stdout).unwrap_or(DEFAULT_BYPASS);
|
|
||||||
|
// change the format to xxx,xxx
|
||||||
|
let bypass = std::str::from_utf8(&bypass_output.stdout)
|
||||||
|
.unwrap_or(DEFAULT_BYPASS)
|
||||||
|
.to_string()
|
||||||
|
.split('\n')
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join(",");
|
||||||
|
|
||||||
Ok(SysProxyConfig {
|
Ok(SysProxyConfig {
|
||||||
enable,
|
enable,
|
||||||
server,
|
server,
|
||||||
bypass: bypass.into(),
|
bypass,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
|
||||||
/// Set the windows system proxy config
|
|
||||||
pub fn set_sys(&self) -> io::Result<()> {
|
|
||||||
use winreg::enums::*;
|
|
||||||
use winreg::RegKey;
|
|
||||||
let hkcu = RegKey::predef(HKEY_CURRENT_USER);
|
|
||||||
let cur_var = hkcu.open_subkey_with_flags(
|
|
||||||
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Internet Settings",
|
|
||||||
KEY_SET_VALUE,
|
|
||||||
)?;
|
|
||||||
|
|
||||||
let enable: u32 = if self.enable { 1u32 } else { 0u32 };
|
|
||||||
|
|
||||||
cur_var.set_value("ProxyEnable", &enable)?;
|
|
||||||
cur_var.set_value("ProxyServer", &self.server)?;
|
|
||||||
cur_var.set_value("ProxyOverride", &self.bypass)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(target_os = "macos")]
|
|
||||||
/// Set the macos system proxy config
|
/// Set the macos system proxy config
|
||||||
pub fn set_sys(&self) -> io::Result<()> {
|
pub fn set_sys(&self) -> Result<()> {
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
let enable = self.enable;
|
let enable = self.enable;
|
||||||
let server = self.server.as_str();
|
let server = self.server.as_str();
|
||||||
|
let bypass = self.bypass.clone();
|
||||||
macproxy::set_proxy("-setwebproxy", MACOS_SERVICE, enable, server)?;
|
macproxy::set_proxy("-setwebproxy", MACOS_SERVICE, enable, server)?;
|
||||||
macproxy::set_proxy("-setsecurewebproxy", MACOS_SERVICE, enable, server)?;
|
macproxy::set_proxy("-setsecurewebproxy", MACOS_SERVICE, enable, server)?;
|
||||||
macproxy::set_proxy("-setsocksfirewallproxy", MACOS_SERVICE, enable, server)
|
macproxy::set_proxy("-setsocksfirewallproxy", MACOS_SERVICE, enable, server)?;
|
||||||
|
|
||||||
|
let domains = bypass.split(",").collect::<Vec<_>>();
|
||||||
|
Command::new("networksetup")
|
||||||
|
.args([["-setproxybypassdomains", MACOS_SERVICE].to_vec(), domains].concat())
|
||||||
|
.status()?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
mod macproxy {
|
mod macproxy {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
use anyhow::bail;
|
||||||
use std::process::Command;
|
use std::process::Command;
|
||||||
|
|
||||||
/// use networksetup
|
/// use networksetup
|
||||||
/// get the target proxy config
|
/// get the target proxy config
|
||||||
pub(super) fn get_proxy(args: &[&str; 2]) -> io::Result<(String, String)> {
|
pub(super) fn get_proxy(args: &[&str; 2]) -> Result<(String, String)> {
|
||||||
let output = Command::new("networksetup").args(args).output()?;
|
let output = Command::new("networksetup").args(args).output()?;
|
||||||
match std::str::from_utf8(&output.stdout) {
|
|
||||||
Ok(stdout) => {
|
let stdout = std::str::from_utf8(&output.stdout)?;
|
||||||
let enable = parse(stdout, "Enabled:");
|
let enable = parse(stdout, "Enabled:");
|
||||||
let server = parse(stdout, "Server:");
|
let server = parse(stdout, "Server:");
|
||||||
let port = parse(stdout, "Port:");
|
let port = parse(stdout, "Port:");
|
||||||
let server = format!("{}:{}", server, port);
|
let server = format!("{server}:{port}");
|
||||||
Ok((enable.into(), server))
|
Ok((enable.into(), server))
|
||||||
}
|
|
||||||
Err(_) => Err(io::Error::from_raw_os_error(1)),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// use networksetup
|
/// use networksetup
|
||||||
@@ -148,17 +169,17 @@ mod macproxy {
|
|||||||
device: &str,
|
device: &str,
|
||||||
enable: bool,
|
enable: bool,
|
||||||
server: &str,
|
server: &str,
|
||||||
) -> io::Result<()> {
|
) -> Result<()> {
|
||||||
let mut split = server.split(":");
|
let mut split = server.split(":");
|
||||||
let domain = split.next();
|
let host = split.next();
|
||||||
let port = split.next();
|
let port = split.next();
|
||||||
|
|
||||||
// can not parse the field
|
// can not parse the field
|
||||||
if domain.is_none() || port.is_none() {
|
if host.is_none() || port.is_none() {
|
||||||
return Err(io::Error::from_raw_os_error(1));
|
bail!("failed to parse the server into host:port");
|
||||||
}
|
}
|
||||||
|
|
||||||
let args = vec![target, device, domain.unwrap(), port.unwrap()];
|
let args = vec![target, device, host.unwrap(), port.unwrap()];
|
||||||
Command::new("networksetup").args(&args).status()?;
|
Command::new("networksetup").args(&args).status()?;
|
||||||
|
|
||||||
let target_state = String::from(target) + "state";
|
let target_state = String::from(target) + "state";
|
||||||
@@ -169,7 +190,7 @@ mod macproxy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// parse the networksetup output
|
/// parse the networksetup output
|
||||||
pub(super) fn parse<'a>(target: &'a str, key: &'a str) -> &'a str {
|
fn parse<'a>(target: &'a str, key: &'a str) -> &'a str {
|
||||||
match target.find(key) {
|
match target.find(key) {
|
||||||
Some(idx) => {
|
Some(idx) => {
|
||||||
let idx = idx + key.len();
|
let idx = idx + key.len();
|
||||||
@@ -209,3 +230,137 @@ mod macproxy {
|
|||||||
dbg!(sysproxy.set_sys().unwrap());
|
dbg!(sysproxy.set_sys().unwrap());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
///
|
||||||
|
/// Linux Desktop System Proxy Supports
|
||||||
|
/// by using `gsettings`
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
impl SysProxyConfig {
|
||||||
|
/// Get the system proxy config [http/https/socks]
|
||||||
|
pub fn get_sys() -> Result<Self> {
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
let schema = "org.gnome.system.proxy";
|
||||||
|
|
||||||
|
// get enable
|
||||||
|
let mode = Command::new("gsettings")
|
||||||
|
.args(["get", schema, "mode"])
|
||||||
|
.output()?;
|
||||||
|
let mode = std::str::from_utf8(&mode.stdout)?;
|
||||||
|
let enable = mode == "manual";
|
||||||
|
|
||||||
|
// get bypass
|
||||||
|
// Todo: parse the ignore-hosts
|
||||||
|
// ['aaa', 'bbb'] -> aaa,bbb
|
||||||
|
let ignore = Command::new("gsettings")
|
||||||
|
.args(["get", schema, "ignore-hosts"])
|
||||||
|
.output()?;
|
||||||
|
let ignore = std::str::from_utf8(&ignore.stdout)?;
|
||||||
|
let bypass = ignore.to_string();
|
||||||
|
|
||||||
|
let http = Self::get_proxy("http")?;
|
||||||
|
let https = Self::get_proxy("https")?;
|
||||||
|
let socks = Self::get_proxy("socks")?;
|
||||||
|
|
||||||
|
let mut server = "".into();
|
||||||
|
|
||||||
|
if socks.len() > 0 {
|
||||||
|
server = socks;
|
||||||
|
}
|
||||||
|
if https.len() > 0 {
|
||||||
|
server = https;
|
||||||
|
}
|
||||||
|
if http.len() > 0 {
|
||||||
|
server = http;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(SysProxyConfig {
|
||||||
|
enable,
|
||||||
|
server,
|
||||||
|
bypass,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get the system proxy config [http/https/socks]
|
||||||
|
pub fn set_sys(&self) -> Result<()> {
|
||||||
|
use anyhow::bail;
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
let enable = self.enable;
|
||||||
|
let server = self.server.as_str();
|
||||||
|
let bypass = self.bypass.clone();
|
||||||
|
let schema = "org.gnome.system.proxy";
|
||||||
|
|
||||||
|
if enable {
|
||||||
|
let mut split = server.split(":");
|
||||||
|
let host = split.next();
|
||||||
|
let port = split.next();
|
||||||
|
|
||||||
|
if port.is_none() {
|
||||||
|
bail!("failed to parse the port");
|
||||||
|
}
|
||||||
|
|
||||||
|
let host = format!("'{}'", host.unwrap_or("127.0.0.1"));
|
||||||
|
let host = host.as_str();
|
||||||
|
let port = port.unwrap();
|
||||||
|
|
||||||
|
let http = format!("{schema}.http");
|
||||||
|
Command::new("gsettings")
|
||||||
|
.args(["set", http.as_str(), "host", host])
|
||||||
|
.status()?;
|
||||||
|
Command::new("gsettings")
|
||||||
|
.args(["set", http.as_str(), "port", port])
|
||||||
|
.status()?;
|
||||||
|
|
||||||
|
let https = format!("{schema}.https");
|
||||||
|
Command::new("gsettings")
|
||||||
|
.args(["set", https.as_str(), "host", host])
|
||||||
|
.status()?;
|
||||||
|
Command::new("gsettings")
|
||||||
|
.args(["set", https.as_str(), "port", port])
|
||||||
|
.status()?;
|
||||||
|
|
||||||
|
let socks = format!("{schema}.socks");
|
||||||
|
Command::new("gsettings")
|
||||||
|
.args(["set", socks.as_str(), "host", host])
|
||||||
|
.status()?;
|
||||||
|
Command::new("gsettings")
|
||||||
|
.args(["set", socks.as_str(), "port", port])
|
||||||
|
.status()?;
|
||||||
|
|
||||||
|
// set bypass
|
||||||
|
// Todo: parse the ignore-hosts
|
||||||
|
// aaa,bbb,cccc -> ['aaa', 'bbb', 'ccc']
|
||||||
|
Command::new("gsettings")
|
||||||
|
.args(["set", schema, "ignore-hosts", bypass.as_str()]) // todo
|
||||||
|
.status()?;
|
||||||
|
}
|
||||||
|
|
||||||
|
let mode = if enable { "'manual'" } else { "'none'" };
|
||||||
|
Command::new("gsettings")
|
||||||
|
.args(["set", schema, "mode", mode])
|
||||||
|
.status()?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// help function
|
||||||
|
fn get_proxy(typ: &str) -> Result<String> {
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
let schema = format!("org.gnome.system.proxy.{typ}");
|
||||||
|
let schema = schema.as_str();
|
||||||
|
|
||||||
|
let host = Command::new("gsettings")
|
||||||
|
.args(["get", schema, "host"])
|
||||||
|
.output()?;
|
||||||
|
let host = std::str::from_utf8(&host.stdout)?;
|
||||||
|
|
||||||
|
let port = Command::new("gsettings")
|
||||||
|
.args(["get", schema, "port"])
|
||||||
|
.output()?;
|
||||||
|
let port = std::str::from_utf8(&port.stdout)?;
|
||||||
|
|
||||||
|
Ok(format!("{host}:{port}"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -14,13 +14,14 @@ secret: ""
|
|||||||
/// template for `profiles.yaml`
|
/// template for `profiles.yaml`
|
||||||
pub const PROFILES_CONFIG: &[u8] = b"# Profiles Config for Clash Verge
|
pub const PROFILES_CONFIG: &[u8] = b"# Profiles Config for Clash Verge
|
||||||
|
|
||||||
current: 0
|
current: ~
|
||||||
items: ~
|
items: ~
|
||||||
";
|
";
|
||||||
|
|
||||||
/// template for `verge.yaml`
|
/// template for `verge.yaml`
|
||||||
pub const VERGE_CONFIG: &[u8] = b"# Defaulf Config For Clash Verge
|
pub const VERGE_CONFIG: &[u8] = b"# Defaulf Config For Clash Verge
|
||||||
|
|
||||||
|
language: en
|
||||||
theme_mode: light
|
theme_mode: light
|
||||||
theme_blur: false
|
theme_blur: false
|
||||||
traffic_graph: true
|
traffic_graph: true
|
||||||
@@ -32,11 +33,38 @@ system_proxy_bypass: localhost;127.*;10.*;192.168.*;<local>
|
|||||||
";
|
";
|
||||||
|
|
||||||
/// template for new a profile item
|
/// template for new a profile item
|
||||||
pub const ITEM_CONFIG: &[u8] = b"# Profile Template for clash verge\n\n
|
pub const ITEM_LOCAL: &str = "# Profile Template for clash verge
|
||||||
# proxies defination (optional, the same as clash)
|
|
||||||
proxies:\n
|
proxies:
|
||||||
# proxy-groups (optional, the same as clash)
|
|
||||||
proxy-groups:\n
|
proxy-groups:
|
||||||
# rules (optional, the same as clash)
|
|
||||||
rules:\n\n
|
rules:
|
||||||
|
";
|
||||||
|
|
||||||
|
/// enhanced profile
|
||||||
|
pub const ITEM_MERGE: &str = "# Merge Template for clash verge
|
||||||
|
# The `Merge` format used to enhance profile
|
||||||
|
|
||||||
|
prepend-rules:
|
||||||
|
|
||||||
|
prepend-proxies:
|
||||||
|
|
||||||
|
prepend-proxy-groups:
|
||||||
|
|
||||||
|
append-rules:
|
||||||
|
|
||||||
|
append-proxies:
|
||||||
|
|
||||||
|
append-proxy-groups:
|
||||||
|
";
|
||||||
|
|
||||||
|
/// enhanced profile
|
||||||
|
pub const ITEM_SCRIPT: &str = "// Should define the `main` function
|
||||||
|
// The argument to this function is the clash config
|
||||||
|
// or the result of the previous handler
|
||||||
|
// so you should return the config after processing
|
||||||
|
function main(params) {
|
||||||
|
return params;
|
||||||
|
}
|
||||||
";
|
";
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"package": {
|
"package": {
|
||||||
"productName": "clash-verge",
|
"productName": "Clash Verge",
|
||||||
"version": "0.0.18"
|
"version": "0.0.25"
|
||||||
},
|
},
|
||||||
"build": {
|
"build": {
|
||||||
"distDir": "../dist",
|
"distDir": "../dist",
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
],
|
],
|
||||||
"resources": ["resources"],
|
"resources": ["resources"],
|
||||||
"externalBin": ["sidecar/clash"],
|
"externalBin": ["sidecar/clash"],
|
||||||
"copyright": "© 2021 zzzgydi All Rights Reserved",
|
"copyright": "© 2022 zzzgydi All Rights Reserved",
|
||||||
"category": "DeveloperTool",
|
"category": "DeveloperTool",
|
||||||
"shortDescription": "A Clash GUI based on tauri.",
|
"shortDescription": "A Clash GUI based on tauri.",
|
||||||
"longDescription": "A Clash GUI based on tauri.",
|
"longDescription": "A Clash GUI based on tauri.",
|
||||||
@@ -52,7 +52,8 @@
|
|||||||
"updater": {
|
"updater": {
|
||||||
"active": true,
|
"active": true,
|
||||||
"endpoints": [
|
"endpoints": [
|
||||||
"https://github.com/zzzgydi/clash-verge/releases/download/updater/update.json"
|
"https://github.com/zzzgydi/clash-verge/releases/download/updater/update.json",
|
||||||
|
"https://hub.fastgit.xyz/zzzgydi/clash-verge/releases/download/updater/update-proxy.json"
|
||||||
],
|
],
|
||||||
"dialog": false,
|
"dialog": false,
|
||||||
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDExNUFBNTBBN0FDNEFBRTUKUldUbHFzUjZDcVZhRVRJM25NS3NkSFlFVElxUkNZMzZ6bHUwRVJjb2F3alJXVzRaeDdSaTA2YWYK"
|
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDExNUFBNTBBN0FDNEFBRTUKUldUbHFzUjZDcVZhRVRJM25NS3NkSFlFVElxUkNZMzZ6bHUwRVJjb2F3alJXVzRaeDdSaTA2YWYK"
|
||||||
@@ -63,6 +64,9 @@
|
|||||||
},
|
},
|
||||||
"window": {
|
"window": {
|
||||||
"all": true
|
"all": true
|
||||||
|
},
|
||||||
|
"process": {
|
||||||
|
"all": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"windows": [
|
"windows": [
|
||||||
|
|||||||
@@ -72,7 +72,7 @@
|
|||||||
|
|
||||||
.the-content {
|
.the-content {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 30px;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
right: 2px;
|
right: 2px;
|
||||||
bottom: 10px;
|
bottom: 10px;
|
||||||
@@ -80,8 +80,12 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.macos.layout {
|
.linux,
|
||||||
.layout__right .the-content {
|
.windows,
|
||||||
top: 0;
|
.unknown {
|
||||||
|
&.layout {
|
||||||
|
.layout__right .the-content {
|
||||||
|
top: 30px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,20 @@
|
|||||||
|
import dayjs from "dayjs";
|
||||||
|
import { useLockFn } from "ahooks";
|
||||||
|
import { styled, Box, ListItem, IconButton, ListItemText } from "@mui/material";
|
||||||
|
import { CloseRounded } from "@mui/icons-material";
|
||||||
import { ApiType } from "../../services/types";
|
import { ApiType } from "../../services/types";
|
||||||
|
import { deleteConnection } from "../../services/api";
|
||||||
|
|
||||||
|
const Tag = styled(Box)(({ theme }) => ({
|
||||||
|
display: "inline-block",
|
||||||
|
fontSize: "12px",
|
||||||
|
padding: "0 4px",
|
||||||
|
lineHeight: 1.375,
|
||||||
|
border: "1px solid #ccc",
|
||||||
|
borderRadius: 4,
|
||||||
|
marginRight: "0.1em",
|
||||||
|
transform: "scale(0.92)",
|
||||||
|
}));
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
value: ApiType.ConnectionsItem;
|
value: ApiType.ConnectionsItem;
|
||||||
@@ -7,7 +23,34 @@ interface Props {
|
|||||||
const ConnectionItem = (props: Props) => {
|
const ConnectionItem = (props: Props) => {
|
||||||
const { value } = props;
|
const { value } = props;
|
||||||
|
|
||||||
return <div>{value.metadata.host || value.metadata.destinationIP}</div>;
|
const onDelete = useLockFn(async () => deleteConnection(value.id));
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ListItem
|
||||||
|
dense
|
||||||
|
secondaryAction={
|
||||||
|
<IconButton edge="end" onClick={onDelete}>
|
||||||
|
<CloseRounded />
|
||||||
|
</IconButton>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<ListItemText
|
||||||
|
primary={value.metadata.host || value.metadata.destinationIP}
|
||||||
|
secondary={
|
||||||
|
<Box>
|
||||||
|
<Tag sx={{ textTransform: "uppercase", color: "success" }}>
|
||||||
|
{value.metadata.network}
|
||||||
|
</Tag>
|
||||||
|
<Tag>{value.metadata.type}</Tag>
|
||||||
|
{value.chains.length > 0 && (
|
||||||
|
<Tag>{value.chains[value.chains.length - 1]}</Tag>
|
||||||
|
)}
|
||||||
|
<Tag>{dayjs(value.start).fromNow()}</Tag>
|
||||||
|
</Box>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</ListItem>
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default ConnectionItem;
|
export default ConnectionItem;
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import useLogSetup from "./use-log-setup";
|
|||||||
import useTrafficGraph from "./use-traffic-graph";
|
import useTrafficGraph from "./use-traffic-graph";
|
||||||
import parseTraffic from "../../utils/parse-traffic";
|
import parseTraffic from "../../utils/parse-traffic";
|
||||||
|
|
||||||
|
// setup the traffic
|
||||||
const LayoutTraffic = () => {
|
const LayoutTraffic = () => {
|
||||||
const portValue = useRecoilValue(atomClashPort);
|
const portValue = useRecoilValue(atomClashPort);
|
||||||
const [traffic, setTraffic] = useState({ up: 0, down: 0 });
|
const [traffic, setTraffic] = useState({ up: 0, down: 0 });
|
||||||
@@ -26,12 +27,14 @@ const LayoutTraffic = () => {
|
|||||||
useLogSetup();
|
useLogSetup();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let unlisten: () => void = null!;
|
|
||||||
|
|
||||||
// should reconnect the traffic ws
|
// should reconnect the traffic ws
|
||||||
listen("restart_clash", () => setRefresh({})).then((fn) => (unlisten = fn));
|
const unlisten = listen("verge://refresh-clash-config", () =>
|
||||||
|
setRefresh({})
|
||||||
|
);
|
||||||
|
|
||||||
return () => unlisten?.();
|
return () => {
|
||||||
|
unlisten.then((fn) => fn());
|
||||||
|
};
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
@@ -32,7 +32,9 @@ const UpdateButton = (props: Props) => {
|
|||||||
New
|
New
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<UpdateDialog open={dialogOpen} onClose={() => setDialogOpen(false)} />
|
{dialogOpen && (
|
||||||
|
<UpdateDialog open={dialogOpen} onClose={() => setDialogOpen(false)} />
|
||||||
|
)}
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,23 +1,30 @@
|
|||||||
import useSWR from "swr";
|
import useSWR from "swr";
|
||||||
import { useState } from "react";
|
import snarkdown from "snarkdown";
|
||||||
import { checkUpdate, installUpdate } from "@tauri-apps/api/updater";
|
import { useMemo } from "react";
|
||||||
import { relaunch } from "@tauri-apps/api/process";
|
import { useRecoilState } from "recoil";
|
||||||
import {
|
import {
|
||||||
|
Box,
|
||||||
Button,
|
Button,
|
||||||
Dialog,
|
Dialog,
|
||||||
DialogActions,
|
DialogActions,
|
||||||
DialogContent,
|
DialogContent,
|
||||||
DialogContentText,
|
|
||||||
DialogTitle,
|
DialogTitle,
|
||||||
|
styled,
|
||||||
} from "@mui/material";
|
} from "@mui/material";
|
||||||
import { killSidecars } from "../../services/cmds";
|
import { relaunch } from "@tauri-apps/api/process";
|
||||||
|
import { checkUpdate, installUpdate } from "@tauri-apps/api/updater";
|
||||||
|
import { killSidecars, restartSidecar } from "../../services/cmds";
|
||||||
|
import { atomUpdateState } from "../../services/states";
|
||||||
|
import Notice from "../base/base-notice";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
open: boolean;
|
open: boolean;
|
||||||
onClose: () => void;
|
onClose: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
let uploadingState = false;
|
const UpdateLog = styled(Box)(() => ({
|
||||||
|
"h1,h2,h3,ul,ol,p": { margin: "0.5em 0", color: "inherit" },
|
||||||
|
}));
|
||||||
|
|
||||||
const UpdateDialog = (props: Props) => {
|
const UpdateDialog = (props: Props) => {
|
||||||
const { open, onClose } = props;
|
const { open, onClose } = props;
|
||||||
@@ -26,37 +33,48 @@ const UpdateDialog = (props: Props) => {
|
|||||||
revalidateIfStale: false,
|
revalidateIfStale: false,
|
||||||
focusThrottleInterval: 36e5, // 1 hour
|
focusThrottleInterval: 36e5, // 1 hour
|
||||||
});
|
});
|
||||||
const [uploading, setUploading] = useState(uploadingState);
|
|
||||||
|
const [updateState, setUpdateState] = useRecoilState(atomUpdateState);
|
||||||
|
|
||||||
const onUpdate = async () => {
|
const onUpdate = async () => {
|
||||||
|
if (updateState) return;
|
||||||
|
setUpdateState(true);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
setUploading(true);
|
|
||||||
uploadingState = true;
|
|
||||||
await killSidecars();
|
await killSidecars();
|
||||||
await installUpdate();
|
await installUpdate();
|
||||||
await relaunch();
|
await relaunch();
|
||||||
} catch (error) {
|
} catch (err: any) {
|
||||||
console.log(error);
|
await restartSidecar();
|
||||||
window.alert("Failed to upload, please try again.");
|
Notice.error(err?.message || err.toString());
|
||||||
} finally {
|
} finally {
|
||||||
setUploading(true);
|
setUpdateState(false);
|
||||||
uploadingState = true;
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// markdown parser
|
||||||
|
const parseContent = useMemo(() => {
|
||||||
|
if (!updateInfo?.manifest?.body) {
|
||||||
|
return "New Version is available";
|
||||||
|
}
|
||||||
|
return snarkdown(updateInfo?.manifest?.body);
|
||||||
|
}, [updateInfo]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Dialog open={open} onClose={onClose}>
|
<Dialog open={open} onClose={onClose}>
|
||||||
<DialogTitle>New Version v{updateInfo?.manifest?.version}</DialogTitle>
|
<DialogTitle>New Version v{updateInfo?.manifest?.version}</DialogTitle>
|
||||||
|
|
||||||
<DialogContent sx={{ minWidth: 360, maxWidth: 400, maxHeight: "50vh" }}>
|
<DialogContent sx={{ minWidth: 360, maxWidth: 400, maxHeight: "50vh" }}>
|
||||||
<DialogContentText>{updateInfo?.manifest?.body}</DialogContentText>
|
<UpdateLog dangerouslySetInnerHTML={{ __html: parseContent }} />
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
|
|
||||||
<DialogActions>
|
<DialogActions>
|
||||||
<Button onClick={onClose}>Cancel</Button>
|
<Button onClick={onClose}>Cancel</Button>
|
||||||
<Button
|
<Button
|
||||||
variant="contained"
|
|
||||||
autoFocus
|
autoFocus
|
||||||
|
variant="contained"
|
||||||
|
disabled={updateState}
|
||||||
onClick={onUpdate}
|
onClick={onUpdate}
|
||||||
disabled={uploading}
|
|
||||||
>
|
>
|
||||||
Update
|
Update
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
import { useEffect } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { useSetRecoilState } from "recoil";
|
import { useSetRecoilState } from "recoil";
|
||||||
import { listen } from "@tauri-apps/api/event";
|
import { listen } from "@tauri-apps/api/event";
|
||||||
import { ApiType } from "../../services/types";
|
import { ApiType } from "../../services/types";
|
||||||
@@ -10,11 +10,11 @@ const MAX_LOG_NUM = 1000;
|
|||||||
|
|
||||||
// setup the log websocket
|
// setup the log websocket
|
||||||
export default function useLogSetup() {
|
export default function useLogSetup() {
|
||||||
|
const [refresh, setRefresh] = useState({});
|
||||||
const setLogData = useSetRecoilState(atomLogData);
|
const setLogData = useSetRecoilState(atomLogData);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let ws: WebSocket = null!;
|
let ws: WebSocket = null!;
|
||||||
let unlisten: () => void = null!;
|
|
||||||
|
|
||||||
const handler = (event: MessageEvent<any>) => {
|
const handler = (event: MessageEvent<any>) => {
|
||||||
const data = JSON.parse(event.data) as ApiType.LogItem;
|
const data = JSON.parse(event.data) as ApiType.LogItem;
|
||||||
@@ -25,25 +25,19 @@ export default function useLogSetup() {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
(async () => {
|
getInfomation().then((info) => {
|
||||||
const { server = "", secret = "" } = await getInfomation();
|
const { server = "", secret = "" } = info;
|
||||||
|
|
||||||
ws = new WebSocket(`ws://${server}/logs?token=${secret}`);
|
ws = new WebSocket(`ws://${server}/logs?token=${secret}`);
|
||||||
ws.addEventListener("message", handler);
|
ws.addEventListener("message", handler);
|
||||||
|
});
|
||||||
|
|
||||||
// reconnect the websocket
|
const unlisten = listen("verge://refresh-clash-config", () =>
|
||||||
unlisten = await listen("restart_clash", async () => {
|
setRefresh({})
|
||||||
const { server = "", secret = "" } = await getInfomation();
|
);
|
||||||
|
|
||||||
ws?.close();
|
|
||||||
ws = new WebSocket(`ws://${server}/logs?token=${secret}`);
|
|
||||||
ws.addEventListener("message", handler);
|
|
||||||
});
|
|
||||||
})();
|
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
ws?.close();
|
ws?.close();
|
||||||
unlisten?.();
|
unlisten?.then((fn) => fn());
|
||||||
};
|
};
|
||||||
}, []);
|
}, [refresh]);
|
||||||
}
|
}
|
||||||
|
|||||||
61
src/components/profile/file-input.tsx
Normal file
61
src/components/profile/file-input.tsx
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
import { useRef, useState } from "react";
|
||||||
|
import { useLockFn } from "ahooks";
|
||||||
|
import { Box, Button, Typography } from "@mui/material";
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
onChange: (value: string) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
const FileInput = (props: Props) => {
|
||||||
|
const { onChange } = props;
|
||||||
|
|
||||||
|
// file input
|
||||||
|
const inputRef = useRef<any>();
|
||||||
|
const [loading, setLoading] = useState(false);
|
||||||
|
const [fileName, setFileName] = useState("");
|
||||||
|
|
||||||
|
const onFileInput = useLockFn(async (e: any) => {
|
||||||
|
const file = e.target.files?.[0] as File;
|
||||||
|
|
||||||
|
if (!file) return;
|
||||||
|
|
||||||
|
setFileName(file.name);
|
||||||
|
setLoading(true);
|
||||||
|
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const reader = new FileReader();
|
||||||
|
reader.onload = (event) => {
|
||||||
|
resolve(null);
|
||||||
|
onChange(event.target?.result as string);
|
||||||
|
};
|
||||||
|
reader.onerror = reject;
|
||||||
|
reader.readAsText(file);
|
||||||
|
}).finally(() => setLoading(false));
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Box sx={{ mt: 2, mb: 1, display: "flex", alignItems: "center" }}>
|
||||||
|
<Button
|
||||||
|
variant="outlined"
|
||||||
|
sx={{ flex: "none" }}
|
||||||
|
onClick={() => inputRef.current?.click()}
|
||||||
|
>
|
||||||
|
Choose File
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
<input
|
||||||
|
type="file"
|
||||||
|
accept=".yaml,.yml"
|
||||||
|
ref={inputRef}
|
||||||
|
style={{ display: "none" }}
|
||||||
|
onChange={onFileInput}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Typography noWrap sx={{ ml: 1 }}>
|
||||||
|
{loading ? "Loading..." : fileName}
|
||||||
|
</Typography>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default FileInput;
|
||||||
137
src/components/profile/profile-edit.tsx
Normal file
137
src/components/profile/profile-edit.tsx
Normal file
@@ -0,0 +1,137 @@
|
|||||||
|
import { mutate } from "swr";
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { useLockFn, useSetState } from "ahooks";
|
||||||
|
import {
|
||||||
|
Button,
|
||||||
|
Dialog,
|
||||||
|
DialogActions,
|
||||||
|
DialogContent,
|
||||||
|
DialogTitle,
|
||||||
|
IconButton,
|
||||||
|
TextField,
|
||||||
|
} from "@mui/material";
|
||||||
|
import { Settings } from "@mui/icons-material";
|
||||||
|
import { CmdType } from "../../services/types";
|
||||||
|
import { patchProfile } from "../../services/cmds";
|
||||||
|
import Notice from "../base/base-notice";
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
open: boolean;
|
||||||
|
itemData: CmdType.ProfileItem;
|
||||||
|
onClose: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
// edit the profile item
|
||||||
|
// remote / local file / merge / script
|
||||||
|
const ProfileEdit = (props: Props) => {
|
||||||
|
const { open, itemData, onClose } = props;
|
||||||
|
const [form, setForm] = useSetState({ ...itemData });
|
||||||
|
const [option, setOption] = useSetState(itemData.option ?? {});
|
||||||
|
const [showOpt, setShowOpt] = useState(!!itemData.option);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (itemData) {
|
||||||
|
setForm({ ...itemData });
|
||||||
|
setOption(itemData.option ?? {});
|
||||||
|
setShowOpt(!!itemData.option?.user_agent);
|
||||||
|
}
|
||||||
|
}, [itemData]);
|
||||||
|
|
||||||
|
const onUpdate = useLockFn(async () => {
|
||||||
|
try {
|
||||||
|
const { uid } = itemData;
|
||||||
|
const { name, desc, url } = form;
|
||||||
|
const option_ = itemData.type === "remote" ? option : undefined;
|
||||||
|
|
||||||
|
if (itemData.type === "remote" && !url) {
|
||||||
|
throw new Error("Remote URL should not be null");
|
||||||
|
}
|
||||||
|
|
||||||
|
await patchProfile(uid, { uid, name, desc, url, option: option_ });
|
||||||
|
setShowOpt(false);
|
||||||
|
mutate("getProfiles");
|
||||||
|
onClose();
|
||||||
|
} catch (err: any) {
|
||||||
|
Notice.error(err?.message || err.toString());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const textFieldProps = {
|
||||||
|
fullWidth: true,
|
||||||
|
size: "small",
|
||||||
|
margin: "normal",
|
||||||
|
variant: "outlined",
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
const type =
|
||||||
|
form.type ||
|
||||||
|
(form.url ? "remote" : form.file?.endsWith("js") ? "script" : "local");
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Dialog open={open} onClose={onClose}>
|
||||||
|
<DialogTitle sx={{ pb: 0.5 }}>Edit Profile</DialogTitle>
|
||||||
|
|
||||||
|
<DialogContent sx={{ width: 336, pb: 1 }}>
|
||||||
|
<TextField
|
||||||
|
{...textFieldProps}
|
||||||
|
disabled
|
||||||
|
label="Type"
|
||||||
|
value={type}
|
||||||
|
sx={{ input: { textTransform: "capitalize" } }}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<TextField
|
||||||
|
{...textFieldProps}
|
||||||
|
autoFocus
|
||||||
|
label="Name"
|
||||||
|
value={form.name}
|
||||||
|
onChange={(e) => setForm({ name: e.target.value })}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<TextField
|
||||||
|
{...textFieldProps}
|
||||||
|
label="Descriptions"
|
||||||
|
value={form.desc}
|
||||||
|
onChange={(e) => setForm({ desc: e.target.value })}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{type === "remote" && (
|
||||||
|
<TextField
|
||||||
|
{...textFieldProps}
|
||||||
|
label="Subscription Url"
|
||||||
|
value={form.url}
|
||||||
|
onChange={(e) => setForm({ url: e.target.value })}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{showOpt && (
|
||||||
|
<TextField
|
||||||
|
{...textFieldProps}
|
||||||
|
label="User Agent"
|
||||||
|
value={option.user_agent}
|
||||||
|
onChange={(e) => setOption({ user_agent: e.target.value })}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</DialogContent>
|
||||||
|
|
||||||
|
<DialogActions sx={{ px: 2, pb: 2, position: "relative" }}>
|
||||||
|
{form.type === "remote" && (
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
sx={{ position: "absolute", left: 18 }}
|
||||||
|
onClick={() => setShowOpt((o) => !o)}
|
||||||
|
>
|
||||||
|
<Settings />
|
||||||
|
</IconButton>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<Button onClick={onClose}>Cancel</Button>
|
||||||
|
<Button onClick={onUpdate} variant="contained">
|
||||||
|
Update
|
||||||
|
</Button>
|
||||||
|
</DialogActions>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ProfileEdit;
|
||||||
@@ -1,5 +1,9 @@
|
|||||||
import React, { useRef, useState } from "react";
|
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
|
import { useState } from "react";
|
||||||
|
import { useLockFn } from "ahooks";
|
||||||
|
import { useSWRConfig } from "swr";
|
||||||
|
import { useRecoilState } from "recoil";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
import {
|
import {
|
||||||
alpha,
|
alpha,
|
||||||
Box,
|
Box,
|
||||||
@@ -11,15 +15,13 @@ import {
|
|||||||
MenuItem,
|
MenuItem,
|
||||||
Menu,
|
Menu,
|
||||||
} from "@mui/material";
|
} from "@mui/material";
|
||||||
import { useSWRConfig } from "swr";
|
|
||||||
import { RefreshRounded } from "@mui/icons-material";
|
import { RefreshRounded } from "@mui/icons-material";
|
||||||
import { CmdType } from "../../services/types";
|
import { CmdType } from "../../services/types";
|
||||||
|
import { atomLoadingCache } from "../../services/states";
|
||||||
import { updateProfile, deleteProfile, viewProfile } from "../../services/cmds";
|
import { updateProfile, deleteProfile, viewProfile } from "../../services/cmds";
|
||||||
import Notice from "../base/base-notice";
|
|
||||||
import parseTraffic from "../../utils/parse-traffic";
|
import parseTraffic from "../../utils/parse-traffic";
|
||||||
import relativeTime from "dayjs/plugin/relativeTime";
|
import ProfileEdit from "./profile-edit";
|
||||||
|
import Notice from "../base/base-notice";
|
||||||
dayjs.extend(relativeTime);
|
|
||||||
|
|
||||||
const Wrapper = styled(Box)(({ theme }) => ({
|
const Wrapper = styled(Box)(({ theme }) => ({
|
||||||
width: "100%",
|
width: "100%",
|
||||||
@@ -38,19 +40,19 @@ const round = keyframes`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
index: number;
|
|
||||||
selected: boolean;
|
selected: boolean;
|
||||||
itemData: CmdType.ProfileItem;
|
itemData: CmdType.ProfileItem;
|
||||||
onSelect: (force: boolean) => void;
|
onSelect: (force: boolean) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
const ProfileItem: React.FC<Props> = (props) => {
|
const ProfileItem = (props: Props) => {
|
||||||
const { index, selected, itemData, onSelect } = props;
|
const { selected, itemData, onSelect } = props;
|
||||||
|
|
||||||
|
const { t } = useTranslation();
|
||||||
const { mutate } = useSWRConfig();
|
const { mutate } = useSWRConfig();
|
||||||
const [loading, setLoading] = useState(false);
|
|
||||||
const [anchorEl, setAnchorEl] = useState<any>(null);
|
const [anchorEl, setAnchorEl] = useState<any>(null);
|
||||||
const [position, setPosition] = useState({ left: 0, top: 0 });
|
const [position, setPosition] = useState({ left: 0, top: 0 });
|
||||||
|
const [loadingCache, setLoadingCache] = useRecoilState(atomLoadingCache);
|
||||||
|
|
||||||
const { name = "Profile", extra, updated = 0 } = itemData;
|
const { name = "Profile", extra, updated = 0 } = itemData;
|
||||||
const { upload = 0, download = 0, total = 0 } = extra ?? {};
|
const { upload = 0, download = 0, total = 0 } = extra ?? {};
|
||||||
@@ -65,12 +67,20 @@ const ProfileItem: React.FC<Props> = (props) => {
|
|||||||
const hasUrl = !!itemData.url;
|
const hasUrl = !!itemData.url;
|
||||||
const hasExtra = !!extra; // only subscription url has extra info
|
const hasExtra = !!extra; // only subscription url has extra info
|
||||||
|
|
||||||
|
const loading = loadingCache[itemData.uid] ?? false;
|
||||||
|
|
||||||
|
const [editOpen, setEditOpen] = useState(false);
|
||||||
|
const onEdit = () => {
|
||||||
|
setAnchorEl(null);
|
||||||
|
setEditOpen(true);
|
||||||
|
};
|
||||||
|
|
||||||
const onView = async () => {
|
const onView = async () => {
|
||||||
setAnchorEl(null);
|
setAnchorEl(null);
|
||||||
try {
|
try {
|
||||||
await viewProfile(index);
|
await viewProfile(itemData.uid);
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
Notice.error(err.toString());
|
Notice.error(err?.message || err.toString());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -79,43 +89,29 @@ const ProfileItem: React.FC<Props> = (props) => {
|
|||||||
onSelect(true);
|
onSelect(true);
|
||||||
};
|
};
|
||||||
|
|
||||||
const onUpdateWrapper = (withProxy: boolean) => async () => {
|
const onUpdate = useLockFn(async (withProxy: boolean) => {
|
||||||
setAnchorEl(null);
|
setAnchorEl(null);
|
||||||
if (loading) return;
|
setLoadingCache((cache) => ({ ...cache, [itemData.uid]: true }));
|
||||||
setLoading(true);
|
|
||||||
try {
|
try {
|
||||||
await updateProfile(index, withProxy);
|
await updateProfile(itemData.uid, { with_proxy: withProxy });
|
||||||
mutate("getProfiles");
|
mutate("getProfiles");
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
Notice.error(err.toString());
|
Notice.error(err?.message || err.toString());
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
setLoadingCache((cache) => ({ ...cache, [itemData.uid]: false }));
|
||||||
}
|
}
|
||||||
};
|
});
|
||||||
|
|
||||||
const deleteRef = useRef(false);
|
const onDelete = useLockFn(async () => {
|
||||||
const onDelete = async () => {
|
|
||||||
setAnchorEl(null);
|
setAnchorEl(null);
|
||||||
if (deleteRef.current) return;
|
|
||||||
deleteRef.current = true;
|
|
||||||
try {
|
try {
|
||||||
await deleteProfile(index);
|
await deleteProfile(itemData.uid);
|
||||||
mutate("getProfiles");
|
mutate("getProfiles");
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
Notice.error(err.toString());
|
Notice.error(err?.message || err.toString());
|
||||||
} finally {
|
|
||||||
deleteRef.current = false;
|
|
||||||
}
|
}
|
||||||
};
|
});
|
||||||
|
|
||||||
const handleContextMenu = (
|
|
||||||
event: React.MouseEvent<HTMLDivElement, MouseEvent>
|
|
||||||
) => {
|
|
||||||
const { clientX, clientY } = event;
|
|
||||||
setPosition({ top: clientY, left: clientX });
|
|
||||||
setAnchorEl(event.currentTarget);
|
|
||||||
event.preventDefault();
|
|
||||||
};
|
|
||||||
|
|
||||||
const boxStyle = {
|
const boxStyle = {
|
||||||
height: 26,
|
height: 26,
|
||||||
@@ -126,14 +122,16 @@ const ProfileItem: React.FC<Props> = (props) => {
|
|||||||
|
|
||||||
const urlModeMenu = [
|
const urlModeMenu = [
|
||||||
{ label: "Select", handler: onForceSelect },
|
{ label: "Select", handler: onForceSelect },
|
||||||
{ label: "View", handler: onView },
|
{ label: "Edit", handler: onEdit },
|
||||||
{ label: "Update", handler: onUpdateWrapper(false) },
|
{ label: "File", handler: onView },
|
||||||
{ label: "Update(Proxy)", handler: onUpdateWrapper(true) },
|
{ label: "Update", handler: () => onUpdate(false) },
|
||||||
|
{ label: "Update(Proxy)", handler: () => onUpdate(true) },
|
||||||
{ label: "Delete", handler: onDelete },
|
{ label: "Delete", handler: onDelete },
|
||||||
];
|
];
|
||||||
const fileModeMenu = [
|
const fileModeMenu = [
|
||||||
{ label: "Select", handler: onForceSelect },
|
{ label: "Select", handler: onForceSelect },
|
||||||
{ label: "Edit", handler: onView },
|
{ label: "Edit", handler: onEdit },
|
||||||
|
{ label: "File", handler: onView },
|
||||||
{ label: "Delete", handler: onDelete },
|
{ label: "Delete", handler: onDelete },
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -168,7 +166,12 @@ const ProfileItem: React.FC<Props> = (props) => {
|
|||||||
return { bgcolor, color, "& h2": { color: h2color } };
|
return { bgcolor, color, "& h2": { color: h2color } };
|
||||||
}}
|
}}
|
||||||
onClick={() => onSelect(false)}
|
onClick={() => onSelect(false)}
|
||||||
onContextMenu={handleContextMenu}
|
onContextMenu={(event) => {
|
||||||
|
const { clientX, clientY } = event;
|
||||||
|
setPosition({ top: clientY, left: clientX });
|
||||||
|
setAnchorEl(event.currentTarget);
|
||||||
|
event.preventDefault();
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<Box display="flex" justifyContent="space-between">
|
<Box display="flex" justifyContent="space-between">
|
||||||
<Typography
|
<Typography
|
||||||
@@ -193,7 +196,7 @@ const ProfileItem: React.FC<Props> = (props) => {
|
|||||||
disabled={loading}
|
disabled={loading}
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
onUpdateWrapper(false)();
|
onUpdate(false);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<RefreshRounded />
|
<RefreshRounded />
|
||||||
@@ -253,6 +256,10 @@ const ProfileItem: React.FC<Props> = (props) => {
|
|||||||
onClose={() => setAnchorEl(null)}
|
onClose={() => setAnchorEl(null)}
|
||||||
anchorPosition={position}
|
anchorPosition={position}
|
||||||
anchorReference="anchorPosition"
|
anchorReference="anchorPosition"
|
||||||
|
onContextMenu={(e) => {
|
||||||
|
setAnchorEl(null);
|
||||||
|
e.preventDefault();
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{(hasUrl ? urlModeMenu : fileModeMenu).map((item) => (
|
{(hasUrl ? urlModeMenu : fileModeMenu).map((item) => (
|
||||||
<MenuItem
|
<MenuItem
|
||||||
@@ -260,10 +267,18 @@ const ProfileItem: React.FC<Props> = (props) => {
|
|||||||
onClick={item.handler}
|
onClick={item.handler}
|
||||||
sx={{ minWidth: 133 }}
|
sx={{ minWidth: 133 }}
|
||||||
>
|
>
|
||||||
{item.label}
|
{t(item.label)}
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
))}
|
))}
|
||||||
</Menu>
|
</Menu>
|
||||||
|
|
||||||
|
{editOpen && (
|
||||||
|
<ProfileEdit
|
||||||
|
open={editOpen}
|
||||||
|
itemData={itemData}
|
||||||
|
onClose={() => setEditOpen(false)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
245
src/components/profile/profile-more.tsx
Normal file
245
src/components/profile/profile-more.tsx
Normal file
@@ -0,0 +1,245 @@
|
|||||||
|
import dayjs from "dayjs";
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import {
|
||||||
|
alpha,
|
||||||
|
Box,
|
||||||
|
Chip,
|
||||||
|
styled,
|
||||||
|
Typography,
|
||||||
|
MenuItem,
|
||||||
|
Menu,
|
||||||
|
} from "@mui/material";
|
||||||
|
import { CmdType } from "../../services/types";
|
||||||
|
import { viewProfile } from "../../services/cmds";
|
||||||
|
import ProfileEdit from "./profile-edit";
|
||||||
|
import Notice from "../base/base-notice";
|
||||||
|
import enhance from "../../services/enhance";
|
||||||
|
|
||||||
|
const Wrapper = styled(Box)(({ theme }) => ({
|
||||||
|
width: "100%",
|
||||||
|
display: "block",
|
||||||
|
cursor: "pointer",
|
||||||
|
textAlign: "left",
|
||||||
|
borderRadius: theme.shape.borderRadius,
|
||||||
|
boxShadow: theme.shadows[2],
|
||||||
|
padding: "8px 16px",
|
||||||
|
boxSizing: "border-box",
|
||||||
|
}));
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
selected: boolean;
|
||||||
|
itemData: CmdType.ProfileItem;
|
||||||
|
onEnable: () => void;
|
||||||
|
onDisable: () => void;
|
||||||
|
onMoveTop: () => void;
|
||||||
|
onMoveEnd: () => void;
|
||||||
|
onDelete: () => void;
|
||||||
|
onEnhance: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
// profile enhanced item
|
||||||
|
const ProfileMore = (props: Props) => {
|
||||||
|
const {
|
||||||
|
selected,
|
||||||
|
itemData,
|
||||||
|
onEnable,
|
||||||
|
onDisable,
|
||||||
|
onMoveTop,
|
||||||
|
onMoveEnd,
|
||||||
|
onDelete,
|
||||||
|
onEnhance,
|
||||||
|
} = props;
|
||||||
|
|
||||||
|
const { uid, type } = itemData;
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
const [anchorEl, setAnchorEl] = useState<any>(null);
|
||||||
|
const [position, setPosition] = useState({ left: 0, top: 0 });
|
||||||
|
const [editOpen, setEditOpen] = useState(false);
|
||||||
|
const [status, setStatus] = useState(enhance.status(uid));
|
||||||
|
|
||||||
|
// unlisten when unmount
|
||||||
|
useEffect(() => enhance.listen(uid, setStatus), [uid]);
|
||||||
|
|
||||||
|
// error during enhanced mode
|
||||||
|
const hasError = selected && status?.status === "error";
|
||||||
|
|
||||||
|
const onEdit = () => {
|
||||||
|
setAnchorEl(null);
|
||||||
|
setEditOpen(true);
|
||||||
|
};
|
||||||
|
|
||||||
|
const onView = async () => {
|
||||||
|
setAnchorEl(null);
|
||||||
|
try {
|
||||||
|
await viewProfile(itemData.uid);
|
||||||
|
} catch (err: any) {
|
||||||
|
Notice.error(err?.message || err.toString());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const closeWrapper = (fn: () => void) => () => {
|
||||||
|
setAnchorEl(null);
|
||||||
|
return fn();
|
||||||
|
};
|
||||||
|
|
||||||
|
const enableMenu = [
|
||||||
|
{ label: "Disable", handler: closeWrapper(onDisable) },
|
||||||
|
{ label: "Refresh", handler: closeWrapper(onEnhance) },
|
||||||
|
{ label: "Edit", handler: onEdit },
|
||||||
|
{ label: "File", handler: onView },
|
||||||
|
{ label: "To Top", show: !hasError, handler: closeWrapper(onMoveTop) },
|
||||||
|
{ label: "To End", show: !hasError, handler: closeWrapper(onMoveEnd) },
|
||||||
|
{ label: "Delete", handler: closeWrapper(onDelete) },
|
||||||
|
];
|
||||||
|
|
||||||
|
const disableMenu = [
|
||||||
|
{ label: "Enable", handler: closeWrapper(onEnable) },
|
||||||
|
{ label: "Edit", handler: onEdit },
|
||||||
|
{ label: "File", handler: onView },
|
||||||
|
{ label: "Delete", handler: closeWrapper(onDelete) },
|
||||||
|
];
|
||||||
|
|
||||||
|
const boxStyle = {
|
||||||
|
height: 26,
|
||||||
|
display: "flex",
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "space-between",
|
||||||
|
lineHeight: 1,
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Wrapper
|
||||||
|
sx={({ palette }) => {
|
||||||
|
// todo
|
||||||
|
// 区分 selected 和 error 和 mode 下各种颜色的排列组合
|
||||||
|
const { mode, primary, text, grey, error } = palette;
|
||||||
|
const key = `${mode}-${selected}`;
|
||||||
|
const bgkey = hasError ? `${mode}-err` : key;
|
||||||
|
|
||||||
|
const bgcolor = {
|
||||||
|
"light-true": alpha(primary.main, 0.15),
|
||||||
|
"light-false": palette.background.paper,
|
||||||
|
"dark-true": alpha(primary.main, 0.35),
|
||||||
|
"dark-false": alpha(grey[700], 0.35),
|
||||||
|
"light-err": alpha(error.main, 0.12),
|
||||||
|
"dark-err": alpha(error.main, 0.3),
|
||||||
|
}[bgkey]!;
|
||||||
|
|
||||||
|
const color = {
|
||||||
|
"light-true": text.secondary,
|
||||||
|
"light-false": text.secondary,
|
||||||
|
"dark-true": alpha(text.secondary, 0.6),
|
||||||
|
"dark-false": alpha(text.secondary, 0.6),
|
||||||
|
}[key]!;
|
||||||
|
|
||||||
|
const h2color = {
|
||||||
|
"light-true": primary.main,
|
||||||
|
"light-false": text.primary,
|
||||||
|
"dark-true": primary.light,
|
||||||
|
"dark-false": text.primary,
|
||||||
|
}[key]!;
|
||||||
|
|
||||||
|
return { bgcolor, color, "& h2": { color: h2color } };
|
||||||
|
}}
|
||||||
|
// onClick={() => onSelect(false)}
|
||||||
|
onContextMenu={(event) => {
|
||||||
|
const { clientX, clientY } = event;
|
||||||
|
setPosition({ top: clientY, left: clientX });
|
||||||
|
setAnchorEl(event.currentTarget);
|
||||||
|
event.preventDefault();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Box display="flex" justifyContent="space-between" alignItems="center">
|
||||||
|
<Typography
|
||||||
|
width="calc(100% - 52px)"
|
||||||
|
variant="h6"
|
||||||
|
component="h2"
|
||||||
|
noWrap
|
||||||
|
title={itemData.name}
|
||||||
|
>
|
||||||
|
{itemData.name}
|
||||||
|
</Typography>
|
||||||
|
|
||||||
|
<Chip
|
||||||
|
label={type}
|
||||||
|
color="primary"
|
||||||
|
size="small"
|
||||||
|
variant="outlined"
|
||||||
|
sx={{ textTransform: "capitalize" }}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
|
||||||
|
<Box sx={boxStyle}>
|
||||||
|
{hasError ? (
|
||||||
|
<Typography
|
||||||
|
noWrap
|
||||||
|
color="error"
|
||||||
|
sx={{ width: "calc(100% - 75px)" }}
|
||||||
|
title={status.message}
|
||||||
|
>
|
||||||
|
{status.message}
|
||||||
|
</Typography>
|
||||||
|
) : (
|
||||||
|
<Typography
|
||||||
|
noWrap
|
||||||
|
title={itemData.desc}
|
||||||
|
sx={{ width: "calc(100% - 75px)" }}
|
||||||
|
>
|
||||||
|
{itemData.desc}
|
||||||
|
</Typography>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<Typography
|
||||||
|
component="span"
|
||||||
|
title="updated time"
|
||||||
|
style={{ fontSize: 14 }}
|
||||||
|
>
|
||||||
|
{parseExpire(itemData.updated)}
|
||||||
|
</Typography>
|
||||||
|
</Box>
|
||||||
|
</Wrapper>
|
||||||
|
|
||||||
|
<Menu
|
||||||
|
open={!!anchorEl}
|
||||||
|
anchorEl={anchorEl}
|
||||||
|
onClose={() => setAnchorEl(null)}
|
||||||
|
anchorPosition={position}
|
||||||
|
anchorReference="anchorPosition"
|
||||||
|
onContextMenu={(e) => {
|
||||||
|
setAnchorEl(null);
|
||||||
|
e.preventDefault();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{(selected ? enableMenu : disableMenu)
|
||||||
|
.filter((item: any) => item.show !== false)
|
||||||
|
.map((item) => (
|
||||||
|
<MenuItem
|
||||||
|
key={item.label}
|
||||||
|
onClick={item.handler}
|
||||||
|
sx={{ minWidth: 133 }}
|
||||||
|
>
|
||||||
|
{t(item.label)}
|
||||||
|
</MenuItem>
|
||||||
|
))}
|
||||||
|
</Menu>
|
||||||
|
|
||||||
|
{editOpen && (
|
||||||
|
<ProfileEdit
|
||||||
|
open={editOpen}
|
||||||
|
itemData={itemData}
|
||||||
|
onClose={() => setEditOpen(false)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
function parseExpire(expire?: number) {
|
||||||
|
if (!expire) return "-";
|
||||||
|
return dayjs(expire * 1000).format("YYYY-MM-DD");
|
||||||
|
}
|
||||||
|
|
||||||
|
export default ProfileMore;
|
||||||
@@ -1,64 +1,158 @@
|
|||||||
import { useEffect, useState } from "react";
|
import { useRef, useState } from "react";
|
||||||
|
import { useSWRConfig } from "swr";
|
||||||
|
import { useLockFn, useSetState } from "ahooks";
|
||||||
import {
|
import {
|
||||||
Button,
|
Button,
|
||||||
Dialog,
|
Dialog,
|
||||||
DialogActions,
|
DialogActions,
|
||||||
DialogContent,
|
DialogContent,
|
||||||
DialogTitle,
|
DialogTitle,
|
||||||
|
FormControl,
|
||||||
|
IconButton,
|
||||||
|
InputLabel,
|
||||||
|
MenuItem,
|
||||||
|
Select,
|
||||||
TextField,
|
TextField,
|
||||||
} from "@mui/material";
|
} from "@mui/material";
|
||||||
|
import { Settings } from "@mui/icons-material";
|
||||||
|
import { createProfile } from "../../services/cmds";
|
||||||
import Notice from "../base/base-notice";
|
import Notice from "../base/base-notice";
|
||||||
|
import FileInput from "./file-input";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
open: boolean;
|
open: boolean;
|
||||||
onClose: () => void;
|
onClose: () => void;
|
||||||
onSubmit: (name: string, desc: string) => void;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// create a new profile
|
||||||
|
// remote / local file / merge / script
|
||||||
const ProfileNew = (props: Props) => {
|
const ProfileNew = (props: Props) => {
|
||||||
const { open, onClose, onSubmit } = props;
|
const { open, onClose } = props;
|
||||||
const [name, setName] = useState("");
|
|
||||||
const [desc, setDesc] = useState("");
|
|
||||||
|
|
||||||
const onCreate = () => {
|
const { mutate } = useSWRConfig();
|
||||||
if (!name.trim()) {
|
const [form, setForm] = useSetState({
|
||||||
Notice.error("`Name` should not be null");
|
type: "remote",
|
||||||
|
name: "",
|
||||||
|
desc: "",
|
||||||
|
url: "",
|
||||||
|
});
|
||||||
|
|
||||||
|
const [showOpt, setShowOpt] = useState(false);
|
||||||
|
// can add more option
|
||||||
|
const [option, setOption] = useSetState({ user_agent: "" });
|
||||||
|
// file input
|
||||||
|
const fileDataRef = useRef<string | null>(null);
|
||||||
|
|
||||||
|
const onCreate = useLockFn(async () => {
|
||||||
|
if (!form.type) {
|
||||||
|
Notice.error("`Type` should not be null");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
onSubmit(name, desc);
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => {
|
try {
|
||||||
if (!open) {
|
const name = form.name || `${form.type} file`;
|
||||||
setName("");
|
|
||||||
setDesc("");
|
if (form.type === "remote" && !form.url) {
|
||||||
|
throw new Error("The URL should not be null");
|
||||||
|
}
|
||||||
|
|
||||||
|
const option_ = form.type === "remote" ? option : undefined;
|
||||||
|
const item = { ...form, name, option: option_ };
|
||||||
|
const fileData = form.type === "local" ? fileDataRef.current : null;
|
||||||
|
|
||||||
|
await createProfile(item, fileData);
|
||||||
|
|
||||||
|
setForm({ type: "remote", name: "", desc: "", url: "" });
|
||||||
|
setOption({ user_agent: "" });
|
||||||
|
setShowOpt(false);
|
||||||
|
fileDataRef.current = null;
|
||||||
|
|
||||||
|
mutate("getProfiles");
|
||||||
|
onClose();
|
||||||
|
} catch (err: any) {
|
||||||
|
Notice.error(err.message || err.toString());
|
||||||
}
|
}
|
||||||
}, [open]);
|
});
|
||||||
|
|
||||||
|
const textFieldProps = {
|
||||||
|
fullWidth: true,
|
||||||
|
size: "small",
|
||||||
|
margin: "normal",
|
||||||
|
variant: "outlined",
|
||||||
|
} as const;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Dialog open={open} onClose={onClose}>
|
<Dialog open={open} onClose={onClose}>
|
||||||
<DialogTitle>Create Profile</DialogTitle>
|
<DialogTitle sx={{ pb: 0.5 }}>Create Profile</DialogTitle>
|
||||||
<DialogContent sx={{ width: 320, pb: 0.5 }}>
|
|
||||||
|
<DialogContent sx={{ width: 336, pb: 1 }}>
|
||||||
|
<FormControl size="small" fullWidth sx={{ mt: 2, mb: 1 }}>
|
||||||
|
<InputLabel>Type</InputLabel>
|
||||||
|
<Select
|
||||||
|
autoFocus
|
||||||
|
label="Type"
|
||||||
|
value={form.type}
|
||||||
|
onChange={(e) => setForm({ type: e.target.value })}
|
||||||
|
>
|
||||||
|
<MenuItem value="remote">Remote</MenuItem>
|
||||||
|
<MenuItem value="local">Local</MenuItem>
|
||||||
|
<MenuItem value="script">Script</MenuItem>
|
||||||
|
<MenuItem value="merge">Merge</MenuItem>
|
||||||
|
</Select>
|
||||||
|
</FormControl>
|
||||||
|
|
||||||
<TextField
|
<TextField
|
||||||
autoFocus
|
{...textFieldProps}
|
||||||
fullWidth
|
|
||||||
label="Name"
|
label="Name"
|
||||||
margin="dense"
|
autoComplete="off"
|
||||||
variant="outlined"
|
value={form.name}
|
||||||
value={name}
|
onChange={(e) => setForm({ name: e.target.value })}
|
||||||
onChange={(e) => setName(e.target.value)}
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<TextField
|
<TextField
|
||||||
fullWidth
|
{...textFieldProps}
|
||||||
label="Descriptions"
|
label="Descriptions"
|
||||||
margin="normal"
|
autoComplete="off"
|
||||||
variant="outlined"
|
value={form.desc}
|
||||||
value={desc}
|
onChange={(e) => setForm({ desc: e.target.value })}
|
||||||
onChange={(e) => setDesc(e.target.value)}
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
{form.type === "remote" && (
|
||||||
|
<TextField
|
||||||
|
{...textFieldProps}
|
||||||
|
label="Subscription Url"
|
||||||
|
autoComplete="off"
|
||||||
|
value={form.url}
|
||||||
|
onChange={(e) => setForm({ url: e.target.value })}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{form.type === "local" && (
|
||||||
|
<FileInput onChange={(val) => (fileDataRef.current = val)} />
|
||||||
|
)}
|
||||||
|
|
||||||
|
{showOpt && (
|
||||||
|
<TextField
|
||||||
|
{...textFieldProps}
|
||||||
|
label="User Agent"
|
||||||
|
autoComplete="off"
|
||||||
|
value={option.user_agent}
|
||||||
|
onChange={(e) => setOption({ user_agent: e.target.value })}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
<DialogActions sx={{ px: 2, pb: 2 }}>
|
|
||||||
|
<DialogActions sx={{ px: 2, pb: 2, position: "relative" }}>
|
||||||
|
{form.type === "remote" && (
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
sx={{ position: "absolute", left: 18 }}
|
||||||
|
onClick={() => setShowOpt((o) => !o)}
|
||||||
|
>
|
||||||
|
<Settings />
|
||||||
|
</IconButton>
|
||||||
|
)}
|
||||||
|
|
||||||
<Button onClick={onClose}>Cancel</Button>
|
<Button onClick={onClose}>Cancel</Button>
|
||||||
<Button onClick={onCreate} variant="contained">
|
<Button onClick={onCreate} variant="contained">
|
||||||
Create
|
Create
|
||||||
|
|||||||
150
src/components/proxy/proxy-global.tsx
Normal file
150
src/components/proxy/proxy-global.tsx
Normal file
@@ -0,0 +1,150 @@
|
|||||||
|
import { useEffect, useRef, useState } from "react";
|
||||||
|
import { useSWRConfig } from "swr";
|
||||||
|
import { useLockFn } from "ahooks";
|
||||||
|
import { Virtuoso } from "react-virtuoso";
|
||||||
|
import { Box, IconButton, TextField } from "@mui/material";
|
||||||
|
import {
|
||||||
|
MyLocationRounded,
|
||||||
|
NetworkCheckRounded,
|
||||||
|
FilterAltRounded,
|
||||||
|
FilterAltOffRounded,
|
||||||
|
VisibilityRounded,
|
||||||
|
VisibilityOffRounded,
|
||||||
|
} from "@mui/icons-material";
|
||||||
|
import { ApiType } from "../../services/types";
|
||||||
|
import { updateProxy } from "../../services/api";
|
||||||
|
import delayManager from "../../services/delay";
|
||||||
|
import useFilterProxy from "./use-filter-proxy";
|
||||||
|
import ProxyItem from "./proxy-item";
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
groupName: string;
|
||||||
|
curProxy?: string;
|
||||||
|
proxies: ApiType.ProxyItem[];
|
||||||
|
}
|
||||||
|
|
||||||
|
const ProxyGlobal = (props: Props) => {
|
||||||
|
const { groupName, curProxy, proxies } = props;
|
||||||
|
|
||||||
|
const { mutate } = useSWRConfig();
|
||||||
|
const [now, setNow] = useState(curProxy || "DIRECT");
|
||||||
|
const [showType, setShowType] = useState(true);
|
||||||
|
const [showFilter, setShowFilter] = useState(false);
|
||||||
|
const [filterText, setFilterText] = useState("");
|
||||||
|
|
||||||
|
const virtuosoRef = useRef<any>();
|
||||||
|
const filterProxies = useFilterProxy(proxies, groupName, filterText);
|
||||||
|
|
||||||
|
const onChangeProxy = useLockFn(async (name: string) => {
|
||||||
|
await updateProxy("GLOBAL", name);
|
||||||
|
mutate("getProxies");
|
||||||
|
setNow(name);
|
||||||
|
});
|
||||||
|
|
||||||
|
const onLocation = (smooth = true) => {
|
||||||
|
const index = filterProxies.findIndex((p) => p.name === now);
|
||||||
|
|
||||||
|
if (index >= 0) {
|
||||||
|
virtuosoRef.current?.scrollToIndex?.({
|
||||||
|
index,
|
||||||
|
align: "center",
|
||||||
|
behavior: smooth ? "smooth" : "auto",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const onCheckAll = useLockFn(async () => {
|
||||||
|
const names = filterProxies.map((p) => p.name);
|
||||||
|
|
||||||
|
await delayManager.checkListDelay(
|
||||||
|
{ names, groupName, skipNum: 8, maxTimeout: 600 },
|
||||||
|
() => mutate("getProxies")
|
||||||
|
);
|
||||||
|
|
||||||
|
mutate("getProxies");
|
||||||
|
});
|
||||||
|
|
||||||
|
useEffect(() => onLocation(false), [groupName]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!showFilter) setFilterText("");
|
||||||
|
}, [showFilter]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (groupName === "DIRECT") setNow("DIRECT");
|
||||||
|
if (groupName === "GLOBAL") setNow(curProxy || "DIRECT");
|
||||||
|
}, [groupName, curProxy]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
px: 3,
|
||||||
|
my: 0.5,
|
||||||
|
display: "flex",
|
||||||
|
alignItems: "center",
|
||||||
|
button: { mr: 0.5 },
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
title="location"
|
||||||
|
onClick={() => onLocation(true)}
|
||||||
|
>
|
||||||
|
<MyLocationRounded />
|
||||||
|
</IconButton>
|
||||||
|
|
||||||
|
<IconButton size="small" title="check" onClick={onCheckAll}>
|
||||||
|
<NetworkCheckRounded />
|
||||||
|
</IconButton>
|
||||||
|
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
title="check"
|
||||||
|
onClick={() => setShowType(!showType)}
|
||||||
|
>
|
||||||
|
{showType ? <VisibilityRounded /> : <VisibilityOffRounded />}
|
||||||
|
</IconButton>
|
||||||
|
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
title="check"
|
||||||
|
onClick={() => setShowFilter(!showFilter)}
|
||||||
|
>
|
||||||
|
{showFilter ? <FilterAltRounded /> : <FilterAltOffRounded />}
|
||||||
|
</IconButton>
|
||||||
|
|
||||||
|
{showFilter && (
|
||||||
|
<TextField
|
||||||
|
autoFocus
|
||||||
|
hiddenLabel
|
||||||
|
value={filterText}
|
||||||
|
size="small"
|
||||||
|
variant="outlined"
|
||||||
|
placeholder="Filter conditions"
|
||||||
|
onChange={(e) => setFilterText(e.target.value)}
|
||||||
|
sx={{ ml: 0.5, flex: "1 1 auto", input: { py: 0.65, px: 1 } }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</Box>
|
||||||
|
|
||||||
|
<Virtuoso
|
||||||
|
ref={virtuosoRef}
|
||||||
|
style={{ height: "calc(100% - 40px)" }}
|
||||||
|
totalCount={filterProxies.length}
|
||||||
|
itemContent={(index) => (
|
||||||
|
<ProxyItem
|
||||||
|
groupName={groupName}
|
||||||
|
proxy={filterProxies[index]}
|
||||||
|
selected={filterProxies[index].name === now}
|
||||||
|
showType={showType}
|
||||||
|
onClick={onChangeProxy}
|
||||||
|
sx={{ py: 0, px: 2 }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ProxyGlobal;
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import { useRef, useState } from "react";
|
import useSWR, { useSWRConfig } from "swr";
|
||||||
import { useSWRConfig } from "swr";
|
import { useEffect, useRef, useState } from "react";
|
||||||
|
import { useLockFn } from "ahooks";
|
||||||
import { Virtuoso } from "react-virtuoso";
|
import { Virtuoso } from "react-virtuoso";
|
||||||
import {
|
import {
|
||||||
Box,
|
Box,
|
||||||
@@ -9,6 +10,7 @@ import {
|
|||||||
List,
|
List,
|
||||||
ListItem,
|
ListItem,
|
||||||
ListItemText,
|
ListItemText,
|
||||||
|
TextField,
|
||||||
} from "@mui/material";
|
} from "@mui/material";
|
||||||
import {
|
import {
|
||||||
SendRounded,
|
SendRounded,
|
||||||
@@ -16,11 +18,16 @@ import {
|
|||||||
ExpandMoreRounded,
|
ExpandMoreRounded,
|
||||||
MyLocationRounded,
|
MyLocationRounded,
|
||||||
NetworkCheckRounded,
|
NetworkCheckRounded,
|
||||||
|
FilterAltRounded,
|
||||||
|
FilterAltOffRounded,
|
||||||
|
VisibilityRounded,
|
||||||
|
VisibilityOffRounded,
|
||||||
} from "@mui/icons-material";
|
} from "@mui/icons-material";
|
||||||
import { ApiType } from "../../services/types";
|
import { ApiType } from "../../services/types";
|
||||||
import { updateProxy } from "../../services/api";
|
import { updateProxy } from "../../services/api";
|
||||||
import { getProfiles, patchProfile } from "../../services/cmds";
|
import { getProfiles, patchProfile } from "../../services/cmds";
|
||||||
import delayManager from "../../services/delay";
|
import delayManager from "../../services/delay";
|
||||||
|
import useFilterProxy from "./use-filter-proxy";
|
||||||
import ProxyItem from "./proxy-item";
|
import ProxyItem from "./proxy-item";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
@@ -31,18 +38,20 @@ const ProxyGroup = ({ group }: Props) => {
|
|||||||
const { mutate } = useSWRConfig();
|
const { mutate } = useSWRConfig();
|
||||||
const [open, setOpen] = useState(false);
|
const [open, setOpen] = useState(false);
|
||||||
const [now, setNow] = useState(group.now);
|
const [now, setNow] = useState(group.now);
|
||||||
|
const [showType, setShowType] = useState(false);
|
||||||
|
const [showFilter, setShowFilter] = useState(false);
|
||||||
|
const [filterText, setFilterText] = useState("");
|
||||||
|
|
||||||
const virtuosoRef = useRef<any>();
|
|
||||||
const proxies = group.all ?? [];
|
const proxies = group.all ?? [];
|
||||||
|
const virtuosoRef = useRef<any>();
|
||||||
|
const filterProxies = useFilterProxy(proxies, group.name, filterText);
|
||||||
|
|
||||||
const selectLockRef = useRef(false);
|
const { data: profiles } = useSWR("getProfiles", getProfiles);
|
||||||
const onSelect = async (name: string) => {
|
|
||||||
|
const onChangeProxy = useLockFn(async (name: string) => {
|
||||||
// Todo: support another proxy group type
|
// Todo: support another proxy group type
|
||||||
if (group.type !== "Selector") return;
|
if (group.type !== "Selector") return;
|
||||||
|
|
||||||
if (selectLockRef.current) return;
|
|
||||||
selectLockRef.current = true;
|
|
||||||
|
|
||||||
const oldValue = now;
|
const oldValue = now;
|
||||||
try {
|
try {
|
||||||
setNow(name);
|
setNow(name);
|
||||||
@@ -50,13 +59,10 @@ const ProxyGroup = ({ group }: Props) => {
|
|||||||
} catch {
|
} catch {
|
||||||
setNow(oldValue);
|
setNow(oldValue);
|
||||||
return; // do not update profile
|
return; // do not update profile
|
||||||
} finally {
|
|
||||||
selectLockRef.current = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const profiles = await getProfiles();
|
const profile = profiles?.items?.find((p) => p.uid === profiles.current);
|
||||||
const profile = profiles.items![profiles.current!]!;
|
|
||||||
if (!profile) return;
|
if (!profile) return;
|
||||||
if (!profile.selected) profile.selected = [];
|
if (!profile.selected) profile.selected = [];
|
||||||
|
|
||||||
@@ -69,46 +75,46 @@ const ProxyGroup = ({ group }: Props) => {
|
|||||||
} else {
|
} else {
|
||||||
profile.selected[index] = { name: group.name, now: name };
|
profile.selected[index] = { name: group.name, now: name };
|
||||||
}
|
}
|
||||||
await patchProfile(profiles.current!, profile);
|
await patchProfile(profiles!.current!, { selected: profile.selected });
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err);
|
console.error(err);
|
||||||
}
|
}
|
||||||
};
|
});
|
||||||
|
|
||||||
const onLocation = () => {
|
const onLocation = (smooth = true) => {
|
||||||
const index = proxies.findIndex((p) => p.name === now);
|
const index = filterProxies.findIndex((p) => p.name === now);
|
||||||
|
|
||||||
if (index >= 0) {
|
if (index >= 0) {
|
||||||
virtuosoRef.current?.scrollToIndex?.({
|
virtuosoRef.current?.scrollToIndex?.({
|
||||||
index,
|
index,
|
||||||
align: "center",
|
align: "center",
|
||||||
behavior: "smooth",
|
behavior: smooth ? "smooth" : "auto",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const checkLockRef = useRef(false);
|
const onCheckAll = useLockFn(async () => {
|
||||||
const onCheckAll = async () => {
|
const names = filterProxies.map((p) => p.name);
|
||||||
if (checkLockRef.current) return;
|
const groupName = group.name;
|
||||||
checkLockRef.current = true;
|
|
||||||
|
|
||||||
// rerender quickly
|
await delayManager.checkListDelay(
|
||||||
if (proxies.length) setTimeout(() => mutate("getProxies"), 500);
|
{ names, groupName, skipNum: 8, maxTimeout: 600 },
|
||||||
|
() => mutate("getProxies")
|
||||||
|
);
|
||||||
|
|
||||||
let names = proxies.map((p) => p.name);
|
mutate("getProxies");
|
||||||
while (names.length) {
|
});
|
||||||
const list = names.slice(0, 8);
|
|
||||||
names = names.slice(8);
|
|
||||||
|
|
||||||
await Promise.all(
|
useEffect(() => {
|
||||||
list.map((n) => delayManager.checkDelay(n, group.name))
|
if (!showFilter) setFilterText("");
|
||||||
);
|
}, [showFilter]);
|
||||||
|
|
||||||
mutate("getProxies");
|
// auto scroll to current index
|
||||||
|
useEffect(() => {
|
||||||
|
if (open) {
|
||||||
|
setTimeout(() => onLocation(false), 5);
|
||||||
}
|
}
|
||||||
|
}, [open]);
|
||||||
checkLockRef.current = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@@ -130,27 +136,84 @@ const ProxyGroup = ({ group }: Props) => {
|
|||||||
</ListItem>
|
</ListItem>
|
||||||
|
|
||||||
<Collapse in={open} timeout="auto" unmountOnExit>
|
<Collapse in={open} timeout="auto" unmountOnExit>
|
||||||
<Box sx={{ pl: 4, pr: 3, my: 0.5 }}>
|
<Box
|
||||||
<IconButton size="small" title="location" onClick={onLocation}>
|
sx={{
|
||||||
|
pl: 4,
|
||||||
|
pr: 3,
|
||||||
|
my: 0.5,
|
||||||
|
display: "flex",
|
||||||
|
alignItems: "center",
|
||||||
|
button: { mr: 0.5 },
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
title="location"
|
||||||
|
onClick={() => onLocation(true)}
|
||||||
|
>
|
||||||
<MyLocationRounded />
|
<MyLocationRounded />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
|
|
||||||
<IconButton size="small" title="check" onClick={onCheckAll}>
|
<IconButton size="small" title="check" onClick={onCheckAll}>
|
||||||
<NetworkCheckRounded />
|
<NetworkCheckRounded />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
|
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
title="check"
|
||||||
|
onClick={() => setShowType(!showType)}
|
||||||
|
>
|
||||||
|
{showType ? <VisibilityRounded /> : <VisibilityOffRounded />}
|
||||||
|
</IconButton>
|
||||||
|
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
title="check"
|
||||||
|
onClick={() => setShowFilter(!showFilter)}
|
||||||
|
>
|
||||||
|
{showFilter ? <FilterAltRounded /> : <FilterAltOffRounded />}
|
||||||
|
</IconButton>
|
||||||
|
|
||||||
|
{showFilter && (
|
||||||
|
<TextField
|
||||||
|
autoFocus
|
||||||
|
hiddenLabel
|
||||||
|
value={filterText}
|
||||||
|
size="small"
|
||||||
|
variant="outlined"
|
||||||
|
placeholder="Filter conditions"
|
||||||
|
onChange={(e) => setFilterText(e.target.value)}
|
||||||
|
sx={{ ml: 0.5, flex: "1 1 auto", input: { py: 0.65, px: 1 } }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
{proxies.length >= 10 ? (
|
{!filterProxies.length && (
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
py: 3,
|
||||||
|
fontSize: 18,
|
||||||
|
textAlign: "center",
|
||||||
|
color: "text.secondary",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Empty
|
||||||
|
</Box>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{filterProxies.length >= 10 ? (
|
||||||
<Virtuoso
|
<Virtuoso
|
||||||
ref={virtuosoRef}
|
ref={virtuosoRef}
|
||||||
style={{ height: "320px", marginBottom: "4px" }}
|
style={{ height: "320px", marginBottom: "4px" }}
|
||||||
totalCount={proxies.length}
|
totalCount={filterProxies.length}
|
||||||
itemContent={(index) => (
|
itemContent={(index) => (
|
||||||
<ProxyItem
|
<ProxyItem
|
||||||
groupName={group.name}
|
groupName={group.name}
|
||||||
proxy={proxies[index]}
|
proxy={filterProxies[index]}
|
||||||
selected={proxies[index].name === now}
|
selected={filterProxies[index].name === now}
|
||||||
|
showType={showType}
|
||||||
sx={{ py: 0, pl: 4 }}
|
sx={{ py: 0, pl: 4 }}
|
||||||
onClick={onSelect}
|
onClick={onChangeProxy}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
@@ -160,14 +223,15 @@ const ProxyGroup = ({ group }: Props) => {
|
|||||||
disablePadding
|
disablePadding
|
||||||
sx={{ maxHeight: "320px", overflow: "auto", mb: "4px" }}
|
sx={{ maxHeight: "320px", overflow: "auto", mb: "4px" }}
|
||||||
>
|
>
|
||||||
{proxies.map((proxy) => (
|
{filterProxies.map((proxy) => (
|
||||||
<ProxyItem
|
<ProxyItem
|
||||||
key={proxy.name}
|
key={proxy.name}
|
||||||
groupName={group.name}
|
groupName={group.name}
|
||||||
proxy={proxy}
|
proxy={proxy}
|
||||||
selected={proxy.name === now}
|
selected={proxy.name === now}
|
||||||
|
showType={showType}
|
||||||
sx={{ py: 0, pl: 4 }}
|
sx={{ py: 0, pl: 4 }}
|
||||||
onClick={onSelect}
|
onClick={onChangeProxy}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
</List>
|
</List>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useEffect, useState } from "react";
|
import { useEffect, useRef, useState } from "react";
|
||||||
import { CheckCircleOutlineRounded } from "@mui/icons-material";
|
import { CheckCircleOutlineRounded } from "@mui/icons-material";
|
||||||
import {
|
import {
|
||||||
alpha,
|
alpha,
|
||||||
@@ -18,6 +18,7 @@ interface Props {
|
|||||||
groupName: string;
|
groupName: string;
|
||||||
proxy: ApiType.ProxyItem;
|
proxy: ApiType.ProxyItem;
|
||||||
selected: boolean;
|
selected: boolean;
|
||||||
|
showType?: boolean;
|
||||||
sx?: SxProps<Theme>;
|
sx?: SxProps<Theme>;
|
||||||
onClick?: (name: string) => void;
|
onClick?: (name: string) => void;
|
||||||
}
|
}
|
||||||
@@ -27,8 +28,20 @@ const Widget = styled(Box)(() => ({
|
|||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
const TypeBox = styled(Box)(({ theme }) => ({
|
||||||
|
display: "inline-block",
|
||||||
|
border: "1px solid #ccc",
|
||||||
|
borderColor: alpha(theme.palette.text.secondary, 0.36),
|
||||||
|
color: alpha(theme.palette.text.secondary, 0.42),
|
||||||
|
borderRadius: 4,
|
||||||
|
fontSize: 10,
|
||||||
|
marginLeft: 4,
|
||||||
|
padding: "0 2px",
|
||||||
|
lineHeight: 1.25,
|
||||||
|
}));
|
||||||
|
|
||||||
const ProxyItem = (props: Props) => {
|
const ProxyItem = (props: Props) => {
|
||||||
const { groupName, proxy, selected, sx, onClick } = props;
|
const { groupName, proxy, selected, showType = true, sx, onClick } = props;
|
||||||
const [delay, setDelay] = useState(-1);
|
const [delay, setDelay] = useState(-1);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -37,14 +50,19 @@ const ProxyItem = (props: Props) => {
|
|||||||
}
|
}
|
||||||
}, [proxy]);
|
}, [proxy]);
|
||||||
|
|
||||||
|
const delayRef = useRef(false);
|
||||||
const onDelay = (e: any) => {
|
const onDelay = (e: any) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
|
||||||
|
if (delayRef.current) return;
|
||||||
|
delayRef.current = true;
|
||||||
|
|
||||||
delayManager
|
delayManager
|
||||||
.checkDelay(proxy.name, groupName)
|
.checkDelay(proxy.name, groupName)
|
||||||
.then((result) => setDelay(result))
|
.then((result) => setDelay(result))
|
||||||
.catch(() => setDelay(1e6));
|
.catch(() => setDelay(1e6))
|
||||||
|
.finally(() => (delayRef.current = false));
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -78,7 +96,17 @@ const ProxyItem = (props: Props) => {
|
|||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<ListItemText title={proxy.name} secondary={proxy.name} />
|
<ListItemText
|
||||||
|
title={proxy.name}
|
||||||
|
secondary={
|
||||||
|
<>
|
||||||
|
{proxy.name}
|
||||||
|
|
||||||
|
{showType && <TypeBox component="span">{proxy.type}</TypeBox>}
|
||||||
|
{showType && proxy.udp && <TypeBox component="span">UDP</TypeBox>}
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
|
||||||
<ListItemIcon
|
<ListItemIcon
|
||||||
sx={{ justifyContent: "flex-end", color: "primary.main" }}
|
sx={{ justifyContent: "flex-end", color: "primary.main" }}
|
||||||
|
|||||||
49
src/components/proxy/use-filter-proxy.ts
Normal file
49
src/components/proxy/use-filter-proxy.ts
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
import { useMemo } from "react";
|
||||||
|
import { ApiType } from "../../services/types";
|
||||||
|
import delayManager from "../../services/delay";
|
||||||
|
|
||||||
|
const regex1 = /delay([=<>])(\d+|timeout|error)/i;
|
||||||
|
const regex2 = /type=(.*)/i;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* filter the proxy
|
||||||
|
* according to the regular conditions
|
||||||
|
*/
|
||||||
|
export default function useFilterProxy(
|
||||||
|
proxies: ApiType.ProxyItem[],
|
||||||
|
groupName: string,
|
||||||
|
filterText: string
|
||||||
|
) {
|
||||||
|
return useMemo(() => {
|
||||||
|
if (!filterText) return proxies;
|
||||||
|
|
||||||
|
const res1 = regex1.exec(filterText);
|
||||||
|
if (res1) {
|
||||||
|
const symbol = res1[1];
|
||||||
|
const symbol2 = res1[2].toLowerCase();
|
||||||
|
const value =
|
||||||
|
symbol2 === "error" ? 1e5 : symbol2 === "timeout" ? 3000 : +symbol2;
|
||||||
|
|
||||||
|
return proxies.filter((p) => {
|
||||||
|
const delay = delayManager.getDelay(p.name, groupName);
|
||||||
|
|
||||||
|
if (delay < 0) return false;
|
||||||
|
if (symbol === "=" && symbol2 === "error") return delay >= 1e5;
|
||||||
|
if (symbol === "=" && symbol2 === "timeout")
|
||||||
|
return delay < 1e5 && delay >= 3000;
|
||||||
|
if (symbol === "=") return delay == value;
|
||||||
|
if (symbol === "<") return delay <= value;
|
||||||
|
if (symbol === ">") return delay >= value;
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const res2 = regex2.exec(filterText);
|
||||||
|
if (res2) {
|
||||||
|
const type = res2[1].toLowerCase();
|
||||||
|
return proxies.filter((p) => p.type.toLowerCase().includes(type));
|
||||||
|
}
|
||||||
|
|
||||||
|
return proxies.filter((p) => p.name.includes(filterText.trim()));
|
||||||
|
}, [proxies, groupName, filterText]);
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import useSWR, { useSWRConfig } from "swr";
|
import useSWR, { useSWRConfig } from "swr";
|
||||||
import { useSetRecoilState } from "recoil";
|
import { useSetRecoilState } from "recoil";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
import {
|
import {
|
||||||
ListItemText,
|
ListItemText,
|
||||||
TextField,
|
TextField,
|
||||||
@@ -21,15 +22,16 @@ interface Props {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const SettingClash = ({ onError }: Props) => {
|
const SettingClash = ({ onError }: Props) => {
|
||||||
|
const { t } = useTranslation();
|
||||||
const { mutate } = useSWRConfig();
|
const { mutate } = useSWRConfig();
|
||||||
const { data: clashConfig } = useSWR("getClashConfig", getClashConfig);
|
const { data: clashConfig } = useSWR("getClashConfig", getClashConfig);
|
||||||
const { data: versionData } = useSWR("getVersion", getVersion);
|
const { data: versionData } = useSWR("getVersion", getVersion);
|
||||||
|
|
||||||
const {
|
const {
|
||||||
ipv6 = false,
|
ipv6,
|
||||||
"allow-lan": allowLan = false,
|
"allow-lan": allowLan,
|
||||||
"log-level": logLevel = "silent",
|
"log-level": logLevel,
|
||||||
"mixed-port": mixedPort = 0,
|
"mixed-port": mixedPort,
|
||||||
} = clashConfig ?? {};
|
} = clashConfig ?? {};
|
||||||
|
|
||||||
const setGlobalClashPort = useSetRecoilState(atomClashPort);
|
const setGlobalClashPort = useSetRecoilState(atomClashPort);
|
||||||
@@ -64,11 +66,11 @@ const SettingClash = ({ onError }: Props) => {
|
|||||||
: versionData?.version || "-";
|
: versionData?.version || "-";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SettingList title="Clash Setting">
|
<SettingList title={t("Clash Setting")}>
|
||||||
<SettingItem>
|
<SettingItem>
|
||||||
<ListItemText primary="Allow Lan" />
|
<ListItemText primary={t("Allow Lan")} />
|
||||||
<GuardState
|
<GuardState
|
||||||
value={allowLan}
|
value={allowLan ?? false}
|
||||||
valueProps="checked"
|
valueProps="checked"
|
||||||
onCatch={onError}
|
onCatch={onError}
|
||||||
onFormat={onSwitchFormat}
|
onFormat={onSwitchFormat}
|
||||||
@@ -80,9 +82,9 @@ const SettingClash = ({ onError }: Props) => {
|
|||||||
</SettingItem>
|
</SettingItem>
|
||||||
|
|
||||||
<SettingItem>
|
<SettingItem>
|
||||||
<ListItemText primary="IPv6" />
|
<ListItemText primary={t("IPv6")} />
|
||||||
<GuardState
|
<GuardState
|
||||||
value={ipv6}
|
value={ipv6 ?? false}
|
||||||
valueProps="checked"
|
valueProps="checked"
|
||||||
onCatch={onError}
|
onCatch={onError}
|
||||||
onFormat={onSwitchFormat}
|
onFormat={onSwitchFormat}
|
||||||
@@ -94,9 +96,9 @@ const SettingClash = ({ onError }: Props) => {
|
|||||||
</SettingItem>
|
</SettingItem>
|
||||||
|
|
||||||
<SettingItem>
|
<SettingItem>
|
||||||
<ListItemText primary="Log Level" />
|
<ListItemText primary={t("Log Level")} />
|
||||||
<GuardState
|
<GuardState
|
||||||
value={logLevel}
|
value={logLevel ?? "info"}
|
||||||
onCatch={onError}
|
onCatch={onError}
|
||||||
onFormat={(e: any) => e.target.value}
|
onFormat={(e: any) => e.target.value}
|
||||||
onChange={(e) => onChangeData({ "log-level": e })}
|
onChange={(e) => onChangeData({ "log-level": e })}
|
||||||
@@ -113,9 +115,9 @@ const SettingClash = ({ onError }: Props) => {
|
|||||||
</SettingItem>
|
</SettingItem>
|
||||||
|
|
||||||
<SettingItem>
|
<SettingItem>
|
||||||
<ListItemText primary="Mixed Port" />
|
<ListItemText primary={t("Mixed Port")} />
|
||||||
<GuardState
|
<GuardState
|
||||||
value={mixedPort!}
|
value={mixedPort ?? 0}
|
||||||
onCatch={onError}
|
onCatch={onError}
|
||||||
onFormat={(e: any) => +e.target.value?.replace(/\D+/, "")}
|
onFormat={(e: any) => +e.target.value?.replace(/\D+/, "")}
|
||||||
onChange={(e) => onChangeData({ "mixed-port": e })}
|
onChange={(e) => onChangeData({ "mixed-port": e })}
|
||||||
@@ -127,7 +129,7 @@ const SettingClash = ({ onError }: Props) => {
|
|||||||
</SettingItem>
|
</SettingItem>
|
||||||
|
|
||||||
<SettingItem>
|
<SettingItem>
|
||||||
<ListItemText primary="Clash core" />
|
<ListItemText primary={t("Clash core")} />
|
||||||
<Typography sx={{ py: 1 }}>{clashVer}</Typography>
|
<Typography sx={{ py: 1 }}>{clashVer}</Typography>
|
||||||
</SettingItem>
|
</SettingItem>
|
||||||
</SettingList>
|
</SettingList>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import useSWR, { useSWRConfig } from "swr";
|
import useSWR, { useSWRConfig } from "swr";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
import { Box, ListItemText, Switch, TextField } from "@mui/material";
|
import { Box, ListItemText, Switch, TextField } from "@mui/material";
|
||||||
import { getVergeConfig, patchVergeConfig } from "../../services/cmds";
|
import { getVergeConfig, patchVergeConfig } from "../../services/cmds";
|
||||||
import { SettingList, SettingItem } from "./setting";
|
import { SettingList, SettingItem } from "./setting";
|
||||||
@@ -11,15 +12,16 @@ interface Props {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const SettingSystem = ({ onError }: Props) => {
|
const SettingSystem = ({ onError }: Props) => {
|
||||||
|
const { t } = useTranslation();
|
||||||
const { mutate } = useSWRConfig();
|
const { mutate } = useSWRConfig();
|
||||||
const { data: vergeConfig } = useSWR("getVergeConfig", getVergeConfig);
|
const { data: vergeConfig } = useSWR("getVergeConfig", getVergeConfig);
|
||||||
|
|
||||||
const {
|
const {
|
||||||
enable_tun_mode = false,
|
enable_tun_mode,
|
||||||
enable_auto_launch = false,
|
enable_auto_launch,
|
||||||
enable_system_proxy = false,
|
enable_system_proxy,
|
||||||
system_proxy_bypass = "",
|
system_proxy_bypass,
|
||||||
enable_proxy_guard = false,
|
enable_proxy_guard,
|
||||||
} = vergeConfig ?? {};
|
} = vergeConfig ?? {};
|
||||||
|
|
||||||
const onSwitchFormat = (_e: any, value: boolean) => value;
|
const onSwitchFormat = (_e: any, value: boolean) => value;
|
||||||
@@ -28,11 +30,11 @@ const SettingSystem = ({ onError }: Props) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SettingList title="System Setting">
|
<SettingList title={t("System Setting")}>
|
||||||
<SettingItem>
|
<SettingItem>
|
||||||
<ListItemText primary="Tun Mode" />
|
<ListItemText primary={t("Tun Mode")} />
|
||||||
<GuardState
|
<GuardState
|
||||||
value={enable_tun_mode}
|
value={enable_tun_mode ?? false}
|
||||||
valueProps="checked"
|
valueProps="checked"
|
||||||
onCatch={onError}
|
onCatch={onError}
|
||||||
onFormat={onSwitchFormat}
|
onFormat={onSwitchFormat}
|
||||||
@@ -44,9 +46,9 @@ const SettingSystem = ({ onError }: Props) => {
|
|||||||
</SettingItem>
|
</SettingItem>
|
||||||
|
|
||||||
<SettingItem>
|
<SettingItem>
|
||||||
<ListItemText primary="Auto Launch" />
|
<ListItemText primary={t("Auto Launch")} />
|
||||||
<GuardState
|
<GuardState
|
||||||
value={enable_auto_launch}
|
value={enable_auto_launch ?? false}
|
||||||
valueProps="checked"
|
valueProps="checked"
|
||||||
onCatch={onError}
|
onCatch={onError}
|
||||||
onFormat={onSwitchFormat}
|
onFormat={onSwitchFormat}
|
||||||
@@ -61,13 +63,13 @@ const SettingSystem = ({ onError }: Props) => {
|
|||||||
<ListItemText
|
<ListItemText
|
||||||
primary={
|
primary={
|
||||||
<Box sx={{ display: "flex", alignItems: "center" }}>
|
<Box sx={{ display: "flex", alignItems: "center" }}>
|
||||||
System Proxy
|
{t("System Proxy")}
|
||||||
<SysproxyTooltip />
|
<SysproxyTooltip />
|
||||||
</Box>
|
</Box>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<GuardState
|
<GuardState
|
||||||
value={enable_system_proxy}
|
value={enable_system_proxy ?? false}
|
||||||
valueProps="checked"
|
valueProps="checked"
|
||||||
onCatch={onError}
|
onCatch={onError}
|
||||||
onFormat={onSwitchFormat}
|
onFormat={onSwitchFormat}
|
||||||
@@ -83,9 +85,9 @@ const SettingSystem = ({ onError }: Props) => {
|
|||||||
|
|
||||||
{enable_system_proxy && (
|
{enable_system_proxy && (
|
||||||
<SettingItem>
|
<SettingItem>
|
||||||
<ListItemText primary="Proxy Guard" />
|
<ListItemText primary={t("Proxy Guard")} />
|
||||||
<GuardState
|
<GuardState
|
||||||
value={enable_proxy_guard}
|
value={enable_proxy_guard ?? false}
|
||||||
valueProps="checked"
|
valueProps="checked"
|
||||||
onCatch={onError}
|
onCatch={onError}
|
||||||
onFormat={onSwitchFormat}
|
onFormat={onSwitchFormat}
|
||||||
@@ -99,7 +101,7 @@ const SettingSystem = ({ onError }: Props) => {
|
|||||||
|
|
||||||
{enable_system_proxy && (
|
{enable_system_proxy && (
|
||||||
<SettingItem>
|
<SettingItem>
|
||||||
<ListItemText primary="Proxy Bypass" />
|
<ListItemText primary={t("Proxy Bypass")} />
|
||||||
<GuardState
|
<GuardState
|
||||||
value={system_proxy_bypass ?? ""}
|
value={system_proxy_bypass ?? ""}
|
||||||
onCatch={onError}
|
onCatch={onError}
|
||||||
|
|||||||
@@ -1,5 +1,13 @@
|
|||||||
import useSWR, { useSWRConfig } from "swr";
|
import useSWR, { useSWRConfig } from "swr";
|
||||||
import { IconButton, ListItemText, Switch, Typography } from "@mui/material";
|
import { useTranslation } from "react-i18next";
|
||||||
|
import {
|
||||||
|
IconButton,
|
||||||
|
ListItemText,
|
||||||
|
MenuItem,
|
||||||
|
Select,
|
||||||
|
Switch,
|
||||||
|
Typography,
|
||||||
|
} from "@mui/material";
|
||||||
import {
|
import {
|
||||||
getVergeConfig,
|
getVergeConfig,
|
||||||
openAppDir,
|
openAppDir,
|
||||||
@@ -18,11 +26,11 @@ interface Props {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const SettingVerge = ({ onError }: Props) => {
|
const SettingVerge = ({ onError }: Props) => {
|
||||||
|
const { t } = useTranslation();
|
||||||
const { mutate } = useSWRConfig();
|
const { mutate } = useSWRConfig();
|
||||||
const { data: vergeConfig } = useSWR("getVergeConfig", getVergeConfig);
|
const { data: vergeConfig } = useSWR("getVergeConfig", getVergeConfig);
|
||||||
|
|
||||||
const { theme_mode = "light", theme_blur = false, traffic_graph } =
|
const { theme_mode, theme_blur, traffic_graph, language } = vergeConfig ?? {};
|
||||||
vergeConfig ?? {};
|
|
||||||
|
|
||||||
const onSwitchFormat = (_e: any, value: boolean) => value;
|
const onSwitchFormat = (_e: any, value: boolean) => value;
|
||||||
const onChangeData = (patch: Partial<CmdType.VergeConfig>) => {
|
const onChangeData = (patch: Partial<CmdType.VergeConfig>) => {
|
||||||
@@ -30,9 +38,9 @@ const SettingVerge = ({ onError }: Props) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SettingList title="Verge Setting">
|
<SettingList title={t("Verge Setting")}>
|
||||||
<SettingItem>
|
<SettingItem>
|
||||||
<ListItemText primary="Theme Mode" />
|
<ListItemText primary={t("Theme Mode")} />
|
||||||
<GuardState
|
<GuardState
|
||||||
value={theme_mode === "dark"}
|
value={theme_mode === "dark"}
|
||||||
valueProps="checked"
|
valueProps="checked"
|
||||||
@@ -48,9 +56,9 @@ const SettingVerge = ({ onError }: Props) => {
|
|||||||
</SettingItem>
|
</SettingItem>
|
||||||
|
|
||||||
<SettingItem>
|
<SettingItem>
|
||||||
<ListItemText primary="Theme Blur" />
|
<ListItemText primary={t("Theme Blur")} />
|
||||||
<GuardState
|
<GuardState
|
||||||
value={theme_blur}
|
value={theme_blur ?? false}
|
||||||
valueProps="checked"
|
valueProps="checked"
|
||||||
onCatch={onError}
|
onCatch={onError}
|
||||||
onFormat={onSwitchFormat}
|
onFormat={onSwitchFormat}
|
||||||
@@ -62,7 +70,7 @@ const SettingVerge = ({ onError }: Props) => {
|
|||||||
</SettingItem>
|
</SettingItem>
|
||||||
|
|
||||||
<SettingItem>
|
<SettingItem>
|
||||||
<ListItemText primary="Traffic Graph" />
|
<ListItemText primary={t("Traffic Graph")} />
|
||||||
<GuardState
|
<GuardState
|
||||||
value={traffic_graph ?? true}
|
value={traffic_graph ?? true}
|
||||||
valueProps="checked"
|
valueProps="checked"
|
||||||
@@ -76,21 +84,37 @@ const SettingVerge = ({ onError }: Props) => {
|
|||||||
</SettingItem>
|
</SettingItem>
|
||||||
|
|
||||||
<SettingItem>
|
<SettingItem>
|
||||||
<ListItemText primary="Open App Dir" />
|
<ListItemText primary={t("Language")} />
|
||||||
|
<GuardState
|
||||||
|
value={language ?? "en"}
|
||||||
|
onCatch={onError}
|
||||||
|
onFormat={(e: any) => e.target.value}
|
||||||
|
onChange={(e) => onChangeData({ language: e })}
|
||||||
|
onGuard={(e) => patchVergeConfig({ language: e })}
|
||||||
|
>
|
||||||
|
<Select size="small" sx={{ width: 100 }}>
|
||||||
|
<MenuItem value="zh">中文</MenuItem>
|
||||||
|
<MenuItem value="en">English</MenuItem>
|
||||||
|
</Select>
|
||||||
|
</GuardState>
|
||||||
|
</SettingItem>
|
||||||
|
|
||||||
|
<SettingItem>
|
||||||
|
<ListItemText primary={t("Open App Dir")} />
|
||||||
<IconButton color="inherit" size="small" onClick={openAppDir}>
|
<IconButton color="inherit" size="small" onClick={openAppDir}>
|
||||||
<ArrowForward />
|
<ArrowForward />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</SettingItem>
|
</SettingItem>
|
||||||
|
|
||||||
<SettingItem>
|
<SettingItem>
|
||||||
<ListItemText primary="Open Logs Dir" />
|
<ListItemText primary={t("Open Logs Dir")} />
|
||||||
<IconButton color="inherit" size="small" onClick={openLogsDir}>
|
<IconButton color="inherit" size="small" onClick={openLogsDir}>
|
||||||
<ArrowForward />
|
<ArrowForward />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</SettingItem>
|
</SettingItem>
|
||||||
|
|
||||||
<SettingItem>
|
<SettingItem>
|
||||||
<ListItemText primary="Version" />
|
<ListItemText primary={t("Version")} />
|
||||||
<Typography sx={{ py: "6px" }}>v{version}</Typography>
|
<Typography sx={{ py: "6px" }}>v{version}</Typography>
|
||||||
</SettingItem>
|
</SettingItem>
|
||||||
</SettingList>
|
</SettingList>
|
||||||
|
|||||||
54
src/locales/en.json
Normal file
54
src/locales/en.json
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
{
|
||||||
|
"Label-Proxies": "Proxies",
|
||||||
|
"Label-Profiles": "Profiles",
|
||||||
|
"Label-Connections": "Connections",
|
||||||
|
"Label-Logs": "Logs",
|
||||||
|
"Label-Settings": "Settings",
|
||||||
|
|
||||||
|
"Connections": "Connections",
|
||||||
|
"Logs": "Logs",
|
||||||
|
"Clear": "Clear",
|
||||||
|
"Proxies": "Proxies",
|
||||||
|
"Proxy Groups": "Proxy Groups",
|
||||||
|
"rule": "rule",
|
||||||
|
"global": "global",
|
||||||
|
"direct": "direct",
|
||||||
|
"Profiles": "Profiles",
|
||||||
|
"Profile URL": "Profile URL",
|
||||||
|
"Import": "Import",
|
||||||
|
"New": "New",
|
||||||
|
"Close All": "Close All",
|
||||||
|
"Select": "Select",
|
||||||
|
"Edit": "Edit",
|
||||||
|
"File": "File",
|
||||||
|
"Update": "Update",
|
||||||
|
"Update(Proxy)": "Update(Proxy)",
|
||||||
|
"Delete": "Delete",
|
||||||
|
"Enable": "Enable",
|
||||||
|
"Disable": "Disable",
|
||||||
|
"Refresh": "Refresh",
|
||||||
|
"To Top": "To Top",
|
||||||
|
"To End": "To End",
|
||||||
|
|
||||||
|
"Settings": "Settings",
|
||||||
|
"Clash Setting": "Clash Setting",
|
||||||
|
"System Setting": "System Setting",
|
||||||
|
"Verge Setting": "Verge Setting",
|
||||||
|
"Allow Lan": "Allow Lan",
|
||||||
|
"IPv6": "IPv6",
|
||||||
|
"Log Level": "Log Level",
|
||||||
|
"Mixed Port": "Mixed Port",
|
||||||
|
"Clash core": "Clash core",
|
||||||
|
"Tun Mode": "Tun Mode",
|
||||||
|
"Auto Launch": "Auto Launch",
|
||||||
|
"System Proxy": "System Proxy",
|
||||||
|
"Proxy Guard": "Proxy Guard",
|
||||||
|
"Proxy Bypass": "Proxy Bypass",
|
||||||
|
"Theme Mode": "Theme Mode",
|
||||||
|
"Theme Blur": "Theme Blur",
|
||||||
|
"Traffic Graph": "Traffic Graph",
|
||||||
|
"Language": "Language",
|
||||||
|
"Open App Dir": "Open App Dir",
|
||||||
|
"Open Logs Dir": "Open Logs Dir",
|
||||||
|
"Version": "Version"
|
||||||
|
}
|
||||||
54
src/locales/zh.json
Normal file
54
src/locales/zh.json
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
{
|
||||||
|
"Label-Proxies": "代 理",
|
||||||
|
"Label-Profiles": "配 置",
|
||||||
|
"Label-Connections": "连 接",
|
||||||
|
"Label-Logs": "日 志",
|
||||||
|
"Label-Settings": "设 置",
|
||||||
|
|
||||||
|
"Connections": "连接",
|
||||||
|
"Logs": "日志",
|
||||||
|
"Clear": "清除",
|
||||||
|
"Proxies": "代理",
|
||||||
|
"Proxy Groups": "代理组",
|
||||||
|
"rule": "规则",
|
||||||
|
"global": "全局",
|
||||||
|
"direct": "直连",
|
||||||
|
"Profiles": "配置",
|
||||||
|
"Profile URL": "配置文件链接",
|
||||||
|
"Import": "导入",
|
||||||
|
"New": "新建",
|
||||||
|
"Close All": "关闭全部",
|
||||||
|
"Select": "使用",
|
||||||
|
"Edit": "编辑信息",
|
||||||
|
"File": "打开文件",
|
||||||
|
"Update": "更新",
|
||||||
|
"Update(Proxy)": "更新(代理)",
|
||||||
|
"Delete": "删除",
|
||||||
|
"Enable": "启用",
|
||||||
|
"Disable": "禁用",
|
||||||
|
"Refresh": "刷新",
|
||||||
|
"To Top": "移到最前",
|
||||||
|
"To End": "移到末尾",
|
||||||
|
|
||||||
|
"Settings": "设置",
|
||||||
|
"Clash Setting": "Clash 设置",
|
||||||
|
"System Setting": "系统设置",
|
||||||
|
"Verge Setting": "Verge 设置",
|
||||||
|
"Allow Lan": "局域网连接",
|
||||||
|
"IPv6": "IPv6",
|
||||||
|
"Log Level": "日志等级",
|
||||||
|
"Mixed Port": "端口设置",
|
||||||
|
"Clash core": "Clash 内核",
|
||||||
|
"Tun Mode": "Tun 模式",
|
||||||
|
"Auto Launch": "开机自启",
|
||||||
|
"System Proxy": "系统代理",
|
||||||
|
"Proxy Guard": "系统代理守卫",
|
||||||
|
"Proxy Bypass": "Proxy Bypass",
|
||||||
|
"Theme Mode": "暗夜模式",
|
||||||
|
"Theme Blur": "背景模糊",
|
||||||
|
"Traffic Graph": "流量图显",
|
||||||
|
"Language": "语言设置",
|
||||||
|
"Open App Dir": "应用目录",
|
||||||
|
"Open Logs Dir": "日志目录",
|
||||||
|
"Version": "版本"
|
||||||
|
}
|
||||||
@@ -6,6 +6,10 @@ import ReactDOM from "react-dom";
|
|||||||
import { RecoilRoot } from "recoil";
|
import { RecoilRoot } from "recoil";
|
||||||
import { BrowserRouter } from "react-router-dom";
|
import { BrowserRouter } from "react-router-dom";
|
||||||
import Layout from "./pages/_layout";
|
import Layout from "./pages/_layout";
|
||||||
|
import enhance from "./services/enhance";
|
||||||
|
import "./services/i18n";
|
||||||
|
|
||||||
|
enhance.setup();
|
||||||
|
|
||||||
ReactDOM.render(
|
ReactDOM.render(
|
||||||
<React.StrictMode>
|
<React.StrictMode>
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
|
import dayjs from "dayjs";
|
||||||
|
import i18next from "i18next";
|
||||||
|
import relativeTime from "dayjs/plugin/relativeTime";
|
||||||
import useSWR, { SWRConfig, useSWRConfig } from "swr";
|
import useSWR, { SWRConfig, useSWRConfig } from "swr";
|
||||||
import { useEffect, useMemo } from "react";
|
import { useEffect, useMemo } from "react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
import { Route, Routes } from "react-router-dom";
|
import { Route, Routes } from "react-router-dom";
|
||||||
import { alpha, createTheme, List, Paper, ThemeProvider } from "@mui/material";
|
import { alpha, createTheme, List, Paper, ThemeProvider } from "@mui/material";
|
||||||
import { listen } from "@tauri-apps/api/event";
|
import { listen } from "@tauri-apps/api/event";
|
||||||
@@ -12,10 +16,15 @@ import LayoutItem from "../components/layout/layout-item";
|
|||||||
import LayoutControl from "../components/layout/layout-control";
|
import LayoutControl from "../components/layout/layout-control";
|
||||||
import LayoutTraffic from "../components/layout/layout-traffic";
|
import LayoutTraffic from "../components/layout/layout-traffic";
|
||||||
import UpdateButton from "../components/layout/update-button";
|
import UpdateButton from "../components/layout/update-button";
|
||||||
|
import getSystem from "../utils/get-system";
|
||||||
|
import "dayjs/locale/zh-cn";
|
||||||
|
|
||||||
const isMacos = navigator.userAgent.includes("Mac OS X");
|
dayjs.extend(relativeTime);
|
||||||
|
|
||||||
|
const OS = getSystem();
|
||||||
|
|
||||||
const Layout = () => {
|
const Layout = () => {
|
||||||
|
const { t } = useTranslation();
|
||||||
const { mutate } = useSWRConfig();
|
const { mutate } = useSWRConfig();
|
||||||
const { data } = useSWR("getVergeConfig", getVergeConfig);
|
const { data } = useSWR("getVergeConfig", getVergeConfig);
|
||||||
|
|
||||||
@@ -27,16 +36,24 @@ const Layout = () => {
|
|||||||
if (e.key === "Escape") appWindow.hide();
|
if (e.key === "Escape") appWindow.hide();
|
||||||
});
|
});
|
||||||
|
|
||||||
listen("restart_clash", async () => {
|
listen("verge://refresh-clash-config", async () => {
|
||||||
// the clash info may be updated
|
// the clash info may be updated
|
||||||
await getAxios(true);
|
await getAxios(true);
|
||||||
// make sure that the clash is ok
|
mutate("getProxies");
|
||||||
setTimeout(() => mutate("getProxies"), 1000);
|
|
||||||
setTimeout(() => mutate("getProxies"), 2000);
|
|
||||||
mutate("getClashConfig");
|
mutate("getClashConfig");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// update the verge config
|
||||||
|
listen("verge://refresh-verge-config", () => mutate("getVergeConfig"));
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (data?.language) {
|
||||||
|
dayjs.locale(data.language === "zh" ? "zh-cn" : data.language);
|
||||||
|
i18next.changeLanguage(data.language);
|
||||||
|
}
|
||||||
|
}, [data?.language]);
|
||||||
|
|
||||||
const theme = useMemo(() => {
|
const theme = useMemo(() => {
|
||||||
// const background = mode === "light" ? "#f5f5f5" : "#000";
|
// const background = mode === "light" ? "#f5f5f5" : "#000";
|
||||||
const selectColor = mode === "light" ? "#f5f5f5" : "#d5d5d5";
|
const selectColor = mode === "light" ? "#f5f5f5" : "#d5d5d5";
|
||||||
@@ -69,8 +86,12 @@ const Layout = () => {
|
|||||||
<Paper
|
<Paper
|
||||||
square
|
square
|
||||||
elevation={0}
|
elevation={0}
|
||||||
className={`${isMacos ? "macos " : ""}layout`}
|
className={`${OS} layout`}
|
||||||
onPointerDown={onDragging}
|
onPointerDown={onDragging}
|
||||||
|
onContextMenu={(e) => {
|
||||||
|
// only prevent it on Windows
|
||||||
|
if (OS === "windows") e.preventDefault();
|
||||||
|
}}
|
||||||
sx={[
|
sx={[
|
||||||
(theme) => ({
|
(theme) => ({
|
||||||
bgcolor: alpha(theme.palette.background.paper, blur ? 0.85 : 1),
|
bgcolor: alpha(theme.palette.background.paper, blur ? 0.85 : 1),
|
||||||
@@ -87,7 +108,7 @@ const Layout = () => {
|
|||||||
<List className="the-menu" data-windrag>
|
<List className="the-menu" data-windrag>
|
||||||
{routers.map((router) => (
|
{routers.map((router) => (
|
||||||
<LayoutItem key={router.label} to={router.link}>
|
<LayoutItem key={router.label} to={router.link}>
|
||||||
{router.label}
|
{t(router.label)}
|
||||||
</LayoutItem>
|
</LayoutItem>
|
||||||
))}
|
))}
|
||||||
</List>
|
</List>
|
||||||
@@ -98,7 +119,7 @@ const Layout = () => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="layout__right" data-windrag>
|
<div className="layout__right" data-windrag>
|
||||||
{!isMacos && (
|
{OS === "windows" && (
|
||||||
<div className="the-bar">
|
<div className="the-bar">
|
||||||
<LayoutControl />
|
<LayoutControl />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -6,27 +6,27 @@ import ConnectionsPage from "./connections";
|
|||||||
|
|
||||||
export const routers = [
|
export const routers = [
|
||||||
{
|
{
|
||||||
label: "Proxies",
|
label: "Label-Proxies",
|
||||||
link: "/",
|
link: "/",
|
||||||
ele: ProxiesPage,
|
ele: ProxiesPage,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: "Profiles",
|
label: "Label-Profiles",
|
||||||
link: "/profile",
|
link: "/profile",
|
||||||
ele: ProfilesPage,
|
ele: ProfilesPage,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: "Connections",
|
label: "Label-Connections",
|
||||||
link: "/connections",
|
link: "/connections",
|
||||||
ele: ConnectionsPage,
|
ele: ConnectionsPage,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: "Logs",
|
label: "Label-Logs",
|
||||||
link: "/logs",
|
link: "/logs",
|
||||||
ele: LogsPage,
|
ele: LogsPage,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: "Settings",
|
label: "Label-Settings",
|
||||||
link: "/settings",
|
link: "/settings",
|
||||||
ele: SettingsPage,
|
ele: SettingsPage,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,13 +1,17 @@
|
|||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { Paper } from "@mui/material";
|
import { useLockFn } from "ahooks";
|
||||||
|
import { Button, Paper } from "@mui/material";
|
||||||
import { Virtuoso } from "react-virtuoso";
|
import { Virtuoso } from "react-virtuoso";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
import { ApiType } from "../services/types";
|
import { ApiType } from "../services/types";
|
||||||
import { getInfomation } from "../services/api";
|
import { closeAllConnections, getInfomation } from "../services/api";
|
||||||
import BasePage from "../components/base/base-page";
|
import BasePage from "../components/base/base-page";
|
||||||
import ConnectionItem from "../components/connection/connection-item";
|
import ConnectionItem from "../components/connection/connection-item";
|
||||||
|
|
||||||
const ConnectionsPage = () => {
|
const ConnectionsPage = () => {
|
||||||
const initConn = { uploadTotal: 0, downloadTotal: 0, connections: [] };
|
const initConn = { uploadTotal: 0, downloadTotal: 0, connections: [] };
|
||||||
|
|
||||||
|
const { t } = useTranslation();
|
||||||
const [conn, setConn] = useState<ApiType.Connections>(initConn);
|
const [conn, setConn] = useState<ApiType.Connections>(initConn);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -26,10 +30,26 @@ const ConnectionsPage = () => {
|
|||||||
return () => ws?.close();
|
return () => ws?.close();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
const onCloseAll = useLockFn(closeAllConnections);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<BasePage title="Connections" contentStyle={{ height: "100%" }}>
|
<BasePage
|
||||||
|
title={t("Connections")}
|
||||||
|
contentStyle={{ height: "100%" }}
|
||||||
|
header={
|
||||||
|
<Button
|
||||||
|
size="small"
|
||||||
|
sx={{ mt: 1 }}
|
||||||
|
variant="contained"
|
||||||
|
onClick={onCloseAll}
|
||||||
|
>
|
||||||
|
{t("Close All")}
|
||||||
|
</Button>
|
||||||
|
}
|
||||||
|
>
|
||||||
<Paper sx={{ boxShadow: 2, height: "100%" }}>
|
<Paper sx={{ boxShadow: 2, height: "100%" }}>
|
||||||
<Virtuoso
|
<Virtuoso
|
||||||
|
initialTopMostItemIndex={999}
|
||||||
data={conn.connections}
|
data={conn.connections}
|
||||||
itemContent={(index, item) => <ConnectionItem value={item} />}
|
itemContent={(index, item) => <ConnectionItem value={item} />}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -1,16 +1,18 @@
|
|||||||
import { useRecoilState } from "recoil";
|
import { useRecoilState } from "recoil";
|
||||||
import { Button, Paper } from "@mui/material";
|
import { Button, Paper } from "@mui/material";
|
||||||
import { Virtuoso } from "react-virtuoso";
|
import { Virtuoso } from "react-virtuoso";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
import { atomLogData } from "../services/states";
|
import { atomLogData } from "../services/states";
|
||||||
import BasePage from "../components/base/base-page";
|
import BasePage from "../components/base/base-page";
|
||||||
import LogItem from "../components/log/log-item";
|
import LogItem from "../components/log/log-item";
|
||||||
|
|
||||||
const LogPage = () => {
|
const LogPage = () => {
|
||||||
|
const { t } = useTranslation();
|
||||||
const [logData, setLogData] = useRecoilState(atomLogData);
|
const [logData, setLogData] = useRecoilState(atomLogData);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<BasePage
|
<BasePage
|
||||||
title="Logs"
|
title={t("Logs")}
|
||||||
contentStyle={{ height: "100%" }}
|
contentStyle={{ height: "100%" }}
|
||||||
header={
|
header={
|
||||||
<Button
|
<Button
|
||||||
@@ -19,7 +21,7 @@ const LogPage = () => {
|
|||||||
variant="contained"
|
variant="contained"
|
||||||
onClick={() => setLogData([])}
|
onClick={() => setLogData([])}
|
||||||
>
|
>
|
||||||
Clear
|
{t("Clear")}
|
||||||
</Button>
|
</Button>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -1,33 +1,58 @@
|
|||||||
import useSWR, { useSWRConfig } from "swr";
|
import useSWR, { useSWRConfig } from "swr";
|
||||||
import { useEffect, useRef, useState } from "react";
|
import { useLockFn } from "ahooks";
|
||||||
|
import { useEffect, useMemo, useState } from "react";
|
||||||
import { Box, Button, Grid, TextField } from "@mui/material";
|
import { Box, Button, Grid, TextField } from "@mui/material";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
import {
|
import {
|
||||||
getProfiles,
|
getProfiles,
|
||||||
selectProfile,
|
|
||||||
patchProfile,
|
patchProfile,
|
||||||
|
deleteProfile,
|
||||||
|
selectProfile,
|
||||||
importProfile,
|
importProfile,
|
||||||
newProfile,
|
enhanceProfiles,
|
||||||
|
changeProfileChain,
|
||||||
} from "../services/cmds";
|
} from "../services/cmds";
|
||||||
import { getProxies, updateProxy } from "../services/api";
|
import { getProxies, updateProxy } from "../services/api";
|
||||||
import noop from "../utils/noop";
|
|
||||||
import Notice from "../components/base/base-notice";
|
import Notice from "../components/base/base-notice";
|
||||||
import BasePage from "../components/base/base-page";
|
import BasePage from "../components/base/base-page";
|
||||||
import ProfileItem from "../components/profile/profile-item";
|
|
||||||
import ProfileNew from "../components/profile/profile-new";
|
import ProfileNew from "../components/profile/profile-new";
|
||||||
|
import ProfileItem from "../components/profile/profile-item";
|
||||||
|
import ProfileMore from "../components/profile/profile-more";
|
||||||
|
|
||||||
const ProfilePage = () => {
|
const ProfilePage = () => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const { mutate } = useSWRConfig();
|
||||||
|
|
||||||
const [url, setUrl] = useState("");
|
const [url, setUrl] = useState("");
|
||||||
const [disabled, setDisabled] = useState(false);
|
const [disabled, setDisabled] = useState(false);
|
||||||
|
const [dialogOpen, setDialogOpen] = useState(false);
|
||||||
|
|
||||||
const { mutate } = useSWRConfig();
|
|
||||||
const { data: profiles = {} } = useSWR("getProfiles", getProfiles);
|
const { data: profiles = {} } = useSWR("getProfiles", getProfiles);
|
||||||
|
|
||||||
|
const { regularItems, enhanceItems } = useMemo(() => {
|
||||||
|
const items = profiles.items || [];
|
||||||
|
const chain = profiles.chain || [];
|
||||||
|
|
||||||
|
const type1 = ["local", "remote"];
|
||||||
|
const type2 = ["merge", "script"];
|
||||||
|
|
||||||
|
const regularItems = items.filter((i) => type1.includes(i.type!));
|
||||||
|
const restItems = items.filter((i) => type2.includes(i.type!));
|
||||||
|
|
||||||
|
const restMap = Object.fromEntries(restItems.map((i) => [i.uid, i]));
|
||||||
|
|
||||||
|
const enhanceItems = chain
|
||||||
|
.map((i) => restMap[i]!)
|
||||||
|
.concat(restItems.filter((i) => !chain.includes(i.uid)));
|
||||||
|
|
||||||
|
return { regularItems, enhanceItems };
|
||||||
|
}, [profiles]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (profiles.current == null) return;
|
if (profiles.current == null) return;
|
||||||
if (!profiles.items) profiles.items = [];
|
|
||||||
|
|
||||||
const current = profiles.current;
|
const current = profiles.current;
|
||||||
const profile = profiles.items![current];
|
const profile = regularItems.find((p) => p.uid === current);
|
||||||
if (!profile) return;
|
if (!profile) return;
|
||||||
|
|
||||||
setTimeout(async () => {
|
setTimeout(async () => {
|
||||||
@@ -58,11 +83,14 @@ const ProfilePage = () => {
|
|||||||
name,
|
name,
|
||||||
now,
|
now,
|
||||||
}));
|
}));
|
||||||
patchProfile(current!, profile).catch(console.error);
|
|
||||||
|
patchProfile(current!, { selected: profile.selected }).catch(
|
||||||
|
console.error
|
||||||
|
);
|
||||||
// update proxies cache
|
// update proxies cache
|
||||||
if (hasChange) mutate("getProxies", getProxies());
|
if (hasChange) mutate("getProxies", getProxies());
|
||||||
}, 100);
|
}, 100);
|
||||||
}, [profiles]);
|
}, [profiles, regularItems]);
|
||||||
|
|
||||||
const onImport = async () => {
|
const onImport = async () => {
|
||||||
if (!url) return;
|
if (!url) return;
|
||||||
@@ -71,9 +99,17 @@ const ProfilePage = () => {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
await importProfile(url);
|
await importProfile(url);
|
||||||
mutate("getProfiles", getProfiles());
|
|
||||||
if (!profiles.items?.length) selectProfile(0).catch(noop);
|
|
||||||
Notice.success("Successfully import profile.");
|
Notice.success("Successfully import profile.");
|
||||||
|
|
||||||
|
getProfiles().then((newProfiles) => {
|
||||||
|
mutate("getProfiles", newProfiles);
|
||||||
|
|
||||||
|
if (!newProfiles.current && newProfiles.items?.length) {
|
||||||
|
const current = newProfiles.items[0].uid;
|
||||||
|
selectProfile(current);
|
||||||
|
mutate("getProfiles", { ...newProfiles, current }, true);
|
||||||
|
}
|
||||||
|
});
|
||||||
} catch {
|
} catch {
|
||||||
Notice.error("Failed to import profile.");
|
Notice.error("Failed to import profile.");
|
||||||
} finally {
|
} finally {
|
||||||
@@ -81,45 +117,72 @@ const ProfilePage = () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const lockRef = useRef(false);
|
const onSelect = useLockFn(async (uid: string, force: boolean) => {
|
||||||
const onSelect = async (index: number, force: boolean) => {
|
if (!force && uid === profiles.current) return;
|
||||||
if (lockRef.current) return;
|
|
||||||
if (!force && index === profiles.current) return;
|
|
||||||
lockRef.current = true;
|
|
||||||
try {
|
try {
|
||||||
await selectProfile(index);
|
await selectProfile(uid);
|
||||||
mutate("getProfiles", { ...profiles, current: index }, true);
|
mutate("getProfiles", { ...profiles, current: uid }, true);
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
err && Notice.error(err.toString());
|
Notice.error(err?.message || err.toString());
|
||||||
} finally {
|
|
||||||
lockRef.current = false;
|
|
||||||
}
|
}
|
||||||
};
|
});
|
||||||
|
|
||||||
const lockNewRef = useRef(false);
|
/** enhanced profile mode */
|
||||||
const [dialogOpen, setDialogOpen] = useState(false);
|
|
||||||
const onNew = async (name: string, desc: string) => {
|
|
||||||
if (lockNewRef.current) return;
|
|
||||||
lockNewRef.current = true;
|
|
||||||
|
|
||||||
|
const chain = profiles.chain || [];
|
||||||
|
|
||||||
|
const onEnhance = useLockFn(enhanceProfiles);
|
||||||
|
|
||||||
|
const onEnhanceEnable = useLockFn(async (uid: string) => {
|
||||||
|
if (chain.includes(uid)) return;
|
||||||
|
|
||||||
|
const newChain = [...chain, uid];
|
||||||
|
await changeProfileChain(newChain);
|
||||||
|
mutate("getProfiles", { ...profiles, chain: newChain }, true);
|
||||||
|
});
|
||||||
|
|
||||||
|
const onEnhanceDisable = useLockFn(async (uid: string) => {
|
||||||
|
if (!chain.includes(uid)) return;
|
||||||
|
|
||||||
|
const newChain = chain.filter((i) => i !== uid);
|
||||||
|
await changeProfileChain(newChain);
|
||||||
|
mutate("getProfiles", { ...profiles, chain: newChain }, true);
|
||||||
|
});
|
||||||
|
|
||||||
|
const onEnhanceDelete = useLockFn(async (uid: string) => {
|
||||||
try {
|
try {
|
||||||
await newProfile(name, desc);
|
await onEnhanceDisable(uid);
|
||||||
setDialogOpen(false);
|
await deleteProfile(uid);
|
||||||
mutate("getProfiles");
|
mutate("getProfiles");
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
err && Notice.error(err.toString());
|
Notice.error(err?.message || err.toString());
|
||||||
} finally {
|
|
||||||
lockNewRef.current = false;
|
|
||||||
}
|
}
|
||||||
};
|
});
|
||||||
|
|
||||||
|
const onMoveTop = useLockFn(async (uid: string) => {
|
||||||
|
if (!chain.includes(uid)) return;
|
||||||
|
|
||||||
|
const newChain = [uid].concat(chain.filter((i) => i !== uid));
|
||||||
|
await changeProfileChain(newChain);
|
||||||
|
mutate("getProfiles", { ...profiles, chain: newChain }, true);
|
||||||
|
});
|
||||||
|
|
||||||
|
const onMoveEnd = useLockFn(async (uid: string) => {
|
||||||
|
if (!chain.includes(uid)) return;
|
||||||
|
|
||||||
|
const newChain = chain.filter((i) => i !== uid).concat([uid]);
|
||||||
|
await changeProfileChain(newChain);
|
||||||
|
mutate("getProfiles", { ...profiles, chain: newChain }, true);
|
||||||
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<BasePage title="Profiles">
|
<BasePage title={t("Profiles")}>
|
||||||
<Box sx={{ display: "flex", mb: 3 }}>
|
<Box sx={{ display: "flex", mb: 2.5 }}>
|
||||||
<TextField
|
<TextField
|
||||||
id="profile_url"
|
id="clas_verge_profile_url"
|
||||||
name="profile_url"
|
name="profile_url"
|
||||||
label="Profile URL"
|
label={t("Profile URL")}
|
||||||
size="small"
|
size="small"
|
||||||
fullWidth
|
fullWidth
|
||||||
value={url}
|
value={url}
|
||||||
@@ -132,31 +195,43 @@ const ProfilePage = () => {
|
|||||||
onClick={onImport}
|
onClick={onImport}
|
||||||
sx={{ mr: 1 }}
|
sx={{ mr: 1 }}
|
||||||
>
|
>
|
||||||
Import
|
{t("Import")}
|
||||||
</Button>
|
</Button>
|
||||||
<Button variant="contained" onClick={() => setDialogOpen(true)}>
|
<Button variant="contained" onClick={() => setDialogOpen(true)}>
|
||||||
New
|
{t("New")}
|
||||||
</Button>
|
</Button>
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
<Grid container spacing={3}>
|
<Grid container spacing={2}>
|
||||||
{profiles?.items?.map((item, idx) => (
|
{regularItems.map((item) => (
|
||||||
<Grid item xs={12} sm={6} key={item.file}>
|
<Grid item xs={12} sm={6} key={item.file}>
|
||||||
<ProfileItem
|
<ProfileItem
|
||||||
index={idx}
|
selected={profiles.current === item.uid}
|
||||||
selected={profiles.current === idx}
|
|
||||||
itemData={item}
|
itemData={item}
|
||||||
onSelect={(f) => onSelect(idx, f)}
|
onSelect={(f) => onSelect(item.uid, f)}
|
||||||
/>
|
/>
|
||||||
</Grid>
|
</Grid>
|
||||||
))}
|
))}
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<ProfileNew
|
<Grid container spacing={2} sx={{ mt: 3 }}>
|
||||||
open={dialogOpen}
|
{enhanceItems.map((item) => (
|
||||||
onClose={() => setDialogOpen(false)}
|
<Grid item xs={12} sm={6} key={item.file}>
|
||||||
onSubmit={onNew}
|
<ProfileMore
|
||||||
/>
|
selected={!!profiles.chain?.includes(item.uid)}
|
||||||
|
itemData={item}
|
||||||
|
onEnable={() => onEnhanceEnable(item.uid)}
|
||||||
|
onDisable={() => onEnhanceDisable(item.uid)}
|
||||||
|
onDelete={() => onEnhanceDelete(item.uid)}
|
||||||
|
onMoveTop={() => onMoveTop(item.uid)}
|
||||||
|
onMoveEnd={() => onMoveEnd(item.uid)}
|
||||||
|
onEnhance={onEnhance}
|
||||||
|
/>
|
||||||
|
</Grid>
|
||||||
|
))}
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<ProfileNew open={dialogOpen} onClose={() => setDialogOpen(false)} />
|
||||||
</BasePage>
|
</BasePage>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,90 +1,53 @@
|
|||||||
import useSWR, { useSWRConfig } from "swr";
|
import useSWR, { useSWRConfig } from "swr";
|
||||||
import { useEffect, useMemo, useRef, useState } from "react";
|
import { useEffect } from "react";
|
||||||
import { Virtuoso } from "react-virtuoso";
|
import { useLockFn } from "ahooks";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
import { Button, ButtonGroup, List, Paper } from "@mui/material";
|
import { Button, ButtonGroup, List, Paper } from "@mui/material";
|
||||||
import { getClashConfig, updateConfigs, updateProxy } from "../services/api";
|
import { getClashConfig, updateConfigs } from "../services/api";
|
||||||
import { patchClashConfig } from "../services/cmds";
|
import { patchClashConfig } from "../services/cmds";
|
||||||
import { getProxies } from "../services/api";
|
import { getProxies } from "../services/api";
|
||||||
import BasePage from "../components/base/base-page";
|
import BasePage from "../components/base/base-page";
|
||||||
import ProxyItem from "../components/proxy/proxy-item";
|
|
||||||
import ProxyGroup from "../components/proxy/proxy-group";
|
import ProxyGroup from "../components/proxy/proxy-group";
|
||||||
|
import ProxyGlobal from "../components/proxy/proxy-global";
|
||||||
|
|
||||||
const ProxyPage = () => {
|
const ProxyPage = () => {
|
||||||
|
const { t } = useTranslation();
|
||||||
const { mutate } = useSWRConfig();
|
const { mutate } = useSWRConfig();
|
||||||
const { data: proxiesData } = useSWR("getProxies", getProxies);
|
const { data: proxiesData } = useSWR("getProxies", getProxies);
|
||||||
const { data: clashConfig } = useSWR("getClashConfig", getClashConfig);
|
const { data: clashConfig } = useSWR("getClashConfig", getClashConfig);
|
||||||
const [curProxy, setCurProxy] = useState<string>("DIRECT");
|
|
||||||
const curMode = clashConfig?.mode.toLowerCase();
|
|
||||||
|
|
||||||
// proxy groups
|
|
||||||
const { groups = [] } = proxiesData ?? {};
|
|
||||||
// proxies and sorted
|
|
||||||
const filterProxies = useMemo(() => {
|
|
||||||
if (!proxiesData?.proxies) return [];
|
|
||||||
|
|
||||||
const list = Object.values(proxiesData.proxies);
|
|
||||||
const retList = list.filter(
|
|
||||||
(p) => !p.all?.length && p.name !== "DIRECT" && p.name !== "REJECT"
|
|
||||||
);
|
|
||||||
const direct = list.filter((p) => p.name === "DIRECT");
|
|
||||||
const reject = list.filter((p) => p.name === "REJECT");
|
|
||||||
|
|
||||||
return direct.concat(retList).concat(reject);
|
|
||||||
}, [proxiesData]);
|
|
||||||
|
|
||||||
const modeList = ["rule", "global", "direct"];
|
const modeList = ["rule", "global", "direct"];
|
||||||
const asGroup = curMode === "rule" && groups.length;
|
const curMode = clashConfig?.mode.toLowerCase() ?? "direct";
|
||||||
|
const { groups = [], proxies = [] } = proxiesData ?? {};
|
||||||
|
|
||||||
// make sure that fetch the proxies successfully
|
// make sure that fetch the proxies successfully
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (
|
if (
|
||||||
(curMode === "rule" && !groups.length) ||
|
(curMode === "rule" && !groups.length) ||
|
||||||
(curMode === "global" && filterProxies.length < 4)
|
(curMode === "global" && proxies.length < 2)
|
||||||
) {
|
) {
|
||||||
setTimeout(() => mutate("getProxies"), 500);
|
setTimeout(() => mutate("getProxies"), 500);
|
||||||
}
|
}
|
||||||
}, [groups, filterProxies, curMode]);
|
}, [groups, proxies, curMode]);
|
||||||
|
|
||||||
// update the current proxy
|
const onChangeMode = useLockFn(async (mode: string) => {
|
||||||
useEffect(() => {
|
// switch rapidly
|
||||||
if (curMode === "direct") setCurProxy("DIRECT");
|
await updateConfigs({ mode });
|
||||||
if (curMode === "global") {
|
await patchClashConfig({ mode });
|
||||||
const globalNow = proxiesData?.proxies?.GLOBAL?.now;
|
mutate("getClashConfig");
|
||||||
setCurProxy(globalNow || "DIRECT");
|
});
|
||||||
}
|
|
||||||
}, [curMode, proxiesData]);
|
|
||||||
|
|
||||||
const changeLockRef = useRef(false);
|
|
||||||
const onChangeMode = async (mode: string) => {
|
|
||||||
if (changeLockRef.current) return;
|
|
||||||
changeLockRef.current = true;
|
|
||||||
|
|
||||||
try {
|
|
||||||
// switch rapidly
|
|
||||||
await updateConfigs({ mode });
|
|
||||||
await patchClashConfig({ mode });
|
|
||||||
mutate("getClashConfig");
|
|
||||||
} finally {
|
|
||||||
changeLockRef.current = false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const onChangeProxy = async (name: string) => {
|
|
||||||
if (curMode !== "global") return;
|
|
||||||
await updateProxy("GLOBAL", name);
|
|
||||||
setCurProxy(name);
|
|
||||||
};
|
|
||||||
|
|
||||||
// difference style
|
// difference style
|
||||||
const pageStyle = asGroup ? {} : { height: "100%" };
|
const showGroup = curMode === "rule" && !!groups.length;
|
||||||
const paperStyle: any = asGroup
|
const pageStyle = showGroup ? {} : { height: "100%" };
|
||||||
|
const paperStyle: any = showGroup
|
||||||
? { mb: 0.5 }
|
? { mb: 0.5 }
|
||||||
: { py: 1, height: "100%", boxSizing: "border-box" };
|
: { py: 1, height: "100%", boxSizing: "border-box" };
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<BasePage
|
<BasePage
|
||||||
contentStyle={pageStyle}
|
contentStyle={pageStyle}
|
||||||
title={asGroup ? "Proxy Groups" : "Proxies"}
|
title={showGroup ? t("Proxy Groups") : t("Proxies")}
|
||||||
header={
|
header={
|
||||||
<ButtonGroup size="small">
|
<ButtonGroup size="small">
|
||||||
{modeList.map((mode) => (
|
{modeList.map((mode) => (
|
||||||
@@ -94,33 +57,32 @@ const ProxyPage = () => {
|
|||||||
onClick={() => onChangeMode(mode)}
|
onClick={() => onChangeMode(mode)}
|
||||||
sx={{ textTransform: "capitalize" }}
|
sx={{ textTransform: "capitalize" }}
|
||||||
>
|
>
|
||||||
{mode}
|
{t(mode)}
|
||||||
</Button>
|
</Button>
|
||||||
))}
|
))}
|
||||||
</ButtonGroup>
|
</ButtonGroup>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<Paper sx={{ borderRadius: 1, boxShadow: 2, ...paperStyle }}>
|
<Paper sx={{ borderRadius: 1, boxShadow: 2, ...paperStyle }}>
|
||||||
{asGroup ? (
|
{curMode === "rule" && !!groups.length && (
|
||||||
<List>
|
<List>
|
||||||
{groups.map((group) => (
|
{groups.map((group) => (
|
||||||
<ProxyGroup key={group.name} group={group} />
|
<ProxyGroup key={group.name} group={group} />
|
||||||
))}
|
))}
|
||||||
</List>
|
</List>
|
||||||
) : (
|
)}
|
||||||
// virtual list
|
{((curMode === "rule" && !groups.length) || curMode === "global") && (
|
||||||
<Virtuoso
|
<ProxyGlobal
|
||||||
style={{ height: "100%" }}
|
groupName="GLOBAL"
|
||||||
totalCount={filterProxies.length}
|
curProxy={proxiesData?.global?.now}
|
||||||
itemContent={(index) => (
|
proxies={proxies}
|
||||||
<ProxyItem
|
/>
|
||||||
groupName="GLOBAL"
|
)}
|
||||||
proxy={filterProxies[index]}
|
{curMode === "direct" && (
|
||||||
selected={filterProxies[index].name === curProxy}
|
<ProxyGlobal
|
||||||
onClick={onChangeProxy}
|
groupName="DIRECT"
|
||||||
sx={{ py: 0, px: 2 }}
|
curProxy="DIRECT"
|
||||||
/>
|
proxies={[proxiesData?.direct!].filter(Boolean)}
|
||||||
)}
|
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</Paper>
|
</Paper>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { Paper } from "@mui/material";
|
import { Paper } from "@mui/material";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
import Notice from "../components/base/base-notice";
|
import Notice from "../components/base/base-notice";
|
||||||
import BasePage from "../components/base/base-page";
|
import BasePage from "../components/base/base-page";
|
||||||
import SettingVerge from "../components/setting/setting-verge";
|
import SettingVerge from "../components/setting/setting-verge";
|
||||||
@@ -6,12 +7,14 @@ import SettingClash from "../components/setting/setting-clash";
|
|||||||
import SettingSystem from "../components/setting/setting-system";
|
import SettingSystem from "../components/setting/setting-system";
|
||||||
|
|
||||||
const SettingPage = () => {
|
const SettingPage = () => {
|
||||||
const onError = (error: any) => {
|
const { t } = useTranslation();
|
||||||
error && Notice.error(error.toString());
|
|
||||||
|
const onError = (err: any) => {
|
||||||
|
Notice.error(err?.message || err.toString());
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<BasePage title="Settings">
|
<BasePage title={t("Settings")}>
|
||||||
<Paper sx={{ borderRadius: 1, boxShadow: 2, mb: 3 }}>
|
<Paper sx={{ borderRadius: 1, boxShadow: 2, mb: 3 }}>
|
||||||
<SettingClash onError={onError} />
|
<SettingClash onError={onError} />
|
||||||
</Paper>
|
</Paper>
|
||||||
|
|||||||
@@ -14,7 +14,13 @@ export async function getAxios(force: boolean = false) {
|
|||||||
try {
|
try {
|
||||||
const info = await getClashInfo();
|
const info = await getClashInfo();
|
||||||
|
|
||||||
if (info?.server) server = info?.server;
|
if (info?.server) {
|
||||||
|
server = info.server;
|
||||||
|
|
||||||
|
// compatible width `external-controller`
|
||||||
|
if (server.startsWith(":")) server = `127.0.0.1${server}`;
|
||||||
|
else if (/^\d+$/.test(server)) server = `127.0.0.1:${server}`;
|
||||||
|
}
|
||||||
if (info?.secret) secret = info?.secret;
|
if (info?.secret) secret = info?.secret;
|
||||||
} catch {}
|
} catch {}
|
||||||
|
|
||||||
@@ -84,33 +90,66 @@ export async function updateProxy(group: string, proxy: string) {
|
|||||||
export async function getProxies() {
|
export async function getProxies() {
|
||||||
const instance = await getAxios();
|
const instance = await getAxios();
|
||||||
const response = await instance.get<any, any>("/proxies");
|
const response = await instance.get<any, any>("/proxies");
|
||||||
const proxies = (response?.proxies ?? {}) as Record<
|
const records = (response?.proxies ?? {}) as Record<
|
||||||
string,
|
string,
|
||||||
ApiType.ProxyItem
|
ApiType.ProxyItem
|
||||||
>;
|
>;
|
||||||
|
|
||||||
const global = proxies["GLOBAL"];
|
const global = records["GLOBAL"];
|
||||||
|
const direct = records["DIRECT"];
|
||||||
|
const reject = records["REJECT"];
|
||||||
const order = global?.all;
|
const order = global?.all;
|
||||||
|
|
||||||
let groups: ApiType.ProxyGroupItem[] = [];
|
let groups: ApiType.ProxyGroupItem[] = [];
|
||||||
|
|
||||||
|
// compatible with proxy-providers
|
||||||
|
const generateItem = (name: string) => {
|
||||||
|
if (records[name]) return records[name];
|
||||||
|
return { name, type: "unknown", udp: false, history: [] };
|
||||||
|
};
|
||||||
|
|
||||||
if (order) {
|
if (order) {
|
||||||
groups = order
|
groups = order
|
||||||
.filter((name) => proxies[name]?.all)
|
.filter((name) => records[name]?.all)
|
||||||
.map((name) => proxies[name])
|
.map((name) => records[name])
|
||||||
.map((each) => ({
|
.map((each) => ({
|
||||||
...each,
|
...each,
|
||||||
all: each.all!.map((item) => proxies[item]),
|
all: each.all!.map((item) => generateItem(item)),
|
||||||
}));
|
}));
|
||||||
} else {
|
} else {
|
||||||
groups = Object.values(proxies)
|
groups = Object.values(records)
|
||||||
.filter((each) => each.name !== "GLOBAL" && each.all)
|
.filter((each) => each.name !== "GLOBAL" && each.all)
|
||||||
.map((each) => ({
|
.map((each) => ({
|
||||||
...each,
|
...each,
|
||||||
all: each.all!.map((item) => proxies[item]),
|
all: each.all!.map((item) => generateItem(item)),
|
||||||
}));
|
}));
|
||||||
groups.sort((a, b) => b.name.localeCompare(a.name));
|
groups.sort((a, b) => b.name.localeCompare(a.name));
|
||||||
}
|
}
|
||||||
|
|
||||||
return { global, groups, proxies };
|
const proxies = [direct, reject].concat(
|
||||||
|
Object.values(records).filter(
|
||||||
|
(p) => !p.all?.length && p.name !== "DIRECT" && p.name !== "REJECT"
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
return { global, direct, groups, records, proxies };
|
||||||
|
}
|
||||||
|
|
||||||
|
// todo: get proxy providers
|
||||||
|
export async function getProviders() {
|
||||||
|
const instance = await getAxios();
|
||||||
|
const response = await instance.get<any, any>("/providers/proxies");
|
||||||
|
return response.providers as any;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close specific connection
|
||||||
|
export async function deleteConnection(id: string) {
|
||||||
|
const instance = await getAxios();
|
||||||
|
await instance.delete<any, any>(`/connections/${encodeURIComponent(id)}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close all connections
|
||||||
|
export async function closeAllConnections() {
|
||||||
|
const instance = await getAxios();
|
||||||
|
await instance.delete<any, any>(`/connections`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { invoke } from "@tauri-apps/api/tauri";
|
import { invoke } from "@tauri-apps/api/tauri";
|
||||||
import { ApiType, CmdType } from "./types";
|
import { ApiType, CmdType } from "./types";
|
||||||
|
import Notice from "../components/base/base-notice";
|
||||||
|
|
||||||
export async function getProfiles() {
|
export async function getProfiles() {
|
||||||
return invoke<CmdType.ProfilesConfig>("get_profiles");
|
return invoke<CmdType.ProfilesConfig>("get_profiles");
|
||||||
@@ -9,39 +10,52 @@ export async function syncProfiles() {
|
|||||||
return invoke<void>("sync_profiles");
|
return invoke<void>("sync_profiles");
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function newProfile(name: string, desc: string) {
|
export async function enhanceProfiles() {
|
||||||
return invoke<void>("new_profile", { name, desc });
|
return invoke<void>("enhance_profiles");
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function viewProfile(index: number) {
|
export async function createProfile(
|
||||||
|
item: Partial<CmdType.ProfileItem>,
|
||||||
|
fileData?: string | null
|
||||||
|
) {
|
||||||
|
return invoke<void>("create_profile", { item, fileData });
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function viewProfile(index: string) {
|
||||||
return invoke<void>("view_profile", { index });
|
return invoke<void>("view_profile", { index });
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function importProfile(url: string) {
|
export async function importProfile(url: string) {
|
||||||
return invoke<void>("import_profile", { url, withProxy: true });
|
return invoke<void>("import_profile", {
|
||||||
|
url,
|
||||||
|
option: { with_proxy: true },
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function updateProfile(index: number, withProxy: boolean) {
|
export async function updateProfile(
|
||||||
return invoke<void>("update_profile", { index, withProxy });
|
index: string,
|
||||||
|
option?: CmdType.ProfileOption
|
||||||
|
) {
|
||||||
|
return invoke<void>("update_profile", { index, option });
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function deleteProfile(index: number) {
|
export async function deleteProfile(index: string) {
|
||||||
return invoke<void>("delete_profile", { index });
|
return invoke<void>("delete_profile", { index });
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function patchProfile(
|
export async function patchProfile(
|
||||||
index: number,
|
index: string,
|
||||||
profile: CmdType.ProfileItem
|
profile: Partial<CmdType.ProfileItem>
|
||||||
) {
|
) {
|
||||||
return invoke<void>("patch_profile", { index, profile });
|
return invoke<void>("patch_profile", { index, profile });
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function selectProfile(index: number) {
|
export async function selectProfile(index: string) {
|
||||||
return invoke<void>("select_profile", { index });
|
return invoke<void>("select_profile", { index });
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function restartSidecar() {
|
export async function changeProfileChain(chain?: string[]) {
|
||||||
return invoke<void>("restart_sidecar");
|
return invoke<void>("change_profile_chain", { chain });
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getClashInfo() {
|
export async function getClashInfo() {
|
||||||
@@ -64,14 +78,22 @@ export async function getSystemProxy() {
|
|||||||
return invoke<any>("get_sys_proxy");
|
return invoke<any>("get_sys_proxy");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function restartSidecar() {
|
||||||
|
return invoke<void>("restart_sidecar");
|
||||||
|
}
|
||||||
|
|
||||||
export async function killSidecars() {
|
export async function killSidecars() {
|
||||||
return invoke<any>("kill_sidecars");
|
return invoke<any>("kill_sidecars");
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function openAppDir() {
|
export async function openAppDir() {
|
||||||
return invoke<void>("open_app_dir");
|
return invoke<void>("open_app_dir").catch((err) =>
|
||||||
|
Notice.error(err?.message || err.toString(), 1500)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function openLogsDir() {
|
export async function openLogsDir() {
|
||||||
return invoke<void>("open_logs_dir");
|
return invoke<void>("open_logs_dir").catch((err) =>
|
||||||
|
Notice.error(err?.message || err.toString(), 1500)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,6 +32,39 @@ class DelayManager {
|
|||||||
this.setDelay(name, group, delay);
|
this.setDelay(name, group, delay);
|
||||||
return delay;
|
return delay;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async checkListDelay(
|
||||||
|
options: {
|
||||||
|
names: readonly string[];
|
||||||
|
groupName: string;
|
||||||
|
skipNum: number;
|
||||||
|
maxTimeout: number;
|
||||||
|
},
|
||||||
|
callback: Function
|
||||||
|
) {
|
||||||
|
let names = [...options.names];
|
||||||
|
const { groupName, skipNum, maxTimeout } = options;
|
||||||
|
|
||||||
|
while (names.length) {
|
||||||
|
const list = names.slice(0, skipNum);
|
||||||
|
names = names.slice(skipNum);
|
||||||
|
|
||||||
|
let called = false;
|
||||||
|
setTimeout(() => {
|
||||||
|
if (!called) {
|
||||||
|
called = true;
|
||||||
|
callback();
|
||||||
|
}
|
||||||
|
}, maxTimeout);
|
||||||
|
|
||||||
|
await Promise.all(list.map((n) => this.checkDelay(n, groupName)));
|
||||||
|
|
||||||
|
if (!called) {
|
||||||
|
called = true;
|
||||||
|
callback();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default new DelayManager();
|
export default new DelayManager();
|
||||||
|
|||||||
173
src/services/enhance.ts
Normal file
173
src/services/enhance.ts
Normal file
@@ -0,0 +1,173 @@
|
|||||||
|
import { emit, listen } from "@tauri-apps/api/event";
|
||||||
|
import { CmdType } from "./types";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* process the merge mode
|
||||||
|
*/
|
||||||
|
function toMerge(
|
||||||
|
merge: CmdType.ProfileMerge,
|
||||||
|
data: CmdType.ProfileData
|
||||||
|
): CmdType.ProfileData {
|
||||||
|
if (!merge) return data;
|
||||||
|
|
||||||
|
const newData = { ...data };
|
||||||
|
|
||||||
|
// rules
|
||||||
|
if (Array.isArray(merge["prepend-rules"])) {
|
||||||
|
if (!newData.rules) newData.rules = [];
|
||||||
|
newData.rules.unshift(...merge["prepend-rules"]);
|
||||||
|
}
|
||||||
|
if (Array.isArray(merge["append-rules"])) {
|
||||||
|
if (!newData.rules) newData.rules = [];
|
||||||
|
newData.rules.push(...merge["append-rules"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// proxies
|
||||||
|
if (Array.isArray(merge["prepend-proxies"])) {
|
||||||
|
if (!newData.proxies) newData.proxies = [];
|
||||||
|
newData.proxies.unshift(...merge["prepend-proxies"]);
|
||||||
|
}
|
||||||
|
if (Array.isArray(merge["append-proxies"])) {
|
||||||
|
if (!newData.proxies) newData.proxies = [];
|
||||||
|
newData.proxies.push(...merge["append-proxies"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// proxy-groups
|
||||||
|
if (Array.isArray(merge["prepend-proxy-groups"])) {
|
||||||
|
if (!newData["proxy-groups"]) newData["proxy-groups"] = [];
|
||||||
|
newData["proxy-groups"].unshift(...merge["prepend-proxy-groups"]);
|
||||||
|
}
|
||||||
|
if (Array.isArray(merge["append-proxy-groups"])) {
|
||||||
|
if (!newData["proxy-groups"]) newData["proxy-groups"] = [];
|
||||||
|
newData["proxy-groups"].push(...merge["append-proxy-groups"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return newData;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* process the script mode
|
||||||
|
*/
|
||||||
|
function toScript(
|
||||||
|
script: string,
|
||||||
|
data: CmdType.ProfileData
|
||||||
|
): Promise<CmdType.ProfileData> {
|
||||||
|
if (!script) {
|
||||||
|
throw new Error("miss the main function");
|
||||||
|
}
|
||||||
|
|
||||||
|
const paramsName = `__verge${Math.floor(Math.random() * 1000)}`;
|
||||||
|
const code = `'use strict';${script};return main(${paramsName});`;
|
||||||
|
const func = new Function(paramsName, code);
|
||||||
|
return func(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
export type EStatus = { status: "ok" | "error"; message?: string };
|
||||||
|
export type EListener = (status: EStatus) => void;
|
||||||
|
export type EUnlistener = () => void;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The service helps to
|
||||||
|
* implement enhanced profiles
|
||||||
|
*/
|
||||||
|
class Enhance {
|
||||||
|
private isSetup = false;
|
||||||
|
private listenMap: Map<string, EListener>;
|
||||||
|
private resultMap: Map<string, EStatus>;
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
this.listenMap = new Map();
|
||||||
|
this.resultMap = new Map();
|
||||||
|
}
|
||||||
|
|
||||||
|
// setup some listener
|
||||||
|
// for the enhanced running status
|
||||||
|
listen(uid: string, cb: EListener): EUnlistener {
|
||||||
|
this.listenMap.set(uid, cb);
|
||||||
|
return () => this.listenMap.delete(uid);
|
||||||
|
}
|
||||||
|
|
||||||
|
// get the running status
|
||||||
|
status(uid: string): EStatus | undefined {
|
||||||
|
return this.resultMap.get(uid);
|
||||||
|
}
|
||||||
|
|
||||||
|
// setup the handler
|
||||||
|
setup() {
|
||||||
|
if (this.isSetup) return;
|
||||||
|
this.isSetup = true;
|
||||||
|
|
||||||
|
listen("script-handler", async (event) => {
|
||||||
|
const payload = event.payload as CmdType.EnhancedPayload;
|
||||||
|
let pdata = payload.current || {};
|
||||||
|
|
||||||
|
let hasScript = false;
|
||||||
|
|
||||||
|
for (const each of payload.chain) {
|
||||||
|
const { uid, type = "" } = each.item;
|
||||||
|
|
||||||
|
try {
|
||||||
|
// process script
|
||||||
|
if (type === "script") {
|
||||||
|
// support async main function
|
||||||
|
pdata = await toScript(each.script!, { ...pdata });
|
||||||
|
hasScript = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// process merge
|
||||||
|
else if (type === "merge") {
|
||||||
|
pdata = toMerge(each.merge!, { ...pdata });
|
||||||
|
}
|
||||||
|
|
||||||
|
// invalid type
|
||||||
|
else {
|
||||||
|
throw new Error(`invalid enhanced profile type "${type}"`);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.exec(uid, { status: "ok" });
|
||||||
|
} catch (err: any) {
|
||||||
|
this.exec(uid, {
|
||||||
|
status: "error",
|
||||||
|
message: err.message || err.toString(),
|
||||||
|
});
|
||||||
|
|
||||||
|
console.error(err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If script is never used
|
||||||
|
// filter other fields
|
||||||
|
if (!hasScript) {
|
||||||
|
const validKeys = [
|
||||||
|
"proxies",
|
||||||
|
"proxy-providers",
|
||||||
|
"proxy-groups",
|
||||||
|
"rule-providers",
|
||||||
|
"rules",
|
||||||
|
];
|
||||||
|
|
||||||
|
// to lowercase
|
||||||
|
const newData: any = {};
|
||||||
|
Object.keys(pdata).forEach((key) => {
|
||||||
|
const newKey = key.toLowerCase();
|
||||||
|
if (validKeys.includes(newKey)) {
|
||||||
|
newData[newKey] = (pdata as any)[key];
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
pdata = newData;
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = { data: pdata, status: "ok" };
|
||||||
|
emit(payload.callback, JSON.stringify(result)).catch(console.error);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// exec the listener
|
||||||
|
private exec(uid: string, status: EStatus) {
|
||||||
|
this.resultMap.set(uid, status);
|
||||||
|
this.listenMap.get(uid)?.(status);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default new Enhance();
|
||||||
17
src/services/i18n.ts
Normal file
17
src/services/i18n.ts
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
import i18n from "i18next";
|
||||||
|
import { initReactI18next } from "react-i18next";
|
||||||
|
import en from "../locales/en.json";
|
||||||
|
import zh from "../locales/zh.json";
|
||||||
|
|
||||||
|
const resources = {
|
||||||
|
en: { translation: en },
|
||||||
|
zh: { translation: zh },
|
||||||
|
};
|
||||||
|
|
||||||
|
i18n.use(initReactI18next).init({
|
||||||
|
resources,
|
||||||
|
lng: "en",
|
||||||
|
interpolation: {
|
||||||
|
escapeValue: false,
|
||||||
|
},
|
||||||
|
});
|
||||||
@@ -10,3 +10,15 @@ export const atomLogData = atom<ApiType.LogItem[]>({
|
|||||||
key: "atomLogData",
|
key: "atomLogData",
|
||||||
default: [],
|
default: [],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// save the state of each profile item loading
|
||||||
|
export const atomLoadingCache = atom<Record<string, boolean>>({
|
||||||
|
key: "atomLoadingCache",
|
||||||
|
default: {},
|
||||||
|
});
|
||||||
|
|
||||||
|
// save update state
|
||||||
|
export const atomUpdateState = atom<boolean>({
|
||||||
|
key: "atomUpdateState",
|
||||||
|
default: false,
|
||||||
|
});
|
||||||
|
|||||||
@@ -78,6 +78,8 @@ export namespace ApiType {
|
|||||||
* Some interface for command
|
* Some interface for command
|
||||||
*/
|
*/
|
||||||
export namespace CmdType {
|
export namespace CmdType {
|
||||||
|
export type ProfileType = "local" | "remote" | "merge" | "script";
|
||||||
|
|
||||||
export interface ClashInfo {
|
export interface ClashInfo {
|
||||||
status: string;
|
status: string;
|
||||||
port?: string;
|
port?: string;
|
||||||
@@ -86,10 +88,11 @@ export namespace CmdType {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface ProfileItem {
|
export interface ProfileItem {
|
||||||
|
uid: string;
|
||||||
|
type?: ProfileType | string;
|
||||||
name?: string;
|
name?: string;
|
||||||
desc?: string;
|
desc?: string;
|
||||||
file?: string;
|
file?: string;
|
||||||
mode?: string;
|
|
||||||
url?: string;
|
url?: string;
|
||||||
updated?: number;
|
updated?: number;
|
||||||
selected?: {
|
selected?: {
|
||||||
@@ -102,14 +105,22 @@ export namespace CmdType {
|
|||||||
total: number;
|
total: number;
|
||||||
expire: number;
|
expire: number;
|
||||||
};
|
};
|
||||||
|
option?: ProfileOption;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ProfileOption {
|
||||||
|
user_agent?: string;
|
||||||
|
with_proxy?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ProfilesConfig {
|
export interface ProfilesConfig {
|
||||||
current?: number;
|
current?: string;
|
||||||
|
chain?: string[];
|
||||||
items?: ProfileItem[];
|
items?: ProfileItem[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface VergeConfig {
|
export interface VergeConfig {
|
||||||
|
language?: string;
|
||||||
theme_mode?: "light" | "dark";
|
theme_mode?: "light" | "dark";
|
||||||
theme_blur?: boolean;
|
theme_blur?: boolean;
|
||||||
traffic_graph?: boolean;
|
traffic_graph?: boolean;
|
||||||
@@ -119,4 +130,33 @@ export namespace CmdType {
|
|||||||
enable_proxy_guard?: boolean;
|
enable_proxy_guard?: boolean;
|
||||||
system_proxy_bypass?: string;
|
system_proxy_bypass?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type ProfileMerge = Record<string, any>;
|
||||||
|
|
||||||
|
// partial of the clash config
|
||||||
|
export type ProfileData = Partial<{
|
||||||
|
rules: any[];
|
||||||
|
proxies: any[];
|
||||||
|
"proxy-groups": any[];
|
||||||
|
"proxy-providers": any[];
|
||||||
|
"rule-providers": any[];
|
||||||
|
}>;
|
||||||
|
|
||||||
|
export interface ChainItem {
|
||||||
|
item: ProfileItem;
|
||||||
|
merge?: ProfileMerge;
|
||||||
|
script?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface EnhancedPayload {
|
||||||
|
chain: ChainItem[];
|
||||||
|
current: ProfileData;
|
||||||
|
callback: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface EnhancedResult {
|
||||||
|
data: ProfileData;
|
||||||
|
status: string;
|
||||||
|
error?: string;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
13
src/utils/get-system.ts
Normal file
13
src/utils/get-system.ts
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
// get the system os
|
||||||
|
// according to UA
|
||||||
|
export default function getSystem() {
|
||||||
|
const ua = navigator.userAgent;
|
||||||
|
|
||||||
|
if (ua.includes("Mac OS X")) return "macos";
|
||||||
|
|
||||||
|
if (/win64|win32/i.test(ua)) return "windows";
|
||||||
|
|
||||||
|
if (/linux/i.test(ua)) return "linux";
|
||||||
|
|
||||||
|
return "unknown";
|
||||||
|
}
|
||||||
615
yarn.lock
615
yarn.lock
@@ -123,9 +123,9 @@
|
|||||||
"@babel/types" "^7.16.7"
|
"@babel/types" "^7.16.7"
|
||||||
|
|
||||||
"@babel/helper-module-transforms@^7.16.7":
|
"@babel/helper-module-transforms@^7.16.7":
|
||||||
version "7.16.7"
|
version "7.17.6"
|
||||||
resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41"
|
resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz#3c3b03cc6617e33d68ef5a27a67419ac5199ccd0"
|
||||||
integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==
|
integrity sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/helper-environment-visitor" "^7.16.7"
|
"@babel/helper-environment-visitor" "^7.16.7"
|
||||||
"@babel/helper-module-imports" "^7.16.7"
|
"@babel/helper-module-imports" "^7.16.7"
|
||||||
@@ -133,8 +133,8 @@
|
|||||||
"@babel/helper-split-export-declaration" "^7.16.7"
|
"@babel/helper-split-export-declaration" "^7.16.7"
|
||||||
"@babel/helper-validator-identifier" "^7.16.7"
|
"@babel/helper-validator-identifier" "^7.16.7"
|
||||||
"@babel/template" "^7.16.7"
|
"@babel/template" "^7.16.7"
|
||||||
"@babel/traverse" "^7.16.7"
|
"@babel/traverse" "^7.17.3"
|
||||||
"@babel/types" "^7.16.7"
|
"@babel/types" "^7.17.0"
|
||||||
|
|
||||||
"@babel/helper-plugin-utils@^7.16.7":
|
"@babel/helper-plugin-utils@^7.16.7":
|
||||||
version "7.16.7"
|
version "7.16.7"
|
||||||
@@ -227,7 +227,7 @@
|
|||||||
"@babel/plugin-syntax-jsx" "^7.16.7"
|
"@babel/plugin-syntax-jsx" "^7.16.7"
|
||||||
"@babel/types" "^7.17.0"
|
"@babel/types" "^7.17.0"
|
||||||
|
|
||||||
"@babel/runtime@^7.13.10", "@babel/runtime@^7.17.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.7":
|
"@babel/runtime@^7.13.10", "@babel/runtime@^7.14.5", "@babel/runtime@^7.17.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.7":
|
||||||
version "7.17.2"
|
version "7.17.2"
|
||||||
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941"
|
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941"
|
||||||
integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==
|
integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==
|
||||||
@@ -243,7 +243,7 @@
|
|||||||
"@babel/parser" "^7.16.7"
|
"@babel/parser" "^7.16.7"
|
||||||
"@babel/types" "^7.16.7"
|
"@babel/types" "^7.16.7"
|
||||||
|
|
||||||
"@babel/traverse@^7.16.7", "@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3":
|
"@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3":
|
||||||
version "7.17.3"
|
version "7.17.3"
|
||||||
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
|
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
|
||||||
integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
|
integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
|
||||||
@@ -267,7 +267,7 @@
|
|||||||
"@babel/helper-validator-identifier" "^7.16.7"
|
"@babel/helper-validator-identifier" "^7.16.7"
|
||||||
to-fast-properties "^2.0.0"
|
to-fast-properties "^2.0.0"
|
||||||
|
|
||||||
"@emotion/babel-plugin@^11.3.0":
|
"@emotion/babel-plugin@^11.7.1":
|
||||||
version "11.7.2"
|
version "11.7.2"
|
||||||
resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.7.2.tgz#fec75f38a6ab5b304b0601c74e2a5e77c95e5fa0"
|
resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.7.2.tgz#fec75f38a6ab5b304b0601c74e2a5e77c95e5fa0"
|
||||||
integrity sha512-6mGSCWi9UzXut/ZAN6lGFu33wGR3SJisNl3c0tvlmb8XChH1b2SUvxvnOh7hvLpqyRdHHU9AiazV3Cwbk5SXKQ==
|
integrity sha512-6mGSCWi9UzXut/ZAN6lGFu33wGR3SJisNl3c0tvlmb8XChH1b2SUvxvnOh7hvLpqyRdHHU9AiazV3Cwbk5SXKQ==
|
||||||
@@ -301,10 +301,10 @@
|
|||||||
resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
|
resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
|
||||||
integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
|
integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
|
||||||
|
|
||||||
"@emotion/is-prop-valid@^1.1.1":
|
"@emotion/is-prop-valid@^1.1.2":
|
||||||
version "1.1.1"
|
version "1.1.2"
|
||||||
resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.1.tgz#cbd843d409dfaad90f9404e7c0404c55eae8c134"
|
resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95"
|
||||||
integrity sha512-bW1Tos67CZkOURLc0OalnfxtSXQJMrAMV0jZTVGJUPSOd4qgjF3+tTD5CwJM13PHA8cltGW1WGbbvV9NpvUZPw==
|
integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@emotion/memoize" "^0.7.4"
|
"@emotion/memoize" "^0.7.4"
|
||||||
|
|
||||||
@@ -313,16 +313,17 @@
|
|||||||
resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
|
resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
|
||||||
integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
|
integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
|
||||||
|
|
||||||
"@emotion/react@^11.7.0":
|
"@emotion/react@^11.8.1":
|
||||||
version "11.7.1"
|
version "11.8.1"
|
||||||
resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.7.1.tgz#3f800ce9b20317c13e77b8489ac4a0b922b2fe07"
|
resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.8.1.tgz#5358b8c78367063881e26423057c030c57ce52eb"
|
||||||
integrity sha512-DV2Xe3yhkF1yT4uAUoJcYL1AmrnO5SVsdfvu+fBuS7IbByDeTVx9+wFmvx9Idzv7/78+9Mgx2Hcmr7Fex3tIyw==
|
integrity sha512-XGaie4nRxmtP1BZYBXqC5JGqMYF2KRKKI7vjqNvQxyRpekVAZhb6QqrElmZCAYXH1L90lAelADSVZC4PFsrJ8Q==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/runtime" "^7.13.10"
|
"@babel/runtime" "^7.13.10"
|
||||||
|
"@emotion/babel-plugin" "^11.7.1"
|
||||||
"@emotion/cache" "^11.7.1"
|
"@emotion/cache" "^11.7.1"
|
||||||
"@emotion/serialize" "^1.0.2"
|
"@emotion/serialize" "^1.0.2"
|
||||||
"@emotion/sheet" "^1.1.0"
|
"@emotion/sheet" "^1.1.0"
|
||||||
"@emotion/utils" "^1.0.0"
|
"@emotion/utils" "^1.1.0"
|
||||||
"@emotion/weak-memoize" "^0.2.5"
|
"@emotion/weak-memoize" "^0.2.5"
|
||||||
hoist-non-react-statics "^3.3.1"
|
hoist-non-react-statics "^3.3.1"
|
||||||
|
|
||||||
@@ -342,26 +343,26 @@
|
|||||||
resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2"
|
resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2"
|
||||||
integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==
|
integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==
|
||||||
|
|
||||||
"@emotion/styled@^11.6.0":
|
"@emotion/styled@^11.8.1":
|
||||||
version "11.6.0"
|
version "11.8.1"
|
||||||
resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.6.0.tgz#9230d1a7bcb2ebf83c6a579f4c80e0664132d81d"
|
resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.8.1.tgz#856f6f63aceef0eb783985fa2322e2bf66d04e17"
|
||||||
integrity sha512-mxVtVyIOTmCAkFbwIp+nCjTXJNgcz4VWkOYQro87jE2QBTydnkiYusMrRGFtzuruiGK4dDaNORk4gH049iiQuw==
|
integrity sha512-OghEVAYBZMpEquHZwuelXcRjRJQOVayvbmNR0zr174NHdmMgrNkLC6TljKC5h9lZLkN5WGrdUcrKlOJ4phhoTQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/runtime" "^7.13.10"
|
"@babel/runtime" "^7.13.10"
|
||||||
"@emotion/babel-plugin" "^11.3.0"
|
"@emotion/babel-plugin" "^11.7.1"
|
||||||
"@emotion/is-prop-valid" "^1.1.1"
|
"@emotion/is-prop-valid" "^1.1.2"
|
||||||
"@emotion/serialize" "^1.0.2"
|
"@emotion/serialize" "^1.0.2"
|
||||||
"@emotion/utils" "^1.0.0"
|
"@emotion/utils" "^1.1.0"
|
||||||
|
|
||||||
"@emotion/unitless@^0.7.5":
|
"@emotion/unitless@^0.7.5":
|
||||||
version "0.7.5"
|
version "0.7.5"
|
||||||
resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
|
resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
|
||||||
integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
|
integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
|
||||||
|
|
||||||
"@emotion/utils@^1.0.0":
|
"@emotion/utils@^1.0.0", "@emotion/utils@^1.1.0":
|
||||||
version "1.0.0"
|
version "1.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af"
|
resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.1.0.tgz#86b0b297f3f1a0f2bdb08eeac9a2f49afd40d0cf"
|
||||||
integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==
|
integrity sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ==
|
||||||
|
|
||||||
"@emotion/weak-memoize@^0.2.5":
|
"@emotion/weak-memoize@^0.2.5":
|
||||||
version "0.2.5"
|
version "0.2.5"
|
||||||
@@ -386,36 +387,36 @@
|
|||||||
"@jridgewell/resolve-uri" "^3.0.3"
|
"@jridgewell/resolve-uri" "^3.0.3"
|
||||||
"@jridgewell/sourcemap-codec" "^1.4.10"
|
"@jridgewell/sourcemap-codec" "^1.4.10"
|
||||||
|
|
||||||
"@mui/base@5.0.0-alpha.69":
|
"@mui/base@5.0.0-alpha.70":
|
||||||
version "5.0.0-alpha.69"
|
version "5.0.0-alpha.70"
|
||||||
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.69.tgz#8511198d760de0795870f5ec63e53db73ba801ec"
|
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.70.tgz#e280ee3b69d86034f2cff445161747940129d576"
|
||||||
integrity sha512-IxUUj/lkilCTNBIybQxyQGW/zpxFp490G0QBQJgRp9TJkW2PWSTLvAH7gcH0YHd0L2TAf1TRgfdemoRseMzqQA==
|
integrity sha512-8UZWhz1JYuQnPkAbC37cl4aL1JyNWZ08wDXlp57W7fYQp5xFpBP/7p56AcWg2qG9CNJP0IlFg2Wp4md1v2l4iA==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/runtime" "^7.17.0"
|
"@babel/runtime" "^7.17.2"
|
||||||
"@emotion/is-prop-valid" "^1.1.1"
|
"@emotion/is-prop-valid" "^1.1.2"
|
||||||
"@mui/utils" "^5.4.2"
|
"@mui/utils" "^5.4.4"
|
||||||
"@popperjs/core" "^2.4.4"
|
"@popperjs/core" "^2.4.4"
|
||||||
clsx "^1.1.1"
|
clsx "^1.1.1"
|
||||||
prop-types "^15.7.2"
|
prop-types "^15.7.2"
|
||||||
react-is "^17.0.2"
|
react-is "^17.0.2"
|
||||||
|
|
||||||
"@mui/icons-material@^5.4.1":
|
"@mui/icons-material@^5.4.4":
|
||||||
version "5.4.2"
|
version "5.4.4"
|
||||||
resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.4.2.tgz#b2fd2c6c81d2d275e17ce40bd50c63cb197d324b"
|
resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.4.4.tgz#0dc7b4e68cbbdfc675f09f0763be1100aad910af"
|
||||||
integrity sha512-7c+G3jBT+e+pN0a9DJ0Bd8Kr1Vy6os5Q1yd2aXcwuhlRI3uzJBLJ8sX6FSWoh5DSEBchb7Bsk1uHz6U0YN9l+Q==
|
integrity sha512-7zoRpjO8vsd+bPvXq6rtXu0V8Saj70X09dtTQogZmxQKabrYW3g7+Yym7SCRA7IYVF3ysz2AvdQrGD1P/sGepg==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/runtime" "^7.17.0"
|
"@babel/runtime" "^7.17.2"
|
||||||
|
|
||||||
"@mui/material@^5.4.1":
|
"@mui/material@^5.4.4":
|
||||||
version "5.4.2"
|
version "5.4.4"
|
||||||
resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.4.2.tgz#04ea6632d7ca600a2ae528f6f140ef0af9c01434"
|
resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.4.4.tgz#2652a07085bf107da590007286336640f605055e"
|
||||||
integrity sha512-jmeLWEO6AA6g7HErhI3MXVGaMZtqDZjDwcHCg24WY954wO38Xn0zJ53VfpFc44ZTJLV9Ejd7ci9fLlG/HmJCeg==
|
integrity sha512-VDJC7GzO1HTFqfMe2zwvaW/sRhABBJXFkKEv5gO3uXx7x9fdwJHQr4udU7NWZCUdOcx9Y0h3BsAILLefYq+WPw==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/runtime" "^7.17.0"
|
"@babel/runtime" "^7.17.2"
|
||||||
"@mui/base" "5.0.0-alpha.69"
|
"@mui/base" "5.0.0-alpha.70"
|
||||||
"@mui/system" "^5.4.2"
|
"@mui/system" "^5.4.4"
|
||||||
"@mui/types" "^7.1.2"
|
"@mui/types" "^7.1.2"
|
||||||
"@mui/utils" "^5.4.2"
|
"@mui/utils" "^5.4.4"
|
||||||
"@types/react-transition-group" "^4.4.4"
|
"@types/react-transition-group" "^4.4.4"
|
||||||
clsx "^1.1.1"
|
clsx "^1.1.1"
|
||||||
csstype "^3.0.10"
|
csstype "^3.0.10"
|
||||||
@@ -424,34 +425,34 @@
|
|||||||
react-is "^17.0.2"
|
react-is "^17.0.2"
|
||||||
react-transition-group "^4.4.2"
|
react-transition-group "^4.4.2"
|
||||||
|
|
||||||
"@mui/private-theming@^5.4.2":
|
"@mui/private-theming@^5.4.4":
|
||||||
version "5.4.2"
|
version "5.4.4"
|
||||||
resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.4.2.tgz#f0a05f908456a2f7b87ccb6fc3b6e1faae9d89e6"
|
resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.4.4.tgz#cc2b2d897888ce5d1c319adfa2c50c0063a649ab"
|
||||||
integrity sha512-mlPDYYko4wIcwXjCPEmOWbNTT4DZ6h9YHdnRtQPnWM28+TRUHEo7SbydnnmVDQLRXUfaH4Y6XtEHIfBNPE/SLg==
|
integrity sha512-V/gxttr6736yJoU9q+4xxXsa0K/w9Hn9pg99zsOHt7i/O904w2CX5NHh5WqDXtoUzVcayLF0RB17yr6l79CE+A==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/runtime" "^7.17.0"
|
"@babel/runtime" "^7.17.2"
|
||||||
"@mui/utils" "^5.4.2"
|
"@mui/utils" "^5.4.4"
|
||||||
prop-types "^15.7.2"
|
prop-types "^15.7.2"
|
||||||
|
|
||||||
"@mui/styled-engine@^5.4.2":
|
"@mui/styled-engine@^5.4.4":
|
||||||
version "5.4.2"
|
version "5.4.4"
|
||||||
resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.4.2.tgz#e04903e06bd49fd10072a44ff38e13f5481bb64d"
|
resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.4.4.tgz#8991b2e2dd47ae60071e7f042a5fab8e6e092e82"
|
||||||
integrity sha512-tz9p3aRtzXHKAg7x3BgP0hVQEoGKaxNCFxsJ+d/iqEHYvywWFSs6oxqYAvDHIRpvMlUZyPNoTrkcNnbdMmH/ng==
|
integrity sha512-AKx3rSgB6dmt5f7iP4K18mLFlE5/9EfJe/5EH9Pyqez8J/CPkTgYhJ/Va6qtlrcunzpui+uG/vfuf04yAZekSg==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/runtime" "^7.17.0"
|
"@babel/runtime" "^7.17.2"
|
||||||
"@emotion/cache" "^11.7.1"
|
"@emotion/cache" "^11.7.1"
|
||||||
prop-types "^15.7.2"
|
prop-types "^15.7.2"
|
||||||
|
|
||||||
"@mui/system@^5.4.2":
|
"@mui/system@^5.4.4":
|
||||||
version "5.4.2"
|
version "5.4.4"
|
||||||
resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.4.2.tgz#8166e406ba4628950bd79cec8159de25d5aef162"
|
resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.4.4.tgz#cd5d3d35c75594abd88708e715b5e39a8874ff51"
|
||||||
integrity sha512-QegBVu6fxUNov1X9bWc1MZUTeV3A5g9PIpli7d0kzkGfq6JzrJWuPlhSPZ+6hlWmWky+bbAXhU65Qz8atWxDGw==
|
integrity sha512-Zjbztq2o/VRuRRCWjG44juRrPKYLQMqtQpMHmMttGu5BnvK6PAPW3WOY0r1JCAwLhbd8Kug9nyhGQYKETjo+tQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/runtime" "^7.17.0"
|
"@babel/runtime" "^7.17.2"
|
||||||
"@mui/private-theming" "^5.4.2"
|
"@mui/private-theming" "^5.4.4"
|
||||||
"@mui/styled-engine" "^5.4.2"
|
"@mui/styled-engine" "^5.4.4"
|
||||||
"@mui/types" "^7.1.2"
|
"@mui/types" "^7.1.2"
|
||||||
"@mui/utils" "^5.4.2"
|
"@mui/utils" "^5.4.4"
|
||||||
clsx "^1.1.1"
|
clsx "^1.1.1"
|
||||||
csstype "^3.0.10"
|
csstype "^3.0.10"
|
||||||
prop-types "^15.7.2"
|
prop-types "^15.7.2"
|
||||||
@@ -461,12 +462,12 @@
|
|||||||
resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.2.tgz#4f3678ae77a7a3efab73b6e040469cc6df2144ac"
|
resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.2.tgz#4f3678ae77a7a3efab73b6e040469cc6df2144ac"
|
||||||
integrity sha512-SD7O1nVzqG+ckQpFjDhXPZjRceB8HQFHEvdLLrPhlJy4lLbwEBbxK74Tj4t6Jgk0fTvLJisuwOutrtYe9P/xBQ==
|
integrity sha512-SD7O1nVzqG+ckQpFjDhXPZjRceB8HQFHEvdLLrPhlJy4lLbwEBbxK74Tj4t6Jgk0fTvLJisuwOutrtYe9P/xBQ==
|
||||||
|
|
||||||
"@mui/utils@^5.4.2":
|
"@mui/utils@^5.4.4":
|
||||||
version "5.4.2"
|
version "5.4.4"
|
||||||
resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.4.2.tgz#3edda8f80de235418fff0424ee66e2a49793ec01"
|
resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.4.4.tgz#bd7dde4f48f60c02b6debf976bd74f3505b188fe"
|
||||||
integrity sha512-646dBCC57MXTo/Gf3AnZSHRHznaTETQq5x7AWp5FRQ4jPeyT4WSs18cpJVwkV01cAHKh06pNQTIufIALIWCL5g==
|
integrity sha512-hfYIXEuhc2mXMGN5nUPis8beH6uE/zl3uMWJcyHX0/LN/+QxO9zhYuV6l8AsAaphHFyS/fBv0SW3Nid7jw5hKQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/runtime" "^7.17.0"
|
"@babel/runtime" "^7.17.2"
|
||||||
"@types/prop-types" "^15.7.4"
|
"@types/prop-types" "^15.7.4"
|
||||||
"@types/react-is" "^16.7.1 || ^17.0.0"
|
"@types/react-is" "^16.7.1 || ^17.0.0"
|
||||||
prop-types "^15.7.2"
|
prop-types "^15.7.2"
|
||||||
@@ -571,66 +572,72 @@
|
|||||||
estree-walker "^2.0.1"
|
estree-walker "^2.0.1"
|
||||||
picomatch "^2.2.2"
|
picomatch "^2.2.2"
|
||||||
|
|
||||||
"@tauri-apps/api@^1.0.0-rc.1":
|
"@tauri-apps/api@^1.0.0-rc.2":
|
||||||
version "1.0.0-rc.1"
|
version "1.0.0-rc.2"
|
||||||
resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.0.0-rc.1.tgz#ce26a0fe30d8980a4682d50015eec28ed4a23c1e"
|
resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.0.0-rc.2.tgz#bac494a6b8868e05f86184d2ee1ccc8477470363"
|
||||||
integrity sha512-VBUOmfT8ea02JB/Qr+FHeaLnug5BRA7ro2pX47q0GZCbZsU9b+iPnOXl0ShJwT0melR7B6iamyhDwkHStMVfQA==
|
integrity sha512-JhUDCJpfxmf/S1R+yHmJGsher4CGi07Qv4fYeucB7naeFZ7yTQe7S1CHKUZaRYpurGSdwOF3my9k0LyGmpAGYw==
|
||||||
dependencies:
|
dependencies:
|
||||||
type-fest "2.11.2"
|
type-fest "2.12.0"
|
||||||
|
|
||||||
"@tauri-apps/cli-darwin-arm64@1.0.0-rc.5":
|
"@tauri-apps/cli-darwin-arm64@1.0.0-rc.7":
|
||||||
version "1.0.0-rc.5"
|
version "1.0.0-rc.7"
|
||||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.0-rc.5.tgz#9374be8c96afa1cf77b5647bc81fe1a05006757d"
|
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.0-rc.7.tgz#c7d190ea7496381bf456494e93dd8b35005a0e78"
|
||||||
integrity sha512-X+3EIAUGfoL8uE6PBADZC8FcUISe4JPQCxXgaVv6ehoZGoCh/pFJF7AvBGTQxbnvngqM7Xce4Lmh63Io2/5ggw==
|
integrity sha512-fb1plxZZHDG0KwZOoAl6tuisFU+oZFtNtqK3V2KL+4hz75DyH6BfsrgjyYSecJrtQejL2cHi8q7vUsU+EeLopw==
|
||||||
|
|
||||||
"@tauri-apps/cli-darwin-x64@1.0.0-rc.5":
|
"@tauri-apps/cli-darwin-x64@1.0.0-rc.7":
|
||||||
version "1.0.0-rc.5"
|
version "1.0.0-rc.7"
|
||||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.0-rc.5.tgz#4db1dd56a228bfafe5b3f64c7661abbe5606e804"
|
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.0-rc.7.tgz#b152f333ea081674e8e6c45d1c3ff1850bff854c"
|
||||||
integrity sha512-fEpgOdAvKdq9C5/yip8RnwP1VS+nRrtKdzzplu4jY6njDVH/Vom8mg+EfXkCY5RveCaoskJMFgUvt10IGeZHBA==
|
integrity sha512-FOFPNsYUgCDaxEK+9oQ3vv9bMD3XVcOKdh1vo/DImzZNO6fQkcsDC8zlmA+Q4axd+X8kvu0iti1fK8Vl7HIUEA==
|
||||||
|
|
||||||
"@tauri-apps/cli-linux-arm-gnueabihf@1.0.0-rc.5":
|
"@tauri-apps/cli-linux-arm-gnueabihf@1.0.0-rc.7":
|
||||||
version "1.0.0-rc.5"
|
version "1.0.0-rc.7"
|
||||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.0-rc.5.tgz#0f1ff84c534908a54fbe63b45004abc6d4f03f4d"
|
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.0-rc.7.tgz#14fb37a337526200dbbe9b49dabd221b81682b02"
|
||||||
integrity sha512-V7sWSBrpLyvkQxpkHIM8JltYqQhiTpThySDjO8POtrTqkRwM5BXORcCYhxTAKCedecfYK/RNUJ6Q0t7+3jS6DQ==
|
integrity sha512-tFzcJtNHy5AInU3E7kKDyhg4Qb7csu3uZ3FhGfORmGvQAiNQFpGV3ypC230RQYa3sxxRMbn8vjUAZMlU6JArbA==
|
||||||
|
|
||||||
"@tauri-apps/cli-linux-arm64-gnu@1.0.0-rc.5":
|
"@tauri-apps/cli-linux-arm64-gnu@1.0.0-rc.7":
|
||||||
version "1.0.0-rc.5"
|
version "1.0.0-rc.7"
|
||||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.0-rc.5.tgz#c5d2f1dd962d80a1958261229778b410b86254d4"
|
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.0-rc.7.tgz#43e7a38018258ad2bf665bb61e0328688b345355"
|
||||||
integrity sha512-HhM+2FInxtUAI/41LF4fDEzmhLQUq6DOoo7fLN94vgWlhsPyWZoDGP9pA043XbO86+4OX5JZUW1SnTVXMwEaMA==
|
integrity sha512-QAoNUJMmoCv/mDZsfEZOOTeEPYuxtMgCgqTDqMd0H8S0Y3Cu2D/Q2fwVl0s9pMb6wLD2GJ2FEneySEMhMxt7Pg==
|
||||||
|
|
||||||
"@tauri-apps/cli-linux-arm64-musl@1.0.0-rc.5":
|
"@tauri-apps/cli-linux-arm64-musl@1.0.0-rc.7":
|
||||||
version "1.0.0-rc.5"
|
version "1.0.0-rc.7"
|
||||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.0-rc.5.tgz#f485db9ca5402f5d2c4585801a3aaa4519bd67e8"
|
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.0-rc.7.tgz#37ebcfc7d1431dd698f529fa57248adadd94b3b4"
|
||||||
integrity sha512-DhHdKOhf3+peA/sM0c9CpxK89cp8GVwOB5osFW55fxBZbD0mJFeL2SzjkgfGFqFu6Ci/ZiibQGfEp8XTC8OsYA==
|
integrity sha512-ieLyACtbY7ezReTnjWLw/kKDXRCbnbrUjQ+hltSmHaRuV51nX+I2rmFO5e7VPdj406jvyKwfSPuBC34bHxt3Og==
|
||||||
|
|
||||||
"@tauri-apps/cli-linux-x64-gnu@1.0.0-rc.5":
|
"@tauri-apps/cli-linux-x64-gnu@1.0.0-rc.7":
|
||||||
version "1.0.0-rc.5"
|
version "1.0.0-rc.7"
|
||||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.0-rc.5.tgz#e468939585bc98e80ec827d0a3d8ba06a7cc38e8"
|
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.0-rc.7.tgz#b47239c4f10b3fe8e1e2f031f639125ededc6d79"
|
||||||
integrity sha512-pZzsOHRGG/mdcn7fF/yOIOdeVzGxZUtZqvlGSd90ZM9Ps3//uYGCBHoNTbeSwp/V6+D0KVDaSCbm9lYlHoXcdA==
|
integrity sha512-wPAZctuFpurACxdCrjw+aaSuFReuIvv1nalVezfqA78AlsCk785yF2YVjoZr5bT8a9+6F+t8uNi3l6Vp5oNqwQ==
|
||||||
|
|
||||||
"@tauri-apps/cli-linux-x64-musl@1.0.0-rc.5":
|
"@tauri-apps/cli-linux-x64-musl@1.0.0-rc.7":
|
||||||
version "1.0.0-rc.5"
|
version "1.0.0-rc.7"
|
||||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.0-rc.5.tgz#a1308e93850555f2b6c97b5d7cdbbb9afaa803e2"
|
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.0-rc.7.tgz#9e62494cf80aed170f389d84b2b23f354e8ce748"
|
||||||
integrity sha512-COwWCbOhEjBlzGRGTa0ESO4/AiC0cBZ2UEPExRn++S+kWSPJ2vsyMdCLu3hiMy1ABSIRcQ4Vc68M1iVkLhOHHw==
|
integrity sha512-/AxuXFC2d1V8KpZJ6cFDcD5QqPFIZFXC/tAJlnTW75VnHgjat9TYP3BdSOuEA81ZLs9tV4PQF40tNnUSzfRYMg==
|
||||||
|
|
||||||
"@tauri-apps/cli-win32-x64-msvc@1.0.0-rc.5":
|
"@tauri-apps/cli-win32-ia32-msvc@1.0.0-rc.7":
|
||||||
version "1.0.0-rc.5"
|
version "1.0.0-rc.7"
|
||||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.0-rc.5.tgz#d15c95143d9123d10c510e28ba90df5349b68ecd"
|
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.0.0-rc.7.tgz#71c2f9498f4d03fd2c0ca6137a2be7db95a006f3"
|
||||||
integrity sha512-zzizUmPWvnWjj+IUCk36kVjS9j1Bg5JmnwOW5QdX26+a64q5vocmVimCgrfZ5STw3sDFXE++S55ghpzhhH5o+g==
|
integrity sha512-C4M2rHXlYVPSHGl2Iax1rfiNM5GPSRP1JHxW7/4jH9FfW6mVFcjULZAyVMRfOMQEQ9bYXbVnSTPbhG2Fm0jPxQ==
|
||||||
|
|
||||||
"@tauri-apps/cli@^1.0.0-rc.5":
|
"@tauri-apps/cli-win32-x64-msvc@1.0.0-rc.7":
|
||||||
version "1.0.0-rc.5"
|
version "1.0.0-rc.7"
|
||||||
resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.0.0-rc.5.tgz#db8ca22c9f55f5400d1c6addd78ee1df5dc15a29"
|
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.0-rc.7.tgz#6d719f70a0789f2a179d160c302996ce81194099"
|
||||||
integrity sha512-Q3D0R5YdZRA5EcL206hwwKCyXpet2mRDcfaRTU/IXwF73bS4AMja+JdAGfO2cyHuSvXd+b//Cgbei2zCG8M6hw==
|
integrity sha512-lpstJKOtP+ahhjbutapA02TpvfNTZqXwhmA1fvqxDu6BYVezFn7ZiGG5HwdXlkiRDfbwZwBd1evdkV3MxwY1NQ==
|
||||||
|
|
||||||
|
"@tauri-apps/cli@^1.0.0-rc.7":
|
||||||
|
version "1.0.0-rc.7"
|
||||||
|
resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.0.0-rc.7.tgz#0eb73718f6ebddc159b0b54f6fd6dfc26d110b36"
|
||||||
|
integrity sha512-g7lUsI2iFiB2JuPFr209vWNqOnxCOGXN6yBttMRY+94UUXZOeWlKxYYpSabyjSr7EbfAUNzjITYmE4urdtmB+A==
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
"@tauri-apps/cli-darwin-arm64" "1.0.0-rc.5"
|
"@tauri-apps/cli-darwin-arm64" "1.0.0-rc.7"
|
||||||
"@tauri-apps/cli-darwin-x64" "1.0.0-rc.5"
|
"@tauri-apps/cli-darwin-x64" "1.0.0-rc.7"
|
||||||
"@tauri-apps/cli-linux-arm-gnueabihf" "1.0.0-rc.5"
|
"@tauri-apps/cli-linux-arm-gnueabihf" "1.0.0-rc.7"
|
||||||
"@tauri-apps/cli-linux-arm64-gnu" "1.0.0-rc.5"
|
"@tauri-apps/cli-linux-arm64-gnu" "1.0.0-rc.7"
|
||||||
"@tauri-apps/cli-linux-arm64-musl" "1.0.0-rc.5"
|
"@tauri-apps/cli-linux-arm64-musl" "1.0.0-rc.7"
|
||||||
"@tauri-apps/cli-linux-x64-gnu" "1.0.0-rc.5"
|
"@tauri-apps/cli-linux-x64-gnu" "1.0.0-rc.7"
|
||||||
"@tauri-apps/cli-linux-x64-musl" "1.0.0-rc.5"
|
"@tauri-apps/cli-linux-x64-musl" "1.0.0-rc.7"
|
||||||
"@tauri-apps/cli-win32-x64-msvc" "1.0.0-rc.5"
|
"@tauri-apps/cli-win32-ia32-msvc" "1.0.0-rc.7"
|
||||||
|
"@tauri-apps/cli-win32-x64-msvc" "1.0.0-rc.7"
|
||||||
|
|
||||||
"@types/fs-extra@^9.0.13":
|
"@types/fs-extra@^9.0.13":
|
||||||
version "9.0.13"
|
version "9.0.13"
|
||||||
@@ -655,9 +662,9 @@
|
|||||||
integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
|
integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
|
||||||
|
|
||||||
"@types/node@*":
|
"@types/node@*":
|
||||||
version "17.0.18"
|
version "17.0.21"
|
||||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.18.tgz#3b4fed5cfb58010e3a2be4b6e74615e4847f1074"
|
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644"
|
||||||
integrity sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==
|
integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==
|
||||||
|
|
||||||
"@types/parse-json@^4.0.0":
|
"@types/parse-json@^4.0.0":
|
||||||
version "4.0.0"
|
version "4.0.0"
|
||||||
@@ -670,9 +677,9 @@
|
|||||||
integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
|
integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
|
||||||
|
|
||||||
"@types/react-dom@^17.0.0":
|
"@types/react-dom@^17.0.0":
|
||||||
version "17.0.11"
|
version "17.0.13"
|
||||||
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.11.tgz#e1eadc3c5e86bdb5f7684e00274ae228e7bcc466"
|
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.13.tgz#a3323b974ee4280070982b3112351bb1952a7809"
|
||||||
integrity sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==
|
integrity sha512-wEP+B8hzvy6ORDv1QBhcQia4j6ea4SFIBttHYpXKPFZRviBvknq0FRh3VrIxeXUmsPkwuXVZrVGG7KUVONmXCQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@types/react" "*"
|
"@types/react" "*"
|
||||||
|
|
||||||
@@ -740,10 +747,10 @@ ahooks-v3-count@^1.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/ahooks-v3-count/-/ahooks-v3-count-1.0.0.tgz#ddeb392e009ad6e748905b3cbf63a9fd8262ca80"
|
resolved "https://registry.yarnpkg.com/ahooks-v3-count/-/ahooks-v3-count-1.0.0.tgz#ddeb392e009ad6e748905b3cbf63a9fd8262ca80"
|
||||||
integrity sha512-V7uUvAwnimu6eh/PED4mCDjE7tokeZQLKlxg9lCTMPhN+NjsSbtdacByVlR1oluXQzD3MOw55wylDmQo4+S9ZQ==
|
integrity sha512-V7uUvAwnimu6eh/PED4mCDjE7tokeZQLKlxg9lCTMPhN+NjsSbtdacByVlR1oluXQzD3MOw55wylDmQo4+S9ZQ==
|
||||||
|
|
||||||
ahooks@^3.1.9:
|
ahooks@^3.1.13:
|
||||||
version "3.1.9"
|
version "3.1.13"
|
||||||
resolved "https://registry.yarnpkg.com/ahooks/-/ahooks-3.1.9.tgz#7b04672c9fc2e26e551cb57bd46cfa043e680511"
|
resolved "https://registry.yarnpkg.com/ahooks/-/ahooks-3.1.13.tgz#23492e2a24f9d7951a52d9359b877e010a0a56e0"
|
||||||
integrity sha512-+ei+s0f+K2UKs6PGOUoJzMNKlj74qySO3lLd2xTJsvRUOoLhcLeFMledyJ2dRAvcFL8YFm+2T5Nidrlb8wl2tQ==
|
integrity sha512-ZWwWRhikXCWuR+X+LxXK8sWu2KPU7nh7UfaTTB93NhmoeytzN8VODRfVjq8LbT2ow5Q7PuG13143OcW9nN1vBg==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@types/js-cookie" "^2.x.x"
|
"@types/js-cookie" "^2.x.x"
|
||||||
ahooks-v3-count "^1.0.0"
|
ahooks-v3-count "^1.0.0"
|
||||||
@@ -838,9 +845,9 @@ braces@~3.0.2:
|
|||||||
fill-range "^7.0.1"
|
fill-range "^7.0.1"
|
||||||
|
|
||||||
browserslist@^4.17.5:
|
browserslist@^4.17.5:
|
||||||
version "4.19.2"
|
version "4.19.3"
|
||||||
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.2.tgz#9ba98791192a39e1242f0670bb265ceee1baf0a4"
|
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.3.tgz#29b7caad327ecf2859485f696f9604214bedd383"
|
||||||
integrity sha512-97XU1CTZ5TwU9Qy/Taj+RtiI6SQM1WIhZ9osT7EY0oO2aWXGABZT2OZeRL+6PfaQsiiMIjjwIoYFPq4APgspgQ==
|
integrity sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==
|
||||||
dependencies:
|
dependencies:
|
||||||
caniuse-lite "^1.0.30001312"
|
caniuse-lite "^1.0.30001312"
|
||||||
electron-to-chromium "^1.4.71"
|
electron-to-chromium "^1.4.71"
|
||||||
@@ -961,10 +968,10 @@ data-uri-to-buffer@^4.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b"
|
resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b"
|
||||||
integrity sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==
|
integrity sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==
|
||||||
|
|
||||||
dayjs@^1.10.7, dayjs@^1.9.1:
|
dayjs@^1.10.8, dayjs@^1.9.1:
|
||||||
version "1.10.7"
|
version "1.10.8"
|
||||||
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
|
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.8.tgz#267df4bc6276fcb33c04a6735287e3f429abec41"
|
||||||
integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==
|
integrity sha512-wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow==
|
||||||
|
|
||||||
debug@^4.1.0:
|
debug@^4.1.0:
|
||||||
version "4.3.3"
|
version "4.3.3"
|
||||||
@@ -987,9 +994,9 @@ dom-helpers@^5.0.1:
|
|||||||
csstype "^3.0.2"
|
csstype "^3.0.2"
|
||||||
|
|
||||||
electron-to-chromium@^1.4.71:
|
electron-to-chromium@^1.4.71:
|
||||||
version "1.4.71"
|
version "1.4.75"
|
||||||
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz#17056914465da0890ce00351a3b946fd4cd51ff6"
|
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.75.tgz#d1ad9bb46f2f1bf432118c2be21d27ffeae82fdd"
|
||||||
integrity sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw==
|
integrity sha512-LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q==
|
||||||
|
|
||||||
end-of-stream@^1.1.0:
|
end-of-stream@^1.1.0:
|
||||||
version "1.4.4"
|
version "1.4.4"
|
||||||
@@ -1005,125 +1012,125 @@ error-ex@^1.3.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
is-arrayish "^0.2.1"
|
is-arrayish "^0.2.1"
|
||||||
|
|
||||||
esbuild-android-arm64@0.14.22:
|
esbuild-android-arm64@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.22.tgz#fb051169a63307d958aec85ad596cfc7d7770303"
|
resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.23.tgz#c89b3c50b4f47668dcbeb0b34ee4615258818e71"
|
||||||
integrity sha512-k1Uu4uC4UOFgrnTj2zuj75EswFSEBK+H6lT70/DdS4mTAOfs2ECv2I9ZYvr3w0WL0T4YItzJdK7fPNxcPw6YmQ==
|
integrity sha512-k9sXem++mINrZty1v4FVt6nC5BQCFG4K2geCIUUqHNlTdFnuvcqsY7prcKZLFhqVC1rbcJAr9VSUGFL/vD4vsw==
|
||||||
|
|
||||||
esbuild-darwin-64@0.14.22:
|
esbuild-darwin-64@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.22.tgz#615ea0a9de67b57a293a7128d7ac83ee307a856d"
|
resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.23.tgz#1c131e8cb133ed935ca32f824349a117c896a15b"
|
||||||
integrity sha512-d8Ceuo6Vw6HM3fW218FB6jTY6O3r2WNcTAU0SGsBkXZ3k8SDoRLd3Nrc//EqzdgYnzDNMNtrWegK2Qsss4THhw==
|
integrity sha512-lB0XRbtOYYL1tLcYw8BoBaYsFYiR48RPrA0KfA/7RFTr4MV7Bwy/J4+7nLsVnv9FGuQummM3uJ93J3ptaTqFug==
|
||||||
|
|
||||||
esbuild-darwin-arm64@0.14.22:
|
esbuild-darwin-arm64@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.22.tgz#82054dcfcecb15ccfd237093b8008e7745a99ad9"
|
resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.23.tgz#3c6245a50109dd84953f53d7833bd3b4f0e8c6fa"
|
||||||
integrity sha512-YAt9Tj3SkIUkswuzHxkaNlT9+sg0xvzDvE75LlBo4DI++ogSgSmKNR6B4eUhU5EUUepVXcXdRIdqMq9ppeRqfw==
|
integrity sha512-yat73Z/uJ5tRcfRiI4CCTv0FSnwErm3BJQeZAh+1tIP0TUNh6o+mXg338Zl5EKChD+YGp6PN+Dbhs7qa34RxSw==
|
||||||
|
|
||||||
esbuild-freebsd-64@0.14.22:
|
esbuild-freebsd-64@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.22.tgz#778a818c5b078d5cdd6bb6c0e0797217d196999b"
|
resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.23.tgz#0cdc54e72d3dd9cd992f9c2960055e68a7f8650c"
|
||||||
integrity sha512-ek1HUv7fkXMy87Qm2G4IRohN+Qux4IcnrDBPZGXNN33KAL0pEJJzdTv0hB/42+DCYWylSrSKxk3KUXfqXOoH4A==
|
integrity sha512-/1xiTjoLuQ+LlbfjJdKkX45qK/M7ARrbLmyf7x3JhyQGMjcxRYVR6Dw81uH3qlMHwT4cfLW4aEVBhP1aNV7VsA==
|
||||||
|
|
||||||
esbuild-freebsd-arm64@0.14.22:
|
esbuild-freebsd-arm64@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.22.tgz#18da93b9f3db2e036f72383bfe73b28b73bb332c"
|
resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.23.tgz#1d11faed3a0c429e99b7dddef84103eb509788b2"
|
||||||
integrity sha512-zPh9SzjRvr9FwsouNYTqgqFlsMIW07O8mNXulGeQx6O5ApgGUBZBgtzSlBQXkHi18WjrosYfsvp5nzOKiWzkjQ==
|
integrity sha512-uyPqBU/Zcp6yEAZS4LKj5jEE0q2s4HmlMBIPzbW6cTunZ8cyvjG6YWpIZXb1KK3KTJDe62ltCrk3VzmWHp+iLg==
|
||||||
|
|
||||||
esbuild-linux-32@0.14.22:
|
esbuild-linux-32@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.22.tgz#d0d5d9f5bb3536e17ac097e9512019c65b7c0234"
|
resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.23.tgz#fd9f033fc27dcab61100cb1eb1c936893a68c841"
|
||||||
integrity sha512-SnpveoE4nzjb9t2hqCIzzTWBM0RzcCINDMBB67H6OXIuDa4KqFqaIgmTchNA9pJKOVLVIKd5FYxNiJStli21qg==
|
integrity sha512-37R/WMkQyUfNhbH7aJrr1uCjDVdnPeTHGeDhZPUNhfoHV0lQuZNCKuNnDvlH/u/nwIYZNdVvz1Igv5rY/zfrzQ==
|
||||||
|
|
||||||
esbuild-linux-64@0.14.22:
|
esbuild-linux-64@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.22.tgz#2773d540971999ea7f38107ef92fca753f6a8c30"
|
resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.23.tgz#c04c438514f1359ecb1529205d0c836d4165f198"
|
||||||
integrity sha512-Zcl9Wg7gKhOWWNqAjygyqzB+fJa19glgl2JG7GtuxHyL1uEnWlpSMytTLMqtfbmRykIHdab797IOZeKwk5g0zg==
|
integrity sha512-H0gztDP60qqr8zoFhAO64waoN5yBXkmYCElFklpd6LPoobtNGNnDe99xOQm28+fuD75YJ7GKHzp/MLCLhw2+vQ==
|
||||||
|
|
||||||
esbuild-linux-arm64@0.14.22:
|
esbuild-linux-arm64@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.22.tgz#5d4480ce6d6bffab1dd76a23158f5a5ab33e7ba4"
|
resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.23.tgz#d1b3ab2988ab0734886eb9e811726f7db099ab96"
|
||||||
integrity sha512-8q/FRBJtV5IHnQChO3LHh/Jf7KLrxJ/RCTGdBvlVZhBde+dk3/qS9fFsUy+rs3dEi49aAsyVitTwlKw1SUFm+A==
|
integrity sha512-c4MLOIByNHR55n3KoYf9hYDfBRghMjOiHLaoYLhkQkIabb452RWi+HsNgB41sUpSlOAqfpqKPFNg7VrxL3UX9g==
|
||||||
|
|
||||||
esbuild-linux-arm@0.14.22:
|
esbuild-linux-arm@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.22.tgz#c6391b3f7c8fa6d3b99a7e893ce0f45f3a921eef"
|
resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.23.tgz#df7558b6a5076f5eb9fd387c8704f768b61d97fb"
|
||||||
integrity sha512-soPDdbpt/C0XvOOK45p4EFt8HbH5g+0uHs5nUKjHVExfgR7du734kEkXR/mE5zmjrlymk5AA79I0VIvj90WZ4g==
|
integrity sha512-x64CEUxi8+EzOAIpCUeuni0bZfzPw/65r8tC5cy5zOq9dY7ysOi5EVQHnzaxS+1NmV+/RVRpmrzGw1QgY2Xpmw==
|
||||||
|
|
||||||
esbuild-linux-mips64le@0.14.22:
|
esbuild-linux-mips64le@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.22.tgz#2c8dabac355c502e86c38f9f292b3517d8e181f3"
|
resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.23.tgz#bb4c47fccc9493d460ffeb1f88e8a97a98a14f8b"
|
||||||
integrity sha512-SiNDfuRXhGh1JQLLA9JPprBgPVFOsGuQ0yDfSPTNxztmVJd8W2mX++c4FfLpAwxuJe183mLuKf7qKCHQs5ZnBQ==
|
integrity sha512-kHKyKRIAedYhKug2EJpyJxOUj3VYuamOVA1pY7EimoFPzaF3NeY7e4cFBAISC/Av0/tiV0xlFCt9q0HJ68IBIw==
|
||||||
|
|
||||||
esbuild-linux-ppc64le@0.14.22:
|
esbuild-linux-ppc64le@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.22.tgz#69d71b2820d5c94306072dac6094bae38e77d1c0"
|
resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.23.tgz#a332dbc8a1b4e30cfe1261bfaa5cef57c9c8c02a"
|
||||||
integrity sha512-6t/GI9I+3o1EFm2AyN9+TsjdgWCpg2nwniEhjm2qJWtJyJ5VzTXGUU3alCO3evopu8G0hN2Bu1Jhz2YmZD0kng==
|
integrity sha512-7ilAiJEPuJJnJp/LiDO0oJm5ygbBPzhchJJh9HsHZzeqO+3PUzItXi+8PuicY08r0AaaOe25LA7sGJ0MzbfBag==
|
||||||
|
|
||||||
esbuild-linux-riscv64@0.14.22:
|
esbuild-linux-riscv64@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.22.tgz#c0ec0fc3a23624deebf657781550d2329cec4213"
|
resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.23.tgz#85675f3f931f5cd7cfb238fd82f77a62ffcb6d86"
|
||||||
integrity sha512-AyJHipZKe88sc+tp5layovquw5cvz45QXw5SaDgAq2M911wLHiCvDtf/07oDx8eweCyzYzG5Y39Ih568amMTCQ==
|
integrity sha512-fbL3ggK2wY0D8I5raPIMPhpCvODFE+Bhb5QGtNP3r5aUsRR6TQV+ZBXIaw84iyvKC8vlXiA4fWLGhghAd/h/Zg==
|
||||||
|
|
||||||
esbuild-linux-s390x@0.14.22:
|
esbuild-linux-s390x@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.22.tgz#ec2af4572d63336cfb27f5a5c851fb1b6617dd91"
|
resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.23.tgz#a526282a696e6d846f4c628f5315475518c0c0f0"
|
||||||
integrity sha512-Sz1NjZewTIXSblQDZWEFZYjOK6p8tV6hrshYdXZ0NHTjWE+lwxpOpWeElUGtEmiPcMT71FiuA9ODplqzzSxkzw==
|
integrity sha512-GHMDCyfy7+FaNSO8RJ8KCFsnax8fLUsOrj9q5Gi2JmZMY0Zhp75keb5abTFCq2/Oy6KVcT0Dcbyo/bFb4rIFJA==
|
||||||
|
|
||||||
esbuild-netbsd-64@0.14.22:
|
esbuild-netbsd-64@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.22.tgz#0e283278e9fdbaa7f0930f93ee113d7759cd865e"
|
resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.23.tgz#8e456605694719aa1be4be266d6cd569c06dfaf5"
|
||||||
integrity sha512-TBbCtx+k32xydImsHxvFgsOCuFqCTGIxhzRNbgSL1Z2CKhzxwT92kQMhxort9N/fZM2CkRCPPs5wzQSamtzEHA==
|
integrity sha512-ovk2EX+3rrO1M2lowJfgMb/JPN1VwVYrx0QPUyudxkxLYrWeBxDKQvc6ffO+kB4QlDyTfdtAURrVzu3JeNdA2g==
|
||||||
|
|
||||||
esbuild-openbsd-64@0.14.22:
|
esbuild-openbsd-64@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.22.tgz#2a73bba04e16d8ef278fbe2be85248e12a2f2cc2"
|
resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.23.tgz#f2fc51714b4ddabc86e4eb30ca101dd325db2f7d"
|
||||||
integrity sha512-vK912As725haT313ANZZZN+0EysEEQXWC/+YE4rQvOQzLuxAQc2tjbzlAFREx3C8+uMuZj/q7E5gyVB7TzpcTA==
|
integrity sha512-uYYNqbVR+i7k8ojP/oIROAHO9lATLN7H2QeXKt2H310Fc8FJj4y3Wce6hx0VgnJ4k1JDrgbbiXM8rbEgQyg8KA==
|
||||||
|
|
||||||
esbuild-sunos-64@0.14.22:
|
esbuild-sunos-64@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.22.tgz#8fe03513b8b2e682a6d79d5e3ca5849651a3c1d8"
|
resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.23.tgz#a408f33ea20e215909e20173a0fd78b1aaad1f8e"
|
||||||
integrity sha512-/mbJdXTW7MTcsPhtfDsDyPEOju9EOABvCjeUU2OJ7fWpX/Em/H3WYDa86tzLUbcVg++BScQDzqV/7RYw5XNY0g==
|
integrity sha512-hAzeBeET0+SbScknPzS2LBY6FVDpgE+CsHSpe6CEoR51PApdn2IB0SyJX7vGelXzlyrnorM4CAsRyb9Qev4h9g==
|
||||||
|
|
||||||
esbuild-windows-32@0.14.22:
|
esbuild-windows-32@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.22.tgz#a75df61e3e49df292a1842be8e877a3153ee644f"
|
resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.23.tgz#b9005bbff54dac3975ff355d5de2b5e37165d128"
|
||||||
integrity sha512-1vRIkuvPTjeSVK3diVrnMLSbkuE36jxA+8zGLUOrT4bb7E/JZvDRhvtbWXWaveUc/7LbhaNFhHNvfPuSw2QOQg==
|
integrity sha512-Kttmi3JnohdaREbk6o9e25kieJR379TsEWF0l39PQVHXq3FR6sFKtVPgY8wk055o6IB+rllrzLnbqOw/UV60EA==
|
||||||
|
|
||||||
esbuild-windows-64@0.14.22:
|
esbuild-windows-64@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.22.tgz#d06cf8bbe4945b8bf95a730d871e54a22f635941"
|
resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.23.tgz#2b5a99befeaca6aefdad32d738b945730a60a060"
|
||||||
integrity sha512-AxjIDcOmx17vr31C5hp20HIwz1MymtMjKqX4qL6whPj0dT9lwxPexmLj6G1CpR3vFhui6m75EnBEe4QL82SYqw==
|
integrity sha512-JtIT0t8ymkpl6YlmOl6zoSWL5cnCgyLaBdf/SiU/Eg3C13r0NbHZWNT/RDEMKK91Y6t79kTs3vyRcNZbfu5a8g==
|
||||||
|
|
||||||
esbuild-windows-arm64@0.14.22:
|
esbuild-windows-arm64@0.14.23:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.22.tgz#f8b1b05c548073be8413a5ecb12d7c2f6e717227"
|
resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.23.tgz#edc560bbadb097eb45fc235aeacb942cb94a38c0"
|
||||||
integrity sha512-5wvQ+39tHmRhNpu2Fx04l7QfeK3mQ9tKzDqqGR8n/4WUxsFxnVLfDRBGirIfk4AfWlxk60kqirlODPoT5LqMUg==
|
integrity sha512-cTFaQqT2+ik9e4hePvYtRZQ3pqOvKDVNarzql0VFIzhc0tru/ZgdLoXd6epLiKT+SzoSce6V9YJ+nn6RCn6SHw==
|
||||||
|
|
||||||
esbuild@^0.14.14:
|
esbuild@^0.14.14:
|
||||||
version "0.14.22"
|
version "0.14.23"
|
||||||
resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.22.tgz#2b55fde89d7aa5aaaad791816d58ff9dfc5ed085"
|
resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.23.tgz#95e842cb22bc0c7d82c140adc16788aac91469fe"
|
||||||
integrity sha512-CjFCFGgYtbFOPrwZNJf7wsuzesx8kqwAffOlbYcFDLFuUtP8xloK1GH+Ai13Qr0RZQf9tE7LMTHJ2iVGJ1SKZA==
|
integrity sha512-XjnIcZ9KB6lfonCa+jRguXyRYcldmkyZ99ieDksqW/C8bnyEX299yA4QH2XcgijCgaddEZePPTgvx/2imsq7Ig==
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
esbuild-android-arm64 "0.14.22"
|
esbuild-android-arm64 "0.14.23"
|
||||||
esbuild-darwin-64 "0.14.22"
|
esbuild-darwin-64 "0.14.23"
|
||||||
esbuild-darwin-arm64 "0.14.22"
|
esbuild-darwin-arm64 "0.14.23"
|
||||||
esbuild-freebsd-64 "0.14.22"
|
esbuild-freebsd-64 "0.14.23"
|
||||||
esbuild-freebsd-arm64 "0.14.22"
|
esbuild-freebsd-arm64 "0.14.23"
|
||||||
esbuild-linux-32 "0.14.22"
|
esbuild-linux-32 "0.14.23"
|
||||||
esbuild-linux-64 "0.14.22"
|
esbuild-linux-64 "0.14.23"
|
||||||
esbuild-linux-arm "0.14.22"
|
esbuild-linux-arm "0.14.23"
|
||||||
esbuild-linux-arm64 "0.14.22"
|
esbuild-linux-arm64 "0.14.23"
|
||||||
esbuild-linux-mips64le "0.14.22"
|
esbuild-linux-mips64le "0.14.23"
|
||||||
esbuild-linux-ppc64le "0.14.22"
|
esbuild-linux-ppc64le "0.14.23"
|
||||||
esbuild-linux-riscv64 "0.14.22"
|
esbuild-linux-riscv64 "0.14.23"
|
||||||
esbuild-linux-s390x "0.14.22"
|
esbuild-linux-s390x "0.14.23"
|
||||||
esbuild-netbsd-64 "0.14.22"
|
esbuild-netbsd-64 "0.14.23"
|
||||||
esbuild-openbsd-64 "0.14.22"
|
esbuild-openbsd-64 "0.14.23"
|
||||||
esbuild-sunos-64 "0.14.22"
|
esbuild-sunos-64 "0.14.23"
|
||||||
esbuild-windows-32 "0.14.22"
|
esbuild-windows-32 "0.14.23"
|
||||||
esbuild-windows-64 "0.14.22"
|
esbuild-windows-64 "0.14.23"
|
||||||
esbuild-windows-arm64 "0.14.22"
|
esbuild-windows-arm64 "0.14.23"
|
||||||
|
|
||||||
escalade@^3.1.1:
|
escalade@^3.1.1:
|
||||||
version "3.1.1"
|
version "3.1.1"
|
||||||
@@ -1201,9 +1208,9 @@ formdata-polyfill@^4.0.10:
|
|||||||
fetch-blob "^3.1.2"
|
fetch-blob "^3.1.2"
|
||||||
|
|
||||||
fs-extra@^10.0.0:
|
fs-extra@^10.0.0:
|
||||||
version "10.0.0"
|
version "10.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
|
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8"
|
||||||
integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
|
integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==
|
||||||
dependencies:
|
dependencies:
|
||||||
graceful-fs "^4.2.0"
|
graceful-fs "^4.2.0"
|
||||||
jsonfile "^6.0.1"
|
jsonfile "^6.0.1"
|
||||||
@@ -1271,9 +1278,9 @@ has@^1.0.3:
|
|||||||
function-bind "^1.1.1"
|
function-bind "^1.1.1"
|
||||||
|
|
||||||
history@^5.2.0:
|
history@^5.2.0:
|
||||||
version "5.2.0"
|
version "5.3.0"
|
||||||
resolved "https://registry.yarnpkg.com/history/-/history-5.2.0.tgz#7cdd31cf9bac3c5d31f09c231c9928fad0007b7c"
|
resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"
|
||||||
integrity sha512-uPSF6lAJb3nSePJ43hN3eKj1dTWpN9gMod0ZssbFTIsen+WehTmEadgL+kg78xLJFdRfrrC//SavDzmRVdE+Ig==
|
integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/runtime" "^7.7.6"
|
"@babel/runtime" "^7.7.6"
|
||||||
|
|
||||||
@@ -1284,6 +1291,18 @@ hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
|
|||||||
dependencies:
|
dependencies:
|
||||||
react-is "^16.7.0"
|
react-is "^16.7.0"
|
||||||
|
|
||||||
|
html-escaper@^2.0.2:
|
||||||
|
version "2.0.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
|
||||||
|
integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
|
||||||
|
|
||||||
|
html-parse-stringify@^3.0.1:
|
||||||
|
version "3.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz#dfc1017347ce9f77c8141a507f233040c59c55d2"
|
||||||
|
integrity sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==
|
||||||
|
dependencies:
|
||||||
|
void-elements "3.1.0"
|
||||||
|
|
||||||
human-signals@^1.1.1:
|
human-signals@^1.1.1:
|
||||||
version "1.1.1"
|
version "1.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
|
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
|
||||||
@@ -1294,6 +1313,13 @@ husky@^7.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535"
|
resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535"
|
||||||
integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==
|
integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==
|
||||||
|
|
||||||
|
i18next@^21.6.14:
|
||||||
|
version "21.6.14"
|
||||||
|
resolved "https://registry.yarnpkg.com/i18next/-/i18next-21.6.14.tgz#2bc199fba7f4da44b5952d7df0a3814a6e5c3943"
|
||||||
|
integrity sha512-XL6WyD+xlwQwbieXRlXhKWoLb/rkch50/rA+vl6untHnJ+aYnkQ0YDZciTWE78PPhOpbi2gR0LTJCJpiAhA+uQ==
|
||||||
|
dependencies:
|
||||||
|
"@babel/runtime" "^7.17.2"
|
||||||
|
|
||||||
ignore@^5.1.4:
|
ignore@^5.1.4:
|
||||||
version "5.2.0"
|
version "5.2.0"
|
||||||
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
|
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
|
||||||
@@ -1471,7 +1497,7 @@ multimatch@^4.0.0:
|
|||||||
arrify "^2.0.1"
|
arrify "^2.0.1"
|
||||||
minimatch "^3.0.4"
|
minimatch "^3.0.4"
|
||||||
|
|
||||||
nanoid@^3.2.0:
|
nanoid@^3.3.1:
|
||||||
version "3.3.1"
|
version "3.3.1"
|
||||||
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35"
|
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35"
|
||||||
integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==
|
integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==
|
||||||
@@ -1489,9 +1515,9 @@ node-fetch@^2.6.7:
|
|||||||
whatwg-url "^5.0.0"
|
whatwg-url "^5.0.0"
|
||||||
|
|
||||||
node-fetch@^3.2.0:
|
node-fetch@^3.2.0:
|
||||||
version "3.2.0"
|
version "3.2.1"
|
||||||
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.2.0.tgz#59390db4e489184fa35d4b74caf5510e8dfbaf3b"
|
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.2.1.tgz#002177382810cfb77858857f69a3621a86c45f26"
|
||||||
integrity sha512-8xeimMwMItMw8hRrOl3C9/xzU49HV/yE6ORew/l+dxWimO5A4Ra8ld2rerlJvc/O7et5Z1zrWsPX43v1QBjCxw==
|
integrity sha512-Ef3SPFtRWFCDyhvcwCSvacLpkwmYZcD57mmZzAsMiks9TpHpIghe32U9H06tMICnr+X7YCpzH7WvUlUoml2urA==
|
||||||
dependencies:
|
dependencies:
|
||||||
data-uri-to-buffer "^4.0.0"
|
data-uri-to-buffer "^4.0.0"
|
||||||
fetch-blob "^3.1.4"
|
fetch-blob "^3.1.4"
|
||||||
@@ -1600,11 +1626,11 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2:
|
|||||||
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
|
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
|
||||||
|
|
||||||
postcss@^8.4.6:
|
postcss@^8.4.6:
|
||||||
version "8.4.6"
|
version "8.4.7"
|
||||||
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.6.tgz#c5ff3c3c457a23864f32cb45ac9b741498a09ae1"
|
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.7.tgz#f99862069ec4541de386bf57f5660a6c7a0875a8"
|
||||||
integrity sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==
|
integrity sha512-L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A==
|
||||||
dependencies:
|
dependencies:
|
||||||
nanoid "^3.2.0"
|
nanoid "^3.3.1"
|
||||||
picocolors "^1.0.0"
|
picocolors "^1.0.0"
|
||||||
source-map-js "^1.0.2"
|
source-map-js "^1.0.2"
|
||||||
|
|
||||||
@@ -1646,6 +1672,15 @@ react-dom@^17.0.2:
|
|||||||
object-assign "^4.1.1"
|
object-assign "^4.1.1"
|
||||||
scheduler "^0.20.2"
|
scheduler "^0.20.2"
|
||||||
|
|
||||||
|
react-i18next@^11.15.6:
|
||||||
|
version "11.15.6"
|
||||||
|
resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.15.6.tgz#693430fbee5ac7d0774bd88683575d62adb24afb"
|
||||||
|
integrity sha512-OUWcFdNgIA9swVx3JGIreuquglAinpRwB/HYrCprTN+s9BQDt9LSiY7x5DGc2JzVpwqtpoTV7oRUTOxEPNyUPw==
|
||||||
|
dependencies:
|
||||||
|
"@babel/runtime" "^7.14.5"
|
||||||
|
html-escaper "^2.0.2"
|
||||||
|
html-parse-stringify "^3.0.1"
|
||||||
|
|
||||||
react-is@^16.13.1, react-is@^16.7.0:
|
react-is@^16.13.1, react-is@^16.7.0:
|
||||||
version "16.13.1"
|
version "16.13.1"
|
||||||
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
|
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
|
||||||
@@ -1661,18 +1696,18 @@ react-refresh@^0.11.0:
|
|||||||
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046"
|
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046"
|
||||||
integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==
|
integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==
|
||||||
|
|
||||||
react-router-dom@^6.2.1:
|
react-router-dom@^6.2.2:
|
||||||
version "6.2.1"
|
version "6.2.2"
|
||||||
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.2.1.tgz#32ec81829152fbb8a7b045bf593a22eadf019bec"
|
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.2.2.tgz#f1a2c88365593c76b9612ae80154a13fcb72e442"
|
||||||
integrity sha512-I6Zax+/TH/cZMDpj3/4Fl2eaNdcvoxxHoH1tYOREsQ22OKDYofGebrNm6CTPUcvLvZm63NL/vzCYdjf9CUhqmA==
|
integrity sha512-AtYEsAST7bDD4dLSQHDnk/qxWLJdad5t1HFa1qJyUrCeGgEuCSw0VB/27ARbF9Fi/W5598ujvJOm3ujUCVzuYQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
history "^5.2.0"
|
history "^5.2.0"
|
||||||
react-router "6.2.1"
|
react-router "6.2.2"
|
||||||
|
|
||||||
react-router@6.2.1:
|
react-router@6.2.2:
|
||||||
version "6.2.1"
|
version "6.2.2"
|
||||||
resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.2.1.tgz#be2a97a6006ce1d9123c28934e604faef51448a3"
|
resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.2.2.tgz#495e683a0c04461eeb3d705fe445d6cf42f0c249"
|
||||||
integrity sha512-2fG0udBtxou9lXtK97eJeET2ki5//UWfQSl1rlJ7quwe6jrktK9FCCc8dQb5QY6jAv3jua8bBQRhhDOM/kVRsg==
|
integrity sha512-/MbxyLzd7Q7amp4gDOGaYvXwhEojkJD5BtExkuKmj39VEE0m3l/zipf6h2WIB2jyAO0lI6NGETh4RDcktRm4AQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
history "^5.2.0"
|
history "^5.2.0"
|
||||||
|
|
||||||
@@ -1687,9 +1722,9 @@ react-transition-group@^4.4.2:
|
|||||||
prop-types "^15.6.2"
|
prop-types "^15.6.2"
|
||||||
|
|
||||||
react-virtuoso@^2.7.0:
|
react-virtuoso@^2.7.0:
|
||||||
version "2.7.1"
|
version "2.7.2"
|
||||||
resolved "https://registry.yarnpkg.com/react-virtuoso/-/react-virtuoso-2.7.1.tgz#62408c9eeb9e7747be1c070fd635846891b7622a"
|
resolved "https://registry.yarnpkg.com/react-virtuoso/-/react-virtuoso-2.7.2.tgz#b2935ce182d47846c26277da4d5b576b2faeb481"
|
||||||
integrity sha512-isl04/UARFv75IQelKRLCLDIsS5a5V4tiU3kYXpTxXwGXZLwK7tFDimR3OYzkBamJ2dK3rT+DvfBb8C2Jteggg==
|
integrity sha512-EJm0e1hTpMK8xXzgtfbvr2dr2l2gek8p8dCJleJ6EJoQjr9sf+XCYkODThN1vTxhksvAT8uQxmxR5ASPDoS/uA==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@virtuoso.dev/react-urx" "^0.2.12"
|
"@virtuoso.dev/react-urx" "^0.2.12"
|
||||||
"@virtuoso.dev/urx" "^0.2.12"
|
"@virtuoso.dev/urx" "^0.2.12"
|
||||||
@@ -1741,9 +1776,9 @@ resolve@^1.12.0, resolve@^1.22.0:
|
|||||||
supports-preserve-symlinks-flag "^1.0.0"
|
supports-preserve-symlinks-flag "^1.0.0"
|
||||||
|
|
||||||
rollup@^2.59.0:
|
rollup@^2.59.0:
|
||||||
version "2.67.3"
|
version "2.69.0"
|
||||||
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.67.3.tgz#3f04391fc296f807d067c9081d173e0a33dbd37e"
|
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.69.0.tgz#82aa86682a45e9760146b736c1643bf435506156"
|
||||||
integrity sha512-G/x1vUwbGtP6O5ZM8/sWr8+p7YfZhI18pPqMRtMYMWSbHjKZ/ajHGiM+GWNTlWyOR0EHIdT8LHU+Z4ciIZ1oBw==
|
integrity sha512-kjER91tHyek8gAkuz7+558vSnTQ+pITEok1P0aNOS45ZXyngaqPsXJmSel4QPQnJo7EJMjXUU1/GErWkWiKORg==
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
fsevents "~2.3.2"
|
fsevents "~2.3.2"
|
||||||
|
|
||||||
@@ -1753,9 +1788,9 @@ safe-buffer@~5.1.1:
|
|||||||
integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
|
integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
|
||||||
|
|
||||||
sass@^1.49.7:
|
sass@^1.49.7:
|
||||||
version "1.49.8"
|
version "1.49.9"
|
||||||
resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.8.tgz#9bbbc5d43d14862db07f1c04b786c9da9b641828"
|
resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.9.tgz#b15a189ecb0ca9e24634bae5d1ebc191809712f9"
|
||||||
integrity sha512-NoGOjvDDOU9og9oAxhRnap71QaTjjlzrvLnKecUJ3GxhaQBrV6e7gPuSPF28u1OcVAArVojPAe4ZhOXwwC4tGw==
|
integrity sha512-YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A==
|
||||||
dependencies:
|
dependencies:
|
||||||
chokidar ">=3.0.0 <4.0.0"
|
chokidar ">=3.0.0 <4.0.0"
|
||||||
immutable "^4.0.0"
|
immutable "^4.0.0"
|
||||||
@@ -1796,6 +1831,11 @@ signal-exit@^3.0.2:
|
|||||||
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
|
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
|
||||||
integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
|
integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
|
||||||
|
|
||||||
|
snarkdown@^2.0.0:
|
||||||
|
version "2.0.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/snarkdown/-/snarkdown-2.0.0.tgz#b1feb4db91b9f94a8ebbd7a50f3e99aee18b1e03"
|
||||||
|
integrity sha512-MgL/7k/AZdXCTJiNgrO7chgDqaB9FGM/1Tvlcenenb7div6obaDATzs16JhFyHHBGodHT3B7RzRc5qk8pFhg3A==
|
||||||
|
|
||||||
"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
|
"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
|
||||||
version "1.0.2"
|
version "1.0.2"
|
||||||
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
|
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
|
||||||
@@ -1836,9 +1876,9 @@ supports-preserve-symlinks-flag@^1.0.0:
|
|||||||
integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
|
integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
|
||||||
|
|
||||||
swr@^1.2.1:
|
swr@^1.2.1:
|
||||||
version "1.2.1"
|
version "1.2.2"
|
||||||
resolved "https://registry.yarnpkg.com/swr/-/swr-1.2.1.tgz#c21a4fe2139cb1c4630450589b5b5add947a9d41"
|
resolved "https://registry.yarnpkg.com/swr/-/swr-1.2.2.tgz#6cae09928d30593a7980d80f85823e57468fac5d"
|
||||||
integrity sha512-1cuWXqJqXcFwbgONGCY4PHZ8v05009JdHsC3CIC6u7d00kgbMswNr1sHnnhseOBxtzVqcCNpOHEgVDciRer45w==
|
integrity sha512-ky0BskS/V47GpW8d6RU7CPsr6J8cr7mQD6+do5eky3bM0IyJaoi3vO8UhvrzJaObuTlGhPl2szodeB2dUd76Xw==
|
||||||
|
|
||||||
to-fast-properties@^2.0.0:
|
to-fast-properties@^2.0.0:
|
||||||
version "2.0.0"
|
version "2.0.0"
|
||||||
@@ -1862,15 +1902,15 @@ tunnel@0.0.6:
|
|||||||
resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
|
resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
|
||||||
integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
|
integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
|
||||||
|
|
||||||
type-fest@2.11.2:
|
type-fest@2.12.0:
|
||||||
version "2.11.2"
|
version "2.12.0"
|
||||||
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.11.2.tgz#5534a919858bc517492cd3a53a673835a76d2e71"
|
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.12.0.tgz#ce342f58cab9114912f54b493d60ab39c3fc82b6"
|
||||||
integrity sha512-reW2Y2Mpn0QNA/5fvtm5doROLwDPu2zOm5RtY7xQQS05Q7xgC8MOZ3yPNaP9m/s/sNjjFQtHo7VCNqYW2iI+Ig==
|
integrity sha512-Qe5GRT+n/4GoqCNGGVp5Snapg1Omq3V7irBJB3EaKsp7HWDo5Gv2d/67gfNyV+d5EXD+x/RF5l1h4yJ7qNkcGA==
|
||||||
|
|
||||||
typescript@^4.5.5:
|
typescript@^4.5.5:
|
||||||
version "4.5.5"
|
version "4.6.2"
|
||||||
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
|
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"
|
||||||
integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
|
integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==
|
||||||
|
|
||||||
universal-user-agent@^6.0.0:
|
universal-user-agent@^6.0.0:
|
||||||
version "6.0.0"
|
version "6.0.0"
|
||||||
@@ -1882,10 +1922,10 @@ universalify@^2.0.0:
|
|||||||
resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
|
resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
|
||||||
integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
|
integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
|
||||||
|
|
||||||
vite@^2.8.0:
|
vite@^2.8.6:
|
||||||
version "2.8.4"
|
version "2.8.6"
|
||||||
resolved "https://registry.yarnpkg.com/vite/-/vite-2.8.4.tgz#4e52a534289b7b4e94e646df2fc5556ceaa7336b"
|
resolved "https://registry.yarnpkg.com/vite/-/vite-2.8.6.tgz#32d50e23c99ca31b26b8ccdc78b1d72d4d7323d3"
|
||||||
integrity sha512-GwtOkkaT2LDI82uWZKcrpRQxP5tymLnC7hVHHqNkhFNknYr0hJUlDLfhVRgngJvAy3RwypkDCWtTKn1BjO96Dw==
|
integrity sha512-e4H0QpludOVKkmOsRyqQ7LTcMUDF3mcgyNU4lmi0B5JUbe0ZxeBBl8VoZ8Y6Rfn9eFKYtdXNPcYK97ZwH+K2ug==
|
||||||
dependencies:
|
dependencies:
|
||||||
esbuild "^0.14.14"
|
esbuild "^0.14.14"
|
||||||
postcss "^8.4.6"
|
postcss "^8.4.6"
|
||||||
@@ -1894,6 +1934,11 @@ vite@^2.8.0:
|
|||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
fsevents "~2.3.2"
|
fsevents "~2.3.2"
|
||||||
|
|
||||||
|
void-elements@3.1.0:
|
||||||
|
version "3.1.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
|
||||||
|
integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=
|
||||||
|
|
||||||
web-streams-polyfill@^3.0.3:
|
web-streams-polyfill@^3.0.3:
|
||||||
version "3.2.0"
|
version "3.2.0"
|
||||||
resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.0.tgz#a6b74026b38e4885869fb5c589e90b95ccfc7965"
|
resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.0.tgz#a6b74026b38e4885869fb5c589e90b95ccfc7965"
|
||||||
|
|||||||
Reference in New Issue
Block a user