Merge pull request #8 from calcit-lang/calcit-0.7

upgrade calcit 0.7

Author: csvwolf

.github/workflows/check.yaml

@@ -12,18 +12,19 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-
-      - name: ACTIONS_ALLOW_UNSECURE_COMMANDS
-        id: ACTIONS_ALLOW_UNSECURE_COMMANDS
-        run: echo 'ACTIONS_ALLOW_UNSECURE_COMMANDS=true' >> $GITHUB_ENV
-
-      - name: add cr
-        run: |
-          mkdir -p $GITHUB_WORKSPACE/bin
-          wget -O $GITHUB_WORKSPACE/bin/cr https://github.com/calcit-lang/calcit/releases/download/0.6.13/cr
-          chmod +x $GITHUB_WORKSPACE/bin/cr
-          echo "::add-path::$GITHUB_WORKSPACE/bin"
+      - uses: actions/checkout@v3
+
+      - uses: supplypike/setup-bin@v3
+        with:
+          uri: 'https://github.com/calcit-lang/calcit/releases/download/0.7.0-a3/cr'
+          name: 'cr'
+          version: '0.7.0-a3'
+
+      - uses: supplypike/setup-bin@v3
+        with:
+          uri: 'https://github.com/calcit-lang/calcit/releases/download/0.7.0-a3/caps'
+          name: 'caps'
+          version: '0.7.0-a3'
 
       - uses: actions-rs/toolchain@v1
         with:

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "calcit_wss"
-version = "0.0.7"
+version = "0.1.0"
 authors = ["jiyinyiyong <[email protected]>"]
 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.2.21"
+cirru_edn = "0.4.0"
 lazy_static = "1.4.0"
-simple-websockets = "0.1.4"
+simple-websockets = "0.1.5"
 

Cargo.toml

@@ -21,7 +21,7 @@ pub fn wss_serve(
   _finish: Box<dyn FnOnce()>,
 ) -> Result<Edn, String> {
   let port = match args.get(0) {
-    Some(Edn::Map(m)) => match m.get(&Edn::kwd("port")) {
+    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)),
       None => 9001,
@@ -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::List(vec![Edn::kwd("connect"), Edn::Number(client_id as f64)])]) {
+          if let Err(e) = handler(vec![Edn::List(vec![Edn::tag("connect"), Edn::Number(client_id as f64)])]) {
             println!("Failed to handle connect: {}", e)
           }
         }
@@ -54,14 +54,14 @@ pub fn wss_serve(
             let mut clients = CLIENTS.write().unwrap();
             clients.remove(&client_id);
           }
-          if let Err(e) = handler(vec![Edn::List(vec![Edn::kwd("disconnect"), Edn::Number(client_id as f64)])]) {
+          if let Err(e) = handler(vec![Edn::List(vec![Edn::tag("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(vec![Edn::List(vec![
-              Edn::kwd("message"),
+              Edn::tag("message"),
               Edn::Number(client_id as f64),
               Edn::Str(s.into_boxed_str()),
             ])]) {
@@ -70,7 +70,7 @@ pub fn wss_serve(
           }
           Message::Binary(buf) => {
             if let Err(e) = handler(vec![Edn::List(vec![
-              Edn::kwd("message"),
+              Edn::tag("message"),
               Edn::Number(client_id as f64),
               Edn::Buffer(buf),
             ])]) {