@eclipse-glsp/server 1.1.0-RC07 → 1.1.0-RC09

package/src/common/session/client-session-factory.spec.ts

@@ -13,11 +13,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { GLSPClientProxy } from '@eclipse-glsp/protocol';
 import { expect } from 'chai';
 import { Container, ContainerModule } from 'inversify';
 import { ActionDispatcher } from '../actions/action-dispatcher';
 import { DiagramModules, InjectionContainer } from '../di/service-identifiers';
-import { GLSPClientProxy } from '../protocol/glsp-client-proxy';
 import * as mock from '../test/mock-util';
 import { GLSPServerError } from '../utils/glsp-server-error';
 import { Logger } from '../utils/logger';

package/src/common/session/client-session-factory.ts

@@ -13,12 +13,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { InitializeClientSessionParameters } from '@eclipse-glsp/protocol';
+import { GLSPClientProxy, InitializeClientSessionParameters } from '@eclipse-glsp/protocol';
 import { Container, ContainerModule, inject, injectable } from 'inversify';
 import { ActionDispatcher } from '../actions/action-dispatcher';
 import { createClientSessionModule } from '../di/client-session-module';
 import { DiagramModules, InjectionContainer } from '../di/service-identifiers';
-import { GLSPClientProxy } from '../protocol/glsp-client-proxy';
 import { GLSPServerError } from '../utils/glsp-server-error';
 import { ClientSession, DefaultClientSession } from './client-session';
 import { ClientSessionInitializer } from './client-session-initializer';

package/src/common/session/client-session-manager.ts

@@ -13,10 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { InitializeClientSessionParameters, remove } from '@eclipse-glsp/protocol';
+import { GLSPServer, GLSPServerListener, InitializeClientSessionParameters, remove } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { GLSPServer } from '../protocol/glsp-server';
-import { GLSPServerListener } from '../protocol/glsp-server-listener';
 import { GLSPServerError } from '../utils/glsp-server-error';
 import { ClientSession } from './client-session';
 import { ClientSessionFactory } from './client-session-factory';

package/src/common/test/mock-util.ts

@@ -23,6 +23,9 @@ import {
     Args,
     CreateNodeOperation,
     EdgeTypeHint,
+    GLSPClientProxy,
+    GLSPServer,
+    GLSPServerListener,
     InitializeClientSessionParameters,
     MaybeArray,
     MaybePromise,
@@ -41,15 +44,12 @@ import { DiagramConfiguration, ServerLayoutKind } from '../diagram/diagram-confi
 import { ContextEditValidator } from '../features/directediting/context-edit-validator';
 import { LabelEditValidator } from '../features/directediting/label-edit-validator';
 import { GModelCreateEdgeOperationHandler, GModelCreateNodeOperationHandler } from '../gmodel/index';
-import { JsonRpcGLSPClientProxy } from '../protocol/glsp-client-proxy';
-import { GLSPServer } from '../protocol/glsp-server';
-import { GLSPServerListener } from '../protocol/glsp-server-listener';
 import { ClientSession } from '../session/client-session';
 import { ClientSessionFactory } from '../session/client-session-factory';
 import { ClientSessionInitializer } from '../session/client-session-initializer';
 import { ClientSessionListener } from '../session/client-session-listener';
 import { ClientSessionManager } from '../session/client-session-manager';
-import { Logger, LogLevel } from '../utils/logger';
+import { LogLevel, Logger } from '../utils/logger';
 
 export async function delay(ms: number): Promise<void> {
     return new Promise(resolve => setTimeout(resolve, ms));
@@ -194,7 +194,7 @@ export class StubClientSessionListener implements ClientSessionListener {
     sessionDisposed(clientSession: ClientSession): void {}
 }
 
-export class StubGLSPClientProxy implements JsonRpcGLSPClientProxy {
+export class StubGLSPClientProxy implements GLSPClientProxy {
     connect(connection: MessageConnection): void {}
 
     process(message: ActionMessage<Action>): void {}

package/src/{browser/di → common/utils}/console-logger.ts

@@ -14,9 +14,14 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
+import { BindingContext } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
-import { Logger, LogLevel } from '../../common/index';
+import { LogLevel, Logger, LoggerConfigOptions, LoggerFactory, NullLogger, getRequestParentName } from './logger';
 
+/**
+ *  Simple logger implementation that forwards logging calls to the `console` and
+ *  can be used in both the browser and node context.
+ */
 @injectable()
 export class ConsoleLogger extends Logger {
     constructor(public logLevel: LogLevel = LogLevel.none, public caller?: string) {
@@ -69,3 +74,16 @@ export class ConsoleLogger extends Logger {
         return JSON.stringify(param, undefined, 4);
     }
 }
+
+export function configureConsoleLogger<T extends LoggerConfigOptions>(context: BindingContext, options: T): void {
+    if (!options.consoleLog) {
+        context.bind(Logger).to(NullLogger).inSingletonScope();
+    } else {
+        context.bind(Logger).toDynamicValue(ctx => new ConsoleLogger(options.logLevel, getRequestParentName(ctx)));
+    }
+    context.bind(LoggerFactory).toFactory(dynamicContext => (caller: string) => {
+        const logger = dynamicContext.container.get(Logger);
+        logger.caller = caller;
+        return logger;
+    });
+}

package/src/common/utils/logger.ts

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { injectable } from 'inversify';
+import { injectable, interfaces } from 'inversify';
 
 @injectable()
 export abstract class Logger {
@@ -70,3 +70,18 @@ export function asLogLevel(level: string | number): LogLevel | undefined {
     }
     return undefined;
 }
+
+export interface LoggerConfigOptions {
+    consoleLog?: boolean;
+    logLevel?: LogLevel;
+}
+
+export function getRequestParentName(context: interfaces.Context): string | undefined {
+    if (context.currentRequest.parentRequest) {
+        const bindings = context.currentRequest.parentRequest.bindings;
+        if (bindings.length > 0) {
+            return bindings[0].implementationType?.name;
+        }
+    }
+    return undefined;
+}

package/src/node/di/app-module.ts

@@ -13,9 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule, interfaces } from 'inversify';
+import { BindingContext } from '@eclipse-glsp/protocol';
+import { ContainerModule } from 'inversify';
 import * as winston from 'winston';
-import { InjectionContainer, Logger, LoggerFactory, LogLevel, ModuleContext } from '../../common/index';
+import { InjectionContainer, LogLevel, Logger, LoggerFactory, getRequestParentName } from '../../common';
 import { LaunchOptions } from '../launch/cli-parser';
 import { WinstonLogger } from './winston-logger';
 
@@ -68,7 +69,7 @@ export function createWinstonInstance<T extends LaunchOptions>(options: T): wins
  * @param baseLoggerCreator The underling global {@link winston.Logger} instance.
  */
 export function configureWinstonLogger<T extends LaunchOptions>(
-    context: ModuleContext,
+    context: BindingContext,
     options: T,
     rebind = true,
     baseLoggerCreator: (launchOptions: T) => winston.Logger = createWinstonInstance
@@ -90,13 +91,3 @@ export function configureWinstonLogger<T extends LaunchOptions>(
         return logger;
     });
 }
-
-function getRequestParentName(context: interfaces.Context): string | undefined {
-    if (context.currentRequest.parentRequest) {
-        const bindings = context.currentRequest.parentRequest.bindings;
-        if (bindings.length > 0) {
-            return bindings[0].implementationType?.name;
-        }
-    }
-    return undefined;
-}

package/src/node/launch/cli-parser.ts

@@ -16,13 +16,12 @@
 import * as cmd from 'commander';
 import * as fs from 'fs-extra';
 import * as path from 'path';
-import { asLogLevel, LogLevel } from '../../common/utils/logger';
+import { LogLevel, LoggerConfigOptions, asLogLevel } from '../../common/utils/logger';
 
-export interface LaunchOptions {
+export interface LaunchOptions extends LoggerConfigOptions {
     logLevel: LogLevel;
     logDir?: string;
     fileLog: boolean;
-    consoleLog: boolean;
 }
 
 export interface CliParser<O extends LaunchOptions = LaunchOptions> {

package/src/node/launch/socket-cli-parser.ts

@@ -23,7 +23,7 @@ export interface SocketLaunchOptions extends LaunchOptions {
 
 export const defaultSocketLaunchOptions: Required<SocketLaunchOptions> = {
     ...defaultLaunchOptions,
-    port: 5007,
+    port: 0,
     host: 'localhost'
 };
 

package/src/node/launch/socket-server-launcher.spec.ts

@@ -14,9 +14,12 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
+import { GLSPServer } from '@eclipse-glsp/protocol';
 import { expect } from 'chai';
 import { Container } from 'inversify';
 import * as net from 'net';
+import * as sinon from 'sinon';
+import { DefaultGLSPServer } from '../../common/protocol/glsp-server';
 import { createAppModule } from '../di/app-module';
 import { defaultSocketLaunchOptions } from './socket-cli-parser';
 import { SocketServerLauncher } from './socket-server-launcher';
@@ -24,7 +27,10 @@ const severPort = 5008;
 describe('test SocketServerLauncher', () => {
     it('starts and stops', async () => {
         const appContainer = new Container();
+        const serverStub = sinon.createStubInstance(DefaultGLSPServer);
         appContainer.load(createAppModule(defaultSocketLaunchOptions));
+
+        appContainer.bind(GLSPServer).toConstantValue(serverStub);
         const launcher = appContainer.resolve(SocketServerLauncher);
         launcher.start({ port: severPort });
         const sockStart = new net.Socket();

package/src/node/launch/socket-server-launcher.ts

@@ -13,36 +13,35 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Container, inject, injectable } from 'inversify';
+import { Disposable } from '@eclipse-glsp/protocol';
+import { inject, injectable } from 'inversify';
 import * as net from 'net';
 import * as jsonrpc from 'vscode-jsonrpc/node';
-import { Disposable } from '..';
-import { GLSPServerLauncher } from '../../common/launch/glsp-server-launcher';
-import { GLSPServer, JsonRpcGLSPServer } from '../../common/protocol/glsp-server';
+import { JsonRpcGLSPServerLauncher } from '../../common/launch/jsonrpc-server-launcher';
 import { Logger } from '../../common/utils/logger';
 
 export const START_UP_COMPLETE_MSG = '[GLSP-Server]:Startup completed. Accepting requests on port:';
 
 @injectable()
-export class SocketServerLauncher extends GLSPServerLauncher<net.TcpSocketConnectOpts> {
+export class SocketServerLauncher extends JsonRpcGLSPServerLauncher<net.TcpSocketConnectOpts> {
     @inject(Logger) protected override logger: Logger;
 
-    protected currentConnections: jsonrpc.MessageConnection[] = [];
-    protected startupCompleteMessage = START_UP_COMPLETE_MSG;
     protected netServer: net.Server;
 
     constructor() {
         super();
         this.toDispose.push(
             Disposable.create(() => {
-                this.currentConnections.forEach(connection => connection.dispose());
                 this.netServer.close();
             })
         );
     }
 
     protected run(opts: net.TcpSocketConnectOpts): Promise<void> {
-        this.netServer = net.createServer(socket => this.createClientConnection(socket));
+        this.netServer = net.createServer(socket => {
+            const connection = this.createConnection(socket);
+            this.createServerInstance(connection);
+        });
 
         this.netServer.listen(opts.port, opts.host);
         this.netServer.on('listening', () => {
@@ -69,27 +68,6 @@ export class SocketServerLauncher extends GLSPServerLauncher<net.TcpSocketConnec
         });
     }
 
-    protected async createClientConnection(socket: net.Socket): Promise<void> {
-        const container = this.createContainer();
-        const connection = this.createConnection(socket);
-        this.currentConnections.push(connection);
-        const glspServer = container.get<JsonRpcGLSPServer>(JsonRpcGLSPServer);
-        glspServer.connect(connection);
-        this.logger.info(`Starting GLSP server connection for client: '${socket.localAddress}'`);
-        connection.listen();
-        connection.onDispose(() => this.disposeClientConnection(container, glspServer));
-        socket.on('close', () => this.disposeClientConnection(container, glspServer));
-        return new Promise((resolve, rejects) => {
-            connection.onClose(() => resolve(undefined));
-            connection.onError(error => rejects(error));
-        });
-    }
-
-    protected disposeClientConnection(container: Container, glspServer: GLSPServer): void {
-        glspServer.shutdown();
-        container.unbindAll();
-    }
-
     protected createConnection(socket: net.Socket): jsonrpc.MessageConnection {
         return jsonrpc.createMessageConnection(new jsonrpc.SocketMessageReader(socket), new jsonrpc.SocketMessageWriter(socket), console);
     }

package/src/node/launch/websocket-server-launcher.ts

@@ -16,14 +16,12 @@
 
 import { createWebSocketConnection, Disposable, MaybePromise, WebSocketWrapper } from '@eclipse-glsp/protocol';
 import * as http from 'http';
-import { Container, inject, injectable } from 'inversify';
+import { inject, injectable } from 'inversify';
 import * as net from 'net';
 import * as jsonrpc from 'vscode-jsonrpc';
 import { Server, WebSocket } from 'ws';
-import { GLSPServerLauncher } from '../../common/launch/glsp-server-launcher';
-import { GLSPServer, JsonRpcGLSPServer } from '../../common/protocol/glsp-server';
+import { JsonRpcGLSPServerLauncher } from '../../common/launch/jsonrpc-server-launcher';
 import { Logger } from '../../common/utils/logger';
-import { START_UP_COMPLETE_MSG } from './socket-server-launcher';
 
 export interface WebSocketServerOptions {
     host?: string;
@@ -46,19 +44,16 @@ export interface WebsocketConnectionData {
 const STATUS_UPGRADE_REQUIRED = 426;
 
 @injectable()
-export class WebSocketServerLauncher extends GLSPServerLauncher<WebSocketServerOptions> {
+export class WebSocketServerLauncher extends JsonRpcGLSPServerLauncher<WebSocketServerOptions> {
     @inject(Logger)
     protected override logger: Logger;
 
     protected server: Server;
-    protected startupCompleteMessage = START_UP_COMPLETE_MSG;
-    protected currentConnections: jsonrpc.MessageConnection[] = [];
 
     constructor() {
         super();
         this.toDispose.push(
             Disposable.create(() => {
-                this.currentConnections.forEach(connection => connection.dispose());
                 this.server.close();
             })
         );
@@ -72,7 +67,8 @@ export class WebSocketServerLauncher extends GLSPServerLauncher<WebSocketServerO
         console.log(this.startupCompleteMessage.concat(resolvedOptions.port.toString()));
 
         this.server.on('connection', (ws, req) => {
-            this.createClientConnection(ws);
+            const connection = this.createConnection(ws);
+            this.createServerInstance(connection);
         });
 
         return new Promise((resolve, reject) => {
@@ -81,28 +77,6 @@ export class WebSocketServerLauncher extends GLSPServerLauncher<WebSocketServerO
         });
     }
 
-    protected async createClientConnection(socket: WebSocket): Promise<void> {
-        const container = this.createContainer();
-        const connection = this.createConnection(socket);
-        this.currentConnections.push(connection);
-        const glspServer = container.get<JsonRpcGLSPServer>(JsonRpcGLSPServer);
-        glspServer.connect(connection);
-        this.logger.info('Starting GLSP server connection');
-        connection.listen();
-        connection.onDispose(() => this.disposeClientConnection(container, glspServer));
-        socket.on('close', () => this.disposeClientConnection(container, glspServer));
-        connection.onClose(() => console.log('GOD dam'));
-        return new Promise((resolve, rejects) => {
-            connection.onClose(() => resolve(undefined));
-            connection.onError(error => rejects(error));
-        });
-    }
-
-    protected disposeClientConnection(container: Container, glspServer: GLSPServer): void {
-        glspServer.shutdown();
-        container.unbindAll();
-    }
-
     protected createConnection(socket: WebSocket): jsonrpc.MessageConnection {
         return createWebSocketConnection(wrapWebSocket(socket));
     }

package/lib/browser/di/console-logger.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"console-logger.d.ts","sourceRoot":"","sources":["../../../src/browser/di/console-logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEtD,qBACa,aAAc,SAAQ,MAAM;IAClB,QAAQ,EAAE,QAAQ;IAAyB,MAAM,CAAC;gBAAlD,QAAQ,GAAE,QAAwB,EAAS,MAAM,CAAC,oBAAQ;IAI7E,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM7C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM7C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM9C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI;IAM9C,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM;IAOrD,cAAc,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM;IAOxC,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM;CAOpC"}

package/lib/browser/di/console-logger.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"console-logger.js","sourceRoot":"","sources":["../../../src/browser/di/console-logger.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,yCAAuC;AACvC,8CAAsD;AAG/C,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,cAAM;IACrC,YAAmB,WAAqB,gBAAQ,CAAC,IAAI,EAAS,MAAe;QACzE,KAAK,EAAE,CAAC;QADO,aAAQ,GAAR,QAAQ,CAA0B;QAAS,WAAM,GAAN,MAAM,CAAS;IAE7E,CAAC;IAED,IAAI,CAAC,OAAe,EAAE,GAAG,MAAa;QAClC,IAAI,gBAAQ,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE;YAChC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;SAClD;IACL,CAAC;IAED,IAAI,CAAC,OAAe,EAAE,GAAG,MAAa;QAClC,IAAI,gBAAQ,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE;YAChC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;SAClD;IACL,CAAC;IAED,KAAK,CAAC,OAAe,EAAE,GAAG,MAAa;QACnC,IAAI,gBAAQ,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;SACnD;IACL,CAAC;IAED,KAAK,CAAC,OAAe,EAAE,GAAG,MAAa;QACnC,IAAI,gBAAQ,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;SACnD;IACL,CAAC;IAED,UAAU,CAAC,OAAe,EAAE,GAAG,MAAa;QACxC,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,kBAAkB,EAAE,CAAC;QAClD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,MAAM,CAAC,CAAC;QAClD,OAAO,GAAG,SAAS,IAAI,IAAI,CAAC,QAAQ,MAAM,MAAM,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;IAChF,CAAC;IAED,cAAc,CAAC,GAAG,MAAa;QAC3B,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YAChC,OAAO,EAAE,CAAC;SACb;QACD,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClE,CAAC;IAED,SAAS,CAAC,KAAc;QACpB,IAAI,KAAK,YAAY,KAAK,EAAE;YACxB,OAAO,GAAG,KAAK,CAAC,OAAO;cACrB,KAAK,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;SACzB;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAA;AAlDY,aAAa;IADzB,IAAA,sBAAU,GAAE;;GACA,aAAa,CAkDzB;AAlDY,sCAAa"}

package/lib/common/actions/action-dispatcher.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=action-dispatcher.spec.d.ts.map

package/lib/common/actions/action-dispatcher.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"action-dispatcher.spec.d.ts","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.spec.ts"],"names":[],"mappings":""}