dicom-curate 0.32.1 → 0.33.0

package/dist/esm/scanDirectoryWorker.js

@@ -37140,11 +37140,8 @@ var keepScanning = true;
 var pauseResolve = null;
 var pausePromise = null;
 var totalDiscovered = 0;
-var countingMode = false;
-var fileBuffer = [];
 function pauseScanning() {
   if (!pausePromise) {
-    countingMode = true;
     pausePromise = new Promise((resolve) => {
       pauseResolve = resolve;
     });
@@ -37152,7 +37149,6 @@ function pauseScanning() {
 }
 function resumeScanning() {
   if (pauseResolve) {
-    countingMode = false;
     pauseResolve();
     pauseResolve = null;
     pausePromise = null;
@@ -37286,7 +37282,7 @@ async function shouldProcessFileNode(filePath, fileName, fileSize, fileAnomalies
     return true;
   }
 }
-function cheapFilter(fileName, fileSize, filePath) {
+function cheapFilterNameOnly(fileName, filePath) {
   const allExcludedFiletypes = [
     ...noDefaultExclusions ? [] : DEFAULT_EXCLUDED_FILETYPES,
     ...excludedFiletypes
@@ -37299,100 +37295,8 @@ function cheapFilter(fileName, fileSize, filePath) {
   )) {
     return false;
   }
-  if (noDicomSignatureCheck) {
-    return true;
-  }
-  if (fileSize < 132) {
-    return false;
-  }
   return true;
 }
-async function drainBuffer() {
-  while (fileBuffer.length > 0 && keepScanning) {
-    const item = fileBuffer.shift();
-    const fileAnomalies = [];
-    if (item.kind === "handle") {
-      const filePath = `${item.prefix}/${item.name}`;
-      if (await shouldProcessFile(item.file, fileAnomalies, filePath)) {
-        globalThis.postMessage({
-          response: "file",
-          fileInfo: {
-            path: item.prefix,
-            name: item.name,
-            size: item.size,
-            kind: "handle",
-            fileHandle: item.entry
-          },
-          previousFileInfo: item.prev
-        });
-      } else {
-        totalDiscovered--;
-        globalThis.postMessage({
-          response: "count",
-          totalDiscovered
-        });
-        if (fileAnomalies.length > 0) {
-          globalThis.postMessage({
-            response: "scanAnomalies",
-            fileInfo: {
-              path: item.prefix,
-              name: item.name,
-              size: item.size,
-              kind: "handle",
-              fileHandle: item.entry
-            },
-            anomalies: fileAnomalies,
-            previousFileInfo: item.prev
-          });
-        }
-      }
-    } else {
-      if (await shouldProcessFileNode(
-        item.filePath,
-        item.name,
-        item.size,
-        fileAnomalies,
-        `${item.prefix}/${item.name}`
-      )) {
-        globalThis.postMessage({
-          response: "file",
-          fileInfo: {
-            path: item.prefix,
-            name: item.name,
-            size: item.size,
-            kind: "path",
-            fullPath: item.filePath
-          },
-          previousFileInfo: item.prev
-        });
-      } else {
-        totalDiscovered--;
-        globalThis.postMessage({
-          response: "count",
-          totalDiscovered
-        });
-        if (fileAnomalies.length > 0) {
-          globalThis.postMessage({
-            response: "scanAnomalies",
-            fileInfo: {
-              path: item.prefix,
-              name: item.name,
-              size: item.size,
-              kind: "path",
-              fullPath: item.filePath
-            },
-            anomalies: fileAnomalies,
-            previousFileInfo: item.prev
-          });
-        }
-      }
-    }
-    if (!await waitIfPaused())
-      return;
-    if (countingMode)
-      return;
-  }
-}
 fixupNodeWorkerEnvironment().then(() => {
   globalThis.addEventListener("message", (event) => {
     switch (event.data.request) {
@@ -37417,8 +37321,6 @@ fixupNodeWorkerEnvironment().then(() => {
         noDefaultExclusions = event.data.noDefaultExclusions ?? false;
         keepScanning = true;
         totalDiscovered = 0;
-        countingMode = false;
-        fileBuffer.length = 0;
         if ("path" in eventData) {
           scanDirectoryNode(eventData.path);
         } else if ("directoryHandle" in eventData) {
@@ -37496,8 +37398,16 @@ async function scanS3Bucket(bucketOptions) {
           }
         }
       }
+      globalThis.postMessage({
+        response: "count",
+        totalDiscovered
+      });
       continuationToken = data2.NextContinuationToken;
     } while (continuationToken);
+    globalThis.postMessage({
+      response: "count",
+      totalDiscovered
+    });
     globalThis.postMessage({ response: "done" });
   } catch (error2) {
     globalThis.postMessage({
@@ -37509,58 +37419,37 @@ async function scanS3Bucket(bucketOptions) {
   }
 }
 async function scanDirectory(dir) {
-  async function traverse(dir2, prefix) {
-    for await (const entry of dir2.values()) {
+  async function counter(dirHandle, prefix) {
+    for await (const entry of dirHandle.values()) {
+      if (!keepScanning)
+        return;
+      if (entry.kind === "file") {
+        const key = `${prefix}/${entry.name}`;
+        if (cheapFilterNameOnly(entry.name, key)) {
+          totalDiscovered++;
+          globalThis.postMessage({
+            response: "count",
+            totalDiscovered
+          });
+        }
+      } else if (entry.kind === "directory") {
+        await counter(
+          entry,
+          prefix + "/" + entry.name
+        );
+      }
+    }
+  }
+  async function feeder(dirHandle, prefix) {
+    for await (const entry of dirHandle.values()) {
       if (!keepScanning)
         return;
       if (entry.kind === "file") {
         const file = await entry.getFile();
         const key = `${prefix}/${entry.name}`;
         const prev = previousIndex ? previousIndex[key] : void 0;
-        if (countingMode) {
-          if (cheapFilter(entry.name, file.size, key)) {
-            totalDiscovered++;
-            fileBuffer.push({
-              kind: "handle",
-              entry,
-              file,
-              prefix,
-              name: entry.name,
-              size: file.size,
-              prev
-            });
-            globalThis.postMessage({
-              response: "count",
-              totalDiscovered
-            });
-          }
-          continue;
-        }
-        if (fileBuffer.length > 0) {
-          await drainBuffer();
-          if (countingMode) {
-            if (cheapFilter(entry.name, file.size, key)) {
-              totalDiscovered++;
-              fileBuffer.push({
-                kind: "handle",
-                entry,
-                file,
-                prefix,
-                name: entry.name,
-                size: file.size,
-                prev
-              });
-              globalThis.postMessage({
-                response: "count",
-                totalDiscovered
-              });
-            }
-            continue;
-          }
-        }
         const fileAnomalies = [];
         if (await shouldProcessFile(file, fileAnomalies, key)) {
-          totalDiscovered++;
           globalThis.postMessage({
             response: "file",
             fileInfo: {
@@ -37572,30 +37461,33 @@ async function scanDirectory(dir) {
             },
             previousFileInfo: prev
           });
-          if (totalDiscovered % 100 === 0) {
+        } else {
+          if (cheapFilterNameOnly(entry.name, key)) {
+            totalDiscovered--;
             globalThis.postMessage({
               response: "count",
               totalDiscovered
             });
           }
-        } else if (fileAnomalies.length > 0) {
-          globalThis.postMessage({
-            response: "scanAnomalies",
-            fileInfo: {
-              path: prefix,
-              name: entry.name,
-              size: file.size,
-              kind: "handle",
-              fileHandle: entry
-            },
-            anomalies: fileAnomalies,
-            previousFileInfo: prev
-          });
+          if (fileAnomalies.length > 0) {
+            globalThis.postMessage({
+              response: "scanAnomalies",
+              fileInfo: {
+                path: prefix,
+                name: entry.name,
+                size: file.size,
+                kind: "handle",
+                fileHandle: entry
+              },
+              anomalies: fileAnomalies,
+              previousFileInfo: prev
+            });
+          }
         }
         if (!await waitIfPaused())
           return;
       } else if (entry.kind === "directory") {
-        await traverse(
+        await feeder(
           entry,
           prefix + "/" + entry.name
         );
@@ -37603,11 +37495,7 @@ async function scanDirectory(dir) {
     }
   }
   try {
-    await traverse(dir, dir.name);
-    if (fileBuffer.length > 0) {
-      countingMode = false;
-      await drainBuffer();
-    }
+    await Promise.all([counter(dir, dir.name), feeder(dir, dir.name)]);
     globalThis.postMessage({
       response: "count",
       totalDiscovered
@@ -37626,7 +37514,30 @@ async function scanDirectoryNode(dirPath) {
   try {
     const fs = await import("fs/promises");
     const path = await import("path");
-    async function traverse(currentPath, prefix) {
+    async function counter(currentPath, prefix) {
+      const entries = await fs.readdir(currentPath, { withFileTypes: true });
+      entries.sort((a4, b4) => a4.name.localeCompare(b4.name));
+      for (const entry of entries) {
+        if (!keepScanning)
+          return;
+        if (entry.isFile()) {
+          const key = `${prefix}/${entry.name}`;
+          if (cheapFilterNameOnly(entry.name, key)) {
+            totalDiscovered++;
+            globalThis.postMessage({
+              response: "count",
+              totalDiscovered
+            });
+          }
+        } else if (entry.isDirectory()) {
+          await counter(
+            path.join(currentPath, entry.name),
+            prefix + "/" + entry.name
+          );
+        }
+      }
+    }
+    async function feeder(currentPath, prefix) {
       const entries = await fs.readdir(currentPath, { withFileTypes: true });
       entries.sort((a4, b4) => a4.name.localeCompare(b4.name));
       for (const entry of entries) {
@@ -37637,45 +37548,6 @@ async function scanDirectoryNode(dirPath) {
           const stats = await fs.stat(filePath);
           const key = `${prefix}/${entry.name}`;
           const prev = previousIndex ? previousIndex[key] : void 0;
-          if (countingMode) {
-            if (cheapFilter(entry.name, stats.size, key)) {
-              totalDiscovered++;
-              fileBuffer.push({
-                kind: "path",
-                filePath,
-                name: entry.name,
-                size: stats.size,
-                prefix,
-                prev
-              });
-              globalThis.postMessage({
-                response: "count",
-                totalDiscovered
-              });
-            }
-            continue;
-          }
-          if (fileBuffer.length > 0) {
-            await drainBuffer();
-            if (countingMode) {
-              if (cheapFilter(entry.name, stats.size, key)) {
-                totalDiscovered++;
-                fileBuffer.push({
-                  kind: "path",
-                  filePath,
-                  name: entry.name,
-                  size: stats.size,
-                  prefix,
-                  prev
-                });
-                globalThis.postMessage({
-                  response: "count",
-                  totalDiscovered
-                });
-              }
-              continue;
-            }
-          }
           const fileAnomalies = [];
           if (await shouldProcessFileNode(
             filePath,
@@ -37684,7 +37556,6 @@ async function scanDirectoryNode(dirPath) {
             fileAnomalies,
             key
           )) {
-            totalDiscovered++;
             globalThis.postMessage({
               response: "file",
               fileInfo: {
@@ -37696,42 +37567,41 @@ async function scanDirectoryNode(dirPath) {
               },
               previousFileInfo: prev
             });
-            if (totalDiscovered % 100 === 0) {
+          } else {
+            if (cheapFilterNameOnly(entry.name, key)) {
+              totalDiscovered--;
               globalThis.postMessage({
                 response: "count",
                 totalDiscovered
               });
             }
-          } else if (fileAnomalies.length > 0) {
-            globalThis.postMessage({
-              response: "scanAnomalies",
-              fileInfo: {
-                path: prefix,
-                name: entry.name,
-                size: stats.size,
-                kind: "path",
-                fullPath: filePath
-              },
-              anomalies: fileAnomalies,
-              previousFileInfo: prev
-            });
+            if (fileAnomalies.length > 0) {
+              globalThis.postMessage({
+                response: "scanAnomalies",
+                fileInfo: {
+                  path: prefix,
+                  name: entry.name,
+                  size: stats.size,
+                  kind: "path",
+                  fullPath: filePath
+                },
+                anomalies: fileAnomalies,
+                previousFileInfo: prev
+              });
+            }
           }
           if (!await waitIfPaused())
             return;
         } else if (entry.isDirectory()) {
-          await traverse(
+          await feeder(
             path.join(currentPath, entry.name),
             prefix + "/" + entry.name
           );
         }
       }
     }
-    const dirName = await import("path").then((p4) => p4.basename(dirPath));
-    await traverse(dirPath, dirName);
-    if (fileBuffer.length > 0) {
-      countingMode = false;
-      await drainBuffer();
-    }
+    const dirName = path.basename(dirPath);
+    await Promise.all([counter(dirPath, dirName), feeder(dirPath, dirName)]);
     globalThis.postMessage({
       response: "count",
       totalDiscovered