@knopkem/dicomview 0.2.0 → 0.2.2

package/dist/loader.js

@@ -50,7 +50,12 @@ export class DICOMwebLoader {
                 };
             requestFrame(() => {
                 renderScheduled = false;
-                viewer.render();
+                try {
+                    viewer.render();
+                }
+                catch {
+                    // Viewer may have been destroyed between scheduling and callback
+                }
             });
         };
         try {
@@ -85,7 +90,12 @@ export class DICOMwebLoader {
                 }
             });
             await Promise.all(workers);
-            viewer.render();
+            try {
+                viewer.render();
+            }
+            catch {
+                // Viewer may have been destroyed during load
+            }
         }
         finally {
             pool?.destroy();
@@ -99,7 +109,12 @@ export class DICOMwebLoader {
         return response.json();
     }
     async #fetchBytes(url, signal) {
-        const response = await this.#fetch(url, signal, "application/dicom; transfer-syntax=*");
+        const response = await this.#fetch(url, signal, 'multipart/related; type="application/dicom"');
+        const contentType = response.headers.get("Content-Type") ?? "";
+        if (contentType.includes("multipart/related")) {
+            return extractMultipartDicom(new Uint8Array(await response.arrayBuffer()), contentType);
+        }
+        // Fallback: server returned a single-part DICOM response
         return new Uint8Array(await response.arrayBuffer());
     }
     async #fetch(url, signal, accept) {
@@ -343,3 +358,46 @@ function normalize(vector) {
     }
     return [vector[0] / length, vector[1] / length, vector[2] / length];
 }
+/**
+ * Extract the DICOM file bytes from a WADO-RS multipart/related response.
+ *
+ * The response body contains one or more parts separated by a MIME boundary.
+ * We extract the first part (single-instance retrieval returns exactly one).
+ */
+function extractMultipartDicom(body, contentType) {
+    const boundaryMatch = contentType.match(/boundary=([^\s;]+)/);
+    if (!boundaryMatch) {
+        // No boundary found — assume the body is the raw DICOM bytes
+        return body;
+    }
+    const boundary = boundaryMatch[1].replace(/^"(.*)"$/, "$1");
+    const boundaryBytes = new TextEncoder().encode("--" + boundary);
+    // Find the first boundary
+    const firstBoundary = indexOfBytes(body, boundaryBytes, 0);
+    if (firstBoundary === -1) {
+        return body;
+    }
+    // After the boundary line, skip until we find \r\n\r\n (end of part headers)
+    const headerStart = firstBoundary + boundaryBytes.length;
+    const headerEnd = indexOfBytes(body, new Uint8Array([0x0d, 0x0a, 0x0d, 0x0a]), headerStart);
+    if (headerEnd === -1) {
+        return body;
+    }
+    const partStart = headerEnd + 4;
+    // Find the next boundary (or end boundary) — the part data ends 2 bytes before it (\r\n)
+    const nextBoundary = indexOfBytes(body, boundaryBytes, partStart);
+    const partEnd = nextBoundary === -1 ? body.length : nextBoundary - 2;
+    return body.subarray(partStart, partEnd);
+}
+function indexOfBytes(haystack, needle, offset) {
+    const end = haystack.length - needle.length;
+    outer: for (let i = offset; i <= end; i++) {
+        for (let j = 0; j < needle.length; j++) {
+            if (haystack[i + j] !== needle[j]) {
+                continue outer;
+            }
+        }
+        return i;
+    }
+    return -1;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knopkem/dicomview",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Rust/WASM medical imaging primitives for the web",
   "type": "module",
   "sideEffects": false,

package/wasm/dicomview_wasm.js

@@ -1379,7 +1379,7 @@ function __wbg_get_imports() {
             return ret;
         },
         __wbindgen_cast_0000000000000002: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 695, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
+            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 697, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
             const ret = makeMutClosure(arg0, arg1, wasm_bindgen__convert__closures_____invoke__h77f088fde8c66f5c);
             return ret;
         },