@jsenv/filesystem 4.0.10 → 4.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/filesystem",
-  "version": "4.0.10",
+  "version": "4.1.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -8,8 +8,7 @@
     "directory": "packages/filesystem"
   },
   "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org"
+    "access": "public"
   },
   "author": {
     "name": "dmail",
@@ -31,8 +30,8 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {
-    "@jsenv/urls": "1.2.6",
+    "@jsenv/urls": "1.2.7",
     "@jsenv/url-meta": "7.0.0",
     "@jsenv/abort": "4.2.3"
   }
-}
+}

package/src/collectFiles.js

@@ -30,7 +30,6 @@ export const collectFiles = async ({
     await Promise.all(
       directoryItems.map(async (directoryItem) => {
         const directoryChildNodeUrl = `${directoryUrl}${directoryItem}`
-
         collectOperation.throwIfAborted()
         const directoryChildNodeStats = await readEntryStat(
           directoryChildNodeUrl,

package/src/ensureWindowsDriveLetter.js

@@ -59,10 +59,10 @@ export const ensureWindowsDriveLetter = (url, baseUrl) => {
   return `file:///${driveLetter}:${afterProtocol}`
 }
 
-const extractDriveLetter = (ressource) => {
+const extractDriveLetter = (resource) => {
   // we still have the windows drive letter
-  if (/[a-zA-Z]/.test(ressource[1]) && ressource[2] === ":") {
-    return ressource[1]
+  if (/[a-zA-Z]/.test(resource[1]) && resource[2] === ":") {
+    return resource[1]
   }
   return null
 }

package/src/internal/guard_second_call.js

@@ -1,6 +1,25 @@
 export const guardTooFastSecondCall = (
   callback,
   cooldownBetweenFileEvents = 40,
+) => {
+  let previousCallMs
+  return (...args) => {
+    const nowMs = Date.now()
+    if (previousCallMs) {
+      const msEllapsed = nowMs - previousCallMs
+      if (msEllapsed < cooldownBetweenFileEvents) {
+        previousCallMs = null
+        return
+      }
+    }
+    previousCallMs = nowMs
+    callback(...args)
+  }
+}
+
+export const guardTooFastSecondCallPerFile = (
+  callback,
+  cooldownBetweenFileEvents = 40,
 ) => {
   const previousCallMsMap = new Map()
   return (fileEvent) => {

package/src/internal/{trackRessources.js → track_resources.js}

@@ -1,4 +1,4 @@
-export const trackRessources = () => {
+export const trackResources = () => {
   const callbackArray = []
 
   const registerCleanupCallback = (callback) => {

package/src/readDirectory.js

@@ -1,54 +1,39 @@
 import { readdir } from "node:fs"
-import { urlToFileSystemPath } from "@jsenv/urls"
 import { assertAndNormalizeDirectoryUrl } from "./assertAndNormalizeDirectoryUrl.js"
 
 export const readDirectory = async (url, { emfileMaxWait = 1000 } = {}) => {
   const directoryUrl = assertAndNormalizeDirectoryUrl(url)
-  const directoryPath = urlToFileSystemPath(directoryUrl)
+  const directoryUrlObject = new URL(directoryUrl)
   const startMs = Date.now()
   let attemptCount = 0
 
-  const attempt = () => {
-    return readdirNaive(directoryPath, {
-      handleTooManyFilesOpenedError: async (error) => {
+  const attempt = async () => {
+    try {
+      const names = await new Promise((resolve, reject) => {
+        readdir(directoryUrlObject, (error, names) => {
+          if (error) {
+            reject(error)
+          } else {
+            resolve(names)
+          }
+        })
+      })
+      return names.map(encodeURIComponent)
+    } catch (e) {
+      // https://nodejs.org/dist/latest-v13.x/docs/api/errors.html#errors_common_system_errors
+      if (e.code === "EMFILE" || e.code === "ENFILE") {
         attemptCount++
         const nowMs = Date.now()
         const timeSpentWaiting = nowMs - startMs
         if (timeSpentWaiting > emfileMaxWait) {
-          throw error
+          throw e
         }
-
-        return new Promise((resolve) => {
-          setTimeout(() => {
-            resolve(attempt())
-          }, attemptCount)
-        })
-      },
-    })
+        await new Promise((resolve) => setTimeout(resolve), attemptCount)
+        return await attempt()
+      }
+      throw e
+    }
   }
 
   return attempt()
 }
-
-const readdirNaive = (
-  directoryPath,
-  { handleTooManyFilesOpenedError = null } = {},
-) => {
-  return new Promise((resolve, reject) => {
-    readdir(directoryPath, (error, names) => {
-      if (error) {
-        // https://nodejs.org/dist/latest-v13.x/docs/api/errors.html#errors_common_system_errors
-        if (
-          handleTooManyFilesOpenedError &&
-          (error.code === "EMFILE" || error.code === "ENFILE")
-        ) {
-          resolve(handleTooManyFilesOpenedError(error))
-        } else {
-          reject(error)
-        }
-      } else {
-        resolve(names)
-      }
-    })
-  })
-}

package/src/registerDirectoryLifecycle.js

@@ -4,9 +4,9 @@ import { urlToFileSystemPath, urlToRelativeUrl } from "@jsenv/urls"
 
 import { assertAndNormalizeDirectoryUrl } from "./assertAndNormalizeDirectoryUrl.js"
 import { statsToType } from "./internal/statsToType.js"
-import { guardTooFastSecondCall } from "./internal/guard_second_call.js"
+import { guardTooFastSecondCallPerFile } from "./internal/guard_second_call.js"
 import { createWatcher } from "./internal/createWatcher.js"
-import { trackRessources } from "./internal/trackRessources.js"
+import { trackResources } from "./internal/track_resources.js"
 
 const isLinux = process.platform === "linux"
 // linux does not support recursive option
@@ -49,13 +49,19 @@ export const registerDirectoryLifecycle = (
   }
   if (cooldownBetweenFileEvents) {
     if (added) {
-      added = guardTooFastSecondCall(added, cooldownBetweenFileEvents)
+      added = guardTooFastSecondCallPerFile(added, cooldownBetweenFileEvents)
     }
     if (updated) {
-      updated = guardTooFastSecondCall(updated, cooldownBetweenFileEvents)
+      updated = guardTooFastSecondCallPerFile(
+        updated,
+        cooldownBetweenFileEvents,
+      )
     }
     if (removed) {
-      removed = guardTooFastSecondCall(removed, cooldownBetweenFileEvents)
+      removed = guardTooFastSecondCallPerFile(
+        removed,
+        cooldownBetweenFileEvents,
+      )
     }
   }
 
@@ -81,7 +87,7 @@ export const registerDirectoryLifecycle = (
     const { watch } = URL_META.applyAssociations({ url, associations })
     return watch
   }
-  const tracker = trackRessources()
+  const tracker = trackResources()
   const infoMap = new Map()
   const readEntryInfo = (url) => {
     try {
@@ -199,7 +205,7 @@ export const registerDirectoryLifecycle = (
     }
     if (entryInfo.type !== previousInfo.type) {
       // it existed and was replaced by something else
-      // we don't handle this as an update. We rather say the ressource
+      // we don't handle this as an update. We rather say the resource
       // is lost and something else is found (call removed() then added())
       handleEntryLost(previousInfo)
       handleEntryFound(entryInfo)

package/src/registerFileLifecycle.js

@@ -6,7 +6,7 @@ import { assertAndNormalizeFileUrl } from "./assertAndNormalizeFileUrl.js"
 import { guardTooFastSecondCall } from "./internal/guard_second_call.js"
 import { statsToType } from "./internal/statsToType.js"
 import { createWatcher } from "./internal/createWatcher.js"
-import { trackRessources } from "./internal/trackRessources.js"
+import { trackResources } from "./internal/track_resources.js"
 
 export const registerFileLifecycle = (
   source,
@@ -45,7 +45,7 @@ export const registerFileLifecycle = (
     }
   }
 
-  const tracker = trackRessources()
+  const tracker = trackResources()
 
   const handleFileFound = ({ existent }) => {
     const fileMutationStopWatching = watchFileMutation(sourceUrl, {