Merge pull request #3 from calcit-lang/abi-version

change about ABI version

Author: TCXX

Cargo.lock

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

Cargo.toml

@@ -2,7 +2,7 @@
 {} (:package |wss)
   :configs $ {} (:init-fn |wss.test/main!) (:reload-fn |wss.test/reload!)
     :modules $ []
-    :version |0.0.1-a2
+    :version |0.0.1
   :files $ {}
     |wss.core $ {}
       :ns $ quote
@@ -30,15 +30,15 @@
         |demo! $ quote
           defn demo! ()
             wss-serve!
-              {} $ :port 0
+              {} $ :port 9001
               fn (income) (println income)
                 wss-each! $ fn (id)
                   wss-send! id $ str "\"hello from: " income
-            println "\"TODO started"
+            println "\"demo started"
         |main! $ quote
           defn main! () $ run-tests
         |reload! $ quote
-          defn reload! $
+          defn reload! () $ println "\"did nothing on reload"
     |wss.util $ {}
       :ns $ quote
         ns wss.util $ :require

calcit.cirru

@@ -9,10 +9,16 @@ lazy_static! {
   static ref CLIENTS: RwLock<HashMap<u64, Responder>> = RwLock::new(HashMap::new());
 }
 
+#[no_mangle]
+pub fn abi_version() -> String {
+  String::from("0.0.1")
+}
+
 #[no_mangle]
 pub fn wss_serve(
   args: Vec<Edn>,
   handler: Arc<dyn Fn(Vec<Edn>) -> Result<Edn, String> + Send + Sync + 'static>,
+  _finish: Box<dyn FnOnce()>,
 ) -> Result<Edn, String> {
   let port = match args.get(0) {
     Some(Edn::Map(m)) => match m.get(&Edn::Keyword(String::from("port"))) {
@@ -27,6 +33,7 @@ pub fn wss_serve(
 
   // listen for WebSockets on port, defaults to 9001:
   let event_hub = simple_websockets::launch(port).expect("failed to listen on port 9001");
+  println!("WebSocket server started at port {}", port);
 
   spawn(move || {
     loop {
@@ -112,6 +119,7 @@ pub fn wss_send(args: Vec<Edn>) -> Result<Edn, String> {
 pub fn wss_each(
   _args: Vec<Edn>,
   handler: Arc<dyn Fn(Vec<Edn>) -> Result<Edn, String> + Send + Sync + 'static>,
+  finish: Box<dyn FnOnce()>,
 ) -> Result<Edn, String> {
   let mut ids: Vec<u64> = vec![];
   {
@@ -127,5 +135,6 @@ pub fn wss_each(
     handler(vec![Edn::Number(id as f64)])?;
   }
 
+  finish();
   Ok(Edn::Nil)
 }