fix(wasm): Avoid multiple FS.syncfs causing emscripten warning

unoplatform · Feb 1, 2022 · ea33cf2 · ea33cf2
1 parent 4f08e8a
commit ea33cf2
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 28 deletions.
diff --git a/src/Uno.UI/WasmScripts/Uno.UI.d.ts b/src/Uno.UI/WasmScripts/Uno.UI.d.ts
@@ -1029,6 +1029,7 @@ declare namespace Uno.Storage {
 declare namespace Windows.Storage {
     class StorageFolder {
         private static _isInit;
+        private static _isSynchronizing;
         private static dispatchStorageInitialized;
         /**
          * Determine if IndexDB is available, some browsers and modes disable it.

diff --git a/src/Uno.UI/WasmScripts/Uno.UI.js b/src/Uno.UI/WasmScripts/Uno.UI.js
@@ -3667,12 +3667,7 @@ var Windows;
                 // Ensure to sync pseudo file system on unload (and periodically for safety)
                 if (!this._isInit) {
                     // Request an initial sync to populate the file system
-                    FS.syncfs(true, err => {
-                        if (err) {
-                            console.error(`Error synchronizing filesystem from IndexDB: ${err} (errno: ${err.errno})`);
-                        }
-                        StorageFolder.onStorageInitialized();
-                    });
+                    StorageFolder.synchronizeFileSystem();
                     window.addEventListener("beforeunload", this.synchronizeFileSystem);
                     setInterval(this.synchronizeFileSystem, 10000);
                     this._isInit = true;
@@ -3689,14 +3684,19 @@ var Windows;
              * Synchronize the IDBFS memory cache back to IndexDB
              * */
             static synchronizeFileSystem() {
-                FS.syncfs(err => {
-                    if (err) {
-                        console.error(`Error synchronizing filesystem from IndexDB: ${err} (errno: ${err.errno})`);
-                    }
-                });
+                if (!StorageFolder._isSynchronizing) {
+                    StorageFolder._isSynchronizing = true;
+                    FS.syncfs(err => {
+                        StorageFolder._isSynchronizing = false;
+                        if (err) {
+                            console.error(`Error synchronizing filesystem from IndexDB: ${err} (errno: ${err.errno})`);
+                        }
+                    });
+                }
             }
         }
         StorageFolder._isInit = false;
+        StorageFolder._isSynchronizing = false;
         Storage.StorageFolder = StorageFolder;
     })(Storage = Windows.Storage || (Windows.Storage = {}));
 })(Windows || (Windows = {}));

diff --git a/src/Uno.UI/ts/Windows/Storage/StorageFolder.ts b/src/Uno.UI/ts/Windows/Storage/StorageFolder.ts
@@ -3,7 +3,8 @@
 namespace Windows.Storage {
 
 	export class StorageFolder {
-		private static _isInit = false;
+		private static _isInitialized = false;
+		private static _isSynchronizing = false;
 		private static dispatchStorageInitialized: () => number;
 
 		/**
@@ -62,20 +63,14 @@ namespace Windows.Storage {
 			FS.mount(IDBFS, {}, path);
 
 			// Ensure to sync pseudo file system on unload (and periodically for safety)
-			if (!this._isInit) {
+			if (!this._isInitialized) {
+				// Request an initial sync to populate the file system
+				StorageFolder.synchronizeFileSystem(() => StorageFolder.onStorageInitialized());
 
-			// Request an initial sync to populate the file system
-				FS.syncfs(true, err => {
-					if (err) {
-						console.error(`Error synchronizing filesystem from IndexDB: ${err} (errno: ${err.errno})`);
-					}
-					StorageFolder.onStorageInitialized();
-				});
-
-				window.addEventListener("beforeunload", this.synchronizeFileSystem);
+				window.addEventListener("beforeunload", () => this.synchronizeFileSystem());
 				setInterval(this.synchronizeFileSystem, 10000);
 
-				this._isInit = true;
+				this._isInitialized = true;
 			}
 		}
 
@@ -91,11 +86,23 @@ namespace Windows.Storage {
 		/**
 		 * Synchronize the IDBFS memory cache back to IndexDB
 		 * */
-		private static synchronizeFileSystem(): void {
-			FS.syncfs(err => {
-				if (err) {
-					console.error(`Error synchronizing filesystem from IndexDB: ${err} (errno: ${err.errno})`);
-			}});
+		private static synchronizeFileSystem(onSynchronized: Function = null): void {
+
+			if (!StorageFolder._isSynchronizing) {
+				StorageFolder._isSynchronizing = true;
+
+				FS.syncfs(err => {
+					StorageFolder._isSynchronizing = false;
+
+					if (onSynchronized) {
+						onSynchronized();
+					}
+
+					if (err) {
+						console.error(`Error synchronizing filesystem from IndexDB: ${err} (errno: ${err.errno})`);
+					}
+				});
+			}
 		}
 	}
 }