try lazylock; tag 0.2.6

Author: tiye

.gitignore

@@ -12,3 +12,5 @@
 .compact-inc.cirru
 
 /dylibs/
+
+.DS_Store

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "calcit_wss"
-version = "0.2.5"
+version = "0.2.6"
 authors = ["jiyinyiyong <[email protected]>"]
 edition = "2021"
 
@@ -13,6 +13,5 @@ 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.6.5"
-lazy_static = "1.4.0"
+cirru_edn = "0.6.12"
 simple-websockets = "0.1.6"

Cargo.toml

@@ -1,6 +1,6 @@
 
 {} (:package |wss)
-  :configs $ {} (:init-fn |wss.test/main!) (:reload-fn |wss.test/reload!) (:version |0.2.5)
+  :configs $ {} (:init-fn |wss.test/main!) (:reload-fn |wss.test/reload!) (:version |0.2.6)
     :modules $ []
   :entries $ {}
     :demo $ {} (:init-fn |wss.test/demo!) (:port 6001) (:reload-fn |wss.test/reload!)

calcit.cirru

@@ -1,13 +1,10 @@
 use cirru_edn::{Edn, EdnTupleView};
-use lazy_static::lazy_static;
 use simple_websockets::{Event, Message, Responder};
 use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
+use std::sync::{Arc, LazyLock, RwLock};
 use std::thread::spawn;
 
-lazy_static! {
-  static ref CLIENTS: RwLock<HashMap<u64, Responder>> = RwLock::new(HashMap::new());
-}
+static CLIENTS: LazyLock<RwLock<HashMap<u64, Responder>>> = LazyLock::new(|| RwLock::new(HashMap::new()));
 
 #[no_mangle]
 pub fn abi_version() -> String {
@@ -100,7 +97,7 @@ pub fn wss_send(args: Vec<Edn>) -> Result<Edn, String> {
         let clients = CLIENTS.read().unwrap();
         let responder = clients.get(&(*id as u64)).unwrap();
         // echo the message back:
-        responder.send(Message::Text(s.to_string().to_owned()));
+        responder.send(Message::Text(s.to_string()));
         Ok(Edn::Nil)
       }
       (a, b) => Err(format!("wss-send expected id and message, got {} {}", a, b)),