@jupyterlite/terminal 0.1.6 → 0.2.0

package/lib/terminal.js

@@ -1,101 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-import { Signal } from '@lumino/signaling';
-import { Server as WebSocketServer } from 'mock-socket';
-import { Shell } from './shell';
-export class Terminal {
-    /**
-     * Construct a new Terminal.
-     */
-    constructor(options) {
-        this.options = options;
-        this._disposed = new Signal(this);
-        this._isDisposed = false;
-        this._running = false;
-        this._shell = new Shell({
-            mountpoint: '/drive',
-            driveFsBaseUrl: options.baseUrl,
-            wasmBaseUrl: options.baseUrl + 'extensions/@jupyterlite/terminal/static/wasm/',
-            outputCallback: this._outputCallback.bind(this)
-        });
-        this._shell.disposed.connect(() => this.dispose());
-    }
-    _outputCallback(text) {
-        if (this._socket) {
-            const ret = JSON.stringify(['stdout', text]);
-            this._socket.send(ret);
-        }
-    }
-    dispose() {
-        if (this._isDisposed) {
-            return;
-        }
-        console.log('Terminal.dispose');
-        this._isDisposed = true;
-        if (this._socket !== undefined) {
-            // Disconnect from frontend.
-            this._socket.send(JSON.stringify(['disconnect']));
-            this._socket.close();
-            this._socket = undefined;
-        }
-        if (this._server !== undefined) {
-            this._server.close();
-            this._server = undefined;
-        }
-        this._shell.dispose();
-        this._disposed.emit();
-    }
-    get disposed() {
-        return this._disposed;
-    }
-    get isDisposed() {
-        return this._isDisposed;
-    }
-    /**
-     * Get the name of the terminal.
-     */
-    get name() {
-        return this.options.name;
-    }
-    async wsConnect(url) {
-        console.log('Terminal wsConnect', url);
-        this._server = new WebSocketServer(url);
-        this._server.on('connection', async (socket) => {
-            console.log('Terminal server connection');
-            if (this._socket !== undefined) {
-                this._socket.send(JSON.stringify(['disconnect']));
-                this._socket.close();
-                this._socket = undefined;
-            }
-            this._socket = socket;
-            socket.on('message', async (message) => {
-                const data = JSON.parse(message);
-                //console.log('==> socket message', data);
-                const message_type = data[0];
-                const content = data.slice(1);
-                if (message_type === 'stdin') {
-                    await this._shell.input(content[0]);
-                }
-                else if (message_type === 'set_size') {
-                    const rows = content[0];
-                    const columns = content[1];
-                    await this._shell.setSize(rows, columns);
-                }
-            });
-            socket.on('close', () => {
-                console.log('Terminal socket close');
-            });
-            socket.on('error', () => {
-                console.log('Terminal socket error');
-            });
-            // Return handshake.
-            const res = JSON.stringify(['setup']);
-            console.log('Terminal returning handshake via socket');
-            socket.send(res);
-            if (!this._running) {
-                this._running = true;
-                await this._shell.start();
-            }
-        });
-    }
-}

package/src/manager.ts

@@ -1,82 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-import { PageConfig } from '@jupyterlab/coreutils';
-import { TerminalAPI } from '@jupyterlab/services';
-
-import { Terminal } from './terminal';
-import { ITerminalManager } from './tokens';
-
-/**
- * A class to handle requests to /api/terminals.
- * Although this looks similar to a JupyterLab TerminalManager, it is really a class that
- * implements the terminal REST API.
- */
-export class TerminalManager implements ITerminalManager {
-  /**
-   * Construct a new TerminalManager object.
-   */
-  constructor(wsUrl: string) {
-    this._wsUrl = wsUrl;
-    console.log('==> TerminalManager.constructor', this._wsUrl);
-  }
-
-  /**
-   * Return whether the named terminal exists.
-   */
-  has(name: string): boolean {
-    return this._terminals.has(name);
-  }
-
-  /**
-   * List the running terminals.
-   */
-  async listRunning(): Promise<TerminalAPI.IModel[]> {
-    const ret = [...this._terminals.values()].map(terminal => ({
-      name: terminal.name
-    }));
-    return ret;
-  }
-
-  /**
-   * Shutdown a terminal by name.
-   */
-  async shutdownTerminal(name: string): Promise<void> {
-    const terminal = this._terminals.get(name);
-    if (terminal !== undefined) {
-      console.log('==> TerminalManager.shutdownTerminal', name);
-      this._terminals.delete(name);
-      terminal.dispose();
-    }
-  }
-
-  /**
-   * Start a new kernel.
-   */
-  async startNew(): Promise<TerminalAPI.IModel> {
-    const name = this._nextAvailableName();
-    console.log('==> TerminalManager.startNew', name);
-    const baseUrl = PageConfig.getBaseUrl();
-    const terminal = new Terminal({ name, baseUrl });
-    this._terminals.set(name, terminal);
-
-    terminal.disposed.connect(() => this.shutdownTerminal(name));
-
-    const url = `${this._wsUrl}terminals/websocket/${name}`;
-    await terminal.wsConnect(url);
-
-    return { name };
-  }
-
-  private _nextAvailableName(): string {
-    for (let i = 1; ; ++i) {
-      const name = `${i}`;
-      if (!this._terminals.has(name)) {
-        return name;
-      }
-    }
-  }
-
-  private _wsUrl: string;
-  private _terminals: Map<string, Terminal> = new Map();
-}

package/src/terminal.ts

@@ -1,131 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-import { IShell } from '@jupyterlite/cockle';
-import { JSONPrimitive } from '@lumino/coreutils';
-import { ISignal, Signal } from '@lumino/signaling';
-
-import {
-  Server as WebSocketServer,
-  Client as WebSocketClient
-} from 'mock-socket';
-
-import { Shell } from './shell';
-import { ITerminal } from './tokens';
-
-export class Terminal implements ITerminal {
-  /**
-   * Construct a new Terminal.
-   */
-  constructor(readonly options: ITerminal.IOptions) {
-    this._shell = new Shell({
-      mountpoint: '/drive',
-      driveFsBaseUrl: options.baseUrl,
-      wasmBaseUrl:
-        options.baseUrl + 'extensions/@jupyterlite/terminal/static/wasm/',
-      outputCallback: this._outputCallback.bind(this)
-    });
-    this._shell.disposed.connect(() => this.dispose());
-  }
-
-  private _outputCallback(text: string): void {
-    if (this._socket) {
-      const ret = JSON.stringify(['stdout', text]);
-      this._socket.send(ret);
-    }
-  }
-
-  dispose(): void {
-    if (this._isDisposed) {
-      return;
-    }
-
-    console.log('Terminal.dispose');
-    this._isDisposed = true;
-
-    if (this._socket !== undefined) {
-      // Disconnect from frontend.
-      this._socket.send(JSON.stringify(['disconnect']));
-      this._socket.close();
-      this._socket = undefined;
-    }
-
-    if (this._server !== undefined) {
-      this._server.close();
-      this._server = undefined;
-    }
-
-    this._shell.dispose();
-    this._disposed.emit();
-  }
-
-  get disposed(): ISignal<this, void> {
-    return this._disposed;
-  }
-
-  get isDisposed(): boolean {
-    return this._isDisposed;
-  }
-
-  /**
-   * Get the name of the terminal.
-   */
-  get name(): string {
-    return this.options.name;
-  }
-
-  async wsConnect(url: string) {
-    console.log('Terminal wsConnect', url);
-    this._server = new WebSocketServer(url);
-
-    this._server.on('connection', async (socket: WebSocketClient) => {
-      console.log('Terminal server connection');
-      if (this._socket !== undefined) {
-        this._socket.send(JSON.stringify(['disconnect']));
-        this._socket.close();
-        this._socket = undefined;
-      }
-      this._socket = socket;
-
-      socket.on('message', async (message: any) => {
-        const data = JSON.parse(message) as JSONPrimitive[];
-        //console.log('==> socket message', data);
-        const message_type = data[0];
-        const content = data.slice(1);
-
-        if (message_type === 'stdin') {
-          await this._shell.input(content[0] as string);
-        } else if (message_type === 'set_size') {
-          const rows = content[0] as number;
-          const columns = content[1] as number;
-          await this._shell.setSize(rows, columns);
-        }
-      });
-
-      socket.on('close', () => {
-        console.log('Terminal socket close');
-      });
-
-      socket.on('error', () => {
-        console.log('Terminal socket error');
-      });
-
-      // Return handshake.
-      const res = JSON.stringify(['setup']);
-      console.log('Terminal returning handshake via socket');
-      socket.send(res);
-
-      if (!this._running) {
-        this._running = true;
-        await this._shell.start();
-      }
-    });
-  }
-
-  private _disposed = new Signal<this, void>(this);
-  private _isDisposed = false;
-  private _server?: WebSocketServer;
-  private _socket?: WebSocketClient;
-  private _shell: IShell;
-  private _running = false;
-}