cod-dicomweb-server 1.3.16 → 1.3.18

package/dist/esm/metadataManager.js

@@ -1,10 +1,27 @@
+import { ZSTDDecoder } from 'zstddec';
 import { CustomError } from './classes/customClasses';
 import { createMetadataJsonUrl } from './classes/utils';
+import { medatata } from './constants';
 import { createMetadataFileName, getDirectoryHandle, readFile, writeFile } from './fileAccessSystemUtils';
 class MetadataManager {
     metadataPromises = {};
-    constructor() { }
-    addDeidMetadata(jsonMetadata, url) {
+    decoder;
+    decoderInitPromise;
+    constructor() {
+        this.decoder = null;
+        const decoder = new ZSTDDecoder();
+        this.decoderInitPromise = decoder
+            .init()
+            .then(() => {
+            this.decoder = decoder;
+            return true;
+        })
+            .catch((error) => {
+            console.error('Failed to initialize ZSTD WASM module:', error);
+            return false;
+        });
+    }
+    async addDeidMetadata(jsonMetadata, url) {
         const { cod } = jsonMetadata;
         const [studyUID, _, seriesUID] = url.match(/studies\/(.*?)\/metadata/)?.[1].split('/') || [];
         if (!cod || !studyUID || !seriesUID) {
@@ -13,9 +30,18 @@ class MetadataManager {
         }
         for (const sopUID in cod.instances) {
             const instance = cod.instances[sopUID];
-            instance.metadata.DeidStudyInstanceUID = { Value: [studyUID] };
-            instance.metadata.DeidSeriesInstanceUID = { Value: [seriesUID] };
-            instance.metadata.DeidSopInstanceUID = { Value: [sopUID] };
+            // For V2, convert the metadata to InstanceMetadata format.
+            if (instance.version === medatata.METADATA_VERSION.V2 && typeof instance.metadata === 'string') {
+                const parsedMetadata = await this.decodeDecompressAndParse(instance.metadata);
+                if (!parsedMetadata) {
+                    throw new Error('Failed to decode, decompress, or parse JSON');
+                }
+                instance.metadata = parsedMetadata;
+            }
+            const instanceMetadata = instance.metadata;
+            instanceMetadata.DeidStudyInstanceUID = { Value: [studyUID] };
+            instanceMetadata.DeidSeriesInstanceUID = { Value: [seriesUID] };
+            instanceMetadata.DeidSopInstanceUID = { Value: [sopUID] };
         }
     }
     getMetadataFromCache(url) {
@@ -44,9 +70,10 @@ class MetadataManager {
                 }
                 return response.json();
             })
-                .then((data) => {
-                this.addDeidMetadata(data, url);
-                return writeFile(directoryHandle, fileName, data, true).then(() => data);
+                .then(async (data) => {
+                await this.addDeidMetadata(data, url);
+                await writeFile(directoryHandle, fileName, data, true);
+                return data;
             });
             return await this.metadataPromises[url];
         }
@@ -55,5 +82,23 @@ class MetadataManager {
             throw error;
         }
     }
+    async decodeDecompressAndParse(base64String) {
+        if (!base64String) {
+            return null;
+        }
+        try {
+            if (!(await this.decoderInitPromise)) {
+                throw new Error('WASM Decoder is not initialized. Cannot decompress data.');
+            }
+            const compressedBytes = Uint8Array.from(atob(base64String), (c) => c.charCodeAt(0));
+            const decompressedBytes = this.decoder.decode(compressedBytes);
+            const jsonString = new TextDecoder().decode(decompressedBytes);
+            return JSON.parse(jsonString);
+        }
+        catch (error) {
+            console.error('Failed to decode, decompress, or parse JSON:', error);
+            return null;
+        }
+    }
 }
 export default MetadataManager;

package/dist/esm/types/metadata.d.ts

@@ -6,7 +6,7 @@ type JsonMetadata = {
     deid_series_uid: string;
     cod: {
         instances: Record<string, {
-            metadata: InstanceMetadata;
+            metadata: InstanceMetadata | string;
             uri: string;
             url: string;
             headers: {

package/dist/umd/563.js

@@ -1,6 +1,6 @@
 /*!
  * 
- * cod-dicomweb-server v1.3.16
+ * cod-dicomweb-server v1.3.18
  * git+https://github.com/gradienthealth/cod-dicomweb-server.git
  *
  *   Copyright (c) Adithyan Dinesh and project contributors.

package/dist/umd/846.js

@@ -1,6 +1,6 @@
 /*!
  * 
- * cod-dicomweb-server v1.3.16
+ * cod-dicomweb-server v1.3.18
  * git+https://github.com/gradienthealth/cod-dicomweb-server.git
  *
  *   Copyright (c) Adithyan Dinesh and project contributors.