Merge pull request #7 from calcit-lang/updates

upgrade edn deps

Author: NoEgAm

.github/workflows/check.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: add cr
         run: |
           mkdir -p $GITHUB_WORKSPACE/bin
-          wget -O $GITHUB_WORKSPACE/bin/cr http://repo.calcit-lang.org/binaries/linux/cr
+          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"
 

.rustfmt.toml

@@ -0,0 +1,3 @@
+
+max_width = 136
+tab_spaces = 2

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "calcit_wss"
-version = "0.0.6"
+version = "0.0.7"
 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.9"
+cirru_edn = "0.2.21"
 lazy_static = "1.4.0"
-simple-websockets = "0.1.3"
+simple-websockets = "0.1.4"
 

Cargo.toml

@@ -1,3 +1,4 @@
 
+rm -rfv dylibs/
 cargo build --release
 mkdir -p dylibs/ && ls target/release/ && cp -v target/release/*.* dylibs/

build.sh

@@ -1,15 +1,10 @@
 
 {} (:package |wss)
-  :configs $ {} (:init-fn |wss.test/main!) (:reload-fn |wss.test/reload!)
+  :configs $ {} (:init-fn |wss.test/main!) (:reload-fn |wss.test/reload!) (:version |0.0.7)
     :modules $ []
-    :version |0.0.6
   :entries $ {}
   :files $ {}
     |wss.core $ {}
-      :ns $ quote
-        ns wss.core $ :require
-          wss.$meta :refer $ calcit-dirname
-          wss.util :refer $ get-dylib-path
       :defs $ {}
         |wss-each! $ quote
           defn wss-each! (cb)
@@ -20,14 +15,12 @@
         |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
-          wss.core :refer $ wss-serve! wss-each! wss-send!
-          wss.$meta :refer $ calcit-dirname calcit-filename
+        ns wss.core $ :require
+          wss.$meta :refer $ calcit-dirname
+          wss.util :refer $ get-dylib-path
+    |wss.test $ {}
       :defs $ {}
-        |run-tests $ quote
-          defn run-tests () (println "\"%%%% test for lib") (println calcit-filename calcit-dirname)
         |demo! $ quote
           defn demo! ()
             wss-serve!
@@ -40,10 +33,13 @@
           defn main! () $ run-tests
         |reload! $ quote
           defn reload! () $ println "\"did nothing on reload"
-    |wss.util $ {}
+        |run-tests $ quote
+          defn run-tests () (println "\"%%%% test for lib") (println calcit-filename calcit-dirname)
       :ns $ quote
-        ns wss.util $ :require
+        ns wss.test $ :require
+          wss.core :refer $ wss-serve! wss-each! wss-send!
           wss.$meta :refer $ calcit-dirname calcit-filename
+    |wss.util $ {}
       :defs $ {}
         |get-dylib-ext $ quote
           defmacro get-dylib-ext () $ case-default (&get-os) "\".so" (:macos "\".dylib") (:windows "\".dll")
@@ -53,3 +49,6 @@
         |or-current-path $ quote
           defn or-current-path (p)
             if (blank? p) "\"." p
+      :ns $ quote
+        ns wss.util $ :require
+          wss.$meta :refer $ calcit-dirname calcit-filename

calcit.cirru

@@ -44,10 +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::kwd("connect"), Edn::Number(client_id as f64)])]) {
             println!("Failed to handle connect: {}", e)
           }
         }
@@ -57,10 +54,7 @@ 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::kwd("disconnect"), Edn::Number(client_id as f64)])]) {
             println!("Failed to handle disconnect: {}", e)
           }
         }