@inweb/client 25.3.17 → 25.3.18

package/lib/Api/Assembly.d.ts

@@ -18,11 +18,9 @@ export declare class Assembly {
     constructor(data: any, httpClient: IHttpClient);
     appendVersionParam(relativePath: string): string;
     protected internalGet(relativePath: string, signal?: AbortSignal): Promise<Response>;
-    protected internalPost(relativePath: string, body?: ArrayBuffer | Blob | globalThis.File | FormData | object | string | null): Promise<Response>;
-    protected internalPut(relativePath: string, body?: ArrayBuffer | Blob | globalThis.File | FormData | object | string | null): Promise<Response>;
+    protected internalPost(relativePath: string, body?: BodyInit | object): Promise<Response>;
+    protected internalPut(relativePath: string, body?: BodyInit | object): Promise<Response>;
     protected internalDelete(relativePath: string): Promise<Response>;
-    partialDownloadResource(dataId: string, onProgress?: (progress: number, downloaded: Uint8Array) => void, signal?: AbortSignal): Promise<void>;
-    downloadFileRange(requestId: number, records: any | null, dataId: string, onProgress?: (progress: number, downloaded: Uint8Array, requestId: number) => void, signal?: AbortSignal): Promise<void>;
     get activeVersion(): number;
     /**
      * List of unique files from which the assembly was created.
@@ -134,7 +132,7 @@ export declare class Assembly {
      * @async
      */
     save(): Promise<Assembly>;
-    setPreview(image?: ArrayBuffer | Blob | globalThis.File | FormData | string | null): Promise<Awaited<this>>;
+    setPreview(image: BodyInit | null): Promise<Awaited<this>>;
     /**
      * Returns list of assembly models.
      *
@@ -219,16 +217,42 @@ export declare class Assembly {
     getSnapshot(guid: any): Promise<any>;
     getSnapshotData(guid: any, bitmapGuid: any): Promise<string>;
     /**
-     * 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: string, onProgress?: (progress: number) => void, signal?: AbortSignal): Promise<ArrayBuffer>;
+    downloadResource(dataId: string, onProgress?: (progress: number, chunk: Uint8Array) => void, signal?: AbortSignal): Promise<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: string, ranges: Array<{
+        begin: number;
+        end: number;
+        requestId: number;
+    }>, requestId: number, onProgress?: (progress: number, chunk: Uint8Array, requestId: number) => void, signal?: AbortSignal): Promise<ArrayBuffer>;
+    /**
+     * Deprecated since `25.3`. Use {@link Assembly.downloadResource()} instead.
+     */
+    partialDownloadResource(dataId: string, onProgress?: (progress: number, chunk: Uint8Array) => void, signal?: AbortSignal): Promise<ArrayBuffer>;
+    /**
+     * Deprecated since `25.3`. Use {@link Assembly.downloadResourceRange()} instead.
+     */
+    downloadFileRange(requestId: number, records: any | null, dataId: string, onProgress?: (progress: number, chunk: Uint8Array, requestId: number) => void, signal?: AbortSignal): Promise<void>;
     getReferences(signal?: AbortSignal): Promise<{
         fileId: string;
         references: any[];

package/lib/Api/ClashTest.d.ts

@@ -14,7 +14,7 @@ export declare class ClashTest {
      */
     constructor(data: any, basePath: string, httpClient: IHttpClient);
     protected internalGet(relativePath: string): Promise<any>;
-    protected internalPut(relativePath: string, body?: ArrayBuffer | Blob | globalThis.File | FormData | object | string | null): Promise<any>;
+    protected internalPut(relativePath: string, body?: BodyInit | object): Promise<any>;
     protected internalDelete(relativePath: string): Promise<any>;
     /**
      * The type of the clashes that the test detects:

package/lib/Api/Client.d.ts

@@ -24,14 +24,13 @@ export declare class Client extends EventEmitter2<ClientEventMap> {
         url?: string;
     });
     /**
-     * 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
      */
     get serverUrl(): string;
     /**
-     * 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(): any;
     /**

package/lib/Api/Fetch.d.ts

@@ -0,0 +1,6 @@
+export declare function $fetch(url: string, params?: {
+    method: "GET" | "POST" | "PUT" | "DELETE";
+    headers?: HeadersInit;
+    body?: BodyInit | object;
+    signal?: AbortSignal;
+}): Promise<Response>;

package/lib/Api/{impl/FetchError.d.ts → FetchError.d.ts}

@@ -1,3 +1,5 @@
+export declare function statusText(status: number): string;
+export declare function error400(text: string, _default?: string): any;
 /**
  * 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

package/lib/Api/File.d.ts

@@ -22,8 +22,6 @@ export declare class File {
     private internalPost;
     private internalPut;
     private internalDelete;
-    partialDownloadResource(dataId: string, onProgress?: (progress: number, downloaded: Uint8Array) => void, signal?: AbortSignal): Promise<void>;
-    downloadFileRange(requestId: number, records: any | null, dataId: string, onProgress?: (progress: number, downloaded: Uint8Array, requestId: number) => void, signal?: AbortSignal): Promise<void>;
     /**
      * Active version number of the file.
      *
@@ -52,8 +50,8 @@ export declare class File {
     get data(): any;
     private set data(value);
     /**
-     * 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
@@ -211,7 +209,7 @@ export declare class File {
      *   Web API <a href="https://developer.mozilla.org/docs/Web/API/File"
      *   target="_blank">File</a> object. Setting the `image` to `null` will remove the preview.
      */
-    setPreview(image?: ArrayBuffer | Blob | globalThis.File | FormData | string | null): Promise<File>;
+    setPreview(image: BodyInit | null): Promise<File>;
     /**
      * Returns a list of models of the active version of the file.
      *
@@ -334,24 +332,50 @@ export declare class File {
      */
     download(onProgress?: (progress: number) => void, signal?: AbortSignal): Promise<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: string, onProgress?: (progress: number) => void, signal?: AbortSignal): Promise<ArrayBuffer>;
+    downloadResource(dataId: string, onProgress?: (progress: number, chunk: Uint8Array) => void, signal?: AbortSignal): Promise<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: string, ranges: Array<{
+        begin: number;
+        end: number;
+        requestId: number;
+    }>, requestId: number, onProgress?: (progress: number, chunk: Uint8Array, requestId: number) => void, signal?: AbortSignal): Promise<ArrayBuffer>;
+    /**
+     * Deprecated since `25.3`. Use {@link File.downloadResource()} instead.
+     */
+    partialDownloadResource(dataId: string, onProgress?: (progress: number, downloaded: Uint8Array) => void, signal?: AbortSignal): Promise<ArrayBuffer>;
+    /**
+     * Deprecated since `25.3`. Use {@link File.downloadResourceRange()} instead.
+     */
+    downloadFileRange(requestId: number, records: any | null, dataId: string, onProgress?: (progress: number, downloaded: Uint8Array, requestId: number) => void, signal?: AbortSignal): Promise<void>;
     /**
      * Returns a list of references to files used to correct rendering of the current file.
      *

package/lib/Api/HttpClient.d.ts

@@ -5,8 +5,14 @@ export declare class HttpClient implements IHttpClient {
     signInUserId: string;
     constructor(serverUrl: string);
     get(relativePath: string, signal?: AbortSignal): Promise<Response>;
-    post(relativePath: string, body?: string | object | ArrayBuffer | Blob | globalThis.File | FormData): Promise<Response>;
-    put(relativePath: string, body?: string | object | ArrayBuffer | Blob | globalThis.File | FormData): Promise<Response>;
+    post(relativePath: string, body?: BodyInit | object): Promise<Response>;
+    put(relativePath: string, body?: BodyInit | object): Promise<Response>;
     delete(relativePath: string): Promise<Response>;
-    postFile(relativePath: string, file: globalThis.File, onProgress?: (progress: number) => void): Promise<XMLHttpRequest>;
+    uploadFile(relativePath: string, file: File, onProgress?: (progress: number) => void): Promise<XMLHttpRequest>;
+    downloadFile(relativePath: string, onProgress?: (progress: number, chunk: Uint8Array) => void, signal?: AbortSignal): Promise<Response>;
+    downloadFileRange(relativePath: string, ranges: Array<{
+        begin: number;
+        end: number;
+        requestId: number;
+    }>, onProgress?: (progress: number, chunk: Uint8Array, requestId: number) => void, signal?: AbortSignal): Promise<Response>;
 }

package/lib/Api/IHttpClient.d.ts

@@ -2,9 +2,15 @@ export interface IHttpClient {
     serverUrl: string;
     headers: HeadersInit;
     signInUserId: string;
-    get(relativePath: any, signal?: AbortSignal): Promise<Response>;
-    post(relativePath: string, body?: ArrayBuffer | Blob | globalThis.File | FormData | object | string | null): Promise<Response>;
-    put(relativePath: string, body?: ArrayBuffer | Blob | globalThis.File | FormData | object | string | null): Promise<Response>;
+    get(relativePath: string, signal?: AbortSignal): Promise<Response>;
+    post(relativePath: string, body?: BodyInit | object): Promise<Response>;
+    put(relativePath: string, body?: BodyInit | object): Promise<Response>;
     delete(relativePath: string): Promise<Response>;
-    postFile(relativePath: string, file: globalThis.File, onProgress?: (progress: number) => void): Promise<XMLHttpRequest>;
+    uploadFile(relativePath: string, file: globalThis.File, onProgress?: (progress: number) => void): Promise<XMLHttpRequest>;
+    downloadFile(relativePath: string, onProgress?: (progress: number, chunk: Uint8Array) => void, signal?: AbortSignal): Promise<Response>;
+    downloadFileRange(relativePath: string, ranges: Array<{
+        begin: number;
+        end: number;
+        requestId: number;
+    }>, onProgress?: (progress: number, chunk: Uint8Array, requestId: number) => void, signal?: AbortSignal): Promise<Response>;
 }

package/lib/Api/Job.d.ts

@@ -12,7 +12,7 @@ export declare class Job {
      */
     constructor(data: any, httpClient: IHttpClient);
     protected internalGet(): Promise<Response>;
-    protected internalPut(body?: ArrayBuffer | Blob | globalThis.File | FormData | object | string | null): Promise<Response>;
+    protected internalPut(body?: BodyInit | object): Promise<Response>;
     protected internalDelete(): Promise<Response>;
     /**
      * The ID of the assembly the job is working on (internal).

package/lib/Api/Model.d.ts

@@ -29,8 +29,8 @@ export declare class Model {
     get data(): any;
     private set 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
      */
@@ -54,8 +54,8 @@ export declare class Model {
      */
     get fileId(): string;
     /**
-     * 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
      */
@@ -146,18 +146,42 @@ export declare class Model {
      */
     getSnapshotData(guid: string, bitmapGuid: string): Promise<string>;
     /**
-     * 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
      *   and abort it if desired.
      */
-    downloadResource(dataId: string, onProgress?: (progress: number) => void, signal?: AbortSignal): Promise<ArrayBuffer>;
-    partialDownloadResource(dataId: string, onProgress?: (progress: number, downloaded: Uint8Array) => void, signal?: AbortSignal): Promise<void>;
-    downloadFileRange(requestId: number, records: any | null, dataId: string, onProgress?: (progress: number, downloaded: Uint8Array, requestId: number) => void, signal?: AbortSignal): Promise<void>;
+    downloadResource(dataId: string, onProgress?: (progress: number, chunk: Uint8Array) => void, signal?: AbortSignal): Promise<ArrayBuffer>;
+    /**
+     * 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: string, ranges: Array<{
+        begin: number;
+        end: number;
+        requestId: number;
+    }>, requestId: number, onProgress?: (progress: number, chunk: Uint8Array, requestId: number) => void, signal?: AbortSignal): Promise<ArrayBuffer>;
+    /**
+     * Deprecated since `25.3`. Use {@link Model.downloadResource()} instead.
+     */
+    partialDownloadResource(dataId: string, onProgress?: (progress: number, chunk: Uint8Array) => void, signal?: AbortSignal): Promise<ArrayBuffer>;
+    /**
+     * Deprecated since `25.3`. Use {@link Model.downloadResourceRange()} instead.
+     */
+    downloadFileRange(requestId: number, records: any | null, dataId: string, onProgress?: (progress: number, chunk: Uint8Array, requestId: number) => void, signal?: AbortSignal): Promise<void>;
     /**
      * Returns a list of references to files used to extract geometry data.
      *

package/lib/Api/Project.d.ts

@@ -14,8 +14,8 @@ export declare class Project {
      */
     constructor(data: any, httpClient: IHttpClient);
     protected internalGet(relativePath: string): Promise<Response>;
-    protected internalPost(relativePath: string, body?: ArrayBuffer | Blob | globalThis.File | FormData | object | string | null): Promise<Response>;
-    protected internalPut(relativePath: string, body?: ArrayBuffer | Blob | globalThis.File | FormData | object | string | null): Promise<Response>;
+    protected internalPost(relativePath: string, body?: BodyInit | object): Promise<Response>;
+    protected internalPut(relativePath: string, body?: BodyInit | object): Promise<Response>;
     protected internalDelete(relativePath: string): Promise<Response>;
     /**
      * Project features the user has access to.
@@ -162,7 +162,7 @@ export declare class Project {
      *   Web API <a href="https://developer.mozilla.org/docs/Web/API/File"
      *   target="_blank">File</a> object. Setting the `image` to `null` will remove the preview.
      */
-    setPreview(image?: ArrayBuffer | Blob | globalThis.File | FormData | string | null): Promise<this>;
+    setPreview(image: BodyInit | null): Promise<this>;
     /**
      * Returns a list of project roles. Project {@link Member | members} have different abilities
      * depending on the role they have in a project.

package/lib/Api/User.d.ts

@@ -192,5 +192,5 @@ export declare class User {
      *   Web API <a href="https://developer.mozilla.org/docs/Web/API/File"
      *   target="_blank">File</a> object. Setting the `image` to `null` will remove the avatar.
      */
-    setAvatar(image?: ArrayBuffer | Blob | globalThis.File | FormData | string | null): Promise<User>;
+    setAvatar(image: BodyInit | null): Promise<User>;
 }

package/lib/Api/Utils.d.ts

@@ -0,0 +1,11 @@
+export declare function waitFor(func: (params: any) => Promise<boolean>, params?: {
+    timeout?: number;
+    interval?: number;
+    signal?: AbortSignal;
+    abortError?: DOMException;
+    timeoutError?: DOMException;
+    result?: any;
+}): Promise<any>;
+export declare function parseArgs(args: string | object): object;
+export declare function userFullName(firstName: string | any, lastName?: string, userName?: string): string;
+export declare function userInitials(fullName?: string): string;

package/lib/Api/XMLHttp.d.ts

@@ -0,0 +1,7 @@
+export declare function $xmlhttp(url: string, params?: {
+    method: "GET" | "POST" | "PUT" | "DELETE";
+    headers?: HeadersInit;
+    body?: XMLHttpRequestBodyInit;
+    uploadProgress?: (progress: number) => void;
+    downloadProgress?: (progress: number) => void;
+}): Promise<XMLHttpRequest>;

package/lib/index.d.ts

@@ -10,5 +10,5 @@ export { Permission } from "./Api/Permission";
 export { Project } from "./Api/Project";
 export { Role } from "./Api/Role";
 export { User } from "./Api/User";
-export { parseArgs, userFullName, userInitials, waitFor } from "./Api/impl/Utils";
+export { parseArgs, userFullName, userInitials, waitFor } from "./Api/Utils";
 export declare const version = "CLIENT_JS_VERSION";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/client",
-  "version": "25.3.17",
+  "version": "25.3.18",
   "description": "JavaScript REST API client for the Open Cloud Server",
   "homepage": "https://cloud.opendesign.com/docs/index.html",
   "license": "SEE LICENSE IN LICENSE",

package/src/Api/Assembly.ts

@@ -26,8 +26,8 @@ import { IAssociatedFileData, IAssemblyVersionInfo } from "./IAssembly";
 import { IShortUserDescription } from "./IUser";
 import { Model } from "./Model";
 import { ClashTest } from "./ClashTest";
-import { json, downloadProgress, downloadPartOfFile, waitFor, userFullName, userInitials } from "./impl/Utils";
-import { FetchError } from "./impl/FetchError";
+import { waitFor, userFullName, userInitials } from "./Utils";
+import { FetchError } from "./FetchError";
 
 /**
  * The class representing a `assembly` entity.
@@ -50,7 +50,6 @@ export class Assembly {
 
   public appendVersionParam(relativePath: string): string {
     if (this._useVersion === undefined) return relativePath;
-
     const delimiter = relativePath.includes("?") ? "&" : "?";
     return `${relativePath}${delimiter}version=${this._useVersion}`;
   }
@@ -60,18 +59,12 @@ export class Assembly {
     return this.httpClient.get(`${this.path}${relativePath}`, signal);
   }
 
-  protected internalPost(
-    relativePath: string,
-    body?: ArrayBuffer | Blob | globalThis.File | FormData | object | string | null
-  ) {
+  protected internalPost(relativePath: string, body?: BodyInit | object) {
     relativePath = this.appendVersionParam(relativePath);
     return this.httpClient.post(`${this.path}${relativePath}`, body);
   }
 
-  protected internalPut(
-    relativePath: string,
-    body?: ArrayBuffer | Blob | globalThis.File | FormData | object | string | null
-  ) {
+  protected internalPut(relativePath: string, body?: BodyInit | object) {
     relativePath = this.appendVersionParam(relativePath);
     return this.httpClient.put(`${this.path}${relativePath}`, body);
   }
@@ -81,52 +74,6 @@ export class Assembly {
     return this.httpClient.delete(`${this.path}${relativePath}`);
   }
 
-  async partialDownloadResource(
-    dataId: string,
-    onProgress?: (progress: number, downloaded: Uint8Array) => void,
-    signal?: AbortSignal
-  ): Promise<void> {
-    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 = response.headers.get("Content-Length") ?? "";
-    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: number,
-    records: any | null,
-    dataId: string,
-    onProgress?: (progress: number, downloaded: Uint8Array, requestId: number) => void,
-    signal?: AbortSignal
-  ): Promise<void> {
-    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(): number {
@@ -285,7 +232,8 @@ export class Assembly {
    * @async
    */
   async checkout(): Promise<Assembly> {
-    this.data = await json(this.internalGet(""));
+    const response = await this.internalGet("");
+    this.data = await response.json();
     return this;
   }
 
@@ -296,7 +244,8 @@ export class Assembly {
    * @param data - Raw assembly data.
    */
   async update(data: any): Promise<Assembly> {
-    this.data = await json(this.internalPut("", data));
+    const response = await this.internalPut("", data);
+    this.data = await response.json();
     return this;
   }
 
@@ -307,7 +256,7 @@ export class Assembly {
    * @returns Returns the raw data of a deleted assembly.
    */
   delete(): Promise<any> {
-    return json(this.internalDelete(""));
+    return this.internalDelete("").then((response) => response.json());
   }
 
   /**
@@ -322,7 +271,7 @@ export class Assembly {
 
   // Reserved for future use
 
-  setPreview(image?: ArrayBuffer | Blob | globalThis.File | FormData | string | null) {
+  setPreview(image: BodyInit | null) {
     console.warn("Assembly does not support preview");
     return Promise.resolve(this);
   }
@@ -333,7 +282,9 @@ export class Assembly {
    * @async
    */
   getModels(): Promise<Model[]> {
-    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: any) => new Model(data, this)));
   }
 
   /**
@@ -384,7 +335,8 @@ export class Assembly {
    * @returns {Promise<any>}
    */
   getProperties(handles?: string | string[]): Promise<any[]> {
-    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());
   }
 
   /**
@@ -414,7 +366,7 @@ export class Assembly {
    * @param searchPattern - Search pattern or combination of the patterns, see example below.
    */
   searchProperties(searchPattern: any): Promise<any[]> {
-    return json(this.internalPost("/properties/search", searchPattern));
+    return this.internalPost("/properties/search", searchPattern).then((response) => response.json());
   }
 
   /**
@@ -423,7 +375,7 @@ export class Assembly {
    * @async
    */
   getCdaTree(): Promise<any[]> {
-    return json(this.internalGet(`/properties/tree`));
+    return this.internalGet(`/properties/tree`).then((response) => response.json());
   }
 
   // Reserved for future use
@@ -454,10 +406,11 @@ export class Assembly {
   }
 
   /**
-   * 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
@@ -465,14 +418,67 @@ export class Assembly {
    */
   downloadResource(
     dataId: string,
-    onProgress?: (progress: number) => void,
+    onProgress?: (progress: number, chunk: Uint8Array) => void,
     signal?: AbortSignal
   ): Promise<ArrayBuffer> {
-    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: string,
+    ranges: Array<{ begin: number; end: number; requestId: number }>,
+    requestId: number,
+    onProgress?: (progress: number, chunk: Uint8Array, requestId: number) => void,
+    signal?: AbortSignal
+  ): Promise<ArrayBuffer> {
+    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: string,
+    onProgress?: (progress: number, chunk: Uint8Array) => void,
+    signal?: AbortSignal
+  ): Promise<ArrayBuffer> {
+    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: number,
+    records: any | null,
+    dataId: string,
+    onProgress?: (progress: number, chunk: Uint8Array, requestId: number) => void,
+    signal?: AbortSignal
+  ): Promise<void> {
+    await this.downloadResourceRange(dataId, records, requestId, onProgress, signal);
+  }
+
   // Reserved for future use
 
   getReferences(signal?: AbortSignal) {