@inweb/viewer-visualize 25.3.18 → 25.3.20

package/src/Viewer/Loaders/VsfXPartialLoader.ts

@@ -74,15 +74,11 @@ export class VsfXPartialLoader extends BaseLoader {
     };
 
     const downloadResourceRange = async (dataId: string, requestId: number, ranges: any) => {
-      console.log("--- VsfXPartialLoader.downloadResourceRange", dataId, requestId, ranges);
-
       const abortCtrl = new AbortController();
       abortControllerForRequestMap.set(requestId, abortCtrl);
       try {
-        await this.model.downloadResourceRange(dataId, ranges, requestId, chunkLoadHandler, abortCtrl.signal);
-      } catch (error) {
-        console.log("--- VsfXPartialLoader.downloadResourceRange error", dataId, requestId, error);
-
+        await this.model.downloadResourceRange(dataId, requestId, ranges, chunkLoadHandler, abortCtrl.signal);
+      } catch (error: any) {
         this.viewer.emitEvent({ type: "geometryerror", data: error, model: this.model });
       } finally {
         ranges.forEach((range) => visViewer.onRequestResponseComplete(range.requestId));
@@ -107,8 +103,6 @@ export class VsfXPartialLoader extends BaseLoader {
 
     const objectHandler = {
       onServicePartReceived: (bHasIndex: boolean) => {
-        console.log("--- VsfXPartialLoader.onServicePartReceived", bHasIndex);
-
         if (bHasIndex) {
           servicePartAborted = true;
           abortController.abort();
@@ -117,38 +111,27 @@ export class VsfXPartialLoader extends BaseLoader {
 
       onRequest: (requestId: number, records: any) => {
         const ranges = requestRecordsToRanges(requestId, records);
-
-        console.log("--- VsfXPartialLoader.onRequest", this.model.database, requestId, ranges);
-
         downloadResourceRange(this.model.database, requestId, ranges);
       },
 
       onFullLoaded: () => {
-        console.log("--- VsfXPartialLoader.onFullLoaded");
-
         updaterController.update(UpdateType.kNormal);
       },
 
       onRequestResponseParsed: (requestId: number) => {
-        console.log("--- VsfXPartialLoader.onRequestResponseParsed", requestId);
-
         abortControllerForRequestMap.delete(requestId);
         updaterController.update(UpdateType.kNormal);
       },
 
       onRequestAborted: (requestId: number) => {
-        console.log("--- VsfXPartialLoader.onRequestAborted", requestId);
-
         const abortCtrl = abortControllerForRequestMap.get(requestId);
         if (abortCtrl) abortCtrl.abort();
       },
 
-      onRequestResourceFile: (requestId: number, dataId: string, records: any) => {
-        // const dataId = `${this.model.fileId}${this.model.file.type}`;
+      onRequestResourceFile: (requestId: number, _: string, records: any) => {
+        const dataId = `${this.model.fileId}${this.model.file.type}`;
         const ranges = requestRecordsToRanges(requestId, records);
 
-        console.log("--- VsfXPartialLoader.onRequestResourceFile", dataId, requestId, ranges);
-
         let pendingRanges = [];
         let requestNumber = 0;
         const pendingRequest = pendingRequestsMap.get(dataId);
@@ -159,8 +142,6 @@ export class VsfXPartialLoader extends BaseLoader {
 
         // first several records of each file are processed without grouping (they usually require to be processed sequentially)
         if (requestNumber <= 5) {
-          console.log("--- VsfXPartialLoader.onRequestResourceFile: requestNumber <= 5");
-
           pendingRequestsMap.set(dataId, { ranges: [], number: requestNumber + 1 });
           downloadResourceRange(dataId, requestId, ranges);
           return;
@@ -170,8 +151,6 @@ export class VsfXPartialLoader extends BaseLoader {
 
         // group requests to each file to launch a combined server request
         if (pendingRanges.length >= PENDING_REQUESTS_SIZE) {
-          console.log("--- VsfXPartialLoader.onRequestResourceFile: pendingRanges.length >", PENDING_REQUESTS_SIZE);
-
           if (pendingRequestsTimerId) {
             window.clearTimeout(pendingRequestsTimerId);
             pendingRequestsTimerId = 0;
@@ -187,8 +166,6 @@ export class VsfXPartialLoader extends BaseLoader {
         // set timeout to wait for the new requests, after that process the remaining requests
         if (pendingRequestsTimerId === 0) {
           pendingRequestsTimerId = window.setTimeout(() => {
-            console.log("--- VsfXPartialLoader.onRequestResourceFile: timer", PENDING_REQUESTS_SIZE);
-
             pendingRequestsAbortController.signal.removeEventListener("abort", pendingRequestsAbortHandler);
             pendingRequestsTimerId = 0;
 
@@ -217,7 +194,7 @@ export class VsfXPartialLoader extends BaseLoader {
         });
 
       this.viewer.emitEvent({ type: "geometryend", model: this.model });
-    } catch (error) {
+    } catch (error: any) {
       if (pendingRequestsTimerId) {
         window.clearTimeout(pendingRequestsTimerId);
         pendingRequestsTimerId = 0;

package/src/Viewer/Loaders/VsfXStreamingLoader.ts

@@ -79,7 +79,7 @@ export class VsfXStreamingLoader extends BaseLoader {
       updaterController.update(UpdateType.kNormal);
 
       this.viewer.emitEvent({ type: "geometryend", model: this.model });
-    } catch (error) {
+    } catch (error: any) {
       this.viewer.emitEvent({ type: "geometryerror", data: error, model: this.model });
       throw error;
     }

package/src/Viewer/Viewer.ts

@@ -27,11 +27,11 @@ import {
   CANVAS_EVENTS,
   commands,
   IClippingPlane,
+  IOptions,
   IOrthogonalCamera,
   IViewpoint,
   IViewer,
   Options,
-  OptionsData,
   OptionsEventMap,
   ViewerEventMap,
 } from "@inweb/viewer-core";
@@ -74,14 +74,14 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
   private _renderTime: DOMHighResTimeStamp;
 
   protected _options: Options;
-  protected _visualizeJsUrl: string;
+  protected _visualizeJsUrl = "";
   protected _abortControllerForReferences: AbortController | undefined;
 
   private canvaseventlistener: (event: Event) => void;
 
   public draggerFactory: Map<string, typeof OdBaseDragger>;
   public canvasEvents: string[];
-  private frameId: number;
+  private frameId = 0;
   private _resizeObserver: ResizeObserver | undefined;
   public canvas: HTMLCanvasElement | undefined;
   public markup: IMarkup;
@@ -89,7 +89,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
   public visualizeJs: any;
   public _abortController: AbortController | undefined;
   public _abortControllerForRequestMap: Map<string, AbortController> | undefined;
-  public client: Client;
+  public client: Client | undefined;
 
   /**
    * @param client - The `Client` instance that provides access to a server. Do not specify
@@ -107,9 +107,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
    */
   constructor(
     client?: Client,
-    params: { visualizeJsUrl?: string; enableAutoUpdate?: boolean; markupType?: MarkupType } = {
-      markupType: MarkupType.Konva,
-    }
+    params: { visualizeJsUrl?: string; enableAutoUpdate?: boolean; markupType?: MarkupType } = {}
   ) {
     super();
     this.configure(params);
@@ -119,6 +117,8 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
     this.client = client;
 
     this._activeDragger = null;
+    this._zoomWheelDragger = null;
+    this._gestureManager = null;
     this._renderTime = 0;
 
     this.markup = MarkupFactory.createMarkup(params.markupType ?? MarkupType.Konva);
@@ -335,7 +335,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
    * @param force - If `true` updates the viewer immidietly. Otherwise updates on next
    *   animation frame. Default is `false`.
    */
-  update(force?: boolean) {
+  update(force = false) {
     if (this._enableAutoUpdate) {
       if (force) {
         this.visViewer()?.update();
@@ -455,7 +455,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
     return this;
   }
 
-  syncOptions(options: OptionsData = this.options.data): this {
+  syncOptions(options: IOptions = this.options): this {
     if (!this.visualizeJs) return this;
 
     const visLib = this.visLib();
@@ -526,7 +526,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
     return this;
   }
 
-  syncHighlightingOptions(options: OptionsData = this.options.data): this {
+  syncHighlightingOptions(options: IOptions = this.options): this {
     if (!this.visualizeJs) return this;
 
     const params = options.enableCustomHighlight ? options : Options.defaults();
@@ -774,12 +774,13 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
    */
   async loadReferences(model: Model | File | Assembly): Promise<this> {
     if (!this.visualizeJs) return this;
+    if (!this.client) return this;
 
     const abortController = new AbortController();
     this._abortControllerForReferences?.abort();
     this._abortControllerForReferences = abortController;
 
-    let references = [];
+    let references: any[] = [];
     await model
       .getReferences(abortController.signal)
       .then((data) => (references = data.references))
@@ -849,8 +850,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
 
     this.emitEvent({ type: "open", file, model: file });
 
-    let model: Model;
-
+    let model: Model | undefined = undefined;
     if (file) {
       const models = (await file.getModels()) || [];
       model = models.find((model: Model) => model.default) || models[0];
@@ -865,7 +865,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
     }
 
     const loaderFactory = new LoaderFactory();
-    const loader = loaderFactory.create(this, model, overrideOptions.data);
+    const loader = loaderFactory.create(this, model, overrideOptions);
 
     await this.loadReferences(model);
     await loader.load();
@@ -916,7 +916,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
       this.emitEvent({ type: "geometryprogress", data: 1, buffer });
       this.emitEvent({ type: "databasechunk", data, buffer });
       this.emitEvent({ type: "geometryend", buffer });
-    } catch (error) {
+    } catch (error: any) {
       this.emitEvent({ type: "geometryerror", data: error, buffer });
       throw error;
     }
@@ -962,7 +962,7 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
       this.emitEvent({ type: "geometryprogress", data: 1, buffer });
       this.emitEvent({ type: "databasechunk", data, buffer });
       this.emitEvent({ type: "geometryend", buffer });
-    } catch (error) {
+    } catch (error: any) {
       this.emitEvent({ type: "geometryerror", data: error, buffer });
       throw error;
     }

package/src/Viewer/utils.ts

@@ -21,7 +21,7 @@
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
 
-export function loadScript(url: string) {
+export function loadScript(url: string): Promise<HTMLScriptElement> {
   return new Promise((resolve, reject) => {
     const script = document.createElement("script");
     script.src = url;
@@ -35,16 +35,7 @@ export function loadScript(url: string) {
   });
 }
 
-export const memoize = (f) => {
-  const cache = {};
-  return (...args) => {
-    const argStr = JSON.stringify(args);
-    cache[argStr] = cache[argStr] || f(...args);
-    return cache[argStr];
-  };
-};
-
-function loadVisuazlizeJsScript(url) {
+function loadVisuazlizeJsScript(url: string): Promise<HTMLScriptElement> {
   if (window["getVisualizeLibInst"]) {
     const script = window["getVisualizeLibInst"].script;
     if (script) {
@@ -56,7 +47,7 @@ function loadVisuazlizeJsScript(url) {
   return loadScript(url);
 }
 
-export const loadVisualizeJs = (url: string, onprogress) => {
+export const loadVisualizeJs = (url: string, onprogress): Promise<any> => {
   return loadVisuazlizeJsScript(url).then((script) => {
     return new Promise((resolve, reject) => {
       const instance = window["getVisualizeLibInst"]({

package/src/index.ts

@@ -23,6 +23,6 @@
 
 import "./Viewer/Commands";
 
-export { commands, Options } from "@inweb/viewer-core";
+export * from "@inweb/viewer-core";
 export { Viewer } from "./Viewer/Viewer";
 export { OdBaseDragger } from "./Viewer/Draggers/Common/OdBaseDragger";