@inweb/client 25.3.17 → 25.3.18

package/dist/client.module.js

@@ -75,254 +75,38 @@ class Model {
     downloadResource(dataId, onProgress, signal) {
         return this._file.downloadResource(dataId, onProgress, signal);
     }
-    partialDownloadResource(dataId, onProgress, signal) {
-        return this._file.partialDownloadResource(dataId, onProgress, signal);
-    }
-    downloadFileRange(requestId, records, dataId, onProgress, signal) {
-        return this._file.downloadFileRange(requestId, records, dataId, onProgress, signal);
-    }
-    getReferences(signal) {
-        return this._file.getReferences(signal);
-    }
-}
-
-const STATUS_CODES = {
-    100: "Continue",
-    101: "Switching Protocols",
-    102: "Processing",
-    103: "Early Hints",
-    200: "OK",
-    201: "Created",
-    202: "Accepted",
-    203: "Non-Authoritative Information",
-    204: "No Content",
-    205: "Reset Content",
-    206: "Partial Content",
-    207: "Multi-Status",
-    208: "Already Reported",
-    226: "IM Used",
-    300: "Multiple Choices",
-    301: "Moved Permanently",
-    302: "Found",
-    303: "See Other",
-    304: "Not Modified",
-    305: "Use Proxy",
-    307: "Temporary Redirect",
-    308: "Permanent Redirect",
-    400: "Bad Request",
-    401: "Unauthorized",
-    402: "Payment Required",
-    403: "Forbidden",
-    404: "Not Found",
-    405: "Method Not Allowed",
-    406: "Not Acceptable",
-    407: "Proxy Authentication Required",
-    408: "Request Time-out",
-    409: "Conflict",
-    410: "Gone",
-    411: "Length Required",
-    412: "Precondition Failed",
-    413: "Payload Too Large",
-    414: "URI Too Long",
-    415: "Unsupported Media Type",
-    416: "Range Not Satisfiable",
-    417: "Expectation Failed",
-    418: "I'm a teapot",
-    421: "Misdirected Request",
-    422: "Unprocessable Entity",
-    423: "Locked",
-    424: "Failed Dependency",
-    425: "Too Early",
-    426: "Upgrade Required",
-    428: "Precondition Required",
-    429: "Too Many Requests",
-    431: "Header Fields Too Large",
-    451: "Unavailable For Legal Reasons",
-    500: "Internal Server Error",
-    501: "Not Implemented",
-    502: "Bad Gateway",
-    503: "Service Unavailable",
-    504: "Gateway Timeout",
-    505: "HTTP Version Not Supported",
-    506: "Variant Also Negotiates",
-    507: "Insufficient Storage",
-    508: "Loop Detected",
-    509: "Bandwidth Limit Exceeded",
-    510: "Not Extended",
-    511: "Network Authentication Required"
-};
-
-function statusText(status) {
-    return STATUS_CODES[status] || `Error ${status}`;
-}
-
-class FetchError extends Error {
-    constructor(status, message) {
-        super(message || statusText(status));
-        this.status = status;
-        this.statusText = statusText(status);
-    }
-}
-
-function json(request) {
-    return request.then((response => response.json()));
-}
-
-function text(request) {
-    return request.then((response => response.text()));
-}
-
-function error400(text, _default = "400") {
-    try {
-        return JSON.parse(text).description;
-    } catch {
-        return _default;
-    }
-}
-
-function handleXMLHttpError(xhr) {
-    if (xhr.status === 0) {
-        return Promise.reject(new FetchError(0, "Network error"));
-    }
-    if (xhr.status < 200 || xhr.status > 299) {
-        switch (xhr.status) {
-          case 400:
-            {
-                console.error(xhr.responseText);
-                return Promise.reject(new FetchError(400, error400(xhr.responseText)));
-            }
-
-          case 500:
-            {
-                console.error(error400(xhr.responseText, xhr.responseText));
-                return Promise.reject(new FetchError(500));
-            }
-
-          default:
-            {
-                return Promise.reject(new FetchError(xhr.status));
-            }
-        }
+    downloadResourceRange(dataId, ranges, requestId, onProgress, signal) {
+        return this._file.downloadResourceRange(dataId, ranges, requestId, onProgress, signal);
     }
-    return Promise.resolve(xhr);
-}
-
-function handleFetchError(response) {
-    if (!response.ok) {
-        switch (response.status) {
-          case 400:
-            {
-                return response.text().then((text => {
-                    console.error(text);
-                    return Promise.reject(new FetchError(400, error400(text)));
-                }));
-            }
-
-          case 500:
-            {
-                return response.text().then((text => {
-                    console.error(error400(text, text));
-                    return Promise.reject(new FetchError(500));
-                }));
+    partialDownloadResource(dataId, onProgress, signal) {
+        console.warn("Model.partialDownloadResource() has been deprecated since 25.3 and will be removed in a future release, use Model.downloadResource() instead.");
+        return this.downloadResource(dataId, onProgress, signal);
+    }
+    async downloadFileRange(requestId, records, dataId, onProgress, signal) {
+        if (!records) return;
+        let ranges = [];
+        if (records.length) {
+            ranges = records.map((record => ({
+                begin: Number(record.begin),
+                end: Number(record.end),
+                requestId: record.reqId
+            })));
+        } else {
+            for (let i = 0; i < records.size(); i++) {
+                const record = records.get(i);
+                ranges.push({
+                    begin: Number(record.begin),
+                    end: Number(record.end),
+                    requestId: requestId
+                });
+                record.delete();
             }
-
-          default:
-            return Promise.reject(new FetchError(response.status, statusText(response.status)));
         }
+        await this.downloadResourceRange(dataId, ranges, requestId, onProgress, signal);
     }
-    return Promise.resolve(response);
-}
-
-function $init(method, headers, body, signal) {
-    headers = {
-        ...headers
-    };
-    headers["Content-Type"] = "application/json";
-    if (method === "POST" || method === "PUT") {
-        if (body instanceof FormData) {
-            delete headers["Content-Type"];
-        } else if (body instanceof File || body instanceof Blob) {
-            const formData = new FormData;
-            formData.append("file", body);
-            return $init(method, headers, formData, signal);
-        } else if (body instanceof ArrayBuffer) {
-            const blob = new Blob([ body ]);
-            return $init(method, headers, blob, signal);
-        } else if (body && typeof body === "object") {
-            body = JSON.stringify(body);
-        } else if (typeof body === "string") {
-            headers["Content-Type"] = "text/plain";
-        }
-    }
-    const result = {
-        method: method,
-        headers: headers
-    };
-    if (body && (body instanceof ArrayBuffer || body instanceof Blob || body instanceof globalThis.File || body instanceof FormData || typeof body === "string")) {
-        result.body = body;
-    }
-    if (signal) result.signal = signal;
-    return result;
-}
-
-function $fetch(url, init) {
-    return fetch(url, init).then((response => handleFetchError(response)));
-}
-
-function $get(url, headers, signal) {
-    return $fetch(url, $init("GET", headers, null, signal));
-}
-
-function $put(url, headers, body) {
-    return $fetch(url, $init("PUT", headers, body));
-}
-
-function $post(url, headers, body) {
-    return $fetch(url, $init("POST", headers, body));
-}
-
-function $delete(url, headers) {
-    return $fetch(url, $init("DELETE", headers));
-}
-
-function streamProgress(stream, onprogress) {
-    const reader = stream.getReader();
-    let current = 0;
-    function calc(ev) {
-        if (!ev.done) {
-            reader.read().then(calc).catch(console.error);
-        }
-        if (ev.value) current += ev.value.length;
-        onprogress(current);
+    getReferences(signal) {
+        return this._file.getReferences(signal);
     }
-    reader.read().then(calc).catch(console.error);
-    return stream;
-}
-
-function downloadProgress(response, onprogress) {
-    var _a;
-    const contentLength = (_a = response.headers.get("Content-Length")) !== null && _a !== void 0 ? _a : "";
-    const total = parseInt(contentLength, 10);
-    const tee = response.body.tee();
-    streamProgress(tee[0], (bytesCount => onprogress && onprogress(bytesCount / total)));
-    return new Response(tee[1]);
-}
-
-function $XMLHttp(url, {headers: headers, method: method, body: body, uploadProgress: uploadProgress, downloadProgress: downloadProgress}) {
-    return new Promise(((resolve, reject) => {
-        const xhr = new XMLHttpRequest;
-        xhr.open(method, url, true);
-        for (const key in headers) {
-            xhr.setRequestHeader(key, headers[key]);
-        }
-        function calcProgress(event) {
-            return event.lengthComputable ? event.loaded / event.total : 1;
-        }
-        xhr.upload.onprogress = event => uploadProgress && uploadProgress(calcProgress(event));
-        xhr.onprogress = event => downloadProgress && downloadProgress(calcProgress(event));
-        xhr.onloadend = event => handleXMLHttpError(event.target).then(resolve, reject);
-        xhr.send(body);
-    }));
 }
 
 function delay(ms, signal) {
@@ -358,69 +142,6 @@ async function waitFor(func, params = {}) {
     return Promise.reject(timeoutError);
 }
 
-async function downloadPartOfFile(requestId, records, url, defHeaders, onProgress, signal) {
-    var _a;
-    const headers = {
-        ...defHeaders
-    };
-    const isMultipleResourceParts = records && records.length;
-    if (records) {
-        const ranges = [];
-        if (isMultipleResourceParts) {
-            for (let i = 0; i < records.length; i++) {
-                const record = records[i];
-                ranges.push(`${record.begin}-${record.end}`);
-            }
-        } else {
-            for (let i = 0; i < records.size(); i++) {
-                const record = records.get(i);
-                ranges.push(`${record.begin}-${record.end}`);
-                record.delete();
-            }
-        }
-        headers["Range"] = "bytes=" + ranges.join(",");
-    }
-    const response = await $fetch(url, $init("GET", headers, null, signal));
-    const contentLength = (_a = response.headers.get("content-length")) !== null && _a !== void 0 ? _a : "";
-    const total = parseInt(contentLength, 10);
-    const reader = response.body.getReader();
-    if (isMultipleResourceParts) {
-        let curRecordIndex = 0;
-        let curRecordPos = 0;
-        while (true) {
-            const {done: done, value: value} = await reader.read();
-            if (done) break;
-            let totalLeft = value.byteLength;
-            let loadedPos = 0;
-            while (totalLeft > 0) {
-                const curRecord = records[curRecordIndex];
-                const recLeft = curRecord.size - curRecordPos;
-                if (totalLeft < recLeft) {
-                    const buf = value.subarray(loadedPos, loadedPos + totalLeft);
-                    if (typeof onProgress === "function") onProgress(loadedPos / total, buf, curRecord.reqId);
-                    curRecordPos += totalLeft;
-                    totalLeft = 0;
-                } else {
-                    const buf = value.subarray(loadedPos, loadedPos + recLeft);
-                    if (typeof onProgress === "function") onProgress(loadedPos / total, buf, curRecord.reqId);
-                    curRecordIndex++;
-                    curRecordPos = 0;
-                    loadedPos += recLeft;
-                    totalLeft -= recLeft;
-                }
-            }
-        }
-    } else {
-        let loaded = 0;
-        while (true) {
-            const {done: done, value: value} = await reader.read();
-            if (done) break;
-            loaded += value.byteLength;
-            if (onProgress) onProgress(loaded / total, value, requestId);
-        }
-    }
-}
-
 function parseArgs(args) {
     if (typeof args === "string") {
         const firstArg = args.indexOf("--");
@@ -510,17 +231,15 @@ class ClashTest {
     get tolerance() {
         return this.data.tolerance;
     }
-    checkout() {
-        return this.internalGet("").then((response => response.json())).then((data => {
-            this.data = data;
-            return this;
-        }));
+    async checkout() {
+        const response = await this.internalGet("");
+        this.data = await response.json();
+        return this;
     }
-    update(data) {
-        return this.internalPut("", data).then((response => response.json())).then((data => {
-            this.data = data;
-            return this;
-        }));
+    async update(data) {
+        const response = await this.internalPut("", data);
+        this.data = await response.json();
+        return this;
     }
     delete() {
         return this.internalDelete("").then((response => response.json()));
@@ -537,6 +256,92 @@ class ClashTest {
     }
 }
 
+const STATUS_CODES = {
+    100: "Continue",
+    101: "Switching Protocols",
+    102: "Processing",
+    103: "Early Hints",
+    200: "OK",
+    201: "Created",
+    202: "Accepted",
+    203: "Non-Authoritative Information",
+    204: "No Content",
+    205: "Reset Content",
+    206: "Partial Content",
+    207: "Multi-Status",
+    208: "Already Reported",
+    226: "IM Used",
+    300: "Multiple Choices",
+    301: "Moved Permanently",
+    302: "Found",
+    303: "See Other",
+    304: "Not Modified",
+    305: "Use Proxy",
+    307: "Temporary Redirect",
+    308: "Permanent Redirect",
+    400: "Bad Request",
+    401: "Unauthorized",
+    402: "Payment Required",
+    403: "Forbidden",
+    404: "Not Found",
+    405: "Method Not Allowed",
+    406: "Not Acceptable",
+    407: "Proxy Authentication Required",
+    408: "Request Time-out",
+    409: "Conflict",
+    410: "Gone",
+    411: "Length Required",
+    412: "Precondition Failed",
+    413: "Payload Too Large",
+    414: "URI Too Long",
+    415: "Unsupported Media Type",
+    416: "Range Not Satisfiable",
+    417: "Expectation Failed",
+    418: "I'm a teapot",
+    421: "Misdirected Request",
+    422: "Unprocessable Entity",
+    423: "Locked",
+    424: "Failed Dependency",
+    425: "Too Early",
+    426: "Upgrade Required",
+    428: "Precondition Required",
+    429: "Too Many Requests",
+    431: "Header Fields Too Large",
+    451: "Unavailable For Legal Reasons",
+    500: "Internal Server Error",
+    501: "Not Implemented",
+    502: "Bad Gateway",
+    503: "Service Unavailable",
+    504: "Gateway Timeout",
+    505: "HTTP Version Not Supported",
+    506: "Variant Also Negotiates",
+    507: "Insufficient Storage",
+    508: "Loop Detected",
+    509: "Bandwidth Limit Exceeded",
+    510: "Not Extended",
+    511: "Network Authentication Required"
+};
+
+function statusText(status) {
+    return STATUS_CODES[status] || `Error ${status}`;
+}
+
+function error400(text, _default = "400") {
+    try {
+        return JSON.parse(text).description;
+    } catch {
+        return _default;
+    }
+}
+
+class FetchError extends Error {
+    constructor(status, message) {
+        super(message || statusText(status));
+        this.status = status;
+        this.statusText = statusText(status);
+    }
+}
+
 class Assembly {
     constructor(data, httpClient) {
         this.path = `/assemblies/${data.id}`;
@@ -564,30 +369,6 @@ class Assembly {
         relativePath = this.appendVersionParam(relativePath);
         return this.httpClient.delete(`${this.path}${relativePath}`);
     }
-    async partialDownloadResource(dataId, onProgress, signal) {
-        var _a;
-        let pathname = `${this.path}/downloads/${dataId}`;
-        pathname = this.appendVersionParam(pathname);
-        const response = await fetch(`${this.httpClient.serverUrl}${pathname}`, {
-            headers: this.httpClient.headers,
-            signal: signal
-        });
-        const contentLength = (_a = response.headers.get("Content-Length")) !== null && _a !== void 0 ? _a : "";
-        const total = parseInt(contentLength, 10);
-        const reader = response.body.getReader();
-        let loaded = 0;
-        while (true) {
-            const {done: done, value: value} = await reader.read();
-            if (done) break;
-            loaded += value.byteLength;
-            if (typeof onProgress === "function") onProgress(loaded / total, value);
-        }
-    }
-    downloadFileRange(requestId, records, dataId, onProgress, signal) {
-        let pathname = `${this.path}/downloads/${dataId}?requestId=${requestId}`;
-        pathname = this.appendVersionParam(pathname);
-        return downloadPartOfFile(requestId, records, `${this.httpClient.serverUrl}${pathname}`, this.httpClient.headers, onProgress, signal);
-    }
     get activeVersion() {
         return this.data.activeVersion;
     }
@@ -651,15 +432,17 @@ class Assembly {
         return this.data.versions;
     }
     async checkout() {
-        this.data = await json(this.internalGet(""));
+        const response = await this.internalGet("");
+        this.data = await response.json();
         return this;
     }
     async update(data) {
-        this.data = await json(this.internalPut("", data));
+        const response = await this.internalPut("", data);
+        this.data = await response.json();
         return this;
     }
     delete() {
-        return json(this.internalDelete(""));
+        return this.internalDelete("").then((response => response.json()));
     }
     save() {
         return this.update(this.data);
@@ -669,7 +452,7 @@ class Assembly {
         return Promise.resolve(this);
     }
     getModels() {
-        return json(this.internalGet("/geometry")).then((array => array.map((data => new Model(data, this)))));
+        return this.internalGet("/geometry").then((response => response.json())).then((array => array.map((data => new Model(data, this)))));
     }
     getModelTransformMatrix(handle) {
         return this.data.transform[handle];
@@ -684,13 +467,14 @@ class Assembly {
         });
     }
     getProperties(handles) {
-        return json(this.internalGet(handles !== undefined ? `/properties?handles=${handles}` : "/properties"));
+        const relativePath = handles !== undefined ? `/properties?handles=${handles}` : "/properties";
+        return this.internalGet(relativePath).then((response => response.json()));
     }
     searchProperties(searchPattern) {
-        return json(this.internalPost("/properties/search", searchPattern));
+        return this.internalPost("/properties/search", searchPattern).then((response => response.json()));
     }
     getCdaTree() {
-        return json(this.internalGet(`/properties/tree`));
+        return this.internalGet(`/properties/tree`).then((response => response.json()));
     }
     getViewpoints() {
         console.warn("Assembly does not support viewpoints");
@@ -713,7 +497,19 @@ class Assembly {
         return Promise.resolve("");
     }
     downloadResource(dataId, onProgress, signal) {
-        return this.internalGet(`/downloads/${dataId}`, signal).then((response => downloadProgress(response, onProgress))).then((response => response.arrayBuffer()));
+        const relativePath = this.appendVersionParam(`/downloads/${dataId}`);
+        return this.httpClient.downloadFile(`${this.path}${relativePath}`, onProgress, signal).then((response => response.arrayBuffer()));
+    }
+    downloadResourceRange(dataId, ranges, requestId, onProgress, signal) {
+        const relativePath = this.appendVersionParam(`/downloads/${dataId}?requestId=${requestId}`);
+        return this.httpClient.downloadFileRange(`${this.path}${relativePath}`, ranges, onProgress, signal).then((response => response.arrayBuffer()));
+    }
+    partialDownloadResource(dataId, onProgress, signal) {
+        console.warn("Assembly.partialDownloadResource() has been deprecated since 25.3 and will be removed in a future release, use Assembly.downloadResource() instead.");
+        return this.downloadResource(dataId, onProgress, signal);
+    }
+    async downloadFileRange(requestId, records, dataId, onProgress, signal) {
+        await this.downloadResourceRange(dataId, records, requestId, onProgress, signal);
     }
     getReferences(signal) {
         return Promise.resolve({
@@ -836,32 +632,219 @@ class EventEmitter2 {
     }
 }
 
+function handleFetchError(response) {
+    if (!response.ok) {
+        switch (response.status) {
+          case 400:
+            {
+                return response.text().then((text => {
+                    console.error(text);
+                    return Promise.reject(new FetchError(400, error400(text)));
+                }));
+            }
+
+          case 500:
+            {
+                return response.text().then((text => {
+                    console.error(error400(text, text));
+                    return Promise.reject(new FetchError(500));
+                }));
+            }
+
+          default:
+            return Promise.reject(new FetchError(response.status, statusText(response.status)));
+        }
+    }
+    return Promise.resolve(response);
+}
+
+function $fetch(url, params = {
+    method: "GET"
+}) {
+    const headers = {
+        ...params.headers
+    };
+    delete headers["Content-Type"];
+    let body;
+    if (params.method === "POST" || params.method === "PUT") {
+        if (params.body instanceof FormData) {
+            body = params.body;
+        } else if (params.body instanceof Blob) {
+            body = new FormData;
+            body.append("file", params.body);
+        } else if (params.body instanceof ArrayBuffer) {
+            body = new FormData;
+            body.append("file", new Blob([ params.body ]));
+        } else if (typeof params.body === "object") {
+            body = JSON.stringify(params.body);
+            headers["Content-Type"] = "application/json";
+        } else if (typeof params.body === "string") {
+            body = params.body;
+            headers["Content-Type"] = "text/plain";
+        }
+    }
+    const init = {
+        method: params.method,
+        headers: headers
+    };
+    if (body) init.body = body;
+    if (params.signal) init.signal = params.signal;
+    return fetch(url, init).then(handleFetchError);
+}
+
+function handleXMLHttpError(xhr) {
+    if (xhr.status === 0) {
+        return Promise.reject(new FetchError(0, "Network error"));
+    }
+    if (xhr.status < 200 || xhr.status > 299) {
+        switch (xhr.status) {
+          case 400:
+            {
+                console.error(xhr.responseText);
+                return Promise.reject(new FetchError(400, error400(xhr.responseText)));
+            }
+
+          case 500:
+            {
+                console.error(error400(xhr.responseText, xhr.responseText));
+                return Promise.reject(new FetchError(500));
+            }
+
+          default:
+            {
+                return Promise.reject(new FetchError(xhr.status));
+            }
+        }
+    }
+    return Promise.resolve(xhr);
+}
+
+function $xmlhttp(url, params = {
+    method: "GET"
+}) {
+    return new Promise(((resolve, reject) => {
+        const xhr = new XMLHttpRequest;
+        xhr.open(params.method, url, true);
+        for (const key in params.headers) {
+            xhr.setRequestHeader(key, params.headers[key]);
+        }
+        function calcProgress(event) {
+            return event.lengthComputable ? event.loaded / event.total : 1;
+        }
+        xhr.upload.onprogress = event => params.uploadProgress && params.uploadProgress(calcProgress(event));
+        xhr.onprogress = event => params.downloadProgress && params.downloadProgress(calcProgress(event));
+        xhr.onloadend = event => handleXMLHttpError(event.target).then(resolve, reject);
+        xhr.send(params.body);
+    }));
+}
+
 class HttpClient {
     constructor(serverUrl) {
         this.serverUrl = serverUrl;
     }
     get(relativePath, signal) {
-        return $get(`${this.serverUrl}${relativePath}`, this.headers, signal);
+        return $fetch(`${this.serverUrl}${relativePath}`, {
+            method: "GET",
+            headers: this.headers,
+            signal: signal
+        });
     }
     post(relativePath, body) {
-        return $post(`${this.serverUrl}${relativePath}`, this.headers, body);
+        return $fetch(`${this.serverUrl}${relativePath}`, {
+            method: "POST",
+            headers: this.headers,
+            body: body
+        });
     }
     put(relativePath, body) {
-        return $put(`${this.serverUrl}${relativePath}`, this.headers, body);
+        return $fetch(`${this.serverUrl}${relativePath}`, {
+            method: "PUT",
+            headers: this.headers,
+            body: body
+        });
     }
     delete(relativePath) {
-        return $delete(`${this.serverUrl}${relativePath}`, this.headers);
+        return $fetch(`${this.serverUrl}${relativePath}`, {
+            method: "DELETE",
+            headers: this.headers
+        });
     }
-    postFile(relativePath, file, onProgress) {
+    uploadFile(relativePath, file, onProgress) {
         const data = new FormData;
         data.append("file", file);
-        return $XMLHttp(`${this.serverUrl}${relativePath}`, {
+        return $xmlhttp(`${this.serverUrl}${relativePath}`, {
             method: "POST",
             headers: this.headers,
             body: data,
             uploadProgress: onProgress
         });
     }
+    async downloadFile(relativePath, onProgress, signal) {
+        const response = await this.get(relativePath, signal);
+        const contentLength = response.headers.get("Content-Length");
+        const total = parseInt(contentLength, 10) || 1;
+        return new Response(new ReadableStream({
+            async start(controller) {
+                const reader = response.body.getReader();
+                let loaded = 0;
+                while (true) {
+                    const {done: done, value: value} = await reader.read();
+                    if (done) break;
+                    controller.enqueue(value);
+                    loaded += value.length;
+                    if (onProgress) onProgress(loaded / total, value);
+                }
+                controller.close();
+            }
+        }));
+    }
+    async downloadFileRange(relativePath, ranges, onProgress, signal) {
+        const headers = {
+            ...this.headers
+        };
+        headers["Range"] = "bytes=" + ranges.map((x => `${x.begin}-${x.end}`)).join(",");
+        const response = await $fetch(`${this.serverUrl}${relativePath}`, {
+            method: "GET",
+            headers: headers,
+            signal: signal
+        });
+        const contentLength = response.headers.get("content-length");
+        const total = parseInt(contentLength, 10) || 1;
+        return new Response(new ReadableStream({
+            async start(controller) {
+                const reader = response.body.getReader();
+                let loaded = 0;
+                let rangedIndex = 0;
+                let rangePos = 0;
+                while (true) {
+                    const {done: done, value: value} = await reader.read();
+                    if (done) break;
+                    controller.enqueue(value);
+                    loaded += value.length;
+                    let chunkLeft = value.length;
+                    let chunkPos = 0;
+                    while (chunkLeft > 0) {
+                        const range = ranges[rangedIndex];
+                        const rangeLeft = range.end - range.begin - rangePos;
+                        if (chunkLeft < rangeLeft) {
+                            const chunk = value.subarray(chunkPos, chunkPos + chunkLeft);
+                            if (onProgress) onProgress(loaded / total, chunk, range.requestId);
+                            rangePos += chunkLeft;
+                            chunkLeft = 0;
+                        } else {
+                            const chunk = value.subarray(chunkPos, chunkPos + rangeLeft);
+                            if (onProgress) onProgress(loaded / total, chunk, range.requestId);
+                            chunkPos += rangeLeft;
+                            chunkLeft -= rangeLeft;
+                            rangedIndex++;
+                            rangePos = 0;
+                        }
+                    }
+                }
+                controller.close();
+            }
+        }));
+    }
 }
 
 class Permission {
@@ -907,15 +890,17 @@ class Permission {
         this.data.public = value;
     }
     async checkout() {
-        this.data = await json(this.internalGet());
+        const response = await this.internalGet();
+        this.data = await response.json();
         return this;
     }
     async update(data) {
-        this.data = await json(this.internalPut(data));
+        const response = await this.internalPut(data);
+        this.data = await response.json();
         return this;
     }
     delete() {
-        return json(this.internalDelete());
+        return this.internalDelete().then((response => response.json()));
     }
     save() {
         return this.update(this.data);
@@ -979,15 +964,17 @@ class Job {
         return this.data.startedAt;
     }
     async checkout() {
-        this.data = await json(this.internalGet());
+        const response = await this.internalGet();
+        this.data = await response.json();
         return this;
     }
     async update(data) {
-        this.data = await json(this.internalPut(data));
+        const response = await this.internalPut(data);
+        this.data = await response.json();
         return this;
     }
     delete() {
-        return json(this.internalDelete());
+        return this.internalDelete().then((response => response.json()));
     }
     waitForDone(params) {
         const checkDone = () => this.checkout().then((job => {
@@ -1000,7 +987,7 @@ class Job {
     }
 }
 
-class File$1 {
+class File {
     constructor(data, httpClient) {
         this.path = `/files/${data.id}`;
         this.httpClient = httpClient;
@@ -1027,30 +1014,6 @@ class File$1 {
         relativePath = this.appendVersionParam(relativePath);
         return this.httpClient.delete(`${this.path}${relativePath}`);
     }
-    async partialDownloadResource(dataId, onProgress, signal) {
-        var _a;
-        let pathname = `${this.path}/downloads/${dataId}`;
-        pathname = this.appendVersionParam(pathname);
-        const response = await fetch(`${this.httpClient.serverUrl}${pathname}`, {
-            headers: this.httpClient.headers,
-            signal: signal
-        });
-        const contentLength = (_a = response.headers.get("Content-Length")) !== null && _a !== void 0 ? _a : "";
-        const total = parseInt(contentLength, 10);
-        const reader = response.body.getReader();
-        let loaded = 0;
-        while (true) {
-            const {done: done, value: value} = await reader.read();
-            if (done) break;
-            loaded += value.byteLength;
-            if (typeof onProgress === "function") onProgress(loaded / total, value);
-        }
-    }
-    downloadFileRange(requestId, records, dataId, onProgress, signal) {
-        let pathname = `${this.path}/downloads/${dataId}?requestId=${requestId}`;
-        pathname = this.appendVersionParam(pathname);
-        return downloadPartOfFile(requestId, records, `${this.httpClient.serverUrl}${pathname}`, this.httpClient.headers, onProgress, signal);
-    }
     get activeVersion() {
         return this.data.activeVersion;
     }
@@ -1145,29 +1108,28 @@ class File$1 {
         return this.data.versions;
     }
     async checkout() {
-        this.data = await json(this.internalGet(""));
+        const response = await this.internalGet("");
+        this.data = await response.json();
         return this;
     }
     async update(data) {
-        this.data = await json(this.internalPut("", data));
+        const response = await this.internalPut("", data);
+        this.data = await response.json();
         return this;
     }
     delete() {
-        return json(this.internalDelete(""));
+        return this.internalDelete("").then((response => response.json()));
     }
     save() {
         return this.update(this.data);
     }
     async setPreview(image) {
-        if (image) {
-            this.data = await json(this.internalPost("/preview", image));
-        } else {
-            this.data = await json(this.internalDelete("/preview"));
-        }
+        const response = await (image ? this.internalPost("/preview", image) : this.internalDelete("/preview"));
+        this.data = await response.json();
         return this;
     }
     getModels() {
-        return json(this.internalGet("/geometry")).then((array => array.map((data => new Model(data, this)))));
+        return this.internalGet("/geometry").then((response => response.json())).then((array => array.map((data => new Model(data, this)))));
     }
     getModelTransformMatrix(handle) {
         return undefined;
@@ -1177,44 +1139,58 @@ class File$1 {
         return Promise.resolve(this);
     }
     getProperties(handles) {
-        return json(this.internalGet(handles !== undefined ? `/properties?handles=${handles}` : "/properties"));
+        const relativePath = handles !== undefined ? `/properties?handles=${handles}` : "/properties";
+        return this.internalGet(relativePath).then((response => response.json()));
     }
     searchProperties(searchPattern) {
-        return json(this.internalPost("/properties/search", searchPattern));
+        return this.internalPost("/properties/search", searchPattern).then((response => response.json()));
     }
     getCdaTree() {
-        return json(this.internalGet(`/properties/tree`));
+        return this.internalGet(`/properties/tree`).then((response => response.json()));
     }
     getViewpoints() {
-        return json(this.internalGet("/viewpoints")).then((viewpoints => viewpoints.result));
+        return this.internalGet("/viewpoints").then((response => response.json())).then((viewpoints => viewpoints.result));
     }
     saveViewpoint(viewpoint) {
-        return json(this.internalPost("/viewpoints", viewpoint));
+        return this.internalPost("/viewpoints", viewpoint).then((response => response.json()));
     }
     deleteViewpoint(guid) {
-        return json(this.internalDelete(`/viewpoints/${guid}`));
+        return this.internalDelete(`/viewpoints/${guid}`).then((response => response.json()));
     }
     getSnapshot(guid) {
-        return text(this.internalGet(`/viewpoints/${guid}/snapshot`));
+        return this.internalGet(`/viewpoints/${guid}/snapshot`).then((response => response.text()));
     }
     getSnapshotData(guid, bitmapGuid) {
-        return text(this.internalGet(`/viewpoints/${guid}/bitmaps/${bitmapGuid}`));
+        return this.internalGet(`/viewpoints/${guid}/bitmaps/${bitmapGuid}`).then((response => response.text()));
     }
     download(onProgress, signal) {
-        return this.internalGet(`/downloads`, signal).then((response => downloadProgress(response, onProgress))).then((response => response.arrayBuffer()));
+        const relativePath = this.appendVersionParam("/downloads");
+        return this.httpClient.downloadFile(`${this.path}${relativePath}`, onProgress, signal).then((response => response.arrayBuffer()));
     }
     downloadResource(dataId, onProgress, signal) {
-        return this.internalGet(`/downloads/${dataId}`, signal).then((response => downloadProgress(response, onProgress))).then((response => response.arrayBuffer()));
+        const relativePath = this.appendVersionParam(`/downloads/${dataId}`);
+        return this.httpClient.downloadFile(`${this.path}${relativePath}`, onProgress, signal).then((response => response.arrayBuffer()));
+    }
+    downloadResourceRange(dataId, ranges, requestId, onProgress, signal) {
+        const relativePath = this.appendVersionParam(`/downloads/${dataId}?requestId=${requestId}`);
+        return this.httpClient.downloadFileRange(`${this.path}${relativePath}`, ranges, onProgress, signal).then((response => response.arrayBuffer()));
+    }
+    partialDownloadResource(dataId, onProgress, signal) {
+        console.warn("File.partialDownloadResource() has been deprecated since 25.3 and will be removed in a future release, use File.downloadResource() instead.");
+        return this.downloadResource(dataId, onProgress, signal);
+    }
+    async downloadFileRange(requestId, records, dataId, onProgress, signal) {
+        await this.downloadResourceRange(dataId, records, requestId, onProgress, signal);
     }
     getReferences(signal) {
-        return json(this.internalGet("/references", signal));
+        return this.internalGet("/references", signal).then((response => response.json()));
     }
     setReferences(references) {
-        return json(this.internalPut("/references", references));
+        return this.internalPut("/references", references).then((response => response.json()));
     }
     createJob(outputFormat, parameters) {
-        const pathname = this.appendVersionParam("/jobs");
-        return this.httpClient.post(pathname, {
+        const relativePath = this.appendVersionParam("/jobs");
+        return this.httpClient.post(relativePath, {
             fileId: this.id,
             outputFormat: outputFormat,
             parameters: parseArgs(parameters)
@@ -1245,28 +1221,28 @@ class File$1 {
         return waitFor(checkDone, params).then((() => this));
     }
     getPermissions() {
-        return json(this.internalGet("/permissions")).then((array => array.map((data => new Permission(data, this.id, this.httpClient)))));
+        return this.internalGet("/permissions").then((response => response.json())).then((array => array.map((data => new Permission(data, this.id, this.httpClient)))));
     }
     getPermission(permissionId) {
-        return json(this.internalGet(`/permissions/${permissionId}`)).then((data => new Permission(data, this.id, this.httpClient)));
+        return this.internalGet(`/permissions/${permissionId}`).then((response => response.json())).then((data => new Permission(data, this.id, this.httpClient)));
     }
     createPermission(actions, grantedTo, _public) {
-        return json(this.internalPost("/permissions", {
-            actions: typeof actions === "string" ? [ actions ] : actions,
+        return this.internalPost("/permissions", {
+            actions: Array.isArray(actions) ? actions : [ actions ],
             grantedTo: grantedTo,
             public: _public
-        })).then((data => new Permission(data, this.id, this.httpClient)));
+        }).then((response => response.json())).then((data => new Permission(data, this.id, this.httpClient)));
     }
     deletePermission(permissionId) {
-        return json(this.internalDelete(`/permissions/${permissionId}`));
+        return this.internalDelete(`/permissions/${permissionId}`).then((response => response.json()));
     }
     async uploadVersion(file, params = {
         waitForDone: false
     }) {
-        const result = await this.httpClient.postFile(`${this.path}/versions`, file, (progress => {
+        const result = await this.httpClient.uploadFile(`${this.path}/versions`, file, (progress => {
             var _a;
             return (_a = params.onProgress) === null || _a === void 0 ? void 0 : _a.call(params, progress, file);
-        })).then((xhr => JSON.parse(xhr.responseText))).then((data => new File$1(data, this.httpClient)));
+        })).then((xhr => JSON.parse(xhr.responseText))).then((data => new File(data, this.httpClient)));
         if (params.geometry === undefined && this.geometryType !== "") params.geometry = true;
         if (params.properties === undefined && this.status.properties.state !== "none") params.properties = true;
         const jobs = [];
@@ -1277,16 +1253,16 @@ class File$1 {
         return result;
     }
     getVersions() {
-        return this.internalGet("/versions").then((response => response.json())).then((files => files.map((data => new File$1(data, this.httpClient))))).then((files => files.map((file => file.id == file.originalFileId ? file.useVersion(0) : file))));
+        return this.internalGet("/versions").then((response => response.json())).then((files => files.map((data => new File(data, this.httpClient))))).then((files => files.map((file => file.id == file.originalFileId ? file.useVersion(0) : file))));
     }
     getVersion(version) {
-        return this.internalGet(`/versions/${version}`).then((response => response.json())).then((data => new File$1(data, this.httpClient))).then((file => file.id == file.originalFileId ? file.useVersion(0) : file));
+        return this.internalGet(`/versions/${version}`).then((response => response.json())).then((data => new File(data, this.httpClient))).then((file => file.id == file.originalFileId ? file.useVersion(0) : file));
     }
     async deleteVersion(version) {
         const response = await this.internalDelete(`/versions/${version}`);
-        const result = await response.json();
+        const data = await response.json();
         await this.checkout();
-        return result;
+        return data;
     }
     setActiveVersion(version) {
         return this.update({
@@ -1339,15 +1315,17 @@ class Role {
         this.data.permissions = value || {};
     }
     async checkout() {
-        this.data = await json(this.internalGet());
+        const response = await this.internalGet();
+        this.data = await response.json();
         return this;
     }
     async update(data) {
-        this.data = await json(this.internalPut(data));
+        const response = await this.internalPut(data);
+        this.data = await response.json();
         return this;
     }
     delete() {
-        return json(this.internalDelete());
+        return this.internalDelete().then((response => response.json()));
     }
     save() {
         return this.update(this.data);
@@ -1394,15 +1372,17 @@ class Member {
         return this.data.user;
     }
     async checkout() {
-        this.data = await json(this.internalGet());
+        const response = await this.internalGet();
+        this.data = await response.json();
         return this;
     }
     async update(data) {
-        this.data = await json(this.internalPut(data));
+        const response = await this.internalPut(data);
+        this.data = await response.json();
         return this;
     }
     delete() {
-        return json(this.internalDelete());
+        return this.internalDelete().then((response => response.json()));
     }
     save() {
         return this.update(this.data);
@@ -1500,15 +1480,17 @@ class Project {
         return this.data.updatedAt;
     }
     async checkout() {
-        this.data = await json(this.internalGet(""));
+        const response = await this.internalGet("");
+        this.data = await response.json();
         return this;
     }
     async update(data) {
-        this.data = await json(this.internalPut("", data));
+        const response = await this.internalPut("", data);
+        this.data = await response.json();
         return this;
     }
     delete() {
-        return text(this.internalDelete("")).then((text => {
+        return this.internalDelete("").then((response => response.text())).then((text => {
             try {
                 return JSON.parse(text);
             } catch {
@@ -1522,46 +1504,43 @@ class Project {
         return this.update(this.data);
     }
     async setPreview(image) {
-        if (image) {
-            this.data = await json(this.internalPost("/preview", image));
-        } else {
-            this.data = await json(this.internalDelete("/preview"));
-        }
+        const response = await (image ? this.internalPost("/preview", image) : this.internalDelete("/preview"));
+        this.data = await response.json();
         return this;
     }
     getRoles() {
-        return json(this.internalGet("/roles")).then((array => array.map((data => new Role(data, this.id, this.httpClient)))));
+        return this.internalGet("/roles").then((response => response.json())).then((array => array.map((data => new Role(data, this.id, this.httpClient)))));
     }
     getRole(name) {
-        return json(this.internalGet(`/roles/${name}`)).then((data => new Role(data, this.id, this.httpClient)));
+        return this.internalGet(`/roles/${name}`).then((response => response.json())).then((data => new Role(data, this.id, this.httpClient)));
     }
     createRole(name, description, permissions) {
-        return json(this.internalPost("/roles", {
+        return this.internalPost("/roles", {
             name: name,
             description: description,
             permissions: permissions || {}
-        })).then((data => new Role(data, this.id, this.httpClient)));
+        }).then((response => response.json())).then((data => new Role(data, this.id, this.httpClient)));
     }
     deleteRole(name) {
-        return json(this.internalDelete(`/roles/${name}`));
+        return this.internalDelete(`/roles/${name}`).then((response => response.json()));
     }
     getMembers() {
-        return json(this.internalGet("/members")).then((array => array.map((data => new Member(data, this.id, this.httpClient)))));
+        return this.internalGet("/members").then((response => response.json())).then((array => array.map((data => new Member(data, this.id, this.httpClient)))));
     }
     getMember(memberId) {
-        return json(this.internalGet(`/members/${memberId}`)).then((data => new Member(data, this.id, this.httpClient)));
+        return this.internalGet(`/members/${memberId}`).then((response => response.json())).then((data => new Member(data, this.id, this.httpClient)));
     }
     addMember(userId, role) {
-        return json(this.internalPost("/members", {
+        return this.internalPost("/members", {
             userId: userId,
             role: role
-        })).then((data => new Member(data, this.id, this.httpClient)));
+        }).then((response => response.json())).then((data => new Member(data, this.id, this.httpClient)));
     }
     removeMember(memberId) {
-        return json(this.internalDelete(`/members/${memberId}`));
+        return this.internalDelete(`/members/${memberId}`).then((response => response.json()));
     }
     getFilesInformation() {
-        return json(this.httpClient.get(`/bcf/3.0/projects/${this.data.id}/files_information`)).then((items => {
+        return this.httpClient.get(`/bcf/3.0/projects/${this.data.id}/files_information`).then((response => response.json())).then((items => {
             items.forEach((item => {
                 const getFieldValue = displayName => (item.display_information.find((x => x.field_display_name === displayName)) || {}).field_value;
                 const previewUrl = `${this.httpClient.serverUrl}/files/${item.file.reference}/preview`;
@@ -1697,13 +1676,15 @@ class User {
     }
     async checkout() {
         if (this.id === this.httpClient.signInUserId) {
-            const data = await json(this.httpClient.get("/user"));
+            const response = await this.httpClient.get("/user");
+            const data = await response.json();
             this.data = {
                 id: this.id,
                 ...data
             };
         } else {
-            const data = await json(this.httpClient.get(`/users/${this.id}`));
+            const response = await this.httpClient.get(`/users/${this.id}`);
+            const data = await response.json();
             this.data = {
                 id: data.id,
                 ...data.userBrief
@@ -1713,15 +1694,17 @@ class User {
     }
     async update(data) {
         if (this.id === this.httpClient.signInUserId) {
-            const newData = await json(this.httpClient.put("/user", data));
+            const response = await this.httpClient.put("/user", data);
+            const newData = await response.json();
             this.data = {
                 id: this.id,
                 ...newData
             };
         } else {
-            const newData = await json(this.httpClient.put(`/users/${this.id}`, {
+            const response = await this.httpClient.put(`/users/${this.id}`, {
                 userBrief: data
-            }));
+            });
+            const newData = await response.json();
             this.data = {
                 id: newData.id,
                 ...newData.userBrief
@@ -1730,7 +1713,7 @@ class User {
         return this;
     }
     delete() {
-        return json(this.httpClient.delete(`/users/${this.id}`)).then((data => {
+        return this.httpClient.delete(`/users/${this.id}`).then((response => response.json())).then((data => {
             if (this.id === this.httpClient.signInUserId) {
                 this.httpClient.headers = {};
                 this.httpClient.signInUserId = "";
@@ -1744,13 +1727,15 @@ class User {
     async setAvatar(image) {
         if (image) {
             if (this.id === this.httpClient.signInUserId) {
-                const data = await json(this.httpClient.post("/user/avatar", image));
+                const response = await this.httpClient.post("/user/avatar", image);
+                const data = await response.json();
                 this.data = {
                     id: this.id,
                     ...data
                 };
             } else {
-                const data = await json(this.httpClient.post(`/users/${this.id}/avatar`, image));
+                const response = await this.httpClient.post(`/users/${this.id}/avatar`, image);
+                const data = await response.json();
                 this.data = {
                     id: data.id,
                     ...data.userBrief
@@ -1758,13 +1743,15 @@ class User {
             }
         } else {
             if (this.id === this.httpClient.signInUserId) {
-                const data = await json(this.httpClient.delete("/user/avatar"));
+                const response = await this.httpClient.delete("/user/avatar");
+                const data = await response.json();
                 this.data = {
                     id: this.id,
                     ...data
                 };
             } else {
-                const data = await json(this.httpClient.delete(`/users/${this.id}/avatar`));
+                const response = await this.httpClient.delete(`/users/${this.id}/avatar`);
+                const data = await response.json();
                 this.data = {
                     id: data.id,
                     ...data.userBrief
@@ -1844,7 +1831,7 @@ class Client extends EventEmitter2 {
         return this._httpClient.get("/version").then((response => response.json())).then((data => ({
             ...data,
             server: data.version,
-            client: "25.3.17"
+            client: "25.3.18"
         })));
     }
     registerUser(email, password, userName) {
@@ -1868,14 +1855,16 @@ class Client extends EventEmitter2 {
         this._httpClient.headers = {
             Authorization: "Basic " + credentials
         };
-        const data = await json(this._httpClient.get("/token"));
+        const response = await this._httpClient.get("/token");
+        const data = await response.json();
         return this.setCurrentUser(data);
     }
     async signInWithToken(token) {
         this._httpClient.headers = {
             Authorization: token
         };
-        const data = await json(this._httpClient.get("/user"));
+        const response = await this._httpClient.get("/user");
+        const data = await response.json();
         return this.setCurrentUser(data);
     }
     setCurrentUser(data) {
@@ -1896,19 +1885,19 @@ class Client extends EventEmitter2 {
         return this._user;
     }
     getUsers() {
-        return json(this._httpClient.get("/users")).then((array => array.map((data => ({
+        return this._httpClient.get("/users").then((response => response.json())).then((array => array.map((data => ({
             id: data.id,
             ...data.userBrief
         }))))).then((array => array.map((data => new User(data, this._httpClient)))));
     }
     getUser(userId) {
         if (userId === this._httpClient.signInUserId) {
-            return json(this._httpClient.get("/user")).then((data => ({
+            return this._httpClient.get("/user").then((response => response.json())).then((data => ({
                 id: userId,
                 ...data
             }))).then((data => new User(data, this._httpClient)));
         } else {
-            return json(this._httpClient.get(`/users/${userId}`)).then((data => ({
+            return this._httpClient.get(`/users/${userId}`).then((response => response.json())).then((data => ({
                 id: data.id,
                 ...data.userBrief
             }))).then((data => new User(data, this._httpClient)));
@@ -1916,7 +1905,7 @@ class Client extends EventEmitter2 {
     }
     createUser(email, password, params = {}) {
         const {isAdmin: isAdmin, userName: userName, ...rest} = params;
-        return json(this._httpClient.post("/users", {
+        return this._httpClient.post("/users", {
             isAdmin: isAdmin,
             userBrief: {
                 ...rest,
@@ -1924,13 +1913,13 @@ class Client extends EventEmitter2 {
                 userName: userName !== null && userName !== void 0 ? userName : (email + "").split("@").at(0)
             },
             password: password
-        })).then((data => ({
+        }).then((response => response.json())).then((data => ({
             id: data.id,
             ...data.userBrief
         }))).then((data => new User(data, this._httpClient)));
     }
     deleteUser(userId) {
-        return json(this._httpClient.delete(`/users/${userId}`)).then((data => {
+        return this._httpClient.delete(`/users/${userId}`).then((response => response.json())).then((data => {
             if (userId === this._httpClient.signInUserId) {
                 this.clearCurrentUser();
             }
@@ -1955,20 +1944,20 @@ class Client extends EventEmitter2 {
         if (sortField) searchParams.set("sortField", sortField);
         let queryString = searchParams.toString();
         if (queryString) queryString = "?" + queryString;
-        return json(this._httpClient.get(`/files${queryString}`)).then((files => ({
+        return this._httpClient.get(`/files${queryString}`).then((response => response.json())).then((files => ({
             ...files,
-            result: files.result.map((data => new File$1(data, this._httpClient)))
+            result: files.result.map((data => new File(data, this._httpClient)))
         })));
     }
     getFile(fileId) {
-        return json(this._httpClient.get(`/files/${fileId}`)).then((data => new File$1(data, this._httpClient)));
+        return this._httpClient.get(`/files/${fileId}`).then((response => response.json())).then((data => new File(data, this._httpClient)));
     }
     async uploadFile(file, params = {
         geometry: true,
         properties: false,
         waitForDone: false
     }) {
-        const result = await this._httpClient.postFile("/files", file, (progress => {
+        const result = await this._httpClient.uploadFile("/files", file, (progress => {
             var _a;
             this.emitEvent({
                 type: "uploadprogress",
@@ -1976,7 +1965,7 @@ class Client extends EventEmitter2 {
                 file: file
             });
             (_a = params.onProgress) === null || _a === void 0 ? void 0 : _a.call(params, progress, file);
-        })).then((xhr => JSON.parse(xhr.responseText))).then((data => new File$1(data, this._httpClient)));
+        })).then((xhr => JSON.parse(xhr.responseText))).then((data => new File(data, this._httpClient)));
         const geometryType = typeof params.geometry === "string" ? params.geometry : "vsfx";
         const jobs = [];
         if (params.geometry) jobs.push((await result.extractGeometry(geometryType)).outputFormat);
@@ -1985,10 +1974,10 @@ class Client extends EventEmitter2 {
         return result;
     }
     deleteFile(fileId) {
-        return json(this._httpClient.delete(`/files/${fileId}`));
+        return this._httpClient.delete(`/files/${fileId}`).then((response => response.json()));
     }
     downloadFile(fileId, onProgress, signal) {
-        return this._httpClient.get(`/files/${fileId}/downloads`, signal).then((response => downloadProgress(response, onProgress))).then((response => response.arrayBuffer()));
+        return this._httpClient.downloadFile(`/files/${fileId}/downloads`, onProgress, signal).then((response => response.arrayBuffer()));
     }
     getJobs(status, limit, start, sortByDesc, sortField) {
         const searchParams = new URLSearchParams;
@@ -2003,13 +1992,13 @@ class Client extends EventEmitter2 {
         if (sortField) searchParams.set("sortField", sortField);
         let queryString = searchParams.toString();
         if (queryString) queryString = "?" + queryString;
-        return json(this._httpClient.get(`/jobs${queryString}`)).then((jobs => ({
+        return this._httpClient.get(`/jobs${queryString}`).then((response => response.json())).then((jobs => ({
             ...jobs,
             result: jobs.result.map((data => new Job(data, this._httpClient)))
         })));
     }
     getJob(jobId) {
-        return json(this._httpClient.get(`/jobs/${jobId}`)).then((data => new Job(data, this._httpClient)));
+        return this._httpClient.get(`/jobs/${jobId}`).then((response => response.json())).then((data => new Job(data, this._httpClient)));
     }
     createJob(fileId, outputFormat, parameters) {
         return this._httpClient.post("/jobs", {
@@ -2019,7 +2008,7 @@ class Client extends EventEmitter2 {
         }).then((response => response.json())).then((data => new Job(data, this._httpClient)));
     }
     deleteJob(jobId) {
-        return json(this._httpClient.delete(`/jobs/${jobId}`));
+        return this._httpClient.delete(`/jobs/${jobId}`).then((response => response.json()));
     }
     getAssemblies(start, limit, name, ids, sortByDesc, sortField) {
         const searchParams = new URLSearchParams;
@@ -2035,13 +2024,13 @@ class Client extends EventEmitter2 {
         if (sortField) searchParams.set("sortField", sortField);
         let queryString = searchParams.toString();
         if (queryString) queryString = "?" + queryString;
-        return json(this._httpClient.get(`/assemblies${queryString}`)).then((assemblies => ({
+        return this._httpClient.get(`/assemblies${queryString}`).then((response => response.json())).then((assemblies => ({
             ...assemblies,
             result: assemblies.result.map((data => new Assembly(data, this._httpClient)))
         })));
     }
     getAssembly(assemblyId) {
-        return json(this._httpClient.get(`/assemblies/${assemblyId}`)).then((data => new Assembly(data, this._httpClient)));
+        return this._httpClient.get(`/assemblies/${assemblyId}`).then((response => response.json())).then((data => new Assembly(data, this._httpClient)));
     }
     createAssembly(files, name, params) {
         const {waitForDone: waitForDone} = params !== null && params !== void 0 ? params : {};
@@ -2051,7 +2040,7 @@ class Client extends EventEmitter2 {
         }).then((response => response.json())).then((data => new Assembly(data, this._httpClient))).then((result => waitForDone ? result.waitForDone(params) : result));
     }
     deleteAssembly(assemblyId) {
-        return json(this._httpClient.delete(`/assemblies/${assemblyId}`));
+        return this._httpClient.delete(`/assemblies/${assemblyId}`).then((response => response.json()));
     }
     getProjects(start, limit, name, ids, sortByDesc) {
         const searchParams = new URLSearchParams;
@@ -2066,7 +2055,7 @@ class Client extends EventEmitter2 {
         if (sortByDesc !== undefined) searchParams.set("sortBy", sortByDesc ? "desc" : "asc");
         let queryString = searchParams.toString();
         if (queryString) queryString = "?" + queryString;
-        return json(this._httpClient.get(`/projects${queryString}`)).then((projects => {
+        return this._httpClient.get(`/projects${queryString}`).then((response => response.json())).then((projects => {
             if (Array.isArray(projects)) {
                 let result = projects;
                 if (ids) result = result.filter((x => ids.includes(x.id)));
@@ -2090,19 +2079,19 @@ class Client extends EventEmitter2 {
         })));
     }
     getProject(projectId) {
-        return json(this._httpClient.get(`/projects/${projectId}`)).then((data => new Project(data, this._httpClient)));
+        return this._httpClient.get(`/projects/${projectId}`).then((response => response.json())).then((data => new Project(data, this._httpClient)));
     }
     createProject(name, description, startDate, endDate, avatarUrl) {
-        return json(this._httpClient.post("/projects", {
+        return this._httpClient.post("/projects", {
             name: name,
             description: description,
             startDate: startDate instanceof Date ? startDate.toISOString() : startDate,
             endDate: endDate instanceof Date ? endDate.toISOString() : endDate,
             avatarUrl: avatarUrl
-        })).then((data => new Project(data, this._httpClient)));
+        }).then((response => response.json())).then((data => new Project(data, this._httpClient)));
     }
     deleteProject(projectId) {
-        return text(this._httpClient.delete(`/projects/${projectId}`)).then((text => {
+        return this._httpClient.delete(`/projects/${projectId}`).then((response => response.text())).then((text => {
             try {
                 return JSON.parse(text);
             } catch {
@@ -2114,7 +2103,7 @@ class Client extends EventEmitter2 {
     }
 }
 
-const version = "25.3.17";
+const version = "25.3.18";
 
-export { Assembly, ClashTest, Client, File$1 as File, Job, Member, Model, Permission, Project, Role, User, parseArgs, userFullName, userInitials, version, waitFor };
+export { Assembly, ClashTest, Client, File, Job, Member, Model, Permission, Project, Role, User, parseArgs, userFullName, userInitials, version, waitFor };
 //# sourceMappingURL=client.module.js.map