actually apply the refactor

Author: sxlijin

engine/Cargo.lock

@@ -24,7 +24,7 @@ members = [
   "sandbox",
   "llm-response-parser",
   "boundary-udf",
-  "tokio-console-demo",
+  "playground-server",
   "repro",
 ]
 default-members = [
@@ -92,6 +92,7 @@ indoc = "2.0.5"
 internal-baml-codegen = { path = "language_client_codegen" }
 internal-baml-core = { path = "baml-lib/baml-core" }
 internal-baml-jinja = { path = "baml-lib/jinja-runtime" }
+playground-server = { path = "playground-server" }
 internal-llm-client = { path = "baml-lib/llm-client" }
 itertools = "0.14.0"
 jsonish = { path = "baml-lib/jsonish" }

engine/Cargo.toml

@@ -23,6 +23,7 @@ baml-lsp-types = { path = "../baml-lsp-types" }
 internal-baml-core = { path = "../baml-lib/baml-core" }
 internal-baml-diagnostics = { path = "../baml-lib/diagnostics" }
 internal-baml-codegen = { workspace = true }
+playground-server = { workspace = true }
 crossbeam = { version = "0.8.4", features = ["crossbeam-channel"] }
 ignore = { version = "0.4.22" }
 parking_lot = { version = "0.12", features = ["deadlock_detection"] }

engine/language_server/Cargo.toml

@@ -8,10 +8,9 @@ pub use session::{ClientSettings, DocumentQuery, DocumentSnapshot, Session};
 use tokio::sync::broadcast;
 
 use crate::{
-    playground2::server::LangServerToWasmMessage,
     server::{Server, ServerArgs},
-    session::PreSendToWasmMessage,
 };
+use playground_server::{LangServerToWasmMessage, PreSendToWasmMessage};
 
 #[macro_use]
 mod message;
@@ -44,11 +43,15 @@ pub fn run_server() -> anyhow::Result<()> {
     let (broadcast_tx, broadcast_rx) = broadcast::channel(1000);
     let (playground_tx, playground_rx) = broadcast::channel(1000);
 
-    let port_picks = tokio_runtime.block_on(playground2::port_picker::pick())?;
+    let port_config = playground2::PortConfiguration {
+        base_port: 3700,
+        max_attempts: 100,
+    };
+    let port_picks = tokio_runtime.block_on(playground2::port_picker_pick(port_config))?;
 
     tokio_runtime.spawn(futures::future::join(
         playground2::Playground2Server {
-            app_state: playground2::server::AppState {
+            app_state: playground_server::AppState {
                 broadcast_rx,
                 playground_tx: playground_tx.clone(),
                 playground_port: port_picks.playground_port,

engine/language_server/src/lib.rs

@@ -1,30 +1,2 @@
-use std::collections::{HashMap, VecDeque};
-
-use serde::{Deserialize, Serialize};
-use tokio::sync::broadcast;
-
-// Note: the name add_project should match exactly to the
-// EventListener.tsx command definitions due to how serde serializes these into json
-#[allow(non_camel_case_types)]
-#[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(tag = "command", content = "content")]
-pub enum FrontendMessage {
-    add_project {
-        root_path: String,
-        files: HashMap<String, String>,
-    },
-    remove_project {
-        root_path: String,
-    },
-    select_function {
-        root_path: String,
-        function_name: String,
-    },
-    baml_settings_updated {
-        settings: HashMap<String, String>,
-    },
-    run_test {
-        function_name: String,
-        test_name: String,
-    },
-}
+// Use the shared FrontendMessage from playground-server
+pub use playground_server::FrontendMessage;

engine/language_server/src/playground/definitions.rs

@@ -1,9 +1,9 @@
-mod ping_handler;
-pub mod port_picker;
-pub mod proxy;
-pub mod server;
-mod websocket_rpc_handler;
-mod websocket_ws_handler;
+pub use playground_server::{
+    PortConfiguration, PortPicks, pick_ports as port_picker_pick
+};
 
+mod proxy;
 pub use proxy::ProxyServer;
+
 pub use server::Playground2Server;
+mod server;