refactor(rust-examples): reorganize keyvalue server impls

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

Author: rvolosatovs

examples/rust/wasi-keyvalue-component-server/src/lib.rs

@@ -39,6 +39,18 @@ impl Bucket {
     }
 }
 
+impl bindings::exports::wasi::keyvalue::store::Guest for Handler {
+    type Bucket = Bucket;
+
+    fn open(identifier: String) -> Result<store::Bucket> {
+        static STORE: OnceLock<Mutex<HashMap<String, Bucket>>> = OnceLock::new();
+        let store = STORE.get_or_init(Mutex::default);
+        let mut store = store.lock().expect("failed to lock store");
+        let bucket = store.entry(identifier).or_default().clone();
+        Ok(store::Bucket::new(bucket))
+    }
+}
+
 impl bindings::exports::wasi::keyvalue::store::GuestBucket for Bucket {
     fn get(&self, key: String) -> Result<Option<Vec<u8>>> {
         let bucket = self.read()?;
@@ -75,15 +87,3 @@ impl bindings::exports::wasi::keyvalue::store::GuestBucket for Bucket {
         Ok(KeyResponse { keys, cursor: None })
     }
 }
-
-impl bindings::exports::wasi::keyvalue::store::Guest for Handler {
-    type Bucket = Bucket;
-
-    fn open(identifier: String) -> Result<store::Bucket> {
-        static STORE: OnceLock<Mutex<HashMap<String, Bucket>>> = OnceLock::new();
-        let store = STORE.get_or_init(Mutex::default);
-        let mut store = store.lock().expect("failed to lock store");
-        let bucket = store.entry(identifier).or_default().clone();
-        Ok(store::Bucket::new(bucket))
-    }
-}

examples/rust/wasi-keyvalue-nats-server/src/main.rs

@@ -137,6 +137,28 @@ impl Server {
     }
 }
 
+impl bindings::exports::wasi::keyvalue::store::Handler<Option<HeaderMap>> for Server {
+    // NOTE: Resource handle returned is just the `identifier` itself
+    #[instrument(level = "trace", skip(_cx), ret)]
+    async fn open(
+        &self,
+        _cx: Option<HeaderMap>,
+        identifier: String,
+    ) -> anyhow::Result<Result<ResourceOwn<store::Bucket>>> {
+        let identifier = Bytes::from(identifier);
+        {
+            // first, optimistically try read-only lock
+            let store = self.0.read().await;
+            if store.contains_key(&identifier) {
+                return Ok(Ok(ResourceOwn::from(identifier)));
+            }
+        }
+        let mut store = self.0.write().await;
+        store.entry(identifier.clone()).or_default();
+        Ok(Ok(ResourceOwn::from(identifier)))
+    }
+}
+
 impl bindings::exports::wasi::keyvalue::store::HandlerBucket<Option<HeaderMap>> for Server {
     #[instrument(level = "trace", skip(_cx), ret)]
     async fn get(
@@ -209,25 +231,3 @@ impl bindings::exports::wasi::keyvalue::store::HandlerBucket<Option<HeaderMap>>
         Ok(Ok(KeyResponse { keys, cursor: None }))
     }
 }
-
-impl bindings::exports::wasi::keyvalue::store::Handler<Option<HeaderMap>> for Server {
-    // NOTE: Resource handle returned is just the `identifier` itself
-    #[instrument(level = "trace", skip(_cx), ret)]
-    async fn open(
-        &self,
-        _cx: Option<HeaderMap>,
-        identifier: String,
-    ) -> anyhow::Result<Result<ResourceOwn<store::Bucket>>> {
-        let identifier = Bytes::from(identifier);
-        {
-            // first, optimistically try read-only lock
-            let store = self.0.read().await;
-            if store.contains_key(&identifier) {
-                return Ok(Ok(ResourceOwn::from(identifier)));
-            }
-        }
-        let mut store = self.0.write().await;
-        store.entry(identifier.clone()).or_default();
-        Ok(Ok(ResourceOwn::from(identifier)))
-    }
-}