Session populates data

src/dataEditor/dataEditorClient.ts

@@ -157,7 +157,7 @@ export function activate(ctx: vscode.ExtensionContext): void {
         await server.start()
         /* Moving on w/ assumption that server is up and running */
         const editor = new StandaloneEditor(ctx, configVars)
-        await editor.initialize(await server.getService())
+        await editor.initialize(server)
         // await server.register(editor.heatbeat)
         // return await createDataEditorWebviewPanel(ctx, configVars, fileToEdit)
       }

src/dataEditor/include/client/dataEditorClient.ts

@@ -1,28 +1,13 @@
-import { IHeartbeatReceiver } from '@omega-edit/client'
-import {
-  HeartbeatInfo,
-  HeartbeatProcessor,
-} from '../server/heartbeat/HeartBeatInfo'
-import { ServiceHeartbeat } from '../server/Server'
+import { IEditServiceProvider } from '../server/Server'
 import { IEditService } from '../service/editorService'
-class TestProcessor implements IHeartbeatReceiver {
-  constructor(
-    readonly id: string,
-    public process: (heartbeat: HeartbeatInfo) => void
-  ) {}
-}
 export abstract class DataEditor {
   protected abstract fileToEdit: string
   protected editService: IEditService | undefined = undefined
-  constructor() {}
-  async initialize(service: IEditService) {
+  async initialize(provider: IEditServiceProvider) {
     await this.getFile()
-    this.editService = service
-    service.setup(this.fileToEdit)
-    // await this.setupService()
+    this.editService = await provider.getService(this.fileToEdit)
   }
   protected abstract getFile(): Promise<void>
-  // protected abstract setupService(): Promise<void>
 }
 export interface DataEditorUI {
   show(): Promise<void>

src/dataEditor/include/server/Server.ts

@@ -12,11 +12,10 @@
 // import net from 'net'
 import * as fs from 'fs'
 import {
-  IHeartbeatReceiver,
+  // IHeartbeatReceiver,
   IServerHeartbeat,
   IServerInfo,
   getServerHeartbeat,
-  getServerHeartbeatFor,
   getServerInfo,
   pidIsRunning,
   startServer,
@@ -25,8 +24,7 @@ import {
 import path from 'path'
 import { APP_DATA_PATH } from '../../config'
 import assert from 'assert'
-import { HeartbeatProcessor, IHeartbeatInfo } from './heartbeat/HeartBeatInfo'
-import { OmegaEditService } from '../service/editorService'
+import { IEditService, OmegaEditService } from '../service/editorService'
 
 type ServerProcess = {
   pidFile: string
@@ -45,13 +43,10 @@ export class ServiceHeartbeat {
     }, this.interval)
   }
 }
-export class ServiceClient {
-  constructor() {
-    // createSession()
-    // createViewport()
-  }
+export interface IEditServiceProvider {
+  getService(targetFile: string): Promise<IEditService>
 }
-export class OmegaEditServer {
+export class OmegaEditServer implements IEditServiceProvider {
   readonly host: string
   readonly port: number
   private proc: ServerProcess = { pidFile: '', pid: -1 }
@@ -123,17 +118,19 @@ export class OmegaEditServer {
       resolve(true)
     })
   }
-  async getService(): Promise<OmegaEditService> {
-    return new Promise((resolve, reject) => {
-      resolve(new OmegaEditService())
+  async getService(targetFile: string): Promise<OmegaEditService> {
+    return new Promise(async (resolve, reject) => {
+      let service = new OmegaEditService()
+      await service.set(targetFile)
+      resolve(service)
     })
   }
-  static createProcessor(
-    params: Required<IHeartbeatReceiver>
-  ): IHeartbeatReceiver {
-    // Register Receiver w/ server registry
-    return params as IHeartbeatReceiver
-  }
+  // static createProcessor(
+  //   params: Required<IHeartbeatReceiver>
+  // ): IHeartbeatReceiver {
+  //   // Register Receiver w/ server registry
+  //   return params as IHeartbeatReceiver
+  // }
   private async verify(): Promise<void> {
     return new Promise(async (resolve, reject) => {
       for (let i = 1; i <= 10; ++i) {

src/dataEditor/include/service/editorService.ts

@@ -5,12 +5,12 @@ import {
   getLanguage,
   CreateSessionResponse,
 } from '@omega-edit/client'
-import assert from 'assert'
 
 export interface IEditService {
-  setup(editingFile: string): any
+  set(editingFile: string): any
 }
 
+/* OmegaEditService Implementation */
 const SessionMetadata = {
   byteOrderMark: '',
   changeCount: 0,
@@ -35,7 +35,7 @@ export class Session {
 export class OmegaEditService implements IEditService {
   private session: Session | undefined = undefined
   constructor() {}
-  async setup(editingFile: string) {
+  async set(editingFile: string) {
     try {
       this.session = new Session(await createSession(editingFile))
     } catch {

src/dataEditor/standalone/standaloneEditor.ts

@@ -1,7 +1,6 @@
 import * as vscode from 'vscode'
 import * as editor_config from '../config'
 import { DataEditor } from '../include/client/dataEditorClient'
-import { IEditService } from '../include/service/editorService'
 
 export class StandaloneEditor extends DataEditor {
   protected fileToEdit: string = ''
@@ -21,6 +20,4 @@ export class StandaloneEditor extends DataEditor {
       // await this.setupDataEditor()
     }
   }
-
-  async setupService(): Promise<void> {}
 }