dicom-curate 0.28.1 → 0.30.0

package/dist/esm/applyMappingsWorker.js

@@ -79926,7 +79926,7 @@ async function curateOne({
       canSkip = previousSourceFileInfo.size === fileInfo.size && previousSourceFileInfo.mtime === mtime;
     }
   }
-  const noMapResult = (outputFilePath) => {
+  const noMapResult = (outputFilePath, knownPostMappedHash) => {
     const retval = {
       sourceInstanceUID: `unchanged_${fileInfo.name.replace(/[^a-zA-Z0-9]/g, "_")}`,
       mappings: {},
@@ -79939,7 +79939,10 @@ async function curateOne({
         size: fileInfo.size,
         path: fileInfo.path,
         mtime: previousSourceFileInfo?.mtime,
-        preMappedHash
+        preMappedHash,
+        ...knownPostMappedHash !== void 0 && {
+          postMappedHash: knownPostMappedHash
+        }
       },
       // include curationTime even when skipped to measure hashing/check time
       curationTime: performance.now() - startTime,
@@ -80041,7 +80044,7 @@ async function curateOne({
     fileArrayBuffer = null;
     const previousPostMappedHash = previousMappedFileInfo ? (await previousMappedFileInfo(clonedMapResults.outputFilePath))?.postMappedHash : void 0;
     if (previousPostMappedHash !== void 0 && previousPostMappedHash === postMappedHash) {
-      return noMapResult(clonedMapResults.outputFilePath);
+      return noMapResult(clonedMapResults.outputFilePath, postMappedHash);
     }
     if (typeof outputTarget?.directory === "object" && "getFileHandle" in outputTarget.directory) {
       const subDirectoryHandle = await createNestedDirectories(
@@ -80109,9 +80112,11 @@ async function curateOne({
             `Upload failed: ${resp.status} ${resp.statusText}`
           );
         } else {
+          const etag = resp.headers.get("etag") ?? void 0;
           clonedMapResults.outputUpload = clonedMapResults.outputUpload ?? {
             url: uploadUrl,
-            status: resp.status
+            status: resp.status,
+            etag
           };
         }
       } catch (e4) {
@@ -80132,7 +80137,7 @@ async function curateOne({
       try {
         const prefix = outputTarget.s3.prefix ? outputTarget.s3.prefix.endsWith("/") ? outputTarget.s3.prefix : outputTarget.s3.prefix + "/" : "";
         const key = prefix + clonedMapResults.outputFilePath;
-        await client.send(
+        const putResponse = await client.send(
           new s32.PutObjectCommand({
             Bucket: outputTarget.s3.bucketName,
             Key: key,
@@ -80151,7 +80156,8 @@ async function curateOne({
         const uploadUrl = `s3://${outputTarget.s3.bucketName}/${key}`;
         clonedMapResults.outputUpload = {
           url: uploadUrl,
-          status: 200
+          status: 200,
+          etag: putResponse.ETag ?? void 0
         };
       } catch (e4) {
         console.error("S3 Upload error", e4);

package/dist/esm/curateOne.js

@@ -73635,7 +73635,7 @@ async function curateOne({
       canSkip = previousSourceFileInfo.size === fileInfo.size && previousSourceFileInfo.mtime === mtime;
     }
   }
-  const noMapResult = (outputFilePath) => {
+  const noMapResult = (outputFilePath, knownPostMappedHash) => {
     const retval = {
       sourceInstanceUID: `unchanged_${fileInfo.name.replace(/[^a-zA-Z0-9]/g, "_")}`,
       mappings: {},
@@ -73648,7 +73648,10 @@ async function curateOne({
         size: fileInfo.size,
         path: fileInfo.path,
         mtime: previousSourceFileInfo?.mtime,
-        preMappedHash
+        preMappedHash,
+        ...knownPostMappedHash !== void 0 && {
+          postMappedHash: knownPostMappedHash
+        }
       },
       // include curationTime even when skipped to measure hashing/check time
       curationTime: performance.now() - startTime,
@@ -73750,7 +73753,7 @@ async function curateOne({
     fileArrayBuffer = null;
     const previousPostMappedHash = previousMappedFileInfo ? (await previousMappedFileInfo(clonedMapResults.outputFilePath))?.postMappedHash : void 0;
     if (previousPostMappedHash !== void 0 && previousPostMappedHash === postMappedHash) {
-      return noMapResult(clonedMapResults.outputFilePath);
+      return noMapResult(clonedMapResults.outputFilePath, postMappedHash);
     }
     if (typeof outputTarget?.directory === "object" && "getFileHandle" in outputTarget.directory) {
       const subDirectoryHandle = await createNestedDirectories(
@@ -73818,9 +73821,11 @@ async function curateOne({
             `Upload failed: ${resp.status} ${resp.statusText}`
           );
         } else {
+          const etag = resp.headers.get("etag") ?? void 0;
           clonedMapResults.outputUpload = clonedMapResults.outputUpload ?? {
             url: uploadUrl,
-            status: resp.status
+            status: resp.status,
+            etag
           };
         }
       } catch (e4) {
@@ -73841,7 +73846,7 @@ async function curateOne({
       try {
         const prefix = outputTarget.s3.prefix ? outputTarget.s3.prefix.endsWith("/") ? outputTarget.s3.prefix : outputTarget.s3.prefix + "/" : "";
         const key = prefix + clonedMapResults.outputFilePath;
-        await client.send(
+        const putResponse = await client.send(
           new s32.PutObjectCommand({
             Bucket: outputTarget.s3.bucketName,
             Key: key,
@@ -73860,7 +73865,8 @@ async function curateOne({
         const uploadUrl = `s3://${outputTarget.s3.bucketName}/${key}`;
         clonedMapResults.outputUpload = {
           url: uploadUrl,
-          status: 200
+          status: 200,
+          etag: putResponse.ETag ?? void 0
         };
       } catch (e4) {
         console.error("S3 Upload error", e4);

package/dist/esm/index.js

@@ -48613,14 +48613,14 @@ var require_dist_cjs70 = __commonJS({
       const exitConditions = [runPolling(params, input, acceptorChecks)];
       const finalize = [];
       if (options.abortSignal) {
-        const { aborted, clearListener } = abortTimeout(options.abortSignal);
+        const { aborted: aborted2, clearListener } = abortTimeout(options.abortSignal);
         finalize.push(clearListener);
-        exitConditions.push(aborted);
+        exitConditions.push(aborted2);
       }
       if (options.abortController?.signal) {
-        const { aborted, clearListener } = abortTimeout(options.abortController.signal);
+        const { aborted: aborted2, clearListener } = abortTimeout(options.abortController.signal);
         finalize.push(clearListener);
-        exitConditions.push(aborted);
+        exitConditions.push(aborted2);
       }
       return Promise.race(exitConditions).then((result) => {
         for (const fn of finalize) {
@@ -81486,7 +81486,7 @@ async function curateOne({
       canSkip = previousSourceFileInfo.size === fileInfo.size && previousSourceFileInfo.mtime === mtime;
     }
   }
-  const noMapResult = (outputFilePath) => {
+  const noMapResult = (outputFilePath, knownPostMappedHash) => {
     const retval = {
       sourceInstanceUID: `unchanged_${fileInfo.name.replace(/[^a-zA-Z0-9]/g, "_")}`,
       mappings: {},
@@ -81499,7 +81499,10 @@ async function curateOne({
         size: fileInfo.size,
         path: fileInfo.path,
         mtime: previousSourceFileInfo?.mtime,
-        preMappedHash
+        preMappedHash,
+        ...knownPostMappedHash !== void 0 && {
+          postMappedHash: knownPostMappedHash
+        }
       },
       // include curationTime even when skipped to measure hashing/check time
       curationTime: performance.now() - startTime,
@@ -81601,7 +81604,7 @@ async function curateOne({
     fileArrayBuffer = null;
     const previousPostMappedHash = previousMappedFileInfo ? (await previousMappedFileInfo(clonedMapResults.outputFilePath))?.postMappedHash : void 0;
     if (previousPostMappedHash !== void 0 && previousPostMappedHash === postMappedHash) {
-      return noMapResult(clonedMapResults.outputFilePath);
+      return noMapResult(clonedMapResults.outputFilePath, postMappedHash);
     }
     if (typeof outputTarget?.directory === "object" && "getFileHandle" in outputTarget.directory) {
       const subDirectoryHandle = await createNestedDirectories(
@@ -81669,9 +81672,11 @@ async function curateOne({
             `Upload failed: ${resp.status} ${resp.statusText}`
           );
         } else {
+          const etag = resp.headers.get("etag") ?? void 0;
           clonedMapResults.outputUpload = clonedMapResults.outputUpload ?? {
             url: uploadUrl,
-            status: resp.status
+            status: resp.status,
+            etag
           };
         }
       } catch (e4) {
@@ -81692,7 +81697,7 @@ async function curateOne({
       try {
         const prefix = outputTarget.s3.prefix ? outputTarget.s3.prefix.endsWith("/") ? outputTarget.s3.prefix : outputTarget.s3.prefix + "/" : "";
         const key = prefix + clonedMapResults.outputFilePath;
-        await client.send(
+        const putResponse = await client.send(
           new s32.PutObjectCommand({
             Bucket: outputTarget.s3.bucketName,
             Key: key,
@@ -81711,7 +81716,8 @@ async function curateOne({
         const uploadUrl = `s3://${outputTarget.s3.bucketName}/${key}`;
         clonedMapResults.outputUpload = {
           url: uploadUrl,
-          status: 200
+          status: 200,
+          etag: putResponse.ETag ?? void 0
         };
       } catch (e4) {
         console.error("S3 Upload error", e4);
@@ -87477,6 +87483,7 @@ var filesMapped = 0;
 var workerCurrentFile = /* @__PURE__ */ new Map();
 var lastWorkerProgressTime = 0;
 var pendingReplacements = 0;
+var aborted = false;
 var currentFileInfoIndex;
 var filesToProcess = [];
 var directoryScanFinished = false;
@@ -87499,12 +87506,32 @@ function setScanResumeCallback(cb) {
 function markScanPaused() {
   scanPaused = true;
 }
+function terminateAllWorkers() {
+  aborted = true;
+  while (availableMappingWorkers.length) {
+    availableMappingWorkers.pop().terminate();
+  }
+  for (const [worker] of workerCurrentFile) {
+    try {
+      worker.terminate();
+    } catch {
+    }
+  }
+  workerCurrentFile.clear();
+  filesToProcess.length = 0;
+  workersActive = 0;
+  pendingReplacements = 0;
+  directoryScanFinished = false;
+  scanPaused = false;
+  scanResumeCallback = null;
+}
 async function initializeMappingWorkers(skipCollectingMappings, fileInfoIndex, progressCb, workerCount) {
   mappingWorkerOptions = {};
   workersActive = 0;
   mapResultsList = skipCollectingMappings ? void 0 : [];
   filesMapped = 0;
   pendingReplacements = 0;
+  aborted = false;
   workerCurrentFile.clear();
   lastWorkerProgressTime = Date.now();
   currentFileInfoIndex = fileInfoIndex;
@@ -87520,6 +87547,8 @@ async function initializeMappingWorkers(skipCollectingMappings, fileInfoIndex, p
   availableMappingWorkers.push(...workers);
 }
 async function dispatchMappingJobs() {
+  if (aborted)
+    return;
   while (filesToProcess.length > 0 && availableMappingWorkers.length > 0) {
     const { fileInfo, previousFileInfo } = filesToProcess.pop();
     const mappingWorker = availableMappingWorkers.pop();
@@ -87582,6 +87611,8 @@ async function getHardwareConcurrency() {
   return cpus().length;
 }
 function recoverCrashedWorker(mappingWorker, errorMessage) {
+  if (aborted)
+    return;
   if (!workerCurrentFile.has(mappingWorker)) {
     return;
   }
@@ -87617,6 +87648,10 @@ function recoverCrashedWorker(mappingWorker, errorMessage) {
   pendingReplacements += 1;
   void createMappingWorker().then((worker) => {
     pendingReplacements -= 1;
+    if (aborted) {
+      worker.terminate();
+      return;
+    }
     availableMappingWorkers.push(worker);
     dispatchMappingJobs();
   }).catch((error2) => {
@@ -87646,6 +87681,8 @@ async function createMappingWorker() {
     });
   }
   mappingWorker.addEventListener("message", (event) => {
+    if (aborted)
+      return;
     if (event.data.response === "lookup") {
       const outputPath = event.data.outputPath;
       const entry = currentFileInfoIndex?.[OUTPUT_FILE_PREFIX + outputPath];
@@ -87864,7 +87901,14 @@ function queueUrlsForMapping(organizeOptions) {
   setDirectoryScanFinished(true);
 }
 async function curateMany(organizeOptions, onProgress) {
+  if (organizeOptions.signal?.aborted) {
+    return Promise.reject(
+      new DOMException("The operation was aborted.", "AbortError")
+    );
+  }
   return new Promise(async (resolve, reject) => {
+    let settled = false;
+    const signal = organizeOptions.signal;
     const STALL_TIMEOUT_MS = 10 * 60 * 1e3;
     const stallWatchdog = setInterval(() => {
       if (getWorkersActive() > 0 && Date.now() - getLastWorkerProgressTime() > STALL_TIMEOUT_MS) {
@@ -87883,15 +87927,42 @@ async function curateMany(organizeOptions, onProgress) {
     }, 6e4);
     const progressCallback2 = (msg) => {
       onProgress?.(msg);
-      if (msg.response === "done") {
+      if (msg.response === "done" && !settled) {
+        settled = true;
         clearInterval(stallWatchdog);
+        signal?.removeEventListener("abort", onAbort);
         resolve(msg);
       }
     };
     const rejectCallback = (reason) => {
+      if (settled)
+        return;
+      settled = true;
       clearInterval(stallWatchdog);
+      signal?.removeEventListener("abort", onAbort);
       reject(reason);
     };
+    let fileListWorker;
+    const onAbort = () => {
+      try {
+        fileListWorker?.terminate();
+      } catch {
+      }
+      terminateAllWorkers();
+      rejectCallback(
+        new DOMException("The operation was aborted.", "AbortError")
+      );
+    };
+    if (signal) {
+      if (signal.aborted) {
+        clearInterval(stallWatchdog);
+        rejectCallback(
+          new DOMException("The operation was aborted.", "AbortError")
+        );
+        return;
+      }
+      signal.addEventListener("abort", onAbort, { once: true });
+    }
     try {
       await initializeMappingWorkers(
         organizeOptions.skipCollectingMappings,
@@ -87903,7 +87974,7 @@ async function curateMany(organizeOptions, onProgress) {
         await collectMappingOptions(organizeOptions)
       );
       if (organizeOptions.inputType === "directory" || organizeOptions.inputType === "path" || organizeOptions.inputType === "s3") {
-        const fileListWorker = await initializeFileListWorker(rejectCallback);
+        fileListWorker = await initializeFileListWorker(rejectCallback);
         setScanResumeCallback(() => {
           fileListWorker.postMessage({ request: "resume" });
         });
@@ -87960,7 +88031,7 @@ async function curateMany(organizeOptions, onProgress) {
       }
       dispatchMappingJobs();
     } catch (error2) {
-      reject(error2);
+      rejectCallback(error2);
     }
   });
 }

package/dist/esm/mappingWorkerPool.js

@@ -12055,6 +12055,7 @@ var filesMapped = 0;
 var workerCurrentFile = /* @__PURE__ */ new Map();
 var lastWorkerProgressTime = 0;
 var pendingReplacements = 0;
+var aborted = false;
 var currentFileInfoIndex;
 var filesToProcess = [];
 var directoryScanFinished = false;
@@ -12077,12 +12078,35 @@ function setScanResumeCallback(cb) {
 function markScanPaused() {
   scanPaused = true;
 }
+function terminateAllWorkers() {
+  aborted = true;
+  while (availableMappingWorkers.length) {
+    availableMappingWorkers.pop().terminate();
+  }
+  for (const [worker] of workerCurrentFile) {
+    try {
+      worker.terminate();
+    } catch {
+    }
+  }
+  workerCurrentFile.clear();
+  filesToProcess.length = 0;
+  workersActive = 0;
+  pendingReplacements = 0;
+  directoryScanFinished = false;
+  scanPaused = false;
+  scanResumeCallback = null;
+}
+function isAborted() {
+  return aborted;
+}
 async function initializeMappingWorkers(skipCollectingMappings, fileInfoIndex, progressCb, workerCount) {
   mappingWorkerOptions = {};
   workersActive = 0;
   mapResultsList = skipCollectingMappings ? void 0 : [];
   filesMapped = 0;
   pendingReplacements = 0;
+  aborted = false;
   workerCurrentFile.clear();
   lastWorkerProgressTime = Date.now();
   currentFileInfoIndex = fileInfoIndex;
@@ -12098,6 +12122,8 @@ async function initializeMappingWorkers(skipCollectingMappings, fileInfoIndex, p
   availableMappingWorkers.push(...workers);
 }
 async function dispatchMappingJobs() {
+  if (aborted)
+    return;
   while (filesToProcess.length > 0 && availableMappingWorkers.length > 0) {
     const { fileInfo, previousFileInfo } = filesToProcess.pop();
     const mappingWorker = availableMappingWorkers.pop();
@@ -12160,6 +12186,8 @@ async function getHardwareConcurrency() {
   return cpus().length;
 }
 function recoverCrashedWorker(mappingWorker, errorMessage) {
+  if (aborted)
+    return;
   if (!workerCurrentFile.has(mappingWorker)) {
     return;
   }
@@ -12195,6 +12223,10 @@ function recoverCrashedWorker(mappingWorker, errorMessage) {
   pendingReplacements += 1;
   void createMappingWorker().then((worker) => {
     pendingReplacements -= 1;
+    if (aborted) {
+      worker.terminate();
+      return;
+    }
     availableMappingWorkers.push(worker);
     dispatchMappingJobs();
   }).catch((error) => {
@@ -12224,6 +12256,8 @@ async function createMappingWorker() {
     });
   }
   mappingWorker.addEventListener("message", (event) => {
+    if (aborted)
+      return;
     if (event.data.response === "lookup") {
       const outputPath = event.data.outputPath;
       const entry = currentFileInfoIndex?.[OUTPUT_FILE_PREFIX + outputPath];
@@ -12299,9 +12333,11 @@ export {
   getWorkerCurrentFile,
   getWorkersActive,
   initializeMappingWorkers,
+  isAborted,
   markScanPaused,
   scanAnomalies,
   setDirectoryScanFinished,
   setMappingWorkerOptions,
-  setScanResumeCallback
+  setScanResumeCallback,
+  terminateAllWorkers
 };

package/dist/types/mappingWorkerPool.d.ts

@@ -39,6 +39,18 @@ export declare function setScanResumeCallback(cb: (() => void) | null): void;
  * index.ts when the queue exceeds the high-water mark.
  */
 export declare function markScanPaused(): void;
+/**
+ * Hard-terminate all workers (idle and active) and reset pool state.
+ * Called when curateMany is aborted via AbortSignal. Equivalent to a
+ * tab reload — partially written files are handled by hash checks on
+ * the next run.
+ */
+export declare function terminateAllWorkers(): void;
+/**
+ * Whether the current run has been aborted. Used by worker message handlers
+ * to bail out on messages arriving after teardown.
+ */
+export declare function isAborted(): boolean;
 /**
  * Initialize the mapping worker pool. Call once per curateMany invocation.
  */

package/dist/types/types.d.ts

@@ -33,6 +33,7 @@ export type OrganizeOptions = {
     fileInfoIndex?: TFileInfoIndex;
     excludedPathGlobs?: string[];
     workerCount?: number;
+    signal?: AbortSignal;
 } & ({
     inputType: 'directory';
     inputDirectory: FileSystemDirectoryHandle;
@@ -141,6 +142,7 @@ export type TMapResults = {
     outputUpload?: {
         url: string;
         status: number;
+        etag?: string;
     };
     mappingRequired?: boolean;
     curationTime?: number;