@loaders.gl/tile-converter 4.0.1 → 4.0.3

package/dist/index.cjs

@@ -252,7 +252,7 @@ var import_core9 = require("@loaders.gl/core");
 var import_d_tiles2 = require("@loaders.gl/3d-tiles");
 var import_path7 = require("path");
 var import_uuid4 = require("uuid");
-var import_process2 = __toESM(require("process"), 1);
+var import_process3 = __toESM(require("process"), 1);
 var import_json_map_transform8 = __toESM(require("json-map-transform"), 1);
 var import_md52 = __toESM(require("md5"), 1);
 
@@ -712,14 +712,24 @@ var NodePages = class {
 var import_path4 = require("path");
 var import_fs3 = require("fs");
 function timeConverter(time) {
-  const nanoSecondsInMillisecond = 1e6;
-  let timeInSeconds = time[0];
+  if (typeof time === "number") {
+    const milliSecondsInSecond = 1e3;
+    const timeInSeconds = Math.floor(time / milliSecondsInSecond);
+    const milliseconds = time - timeInSeconds * milliSecondsInSecond;
+    return timeConverterFromSecondsAndMilliseconds(timeInSeconds, milliseconds);
+  } else {
+    const nanoSecondsInMillisecond = 1e6;
+    const timeInSeconds = time[0];
+    const milliseconds = time[1] / nanoSecondsInMillisecond;
+    return timeConverterFromSecondsAndMilliseconds(timeInSeconds, milliseconds);
+  }
+}
+function timeConverterFromSecondsAndMilliseconds(timeInSeconds, milliseconds) {
   const hours = Math.floor(timeInSeconds / 3600);
   timeInSeconds = timeInSeconds - hours * 3600;
   const minutes = Math.floor(timeInSeconds / 60);
   timeInSeconds = timeInSeconds - minutes * 60;
   const seconds = Math.floor(timeInSeconds);
-  const milliseconds = time[1] / nanoSecondsInMillisecond;
   let result = "";
   if (hours) {
     result += `${hours}h `;
@@ -2297,21 +2307,26 @@ async function generateCompressedGeometry(vertexCount, convertedAttributes, attr
       "i3s-attribute-type": "uv-region"
     };
   }
-  return (0, import_core5.encode)({ attributes: compressedAttributes, indices }, import_draco.DracoWriterWorker, {
-    ...import_draco.DracoWriterWorker.options,
-    reuseWorkers: true,
-    _nodeWorkers: true,
-    modules: libraries,
-    useLocalLibraries: true,
-    draco: {
-      method: "MESH_SEQUENTIAL_ENCODING",
-      attributesMetadata
-    },
-    ["draco-writer"]: {
-      // We need to load local fs workers because nodejs can't load workers from the Internet
-      workerUrl: "./modules/draco/dist/draco-writer-worker-node.js"
+  return (0, import_core5.encode)(
+    { attributes: compressedAttributes, indices },
+    // @ts-expect-error if encoded supports worker writer, we should update its type signature
+    import_draco.DracoWriterWorker,
+    {
+      ...import_draco.DracoWriterWorker.options,
+      reuseWorkers: true,
+      _nodeWorkers: true,
+      modules: libraries,
+      useLocalLibraries: true,
+      draco: {
+        method: "MESH_SEQUENTIAL_ENCODING",
+        attributesMetadata
+      },
+      ["draco-writer"]: {
+        // We need to load local fs workers because nodejs can't load workers from the Internet
+        workerUrl: "./modules/draco/dist/draco-writer-worker-node.js"
+      }
     }
-  });
+  );
 }
 function generateFeatureIndexAttribute(featureIndex, faceRange) {
   const orderedFeatureIndices = new Uint32Array(featureIndex.length);
@@ -3749,14 +3764,153 @@ var mergePreprocessData = (object1, object2) => {
   }
 };
 
+// src/i3s-converter/helpers/progress.ts
+var import_process2 = __toESM(require("process"), 1);
+var THRESHOLD_DEFAULT = 0.2;
+var Progress = class {
+  constructor(options = {}) {
+    /** Total amount of work, e.g. number of files to save or number of bytes to send */
+    this._stepsTotal = 0;
+    /** Amount of work already done */
+    this._stepsDone = 0;
+    /** Time in milli-seconds when the process started */
+    this.startTime = 0;
+    /** Time in milli-seconds when the process stopped */
+    this.stopTime = 0;
+    /** Time in milli-seconds when stepsDone was updated */
+    this.timeOfUpdatingStepsDone = 0;
+    /** Time in milli-seconds spent for performing one step*/
+    this.milliSecForOneStep = 0;
+    this.trust = false;
+    /**
+     * The number of digits to appear after decimal point in the string representation of the count of steps already done.
+     * It's calculated based on the total count of steps.
+     */
+    this.numberOfDigitsInPercentage = 0;
+    this.getTime = options.getTime || import_process2.default.hrtime.bigint;
+    this.threshold = options.threshold || THRESHOLD_DEFAULT;
+  }
+  /** Total amount of work, e.g. number of files to save or number of bytes to send */
+  get stepsTotal() {
+    return this._stepsTotal;
+  }
+  set stepsTotal(stepsTotal) {
+    this._stepsTotal = stepsTotal;
+    this.numberOfDigitsInPercentage = this.stepsTotal > 100 ? Math.ceil(Math.log10(this.stepsTotal)) - 2 : 0;
+  }
+  /** Amount of work already done */
+  get stepsDone() {
+    return this._stepsDone;
+  }
+  set stepsDone(stepsDone) {
+    this._stepsDone = stepsDone;
+    this.timeOfUpdatingStepsDone = this.getCurrentTimeInMilliSeconds();
+    if (this._stepsDone) {
+      const diff = this.timeOfUpdatingStepsDone - this.startTime;
+      const milliSecForOneStep = diff / this._stepsDone;
+      this.trust = this.isVelocityTrust(milliSecForOneStep, this.milliSecForOneStep);
+      this.milliSecForOneStep = milliSecForOneStep;
+    }
+  }
+  /**
+   * Saves the current time as we start monitoring the process.
+   */
+  startMonitoring() {
+    this.startTime = this.getCurrentTimeInMilliSeconds();
+    this.milliSecForOneStep = 0;
+    this.trust = false;
+    this.timeOfUpdatingStepsDone = 0;
+    this.stopTime = 0;
+    this.stepsDone = 0;
+  }
+  /**
+   * Saves the current time as we stop monitoring the process.
+   */
+  stopMonitoring() {
+    this.stopTime = this.getCurrentTimeInMilliSeconds();
+  }
+  /**
+   * Gets percentage of the work already done.
+   * @returns percentage of the work already done.
+   */
+  getPercent() {
+    if (!this._stepsTotal) {
+      return null;
+    }
+    const percent = this._stepsDone / this._stepsTotal * 100;
+    return percent;
+  }
+  /**
+   * Gets string representation of percentage of the work already done.
+   * @returns string representation of percentage or an empty string if the percetage value cannot be calculated.
+   */
+  getPercentString() {
+    const percent = this.getPercent();
+    return percent !== null ? percent.toFixed(this.numberOfDigitsInPercentage) : "";
+  }
+  /**
+   * Gets the time elapsed since the monitoring started
+   * @returns Number of milliseconds elapsed
+   */
+  getTimeCurrentlyElapsed() {
+    const currentTime = this.stopTime ? this.stopTime : this.getCurrentTimeInMilliSeconds();
+    const diff = currentTime - this.startTime;
+    return diff;
+  }
+  /**
+   * Gets the time remaining (expected at the moment of updating 'stepsDone') to complete the work.
+   * @returns Number of milliseconds remaining
+   */
+  getTimeRemaining() {
+    if (!this._stepsDone || !this.startTime) {
+      return null;
+    }
+    const timeRemainingInMilliSeconds = (this._stepsTotal - this._stepsDone) * this.milliSecForOneStep;
+    return { timeRemaining: timeRemainingInMilliSeconds, trust: this.trust };
+  }
+  /**
+   * Gets the string representation of the time remaining (expected at the moment of updating 'stepsDone') to complete the work.
+   * @returns string representation of the time remaining.
+   * It's an empty string if the time cannot be pedicted or it's still being calculated.
+   */
+  getTimeRemainingString() {
+    const timeRemainingObject = this.getTimeRemaining();
+    return (timeRemainingObject == null ? void 0 : timeRemainingObject.trust) ? timeConverter(timeRemainingObject.timeRemaining) : "";
+  }
+  /**
+   * Check if the computed velociy of the process can be considered trust.
+   * At the beginning of the process the number of samples collected ('time necessary to perform one step' averaged) is too small,
+   * which results in huge deviation of the cumputed velocity of the process.
+   * It makes sense to perform the check before reporting the time remainig so the end user is not confused.
+   * @param current - current value
+   * @param previous - previous value
+   * @returns true if the computed velociy can be considered trust, or false otherwise
+   */
+  isVelocityTrust(current, previous) {
+    if (previous) {
+      const dev = Math.abs((current - previous) / previous);
+      return dev < this.threshold;
+    }
+    return false;
+  }
+  /**
+   * Gets current time in milliseconds.
+   * @returns current time in milliseconds.
+   */
+  getCurrentTimeInMilliSeconds() {
+    return Number(this.getTime() / BigInt(1e6));
+  }
+};
+
 // src/i3s-converter/i3s-converter.ts
 var _a;
-var ION_DEFAULT_TOKEN = (_a = import_process2.default.env) == null ? void 0 : _a.IonToken;
+var ION_DEFAULT_TOKEN = (_a = import_process3.default.env) == null ? void 0 : _a.IonToken;
 var HARDCODED_NODES_PER_PAGE = 64;
 var _3D_TILES = "3DTILES";
 var _3D_OBJECT_LAYER_TYPE = "3DObject";
 var REFRESH_TOKEN_TIMEOUT = 1800;
 var CESIUM_DATASET_PREFIX = "https://";
+var PROGRESS_PHASE1_COUNT = "phase1-count";
 var I3SConverter = class {
   constructor() {
     this.boundingVolumeWarnings = [];
@@ -3786,15 +3940,7 @@ var I3SConverter = class {
       meshTopologyTypes: /* @__PURE__ */ new Set(),
       metadataClasses: /* @__PURE__ */ new Set()
     };
-    /** Total count of tiles in tileset */
-    this.tileCountTotal = 0;
-    /** Count of tiles already converted plus one (refers to the tile currently being converted) */
-    this.tileCountCurrentlyConverting = 0;
-    /**
-     * The number of digits to appear after decimal point in the string representation of the tile count.
-     * It's calculated based on the total count of tiles.
-     */
-    this.numberOfDigitsInPercentage = 0;
+    this.progresses = {};
     this.attributeMetadataInfo = new AttributeMetadataInfo();
     this.nodePages = new NodePages(writeFile, HARDCODED_NODES_PER_PAGE, this);
     this.options = {};
@@ -3838,7 +3984,7 @@ var I3SConverter = class {
       console.log(BROWSER_ERROR_MESSAGE);
       return BROWSER_ERROR_MESSAGE;
     }
-    this.conversionStartTime = import_process2.default.hrtime();
+    this.conversionStartTime = import_process3.default.hrtime();
     const {
       tilesetName,
       slpk,
@@ -3871,6 +4017,7 @@ var I3SConverter = class {
       inquirer,
       metadataClass
     };
+    this.progresses[PROGRESS_PHASE1_COUNT] = new Progress();
     this.compressList = this.options.instantNodeWriting && [] || null;
     this.validate = Boolean(validate);
     this.Loader = inputUrl.indexOf(CESIUM_DATASET_PREFIX) !== -1 ? import_d_tiles2.CesiumIonLoader : import_d_tiles2.Tiles3DLoader;
@@ -3927,10 +4074,9 @@ var I3SConverter = class {
       this.options.maxDepth
     );
     const { meshTopologyTypes, metadataClasses } = this.preprocessData;
-    this.numberOfDigitsInPercentage = this.tileCountTotal > 100 ? Math.ceil(Math.log10(this.tileCountTotal)) - 2 : 0;
     console.log(`------------------------------------------------`);
     console.log(`Preprocess results:`);
-    console.log(`Tile count: ${this.tileCountTotal}`);
+    console.log(`Tile count: ${this.progresses[PROGRESS_PHASE1_COUNT].stepsTotal}`);
     console.log(`glTF mesh topology types: ${Array.from(meshTopologyTypes).join(", ")}`);
     if (metadataClasses.size) {
       console.log(
@@ -3962,7 +4108,7 @@ var I3SConverter = class {
       return null;
     }
     if (sourceTile.id) {
-      this.tileCountTotal++;
+      this.progresses[PROGRESS_PHASE1_COUNT].stepsTotal += 1;
       console.log(`[analyze]: ${sourceTile.id}`);
     }
     let tileContent = null;
@@ -4044,6 +4190,7 @@ var I3SConverter = class {
       obb: boundingVolumes.obb,
       children: []
     });
+    this.progresses[PROGRESS_PHASE1_COUNT].startMonitoring();
     const rootNode = await NodeIndexDocument.createRootNode(boundingVolumes, this);
     await traverseDatasetWith(
       sourceRootTile,
@@ -4055,6 +4202,7 @@ var I3SConverter = class {
       this.finalizeTile.bind(this),
       this.options.maxDepth
     );
+    this.progresses[PROGRESS_PHASE1_COUNT].stopMonitoring();
     this.layers0.attributeStorageInfo = this.attributeMetadataInfo.attributeStorageInfo;
     this.layers0.fields = this.attributeMetadataInfo.fields;
     this.layers0.popupInfo = this.attributeMetadataInfo.popupInfo;
@@ -4172,13 +4320,7 @@ var I3SConverter = class {
       return traversalProps;
     }
     if (sourceTile.id) {
-      this.tileCountCurrentlyConverting++;
-      let percentString = "";
-      if (this.tileCountTotal) {
-        const percent = this.tileCountCurrentlyConverting / this.tileCountTotal * 100;
-        percentString = " " + percent.toFixed(this.numberOfDigitsInPercentage);
-      }
-      console.log(`[convert${percentString}%]: ${sourceTile.id}`);
+      console.log(`[convert]: ${sourceTile.id}`);
     }
     const { parentNodes, transform: transform11 } = traversalProps;
     let transformationMatrix = transform11.clone();
@@ -4192,6 +4334,16 @@ var I3SConverter = class {
       transform: transformationMatrix,
       parentNodes: childNodes
     };
+    if (sourceTile.id) {
+      this.progresses[PROGRESS_PHASE1_COUNT].stepsDone += 1;
+      let timeRemainingString = "Calculating time left...";
+      const timeRemainingStringBasedOnCount = this.progresses[PROGRESS_PHASE1_COUNT].getTimeRemainingString();
+      if (timeRemainingStringBasedOnCount) {
+        timeRemainingString = `${timeRemainingStringBasedOnCount} left`;
+      }
+      let percentString = this.progresses[PROGRESS_PHASE1_COUNT].getPercentString();
+      console.log(`[converted ${percentString}%, ${timeRemainingString}]: ${sourceTile.id}`);
+    }
     return newTraversalProps;
   }
   /**
@@ -4670,7 +4822,7 @@ var I3SConverter = class {
     const { tilesCount, tilesWithAddRefineCount } = this.refinementCounter;
     const addRefinementPercentage = tilesWithAddRefineCount ? tilesWithAddRefineCount / tilesCount * 100 : 0;
     const filesSize = await calculateFilesSize(params);
-    const diff = import_process2.default.hrtime(this.conversionStartTime);
+    const diff = import_process3.default.hrtime(this.conversionStartTime);
     const conversionTime = timeConverter(diff);
     console.log(`------------------------------------------------`);
     console.log(`Finishing conversion of ${_3D_TILES}`);
@@ -4691,18 +4843,18 @@ var I3SConverter = class {
       "cesium-ion": { accessToken: this.options.token || ION_DEFAULT_TOKEN }
     };
     const preloadOptions = await this.Loader.preload(this.options.inputUrl, options);
-    this.refreshTokenTime = import_process2.default.hrtime();
+    this.refreshTokenTime = import_process3.default.hrtime();
     return { ...options, ...preloadOptions };
   }
   /**
    * Update options of source tileset
    */
   async _updateTilesetOptions() {
-    const diff = import_process2.default.hrtime(this.refreshTokenTime);
+    const diff = import_process3.default.hrtime(this.refreshTokenTime);
     if (diff[0] < REFRESH_TOKEN_TIMEOUT) {
       return;
     }
-    this.refreshTokenTime = import_process2.default.hrtime();
+    this.refreshTokenTime = import_process3.default.hrtime();
     const preloadOptions = await this._fetchPreloadOptions();
     if (preloadOptions.headers) {
       this.loadOptions.fetch = {
@@ -4735,7 +4887,7 @@ var I3SConverter = class {
 
 // src/3d-tiles-converter/3d-tiles-converter.ts
 var import_path8 = require("path");
-var import_process3 = __toESM(require("process"), 1);
+var import_process4 = __toESM(require("process"), 1);
 var import_json_map_transform10 = __toESM(require("json-map-transform"), 1);
 var import_core15 = require("@loaders.gl/core");
 var import_i3s2 = require("@loaders.gl/i3s");
@@ -5169,7 +5321,7 @@ var Tiles3DConverter = class {
       return BROWSER_ERROR_MESSAGE;
     }
     const { inputUrl, outputPath, tilesetName, maxDepth, egmFilePath } = options;
-    this.conversionStartTime = import_process3.default.hrtime();
+    this.conversionStartTime = import_process4.default.hrtime();
     this.options = { maxDepth };
     console.log("Loading egm file...");
     this.geoidHeightModel = await (0, import_core15.load)(egmFilePath, PGMLoader);
@@ -5371,7 +5523,7 @@ var Tiles3DConverter = class {
    */
   async _finishConversion(params) {
     const filesSize = await calculateFilesSize(params);
-    const diff = import_process3.default.hrtime(this.conversionStartTime);
+    const diff = import_process4.default.hrtime(this.conversionStartTime);
     const conversionTime = timeConverter(diff);
     console.log(`------------------------------------------------`);
     console.log(`Finish conversion of ${I3S}`);

package/dist/lib/utils/statistic-utills.d.ts

@@ -1,3 +1,8 @@
-export declare function timeConverter(time: any): string;
+/**
+ * Converts time value to string.
+ * @param time - high-resolution real time in a [seconds, nanoseconds] tuple Array, or a value on milliseconds.
+ * @returns string representation of the time
+ */
+export declare function timeConverter(time: number | [number, number]): string;
 export declare function calculateFilesSize(params: any): Promise<number | null>;
 //# sourceMappingURL=statistic-utills.d.ts.map

package/dist/lib/utils/statistic-utills.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"statistic-utills.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/statistic-utills.ts"],"names":[],"mappings":"AAIA,wBAAgB,aAAa,CAAC,IAAI,KAAA,UA4BjC;AAED,wBAAsB,kBAAkB,CAAC,MAAM,KAAA,0BAkB9C"}
+{"version":3,"file":"statistic-utills.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/statistic-utills.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAcrE;AA6BD,wBAAsB,kBAAkB,CAAC,MAAM,KAAA,0BAkB9C"}

package/dist/lib/utils/statistic-utills.js

@@ -2,14 +2,24 @@ import { join } from 'path';
 import { promises as fs } from 'fs';
 import { getAbsoluteFilePath } from "./file-utils.js";
 export function timeConverter(time) {
-  const nanoSecondsInMillisecond = 1e6;
-  let timeInSeconds = time[0];
+  if (typeof time === 'number') {
+    const milliSecondsInSecond = 1e3;
+    const timeInSeconds = Math.floor(time / milliSecondsInSecond);
+    const milliseconds = time - timeInSeconds * milliSecondsInSecond;
+    return timeConverterFromSecondsAndMilliseconds(timeInSeconds, milliseconds);
+  } else {
+    const nanoSecondsInMillisecond = 1e6;
+    const timeInSeconds = time[0];
+    const milliseconds = time[1] / nanoSecondsInMillisecond;
+    return timeConverterFromSecondsAndMilliseconds(timeInSeconds, milliseconds);
+  }
+}
+function timeConverterFromSecondsAndMilliseconds(timeInSeconds, milliseconds) {
   const hours = Math.floor(timeInSeconds / 3600);
   timeInSeconds = timeInSeconds - hours * 3600;
   const minutes = Math.floor(timeInSeconds / 60);
   timeInSeconds = timeInSeconds - minutes * 60;
   const seconds = Math.floor(timeInSeconds);
-  const milliseconds = time[1] / nanoSecondsInMillisecond;
   let result = '';
   if (hours) {
     result += `${hours}h `;

package/dist/lib/utils/statistic-utills.js.map

@@ -1 +1 @@
-{"version":3,"file":"statistic-utills.js","names":["join","promises","fs","getAbsoluteFilePath","timeConverter","time","nanoSecondsInMillisecond","timeInSeconds","hours","Math","floor","minutes","seconds","milliseconds","result","calculateFilesSize","params","slpk","outputPath","tilesetName","fullOutputPath","slpkPath","stat","size","directoryPath","totalSize","getTotalFilesSize","error","console","log","dirPath","totalFileSize","files","readdir","file","fileStat","isDirectory"],"sources":["../../../src/lib/utils/statistic-utills.ts"],"sourcesContent":["import {join} from 'path';\nimport {promises as fs} from 'fs';\nimport {getAbsoluteFilePath} from './file-utils';\n\nexport function timeConverter(time) {\n  const nanoSecondsInMillisecond = 1e6;\n  let timeInSeconds = time[0];\n  const hours = Math.floor(timeInSeconds / 3600);\n  timeInSeconds = timeInSeconds - hours * 3600;\n  const minutes = Math.floor(timeInSeconds / 60);\n  timeInSeconds = timeInSeconds - minutes * 60;\n  const seconds = Math.floor(timeInSeconds);\n  const milliseconds = time[1] / nanoSecondsInMillisecond;\n  let result = '';\n\n  if (hours) {\n    result += `${hours}h `;\n  }\n\n  if (minutes) {\n    result += `${minutes}m `;\n  }\n\n  if (seconds) {\n    result += `${seconds}s`;\n  }\n\n  if (!result) {\n    result += `${milliseconds}ms`;\n  }\n\n  return result;\n}\n\nexport async function calculateFilesSize(params) {\n  const {slpk, outputPath, tilesetName} = params;\n  const fullOutputPath = getAbsoluteFilePath(outputPath);\n\n  try {\n    if (slpk) {\n      const slpkPath = join(fullOutputPath, `${tilesetName}.slpk`);\n      const stat = await fs.stat(slpkPath);\n      return stat.size;\n    }\n\n    const directoryPath = join(fullOutputPath, tilesetName);\n    const totalSize = await getTotalFilesSize(directoryPath);\n    return totalSize;\n  } catch (error) {\n    console.log('Calculate file sizes error: ', error); // eslint-disable-line\n    return null;\n  }\n}\n\nasync function getTotalFilesSize(dirPath) {\n  let totalFileSize = 0;\n\n  const files = await fs.readdir(dirPath);\n\n  for (const file of files) {\n    const fileStat = await fs.stat(join(dirPath, file));\n    if (fileStat.isDirectory()) {\n      totalFileSize += await getTotalFilesSize(join(dirPath, file));\n    } else {\n      totalFileSize += fileStat.size;\n    }\n  }\n  return totalFileSize;\n}\n"],"mappings":"AAAA,SAAQA,IAAI,QAAO,MAAM;AACzB,SAAQC,QAAQ,IAAIC,EAAE,QAAO,IAAI;AAAC,SAC1BC,mBAAmB;AAE3B,OAAO,SAASC,aAAaA,CAACC,IAAI,EAAE;EAClC,MAAMC,wBAAwB,GAAG,GAAG;EACpC,IAAIC,aAAa,GAAGF,IAAI,CAAC,CAAC,CAAC;EAC3B,MAAMG,KAAK,GAAGC,IAAI,CAACC,KAAK,CAACH,aAAa,GAAG,IAAI,CAAC;EAC9CA,aAAa,GAAGA,aAAa,GAAGC,KAAK,GAAG,IAAI;EAC5C,MAAMG,OAAO,GAAGF,IAAI,CAACC,KAAK,CAACH,aAAa,GAAG,EAAE,CAAC;EAC9CA,aAAa,GAAGA,aAAa,GAAGI,OAAO,GAAG,EAAE;EAC5C,MAAMC,OAAO,GAAGH,IAAI,CAACC,KAAK,CAACH,aAAa,CAAC;EACzC,MAAMM,YAAY,GAAGR,IAAI,CAAC,CAAC,CAAC,GAAGC,wBAAwB;EACvD,IAAIQ,MAAM,GAAG,EAAE;EAEf,IAAIN,KAAK,EAAE;IACTM,MAAM,IAAK,GAAEN,KAAM,IAAG;EACxB;EAEA,IAAIG,OAAO,EAAE;IACXG,MAAM,IAAK,GAAEH,OAAQ,IAAG;EAC1B;EAEA,IAAIC,OAAO,EAAE;IACXE,MAAM,IAAK,GAAEF,OAAQ,GAAE;EACzB;EAEA,IAAI,CAACE,MAAM,EAAE;IACXA,MAAM,IAAK,GAAED,YAAa,IAAG;EAC/B;EAEA,OAAOC,MAAM;AACf;AAEA,OAAO,eAAeC,kBAAkBA,CAACC,MAAM,EAAE;EAC/C,MAAM;IAACC,IAAI;IAAEC,UAAU;IAAEC;EAAW,CAAC,GAAGH,MAAM;EAC9C,MAAMI,cAAc,GAAGjB,mBAAmB,CAACe,UAAU,CAAC;EAEtD,IAAI;IACF,IAAID,IAAI,EAAE;MACR,MAAMI,QAAQ,GAAGrB,IAAI,CAACoB,cAAc,EAAG,GAAED,WAAY,OAAM,CAAC;MAC5D,MAAMG,IAAI,GAAG,MAAMpB,EAAE,CAACoB,IAAI,CAACD,QAAQ,CAAC;MACpC,OAAOC,IAAI,CAACC,IAAI;IAClB;IAEA,MAAMC,aAAa,GAAGxB,IAAI,CAACoB,cAAc,EAAED,WAAW,CAAC;IACvD,MAAMM,SAAS,GAAG,MAAMC,iBAAiB,CAACF,aAAa,CAAC;IACxD,OAAOC,SAAS;EAClB,CAAC,CAAC,OAAOE,KAAK,EAAE;IACdC,OAAO,CAACC,GAAG,CAAC,8BAA8B,EAAEF,KAAK,CAAC;IAClD,OAAO,IAAI;EACb;AACF;AAEA,eAAeD,iBAAiBA,CAACI,OAAO,EAAE;EACxC,IAAIC,aAAa,GAAG,CAAC;EAErB,MAAMC,KAAK,GAAG,MAAM9B,EAAE,CAAC+B,OAAO,CAACH,OAAO,CAAC;EAEvC,KAAK,MAAMI,IAAI,IAAIF,KAAK,EAAE;IACxB,MAAMG,QAAQ,GAAG,MAAMjC,EAAE,CAACoB,IAAI,CAACtB,IAAI,CAAC8B,OAAO,EAAEI,IAAI,CAAC,CAAC;IACnD,IAAIC,QAAQ,CAACC,WAAW,CAAC,CAAC,EAAE;MAC1BL,aAAa,IAAI,MAAML,iBAAiB,CAAC1B,IAAI,CAAC8B,OAAO,EAAEI,IAAI,CAAC,CAAC;IAC/D,CAAC,MAAM;MACLH,aAAa,IAAII,QAAQ,CAACZ,IAAI;IAChC;EACF;EACA,OAAOQ,aAAa;AACtB"}
+{"version":3,"file":"statistic-utills.js","names":["join","promises","fs","getAbsoluteFilePath","timeConverter","time","milliSecondsInSecond","timeInSeconds","Math","floor","milliseconds","timeConverterFromSecondsAndMilliseconds","nanoSecondsInMillisecond","hours","minutes","seconds","result","calculateFilesSize","params","slpk","outputPath","tilesetName","fullOutputPath","slpkPath","stat","size","directoryPath","totalSize","getTotalFilesSize","error","console","log","dirPath","totalFileSize","files","readdir","file","fileStat","isDirectory"],"sources":["../../../src/lib/utils/statistic-utills.ts"],"sourcesContent":["import {join} from 'path';\nimport {promises as fs} from 'fs';\nimport {getAbsoluteFilePath} from './file-utils';\n\n/**\n * Converts time value to string.\n * @param time - high-resolution real time in a [seconds, nanoseconds] tuple Array, or a value on milliseconds.\n * @returns string representation of the time\n */\nexport function timeConverter(time: number | [number, number]): string {\n  if (typeof time === 'number') {\n    // time - real time in milli-seconds\n    const milliSecondsInSecond = 1e3;\n    const timeInSeconds = Math.floor(time / milliSecondsInSecond);\n    const milliseconds = time - timeInSeconds * milliSecondsInSecond;\n    return timeConverterFromSecondsAndMilliseconds(timeInSeconds, milliseconds);\n  } else {\n    // time - high-resolution real time in a [seconds, nanoseconds] tuple Array\n    const nanoSecondsInMillisecond = 1e6;\n    const timeInSeconds = time[0];\n    const milliseconds = time[1] / nanoSecondsInMillisecond;\n    return timeConverterFromSecondsAndMilliseconds(timeInSeconds, milliseconds);\n  }\n}\n\nfunction timeConverterFromSecondsAndMilliseconds(timeInSeconds: number, milliseconds: number) {\n  const hours = Math.floor(timeInSeconds / 3600);\n  timeInSeconds = timeInSeconds - hours * 3600;\n  const minutes = Math.floor(timeInSeconds / 60);\n  timeInSeconds = timeInSeconds - minutes * 60;\n  const seconds = Math.floor(timeInSeconds);\n  let result = '';\n\n  if (hours) {\n    result += `${hours}h `;\n  }\n\n  if (minutes) {\n    result += `${minutes}m `;\n  }\n\n  if (seconds) {\n    result += `${seconds}s`;\n  }\n\n  if (!result) {\n    result += `${milliseconds}ms`;\n  }\n\n  return result;\n}\n\nexport async function calculateFilesSize(params) {\n  const {slpk, outputPath, tilesetName} = params;\n  const fullOutputPath = getAbsoluteFilePath(outputPath);\n\n  try {\n    if (slpk) {\n      const slpkPath = join(fullOutputPath, `${tilesetName}.slpk`);\n      const stat = await fs.stat(slpkPath);\n      return stat.size;\n    }\n\n    const directoryPath = join(fullOutputPath, tilesetName);\n    const totalSize = await getTotalFilesSize(directoryPath);\n    return totalSize;\n  } catch (error) {\n    console.log('Calculate file sizes error: ', error); // eslint-disable-line\n    return null;\n  }\n}\n\nasync function getTotalFilesSize(dirPath) {\n  let totalFileSize = 0;\n\n  const files = await fs.readdir(dirPath);\n\n  for (const file of files) {\n    const fileStat = await fs.stat(join(dirPath, file));\n    if (fileStat.isDirectory()) {\n      totalFileSize += await getTotalFilesSize(join(dirPath, file));\n    } else {\n      totalFileSize += fileStat.size;\n    }\n  }\n  return totalFileSize;\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "description": "Converter",
   "license": "MIT",
   "type": "module",
@@ -52,18 +52,18 @@
     "build-i3s-server-bundle": "esbuild src/i3s-server/bin/www.ts --outfile=dist/i3s-server/bin/i3s-server.min.cjs --platform=node --target=esnext,node14 --minify --bundle --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "4.0.1",
-    "@loaders.gl/crypto": "4.0.1",
-    "@loaders.gl/draco": "4.0.1",
-    "@loaders.gl/gltf": "4.0.1",
-    "@loaders.gl/i3s": "4.0.1",
-    "@loaders.gl/images": "4.0.1",
-    "@loaders.gl/loader-utils": "4.0.1",
-    "@loaders.gl/polyfills": "4.0.1",
-    "@loaders.gl/textures": "4.0.1",
-    "@loaders.gl/tiles": "4.0.1",
-    "@loaders.gl/worker-utils": "4.0.1",
-    "@loaders.gl/zip": "4.0.1",
+    "@loaders.gl/3d-tiles": "4.0.3",
+    "@loaders.gl/crypto": "4.0.3",
+    "@loaders.gl/draco": "4.0.3",
+    "@loaders.gl/gltf": "4.0.3",
+    "@loaders.gl/i3s": "4.0.3",
+    "@loaders.gl/images": "4.0.3",
+    "@loaders.gl/loader-utils": "4.0.3",
+    "@loaders.gl/polyfills": "4.0.3",
+    "@loaders.gl/textures": "4.0.3",
+    "@loaders.gl/tiles": "4.0.3",
+    "@loaders.gl/worker-utils": "4.0.3",
+    "@loaders.gl/zip": "4.0.3",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/geoid": "^4.0.0",
@@ -81,13 +81,13 @@
     "uuid": "^9.0.0"
   },
   "peerDependencies": {
-    "@loaders.gl/core": "4.0.0-beta.8"
+    "@loaders.gl/core": "^4.0.0"
   },
   "quarantinedDependencies": {
     "join-images": "^1.1.3",
     "sharp": "^0.31.3"
   },
-  "gitHead": "765e5a26a6bf3f2cc02cabffc4a1e3665ec92a53",
+  "gitHead": "03c871839b36c997249dabae1844df53a35d3760",
   "devDependencies": {
     "@types/express": "^4.17.17",
     "@types/node": "^20.4.2"

package/src/deps-installer/deps-installer.ts

@@ -7,7 +7,7 @@ import {DRACO_EXTERNAL_LIBRARIES, DRACO_EXTERNAL_LIBRARY_URLS} from '@loaders.gl
 import {BASIS_EXTERNAL_LIBRARIES} from '@loaders.gl/textures';
 
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'beta';
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
 const PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
 

package/src/i3s-converter/helpers/geometry-converter.ts

@@ -1561,21 +1561,26 @@ async function generateCompressedGeometry(
     };
   }
 
-  return encode({attributes: compressedAttributes, indices}, DracoWriterWorker, {
-    ...DracoWriterWorker.options,
-    reuseWorkers: true,
-    _nodeWorkers: true,
-    modules: libraries,
-    useLocalLibraries: true,
-    draco: {
-      method: 'MESH_SEQUENTIAL_ENCODING',
-      attributesMetadata
-    },
-    ['draco-writer']: {
-      // We need to load local fs workers because nodejs can't load workers from the Internet
-      workerUrl: './modules/draco/dist/draco-writer-worker-node.js'
+  return encode(
+    {attributes: compressedAttributes, indices},
+    // @ts-expect-error if encoded supports worker writer, we should update its type signature
+    DracoWriterWorker,
+    {
+      ...DracoWriterWorker.options,
+      reuseWorkers: true,
+      _nodeWorkers: true,
+      modules: libraries,
+      useLocalLibraries: true,
+      draco: {
+        method: 'MESH_SEQUENTIAL_ENCODING',
+        attributesMetadata
+      },
+      ['draco-writer']: {
+        // We need to load local fs workers because nodejs can't load workers from the Internet
+        workerUrl: './modules/draco/dist/draco-writer-worker-node.js'
+      }
     }
-  });
+  );
 }
 
 /**