@anysphere/file-service 0.0.0-bb2746e1 → 0.0.0-bc85c93a

package/index.d.ts

@@ -5,6 +5,7 @@
 
 export class MerkleClient {
   constructor(absoluteRootDirectory: string)
+  isTooBig(maxFiles: number, gitIgnoredFiles: Array<string>, isGitRepo: boolean): Promise<boolean>
   init(gitIgnoredFiles: Array<string>, isGitRepo: boolean): Promise<void>
   computeMerkleTree(gitIgnoredFiles: Array<string>, isGitRepo: boolean): Promise<void>
   updateFile(filePath: string): Promise<void>

package/package.json

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

package/push-rust-indexer.sh

@@ -0,0 +1,21 @@
+echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
+VERSION="0.0.0-$(git rev-parse --short HEAD)"
+echo "Checking npm view works"
+
+NPM_VIEW_HELP=$(npm view --help 2>/dev/null)
+if [ $? -eq 0 ]; then
+  echo "npm view --help command executed successfully"
+else
+  echo "npm view --help command failed"
+  exit 1
+fi
+
+echo "checking if version $VERSION already exists"
+EXISTS=$(npm view @anysphere/file-service@$VERSION version 2>/dev/null)
+if [ -z "$EXISTS" ]; then
+  echo "Publishing version $VERSION"
+  yarn version --no-git-tag-version --new-version $VERSION
+  npm publish --access public --tag next --scope @anysphere
+else
+  echo "Version $VERSION already exists. Skipping publish."
+fi

package/src/file_utils.rs

@@ -45,86 +45,17 @@ pub fn is_good_file(file_path: &Path) -> Result<(), Error> {
   }
 
   let bad_extensions = vec![
-    "lock",
-    "bak",
-    "tmp",
-    "bin",
-    "exe",
-    "dll",
-    "so",
-    "lockb",
-    "qwoff",
-    "isl",
-    "csv",
-    "pdf",
-    // add ms word, excel, powerpoint, etc.
-    "doc",
-    "docx",
-    "xls",
-    "xlsx",
-    "ppt",
-    "pptx",
-    "odt",
-    "ods",
-    "odp",
-    "odg",
-    "odf",
-    "sxw",
-    "sxc",
-    "sxi",
-    "sxd",
-    "sdc",
-    // add images
-    "jpg",
-    "jpeg",
-    "png",
-    "gif",
-    "bmp",
-    "tif",
-    // add audio
-    "mp3",
-    "wav",
-    "wma",
-    "ogg",
-    "flac",
-    "aac",
-    // add video
-    "mp4",
-    "mov",
-    "wmv",
-    "flv",
-    "avi",
-    // add archives
-    "zip",
-    "tar",
-    "gz",
-    "7z",
-    "rar",
-    "tgz",
-    "dmg",
-    "iso",
-    "cue",
-    "mdf",
-    "mds",
-    "vcd",
-    "toast",
-    "img",
-    "apk",
-    "msi",
-    "cab",
-    "tar.gz",
-    "tar.xz",
-    "tar.bz2",
-    "tar.lzma",
-    "tar.Z",
-    "tar.sz",
-    "lzma",
-    // add fonts
-    "ttf",
-    "otf",
-    "woff",
-    "woff2",
-    "eot",
+    "lock", "bak", "tmp", "bin", "exe", "dll", "so", "lockb", "qwoff", "isl",
+    "csv", "pdf", // add ms word, excel, powerpoint, etc.
+    "doc", "docx", "xls", "xlsx", "ppt", "pptx", "odt", "ods", "odp", "odg",
+    "odf", "sxw", "sxc", "sxi", "sxd", "sdc", // add images
+    "jpg", "jpeg", "png", "gif", "bmp", "tif", // add audio
+    "mp3", "wav", "wma", "ogg", "flac", "aac", // add video
+    "mp4", "mov", "wmv", "flv", "avi", // add archives
+    "zip", "tar", "gz", "7z", "rar", "tgz", "dmg", "iso", "cue", "mdf", "mds",
+    "vcd", "toast", "img", "apk", "msi", "cab", "tar.gz", "tar.xz", "tar.bz2",
+    "tar.lzma", "tar.Z", "tar.sz", "lzma", // add fonts
+    "ttf", "otf", "woff", "woff2", "eot", "webp", "vsix",
   ];
   match bad_extensions.contains(&extension) {
     true => {

package/src/lib.rs

@@ -44,6 +44,57 @@ impl MerkleClient {
     }
   }
 
+  #[napi]
+  pub async fn is_too_big(
+    &self,
+    max_files: i32,
+    git_ignored_files: Vec<String>,
+    is_git_repo: bool,
+  ) -> bool {
+    let git_ignored_set =
+      HashSet::<String>::from_iter(git_ignored_files.into_iter());
+    let mut num_files = 0;
+    let mut dirs_to_check = vec![self.absolute_root_directory.clone()];
+
+    while let Some(dir) = dirs_to_check.pop() {
+      info!("dir: {:?}", dir);
+      let mut entries = match tokio::fs::read_dir(&dir).await {
+        Ok(entries) => entries,
+        Err(_) => continue,
+      };
+      if num_files > max_files {
+        return true;
+      }
+
+      while let Some(entry) = entries.next_entry().await.unwrap_or(None) {
+        let path = entry.path();
+        info!("entry: {:?}", path);
+        let path_str = match path.to_str() {
+          Some(path_str) => path_str.to_string(),
+          None => continue,
+        };
+
+        if git_ignored_set.contains(&path_str) {
+          continue;
+        }
+
+        match entry.file_type().await {
+          Ok(file_type) => {
+            if file_type.is_dir() {
+              dirs_to_check.push(path_str);
+            }
+
+            if file_type.is_file() {
+              num_files += 1;
+            }
+          }
+          Err(_) => continue,
+        }
+      }
+    }
+    num_files > max_files
+  }
+
   #[napi]
   pub async unsafe fn init(
     &mut self,

package/src/merkle_tree/mod.rs

@@ -295,9 +295,14 @@ impl MerkleTree {
     if file_node.is_none() {
       return Err(anyhow::anyhow!("Could not find directory the in tree!"));
     }
+    let absolute_path = if absolute_path.ends_with(std::path::MAIN_SEPARATOR) {
+      absolute_path.to_string()
+    } else {
+      format!("{}{}", absolute_path, std::path::MAIN_SEPARATOR)
+    };
 
     for (file_path, f) in &self.files {
-      if !file_path.contains(absolute_path) {
+      if !file_path.contains(absolute_path.as_str()) {
         continue;
       }