Need to clean up disposals w/ heartbeat

src/dataEditor/core/editor/dataEditor.ts

@@ -1,4 +1,4 @@
-import { ExtensionContext } from 'vscode'
+import { Disposable, ExtensionContext } from 'vscode'
 import { DataSource, EditServiceClient } from '../service/editService'
 import { DataEditorUI } from './editorUI'
 
@@ -11,7 +11,7 @@ export type EditorCommand = {
   initializer: DataEditorInitializer
 }
 
-export abstract class DataEditor {
+export abstract class DataEditor implements Disposable {
   constructor(
     protected serviceClient: EditServiceClient,
     protected ui: DataEditorUI
@@ -23,6 +23,12 @@ export abstract class DataEditor {
     ui.onInputEvent = (input) => {
       this.serviceClient.request(input)
     }
+    ui.onClosed(() => {
+      this.dispose()
+    })
+  }
+  dispose() {
+    this.serviceClient.close()
   }
   dataSource(): DataSource {
     throw ''

src/dataEditor/omegaEdit/server/heartbeat.ts

@@ -30,4 +30,7 @@ export class Heartbeat {
   getLast() {
     return this.lastHeartbeat
   }
+  stop() {
+    clearInterval(this.intervalId)
+  }
 }

src/dataEditor/omegaEdit/server/server.ts

@@ -35,6 +35,7 @@ const ServerDisposeAll = {
 
 export class OmegaEditServer {
   private service: OmegaEditService
+  private disposables: Array<() => any> = []
   constructor(
     private client: EditorClient,
     readonly config: ServerConfig,
@@ -50,14 +51,24 @@ export class OmegaEditServer {
     this.service.onAllSessionsClosed(() => {
       serverStop(this.config)
     })
+    this.disposables.push(
+      () => {
+        heartbeat.stop()
+      },
+      () => {
+        serverStop(this.config)
+      }
+    )
   }
   getService(): Promise<OmegaEditService> {
     return new Promise((res, rej) => {
       this.service ? res(this.service) : rej('No service was initialzied!')
     })
   }
   readonly dispose = () => {
-    serverStop(this.config)
+    this.disposables.forEach((disposal) => {
+      disposal()
+    })
   }
 }
 

src/dataEditor/omegaEdit/service/editService.ts

@@ -50,9 +50,12 @@ export class OmegaEditService implements EditService {
     private heartbeat_: Heartbeat,
     readonly serviceInfo: ServiceInfo,
     readonly checkpointDirectory: FilePath = FilePath.SystemTmpDirectory()
-  ) {}
+  ) {
+    this.Events.on('allSessionsClosed', () => {
+      clearInterval(this.heartbeatInterval)
+    })
+  }
   onAllSessionsClosed(listener: () => void) {
-    clearInterval(this.heartbeatInterval)
     this.Events.on('allSessionsClosed', () => {
       listener()
     })
@@ -91,12 +94,6 @@ export class OmegaEditService implements EditService {
         .on('error', (err) => {
           console.log('Viewport Subscribe err: ', err)
         })
-        .on('status', (status) => {
-          console.log(status.details)
-        })
-        .on('resume', () => {
-          console.log('Viewport Events Resuming')
-        })
       getViewportData(vpId).then((r) => {
         session.onDidProcess({
           command: 20,
@@ -133,9 +130,11 @@ export class OmegaEditService implements EditService {
 
       const id = response.getSessionId()
       this.activeSessions.set(id, file)
+
       const requestHandlerFn = async (req) => {
         return this.requestHandler(req)
       }
+
       const sessionCloseCallback = () => {
         this.removeSession(id)
       }
@@ -157,50 +156,16 @@ export class OmegaEditService implements EditService {
           this.activeSessions.get(request.sessionId)!
         )
       case 'getServerHeartbeat':
-        return ServiceRequestHandler.getHandle('getServerHeartbeat')()
+        return new Promise((res, rej) => {
+          res({
+            command: 4,
+            data: { ...this.heartbeat_.getLast(), ...this.serviceInfo },
+          })
+        })
       default:
         return new Promise((_, rej) => {
-          rej('Unknown request command')
+          rej(`Unknown request command: ${request.command}`)
         })
     }
-    // const handler = ServiceRequestHandler.getHandle('viewportSeekTo')
-    // return new Promise(async (res, rej) => {
-
-    //   if (request.command === 'getServerHeartbeat') {
-    //     res({
-    //       command: 4,
-    //       data: { ...this.heartbeat_.getLast(), ...this.serviceInfo },
-    //     })
-    //   }
-    //   if (request.command === 'getFileInfo') {
-    //     const count = await getCounts(sessionId, [
-    //       1, //CountKind.COUNT_COMPUTED_FILE_SIZE,
-    //       7, //CountKind.COUNT_CHANGE_TRANSACTIONS,
-    //       8, //CountKind.COUNT_UNDO_TRANSACTIONS,
-    //     ])
-    //     const file = this.activeSessions.get(sessionId)
-    //     let data = {
-    //       fileName: file ? file.fullPath() : 'No file',
-    //       computedFileSize: 0,
-    //       changeCount: 0,
-    //       undoCount: 0,
-    //     }
-    //     count.forEach((count) => {
-    //       switch (count.getKind()) {
-    //         case 1: //CountKind.COUNT_COMPUTED_FILE_SIZE:
-    //           data.computedFileSize = count.getCount()
-    //           break
-    //         case 7: //CountKind.COUNT_CHANGE_TRANSACTIONS:
-    //           data.changeCount = count.getCount()
-    //           break
-    //         case 8: //CountKind.COUNT_UNDO_TRANSACTIONS:
-    //           data.undoCount = count.getCount()
-    //           break
-    //       }
-    //     })
-    //     res({ command: 3, data: data })
-    //   }
-    //   rej({ msg: `no ${request.command} handler found` })
-    // })
   }
 }

src/dataEditor/omegaEdit/service/requests.ts/requestHandler.ts

@@ -1,25 +1,25 @@
-import { getCounts } from '@omega-edit/client'
+import { getCounts, IServerHeartbeat } from '@omega-edit/client'
 import { FilePath } from '../..'
 import { SessionIdType } from '../session'
 import { ViewportCreateHandler } from './viewport'
 
 type CommandResponse<Args, ResponseType> = (
   args?: Args
 ) => Promise<ResponseType>
-const ServerHeartbeatHandler: CommandResponse<undefined, {}> = () => {
-  return new Promise((res, rej) => {
-    res({
-      command: 4,
-      data: {},
-    })
-  })
+
+interface ServiceRequest {
+  readonly command: string
 }
+
+const ServerHeartbeatHandler = (hb: IServerHeartbeat) => {}
+
 type FileInfo = {
   name: string
   computedFileSize: number
   changeCount: number
   undoCount: number
 }
+
 const FileInfoHandler = (sessionId: SessionIdType, file: FilePath) => {
   return new Promise(async (res, rej) => {
     const count = await getCounts(sessionId, [

src/dataEditor/omegaEdit/service/session.ts

@@ -14,7 +14,7 @@ export class OmegaEditSession implements EditServiceClient {
   constructor(
     private sessionId: SessionIdType,
     private serviceRequestHandler: (request: any) => Promise<any>,
-    readonly close: () => void
+    readonly onClose: () => void
   ) {
     this.heartbeatInterval = setInterval(() => {
       this.request({ command: 'getServerHeartbeat' })
@@ -55,6 +55,12 @@ export class OmegaEditSession implements EditServiceClient {
     this.onDidProcess(response)
     this.onRequestProcessed
   }
+  close() {
+    clearInterval(this.heartbeatInterval)
+    this.requestResponseCallbacks = []
+    this.responseBacklog = []
+    this.onClose()
+  }
 }
 
 export class OmegaEditSessionNotifier {

src/dataEditor/standalone/standaloneEditor.ts

@@ -26,9 +26,6 @@ export class StandaloneEditor extends DataEditor implements vscode.Disposable {
     }
     this.serviceClient.request({ command: 'getFileInfo' })
   }
-  dispose() {
-    // this.editService.dispose()
-  }
 }
 
 export class StandaloneInitializer extends DataEditorInitializer<StandaloneEditor> {
@@ -42,8 +39,9 @@ export class StandaloneInitializer extends DataEditorInitializer<StandaloneEdito
         extractConfigurationVariables
       )
       const service = await server.getService()
-
       const session = await service.register(target)
+      ctx.subscriptions.push(server)
+
       resolve(
         new StandaloneEditor(
           session,

src/dataEditor/webview/editorWebviewPanel.ts

@@ -33,7 +33,9 @@ export class WebviewPanelEditorUI implements DataEditorUI {
   }
 
   updateUI(data: any) {
-    this.panel.webview.postMessage(data)
+    this.panel.webview.postMessage(data).then(undefined, (rejected) => {
+      console.log(`Panel rejected postMessage: ${rejected}`)
+    })
   }
 
   /// `postMessage` can only send JSON serializable data
@@ -45,6 +47,9 @@ export class WebviewPanelEditorUI implements DataEditorUI {
     })
   }
   onClosed(disposal: (e: void) => any) {
-    this.panel.onDidDispose(disposal)
+    this.panel.onDidDispose(() => {
+      disposal()
+      this.panel.dispose()
+    })
   }
 }

src/svelte/src/components/Header/fieldsets/FileMetrics.svelte

@@ -69,8 +69,8 @@ limitations under the License.
           // reset the profiler if changes have been made
           isProfilerOpen = false
           startOffset = length = 0
-          if ('fileName' in msg.data.data) {
-            $fileMetrics.name = msg.data.data.fileName
+          if ('name' in msg.data.data) {
+            $fileMetrics.name = msg.data.data.name
           }
           if ('type' in msg.data.data) {
             $fileMetrics.type = msg.data.data.type

src/svelte/src/components/ServerMetrics/ServerMetrics.svelte

@@ -85,7 +85,7 @@ limitations under the License.
         heartbeat.jvmVendor = msg.data.data.server.jvmVendor
         heartbeat.jvmPath = msg.data.data.server.jvmPath
         heartbeat.availableProcessors =
-          msg.data.data.serverInfo.availableProcessors
+          msg.data.data.server.availableProcessors
 
         // set the serverTimestamp to 0 after 5 seconds of no heartbeat to indicate that no heartbeat has been received
         clearTimeout(timerId)