mirror of
https://github.com/shadowsocks/ShadowsocksX-NG.git
synced 2026-11-16 23:44:42 +00:00
feat(ng2): add Nushell and Windows proxy environment commands
This commit is contained in:
@@ -108,8 +108,8 @@ extension HTTPExportCapability {
|
||||
}
|
||||
|
||||
/// 终端代理环境变量命令的唯一派生点:已保存监听事实 + 生效
|
||||
/// 命令地址 → 两种 shell 的可复制命令。HTTP/HTTPS 用已保存 HTTP 端口,
|
||||
/// SOCKS 用已保存 SOCKS 端口;变量集合、小写变量名、单引号转义、socks5
|
||||
/// 命令地址 → 各种 shell 的可复制命令。HTTP/HTTPS 用已保存 HTTP 端口,
|
||||
/// SOCKS 用已保存 SOCKS 端口;变量集合、小写变量名、socks5
|
||||
/// 协议与 no_proxy 内容保持不变;IPv6 URL 使用方括号。
|
||||
extension TerminalProxyEnvironmentCommands {
|
||||
init(
|
||||
@@ -140,30 +140,38 @@ extension TerminalProxyEnvironmentCommands {
|
||||
}
|
||||
userInfo = "\(username):\(encodedPassword)@"
|
||||
} catch {
|
||||
self.init(zshBash: "", fish: "", failure: .credentialUnreadable)
|
||||
self.init(
|
||||
zshBash: "", fish: "", nushell: "", windowsCMD: "", windowsPowerShell: "",
|
||||
failure: .credentialUnreadable)
|
||||
return
|
||||
}
|
||||
}
|
||||
let httpEndpoint = "'http://\(userInfo)\(urlHost):\(httpPort)'"
|
||||
let socksEndpoint = "'socks5://\(userInfo)\(urlHost):\(socksPort)'"
|
||||
let noProxy = "'localhost,127.0.0.1,::1,.local'"
|
||||
let zshBash =
|
||||
[
|
||||
"export http_proxy=\(httpEndpoint)",
|
||||
"export https_proxy=\(httpEndpoint)",
|
||||
"export all_proxy=\(socksEndpoint)",
|
||||
"export no_proxy=\(noProxy)",
|
||||
].joined(separator: "; ") + ";"
|
||||
let fish =
|
||||
[
|
||||
"set -gx http_proxy \(httpEndpoint)",
|
||||
"set -gx https_proxy \(httpEndpoint)",
|
||||
"set -gx all_proxy \(socksEndpoint)",
|
||||
"set -gx no_proxy \(noProxy)",
|
||||
].joined(separator: "; ") + ";"
|
||||
let httpEndpoint = "http://\(userInfo)\(urlHost):\(httpPort)"
|
||||
let socksEndpoint = "socks5://\(userInfo)\(urlHost):\(socksPort)"
|
||||
let variables = [
|
||||
(name: "http_proxy", value: httpEndpoint),
|
||||
(name: "https_proxy", value: httpEndpoint),
|
||||
(name: "all_proxy", value: socksEndpoint),
|
||||
(name: "no_proxy", value: "localhost,127.0.0.1,::1,.local"),
|
||||
]
|
||||
let windowsAssignments = variables.map { "set \"\($0.name)=\($0.value)\"" }
|
||||
// CMD 会把 %XX% 当作环境变量展开。用交互 FOR 变量插入字面百分号,
|
||||
// 不写临时环境变量;逐行赋值使最长允许凭据仍不超过单行长度限制。
|
||||
let windowsCMD =
|
||||
userInfo.contains("%")
|
||||
? windowsAssignments.map { assignment in
|
||||
assignment.contains("%")
|
||||
? "for %P in (\"%\") do \(assignment.replacingOccurrences(of: "%", with: "%~P"))"
|
||||
: assignment
|
||||
}.joined(separator: "\r\n")
|
||||
: windowsAssignments.joined(separator: " & ")
|
||||
self.init(
|
||||
zshBash: zshBash,
|
||||
fish: fish)
|
||||
zshBash: variables.map { "export \($0.name)='\($0.value)'" }.joined(separator: "; ") + ";",
|
||||
fish: variables.map { "set -gx \($0.name) '\($0.value)'" }.joined(separator: "; ") + ";",
|
||||
nushell: variables.map { "$env.\($0.name) = '\($0.value)'" }.joined(separator: "; ") + ";",
|
||||
windowsCMD: windowsCMD,
|
||||
windowsPowerShell:
|
||||
variables.map { "$env:\($0.name) = '\($0.value)'" }.joined(separator: "; ") + ";")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -13,14 +13,34 @@ struct HTTPExportCapability: Equatable, Sendable {
|
||||
|
||||
/// 首页可复制的 shell 环境变量设置命令。不同 shell 的语法由 workflow 一次投影,
|
||||
/// 呈现层只选择格式并执行剪贴板副作用。
|
||||
enum TerminalCommandFailure: Error, Equatable, Sendable { case credentialUnreadable }
|
||||
enum TerminalCommandFailure: Error, Equatable, Sendable {
|
||||
case credentialUnreadable
|
||||
case addressUnavailable
|
||||
}
|
||||
|
||||
struct TerminalProxyEnvironmentCommands: Equatable, Sendable {
|
||||
let zshBash: String
|
||||
let fish: String
|
||||
let nushell: String
|
||||
let windowsCMD: String
|
||||
let windowsPowerShell: String
|
||||
var failure: TerminalCommandFailure?
|
||||
}
|
||||
|
||||
enum TerminalCommandShell: CaseIterable, Hashable, Sendable {
|
||||
case zshBash, fish, nushell, windowsCMD, windowsPowerShell
|
||||
|
||||
func command(from commands: TerminalProxyEnvironmentCommands) -> String {
|
||||
switch self {
|
||||
case .zshBash: commands.zshBash
|
||||
case .fish: commands.fish
|
||||
case .nushell: commands.nushell
|
||||
case .windowsCMD: commands.windowsCMD
|
||||
case .windowsPowerShell: commands.windowsPowerShell
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 活动目标安全事实:存在性 + 可展示路径摘要。身份是不透明
|
||||
/// `NodeID`(级联勾选用);不含凭据、原始配置 URL 或目录树结构。路径摘要
|
||||
/// 是目录 projection 的显示名(导入缺名的服务器叶子以地址端口为名称,与目录树
|
||||
@@ -65,9 +85,15 @@ struct ProxyControlSnapshot: Equatable, Sendable {
|
||||
let httpExport: HTTPExportCapability
|
||||
/// 首页命令地址选择器:可见性、候选与生效选择。
|
||||
let commandAddressPicker: TerminalCommandAddressPicker
|
||||
/// 首页终端代理环境变量命令,分别适用于 zsh/bash 与 fish;端点地址为生效
|
||||
/// 首页终端代理环境变量命令;端点地址为生效
|
||||
/// 命令地址选择,端口取已保存监听事实。
|
||||
let terminalProxyEnvironmentCommands: TerminalProxyEnvironmentCommands
|
||||
|
||||
/// Windows 格式供其他设备使用,只在局域网入口与网络地址都有效时提供。
|
||||
var terminalCommandShells: [TerminalCommandShell] {
|
||||
commandAddressPicker.isVisible && commandAddressPicker.selected.address != "127.0.0.1"
|
||||
? TerminalCommandShell.allCases : [.zshBash, .fish, .nushell]
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 适配缝
|
||||
@@ -248,13 +274,25 @@ final class ProxyControlWorkflow: ObservableObject {
|
||||
}
|
||||
|
||||
/// 刷新命令地址候选并整体重发布(进入首页与复制前调用;网络变化经接口
|
||||
/// 事实变化通知自动刷新)。返回刷新后的两种 shell 命令供剪贴板副作用
|
||||
/// 使用——失效选择已在本次观察中回退,提示投影与返回值一致。
|
||||
/// 事实变化通知自动刷新)。失效选择回退到本地地址。
|
||||
@discardableResult
|
||||
func refreshTerminalCommands() -> TerminalProxyEnvironmentCommands {
|
||||
republish().terminalProxyEnvironmentCommands
|
||||
}
|
||||
|
||||
/// 复制前核实按钮呈现时的 IP 仍有效;回退只更新界面,不改写剪贴板。
|
||||
/// 显式传入原地址身份,防止网络通知先回退 snapshot 后复制旧按钮。
|
||||
func prepareTerminalCommandsForCopy(expectedAddress: TerminalCommandAddressIdentity) throws
|
||||
-> TerminalProxyEnvironmentCommands
|
||||
{
|
||||
let commands = refreshTerminalCommands()
|
||||
guard snapshot.commandAddressPicker.selected.identity == expectedAddress else {
|
||||
throw TerminalCommandFailure.addressUnavailable
|
||||
}
|
||||
if let failure = commands.failure { throw failure }
|
||||
return commands
|
||||
}
|
||||
|
||||
// MARK: - 整体观察(implementation,UI 不可见)
|
||||
|
||||
/// 一次 observation 内整体拼装 snapshot;任何单一事实变化后整体替换,
|
||||
|
||||
Reference in New Issue
Block a user