@anysphere/file-service 0.0.0-a4fe55c1 → 0.0.0-b16d9d59

package/index.d.ts

@@ -6,15 +6,11 @@
 export class MerkleClient {
   constructor(rootDirectory: string)
   init(): Promise<void>
-  computeMerkleTree(): Promise<void>
   updateFile(filePath: string): Promise<void>
   deleteFile(filePath: string): Promise<void>
-  getSubtreeHash(relativePath: string): Promise<string>
+  getSubtreeHash(path: string): Promise<string>
   getNumEmbeddableFiles(): Promise<number>
   getAllFiles(): Promise<Array<string>>
-  getAllDirFilesToEmbed(absoluteFilePath: string): Promise<Array<string>>
   getNextFileToEmbed(): Promise<Array<string>>
-  getSpline(absoluteFilePath: string): Promise<Array<string>>
   getHashesForFiles(files: Array<string>): Promise<Array<string>>
-  updateRootDirectory(rootDirectory: string): void
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anysphere/file-service",
-  "version": "0.0.0-a4fe55c1",
+  "version": "0.0.0-b16d9d59",
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {
@@ -35,11 +35,11 @@
     "version": "napi version"
   },
   "optionalDependencies": {
-    "@anysphere/file-service-win32-x64-msvc": "0.0.0-a4fe55c1",
-    "@anysphere/file-service-darwin-x64": "0.0.0-a4fe55c1",
-    "@anysphere/file-service-linux-x64-gnu": "0.0.0-a4fe55c1",
-    "@anysphere/file-service-darwin-arm64": "0.0.0-a4fe55c1",
-    "@anysphere/file-service-win32-arm64-msvc": "0.0.0-a4fe55c1",
-    "@anysphere/file-service-darwin-universal": "0.0.0-a4fe55c1"
+    "@anysphere/file-service-win32-x64-msvc": "0.0.0-b16d9d59",
+    "@anysphere/file-service-darwin-x64": "0.0.0-b16d9d59",
+    "@anysphere/file-service-linux-x64-gnu": "0.0.0-b16d9d59",
+    "@anysphere/file-service-darwin-arm64": "0.0.0-b16d9d59",
+    "@anysphere/file-service-win32-arm64-msvc": "0.0.0-b16d9d59",
+    "@anysphere/file-service-darwin-universal": "0.0.0-b16d9d59"
   }
 }

package/src/lib.rs

@@ -40,7 +40,7 @@ impl MerkleClient {
     unimplemented!("Interrupt is not implemented yet");
   }
 
-  #[napi]
+  // #[napi]
   pub async unsafe fn compute_merkle_tree(
     &mut self,
   ) -> Result<(), napi::Error> {
@@ -72,11 +72,9 @@ impl MerkleClient {
   #[napi]
   pub async fn get_subtree_hash(
     &self,
-    relative_path: String,
+    path: String,
   ) -> Result<String, napi::Error> {
-    let absolute_path =
-      std::path::Path::new(&self.root_directory).join(relative_path);
-    let hash = self.tree.get_subtree_hash(absolute_path).await;
+    let hash = self.tree.get_subtree_hash(path).await;
 
     match hash {
       Ok(hash) => Ok(hash),
@@ -100,26 +98,6 @@ impl MerkleClient {
     }
   }
 
-  pub async fn get_num_embeddable_files_in_subtree(
-    &self,
-    relative_path: String,
-  ) -> Result<i32, napi::Error> {
-    let absolute_path =
-      std::path::Path::new(&self.root_directory).join(relative_path);
-    let num = self
-      .tree
-      .get_num_embeddable_files_in_subtree(absolute_path)
-      .await;
-
-    match num {
-      Ok(num) => Ok(num),
-      Err(e) => Err(napi::Error::new(
-        napi::Status::Unknown,
-        format!("Error in get_num_embeddable_files_in_subtree: {:?}", e),
-      )),
-    }
-  }
-
   #[napi]
   pub async fn get_all_files(&self) -> Result<Vec<String>, napi::Error> {
     let files = self.tree.get_all_files().await;
@@ -133,26 +111,6 @@ impl MerkleClient {
     }
   }
 
-  #[napi]
-  pub async fn get_all_dir_files_to_embed(
-    &self,
-    absolute_file_path: String,
-  ) -> Result<Vec<String>, napi::Error> {
-    let absolute_path_str = absolute_file_path.as_str();
-    let files = self
-      .tree
-      .get_all_dir_files_to_embed(absolute_path_str)
-      .await;
-
-    match files {
-      Ok(files) => Ok(files),
-      Err(e) => Err(napi::Error::new(
-        napi::Status::Unknown,
-        format!("Error in get_all_dir_files_to_embed: {:?}", e),
-      )),
-    }
-  }
-
   #[napi]
   pub async unsafe fn get_next_file_to_embed(
     &mut self,
@@ -177,25 +135,6 @@ impl MerkleClient {
     }
   }
 
-  // FIXME(sualeh): get_spline
-  #[napi]
-  pub async fn get_spline(
-    &self,
-    absolute_file_path: String,
-  ) -> Result<Vec<String>, napi::Error> {
-    // let spline = self.tree.get_spline(absolute_file_path).await;
-
-    return Ok(vec![]);
-
-    // match spline {
-    //   Ok(spline) => Ok(spline),
-    //   Err(e) => Err(napi::Error::new(
-    //     napi::Status::Unknown,
-    //     format!("Error in get_spline: {:?}", e),
-    //   )),
-    // }
-  }
-
   #[napi]
   pub async fn get_hashes_for_files(
     &self,
@@ -212,7 +151,7 @@ impl MerkleClient {
     }
   }
 
-  #[napi]
+  // #[napi]
   pub fn update_root_directory(&mut self, root_directory: String) {
     self.root_directory = root_directory;
   }

package/src/merkle_tree/local_construction.rs

@@ -3,7 +3,6 @@ use crate::merkle_tree::{
 };
 
 use super::{LocalConstruction, MerkleTree};
-use std::collections::BTreeMap;
 use std::path::PathBuf;
 use std::{collections::HashMap, path::Path, sync::Arc};
 use tonic::async_trait;
@@ -40,7 +39,7 @@ impl LocalConstruction for MerkleTree {
     let root_node = MerkleNode::new(path, None).await;
     let mut mt = MerkleTree {
       root: root_node,
-      files: BTreeMap::new(),
+      files: HashMap::new(),
       root_path: root_directory,
       cursor: None,
     };
@@ -49,7 +48,7 @@ impl LocalConstruction for MerkleTree {
     // TODO(later): i can make this parallel.
     fn add_nodes_to_hashmap<'a>(
       node: &'a MerkleNodePtr,
-      files: &'a mut BTreeMap<String, File>,
+      files: &'a mut HashMap<String, File>,
     ) -> PinnedFuture<'a, ()> {
       Box::pin(async move {
         let node_reader = node.read().await;

package/src/merkle_tree/mod.rs

@@ -1,8 +1,7 @@
 use super::file_utils;
 use sha2::Digest;
-use std::collections::BTreeMap;
 use std::path::PathBuf;
-use std::{fs, path::Path, sync::Arc};
+use std::{collections::HashMap, fs, path::Path, sync::Arc};
 use tokio::sync::RwLock;
 use tonic::async_trait;
 pub mod local_construction;
@@ -13,7 +12,7 @@ pub type MerkleNodePtr = Arc<RwLock<MerkleNode>>;
 pub struct MerkleTree {
   root_path: String,
   root: MerkleNodePtr,
-  files: BTreeMap<String, File>,
+  files: HashMap<String, File>,
   cursor: Option<MerkleNodePtr>,
 }
 
@@ -88,7 +87,7 @@ impl MerkleTree {
   pub fn empty_tree() -> MerkleTree {
     MerkleTree {
       root: Arc::new(RwLock::new(MerkleNode::empty_node(None, None))),
-      files: BTreeMap::new(),
+      files: HashMap::new(),
       root_path: "".to_string(),
       cursor: None,
     }
@@ -96,18 +95,10 @@ impl MerkleTree {
 
   pub async fn get_subtree_hash(
     &self,
-    absolute_path: PathBuf,
+    path: String,
   ) -> Result<String, anyhow::Error> {
-    let abs_string = match absolute_path.to_str() {
-      Some(s) => s.to_string(),
-      None => {
-        return Err(anyhow::anyhow!(
-          "get_subtree_hash: Failed to convert path to string"
-        ))
-      }
-    };
-
-    let node = match self.files.get(&abs_string) {
+    let path = PathBuf::from(path);
+    let node = match self.files.get(path.to_str().unwrap()) {
       Some(file) => file.node.clone(),
       None => {
         return Err(anyhow::anyhow!("Could not find file in tree!"));
@@ -141,43 +132,6 @@ impl MerkleTree {
     Ok(count)
   }
 
-  pub async fn get_num_embeddable_files_in_subtree(
-    &self,
-    absolute_path: PathBuf,
-  ) -> Result<i32, anyhow::Error> {
-    let mut count = 0;
-
-    let absolute_path = match absolute_path.to_str() {
-      Some(s) => s.to_string(),
-      None => {
-        return Err(anyhow::anyhow!(
-        "get_num_embeddable_files_in_subtree: Failed to convert path to string"
-      ))
-      }
-    };
-
-    // TODO(sualeh): worth keeping this list sorted.
-
-    for (_, file) in &self.files {
-      let file_reader = file.node.read().await;
-      match &file_reader.node_type {
-        NodeType::File(file_name) => {
-          if file_name.contains(&absolute_path) {
-            count += 1;
-          }
-        }
-        NodeType::Branch(_) => {
-          continue;
-        }
-        NodeType::ErrorNode(_) => {
-          continue;
-        }
-      }
-    }
-
-    Ok(count)
-  }
-
   pub async fn get_all_files(&self) -> Result<Vec<String>, anyhow::Error> {
     let mut files = Vec::new();
 
@@ -313,33 +267,6 @@ impl MerkleTree {
     Err(anyhow::anyhow!("Could not find file to embed!"))
   }
 
-  pub async fn get_all_dir_files_to_embed(
-    &self,
-    absolute_path: &str,
-  ) -> Result<Vec<String>, anyhow::Error> {
-    let mut files = Vec::new();
-
-    for (file_path, f) in &self.files {
-      if !file_path.contains(absolute_path) {
-        continue;
-      }
-
-      match f.node.read().await.node_type {
-        NodeType::File(_) => {
-          files.push(file_path.clone());
-        }
-        NodeType::Branch(_) => {
-          continue;
-        }
-        NodeType::ErrorNode(_) => {
-          continue;
-        }
-      }
-    }
-
-    Ok(files)
-  }
-
   /// creates a new node and attaches it to the current tree.
   /// SPEC:
   /// - you are allowed to create a file with a node such that the