fix(core): improve ifc memory clean logic

ThatOpen · Aug 9, 2024 · 8d3099c · 8d3099c
1 parent b1bb30a
commit 8d3099c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@thatopen/components",
   "description": "Collection of core functionalities to author BIM apps.",
-  "version": "2.1.21",
+  "version": "2.1.22",
   "author": "That Open Company",
   "contributors": [
     "Antonio Gonzalez Viegas (https://github.com/agviegas)",

diff --git a/packages/core/src/core/Components/index.ts b/packages/core/src/core/Components/index.ts
@@ -14,7 +14,7 @@ export class Components implements Disposable {
   /**
    * The version of the @thatopen/components library.
    */
-  static readonly release = "2.1.21";
+  static readonly release = "2.1.22";
 
   /** {@link Disposable.onDisposed} */
   readonly onDisposed = new Event<void>();

diff --git a/packages/core/src/fragments/IfcGeometryTiler/index.ts b/packages/core/src/fragments/IfcGeometryTiler/index.ts
@@ -298,7 +298,11 @@ export class IfcGeometryTiler extends Component implements Disposable {
   }
 
   private cleanUp() {
-    this.webIfc.Dispose();
+    try {
+      this.webIfc.Dispose();
+    } catch (e) {
+      // Problem disposing memory (maybe already disposed?)
+    }
     (this.webIfc as any) = null;
     this.webIfc = new WEBIFC.IfcAPI();
     this._visitedGeometries.clear();

diff --git a/packages/core/src/fragments/IfcLoader/index.ts b/packages/core/src/fragments/IfcLoader/index.ts
@@ -71,6 +71,11 @@ export class IfcLoader extends Component implements Disposable {
 
   /** {@link Disposable.dispose} */
   dispose() {
+    try {
+      this.webIfc.Dispose();
+    } catch (e) {
+      // web-ifc couldn't be disposed
+    }
     (this.webIfc as any) = null;
     this.onDisposed.trigger(IfcLoader.uuid);
     this.onDisposed.reset();
@@ -198,7 +203,11 @@ export class IfcLoader extends Component implements Disposable {
    * ```
    */
   cleanUp() {
-    this.webIfc.Dispose();
+    try {
+      this.webIfc.Dispose();
+    } catch (e) {
+      // web-ifc couldn't be disposed
+    }
     (this.webIfc as any) = null; // Clear the reference to the Web-IFC library
     this.webIfc = new WEBIFC.IfcAPI(); // Create a new instance of the Web-IFC library
     this._visitedFragments.clear(); // Clear the map of visited fragments