Update On Thu Jun 20 20:32:19 CEST 2024

This commit is contained in:
github-action[bot]
2024-06-20 20:32:20 +02:00
parent 58ae8b1db9
commit 454ce63920
41 changed files with 482 additions and 214 deletions

1
.github/update.log vendored
View File

@@ -678,3 +678,4 @@ Update On Sun Jun 16 20:31:07 CEST 2024
Update On Mon Jun 17 20:31:27 CEST 2024
Update On Tue Jun 18 20:32:23 CEST 2024
Update On Wed Jun 19 20:31:46 CEST 2024
Update On Thu Jun 20 20:32:09 CEST 2024

View File

@@ -30,7 +30,7 @@
"framer-motion": "12.0.0-alpha.0",
"i18next": "23.11.5",
"jotai": "2.8.3",
"monaco-editor": "0.49.0",
"monaco-editor": "0.50.0",
"mui-color-input": "2.0.3",
"react": "18.3.1",
"react-dom": "18.3.1",

View File

@@ -2,7 +2,7 @@
"manifest_version": 1,
"latest": {
"mihomo": "v1.18.5",
"mihomo_alpha": "alpha-1457f83",
"mihomo_alpha": "alpha-917c5fd",
"clash_rs": "v0.1.18",
"clash_premium": "2023-09-05-gdcc8d87"
},
@@ -36,5 +36,5 @@
"darwin-x64": "clash-darwin-amd64-n{}.gz"
}
},
"updated_at": "2024-06-18T22:20:18.344Z"
"updated_at": "2024-06-19T22:20:00.814Z"
}

View File

@@ -74,7 +74,7 @@
"@tauri-apps/cli": "1.5.14",
"@types/fs-extra": "11.0.4",
"@types/lodash-es": "4.17.12",
"@types/node": "20.14.5",
"@types/node": "20.14.6",
"autoprefixer": "10.4.19",
"conventional-changelog-conventionalcommits": "8.0.0",
"cross-env": "7.0.3",
@@ -104,7 +104,7 @@
"stylelint-config-standard": "36.0.0",
"stylelint-declaration-block-no-ignored-properties": "2.8.0",
"stylelint-order": "6.0.4",
"stylelint-scss": "6.3.1",
"stylelint-scss": "6.3.2",
"tailwindcss": "3.4.4",
"tsx": "4.15.6",
"typescript": "5.4.5"

View File

@@ -24,7 +24,7 @@ importers:
devDependencies:
'@commitlint/cli':
specifier: 19.3.0
version: 19.3.0(@types/node@20.14.5)(typescript@5.4.5)
version: 19.3.0(@types/node@20.14.6)(typescript@5.4.5)
'@commitlint/config-conventional':
specifier: 19.2.2
version: 19.2.2
@@ -38,8 +38,8 @@ importers:
specifier: 4.17.12
version: 4.17.12
'@types/node':
specifier: 20.14.5
version: 20.14.5
specifier: 20.14.6
version: 20.14.6
autoprefixer:
specifier: 10.4.19
version: 10.4.19(postcss@8.4.38)
@@ -128,8 +128,8 @@ importers:
specifier: 6.0.4
version: 6.0.4(stylelint@16.6.1(typescript@5.4.5))
stylelint-scss:
specifier: 6.3.1
version: 6.3.1(stylelint@16.6.1(typescript@5.4.5))
specifier: 6.3.2
version: 6.3.2(stylelint@16.6.1(typescript@5.4.5))
tailwindcss:
specifier: 3.4.4
version: 3.4.4
@@ -178,7 +178,7 @@ importers:
version: 11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-fb9a90fa48-20240614)(types-react@19.0.0-rc.1))(react@19.0.0-rc-fb9a90fa48-20240614)(types-react@19.0.0-rc.1)
'@generouted/react-router':
specifier: 1.19.5
version: 1.19.5(react-router-dom@6.23.1(react-dom@19.0.0-rc-fb9a90fa48-20240614(react@19.0.0-rc-fb9a90fa48-20240614))(react@19.0.0-rc-fb9a90fa48-20240614))(react@19.0.0-rc-fb9a90fa48-20240614)(vite@5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))
version: 1.19.5(react-router-dom@6.23.1(react-dom@19.0.0-rc-fb9a90fa48-20240614(react@19.0.0-rc-fb9a90fa48-20240614))(react@19.0.0-rc-fb9a90fa48-20240614))(react@19.0.0-rc-fb9a90fa48-20240614)(vite@5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))
'@juggle/resize-observer':
specifier: 3.4.0
version: 3.4.0
@@ -228,8 +228,8 @@ importers:
specifier: 2.8.3
version: 2.8.3(react@19.0.0-rc-fb9a90fa48-20240614)(types-react@19.0.0-rc.1)
monaco-editor:
specifier: 0.49.0
version: 0.49.0
specifier: 0.50.0
version: 0.50.0
mui-color-input:
specifier: 2.0.3
version: 2.0.3(@emotion/react@11.11.4(react@19.0.0-rc-fb9a90fa48-20240614)(types-react@19.0.0-rc.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-fb9a90fa48-20240614)(types-react@19.0.0-rc.1))(react@19.0.0-rc-fb9a90fa48-20240614)(types-react@19.0.0-rc.1))(@mui/material@5.15.20(@emotion/react@11.11.4(react@19.0.0-rc-fb9a90fa48-20240614)(types-react@19.0.0-rc.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-fb9a90fa48-20240614)(types-react@19.0.0-rc.1))(react@19.0.0-rc-fb9a90fa48-20240614)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-fb9a90fa48-20240614(react@19.0.0-rc-fb9a90fa48-20240614))(react@19.0.0-rc-fb9a90fa48-20240614)(types-react@19.0.0-rc.1))(react-dom@19.0.0-rc-fb9a90fa48-20240614(react@19.0.0-rc-fb9a90fa48-20240614))(react@19.0.0-rc-fb9a90fa48-20240614)(types-react@19.0.0-rc.1)
@@ -299,10 +299,10 @@ importers:
version: 7.13.1(eslint@8.57.0)(typescript@5.4.5)
'@vitejs/plugin-react':
specifier: 4.3.1
version: 4.3.1(vite@5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))
version: 4.3.1(vite@5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))
'@vitejs/plugin-react-swc':
specifier: 3.7.0
version: 3.7.0(vite@5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))
version: 3.7.0(vite@5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))
sass:
specifier: 1.77.6
version: 1.77.6
@@ -314,19 +314,19 @@ importers:
version: 2.1.3
vite:
specifier: 5.3.1
version: 5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)
version: 5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)
vite-plugin-monaco-editor:
specifier: npm:vite-plugin-monaco-editor-new@1.1.3
version: vite-plugin-monaco-editor-new@1.1.3(monaco-editor@0.49.0)
version: vite-plugin-monaco-editor-new@1.1.3(monaco-editor@0.50.0)
vite-plugin-sass-dts:
specifier: 1.3.22
version: 1.3.22(postcss@8.4.38)(prettier@3.3.2)(sass@1.77.6)(vite@5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))
version: 1.3.22(postcss@8.4.38)(prettier@3.3.2)(sass@1.77.6)(vite@5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))
vite-plugin-svgr:
specifier: 4.2.0
version: 4.2.0(rollup@4.17.2)(typescript@5.4.5)(vite@5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))
version: 4.2.0(rollup@4.17.2)(typescript@5.4.5)(vite@5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))
vite-tsconfig-paths:
specifier: 4.3.2
version: 4.3.2(typescript@5.4.5)(vite@5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))
version: 4.3.2(typescript@5.4.5)(vite@5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))
frontend/ui:
dependencies:
@@ -1929,8 +1929,8 @@ packages:
'@types/node@20.12.10':
resolution: {integrity: sha512-Eem5pH9pmWBHoGAT8Dr5fdc5rYA+4NAovdM4EktRPVAAiJhmWWfQrA0cFhAbOsQdSfIHjAud6YdkbL69+zSKjw==}
'@types/node@20.14.5':
resolution: {integrity: sha512-aoRR+fJkZT2l0aGOJhuA8frnCSoNX6W7U2mpNq63+BxBIj5BQFt8rHy627kijCmm63ijdSdwvGgpUsU6MBsZZA==}
'@types/node@20.14.6':
resolution: {integrity: sha512-JbA0XIJPL1IiNnU7PFxDXyfAwcwVVrOoqyzzyQTyMeVhBzkJVMSkC1LlVsRQ2lpqiY4n6Bb9oCS6lzDKVQxbZw==}
'@types/parse-json@4.0.2':
resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}
@@ -4151,8 +4151,8 @@ packages:
resolution: {integrity: sha512-oGZRv2OT1lO2UF1zUcwdTb3wqUwI0kBGTgt/T7OdSj6M6N5m3o5uPf0AIW6lVxGGoiWUR7e2AwTE+xiwK8WQig==}
engines: {node: '>=16 || 14 >=14.17'}
monaco-editor@0.49.0:
resolution: {integrity: sha512-2I8/T3X/hLxB2oPHgqcNYUVdA/ZEFShT7IAujifIPMfKkNbLOqY8XCoyHCXrsdjb36dW9MwoTwBCFpXKMwNwaQ==}
monaco-editor@0.50.0:
resolution: {integrity: sha512-8CclLCmrRRh+sul7C08BmPBP3P8wVWfBHomsTcndxg5NRCEPfu/mc2AGU8k37ajjDVXcXFc12ORAMUkmk+lkFA==}
ms@2.0.0:
resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
@@ -5141,8 +5141,8 @@ packages:
peerDependencies:
stylelint: ^14.0.0 || ^15.0.0 || ^16.0.1
stylelint-scss@6.3.1:
resolution: {integrity: sha512-w/czBoWUZxJNk5fBRPODcXSN4qcPv3WHjTSSpFovVY+TE3MZTMR0yRlbmaDYrm8tTWHvpwQAuEBZ0lk2wwkboQ==}
stylelint-scss@6.3.2:
resolution: {integrity: sha512-pNk9mXOVKkQtd+SROPC9io8ISSgX+tOVPhFdBE+LaKQnJMLdWPbGKAGYv4Wmf/RrnOjkutunNTN9kKMhkdE5qA==}
engines: {node: '>=18.12.0'}
peerDependencies:
stylelint: ^16.0.2
@@ -5840,11 +5840,11 @@ snapshots:
'@babel/helper-validator-identifier': 7.24.5
to-fast-properties: 2.0.0
'@commitlint/cli@19.3.0(@types/node@20.14.5)(typescript@5.4.5)':
'@commitlint/cli@19.3.0(@types/node@20.14.6)(typescript@5.4.5)':
dependencies:
'@commitlint/format': 19.3.0
'@commitlint/lint': 19.2.2
'@commitlint/load': 19.2.0(@types/node@20.14.5)(typescript@5.4.5)
'@commitlint/load': 19.2.0(@types/node@20.14.6)(typescript@5.4.5)
'@commitlint/read': 19.2.1
'@commitlint/types': 19.0.3
execa: 8.0.1
@@ -5891,7 +5891,7 @@ snapshots:
'@commitlint/rules': 19.0.3
'@commitlint/types': 19.0.3
'@commitlint/load@19.2.0(@types/node@20.14.5)(typescript@5.4.5)':
'@commitlint/load@19.2.0(@types/node@20.14.6)(typescript@5.4.5)':
dependencies:
'@commitlint/config-validator': 19.0.3
'@commitlint/execute-rule': 19.0.0
@@ -5899,7 +5899,7 @@ snapshots:
'@commitlint/types': 19.0.3
chalk: 5.3.0
cosmiconfig: 9.0.0(typescript@5.4.5)
cosmiconfig-typescript-loader: 5.0.0(@types/node@20.14.5)(cosmiconfig@9.0.0(typescript@5.4.5))(typescript@5.4.5)
cosmiconfig-typescript-loader: 5.0.0(@types/node@20.14.6)(cosmiconfig@9.0.0(typescript@5.4.5))(typescript@5.4.5)
lodash.isplainobject: 4.0.6
lodash.merge: 4.6.2
lodash.uniq: 4.5.0
@@ -6273,13 +6273,13 @@ snapshots:
postcss: 7.0.32
purgecss: 2.3.0
'@generouted/react-router@1.19.5(react-router-dom@6.23.1(react-dom@19.0.0-rc-fb9a90fa48-20240614(react@19.0.0-rc-fb9a90fa48-20240614))(react@19.0.0-rc-fb9a90fa48-20240614))(react@19.0.0-rc-fb9a90fa48-20240614)(vite@5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))':
'@generouted/react-router@1.19.5(react-router-dom@6.23.1(react-dom@19.0.0-rc-fb9a90fa48-20240614(react@19.0.0-rc-fb9a90fa48-20240614))(react@19.0.0-rc-fb9a90fa48-20240614))(react@19.0.0-rc-fb9a90fa48-20240614)(vite@5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))':
dependencies:
fast-glob: 3.3.2
generouted: 1.19.5(vite@5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))
generouted: 1.19.5(vite@5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))
react: 19.0.0-rc-fb9a90fa48-20240614
react-router-dom: 6.23.1(react-dom@19.0.0-rc-fb9a90fa48-20240614(react@19.0.0-rc-fb9a90fa48-20240614))(react@19.0.0-rc-fb9a90fa48-20240614)
vite: 5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)
vite: 5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)
'@humanwhocodes/config-array@0.11.14':
dependencies:
@@ -6974,12 +6974,12 @@ snapshots:
dependencies:
'@types/http-cache-semantics': 4.0.4
'@types/keyv': 3.1.4
'@types/node': 20.14.5
'@types/node': 20.14.6
'@types/responselike': 1.0.3
'@types/conventional-commits-parser@5.0.0':
dependencies:
'@types/node': 20.14.5
'@types/node': 20.14.6
'@types/d3-array@3.2.1': {}
@@ -7113,7 +7113,7 @@ snapshots:
'@types/fs-extra@11.0.4':
dependencies:
'@types/jsonfile': 6.1.4
'@types/node': 20.14.5
'@types/node': 20.14.6
'@types/geojson@7946.0.14': {}
@@ -7129,11 +7129,11 @@ snapshots:
'@types/jsonfile@6.1.4':
dependencies:
'@types/node': 20.14.5
'@types/node': 20.14.6
'@types/keyv@3.1.4':
dependencies:
'@types/node': 20.14.5
'@types/node': 20.14.6
'@types/lodash-es@4.17.12':
dependencies:
@@ -7153,7 +7153,7 @@ snapshots:
dependencies:
undici-types: 5.26.5
'@types/node@20.14.5':
'@types/node@20.14.6':
dependencies:
undici-types: 5.26.5
@@ -7175,7 +7175,7 @@ snapshots:
'@types/responselike@1.0.3':
dependencies:
'@types/node': 20.14.5
'@types/node': 20.14.6
'@types/unist@2.0.10': {}
@@ -7183,7 +7183,7 @@ snapshots:
'@types/yauzl@2.10.3':
dependencies:
'@types/node': 20.14.5
'@types/node': 20.14.6
optional: true
'@typescript-eslint/eslint-plugin@7.13.1(@typescript-eslint/parser@7.13.1(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)':
@@ -7269,21 +7269,21 @@ snapshots:
'@ungap/structured-clone@1.2.0': {}
'@vitejs/plugin-react-swc@3.7.0(vite@5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))':
'@vitejs/plugin-react-swc@3.7.0(vite@5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))':
dependencies:
'@swc/core': 1.6.1
vite: 5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)
vite: 5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)
transitivePeerDependencies:
- '@swc/helpers'
'@vitejs/plugin-react@4.3.1(vite@5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))':
'@vitejs/plugin-react@4.3.1(vite@5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0))':
dependencies:
'@babel/core': 7.24.5
'@babel/plugin-transform-react-jsx-self': 7.24.5(@babel/core@7.24.5)
'@babel/plugin-transform-react-jsx-source': 7.24.1(@babel/core@7.24.5)
'@types/babel__core': 7.20.5
react-refresh: 0.14.2
vite: 5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)
vite: 5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)
transitivePeerDependencies:
- supports-color
@@ -7771,9 +7771,9 @@ snapshots:
dependencies:
is-what: 3.14.1
cosmiconfig-typescript-loader@5.0.0(@types/node@20.14.5)(cosmiconfig@9.0.0(typescript@5.4.5))(typescript@5.4.5):
cosmiconfig-typescript-loader@5.0.0(@types/node@20.14.6)(cosmiconfig@9.0.0(typescript@5.4.5))(typescript@5.4.5):
dependencies:
'@types/node': 20.14.5
'@types/node': 20.14.6
cosmiconfig: 9.0.0(typescript@5.4.5)
jiti: 1.21.0
typescript: 5.4.5
@@ -8748,9 +8748,9 @@ snapshots:
functions-have-names@1.2.3: {}
generouted@1.19.5(vite@5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)):
generouted@1.19.5(vite@5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)):
dependencies:
vite: 5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)
vite: 5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)
gensync@1.0.0-beta.2: {}
@@ -9737,7 +9737,7 @@ snapshots:
minipass@7.1.0: {}
monaco-editor@0.49.0: {}
monaco-editor@0.50.0: {}
ms@2.0.0: {}
@@ -10737,7 +10737,7 @@ snapshots:
postcss-sorting: 8.0.2(postcss@8.4.38)
stylelint: 16.6.1(typescript@5.4.5)
stylelint-scss@6.3.1(stylelint@16.6.1(typescript@5.4.5)):
stylelint-scss@6.3.2(stylelint@16.6.1(typescript@5.4.5)):
dependencies:
known-css-properties: 0.31.0
postcss-media-query-parser: 0.2.3
@@ -11215,48 +11215,48 @@ snapshots:
react: 19.0.0-rc-fb9a90fa48-20240614
react-dom: 19.0.0-rc-fb9a90fa48-20240614(react@19.0.0-rc-fb9a90fa48-20240614)
vite-plugin-monaco-editor-new@1.1.3(monaco-editor@0.49.0):
vite-plugin-monaco-editor-new@1.1.3(monaco-editor@0.50.0):
dependencies:
esbuild: 0.19.12
monaco-editor: 0.49.0
monaco-editor: 0.50.0
vite-plugin-sass-dts@1.3.22(postcss@8.4.38)(prettier@3.3.2)(sass@1.77.6)(vite@5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)):
vite-plugin-sass-dts@1.3.22(postcss@8.4.38)(prettier@3.3.2)(sass@1.77.6)(vite@5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)):
dependencies:
postcss: 8.4.38
postcss-js: 4.0.1(postcss@8.4.38)
prettier: 3.3.2
sass: 1.77.6
vite: 5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)
vite: 5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)
vite-plugin-svgr@4.2.0(rollup@4.17.2)(typescript@5.4.5)(vite@5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)):
vite-plugin-svgr@4.2.0(rollup@4.17.2)(typescript@5.4.5)(vite@5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)):
dependencies:
'@rollup/pluginutils': 5.1.0(rollup@4.17.2)
'@svgr/core': 8.1.0(typescript@5.4.5)
'@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0(typescript@5.4.5))
vite: 5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)
vite: 5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)
transitivePeerDependencies:
- rollup
- supports-color
- typescript
vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)):
vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)):
dependencies:
debug: 4.3.4
globrex: 0.1.2
tsconfck: 3.0.3(typescript@5.4.5)
optionalDependencies:
vite: 5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)
vite: 5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0)
transitivePeerDependencies:
- supports-color
- typescript
vite@5.3.1(@types/node@20.14.5)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0):
vite@5.3.1(@types/node@20.14.6)(less@4.2.0)(sass@1.77.6)(stylus@0.62.0):
dependencies:
esbuild: 0.21.4
postcss: 8.4.38
rollup: 4.17.2
optionalDependencies:
'@types/node': 20.14.5
'@types/node': 20.14.6
fsevents: 2.3.3
less: 4.2.0
sass: 1.77.6

View File

@@ -224,7 +224,7 @@ dependencies = [
"futures-io",
"futures-lite 2.3.0",
"parking",
"polling 3.7.1",
"polling 3.7.2",
"rustix 0.38.34",
"slab",
"tracing",
@@ -394,9 +394,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
[[package]]
name = "backtrace"
version = "0.3.72"
version = "0.3.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
dependencies = [
"addr2line",
"cc",
@@ -646,9 +646,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
name = "bytemuck"
version = "1.16.0"
version = "1.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
dependencies = [
"bytemuck_derive",
]
@@ -802,7 +802,7 @@ dependencies = [
"parking_lot",
"percent-encoding",
"port_scanner",
"reqwest 0.12.4",
"reqwest 0.12.5",
"runas",
"serde",
"serde_json",
@@ -1204,15 +1204,15 @@ dependencies = [
[[package]]
name = "derive_more"
version = "0.99.17"
version = "0.99.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
dependencies = [
"convert_case",
"proc-macro2",
"quote",
"rustc_version 0.4.0",
"syn 1.0.109",
"syn 2.0.66",
]
[[package]]
@@ -2176,6 +2176,12 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
[[package]]
name = "hermit-abi"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
[[package]]
name = "hex"
version = "0.4.3"
@@ -2269,9 +2275,9 @@ checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
[[package]]
name = "httparse"
version = "1.9.3"
version = "1.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545"
checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
[[package]]
name = "httpdate"
@@ -2331,9 +2337,9 @@ dependencies = [
[[package]]
name = "hyper-rustls"
version = "0.26.0"
version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
dependencies = [
"futures-util",
"http 1.1.0",
@@ -2344,6 +2350,7 @@ dependencies = [
"tokio",
"tokio-rustls",
"tower-service",
"webpki-roots",
]
[[package]]
@@ -2564,14 +2571,12 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
[[package]]
name = "idna"
version = "1.0.0"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed"
checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
dependencies = [
"icu_normalizer",
"icu_properties",
"smallvec",
"utf8_iter",
"unicode-bidi",
"unicode-normalization",
]
[[package]]
@@ -2695,7 +2700,7 @@ version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
"hermit-abi",
"hermit-abi 0.3.9",
"libc",
"windows-sys 0.48.0",
]
@@ -3080,9 +3085,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
[[package]]
name = "memchr"
version = "2.7.2"
version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memmem"
@@ -3147,9 +3152,9 @@ checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
[[package]]
name = "miniz_oxide"
version = "0.7.3"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
dependencies = [
"adler",
"simd-adler32",
@@ -3392,7 +3397,7 @@ version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
dependencies = [
"hermit-abi",
"hermit-abi 0.3.9",
"libc",
]
@@ -3587,9 +3592,9 @@ dependencies = [
[[package]]
name = "object"
version = "0.35.0"
version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
dependencies = [
"memchr",
]
@@ -3761,7 +3766,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
"redox_syscall 0.5.1",
"redox_syscall 0.5.2",
"smallvec",
"windows-targets 0.52.5",
]
@@ -4059,13 +4064,13 @@ dependencies = [
[[package]]
name = "polling"
version = "3.7.1"
version = "3.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1"
checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
dependencies = [
"cfg-if",
"concurrent-queue",
"hermit-abi",
"hermit-abi 0.4.0",
"pin-project-lite",
"rustix 0.38.34",
"tracing",
@@ -4181,6 +4186,53 @@ dependencies = [
"memchr",
]
[[package]]
name = "quinn"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad"
dependencies = [
"bytes",
"pin-project-lite",
"quinn-proto",
"quinn-udp",
"rustc-hash",
"rustls",
"thiserror",
"tokio",
"tracing",
]
[[package]]
name = "quinn-proto"
version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe"
dependencies = [
"bytes",
"rand 0.8.5",
"ring",
"rustc-hash",
"rustls",
"slab",
"thiserror",
"tinyvec",
"tracing",
]
[[package]]
name = "quinn-udp"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46"
dependencies = [
"libc",
"once_cell",
"socket2 0.5.7",
"tracing",
"windows-sys 0.52.0",
]
[[package]]
name = "quote"
version = "1.0.36"
@@ -4308,9 +4360,9 @@ dependencies = [
[[package]]
name = "redox_syscall"
version = "0.5.1"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
dependencies = [
"bitflags 2.5.0",
]
@@ -4430,7 +4482,7 @@ dependencies = [
"serde",
"serde_json",
"serde_urlencoded",
"sync_wrapper",
"sync_wrapper 0.1.2",
"system-configuration",
"tokio",
"tokio-native-tls",
@@ -4446,9 +4498,9 @@ dependencies = [
[[package]]
name = "reqwest"
version = "0.12.4"
version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
dependencies = [
"base64 0.22.1",
"bytes",
@@ -4471,13 +4523,14 @@ dependencies = [
"once_cell",
"percent-encoding",
"pin-project-lite",
"quinn",
"rustls",
"rustls-pemfile 2.1.2",
"rustls-pki-types",
"serde",
"serde_json",
"serde_urlencoded",
"sync_wrapper",
"sync_wrapper 1.0.1",
"system-configuration",
"tokio",
"tokio-native-tls",
@@ -4607,11 +4660,11 @@ dependencies = [
[[package]]
name = "rustls"
version = "0.22.4"
version = "0.23.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
dependencies = [
"log 0.4.21",
"once_cell",
"ring",
"rustls-pki-types",
"rustls-webpki",
@@ -5179,9 +5232,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "subtle"
version = "2.5.0"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
checksum = "0d0208408ba0c3df17ed26eb06992cb1a1268d41b2c0e12e65203fbe3972cee5"
[[package]]
name = "syn"
@@ -5211,6 +5264,12 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
[[package]]
name = "sync_wrapper"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
[[package]]
name = "synstructure"
version = "0.13.1"
@@ -5384,7 +5443,7 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
[[package]]
name = "tauri"
version = "1.6.7"
source = "git+https://github.com/tauri-apps/tauri?branch=1.x#d2786bf699ffca1d5e9c234a3b1b4d5ec173af87"
source = "git+https://github.com/tauri-apps/tauri?branch=1.x#c2d3afa4fbc0e6d118fe002a1b2ba97b4072438a"
dependencies = [
"anyhow",
"base64 0.21.7",
@@ -5447,7 +5506,7 @@ dependencies = [
[[package]]
name = "tauri-build"
version = "1.5.2"
source = "git+https://github.com/tauri-apps/tauri?branch=1.x#d2786bf699ffca1d5e9c234a3b1b4d5ec173af87"
source = "git+https://github.com/tauri-apps/tauri?branch=1.x#c2d3afa4fbc0e6d118fe002a1b2ba97b4072438a"
dependencies = [
"anyhow",
"cargo_toml",
@@ -5465,7 +5524,7 @@ dependencies = [
[[package]]
name = "tauri-codegen"
version = "1.4.3"
source = "git+https://github.com/tauri-apps/tauri?branch=1.x#d2786bf699ffca1d5e9c234a3b1b4d5ec173af87"
source = "git+https://github.com/tauri-apps/tauri?branch=1.x#c2d3afa4fbc0e6d118fe002a1b2ba97b4072438a"
dependencies = [
"base64 0.21.7",
"brotli",
@@ -5490,7 +5549,7 @@ dependencies = [
[[package]]
name = "tauri-macros"
version = "1.4.4"
source = "git+https://github.com/tauri-apps/tauri?branch=1.x#d2786bf699ffca1d5e9c234a3b1b4d5ec173af87"
source = "git+https://github.com/tauri-apps/tauri?branch=1.x#c2d3afa4fbc0e6d118fe002a1b2ba97b4072438a"
dependencies = [
"heck 0.5.0",
"proc-macro2",
@@ -5503,7 +5562,7 @@ dependencies = [
[[package]]
name = "tauri-runtime"
version = "0.14.3"
source = "git+https://github.com/tauri-apps/tauri?branch=1.x#d2786bf699ffca1d5e9c234a3b1b4d5ec173af87"
source = "git+https://github.com/tauri-apps/tauri?branch=1.x#c2d3afa4fbc0e6d118fe002a1b2ba97b4072438a"
dependencies = [
"gtk",
"http 0.2.12",
@@ -5523,7 +5582,7 @@ dependencies = [
[[package]]
name = "tauri-runtime-wry"
version = "0.14.8"
source = "git+https://github.com/tauri-apps/tauri?branch=1.x#d2786bf699ffca1d5e9c234a3b1b4d5ec173af87"
source = "git+https://github.com/tauri-apps/tauri?branch=1.x#c2d3afa4fbc0e6d118fe002a1b2ba97b4072438a"
dependencies = [
"arboard",
"cocoa 0.24.1",
@@ -5543,7 +5602,7 @@ dependencies = [
[[package]]
name = "tauri-utils"
version = "1.5.4"
source = "git+https://github.com/tauri-apps/tauri?branch=1.x#d2786bf699ffca1d5e9c234a3b1b4d5ec173af87"
source = "git+https://github.com/tauri-apps/tauri?branch=1.x#c2d3afa4fbc0e6d118fe002a1b2ba97b4072438a"
dependencies = [
"brotli",
"ctor",
@@ -5783,6 +5842,21 @@ dependencies = [
"zerovec",
]
[[package]]
name = "tinyvec"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
dependencies = [
"tinyvec_macros",
]
[[package]]
name = "tinyvec_macros"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
version = "1.38.0"
@@ -5825,9 +5899,9 @@ dependencies = [
[[package]]
name = "tokio-rustls"
version = "0.25.0"
version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
dependencies = [
"rustls",
"rustls-pki-types",
@@ -6113,12 +6187,27 @@ dependencies = [
"version_check",
]
[[package]]
name = "unicode-bidi"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
[[package]]
name = "unicode-ident"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
name = "unicode-normalization"
version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-segmentation"
version = "1.11.0"
@@ -6148,9 +6237,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "url"
version = "2.5.1"
version = "2.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56"
checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
dependencies = [
"form_urlencoded",
"idna",
@@ -6543,9 +6632,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
version = "0.26.2"
version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3"
checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
dependencies = [
"rustls-pki-types",
]
@@ -7262,9 +7351,9 @@ dependencies = [
[[package]]
name = "zbus"
version = "4.2.2"
version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f"
checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5"
dependencies = [
"async-broadcast",
"async-executor",
@@ -7300,9 +7389,9 @@ dependencies = [
[[package]]
name = "zbus_macros"
version = "4.2.2"
version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1"
checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d"
dependencies = [
"proc-macro-crate 3.1.0",
"proc-macro2",

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

View File

@@ -89,10 +89,7 @@ impl CoreManager {
let procs = system.processes_by_name("verge-mihomo");
for proc in procs {
log::debug!(target: "app", "kill all clash process");
#[cfg(target_os = "windows")]
proc.kill();
#[cfg(not(target_os = "windows"))]
proc.kill_with(sysinfo::Signal::Interrupt);
}
if *self.use_service_mode.lock() {
@@ -249,10 +246,7 @@ impl CoreManager {
let procs = system.processes_by_name("verge-mihomo");
for proc in procs {
log::debug!(target: "app", "kill all clash process");
#[cfg(target_os = "windows")]
proc.kill();
#[cfg(not(target_os = "windows"))]
proc.kill_with(sysinfo::Signal::Interrupt);
}
Ok(())
}

View File

@@ -14,6 +14,25 @@
"exceptionDomain": "",
"signingIdentity": null,
"entitlements": null
},
"dmg": {
"background": "images/background.png",
"appPosition": {
"x": 180,
"y": 170
},
"applicationFolderPosition": {
"x": 480,
"y": 170
},
"windowSize": {
"height": 400,
"width": 660
},
"windowPosition": {
"x": 200,
"y": 180
}
}
}
}

View File

@@ -21,6 +21,8 @@ export const ProxyItemMini = (props: Props) => {
const { t } = useTranslation();
const presetList = ["DIRECT", "REJECT", "REJECT-DROP", "PASS", "COMPATIBLE"];
const isPreset = presetList.includes(proxy.name);
// -1/<=0 为 不显示
// -2 为 loading
const [delay, setDelay] = useState(-1);
@@ -28,6 +30,7 @@ export const ProxyItemMini = (props: Props) => {
const timeout = verge?.default_latency_timeout || 10000;
useEffect(() => {
if (isPreset) return;
delayManager.setListener(proxy.name, group.name, setDelay);
return () => {
@@ -160,7 +163,9 @@ export const ProxyItemMini = (props: Props) => {
</Box>
)}
</Box>
<Box sx={{ ml: 0.5, color: "primary.main" }}>
<Box
sx={{ ml: 0.5, color: "primary.main", display: isPreset ? "none" : "" }}
>
{delay === -2 && (
<Widget>
<BaseLoading />

View File

@@ -46,12 +46,15 @@ const TypeBox = styled(Box)(({ theme }) => ({
export const ProxyItem = (props: Props) => {
const { group, proxy, selected, showType = true, sx, onClick } = props;
const presetList = ["DIRECT", "REJECT", "REJECT-DROP", "PASS", "COMPATIBLE"];
const isPreset = presetList.includes(proxy.name);
// -1/<=0 为 不显示
// -2 为 loading
const [delay, setDelay] = useState(-1);
const { verge } = useVerge();
const timeout = verge?.default_latency_timeout || 10000;
useEffect(() => {
if (isPreset) return;
delayManager.setListener(proxy.name, group.name, setDelay);
return () => {
@@ -131,7 +134,11 @@ export const ProxyItem = (props: Props) => {
/>
<ListItemIcon
sx={{ justifyContent: "flex-end", color: "primary.main" }}
sx={{
justifyContent: "flex-end",
color: "primary.main",
display: isPreset ? "none" : "",
}}
>
{delay === -2 && (
<Widget>

View File

@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=openssl
PKG_VERSION:=3.0.13
PKG_VERSION:=3.0.14
PKG_RELEASE:=1
PKG_USE_MIPS16:=0
PKG_BUILD_FLAGS:=gc-sections no-lto
@@ -27,7 +27,7 @@ PKG_SOURCE_URL:= \
ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/ \
ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/old/$(PKG_BASE)/
PKG_HASH:=88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313
PKG_HASH:=eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE

86
mieru/tools/enable_tcp_bbr.py Executable file
View File

@@ -0,0 +1,86 @@
#!/usr/bin/env python3
#
# Copyright (C) 2024 mieru authors
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
'''
This program enables TCP BBR congestion control.
'''
import os
import subprocess
import sys
def enable_tcp_bbr() -> None:
if not sys.platform.startswith('linux'):
print_exit('You can only run this program on Linux.')
return
if is_bbr_enabled():
print('BBR is already enabled.')
return
uid = os.getuid()
if uid != 0:
print_exit('Only root user can run this program.')
must_run_command(['modprobe', 'tcp_bbr'])
mods = must_run_command(['lsmod'])
if 'tcp_bbr' not in mods:
print_exit('Fail to load tcp_bbr kernel module.')
must_write_sysctl_file(['net.core.default_qdisc=fq', 'net.ipv4.tcp_congestion_control=bbr'])
must_run_command(['sysctl', '--system', '--pattern', '^net'])
if is_bbr_enabled():
print('BBR is enabled.')
else:
print_exit('BBR is not enabled. This program doesn\'t support your operating system.')
def is_bbr_enabled() -> bool:
try:
with open('/proc/sys/net/ipv4/tcp_congestion_control', 'r') as f:
return f.read().strip() == 'bbr'
except Exception as e:
print_exit(e)
def must_write_sysctl_file(content: list[str]) -> None:
try:
with open('/etc/sysctl.d/mieru_tcp_bbr.conf', 'w') as f:
for line in content:
f.write(line)
f.write('\n')
except Exception as e:
print_exit(e)
def must_run_command(command: list[str]) -> str:
try:
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True, text=True)
return result.stdout
except Exception as e:
print_exit(e)
def print_exit(*values: object) -> None:
print(*values)
sys.exit(1)
if __name__ == "__main__":
enable_tcp_bbr()

View File

@@ -20,13 +20,9 @@ This program generates users that can be used in mita server configurations.
'''
import sys
sys.dont_write_bytecode = True
from gen_username_passwd import gen_token
import argparse
import json
import secrets
def gen_users() -> None:
@@ -45,5 +41,10 @@ def gen_users() -> None:
print(json.dumps(users, indent=4))
def gen_token(length: int) -> str:
s = secrets.token_urlsafe(length)
return s[:length]
if __name__ == '__main__':
gen_users()

View File

@@ -29,10 +29,16 @@ import sys
def uninstall_mita() -> None:
print('[check operating system]')
if not sys.platform.startswith('linux'):
print_exit('You can only run this program on Linux.')
else:
print('OK')
print('[check permission]')
uid = os.getuid()
if uid != 0:
print_exit('ERROR: only root user can run this program.')
print_exit('Only root user can run this program.')
else:
print('OK')
@@ -44,7 +50,7 @@ def uninstall_mita() -> None:
print('Package manager is rpm.')
rpm_uninstall()
else:
print_exit('ERROR: unable to determine package manager.')
print_exit('Unable to determine package manager.')
def is_deb() -> bool:
@@ -87,6 +93,7 @@ def deb_uninstall() -> None:
run_command('[remove mita metrics]', ['rm', '-rf', '/var/lib/mita'])
run_command('[remove mita runtime]', ['rm', '-rf', '/var/run/mita'])
run_command('[remove mita systemd unit]', ['rm', '-f', '/lib/systemd/system/mita.service'])
run_command('[remove TCP BBR sysctl patch]', ['rm', '-f', '/etc/sysctl.d/mieru_tcp_bbr.conf'])
run_command('[reload systemd]', ['systemctl', 'daemon-reload'])
run_command('[delete mita user]', ['userdel', 'mita'])
run_command('[delete mita group]', ['groupdel', 'mita'])
@@ -100,6 +107,7 @@ def rpm_uninstall() -> None:
run_command('[remove mita metrics]', ['rm', '-rf', '/var/lib/mita'])
run_command('[remove mita runtime]', ['rm', '-rf', '/var/run/mita'])
run_command('[remove mita systemd unit]', ['rm', '-f', '/lib/systemd/system/mita.service'])
run_command('[remove TCP BBR sysctl patch]', ['rm', '-f', '/etc/sysctl.d/mieru_tcp_bbr.conf'])
run_command('[reload systemd]', ['systemctl', 'daemon-reload'])
run_command('[delete mita user]', ['userdel', 'mita'])
run_command('[delete mita group]', ['groupdel', 'mita'])

View File

@@ -21,10 +21,12 @@ function index()
entry({"admin", "services", appname, "reset_config"}, call("reset_config")).leaf = true
entry({"admin", "services", appname, "show"}, call("show_menu")).leaf = true
entry({"admin", "services", appname, "hide"}, call("hide_menu")).leaf = true
if uci:get(appname, "@global[0]", "hide_from_luci") == "1" then
return
local e
if uci:get(appname, "@global[0]", "hide_from_luci") ~= "1" then
e = entry({"admin", "services", appname}, alias("admin", "services", appname, "settings"), _("Pass Wall"), -1)
else
e = entry({"admin", "services", appname}, alias("admin", "services", appname, "settings"), nil, -1)
end
e = entry({"admin", "services", appname}, alias("admin", "services", appname, "settings"), _("Pass Wall"), -1)
e.dependent = true
e.acl_depends = { "luci-app-passwall" }
--[[ Client ]]

View File

@@ -3215,7 +3215,7 @@ dependencies = [
[[package]]
name = "shadowsocks-rust"
version = "1.20.1"
version = "1.20.2"
dependencies = [
"base64 0.22.1",
"build-time",
@@ -3256,7 +3256,7 @@ dependencies = [
[[package]]
name = "shadowsocks-service"
version = "1.20.1"
version = "1.20.2"
dependencies = [
"arc-swap",
"async-trait",
@@ -3273,6 +3273,7 @@ dependencies = [
"hickory-resolver",
"http 1.1.0",
"http-body-util",
"httparse",
"hyper",
"idna 1.0.0",
"ipnet",

View File

@@ -1,6 +1,6 @@
[package]
name = "shadowsocks-rust"
version = "1.20.1"
version = "1.20.2"
authors = ["Shadowsocks Contributors"]
description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls."
repository = "https://github.com/shadowsocks/shadowsocks-rust"
@@ -248,7 +248,7 @@ jemallocator = { version = "0.5", optional = true }
snmalloc-rs = { version = "0.3", optional = true }
rpmalloc = { version = "0.2", optional = true }
shadowsocks-service = { version = "1.20.1", path = "./crates/shadowsocks-service" }
shadowsocks-service = { version = "1.20.2", path = "./crates/shadowsocks-service" }
windows-service = { version = "0.7", optional = true }

View File

@@ -1,6 +1,6 @@
[package]
name = "shadowsocks-service"
version = "1.20.1"
version = "1.20.2"
authors = ["Shadowsocks Contributors"]
description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls."
repository = "https://github.com/shadowsocks/shadowsocks-rust"
@@ -27,7 +27,7 @@ full = [
]
# Enable local server
local = []
local = ["httparse"]
# Enable remote server
server = []
# Enable manager server
@@ -170,6 +170,7 @@ libc = "0.2.141"
hyper = { version = "1.3", optional = true, features = ["full"] }
http-body-util = { version = "0.1", optional = true }
http = { version = "1.1", optional = true }
httparse = { version = "1.9", optional = true }
hickory-resolver = { version = "0.24", optional = true, features = [
"serde-config",

View File

@@ -70,7 +70,14 @@ use serde::{Deserialize, Serialize};
use shadowsocks::relay::socks5::Address;
use shadowsocks::{
config::{
ManagerAddr, Mode, ReplayAttackPolicy, ServerAddr, ServerConfig, ServerSource, ServerUser, ServerUserManager,
ManagerAddr,
Mode,
ReplayAttackPolicy,
ServerAddr,
ServerConfig,
ServerSource,
ServerUser,
ServerUserManager,
ServerWeight,
},
crypto::CipherKind,

View File

@@ -841,6 +841,8 @@ impl PingChecker {
/// Detect TCP connectivity with Chromium [Network Portal Detection](https://www.chromium.org/chromium-os/chromiumos-design-docs/network-portal-detection)
#[allow(dead_code)]
async fn check_request_tcp_chromium(&self) -> io::Result<()> {
use std::io::{Error, ErrorKind};
static GET_BODY: &[u8] =
b"GET /generate_204 HTTP/1.1\r\nHost: clients3.google.com\r\nConnection: close\r\nAccept: */*\r\n\r\n";
@@ -860,27 +862,28 @@ impl PingChecker {
let mut buf = Vec::new();
reader.read_until(b'\n', &mut buf).await?;
static EXPECTED_HTTP_STATUS_LINE: &[u8] = b"HTTP/1.1 204 No Content\r\n";
if buf != EXPECTED_HTTP_STATUS_LINE {
use std::io::{Error, ErrorKind};
let mut headers = [httparse::EMPTY_HEADER; 1];
let mut response = httparse::Response::new(&mut headers);
debug!(
"unexpected response from http://clients3.google.com/generate_204, {:?}",
ByteStr::new(&buf)
);
let err = Error::new(
ErrorKind::InvalidData,
"unexpected response from http://clients3.google.com/generate_204",
);
return Err(err);
if let Ok(..) = response.parse(&buf) {
if matches!(response.code, Some(204)) {
return Ok(());
}
}
Ok(())
Err(Error::new(
ErrorKind::InvalidData,
format!(
"unexpected response from http://clients3.google.com/generate_204, {:?}",
ByteStr::new(&buf)
),
))
}
/// Detect TCP connectivity with Firefox's http://detectportal.firefox.com/success.txt
async fn check_request_tcp_firefox(&self) -> io::Result<()> {
use std::io::{Error, ErrorKind};
static GET_BODY: &[u8] =
b"GET /success.txt HTTP/1.1\r\nHost: detectportal.firefox.com\r\nConnection: close\r\nAccept: */*\r\n\r\n";
@@ -900,23 +903,22 @@ impl PingChecker {
let mut buf = Vec::new();
reader.read_until(b'\n', &mut buf).await?;
static EXPECTED_HTTP_STATUS_LINE: &[u8] = b"HTTP/1.1 200 OK\r\n";
if buf != EXPECTED_HTTP_STATUS_LINE {
use std::io::{Error, ErrorKind};
let mut headers = [httparse::EMPTY_HEADER; 1];
let mut response = httparse::Response::new(&mut headers);
debug!(
"unexpected response from http://detectportal.firefox.com/success.txt, {:?}",
ByteStr::new(&buf)
);
let err = Error::new(
ErrorKind::InvalidData,
"unexpected response from http://detectportal.firefox.com/success.txt",
);
return Err(err);
if let Ok(..) = response.parse(&buf) {
if matches!(response.code, Some(200) | Some(204)) {
return Ok(());
}
}
Ok(())
Err(Error::new(
ErrorKind::InvalidData,
format!(
"unexpected response from http://detectportal.firefox.com/success.txt, {:?}",
ByteStr::new(&buf)
),
))
}
async fn check_request_udp(&self) -> io::Result<()> {

View File

@@ -21,23 +21,23 @@ endif
ifeq ($(ARCH),aarch64)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).aarch64-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
PKG_HASH:=a4551b599c0e0adbd395528681c748ac2ad71fd5ca37b39a900a49e767e8cc46
PKG_HASH:=8c0d0cd3b614888cd3ffcdf9e007ba8697aa6331f8433c90b0a3b2bc3eb37e8b
else ifeq ($(ARCH),arm)
# Referred to golang/golang-values.mk
ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE))))
ifeq ($(ARM_CPU_FEATURES),)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).arm-$(PKG_SOURCE_BODY)eabi.$(PKG_SOURCE_FOOTER)
PKG_HASH:=37fbb3d9ceecea96f8c9ecda6e6c7573e9546e107f84f8676554525ba90689be
PKG_HASH:=4c24eab26472dfb332ccbb5a8c15d6e1ecc4a857d915ffa853372bde55f0eeeb
else
PKG_SOURCE:=$(PKG_SOURCE_HEADER).arm-$(PKG_SOURCE_BODY)eabihf.$(PKG_SOURCE_FOOTER)
PKG_HASH:=35044b469236cab55902c09074c9c05af2192e60eba327688685f0b97c0de5e7
endif
else ifeq ($(ARCH),i386)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).i686-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
PKG_HASH:=0419385c0b525a85877bd29ee5c78a9f114d9efd0821f24f47c6e5d501077def
PKG_HASH:=0b6916aa85763764e3896b31900229503802f5d76d3bd35b341fa45bf87486f9
else ifeq ($(ARCH),x86_64)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).x86_64-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
PKG_HASH:=25b529acf60587e32aa87e1a2e9126f4503a01d5f789fa48fbc62b396ee09621
PKG_HASH:=41a8d242409e4f46f0588d5cecc8ea41b420978f83083ed52443544b5d71936f
else ifeq ($(ARCH),mips)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).mips-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
PKG_HASH:=0d64790a2dad37ee43cc9847169a216f5611ce0a1f37d1be1babf968196e8288

View File

@@ -12,13 +12,13 @@ PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
include $(INCLUDE_DIR)/package.mk
GEOIP_VER:=202406130042
GEOIP_VER:=202406200042
GEOIP_FILE:=geoip.dat.$(GEOIP_VER)
define Download/geoip
URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/
URL_FILE:=geoip.dat
FILE:=$(GEOIP_FILE)
HASH:=e3ebf15b59b42c3bb6db1b88614e7a63af94da199e1398826105557f52124cd5
HASH:=4d65e0bfc4976c65d7ce2c77ae7c06fe8bf8ab852c3d83bd2a2fa1f952e556e5
endef
GEOSITE_VER:=20240614093027

View File

@@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=xray-core
PKG_VERSION:=1.8.15
PKG_VERSION:=1.8.13
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=4e0ac5170668033fd55544688a1d56938de91bc00c5ebc7d8c5211fd97cbca65
PKG_HASH:=9e63fbeb4667c19e286389c370d30e9e904f4421784adcbe6cf4d6e172a2ac29
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=MPL-2.0

View File

@@ -6,6 +6,7 @@
kcp,
ws,
httpupgrade,
splithttp,
h2,
http,
quic,

View File

@@ -157,7 +157,7 @@ namespace v2rayN
public static readonly List<string> SsSecuritiesInXray = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
public static readonly List<string> SsSecuritiesInSingbox = new() { "aes-256-gcm", "aes-192-gcm", "aes-128-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "rc4-md5", "chacha20-ietf", "xchacha20" };
public static readonly List<string> Flows = new() { "", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
public static readonly List<string> Networks = new() { "tcp", "kcp", "ws", "httpupgrade", "h2", "quic", "grpc" };
public static readonly List<string> Networks = new() { "tcp", "kcp", "ws", "httpupgrade", "splithttp", "h2", "quic", "grpc" };
public static readonly List<string> KcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" };
public static readonly List<string> CoreTypes = new() { "v2fly", "SagerNet", "Xray", "sing_box" };
public static readonly List<string> CoreTypes4VLESS = new() { "Xray", "sing_box" };

View File

@@ -26,7 +26,7 @@ namespace v2rayN.Handler.CoreConfig
msg = ResUI.CheckServerSettings;
return -1;
}
if (node.GetNetwork() == nameof(ETransport.kcp))
if (node.GetNetwork() is nameof(ETransport.kcp) or nameof(ETransport.splithttp))
{
msg = ResUI.Incorrectconfiguration + $" - {node.GetNetwork()}";
return -1;
@@ -841,13 +841,13 @@ namespace v2rayN.Handler.CoreConfig
if (lstDomain != null && lstDomain.Count > 0)
{
var tag = "local_local";
dns4Sbox.servers.Insert(0, new()
dns4Sbox.servers.Add(new()
{
tag = tag,
address = "223.5.5.5",
detour = Global.DirectTag,
});
dns4Sbox.rules.Insert(0, new()
dns4Sbox.rules.Add(new()
{
server = tag,
domain = lstDomain

View File

@@ -565,6 +565,7 @@ namespace v2rayN.Handler.CoreConfig
publicKey = node.publicKey,
shortId = node.shortId,
spiderX = node.spiderX,
show = false,
};
streamSettings.realitySettings = realitySettings;
@@ -630,6 +631,25 @@ namespace v2rayN.Handler.CoreConfig
}
streamSettings.httpupgradeSettings = httpupgradeSettings;
break;
//splithttp
case nameof(ETransport.splithttp):
SplithttpSettings4Ray splithttpSettings = new()
{
maxUploadSize = 1000000,
maxConcurrentUploads = 10
};
if (!Utils.IsNullOrEmpty(node.path))
{
splithttpSettings.path = node.path;
}
if (!Utils.IsNullOrEmpty(host))
{
splithttpSettings.host = host;
}
streamSettings.splithttpSettings = splithttpSettings;
break;
//h2
case nameof(ETransport.h2):

View File

@@ -81,6 +81,7 @@ namespace v2rayN.Handler.Fmt
case nameof(ETransport.ws):
case nameof(ETransport.httpupgrade):
case nameof(ETransport.splithttp):
if (!Utils.IsNullOrEmpty(item.requestHost))
{
dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
@@ -152,6 +153,7 @@ namespace v2rayN.Handler.Fmt
case nameof(ETransport.ws):
case nameof(ETransport.httpupgrade):
case nameof(ETransport.splithttp):
item.requestHost = Utils.UrlDecode(query["host"] ?? "");
item.path = Utils.UrlDecode(query["path"] ?? "/");
break;

View File

@@ -156,6 +156,7 @@ namespace v2rayN.Handler.Fmt
case nameof(ETransport.ws):
case nameof(ETransport.httpupgrade):
case nameof(ETransport.splithttp):
string p1 = query["path"] ?? "/";
string h1 = query["host"] ?? "";
item.requestHost = Utils.UrlDecode(h1);

View File

@@ -87,6 +87,8 @@ namespace v2rayN.Handler
private void ParseOutput(Google.Protobuf.Collections.RepeatedField<Stat> source, out ServerSpeedItem server)
{
server = new();
long aggregateProxyUp = 0;
long aggregateProxyDown = 0;
try
{
foreach (Stat stat in source)
@@ -101,15 +103,15 @@ namespace v2rayN.Handler
name = nStr[1];
type = nStr[3];
if (name == Global.ProxyTag)
if (name.StartsWith(Global.ProxyTag))
{
if (type == "uplink")
{
server.proxyUp = value;
aggregateProxyUp += value;
}
else if (type == "downlink")
{
server.proxyDown = value;
aggregateProxyDown += value;
}
}
else if (name == Global.DirectTag)
@@ -124,6 +126,8 @@ namespace v2rayN.Handler
}
}
}
server.proxyUp = aggregateProxyUp;
server.proxyDown = aggregateProxyDown;
}
catch
{

View File

@@ -421,47 +421,52 @@ namespace v2rayN.Models
/// <summary>
///
/// </summary>
public TlsSettings4Ray tlsSettings { get; set; }
public TlsSettings4Ray? tlsSettings { get; set; }
/// <summary>
/// Tcp传输额外设置
/// </summary>
public TcpSettings4Ray tcpSettings { get; set; }
public TcpSettings4Ray? tcpSettings { get; set; }
/// <summary>
/// Kcp传输额外设置
/// </summary>
public KcpSettings4Ray kcpSettings { get; set; }
public KcpSettings4Ray? kcpSettings { get; set; }
/// <summary>
/// ws传输额外设置
/// </summary>
public WsSettings4Ray wsSettings { get; set; }
public WsSettings4Ray? wsSettings { get; set; }
/// <summary>
///
/// </summary>
public HttpupgradeSettings4Ray? httpupgradeSettings { get; set; }
/// <summary>
///
/// </summary>
public SplithttpSettings4Ray? splithttpSettings { get; set; }
/// <summary>
/// h2传输额外设置
/// </summary>
public HttpSettings4Ray httpSettings { get; set; }
public HttpSettings4Ray? httpSettings { get; set; }
/// <summary>
/// QUIC
/// </summary>
public QuicSettings4Ray quicSettings { get; set; }
public QuicSettings4Ray? quicSettings { get; set; }
/// <summary>
/// VLESS only
/// </summary>
public TlsSettings4Ray realitySettings { get; set; }
public TlsSettings4Ray? realitySettings { get; set; }
/// <summary>
/// grpc
/// </summary>
public GrpcSettings4Ray grpcSettings { get; set; }
public GrpcSettings4Ray? grpcSettings { get; set; }
/// <summary>
/// sockopt
@@ -488,7 +493,7 @@ namespace v2rayN.Models
public string? fingerprint { get; set; }
public bool? show { get; set; } = false;
public bool? show { get; set; }
public string? publicKey { get; set; }
public string? shortId { get; set; }
public string? spiderX { get; set; }
@@ -608,6 +613,17 @@ namespace v2rayN.Models
public string? host { get; set; }
}
public class SplithttpSettings4Ray
{
public string? path { get; set; }
public string? host { get; set; }
public int? maxUploadSize { get; set; }
public int? maxConcurrentUploads { get; set; }
}
public class HttpSettings4Ray
{
/// <summary>

View File

@@ -3266,7 +3266,7 @@ namespace v2rayN.Resx {
}
/// <summary>
/// 查找类似 *ws/httpupgrade path 的本地化字符串。
/// 查找类似 *ws/httpupgrade/splithttp path 的本地化字符串。
/// </summary>
public static string TransportPathTip1 {
get {
@@ -3320,7 +3320,7 @@ namespace v2rayN.Resx {
}
/// <summary>
/// 查找类似 *ws/httpupgrade host 的本地化字符串。
/// 查找类似 *ws/httpupgrade/splithttp host 的本地化字符串。
/// </summary>
public static string TransportRequestHostTip2 {
get {

View File

@@ -359,7 +359,7 @@
<value>Please fill in the correct custom DNS</value>
</data>
<data name="TransportPathTip1" xml:space="preserve">
<value>*ws/httpupgrade path</value>
<value>*ws/httpupgrade/splithttp path</value>
</data>
<data name="TransportPathTip2" xml:space="preserve">
<value>*h2 path</value>
@@ -374,7 +374,7 @@
<value>*http host Separated by commas (,)</value>
</data>
<data name="TransportRequestHostTip2" xml:space="preserve">
<value>*ws/httpupgrade host</value>
<value>*ws/httpupgrade/splithttp host</value>
</data>
<data name="TransportRequestHostTip3" xml:space="preserve">
<value>*h2 host Separated by commas (,)</value>

View File

@@ -359,7 +359,7 @@
<value>请填写正确的自定义DNS</value>
</data>
<data name="TransportPathTip1" xml:space="preserve">
<value>*ws/httpupgrade path</value>
<value>*ws/httpupgrade/splithttp path</value>
</data>
<data name="TransportPathTip2" xml:space="preserve">
<value>*h2 path</value>
@@ -374,7 +374,7 @@
<value>*http host中间逗号(,)分隔</value>
</data>
<data name="TransportRequestHostTip2" xml:space="preserve">
<value>*ws/httpupgrade host</value>
<value>*ws/httpupgrade/splithttp host</value>
</data>
<data name="TransportRequestHostTip3" xml:space="preserve">
<value>*h2 host中间逗号(,)分隔</value>

View File

@@ -358,7 +358,7 @@
<value>請填寫正確的自訂DNS</value>
</data>
<data name="TransportPathTip1" xml:space="preserve">
<value>*ws/httpupgrade path</value>
<value>*ws/httpupgrade/splithttp path</value>
</data>
<data name="TransportPathTip2" xml:space="preserve">
<value>*h2 path</value>
@@ -373,7 +373,7 @@
<value>*http host中間逗號(,)分隔</value>
</data>
<data name="TransportRequestHostTip2" xml:space="preserve">
<value>*ws/httpupgrade host</value>
<value>*ws/httpupgrade/splithttp host</value>
</data>
<data name="TransportRequestHostTip3" xml:space="preserve">
<value>*h2 host中間逗號(,)分隔</value>

View File

@@ -333,6 +333,7 @@ namespace v2rayN.Views
case nameof(ETransport.ws):
case nameof(ETransport.httpupgrade):
case nameof(ETransport.splithttp):
tipRequestHost.Text = ResUI.TransportRequestHostTip2;
tipPath.Text = ResUI.TransportPathTip1;
break;

View File

@@ -119,7 +119,7 @@ jobs:
with:
path: |
qemu-user-static*.deb
key: ${{ runner.os }}-qemu-8.2.2-ds-2
key: ${{ runner.os }}-qemu-8.2.5-ds-1
- name: Cache sysroot
id: sysroot-cache
uses: actions/cache@v4
@@ -163,7 +163,7 @@ jobs:
- name: "Install dependency: qemu user cache"
if: ${{ steps.qemu-user-cache.outputs.cache-hit != 'true' }}
run: |
wget http://ftp.us.debian.org/debian/pool/main/q/qemu/qemu-user-static_8.2.2+ds-2_amd64.deb
wget http://ftp.us.debian.org/debian/pool/main/q/qemu/qemu-user-static_8.2.5+ds-1_amd64.deb
- name: Change ubuntu mirror
run: |
sudo sed -i 's/azure.archive.ubuntu.com/azure.archive.ubuntu.com/g' /etc/apt/sources.list

View File

@@ -106,7 +106,7 @@ jobs:
with:
path: |
qemu-user-static*.deb
key: ${{ runner.os }}-qemu-8.2.2-ds-2
key: ${{ runner.os }}-qemu-8.2.5-ds-1
- name: Cache sysroot
id: sysroot-cache
uses: actions/cache@v4
@@ -134,7 +134,7 @@ jobs:
- name: "Install dependency: qemu user cache"
if: ${{ steps.qemu-user-cache.outputs.cache-hit != 'true' }}
run: |
wget http://ftp.us.debian.org/debian/pool/main/q/qemu/qemu-user-static_8.2.2+ds-2_amd64.deb
wget http://ftp.us.debian.org/debian/pool/main/q/qemu/qemu-user-static_8.2.5+ds-1_amd64.deb
- name: "Install dependency: sysroot"
if: ${{ steps.sysroot-cache.outputs.cache-hit != 'true' && matrix.arch != 'loongarch64' && matrix.arch != 'riscv64' && matrix.arch != 'riscv32' }}
run: |

View File

@@ -107,7 +107,7 @@ jobs:
with:
path: |
qemu-user-static*.deb
key: ${{ runner.os }}-qemu-8.2.2-ds-2
key: ${{ runner.os }}-qemu-8.2.5-ds-1
- name: Cache openwrt sdk home
id: openwrt-sdkhome-cache
uses: actions/cache@v4
@@ -129,7 +129,7 @@ jobs:
- name: "Install dependency: qemu user cache"
if: ${{ steps.qemu-user-cache.outputs.cache-hit != 'true' }}
run: |
wget http://ftp.us.debian.org/debian/pool/main/q/qemu/qemu-user-static_8.2.2+ds-2_amd64.deb
wget http://ftp.us.debian.org/debian/pool/main/q/qemu/qemu-user-static_8.2.5+ds-1_amd64.deb
- name: Change ubuntu mirror
run: |
sudo sed -i 's/azure.archive.ubuntu.com/azure.archive.ubuntu.com/g' /etc/apt/sources.list

View File

@@ -36,7 +36,7 @@ See [Status of Package Store](https://github.com/Chilledheart/yass/wiki/Status-o
### Prebuilt binaries (Other platforms)
- Android [download apk](https://github.com/Chilledheart/yass/releases/download/1.11.2/yass-android-release-arm64-1.11.2.apk) or [download 32-bit apk](https://github.com/Chilledheart/yass/releases/download/1.11.2/yass-android-release-arm-1.11.2.apk)
- iOS [Continue to TestFlight Invitation](https://testflight.apple.com/join/6AkiEq09)
- iOS [Continue to accept TestFlight invitation](https://testflight.apple.com/join/6AkiEq09)
- Windows [download installer](https://github.com/Chilledheart/yass/releases/download/1.11.2/yass-mingw-win7-release-x86_64-1.11.2-system-installer.exe) [(require KB2999226 below windows 10)][KB2999226] or [download 32-bit installer](https://github.com/Chilledheart/yass/releases/download/1.11.2/yass-mingw-winxp-release-i686-1.11.2-system-installer.exe) [(require vc 2010 runtime)][vs2010_x86] or [download woa arm64 installer](https://github.com/Chilledheart/yass/releases/download/1.11.2/yass-mingw-release-aarch64-1.11.2-system-installer.exe)
- macOS [download intel dmg](https://github.com/Chilledheart/yass/releases/download/1.11.2/yass-macos-release-x64-1.11.2.dmg) or [download apple silicon dmg](https://github.com/Chilledheart/yass/releases/download/1.11.2/yass-macos-release-arm64-1.11.2.dmg)
> via homebrew: `brew install --cask yass`