Skip to content

Commit

Permalink
feat(jetsocat): new doctor subcommand for diagnostics (#1030)
Browse files Browse the repository at this point in the history
  • Loading branch information
CBenoit authored Oct 2, 2024
1 parent 742e329 commit 6ed8591
Show file tree
Hide file tree
Showing 9 changed files with 1,054 additions and 312 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
matrix:
arch: [ x86_64, aarch64 ]
platform: [ pc-windows-msvc, unknown-linux-gnu, apple-darwin ]
tool: [ jet-doctor, tokengen ]
tool: [ tokengen ]
include:
- platform: pc-windows-msvc
runner: windows-2022
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
needs: build
strategy:
matrix:
tool: [ jet-doctor, tokengen ]
tool: [ tokengen ]

steps:
- name: Download binaries
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
matrix:
arch: [ x86_64, aarch64, universal ]
platform: [ pc-windows-msvc, apple-darwin ]
tool: [ jet-doctor, tokengen ]
tool: [ tokengen ]
include:
- platform: pc-windows-msvc
runner: windows-2022
Expand Down
14 changes: 14 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 15 additions & 2 deletions jetsocat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ workspace = true
[features]
default = ["rustls", "detect-proxy"]
detect-proxy = ["proxy_cfg"]
rustls = ["tokio-tungstenite/rustls-tls-native-roots"]
native-tls = ["tokio-tungstenite/native-tls"]
rustls = ["tokio-tungstenite/rustls-tls-native-roots", "dep:rustls", "dep:rustls-native-certs"]
native-tls = ["tokio-tungstenite/native-tls", "dep:openssl", "dep:native-tls"]

[dependencies]

Expand Down Expand Up @@ -55,6 +55,19 @@ dirs-next = "2.0"
# find parent process / watch process
sysinfo = { version = "0.30", default-features = false }

# doctor
tinyjson = "2.5" # Small JSON library; used to avoid including a bigger like serde-json
native-tls = { version = "0.2", optional = true } # Same dependency as tokio-tungstenite
rustls = { version = "0.22", optional = true, default-features = false } # Same dependency as tokio-tungstenite
rustls-native-certs = { version = "0.7", optional = true } # Same dependency as tokio-tungstenite
openssl-probe = "0.1" # Same dependency as rustls-native-certs
rustls-pemfile = "2.2" # Same dependency as rustls-native-certs
base64 = "0.22" # Same dependency as rustls-pemfile

[target.'cfg(not(any(target_os = "windows", target_vendor = "apple")))'.dependencies]
# doctor
openssl = { version = "0.10", optional = true } # Same dependency as tokio-tungstenite/native-tls

[dev-dependencies]
test-utils = { path = "../crates/test-utils" }
tokio = { version = "1.38", features = ["time"] }
Expand Down
Loading

0 comments on commit 6ed8591

Please sign in to comment.