feat: expose AccessKey encode/decode api (#296)

* feat: expose AccessKey encode/decode api * Format using newer formatter --------- Co-authored-by: Philipp Krüger <philipp.krueger1@gmail.com>
wnfs-wg · Jul 5, 2023 · 982feff · 982feff
1 parent 25c5215
commit 982feff
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 12 deletions.
diff --git a/wnfs-wasm/src/fs/private/access_key.rs b/wnfs-wasm/src/fs/private/access_key.rs
@@ -28,4 +28,14 @@ impl AccessKey {
     pub fn get_content_cid(&self) -> Vec<u8> {
         self.0.get_content_cid().to_bytes()
     }
+
+    #[wasm_bindgen(js_name = "toBytes")]
+    pub fn into_bytes(&self) -> Vec<u8> {
+        Vec::<u8>::from(&self.0)
+    }
+
+    #[wasm_bindgen(js_name = "fromBytes")]
+    pub fn from_bytes(bytes: &[u8]) -> Self {
+        Self(WnfsAccessKey::from(bytes).into())
+    }
 }
diff --git a/wnfs-wasm/tests/mock.ts b/wnfs-wasm/tests/mock.ts
@@ -5,6 +5,7 @@ import {
   Namefilter,
   PrivateDirectory,
   PrivateForest,
+  AccessKey,
   PublicDirectory,
 } from "../pkg";
 
@@ -190,4 +191,5 @@ export {
   createRecipientExchangeRoot,
   PrivateKey,
   ExchangeKey,
+  AccessKey,
 };
diff --git a/wnfs-wasm/tests/private.spec.ts b/wnfs-wasm/tests/private.spec.ts
@@ -613,3 +613,36 @@ test.describe("PrivateForest", () => {
     expect(result).toBeDefined();
   });
 });
+
+test.describe("AccessKey", () => {
+  test("can encode / decode an access key", async ({ page }) => {
+    const [metadataBefore, metadataAfter] = await page.evaluate(async () => {
+      const {
+        wnfs: { AccessKey, Namefilter, PrivateFile, PrivateNode, PrivateForest },
+        mock: { MemoryBlockStore, Rng },
+      } = await window.setup();
+
+
+      const rng = new Rng();
+      const store = new MemoryBlockStore();
+      const time = new Date();
+      const file = new PrivateFile(new Namefilter(), time, rng);
+      const node = file.asNode();
+      const forest = new PrivateForest();
+      const [accessKey, newForest] = await node.store(forest, store, rng);
+
+      const encodedAccessKey = accessKey.toBytes();
+      const decodedAccessKey = AccessKey.fromBytes(encodedAccessKey);
+
+      const fetched = await PrivateNode.load(decodedAccessKey, newForest, store);
+      const metadataBefore = node.asFile().metadata();
+      const metadataAfter = fetched.asFile().metadata();
+      return [metadataBefore, metadataAfter];
+    });
+
+    expect(metadataBefore).toBeDefined();
+    expect(metadataAfter).toBeDefined();
+    expect(metadataBefore.created).toEqual(metadataAfter.created);
+    expect(metadataBefore.modified).toEqual(metadataAfter.modified);
+  });
+});
diff --git a/wnfs/src/private/directory.rs b/wnfs/src/private/directory.rs
@@ -520,7 +520,10 @@ impl PrivateDirectory {
             return Ok(None);
         };
 
-        let SearchResult::Found(dir) = self.get_leaf_dir(path, search_latest, forest, store).await? else {
+        let SearchResult::Found(dir) = self
+            .get_leaf_dir(path, search_latest, forest, store)
+            .await?
+        else {
             return Ok(None);
         };
 
@@ -1069,7 +1072,10 @@ impl PrivateDirectory {
         store: &impl BlockStore,
     ) -> Result<PrivateNode> {
         let (path, node_name) = crate::utils::split_last(path_segments)?;
-        let SearchResult::Found(dir) = self.get_leaf_dir_mut(path, search_latest, forest, store).await? else {
+        let SearchResult::Found(dir) = self
+            .get_leaf_dir_mut(path, search_latest, forest, store)
+            .await?
+        else {
             bail!(FsError::NotFound)
         };
 
@@ -1096,7 +1102,10 @@ impl PrivateDirectory {
         rng: &mut impl RngCore,
     ) -> Result<()> {
         let (path, node_name) = crate::utils::split_last(path_segments)?;
-        let SearchResult::Found(dir) = self.get_leaf_dir_mut(path, search_latest, forest, store).await? else {
+        let SearchResult::Found(dir) = self
+            .get_leaf_dir_mut(path, search_latest, forest, store)
+            .await?
+        else {
             bail!(FsError::NotFound);
         };
 

diff --git a/wnfs/src/private/keys/access.rs b/wnfs/src/private/keys/access.rs
@@ -101,3 +101,15 @@ impl From<&PrivateRef> for SnapshotAccessKey {
         }
     }
 }
+
+impl From<&[u8]> for AccessKey {
+    fn from(bytes: &[u8]) -> Self {
+        serde_ipld_dagcbor::from_slice(bytes).unwrap()
+    }
+}
+
+impl From<&AccessKey> for Vec<u8> {
+    fn from(key: &AccessKey) -> Self {
+        serde_ipld_dagcbor::to_vec(key).unwrap()
+    }
+}
diff --git a/wnfs/src/private/previous.rs b/wnfs/src/private/previous.rs
@@ -108,8 +108,7 @@ impl PrivateNodeHistory {
         &mut self,
         store: &impl BlockStore,
     ) -> Result<Option<PrivateNode>> {
-        let Some(previous_ratchet) = self.ratchets.next()
-        else {
+        let Some(previous_ratchet) = self.ratchets.next() else {
             return Ok(None);
         };
 
@@ -144,7 +143,7 @@ impl PrivateNodeHistory {
             .iter()
             .find(|(revisions_back, _)| *revisions_back == 1)
         else {
-            return Ok(None)
+            return Ok(None);
         };
         Ok(Some(*first_backpointer.resolve_value(&temporal_key)?))
     }
@@ -289,7 +288,9 @@ impl PrivateNodeOnPathHistory {
             PathNodesResult::NotADirectory(_, _) => bail!(FsError::NotADirectory),
         };
 
-        let Some(target) = (*path_nodes.tail).lookup_node(target_path_segment, false, &forest, store).await?
+        let Some(target) = (*path_nodes.tail)
+            .lookup_node(target_path_segment, false, &forest, store)
+            .await?
         else {
             bail!(FsError::NotFound);
         };
@@ -355,8 +356,7 @@ impl PrivateNodeOnPathHistory {
             return Ok(Some(node));
         }
 
-        let Some(working_stack) = self.find_and_step_segment_history(store).await?
-        else {
+        let Some(working_stack) = self.find_and_step_segment_history(store).await? else {
             return Ok(None);
         };
 
@@ -481,8 +481,7 @@ impl PrivateNodeOnPathHistory {
             };
 
             // We need to find the in-between history entry! See the test case `previous_with_multiple_child_changes`.
-            let Some(directory_prev) = directory_history.get_previous_dir(store).await?
-            else {
+            let Some(directory_prev) = directory_history.get_previous_dir(store).await? else {
                 return Ok(false);
             };
 

diff --git a/wnfs/src/public/directory.rs b/wnfs/src/public/directory.rs
@@ -242,7 +242,7 @@ impl PublicDirectory {
         };
 
         let SearchResult::Found(dir) = self.get_leaf_dir(path, store).await? else {
-            return Ok(None)
+            return Ok(None);
         };
 
         dir.lookup_node(tail, store).await