update FFI type again; handle port option; tag 0.0.1-a2

Author: tiye

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "calcit_wss"
-version = "0.0.1-a1"
+version = "0.0.1-a2"
 authors = ["jiyinyiyong <[email protected]>"]
 edition = "2018"
 

Cargo.toml

@@ -2,23 +2,23 @@
 {} (:package |wss)
   :configs $ {} (:init-fn |wss.test/main!) (:reload-fn |wss.test/reload!)
     :modules $ []
-    :version |0.0.3
+    :version |0.0.1-a2
   :files $ {}
     |wss.core $ {}
       :ns $ quote
         ns wss.core $ :require
           wss.$meta :refer $ calcit-dirname
           wss.util :refer $ get-dylib-path
       :defs $ {}
-        |wss-serve! $ quote
-          defn wss-serve! (options cb)
-            &call-dylib-edn-fn (get-dylib-path "\"/dylibs/libcalcit_wss") "\"wss_serve" options cb
         |wss-each! $ quote
           defn wss-each! (cb)
             &call-dylib-edn-fn (get-dylib-path "\"/dylibs/libcalcit_wss") "\"wss_each" cb
         |wss-send! $ quote
           defn wss-send! (client message)
             &call-dylib-edn (get-dylib-path "\"/dylibs/libcalcit_wss") "\"wss_send" client message
+        |wss-serve! $ quote
+          defn wss-serve! (options cb)
+            &call-dylib-edn-fn (get-dylib-path "\"/dylibs/libcalcit_wss") "\"wss_serve" options cb
     |wss.test $ {}
       :ns $ quote
         ns wss.test $ :require

calcit.cirru

@@ -12,14 +12,21 @@ lazy_static! {
 #[no_mangle]
 pub fn wss_serve(
   args: Vec<Edn>,
-  handler: Arc<dyn Fn(Edn) -> Result<Edn, String> + Send + Sync + 'static>,
+  handler: Arc<dyn Fn(Vec<Edn>) -> Result<Edn, String> + Send + Sync + 'static>,
 ) -> Result<Edn, String> {
-  println!("args: {:?}", args);
-  // let result = handler(Edn::Str(msg.into_text().unwrap().to_string()));
+  let port = match args.get(0) {
+    Some(Edn::Map(m)) => match m.get(&Edn::Keyword(String::from("port"))) {
+      Some(Edn::Number(n)) => n.floor().round() as u16,
+      Some(a) => return Err(format!("Unknown port: {}", a)),
+      None => 9001,
+    },
+    Some(Edn::Nil) => 9001,
+    Some(a) => return Err(format!("Unknown option: {}", a)),
+    None => 9001,
+  };
 
-  // listen for WebSockets on port 9001:
-  let event_hub = simple_websockets::launch(9001).expect("failed to listen on port 9001");
-  // map between client ids and the client's `Responder`:
+  // listen for WebSockets on port, defaults to 9001:
+  let event_hub = simple_websockets::launch(port).expect("failed to listen on port 9001");
 
   spawn(move || {
     loop {
@@ -35,10 +42,10 @@ pub fn wss_serve(
             let mut clients = CLIENTS.write().unwrap();
             clients.insert(client_id, responder);
           }
-          if let Err(e) = handler(Edn::List(vec![
+          if let Err(e) = handler(vec![Edn::List(vec![
             Edn::Keyword(String::from("connect")),
             Edn::Number(client_id as f64),
-          ])) {
+          ])]) {
             println!("Failed to handle connect: {}", e)
           }
         }
@@ -48,29 +55,29 @@ pub fn wss_serve(
             let mut clients = CLIENTS.write().unwrap();
             clients.remove(&client_id);
           }
-          if let Err(e) = handler(Edn::List(vec![
+          if let Err(e) = handler(vec![Edn::List(vec![
             Edn::Keyword(String::from("disconnect")),
             Edn::Number(client_id as f64),
-          ])) {
+          ])]) {
             println!("Failed to handle disconnect: {}", e)
           }
         }
         Event::Message(client_id, message) => match message {
           Message::Text(s) => {
-            if let Err(e) = handler(Edn::List(vec![
+            if let Err(e) = handler(vec![Edn::List(vec![
               Edn::Keyword(String::from("message")),
               Edn::Number(client_id as f64),
               Edn::Str(s),
-            ])) {
+            ])]) {
               println!("Failed to handle text message: {}", e)
             }
           }
           Message::Binary(buf) => {
-            if let Err(e) = handler(Edn::List(vec![
+            if let Err(e) = handler(vec![Edn::List(vec![
               Edn::Keyword(String::from("message")),
               Edn::Number(client_id as f64),
               Edn::Buffer(buf),
-            ])) {
+            ])]) {
               println!("Failed to handle binary message: {}", e)
             }
           }
@@ -104,7 +111,7 @@ pub fn wss_send(args: Vec<Edn>) -> Result<Edn, String> {
 #[no_mangle]
 pub fn wss_each(
   _args: Vec<Edn>,
-  handler: Arc<dyn Fn(Edn) -> Result<Edn, String> + Send + Sync + 'static>,
+  handler: Arc<dyn Fn(Vec<Edn>) -> Result<Edn, String> + Send + Sync + 'static>,
 ) -> Result<Edn, String> {
   let mut ids: Vec<u64> = vec![];
   {
@@ -117,7 +124,7 @@ pub fn wss_each(
   }
 
   for id in ids {
-    handler(Edn::Number(id as f64))?;
+    handler(vec![Edn::Number(id as f64)])?;
   }
 
   Ok(Edn::Nil)