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

package/Cargo.toml

@@ -9,6 +9,7 @@ crate-type = ["cdylib"]
 [features]
 default = ["windows-subsystem"]
 windows-subsystem = []
+debugfile = []
 
 [dependencies]
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anysphere/file-service",
-  "version": "0.0.0-e36a46ab",
+  "version": "0.0.0-e6124fba",
   "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-e36a46ab",
-    "@anysphere/file-service-darwin-x64": "0.0.0-e36a46ab",
-    "@anysphere/file-service-linux-x64-gnu": "0.0.0-e36a46ab",
-    "@anysphere/file-service-darwin-arm64": "0.0.0-e36a46ab",
-    "@anysphere/file-service-win32-arm64-msvc": "0.0.0-e36a46ab",
-    "@anysphere/file-service-darwin-universal": "0.0.0-e36a46ab",
-    "@anysphere/file-service-linux-arm64-gnu": "0.0.0-e36a46ab"
+    "@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"
   }
 }

package/src/lib.rs

@@ -4,7 +4,7 @@
 pub mod file_utils;
 pub mod merkle_tree;
 
-use std::{vec, collections::HashSet};
+use std::{collections::HashSet, vec};
 
 use anyhow::Context;
 use merkle_tree::{LocalConstruction, MerkleTree};
@@ -19,22 +19,27 @@ extern crate napi_derive;
 pub struct MerkleClient {
   tree: MerkleTree,
   absolute_root_directory: String,
-  _guard: tracing_appender::non_blocking::WorkerGuard,
+  _guard: Option<tracing_appender::non_blocking::WorkerGuard>,
 }
 
-pub fn init_logger() -> tracing_appender::non_blocking::WorkerGuard {
-  let file_appender =
-    RollingFileAppender::new(Rotation::NEVER, "./", "rust_log.txt");
-  let (non_blocking, _guard) = tracing_appender::non_blocking(file_appender);
-  let subscriber = fmt::Subscriber::builder()
-    .with_max_level(Level::TRACE)
-    .with_writer(non_blocking)
-    .with_ansi(false)
-    .with_line_number(true)
-    .finish();
-
-  let _ = tracing::subscriber::set_global_default(subscriber);
-
+pub fn init_logger() -> Option<tracing_appender::non_blocking::WorkerGuard> {
+  #[cfg(feature = "debugfile")]
+  let _guard = {
+    let file_appender =
+      RollingFileAppender::new(Rotation::NEVER, "./", "rust_log.txt");
+    let (non_blocking, _guard) = tracing_appender::non_blocking(file_appender);
+    let subscriber = fmt::Subscriber::builder()
+      .with_max_level(Level::TRACE)
+      .with_writer(non_blocking)
+      .with_ansi(false)
+      .with_line_number(true)
+      .finish();
+
+    let _ = tracing::subscriber::set_global_default(subscriber);
+    Some(_guard)
+  };
+  #[cfg(not(feature = "debugfile"))]
+  let _guard = { None };
   _guard
 }
 
@@ -62,13 +67,20 @@ impl MerkleClient {
   }
 
   #[napi]
-  pub async unsafe fn init(&mut self, git_ignored_files: Vec<String>, is_git_repo: bool) -> Result<(), napi::Error> {
+  pub async unsafe fn init(
+    &mut self,
+    git_ignored_files: Vec<String>,
+    is_git_repo: bool,
+  ) -> Result<(), napi::Error> {
     // 1. compute the merkle tree
     // 2. update the backend
     // 3. sync with the remote
     info!("Merkle tree compute started!");
+		info!("Root directory: {:?}", self.absolute_root_directory);
     unsafe {
-      self.compute_merkle_tree(git_ignored_files, is_git_repo).await?;
+      self
+        .compute_merkle_tree(git_ignored_files, is_git_repo)
+        .await?;
     }
 
     Ok(())
@@ -82,14 +94,19 @@ impl MerkleClient {
   pub async unsafe fn compute_merkle_tree(
     &mut self,
     git_ignored_files: Vec<String>,
-    is_git_repo: bool
+    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 t =
-      MerkleTree::construct_merkle_tree(self.absolute_root_directory.clone(), git_ignored_set, is_git_repo)
-        .await;
+		info!("Git ignored set: {:?}", git_ignored_set);
+
+    let t = MerkleTree::construct_merkle_tree(
+      self.absolute_root_directory.clone(),
+      git_ignored_set,
+      is_git_repo,
+    )
+    .await;
 
     match t {
       Ok(tree) => {

package/src/merkle_tree/local_construction.rs

@@ -66,7 +66,7 @@ impl LocalConstruction for MerkleTree {
       files: BTreeMap::new(),
       root_path: absolute_path_to_root_directory,
       cursor: None,
-      git_ignored_files_and_dirs: git_ignored_files_and_dirs,
+      git_ignored_files_and_dirs,
       is_git_repo
     };
 

package/src/merkle_tree/mod.rs

@@ -322,16 +322,13 @@ impl MerkleTree {
     &self,
     absolute_path: &str,
   ) -> Result<Vec<String>, anyhow::Error> {
-    info!("get_spline called with absolute_path: {}", absolute_path);
     let mut files = Vec::new();
 
     let current_node = match self.files.get(absolute_path) {
       Some(node) => {
-        info!("Found node for absolute_path: {}", absolute_path);
         node.node.clone()
       }
       None => {
-        info!("File not found for absolute_path: {}", absolute_path);
         return Err(anyhow::anyhow!("File not found: {}", absolute_path));
       }
     };
@@ -342,7 +339,6 @@ impl MerkleTree {
     while let Some(node) = stack.pop() {
       let parent = node.read().await.parent.clone();
       if let Some(parent) = parent {
-        info!("Adding parent hash to files vector");
         {
           let parent_node = parent.read().await;
           match &parent_node.node_type {
@@ -361,7 +357,6 @@ impl MerkleTree {
         stack.push(parent);
       }
     }
-    info!("Returning files vector with {} elements", files.len());
     Ok(files)
   }
 
@@ -749,7 +744,6 @@ impl MerkleNode {
       "constructing node for absolute_file_or_directory: {:?}",
       absolute_file_or_directory
     );
-    info!("bypass_git: {}, is_git_repo: {}", bypass_git, is_git_repo);
 
     MerkleNode::construct_node(
       Path::new(&absolute_file_or_directory),