dicom-curate 0.28.0 → 0.29.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,
@@ -80039,9 +80042,9 @@ async function curateOne({
       hashPartSize
     );
     fileArrayBuffer = null;
-    const previousPostMappedHash = previousMappedFileInfo ? previousMappedFileInfo(clonedMapResults.outputFilePath)?.postMappedHash : void 0;
+    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);
@@ -85792,9 +85798,6 @@ function deserializeMappingOptions(serializedMappingOptions) {
   return { ...rest, curationSpec };
 }
 
-// src/types.ts
-var OUTPUT_FILE_PREFIX = "output#";
-
 // src/worker.ts
 var wt = null;
 async function initializeNodeWorker() {
@@ -85848,51 +85851,60 @@ function postErrorResponse(error2, fileInfo) {
     });
   }
 }
-var postMappedFileInfo;
+var pendingLookupResolve = null;
+function lookupMappedFileInfo(outputPath) {
+  return new Promise((resolve) => {
+    pendingLookupResolve = resolve;
+    globalThis.postMessage({
+      response: "lookup",
+      outputPath
+    });
+  });
+}
 fixupNodeWorkerEnvironment().then(() => {
   globalThis.addEventListener(
     "message",
     (event) => {
-      switch (event.data.request) {
-        case "fileInfoIndex": {
-          postMappedFileInfo = event.data.fileInfoIndex;
-          break;
-        }
-        case "apply": {
-          const { serializedMappingOptions } = event.data;
-          const mappingOptions = deserializeMappingOptions(
-            serializedMappingOptions
-          );
-          const fileInfo = event.data.fileInfo;
-          try {
-            curateOne({
-              fileInfo,
-              outputTarget: event.data.outputTarget ?? {},
-              hashMethod: event.data.hashMethod,
-              hashPartSize: event.data.hashPartSize,
-              mappingOptions,
-              previousSourceFileInfo: event.data.previousFileInfo,
-              previousMappedFileInfo: (targetName) => {
-                const hash2 = postMappedFileInfo?.[OUTPUT_FILE_PREFIX + targetName];
-                return hash2;
-              }
-            }).then((mapResults) => {
-              globalThis.postMessage({
-                response: "finished",
-                mapResults
-              });
-            }).catch((error2) => {
-              postErrorResponse(error2, fileInfo);
-            });
-          } catch (error2) {
-            postErrorResponse(error2, fileInfo);
-          }
-          break;
+      if ("response" in event.data && event.data.response === "lookupResult") {
+        const resolve = pendingLookupResolve;
+        pendingLookupResolve = null;
+        if (resolve) {
+          const hash2 = event.data.postMappedHash;
+          resolve(hash2 ? { postMappedHash: hash2 } : void 0);
         }
-        default:
-          console.error(
-            `Unknown request ${event.data.request}`
-          );
+        return;
+      }
+      const data10 = event.data;
+      if (data10.request !== "apply") {
+        console.error(
+          `Unknown request ${data10.request}`
+        );
+        return;
+      }
+      const { serializedMappingOptions } = data10;
+      const mappingOptions = deserializeMappingOptions(
+        serializedMappingOptions
+      );
+      const fileInfo = data10.fileInfo;
+      try {
+        curateOne({
+          fileInfo,
+          outputTarget: data10.outputTarget ?? {},
+          hashMethod: data10.hashMethod,
+          hashPartSize: data10.hashPartSize,
+          mappingOptions,
+          previousSourceFileInfo: data10.previousFileInfo,
+          previousMappedFileInfo: lookupMappedFileInfo
+        }).then((mapResults) => {
+          globalThis.postMessage({
+            response: "finished",
+            mapResults
+          });
+        }).catch((error2) => {
+          postErrorResponse(error2, fileInfo);
+        });
+      } catch (error2) {
+        postErrorResponse(error2, fileInfo);
       }
     }
   );

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,
@@ -73748,9 +73751,9 @@ async function curateOne({
       hashPartSize
     );
     fileArrayBuffer = null;
-    const previousPostMappedHash = previousMappedFileInfo ? previousMappedFileInfo(clonedMapResults.outputFilePath)?.postMappedHash : void 0;
+    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

@@ -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,
@@ -81599,9 +81602,9 @@ async function curateOne({
       hashPartSize
     );
     fileArrayBuffer = null;
-    const previousPostMappedHash = previousMappedFileInfo ? previousMappedFileInfo(clonedMapResults.outputFilePath)?.postMappedHash : void 0;
+    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);
@@ -87465,6 +87471,9 @@ async function getHttpOutputHeaders(outputTarget) {
   return outputTarget;
 }
 
+// src/types.ts
+var OUTPUT_FILE_PREFIX = "output#";
+
 // src/mappingWorkerPool.ts
 var mappingWorkerOptions = {};
 var availableMappingWorkers = [];
@@ -87512,10 +87521,7 @@ async function initializeMappingWorkers(skipCollectingMappings, fileInfoIndex, p
     progressCallback = progressCb;
   const effectiveWorkerCount = workerCount ?? Math.min(await getHardwareConcurrency(), 8);
   const workers = await Promise.all(
-    Array.from(
-      { length: effectiveWorkerCount },
-      () => createMappingWorker(fileInfoIndex)
-    )
+    Array.from({ length: effectiveWorkerCount }, () => createMappingWorker())
   );
   availableMappingWorkers.push(...workers);
 }
@@ -87615,7 +87621,7 @@ function recoverCrashedWorker(mappingWorker, errorMessage) {
   });
   dispatchMappingJobs();
   pendingReplacements += 1;
-  void createMappingWorker(currentFileInfoIndex).then((worker) => {
+  void createMappingWorker().then((worker) => {
     pendingReplacements -= 1;
     availableMappingWorkers.push(worker);
     dispatchMappingJobs();
@@ -87625,7 +87631,7 @@ function recoverCrashedWorker(mappingWorker, errorMessage) {
     dispatchMappingJobs();
   });
 }
-async function createMappingWorker(fileInfoIndex) {
+async function createMappingWorker() {
   const mappingWorker = await createWorker(
     new URL("./applyMappingsWorker.js", import.meta.url),
     { type: "module" }
@@ -87645,18 +87651,16 @@ async function createMappingWorker(fileInfoIndex) {
       }
     });
   }
-  if (fileInfoIndex !== void 0) {
-    const postMappedOnly = Object.fromEntries(
-      Object.entries(fileInfoIndex).filter(
-        ([_key, value]) => !!value.postMappedHash
-      )
-    );
-    mappingWorker.postMessage({
-      request: "fileInfoIndex",
-      fileInfoIndex: postMappedOnly
-    });
-  }
   mappingWorker.addEventListener("message", (event) => {
+    if (event.data.response === "lookup") {
+      const outputPath = event.data.outputPath;
+      const entry = currentFileInfoIndex?.[OUTPUT_FILE_PREFIX + outputPath];
+      mappingWorker.postMessage({
+        response: "lookupResult",
+        postMappedHash: entry?.postMappedHash
+      });
+      return;
+    }
     lastWorkerProgressTime = Date.now();
     workerCurrentFile.delete(mappingWorker);
     switch (event.data.response) {
@@ -87715,9 +87719,6 @@ function getLastWorkerProgressTime() {
   return lastWorkerProgressTime;
 }
 
-// src/types.ts
-var OUTPUT_FILE_PREFIX = "output#";
-
 // src/index.ts
 function requiresDateOffset(deIdOpts) {
   return deIdOpts !== "Off" && deIdOpts.retainLongitudinalTemporalInformationOptions === "Offset";

package/dist/esm/mappingWorkerPool.js

@@ -12043,6 +12043,9 @@ function dataURLToBlobURL(dataURL) {
   return URL.createObjectURL(blob);
 }
 
+// src/types.ts
+var OUTPUT_FILE_PREFIX = "output#";
+
 // src/mappingWorkerPool.ts
 var mappingWorkerOptions = {};
 var availableMappingWorkers = [];
@@ -12090,10 +12093,7 @@ async function initializeMappingWorkers(skipCollectingMappings, fileInfoIndex, p
     progressCallback = progressCb;
   const effectiveWorkerCount = workerCount ?? Math.min(await getHardwareConcurrency(), 8);
   const workers = await Promise.all(
-    Array.from(
-      { length: effectiveWorkerCount },
-      () => createMappingWorker(fileInfoIndex)
-    )
+    Array.from({ length: effectiveWorkerCount }, () => createMappingWorker())
   );
   availableMappingWorkers.push(...workers);
 }
@@ -12193,7 +12193,7 @@ function recoverCrashedWorker(mappingWorker, errorMessage) {
   });
   dispatchMappingJobs();
   pendingReplacements += 1;
-  void createMappingWorker(currentFileInfoIndex).then((worker) => {
+  void createMappingWorker().then((worker) => {
     pendingReplacements -= 1;
     availableMappingWorkers.push(worker);
     dispatchMappingJobs();
@@ -12203,7 +12203,7 @@ function recoverCrashedWorker(mappingWorker, errorMessage) {
     dispatchMappingJobs();
   });
 }
-async function createMappingWorker(fileInfoIndex) {
+async function createMappingWorker() {
   const mappingWorker = await createWorker(
     new URL("./applyMappingsWorker.js", import.meta.url),
     { type: "module" }
@@ -12223,18 +12223,16 @@ async function createMappingWorker(fileInfoIndex) {
       }
     });
   }
-  if (fileInfoIndex !== void 0) {
-    const postMappedOnly = Object.fromEntries(
-      Object.entries(fileInfoIndex).filter(
-        ([_key, value]) => !!value.postMappedHash
-      )
-    );
-    mappingWorker.postMessage({
-      request: "fileInfoIndex",
-      fileInfoIndex: postMappedOnly
-    });
-  }
   mappingWorker.addEventListener("message", (event) => {
+    if (event.data.response === "lookup") {
+      const outputPath = event.data.outputPath;
+      const entry = currentFileInfoIndex?.[OUTPUT_FILE_PREFIX + outputPath];
+      mappingWorker.postMessage({
+        response: "lookupResult",
+        postMappedHash: entry?.postMappedHash
+      });
+      return;
+    }
     lastWorkerProgressTime = Date.now();
     workerCurrentFile.delete(mappingWorker);
     switch (event.data.response) {

package/dist/types/applyMappingsWorker.d.ts

@@ -1,4 +1,4 @@
-import { type TFileInfo, type TFileInfoIndex, type THashMethod, type TOutputTarget, type TSerializedMappingOptions } from './types';
+import { type TFileInfo, type THashMethod, type TOutputTarget, type TSerializedMappingOptions } from './types';
 export type MappingRequest = {
     request: 'apply';
     fileInfo: TFileInfo;
@@ -11,7 +11,9 @@ export type MappingRequest = {
     hashMethod?: THashMethod;
     hashPartSize?: number;
     serializedMappingOptions: TSerializedMappingOptions;
-} | {
-    request: 'fileInfoIndex';
-    fileInfoIndex?: TFileInfoIndex;
+};
+/** Response sent back from the main thread for a fileInfoIndex lookup. */
+export type LookupResponse = {
+    response: 'lookupResult';
+    postMappedHash?: string;
 };

package/dist/types/curateOne.d.ts

@@ -10,9 +10,9 @@ export type TCurateOneArgs = {
         mtime?: string;
         preMappedHash?: string;
     };
-    previousMappedFileInfo?: (mappedFileName: string) => {
+    previousMappedFileInfo?: (mappedFileName: string) => Promise<{
         postMappedHash?: string;
-    } | undefined;
+    } | undefined>;
 };
 export declare function curateOne({ fileInfo, outputTarget, mappingOptions, hashMethod, hashPartSize, previousSourceFileInfo, previousMappedFileInfo, }: TCurateOneArgs): Promise<Omit<Partial<TMapResults>, 'anomalies'> & {
     anomalies: TMapResults['anomalies'];

package/dist/types/types.d.ts

@@ -141,6 +141,7 @@ export type TMapResults = {
     outputUpload?: {
         url: string;
         status: number;
+        etag?: string;
     };
     mappingRequired?: boolean;
     curationTime?: number;