github
/
dev-sidecar
mirror of https://github.com/docmirror/dev-sidecar
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into develop

release-2.0.0.2
王良 2025-04-07 22:58:38 +08:00
parent 42224a4bf0 8ed6193513
commit cc5e6010da
4 changed files with 29 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/package.json
View File

@ -16,7 +16,7 @@
"test": "mocha"
},
"dependencies": {
"@starknt/sysproxy": "^0.0.2",
"@starknt/sysproxy": "^0.0.3",
"@vscode/sudo-prompt": "^9.3.1",
"fix-path": "^3.0.0",
"iconv-lite": "^0.6.3",

2
packages/core/src/shell/scripts/set-system-proxy/index.js
View File

@ -203,7 +203,7 @@ const executor = {
const excludeIpStr = getProxyExcludeIpStr(';')
// 设置代理，同时设置排除域名
try {
require('@starknt/sysproxy').triggerManualProxyByUrl(true, proxyAddr, excludeIpStr)
require('@starknt/sysproxy').triggerManualProxyByUrl(true, proxyAddr, excludeIpStr, true)
log.info(`设置windows系统代理成功: ${proxyAddr} ......(省略排除IP列表)`)
} catch (e1) {
log.warn('设置windows系统代理失败：执行 `@starknt/sysproxy` 失败，现尝试通过执行 `sysproxy.exe global ...` 来设置系统代理！\r\n捕获的异常:', e1)

2
packages/gui/package.json
View File

@ -23,7 +23,7 @@
"@docmirror/dev-sidecar": "workspace:*",
"@docmirror/mitmproxy": "workspace:*",
"@starknt/shutdown-handler-napi": "^0.0.3",
"@starknt/sysproxy": "^0.0.2",
"@starknt/sysproxy": "^0.0.3",
"@vscode/sudo-prompt": "^9.3.1",
"adm-zip": "^0.5.16",
"ant-design-vue": "^1.7.8",

82
pnpm-lock.yaml
View File

@ -30,8 +30,8 @@ importers:
packages/core:
dependencies:
'@starknt/sysproxy':
specifier: ^0.0.2
version: 0.0.2
specifier: ^0.0.3
version: 0.0.3
'@vscode/sudo-prompt':
specifier: ^9.3.1
version: 9.3.1
@ -76,8 +76,8 @@ importers:
specifier: ^0.0.3
version: 0.0.3
'@starknt/sysproxy':
specifier: ^0.0.2
version: 0.0.2
specifier: ^0.0.3
version: 0.0.3
'@vscode/sudo-prompt':
specifier: ^9.3.1
version: 9.3.1
@ -141,7 +141,7 @@ importers:
version: 19.1.9
electron-builder:
specifier: ^25.1.8
version: 25.1.8(electron-builder-squirrel-windows@25.1.8(dmg-builder@25.1.8))
version: 25.1.8(electron-builder-squirrel-windows@25.1.8)
electron-icon-builder:
specifier: ^2.0.1
version: 2.0.1
@ -1345,44 +1345,26 @@ packages:
resolution: {integrity: sha512-Zx2zXJeM2rCUgdbHcMFfvpvwswIuXMU1qWhqGUD1+b7Fgqoz/MM57XjjZJqqktpAfrN876haJBxxaDWIqIMIsw==}
engines: {node: '>= 10'}
'@starknt/sysproxy-darwin-arm64@0.0.2':
resolution: {integrity: sha512-ZSKm8FBWJJv//Ypc513A7+hqG6GQxFmxsHX+tgclvwKK7S0tNgaMgCdKjQ5rCDWTJufDq6BE3QPmSlUfeukD2Q==}
'@starknt/sysproxy-darwin-x64@0.0.3':
resolution: {integrity: sha512-gXN1hqmyPY3/Y5iCAoN36rxszW0On9AJjmo+4REuct/boUh+yc8A+JjjcpNkcvGPWQED8TVQ6WjCNj36nXAHZA==}
engines: {node: '>= 10'}
cpu: [arm64]
cpu: [x64]
os: [darwin]
'@starknt/sysproxy-linux-arm64-gnu@0.0.2':
resolution: {integrity: sha512-WedSH4rsD30hKfcEqV+zF2GJc0q545WAKDMaXtMMRrRJZcOy9IFFRajkOuo+1TFzlPqjF/edsjLa294FcYWMIw==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [linux]
'@starknt/sysproxy-linux-x64-gnu@0.0.2':
resolution: {integrity: sha512-/rSsvLOmCjkwYqzJqkq7Y31X3D1FneZiAG4HBcr9/wjSiuXq6beUiRAe6X5mjc2LisvFOZPPHd7zIHytplyGEw==}
'@starknt/sysproxy-linux-x64-gnu@0.0.3':
resolution: {integrity: sha512-HEWO00qfaakgHRkr6pg2bvJwk7aKPcxndTFEijX61qym+WIzepbUOQSQ1HGcYKsxmqJ3dDXT+cTLWshWdnQ5JA==}
engines: {node: '>= 10'}
cpu: [x64]
os: [linux]
'@starknt/sysproxy-win32-arm64-msvc@0.0.2':
resolution: {integrity: sha512-iaUI/9i47LhIKh5XR/tLA6GovPevR3joYSsa4ZBj17uS/B+epli35iSf+QpCwdviXSXTWQqPlEZNeS3hVz/Jhg==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [win32]
'@starknt/sysproxy-win32-ia32-msvc@0.0.2':
resolution: {integrity: sha512-gpKNYN79rVY6YKwEGouFKjMoShh24peK67BkgaGGmlKx9t/Uv3qkzdfFRuqnYumZQt4MVB8wFHMBDgn/M/Jh0g==}
engines: {node: '>= 10'}
cpu: [ia32]
os: [win32]
'@starknt/sysproxy-win32-x64-msvc@0.0.2':
resolution: {integrity: sha512-DUaRzGu7I9CpTKterqsHPzfYgwsdh7eAxOBfmF9/K100KDHYf57sRhfUVTZfDTqBz0jVmxYBX/tIYkqhlf5ldA==}
'@starknt/sysproxy-win32-x64-msvc@0.0.3':
resolution: {integrity: sha512-Lw6zsaZhxQWYsOss4Kgi0rt3Cj+jUn7DqNAVunCD+w3or/FUrGfrGkO+6UyqlVl5l4LaOi4cV3dtdJY91IbWug==}
engines: {node: '>= 10'}
cpu: [x64]
os: [win32]
'@starknt/sysproxy@0.0.2':
resolution: {integrity: sha512-pb5+FcRV6H60maLwTZxwGWD6lw9DM5FsPaQ5TzovSTwqigwBSv1YsQ5jUdm/hXjdALW9tjLVpYwOtO1Ft371ng==}
'@starknt/sysproxy@0.0.3':
resolution: {integrity: sha512-tFPqJEo7JWlDI07OGBn/q6+nhxVw/dvNkvb/wLJO6YFN6itWt9mThJE3SXXeogK3HCo5eBk0OnE0n9tZdoKcHQ==}
engines: {node: '>= 10'}
'@stylistic/eslint-plugin@2.10.1':
@ -8457,32 +8439,20 @@ snapshots:
'@starknt/shutdown-handler-napi-win32-ia32-msvc': 0.0.3
'@starknt/shutdown-handler-napi-win32-x64-msvc': 0.0.3
'@starknt/sysproxy-darwin-arm64@0.0.2':
'@starknt/sysproxy-darwin-x64@0.0.3':
optional: true
'@starknt/sysproxy-linux-arm64-gnu@0.0.2':
'@starknt/sysproxy-linux-x64-gnu@0.0.3':
optional: true
'@starknt/sysproxy-linux-x64-gnu@0.0.2':
'@starknt/sysproxy-win32-x64-msvc@0.0.3':
optional: true
'@starknt/sysproxy-win32-arm64-msvc@0.0.2':
optional: true
'@starknt/sysproxy-win32-ia32-msvc@0.0.2':
optional: true
'@starknt/sysproxy-win32-x64-msvc@0.0.2':
optional: true
'@starknt/sysproxy@0.0.2':
'@starknt/sysproxy@0.0.3':
optionalDependencies:
'@starknt/sysproxy-darwin-arm64': 0.0.2
'@starknt/sysproxy-linux-arm64-gnu': 0.0.2
'@starknt/sysproxy-linux-x64-gnu': 0.0.2
'@starknt/sysproxy-win32-arm64-msvc': 0.0.2
'@starknt/sysproxy-win32-ia32-msvc': 0.0.2
'@starknt/sysproxy-win32-x64-msvc': 0.0.2
'@starknt/sysproxy-darwin-x64': 0.0.3
'@starknt/sysproxy-linux-x64-gnu': 0.0.3
'@starknt/sysproxy-win32-x64-msvc': 0.0.3
'@stylistic/eslint-plugin@2.10.1(eslint@9.15.0)(typescript@5.6.3)':
dependencies:
@ -9457,7 +9427,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
app-builder-lib@25.1.8(dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.8))(electron-builder-squirrel-windows@25.1.8(dmg-builder@25.1.8)):
app-builder-lib@25.1.8(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8):
dependencies:
'@develar/schema-utils': 2.6.5
'@electron/notarize': 2.5.0
@ -10544,7 +10514,7 @@ snapshots:
dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.8):
dependencies:
app-builder-lib: 25.1.8(dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.8))(electron-builder-squirrel-windows@25.1.8(dmg-builder@25.1.8))
app-builder-lib: 25.1.8(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8)
builder-util: 25.1.7
builder-util-runtime: 9.2.10
fs-extra: 10.1.0
@ -10686,7 +10656,7 @@ snapshots:
electron-builder-squirrel-windows@25.1.8(dmg-builder@25.1.8):
dependencies:
app-builder-lib: 25.1.8(dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.8))(electron-builder-squirrel-windows@25.1.8(dmg-builder@25.1.8))
app-builder-lib: 25.1.8(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8)
archiver: 5.3.2
builder-util: 25.1.7
fs-extra: 10.1.0
@ -10712,9 +10682,9 @@ snapshots:
transitivePeerDependencies:
- supports-color
electron-builder@25.1.8(electron-builder-squirrel-windows@25.1.8(dmg-builder@25.1.8)):
electron-builder@25.1.8(electron-builder-squirrel-windows@25.1.8):
dependencies:
app-builder-lib: 25.1.8(dmg-builder@25.1.8(electron-builder-squirrel-windows@25.1.8))(electron-builder-squirrel-windows@25.1.8(dmg-builder@25.1.8))
app-builder-lib: 25.1.8(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8)
builder-util: 25.1.7
builder-util-runtime: 9.2.10
chalk: 4.1.2