@anysphere/file-service 0.0.0-e6124fba → 0.0.0-e9ef07ca

package/package.json

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

package/src/lib.rs

@@ -8,21 +8,28 @@ use std::{collections::HashSet, vec};
 
 use anyhow::Context;
 use merkle_tree::{LocalConstruction, MerkleTree};
-use tracing::{info, Level};
+use tracing::{info, Level, subscriber};
 use tracing_appender::rolling::{RollingFileAppender, Rotation};
 use tracing_subscriber::fmt;
+use tracing_subscriber::prelude::*;
+use tracing_appender::non_blocking::WorkerGuard;
 
 #[macro_use]
 extern crate napi_derive;
 
+pub enum GuardType {
+	// Guard(tracing_axiom::Guard),
+	WorkerGuard(tracing_appender::non_blocking::WorkerGuard),
+}
+
 #[napi]
 pub struct MerkleClient {
   tree: MerkleTree,
   absolute_root_directory: String,
-  _guard: Option<tracing_appender::non_blocking::WorkerGuard>,
+  _guard: Option<GuardType>,
 }
 
-pub fn init_logger() -> Option<tracing_appender::non_blocking::WorkerGuard> {
+pub fn init_logger() -> Option<GuardType> {
   #[cfg(feature = "debugfile")]
   let _guard = {
     let file_appender =
@@ -36,10 +43,23 @@ pub fn init_logger() -> Option<tracing_appender::non_blocking::WorkerGuard> {
       .finish();
 
     let _ = tracing::subscriber::set_global_default(subscriber);
-    Some(_guard)
+
+		Some(GuardType::WorkerGuard(_guard))
   };
+
   #[cfg(not(feature = "debugfile"))]
-  let _guard = { None };
+	let _guard = {
+		// let (axiom_layer, _guard) = tracing_axiom::builder().with_token("xaat-a51088e6-7889-41c0-b440-cfd4601acdd7").with_dataset("local-indexing").layer().ok()?;
+		// // let fmt_layer = fmt::layer().with_level(true).with_ansi(false).with_line_number(true);
+
+		// let _ = tracing_subscriber::registry().with(axiom_layer).try_init().ok()?;
+		// // let _ = tracing::subscriber::set_global_default(subscriber);
+
+		// info!("Tracing initialized! in rust");
+
+		None
+	};
+
   _guard
 }
 
@@ -97,9 +117,13 @@ impl MerkleClient {
     is_git_repo: bool,
   ) -> Result<(), napi::Error> {
     // make the git ignored files into a hash set
-    let git_ignored_set = HashSet::from_iter(git_ignored_files.into_iter());
+    let mut git_ignored_set = HashSet::from_iter(git_ignored_files.into_iter());
 
-		info!("Git ignored set: {:?}", git_ignored_set);
+		// if the hashset itself contains the root directory, then we should remove it.
+		// this is because the root directory is not a file, and we don't want to ignore it.
+		if git_ignored_set.contains(&self.absolute_root_directory) {
+			git_ignored_set.remove(&self.absolute_root_directory);
+		}
 
     let t = MerkleTree::construct_merkle_tree(
       self.absolute_root_directory.clone(),

package/src/merkle_tree/local_construction.rs

@@ -9,6 +9,7 @@ use tonic::async_trait;
 
 #[async_trait]
 impl LocalConstruction for MerkleTree {
+	#[tracing::instrument]
   async fn new(
     root_directory: Option<String>,
   ) -> Result<MerkleTree, anyhow::Error> {
@@ -32,6 +33,7 @@ impl LocalConstruction for MerkleTree {
   /// 2. compute hash for each file
   /// 3. construct merkle tree
   /// 4. return merkle tree
+	#[tracing::instrument(skip(git_ignored_files_and_dirs))]
   async fn construct_merkle_tree(
     absolute_path_to_root_directory: String,
     git_ignored_files_and_dirs: HashSet<String>,
@@ -59,8 +61,8 @@ impl LocalConstruction for MerkleTree {
       &git_ignored_files_and_dirs,
       absolute_path_to_root_directory.as_str(),
       is_git_repo
-    )
-    .await;
+    ).await;
+
     let mut mt = MerkleTree {
       root: root_node,
       files: BTreeMap::new(),
@@ -80,7 +82,6 @@ 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 {
@@ -107,12 +108,12 @@ 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);
+		tracing::info!("number of files in the tree: {}", mt.files.len());
 
     Ok(mt)
   }
 
+	#[tracing::instrument]
   async fn update_file(
     &mut self,
     file_path: String,
@@ -152,6 +153,7 @@ impl LocalConstruction for MerkleTree {
     Ok(())
   }
 
+	#[tracing::instrument]
   async fn delete_file(
     &mut self,
     file_path: String,

package/src/merkle_tree/mod.rs

@@ -13,6 +13,7 @@ pub mod test;
 
 pub type MerkleNodePtr = Arc<RwLock<MerkleNode>>;
 
+#[derive(Debug)]
 pub struct MerkleTree {
   root_path: String,
   root: MerkleNodePtr,
@@ -103,6 +104,7 @@ impl MerkleTree {
     }
   }
 
+	#[tracing::instrument]
   pub async fn get_subtree_hash(
     &self,
     absolute_path: &str,
@@ -122,11 +124,6 @@ impl MerkleTree {
     let node_reader = node.read().await;
     let node_hash = node_reader.hash.clone();
 
-    info!(
-      "get_subtree_hash for path: {}, node_hash: {}",
-      absolute_path, node_hash
-    );
-
     Ok(node_hash)
   }
 
@@ -731,6 +728,7 @@ impl MerkleNode {
     .await
   }
 
+	#[tracing::instrument]
   async fn new(
     absolute_file_or_directory: PathBuf,
     parent: ParentPtr,
@@ -772,7 +770,9 @@ impl MerkleNode {
     Box::pin(async move {
       // check if it is a file
       let path_str = absolute_file_or_directory.to_str().unwrap().to_string();
+
       if absolute_file_or_directory.is_file() {
+				tracing::info!("constructing file node for path_str: {}", path_str);
         return Arc::new(RwLock::new(
           MerkleNode::construct_file_node_or_error_node(
             absolute_file_or_directory,
@@ -783,6 +783,8 @@ impl MerkleNode {
         ));
       }
 
+			tracing::info!("constructing directory node for path_str: {}", path_str);
+
       // check if the directory fails the bad dir test.
       let is_bad_dir = file_utils::is_in_bad_dir(absolute_file_or_directory);
       if is_bad_dir.is_err() || is_bad_dir.unwrap_or(false) {
@@ -794,8 +796,10 @@ impl MerkleNode {
       }
 
       let is_git_ignored_dir = ignored_files.contains(&path_str);
+			tracing::info!("is_git_ignored_dir: {}", is_git_ignored_dir);
 
       if is_git_ignored_dir && !bypass_git {
+				tracing::info!("skipping directory: {}", path_str);
         return Arc::new(RwLock::new(MerkleNode::empty_node(
           Some(absolute_file_or_directory),
           Some("Directory is git ignored!".to_string()),
@@ -806,6 +810,7 @@ impl MerkleNode {
       match entries {
         Ok(_) => (),
         Err(e) => {
+					tracing::error!("error reading directory: {}", e);
           return Arc::new(RwLock::new(MerkleNode::empty_node(
             Some(absolute_file_or_directory),
             Some(e.to_string()),
@@ -838,6 +843,7 @@ impl MerkleNode {
             );
           }
           Err(e) => {
+						tracing::error!("error reading directory: {}", e);
             children.push(Arc::new(RwLock::new(MerkleNode::empty_node(
               Some(absolute_file_or_directory),
               Some(e.to_string()),
@@ -934,6 +940,7 @@ impl MerkleNode {
       Err(e) => {
         // println!("constructing error node. error: {}", e);
         // println!("file_path: {:?}", file_path);
+				tracing::error!("constructing error node. error: {}", e);
         MerkleNode::empty_node(Some(absolute_file_path), Some(e))
       }
     };
@@ -995,7 +1002,6 @@ impl MerkleNode {
       if hash == "" {
         continue;
       }
-      info!("name: {}, hash: {}", name, hash);
       hasher.update(hash);
     }