Restructure data editor messaging with Message Registry

Author: stricklandrbls

src/dataEditor/dataEditorClient.ts

@@ -14,17 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { IServerHeartbeat } from '@omega-edit/client'
+import { IServerHeartbeat, IServerInfo } from '@omega-edit/client'
 
-export class HeartbeatInfo implements IServerHeartbeat {
-  omegaEditPort: number = 0 // Ωedit server port
-  latency: number = 0 // latency in ms
-  serverCommittedMemory: number = 0 // committed memory in bytes
-  serverCpuCount: number = 0 // cpu count
-  serverCpuLoadAverage: number = 0 // cpu load average
-  serverMaxMemory: number = 0 // max memory in bytes
-  serverTimestamp: number = 0 // timestamp in ms
-  serverUptime: number = 0 // uptime in ms
-  serverUsedMemory: number = 0 // used memory in bytes
-  sessionCount: number = 0 // session count
+export type ServerHeartbeat = IServerHeartbeat & { serverInfo: IServerInfo }
+
+export class HeartbeatInfo {
+  serverHeartbeat: ServerHeartbeat = {
+    latency: 0,
+    sessionCount: 0,
+    serverTimestamp: 0,
+    serverUptime: 0,
+    serverCpuCount: 0,
+    serverCpuLoadAverage: 0,
+    serverMaxMemory: 0,
+    serverCommittedMemory: 0,
+    serverUsedMemory: 0,
+    serverInfo: {
+      serverHostname: '',
+      serverProcessId: 0,
+      serverVersion: '',
+      jvmVersion: '',
+      jvmVendor: '',
+      jvmPath: '',
+      availableProcessors: 0,
+    },
+  }
 }

src/dataEditor/include/server/heartbeat/HeartBeatInfo.ts

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { getServerHeartbeat, IServerHeartbeat } from '@omega-edit/client'
+import { getServerHeartbeat, getServerInfo } from '@omega-edit/client'
 import { HeartbeatInfo } from './HeartBeatInfo'
 
 const HEARTBEAT_INTERVAL_MS: number = 1000 // 1 second (1000 ms)
-let heartbeatInfo: IServerHeartbeat = new HeartbeatInfo()
+let heartbeatInfo = new HeartbeatInfo()
 let getHeartbeatIntervalId: NodeJS.Timeout | number | undefined = undefined
 
 export function updateHeartbeatInterval(activeSessions: string[]) {
@@ -28,10 +28,15 @@ export function updateHeartbeatInterval(activeSessions: string[]) {
   getHeartbeatIntervalId =
     activeSessions.length > 0
       ? setInterval(async () => {
-          heartbeatInfo = await getServerHeartbeat(
+          const heartbeat = await getServerHeartbeat(
             activeSessions,
             HEARTBEAT_INTERVAL_MS * activeSessions.length
           )
+          const info = await getServerInfo()
+          heartbeatInfo.serverHeartbeat = {
+            ...heartbeat,
+            serverInfo: { ...info },
+          }
         })
       : undefined
 }

src/dataEditor/include/server/heartbeat/index.ts

@@ -16,9 +16,16 @@
  */
 import { debug } from 'vscode'
 
-export function isDFDLDebugSessionActive(): boolean {
-  return (
-    debug.activeDebugSession !== undefined &&
-    debug.activeDebugSession.type === 'dfdl'
-  )
+export function isDFDLDebugSessionActive(file: string): boolean {
+  if (debug.activeDebugSession === undefined) return false
+  if (debug.activeDebugSession!.type !== 'dfdl') return false
+  if (debug.activeDebugSession!.configuration.data !== file) return false
+  return true
+}
+
+export function toEncoding(encoding: string): BufferEncoding {
+  if (!Buffer.isEncoding(encoding)) {
+    console.error(`Value (${encoding}) is not a valid BufferEncoding type`)
+  }
+  return encoding as BufferEncoding
 }

src/dataEditor/include/utils.ts

@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import * as vscode from 'vscode'
+
+interface DisplayStateAttributes {
+  title: string
+  encoding: BufferEncoding
+  colorTheme: vscode.ColorThemeKind
+}
+
+export class DisplayState {
+  private attributes: DisplayStateAttributes = {
+    title: '',
+    encoding: 'hex',
+    colorTheme: vscode.window.activeColorTheme.kind,
+  }
+
+  constructor() {
+    vscode.window.onDidChangeActiveColorTheme(async (event) => {
+      this.attributes.colorTheme = event.kind
+      await this.sendUIThemeUpdate()
+    }, this)
+    this.sendUIThemeUpdate()
+  }
+
+  update<K extends keyof DisplayStateAttributes>(
+    attribute: K,
+    value: DisplayStateAttributes[K]
+  ): void {
+    this.attributes[attribute] = value
+  }
+
+  get<K extends keyof DisplayStateAttributes>(
+    attribute: K
+  ): DisplayStateAttributes[K] {
+    return this.attributes[attribute]
+  }
+
+  on<K extends keyof DisplayStateAttributes>(
+    eventType: `${K}_update`,
+    listener: (value: DisplayStateAttributes[K]) => any
+  ) {}
+  private sendUIThemeUpdate() {
+    // return this.panel.webview.postMessage({
+    //   command: MessageCommand.setUITheme,
+    //   theme: this.colorThemeKind,
+    // })
+  }
+}