@inweb/client 25.3.15 → 25.3.18

package/dist/client.js

@@ -61,8 +61,8 @@
             this._data = value;
         }
         /**
-         * Scene description file resource ID. Use {@link Model#downloadResource | downloadResource()}
-         * to download scene description file.
+         * Scene description resource file name. Use {@link Model.downloadResource()} to download
+         * scene description file.
          *
          * @readonly
          */
@@ -94,8 +94,8 @@
             return this.data.fileId;
         }
         /**
-         * The list of resource IDs for geometry data files. Use
-         * {@link Model#downloadResource | downloadResource()} to download geometry data files.
+         * The list of geometry data resource files. Use {@link Model.downloadResource()} to download
+         * geometry data files.
          *
          * @readonly
          */
@@ -218,10 +218,11 @@
             return this._file.getSnapshotData(guid, bitmapGuid);
         }
         /**
-         * Downloads model resource, such as scene description file or geometry data files.
+         * Download model resource file. Resource files are files that contain model scene
+         * descriptions, or geometry data.
          *
          * @async
-         * @param resourceId - Resource ID.
+         * @param dataId - Resource file name.
          * @param onProgress - Download progress callback.
          * @param signal - An <a href="https://developer.mozilla.org/docs/Web/API/AbortSignal" target
          *   ="_blank">AbortSignal</a> object instance. Allows to communicate with a fetch request
@@ -230,12 +231,50 @@
         downloadResource(dataId, onProgress, signal) {
             return this._file.downloadResource(dataId, onProgress, signal);
         }
-        // Internal download routines used by Viewer.
-        partialDownloadResource(dataId, onProgress, signal) {
-            return this._file.partialDownloadResource(dataId, onProgress, signal);
+        /**
+         * Download a part of model resource file. Resource files are files that contain model scene
+         * descriptions, or geometry data.
+         *
+         * @param dataId - Resource file name.
+         * @param ranges - A range of resource file contents to download.
+         * @param requestId - Request ID for download progress callback.
+         * @param onProgress - Download progress callback.
+         * @param signal - An <a href="https://developer.mozilla.org/docs/Web/API/AbortSignal" target
+         *   ="_blank">AbortSignal</a> object instance. Allows to communicate with a fetch request
+         *   and abort it if desired.
+         */
+        downloadResourceRange(dataId, ranges, requestId, onProgress, signal) {
+            return this._file.downloadResourceRange(dataId, ranges, requestId, onProgress, signal);
         }
-        downloadFileRange(requestId, records, dataId, onProgress, signal) {
-            return this._file.downloadFileRange(requestId, records, dataId, onProgress, signal);
+        /**
+         * Deprecated since `25.3`. Use {@link Model.downloadResource()} instead.
+         */
+        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);
+        }
+        /**
+         * Deprecated since `25.3`. Use {@link Model.downloadResourceRange()} instead.
+         */
+        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 });
+                    record.delete();
+                }
+            }
+            await this.downloadResourceRange(dataId, ranges, requestId, onProgress, signal);
         }
         /**
          * Returns a list of references to files used to extract geometry data.
@@ -272,243 +311,6 @@
     // By use of this software, its documentation or related materials, you
     // acknowledge and accept the above terms.
     ///////////////////////////////////////////////////////////////////////////////
-    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}`;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////
-    /**
-     * The `FetchError` object indicates an error when request to Open Cloud Server could not be
-     * performed. A `FetchError` is typically (but not exclusively) thrown when a network error
-     * occurs, access denied, or object not found.
-     */
-    class FetchError extends Error {
-        /**
-         * @property status - The <a href="https://developer.mozilla.org/docs/Web/HTTP/Status" target
-         *   ="_blank">HTTP status code</a> of the response.
-         * @property message - Error message. Inherited from <a
-         *   href="https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Error"
-         *   target ="_blank">Error</a>.
-         */
-        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));
-                }
-            }
-        }
-        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));
-                    });
-                }
-                default:
-                    return Promise.reject(new FetchError(response.status, statusText(response.status)));
-            }
-        }
-        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, headers };
-        // body with type "object", converted to type "string" in the code above
-        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);
-        }
-        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, method, body, uploadProgress, 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) {
         return new Promise((resolve) => {
             let timeoutId = 0;
@@ -540,74 +342,6 @@
         } while (performance.now() < end && --count > 0);
         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, 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, 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("--");
@@ -810,13 +544,10 @@
          *
          * @async
          */
-        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 test data on the server.
@@ -824,13 +555,10 @@
          * @async
          * @param data - Raw test data.
          */
-        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;
         }
         /**
          * Remove a test from a file.
@@ -868,12 +596,130 @@
             return waitFor(checkDone, params).then(() => this);
         }
         /**
-         * Returns a report with the clash detection results for this test.
-         *
-         * @async
+         * Returns a report with the clash detection results for this test.
+         *
+         * @async
+         */
+        getReport() {
+            return this.internalGet("/report").then((response) => response.json());
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////
+    // Copyright (C) 2002-2021, Open Design Alliance (the "Alliance").
+    // All rights reserved.
+    //
+    // This software and its documentation and related materials are owned by
+    // the Alliance. The software may only be incorporated into application
+    // programs owned by members of the Alliance, subject to a signed
+    // Membership Agreement and Supplemental Software License Agreement with the
+    // Alliance. The structure and organization of this software are the valuable
+    // trade secrets of the Alliance and its suppliers. The software is also
+    // protected by copyright law and international treaty provisions. Application
+    // programs incorporating this software must include the following statement
+    // with their copyright notices:
+    //
+    //   This application incorporates Open Design Alliance software pursuant to a
+    //   license agreement with Open Design Alliance.
+    //   Open Design Alliance Copyright (C) 2002-2021 by Open Design Alliance.
+    //   All rights reserved.
+    //
+    // By use of this software, its documentation or related materials, you
+    // acknowledge and accept the above terms.
+    ///////////////////////////////////////////////////////////////////////////////
+    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;
+        }
+    }
+    /**
+     * The `FetchError` object indicates an error when request to Open Cloud Server could not be
+     * performed. A `FetchError` is typically (but not exclusively) thrown when a network error
+     * occurs, access denied, or object not found.
+     */
+    class FetchError extends Error {
+        /**
+         * @property status - The <a href="https://developer.mozilla.org/docs/Web/HTTP/Status" target
+         *   ="_blank">HTTP status code</a> of the response.
+         * @property message - Error message. Inherited from <a
+         *   href="https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Error"
+         *   target ="_blank">Error</a>.
          */
-        getReport() {
-            return this.internalGet("/report").then((response) => response.json());
+        constructor(status, message) {
+            super(message || statusText(status));
+            this.status = status;
+            this.statusText = statusText(status);
         }
     }
 
@@ -913,34 +759,6 @@
             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);
-            // TODO: replace with $get to handle fetch errors
-            const response = await fetch(`${this.httpClient.serverUrl}${pathname}`, {
-                headers: this.httpClient.headers,
-                signal,
-            });
-            // TODO: use ReadableStream pipeTo()
-            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, 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);
-        }
         // Reserved for future use
         get activeVersion() {
             return this.data.activeVersion;
@@ -1080,7 +898,8 @@
          * @async
          */
         async checkout() {
-            this.data = await json(this.internalGet(""));
+            const response = await this.internalGet("");
+            this.data = await response.json();
             return this;
         }
         /**
@@ -1090,7 +909,8 @@
          * @param data - Raw assembly data.
          */
         async update(data) {
-            this.data = await json(this.internalPut("", data));
+            const response = await this.internalPut("", data);
+            this.data = await response.json();
             return this;
         }
         /**
@@ -1100,7 +920,7 @@
          * @returns Returns the raw data of a deleted assembly.
          */
         delete() {
-            return json(this.internalDelete(""));
+            return this.internalDelete("").then((response) => response.json());
         }
         /**
          * Save assembly data changes to the server. Call this method to update assembly data on the
@@ -1122,7 +942,9 @@
          * @async
          */
         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)));
         }
         /**
          * Transformation matrix.
@@ -1169,7 +991,8 @@
          * @returns {Promise<any>}
          */
         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());
         }
         /**
          * Returns the list of original handles for an objects in the file that match the specified
@@ -1198,7 +1021,7 @@
          * @param searchPattern - Search pattern or combination of the patterns, see example below.
          */
         searchProperties(searchPattern) {
-            return json(this.internalPost("/properties/search", searchPattern));
+            return this.internalPost("/properties/search", searchPattern).then((response) => response.json());
         }
         /**
          * Returns the cda.json for an assembly.
@@ -1206,7 +1029,7 @@
          * @async
          */
         getCdaTree() {
-            return json(this.internalGet(`/properties/tree`));
+            return this.internalGet(`/properties/tree`).then((response) => response.json());
         }
         // Reserved for future use
         getViewpoints() {
@@ -1230,20 +1053,53 @@
             return Promise.resolve("");
         }
         /**
-         * Download assembly resource data, such as geometry data.
+         * Download assembly resource file. Resource files are files that contain model scene
+         * descriptions, or geometry data.
          *
          * @async
-         * @param dataId - Resource ID.
+         * @param dataId - Resource file name.
          * @param onProgress - Download progress callback.
          * @param signal - An <a href="https://developer.mozilla.org/docs/Web/API/AbortSignal" target
          *   ="_blank">AbortSignal</a> object instance. Allows to communicate with a fetch request
          *   and abort it if desired.
          */
         downloadResource(dataId, onProgress, signal) {
-            return this.internalGet(`/downloads/${dataId}`, signal)
-                .then((response) => downloadProgress(response, onProgress))
+            const relativePath = this.appendVersionParam(`/downloads/${dataId}`);
+            return this.httpClient
+                .downloadFile(`${this.path}${relativePath}`, onProgress, signal)
+                .then((response) => response.arrayBuffer());
+        }
+        /**
+         * Download a part of assembly resource file. Resource files are files that contain model
+         * scene descriptions, or geometry data.
+         *
+         * @param dataId - Resource file name.
+         * @param ranges - A range of resource file contents to download.
+         * @param requestId - Request ID for download progress callback.
+         * @param onProgress - Download progress callback.
+         * @param signal - An <a href="https://developer.mozilla.org/docs/Web/API/AbortSignal" target
+         *   ="_blank">AbortSignal</a> object instance. Allows to communicate with a fetch request
+         *   and abort it if desired.
+         */
+        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());
         }
+        /**
+         * Deprecated since `25.3`. Use {@link Assembly.downloadResource()} instead.
+         */
+        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);
+        }
+        /**
+         * Deprecated since `25.3`. Use {@link Assembly.downloadResourceRange()} instead.
+         */
+        async downloadFileRange(requestId, records, dataId, onProgress, signal) {
+            await this.downloadResourceRange(dataId, records, requestId, onProgress, signal);
+        }
         // Reserved for future use
         getReferences(signal) {
             return Promise.resolve({ fileId: "", references: [] });
@@ -1449,35 +1305,237 @@
         }
     }
 
+    ///////////////////////////////////////////////////////////////////////////////
+    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 };
+        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 });
         }
         post(relativePath, body) {
-            return $post(`${this.serverUrl}${relativePath}`, this.headers, body);
+            return $fetch(`${this.serverUrl}${relativePath}`, { method: "POST", headers: this.headers, body });
         }
         put(relativePath, body) {
-            return $put(`${this.serverUrl}${relativePath}`, this.headers, body);
+            return $fetch(`${this.serverUrl}${relativePath}`, { method: "PUT", headers: this.headers, 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: string,
+        //   onProgress?: (progress: number, chunk: Uint8Array) => void,
+        //   signal?: AbortSignal
+        // ): Promise<Response> {
+        //   const response = await this.get(relativePath, signal);
+        //   const teedOff = response.body.tee();
+        //   if (onProgress) {
+        //     const contentLength = response.headers.get("Content-Length");
+        //     const total = parseInt(contentLength, 10) || 1;
+        //     let loaded = 0;
+        //     const reader = teedOff[0].getReader();
+        //     reader.read().then(function processChunk({ done, value }) {
+        //       if (done) return;
+        //       loaded += value.length;
+        //       onProgress(loaded / total, value);
+        //       reader.read().then(processChunk);
+        //     });
+        //   }
+        //   return new Response(teedOff[1]);
+        // }
+        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, 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, 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, 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();
+                },
+            }));
+        }
     }
 
+    ///////////////////////////////////////////////////////////////////////////////
+    // Copyright (C) 2002-2021, Open Design Alliance (the "Alliance").
+    // All rights reserved.
+    //
+    // This software and its documentation and related materials are owned by
+    // the Alliance. The software may only be incorporated into application
+    // programs owned by members of the Alliance, subject to a signed
+    // Membership Agreement and Supplemental Software License Agreement with the
+    // Alliance. The structure and organization of this software are the valuable
+    // trade secrets of the Alliance and its suppliers. The software is also
+    // protected by copyright law and international treaty provisions. Application
+    // programs incorporating this software must include the following statement
+    // with their copyright notices:
+    //
+    //   This application incorporates Open Design Alliance software pursuant to a
+    //   license agreement with Open Design Alliance.
+    //   Open Design Alliance Copyright (C) 2002-2021 by Open Design Alliance.
+    //   All rights reserved.
+    //
+    // By use of this software, its documentation or related materials, you
+    // acknowledge and accept the above terms.
     ///////////////////////////////////////////////////////////////////////////////
     /**
      * A permission provides information about {@link File | file} sharing granted to a specific
@@ -1573,7 +1631,8 @@
          * @async
          */
         async checkout() {
-            this.data = await json(this.internalGet());
+            const response = await this.internalGet();
+            this.data = await response.json();
             return this;
         }
         /**
@@ -1583,7 +1642,8 @@
          * @param data - Raw permission data.
          */
         async update(data) {
-            this.data = await json(this.internalPut(data));
+            const response = await this.internalPut(data);
+            this.data = await response.json();
             return this;
         }
         /**
@@ -1593,7 +1653,7 @@
          * @returns Returns the raw data of a deleted permission.
          */
         delete() {
-            return json(this.internalDelete());
+            return this.internalDelete().then((response) => response.json());
         }
         /**
          * Save permission data changes to the server. Call this method to update permission data on
@@ -1746,7 +1806,8 @@
          * @async
          */
         async checkout() {
-            this.data = await json(this.internalGet());
+            const response = await this.internalGet();
+            this.data = await response.json();
             return this;
         }
         /**
@@ -1756,7 +1817,8 @@
          * @param data - Raw job data.
          */
         async update(data) {
-            this.data = await json(this.internalPut(data));
+            const response = await this.internalPut(data);
+            this.data = await response.json();
             return this;
         }
         /**
@@ -1767,7 +1829,7 @@
          * @returns Returns the raw data of a deleted job.
          */
         delete() {
-            return json(this.internalDelete());
+            return this.internalDelete().then((response) => response.json());
         }
         // /**
         //  * Save job data changes to the server. Call this method to update job data on the server
@@ -1808,7 +1870,7 @@
     /**
      * The class representing a `file` entity.
      */
-    class File$1 {
+    class File {
         /**
          * @param data - An object that implements file data storage.
          * @param httpClient - Http client for API.
@@ -1840,34 +1902,6 @@
             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);
-            // TODO: replace with $get to handle fetch errors
-            const response = await fetch(`${this.httpClient.serverUrl}${pathname}`, {
-                headers: this.httpClient.headers,
-                signal,
-            });
-            // TODO: use ReadableStream pipeTo()
-            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, 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);
-        }
         /**
          * Active version number of the file.
          *
@@ -1930,8 +1964,8 @@
             (_k = (_s = this._data.status).geometryGltf) !== null && _k !== void 0 ? _k : (_s.geometryGltf = { state: "none" });
         }
         /**
-         * Returns a list of formats in which the active version of the file was exported. To export
-         * file to one of the supported formats create File Converter job using
+         * Returns a list of files in different formats in which the active version of the file was
+         * exported. To export file to one of the supported formats create File Converter job using
          * {@link File.createJob()}. To download exported file use {@link File.downloadResource()}.
          *
          * @readonly
@@ -2092,7 +2126,8 @@
          * @async
          */
         async checkout() {
-            this.data = await json(this.internalGet(""));
+            const response = await this.internalGet("");
+            this.data = await response.json();
             return this;
         }
         /**
@@ -2102,7 +2137,8 @@
          * @param data - Raw file data.
          */
         async update(data) {
-            this.data = await json(this.internalPut("", data));
+            const response = await this.internalPut("", data);
+            this.data = await response.json();
             return this;
         }
         /**
@@ -2112,7 +2148,7 @@
          * @returns Returns the raw data of a deleted file.
          */
         delete() {
-            return json(this.internalDelete(""));
+            return this.internalDelete("").then((response) => response.json());
         }
         /**
          * Save file data changes to the server. Call this method to update file data on the server
@@ -2137,12 +2173,8 @@
          *   target="_blank">File</a> object. Setting the `image` to `null` will remove the preview.
          */
         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;
         }
         /**
@@ -2151,7 +2183,9 @@
          * @async
          */
         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)));
         }
         // File does not support model transformation.
         getModelTransformMatrix(handle) {
@@ -2176,7 +2210,8 @@
          *   to get properties for all objects in the file.
          */
         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());
         }
         /**
          * Search pattern.
@@ -2221,7 +2256,7 @@
          * @returns {Promise<Properties[]>}
          */
         searchProperties(searchPattern) {
-            return json(this.internalPost("/properties/search", searchPattern));
+            return this.internalPost("/properties/search", searchPattern).then((response) => response.json());
         }
         /**
          * Returns the cda.json for an active version of the file.
@@ -2229,7 +2264,7 @@
          * @async
          */
         getCdaTree() {
-            return json(this.internalGet(`/properties/tree`));
+            return this.internalGet(`/properties/tree`).then((response) => response.json());
         }
         /**
          * Returns a list of file viewpoints.
@@ -2237,7 +2272,9 @@
          * @async
          */
         getViewpoints() {
-            return json(this.internalGet("/viewpoints")).then((viewpoints) => viewpoints.result);
+            return this.internalGet("/viewpoints")
+                .then((response) => response.json())
+                .then((viewpoints) => viewpoints.result);
         }
         /**
          * Add new file viewpoint. To create a new viewpoint use
@@ -2247,7 +2284,7 @@
          * @param viewpoint - Viewpoint.
          */
         saveViewpoint(viewpoint) {
-            return json(this.internalPost("/viewpoints", viewpoint));
+            return this.internalPost("/viewpoints", viewpoint).then((response) => response.json());
         }
         /**
          * Delete file viewpoint.
@@ -2257,7 +2294,7 @@
          * @returns Returns the raw data of a deleted viewpoint.
          */
         deleteViewpoint(guid) {
-            return json(this.internalDelete(`/viewpoints/${guid}`));
+            return this.internalDelete(`/viewpoints/${guid}`).then((response) => response.json());
         }
         /**
          * Returns viewpoint preview image as <a
@@ -2268,7 +2305,7 @@
          * @param guid - Viewpoint GUID.
          */
         getSnapshot(guid) {
-            return text(this.internalGet(`/viewpoints/${guid}/snapshot`));
+            return this.internalGet(`/viewpoints/${guid}/snapshot`).then((response) => response.text());
         }
         /**
          * Returns viewpoint preview data.
@@ -2278,7 +2315,7 @@
          * @param bitmapGuid - Bitmap GUID.
          */
         getSnapshotData(guid, bitmapGuid) {
-            return text(this.internalGet(`/viewpoints/${guid}/bitmaps/${bitmapGuid}`));
+            return this.internalGet(`/viewpoints/${guid}/bitmaps/${bitmapGuid}`).then((response) => response.text());
         }
         /**
          * Download source of active version of the file.
@@ -2290,33 +2327,67 @@
          *   and abort it if desired.
          */
         download(onProgress, signal) {
-            return this.internalGet(`/downloads`, signal)
-                .then((response) => downloadProgress(response, onProgress))
+            const relativePath = this.appendVersionParam("/downloads");
+            return this.httpClient
+                .downloadFile(`${this.path}${relativePath}`, onProgress, signal)
                 .then((response) => response.arrayBuffer());
         }
         /**
-         * Download file resource data of the active version of the file, such as exported file.
+         * Download a resource file of the active version of the file. Resource files are files that
+         * contain model scene descriptions, or geometry data, or exported files.
          *
          * @example <caption>Export file to DWG.</caption>
          *   const job = await file.crateJob("dwg");
          *   await job.waitForDone();
-         *   const resourceId = file.exports.find((x) => x.endsWith(".dwg"));
-         *   const arrayBuffer = await file.downloadResource(resourceId);
+         *   const dwgFileName = file.exports.find((x) => x.endsWith(".dwg"));
+         *   const arrayBuffer = await file.downloadResource(dwgFileName);
          *   const blob = new Blob([arrayBuffer]);
          *   const fileName = file.name.replace(/\.[^.]+$/, "") + ".dwg";
          *   FileSaver.saveAs(blob, fileName);
          *
-         * @param dataId - Resource ID.
+         * @param dataId - Resource file name.
          * @param onProgress - Download progress callback.
          * @param signal - An <a href="https://developer.mozilla.org/docs/Web/API/AbortSignal" target
          *   ="_blank">AbortSignal</a> object instance. Allows to communicate with a fetch request
          *   and abort it if desired.
          */
         downloadResource(dataId, onProgress, signal) {
-            return this.internalGet(`/downloads/${dataId}`, signal)
-                .then((response) => downloadProgress(response, onProgress))
+            const relativePath = this.appendVersionParam(`/downloads/${dataId}`);
+            return this.httpClient
+                .downloadFile(`${this.path}${relativePath}`, onProgress, signal)
+                .then((response) => response.arrayBuffer());
+        }
+        /**
+         * Download a part of resource file of the active version of the file. Resource files are
+         * files that contain model scene descriptions, or geometry data, or exported files.
+         *
+         * @param dataId - Resource file name.
+         * @param ranges - A range of resource file contents to download.
+         * @param requestId - Request ID for download progress callback.
+         * @param onProgress - Download progress callback.
+         * @param signal - An <a href="https://developer.mozilla.org/docs/Web/API/AbortSignal" target
+         *   ="_blank">AbortSignal</a> object instance. Allows to communicate with a fetch request
+         *   and abort it if desired.
+         */
+        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());
         }
+        /**
+         * Deprecated since `25.3`. Use {@link File.downloadResource()} instead.
+         */
+        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);
+        }
+        /**
+         * Deprecated since `25.3`. Use {@link File.downloadResourceRange()} instead.
+         */
+        async downloadFileRange(requestId, records, dataId, onProgress, signal) {
+            await this.downloadResourceRange(dataId, records, requestId, onProgress, signal);
+        }
         /**
          * Returns a list of references to files used to correct rendering of the current file.
          *
@@ -2326,7 +2397,7 @@
          *   signal object instance, which can be used to abort waiting as desired.
          */
         getReferences(signal) {
-            return json(this.internalGet("/references", signal));
+            return this.internalGet("/references", signal).then((response) => response.json());
         }
         /**
          * Set the file references.
@@ -2335,7 +2406,7 @@
          * @param references - File references.
          */
         setReferences(references) {
-            return json(this.internalPut("/references", references));
+            return this.internalPut("/references", references).then((response) => response.json());
         }
         /**
          * Create a new job for the active version of the file.
@@ -2358,9 +2429,9 @@
          *   for the File Converter tool in form "--arg=value".
          */
         createJob(outputFormat, parameters) {
-            const pathname = this.appendVersionParam("/jobs");
+            const relativePath = this.appendVersionParam("/jobs");
             return this.httpClient
-                .post(pathname, {
+                .post(relativePath, {
                 fileId: this.id,
                 outputFormat,
                 parameters: parseArgs(parameters),
@@ -2450,7 +2521,9 @@
          * @async
          */
         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)));
         }
         /**
          * Returns the permission information.
@@ -2459,7 +2532,9 @@
          * @param permissionId - Permission ID.
          */
         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));
         }
         /**
          * Create a new file permission.
@@ -2471,11 +2546,13 @@
          * @param public = false - Specifies whether all users have access to the file or not.
          */
         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,
                 public: _public,
-            })).then((data) => new Permission(data, this.id, this.httpClient));
+            })
+                .then((response) => response.json())
+                .then((data) => new Permission(data, this.id, this.httpClient));
         }
         /**
          * Delete file permission.
@@ -2485,7 +2562,7 @@
          * @returns Returns the raw data of a deleted permission.
          */
         deletePermission(permissionId) {
-            return json(this.internalDelete(`/permissions/${permissionId}`));
+            return this.internalDelete(`/permissions/${permissionId}`).then((response) => response.json());
         }
         /**
          * Upload the new version of the file to the server and extract the geometry and properties as needed.
@@ -2513,9 +2590,9 @@
             waitForDone: false,
         }) {
             const result = await this.httpClient
-                .postFile(`${this.path}/versions`, file, (progress) => { var _a; return (_a = params.onProgress) === null || _a === void 0 ? void 0 : _a.call(params, progress, file); })
+                .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((data) => new File(data, this.httpClient));
             if (params.geometry === undefined && this.geometryType !== "")
                 params.geometry = true;
             if (params.properties === undefined && this.status.properties.state !== "none")
@@ -2538,7 +2615,7 @@
         getVersions() {
             return this.internalGet("/versions")
                 .then((response) => response.json())
-                .then((files) => files.map((data) => new File$1(data, this.httpClient)))
+                .then((files) => files.map((data) => new File(data, this.httpClient)))
                 .then((files) => files.map((file) => (file.id == file.originalFileId ? file.useVersion(0) : file)));
         }
         /**
@@ -2550,7 +2627,7 @@
         getVersion(version) {
             return this.internalGet(`/versions/${version}`)
                 .then((response) => response.json())
-                .then((data) => new File$1(data, this.httpClient))
+                .then((data) => new File(data, this.httpClient))
                 .then((file) => (file.id == file.originalFileId ? file.useVersion(0) : file));
         }
         /**
@@ -2561,9 +2638,9 @@
          */
         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;
         }
         /**
          * Replace the active version of the file with the selected version.
@@ -2603,6 +2680,27 @@
         }
     }
 
+    ///////////////////////////////////////////////////////////////////////////////
+    // Copyright (C) 2002-2021, Open Design Alliance (the "Alliance").
+    // All rights reserved.
+    //
+    // This software and its documentation and related materials are owned by
+    // the Alliance. The software may only be incorporated into application
+    // programs owned by members of the Alliance, subject to a signed
+    // Membership Agreement and Supplemental Software License Agreement with the
+    // Alliance. The structure and organization of this software are the valuable
+    // trade secrets of the Alliance and its suppliers. The software is also
+    // protected by copyright law and international treaty provisions. Application
+    // programs incorporating this software must include the following statement
+    // with their copyright notices:
+    //
+    //   This application incorporates Open Design Alliance software pursuant to a
+    //   license agreement with Open Design Alliance.
+    //   Open Design Alliance Copyright (C) 2002-2021 by Open Design Alliance.
+    //   All rights reserved.
+    //
+    // By use of this software, its documentation or related materials, you
+    // acknowledge and accept the above terms.
     ///////////////////////////////////////////////////////////////////////////////
     /**
      * A roles determines what permissions {@link User | users} have on a {@link Project | project}.
@@ -2685,7 +2783,8 @@
          * @async
          */
         async checkout() {
-            this.data = await json(this.internalGet());
+            const response = await this.internalGet();
+            this.data = await response.json();
             return this;
         }
         /**
@@ -2695,7 +2794,8 @@
          * @param data - Raw role data.
          */
         async update(data) {
-            this.data = await json(this.internalPut(data));
+            const response = await this.internalPut(data);
+            this.data = await response.json();
             return this;
         }
         /**
@@ -2705,7 +2805,7 @@
          * @returns Returns the raw data of a deleted role.
          */
         delete() {
-            return json(this.internalDelete());
+            return this.internalDelete().then((response) => response.json());
         }
         /**
          * Save role data changes to the server. Call this method to update role data on the server
@@ -2803,7 +2903,8 @@
          * @async
          */
         async checkout() {
-            this.data = await json(this.internalGet());
+            const response = await this.internalGet();
+            this.data = await response.json();
             return this;
         }
         /**
@@ -2813,7 +2914,8 @@
          * @param data - Raw member data.
          */
         async update(data) {
-            this.data = await json(this.internalPut(data));
+            const response = await this.internalPut(data);
+            this.data = await response.json();
             return this;
         }
         /**
@@ -2823,7 +2925,7 @@
          * @returns Returns the raw data of a deleted member.
          */
         delete() {
-            return json(this.internalDelete());
+            return this.internalDelete().then((response) => response.json());
         }
         /**
          * Save member data changes to the server. Call this method to update member data on the
@@ -3022,7 +3124,8 @@
          * @async
          */
         async checkout() {
-            this.data = await json(this.internalGet(""));
+            const response = await this.internalGet("");
+            this.data = await response.json();
             return this;
         }
         /**
@@ -3032,7 +3135,8 @@
          * @param data - Raw project data.
          */
         async update(data) {
-            this.data = await json(this.internalPut("", data));
+            const response = await this.internalPut("", data);
+            this.data = await response.json();
             return this;
         }
         /**
@@ -3042,7 +3146,9 @@
          * @returns Returns the raw data of a deleted project.
          */
         delete() {
-            return text(this.internalDelete("")).then((text) => {
+            return this.internalDelete("")
+                .then((response) => response.text())
+                .then((text) => {
                 // TODO fix for server 23.5 and below
                 try {
                     return JSON.parse(text);
@@ -3075,12 +3181,8 @@
          *   target="_blank">File</a> object. Setting the `image` to `null` will remove the preview.
          */
         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;
         }
         /**
@@ -3090,7 +3192,9 @@
          * @async
          */
         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)));
         }
         /**
          * Returns the role information.
@@ -3099,7 +3203,9 @@
          * @param name - Role name.
          */
         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));
         }
         /**
          * Create a new project role.
@@ -3111,11 +3217,13 @@
          *   {@link Role#permissions | Role.permissions} for more details.
          */
         createRole(name, description, permissions) {
-            return json(this.internalPost("/roles", {
+            return this.internalPost("/roles", {
                 name,
                 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));
         }
         /**
          * Delete project role.
@@ -3125,7 +3233,7 @@
          * @returns Returns the raw data of a deleted role.
          */
         deleteRole(name) {
-            return json(this.internalDelete(`/roles/${name}`));
+            return this.internalDelete(`/roles/${name}`).then((response) => response.json());
         }
         /**
          * Returns a list of project members.
@@ -3133,7 +3241,9 @@
          * @async
          */
         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)));
         }
         /**
          * Returns the member information.
@@ -3142,7 +3252,9 @@
          * @param memberId - Member ID.
          */
         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));
         }
         /**
          * Add a user to the project to become a member and have permission to perform actions.
@@ -3152,7 +3264,9 @@
          * @param role - User role from the list of project roles.
          */
         addMember(userId, role) {
-            return json(this.internalPost("/members", { userId, role })).then((data) => new Member(data, this.id, this.httpClient));
+            return this.internalPost("/members", { userId, role })
+                .then((response) => response.json())
+                .then((data) => new Member(data, this.id, this.httpClient));
         }
         /**
          * Remove a member from a project.
@@ -3162,7 +3276,7 @@
          * @returns Returns the raw data of a deleted member.
          */
         removeMember(memberId) {
-            return json(this.internalDelete(`/members/${memberId}`));
+            return this.internalDelete(`/members/${memberId}`).then((response) => response.json());
         }
         /**
          * Information about the file (model) that can be reference in the project topics.
@@ -3183,7 +3297,10 @@
          * @async
          */
         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) => {
                         return (item.display_information.find((x) => x.field_display_name === displayName) || {}).field_value;
@@ -3206,7 +3323,10 @@
                     const updatedByUserName = getFieldValue("Updated By User Name");
                     const updatedByFullName = userFullName(updatedByFirstName, updatedByLastName, updatedByUserName);
                     const updatedByInitials = userInitials(updatedByFullName);
-                    item.display_information.push({ field_display_name: "Updated By Avatar URL", field_value: updatedByAvatarUrl });
+                    item.display_information.push({
+                        field_display_name: "Updated By Avatar URL",
+                        field_value: updatedByAvatarUrl,
+                    });
                     item.display_information.push({ field_display_name: "Updated By Full Name", field_value: updatedByFullName });
                     item.display_information.push({ field_display_name: "Updated By Initials", field_value: updatedByInitials });
                     // geometryType since 24.12
@@ -3391,11 +3511,13 @@
          */
         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 };
             }
             return this;
@@ -3410,11 +3532,13 @@
          */
         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}`, { userBrief: data }));
+                const response = await this.httpClient.put(`/users/${this.id}`, { userBrief: data });
+                const newData = await response.json();
                 this.data = { id: newData.id, ...newData.userBrief };
             }
             return this;
@@ -3432,7 +3556,10 @@
          * @returns Returns the raw data of a deleted user.
          */
         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 = "";
@@ -3467,21 +3594,25 @@
         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 };
                 }
             }
             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 };
                 }
             }
@@ -3507,7 +3638,7 @@
             this._user = null;
         }
         /**
-         * Open Cloud Server URL. Use {@link Client#configure | configure()} to change server URL.
+         * Open Cloud Server URL. Use {@link Client.configure()} to change server URL.
          *
          * @readonly
          */
@@ -3515,8 +3646,7 @@
             return this._serverUrl;
         }
         /**
-         * Deprecated since `25.3`. Use [Viewer.options]{@link Viewer#options} instead to change
-         * Viewer parameters.
+         * Deprecated since `25.3`. Use {@link Viewer.options()} instead to change Viewer parameters.
          */
         get options() {
             console.warn("Client.options has been deprecated since 25.3 and will be removed in a future release, use Viewer.options instead.");
@@ -3587,7 +3717,7 @@
                 .then((data) => ({
                 ...data,
                 server: data.version,
-                client: "25.3.15",
+                client: "25.3.18",
             }));
         }
         /**
@@ -3643,7 +3773,8 @@
         async signInWithEmail(email, password) {
             const credentials = btoa(unescape(encodeURIComponent(email + ":" + password)));
             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);
         }
         /**
@@ -3655,7 +3786,8 @@
          */
         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);
         }
         // Save the current logged in user information for internal use.
@@ -3686,7 +3818,9 @@
          * @async
          */
         getUsers() {
-            return json(this._httpClient.get("/users"))
+            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)));
         }
@@ -3700,12 +3834,16 @@
          */
         getUser(userId) {
             if (userId === this._httpClient.signInUserId) {
-                return json(this._httpClient.get("/user"))
+                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}`))
+                return this._httpClient
+                    .get(`/users/${userId}`)
+                    .then((response) => response.json())
                     .then((data) => ({ id: data.id, ...data.userBrief }))
                     .then((data) => new User(data, this._httpClient));
             }
@@ -3730,7 +3868,8 @@
          */
         createUser(email, password, params = {}) {
             const { isAdmin, userName, ...rest } = params;
-            return json(this._httpClient.post("/users", {
+            return this._httpClient
+                .post("/users", {
                 isAdmin,
                 userBrief: {
                     ...rest,
@@ -3738,7 +3877,8 @@
                     userName: userName !== null && userName !== void 0 ? userName : (email + "").split("@").at(0),
                 },
                 password,
-            }))
+            })
+                .then((response) => response.json())
                 .then((data) => ({ id: data.id, ...data.userBrief }))
                 .then((data) => new User(data, this._httpClient));
         }
@@ -3756,7 +3896,10 @@
          * @returns Returns the raw data of a deleted user.
          */
         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();
                 }
@@ -3818,10 +3961,13 @@
             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) => {
                 return {
                     ...files,
-                    result: files.result.map((data) => new File$1(data, this._httpClient)),
+                    result: files.result.map((data) => new File(data, this._httpClient)),
                 };
             });
         }
@@ -3832,7 +3978,10 @@
          * @param fileId - File ID.
          */
         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));
         }
         /**
          * Upload a drawing or reference file to the server.
@@ -3870,13 +4019,13 @@
             waitForDone: false,
         }) {
             const result = await this._httpClient
-                .postFile("/files", file, (progress) => {
+                .uploadFile("/files", file, (progress) => {
                 var _a;
                 this.emitEvent({ type: "uploadprogress", data: progress, 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((data) => new File(data, this._httpClient));
             const geometryType = typeof params.geometry === "string" ? params.geometry : "vsfx";
             const jobs = [];
             if (params.geometry)
@@ -3895,7 +4044,7 @@
          * @returns Returns the raw data of a deleted file.
          */
         deleteFile(fileId) {
-            return json(this._httpClient.delete(`/files/${fileId}`));
+            return this._httpClient.delete(`/files/${fileId}`).then((response) => response.json());
         }
         /**
          * Download the drawing or reference file.
@@ -3909,8 +4058,7 @@
          */
         downloadFile(fileId, onProgress, signal) {
             return this._httpClient
-                .get(`/files/${fileId}/downloads`, signal)
-                .then((response) => downloadProgress(response, onProgress))
+                .downloadFile(`/files/${fileId}/downloads`, onProgress, signal)
                 .then((response) => response.arrayBuffer());
         }
         /**
@@ -3956,7 +4104,10 @@
             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)),
             }));
@@ -3968,7 +4119,10 @@
          * @param jobId - Job ID.
          */
         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));
         }
         /**
          * Create a new job.
@@ -4007,7 +4161,7 @@
          * @returns Returns the raw data of a deleted job.
          */
         deleteJob(jobId) {
-            return json(this._httpClient.delete(`/jobs/${jobId}`));
+            return this._httpClient.delete(`/jobs/${jobId}`).then((response) => response.json());
         }
         /**
          * Result for assembly list.
@@ -4056,7 +4210,10 @@
             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) => {
                 return {
                     ...assemblies,
                     result: assemblies.result.map((data) => new Assembly(data, this._httpClient)),
@@ -4070,7 +4227,10 @@
          * @param assemblyId - Assembly ID.
          */
         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));
         }
         /**
          * Create a new assembly.
@@ -4097,7 +4257,7 @@
          * @returns Returns the raw data of a deleted assembly.
          */
         deleteAssembly(assemblyId) {
-            return json(this._httpClient.delete(`/assemblies/${assemblyId}`));
+            return this._httpClient.delete(`/assemblies/${assemblyId}`).then((response) => response.json());
         }
         /**
          * Result for project list.
@@ -4142,7 +4302,9 @@
             let queryString = searchParams.toString();
             if (queryString)
                 queryString = "?" + queryString;
-            return json(this._httpClient.get(`/projects${queryString}`))
+            return this._httpClient
+                .get(`/projects${queryString}`)
+                .then((response) => response.json())
                 .then((projects) => {
                 // fix for server 23.5 and below
                 if (Array.isArray(projects)) {
@@ -4179,7 +4341,10 @@
          * @param projectId - Project ID.
          */
         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));
         }
         /**
          * Create a new project.
@@ -4194,13 +4359,16 @@
          *   target="_blank">Data URL</a>.
          */
         createProject(name, description, startDate, endDate, avatarUrl) {
-            return json(this._httpClient.post("/projects", {
+            return this._httpClient
+                .post("/projects", {
                 name,
                 description,
                 startDate: startDate instanceof Date ? startDate.toISOString() : startDate,
                 endDate: endDate instanceof Date ? endDate.toISOString() : endDate,
                 avatarUrl,
-            })).then((data) => new Project(data, this._httpClient));
+            })
+                .then((response) => response.json())
+                .then((data) => new Project(data, this._httpClient));
         }
         /**
          * Delete the project from the server.
@@ -4210,7 +4378,10 @@
          * @returns Returns the raw data of a deleted project.
          */
         deleteProject(projectId) {
-            return text(this._httpClient.delete(`/projects/${projectId}`)).then((text) => {
+            return this._httpClient
+                .delete(`/projects/${projectId}`)
+                .then((response) => response.text())
+                .then((text) => {
                 // fix for server 23.5 and below
                 try {
                     return JSON.parse(text);
@@ -4223,12 +4394,12 @@
     }
 
     ///////////////////////////////////////////////////////////////////////////////
-    const version = "25.3.15";
+    const version = "25.3.18";
 
     exports.Assembly = Assembly;
     exports.ClashTest = ClashTest;
     exports.Client = Client;
-    exports.File = File$1;
+    exports.File = File;
     exports.Job = Job;
     exports.Member = Member;
     exports.Model = Model;