@inweb/viewer-visualize 26.5.0 → 26.5.2

package/src/Viewer/Loaders/{VsfXPartialLoader.ts → VSFXPartialLoader.ts}

@@ -21,20 +21,37 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { BaseLoader } from "./BaseLoader";
-import { UpdaterController, UpdateType } from "./UpdaterController";
+import { Loader } from "@inweb/viewer-core";
+import { Viewer } from "../Viewer";
+import { UpdateController, UpdateType } from "./UpdateController";
 
 const PENDING_REQUESTS_SIZE = 50;
 const PENDING_REQUESTS_TIMEOUT = 250;
 
-export class VsfXPartialLoader extends BaseLoader {
-  override async load(): Promise<void> {
-    if (!this.viewer.visualizeJs) return;
+export class VSFXPartialLoader extends Loader {
+  public viewer: Viewer;
+  public abortControllerForRequestMap: Map<number, AbortController>;
+
+  constructor(viewer: Viewer) {
+    super();
+    this.viewer = viewer;
+    this.abortControllerForRequestMap = new Map();
+  }
+
+  override isSupport(file: any): boolean {
+    return (
+      typeof file === "object" &&
+      typeof file.downloadResource === "function" &&
+      /.vsfx$/i.test(file.database) &&
+      (this.viewer.options.enablePartialMode === true || /.rcs$/i.test(file.name))
+    );
+  }
+
+  override async load(model: any, format?: string): Promise<this> {
+    if (!this.viewer.visualizeJs) return this;
 
     const visLib = this.viewer.visLib();
     const visViewer = visLib.getViewer();
-    const abortController = new AbortController();
-    const abortControllerForRequestMap = new Map();
     let servicePartAborted = false;
 
     const pendingRequestsMap = new Map();
@@ -42,49 +59,46 @@ export class VsfXPartialLoader extends BaseLoader {
     const pendingRequestsAbortHandler = () => clearTimeout(pendingRequestsTimerId);
 
     const pendingRequestsAbortController = new AbortController();
-    abortControllerForRequestMap.set(0, pendingRequestsAbortController);
-
-    const updaterController = new UpdaterController();
-    updaterController.initialize(this.viewer);
+    this.abortControllerForRequestMap.set(0, pendingRequestsAbortController);
 
-    this.viewer._abortController = abortController;
-    this.viewer._abortControllerForRequestMap = abortControllerForRequestMap;
+    const updateController = new UpdateController();
+    updateController.initialize(this.viewer);
 
-    visViewer.memoryLimit = this.options.memoryLimit;
+    visViewer.memoryLimit = this.viewer.options.memoryLimit;
 
     const chunkLoadHandler = (progress: number, chunk: Uint8Array, requestId = 0) => {
       if (!this.viewer.visualizeJs) return;
 
       const state = visViewer.parseVsfxInPartialMode(requestId, chunk);
-      updaterController.update(UpdateType.kDelay);
+      updateController.update(UpdateType.kDelay);
 
-      this.viewer.emitEvent({ type: "geometryprogress", data: progress, model: this.model });
+      this.viewer.emitEvent({ type: "geometryprogress", data: progress, file: model.file, model });
 
       if (state) {
-        updaterController.update(UpdateType.kForce);
+        updateController.update(UpdateType.kForce);
 
         this.viewer.syncOpenCloudVisualStyle(false);
         this.viewer.syncOptions();
         this.viewer.syncOverlay();
         this.viewer.resize();
 
-        this.viewer.emitEvent({ type: "databasechunk", data: chunk, model: this.model });
+        this.viewer.emitEvent({ type: "databasechunk", data: chunk, file: model.file, model });
       } else {
-        this.viewer.emitEvent({ type: "geometrychunk", data: chunk, model: this.model });
+        this.viewer.emitEvent({ type: "geometrychunk", data: chunk, file: model.file, model });
       }
     };
 
     const downloadResourceRange = async (dataId: string, requestId: number, ranges: any) => {
       const abortCtrl = new AbortController();
-      abortControllerForRequestMap.set(requestId, abortCtrl);
+      this.abortControllerForRequestMap.set(requestId, abortCtrl);
       try {
-        await this.model.downloadResourceRange(dataId, requestId, ranges, chunkLoadHandler, abortCtrl.signal);
+        await model.downloadResourceRange(dataId, requestId, ranges, chunkLoadHandler, abortCtrl.signal);
       } catch (error: any) {
-        this.viewer.emitEvent({ type: "geometryerror", data: error, model: this.model });
+        this.viewer.emitEvent({ type: "geometryerror", data: error, file: model.file, model });
       } finally {
         ranges.forEach((range) => visViewer.onRequestResponseComplete(range.requestId));
-        abortControllerForRequestMap.delete(requestId);
-        updaterController.update(UpdateType.kNormal);
+        this.abortControllerForRequestMap.delete(requestId);
+        updateController.update(UpdateType.kNormal);
       }
     };
 
@@ -106,31 +120,31 @@ export class VsfXPartialLoader extends BaseLoader {
       onServicePartReceived: (bHasIndex: boolean) => {
         if (bHasIndex) {
           servicePartAborted = true;
-          abortController.abort();
+          this.abortController.abort();
         }
       },
 
       onRequest: (requestId: number, records: any) => {
         const ranges = requestRecordsToRanges(requestId, records);
-        downloadResourceRange(this.model.database, requestId, ranges);
+        downloadResourceRange(model.database, requestId, ranges);
       },
 
       onFullLoaded: () => {
-        updaterController.update(UpdateType.kNormal);
+        updateController.update(UpdateType.kNormal);
       },
 
       onRequestResponseParsed: (requestId: number) => {
-        abortControllerForRequestMap.delete(requestId);
-        updaterController.update(UpdateType.kNormal);
+        this.abortControllerForRequestMap.delete(requestId);
+        updateController.update(UpdateType.kNormal);
       },
 
       onRequestAborted: (requestId: number) => {
-        const abortCtrl = abortControllerForRequestMap.get(requestId);
+        const abortCtrl = this.abortControllerForRequestMap.get(requestId);
         if (abortCtrl) abortCtrl.abort();
       },
 
       onRequestResourceFile: (requestId: number, _: string, records: any) => {
-        const dataId = `${this.model.fileId}${this.model.file.type}`;
+        const dataId = `${model.fileId}${model.file.type}`;
         const ranges = requestRecordsToRanges(requestId, records);
 
         let pendingRanges = [];
@@ -186,21 +200,17 @@ export class VsfXPartialLoader extends BaseLoader {
     visViewer.attachPartialResolver(objectHandler);
 
     try {
-      this.viewer.emitEvent({ type: "geometrystart", model: this.model });
-
-      await this.model.downloadResource(this.model.database, chunkLoadHandler, abortController.signal).catch((e) => {
-        if (!servicePartAborted) throw e;
-      });
+      await model.downloadResource(model.database, chunkLoadHandler, this.abortController.signal);
+    } catch (e) {
+      window.clearTimeout(pendingRequestsTimerId);
+      if (!servicePartAborted) throw e;
+    }
 
-      this.viewer.emitEvent({ type: "geometryend", model: this.model });
-    } catch (e: any) {
-      if (pendingRequestsTimerId) {
-        window.clearTimeout(pendingRequestsTimerId);
-        pendingRequestsTimerId = 0;
-      }
+    return this;
+  }
 
-      this.viewer.emitEvent({ type: "geometryerror", data: e, model: this.model });
-      throw e;
-    }
+  override cancel(): void {
+    super.cancel();
+    this.abortControllerForRequestMap.forEach((controller) => controller.abort());
   }
 }

package/src/Viewer/Loaders/{VsfXStreamingLoader.ts → VSFXStreamingLoader.ts}

@@ -21,21 +21,37 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-import { BaseLoader } from "./BaseLoader";
-import { UpdaterController, UpdateType } from "./UpdaterController";
+import { Loader } from "@inweb/viewer-core";
+import { Viewer } from "../Viewer";
+import { UpdateController, UpdateType } from "./UpdateController";
 
-export class VsfXStreamingLoader extends BaseLoader {
-  override async load(): Promise<void> {
-    if (!this.viewer.visualizeJs) return;
+export class VSFXStreamingLoader extends Loader {
+  public viewer: Viewer;
+
+  constructor(viewer: Viewer) {
+    super();
+    this.viewer = viewer;
+  }
+
+  override isSupport(file: any): boolean {
+    return (
+      typeof file === "object" &&
+      typeof file.downloadResource === "function" &&
+      /.vsfx$/i.test(file.database) &&
+      this.viewer.options.enableStreamingMode === true &&
+      this.viewer.options.enablePartialMode === false &&
+      !/.rcs$/i.test(file.name)
+    );
+  }
+
+  override async load(model: any): Promise<this> {
+    if (!this.viewer.visualizeJs) return this;
 
     const visLib = this.viewer.visLib();
     const visViewer = visLib.getViewer();
-    const abortController = new AbortController();
-
-    const updaterController = new UpdaterController();
-    updaterController.initialize(this.viewer);
 
-    this.viewer._abortController = abortController;
+    const updateController = new UpdateController();
+    updateController.initialize(this.viewer);
 
     let isFireDatabaseChunk = false;
 
@@ -43,9 +59,9 @@ export class VsfXStreamingLoader extends BaseLoader {
       if (!this.viewer.visualizeJs) return;
 
       const status = visViewer.parseVsfx(chunk);
-      updaterController.update(UpdateType.kDelay);
+      updateController.update(UpdateType.kDelay);
 
-      this.viewer.emitEvent({ type: "geometryprogress", data: progress, model: this.model });
+      this.viewer.emitEvent({ type: "geometryprogress", data: progress, file: model.file, model });
 
       let state = false;
       if (
@@ -57,32 +73,26 @@ export class VsfXStreamingLoader extends BaseLoader {
       }
 
       if (state) {
-        updaterController.update(UpdateType.kForce);
+        updateController.update(UpdateType.kForce);
 
         this.viewer.syncOpenCloudVisualStyle(false);
         this.viewer.syncOptions();
         this.viewer.syncOverlay();
         this.viewer.resize();
 
-        this.viewer.emitEvent({ type: "databasechunk", data: chunk, model: this.model });
+        this.viewer.emitEvent({ type: "databasechunk", data: chunk, file: model.file, model });
       } else {
-        this.viewer.emitEvent({ type: "geometrychunk", data: chunk, model: this.model });
+        this.viewer.emitEvent({ type: "geometrychunk", data: chunk, file: model.file, model });
       }
     };
 
     console.time("File load time");
-    try {
-      this.viewer.emitEvent({ type: "geometrystart", model: this.model });
 
-      await this.model.downloadResource(this.model.database, chunkLoadHandler, abortController.signal);
-      console.timeEnd("File load time");
+    await model.downloadResource(model.database, chunkLoadHandler, this.abortController.signal);
+    updateController.update(UpdateType.kNormal);
 
-      updaterController.update(UpdateType.kNormal);
+    console.timeEnd("File load time");
 
-      this.viewer.emitEvent({ type: "geometryend", model: this.model });
-    } catch (error: any) {
-      this.viewer.emitEvent({ type: "geometryerror", data: error, model: this.model });
-      throw error;
-    }
+    return Promise.resolve(this);
   }
 }

package/src/Viewer/Loaders/index.ts

@@ -0,0 +1,108 @@
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2002-2025, 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-2025 by Open Design Alliance.
+//   All rights reserved.
+//
+// By use of this software, its documentation or related materials, you
+// acknowledge and accept the above terms.
+///////////////////////////////////////////////////////////////////////////////
+
+import { ILoadersRegistry, loadersRegistry } from "@inweb/viewer-core";
+
+import { VSFModelLoader } from "./VSFModelLoader";
+import { VSFBufferLoader } from "./VSFBufferLoader";
+import { VSFXModelLoader } from "./VSFXModelLoader";
+import { VSFXStreamingLoader } from "./VSFXStreamingLoader";
+import { VSFXPartialLoader } from "./VSFXPartialLoader";
+import { VSFXBufferLoader } from "./VSFXBufferLoader";
+
+/**
+ * Viewer loaders registry. Use this registry to register custom loaders.
+ *
+ * To implement custom loader:
+ *
+ * 1. Define a loader class implements {@link ILoader}.
+ * 2. Define a constructor with a `viewer` parameter.
+ * 3. Override {@link ILoader.isSupport} and сheck if the loader can load the specified file.
+ * 4. Override {@link ILoader.load} and define the logic for loading the model from the file.
+ *
+ *    The loader should do:
+ *
+ *    - Load model data from file. The model data must be a `VSFX` data buffer of `VSFX` data chunk.
+ *    - Parse model data with the `VisualizeJS` viewer instance.
+ *    - Synchronize viewer styles, options and overlay.
+ *    - Update the viewer.
+ *
+ *    The loader must emit events:
+ *
+ *    - `geometryprogress` - during loading. If progress is not supported, emit it once with a value of 100%
+ *         after the load is complete.
+ *    - `databasechunk` - when model is loaded and ready to render.
+ * 5. Override {@link ILoader.dispose} and release loader resources, if required.
+ * 6. Register loader provider in the loaders registry by calling the {@link loaders.registerLoader}.
+ *
+ * @example Implementing a custom loader.
+ *
+ * ```javascript
+ * import { Loader } from "@inweb/viewer-core";
+ * import { loaders, Viewer } from "@inweb/viewer-visualize";
+ *
+ * class MyLoader extends Loader {
+ *   public viewer: Viewer;
+ *
+ *   constructor(viewer: Viewer) {
+ *     super();
+ *     this.viewer = viewer;
+ *   }
+ *
+ *   override isSupport(file, format): Boolean {
+ *     // place custom logic here
+ *     return ...;
+ *   }
+ *
+ *   override load(file, format, params): Promise<this> {
+ *
+ *     // place custom loading logic here
+ *     const data = ...
+ *
+ *     this.viewer.visualizeJs.getViewer().parseVsfx(data);
+ *
+ *     this.viewer.syncOpenCloudVisualStyle(false);
+ *     this.viewer.syncOptions();
+ *     this.viewer.syncOverlay();
+ *     this.viewer.resize();
+ *
+ *     this.viewer.emitEvent({ type: "databasechunk", data: model, file });
+ *
+ *     return Promise.resove(this);
+ *   };
+ * }
+ *
+ * loaders.registerLoader("MyLoader", (viewer) => new MyLoader(viewer));
+ * ```
+ */
+export const loaders: ILoadersRegistry = loadersRegistry("visualizejs");
+
+// build-in loaders
+
+loaders.registerLoader("vsf", (viewer: any) => new VSFModelLoader(viewer));
+loaders.registerLoader("vsf-buffer", (viewer: any) => new VSFBufferLoader(viewer));
+
+loaders.registerLoader("vsfx", (viewer: any) => new VSFXModelLoader(viewer));
+loaders.registerLoader("vsfx-streaming", (viewer: any) => new VSFXStreamingLoader(viewer));
+loaders.registerLoader("vsfx-partial", (viewer: any) => new VSFXPartialLoader(viewer));
+loaders.registerLoader("vsfx-buffer", (viewer: any) => new VSFXBufferLoader(viewer));

package/src/Viewer/Viewer.ts

@@ -27,10 +27,12 @@ import {
   CANVAS_EVENTS,
   CanvasEventMap,
   Dragger,
+  FileSource,
   IClippingPlane,
   IComponent,
   IEntity,
   IDragger,
+  ILoader,
   IOrthogonalCamera,
   IOptions,
   IPoint,
@@ -45,9 +47,9 @@ import { IMarkup, IWorldTransform } from "@inweb/markup";
 import { draggers } from "./Draggers";
 import { commands } from "./Commands";
 import { components } from "./Components";
+import { loaders } from "./Loaders";
 
 import { loadVisualizeJs } from "./utils";
-import { LoaderFactory } from "./Loaders/LoaderFactory";
 import { MarkupFactory, MarkupType } from "./Markup/MarkupFactory";
 
 const OVERLAY_VIEW_NAME = "$OVERLAY_VIEW_NAME";
@@ -81,10 +83,9 @@ export class Viewer
   private _markup: IMarkup;
   public canvas: HTMLCanvasElement | undefined;
 
-  public _abortController: AbortController | undefined;
-  public _abortControllerForRequestMap: Map<string, AbortController> | undefined;
   public _abortControllerForReferences: AbortController | undefined;
   public client: Client | undefined;
+  public loaders: Array<ILoader>;
 
   /**
    * @param client - The `Client` instance that is used to load model reference files from the Open Cloud
@@ -114,6 +115,7 @@ export class Viewer
     this._options = new Options(this);
 
     this.client = client;
+    this.loaders = [];
 
     this._activeDragger = null;
     this._components = [];
@@ -802,6 +804,7 @@ export class Viewer
   async loadReferences(model: Model | File | Assembly): Promise<this> {
     if (!this.visualizeJs) return this;
     if (!this.client) return this;
+    if (!model.getReferences) return this;
 
     const abortController = new AbortController();
     this._abortControllerForReferences?.abort();
@@ -845,71 +848,39 @@ export class Viewer
     this.update();
   }
 
-  /**
-   * Loads a file from Open Cloud Server into the viewer.
-   *
-   * The file geometry data on the server must be converted to `VSFX` format.
-   *
-   * To open a large file, enable {@link IOptions.enablePartialMode | partial streaming} mode before
-   * opening (see example below).
-   *
-   * This method requires a `Client` instance to be specified when creating the viewer to load model
-   * reference files from the Open Cloud Server. For a standalone viewer instance use
-   * {@link openVsfFile | openVsfFile()} or {@link openVsfxFile | openVsfxFile()}.
-   *
-   * If there was an active dragger before opening the file, it will be deactivated. After opening the
-   * file, you must manually activate the required dragger.
-   *
-   * Fires:
-   *
-   * - {@link OpenEvent | open}
-   * - {@link GeometryStartEvent | geometrystart}
-   * - {@link GeometryProgressEvent | geometryprogress}
-   * - {@link DatabaseChunkEvent | databasechunk}
-   * - {@link GeometryChunkEvent | geometrychunk}
-   * - {@link GeometryEndEvent | geometryend}
-   * - {@link GeometryErrorEvent | geometryerror}
-   *
-   * @example Using partial streaming mode to open a large file from a server.
-   *
-   * ```javascript
-   * viewer.options.enableStreamingMode = true;
-   * viewer.options.enablePartialMode = true;
-   * await viewer.open(file);
-   * ```
-   *
-   * @param file - File, assembly or specific model to load. If a `File` instance with multiple models is
-   *   specified, the default model will be loaded. If there is no default model, first availiable model
-   *   will be loaded.
-   */
-  async open(file: File | Assembly | Model): Promise<this> {
+  async open(file: FileSource, params: { format?: string; mode?: string } = {}): Promise<this> {
     if (!this.visualizeJs) return this;
 
     this.cancel();
     this.clear();
 
-    this.emitEvent({ type: "open", file, model: file });
+    this.emitEvent({ type: "open", file });
 
-    let model: Model | undefined = undefined;
-    if (file) {
-      const models = (await file.getModels()) || [];
-      model = models.find((model: Model) => model.default) || models[0];
-    }
-    if (!model) throw new Error("No default model found");
-
-    const overrideOptions = new Options();
-    overrideOptions.data = this._options.data;
-    if (file.type === ".rcs" && !overrideOptions.enablePartialMode) {
-      console.log("Partial streaming mode is forced for RCS file");
-      overrideOptions.enableStreamingMode = true;
-      overrideOptions.enablePartialMode = true;
+    let model: any = file;
+    if (model && typeof model.getModels === "function") {
+      const models = await model.getModels();
+      model = models.find((model: Model) => model.default) || models[0] || file;
     }
+    if (!model) throw new Error(`Format not supported`);
 
-    const loaderFactory = new LoaderFactory();
-    const loader = loaderFactory.create(this, model, overrideOptions);
+    let format = params.format;
+    if (!format && typeof model.type === "string") format = model.type.split(".").pop();
+    if (!format && typeof file === "string") format = file.split(".").pop();
+    if (!format && file instanceof globalThis.File) format = file.name.split(".").pop();
 
-    await this.loadReferences(model);
-    await loader.load();
+    const loader = loaders.createLoader(this, model, format);
+    if (!loader) throw new Error(`Format not supported`);
+    this.loaders.push(loader);
+
+    this.emitEvent({ type: "geometrystart", file, model });
+    try {
+      await this.loadReferences(model);
+      await loader.load(model, format, params);
+    } catch (error: any) {
+      this.emitEvent({ type: "geometryerror", data: error, file, model });
+      throw error;
+    }
+    this.emitEvent({ type: "geometryend", file, model });
 
     if (this.visualizeJs) {
       this.applyModelTransformMatrix(model);
@@ -920,24 +891,7 @@ export class Viewer
   }
 
   /**
-   * Loads a `VSF` file into the viewer.
-   *
-   * This method does not support {@link IOptions.enableStreamingMode | streaming} or
-   * {@link IOptions.enablePartialMode | partial streaming} mode.
-   *
-   * If there was an active dragger before opening the file, it will be deactivated. After opening the
-   * file, you must manually activate the required dragger.
-   *
-   * Fires:
-   *
-   * - {@link OpenEvent | open}
-   * - {@link GeometryStartEvent | geometrystart}
-   * - {@link GeometryProgressEvent | geometryprogress}
-   * - {@link DatabaseChunkEvent | databasechunk}
-   * - {@link GeometryEndEvent | geometryend}
-   * - {@link GeometryErrorEvent | geometryerror}
-   *
-   * @param buffer - Binary data buffer to load.
+   * Deprecated since `26.4`. Use {@link open | open()} instead.
    */
   openVsfFile(buffer: Uint8Array | ArrayBuffer): this {
     if (!this.visualizeJs) return this;
@@ -945,14 +899,13 @@ export class Viewer
     this.cancel();
     this.clear();
 
-    this.emitEvent({ type: "open", buffer });
-
-    try {
-      this.emitEvent({ type: "geometrystart", buffer });
+    this.emitEvent({ type: "open", file: buffer });
 
-      const visLib = this.visLib();
-      const visViewer = visLib.getViewer();
+    const visLib = this.visLib();
+    const visViewer = visLib.getViewer();
 
+    this.emitEvent({ type: "geometrystart", file: buffer });
+    try {
       const data = buffer instanceof Uint8Array ? buffer : new Uint8Array(buffer);
       visViewer.parseFile(data);
 
@@ -961,13 +914,13 @@ export class Viewer
       this.syncOverlay();
       this.resize();
 
-      this.emitEvent({ type: "geometryprogress", data: 1, buffer });
-      this.emitEvent({ type: "databasechunk", data, buffer });
-      this.emitEvent({ type: "geometryend", buffer });
+      this.emitEvent({ type: "geometryprogress", data: 1, file: buffer });
+      this.emitEvent({ type: "databasechunk", data, file: buffer });
     } catch (error: any) {
-      this.emitEvent({ type: "geometryerror", data: error, buffer });
+      this.emitEvent({ type: "geometryerror", data: error, file: buffer });
       throw error;
     }
+    this.emitEvent({ type: "geometryend", file: buffer });
 
     return this;
   }
@@ -998,14 +951,13 @@ export class Viewer
     this.cancel();
     this.clear();
 
-    this.emitEvent({ type: "open", buffer });
-
-    try {
-      this.emitEvent({ type: "geometrystart", buffer });
+    this.emitEvent({ type: "open", file: buffer });
 
-      const visLib = this.visLib();
-      const visViewer = visLib.getViewer();
+    const visLib = this.visLib();
+    const visViewer = visLib.getViewer();
 
+    this.emitEvent({ type: "geometrystart", file: buffer });
+    try {
       const data = buffer instanceof Uint8Array ? buffer : new Uint8Array(buffer);
       visViewer.parseVsfx(data);
 
@@ -1014,13 +966,13 @@ export class Viewer
       this.syncOverlay();
       this.resize();
 
-      this.emitEvent({ type: "geometryprogress", data: 1, buffer });
-      this.emitEvent({ type: "databasechunk", data, buffer });
-      this.emitEvent({ type: "geometryend", buffer });
+      this.emitEvent({ type: "geometryprogress", data: 1, file: buffer });
+      this.emitEvent({ type: "databasechunk", data, file: buffer });
     } catch (error: any) {
-      this.emitEvent({ type: "geometryerror", data: error, buffer });
+      this.emitEvent({ type: "geometryerror", data: error, file: buffer });
       throw error;
     }
+    this.emitEvent({ type: "geometryend", file: buffer });
 
     return this;
   }
@@ -1029,14 +981,9 @@ export class Viewer
     this._abortControllerForReferences?.abort();
     this._abortControllerForReferences = undefined;
 
-    this._abortController?.abort();
-    this._abortController = undefined;
-
-    this._abortControllerForRequestMap?.forEach((controller) => controller.abort());
-    this._abortControllerForRequestMap = undefined;
+    this.loaders.forEach((loader) => loader.cancel());
 
     this.emitEvent({ type: "cancel" });
-
     return this;
   }
 
@@ -1054,6 +1001,9 @@ export class Viewer
     visViewer.clear();
     visViewer.createLocalDatabase();
 
+    this.loaders.forEach((loader) => loader.dispose());
+    this.loaders = [];
+
     this.syncOpenCloudVisualStyle(true);
     this.syncOptions();
     this.syncOverlay();