Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cod-dicomweb-server",
"title": "COD Dicomweb server",
"version": "1.3.14",
"version": "1.3.15",
"private": false,
"description": "A wadors server proxy that get data from a Cloud Optimized Dicom format.",
"main": "dist/umd/main.js",
Expand Down
22 changes: 17 additions & 5 deletions src/classes/CodDicomWebServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import type {
import { getDataRetrievalManager } from '../dataRetrieval/dataRetrievalManager';
import { CustomError, CustomMessageEvent } from './customClasses';
import { CustomErrorEvent } from './customClasses';
import { download, getDirectoryHandle } from '../fileAccessSystemUtils';
import { createStreamingFileName, download, getDirectoryHandle, readFile } from '../fileAccessSystemUtils';

class CodDicomWebServer {
private filePromises: Record<string, { promise: Promise<void>; requestCount: number }> = {};
Expand Down Expand Up @@ -358,7 +358,7 @@ class CodDicomWebServer {
const completeRequest = (url: string) => {
requestResolved = true;
this.filePromises[url]?.requestCount && this.filePromises[url].requestCount--;

if (fileFetchingCompleted && this.filePromises[url] && !this.filePromises[url]?.requestCount) {
dataRetrievalManager.removeEventListener(FILE_STREAMING_WORKER_NAME, 'message', handleChunkAppend);
delete this.filePromises[url];
Expand Down Expand Up @@ -402,14 +402,26 @@ class CodDicomWebServer {
});
}

public downloadSeriesFile(seriesInstanceUID: string): boolean {
public async downloadSeriesFile(seriesInstanceUID: string): Promise<boolean> {
const seriesFileURL = Array.from(this.seriesUidFileUrls[seriesInstanceUID]).find(
({ url, type }) => type === Enums.URLType.FILE && url.endsWith('.tar')
)?.url;

if (seriesFileURL) {
const seriesArrayBuffer = this.fileManager.get(seriesFileURL);
return download(seriesFileURL.split('/').at(-1), seriesArrayBuffer);
let seriesArrayBuffer = this.fileManager.get(seriesFileURL);

if (!seriesArrayBuffer?.byteLength) {
const directoryHandle = await getDirectoryHandle();
const fileSystemFile = (await readFile(directoryHandle, createStreamingFileName(seriesFileURL))) as ArrayBuffer;

if (fileSystemFile?.byteLength) {
return false;
}

seriesArrayBuffer = new Uint8Array(fileSystemFile);
}

return download(seriesFileURL.split('/').at(-1), seriesArrayBuffer.buffer);
}
return false;
}
Expand Down