From 62fdb9cda89709e1d9a6ef8d17ef07723f46376a Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Wed, 7 Feb 2024 14:34:56 +0100
Subject: [PATCH] Dispose ydocs provider when closing app

---
 app/gui2/src/App.vue                 |  6 +++++-
 app/gui2/src/stores/project/index.ts | 13 +++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/gui2/src/App.vue b/app/gui2/src/App.vue
index 1c59d9519bed..faf15b8365c7 100644
--- a/app/gui2/src/App.vue
+++ b/app/gui2/src/App.vue
@@ -6,7 +6,8 @@ import { useSuggestionDbStore } from '@/stores/suggestionDatabase'
 import { configValue, type ApplicationConfig, type ApplicationConfigValue } from '@/util/config'
 import ProjectView from '@/views/ProjectView.vue'
 import { isDevMode } from 'shared/util/detect'
-import { computed, onMounted, toRaw } from 'vue'
+import { computed, onMounted, onUnmounted, toRaw } from 'vue'
+import { useProjectStore } from './stores/project'
 
 const props = defineProps<{
   config: ApplicationConfig
@@ -26,6 +27,9 @@ onMounted(() => {
     ;(window as any).suggestionDb = toRaw(suggestionDb.entries)
   }
 })
+onUnmounted(() => {
+  useProjectStore().disposeYDocsProvider()
+})
 </script>
 
 <template>
diff --git a/app/gui2/src/stores/project/index.ts b/app/gui2/src/stores/project/index.ts
index 48c5a7ab4315..c71b7da60cdd 100644
--- a/app/gui2/src/stores/project/index.ts
+++ b/app/gui2/src/stores/project/index.ts
@@ -499,6 +499,7 @@ export const useProjectStore = defineStore('project', () => {
     return tryQualifiedName(`${fullName.value}.${withDotSeparators}`)
   })
 
+  let yDocsProvider: ReturnType<typeof attachProvider> | undefined
   watchEffect((onCleanup) => {
     if (lsUrls.rpcUrl.startsWith('mock://')) {
       doc.load()
@@ -510,16 +511,14 @@ export const useProjectStore = defineStore('project', () => {
     const socketUrl = new URL(location.origin)
     socketUrl.protocol = location.protocol.replace(/^http/, 'ws')
     socketUrl.pathname = '/project'
-    const provider = attachProvider(
+    yDocsProvider = attachProvider(
       socketUrl.href,
       'index',
       { ls: lsUrls.rpcUrl },
       doc,
       awareness.internal,
     )
-    onCleanup(() => {
-      provider.dispose()
-    })
+    onCleanup(disposeYDocsProvider)
   })
 
   const projectModel = new DistributedProject(doc)
@@ -675,6 +674,11 @@ export const useProjectStore = defineStore('project', () => {
 
   const { executionMode } = setupSettings(projectModel)
 
+  function disposeYDocsProvider() {
+    yDocsProvider?.dispose()
+    yDocsProvider = undefined
+  }
+
   return {
     setObservedFileName(name: string) {
       observedFileName.value = name
@@ -699,6 +703,7 @@ export const useProjectStore = defineStore('project', () => {
     executionMode,
     dataflowErrors,
     executeExpression,
+    disposeYDocsProvider,
   }
 })