Merge pull request #11 from calcit-lang/upgrade-abi

upgrade to abi 0.0.7

.github/workflows/check.yaml

@@ -12,23 +12,24 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: supplypike/setup-bin@v3
         with:
-          uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.0-a3/cr'
+          uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.21/cr'
           name: 'cr'
-          version: '0.8.0-a3'
+          version: '0.8.21'
 
       - uses: supplypike/setup-bin@v3
         with:
-          uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.0-a3/caps'
+          uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.21/caps'
           name: 'caps'
-          version: '0.8.0-a3'
+          version: '0.8.21'
 
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
+          toolchain: nightly
+          components: clippy
 
       - run: cargo build --release
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "calcit_wss"
-version = "0.2.0-a2"
+version = "0.2.1"
 authors = ["jiyinyiyong <jiyinyiyong@gmail.com>"]
 edition = "2021"
 
@@ -13,7 +13,7 @@ crate-type = ["dylib"] # Creates dynamic lib
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cirru_edn = "0.4.2"
+cirru_edn = "0.5.4"
 lazy_static = "1.4.0"
 simple-websockets = "0.1.6"
 

compact.cirru

@@ -1,6 +1,6 @@
 
 {} (:package |wss)
-  :configs $ {} (:init-fn |wss.test/main!) (:reload-fn |wss.test/reload!) (:version |0.2.0-a3)
+  :configs $ {} (:init-fn |wss.test/main!) (:reload-fn |wss.test/reload!) (:version |0.2.1)
     :modules $ []
   :entries $ {}
   :files $ {}

src/lib.rs

@@ -11,7 +11,7 @@ lazy_static! {
 
 #[no_mangle]
 pub fn abi_version() -> String {
-  String::from("0.0.6")
+  String::from("0.0.7")
 }
 
 #[no_mangle]
@@ -20,7 +20,7 @@ pub fn wss_serve(
   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) {
+  let port = match args.first() {
     Some(Edn::Map(m)) => match m.get(&Edn::tag("port")) {
       Some(Edn::Number(n)) => n.floor().round() as u16,
       Some(a) => return Err(format!("Unknown port: {}", a)),
@@ -44,7 +44,7 @@ pub fn wss_serve(
             let mut clients = CLIENTS.write().unwrap();
             clients.insert(client_id, responder);
           }
-          if let Err(e) = handler(vec![Edn::Tuple(Box::new(Edn::tag("connect")), vec![Edn::Number(client_id as f64)])]) {
+          if let Err(e) = handler(vec![Edn::Tuple(Arc::new(Edn::tag("connect")), vec![Edn::Number(client_id as f64)])]) {
             println!("Failed to handle connect: {}", e)
           }
         }
@@ -55,7 +55,7 @@ pub fn wss_serve(
             clients.remove(&client_id);
           }
           if let Err(e) = handler(vec![Edn::Tuple(
-            Box::new(Edn::tag("disconnect")),
+            Arc::new(Edn::tag("disconnect")),
             vec![Edn::Number(client_id as f64)],
           )]) {
             println!("Failed to handle disconnect: {}", e)
@@ -64,15 +64,15 @@ pub fn wss_serve(
         Event::Message(client_id, message) => match message {
           Message::Text(s) => {
             if let Err(e) = handler(vec![Edn::Tuple(
-              Box::new(Edn::tag("message")),
-              vec![Edn::Number(client_id as f64), Edn::Str(s.into_boxed_str())],
+              Arc::new(Edn::tag("message")),
+              vec![Edn::Number(client_id as f64), Edn::Str(s.into())],
             )]) {
               println!("Failed to handle text message: {}", e)
             }
           }
           Message::Binary(buf) => {
             if let Err(e) = handler(vec![Edn::Tuple(
-              Box::new(Edn::tag("blob")),
+              Arc::new(Edn::tag("blob")),
               vec![Edn::Number(client_id as f64), Edn::Buffer(buf)],
             )]) {
               println!("Failed to handle binary message: {}", e)