zishuo/Archive
1
0
Fork 0
mirror of https://github.com/bolucat/Archive.git synced 2025-09-26 20:21:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update On Tue Mar 26 19:28:39 CET 2024

Browse Source
This commit is contained in:
github-action[bot]
2024-03-26 19:28:40 +01:00
parent 3b1a05465c
commit da0bbd7206
74 changed files with 863 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/update.log vendored
View File

@@ -598,3 +598,4 @@ Update On Fri Mar 22 19:26:11 CET 2024
Update On Sat Mar 23 19:27:23 CET 2024
Update On Sun Mar 24 19:31:12 CET 2024
Update On Mon Mar 25 19:35:07 CET 2024
Update On Tue Mar 26 19:28:27 CET 2024

5
clash-meta/transport/vmess/http.go
View File

@@ -3,6 +3,7 @@ package vmess
import (
"bufio"
"bytes"
"errors"
"fmt"
"net"
"net/http"
@@ -54,6 +55,10 @@ func (hc *httpConn) Write(b []byte) (int, error) {
return hc.Conn.Write(b)
}
if len(hc.cfg.Path) == 0 {
return -1, errors.New("path is empty")
}
path := hc.cfg.Path[fastrand.Intn(len(hc.cfg.Path))]
host := hc.cfg.Host
if header := hc.cfg.Headers["Host"]; len(header) != 0 {

2
clash-nyanpasu/.github/ISSUE_TEMPLATE/bug_report.yaml vendored
View File

@@ -87,7 +87,7 @@ body:
- type: input
id: version
attributes:
label: Clash Nyapasu 版本号 / Clash Nyapasu
label: Clash Nyanpasu 版本号 / Clash Nyanpasu
description: 您可以在 **设置 - 关于** 或在 **托盘 - 更多** 中找到版本号 / You can find the version number in **Settings - About** or **Tray - More**
placeholder: 1.5.0
validations:

2
clash-nyanpasu/.github/ISSUE_TEMPLATE/feature_request.yaml vendored
View File

@@ -56,7 +56,7 @@ body:
- type: input
id: version
attributes:
label: Clash Nyapasu 版本号 / Clash Nyapasu
label: Clash Nyanpasu 版本号 / Clash Nyanpasu
description: 您可以在设置 - 关于处找到版本号 / You can get version code in Settings - About
placeholder: 1.4.1
validations:

4
clash-nyanpasu/backend/Cargo.lock generated
View File

@@ -4958,9 +4958,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.114"
version = "1.0.115"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
dependencies = [
"indexmap 2.2.6",
"itoa 1.0.10",

10
clash-nyanpasu/package.json
View File

@@ -77,7 +77,7 @@
"ahooks": "3.7.10",
"axios": "1.6.8",
"dayjs": "1.11.10",
"framer-motion": "11.0.20",
"framer-motion": "11.0.21",
"i18next": "23.10.1",
"lodash-es": "4.17.21",
"monaco-editor": "0.47.0",
@@ -103,11 +103,11 @@
"@types/js-cookie": "3.0.6",
"@types/lodash-es": "4.17.12",
"@types/node": "20.11.30",
"@types/react": "18.2.70",
"@types/react": "18.2.71",
"@types/react-dom": "18.2.22",
"@types/react-transition-group": "4.4.10",
"@typescript-eslint/eslint-plugin": "7.3.1",
"@typescript-eslint/parser": "7.3.1",
"@typescript-eslint/eslint-plugin": "7.4.0",
"@typescript-eslint/parser": "7.4.0",
"@vitejs/plugin-react": "4.2.1",
"adm-zip": "0.5.12",
"autoprefixer": "10.4.19",
@@ -141,7 +141,7 @@
"prettier-plugin-toml": "2.0.1",
"sass": "1.72.0",
"shikiji": "0.10.2",
"stylelint": "16.3.0",
"stylelint": "16.3.1",
"stylelint-config-html": "1.1.0",
"stylelint-config-recess-order": "5.0.0",
"stylelint-config-standard": "36.0.0",

298
clash-nyanpasu/pnpm-lock.yaml generated
View File

@@ -19,25 +19,25 @@ dependencies:
version: 3.2.2(react@18.2.0)
'@emotion/react':
specifier: 11.11.4
version: 11.11.4(@types/react@18.2.70)(react@18.2.0)
version: 11.11.4(@types/react@18.2.71)(react@18.2.0)
'@emotion/styled':
specifier: 11.11.0
version: 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.70)(react@18.2.0)
version: 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.71)(react@18.2.0)
'@juggle/resize-observer':
specifier: 3.4.0
version: 3.4.0
'@mui/icons-material':
specifier: 5.15.14
version: 5.15.14(@mui/material@5.15.14)(@types/react@18.2.70)(react@18.2.0)
version: 5.15.14(@mui/material@5.15.14)(@types/react@18.2.71)(react@18.2.0)
'@mui/lab':
specifier: 5.0.0-alpha.169
version: 5.0.0-alpha.169(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@5.15.14)(@types/react@18.2.70)(react-dom@18.2.0)(react@18.2.0)
version: 5.0.0-alpha.169(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@5.15.14)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
'@mui/material':
specifier: 5.15.14
version: 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.70)(react-dom@18.2.0)(react@18.2.0)
version: 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
'@mui/x-data-grid':
specifier: 7.0.0
version: 7.0.0(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@5.15.14)(@types/react@18.2.70)(react-dom@18.2.0)(react@18.2.0)
version: 7.0.0(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@5.15.14)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
'@tauri-apps/api':
specifier: 1.5.3
version: 1.5.3
@@ -51,8 +51,8 @@ dependencies:
specifier: 1.11.10
version: 1.11.10
framer-motion:
specifier: 11.0.20
version: 11.0.20(react-dom@18.2.0)(react@18.2.0)
specifier: 11.0.21
version: 11.0.21(react-dom@18.2.0)(react@18.2.0)
i18next:
specifier: 23.10.1
version: 23.10.1
@@ -64,7 +64,7 @@ dependencies:
version: 0.47.0
mui-color-input:
specifier: 2.0.3
version: 2.0.3(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@5.15.14)(@types/react@18.2.70)(react-dom@18.2.0)(react@18.2.0)
version: 2.0.3(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@5.15.14)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
react:
specifier: 18.2.0
version: 18.2.0
@@ -82,7 +82,7 @@ dependencies:
version: 14.1.0(i18next@23.10.1)(react-dom@18.2.0)(react@18.2.0)
react-markdown:
specifier: 9.0.1
version: 9.0.1(@types/react@18.2.70)(react@18.2.0)
version: 9.0.1(@types/react@18.2.71)(react@18.2.0)
react-router-dom:
specifier: 6.22.3
version: 6.22.3(react-dom@18.2.0)(react@18.2.0)
@@ -125,8 +125,8 @@ devDependencies:
specifier: 20.11.30
version: 20.11.30
'@types/react':
specifier: 18.2.70
version: 18.2.70
specifier: 18.2.71
version: 18.2.71
'@types/react-dom':
specifier: 18.2.22
version: 18.2.22
@@ -134,11 +134,11 @@ devDependencies:
specifier: 4.4.10
version: 4.4.10
'@typescript-eslint/eslint-plugin':
specifier: 7.3.1
version: 7.3.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3)
specifier: 7.4.0
version: 7.4.0(@typescript-eslint/parser@7.4.0)(eslint@8.57.0)(typescript@5.4.3)
'@typescript-eslint/parser':
specifier: 7.3.1
version: 7.3.1(eslint@8.57.0)(typescript@5.4.3)
specifier: 7.4.0
version: 7.4.0(eslint@8.57.0)(typescript@5.4.3)
'@vitejs/plugin-react':
specifier: 4.2.1
version: 4.2.1(vite@5.2.6)
@@ -180,7 +180,7 @@ devDependencies:
version: 8.0.0
eslint-plugin-import:
specifier: 2.29.1
version: 2.29.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)
version: 2.29.1(@typescript-eslint/parser@7.4.0)(eslint@8.57.0)
eslint-plugin-n:
specifier: 16.6.2
version: 16.6.2(eslint@8.57.0)
@@ -239,26 +239,26 @@ devDependencies:
specifier: 0.10.2
version: 0.10.2
stylelint:
specifier: 16.3.0
version: 16.3.0(typescript@5.4.3)
specifier: 16.3.1
version: 16.3.1(typescript@5.4.3)
stylelint-config-html:
specifier: 1.1.0
version: 1.1.0(postcss-html@1.6.0)(stylelint@16.3.0)
version: 1.1.0(postcss-html@1.6.0)(stylelint@16.3.1)
stylelint-config-recess-order:
specifier: 5.0.0
version: 5.0.0(stylelint@16.3.0)
version: 5.0.0(stylelint@16.3.1)
stylelint-config-standard:
specifier: 36.0.0
version: 36.0.0(stylelint@16.3.0)
version: 36.0.0(stylelint@16.3.1)
stylelint-declaration-block-no-ignored-properties:
specifier: 2.8.0
version: 2.8.0(stylelint@16.3.0)
version: 2.8.0(stylelint@16.3.1)
stylelint-order:
specifier: 6.0.4
version: 6.0.4(stylelint@16.3.0)
version: 6.0.4(stylelint@16.3.1)
stylelint-scss:
specifier: 6.2.1
version: 6.2.1(stylelint@16.3.0)
version: 6.2.1(stylelint@16.3.1)
telegraf:
specifier: 4.16.3
version: 4.16.3
@@ -829,7 +829,7 @@ packages:
resolution: {integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==}
dev: false
/@emotion/react@11.11.4(@types/react@18.2.70)(react@18.2.0):
/@emotion/react@11.11.4(@types/react@18.2.71)(react@18.2.0):
resolution: {integrity: sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw==}
peerDependencies:
'@types/react': '*'
@@ -845,7 +845,7 @@ packages:
'@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0)
'@emotion/utils': 1.2.1
'@emotion/weak-memoize': 0.3.1
'@types/react': 18.2.70
'@types/react': 18.2.71
hoist-non-react-statics: 3.3.2
react: 18.2.0
dev: false
@@ -864,7 +864,7 @@ packages:
resolution: {integrity: sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==}
dev: false
/@emotion/styled@11.11.0(@emotion/react@11.11.4)(@types/react@18.2.70)(react@18.2.0):
/@emotion/styled@11.11.0(@emotion/react@11.11.4)(@types/react@18.2.71)(react@18.2.0):
resolution: {integrity: sha512-hM5Nnvu9P3midq5aaXj4I+lnSfNi7Pmd4EWk1fOZ3pxookaQTNew6bp4JaCBYM4HVFZF9g7UjJmsUmC2JlxOng==}
peerDependencies:
'@emotion/react': ^11.0.0-rc.0
@@ -877,11 +877,11 @@ packages:
'@babel/runtime': 7.23.8
'@emotion/babel-plugin': 11.11.0
'@emotion/is-prop-valid': 1.2.1
'@emotion/react': 11.11.4(@types/react@18.2.70)(react@18.2.0)
'@emotion/react': 11.11.4(@types/react@18.2.71)(react@18.2.0)
'@emotion/serialize': 1.1.3
'@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0)
'@emotion/utils': 1.2.1
'@types/react': 18.2.70
'@types/react': 18.2.71
react: 18.2.0
dev: false
@@ -1342,7 +1342,7 @@ packages:
debug: 4.3.4
espree: 9.6.1
globals: 13.24.0
ignore: 5.3.0
ignore: 5.3.1
import-fresh: 3.3.0
js-yaml: 4.1.0
minimatch: 3.1.2
@@ -1455,7 +1455,7 @@ packages:
resolution: {integrity: sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==}
dev: false
/@mui/base@5.0.0-beta.40(@types/react@18.2.70)(react-dom@18.2.0)(react@18.2.0):
/@mui/base@5.0.0-beta.40(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -1468,10 +1468,10 @@ packages:
dependencies:
'@babel/runtime': 7.23.9
'@floating-ui/react-dom': 2.0.8(react-dom@18.2.0)(react@18.2.0)
'@mui/types': 7.2.14(@types/react@18.2.70)
'@mui/utils': 5.15.14(@types/react@18.2.70)(react@18.2.0)
'@mui/types': 7.2.14(@types/react@18.2.71)
'@mui/utils': 5.15.14(@types/react@18.2.71)(react@18.2.0)
'@popperjs/core': 2.11.8
'@types/react': 18.2.70
'@types/react': 18.2.71
clsx: 2.1.0
prop-types: 15.8.1
react: 18.2.0
@@ -1482,7 +1482,7 @@ packages:
resolution: {integrity: sha512-on75VMd0XqZfaQW+9pGjSNiqW+ghc5E2ZSLRBXwcXl/C4YzjfyjrLPhrEpKnR9Uym9KXBvxrhoHfPcczYHweyA==}
dev: false
/@mui/icons-material@5.15.14(@mui/material@5.15.14)(@types/react@18.2.70)(react@18.2.0):
/@mui/icons-material@5.15.14(@mui/material@5.15.14)(@types/react@18.2.71)(react@18.2.0):
resolution: {integrity: sha512-vj/51k7MdFmt+XVw94sl30SCvGx6+wJLsNYjZRgxhS6y3UtnWnypMOsm3Kmg8TN+P0dqwsjy4/fX7B1HufJIhw==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -1494,12 +1494,12 @@ packages:
optional: true
dependencies:
'@babel/runtime': 7.23.9
'@mui/material': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.70)(react-dom@18.2.0)(react@18.2.0)
'@types/react': 18.2.70
'@mui/material': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
'@types/react': 18.2.71
react: 18.2.0
dev: false
/@mui/lab@5.0.0-alpha.169(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@5.15.14)(@types/react@18.2.70)(react-dom@18.2.0)(react@18.2.0):
/@mui/lab@5.0.0-alpha.169(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@5.15.14)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-h6xe1K6ISKUbyxTDgdvql4qoDP6+q8ad5fg9nXQxGLUrIeT2jVrBuT/jRECSTufbnhzP+V5kulvYxaMfM8rEdA==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -1518,21 +1518,21 @@ packages:
optional: true
dependencies:
'@babel/runtime': 7.23.9
'@emotion/react': 11.11.4(@types/react@18.2.70)(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.70)(react@18.2.0)
'@mui/base': 5.0.0-beta.40(@types/react@18.2.70)(react-dom@18.2.0)(react@18.2.0)
'@mui/material': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.70)(react-dom@18.2.0)(react@18.2.0)
'@mui/system': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.70)(react@18.2.0)
'@mui/types': 7.2.14(@types/react@18.2.70)
'@mui/utils': 5.15.14(@types/react@18.2.70)(react@18.2.0)
'@types/react': 18.2.70
'@emotion/react': 11.11.4(@types/react@18.2.71)(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.71)(react@18.2.0)
'@mui/base': 5.0.0-beta.40(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
'@mui/material': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
'@mui/system': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.71)(react@18.2.0)
'@mui/types': 7.2.14(@types/react@18.2.71)
'@mui/utils': 5.15.14(@types/react@18.2.71)(react@18.2.0)
'@types/react': 18.2.71
clsx: 2.1.0
prop-types: 15.8.1
react: 18.2.0
react-dom: 18.2.0(react@18.2.0)
dev: false
/@mui/material@5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.70)(react-dom@18.2.0)(react@18.2.0):
/@mui/material@5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-kEbRw6fASdQ1SQ7LVdWR5OlWV3y7Y54ZxkLzd6LV5tmz+NpO3MJKZXSfgR0LHMP7meKsPiMm4AuzV0pXDpk/BQ==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -1550,14 +1550,14 @@ packages:
optional: true
dependencies:
'@babel/runtime': 7.23.9
'@emotion/react': 11.11.4(@types/react@18.2.70)(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.70)(react@18.2.0)
'@mui/base': 5.0.0-beta.40(@types/react@18.2.70)(react-dom@18.2.0)(react@18.2.0)
'@emotion/react': 11.11.4(@types/react@18.2.71)(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.71)(react@18.2.0)
'@mui/base': 5.0.0-beta.40(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
'@mui/core-downloads-tracker': 5.15.14
'@mui/system': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.70)(react@18.2.0)
'@mui/types': 7.2.14(@types/react@18.2.70)
'@mui/utils': 5.15.14(@types/react@18.2.70)(react@18.2.0)
'@types/react': 18.2.70
'@mui/system': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.71)(react@18.2.0)
'@mui/types': 7.2.14(@types/react@18.2.71)
'@mui/utils': 5.15.14(@types/react@18.2.71)(react@18.2.0)
'@types/react': 18.2.71
'@types/react-transition-group': 4.4.10
clsx: 2.1.0
csstype: 3.1.3
@@ -1568,7 +1568,7 @@ packages:
react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0)
dev: false
/@mui/private-theming@5.15.14(@types/react@18.2.70)(react@18.2.0):
/@mui/private-theming@5.15.14(@types/react@18.2.71)(react@18.2.0):
resolution: {integrity: sha512-UH0EiZckOWcxiXLX3Jbb0K7rC8mxTr9L9l6QhOZxYc4r8FHUkefltV9VDGLrzCaWh30SQiJvAEd7djX3XXY6Xw==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -1579,8 +1579,8 @@ packages:
optional: true
dependencies:
'@babel/runtime': 7.24.1
'@mui/utils': 5.15.14(@types/react@18.2.70)(react@18.2.0)
'@types/react': 18.2.70
'@mui/utils': 5.15.14(@types/react@18.2.71)(react@18.2.0)
'@types/react': 18.2.71
prop-types: 15.8.1
react: 18.2.0
dev: false
@@ -1600,14 +1600,14 @@ packages:
dependencies:
'@babel/runtime': 7.24.1
'@emotion/cache': 11.11.0
'@emotion/react': 11.11.4(@types/react@18.2.70)(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.70)(react@18.2.0)
'@emotion/react': 11.11.4(@types/react@18.2.71)(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.71)(react@18.2.0)
csstype: 3.1.3
prop-types: 15.8.1
react: 18.2.0
dev: false
/@mui/system@5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.70)(react@18.2.0):
/@mui/system@5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.71)(react@18.2.0):
resolution: {integrity: sha512-auXLXzUaCSSOLqJXmsAaq7P96VPRXg2Rrz6OHNV7lr+kB8lobUF+/N84Vd9C4G/wvCXYPs5TYuuGBRhcGbiBGg==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -1624,20 +1624,20 @@ packages:
optional: true
dependencies:
'@babel/runtime': 7.24.1
'@emotion/react': 11.11.4(@types/react@18.2.70)(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.70)(react@18.2.0)
'@mui/private-theming': 5.15.14(@types/react@18.2.70)(react@18.2.0)
'@emotion/react': 11.11.4(@types/react@18.2.71)(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.71)(react@18.2.0)
'@mui/private-theming': 5.15.14(@types/react@18.2.71)(react@18.2.0)
'@mui/styled-engine': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(react@18.2.0)
'@mui/types': 7.2.14(@types/react@18.2.70)
'@mui/utils': 5.15.14(@types/react@18.2.70)(react@18.2.0)
'@types/react': 18.2.70
'@mui/types': 7.2.14(@types/react@18.2.71)
'@mui/utils': 5.15.14(@types/react@18.2.71)(react@18.2.0)
'@types/react': 18.2.71
clsx: 2.1.0
csstype: 3.1.3
prop-types: 15.8.1
react: 18.2.0
dev: false
/@mui/types@7.2.14(@types/react@18.2.70):
/@mui/types@7.2.14(@types/react@18.2.71):
resolution: {integrity: sha512-MZsBZ4q4HfzBsywtXgM1Ksj6HDThtiwmOKUXH1pKYISI9gAVXCNHNpo7TlGoGrBaYWZTdNoirIN7JsQcQUjmQQ==}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0
@@ -1645,10 +1645,10 @@ packages:
'@types/react':
optional: true
dependencies:
'@types/react': 18.2.70
'@types/react': 18.2.71
dev: false
/@mui/utils@5.15.14(@types/react@18.2.70)(react@18.2.0):
/@mui/utils@5.15.14(@types/react@18.2.71)(react@18.2.0):
resolution: {integrity: sha512-0lF/7Hh/ezDv5X7Pry6enMsbYyGKjADzvHyo3Qrc/SSlTsQ1VkbDMbH0m2t3OR5iIVLwMoxwM7yGd+6FCMtTFA==}
engines: {node: '>=12.0.0'}
peerDependencies:
@@ -1660,13 +1660,13 @@ packages:
dependencies:
'@babel/runtime': 7.24.1
'@types/prop-types': 15.7.11
'@types/react': 18.2.70
'@types/react': 18.2.71
prop-types: 15.8.1
react: 18.2.0
react-is: 18.2.0
dev: false
/@mui/x-data-grid@7.0.0(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@5.15.14)(@types/react@18.2.70)(react-dom@18.2.0)(react@18.2.0):
/@mui/x-data-grid@7.0.0(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@5.15.14)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-Nwwfr+ot/di0oH/pVwIxKV2QD7QyUY/MKkTWRSKzQoJw2aiFQf1Usmvq9Fu1qsCsvMmqIFaToY7972p0cczRjw==}
engines: {node: '>=14.0.0'}
peerDependencies:
@@ -1675,9 +1675,9 @@ packages:
react-dom: ^17.0.0 || ^18.0.0
dependencies:
'@babel/runtime': 7.24.1
'@mui/material': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.70)(react-dom@18.2.0)(react@18.2.0)
'@mui/system': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.70)(react@18.2.0)
'@mui/utils': 5.15.14(@types/react@18.2.70)(react@18.2.0)
'@mui/material': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
'@mui/system': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.71)(react@18.2.0)
'@mui/utils': 5.15.14(@types/react@18.2.71)(react@18.2.0)
clsx: 2.1.0
prop-types: 15.8.1
react: 18.2.0
@@ -2309,16 +2309,16 @@ packages:
/@types/react-dom@18.2.22:
resolution: {integrity: sha512-fHkBXPeNtfvri6gdsMYyW+dW7RXFo6Ad09nLFK0VQWR7yGLai/Cyvyj696gbwYvBnhGtevUG9cET0pmUbMtoPQ==}
dependencies:
'@types/react': 18.2.70
'@types/react': 18.2.71
dev: true
/@types/react-transition-group@4.4.10:
resolution: {integrity: sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==}
dependencies:
'@types/react': 18.2.70
'@types/react': 18.2.71
/@types/react@18.2.70:
resolution: {integrity: sha512-hjlM2hho2vqklPhopNkXkdkeq6Lv8WSZTpr7956zY+3WS5cfYUewtCzsJLsbW5dEv3lfSeQ4W14ZFeKC437JRQ==}
/@types/react@18.2.71:
resolution: {integrity: sha512-PxEsB9OjmQeYGffoWnYAd/r5FiJuUw2niFQHPc2v2idwh8wGPkkYzOHuinNJJY6NZqfoTCiOIizDOz38gYNsyw==}
dependencies:
'@types/prop-types': 15.7.11
'@types/scheduler': 0.16.2
@@ -2339,8 +2339,8 @@ packages:
resolution: {integrity: sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==}
dev: false
/@typescript-eslint/eslint-plugin@7.3.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)(typescript@5.4.3):
resolution: {integrity: sha512-STEDMVQGww5lhCuNXVSQfbfuNII5E08QWkvAw5Qwf+bj2WT+JkG1uc+5/vXA3AOYMDHVOSpL+9rcbEUiHIm2dw==}
/@typescript-eslint/eslint-plugin@7.4.0(@typescript-eslint/parser@7.4.0)(eslint@8.57.0)(typescript@5.4.3):
resolution: {integrity: sha512-yHMQ/oFaM7HZdVrVm/M2WHaNPgyuJH4WelkSVEWSSsir34kxW2kDJCxlXRhhGWEsMN0WAW/vLpKfKVcm8k+MPw==}
engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies:
'@typescript-eslint/parser': ^7.0.0
@@ -2351,15 +2351,15 @@ packages:
optional: true
dependencies:
'@eslint-community/regexpp': 4.10.0
'@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3)
'@typescript-eslint/scope-manager': 7.3.1
'@typescript-eslint/type-utils': 7.3.1(eslint@8.57.0)(typescript@5.4.3)
'@typescript-eslint/utils': 7.3.1(eslint@8.57.0)(typescript@5.4.3)
'@typescript-eslint/visitor-keys': 7.3.1
'@typescript-eslint/parser': 7.4.0(eslint@8.57.0)(typescript@5.4.3)
'@typescript-eslint/scope-manager': 7.4.0
'@typescript-eslint/type-utils': 7.4.0(eslint@8.57.0)(typescript@5.4.3)
'@typescript-eslint/utils': 7.4.0(eslint@8.57.0)(typescript@5.4.3)
'@typescript-eslint/visitor-keys': 7.4.0
debug: 4.3.4
eslint: 8.57.0
graphemer: 1.4.0
ignore: 5.3.0
ignore: 5.3.1
natural-compare: 1.4.0
semver: 7.6.0
ts-api-utils: 1.0.3(typescript@5.4.3)
@@ -2368,8 +2368,8 @@ packages:
- supports-color
dev: true
/@typescript-eslint/parser@7.3.1(eslint@8.57.0)(typescript@5.4.3):
resolution: {integrity: sha512-Rq49+pq7viTRCH48XAbTA+wdLRrB/3sRq4Lpk0oGDm0VmnjBrAOVXH/Laalmwsv2VpekiEfVFwJYVk6/e8uvQw==}
/@typescript-eslint/parser@7.4.0(eslint@8.57.0)(typescript@5.4.3):
resolution: {integrity: sha512-ZvKHxHLusweEUVwrGRXXUVzFgnWhigo4JurEj0dGF1tbcGh6buL+ejDdjxOQxv6ytcY1uhun1p2sm8iWStlgLQ==}
engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies:
eslint: ^8.56.0
@@ -2378,10 +2378,10 @@ packages:
typescript:
optional: true
dependencies:
'@typescript-eslint/scope-manager': 7.3.1
'@typescript-eslint/types': 7.3.1
'@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.3)
'@typescript-eslint/visitor-keys': 7.3.1
'@typescript-eslint/scope-manager': 7.4.0
'@typescript-eslint/types': 7.4.0
'@typescript-eslint/typescript-estree': 7.4.0(typescript@5.4.3)
'@typescript-eslint/visitor-keys': 7.4.0
debug: 4.3.4
eslint: 8.57.0
typescript: 5.4.3
@@ -2389,16 +2389,16 @@ packages:
- supports-color
dev: true
/@typescript-eslint/scope-manager@7.3.1:
resolution: {integrity: sha512-fVS6fPxldsKY2nFvyT7IP78UO1/I2huG+AYu5AMjCT9wtl6JFiDnsv4uad4jQ0GTFzcUV5HShVeN96/17bTBag==}
/@typescript-eslint/scope-manager@7.4.0:
resolution: {integrity: sha512-68VqENG5HK27ypafqLVs8qO+RkNc7TezCduYrx8YJpXq2QGZ30vmNZGJJJC48+MVn4G2dCV8m5ZTVnzRexTVtw==}
engines: {node: ^18.18.0 || >=20.0.0}
dependencies:
'@typescript-eslint/types': 7.3.1
'@typescript-eslint/visitor-keys': 7.3.1
'@typescript-eslint/types': 7.4.0
'@typescript-eslint/visitor-keys': 7.4.0
dev: true
/@typescript-eslint/type-utils@7.3.1(eslint@8.57.0)(typescript@5.4.3):
resolution: {integrity: sha512-iFhaysxFsMDQlzJn+vr3OrxN8NmdQkHks4WaqD4QBnt5hsq234wcYdyQ9uquzJJIDAj5W4wQne3yEsYA6OmXGw==}
/@typescript-eslint/type-utils@7.4.0(eslint@8.57.0)(typescript@5.4.3):
resolution: {integrity: sha512-247ETeHgr9WTRMqHbbQdzwzhuyaJ8dPTuyuUEMANqzMRB1rj/9qFIuIXK7l0FX9i9FXbHeBQl/4uz6mYuCE7Aw==}
engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies:
eslint: ^8.56.0
@@ -2407,8 +2407,8 @@ packages:
typescript:
optional: true
dependencies:
'@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.3)
'@typescript-eslint/utils': 7.3.1(eslint@8.57.0)(typescript@5.4.3)
'@typescript-eslint/typescript-estree': 7.4.0(typescript@5.4.3)
'@typescript-eslint/utils': 7.4.0(eslint@8.57.0)(typescript@5.4.3)
debug: 4.3.4
eslint: 8.57.0
ts-api-utils: 1.0.3(typescript@5.4.3)
@@ -2417,13 +2417,13 @@ packages:
- supports-color
dev: true
/@typescript-eslint/types@7.3.1:
resolution: {integrity: sha512-2tUf3uWggBDl4S4183nivWQ2HqceOZh1U4hhu4p1tPiIJoRRXrab7Y+Y0p+dozYwZVvLPRI6r5wKe9kToF9FIw==}
/@typescript-eslint/types@7.4.0:
resolution: {integrity: sha512-mjQopsbffzJskos5B4HmbsadSJQWaRK0UxqQ7GuNA9Ga4bEKeiO6b2DnB6cM6bpc8lemaPseh0H9B/wyg+J7rw==}
engines: {node: ^18.18.0 || >=20.0.0}
dev: true
/@typescript-eslint/typescript-estree@7.3.1(typescript@5.4.3):
resolution: {integrity: sha512-tLpuqM46LVkduWP7JO7yVoWshpJuJzxDOPYIVWUUZbW+4dBpgGeUdl/fQkhuV0A8eGnphYw3pp8d2EnvPOfxmQ==}
/@typescript-eslint/typescript-estree@7.4.0(typescript@5.4.3):
resolution: {integrity: sha512-A99j5AYoME/UBQ1ucEbbMEmGkN7SE0BvZFreSnTd1luq7yulcHdyGamZKizU7canpGDWGJ+Q6ZA9SyQobipePg==}
engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies:
typescript: '*'
@@ -2431,8 +2431,8 @@ packages:
typescript:
optional: true
dependencies:
'@typescript-eslint/types': 7.3.1
'@typescript-eslint/visitor-keys': 7.3.1
'@typescript-eslint/types': 7.4.0
'@typescript-eslint/visitor-keys': 7.4.0
debug: 4.3.4
globby: 11.1.0
is-glob: 4.0.3
@@ -2444,8 +2444,8 @@ packages:
- supports-color
dev: true
/@typescript-eslint/utils@7.3.1(eslint@8.57.0)(typescript@5.4.3):
resolution: {integrity: sha512-jIERm/6bYQ9HkynYlNZvXpzmXWZGhMbrOvq3jJzOSOlKXsVjrrolzWBjDW6/TvT5Q3WqaN4EkmcfdQwi9tDjBQ==}
/@typescript-eslint/utils@7.4.0(eslint@8.57.0)(typescript@5.4.3):
resolution: {integrity: sha512-NQt9QLM4Tt8qrlBVY9lkMYzfYtNz8/6qwZg8pI3cMGlPnj6mOpRxxAm7BMJN9K0AiY+1BwJ5lVC650YJqYOuNg==}
engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies:
eslint: ^8.56.0
@@ -2453,9 +2453,9 @@ packages:
'@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
'@types/json-schema': 7.0.15
'@types/semver': 7.5.6
'@typescript-eslint/scope-manager': 7.3.1
'@typescript-eslint/types': 7.3.1
'@typescript-eslint/typescript-estree': 7.3.1(typescript@5.4.3)
'@typescript-eslint/scope-manager': 7.4.0
'@typescript-eslint/types': 7.4.0
'@typescript-eslint/typescript-estree': 7.4.0(typescript@5.4.3)
eslint: 8.57.0
semver: 7.6.0
transitivePeerDependencies:
@@ -2463,11 +2463,11 @@ packages:
- typescript
dev: true
/@typescript-eslint/visitor-keys@7.3.1:
resolution: {integrity: sha512-9RMXwQF8knsZvfv9tdi+4D/j7dMG28X/wMJ8Jj6eOHyHWwDW4ngQJcqEczSsqIKKjFiLFr40Mnr7a5ulDD3vmw==}
/@typescript-eslint/visitor-keys@7.4.0:
resolution: {integrity: sha512-0zkC7YM0iX5Y41homUUeW1CHtZR01K3ybjM1l6QczoMuay0XKtrb93kv95AxUGwdjGr64nNqnOCwmEl616N8CA==}
engines: {node: ^18.18.0 || >=20.0.0}
dependencies:
'@typescript-eslint/types': 7.3.1
'@typescript-eslint/types': 7.4.0
eslint-visitor-keys: 3.4.3
dev: true
@@ -3693,7 +3693,7 @@ packages:
eslint-plugin-promise: ^6.0.0
dependencies:
eslint: 8.57.0
eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)
eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.4.0)(eslint@8.57.0)
eslint-plugin-n: 16.6.2(eslint@8.57.0)
eslint-plugin-promise: 6.1.1(eslint@8.57.0)
dev: true
@@ -3704,7 +3704,7 @@ packages:
peerDependencies:
eslint-plugin-import: '>=1.4.0'
dependencies:
eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0)
eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.4.0)(eslint@8.57.0)
dev: true
/eslint-import-resolver-node@0.3.9:
@@ -3717,7 +3717,7 @@ packages:
- supports-color
dev: true
/eslint-module-utils@2.8.0(@typescript-eslint/parser@7.3.1)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0):
/eslint-module-utils@2.8.0(@typescript-eslint/parser@7.4.0)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0):
resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
engines: {node: '>=4'}
peerDependencies:
@@ -3738,7 +3738,7 @@ packages:
eslint-import-resolver-webpack:
optional: true
dependencies:
'@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3)
'@typescript-eslint/parser': 7.4.0(eslint@8.57.0)(typescript@5.4.3)
debug: 3.2.7
eslint: 8.57.0
eslint-import-resolver-node: 0.3.9
@@ -3765,7 +3765,7 @@ packages:
htmlparser2: 9.1.0
dev: true
/eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.3.1)(eslint@8.57.0):
/eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.4.0)(eslint@8.57.0):
resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==}
engines: {node: '>=4'}
peerDependencies:
@@ -3775,7 +3775,7 @@ packages:
'@typescript-eslint/parser':
optional: true
dependencies:
'@typescript-eslint/parser': 7.3.1(eslint@8.57.0)(typescript@5.4.3)
'@typescript-eslint/parser': 7.4.0(eslint@8.57.0)(typescript@5.4.3)
array-includes: 3.1.7
array.prototype.findlastindex: 1.2.3
array.prototype.flat: 1.3.2
@@ -3784,7 +3784,7 @@ packages:
doctrine: 2.1.0
eslint: 8.57.0
eslint-import-resolver-node: 0.3.9
eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.3.1)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0)
eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.4.0)(eslint-import-resolver-node@0.3.9)(eslint@8.57.0)
hasown: 2.0.0
is-core-module: 2.13.1
is-glob: 4.0.3
@@ -4190,8 +4190,8 @@ packages:
resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
dev: true
/framer-motion@11.0.20(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-YSDmWznt3hpdERosbE0UAPYWoYhTnmQ0J1qWPsgpCia9NgY8Xsz5IpOiUEGGj/nzCAW29fSrWugeLRkdp5de7g==}
/framer-motion@11.0.21(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-blcaJ0LJM2y7AB0c45ijbjtUsoXTga+aJpRWGO/qYLUcpG0dLu2aKBryqfgp5UZ4uXiiZ8UA63q6GLzCK9oZ4Q==}
peerDependencies:
'@emotion/is-prop-valid': '*'
react: ^18.0.0
@@ -5634,7 +5634,7 @@ packages:
/ms@2.1.2:
resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
/mui-color-input@2.0.3(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@5.15.14)(@types/react@18.2.70)(react-dom@18.2.0)(react@18.2.0):
/mui-color-input@2.0.3(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@mui/material@5.15.14)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-rAd040qQ0Y+8dk4gE8kkCiJ/vCgA0j4vv1quJ43BfORTFE3uHarHj0xY1Vo9CPbojtx1f5vW+CjckYPRIZPIRg==}
peerDependencies:
'@emotion/react': ^11.5.0
@@ -5648,10 +5648,10 @@ packages:
optional: true
dependencies:
'@ctrl/tinycolor': 4.0.3
'@emotion/react': 11.11.4(@types/react@18.2.70)(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.70)(react@18.2.0)
'@mui/material': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.70)(react-dom@18.2.0)(react@18.2.0)
'@types/react': 18.2.70
'@emotion/react': 11.11.4(@types/react@18.2.71)(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.4)(@types/react@18.2.71)(react@18.2.0)
'@mui/material': 5.15.14(@emotion/react@11.11.4)(@emotion/styled@11.11.0)(@types/react@18.2.71)(react-dom@18.2.0)(react@18.2.0)
'@types/react': 18.2.71
react: 18.2.0
react-dom: 18.2.0(react@18.2.0)
dev: false
@@ -6181,14 +6181,14 @@ packages:
resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}
dev: false
/react-markdown@9.0.1(@types/react@18.2.70)(react@18.2.0):
/react-markdown@9.0.1(@types/react@18.2.71)(react@18.2.0):
resolution: {integrity: sha512-186Gw/vF1uRkydbsOIkcGXw7aHq0sZOCRFFjGrr7b9+nVZg4UfA4enXCaxm4fUzecU38sWfrNDitGhshuU7rdg==}
peerDependencies:
'@types/react': '>=18'
react: '>=18'
dependencies:
'@types/hast': 3.0.4
'@types/react': 18.2.70
'@types/react': 18.2.71
devlop: 1.1.0
hast-util-to-jsx-runtime: 2.3.0
html-url-attributes: 3.0.0
@@ -6820,7 +6820,7 @@ packages:
inline-style-parser: 0.2.2
dev: false
/stylelint-config-html@1.1.0(postcss-html@1.6.0)(stylelint@16.3.0):
/stylelint-config-html@1.1.0(postcss-html@1.6.0)(stylelint@16.3.1):
resolution: {integrity: sha512-IZv4IVESjKLumUGi+HWeb7skgO6/g4VMuAYrJdlqQFndgbj6WJAXPhaysvBiXefX79upBdQVumgYcdd17gCpjQ==}
engines: {node: ^12 || >=14}
peerDependencies:
@@ -6828,57 +6828,57 @@ packages:
stylelint: '>=14.0.0'
dependencies:
postcss-html: 1.6.0
stylelint: 16.3.0(typescript@5.4.3)
stylelint: 16.3.1(typescript@5.4.3)
dev: true
/stylelint-config-recess-order@5.0.0(stylelint@16.3.0):
/stylelint-config-recess-order@5.0.0(stylelint@16.3.1):
resolution: {integrity: sha512-D+/Got844O96No2mj/H2NhLjj555iKAy/Mea+JCerfKB9TBKQW3/IudSVkTCxE4QiRDLldfH15x6FH1D1Anjhw==}
peerDependencies:
stylelint: '>=16'
dependencies:
stylelint: 16.3.0(typescript@5.4.3)
stylelint-order: 6.0.4(stylelint@16.3.0)
stylelint: 16.3.1(typescript@5.4.3)
stylelint-order: 6.0.4(stylelint@16.3.1)
dev: true
/stylelint-config-recommended@14.0.0(stylelint@16.3.0):
/stylelint-config-recommended@14.0.0(stylelint@16.3.1):
resolution: {integrity: sha512-jSkx290CglS8StmrLp2TxAppIajzIBZKYm3IxT89Kg6fGlxbPiTiyH9PS5YUuVAFwaJLl1ikiXX0QWjI0jmgZQ==}
engines: {node: '>=18.12.0'}
peerDependencies:
stylelint: ^16.0.0
dependencies:
stylelint: 16.3.0(typescript@5.4.3)
stylelint: 16.3.1(typescript@5.4.3)
dev: true
/stylelint-config-standard@36.0.0(stylelint@16.3.0):
/stylelint-config-standard@36.0.0(stylelint@16.3.1):
resolution: {integrity: sha512-3Kjyq4d62bYFp/Aq8PMKDwlgUyPU4nacXsjDLWJdNPRUgpuxALu1KnlAHIj36cdtxViVhXexZij65yM0uNIHug==}
engines: {node: '>=18.12.0'}
peerDependencies:
stylelint: ^16.1.0
dependencies:
stylelint: 16.3.0(typescript@5.4.3)
stylelint-config-recommended: 14.0.0(stylelint@16.3.0)
stylelint: 16.3.1(typescript@5.4.3)
stylelint-config-recommended: 14.0.0(stylelint@16.3.1)
dev: true
/stylelint-declaration-block-no-ignored-properties@2.8.0(stylelint@16.3.0):
/stylelint-declaration-block-no-ignored-properties@2.8.0(stylelint@16.3.1):
resolution: {integrity: sha512-Ws8Cav7Y+SPN0JsV407LrnNXWOrqGjxShf+37GBtnU/C58Syve9c0+I/xpLcFOosST3ternykn3Lp77f3ITnFw==}
engines: {node: '>=6'}
peerDependencies:
stylelint: ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
dependencies:
stylelint: 16.3.0(typescript@5.4.3)
stylelint: 16.3.1(typescript@5.4.3)
dev: true
/stylelint-order@6.0.4(stylelint@16.3.0):
/stylelint-order@6.0.4(stylelint@16.3.1):
resolution: {integrity: sha512-0UuKo4+s1hgQ/uAxlYU4h0o0HS4NiQDud0NAUNI0aa8FJdmYHA5ZZTFHiV5FpmE3071e9pZx5j0QpVJW5zOCUA==}
peerDependencies:
stylelint: ^14.0.0 || ^15.0.0 || ^16.0.1
dependencies:
postcss: 8.4.38
postcss-sorting: 8.0.2(postcss@8.4.38)
stylelint: 16.3.0(typescript@5.4.3)
stylelint: 16.3.1(typescript@5.4.3)
dev: true
/stylelint-scss@6.2.1(stylelint@16.3.0):
/stylelint-scss@6.2.1(stylelint@16.3.1):
resolution: {integrity: sha512-ZoGLbVb1keZYRVGQlhB8G6sZOoNqw61whzzzGFWp05N12ErqLFfBv3JPrXiMLZaW98sBS7K/vUQhRnvUj4vwdw==}
engines: {node: '>=18.12.0'}
peerDependencies:
@@ -6889,11 +6889,11 @@ packages:
postcss-resolve-nested-selector: 0.1.1
postcss-selector-parser: 6.0.15
postcss-value-parser: 4.2.0
stylelint: 16.3.0(typescript@5.4.3)
stylelint: 16.3.1(typescript@5.4.3)
dev: true
/stylelint@16.3.0(typescript@5.4.3):
resolution: {integrity: sha512-hqC6xNTbQ5HRGQXfIW4HwXcx09raIFz4W4XFbraeqWqYRVVY/ibYvI0dsu0ORMQY8re2bpDdCAeIa2cm+QJ4Sw==}
/stylelint@16.3.1(typescript@5.4.3):
resolution: {integrity: sha512-/JOwQnBvxEKOT2RtNgGpBVXnCSMBgKOL2k7w0K52htwCyJls4+cHvc4YZgXlVoAZS9QJd2DgYAiRnja96pTgxw==}
engines: {node: '>=18.12.0'}
hasBin: true
dependencies:

2
clashn/clashN/clashN/App.xaml.cs
View File

@@ -20,7 +20,6 @@ namespace ClashN
if (!bCreatedNew)
{
ProgramStarted.Set();
App.Current.Shutdown();
Environment.Exit(-1);
return;
}
@@ -65,7 +64,6 @@ namespace ClashN
if (ConfigProc.LoadConfig(ref _config) != 0)
{
UI.ShowWarning($"Loading GUI configuration file is abnormal,please restart the application{Environment.NewLine}加载GUI配置文件异常,请重启应用");
Application.Current.Shutdown();
Environment.Exit(0);
return;
}

3
clashn/clashN/clashN/ViewModels/MainWindowViewModel.cs
View File

@@ -8,6 +8,7 @@ using NHotkey;
using ReactiveUI;
using ReactiveUI.Fody.Helpers;
using Splat;
using System.Diagnostics;
using System.Drawing;
using System.Reactive;
using System.Reactive.Linq;
@@ -253,8 +254,8 @@ namespace ClashN.ViewModels
catch { }
finally
{
Application.Current.Shutdown();
Environment.Exit(0);
Process.GetCurrentProcess().Kill();
}
}

6
clashn/clashN/clashN/clashN.csproj
View File

@@ -9,7 +9,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<ApplicationIcon>ClashN.ico</ApplicationIcon>
<Copyright>Copyright © 2019-2024 (GPLv3)</Copyright>
<FileVersion>2.20</FileVersion>
<FileVersion>2.21</FileVersion>
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
</PropertyGroup>
@@ -22,11 +22,11 @@
<PackageReference Include="NHotkey.Wpf" Version="3.0.0" />
<PackageReference Include="QRCoder.Xaml" Version="1.4.3" />
<PackageReference Include="TaskScheduler" Version="2.10.1" />
<PackageReference Include="YamlDotNet" Version="15.1.0" />
<PackageReference Include="YamlDotNet" Version="15.1.2" />
<PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" />
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
<PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
<PackageReference Include="ReactiveUI.WPF" Version="19.5.41" />
<PackageReference Include="ReactiveUI.WPF" Version="19.6.1" />
<PackageReference Include="Splat.NLog" Version="14.8.12" />
<PackageReference Include="System.Reactive" Version="6.0.0" />
</ItemGroup>

2
echo/internal/web/templates/index.html
View File

@@ -58,7 +58,7 @@
<a href="/debug/pprof/">Debug</a>
</li>
<li>
<a href="/connections/"
<a href="/connections/?conn_type=active"
>Current Connections</a
>
</li>

16
hysteria/README.md
View File

@@ -23,23 +23,23 @@
<div class="feature-grid">
<div>
<h3>🛠️ Packed to the gills</h3>
<p>Expansive range of modes including SOCKS5, HTTP proxy, TCP/UDP forwarding, Linux TProxy - not to mention additional features continually being added.</p>
<h3>🛠️ Jack of all trades</h3>
<p>Wide range of modes including SOCKS5, HTTP Proxy, TCP/UDP Forwarding, Linux TProxy, TUN - with more features being added constantly.</p>
</div>
<div>
<h3>⚡ Lightning fast</h3>
<p>Powered by a custom QUIC protocol, Hysteria delivers unparalleled performance over even the most unreliable and lossy networks.</p>
<h3>⚡ Blazing fast</h3>
<p>Powered by a customized QUIC protocol, Hysteria is designed to deliver unparalleled performance over unreliable and lossy networks.</p>
</div>
<div>
<h3>✊ Censorship resistant</h3>
<p>Our protocol is designed to masquerade as standard HTTP/3 traffic, making it very difficult to detect and block without widespread collateral damage.</p>
<p>The protocol masquerades as standard HTTP/3 traffic, making it very difficult for censors to detect and block without widespread collateral damage.</p>
</div>
<div>
<h3>💻 Cross-platform</h3>
<p>We have builds for all major platforms and architectures. Deploy anywhere & use everywhere.</p>
<p>We have builds for every major platform and architecture. Deploy anywhere & use everywhere. Not to mention the long list of 3rd party apps.</p>
</div>
<div>
@@ -48,8 +48,8 @@
</div>
<div>
<h3>🤗 Open standards</h3>
<p>We have well-documented specifications and code for developers to contribute and build their own apps.</p>
<h3>🤗 Cards on the table</h3>
<p>We have well-documented specifications and code for developers to contribute and build their own apps. And a helpful community, too.</p>
</div>
</div>

5
lede/package/lean/vsftpd-alt/Makefile
View File

@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=vsftpd-alt
PKG_NAME:=vsftpd-alt
PKG_VERSION:=3.0.5
PKG_RELEASE:=2
@@ -15,6 +15,7 @@ PKG_SOURCE:=vsftpd-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://security.appspot.com/downloads/
PKG_HASH:=26b602ae454b0ba6d99ef44a09b6b9e0dfa7f67228106736df1f278c70bc91d3
PKG_LICENSE:=GPLv2
PKG_CPE_ID:=cpe:/a:vsftpd_project:vsftpd
BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DIR:=$(BUILD_DIR)/vsftpd-$(PKG_VERSION)
@@ -65,7 +66,7 @@ define Build/Compile
$(SED) 's/-lcrypt -lnsl/$(NLSSTRING)/' $(PKG_BUILD_DIR)/Makefile
$(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
CFLAGS="$(TARGET_CFLAGS)" \
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
vsftpd
endef

5
mihomo/transport/vmess/http.go
View File

@@ -3,6 +3,7 @@ package vmess
import (
"bufio"
"bytes"
"errors"
"fmt"
"net"
"net/http"
@@ -54,6 +55,10 @@ func (hc *httpConn) Write(b []byte) (int, error) {
return hc.Conn.Write(b)
}
if len(hc.cfg.Path) == 0 {
return -1, errors.New("path is empty")
}
path := hc.cfg.Path[fastrand.Intn(len(hc.cfg.Path))]
host := hc.cfg.Host
if header := hc.cfg.Headers["Host"]; len(header) != 0 {

4
openwrt-packages/ddns-go/Makefile
View File

@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ddns-go
PKG_VERSION:=6.2.2
PKG_VERSION:=6.3.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/jeessy2/ddns-go/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=9c1ccfe60ea1e6fc81d2905b5ef7c7bd403a1858de4f0d3aed81e57bce8cfaa0
PKG_HASH:=307a0b045f3631b0f67d566903b80d0ecdd47c8159000ee0d93debe3c59097a0
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE

1
openwrt-packages/luci-theme-tomato/Makefile
View File

@@ -1,5 +1,6 @@
# LuCI Material Theme
# Copyright 2015 Lutty Yang <lutty@wcan.in>
#
# Licensed under the Apache License v2.0
# http://www.apache.org/licenses/LICENSE-2.0

8
sing-box/.goreleaser.fury.yaml
View File

@@ -60,6 +60,7 @@ nfpms:
- id: package_beta
<<: *template
package_name: sing-box-beta
file_name_template: '{{ .ProjectName }}-beta_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
formats:
- deb
- rpm
@@ -71,10 +72,9 @@ furies:
- account: sagernet
ids:
- package
skip: |-
{{ eq .Prerelease "" }}
skip: "{{ .Prerelease }}"
- account: sagernet
ids:
- package_beta
skip: |-
{{ ne .Prerelease "" }}
skip: "{{ not .Prerelease }}"

2
sing-box/docs/changelog.md
View File

@@ -2,7 +2,7 @@
icon: material/alert-decagram
---
#### 1.9.0-rc.2
#### 1.9.0-rc.3
* Fixes and improvements

2
sing-box/go.mod
View File

@@ -26,7 +26,7 @@ require (
github.com/sagernet/gvisor v0.0.0-20240315080113-799fb6b6d311
github.com/sagernet/quic-go v0.42.0-beta.2
github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691
github.com/sagernet/sing v0.4.0-beta.5
github.com/sagernet/sing v0.4.0-beta.6
github.com/sagernet/sing-dns v0.2.0-beta.16
github.com/sagernet/sing-mux v0.2.0
github.com/sagernet/sing-quic v0.1.9-beta.3

4
sing-box/go.sum
View File

@@ -109,8 +109,8 @@ github.com/sagernet/quic-go v0.42.0-beta.2/go.mod h1:lf8OYop+fMxIlrfM/ZHpENt/7ZD
github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 h1:5Th31OC6yj8byLGkEnIYp6grlXfo1QYUfiYFGjewIdc=
github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691/go.mod h1:B8lp4WkQ1PwNnrVMM6KyuFR20pU8jYBD+A4EhJovEXU=
github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo=
github.com/sagernet/sing v0.4.0-beta.5 h1:2RXOU+Hrb5gEOFA+S6Ji+7egLoWj6QMAFpbO1SQ3XTM=
github.com/sagernet/sing v0.4.0-beta.5/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
github.com/sagernet/sing v0.4.0-beta.6 h1:z7plSB0lWX2vt3e5UYYNQi1+bNqfxU9uh1nWlPZFwj8=
github.com/sagernet/sing v0.4.0-beta.6/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
github.com/sagernet/sing-dns v0.2.0-beta.16 h1:bzd4B8eHD7/WO3HrYknvgE8A56/R3n5oXBjNF97iPzQ=
github.com/sagernet/sing-dns v0.2.0-beta.16/go.mod h1:XU6Vqr6aHcMz/34Fcv8jmXpRCEuShzW+B7Qg1Xe1nxY=
github.com/sagernet/sing-mux v0.2.0 h1:4C+vd8HztJCWNYfufvgL49xaOoOHXty2+EAjnzN3IYo=

112
sing-box/ntp/service.go
View File

@@ -1,112 +0,0 @@
package ntp
import (
"context"
"os"
"time"
"github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing-box/common/dialer"
"github.com/sagernet/sing-box/common/settings"
C "github.com/sagernet/sing-box/constant"
"github.com/sagernet/sing-box/option"
"github.com/sagernet/sing/common"
E "github.com/sagernet/sing/common/exceptions"
"github.com/sagernet/sing/common/logger"
M "github.com/sagernet/sing/common/metadata"
N "github.com/sagernet/sing/common/network"
"github.com/sagernet/sing/common/ntp"
)
var _ ntp.TimeService = (*Service)(nil)
type Service struct {
ctx context.Context
cancel common.ContextCancelCauseFunc
server M.Socksaddr
writeToSystem bool
dialer N.Dialer
logger logger.Logger
ticker *time.Ticker
clockOffset time.Duration
}
func NewService(ctx context.Context, router adapter.Router, logger logger.Logger, options option.NTPOptions) (*Service, error) {
ctx, cancel := common.ContextWithCancelCause(ctx)
server := M.ParseSocksaddrHostPort(options.Server, options.ServerPort)
if server.Port == 0 {
server.Port = 123
}
var interval time.Duration
if options.Interval > 0 {
interval = time.Duration(options.Interval)
} else {
interval = 30 * time.Minute
}
outboundDialer, err := dialer.New(router, options.DialerOptions)
if err != nil {
return nil, err
}
return &Service{
ctx: ctx,
cancel: cancel,
server: server,
writeToSystem: options.WriteToSystem,
dialer: outboundDialer,
logger: logger,
ticker: time.NewTicker(interval),
}, nil
}
func (s *Service) Start() error {
err := s.update()
if err != nil {
return E.Cause(err, "initialize time")
}
s.logger.Info("updated time: ", s.TimeFunc()().Local().Format(C.TimeLayout))
go s.loopUpdate()
return nil
}
func (s *Service) Close() error {
s.ticker.Stop()
s.cancel(os.ErrClosed)
return nil
}
func (s *Service) TimeFunc() func() time.Time {
return func() time.Time {
return time.Now().Add(s.clockOffset)
}
}
func (s *Service) loopUpdate() {
for {
select {
case <-s.ctx.Done():
return
case <-s.ticker.C:
}
err := s.update()
if err == nil {
s.logger.Debug("updated time: ", s.TimeFunc()().Local().Format(C.TimeLayout))
} else {
s.logger.Warn("update time: ", err)
}
}
}
func (s *Service) update() error {
response, err := ntp.Exchange(s.ctx, s.dialer, s.server)
if err != nil {
return err
}
s.clockOffset = response.ClockOffset
if s.writeToSystem {
writeErr := settings.SetSystemTime(s.TimeFunc()())
if writeErr != nil {
s.logger.Warn("write time to system: ", writeErr)
}
}
return nil
}

3
sing-box/option/ntp.go
View File

@@ -2,9 +2,8 @@ package option
type NTPOptions struct {
Enabled bool `json:"enabled,omitempty"`
Server string `json:"server,omitempty"`
ServerPort uint16 `json:"server_port,omitempty"`
Interval Duration `json:"interval,omitempty"`
WriteToSystem bool `json:"write_to_system,omitempty"`
ServerOptions
DialerOptions
}

17
sing-box/route/router.go
View File

@@ -23,7 +23,6 @@ import (
C "github.com/sagernet/sing-box/constant"
"github.com/sagernet/sing-box/experimental/libbox/platform"
"github.com/sagernet/sing-box/log"
"github.com/sagernet/sing-box/ntp"
"github.com/sagernet/sing-box/option"
"github.com/sagernet/sing-box/outbound"
"github.com/sagernet/sing-box/transport/fakeip"
@@ -40,7 +39,7 @@ import (
F "github.com/sagernet/sing/common/format"
M "github.com/sagernet/sing/common/metadata"
N "github.com/sagernet/sing/common/network"
serviceNTP "github.com/sagernet/sing/common/ntp"
"github.com/sagernet/sing/common/ntp"
"github.com/sagernet/sing/common/task"
"github.com/sagernet/sing/common/uot"
"github.com/sagernet/sing/common/winpowrprof"
@@ -363,11 +362,19 @@ func NewRouter(
}
if ntpOptions.Enabled {
timeService, err := ntp.NewService(ctx, router, logFactory.NewLogger("ntp"), ntpOptions)
ntpDialer, err := dialer.New(router, ntpOptions.DialerOptions)
if err != nil {
return nil, err
return nil, E.Cause(err, "create NTP service")
}
service.ContextWith[serviceNTP.TimeService](ctx, timeService)
timeService := ntp.NewService(ntp.Options{
Context: ctx,
Dialer: ntpDialer,
Logger: logFactory.NewLogger("ntp"),
Server: ntpOptions.ServerOptions.Build(),
Interval: time.Duration(ntpOptions.Interval),
WriteToSystem: ntpOptions.WriteToSystem,
})
service.MustRegister[ntp.TimeService](ctx, timeService)
router.timeService = timeService
}
return router, nil

15
small/shadowsocksr-libev/patches/104-fix-use-after-free.patch Normal file
View File

@@ -0,0 +1,15 @@
--- a/server/server.c
+++ b/server/server.c
@@ -1942,11 +1942,11 @@ main(int argc, char **argv)
text = (char*)malloc(strlen(protocol) - 11);
memcpy(text, protocol, strlen(protocol) - 11);
int length = strlen(protocol) - 11;
- free(protocol);
obfs = (char*)malloc(length);
memset(protocol, 0x00, length);
memcpy(protocol, text, length);
LOGI("protocol compatible enable, %s", protocol);
+ free(protocol);
free(text);
protocol_compatible = 1;
}

4
small/trojan-plus/Makefile
View File

@@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=trojan-plus
PKG_VERSION:=10.0.3
PKG_VERSION:=10.0.3
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/peter-tank/trojan-plus/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=0240f5b4d2a37074ab33b414a8b60d5f5b4778bd226586a2bd9a5c87a12896ed
PKG_HASH:=0240f5b4d2a37074ab33b414a8b60d5f5b4778bd226586a2bd9a5c87a12896ed
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=openssl

2
v2rayn/v2rayN/ProtosLib/ProtosLib.csproj
View File

@@ -9,7 +9,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.25.3" />
<PackageReference Include="Google.Protobuf" Version="3.26.0" />
<PackageReference Include="Grpc.Net.Client" Version="2.61.0" />
<PackageReference Include="Grpc.Tools" Version="2.62.0">
<PrivateAssets>all</PrivateAssets>

6
v2rayn/v2rayN/v2rayN/App.xaml.cs
View File

@@ -27,14 +27,13 @@ namespace v2rayN
/// <param name="e"></param>
protected override void OnStartup(StartupEventArgs e)
{
var exePathKey = Utile.GetMD5(Utile.GetExePath());
var exePathKey = Utils.GetMD5(Utils.GetExePath());
var rebootas = (e.Args ?? new string[] { }).Any(t => t == Global.RebootAs);
ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew);
if (!rebootas && !bCreatedNew)
{
ProgramStarted.Set();
Current.Shutdown();
Environment.Exit(0);
return;
}
@@ -42,7 +41,7 @@ namespace v2rayN
Logging.Setup();
Init();
Logging.LoggingEnabled(_config.guiItem.enableLog);
Logging.SaveLog($"v2rayN start up | {Utile.GetVersion()} | {Utile.GetExePath()}");
Logging.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
Logging.ClearLogs();
Thread.CurrentThread.CurrentUICulture = new(_config.uiItem.currentLanguage);
@@ -55,7 +54,6 @@ namespace v2rayN
if (ConfigHandler.LoadConfig(ref _config) != 0)
{
UI.Show($"Loading GUI configuration file is abnormal,please restart the application{Environment.NewLine}加载GUI配置文件异常,请重启应用");
Application.Current.Shutdown();
Environment.Exit(0);
return;
}

12
v2rayn/v2rayN/v2rayN/Common/DownloaderHelper.cs
View File

@@ -11,7 +11,7 @@ namespace v2rayN
public async Task<string?> DownloadStringAsync(IWebProxy? webProxy, string url, string? userAgent, int timeout)
{
if (Utile.IsNullOrEmpty(url))
if (Utils.IsNullOrEmpty(url))
{
return null;
}
@@ -19,9 +19,9 @@ namespace v2rayN
Uri uri = new(url);
//Authorization Header
var headers = new WebHeaderCollection();
if (!Utile.IsNullOrEmpty(uri.UserInfo))
if (!Utils.IsNullOrEmpty(uri.UserInfo))
{
headers.Add(HttpRequestHeader.Authorization, "Basic " + Utile.Base64Encode(uri.UserInfo));
headers.Add(HttpRequestHeader.Authorization, "Basic " + Utils.Base64Encode(uri.UserInfo));
}
var downloadOpt = new DownloadConfiguration()
@@ -57,7 +57,7 @@ namespace v2rayN
public async Task DownloadDataAsync4Speed(IWebProxy webProxy, string url, IProgress<string> progress, int timeout)
{
if (Utile.IsNullOrEmpty(url))
if (Utils.IsNullOrEmpty(url))
{
throw new ArgumentNullException(nameof(url));
}
@@ -120,11 +120,11 @@ namespace v2rayN
public async Task DownloadFileAsync(IWebProxy? webProxy, string url, string fileName, IProgress<double> progress, int timeout)
{
if (Utile.IsNullOrEmpty(url))
if (Utils.IsNullOrEmpty(url))
{
throw new ArgumentNullException(nameof(url));
}
if (Utile.IsNullOrEmpty(fileName))
if (Utils.IsNullOrEmpty(fileName))
{
throw new ArgumentNullException(nameof(fileName));
}

2
v2rayn/v2rayN/v2rayN/Common/FileManager.cs
View File

@@ -67,7 +67,7 @@ namespace v2rayN
}
try
{
if (!Utile.IsNullOrEmpty(ignoredName) && entry.Name.Contains(ignoredName))
if (!Utils.IsNullOrEmpty(ignoredName) && entry.Name.Contains(ignoredName))
{
continue;
}

8
v2rayn/v2rayN/v2rayN/Common/HttpClientHelper.cs
View File

@@ -23,19 +23,19 @@ namespace v2rayN
public async Task<string?> GetAsync(string url)
{
if (Utile.IsNullOrEmpty(url)) return null;
if (Utils.IsNullOrEmpty(url)) return null;
return await httpClient.GetStringAsync(url);
}
public async Task<string?> GetAsync(HttpClient client, string url, CancellationToken token = default)
{
if (Utile.IsNullOrEmpty(url)) return null;
if (Utils.IsNullOrEmpty(url)) return null;
return await client.GetStringAsync(url, token);
}
public async Task PutAsync(string url, Dictionary<string, string> headers)
{
var jsonContent = JsonUtile.Serialize(headers);
var jsonContent = JsonUtils.Serialize(headers);
var content = new StringContent(jsonContent, Encoding.UTF8, MediaTypeNames.Application.Json);
var result = await httpClient.PutAsync(url, content);
@@ -88,7 +88,7 @@ namespace v2rayN
public async Task DownloadDataAsync4Speed(HttpClient client, string url, IProgress<string> progress, CancellationToken token = default)
{
if (Utile.IsNullOrEmpty(url))
if (Utils.IsNullOrEmpty(url))
{
throw new ArgumentNullException(nameof(url));
}

2
v2rayn/v2rayN/v2rayN/Common/JsonUtile.cs → v2rayn/v2rayN/v2rayN/Common/JsonUtils.cs
View File

@@ -5,7 +5,7 @@ using System.Text.Json.Serialization;
namespace v2rayN
{
internal class JsonUtile
internal class JsonUtils
{
/// <summary>
/// DeepCopy

4
v2rayn/v2rayN/v2rayN/Common/Logging.cs
View File

@@ -13,7 +13,7 @@ namespace v2rayN
FileTarget fileTarget = new();
config.AddTarget("file", fileTarget);
fileTarget.Layout = "${longdate}-${level:uppercase=true} ${message}";
fileTarget.FileName = Utile.GetLogPath("${shortdate}.txt");
fileTarget.FileName = Utils.GetLogPath("${shortdate}.txt");
config.LoggingRules.Add(new LoggingRule("*", LogLevel.Debug, fileTarget));
LogManager.Configuration = config;
}
@@ -33,7 +33,7 @@ namespace v2rayN
try
{
var now = DateTime.Now.AddMonths(-1);
var dir = Utile.GetLogPath();
var dir = Utils.GetLogPath();
var files = Directory.GetFiles(dir, "*.txt");
foreach (var filePath in files)
{

2
v2rayn/v2rayN/v2rayN/Common/SqliteHelper.cs
View File

@@ -15,7 +15,7 @@ namespace v2rayN
public SQLiteHelper()
{
_connstr = Utile.GetConfigPath(_configDB);
_connstr = Utils.GetConfigPath(_configDB);
_db = new SQLiteConnection(_connstr, false);
_dbAsync = new SQLiteAsyncConnection(_connstr, false);
}

22
v2rayn/v2rayN/v2rayN/Common/Utile.cs → v2rayn/v2rayN/v2rayN/Common/Utils.cs
View File

@@ -25,7 +25,7 @@ using ZXing.Windows.Compatibility;
namespace v2rayN
{
internal class Utile
internal class Utils
{
#region 资源Json操作
@@ -361,7 +361,7 @@ namespace v2rayN
/// <returns></returns>
public static string GetPunycode(string url)
{
if (Utile.IsNullOrEmpty(url))
if (Utils.IsNullOrEmpty(url))
{
return url;
}
@@ -391,7 +391,7 @@ namespace v2rayN
public static string Convert2Comma(string text)
{
if (Utile.IsNullOrEmpty(text))
if (Utils.IsNullOrEmpty(text))
{
return text;
}
@@ -583,7 +583,7 @@ namespace v2rayN
{
try
{
if (!Utile.PortInUse(defaultPort))
if (!Utils.PortInUse(defaultPort))
{
return defaultPort;
}
@@ -840,7 +840,7 @@ namespace v2rayN
{
Directory.CreateDirectory(_tempPath);
}
if (Utile.IsNullOrEmpty(filename))
if (Utils.IsNullOrEmpty(filename))
{
return _tempPath;
}
@@ -876,7 +876,7 @@ namespace v2rayN
{
Directory.CreateDirectory(_tempPath);
}
if (Utile.IsNullOrEmpty(filename))
if (Utils.IsNullOrEmpty(filename))
{
return _tempPath;
}
@@ -901,7 +901,7 @@ namespace v2rayN
Directory.CreateDirectory(_tempPath);
}
}
if (Utile.IsNullOrEmpty(filename))
if (Utils.IsNullOrEmpty(filename))
{
return _tempPath;
}
@@ -918,7 +918,7 @@ namespace v2rayN
{
Directory.CreateDirectory(_tempPath);
}
if (Utile.IsNullOrEmpty(filename))
if (Utils.IsNullOrEmpty(filename))
{
return _tempPath;
}
@@ -935,7 +935,7 @@ namespace v2rayN
{
Directory.CreateDirectory(_tempPath);
}
if (Utile.IsNullOrEmpty(filename))
if (Utils.IsNullOrEmpty(filename))
{
return _tempPath;
}
@@ -1107,7 +1107,7 @@ namespace v2rayN
/// <exception cref="ArgumentNullException"></exception>
public static void AutoStart(string taskName, string fileName, string description)
{
if (Utile.IsNullOrEmpty(taskName))
if (Utils.IsNullOrEmpty(taskName))
{
return;
}
@@ -1122,7 +1122,7 @@ namespace v2rayN
{
taskService.RootFolder.DeleteTask(t.Name);
}
if (Utile.IsNullOrEmpty(fileName))
if (Utils.IsNullOrEmpty(fileName))
{
return;
}

4
v2rayn/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
View File

@@ -12,9 +12,9 @@ namespace v2rayN.Converters
try
{
var fontFamily = LazyConfig.Instance.GetConfig().uiItem.currentFontFamily;
if (!Utile.IsNullOrEmpty(fontFamily))
if (!Utils.IsNullOrEmpty(fontFamily))
{
var fontPath = Utile.GetFontsPath();
var fontPath = Utils.GetFontsPath();
MyFont = new FontFamily(new Uri(@$"file:///{fontPath}\"), $"./#{fontFamily}");
}
}

186
v2rayn/v2rayN/v2rayN/Handler/ConfigHandler.cs
View File

@@ -23,15 +23,15 @@ namespace v2rayN.Handler
public static int LoadConfig(ref Config? config)
{
//载入配置文件
var result = Utile.LoadResource(Utile.GetConfigPath(configRes));
if (!Utile.IsNullOrEmpty(result))
var result = Utils.LoadResource(Utils.GetConfigPath(configRes));
if (!Utils.IsNullOrEmpty(result))
{
//转成Json
config = JsonUtile.Deserialize<Config>(result);
config = JsonUtils.Deserialize<Config>(result);
}
else
{
if (File.Exists(Utile.GetConfigPath(configRes)))
if (File.Exists(Utils.GetConfigPath(configRes)))
{
Logging.SaveLog("LoadConfig Exception");
return -1;
@@ -85,7 +85,7 @@ namespace v2rayN.Handler
};
}
//路由规则
if (Utile.IsNullOrEmpty(config.routingBasicItem.domainStrategy))
if (Utils.IsNullOrEmpty(config.routingBasicItem.domainStrategy))
{
config.routingBasicItem.domainStrategy = Global.DomainStrategies[0];//"IPIfNonMatch";
}
@@ -144,7 +144,7 @@ namespace v2rayN.Handler
{
config.uiItem.mainColumnItem = new();
}
if (Utile.IsNullOrEmpty(config.uiItem.currentLanguage))
if (Utils.IsNullOrEmpty(config.uiItem.currentLanguage))
{
config.uiItem.currentLanguage = Global.Languages[0];
}
@@ -153,7 +153,7 @@ namespace v2rayN.Handler
{
config.constItem = new ConstItem();
}
if (Utile.IsNullOrEmpty(config.constItem.defIEProxyExceptions))
if (Utils.IsNullOrEmpty(config.constItem.defIEProxyExceptions))
{
config.constItem.defIEProxyExceptions = Global.IEProxyExceptions;
}
@@ -166,11 +166,11 @@ namespace v2rayN.Handler
{
config.speedTestItem.speedTestTimeout = 10;
}
if (Utile.IsNullOrEmpty(config.speedTestItem.speedTestUrl))
if (Utils.IsNullOrEmpty(config.speedTestItem.speedTestUrl))
{
config.speedTestItem.speedTestUrl = Global.SpeedTestUrls[0];
}
if (Utile.IsNullOrEmpty(config.speedTestItem.speedPingTestUrl))
if (Utils.IsNullOrEmpty(config.speedTestItem.speedPingTestUrl))
{
config.speedTestItem.speedPingTestUrl = Global.SpeedPingTestUrl;
}
@@ -220,9 +220,9 @@ namespace v2rayN.Handler
try
{
//save temp file
var resPath = Utile.GetConfigPath(configRes);
var resPath = Utils.GetConfigPath(configRes);
var tempPath = $"{resPath}_temp";
if (JsonUtile.ToFile(config, tempPath) != 0)
if (JsonUtils.ToFile(config, tempPath) != 0)
{
return;
}
@@ -243,34 +243,34 @@ namespace v2rayN.Handler
public static int ImportOldGuiConfig(Config config, string fileName)
{
var result = Utile.LoadResource(fileName);
if (Utile.IsNullOrEmpty(result))
var result = Utils.LoadResource(fileName);
if (Utils.IsNullOrEmpty(result))
{
return -1;
}
var configOld = JsonUtile.Deserialize<ConfigOld>(result);
var configOld = JsonUtils.Deserialize<ConfigOld>(result);
if (configOld == null)
{
return -1;
}
var subItem = JsonUtile.Deserialize<List<SubItem>>(JsonUtile.Serialize(configOld.subItem));
var subItem = JsonUtils.Deserialize<List<SubItem>>(JsonUtils.Serialize(configOld.subItem));
foreach (var it in subItem)
{
if (Utile.IsNullOrEmpty(it.id))
if (Utils.IsNullOrEmpty(it.id))
{
it.id = Utile.GetGUID(false);
it.id = Utils.GetGUID(false);
}
SQLiteHelper.Instance.Replace(it);
}
var profileItems = JsonUtile.Deserialize<List<ProfileItem>>(JsonUtile.Serialize(configOld.vmess));
var profileItems = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(configOld.vmess));
foreach (var it in profileItems)
{
if (Utile.IsNullOrEmpty(it.indexId))
if (Utils.IsNullOrEmpty(it.indexId))
{
it.indexId = Utile.GetGUID(false);
it.indexId = Utils.GetGUID(false);
}
SQLiteHelper.Instance.Replace(it);
}
@@ -281,22 +281,22 @@ namespace v2rayN.Handler
{
continue;
}
var routing = JsonUtile.Deserialize<RoutingItem>(JsonUtile.Serialize(it));
var routing = JsonUtils.Deserialize<RoutingItem>(JsonUtils.Serialize(it));
foreach (var it2 in it.rules)
{
it2.id = Utile.GetGUID(false);
it2.id = Utils.GetGUID(false);
}
routing.ruleNum = it.rules.Count;
routing.ruleSet = JsonUtile.Serialize(it.rules, false);
routing.ruleSet = JsonUtils.Serialize(it.rules, false);
if (Utile.IsNullOrEmpty(routing.id))
if (Utils.IsNullOrEmpty(routing.id))
{
routing.id = Utile.GetGUID(false);
routing.id = Utils.GetGUID(false);
}
SQLiteHelper.Instance.Replace(routing);
}
config = JsonUtile.Deserialize<Config>(JsonUtile.Serialize(configOld));
config = JsonUtils.Deserialize<Config>(JsonUtils.Serialize(configOld));
if (config.coreBasicItem == null)
{
@@ -412,13 +412,13 @@ namespace v2rayN.Handler
continue;
}
ProfileItem profileItem = JsonUtile.DeepCopy(item);
ProfileItem profileItem = JsonUtils.DeepCopy(item);
profileItem.indexId = string.Empty;
profileItem.remarks = $"{item.remarks}-clone";
if (profileItem.configType == EConfigType.Custom)
{
profileItem.address = Utile.GetConfigPath(profileItem.address);
profileItem.address = Utils.GetConfigPath(profileItem.address);
if (AddCustomServer(config, profileItem, false) == 0)
{
}
@@ -440,7 +440,7 @@ namespace v2rayN.Handler
/// <returns></returns>
public static int SetDefaultServerIndex(Config config, string? indexId)
{
if (Utile.IsNullOrEmpty(indexId))
if (Utils.IsNullOrEmpty(indexId))
{
return -1;
}
@@ -570,12 +570,12 @@ namespace v2rayN.Handler
return -1;
}
var ext = Path.GetExtension(fileName);
string newFileName = $"{Utile.GetGUID()}{ext}";
string newFileName = $"{Utils.GetGUID()}{ext}";
//newFileName = Path.Combine(Utile.GetTempPath(), newFileName);
try
{
File.Copy(fileName, Utile.GetConfigPath(newFileName));
File.Copy(fileName, Utils.GetConfigPath(newFileName));
if (blDelete)
{
File.Delete(fileName);
@@ -589,7 +589,7 @@ namespace v2rayN.Handler
profileItem.address = newFileName;
profileItem.configType = EConfigType.Custom;
if (Utile.IsNullOrEmpty(profileItem.remarks))
if (Utils.IsNullOrEmpty(profileItem.remarks))
{
profileItem.remarks = $"import custom@{DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")}";
}
@@ -676,7 +676,7 @@ namespace v2rayN.Handler
profileItem.address = profileItem.address.TrimEx();
profileItem.id = profileItem.id.TrimEx();
if (Utile.IsNullOrEmpty(profileItem.streamSecurity))
if (Utils.IsNullOrEmpty(profileItem.streamSecurity))
{
profileItem.streamSecurity = Global.StreamSecurity;
}
@@ -706,7 +706,7 @@ namespace v2rayN.Handler
profileItem.path = profileItem.path.TrimEx();
profileItem.network = string.Empty;
if (Utile.IsNullOrEmpty(profileItem.streamSecurity))
if (Utils.IsNullOrEmpty(profileItem.streamSecurity))
{
profileItem.streamSecurity = Global.StreamSecurity;
}
@@ -741,11 +741,11 @@ namespace v2rayN.Handler
profileItem.headerType = Global.TuicCongestionControls.FirstOrDefault()!;
}
if (Utile.IsNullOrEmpty(profileItem.streamSecurity))
if (Utils.IsNullOrEmpty(profileItem.streamSecurity))
{
profileItem.streamSecurity = Global.StreamSecurity;
}
if (Utile.IsNullOrEmpty(profileItem.alpn))
if (Utils.IsNullOrEmpty(profileItem.alpn))
{
profileItem.alpn = "h3";
}
@@ -913,7 +913,7 @@ namespace v2rayN.Handler
{
return -1;
}
if (!Utile.IsNullOrEmpty(profileItem.security) && profileItem.security != Global.None)
if (!Utils.IsNullOrEmpty(profileItem.security) && profileItem.security != Global.None)
{
profileItem.security = Global.None;
}
@@ -951,7 +951,7 @@ namespace v2rayN.Handler
{
profileItem.configVersion = 2;
if (!Utile.IsNullOrEmpty(profileItem.streamSecurity))
if (!Utils.IsNullOrEmpty(profileItem.streamSecurity))
{
if (profileItem.streamSecurity != Global.StreamSecurity
&& profileItem.streamSecurity != Global.StreamSecurityReality)
@@ -960,26 +960,26 @@ namespace v2rayN.Handler
}
else
{
if (Utile.IsNullOrEmpty(profileItem.allowInsecure))
if (Utils.IsNullOrEmpty(profileItem.allowInsecure))
{
profileItem.allowInsecure = config.coreBasicItem.defAllowInsecure.ToString().ToLower();
}
if (Utile.IsNullOrEmpty(profileItem.fingerprint) && profileItem.streamSecurity == Global.StreamSecurityReality)
if (Utils.IsNullOrEmpty(profileItem.fingerprint) && profileItem.streamSecurity == Global.StreamSecurityReality)
{
profileItem.fingerprint = config.coreBasicItem.defFingerprint;
}
}
}
if (!Utile.IsNullOrEmpty(profileItem.network) && !Global.Networks.Contains(profileItem.network))
if (!Utils.IsNullOrEmpty(profileItem.network) && !Global.Networks.Contains(profileItem.network))
{
profileItem.network = Global.DefaultNetwork;
}
var maxSort = -1;
if (Utile.IsNullOrEmpty(profileItem.indexId))
if (Utils.IsNullOrEmpty(profileItem.indexId))
{
profileItem.indexId = Utile.GetGUID(false);
profileItem.indexId = Utils.GetGUID(false);
maxSort = ProfileExHandler.Instance.GetMaxSort();
}
if (!toFile && maxSort < 0)
@@ -1032,7 +1032,7 @@ namespace v2rayN.Handler
}
if (item.configType == EConfigType.Custom)
{
File.Delete(Utile.GetConfigPath(item.address));
File.Delete(Utils.GetConfigPath(item.address));
}
SQLiteHelper.Instance.Delete(item);
@@ -1058,14 +1058,14 @@ namespace v2rayN.Handler
/// <returns>成功导入的数量</returns>
private static int AddBatchServers(Config config, string clipboardData, string subid, bool isSub, List<ProfileItem> lstOriSub)
{
if (Utile.IsNullOrEmpty(clipboardData))
if (Utils.IsNullOrEmpty(clipboardData))
{
return -1;
}
string subFilter = string.Empty;
//remove sub items
if (isSub && !Utile.IsNullOrEmpty(subid))
if (isSub && !Utils.IsNullOrEmpty(subid))
{
RemoveServerViaSubid(config, subid, isSub);
subFilter = LazyConfig.Instance.GetSubItem(subid)?.filter ?? "";
@@ -1098,7 +1098,7 @@ namespace v2rayN.Handler
}
//exist sub items
if (isSub && !Utile.IsNullOrEmpty(subid))
if (isSub && !Utils.IsNullOrEmpty(subid))
{
var existItem = lstOriSub?.FirstOrDefault(t => t.isSub == isSub
&& config.uiItem.enableUpdateSubOnlyRemarksExist ? t.remarks == profileItem.remarks : CompareProfileItem(t, profileItem, true));
@@ -1120,7 +1120,7 @@ namespace v2rayN.Handler
}
}
//filter
if (!Utile.IsNullOrEmpty(subFilter))
if (!Utils.IsNullOrEmpty(subFilter))
{
if (!Regex.IsMatch(profileItem.remarks, subFilter))
{
@@ -1162,7 +1162,7 @@ namespace v2rayN.Handler
private static int AddBatchServers4Custom(Config config, string clipboardData, string subid, bool isSub, List<ProfileItem> lstOriSub)
{
if (Utile.IsNullOrEmpty(clipboardData))
if (Utils.IsNullOrEmpty(clipboardData))
{
return -1;
}
@@ -1178,10 +1178,10 @@ namespace v2rayN.Handler
}
//Is v2ray array configuration
var configObjects = JsonUtile.Deserialize<Object[]>(clipboardData);
var configObjects = JsonUtils.Deserialize<Object[]>(clipboardData);
if (configObjects != null && configObjects.Length > 0)
{
if (isSub && !Utile.IsNullOrEmpty(subid))
if (isSub && !Utils.IsNullOrEmpty(subid))
{
RemoveServerViaSubid(config, subid, isSub);
}
@@ -1189,11 +1189,11 @@ namespace v2rayN.Handler
int count = 0;
foreach (var configObject in configObjects)
{
var objectString = JsonUtile.Serialize(configObject);
var v2rayCon = JsonUtile.Deserialize<V2rayConfig>(objectString);
var objectString = JsonUtils.Serialize(configObject);
var v2rayCon = JsonUtils.Deserialize<V2rayConfig>(objectString);
if (v2rayCon?.inbounds?.Count > 0 && v2rayCon.outbounds?.Count > 0)
{
var fileName = Utile.GetTempPath($"{Utile.GetGUID(false)}.json");
var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
File.WriteAllText(fileName, objectString);
var profileIt = new ProfileItem
@@ -1219,11 +1219,11 @@ namespace v2rayN.Handler
ProfileItem profileItem = new();
//Is v2ray configuration
var v2rayConfig = JsonUtile.Deserialize<V2rayConfig>(clipboardData);
var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(clipboardData);
if (v2rayConfig?.inbounds?.Count > 0
&& v2rayConfig.outbounds?.Count > 0)
{
var fileName = Utile.GetTempPath($"{Utile.GetGUID(false)}.json");
var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
File.WriteAllText(fileName, clipboardData);
profileItem.coreType = ECoreType.Xray;
@@ -1233,7 +1233,7 @@ namespace v2rayN.Handler
//Is Clash configuration
else if (Contains(clipboardData, "port", "socks-port", "proxies"))
{
var fileName = Utile.GetTempPath($"{Utile.GetGUID(false)}.yaml");
var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.yaml");
File.WriteAllText(fileName, clipboardData);
profileItem.coreType = ECoreType.mihomo;
@@ -1243,7 +1243,7 @@ namespace v2rayN.Handler
//Is hysteria configuration
else if (Contains(clipboardData, "server", "up", "down", "listen", "<html>", "<body>"))
{
var fileName = Utile.GetTempPath($"{Utile.GetGUID(false)}.json");
var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
File.WriteAllText(fileName, clipboardData);
profileItem.coreType = ECoreType.hysteria;
@@ -1253,7 +1253,7 @@ namespace v2rayN.Handler
//Is naiveproxy configuration
else if (Contains(clipboardData, "listen", "proxy", "<html>", "<body>"))
{
var fileName = Utile.GetTempPath($"{Utile.GetGUID(false)}.json");
var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
File.WriteAllText(fileName, clipboardData);
profileItem.coreType = ECoreType.naiveproxy;
@@ -1271,7 +1271,7 @@ namespace v2rayN.Handler
//profileItem.remarks = "other_custom";
}
if (isSub && !Utile.IsNullOrEmpty(subid))
if (isSub && !Utils.IsNullOrEmpty(subid))
{
RemoveServerViaSubid(config, subid, isSub);
}
@@ -1282,7 +1282,7 @@ namespace v2rayN.Handler
profileItem.subid = subid;
profileItem.isSub = isSub;
if (Utile.IsNullOrEmpty(profileItem.address))
if (Utils.IsNullOrEmpty(profileItem.address))
{
return -1;
}
@@ -1299,21 +1299,21 @@ namespace v2rayN.Handler
private static int AddBatchServers4SsSIP008(Config config, string clipboardData, string subid, bool isSub, List<ProfileItem> lstOriSub)
{
if (Utile.IsNullOrEmpty(clipboardData))
if (Utils.IsNullOrEmpty(clipboardData))
{
return -1;
}
if (isSub && !Utile.IsNullOrEmpty(subid))
if (isSub && !Utils.IsNullOrEmpty(subid))
{
RemoveServerViaSubid(config, subid, isSub);
}
//SsSIP008
var lstSsServer = JsonUtile.Deserialize<List<SsServer>>(clipboardData);
var lstSsServer = JsonUtils.Deserialize<List<SsServer>>(clipboardData);
if (lstSsServer?.Count <= 0)
{
var ssSIP008 = JsonUtile.Deserialize<SsSIP008>(clipboardData);
var ssSIP008 = JsonUtils.Deserialize<SsSIP008>(clipboardData);
if (ssSIP008?.servers?.Count > 0)
{
lstSsServer = ssSIP008.servers;
@@ -1332,7 +1332,7 @@ namespace v2rayN.Handler
security = it.method,
id = it.password,
address = it.server,
port = Utile.ToInt(it.server_port)
port = Utils.ToInt(it.server_port)
};
ssItem.subid = subid;
ssItem.isSub = isSub;
@@ -1351,15 +1351,15 @@ namespace v2rayN.Handler
public static int AddBatchServers(Config config, string clipboardData, string subid, bool isSub)
{
List<ProfileItem>? lstOriSub = null;
if (isSub && !Utile.IsNullOrEmpty(subid))
if (isSub && !Utils.IsNullOrEmpty(subid))
{
lstOriSub = LazyConfig.Instance.ProfileItems(subid);
}
var counter = 0;
if (Utile.IsBase64String(clipboardData))
if (Utils.IsBase64String(clipboardData))
{
counter = AddBatchServers(config, Utile.Base64Decode(clipboardData), subid, isSub, lstOriSub);
counter = AddBatchServers(config, Utils.Base64Decode(clipboardData), subid, isSub, lstOriSub);
}
if (counter < 1)
{
@@ -1367,7 +1367,7 @@ namespace v2rayN.Handler
}
if (counter < 1)
{
counter = AddBatchServers(config, Utile.Base64Decode(clipboardData), subid, isSub, lstOriSub);
counter = AddBatchServers(config, Utils.Base64Decode(clipboardData), subid, isSub, lstOriSub);
}
if (counter < 1)
@@ -1414,9 +1414,9 @@ namespace v2rayN.Handler
public static int AddSubItem(Config config, SubItem subItem)
{
if (Utile.IsNullOrEmpty(subItem.id))
if (Utils.IsNullOrEmpty(subItem.id))
{
subItem.id = Utile.GetGUID(false);
subItem.id = Utils.GetGUID(false);
if (subItem.sort <= 0)
{
@@ -1446,7 +1446,7 @@ namespace v2rayN.Handler
/// <returns></returns>
public static int RemoveServerViaSubid(Config config, string subid, bool isSub)
{
if (Utile.IsNullOrEmpty(subid))
if (Utils.IsNullOrEmpty(subid))
{
return -1;
}
@@ -1461,7 +1461,7 @@ namespace v2rayN.Handler
}
foreach (var item in customProfile)
{
File.Delete(Utile.GetConfigPath(item.address));
File.Delete(Utils.GetConfigPath(item.address));
}
return 0;
@@ -1497,9 +1497,9 @@ namespace v2rayN.Handler
public static int SaveRoutingItem(Config config, RoutingItem item)
{
if (Utile.IsNullOrEmpty(item.id))
if (Utils.IsNullOrEmpty(item.id))
{
item.id = Utile.GetGUID(false);
item.id = Utils.GetGUID(false);
}
if (SQLiteHelper.Instance.Replace(item) > 0)
@@ -1520,12 +1520,12 @@ namespace v2rayN.Handler
/// <returns></returns>
public static int AddBatchRoutingRules(ref RoutingItem routingItem, string clipboardData)
{
if (Utile.IsNullOrEmpty(clipboardData))
if (Utils.IsNullOrEmpty(clipboardData))
{
return -1;
}
var lstRules = JsonUtile.Deserialize<List<RulesItem>>(clipboardData);
var lstRules = JsonUtils.Deserialize<List<RulesItem>>(clipboardData);
if (lstRules == null)
{
return -1;
@@ -1533,14 +1533,14 @@ namespace v2rayN.Handler
foreach (var item in lstRules)
{
item.id = Utile.GetGUID(false);
item.id = Utils.GetGUID(false);
}
routingItem.ruleNum = lstRules.Count;
routingItem.ruleSet = JsonUtile.Serialize(lstRules, false);
routingItem.ruleSet = JsonUtils.Serialize(lstRules, false);
if (Utile.IsNullOrEmpty(routingItem.id))
if (Utils.IsNullOrEmpty(routingItem.id))
{
routingItem.id = Utile.GetGUID(false);
routingItem.id = Utils.GetGUID(false);
}
if (SQLiteHelper.Instance.Replace(routingItem) > 0)
@@ -1575,7 +1575,7 @@ namespace v2rayN.Handler
{
return 0;
}
var item = JsonUtile.DeepCopy(rules[index]);
var item = JsonUtils.DeepCopy(rules[index]);
rules.RemoveAt(index);
rules.Insert(0, item);
@@ -1587,7 +1587,7 @@ namespace v2rayN.Handler
{
return 0;
}
var item = JsonUtile.DeepCopy(rules[index]);
var item = JsonUtils.DeepCopy(rules[index]);
rules.RemoveAt(index);
rules.Insert(index - 1, item);
@@ -1600,7 +1600,7 @@ namespace v2rayN.Handler
{
return 0;
}
var item = JsonUtile.DeepCopy(rules[index]);
var item = JsonUtils.DeepCopy(rules[index]);
rules.RemoveAt(index);
rules.Insert(index + 1, item);
@@ -1612,7 +1612,7 @@ namespace v2rayN.Handler
{
return 0;
}
var item = JsonUtile.DeepCopy(rules[index]);
var item = JsonUtils.DeepCopy(rules[index]);
rules.RemoveAt(index);
rules.Add(item);
@@ -1621,7 +1621,7 @@ namespace v2rayN.Handler
case EMove.Position:
{
var removeItem = rules[index];
var item = JsonUtile.DeepCopy(rules[index]);
var item = JsonUtils.DeepCopy(rules[index]);
rules.Insert(pos, item);
rules.Remove(removeItem);
break;
@@ -1668,7 +1668,7 @@ namespace v2rayN.Handler
url = string.Empty,
sort = maxSort + 1,
};
AddBatchRoutingRules(ref item2, Utile.GetEmbedText(Global.CustomRoutingFileName + "white"));
AddBatchRoutingRules(ref item2, Utils.GetEmbedText(Global.CustomRoutingFileName + "white"));
//Blacklist
var item3 = new RoutingItem()
@@ -1677,7 +1677,7 @@ namespace v2rayN.Handler
url = string.Empty,
sort = maxSort + 2,
};
AddBatchRoutingRules(ref item3, Utile.GetEmbedText(Global.CustomRoutingFileName + "black"));
AddBatchRoutingRules(ref item3, Utils.GetEmbedText(Global.CustomRoutingFileName + "black"));
//Global
var item1 = new RoutingItem()
@@ -1686,7 +1686,7 @@ namespace v2rayN.Handler
url = string.Empty,
sort = maxSort + 3,
};
AddBatchRoutingRules(ref item1, Utile.GetEmbedText(Global.CustomRoutingFileName + "global"));
AddBatchRoutingRules(ref item1, Utils.GetEmbedText(Global.CustomRoutingFileName + "global"));
if (!blImportAdvancedRules)
{
@@ -1702,7 +1702,7 @@ namespace v2rayN.Handler
url = string.Empty,
locked = true,
};
AddBatchRoutingRules(ref item1, Utile.GetEmbedText(Global.CustomRoutingFileName + "locked"));
AddBatchRoutingRules(ref item1, Utils.GetEmbedText(Global.CustomRoutingFileName + "locked"));
}
return 0;
}
@@ -1746,9 +1746,9 @@ namespace v2rayN.Handler
public static int SaveDNSItems(Config config, DNSItem item)
{
if (Utile.IsNullOrEmpty(item.id))
if (Utils.IsNullOrEmpty(item.id))
{
item.id = Utile.GetGUID(false);
item.id = Utils.GetGUID(false);
}
if (SQLiteHelper.Instance.Replace(item) > 0)

18
v2rayn/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
View File

@@ -33,13 +33,13 @@ namespace v2rayN.Handler
{
return -1;
}
if (Utile.IsNullOrEmpty(fileName))
if (Utils.IsNullOrEmpty(fileName))
{
content = JsonUtile.Serialize(singboxConfig);
content = JsonUtils.Serialize(singboxConfig);
}
else
{
JsonUtile.ToFile(singboxConfig, fileName, false);
JsonUtils.ToFile(singboxConfig, fileName, false);
}
}
else
@@ -49,13 +49,13 @@ namespace v2rayN.Handler
{
return -1;
}
if (Utile.IsNullOrEmpty(fileName))
if (Utils.IsNullOrEmpty(fileName))
{
content = JsonUtile.Serialize(v2rayConfig);
content = JsonUtils.Serialize(v2rayConfig);
}
else
{
JsonUtile.ToFile(v2rayConfig, fileName, false);
JsonUtils.ToFile(v2rayConfig, fileName, false);
}
}
}
@@ -87,7 +87,7 @@ namespace v2rayN.Handler
string addressFileName = node.address;
if (!File.Exists(addressFileName))
{
addressFileName = Utile.GetConfigPath(addressFileName);
addressFileName = Utils.GetConfigPath(addressFileName);
}
if (!File.Exists(addressFileName))
{
@@ -158,7 +158,7 @@ namespace v2rayN.Handler
{
return -1;
}
JsonUtile.ToFile(singboxConfig, fileName, false);
JsonUtils.ToFile(singboxConfig, fileName, false);
}
else
{
@@ -166,7 +166,7 @@ namespace v2rayN.Handler
{
return -1;
}
JsonUtile.ToFile(v2rayConfig, fileName, false);
JsonUtils.ToFile(v2rayConfig, fileName, false);
}
return 0;
}

104
v2rayn/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
View File

@@ -28,14 +28,14 @@ namespace v2rayN.Handler
msg = ResUI.InitialConfiguration;
string result = Utile.GetEmbedText(Global.SingboxSampleClient);
if (Utile.IsNullOrEmpty(result))
string result = Utils.GetEmbedText(Global.SingboxSampleClient);
if (Utils.IsNullOrEmpty(result))
{
msg = ResUI.FailedGetDefaultConfiguration;
return -1;
}
singboxConfig = JsonUtile.Deserialize<SingboxConfig>(result);
singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
if (singboxConfig == null)
{
msg = ResUI.FailedGenDefaultConfiguration;
@@ -95,7 +95,7 @@ namespace v2rayN.Handler
if (_config.coreBasicItem.logEnabled)
{
var dtNow = DateTime.Now;
singboxConfig.log.output = Utile.GetLogPath($"sbox_{dtNow:yyyy-MM-dd}.txt");
singboxConfig.log.output = Utils.GetLogPath($"sbox_{dtNow:yyyy-MM-dd}.txt");
}
}
catch (Exception ex)
@@ -124,12 +124,12 @@ namespace v2rayN.Handler
inbound.listen_port = LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks);
inbound.sniff = _config.inbound[0].sniffingEnabled;
inbound.sniff_override_destination = _config.inbound[0].routeOnly ? false : _config.inbound[0].sniffingEnabled;
inbound.domain_strategy = Utile.IsNullOrEmpty(_config.routingBasicItem.domainStrategy4Singbox) ? null : _config.routingBasicItem.domainStrategy4Singbox;
inbound.domain_strategy = Utils.IsNullOrEmpty(_config.routingBasicItem.domainStrategy4Singbox) ? null : _config.routingBasicItem.domainStrategy4Singbox;
if (_config.routingBasicItem.enableRoutingAdvanced)
{
var routing = ConfigHandler.GetDefaultRouting(_config);
if (!Utile.IsNullOrEmpty(routing.domainStrategy4Singbox))
if (!Utils.IsNullOrEmpty(routing.domainStrategy4Singbox))
{
inbound.domain_strategy = routing.domainStrategy4Singbox;
}
@@ -152,7 +152,7 @@ namespace v2rayN.Handler
singboxConfig.inbounds.Add(inbound4);
//auth
if (!Utile.IsNullOrEmpty(_config.inbound[0].user) && !Utile.IsNullOrEmpty(_config.inbound[0].pass))
if (!Utils.IsNullOrEmpty(_config.inbound[0].user) && !Utils.IsNullOrEmpty(_config.inbound[0].pass))
{
inbound3.users = new() { new() { username = _config.inbound[0].user, password = _config.inbound[0].pass } };
inbound4.users = new() { new() { username = _config.inbound[0].user, password = _config.inbound[0].pass } };
@@ -170,14 +170,14 @@ namespace v2rayN.Handler
{
if (_config.tunModeItem.mtu <= 0)
{
_config.tunModeItem.mtu = Utile.ToInt(Global.TunMtus[0]);
_config.tunModeItem.mtu = Utils.ToInt(Global.TunMtus[0]);
}
if (Utile.IsNullOrEmpty(_config.tunModeItem.stack))
if (Utils.IsNullOrEmpty(_config.tunModeItem.stack))
{
_config.tunModeItem.stack = Global.TunStacks[0];
}
var tunInbound = JsonUtile.Deserialize<Inbound4Sbox>(Utile.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { };
var tunInbound = JsonUtils.Deserialize<Inbound4Sbox>(Utils.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { };
tunInbound.mtu = _config.tunModeItem.mtu;
tunInbound.strict_route = _config.tunModeItem.strictRoute;
tunInbound.stack = _config.tunModeItem.stack;
@@ -200,7 +200,7 @@ namespace v2rayN.Handler
private Inbound4Sbox GetInbound(Inbound4Sbox inItem, EInboundProtocol protocol, bool bSocks)
{
var inbound = JsonUtile.DeepCopy(inItem);
var inbound = JsonUtils.DeepCopy(inItem);
inbound.tag = protocol.ToString();
inbound.listen_port = inItem.listen_port + (int)protocol;
inbound.type = bSocks ? EInboundProtocol.socks.ToString() : EInboundProtocol.http.ToString();
@@ -245,8 +245,8 @@ namespace v2rayN.Handler
outbound.type = Global.ProtocolTypes[EConfigType.Socks];
outbound.version = "5";
if (!Utile.IsNullOrEmpty(node.security)
&& !Utile.IsNullOrEmpty(node.id))
if (!Utils.IsNullOrEmpty(node.security)
&& !Utils.IsNullOrEmpty(node.id))
{
outbound.username = node.security;
outbound.password = node.id;
@@ -260,7 +260,7 @@ namespace v2rayN.Handler
outbound.packet_encoding = "xudp";
if (Utile.IsNullOrEmpty(node.flow))
if (Utils.IsNullOrEmpty(node.flow))
{
GenOutboundMux(node, outbound);
}
@@ -283,7 +283,7 @@ namespace v2rayN.Handler
outbound.password = node.id;
if (!Utile.IsNullOrEmpty(node.path))
if (!Utils.IsNullOrEmpty(node.path))
{
outbound.obfs = new()
{
@@ -309,9 +309,9 @@ namespace v2rayN.Handler
outbound.private_key = node.id;
outbound.peer_public_key = node.publicKey;
outbound.reserved = Utile.String2List(node.path).Select(int.Parse).ToArray();
outbound.local_address = [.. Utile.String2List(node.requestHost)];
outbound.mtu = Utile.ToInt(node.shortId.IsNullOrEmpty() ? Global.TunMtus.FirstOrDefault() : node.shortId);
outbound.reserved = Utils.String2List(node.path).Select(int.Parse).ToArray();
outbound.local_address = [.. Utils.String2List(node.requestHost)];
outbound.mtu = Utils.ToInt(node.shortId.IsNullOrEmpty() ? Global.TunMtus.FirstOrDefault() : node.shortId);
}
GenOutboundTls(node, outbound);
@@ -354,22 +354,22 @@ namespace v2rayN.Handler
if (node.streamSecurity == Global.StreamSecurityReality || node.streamSecurity == Global.StreamSecurity)
{
var server_name = string.Empty;
if (!Utile.IsNullOrEmpty(node.sni))
if (!Utils.IsNullOrEmpty(node.sni))
{
server_name = node.sni;
}
else if (!Utile.IsNullOrEmpty(node.requestHost))
else if (!Utils.IsNullOrEmpty(node.requestHost))
{
server_name = Utile.String2List(node.requestHost)[0];
server_name = Utils.String2List(node.requestHost)[0];
}
var tls = new Tls4Sbox()
{
enabled = true,
server_name = server_name,
insecure = Utile.ToBool(node.allowInsecure.IsNullOrEmpty() ? _config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
insecure = Utils.ToBool(node.allowInsecure.IsNullOrEmpty() ? _config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
alpn = node.GetAlpn(),
};
if (!Utile.IsNullOrEmpty(node.fingerprint))
if (!Utils.IsNullOrEmpty(node.fingerprint))
{
tls.utls = new Utls4Sbox()
{
@@ -407,8 +407,8 @@ namespace v2rayN.Handler
{
case nameof(ETransport.h2):
transport.type = nameof(ETransport.http);
transport.host = Utile.IsNullOrEmpty(node.requestHost) ? null : Utile.String2List(node.requestHost);
transport.path = Utile.IsNullOrEmpty(node.path) ? null : node.path;
transport.host = Utils.IsNullOrEmpty(node.requestHost) ? null : Utils.String2List(node.requestHost);
transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
break;
case nameof(ETransport.tcp): //http
@@ -422,16 +422,16 @@ namespace v2rayN.Handler
else
{
transport.type = nameof(ETransport.http);
transport.host = Utile.IsNullOrEmpty(node.requestHost) ? null : Utile.String2List(node.requestHost);
transport.path = Utile.IsNullOrEmpty(node.path) ? null : node.path;
transport.host = Utils.IsNullOrEmpty(node.requestHost) ? null : Utils.String2List(node.requestHost);
transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
}
}
break;
case nameof(ETransport.ws):
transport.type = nameof(ETransport.ws);
transport.path = Utile.IsNullOrEmpty(node.path) ? null : node.path;
if (!Utile.IsNullOrEmpty(node.requestHost))
transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
if (!Utils.IsNullOrEmpty(node.requestHost))
{
transport.headers = new()
{
@@ -442,8 +442,8 @@ namespace v2rayN.Handler
case nameof(ETransport.httpupgrade):
transport.type = nameof(ETransport.httpupgrade);
transport.path = Utile.IsNullOrEmpty(node.path) ? null : node.path;
transport.host = Utile.IsNullOrEmpty(node.requestHost) ? null : node.requestHost;
transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
transport.host = Utils.IsNullOrEmpty(node.requestHost) ? null : node.requestHost;
break;
@@ -490,14 +490,14 @@ namespace v2rayN.Handler
//current proxy
var outbound = singboxConfig.outbounds[0];
var txtOutbound = Utile.GetEmbedText(Global.SingboxSampleOutbound);
var txtOutbound = Utils.GetEmbedText(Global.SingboxSampleOutbound);
//Previous proxy
var prevNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.prevProfile!);
if (prevNode is not null
&& prevNode.configType != EConfigType.Custom)
{
var prevOutbound = JsonUtile.Deserialize<Outbound4Sbox>(txtOutbound);
var prevOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
GenOutbound(prevNode, prevOutbound);
prevOutbound.tag = $"{Global.ProxyTag}2";
singboxConfig.outbounds.Add(prevOutbound);
@@ -510,7 +510,7 @@ namespace v2rayN.Handler
if (nextNode is not null
&& nextNode.configType != EConfigType.Custom)
{
var nextOutbound = JsonUtile.Deserialize<Outbound4Sbox>(txtOutbound);
var nextOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
GenOutbound(nextNode, nextOutbound);
nextOutbound.tag = Global.ProxyTag;
singboxConfig.outbounds.Insert(0, nextOutbound);
@@ -535,7 +535,7 @@ namespace v2rayN.Handler
{
singboxConfig.route.auto_detect_interface = true;
var tunRules = JsonUtile.Deserialize<List<Rule4Sbox>>(Utile.GetEmbedText(Global.TunSingboxRulesFileName));
var tunRules = JsonUtils.Deserialize<List<Rule4Sbox>>(Utils.GetEmbedText(Global.TunSingboxRulesFileName));
singboxConfig.route.rules.AddRange(tunRules);
GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe);
@@ -558,7 +558,7 @@ namespace v2rayN.Handler
var routing = ConfigHandler.GetDefaultRouting(_config);
if (routing != null)
{
var rules = JsonUtile.Deserialize<List<RulesItem>>(routing.ruleSet);
var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.ruleSet);
foreach (var item in rules!)
{
if (item.enabled)
@@ -573,7 +573,7 @@ namespace v2rayN.Handler
var lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
if (lockedItem != null)
{
var rules = JsonUtile.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
var rules = JsonUtils.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
foreach (var item in rules!)
{
GenRoutingUserRule(item, singboxConfig.route.rules);
@@ -628,7 +628,7 @@ namespace v2rayN.Handler
outbound = item.outboundTag,
};
if (!Utile.IsNullOrEmpty(item.port))
if (!Utils.IsNullOrEmpty(item.port))
{
if (item.port.Contains("-"))
{
@@ -636,7 +636,7 @@ namespace v2rayN.Handler
}
else
{
rule.port = new List<int> { Utile.ToInt(item.port) };
rule.port = new List<int> { Utils.ToInt(item.port) };
}
}
if (item.protocol?.Count > 0)
@@ -647,8 +647,8 @@ namespace v2rayN.Handler
{
rule.inbound = item.inboundTag;
}
var rule2 = JsonUtile.DeepCopy(rule);
var rule3 = JsonUtile.DeepCopy(rule);
var rule2 = JsonUtils.DeepCopy(rule);
var rule3 = JsonUtils.DeepCopy(rule);
var hasDomainIp = false;
if (item.domain?.Count > 0)
@@ -761,22 +761,22 @@ namespace v2rayN.Handler
{
var item = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
var tunDNS = item?.tunDNS;
if (Utile.IsNullOrEmpty(tunDNS))
if (Utils.IsNullOrEmpty(tunDNS))
{
tunDNS = Utile.GetEmbedText(Global.TunSingboxDNSFileName);
tunDNS = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
}
dns4Sbox = JsonUtile.Deserialize<Dns4Sbox>(tunDNS);
dns4Sbox = JsonUtils.Deserialize<Dns4Sbox>(tunDNS);
}
else
{
var item = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
var normalDNS = item?.normalDNS;
if (Utile.IsNullOrEmpty(normalDNS))
if (Utils.IsNullOrEmpty(normalDNS))
{
normalDNS = "{\"servers\":[{\"address\":\"tcp://8.8.8.8\"}]}";
}
dns4Sbox = JsonUtile.Deserialize<Dns4Sbox>(normalDNS);
dns4Sbox = JsonUtils.Deserialize<Dns4Sbox>(normalDNS);
}
if (dns4Sbox is null)
{
@@ -852,15 +852,15 @@ namespace v2rayN.Handler
msg = ResUI.InitialConfiguration;
string result = Utile.GetEmbedText(Global.SingboxSampleClient);
string txtOutbound = Utile.GetEmbedText(Global.SingboxSampleOutbound);
if (Utile.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
string result = Utils.GetEmbedText(Global.SingboxSampleClient);
string txtOutbound = Utils.GetEmbedText(Global.SingboxSampleOutbound);
if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
{
msg = ResUI.FailedGetDefaultConfiguration;
return -1;
}
singboxConfig = JsonUtile.Deserialize<SingboxConfig>(result);
singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
if (singboxConfig == null)
{
msg = ResUI.FailedGenDefaultConfiguration;
@@ -899,7 +899,7 @@ namespace v2rayN.Handler
if (it.configType is EConfigType.VMess or EConfigType.VLESS)
{
var item2 = LazyConfig.Instance.GetProfileItem(it.indexId);
if (item2 is null || Utile.IsNullOrEmpty(item2.id) || !Utile.IsGuidByParse(item2.id))
if (item2 is null || Utils.IsNullOrEmpty(item2.id) || !Utils.IsGuidByParse(item2.id))
{
continue;
}
@@ -958,7 +958,7 @@ namespace v2rayN.Handler
continue;
}
var outbound = JsonUtile.Deserialize<Outbound4Sbox>(txtOutbound);
var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
GenOutbound(item, outbound);
outbound.tag = Global.ProxyTag + inbound.listen_port.ToString();
singboxConfig.outbounds.Add(outbound);

112
v2rayn/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
View File

@@ -28,14 +28,14 @@ namespace v2rayN.Handler
msg = ResUI.InitialConfiguration;
string result = Utile.GetEmbedText(Global.V2raySampleClient);
if (Utile.IsNullOrEmpty(result))
string result = Utils.GetEmbedText(Global.V2raySampleClient);
if (Utils.IsNullOrEmpty(result))
{
msg = ResUI.FailedGetDefaultConfiguration;
return -1;
}
v2rayConfig = JsonUtile.Deserialize<V2rayConfig>(result);
v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
if (v2rayConfig == null)
{
msg = ResUI.FailedGenDefaultConfiguration;
@@ -77,8 +77,8 @@ namespace v2rayN.Handler
{
var dtNow = DateTime.Now;
v2rayConfig.log.loglevel = _config.coreBasicItem.loglevel;
v2rayConfig.log.access = Utile.GetLogPath($"Vaccess_{dtNow:yyyy-MM-dd}.txt");
v2rayConfig.log.error = Utile.GetLogPath($"Verror_{dtNow:yyyy-MM-dd}.txt");
v2rayConfig.log.access = Utils.GetLogPath($"Vaccess_{dtNow:yyyy-MM-dd}.txt");
v2rayConfig.log.error = Utils.GetLogPath($"Verror_{dtNow:yyyy-MM-dd}.txt");
}
else
{
@@ -120,7 +120,7 @@ namespace v2rayN.Handler
v2rayConfig.inbounds.Add(inbound4);
//auth
if (!Utile.IsNullOrEmpty(_config.inbound[0].user) && !Utile.IsNullOrEmpty(_config.inbound[0].pass))
if (!Utils.IsNullOrEmpty(_config.inbound[0].user) && !Utils.IsNullOrEmpty(_config.inbound[0].pass))
{
inbound3.settings.auth = "password";
inbound3.settings.accounts = new List<AccountsItem4Ray> { new AccountsItem4Ray() { user = _config.inbound[0].user, pass = _config.inbound[0].pass } };
@@ -145,13 +145,13 @@ namespace v2rayN.Handler
private Inbounds4Ray? GetInbound(InItem inItem, EInboundProtocol protocol, bool bSocks)
{
string result = Utile.GetEmbedText(Global.V2raySampleInbound);
if (Utile.IsNullOrEmpty(result))
string result = Utils.GetEmbedText(Global.V2raySampleInbound);
if (Utils.IsNullOrEmpty(result))
{
return null;
}
var inbound = JsonUtile.Deserialize<Inbounds4Ray>(result);
var inbound = JsonUtils.Deserialize<Inbounds4Ray>(result);
if (inbound == null)
{
return null;
@@ -173,23 +173,23 @@ namespace v2rayN.Handler
if (v2rayConfig.routing?.rules != null)
{
v2rayConfig.routing.domainStrategy = _config.routingBasicItem.domainStrategy;
v2rayConfig.routing.domainMatcher = Utile.IsNullOrEmpty(_config.routingBasicItem.domainMatcher) ? null : _config.routingBasicItem.domainMatcher;
v2rayConfig.routing.domainMatcher = Utils.IsNullOrEmpty(_config.routingBasicItem.domainMatcher) ? null : _config.routingBasicItem.domainMatcher;
if (_config.routingBasicItem.enableRoutingAdvanced)
{
var routing = ConfigHandler.GetDefaultRouting(_config);
if (routing != null)
{
if (!Utile.IsNullOrEmpty(routing.domainStrategy))
if (!Utils.IsNullOrEmpty(routing.domainStrategy))
{
v2rayConfig.routing.domainStrategy = routing.domainStrategy;
}
var rules = JsonUtile.Deserialize<List<RulesItem>>(routing.ruleSet);
var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.ruleSet);
foreach (var item in rules)
{
if (item.enabled)
{
var item2 = JsonUtile.Deserialize<RulesItem4Ray>(JsonUtile.Serialize(item));
var item2 = JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item));
GenRoutingUserRule(item2, v2rayConfig);
}
}
@@ -200,10 +200,10 @@ namespace v2rayN.Handler
var lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
if (lockedItem != null)
{
var rules = JsonUtile.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
var rules = JsonUtils.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
foreach (var item in rules)
{
var item2 = JsonUtile.Deserialize<RulesItem4Ray>(JsonUtile.Serialize(item));
var item2 = JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item));
GenRoutingUserRule(item2, v2rayConfig);
}
}
@@ -225,7 +225,7 @@ namespace v2rayN.Handler
{
return 0;
}
if (Utile.IsNullOrEmpty(rules.port))
if (Utils.IsNullOrEmpty(rules.port))
{
rules.port = null;
}
@@ -249,7 +249,7 @@ namespace v2rayN.Handler
var hasDomainIp = false;
if (rules.domain?.Count > 0)
{
var it = JsonUtile.DeepCopy(rules);
var it = JsonUtils.DeepCopy(rules);
it.ip = null;
it.type = "field";
for (int k = it.domain.Count - 1; k >= 0; k--)
@@ -265,7 +265,7 @@ namespace v2rayN.Handler
}
if (rules.ip?.Count > 0)
{
var it = JsonUtile.DeepCopy(rules);
var it = JsonUtils.DeepCopy(rules);
it.domain = null;
it.type = "field";
v2rayConfig.routing.rules.Add(it);
@@ -273,12 +273,12 @@ namespace v2rayN.Handler
}
if (!hasDomainIp)
{
if (!Utile.IsNullOrEmpty(rules.port)
if (!Utils.IsNullOrEmpty(rules.port)
|| (rules.protocol?.Count > 0)
|| (rules.inboundTag?.Count > 0)
)
{
var it = JsonUtile.DeepCopy(rules);
var it = JsonUtils.DeepCopy(rules);
it.type = "field";
v2rayConfig.routing.rules.Add(it);
}
@@ -380,8 +380,8 @@ namespace v2rayN.Handler
serversItem.method = null;
serversItem.password = null;
if (!Utile.IsNullOrEmpty(node.security)
&& !Utile.IsNullOrEmpty(node.id))
if (!Utils.IsNullOrEmpty(node.security)
&& !Utils.IsNullOrEmpty(node.id))
{
SocksUsersItem4Ray socksUsersItem = new()
{
@@ -432,14 +432,14 @@ namespace v2rayN.Handler
if (node.streamSecurity == Global.StreamSecurityReality
|| node.streamSecurity == Global.StreamSecurity)
{
if (!Utile.IsNullOrEmpty(node.flow))
if (!Utils.IsNullOrEmpty(node.flow))
{
usersItem.flow = node.flow;
GenOutboundMux(node, outbound, false);
}
}
if (node.streamSecurity == Global.StreamSecurityReality && Utile.IsNullOrEmpty(node.flow))
if (node.streamSecurity == Global.StreamSecurityReality && Utils.IsNullOrEmpty(node.flow))
{
GenOutboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
}
@@ -529,17 +529,17 @@ namespace v2rayN.Handler
TlsSettings4Ray tlsSettings = new()
{
allowInsecure = Utile.ToBool(node.allowInsecure.IsNullOrEmpty() ? _config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
allowInsecure = Utils.ToBool(node.allowInsecure.IsNullOrEmpty() ? _config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
alpn = node.GetAlpn(),
fingerprint = node.fingerprint.IsNullOrEmpty() ? _config.coreBasicItem.defFingerprint : node.fingerprint
};
if (!Utile.IsNullOrEmpty(sni))
if (!Utils.IsNullOrEmpty(sni))
{
tlsSettings.serverName = sni;
}
else if (!Utile.IsNullOrEmpty(host))
else if (!Utils.IsNullOrEmpty(host))
{
tlsSettings.serverName = Utile.String2List(host)[0];
tlsSettings.serverName = Utils.String2List(host)[0];
}
streamSettings.tlsSettings = tlsSettings;
}
@@ -581,7 +581,7 @@ namespace v2rayN.Handler
{
type = node.headerType
};
if (!Utile.IsNullOrEmpty(node.path))
if (!Utils.IsNullOrEmpty(node.path))
{
kcpSettings.seed = node.path;
}
@@ -592,15 +592,15 @@ namespace v2rayN.Handler
WsSettings4Ray wsSettings = new();
wsSettings.headers = new Headers4Ray();
string path = node.path;
if (!Utile.IsNullOrEmpty(host))
if (!Utils.IsNullOrEmpty(host))
{
wsSettings.headers.Host = host;
}
if (!Utile.IsNullOrEmpty(path))
if (!Utils.IsNullOrEmpty(path))
{
wsSettings.path = path;
}
if (!Utile.IsNullOrEmpty(useragent))
if (!Utils.IsNullOrEmpty(useragent))
{
wsSettings.headers.UserAgent = useragent;
}
@@ -611,11 +611,11 @@ namespace v2rayN.Handler
case nameof(ETransport.httpupgrade):
HttpupgradeSettings4Ray httpupgradeSettings = new();
if (!Utile.IsNullOrEmpty(node.path))
if (!Utils.IsNullOrEmpty(node.path))
{
httpupgradeSettings.path = node.path;
}
if (!Utile.IsNullOrEmpty(host))
if (!Utils.IsNullOrEmpty(host))
{
httpupgradeSettings.host = host;
}
@@ -626,9 +626,9 @@ namespace v2rayN.Handler
case nameof(ETransport.h2):
HttpSettings4Ray httpSettings = new();
if (!Utile.IsNullOrEmpty(host))
if (!Utils.IsNullOrEmpty(host))
{
httpSettings.host = Utile.String2List(host);
httpSettings.host = Utils.String2List(host);
}
httpSettings.path = node.path;
@@ -649,7 +649,7 @@ namespace v2rayN.Handler
streamSettings.quicSettings = quicsettings;
if (node.streamSecurity == Global.StreamSecurity)
{
if (!Utile.IsNullOrEmpty(sni))
if (!Utils.IsNullOrEmpty(sni))
{
streamSettings.tlsSettings.serverName = sni;
}
@@ -663,7 +663,7 @@ namespace v2rayN.Handler
case nameof(ETransport.grpc):
GrpcSettings4Ray grpcSettings = new()
{
authority = Utile.IsNullOrEmpty(host) ? null : host,
authority = Utils.IsNullOrEmpty(host) ? null : host,
serviceName = node.path,
multiMode = (node.headerType == Global.GrpcMultiMode),
idle_timeout = _config.grpcItem.idle_timeout,
@@ -687,7 +687,7 @@ namespace v2rayN.Handler
};
//request Host
string request = Utile.GetEmbedText(Global.V2raySampleHttpRequestFileName);
string request = Utils.GetEmbedText(Global.V2raySampleHttpRequestFileName);
string[] arrHost = host.Split(',');
string host2 = string.Join("\",\"", arrHost);
request = request.Replace("$requestHost$", $"\"{host2}\"");
@@ -695,13 +695,13 @@ namespace v2rayN.Handler
request = request.Replace("$requestUserAgent$", $"\"{useragent}\"");
//Path
string pathHttp = @"/";
if (!Utile.IsNullOrEmpty(node.path))
if (!Utils.IsNullOrEmpty(node.path))
{
string[] arrPath = node.path.Split(',');
pathHttp = string.Join("\",\"", arrPath);
}
request = request.Replace("$requestPath$", $"\"{pathHttp}\"");
tcpSettings.header.request = JsonUtile.Deserialize<object>(request);
tcpSettings.header.request = JsonUtils.Deserialize<object>(request);
streamSettings.tcpSettings = tcpSettings;
}
@@ -722,20 +722,20 @@ namespace v2rayN.Handler
var item = LazyConfig.Instance.GetDNSItem(ECoreType.Xray);
var normalDNS = item?.normalDNS;
var domainStrategy4Freedom = item?.domainStrategy4Freedom;
if (Utile.IsNullOrEmpty(normalDNS))
if (Utils.IsNullOrEmpty(normalDNS))
{
normalDNS = "1.1.1.1,8.8.8.8";
}
//Outbound Freedom domainStrategy
if (!Utile.IsNullOrEmpty(domainStrategy4Freedom))
if (!Utils.IsNullOrEmpty(domainStrategy4Freedom))
{
var outbound = v2rayConfig.outbounds[1];
outbound.settings.domainStrategy = domainStrategy4Freedom;
outbound.settings.userLevel = 0;
}
var obj = JsonUtile.ParseJson(normalDNS);
var obj = JsonUtils.ParseJson(normalDNS);
if (obj is null)
{
List<string> servers = [];
@@ -744,14 +744,14 @@ namespace v2rayN.Handler
{
servers.Add(str);
}
obj = JsonUtile.ParseJson("{}");
obj["servers"] = JsonUtile.SerializeToNode(servers);
obj = JsonUtils.ParseJson("{}");
obj["servers"] = JsonUtils.SerializeToNode(servers);
}
// 追加至 dns 设置
if (item.useSystemHosts)
{
var systemHosts = Utile.GetSystemHosts();
var systemHosts = Utils.GetSystemHosts();
if (systemHosts.Count > 0)
{
var normalHost = obj["hosts"];
@@ -842,7 +842,7 @@ namespace v2rayN.Handler
//current proxy
var outbound = v2rayConfig.outbounds[0];
var txtOutbound = Utile.GetEmbedText(Global.V2raySampleOutbound);
var txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
//Previous proxy
var prevNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.prevProfile!);
@@ -852,7 +852,7 @@ namespace v2rayN.Handler
&& prevNode.configType != EConfigType.Tuic
&& prevNode.configType != EConfigType.Wireguard)
{
var prevOutbound = JsonUtile.Deserialize<Outbounds4Ray>(txtOutbound);
var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
GenOutbound(prevNode, prevOutbound);
prevOutbound.tag = $"{Global.ProxyTag}2";
v2rayConfig.outbounds.Add(prevOutbound);
@@ -871,7 +871,7 @@ namespace v2rayN.Handler
&& nextNode.configType != EConfigType.Tuic
&& nextNode.configType != EConfigType.Wireguard)
{
var nextOutbound = JsonUtile.Deserialize<Outbounds4Ray>(txtOutbound);
var nextOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
GenOutbound(nextNode, nextOutbound);
nextOutbound.tag = Global.ProxyTag;
v2rayConfig.outbounds.Insert(0, nextOutbound);
@@ -908,15 +908,15 @@ namespace v2rayN.Handler
msg = ResUI.InitialConfiguration;
string result = Utile.GetEmbedText(Global.V2raySampleClient);
string txtOutbound = Utile.GetEmbedText(Global.V2raySampleOutbound);
if (Utile.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
string result = Utils.GetEmbedText(Global.V2raySampleClient);
string txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
{
msg = ResUI.FailedGetDefaultConfiguration;
return -1;
}
v2rayConfig = JsonUtile.Deserialize<V2rayConfig>(result);
v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
if (v2rayConfig == null)
{
msg = ResUI.FailedGenDefaultConfiguration;
@@ -954,7 +954,7 @@ namespace v2rayN.Handler
if (it.configType is EConfigType.VMess or EConfigType.VLESS)
{
var item2 = LazyConfig.Instance.GetProfileItem(it.indexId);
if (item2 is null || Utile.IsNullOrEmpty(item2.id) || !Utile.IsGuidByParse(item2.id))
if (item2 is null || Utils.IsNullOrEmpty(item2.id) || !Utils.IsGuidByParse(item2.id))
{
continue;
}
@@ -1013,7 +1013,7 @@ namespace v2rayN.Handler
continue;
}
var outbound = JsonUtile.Deserialize<Outbounds4Ray>(txtOutbound);
var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
GenOutbound(item, outbound);
outbound.tag = Global.ProxyTag + inbound.port.ToString();
v2rayConfig.outbounds.Add(outbound);

28
v2rayn/v2rayN/v2rayN/Handler/CoreHandler.cs
View File

@@ -22,8 +22,8 @@ namespace v2rayN.Handler
_config = config;
_updateFunc = update;
Environment.SetEnvironmentVariable("v2ray.location.asset", Utile.GetBinPath(""), EnvironmentVariableTarget.Process);
Environment.SetEnvironmentVariable("xray.location.asset", Utile.GetBinPath(""), EnvironmentVariableTarget.Process);
Environment.SetEnvironmentVariable("v2ray.location.asset", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
Environment.SetEnvironmentVariable("xray.location.asset", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
}
public void LoadCore()
@@ -35,7 +35,7 @@ namespace v2rayN.Handler
return;
}
string fileName = Utile.GetConfigPath(Global.CoreConfigFileName);
string fileName = Utils.GetConfigPath(Global.CoreConfigFileName);
if (CoreConfigHandler.GenerateClientConfig(node, fileName, out string msg, out string content) != 0)
{
ShowMsg(false, msg);
@@ -48,7 +48,7 @@ namespace v2rayN.Handler
if (_config.tunModeItem.enableTun)
{
Thread.Sleep(1000);
Utile.RemoveTunDevice();
Utils.RemoveTunDevice();
}
CoreStart(node);
@@ -77,7 +77,7 @@ namespace v2rayN.Handler
{
int pid = -1;
var coreType = selecteds.Exists(t => t.configType == EConfigType.Hysteria2 || t.configType == EConfigType.Tuic || t.configType == EConfigType.Wireguard) ? ECoreType.sing_box : ECoreType.Xray;
string configPath = Utile.GetConfigPath(Global.CoreSpeedtestConfigFileName);
string configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName);
if (CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType, out string msg) != 0)
{
ShowMsg(false, msg);
@@ -126,7 +126,7 @@ namespace v2rayN.Handler
foreach (Process p in existing)
{
string? path = p.MainModule?.FileName;
if (path == $"{Utile.GetBinPath(vName, it.coreType.ToString())}.exe")
if (path == $"{Utils.GetBinPath(vName, it.coreType.ToString())}.exe")
{
KillProcess(p);
}
@@ -162,16 +162,16 @@ namespace v2rayN.Handler
foreach (string name in coreInfo.coreExes)
{
string vName = $"{name}.exe";
vName = Utile.GetBinPath(vName, coreInfo.coreType.ToString());
vName = Utils.GetBinPath(vName, coreInfo.coreType.ToString());
if (File.Exists(vName))
{
fileName = vName;
break;
}
}
if (Utile.IsNullOrEmpty(fileName))
if (Utils.IsNullOrEmpty(fileName))
{
string msg = string.Format(ResUI.NotFoundCore, Utile.GetBinPath("", coreInfo.coreType.ToString()), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType.ToString()), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
Logging.SaveLog(msg);
ShowMsg(false, msg);
}
@@ -214,7 +214,7 @@ namespace v2rayN.Handler
address = Global.Loopback,
port = node.preSocksPort
};
string fileName2 = Utile.GetConfigPath(Global.CorePreConfigFileName);
string fileName2 = Utils.GetConfigPath(Global.CorePreConfigFileName);
if (CoreConfigHandler.GenerateClientConfig(itemSocks, fileName2, out string msg2, out string configStr) == 0)
{
var coreInfo2 = LazyConfig.Instance.GetCoreInfo(ECoreType.sing_box);
@@ -267,7 +267,7 @@ namespace v2rayN.Handler
try
{
string fileName = CoreFindExe(coreInfo);
if (Utile.IsNullOrEmpty(fileName))
if (Utils.IsNullOrEmpty(fileName))
{
return null;
}
@@ -277,7 +277,7 @@ namespace v2rayN.Handler
{
FileName = fileName,
Arguments = string.Format(coreInfo.arguments, configPath),
WorkingDirectory = Utile.GetConfigPath(),
WorkingDirectory = Utils.GetConfigPath(),
UseShellExecute = false,
RedirectStandardOutput = displayLog,
RedirectStandardError = displayLog,
@@ -292,7 +292,7 @@ namespace v2rayN.Handler
{
proc.OutputDataReceived += (sender, e) =>
{
if (!Utile.IsNullOrEmpty(e.Data))
if (!Utils.IsNullOrEmpty(e.Data))
{
string msg = e.Data + Environment.NewLine;
ShowMsg(false, msg);
@@ -300,7 +300,7 @@ namespace v2rayN.Handler
};
proc.ErrorDataReceived += (sender, e) =>
{
if (!Utile.IsNullOrEmpty(e.Data))
if (!Utils.IsNullOrEmpty(e.Data))
{
string msg = e.Data + Environment.NewLine;
ShowMsg(false, msg);

30
v2rayn/v2rayN/v2rayN/Handler/DownloadHandle.cs
View File

@@ -34,7 +34,7 @@ namespace v2rayN.Handler
{
try
{
Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
var progress = new Progress<string>();
progress.ProgressChanged += (sender, value) =>
@@ -66,7 +66,7 @@ namespace v2rayN.Handler
{
try
{
Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
UpdateCompleted?.Invoke(this, new ResultEventArgs(false, $"{ResUI.Downloading} {url}"));
var progress = new Progress<double>();
@@ -78,7 +78,7 @@ namespace v2rayN.Handler
var webProxy = GetWebProxy(blProxy);
await DownloaderHelper.Instance.DownloadFileAsync(webProxy,
url,
Utile.GetTempPath(Utile.GetDownloadFileName(url)),
Utils.GetTempPath(Utils.GetDownloadFileName(url)),
progress,
downloadTimeout);
}
@@ -96,7 +96,7 @@ namespace v2rayN.Handler
public async Task<string?> UrlRedirectAsync(string url, bool blProxy)
{
Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
var webRequestHandler = new SocketsHttpHandler
{
AllowAutoRedirect = false,
@@ -121,7 +121,7 @@ namespace v2rayN.Handler
try
{
var result1 = await DownloadStringAsync(url, blProxy, userAgent);
if (!Utile.IsNullOrEmpty(result1))
if (!Utils.IsNullOrEmpty(result1))
{
return result1;
}
@@ -139,7 +139,7 @@ namespace v2rayN.Handler
try
{
var result2 = await DownloadStringViaDownloader(url, blProxy, userAgent);
if (!Utile.IsNullOrEmpty(result2))
if (!Utils.IsNullOrEmpty(result2))
{
return result2;
}
@@ -159,7 +159,7 @@ namespace v2rayN.Handler
using var wc = new WebClient();
wc.Proxy = GetWebProxy(blProxy);
var result3 = await wc.DownloadStringTaskAsync(url);
if (!Utile.IsNullOrEmpty(result3))
if (!Utils.IsNullOrEmpty(result3))
{
return result3;
}
@@ -185,7 +185,7 @@ namespace v2rayN.Handler
{
try
{
Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
var webProxy = GetWebProxy(blProxy);
var client = new HttpClient(new SocketsHttpHandler()
{
@@ -193,17 +193,17 @@ namespace v2rayN.Handler
UseProxy = webProxy != null
});
if (Utile.IsNullOrEmpty(userAgent))
if (Utils.IsNullOrEmpty(userAgent))
{
userAgent = Utile.GetVersion(false);
userAgent = Utils.GetVersion(false);
}
client.DefaultRequestHeaders.UserAgent.TryParseAdd(userAgent);
Uri uri = new(url);
//Authorization Header
if (!Utile.IsNullOrEmpty(uri.UserInfo))
if (!Utils.IsNullOrEmpty(uri.UserInfo))
{
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Utile.Base64Encode(uri.UserInfo));
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Utils.Base64Encode(uri.UserInfo));
}
using var cts = new CancellationTokenSource();
@@ -230,13 +230,13 @@ namespace v2rayN.Handler
{
try
{
Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
var webProxy = GetWebProxy(blProxy);
if (Utile.IsNullOrEmpty(userAgent))
if (Utils.IsNullOrEmpty(userAgent))
{
userAgent = Utile.GetVersion(false);
userAgent = Utils.GetVersion(false);
}
var result = await DownloaderHelper.Instance.DownloadStringAsync(webProxy, url, userAgent, 30);
return result;

14
v2rayn/v2rayN/v2rayN/Handler/LazyConfig.cs
View File

@@ -19,7 +19,7 @@ namespace v2rayN.Handler
{
if (_statePort is null)
{
_statePort = Utile.GetFreePort(GetLocalPort(EInboundProtocol.api));
_statePort = Utils.GetFreePort(GetLocalPort(EInboundProtocol.api));
}
return _statePort.Value;
@@ -77,7 +77,7 @@ namespace v2rayN.Handler
public List<ProfileItem> ProfileItems(string subid)
{
if (Utile.IsNullOrEmpty(subid))
if (Utils.IsNullOrEmpty(subid))
{
return SQLiteHelper.Instance.Table<ProfileItem>().ToList();
}
@@ -89,7 +89,7 @@ namespace v2rayN.Handler
public List<string> ProfileItemIndexes(string subid)
{
if (Utile.IsNullOrEmpty(subid))
if (Utils.IsNullOrEmpty(subid))
{
return SQLiteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).ToList();
}
@@ -106,11 +106,11 @@ namespace v2rayN.Handler
from ProfileItem a
left join SubItem b on a.subid = b.id
where 1=1 ";
if (!Utile.IsNullOrEmpty(subid))
if (!Utils.IsNullOrEmpty(subid))
{
sql += $" and a.subid = '{subid}'";
}
if (!Utile.IsNullOrEmpty(filter))
if (!Utils.IsNullOrEmpty(filter))
{
if (filter.Contains('\''))
{
@@ -124,7 +124,7 @@ namespace v2rayN.Handler
public ProfileItem? GetProfileItem(string indexId)
{
if (Utile.IsNullOrEmpty(indexId))
if (Utils.IsNullOrEmpty(indexId))
{
return null;
}
@@ -133,7 +133,7 @@ namespace v2rayN.Handler
public ProfileItem? GetProfileItemViaRemarks(string remarks)
{
if (Utile.IsNullOrEmpty(remarks))
if (Utils.IsNullOrEmpty(remarks))
{
return null;
}

6
v2rayn/v2rayN/v2rayN/Handler/MainFormHandler.cs
View File

@@ -27,7 +27,7 @@ namespace v2rayN.Handler
}
//Load from local file
var fileName = Utile.GetPath($"NotifyIcon{index + 1}.ico");
var fileName = Utils.GetPath($"NotifyIcon{index + 1}.ico");
if (File.Exists(fileName))
{
return new Icon(fileName);
@@ -79,7 +79,7 @@ namespace v2rayN.Handler
}
var item = ConfigHandler.GetDefaultRouting(config);
if (item == null || Utile.IsNullOrEmpty(item.customIcon) || !File.Exists(item.customIcon))
if (item == null || Utils.IsNullOrEmpty(item.customIcon) || !File.Exists(item.customIcon))
{
return null;
}
@@ -141,7 +141,7 @@ namespace v2rayN.Handler
return;
}
string fileName = fileDialog.FileName;
if (Utile.IsNullOrEmpty(fileName))
if (Utils.IsNullOrEmpty(fileName))
{
return;
}

2
v2rayn/v2rayN/v2rayN/Handler/ProfileExHandler.cs
View File

@@ -44,7 +44,7 @@ namespace v2rayN.Handler
private void IndexIdEnqueue(string indexId)
{
if (!Utile.IsNullOrEmpty(indexId) && !_queIndexIds.Contains(indexId))
if (!Utils.IsNullOrEmpty(indexId) && !_queIndexIds.Contains(indexId))
{
_queIndexIds.Enqueue(indexId);
}

2
v2rayn/v2rayN/v2rayN/Handler/ProxySetting.cs
View File

@@ -51,7 +51,7 @@ namespace v2rayN.Handler
}
else if (type is 2 or 4) // named proxy or autoproxy script URL
{
optionCount = Utile.IsNullOrEmpty(exceptions) ? 2 : 3;
optionCount = Utils.IsNullOrEmpty(exceptions) ? 2 : 3;
}
int m_Int = (int)PerConnFlags.PROXY_TYPE_DIRECT;

278
v2rayn/v2rayN/v2rayN/Handler/ShareHandler.cs
View File

@@ -65,8 +65,8 @@ namespace v2rayN.Handler
fp = item.fingerprint
};
url = JsonUtile.Serialize(vmessQRCode);
url = Utile.Base64Encode(url);
url = JsonUtils.Serialize(vmessQRCode);
url = Utils.Base64Encode(url);
url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
return url;
@@ -77,9 +77,9 @@ namespace v2rayN.Handler
string url = string.Empty;
string remark = string.Empty;
if (!Utile.IsNullOrEmpty(item.remarks))
if (!Utils.IsNullOrEmpty(item.remarks))
{
remark = "#" + Utile.UrlEncode(item.remarks);
remark = "#" + Utils.UrlEncode(item.remarks);
}
//url = string.Format("{0}:{1}@{2}:{3}",
// item.security,
@@ -88,7 +88,7 @@ namespace v2rayN.Handler
// item.port);
//url = Utile.Base64Encode(url);
//new Sip002
var pw = Utile.Base64Encode($"{item.security}:{item.id}");
var pw = Utils.Base64Encode($"{item.security}:{item.id}");
url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
url = $"{Global.ProtocolShares[EConfigType.Shadowsocks]}{url}{remark}";
return url;
@@ -98,9 +98,9 @@ namespace v2rayN.Handler
{
string url = string.Empty;
string remark = string.Empty;
if (!Utile.IsNullOrEmpty(item.remarks))
if (!Utils.IsNullOrEmpty(item.remarks))
{
remark = "#" + Utile.UrlEncode(item.remarks);
remark = "#" + Utils.UrlEncode(item.remarks);
}
//url = string.Format("{0}:{1}@{2}:{3}",
// item.security,
@@ -109,7 +109,7 @@ namespace v2rayN.Handler
// item.port);
//url = Utile.Base64Encode(url);
//new
var pw = Utile.Base64Encode($"{item.security}:{item.id}");
var pw = Utils.Base64Encode($"{item.security}:{item.id}");
url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
url = $"{Global.ProtocolShares[EConfigType.Socks]}{url}{remark}";
return url;
@@ -119,9 +119,9 @@ namespace v2rayN.Handler
{
string url = string.Empty;
string remark = string.Empty;
if (!Utile.IsNullOrEmpty(item.remarks))
if (!Utils.IsNullOrEmpty(item.remarks))
{
remark = "#" + Utile.UrlEncode(item.remarks);
remark = "#" + Utils.UrlEncode(item.remarks);
}
var dicQuery = new Dictionary<string, string>();
GetStdTransport(item, null, ref dicQuery);
@@ -139,12 +139,12 @@ namespace v2rayN.Handler
{
string url = string.Empty;
string remark = string.Empty;
if (!Utile.IsNullOrEmpty(item.remarks))
if (!Utils.IsNullOrEmpty(item.remarks))
{
remark = "#" + Utile.UrlEncode(item.remarks);
remark = "#" + Utils.UrlEncode(item.remarks);
}
var dicQuery = new Dictionary<string, string>();
if (!Utile.IsNullOrEmpty(item.security))
if (!Utils.IsNullOrEmpty(item.security))
{
dicQuery.Add("encryption", item.security);
}
@@ -167,23 +167,23 @@ namespace v2rayN.Handler
{
string url = string.Empty;
string remark = string.Empty;
if (!Utile.IsNullOrEmpty(item.remarks))
if (!Utils.IsNullOrEmpty(item.remarks))
{
remark = "#" + Utile.UrlEncode(item.remarks);
remark = "#" + Utils.UrlEncode(item.remarks);
}
var dicQuery = new Dictionary<string, string>();
if (!Utile.IsNullOrEmpty(item.sni))
if (!Utils.IsNullOrEmpty(item.sni))
{
dicQuery.Add("sni", item.sni);
}
if (!Utile.IsNullOrEmpty(item.alpn))
if (!Utils.IsNullOrEmpty(item.alpn))
{
dicQuery.Add("alpn", Utile.UrlEncode(item.alpn));
dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
}
if (!Utile.IsNullOrEmpty(item.path))
if (!Utils.IsNullOrEmpty(item.path))
{
dicQuery.Add("obfs", "salamander");
dicQuery.Add("obfs-password", Utile.UrlEncode(item.path));
dicQuery.Add("obfs-password", Utils.UrlEncode(item.path));
}
dicQuery.Add("insecure", item.allowInsecure.ToLower() == "true" ? "1" : "0");
@@ -201,18 +201,18 @@ namespace v2rayN.Handler
{
string url = string.Empty;
string remark = string.Empty;
if (!Utile.IsNullOrEmpty(item.remarks))
if (!Utils.IsNullOrEmpty(item.remarks))
{
remark = "#" + Utile.UrlEncode(item.remarks);
remark = "#" + Utils.UrlEncode(item.remarks);
}
var dicQuery = new Dictionary<string, string>();
if (!Utile.IsNullOrEmpty(item.sni))
if (!Utils.IsNullOrEmpty(item.sni))
{
dicQuery.Add("sni", item.sni);
}
if (!Utile.IsNullOrEmpty(item.alpn))
if (!Utils.IsNullOrEmpty(item.alpn))
{
dicQuery.Add("alpn", Utile.UrlEncode(item.alpn));
dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
}
dicQuery.Add("congestion_control", item.headerType);
@@ -230,32 +230,32 @@ namespace v2rayN.Handler
{
string url = string.Empty;
string remark = string.Empty;
if (!Utile.IsNullOrEmpty(item.remarks))
if (!Utils.IsNullOrEmpty(item.remarks))
{
remark = "#" + Utile.UrlEncode(item.remarks);
remark = "#" + Utils.UrlEncode(item.remarks);
}
var dicQuery = new Dictionary<string, string>();
if (!Utile.IsNullOrEmpty(item.publicKey))
if (!Utils.IsNullOrEmpty(item.publicKey))
{
dicQuery.Add("publickey", Utile.UrlEncode(item.publicKey));
dicQuery.Add("publickey", Utils.UrlEncode(item.publicKey));
}
if (!Utile.IsNullOrEmpty(item.path))
if (!Utils.IsNullOrEmpty(item.path))
{
dicQuery.Add("reserved", Utile.UrlEncode(item.path));
dicQuery.Add("reserved", Utils.UrlEncode(item.path));
}
if (!Utile.IsNullOrEmpty(item.requestHost))
if (!Utils.IsNullOrEmpty(item.requestHost))
{
dicQuery.Add("address", Utile.UrlEncode(item.requestHost));
dicQuery.Add("address", Utils.UrlEncode(item.requestHost));
}
if (!Utile.IsNullOrEmpty(item.shortId))
if (!Utils.IsNullOrEmpty(item.shortId))
{
dicQuery.Add("mtu", Utile.UrlEncode(item.shortId));
dicQuery.Add("mtu", Utils.UrlEncode(item.shortId));
}
string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
url = string.Format("{0}@{1}:{2}",
Utile.UrlEncode(item.id),
Utils.UrlEncode(item.id),
GetIpv6(item.address),
item.port);
url = $"{Global.ProtocolShares[EConfigType.Wireguard]}{url}/{query}{remark}";
@@ -264,17 +264,17 @@ namespace v2rayN.Handler
private static string GetIpv6(string address)
{
return Utile.IsIpv6(address) ? $"[{address}]" : address;
return Utils.IsIpv6(address) ? $"[{address}]" : address;
}
private static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
{
if (!Utile.IsNullOrEmpty(item.flow))
if (!Utils.IsNullOrEmpty(item.flow))
{
dicQuery.Add("flow", item.flow);
}
if (!Utile.IsNullOrEmpty(item.streamSecurity))
if (!Utils.IsNullOrEmpty(item.streamSecurity))
{
dicQuery.Add("security", item.streamSecurity);
}
@@ -285,90 +285,90 @@ namespace v2rayN.Handler
dicQuery.Add("security", securityDef);
}
}
if (!Utile.IsNullOrEmpty(item.sni))
if (!Utils.IsNullOrEmpty(item.sni))
{
dicQuery.Add("sni", item.sni);
}
if (!Utile.IsNullOrEmpty(item.alpn))
if (!Utils.IsNullOrEmpty(item.alpn))
{
dicQuery.Add("alpn", Utile.UrlEncode(item.alpn));
dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
}
if (!Utile.IsNullOrEmpty(item.fingerprint))
if (!Utils.IsNullOrEmpty(item.fingerprint))
{
dicQuery.Add("fp", Utile.UrlEncode(item.fingerprint));
dicQuery.Add("fp", Utils.UrlEncode(item.fingerprint));
}
if (!Utile.IsNullOrEmpty(item.publicKey))
if (!Utils.IsNullOrEmpty(item.publicKey))
{
dicQuery.Add("pbk", Utile.UrlEncode(item.publicKey));
dicQuery.Add("pbk", Utils.UrlEncode(item.publicKey));
}
if (!Utile.IsNullOrEmpty(item.shortId))
if (!Utils.IsNullOrEmpty(item.shortId))
{
dicQuery.Add("sid", Utile.UrlEncode(item.shortId));
dicQuery.Add("sid", Utils.UrlEncode(item.shortId));
}
if (!Utile.IsNullOrEmpty(item.spiderX))
if (!Utils.IsNullOrEmpty(item.spiderX))
{
dicQuery.Add("spx", Utile.UrlEncode(item.spiderX));
dicQuery.Add("spx", Utils.UrlEncode(item.spiderX));
}
dicQuery.Add("type", !Utile.IsNullOrEmpty(item.network) ? item.network : nameof(ETransport.tcp));
dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : nameof(ETransport.tcp));
switch (item.network)
{
case nameof(ETransport.tcp):
dicQuery.Add("headerType", !Utile.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
if (!Utile.IsNullOrEmpty(item.requestHost))
dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
if (!Utils.IsNullOrEmpty(item.requestHost))
{
dicQuery.Add("host", Utile.UrlEncode(item.requestHost));
dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
}
break;
case nameof(ETransport.kcp):
dicQuery.Add("headerType", !Utile.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
if (!Utile.IsNullOrEmpty(item.path))
dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
if (!Utils.IsNullOrEmpty(item.path))
{
dicQuery.Add("seed", Utile.UrlEncode(item.path));
dicQuery.Add("seed", Utils.UrlEncode(item.path));
}
break;
case nameof(ETransport.ws):
case nameof(ETransport.httpupgrade):
if (!Utile.IsNullOrEmpty(item.requestHost))
if (!Utils.IsNullOrEmpty(item.requestHost))
{
dicQuery.Add("host", Utile.UrlEncode(item.requestHost));
dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
}
if (!Utile.IsNullOrEmpty(item.path))
if (!Utils.IsNullOrEmpty(item.path))
{
dicQuery.Add("path", Utile.UrlEncode(item.path));
dicQuery.Add("path", Utils.UrlEncode(item.path));
}
break;
case nameof(ETransport.http):
case nameof(ETransport.h2):
dicQuery["type"] = nameof(ETransport.http);
if (!Utile.IsNullOrEmpty(item.requestHost))
if (!Utils.IsNullOrEmpty(item.requestHost))
{
dicQuery.Add("host", Utile.UrlEncode(item.requestHost));
dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
}
if (!Utile.IsNullOrEmpty(item.path))
if (!Utils.IsNullOrEmpty(item.path))
{
dicQuery.Add("path", Utile.UrlEncode(item.path));
dicQuery.Add("path", Utils.UrlEncode(item.path));
}
break;
case nameof(ETransport.quic):
dicQuery.Add("headerType", !Utile.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
dicQuery.Add("quicSecurity", Utile.UrlEncode(item.requestHost));
dicQuery.Add("key", Utile.UrlEncode(item.path));
dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
dicQuery.Add("quicSecurity", Utils.UrlEncode(item.requestHost));
dicQuery.Add("key", Utils.UrlEncode(item.path));
break;
case nameof(ETransport.grpc):
if (!Utile.IsNullOrEmpty(item.path))
if (!Utils.IsNullOrEmpty(item.path))
{
dicQuery.Add("authority", Utile.UrlEncode(item.requestHost));
dicQuery.Add("serviceName", Utile.UrlEncode(item.path));
dicQuery.Add("authority", Utils.UrlEncode(item.requestHost));
dicQuery.Add("serviceName", Utils.UrlEncode(item.path));
if (item.headerType is Global.GrpcGunMode or Global.GrpcMultiMode)
{
dicQuery.Add("mode", Utile.UrlEncode(item.headerType));
dicQuery.Add("mode", Utils.UrlEncode(item.headerType));
}
}
break;
@@ -393,7 +393,7 @@ namespace v2rayN.Handler
try
{
string result = clipboardData.TrimEx();
if (Utile.IsNullOrEmpty(result))
if (Utils.IsNullOrEmpty(result))
{
msg = ResUI.FailedReadConfiguration;
return null;
@@ -484,10 +484,10 @@ namespace v2rayN.Handler
};
result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
result = Utile.Base64Decode(result);
result = Utils.Base64Decode(result);
//转成Json
VmessQRCode? vmessQRCode = JsonUtile.Deserialize<VmessQRCode>(result);
VmessQRCode? vmessQRCode = JsonUtils.Deserialize<VmessQRCode>(result);
if (vmessQRCode == null)
{
msg = ResUI.FailedConversionConfiguration;
@@ -497,30 +497,30 @@ namespace v2rayN.Handler
profileItem.network = Global.DefaultNetwork;
profileItem.headerType = Global.None;
profileItem.configVersion = Utile.ToInt(vmessQRCode.v);
profileItem.remarks = Utile.ToString(vmessQRCode.ps);
profileItem.address = Utile.ToString(vmessQRCode.add);
profileItem.port = Utile.ToInt(vmessQRCode.port);
profileItem.id = Utile.ToString(vmessQRCode.id);
profileItem.alterId = Utile.ToInt(vmessQRCode.aid);
profileItem.security = Utile.ToString(vmessQRCode.scy);
profileItem.configVersion = Utils.ToInt(vmessQRCode.v);
profileItem.remarks = Utils.ToString(vmessQRCode.ps);
profileItem.address = Utils.ToString(vmessQRCode.add);
profileItem.port = Utils.ToInt(vmessQRCode.port);
profileItem.id = Utils.ToString(vmessQRCode.id);
profileItem.alterId = Utils.ToInt(vmessQRCode.aid);
profileItem.security = Utils.ToString(vmessQRCode.scy);
profileItem.security = !Utile.IsNullOrEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
if (!Utile.IsNullOrEmpty(vmessQRCode.net))
profileItem.security = !Utils.IsNullOrEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
if (!Utils.IsNullOrEmpty(vmessQRCode.net))
{
profileItem.network = vmessQRCode.net;
}
if (!Utile.IsNullOrEmpty(vmessQRCode.type))
if (!Utils.IsNullOrEmpty(vmessQRCode.type))
{
profileItem.headerType = vmessQRCode.type;
}
profileItem.requestHost = Utile.ToString(vmessQRCode.host);
profileItem.path = Utile.ToString(vmessQRCode.path);
profileItem.streamSecurity = Utile.ToString(vmessQRCode.tls);
profileItem.sni = Utile.ToString(vmessQRCode.sni);
profileItem.alpn = Utile.ToString(vmessQRCode.alpn);
profileItem.fingerprint = Utile.ToString(vmessQRCode.fp);
profileItem.requestHost = Utils.ToString(vmessQRCode.host);
profileItem.path = Utils.ToString(vmessQRCode.path);
profileItem.streamSecurity = Utils.ToString(vmessQRCode.tls);
profileItem.sni = Utils.ToString(vmessQRCode.sni);
profileItem.alpn = Utils.ToString(vmessQRCode.alpn);
profileItem.fingerprint = Utils.ToString(vmessQRCode.fp);
return profileItem;
}
@@ -537,7 +537,7 @@ namespace v2rayN.Handler
{
result = result[..indexSplit];
}
result = Utile.Base64Decode(result);
result = Utils.Base64Decode(result);
string[] arr1 = result.Split('@');
if (arr1.Length != 2)
@@ -552,7 +552,7 @@ namespace v2rayN.Handler
}
profileItem.address = arr22[0];
profileItem.port = Utile.ToInt(arr22[1]);
profileItem.port = Utils.ToInt(arr22[1]);
profileItem.security = arr21[0];
profileItem.id = arr21[1];
@@ -576,7 +576,7 @@ namespace v2rayN.Handler
i.address = u.IdnHost;
i.port = u.Port;
i.remarks = u.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
var query = Utile.ParseQueryString(u.Query);
var query = Utils.ParseQueryString(u.Query);
var m = StdVmessUserInfo.Match(u.UserInfo);
if (!m.Success) return null;
@@ -593,7 +593,7 @@ namespace v2rayN.Handler
break;
default:
if (!Utile.IsNullOrEmpty(i.streamSecurity))
if (!Utils.IsNullOrEmpty(i.streamSecurity))
return null;
break;
}
@@ -614,7 +614,7 @@ namespace v2rayN.Handler
case nameof(ETransport.httpupgrade):
string p1 = query["path"] ?? "/";
string h1 = query["host"] ?? "";
i.requestHost = Utile.UrlDecode(h1);
i.requestHost = Utils.UrlDecode(h1);
i.path = p1;
break;
@@ -623,7 +623,7 @@ namespace v2rayN.Handler
i.network = nameof(ETransport.h2);
string p2 = query["path"] ?? "/";
string h2 = query["host"] ?? "";
i.requestHost = Utile.UrlDecode(h2);
i.requestHost = Utils.UrlDecode(h2);
i.path = p2;
break;
@@ -632,7 +632,7 @@ namespace v2rayN.Handler
string k = query["key"] ?? "";
string t3 = query["type"] ?? Global.None;
i.headerType = t3;
i.requestHost = Utile.UrlDecode(s);
i.requestHost = Utils.UrlDecode(s);
i.path = k;
break;
@@ -670,12 +670,12 @@ namespace v2rayN.Handler
return null;
}
server.security = userInfoParts[0];
server.id = Utile.UrlDecode(userInfoParts[1]);
server.id = Utils.UrlDecode(userInfoParts[1]);
}
else
{
// parse base64 UserInfo
string userInfo = Utile.Base64Decode(rawUserInfo);
string userInfo = Utils.Base64Decode(rawUserInfo);
string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
if (userInfoParts.Length != 2)
{
@@ -685,12 +685,12 @@ namespace v2rayN.Handler
server.id = userInfoParts[1];
}
var queryParameters = Utile.ParseQueryString(parsedUrl.Query);
var queryParameters = Utils.ParseQueryString(parsedUrl.Query);
if (queryParameters["plugin"] != null)
{
//obfs-host exists
var obfsHost = queryParameters["plugin"]?.Split(';').FirstOrDefault(t => t.Contains("obfs-host"));
if (queryParameters["plugin"].Contains("obfs=http") && !Utile.IsNullOrEmpty(obfsHost))
if (queryParameters["plugin"].Contains("obfs=http") && !Utils.IsNullOrEmpty(obfsHost))
{
obfsHost = obfsHost?.Replace("obfs-host=", "");
server.network = Global.DefaultNetwork;
@@ -718,14 +718,14 @@ namespace v2rayN.Handler
ProfileItem server = new();
var base64 = match.Groups["base64"].Value.TrimEnd('/');
var tag = match.Groups["tag"].Value;
if (!Utile.IsNullOrEmpty(tag))
if (!Utils.IsNullOrEmpty(tag))
{
server.remarks = Utile.UrlDecode(tag);
server.remarks = Utils.UrlDecode(tag);
}
Match details;
try
{
details = DetailsParser.Match(Utile.Base64Decode(base64));
details = DetailsParser.Match(Utils.Base64Decode(base64));
}
catch (FormatException)
{
@@ -736,7 +736,7 @@ namespace v2rayN.Handler
server.security = details.Groups["method"].Value;
server.id = details.Groups["password"].Value;
server.address = details.Groups["hostname"].Value;
server.port = Utile.ToInt(details.Groups["port"].Value);
server.port = Utils.ToInt(details.Groups["port"].Value);
return server;
}
@@ -756,7 +756,7 @@ namespace v2rayN.Handler
{
try
{
profileItem.remarks = Utile.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
profileItem.remarks = Utils.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
}
catch { }
result = result[..indexRemark];
@@ -768,7 +768,7 @@ namespace v2rayN.Handler
}
else
{
result = Utile.Base64Decode(result);
result = Utils.Base64Decode(result);
}
string[] arr1 = result.Split('@');
@@ -784,7 +784,7 @@ namespace v2rayN.Handler
return null;
}
profileItem.address = arr1[1][..indexPort];
profileItem.port = Utile.ToInt(arr1[1][(indexPort + 1)..]);
profileItem.port = Utils.ToInt(arr1[1][(indexPort + 1)..]);
profileItem.security = arr21[0];
profileItem.id = arr21[1];
@@ -811,7 +811,7 @@ namespace v2rayN.Handler
// parse base64 UserInfo
string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.Unescaped);
string userInfo = Utile.Base64Decode(rawUserInfo);
string userInfo = Utils.Base64Decode(rawUserInfo);
string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
if (userInfoParts.Length == 2)
{
@@ -834,9 +834,9 @@ namespace v2rayN.Handler
item.address = url.IdnHost;
item.port = url.Port;
item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
item.id = Utile.UrlDecode(url.UserInfo);
item.id = Utils.UrlDecode(url.UserInfo);
var query = Utile.ParseQueryString(url.Query);
var query = Utils.ParseQueryString(url.Query);
ResolveStdTransport(query, ref item);
return item;
@@ -855,9 +855,9 @@ namespace v2rayN.Handler
item.address = url.IdnHost;
item.port = url.Port;
item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
item.id = Utile.UrlDecode(url.UserInfo);
item.id = Utils.UrlDecode(url.UserInfo);
var query = Utile.ParseQueryString(url.Query);
var query = Utils.ParseQueryString(url.Query);
item.security = query["encryption"] ?? Global.None;
item.streamSecurity = query["security"] ?? "";
ResolveStdTransport(query, ref item);
@@ -877,11 +877,11 @@ namespace v2rayN.Handler
item.address = url.IdnHost;
item.port = url.Port;
item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
item.id = Utile.UrlDecode(url.UserInfo);
item.id = Utils.UrlDecode(url.UserInfo);
var query = Utile.ParseQueryString(url.Query);
var query = Utils.ParseQueryString(url.Query);
ResolveStdTransport(query, ref item);
item.path = Utile.UrlDecode(query["obfs-password"] ?? "");
item.path = Utils.UrlDecode(query["obfs-password"] ?? "");
item.allowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
return item;
@@ -906,7 +906,7 @@ namespace v2rayN.Handler
item.security = userInfoParts[1];
}
var query = Utile.ParseQueryString(url.Query);
var query = Utils.ParseQueryString(url.Query);
ResolveStdTransport(query, ref item);
item.headerType = query["congestion_control"] ?? "";
@@ -925,14 +925,14 @@ namespace v2rayN.Handler
item.address = url.IdnHost;
item.port = url.Port;
item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
item.id = Utile.UrlDecode(url.UserInfo);
item.id = Utils.UrlDecode(url.UserInfo);
var query = Utile.ParseQueryString(url.Query);
var query = Utils.ParseQueryString(url.Query);
item.publicKey = Utile.UrlDecode(query["publickey"] ?? "");
item.path = Utile.UrlDecode(query["reserved"] ?? "");
item.requestHost = Utile.UrlDecode(query["address"] ?? "");
item.shortId = Utile.UrlDecode(query["mtu"] ?? "");
item.publicKey = Utils.UrlDecode(query["publickey"] ?? "");
item.path = Utils.UrlDecode(query["reserved"] ?? "");
item.requestHost = Utils.UrlDecode(query["address"] ?? "");
item.shortId = Utils.UrlDecode(query["mtu"] ?? "");
return item;
}
@@ -942,49 +942,49 @@ namespace v2rayN.Handler
item.flow = query["flow"] ?? "";
item.streamSecurity = query["security"] ?? "";
item.sni = query["sni"] ?? "";
item.alpn = Utile.UrlDecode(query["alpn"] ?? "");
item.fingerprint = Utile.UrlDecode(query["fp"] ?? "");
item.publicKey = Utile.UrlDecode(query["pbk"] ?? "");
item.shortId = Utile.UrlDecode(query["sid"] ?? "");
item.spiderX = Utile.UrlDecode(query["spx"] ?? "");
item.alpn = Utils.UrlDecode(query["alpn"] ?? "");
item.fingerprint = Utils.UrlDecode(query["fp"] ?? "");
item.publicKey = Utils.UrlDecode(query["pbk"] ?? "");
item.shortId = Utils.UrlDecode(query["sid"] ?? "");
item.spiderX = Utils.UrlDecode(query["spx"] ?? "");
item.network = query["type"] ?? nameof(ETransport.tcp);
switch (item.network)
{
case nameof(ETransport.tcp):
item.headerType = query["headerType"] ?? Global.None;
item.requestHost = Utile.UrlDecode(query["host"] ?? "");
item.requestHost = Utils.UrlDecode(query["host"] ?? "");
break;
case nameof(ETransport.kcp):
item.headerType = query["headerType"] ?? Global.None;
item.path = Utile.UrlDecode(query["seed"] ?? "");
item.path = Utils.UrlDecode(query["seed"] ?? "");
break;
case nameof(ETransport.ws):
case nameof(ETransport.httpupgrade):
item.requestHost = Utile.UrlDecode(query["host"] ?? "");
item.path = Utile.UrlDecode(query["path"] ?? "/");
item.requestHost = Utils.UrlDecode(query["host"] ?? "");
item.path = Utils.UrlDecode(query["path"] ?? "/");
break;
case nameof(ETransport.http):
case nameof(ETransport.h2):
item.network = nameof(ETransport.h2);
item.requestHost = Utile.UrlDecode(query["host"] ?? "");
item.path = Utile.UrlDecode(query["path"] ?? "/");
item.requestHost = Utils.UrlDecode(query["host"] ?? "");
item.path = Utils.UrlDecode(query["path"] ?? "/");
break;
case nameof(ETransport.quic):
item.headerType = query["headerType"] ?? Global.None;
item.requestHost = query["quicSecurity"] ?? Global.None;
item.path = Utile.UrlDecode(query["key"] ?? "");
item.path = Utils.UrlDecode(query["key"] ?? "");
break;
case nameof(ETransport.grpc):
item.requestHost = Utile.UrlDecode(query["authority"] ?? "");
item.path = Utile.UrlDecode(query["serviceName"] ?? "");
item.headerType = Utile.UrlDecode(query["mode"] ?? Global.GrpcGunMode);
item.requestHost = Utils.UrlDecode(query["authority"] ?? "");
item.path = Utils.UrlDecode(query["serviceName"] ?? "");
item.headerType = Utils.UrlDecode(query["mode"] ?? Global.GrpcGunMode);
break;
default:

4
v2rayn/v2rayN/v2rayN/Handler/StatisticsSingbox.cs
View File

@@ -84,7 +84,7 @@ namespace v2rayN.Handler
while (!res.CloseStatus.HasValue)
{
var result = Encoding.UTF8.GetString(buffer, 0, res.Count);
if (!Utile.IsNullOrEmpty(result))
if (!Utils.IsNullOrEmpty(result))
{
ParseOutput(result, out ulong up, out ulong down);
@@ -113,7 +113,7 @@ namespace v2rayN.Handler
up = 0; down = 0;
try
{
var trafficItem = JsonUtile.Deserialize<TrafficItem>(source);
var trafficItem = JsonUtils.Deserialize<TrafficItem>(source);
if (trafficItem != null)
{
up = trafficItem.up;

6
v2rayn/v2rayN/v2rayN/Handler/SysProxyHandle.cs
View File

@@ -53,7 +53,7 @@ namespace v2rayN.Handler
var strExceptions = $"<local>;{config.constItem.defIEProxyExceptions};{config.systemProxyExceptions}";
var strProxy = string.Empty;
if (Utile.IsNullOrEmpty(config.systemProxyAdvancedProtocol))
if (Utils.IsNullOrEmpty(config.systemProxyAdvancedProtocol))
{
strProxy = $"{Global.Loopback}:{port}";
}
@@ -75,7 +75,7 @@ namespace v2rayN.Handler
}
else if (type == ESysProxyType.Pac)
{
PacHandler.Start(Utile.GetConfigPath(), port, portPac);
PacHandler.Start(Utils.GetConfigPath(), port, portPac);
var strProxy = $"{Global.HttpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
ProxySetting.SetProxy(strProxy, "", 4); // use pac script url for auto-config proxy
}
@@ -97,7 +97,7 @@ namespace v2rayN.Handler
try
{
//TODO To be verified
Utile.RegWriteValue(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", "ProxyEnable", 0);
Utils.RegWriteValue(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", "ProxyEnable", 0);
}
catch
{

52
v2rayn/v2rayN/v2rayN/Handler/UpdateHandle.cs
View File

@@ -47,15 +47,15 @@ namespace v2rayN.Handler
try
{
string fileName = Utile.GetTempPath(Utile.GetDownloadFileName(url));
fileName = Utile.UrlEncode(fileName);
string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
fileName = Utils.UrlEncode(fileName);
Process process = new()
{
StartInfo = new ProcessStartInfo
{
FileName = "v2rayUpgrade.exe",
Arguments = fileName.AppendQuotes(),
WorkingDirectory = Utile.StartupPath()
WorkingDirectory = Utils.StartupPath()
}
};
process.Start();
@@ -179,7 +179,7 @@ namespace v2rayN.Handler
string url = item.url.TrimEx();
string userAgent = item.userAgent.TrimEx();
string hashCode = $"{item.remarks}->";
if (Utile.IsNullOrEmpty(id) || Utile.IsNullOrEmpty(url) || (!Utile.IsNullOrEmpty(subId) && item.id != subId))
if (Utils.IsNullOrEmpty(id) || Utils.IsNullOrEmpty(url) || (!Utils.IsNullOrEmpty(subId) && item.id != subId))
{
//_updateFunc(false, $"{hashCode}{ResUI.MsgNoValidSubscription}");
continue;
@@ -203,12 +203,12 @@ namespace v2rayN.Handler
_updateFunc(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
//one url
url = Utile.GetPunycode(url);
url = Utils.GetPunycode(url);
//convert
if (!Utile.IsNullOrEmpty(item.convertTarget))
if (!Utils.IsNullOrEmpty(item.convertTarget))
{
var subConvertUrl = Utile.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
url = string.Format(subConvertUrl!, Utile.UrlEncode(url));
var subConvertUrl = Utils.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
if (!url.Contains("target="))
{
url += string.Format("&target={0}", item.convertTarget);
@@ -219,17 +219,17 @@ namespace v2rayN.Handler
}
}
var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
if (blProxy && Utile.IsNullOrEmpty(result))
if (blProxy && Utils.IsNullOrEmpty(result))
{
result = await downloadHandle.TryDownloadString(url, false, userAgent);
}
//more url
if (Utile.IsNullOrEmpty(item.convertTarget) && !Utile.IsNullOrEmpty(item.moreUrl.TrimEx()))
if (Utils.IsNullOrEmpty(item.convertTarget) && !Utils.IsNullOrEmpty(item.moreUrl.TrimEx()))
{
if (!Utile.IsNullOrEmpty(result) && Utile.IsBase64String(result!))
if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result!))
{
result = Utile.Base64Decode(result);
result = Utils.Base64Decode(result);
}
var lstUrl = new List<string>
@@ -238,22 +238,22 @@ namespace v2rayN.Handler
};
foreach (var it in lstUrl)
{
var url2 = Utile.GetPunycode(it);
if (Utile.IsNullOrEmpty(url2))
var url2 = Utils.GetPunycode(it);
if (Utils.IsNullOrEmpty(url2))
{
continue;
}
var result2 = await downloadHandle.TryDownloadString(url2, blProxy, userAgent);
if (blProxy && Utile.IsNullOrEmpty(result2))
if (blProxy && Utils.IsNullOrEmpty(result2))
{
result2 = await downloadHandle.TryDownloadString(url2, false, userAgent);
}
if (!Utile.IsNullOrEmpty(result2))
if (!Utils.IsNullOrEmpty(result2))
{
if (Utile.IsBase64String(result2!))
if (Utils.IsBase64String(result2!))
{
result += Utile.Base64Decode(result2);
result += Utils.Base64Decode(result2);
}
else
{
@@ -263,7 +263,7 @@ namespace v2rayN.Handler
}
}
if (Utile.IsNullOrEmpty(result))
if (Utils.IsNullOrEmpty(result))
{
_updateFunc(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
}
@@ -325,7 +325,7 @@ namespace v2rayN.Handler
string url = coreInfo.coreReleaseApiUrl;
var result = await (new DownloadHandle()).DownloadStringAsync(url, true, "");
if (!Utile.IsNullOrEmpty(result))
if (!Utils.IsNullOrEmpty(result))
{
responseHandler(type, result, preRelease);
}
@@ -354,7 +354,7 @@ namespace v2rayN.Handler
foreach (string name in coreInfo.coreExes)
{
string vName = $"{name}.exe";
vName = Utile.GetBinPath(vName, coreInfo.coreType.ToString());
vName = Utils.GetBinPath(vName, coreInfo.coreType.ToString());
if (File.Exists(vName))
{
filePath = vName;
@@ -372,7 +372,7 @@ namespace v2rayN.Handler
using Process p = new();
p.StartInfo.FileName = filePath.AppendQuotes();
p.StartInfo.Arguments = coreInfo.versionArg;
p.StartInfo.WorkingDirectory = Utile.StartupPath();
p.StartInfo.WorkingDirectory = Utils.StartupPath();
p.StartInfo.UseShellExecute = false;
p.StartInfo.RedirectStandardOutput = true;
p.StartInfo.CreateNoWindow = true;
@@ -414,7 +414,7 @@ namespace v2rayN.Handler
{
try
{
var gitHubReleases = JsonUtile.Deserialize<List<GitHubRelease>>(gitHubReleaseApi);
var gitHubReleases = JsonUtils.Deserialize<List<GitHubRelease>>(gitHubReleaseApi);
var gitHubRelease = preRelease ? gitHubReleases?.First() : gitHubReleases?.First(r => r.Prerelease == false);
var version = new SemanticVersion(gitHubRelease?.TagName!);
var body = gitHubRelease?.Body;
@@ -498,7 +498,7 @@ namespace v2rayN.Handler
}
case ECoreType.v2rayN:
{
curVersion = new SemanticVersion(FileVersionInfo.GetVersionInfo(Utile.GetExePath()).FileVersion.ToString());
curVersion = new SemanticVersion(FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString());
message = string.Format(ResUI.IsLatestN, type, curVersion);
switch (RuntimeInformation.ProcessArchitecture)
{
@@ -570,7 +570,7 @@ namespace v2rayN.Handler
try
{
string fileName = Utile.GetTempPath(Utile.GetDownloadFileName(url));
string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
if (File.Exists(fileName))
{
//Global.coreTypes.ForEach(it =>
@@ -578,7 +578,7 @@ namespace v2rayN.Handler
// string targetPath = Utile.GetBinPath($"{geoName}.dat", (ECoreType)Enum.Parse(typeof(ECoreType), it));
// File.Copy(fileName, targetPath, true);
//});
string targetPath = Utile.GetBinPath($"{geoName}.dat");
string targetPath = Utils.GetBinPath($"{geoName}.dat");
File.Copy(fileName, targetPath, true);
File.Delete(fileName);

6
v2rayn/v2rayN/v2rayN/Model/ProfileItem.cs
View File

@@ -60,19 +60,19 @@ namespace v2rayN.Model
public List<string> GetAlpn()
{
if (Utile.IsNullOrEmpty(alpn))
if (Utils.IsNullOrEmpty(alpn))
{
return null;
}
else
{
return Utile.String2List(alpn);
return Utils.String2List(alpn);
}
}
public string GetNetwork()
{
if (Utile.IsNullOrEmpty(network) || !Global.Networks.Contains(network))
if (Utils.IsNullOrEmpty(network) || !Global.Networks.Contains(network))
{
return Global.DefaultNetwork;
}

20
v2rayn/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs
View File

@@ -36,7 +36,7 @@ namespace v2rayN.ViewModels
}
else
{
SelectedSource = JsonUtile.DeepCopy(profileItem);
SelectedSource = JsonUtils.DeepCopy(profileItem);
}
_view = view;
@@ -56,19 +56,19 @@ namespace v2rayN.ViewModels
SaveServer();
});
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
}
private void SaveServer()
{
string remarks = SelectedSource.remarks;
if (Utile.IsNullOrEmpty(remarks))
if (Utils.IsNullOrEmpty(remarks))
{
_noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
return;
}
if (Utile.IsNullOrEmpty(SelectedSource.address))
if (Utils.IsNullOrEmpty(SelectedSource.address))
{
_noticeHandler?.Enqueue(ResUI.FillServerAddressCustom);
return;
@@ -108,7 +108,7 @@ namespace v2rayN.ViewModels
{
return;
}
if (Utile.IsNullOrEmpty(fileName))
if (Utils.IsNullOrEmpty(fileName))
{
return;
}
@@ -119,9 +119,9 @@ namespace v2rayN.ViewModels
if (ConfigHandler.AddCustomServer(_config, item, false) == 0)
{
_noticeHandler?.Enqueue(ResUI.SuccessfullyImportedCustomServer);
if (!Utile.IsNullOrEmpty(item.indexId))
if (!Utils.IsNullOrEmpty(item.indexId))
{
SelectedSource = JsonUtile.DeepCopy(item);
SelectedSource = JsonUtils.DeepCopy(item);
}
IsModified = true;
}
@@ -134,16 +134,16 @@ namespace v2rayN.ViewModels
private void EditServer()
{
var address = SelectedSource.address;
if (Utile.IsNullOrEmpty(address))
if (Utils.IsNullOrEmpty(address))
{
_noticeHandler?.Enqueue(ResUI.FillServerAddressCustom);
return;
}
address = Utile.GetConfigPath(address);
address = Utils.GetConfigPath(address);
if (File.Exists(address))
{
Utile.ProcessStart(address);
Utils.ProcessStart(address);
}
else
{

16
v2rayn/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
View File

@@ -36,7 +36,7 @@ namespace v2rayN.ViewModels
}
else
{
SelectedSource = JsonUtile.DeepCopy(profileItem);
SelectedSource = JsonUtils.DeepCopy(profileItem);
}
SaveCmd = ReactiveCommand.Create(() =>
@@ -44,24 +44,24 @@ namespace v2rayN.ViewModels
SaveServer();
});
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
}
private void SaveServer()
{
if (Utile.IsNullOrEmpty(SelectedSource.remarks))
if (Utils.IsNullOrEmpty(SelectedSource.remarks))
{
_noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
return;
}
if (Utile.IsNullOrEmpty(SelectedSource.address))
if (Utils.IsNullOrEmpty(SelectedSource.address))
{
_noticeHandler?.Enqueue(ResUI.FillServerAddress);
return;
}
var port = SelectedSource.port.ToString();
if (Utile.IsNullOrEmpty(port) || !Utile.IsNumeric(port)
if (Utils.IsNullOrEmpty(port) || !Utils.IsNumeric(port)
|| SelectedSource.port <= 0 || SelectedSource.port >= Global.MaxPort)
{
_noticeHandler?.Enqueue(ResUI.FillCorrectServerPort);
@@ -69,12 +69,12 @@ namespace v2rayN.ViewModels
}
if (SelectedSource.configType == EConfigType.Shadowsocks)
{
if (Utile.IsNullOrEmpty(SelectedSource.id))
if (Utils.IsNullOrEmpty(SelectedSource.id))
{
_noticeHandler?.Enqueue(ResUI.FillPassword);
return;
}
if (Utile.IsNullOrEmpty(SelectedSource.security))
if (Utils.IsNullOrEmpty(SelectedSource.security))
{
_noticeHandler?.Enqueue(ResUI.PleaseSelectEncryption);
return;
@@ -82,7 +82,7 @@ namespace v2rayN.ViewModels
}
if (SelectedSource.configType != EConfigType.Socks)
{
if (Utile.IsNullOrEmpty(SelectedSource.id))
if (Utils.IsNullOrEmpty(SelectedSource.id))
{
_noticeHandler?.Enqueue(ResUI.FillUUID);
return;

24
v2rayn/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs
View File

@@ -47,23 +47,23 @@ namespace v2rayN.ViewModels
ImportDefConfig4V2rayCmd = ReactiveCommand.Create(() =>
{
normalDNS = Utile.GetEmbedText(Global.DNSV2rayNormalFileName);
normalDNS = Utils.GetEmbedText(Global.DNSV2rayNormalFileName);
});
ImportDefConfig4SingboxCmd = ReactiveCommand.Create(() =>
{
normalDNS2 = Utile.GetEmbedText(Global.DNSSingboxNormalFileName);
tunDNS2 = Utile.GetEmbedText(Global.TunSingboxDNSFileName);
normalDNS2 = Utils.GetEmbedText(Global.DNSSingboxNormalFileName);
tunDNS2 = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
});
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
}
private void SaveSetting()
{
if (!Utile.IsNullOrEmpty(normalDNS))
if (!Utils.IsNullOrEmpty(normalDNS))
{
var obj = JsonUtile.ParseJson(normalDNS);
var obj = JsonUtils.ParseJson(normalDNS);
if (obj != null && obj["servers"] != null)
{
}
@@ -76,18 +76,18 @@ namespace v2rayN.ViewModels
}
}
}
if (!Utile.IsNullOrEmpty(normalDNS2))
if (!Utils.IsNullOrEmpty(normalDNS2))
{
var obj2 = JsonUtile.Deserialize<Dns4Sbox>(normalDNS2);
var obj2 = JsonUtils.Deserialize<Dns4Sbox>(normalDNS2);
if (obj2 == null)
{
_noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
return;
}
}
if (!Utile.IsNullOrEmpty(tunDNS2))
if (!Utils.IsNullOrEmpty(tunDNS2))
{
var obj2 = JsonUtile.Deserialize<Dns4Sbox>(tunDNS2);
var obj2 = JsonUtils.Deserialize<Dns4Sbox>(tunDNS2);
if (obj2 == null)
{
_noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
@@ -102,8 +102,8 @@ namespace v2rayN.ViewModels
ConfigHandler.SaveDNSItems(_config, item);
var item2 = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
item2.normalDNS = JsonUtile.Serialize(JsonUtile.ParseJson(normalDNS2));
item2.tunDNS = JsonUtile.Serialize(JsonUtile.ParseJson(tunDNS2));
item2.normalDNS = JsonUtils.Serialize(JsonUtils.ParseJson(normalDNS2));
item2.tunDNS = JsonUtils.Serialize(JsonUtils.ParseJson(tunDNS2));
ConfigHandler.SaveDNSItems(_config, item2);
_noticeHandler?.Enqueue(ResUI.OperationSuccess);

88
v2rayn/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
View File

@@ -265,7 +265,7 @@ namespace v2rayN.ViewModels
SelectedMoveToGroup = new();
SelectedRouting = new();
SelectedServer = new();
if (_config.tunModeItem.enableTun && Utile.IsAdministrator())
if (_config.tunModeItem.enableTun && Utils.IsAdministrator())
{
EnableTun = true;
}
@@ -645,8 +645,8 @@ namespace v2rayN.ViewModels
return;
}
SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, Global.ProxyTag, Utile.HumanFy(update.proxyUp), Utile.HumanFy(update.proxyDown));
SpeedDirectDisplay = string.Format(ResUI.SpeedDisplayText, Global.DirectTag, Utile.HumanFy(update.directUp), Utile.HumanFy(update.directDown));
SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, Global.ProxyTag, Utils.HumanFy(update.proxyUp), Utils.HumanFy(update.proxyDown));
SpeedDirectDisplay = string.Format(ResUI.SpeedDisplayText, Global.DirectTag, Utils.HumanFy(update.directUp), Utils.HumanFy(update.directDown));
if (update.proxyUp + update.proxyDown > 0)
{
@@ -656,20 +656,20 @@ namespace v2rayN.ViewModels
var item = _profileItems.Where(it => it.indexId == update.indexId).FirstOrDefault();
if (item != null)
{
item.todayDown = Utile.HumanFy(update.todayDown);
item.todayUp = Utile.HumanFy(update.todayUp);
item.totalDown = Utile.HumanFy(update.totalDown);
item.totalUp = Utile.HumanFy(update.totalUp);
item.todayDown = Utils.HumanFy(update.todayDown);
item.todayUp = Utils.HumanFy(update.todayUp);
item.totalDown = Utils.HumanFy(update.totalDown);
item.totalUp = Utils.HumanFy(update.totalUp);
if (SelectedProfile?.indexId == item.indexId)
{
var temp = JsonUtile.DeepCopy(item);
var temp = JsonUtils.DeepCopy(item);
_profileItems.Replace(item, temp);
SelectedProfile = temp;
}
else
{
_profileItems.Replace(item, JsonUtile.DeepCopy(item));
_profileItems.Replace(item, JsonUtils.DeepCopy(item));
}
}
}
@@ -692,7 +692,7 @@ namespace v2rayN.ViewModels
private void SetTestResult(string indexId, string delay, string speed)
{
if (Utile.IsNullOrEmpty(indexId))
if (Utils.IsNullOrEmpty(indexId))
{
_noticeHandler?.SendMessage(delay, true);
_noticeHandler?.Enqueue(delay);
@@ -701,17 +701,17 @@ namespace v2rayN.ViewModels
var item = _profileItems.Where(it => it.indexId == indexId).FirstOrDefault();
if (item != null)
{
if (!Utile.IsNullOrEmpty(delay))
if (!Utils.IsNullOrEmpty(delay))
{
int.TryParse(delay, out int temp);
item.delay = temp;
item.delayVal = $"{delay} {Global.DelayUnit}";
}
if (!Utile.IsNullOrEmpty(speed))
if (!Utils.IsNullOrEmpty(speed))
{
item.speedVal = $"{speed} {Global.SpeedUnit}";
}
_profileItems.Replace(item, JsonUtile.DeepCopy(item));
_profileItems.Replace(item, JsonUtils.DeepCopy(item));
}
}
@@ -801,7 +801,7 @@ namespace v2rayN.ViewModels
return;
}
_serverFilter = ServerFilter;
if (Utile.IsNullOrEmpty(_serverFilter))
if (Utils.IsNullOrEmpty(_serverFilter))
{
RefreshServers();
}
@@ -841,12 +841,12 @@ namespace v2rayN.ViewModels
delay = t33 == null ? 0 : t33.delay,
delayVal = t33?.delay != 0 ? $"{t33?.delay} {Global.DelayUnit}" : string.Empty,
speedVal = t33?.speed != 0 ? $"{t33?.speed} {Global.SpeedUnit}" : string.Empty,
todayDown = t22 == null ? "" : Utile.HumanFy(t22.todayDown),
todayUp = t22 == null ? "" : Utile.HumanFy(t22.todayUp),
totalDown = t22 == null ? "" : Utile.HumanFy(t22.totalDown),
totalUp = t22 == null ? "" : Utile.HumanFy(t22.totalUp)
todayDown = t22 == null ? "" : Utils.HumanFy(t22.todayDown),
todayUp = t22 == null ? "" : Utils.HumanFy(t22.todayUp),
totalDown = t22 == null ? "" : Utils.HumanFy(t22.totalDown),
totalUp = t22 == null ? "" : Utils.HumanFy(t22.totalUp)
}).OrderBy(t => t.sort).ToList();
_lstProfile = JsonUtile.Deserialize<List<ProfileItem>>(JsonUtile.Serialize(lstModel));
_lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel));
Application.Current.Dispatcher.Invoke((Action)(() =>
{
@@ -951,7 +951,7 @@ namespace v2rayN.ViewModels
}
else
{
lstSelecteds = JsonUtile.Deserialize<List<ProfileItem>>(JsonUtile.Serialize(orderProfiles));
lstSelecteds = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(orderProfiles));
}
return 0;
@@ -971,7 +971,7 @@ namespace v2rayN.ViewModels
}
else
{
if (Utile.IsNullOrEmpty(SelectedProfile?.indexId))
if (Utils.IsNullOrEmpty(SelectedProfile?.indexId))
{
return;
}
@@ -1004,7 +1004,7 @@ namespace v2rayN.ViewModels
public void AddServerViaClipboard()
{
var clipboardData = Utile.GetClipboardData();
var clipboardData = Utils.GetClipboardData();
int ret = ConfigHandler.AddBatchServers(_config, clipboardData!, _subId, false);
if (ret > 0)
{
@@ -1018,15 +1018,15 @@ namespace v2rayN.ViewModels
{
ShowHideWindow(false);
var dpiXY = Utile.GetDpiXY(Application.Current.MainWindow);
var dpiXY = Utils.GetDpiXY(Application.Current.MainWindow);
string result = await Task.Run(() =>
{
return Utile.ScanScreen(dpiXY.Item1, dpiXY.Item2);
return Utils.ScanScreen(dpiXY.Item1, dpiXY.Item2);
});
ShowHideWindow(true);
if (Utile.IsNullOrEmpty(result))
if (Utils.IsNullOrEmpty(result))
{
_noticeHandler?.Enqueue(ResUI.NoValidQRcodeFound);
}
@@ -1088,7 +1088,7 @@ namespace v2rayN.ViewModels
public void SetDefaultServer()
{
if (Utile.IsNullOrEmpty(SelectedProfile?.indexId))
if (Utils.IsNullOrEmpty(SelectedProfile?.indexId))
{
return;
}
@@ -1097,7 +1097,7 @@ namespace v2rayN.ViewModels
private void SetDefaultServer(string indexId)
{
if (Utile.IsNullOrEmpty(indexId))
if (Utils.IsNullOrEmpty(indexId))
{
return;
}
@@ -1129,7 +1129,7 @@ namespace v2rayN.ViewModels
{
return;
}
if (Utile.IsNullOrEmpty(SelectedServer.ID))
if (Utils.IsNullOrEmpty(SelectedServer.ID))
{
return;
}
@@ -1145,7 +1145,7 @@ namespace v2rayN.ViewModels
return;
}
var url = ShareHandler.GetShareUrl(item);
if (Utile.IsNullOrEmpty(url))
if (Utils.IsNullOrEmpty(url))
{
return;
}
@@ -1161,7 +1161,7 @@ namespace v2rayN.ViewModels
public void SortServer(string colName)
{
if (Utile.IsNullOrEmpty(colName))
if (Utils.IsNullOrEmpty(colName))
{
return;
}
@@ -1286,7 +1286,7 @@ namespace v2rayN.ViewModels
foreach (var it in lstSelecteds)
{
string url = ShareHandler.GetShareUrl(it);
if (Utile.IsNullOrEmpty(url))
if (Utils.IsNullOrEmpty(url))
{
continue;
}
@@ -1295,7 +1295,7 @@ namespace v2rayN.ViewModels
}
if (sb.Length > 0)
{
Utile.SetClipboardData(sb.ToString());
Utils.SetClipboardData(sb.ToString());
_noticeHandler?.SendMessage(ResUI.BatchExportURLSuccessfully);
}
}
@@ -1311,7 +1311,7 @@ namespace v2rayN.ViewModels
foreach (var it in lstSelecteds)
{
string? url = ShareHandler.GetShareUrl(it);
if (Utile.IsNullOrEmpty(url))
if (Utils.IsNullOrEmpty(url))
{
continue;
}
@@ -1320,7 +1320,7 @@ namespace v2rayN.ViewModels
}
if (sb.Length > 0)
{
Utile.SetClipboardData(Utile.Base64Encode(sb.ToString()));
Utils.SetClipboardData(Utils.Base64Encode(sb.ToString()));
_noticeHandler?.SendMessage(ResUI.BatchExportSubscriptionSuccessfully);
}
}
@@ -1407,8 +1407,8 @@ namespace v2rayN.ViewModels
{
UseShellExecute = true,
Arguments = Global.RebootAs,
WorkingDirectory = Utile.StartupPath(),
FileName = Utile.GetExePath().AppendQuotes(),
WorkingDirectory = Utils.StartupPath(),
FileName = Utils.GetExePath().AppendQuotes(),
Verb = "runas",
};
try
@@ -1426,7 +1426,7 @@ namespace v2rayN.ViewModels
{
return;
}
if (Utile.IsNullOrEmpty(fileName))
if (Utils.IsNullOrEmpty(fileName))
{
return;
}
@@ -1472,8 +1472,8 @@ namespace v2rayN.ViewModels
{
CloseCore();
string fileName = Utile.GetTempPath(Utile.GetDownloadFileName(msg));
string toPath = Utile.GetBinPath("", type.ToString());
string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(msg));
string toPath = Utils.GetBinPath("", type.ToString());
FileManager.ZipExtractToFile(fileName, toPath, _config.guiItem.ignoreGeoUpdateCore ? "geo" : "");
@@ -1647,7 +1647,7 @@ namespace v2rayN.ViewModels
{
_config.tunModeItem.enableTun = EnableTun;
// When running as a non-administrator, reboot to administrator mode
if (EnableTun && !Utile.IsAdministrator())
if (EnableTun && !Utils.IsAdministrator())
{
_config.tunModeItem.enableTun = false;
RebootAsAdmin();
@@ -1689,7 +1689,7 @@ namespace v2rayN.ViewModels
{
if (FollowSystemTheme)
{
ModifyTheme(!Utile.IsLightTheme());
ModifyTheme(!Utils.IsLightTheme());
}
else
{
@@ -1747,7 +1747,7 @@ namespace v2rayN.ViewModels
ConfigHandler.SaveConfig(_config);
if (FollowSystemTheme)
{
ModifyTheme(!Utile.IsLightTheme());
ModifyTheme(!Utils.IsLightTheme());
}
else
{
@@ -1799,7 +1799,7 @@ namespace v2rayN.ViewModels
y => y != null && !y.IsNullOrEmpty())
.Subscribe(c =>
{
if (!Utile.IsNullOrEmpty(CurrentLanguage))
if (!Utils.IsNullOrEmpty(CurrentLanguage))
{
_config.uiItem.currentLanguage = CurrentLanguage;
Thread.CurrentThread.CurrentUICulture = new(CurrentLanguage);
@@ -1851,7 +1851,7 @@ namespace v2rayN.ViewModels
theme.SetBaseTheme(isDarkTheme ? Theme.Dark : Theme.Light);
_paletteHelper.SetTheme(theme);
Utile.SetDarkBorder(Application.Current.MainWindow, isDarkTheme);
Utils.SetDarkBorder(Application.Current.MainWindow, isDarkTheme);
}
public void ChangePrimaryColor(System.Windows.Media.Color color)

6
v2rayn/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
View File

@@ -192,7 +192,7 @@ namespace v2rayN.ViewModels
SaveSetting();
});
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
}
private void InitCoreType()
@@ -249,7 +249,7 @@ namespace v2rayN.ViewModels
private void SaveSetting()
{
if (Utile.IsNullOrEmpty(localPort.ToString()) || !Utile.IsNumeric(localPort.ToString())
if (Utils.IsNullOrEmpty(localPort.ToString()) || !Utils.IsNumeric(localPort.ToString())
|| localPort <= 0 || localPort >= Global.MaxPort)
{
_noticeHandler?.Enqueue(ResUI.FillLocalListeningPort);
@@ -300,7 +300,7 @@ namespace v2rayN.ViewModels
//_config.kcpItem.congestion = Kcpcongestion;
//UI
Utile.SetAutoRun(Global.AutoRunRegPath, Global.AutoRunName, AutoRun);
Utils.SetAutoRun(Global.AutoRunRegPath, Global.AutoRunName, AutoRun);
_config.guiItem.autoRun = AutoRun;
_config.guiItem.enableStatistics = EnableStatistics;
_config.guiItem.keepOlderDedupl = KeepOlderDedupl;

30
v2rayn/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs
View File

@@ -43,7 +43,7 @@ namespace v2rayN.ViewModels
if (rulesItem.id.IsNullOrEmpty())
{
rulesItem.id = Utile.GetGUID(false);
rulesItem.id = Utils.GetGUID(false);
rulesItem.outboundTag = Global.ProxyTag;
rulesItem.enabled = true;
SelectedSource = rulesItem;
@@ -53,35 +53,35 @@ namespace v2rayN.ViewModels
SelectedSource = rulesItem;
}
Domain = Utile.List2String(SelectedSource.domain, true);
IP = Utile.List2String(SelectedSource.ip, true);
Process = Utile.List2String(SelectedSource.process, true);
Domain = Utils.List2String(SelectedSource.domain, true);
IP = Utils.List2String(SelectedSource.ip, true);
Process = Utils.List2String(SelectedSource.process, true);
SaveCmd = ReactiveCommand.Create(() =>
{
SaveRules();
});
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
}
private void SaveRules()
{
Domain = Utile.Convert2Comma(Domain);
IP = Utile.Convert2Comma(IP);
Process = Utile.Convert2Comma(Process);
Domain = Utils.Convert2Comma(Domain);
IP = Utils.Convert2Comma(IP);
Process = Utils.Convert2Comma(Process);
if (AutoSort)
{
SelectedSource.domain = Utile.String2ListSorted(Domain);
SelectedSource.ip = Utile.String2ListSorted(IP);
SelectedSource.process = Utile.String2ListSorted(Process);
SelectedSource.domain = Utils.String2ListSorted(Domain);
SelectedSource.ip = Utils.String2ListSorted(IP);
SelectedSource.process = Utils.String2ListSorted(Process);
}
else
{
SelectedSource.domain = Utile.String2List(Domain);
SelectedSource.ip = Utile.String2List(IP);
SelectedSource.process = Utile.String2List(Process);
SelectedSource.domain = Utils.String2List(Domain);
SelectedSource.ip = Utils.String2List(IP);
SelectedSource.process = Utils.String2List(Process);
}
SelectedSource.protocol = ProtocolItems?.ToList();
SelectedSource.inboundTag = InboundTagItems?.ToList();
@@ -90,7 +90,7 @@ namespace v2rayN.ViewModels
|| SelectedSource.ip?.Count > 0
|| SelectedSource.protocol?.Count > 0
|| SelectedSource.process?.Count > 0
|| !Utile.IsNullOrEmpty(SelectedSource.port);
|| !Utils.IsNullOrEmpty(SelectedSource.port);
if (!hasRule)
{

36
v2rayn/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
View File

@@ -58,7 +58,7 @@ namespace v2rayN.ViewModels
else
{
SelectedRouting = routingItem;
_rules = JsonUtile.Deserialize<List<RulesItem>>(SelectedRouting.ruleSet);
_rules = JsonUtils.Deserialize<List<RulesItem>>(SelectedRouting.ruleSet);
}
RefreshRulesItems();
@@ -115,7 +115,7 @@ namespace v2rayN.ViewModels
SaveRouting();
});
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
}
public void RefreshRulesItems()
@@ -129,10 +129,10 @@ namespace v2rayN.ViewModels
id = item.id,
outboundTag = item.outboundTag,
port = item.port,
protocols = Utile.List2String(item.protocol),
inboundTags = Utile.List2String(item.inboundTag),
domains = Utile.List2String(item.domain),
ips = Utile.List2String(item.ip),
protocols = Utils.List2String(item.protocol),
inboundTags = Utils.List2String(item.inboundTag),
domains = Utils.List2String(item.domain),
ips = Utils.List2String(item.ip),
enabled = item.enabled,
};
_rulesItems.Add(it);
@@ -207,7 +207,7 @@ namespace v2rayN.ViewModels
}
if (lst.Count > 0)
{
Utile.SetClipboardData(JsonUtile.Serialize(lst));
Utils.SetClipboardData(JsonUtils.Serialize(lst));
//_noticeHandler?.Enqueue(ResUI.OperationSuccess"));
}
}
@@ -235,7 +235,7 @@ namespace v2rayN.ViewModels
private void SaveRouting()
{
string remarks = SelectedRouting.remarks;
if (Utile.IsNullOrEmpty(remarks))
if (Utils.IsNullOrEmpty(remarks))
{
_noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
return;
@@ -243,10 +243,10 @@ namespace v2rayN.ViewModels
var item = SelectedRouting;
foreach (var it in _rules)
{
it.id = Utile.GetGUID(false);
it.id = Utils.GetGUID(false);
}
item.ruleNum = _rules.Count;
item.ruleSet = JsonUtile.Serialize(_rules, false);
item.ruleSet = JsonUtils.Serialize(_rules, false);
if (ConfigHandler.SaveRoutingItem(_config, item) == 0)
{
@@ -268,13 +268,13 @@ namespace v2rayN.ViewModels
{
return;
}
if (Utile.IsNullOrEmpty(fileName))
if (Utils.IsNullOrEmpty(fileName))
{
return;
}
string result = Utile.LoadResource(fileName);
if (Utile.IsNullOrEmpty(result))
string result = Utils.LoadResource(fileName);
if (Utils.IsNullOrEmpty(result))
{
return;
}
@@ -288,7 +288,7 @@ namespace v2rayN.ViewModels
private void ImportRulesFromClipboard()
{
string clipboardData = Utile.GetClipboardData();
string clipboardData = Utils.GetClipboardData();
if (AddBatchRoutingRules(SelectedRouting, clipboardData) == 0)
{
RefreshRulesItems();
@@ -299,7 +299,7 @@ namespace v2rayN.ViewModels
private async Task ImportRulesFromUrl()
{
var url = SelectedRouting.url;
if (Utile.IsNullOrEmpty(url))
if (Utils.IsNullOrEmpty(url))
{
_noticeHandler?.Enqueue(ResUI.MsgNeedUrl);
return;
@@ -324,18 +324,18 @@ namespace v2rayN.ViewModels
{
blReplace = true;
}
if (Utile.IsNullOrEmpty(clipboardData))
if (Utils.IsNullOrEmpty(clipboardData))
{
return -1;
}
var lstRules = JsonUtile.Deserialize<List<RulesItem>>(clipboardData);
var lstRules = JsonUtils.Deserialize<List<RulesItem>>(clipboardData);
if (lstRules == null)
{
return -1;
}
foreach (var rule in lstRules)
{
rule.id = Utile.GetGUID(false);
rule.id = Utils.GetGUID(false);
}
if (blReplace)

30
v2rayn/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs
View File

@@ -126,7 +126,7 @@ namespace v2rayN.ViewModels
SaveRouting();
});
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
}
#region locked
@@ -136,15 +136,15 @@ namespace v2rayN.ViewModels
_lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
if (_lockedItem != null)
{
_lockedRules = JsonUtile.Deserialize<List<RulesItem>>(_lockedItem.ruleSet);
ProxyDomain = Utile.List2String(_lockedRules[0].domain, true);
ProxyIP = Utile.List2String(_lockedRules[0].ip, true);
_lockedRules = JsonUtils.Deserialize<List<RulesItem>>(_lockedItem.ruleSet);
ProxyDomain = Utils.List2String(_lockedRules[0].domain, true);
ProxyIP = Utils.List2String(_lockedRules[0].ip, true);
DirectDomain = Utile.List2String(_lockedRules[1].domain, true);
DirectIP = Utile.List2String(_lockedRules[1].ip, true);
DirectDomain = Utils.List2String(_lockedRules[1].domain, true);
DirectIP = Utils.List2String(_lockedRules[1].ip, true);
BlockDomain = Utile.List2String(_lockedRules[2].domain, true);
BlockIP = Utile.List2String(_lockedRules[2].ip, true);
BlockDomain = Utils.List2String(_lockedRules[2].domain, true);
BlockIP = Utils.List2String(_lockedRules[2].ip, true);
}
}
@@ -152,16 +152,16 @@ namespace v2rayN.ViewModels
{
if (_lockedItem != null)
{
_lockedRules[0].domain = Utile.String2List(Utile.Convert2Comma(ProxyDomain.TrimEx()));
_lockedRules[0].ip = Utile.String2List(Utile.Convert2Comma(ProxyIP.TrimEx()));
_lockedRules[0].domain = Utils.String2List(Utils.Convert2Comma(ProxyDomain.TrimEx()));
_lockedRules[0].ip = Utils.String2List(Utils.Convert2Comma(ProxyIP.TrimEx()));
_lockedRules[1].domain = Utile.String2List(Utile.Convert2Comma(DirectDomain.TrimEx()));
_lockedRules[1].ip = Utile.String2List(Utile.Convert2Comma(DirectIP.TrimEx()));
_lockedRules[1].domain = Utils.String2List(Utils.Convert2Comma(DirectDomain.TrimEx()));
_lockedRules[1].ip = Utils.String2List(Utils.Convert2Comma(DirectIP.TrimEx()));
_lockedRules[2].domain = Utile.String2List(Utile.Convert2Comma(BlockDomain.TrimEx()));
_lockedRules[2].ip = Utile.String2List(Utile.Convert2Comma(BlockIP.TrimEx()));
_lockedRules[2].domain = Utils.String2List(Utils.Convert2Comma(BlockDomain.TrimEx()));
_lockedRules[2].ip = Utils.String2List(Utils.Convert2Comma(BlockIP.TrimEx()));
_lockedItem.ruleSet = JsonUtile.Serialize(_lockedRules, false);
_lockedItem.ruleSet = JsonUtils.Serialize(_lockedRules, false);
ConfigHandler.SaveRoutingItem(_config, _lockedItem);
}

6
v2rayn/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs
View File

@@ -32,7 +32,7 @@ namespace v2rayN.ViewModels
}
else
{
SelectedSource = JsonUtile.DeepCopy(subItem);
SelectedSource = JsonUtils.DeepCopy(subItem);
}
SaveCmd = ReactiveCommand.Create(() =>
@@ -40,13 +40,13 @@ namespace v2rayN.ViewModels
SaveSub();
});
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
}
private void SaveSub()
{
string remarks = SelectedSource.remarks;
if (Utile.IsNullOrEmpty(remarks))
if (Utils.IsNullOrEmpty(remarks))
{
_noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
return;

4
v2rayn/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs
View File

@@ -62,7 +62,7 @@ namespace v2rayN.ViewModels
SubShare();
}, canEditRemove);
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
}
public void RefreshSubItems()
@@ -112,7 +112,7 @@ namespace v2rayN.ViewModels
private async void SubShare()
{
if (Utile.IsNullOrEmpty(SelectedSource?.url))
if (Utils.IsNullOrEmpty(SelectedSource?.url))
{
return;
}

6
v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
View File

@@ -265,7 +265,7 @@ namespace v2rayN.Views
private void btnGUID_Click(object sender, RoutedEventArgs e)
{
txtId.Text =
txtId5.Text = Utile.GetGUID();
txtId5.Text = Utils.GetGUID();
}
private void SetHeaderType()
@@ -273,7 +273,7 @@ namespace v2rayN.Views
cmbHeaderType.Items.Clear();
var network = cmbNetwork.SelectedItem.ToString();
if (Utile.IsNullOrEmpty(network))
if (Utils.IsNullOrEmpty(network))
{
cmbHeaderType.Items.Add(Global.None);
return;
@@ -307,7 +307,7 @@ namespace v2rayN.Views
private void SetTips()
{
var network = cmbNetwork.SelectedItem.ToString();
if (Utile.IsNullOrEmpty(network))
if (Utils.IsNullOrEmpty(network))
{
network = Global.DefaultNetwork;
}

4
v2rayn/v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs
View File

@@ -51,12 +51,12 @@ namespace v2rayN.Views
private void linkDnsObjectDoc_Click(object sender, RoutedEventArgs e)
{
Utile.ProcessStart("https://www.v2fly.org/config/dns.html#dnsobject");
Utils.ProcessStart("https://www.v2fly.org/config/dns.html#dnsobject");
}
private void linkDnsSingboxObjectDoc_Click(object sender, RoutedEventArgs e)
{
Utile.ProcessStart("https://sing-box.sagernet.org/zh/configuration/dns/");
Utils.ProcessStart("https://sing-box.sagernet.org/zh/configuration/dns/");
}
}
}

4
v2rayn/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
View File

@@ -39,7 +39,7 @@ namespace v2rayN.Views
HotkeyHandler.Instance.IsPause = true;
this.Closing += (s, e) => HotkeyHandler.Instance.IsPause = false;
Utile.SetDarkBorder(this, _config.uiItem.colorModeDark);
Utils.SetDarkBorder(this, _config.uiItem.colorModeDark);
InitData();
}
@@ -70,7 +70,7 @@ namespace v2rayN.Views
private KeyEventItem GetKeyEventItemByEGlobalHotkey(List<KeyEventItem> KEList, EGlobalHotkey eg)
{
return JsonUtile.DeepCopy(KEList.Find((it) => it.eGlobalHotkey == eg) ?? new()
return JsonUtils.DeepCopy(KEList.Find((it) => it.eGlobalHotkey == eg) ?? new()
{
eGlobalHotkey = eg,
Control = false,

18
v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml.cs
View File

@@ -210,8 +210,8 @@ namespace v2rayN.Views
RestoreUI();
AddHelpMenuItem();
var IsAdministrator = Utile.IsAdministrator();
this.Title = $"{Utile.GetVersion()} - {(IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
var IsAdministrator = Utils.IsAdministrator();
this.Title = $"{Utils.GetVersion()} - {(IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
//if (_config.uiItem.autoHideStartup)
//{
@@ -234,7 +234,7 @@ namespace v2rayN.Views
{
if (wParam == IntPtr.Zero && Marshal.PtrToStringUni(lParam) == "ImmersiveColorSet")
{
ViewModel?.ModifyTheme(!Utile.IsLightTheme());
ViewModel?.ModifyTheme(!Utils.IsLightTheme());
}
}
}
@@ -421,7 +421,7 @@ namespace v2rayN.Views
private void menuPromotion_Click(object sender, RoutedEventArgs e)
{
Utile.ProcessStart($"{Utile.Base64Decode(Global.PromotionUrl)}?t={DateTime.Now.Ticks}");
Utils.ProcessStart($"{Utils.Base64Decode(Global.PromotionUrl)}?t={DateTime.Now.Ticks}");
}
private void txtRunningInfoDisplay_MouseDoubleClick(object sender, MouseButtonEventArgs e)
@@ -431,7 +431,7 @@ namespace v2rayN.Views
private void menuSettingsSetUWP_Click(object sender, RoutedEventArgs e)
{
Utile.ProcessStart(Utile.GetBinPath("EnableLoopback.exe"));
Utils.ProcessStart(Utils.GetBinPath("EnableLoopback.exe"));
}
private void BtnAutofitColumnWidth_Click(object sender, RoutedEventArgs e)
@@ -516,8 +516,8 @@ namespace v2rayN.Views
private void StorageUI()
{
_config.uiItem.mainWidth = Utile.ToInt(this.Width);
_config.uiItem.mainHeight = Utile.ToInt(this.Height);
_config.uiItem.mainWidth = Utils.ToInt(this.Width);
_config.uiItem.mainHeight = Utils.ToInt(this.Height);
List<ColumnItem> lvColumnItem = new();
for (int k = 0; k < lstProfiles.Columns.Count; k++)
@@ -526,7 +526,7 @@ namespace v2rayN.Views
lvColumnItem.Add(new()
{
Name = item2.ExName,
Width = item2.Visibility == Visibility.Visible ? Utile.ToInt(item2.ActualWidth) : -1,
Width = item2.Visibility == Visibility.Visible ? Utils.ToInt(item2.ActualWidth) : -1,
Index = item2.DisplayIndex
});
}
@@ -559,7 +559,7 @@ namespace v2rayN.Views
{
if (sender is MenuItem item)
{
Utile.ProcessStart(item.Tag.ToString());
Utils.ProcessStart(item.Tag.ToString());
}
}

6
v2rayn/v2rayN/v2rayN/Views/MsgView.xaml.cs
View File

@@ -48,7 +48,7 @@ namespace v2rayN.Views
var MsgFilter = cmbMsgFilter.Text.TrimEx();
if (MsgFilter != lastMsgFilter) lastMsgFilterNotAvailable = false;
if (!Utile.IsNullOrEmpty(MsgFilter) && !lastMsgFilterNotAvailable)
if (!Utils.IsNullOrEmpty(MsgFilter) && !lastMsgFilterNotAvailable)
{
try
{
@@ -99,13 +99,13 @@ namespace v2rayN.Views
private void menuMsgViewCopy_Click(object sender, System.Windows.RoutedEventArgs e)
{
var data = txtMsg.SelectedText.TrimEx();
Utile.SetClipboardData(data);
Utils.SetClipboardData(data);
}
private void menuMsgViewCopyAll_Click(object sender, System.Windows.RoutedEventArgs e)
{
var data = txtMsg.Text;
Utile.SetClipboardData(data);
Utils.SetClipboardData(data);
}
private void menuMsgViewClear_Click(object sender, System.Windows.RoutedEventArgs e)

8
v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
View File

@@ -96,13 +96,13 @@ namespace v2rayN.Views
var files = new List<string>();
foreach (var pattern in searchPatterns)
{
files.AddRange(Directory.GetFiles(Utile.GetFontsPath(), pattern));
files.AddRange(Directory.GetFiles(Utils.GetFontsPath(), pattern));
}
var culture = _config.uiItem.currentLanguage == Global.Languages[0] ? "zh-cn" : "en-us";
var culture2 = "en-us";
foreach (var ttf in files)
{
var families = Fonts.GetFontFamilies(Utile.GetFontsPath(ttf));
var families = Fonts.GetFontFamilies(Utils.GetFontsPath(ttf));
foreach (FontFamily family in families)
{
var typefaces = family.GetTypefaces();
@@ -115,10 +115,10 @@ namespace v2rayN.Views
// continue;
//}
var fontFamily = glyph.Win32FamilyNames[new CultureInfo(culture)];
if (Utile.IsNullOrEmpty(fontFamily))
if (Utils.IsNullOrEmpty(fontFamily))
{
fontFamily = glyph.Win32FamilyNames[new CultureInfo(culture2)];
if (Utile.IsNullOrEmpty(fontFamily))
if (Utils.IsNullOrEmpty(fontFamily))
{
continue;
}

2
v2rayn/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
View File

@@ -83,7 +83,7 @@ namespace v2rayN.Views
private void linkRuleobjectDoc_Click(object sender, RoutedEventArgs e)
{
Utile.ProcessStart("https://www.v2fly.org/config/routing.html#ruleobject");
Utils.ProcessStart("https://www.v2fly.org/config/routing.html#ruleobject");
}
}
}

4
v2rayn/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
View File

@@ -127,12 +127,12 @@ namespace v2rayN.Views
private void linkdomainStrategy_Click(object sender, System.Windows.RoutedEventArgs e)
{
Utile.ProcessStart("https://www.v2fly.org/config/routing.html");
Utils.ProcessStart("https://www.v2fly.org/config/routing.html");
}
private void linkdomainStrategy4Singbox_Click(object sender, RoutedEventArgs e)
{
Utile.ProcessStart("https://sing-box.sagernet.org/zh/configuration/shared/listen/#domain_strategy");
Utils.ProcessStart("https://sing-box.sagernet.org/zh/configuration/shared/listen/#domain_strategy");
}
private void btnCancel_Click(object sender, System.Windows.RoutedEventArgs e)

2
v2rayn/v2rayN/v2rayN/v2rayN.csproj
View File

@@ -24,7 +24,7 @@
<PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" />
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
<PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
<PackageReference Include="ReactiveUI.WPF" Version="19.5.41" />
<PackageReference Include="ReactiveUI.WPF" Version="19.5.72" />
<PackageReference Include="Splat.NLog" Version="14.8.12" />
</ItemGroup>

12
yass/README.md
View File

@@ -22,13 +22,13 @@ More Information refers to [wiki](https://github.com/Chilledheart/yass/wiki) and
## Usages
### Prebuilt binaries
- Android [download apk](https://github.com/Chilledheart/yass/releases/download/1.8.0/yass-android-release-arm64-1.8.0.apk) or [download 32-bit apk](https://github.com/Chilledheart/yass/releases/download/1.8.0/yass-android-release-arm-1.8.0.apk)
- iOS [join via TestFlight](https://testflight.apple.com/join/6AkiEq09) or [download ipa](https://github.com/Chilledheart/yass/releases/download/1.8.0/yass-ios-release-arm64-1.8.0.ipa)
- Windows [download installer](https://github.com/Chilledheart/yass/releases/download/1.8.0/yass-mingw-winxp-release-x86_64-1.8.0-system-installer.exe) or [download 32-bit installer (require runtime)](https://github.com/Chilledheart/yass/releases/download/1.8.0/yass-mingw-winxp-release-i686-1.8.0-system-installer.exe) or [download woa arm64 installer](https://github.com/Chilledheart/yass/releases/download/1.8.0/yass-mingw-release-aarch64-1.8.0-system-installer.exe)
- macOS [download intel dmg](https://github.com/Chilledheart/yass/releases/download/1.8.0/yass-macos-release-x64-1.8.0.dmg) or [download apple silicon dmg](https://github.com/Chilledheart/yass/releases/download/1.8.0/yass-macos-release-arm64-1.8.0.dmg)
- Linux [download rpm](https://github.com/Chilledheart/yass/releases/download/1.8.0/yass.el7.x86_64.1.8.0-0.rpm) or [download deb](https://github.com/Chilledheart/yass/releases/download/1.8.0/yass-client-ubuntu-16.04-xenial_amd64.1.8.0.deb)
- Android [download apk](https://github.com/Chilledheart/yass/releases/download/1.8.1/yass-android-release-arm64-1.8.1.apk) or [download 32-bit apk](https://github.com/Chilledheart/yass/releases/download/1.8.1/yass-android-release-arm-1.8.1.apk)
- iOS [join via TestFlight](https://testflight.apple.com/join/6AkiEq09) or [download ipa](https://github.com/Chilledheart/yass/releases/download/1.8.1/yass-ios-release-arm64-1.8.1.ipa)
- Windows [download installer](https://github.com/Chilledheart/yass/releases/download/1.8.1/yass-mingw-winxp-release-x86_64-1.8.1-system-installer.exe) or [download 32-bit installer (require runtime)](https://github.com/Chilledheart/yass/releases/download/1.8.1/yass-mingw-winxp-release-i686-1.8.1-system-installer.exe) or [download woa arm64 installer](https://github.com/Chilledheart/yass/releases/download/1.8.1/yass-mingw-release-aarch64-1.8.1-system-installer.exe)
- macOS [download intel dmg](https://github.com/Chilledheart/yass/releases/download/1.8.1/yass-macos-release-x64-1.8.1.dmg) or [download apple silicon dmg](https://github.com/Chilledheart/yass/releases/download/1.8.1/yass-macos-release-arm64-1.8.1.dmg)
- Linux [download rpm](https://github.com/Chilledheart/yass/releases/download/1.8.1/yass.el7.x86_64.1.8.1-0.rpm) or [download deb](https://github.com/Chilledheart/yass/releases/download/1.8.1/yass-client-ubuntu-16.04-xenial_amd64.1.8.1.deb)
View more at [release page](https://github.com/Chilledheart/yass/releases/tag/1.8.0)
View more at [release page](https://github.com/Chilledheart/yass/releases/tag/1.8.1)
### Status of Package Store
Visit wiki's [Status of Package Store](https://github.com/Chilledheart/yass/wiki/Status-of-Package-Store)

6
yass/debian/changelog
View File

@@ -1,3 +1,9 @@
yass (1.8.1-1) UNRELEASED; urgency=medium
* bump to chromium 124 dependents.
* miscellaneous fixes
-- Chilledheart <keeyou-cn@outlook.com> Tue, 26 Mar 2024 16:16:59 +0800
yass (1.8.0-1) UNRELEASED; urgency=medium
* bump to chromium 124 dependents.

9
yass/src/cli/cli_worker.cpp
View File

@@ -19,7 +19,14 @@ class WorkerPrivate {
std::unique_ptr<CliServer> cli_server;
};
Worker::Worker() : resolver_(io_context_), private_(new WorkerPrivate) {
Worker::Worker()
: resolver_(io_context_),
cached_server_host_(absl::GetFlag(FLAGS_server_host)),
cached_server_sni_(absl::GetFlag(FLAGS_server_sni)),
cached_server_port_(absl::GetFlag(FLAGS_server_port)),
cached_local_host_(absl::GetFlag(FLAGS_local_host)),
cached_local_port_(absl::GetFlag(FLAGS_local_port)),
private_(new WorkerPrivate) {
#ifdef _WIN32
int iResult = 0;
WSADATA wsaData = {0};

2
yass/src/cli/cli_worker.hpp
View File

@@ -66,7 +66,7 @@ class Worker {
std::vector<std::string> remote_server_ips_v6_;
std::string remote_server_sni_;
std::string local_server_ips_;
uint16_t local_port_;
uint16_t local_port_ = 0;
std::vector<asio::ip::tcp::endpoint> endpoints_;
std::atomic_bool in_destroy_ = false;
};

3
yass/yass.spec.in
View File

@@ -240,6 +240,9 @@ for embedded devices and low end boxes.
%systemd_postun_with_restart yass-redir.service
%changelog
* Tue Mar 26 2024 Chilledheart <keeyou-cn@outlook.com> - 1.8.1-1
- bump to chromium 124 dependents.
- miscellaneous fixes
* Wed Mar 20 2024 Chilledheart <keeyou-cn@outlook.com> - 1.8.0-1
- bump to chromium 124 dependents.
* Mon Mar 18 2024 Chilledheart <keeyou-cn@outlook.com> - 1.7.5-1