@eclipse-glsp/server 1.1.0-next.44aae0c.44 → 1.1.0-next.5c40594.46

package/lib/node/launch/websocket-server-launcher.d.ts

@@ -0,0 +1,59 @@
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+/// <reference types="node" />
+import { MaybePromise, WebSocketWrapper } from '@eclipse-glsp/protocol';
+import * as http from 'http';
+import { Container } from 'inversify';
+import * as jsonrpc from 'vscode-jsonrpc';
+import { Server, WebSocket } from 'ws';
+import { GLSPServerLauncher } from '../../common/launch/glsp-server-launcher';
+import { GLSPServer } from '../../common/protocol/glsp-server';
+import { Logger } from '../../common/utils/logger';
+export interface WebSocketServerOptions {
+    host?: string;
+    port?: number;
+    path: string;
+}
+export interface ResolvedWebSocketServerOptions {
+    host?: string;
+    port: number;
+    path: string;
+    server: http.Server;
+}
+export interface WebsocketConnectionData {
+    socket: WebSocket;
+    connection: jsonrpc.MessageConnection;
+}
+export declare class WebSocketServerLauncher extends GLSPServerLauncher<WebSocketServerOptions> {
+    protected logger: Logger;
+    protected server: Server;
+    protected startupCompleteMessage: string;
+    protected currentConnections: jsonrpc.MessageConnection[];
+    constructor();
+    protected run(options: WebSocketServerOptions): Promise<void>;
+    protected createClientConnection(socket: WebSocket): Promise<void>;
+    protected disposeClientConnection(container: Container, glspServer: GLSPServer): void;
+    protected createConnection(socket: WebSocket): jsonrpc.MessageConnection;
+    protected resolveOptions(options: WebSocketServerOptions): Promise<ResolvedWebSocketServerOptions>;
+    protected createHttpServer(port: number, host?: string): http.Server;
+    start(options: WebSocketServerOptions): MaybePromise<void>;
+}
+/**
+ * Creates a {@link WebSocketWrapper} for the given plain WebSocket
+ * @param socket The socket to wrap
+ */
+export declare function wrapWebSocket(socket: WebSocket): WebSocketWrapper;
+//# sourceMappingURL=websocket-server-launcher.d.ts.map

package/lib/node/launch/websocket-server-launcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-server-launcher.d.ts","sourceRoot":"","sources":["../../../src/node/launch/websocket-server-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;;AAElF,OAAO,EAAyC,YAAY,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/G,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAsB,MAAM,WAAW,CAAC;AAE1D,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAqB,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAGnD,MAAM,WAAW,sBAAsB;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,8BAA8B;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,uBAAuB;IACpC,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC,iBAAiB,CAAC;CACzC;AAID,qBACa,uBAAwB,SAAQ,kBAAkB,CAAC,sBAAsB,CAAC;IACnF,UACmB,MAAM,EAAE,MAAM,CAAC;IAElC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,sBAAsB,SAAyB;IACzD,SAAS,CAAC,kBAAkB,EAAE,OAAO,CAAC,iBAAiB,EAAE,CAAM;;cAY/C,GAAG,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;cAiBnD,sBAAsB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBxE,SAAS,CAAC,uBAAuB,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAKrF,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,iBAAiB;cAIxD,cAAc,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,8BAA8B,CAAC;IAQxG,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,MAAM;IAgB3D,KAAK,CAAC,OAAO,EAAE,sBAAsB,GAAG,YAAY,CAAC,IAAI,CAAC;CAGtE;AAeD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,gBAAgB,CAQjE"}

package/lib/node/launch/websocket-server-launcher.js

@@ -0,0 +1,145 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wrapWebSocket = exports.WebSocketServerLauncher = void 0;
+const protocol_1 = require("@eclipse-glsp/protocol");
+const http = require("http");
+const inversify_1 = require("inversify");
+const net = require("net");
+const ws_1 = require("ws");
+const glsp_server_launcher_1 = require("../../common/launch/glsp-server-launcher");
+const glsp_server_1 = require("../../common/protocol/glsp-server");
+const logger_1 = require("../../common/utils/logger");
+const socket_server_launcher_1 = require("./socket-server-launcher");
+const STATUS_UPGRADE_REQUIRED = 426;
+let WebSocketServerLauncher = class WebSocketServerLauncher extends glsp_server_launcher_1.GLSPServerLauncher {
+    constructor() {
+        super();
+        this.startupCompleteMessage = socket_server_launcher_1.START_UP_COMPLETE_MSG;
+        this.currentConnections = [];
+        this.toDispose.push(protocol_1.Disposable.create(() => {
+            this.currentConnections.forEach(connection => connection.dispose());
+            this.server.close();
+        }));
+    }
+    async run(options) {
+        const resolvedOptions = await this.resolveOptions(options);
+        this.server = new ws_1.Server({ server: resolvedOptions.server, path: resolvedOptions.path });
+        const endpoint = `ws://${resolvedOptions.host}:${resolvedOptions.port}:${resolvedOptions.path}`;
+        this.logger.info(`The GLSP Websocket launcher is ready to accept new client requests on endpoint '${endpoint}'`);
+        console.log(this.startupCompleteMessage.concat(resolvedOptions.port.toString()));
+        this.server.on('connection', (ws, req) => {
+            this.createClientConnection(ws);
+        });
+        return new Promise((resolve, reject) => {
+            this.server.on('close', () => resolve(undefined));
+            this.server.on('error', error => reject(error));
+        });
+    }
+    async createClientConnection(socket) {
+        const container = this.createContainer();
+        const connection = this.createConnection(socket);
+        this.currentConnections.push(connection);
+        const glspServer = container.get(glsp_server_1.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));
+        });
+    }
+    disposeClientConnection(container, glspServer) {
+        glspServer.shutdown();
+        container.unbindAll();
+    }
+    createConnection(socket) {
+        return (0, protocol_1.createWebSocketConnection)(wrapWebSocket(socket));
+    }
+    async resolveOptions(options) {
+        const port = !options.port || options.port === 0 ? await getFreePort() : options.port;
+        const path = options.path.startsWith('/') ? options.path : `/${options.path}`;
+        const server = this.createHttpServer(port, options.host);
+        return Object.assign(Object.assign({}, options), { port, path, server });
+    }
+    createHttpServer(port, host) {
+        const server = http.createServer((req, res) => {
+            const body = http.STATUS_CODES[STATUS_UPGRADE_REQUIRED];
+            res.writeHead(426, {
+                'Content-Length': body === null || body === void 0 ? void 0 : body.length,
+                'Content-Type': 'text/plain'
+            });
+            res.end(body);
+        });
+        server.listen(port, host);
+        // Set server timeout to infinite
+        server.setTimeout(0);
+        return server;
+    }
+    start(options) {
+        super.start(options);
+    }
+};
+__decorate([
+    (0, inversify_1.inject)(logger_1.Logger),
+    __metadata("design:type", logger_1.Logger)
+], WebSocketServerLauncher.prototype, "logger", void 0);
+WebSocketServerLauncher = __decorate([
+    (0, inversify_1.injectable)(),
+    __metadata("design:paramtypes", [])
+], WebSocketServerLauncher);
+exports.WebSocketServerLauncher = WebSocketServerLauncher;
+async function getFreePort() {
+    return new Promise((resolve, reject) => {
+        const srv = net.createServer();
+        srv.listen(0, () => {
+            const address = srv.address();
+            if (!address || typeof address === 'string') {
+                reject(new Error('Could not address to compute a free port'));
+                return;
+            }
+            srv.close(() => resolve(address.port));
+        });
+    });
+}
+/**
+ * Creates a {@link WebSocketWrapper} for the given plain WebSocket
+ * @param socket The socket to wrap
+ */
+function wrapWebSocket(socket) {
+    return {
+        send: content => socket.send(content),
+        onMessage: cb => socket.on('message', cb),
+        onClose: cb => socket.on('close', cb),
+        onError: cb => socket.on('error', cb),
+        dispose: () => socket.close()
+    };
+}
+exports.wrapWebSocket = wrapWebSocket;
+//# sourceMappingURL=websocket-server-launcher.js.map

package/lib/node/launch/websocket-server-launcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-server-launcher.js","sourceRoot":"","sources":["../../../src/node/launch/websocket-server-launcher.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/server",
-  "version": "1.1.0-next.44aae0c.44+44aae0c",
+  "version": "1.1.0-next.5c40594.46+5c40594",
   "description": "A js server framework for Eclipse GLSP",
   "keywords": [
     "eclipse",
@@ -59,19 +59,21 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@eclipse-glsp/graph": "1.1.0-next.44aae0c.44+44aae0c",
+    "@eclipse-glsp/graph": "1.1.0-next.5c40594.46+5c40594",
     "@eclipse-glsp/protocol": "next",
     "@types/uuid": "8.3.1",
     "commander": "^8.3.0",
     "fast-json-patch": "^3.1.0",
     "inversify": "^5.1.1",
-    "winston": "^3.3.3"
+    "winston": "^3.3.3",
+    "ws": "^8.12.1"
   },
   "devDependencies": {
-    "@types/fs-extra": "^9.0.13"
+    "@types/fs-extra": "^9.0.13",
+    "@types/ws": "^8.5.4"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "44aae0ca2380fe42eb95aac54d2d4e45e187d14f"
+  "gitHead": "5c40594962e16e16e56ec82d8100f45b849de315"
 }

package/src/browser/launch/worker-server-launcher.ts

@@ -16,24 +16,30 @@
 
 import { Container, injectable } from 'inversify';
 import * as jsonrpc from 'vscode-jsonrpc/browser';
-import { GLSPServer, GLSPServerLauncher, JsonRpcGLSPServer, MaybePromise, START_UP_COMPLETE_MSG } from '../../common/index';
+import { GLSPServer, GLSPServerLauncher, JsonRpcGLSPServer, MaybePromise } from '../../common/index';
+export interface WorkerLaunchOptions {
+    context?: Worker;
+}
+
+export const START_UP_COMPLETE_MSG = '[GLSP-Server]:Startup completed.';
 
 @injectable()
-export class WorkerServerLauncher extends GLSPServerLauncher {
-    private connection?: jsonrpc.MessageConnection;
+export class WorkerServerLauncher extends GLSPServerLauncher<WorkerLaunchOptions> {
+    protected connection?: jsonrpc.MessageConnection;
 
-    protected run(): MaybePromise<void> {
+    protected run(options: WorkerLaunchOptions): MaybePromise<void> {
         if (this.connection) {
             throw new Error('Error during launch. Server already has an active client connection');
         }
         const container = this.createContainer();
-        this.connection = this.createConnection();
+        this.connection = this.createConnection(options);
         const glspServer = container.get<JsonRpcGLSPServer>(JsonRpcGLSPServer);
         glspServer.connect(this.connection);
         this.connection.onDispose(() => this.disposeClientConnection(container, glspServer));
 
         this.logger.info('GLSP server worker connection established');
         this.connection.listen();
+        this.toDispose.push(this.connection);
         postMessage(START_UP_COMPLETE_MSG);
         return new Promise((resolve, rejects) => {
             this.connection?.onClose(() => resolve(undefined));
@@ -47,12 +53,10 @@ export class WorkerServerLauncher extends GLSPServerLauncher {
         this.connection = undefined;
     }
 
-    protected stop(): MaybePromise<void> {
-        this.logger.info('Shutdown WorkerServerLauncher');
-        this.connection?.dispose();
-    }
-
-    protected createConnection(): jsonrpc.MessageConnection {
-        return jsonrpc.createMessageConnection(new jsonrpc.BrowserMessageReader(self), new jsonrpc.BrowserMessageWriter(self));
+    protected createConnection(options: WorkerLaunchOptions): jsonrpc.MessageConnection {
+        return jsonrpc.createMessageConnection(
+            new jsonrpc.BrowserMessageReader(options.context ?? self),
+            new jsonrpc.BrowserMessageWriter(options.context ?? self)
+        );
     }
 }

package/src/common/command/recording-command.ts

@@ -29,9 +29,9 @@ export abstract class AbstractRecordingCommand<JsonObject extends AnyObject> imp
     protected redoPatch?: jsonPatch.Operation[];
 
     async execute(): Promise<void> {
-        const beforeState = this.deepClone(this.getJsonObject());
+        const beforeState = this.deepClone(await this.getJsonObject());
         await this.doExecute();
-        const afterState = this.getJsonObject();
+        const afterState = await this.getJsonObject();
         this.undoPatch = jsonPatch.compare(afterState, beforeState);
         this.redoPatch = jsonPatch.compare(beforeState, afterState);
     }
@@ -41,14 +41,14 @@ export abstract class AbstractRecordingCommand<JsonObject extends AnyObject> imp
      * right after {@link AbstractRecordingCommand.doExecute} to derive the undo & redo patches.
      * @returns The current state of the JSON object
      */
-    protected abstract getJsonObject(): JsonObject;
+    protected abstract getJsonObject(): MaybePromise<JsonObject>;
 
     /**
      * The actual execution i.e. series of changes applied to the JSOn object that should be captured.
      */
     protected abstract doExecute(): MaybePromise<void>;
 
-    protected applyPatch(object: JsonObject, patch: jsonPatch.Operation[]): void {
+    protected applyPatch(object: JsonObject, patch: jsonPatch.Operation[]): MaybePromise<void> {
         jsonPatch.applyPatch(object, patch, false, true);
     }
 
@@ -62,15 +62,15 @@ export abstract class AbstractRecordingCommand<JsonObject extends AnyObject> imp
         return jsonPatch.deepClone(object);
     }
 
-    undo(): void {
+    async undo(): Promise<void> {
         if (this.undoPatch) {
-            this.applyPatch(this.getJsonObject(), this.undoPatch);
+            return this.applyPatch(await this.getJsonObject(), this.undoPatch);
         }
     }
 
-    redo(): void {
+    async redo(): Promise<void> {
         if (this.redoPatch) {
-            this.applyPatch(this.getJsonObject(), this.redoPatch);
+            return this.applyPatch(await this.getJsonObject(), this.redoPatch);
         }
     }
 
@@ -88,7 +88,7 @@ export class RecordingCommand<JsonObject extends AnyObject = AnyObject> extends
         super();
     }
 
-    protected getJsonObject(): JsonObject {
+    protected getJsonObject(): MaybePromise<JsonObject> {
         return this.jsonObject;
     }
 }
@@ -107,11 +107,11 @@ export class GModelRecordingCommand extends AbstractRecordingCommand<GModelRootS
         this.modelState.index.indexRoot(this.modelState.root);
     }
 
-    protected getJsonObject(): GModelRootSchema {
+    protected getJsonObject(): MaybePromise<GModelRootSchema> {
         return this.serializer.createSchema(this.modelState.root);
     }
 
-    protected override applyPatch(rootSchema: GModelRootSchema, patch: jsonPatch.Operation[]): void {
+    protected override applyPatch(rootSchema: GModelRootSchema, patch: jsonPatch.Operation[]): MaybePromise<void> {
         super.applyPatch(rootSchema, patch);
         const newRoot = this.serializer.createRoot(rootSchema);
         this.modelState.updateRoot(newRoot);

package/src/common/features/layout/computed-bounds-action-handler.ts

@@ -17,7 +17,7 @@ import { GModelRoot } from '@eclipse-glsp/graph';
 import { Action, ComputedBoundsAction, MaybePromise } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import { ActionHandler } from '../../actions/action-handler';
-import { applyAlignment, applyBounds, applyRoute } from '../../utils/layout-util';
+import { applyAlignment, applyElementAndBounds, applyRoute } from '../../utils/layout-util';
 import { ModelState } from '../model/model-state';
 import { ModelSubmissionHandler } from '../model/model-submission-handler';
 
@@ -47,7 +47,7 @@ export class ComputedBoundsActionHandler implements ActionHandler {
 
     protected applyBounds(root: GModelRoot, action: ComputedBoundsAction): void {
         const index = this.modelState.index;
-        action.bounds.forEach(bounds => applyBounds(bounds, index));
+        action.bounds.forEach(bounds => applyElementAndBounds(bounds, index));
         (action.alignments ?? []).forEach(alignment => applyAlignment(alignment, index));
         (action.routes ?? []).forEach(route => applyRoute(route, index));
     }

package/src/common/index.ts

@@ -23,6 +23,8 @@ export * from './actions/client-action-handler';
 export * from './actions/global-action-provider';
 export * from './command/command';
 export * from './command/command-stack';
+export * from './command/recording-command';
+export * from './command/undo-redo-action-handler';
 export * from './di/binding-target';
 export * from './di/client-session-module';
 export * from './di/diagram-module';
@@ -65,7 +67,6 @@ export * from './features/popup/popup-model-factory';
 export * from './features/popup/request-popup-model-action-handler';
 export * from './features/validation/model-validator';
 export * from './features/validation/request-markers-handler';
-export * from './gmodel/cut-operation-handler';
 export * from './gmodel/index';
 export * from './launch/glsp-server-launcher';
 export * from './operations/compound-operation-handler';
@@ -84,6 +85,7 @@ export * from './session/client-session-manager';
 export * from './utils/args-util';
 export * from './utils/client-options-util';
 export * from './utils/glsp-server-error';
+export * from './utils/layout-util';
 export * from './utils/logger';
 export * from './utils/promise-queue';
 export * from './utils/registry';

package/src/common/launch/glsp-server-launcher.ts

@@ -13,20 +13,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { MaybePromise } from '@eclipse-glsp/protocol';
+import { Disposable, DisposableCollection, MaybePromise } from '@eclipse-glsp/protocol';
 import { Container, ContainerModule, inject, injectable, optional } from 'inversify';
 import { ServerModule } from '../di/server-module';
 import { InjectionContainer } from '../di/service-identifiers';
 import { Logger } from '../utils/logger';
 
-export const START_UP_COMPLETE_MSG = '[GLSP-Server]:Startup completed';
-
 @injectable()
-export abstract class GLSPServerLauncher<T = undefined> {
+export abstract class GLSPServerLauncher<T> implements Disposable {
     @inject(Logger) protected logger: Logger;
 
     protected _modules: ContainerModule[] = [];
     protected running: boolean;
+    protected toDispose = new DisposableCollection();
 
     @inject(InjectionContainer) @optional() protected parentContainer?: Container;
 
@@ -40,7 +39,7 @@ export abstract class GLSPServerLauncher<T = undefined> {
         return container;
     }
 
-    start(startParams?: T): MaybePromise<void> {
+    start(startParams: T): MaybePromise<void> {
         if (!this.running) {
             this.running = true;
             return this.run(startParams);
@@ -48,10 +47,11 @@ export abstract class GLSPServerLauncher<T = undefined> {
         this.logger.warn('Could not start launcher. Launcher is already running!');
     }
 
-    protected abstract run(startParams?: T): MaybePromise<void>;
+    protected abstract run(startParams: T): MaybePromise<void>;
 
     shutdown(): MaybePromise<void> {
         if (this.running) {
+            this.logger.info('Shutdown GLSPServerLauncher');
             const result = this.stop();
             this.running = false;
             return result;
@@ -59,7 +59,13 @@ export abstract class GLSPServerLauncher<T = undefined> {
         this.logger.warn('Could not stop launcher. Launcher is not running!');
     }
 
-    protected abstract stop(): MaybePromise<void>;
+    protected stop(): MaybePromise<void> {
+        this.dispose();
+    }
+
+    dispose(): void {
+        this.toDispose.dispose();
+    }
 
     get modules(): ContainerModule[] {
         if (!this._modules) {

package/src/common/utils/layout-util.ts

@@ -27,7 +27,7 @@ import { getOrThrow, GLSPServerError } from './glsp-server-error';
  * @param index  The model index.
  * @returns The changed element.
  */
-export function applyBounds(bounds: ElementAndBounds, index: GModelIndex): GBoundsAware | undefined {
+export function applyElementAndBounds(bounds: ElementAndBounds, index: GModelIndex): GBoundsAware | undefined {
     const element = getOrThrow(index.get(bounds.elementId), 'Model element not found! ID: ' + bounds.elementId);
     if (isGBoundsAware(element)) {
         if (bounds.newPosition !== undefined) {

package/src/node/index.ts

@@ -21,3 +21,4 @@ export * from './gmodel/gmodel-storage';
 export * from './launch/cli-parser';
 export * from './launch/socket-cli-parser';
 export * from './launch/socket-server-launcher';
+export * from './launch/websocket-server-launcher';

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

@@ -16,11 +16,13 @@
 import { Container, 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 { Logger } from '../../common/utils/logger';
 
-const START_UP_COMPLETE_MSG = '[GLSP-Server]:Startup completed. Accepting requests on port:';
+export const START_UP_COMPLETE_MSG = '[GLSP-Server]:Startup completed. Accepting requests on port:';
+
 @injectable()
 export class SocketServerLauncher extends GLSPServerLauncher<net.TcpSocketConnectOpts> {
     @inject(Logger) protected override logger: Logger;
@@ -29,6 +31,16 @@ export class SocketServerLauncher extends GLSPServerLauncher<net.TcpSocketConnec
     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));
 
@@ -81,10 +93,4 @@ export class SocketServerLauncher extends GLSPServerLauncher<net.TcpSocketConnec
     protected createConnection(socket: net.Socket): jsonrpc.MessageConnection {
         return jsonrpc.createMessageConnection(new jsonrpc.SocketMessageReader(socket), new jsonrpc.SocketMessageWriter(socket), console);
     }
-
-    protected stop(): void {
-        this.logger.info('Shutdown SocketServerLauncher');
-        this.currentConnections.forEach(connection => connection.dispose());
-        this.netServer.close();
-    }
 }