@inweb/viewer-visualize 25.3.17 → 25.3.19

package/src/Viewer/Loaders/VsfXPartialLoader.ts

@@ -24,6 +24,9 @@
 import { BaseLoader } from "./BaseLoader";
 import { UpdaterController, UpdateType } from "./UpdaterController";
 
+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;
@@ -35,8 +38,6 @@ export class VsfXPartialLoader extends BaseLoader {
     let servicePartAborted = false;
 
     const pendingRequestsMap = new Map();
-    const PENDING_REQUESTS_SIZE = 50;
-    const PENDING_REQUESTS_TIMEOUT = 250;
     let pendingRequestsTimerId = 0;
     const pendingRequestsAbortHandler = () => clearTimeout(pendingRequestsTimerId);
 
@@ -51,10 +52,10 @@ export class VsfXPartialLoader extends BaseLoader {
 
     visViewer.memoryLimit = this.options.memoryLimit;
 
-    const requestLoadHandler = (progress, data, requestId) => {
+    const chunkLoadHandler = (progress: number, chunk: Uint8Array, requestId = 0) => {
       if (!this.viewer.visualizeJs) return;
 
-      const state = visViewer.parseVsfxInPartialMode(requestId, data);
+      const state = visViewer.parseVsfxInPartialMode(requestId, chunk);
       updaterController.update(UpdateType.kDelay);
 
       this.viewer.emitEvent({ type: "geometryprogress", data: progress, model: this.model });
@@ -66,101 +67,101 @@ export class VsfXPartialLoader extends BaseLoader {
         this.viewer.syncOptions();
         this.viewer.resize();
 
-        this.viewer.emitEvent({ type: "databasechunk", data, model: this.model });
+        this.viewer.emitEvent({ type: "databasechunk", data: chunk, model: this.model });
       } else {
-        this.viewer.emitEvent({ type: "geometrychunk", data, model: this.model });
+        this.viewer.emitEvent({ type: "geometrychunk", data: chunk, model: this.model });
       }
     };
 
-    const downloadPartOfFile = async (requestId, records, dataId, isMultipleParts = false) => {
+    const downloadResourceRange = async (dataId: string, requestId: number, ranges: any) => {
       const abortCtrl = new AbortController();
       abortControllerForRequestMap.set(requestId, abortCtrl);
       try {
-        await this.model.downloadFileRange(requestId, records, dataId, requestLoadHandler, abortCtrl.signal);
+        await this.model.downloadResourceRange(dataId, ranges, requestId, chunkLoadHandler, abortCtrl.signal);
       } catch (error) {
         this.viewer.emitEvent({ type: "geometryerror", data: error, model: this.model });
       } finally {
-        const requests = isMultipleParts ? [...new Set(records.map((item) => item.reqId))] : [requestId];
-        requests.forEach((requestId) => visViewer.onRequestResponseComplete(requestId));
+        ranges.forEach((range) => visViewer.onRequestResponseComplete(range.requestId));
         abortControllerForRequestMap.delete(requestId);
         updaterController.update(UpdateType.kNormal);
       }
     };
 
-    const recordsToArray = (requestId, records) => {
-      const res = [];
+    const requestRecordsToRanges = (requestId: number, records: any): any => {
+      const ranges = [];
       for (let i = 0; i < records.size(); i++) {
         const record = records.get(i);
-        res.push({
-          reqId: requestId,
-          begin: record.begin,
-          end: record.end,
-          size: parseInt(record.end, 10) - parseInt(record.begin, 10),
+        ranges.push({
+          requestId,
+          begin: Number(record.begin),
+          end: Number(record.end),
         });
         record.delete();
       }
-      return res;
+      return ranges;
     };
 
     const objectHandler = {
-      onServicePartReceived: (bHasIndex) => {
+      onServicePartReceived: (bHasIndex: boolean) => {
         if (bHasIndex) {
           servicePartAborted = true;
           abortController.abort();
         }
       },
 
-      onRequest: (requestId, records) => {
-        downloadPartOfFile(requestId, records, this.model.database);
+      onRequest: (requestId: number, records: any) => {
+        const ranges = requestRecordsToRanges(requestId, records);
+        downloadResourceRange(this.model.database, requestId, ranges);
       },
 
       onFullLoaded: () => {
         updaterController.update(UpdateType.kNormal);
-        console.timeEnd("File load time");
       },
 
-      onRequestResponseParsed: (requestId) => {
+      onRequestResponseParsed: (requestId: number) => {
         abortControllerForRequestMap.delete(requestId);
         updaterController.update(UpdateType.kNormal);
       },
 
-      onRequestAborted: (requestId) => {
+      onRequestAborted: (requestId: number) => {
         const abortCtrl = abortControllerForRequestMap.get(requestId);
         if (abortCtrl) abortCtrl.abort();
       },
 
-      onRequestResourceFile: async (requestId, _, records) => {
+      onRequestResourceFile: (requestId: number, _: string, records: any) => {
         const dataId = `${this.model.fileId}${this.model.file.type}`;
-
-        let pendingRequests = [];
-        let recNumber = 0;
-        const pendingRequestsRecord = pendingRequestsMap.get(dataId);
-        if (pendingRequestsRecord) {
-          pendingRequests = pendingRequestsRecord.array;
-          recNumber = pendingRequestsRecord.number;
+        const ranges = requestRecordsToRanges(requestId, records);
+
+        let pendingRanges = [];
+        let requestNumber = 0;
+        const pendingRequest = pendingRequestsMap.get(dataId);
+        if (pendingRequest) {
+          pendingRanges = pendingRequest.ranges;
+          requestNumber = pendingRequest.number;
         }
 
         // first several records of each file are processed without grouping (they usually require to be processed sequentially)
-        if (recNumber < 6) {
-          pendingRequestsMap.set(dataId, { array: pendingRequests, number: recNumber + 1 });
-          await downloadPartOfFile(requestId, records, dataId);
+        if (requestNumber <= 5) {
+          pendingRequestsMap.set(dataId, { ranges: [], number: requestNumber + 1 });
+          downloadResourceRange(dataId, requestId, ranges);
           return;
         }
 
+        pendingRanges = pendingRanges.concat(ranges);
+
         // group requests to each file to launch a combined server request
-        if (pendingRequests.length >= PENDING_REQUESTS_SIZE) {
+        if (pendingRanges.length >= PENDING_REQUESTS_SIZE) {
           if (pendingRequestsTimerId) {
             window.clearTimeout(pendingRequestsTimerId);
             pendingRequestsTimerId = 0;
           }
 
-          downloadPartOfFile(requestId, pendingRequests, dataId, true);
-          pendingRequests = [...recordsToArray(requestId, records)];
-        } else {
-          pendingRequests = [...pendingRequests, ...recordsToArray(requestId, records)];
+          pendingRequestsMap.set(dataId, { ranges: [], number: requestNumber + 1 });
+          downloadResourceRange(dataId, requestId, pendingRanges);
+          return;
         }
 
-        pendingRequestsMap.set(dataId, { array: pendingRequests, number: recNumber + 1 });
+        pendingRequestsMap.set(dataId, { ranges: pendingRanges, number: requestNumber + 1 });
 
         // set timeout to wait for the new requests, after that process the remaining requests
         if (pendingRequestsTimerId === 0) {
@@ -168,11 +169,10 @@ export class VsfXPartialLoader extends BaseLoader {
             pendingRequestsAbortController.signal.removeEventListener("abort", pendingRequestsAbortHandler);
             pendingRequestsTimerId = 0;
 
-            pendingRequestsMap.forEach((requestsRecord, keyFileName) => {
-              const array = requestsRecord.array;
-              if (array.length > 0) {
-                downloadPartOfFile(requestId, array, keyFileName, true);
-                pendingRequestsMap.set(keyFileName, { array: [], number: requestsRecord.number + 1 });
+            pendingRequestsMap.forEach((request, dataId) => {
+              if (request.ranges.length > 0) {
+                pendingRequestsMap.set(dataId, { ranges: [], number: request.number + 1 });
+                downloadResourceRange(dataId, requestId, request.ranges);
               }
             });
           }, PENDING_REQUESTS_TIMEOUT);
@@ -184,12 +184,11 @@ export class VsfXPartialLoader extends BaseLoader {
 
     visViewer.attachPartialResolver(objectHandler);
 
-    console.time("File load time");
     try {
       this.viewer.emitEvent({ type: "geometrystart", model: this.model });
 
       await this.model
-        .downloadFileRange(0, null, this.model.database, requestLoadHandler, abortController.signal)
+        .downloadResource(this.model.database, chunkLoadHandler, abortController.signal)
         .catch((error) => {
           if (!servicePartAborted) throw error;
         });

package/src/Viewer/Loaders/VsfXStreamingLoader.ts

@@ -39,10 +39,10 @@ export class VsfXStreamingLoader extends BaseLoader {
 
     let isFireDatabaseChunk = false;
 
-    const chunkLoadHandler = (progress, data) => {
+    const chunkLoadHandler = (progress: number, chunk: Uint8Array) => {
       if (!this.viewer.visualizeJs) return;
 
-      const status = visViewer.parseVsfx(data);
+      const status = visViewer.parseVsfx(chunk);
       updaterController.update(UpdateType.kDelay);
 
       this.viewer.emitEvent({ type: "geometryprogress", data: progress, model: this.model });
@@ -63,9 +63,9 @@ export class VsfXStreamingLoader extends BaseLoader {
         this.viewer.syncOptions();
         this.viewer.resize();
 
-        this.viewer.emitEvent({ type: "databasechunk", data, model: this.model });
+        this.viewer.emitEvent({ type: "databasechunk", data: chunk, model: this.model });
       } else {
-        this.viewer.emitEvent({ type: "geometrychunk", data, model: this.model });
+        this.viewer.emitEvent({ type: "geometrychunk", data: chunk, model: this.model });
       }
     };
 
@@ -73,7 +73,7 @@ export class VsfXStreamingLoader extends BaseLoader {
     try {
       this.viewer.emitEvent({ type: "geometrystart", model: this.model });
 
-      await this.model.partialDownloadResource(this.model.database, chunkLoadHandler, abortController.signal);
+      await this.model.downloadResource(this.model.database, chunkLoadHandler, abortController.signal);
       console.timeEnd("File load time");
 
       updaterController.update(UpdateType.kNormal);

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";
@@ -423,9 +423,9 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
     try {
       visualStyleId = visViewer.findVisualStyle("OpenCloud");
     } catch (e) {
-      if (!isInitializing) {
-        console.log("OpenCloud visual style not found, creating it on client side");
-      }
+      // if (!isInitializing) {
+      //   console.log("OpenCloud visual style not found, creating it on client side");
+      // }
       visualStyleId = visViewer.createVisualStyle("OpenCloud");
 
       const colorDef = new visLib.OdTvColorDef(66, 66, 66);
@@ -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();
@@ -859,13 +859,13 @@ export class Viewer extends EventEmitter2<ViewerEventMap & OptionsEventMap> impl
 
     const overrideOptions = new Options();
     overrideOptions.data = this.options.data;
-    if (file.type === ".rcs") {
+    if (file.type === ".rcs" && !overrideOptions.enablePartialMode) {
       console.log("Partial load mode is forced for RCS file");
       overrideOptions.enablePartialMode = true;
     }
 
     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();

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";