fixes error on opening files

https://discord.com/channels/602097536404160523/639751619352854530/1158488166039306253
bridge-core · Oct 3, 2023 · dcf3e52 · dcf3e52
1 parent 1e50fbc
commit dcf3e52
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 6 deletions.
diff --git a/src/components/FileSystem/FileSystem.ts b/src/components/FileSystem/FileSystem.ts
@@ -20,6 +20,15 @@ export class FileSystem extends Signal<void> {
 		return this._baseDirectory
 	}
 
+	// To prevent multiple files from saving to the same file at once, we will delay saving until all previous save calls are finished
+	protected savingQueue: Map<
+		string,
+		{
+			currentSaveID: number
+			lastSaveID: number
+		}
+	> = new Map()
+
 	constructor(baseDirectory?: AnyDirectoryHandle) {
 		super()
 		if (baseDirectory) this.setup(baseDirectory)
@@ -236,11 +245,31 @@ export class FileSystem extends Signal<void> {
 		// 	await handle.writable.getWriter().write(data)
 		// 	handle.close()
 		// } else {
+		if (!this.savingQueue.has(fileHandle.name))
+			this.savingQueue.set(fileHandle.name, {
+				currentSaveID: 0,
+				lastSaveID: 0,
+			})
+
+		const savingQueueEntry = this.savingQueue.get(fileHandle.name)!
+		const currentSaveID = savingQueueEntry.lastSaveID
+		savingQueueEntry.lastSaveID++
+
+		while (savingQueueEntry.currentSaveID !== currentSaveID) {
+			await new Promise<void>((resolve) => setTimeout(resolve, 1))
+		}
+
 		const writable = await fileHandle.createWritable({
 			keepExistingData: false,
 		})
+
 		await writable.write(data)
 		await writable.close()
+
+		savingQueueEntry.currentSaveID++
+
+		if (savingQueueEntry.currentSaveID === savingQueueEntry.lastSaveID)
+			this.savingQueue.delete(fileHandle.name)
 		// }
 	}
 

diff --git a/src/components/TabSystem/TabSystem.ts b/src/components/TabSystem/TabSystem.ts
@@ -122,7 +122,7 @@ export class TabSystem extends MonacoHolder {
 	}
 
 	async add(tab: Tab, selectTab = true, noTabExistanceCheck = false) {
-		this.closeAllTemporary()
+		await this.closeAllTemporary()
 
 		if (!noTabExistanceCheck) {
 			for (const currentTab of this.tabs.value) {
@@ -155,7 +155,7 @@ export class TabSystem extends MonacoHolder {
 
 		return tab
 	}
-	remove(tab: Tab, destroyEditor = true, selectNewTab = true) {
+	async remove(tab: Tab, destroyEditor = true, selectNewTab = true) {
 		tab.onDeactivate()
 		const tabIndex = this.tabs.value.findIndex((current) => current === tab)
 		if (tabIndex === -1) return
@@ -165,7 +165,7 @@ export class TabSystem extends MonacoHolder {
 
 		if (selectNewTab && tab === this.selectedTab)
 			this.select(this.tabs.value[tabIndex === 0 ? 0 : tabIndex - 1])
-		if (!tab.isForeignFile) this.openedFiles.remove(tab.getPath())
+		if (!tab.isForeignFile) await this.openedFiles.remove(tab.getPath())
 
 		this.project.updateTabFolders()
 
@@ -179,7 +179,7 @@ export class TabSystem extends MonacoHolder {
 
 			return (await unsavedWin.fired) !== 'cancel'
 		} else {
-			this.remove(tab)
+			await this.remove(tab)
 			return true
 		}
 	}
@@ -282,11 +282,11 @@ export class TabSystem extends MonacoHolder {
 
 		app.windows.loadingWindow.close()
 	}
-	closeAllTemporary() {
+	async closeAllTemporary() {
 		for (const tab of [...this.tabs.value]) {
 			if (!tab.isTemporary) continue
 
-			this.remove(tab, true, false)
+			await this.remove(tab, true, false)
 		}
 	}