jupyterpack 0.4.0 → 0.5.1

package/src/type.ts

@@ -26,7 +26,9 @@ export enum JupyterPackFramework {
   REACT = 'react',
   DASH = 'dash',
   STREAMLIT = 'streamlit',
-  TORNADO = 'tornado'
+  TORNADO = 'tornado',
+  SHINY = 'shiny',
+  STARLETTE = 'starlette'
 }
 export interface IJupyterPackFileFormat {
   entry: string;
@@ -49,7 +51,15 @@ export interface IKernelExecutorParams {
   params?: string;
   requestBody?: ArrayBuffer;
 }
+
 export interface IKernelExecutor extends IDisposable {
+  executeCode(
+    code: KernelMessage.IExecuteRequestMsg['content'],
+    waitForResult?: boolean
+  ): Promise<string | null>;
+}
+
+export interface IBasePythonServer extends IDisposable {
   getResponse(options: IKernelExecutorParams): Promise<IDict>;
   openWebsocket(options: {
     instanceId: string;
@@ -57,16 +67,17 @@ export interface IKernelExecutor extends IDisposable {
     wsUrl: string;
     protocol?: string;
   }): Promise<void>;
+  closeWebsocket(options: {
+    instanceId: string;
+    kernelId: string;
+    wsUrl: string;
+  }): Promise<void>;
   sendWebsocketMessage(options: {
     instanceId: string;
     kernelId: string;
     wsUrl: string;
     message: string;
   }): Promise<void>;
-  executeCode(
-    code: KernelMessage.IExecuteRequestMsg['content'],
-    waitForResult?: boolean
-  ): Promise<string | null>;
   init(options: {
     entryPath?: string;
     initCode?: string;
@@ -89,7 +100,7 @@ export interface IKernelExecutor extends IDisposable {
 
 export interface IConnectionManager {
   registerConnection(
-    kernelExecutor: IKernelExecutor
+    kernelExecutor: IBasePythonServer
   ): Promise<{ instanceId: string; kernelClientId: string }>;
   generateResponse(
     option: { kernelClientId: string } & IKernelExecutorParams

package/src/websocket/websocket.ts

@@ -59,7 +59,9 @@
     }
     return data;
   };
-  const bcWsChannel = new BroadcastChannel(`/jupyterpack/ws/${instanceId}`);
+  const bcWsChannel = new BroadcastChannel(
+    `/jupyterpack/ws/${instanceId}/${kernelClientId}`
+  );
 
   class BroadcastChannelWebSocket implements WebSocket {
     constructor(url: string | URL, protocols?: string | string[]) {
@@ -109,6 +111,10 @@
         cb();
       }
       this._eventHandlers['close'] = [];
+      sendTypedMessage({
+        action: 'close',
+        wsUrl: this.url
+      });
       bcWsChannel.removeEventListener('message', this._bcMessageHandler);
 
       this.readyState = this.CLOSED;
@@ -168,10 +174,12 @@
       } else {
         data = rawData;
       }
+
       const { action, dest, wsUrl, payload } = data;
       if (dest !== kernelClientId || wsUrl !== this.url) {
         return;
       }
+
       switch (action) {
         case 'connected': {
           this.readyState = this.OPEN;