@anysphere/file-service 0.0.0-dbd43428 → 0.0.0-e0c70bcd

package/Cargo.toml

@@ -20,6 +20,7 @@ prost = "0.11.9"
 tracing = "0.1.37"
 tracing-subscriber = "0.3.17"
 tracing-appender = "0.2.2"
+binaryornot = "1.0.0"
 
 [build-dependencies]
 napi-build = "2.0.1"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anysphere/file-service",
-  "version": "0.0.0-dbd43428",
+  "version": "0.0.0-e0c70bcd",
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {
@@ -9,7 +9,8 @@
       "additional": [
         "aarch64-apple-darwin",
         "aarch64-pc-windows-msvc",
-        "universal-apple-darwin"
+        "universal-apple-darwin",
+        "aarch64-unknown-linux-gnu"
       ]
     }
   },
@@ -35,11 +36,12 @@
     "version": "napi version"
   },
   "optionalDependencies": {
-    "@anysphere/file-service-win32-x64-msvc": "0.0.0-dbd43428",
-    "@anysphere/file-service-darwin-x64": "0.0.0-dbd43428",
-    "@anysphere/file-service-linux-x64-gnu": "0.0.0-dbd43428",
-    "@anysphere/file-service-darwin-arm64": "0.0.0-dbd43428",
-    "@anysphere/file-service-win32-arm64-msvc": "0.0.0-dbd43428",
-    "@anysphere/file-service-darwin-universal": "0.0.0-dbd43428"
+    "@anysphere/file-service-win32-x64-msvc": "0.0.0-e0c70bcd",
+    "@anysphere/file-service-darwin-x64": "0.0.0-e0c70bcd",
+    "@anysphere/file-service-linux-x64-gnu": "0.0.0-e0c70bcd",
+    "@anysphere/file-service-darwin-arm64": "0.0.0-e0c70bcd",
+    "@anysphere/file-service-win32-arm64-msvc": "0.0.0-e0c70bcd",
+    "@anysphere/file-service-darwin-universal": "0.0.0-e0c70bcd",
+    "@anysphere/file-service-linux-arm64-gnu": "0.0.0-e0c70bcd"
   }
 }

package/src/file_utils.rs

@@ -5,7 +5,7 @@
 // 4. vscode.fs.stat
 
 use anyhow::Error;
-use std::path::Path;
+use std::{path::Path, any};
 use tokio::fs;
 
 pub fn is_in_bad_dir(file_path: &Path) -> Result<bool, Error> {
@@ -62,7 +62,7 @@ pub fn is_good_file(file_path: &Path) -> Result<(), Error> {
     Some(extension) => match extension.to_str() {
       Some(ext_str) => {
         if bad_extensions.contains(&ext_str) {
-          return Err(anyhow::anyhow!("File is not a valid UTF-8 string"));
+          return Err(anyhow::anyhow!("Binary file excluded from indexing."));
         }
       }
       None => {
@@ -88,10 +88,12 @@ pub fn is_good_file(file_path: &Path) -> Result<(), Error> {
   Ok(())
 }
 
+// use binaryornot::is_binary;
+// use anyhow::Context;
 // implement the buffer above:
 pub async fn is_good_file_runtime_check(
   file_path: &Path,
-  buffer: &[u8],
+  _buffer: &[u8],
 ) -> Result<(), Error> {
   match get_file_size(file_path).await {
     Ok(size) if size > 2 * 1024 * 1024 => {
@@ -101,13 +103,10 @@ pub async fn is_good_file_runtime_check(
     _ => {}
   }
 
-  for &byte in buffer.iter().take(2048) {
-    if byte.is_ascii() {
-      continue;
-    } else {
-      return Err(anyhow::anyhow!("File is not a valid UTF-8 string"));
-    }
-  }
+	// if is_binary(file_path).context("Failed to check if file is binary")? {
+	// 	return Err(anyhow::anyhow!("File is binary"));
+	// }
+
   Ok(())
 }
 

package/src/lib.rs

@@ -55,6 +55,7 @@ impl MerkleClient {
     // 1. compute the merkle tree
     // 2. update the backend
     // 3. sync with the remote
+    info!("Merkle tree compute started!");
     unsafe {
       self.compute_merkle_tree().await?;
     }
@@ -73,17 +74,6 @@ impl MerkleClient {
     let t =
       MerkleTree::construct_merkle_tree(self.root_directory.clone()).await;
 
-    let files = self.tree.get_all_files().await;
-
-    match files {
-      Ok(files) => {
-        info!("files: {:?}", files);
-      }
-      Err(e) => {
-        info!("Error in get_all_files: {:?}", e);
-      }
-    }
-
     match t {
       Ok(tree) => {
         self.tree = tree;
@@ -111,19 +101,24 @@ impl MerkleClient {
     &self,
     relative_path: String,
   ) -> Result<String, napi::Error> {
-    info!("relative_path: {:?}", relative_path);
     let absolute_path =
-      std::path::Path::new(&self.root_directory).join(relative_path);
-    let canonical_path = absolute_path.canonicalize().unwrap();
+      std::path::Path::new(&self.root_directory).join(&relative_path);
+
+    let canonical_path = match absolute_path.canonicalize() {
+      Ok(path) => path,
+      Err(e) => return Err(napi::Error::new(
+        napi::Status::Unknown,
+        format!("Error in canonicalizing path: {:?}", e),
+      )),
+    };
 
-    info!("canonical_path: {:?}", canonical_path);
-    let hash = self.tree.get_subtree_hash(canonical_path).await;
+    let hash = self.tree.get_subtree_hash(canonical_path.clone()).await;
 
     match hash {
       Ok(hash) => Ok(hash),
       Err(e) => Err(napi::Error::new(
         napi::Status::Unknown,
-        format!("Error in get_subtree_hash: {:?}", e),
+        format!("Error in get_subtree_hash. \nRelative path: {:?}, \nAbsolute path: {:?}, \nCanonical path: {:?}, \nRoot directory: {:?}\nError: {:?}", &relative_path, absolute_path, canonical_path, self.root_directory, e),
       )),
     }
   }
@@ -209,11 +204,7 @@ impl MerkleClient {
         // TODO(sualeh): we should assert that the path is ascending up to the path.
 
         let ret = vec![file];
-        info!("file: {:?}", ret);
-
         let ret = ret.into_iter().chain(path.into_iter()).collect::<Vec<_>>();
-        info!("ret to js: {:?}", ret);
-
         Ok(ret)
       }
       Err(e) => Err(napi::Error::new(

package/src/merkle_tree/local_construction.rs

@@ -46,8 +46,6 @@ impl LocalConstruction for MerkleTree {
       Err(_e) => HashSet::new(),
     };
 
-    tracing::info!("git_ignored_files: {:?}", git_ignored_files);
-
     let root_node = MerkleNode::new(
       path,
       None,
@@ -73,6 +71,7 @@ impl LocalConstruction for MerkleTree {
         let node_reader = node.read().await;
         match &node_reader.node_type {
           NodeType::Branch(n) => {
+            tracing::info!("Branch: {:?}", n.0);
             let children = &n.1;
             files.insert(n.0.clone(), File { node: node.clone() });
             for child in children {
@@ -81,6 +80,7 @@ impl LocalConstruction for MerkleTree {
           }
           NodeType::File(file_name) => {
             let f = File { node: node.clone() };
+            tracing::info!("File: {:?}", file_name);
             files.insert(file_name.clone(), f);
           }
           NodeType::ErrorNode(_) => {
@@ -92,6 +92,9 @@ impl LocalConstruction for MerkleTree {
 
     add_nodes_to_hashmap(&mt.root, &mut mt.files).await;
 
+    tracing::info!("Merkle tree compute finished!");
+    tracing::info!("Merkle tree: {}", mt);
+
     Ok(mt)
   }
 

package/src/merkle_tree/mod.rs

@@ -115,7 +115,8 @@ impl MerkleTree {
     let node = match self.files.get(&abs_string) {
       Some(file) => file.node.clone(),
       None => {
-        return Err(anyhow::anyhow!("Could not find file in tree!"));
+        let all_files: Vec<String> = self.files.keys().cloned().collect();
+        return Err(anyhow::anyhow!("Could not find file in tree! Looking for: {}. All files: {:?}", abs_string, all_files));
       }
     };
 
@@ -806,6 +807,10 @@ impl MerkleNode {
 
       if is_git_ignored && !bypass_git {
         // println!("skipping directory: {}", path_str);
+        tracing::info!(
+          "skipping directory because its git ignored: {}",
+          path_str
+        );
         return Arc::new(RwLock::new(MerkleNode::empty_node(
           Some(absolute_file_or_directory),
           Some("Directory is git ignored!".to_string()),