Merge pull request #6 from calcit-lang/wait-thread

make sure waiting for child thread

Author: soyaine

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "calcit_wss"
-version = "0.0.4"
+version = "0.0.6"
 authors = ["jiyinyiyong <[email protected]>"]
 edition = "2021"
 

Cargo.toml

@@ -2,7 +2,8 @@
 {} (:package |wss)
   :configs $ {} (:init-fn |wss.test/main!) (:reload-fn |wss.test/reload!)
     :modules $ []
-    :version |0.0.4
+    :version |0.0.6
+  :entries $ {}
   :files $ {}
     |wss.core $ {}
       :ns $ quote

calcit.cirru

@@ -35,7 +35,7 @@ pub fn wss_serve(
   let event_hub = simple_websockets::launch(port).expect("failed to listen on port 9001");
   println!("WebSocket server started at port {}", port);
 
-  spawn(move || {
+  let task = spawn(move || {
     loop {
       match event_hub.poll_event() {
         Event::Connect(client_id, responder) => {
@@ -63,8 +63,6 @@ pub fn wss_serve(
           ])]) {
             println!("Failed to handle disconnect: {}", e)
           }
-
-          break;
         }
         Event::Message(client_id, message) => match message {
           Message::Text(s) => {
@@ -90,6 +88,8 @@ pub fn wss_serve(
     }
   });
 
+  task.join().expect("running WebSocket server");
+
   Ok(Edn::Nil)
 }