feat: finish multiplexer protocol and functionality (#439)

* feat: multiplexer abc * clean up * clean up deps * Add mux alias * add ping * clean up names * clean up mux * fix test * Address comments * Add Q_TERM_DISABLED
aws · Jan 23, 2025 · 98ad5bd · 98ad5bd
1 parent ab0ef29
commit 98ad5bd
Show file tree

Hide file tree

Showing 53 changed files with 1,502 additions and 709 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -73,8 +73,13 @@ fig_telemetry = { path = "crates/fig_telemetry" }
 fig_telemetry_core = { path = "crates/fig_telemetry_core" }
 fig_test_utils = { path = "crates/fig_test_utils" }
 fig_util = { path = "crates/fig_util" }
+flate2 = "1.0.35"
+flume = "0.11.0"
+futures = "0.3.26"
+globset = "0.4.10"
 hex = "0.4.3"
 http = "1.2.0"
+indicatif = "0.17.3"
 indoc = "2.0.5"
 insta = "1.38.0"
 libc = "0.2.167"
@@ -93,11 +98,14 @@ objc2 = "0.5.2"
 objc2-app-kit = "0.2.2"
 objc2-foundation = "0.2.2"
 objc2-input-method-kit = "0.2.2"
+parking_lot = "0.12.3"
 percent-encoding = "2.2.0"
 portable-pty = "0.8.1"
+r2d2 = "0.8.10"
+r2d2_sqlite = "0.25.0"
 rand = "0.8.5"
 regex = "1.7.0"
-reqwest = { version = "0.12.5", default-features = false, features = [
+reqwest = { version = "0.12.12", default-features = false, features = [
     # defaults except tls
     "http2",
     "charset",
@@ -111,6 +119,7 @@ reqwest = { version = "0.12.5", default-features = false, features = [
     "cookies",
 ] }
 ring = "0.17.8"
+rusqlite = { version = "0.32.1", features = ["bundled", "serde_json"] }
 shell-color = { path = "crates/shell-color" }
 semver = { version = "1.0.16", features = ["serde"] }
 serde = { version = "1.0.216", features = ["derive", "rc"] }
@@ -128,7 +137,8 @@ time = { version = "0.3.34", features = [
     "serde",
 ] }
 tokio = { version = "1.42.0", features = ["full"] }
-tokio-util = { version = "0.7.13", features = ["compat"] }
+tokio-tungstenite = "0.26.1"
+tokio-util = { version = "0.7.13", features = ["codec", "compat"] }
 toml = "0.8.12"
 tracing = { version = "0.1.40", features = ["log"] }
 tracing-subscriber = { version = "0.3.19", features = [
@@ -137,9 +147,20 @@ tracing-subscriber = { version = "0.3.19", features = [
     "parking_lot",
     "time",
 ] }
+unicode-width = "0.2.0"
+url = "2.5.4"
 uuid = { version = "1.8.0", features = ["v4", "serde"] }
+walkdir = "2.5.0"
 which = "6.0.3"
 whoami = "1.5.1"
+winnow = "0.6.2"
+
+# Keep these minor synced with reqwest
+# https://github.com/seanmonstar/reqwest/blob/v0.12.12/Cargo.toml
+rustls = "0.23.21"
+rustls-native-certs = "0.8.1"
+webpki-roots = "0.26.0"
+
 
 [workspace.lints.rust]
 future_incompatible = "warn"

diff --git a/build-scripts/build.py b/build-scripts/build.py
@@ -793,16 +793,13 @@ def build(
     else:
         signing_data = None
 
-    cargo_features: Mapping[str, Sequence[str]] = {}
+    cargo_features: Mapping[str, Sequence[str]] = {"q_cli/wayland"}
+
     match stage_name:
         case "prod" | None:
             info("Building for prod")
         case "gamma":
             info("Building for gamma")
-            cargo_features = {
-                CLI_PACKAGE_NAME: [f"{CLI_PACKAGE_NAME}/gamma"],
-                DESKTOP_PACKAGE_NAME: [f"{DESKTOP_PACKAGE_NAME}/gamma"],
-            }
         case _:
             raise ValueError(f"Unknown stage name: {stage_name}")
 

diff --git a/crates/alacritty_terminal/Cargo.toml b/crates/alacritty_terminal/Cargo.toml
@@ -22,7 +22,7 @@ serde.workspace = true
 serde_yaml = "0.9"
 shell-color.workspace = true
 tracing.workspace = true
-unicode-width = "0.2"
+unicode-width.workspace = true
 vte = { version = "0.13.0", default-features = false }
 
 [dev-dependencies]

diff --git a/crates/fig_api_client/Cargo.toml b/crates/fig_api_client/Cargo.toml
@@ -39,9 +39,8 @@ strum = { version = "0.26.1", features = ["derive"] }
 thiserror.workspace = true
 time.workspace = true
 tokio.workspace = true
-tower = "0.5.1"
 tracing.workspace = true
-url = { version = "2.5.4", features = ["serde"] }
+url = { workspace = true, features = ["serde"] }
 which.workspace = true
 
 [dev-dependencies]

diff --git a/crates/fig_desktop/Cargo.toml b/crates/fig_desktop/Cargo.toml
@@ -28,7 +28,6 @@ resource = "./autocomplete-icons/*"
 
 [features]
 default = []
-gamma = ["fig_install/gamma"]
 # console = ["tokio/tracing", "fig_log/console"]
 # Required for cargo-tauri CLI
 custom-protocol = []
@@ -56,18 +55,18 @@ fig_request.workspace = true
 fig_settings.workspace = true
 fig_telemetry.workspace = true
 fig_util.workspace = true
-flume = "0.11.0"
+flume.workspace = true
 fnv = "1.0.7"
-futures = "0.3.30"
-http = "1.1.0"
+futures.workspace = true
+http.workspace = true
 image = "0.25.0"
 infer = "0.16.0"
 keyboard-types = "0.7.0"
 mime = "0.3.17"
 moka = { version = "0.12.1", features = ["future"] }
 muda = { version = "0.15.3", default-features = false }
 notify = "7.0.0"
-parking_lot = { version = "0.12.1", features = ["serde"] }
+parking_lot = { workspace = true, features = ["serde"] }
 paste = "1.0.11"
 percent-encoding.workspace = true
 rand.workspace = true
@@ -84,7 +83,7 @@ time.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 tray-icon = { version = "0.19.2", default-features = false }
-url = "2.5.4"
+url.workspace = true
 uuid.workspace = true
 which.workspace = true
 whoami.workspace = true