Connect refactor

src/extension/extension.ts

@@ -73,7 +73,13 @@ import {
   runForkCommand,
   selectEnvironment,
 } from './commands'
-import { WasmSerializer, GrpcSerializer, SerializerBase } from './serializer'
+import {
+  WasmSerializer,
+  GrpcSerializer,
+  SerializerBase,
+  ConnectSerializer,
+  GrpcSerializerBase,
+} from './serializer'
 import { RunmeLauncherProvider, RunmeTreeProvider } from './provider/launcher'
 import { RunmeLauncherProvider as RunmeLauncherProviderBeta } from './provider/launcherBeta'
 import { RunmeUriHandler } from './handler/uri'
@@ -104,6 +110,8 @@ export class RunmeExtension {
     const grpcSerializer = kernel.hasExperimentEnabled('grpcSerializer')
     const grpcServer = kernel.hasExperimentEnabled('grpcServer')
     const grpcRunner = kernel.hasExperimentEnabled('grpcRunner')
+    const config = workspace.getConfiguration('runme')
+    const serializerAddress = config.get<string>('serializerAddress')
 
     const server = new KernelServer(
       context.extensionUri,
@@ -128,11 +136,16 @@ export class RunmeExtension {
     )
 
     const reporter = new GrpcReporter(context, server)
-    const serializer = grpcSerializer
-      ? new GrpcSerializer(context, server, kernel)
-      : new WasmSerializer(context, kernel)
+    let serializer: SerializerBase
+    if (serializerAddress && serializerAddress.length > 0) {
+      serializer = new ConnectSerializer(context, serializerAddress, kernel)
+    } else if (grpcSerializer) {
+      serializer = new GrpcSerializer(context, server, kernel)
+    } else {
+      serializer = new WasmSerializer(context, kernel)
+    }
     this.serializer = serializer
-    kernel.setSerializer(serializer as GrpcSerializer)
+    kernel.setSerializer(serializer as GrpcSerializerBase)
     kernel.setReporter(reporter)
 
     let treeViewer: RunmeTreeProvider

src/extension/kernel.ts

@@ -101,7 +101,7 @@ import { handleCellOutputMessage } from './messages/cellOutput'
 import handleGitHubMessage, { handleGistMessage } from './messages/github'
 import { getNotebookCategories } from './utils'
 import PanelManager from './panels/panelManager'
-import { GrpcSerializer, SerializerBase } from './serializer'
+import { GrpcSerializerBase } from './serializer'
 import { askAlternativeOutputsAction, openSplitViewAsMarkdownText } from './commands'
 import { handlePlatformApiMessage } from './messages/platformRequest'
 import { handleGCPMessage } from './messages/gcp'
@@ -148,7 +148,7 @@ export class Kernel implements Disposable {
   protected activeTerminals: ActiveTerminal[] = []
   protected category?: string
   protected panelManager: PanelManager
-  protected serializer?: SerializerBase
+  protected serializer?: GrpcSerializerBase
   protected reporter?: GrpcReporter
   protected featuresState$?
 
@@ -270,7 +270,7 @@ export class Kernel implements Disposable {
     this.category = category
   }
 
-  setSerializer(serializer: GrpcSerializer) {
+  setSerializer(serializer: GrpcSerializerBase) {
     this.serializer = serializer
   }
 
@@ -315,7 +315,7 @@ export class Kernel implements Disposable {
   }
 
   async #setNotebookMode(notebookDocument: NotebookDocument): Promise<void> {
-    const isSessionsOutput = GrpcSerializer.isDocumentSessionOutputs(notebookDocument.metadata)
+    const isSessionsOutput = GrpcSerializerBase.isDocumentSessionOutputs(notebookDocument.metadata)
     const notebookMode = isSessionsOutput ? NotebookMode.SessionOutputs : NotebookMode.Execution
     await ContextState.addKey(NOTEBOOK_MODE, notebookMode)
   }
@@ -668,7 +668,7 @@ export class Kernel implements Disposable {
 
   private async _executeAll(cells: NotebookCell[]) {
     const sessionOutputsDoc = cells.find((c) =>
-      GrpcSerializer.isDocumentSessionOutputs(c.notebook.metadata),
+      GrpcSerializerBase.isDocumentSessionOutputs(c.notebook.metadata),
     )
     if (sessionOutputsDoc) {
       const { notebook } = sessionOutputsDoc