@eclipse-glsp/server 1.1.0-next.3d7585d.42

package/lib/common/protocol/glsp-server.d.ts

@@ -0,0 +1,150 @@
+/********************************************************************************
+ * Copyright (c) 2022-2023 STMicroelectronics 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
+ ********************************************************************************/
+import { ActionMessage, Args, DisposeClientSessionParameters, InitializeClientSessionParameters, InitializeParameters, InitializeResult, MaybePromise } from '@eclipse-glsp/protocol';
+import * as jsonrpc from 'vscode-jsonrpc';
+import { MessageConnection } from 'vscode-jsonrpc';
+import { GlobalActionProvider } from '../actions/global-action-provider';
+import { ClientSession } from '../session/client-session';
+import { ClientSessionManager } from '../session/client-session-manager';
+import { Logger } from '../utils/logger';
+import { JsonRpcGLSPClientProxy } from './glsp-client-proxy';
+import { GLSPServerListener } from './glsp-server-listener';
+export declare const GLSPServer: unique symbol;
+/**
+ * Interface for implementations of a server component using json-rpc for client-server communication.
+ * Based on the specification of the Graphical Language Server Protocol:
+ * https://github.com/eclipse-glsp/glsp/blob/master/PROTOCOL.md
+ */
+export interface GLSPServer {
+    /**
+     *
+     * The `initialize` request has to be the first request from the client to the server. Until the server has responded
+     * with an {@link InitializeResult} no other request or notification can be handled and is expected to throw an
+     * error. A client is uniquely identified by an `applicationId` and has to specify on which `protocolVersion` it is
+     * based on. In addition, custom arguments can be provided in the `args` map to allow for custom initialization
+     * behavior on the server.
+     *
+     * After successfully initialization all {@link GLSPServerListener}s are notified via the
+     * {@link GLSPServerListener.serverInitialized} method.
+     *
+     * @param params the {@link InitializeParameters}.
+     * @returns A promise of the {@link InitializeResult} .
+     *
+     * @throws {@link Error} Subsequent initialize requests return the {@link InitializeResult} of the initial request
+     * if the given application id and protocol version are matching, otherwise the promise rejects with an error.
+     *
+     */
+    initialize(params: InitializeParameters): Promise<InitializeResult>;
+    /**
+     * The `initializeClientSession` request is sent to the server whenever a new graphical representation (diagram) is
+     * created. Each individual diagram on the client side counts as one session and has to provide a unique
+     * `clientSessionId` and its `diagramType`. In addition, custom arguments can be provided in the `args` map to allow
+     * for custom initialization behavior on the server. Subsequent `initializeClientSession` requests for the same
+     * client id and diagram type are expected to resolve successfully but don't have an actual effect because the
+     * corresponding client session is  already initialized.
+     *
+     * @param params the {@link InitializeClientSessionParameters}.
+     * @returns A promise that completes when the initialization was successful.
+     */
+    initializeClientSession(params: InitializeClientSessionParameters): Promise<void>;
+    /**
+     * The 'DisposeClientSession' request is sent to the server when a graphical representation (diagram) is no longer
+     * needed, e.g. the tab containing the diagram widget has been closed. The session is identified by its unique
+     * `clientSessionId`. In addition, custom arguments can be provided in the `args` map to allow for custom dispose
+     * behavior on the server.
+     *
+     * @param params the {@link DisposeClientSessionParameters}.
+     * @returns A `void` promise that completes if the disposal was successful.
+     *
+     */
+    disposeClientSession(params: DisposeClientSessionParameters): Promise<void>;
+    /**
+     * A `process` notification is sent from the client to server when the server should handle i.e. process a specific
+     * {@link ActionMessage}. Any communication that is performed between initialization and shutdown is handled by
+     * sending action messages, either from the client to the server or from the server to the client. This is the core
+     * part of the Graphical Language Server Protocol.
+     *
+     * @param message The {@link ActionMessage} that should be processed.
+     */
+    process(message: ActionMessage): void;
+    /**
+     * The `shutdown` notification is sent from the client to the server if the client disconnects from the server (e.g.
+     * the client application has been closed).
+     * This gives the server a chance to clean up and dispose any resources dedicated to the client and its sessions.
+     * All {@link GLSPServerListener}s are notified via the {@link GLSPServerListener.serverShutDown} method.
+     * Afterwards the server instance is considered to be disposed and can no longer be used for handling requests.
+     *
+     */
+    shutdown(): void;
+    /**
+     * Register a new {@link GLSPServerListener}.
+     *
+     * @param listener The listener that should be registered.
+     * @returns `true` if the listener was registered successfully, `false` otherwise (e.g. listener is already
+     *         registered).
+     */
+    addListener(listener: GLSPServerListener): boolean;
+    /**
+     * Unregister a {@link GLSPServerListener}.
+     *
+     * @param listener The listener that should be removed
+     * @returns 'true' if the listener was unregistered successfully, `false` otherwise (e.g. listener is was not
+     *         registered in the first place).
+     */
+    removeListener(listener: GLSPServerListener): boolean;
+    /**
+     * get a {@link ClientSession}.
+     *
+     * @param sessionId The id of the session to get
+     * @returns The either the ClientSession or undefined, if no ClientSession was found for the given id.
+     */
+    getClientSession(sessionId: string): ClientSession | undefined;
+}
+export declare const JsonRpcGLSPServer: unique symbol;
+export interface JsonRpcGLSPServer extends GLSPServer {
+    connect(connection: jsonrpc.MessageConnection): void;
+}
+export declare class DefaultGLSPServer implements JsonRpcGLSPServer {
+    static readonly PROTOCOL_VERSION = "1.0.0";
+    protected logger: Logger;
+    protected sessionManager: ClientSessionManager;
+    protected actionProvider: GlobalActionProvider;
+    protected glspClient: JsonRpcGLSPClientProxy;
+    protected initializeResult?: InitializeResult;
+    protected applicationId: string;
+    protected clientSessions: Map<string, ClientSession>;
+    protected serverListeners: GLSPServerListener[];
+    constructor(serverListeners?: GLSPServerListener[]);
+    protected setupJsonRpc(connection: MessageConnection): void;
+    protected validateProtocolVersion(params: InitializeParameters): void;
+    protected validateServerInitialized(): void;
+    initialize(params: InitializeParameters): Promise<InitializeResult>;
+    protected handleInitializeArgs(result: InitializeResult, args: Args | undefined): MaybePromise<InitializeResult>;
+    initializeClientSession(params: InitializeClientSessionParameters): Promise<void>;
+    protected handleInitializeClientSessionArgs(args: Args | undefined): MaybePromise<void>;
+    disposeClientSession(params: DisposeClientSessionParameters): Promise<void>;
+    protected handleDisposeClientSessionArgs(args: Args | undefined): Promise<void>;
+    process(message: ActionMessage): void;
+    protected handleProcessError(message: ActionMessage, reason: any): void | PromiseLike<void>;
+    getClientSession(sessionId: string): ClientSession | undefined;
+    shutdown(): void;
+    connect(connection: jsonrpc.MessageConnection): void;
+    protected isInitialized(): boolean;
+    addListener(listener: GLSPServerListener): boolean;
+    removeListener(listener: GLSPServerListener): boolean;
+    protected getListenersToNotify(method: keyof GLSPServerListener): GLSPServerListener[];
+}
+//# sourceMappingURL=glsp-server.d.ts.map

package/lib/common/protocol/glsp-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"glsp-server.d.ts","sourceRoot":"","sources":["../../../src/common/protocol/glsp-server.ts"],"names":[],"mappings":"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"}

package/lib/common/protocol/glsp-server.js

@@ -0,0 +1,188 @@
+"use strict";
+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);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var DefaultGLSPServer_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultGLSPServer = exports.JsonRpcGLSPServer = exports.GLSPServer = void 0;
+/********************************************************************************
+ * Copyright (c) 2022-2023 STMicroelectronics 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
+ ********************************************************************************/
+const protocol_1 = require("@eclipse-glsp/protocol");
+const inversify_1 = require("inversify");
+const global_action_provider_1 = require("../actions/global-action-provider");
+const client_session_manager_1 = require("../session/client-session-manager");
+const glsp_server_error_1 = require("../utils/glsp-server-error");
+const logger_1 = require("../utils/logger");
+const glsp_client_proxy_1 = require("./glsp-client-proxy");
+const glsp_server_listener_1 = require("./glsp-server-listener");
+exports.GLSPServer = Symbol('GLSPServer');
+exports.JsonRpcGLSPServer = Symbol('JsonRpcGLSPServer');
+let DefaultGLSPServer = DefaultGLSPServer_1 = class DefaultGLSPServer {
+    constructor(serverListeners = []) {
+        this.serverListeners = [];
+        this.clientSessions = new Map();
+        serverListeners.forEach(listener => this.addListener(listener));
+    }
+    setupJsonRpc(connection) {
+        connection.onRequest(protocol_1.JsonrpcGLSPClient.InitializeRequest.method, (params) => this.initialize(params));
+        connection.onRequest(protocol_1.JsonrpcGLSPClient.InitializeClientSessionRequest, (params) => this.initializeClientSession(params));
+        connection.onRequest(protocol_1.JsonrpcGLSPClient.DisposeClientSessionRequest, (params) => this.disposeClientSession(params));
+        connection.onNotification(protocol_1.JsonrpcGLSPClient.ActionMessageNotification, message => this.process(message));
+        connection.onNotification(protocol_1.JsonrpcGLSPClient.ShutdownNotification, () => this.shutdown());
+    }
+    validateProtocolVersion(params) {
+        if (params.protocolVersion !== DefaultGLSPServer_1.PROTOCOL_VERSION) {
+            throw new Error(
+            // eslint-disable-next-line max-len
+            `Protocol version mismatch! The client protocol version ${params.protocolVersion} is not compatible with the server protocol version ${DefaultGLSPServer_1.PROTOCOL_VERSION}!`);
+        }
+    }
+    validateServerInitialized() {
+        if (!this.isInitialized()) {
+            throw new Error('This GLSP server has not been initialized.');
+        }
+    }
+    async initialize(params) {
+        this.logger.info(`Initializing server with: applicationId: ${params.applicationId}, protocolVersion: ${params.protocolVersion}`);
+        this.validateProtocolVersion(params);
+        if (this.isInitialized()) {
+            if (params.applicationId !== this.applicationId) {
+                throw new Error(`Could not initialize GLSP server for application ${params.applicationId}. 
+                    Server has already been initialized for different application with id ${this.applicationId}`);
+            }
+            if (this.initializeResult) {
+                return this.initializeResult;
+            }
+        }
+        this.applicationId = params.applicationId;
+        const serverActions = {};
+        this.actionProvider.serverActionKinds.forEach((kinds, diagramType) => (serverActions[diagramType] = kinds));
+        let result = { protocolVersion: DefaultGLSPServer_1.PROTOCOL_VERSION, serverActions };
+        result = await this.handleInitializeArgs(result, params.args);
+        this.getListenersToNotify('serverInitialized').forEach((listener) => listener.serverInitialized(this));
+        this.initializeResult = result;
+        return result;
+    }
+    handleInitializeArgs(result, args) {
+        return result;
+    }
+    async initializeClientSession(params) {
+        this.logger.info(`Initializing client session with: clientSessionId: '${params.clientSessionId}', diagramType: '${params.diagramType}'`);
+        this.validateServerInitialized();
+        const session = this.sessionManager.getOrCreateClientSession(params);
+        this.clientSessions.set(params.clientSessionId, session);
+        return this.handleInitializeClientSessionArgs(params.args);
+    }
+    handleInitializeClientSessionArgs(args) {
+        return;
+    }
+    async disposeClientSession(params) {
+        this.logger.debug('Dispose client session with:', params);
+        this.validateServerInitialized();
+        if (this.sessionManager.disposeClientSession(params.clientSessionId)) {
+            this.clientSessions.delete(params.clientSessionId);
+            return this.handleDisposeClientSessionArgs(params.args);
+        }
+        return;
+    }
+    async handleDisposeClientSessionArgs(args) {
+        return;
+    }
+    process(message) {
+        this.validateServerInitialized();
+        this.logger.info(`process [action=${message.action.kind}, clientId=${message.clientId}]`);
+        const clientSessionId = message.clientId;
+        const clientSession = this.clientSessions.get(clientSessionId);
+        if (!clientSession) {
+            throw new Error(`No client session has been initialized for client id: ${clientSessionId}`);
+        }
+        clientSession.actionDispatcher.dispatch(message.action).catch(error => this.handleProcessError(message, error));
+    }
+    handleProcessError(message, reason) {
+        var _a, _b, _c;
+        let errorMsg = `Could not process action: '${message.action.kind}`;
+        this.logger.error(errorMsg);
+        this.logger.error(reason);
+        let details = (_a = reason === null || reason === void 0 ? void 0 : reason.toString) === null || _a === void 0 ? void 0 : _a.call(reason);
+        if (reason instanceof glsp_server_error_1.GLSPServerError) {
+            details = (_c = (_b = reason.cause) === null || _b === void 0 ? void 0 : _b.toString) === null || _c === void 0 ? void 0 : _c.call(_b);
+            errorMsg = reason.message;
+        }
+        const errorAction = protocol_1.ServerMessageAction.create(errorMsg, { severity: 'ERROR', details });
+        this.glspClient.process({ clientId: message.clientId, action: errorAction });
+    }
+    getClientSession(sessionId) {
+        return this.clientSessions.get(sessionId);
+    }
+    shutdown() {
+        this.logger.info('Shutdown GLSP Server');
+        this.getListenersToNotify('serverShutDown').forEach(listener => listener.serverShutDown(this));
+        this.clientSessions.clear();
+        this.initializeResult = undefined;
+    }
+    connect(connection) {
+        this.setupJsonRpc(connection);
+        this.glspClient.connect(connection);
+    }
+    isInitialized() {
+        return this.initializeResult !== undefined;
+    }
+    addListener(listener) {
+        (0, protocol_1.distinctAdd)(this.serverListeners, listener);
+        return true;
+    }
+    removeListener(listener) {
+        (0, protocol_1.remove)(this.serverListeners, listener);
+        return true;
+    }
+    getListenersToNotify(method) {
+        return this.serverListeners.filter(listener => listener[method]);
+    }
+};
+DefaultGLSPServer.PROTOCOL_VERSION = '1.0.0';
+__decorate([
+    (0, inversify_1.inject)(logger_1.Logger),
+    __metadata("design:type", logger_1.Logger)
+], DefaultGLSPServer.prototype, "logger", void 0);
+__decorate([
+    (0, inversify_1.inject)(client_session_manager_1.ClientSessionManager),
+    __metadata("design:type", Object)
+], DefaultGLSPServer.prototype, "sessionManager", void 0);
+__decorate([
+    (0, inversify_1.inject)(global_action_provider_1.GlobalActionProvider),
+    __metadata("design:type", Object)
+], DefaultGLSPServer.prototype, "actionProvider", void 0);
+__decorate([
+    (0, inversify_1.inject)(glsp_client_proxy_1.JsonRpcGLSPClientProxy),
+    __metadata("design:type", Object)
+], DefaultGLSPServer.prototype, "glspClient", void 0);
+DefaultGLSPServer = DefaultGLSPServer_1 = __decorate([
+    (0, inversify_1.injectable)(),
+    __param(0, (0, inversify_1.multiInject)(glsp_server_listener_1.GLSPServerListener)),
+    __param(0, (0, inversify_1.optional)()),
+    __metadata("design:paramtypes", [Array])
+], DefaultGLSPServer);
+exports.DefaultGLSPServer = DefaultGLSPServer;
+//# sourceMappingURL=glsp-server.js.map

package/lib/common/protocol/glsp-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"glsp-server.js","sourceRoot":"","sources":["../../../src/common/protocol/glsp-server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAagC;AAChC,yCAAsE;AAGtE,8EAAyE;AAEzE,8EAAyE;AACzE,kEAA6D;AAC7D,4CAAyC;AACzC,2DAA6D;AAC7D,iEAA4D;AAE/C,QAAA,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAoGlC,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAOtD,IAAM,iBAAiB,yBAAvB,MAAM,iBAAiB;IAsB1B,YAAyD,kBAAwC,EAAE;QAFzF,oBAAe,GAAyB,EAAE,CAAC;QAGjD,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAyB,CAAC;QACvD,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpE,CAAC;IAES,YAAY,CAAC,UAA6B;QAChD,UAAU,CAAC,SAAS,CAAC,4BAAiB,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,MAA4B,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5H,UAAU,CAAC,SAAS,CAAC,4BAAiB,CAAC,8BAA8B,EAAE,CAAC,MAAyC,EAAE,EAAE,CACjH,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CACvC,CAAC;QACF,UAAU,CAAC,SAAS,CAAC,4BAAiB,CAAC,2BAA2B,EAAE,CAAC,MAAsC,EAAE,EAAE,CAC3G,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CACpC,CAAC;QACF,UAAU,CAAC,cAAc,CAAC,4BAAiB,CAAC,yBAAyB,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACzG,UAAU,CAAC,cAAc,CAAC,4BAAiB,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7F,CAAC;IAES,uBAAuB,CAAC,MAA4B;QAC1D,IAAI,MAAM,CAAC,eAAe,KAAK,mBAAiB,CAAC,gBAAgB,EAAE;YAC/D,MAAM,IAAI,KAAK;YACX,mCAAmC;YACnC,0DAA0D,MAAM,CAAC,eAAe,uDAAuD,mBAAiB,CAAC,gBAAgB,GAAG,CAC/K,CAAC;SACL;IACL,CAAC;IAES,yBAAyB;QAC/B,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;SACjE;IACL,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,MAA4B;QAChD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,MAAM,CAAC,aAAa,sBAAsB,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;QACjI,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAErC,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;YACtB,IAAI,MAAM,CAAC,aAAa,KAAK,IAAI,CAAC,aAAa,EAAE;gBAC7C,MAAM,IAAI,KAAK,CAAC,oDAAoD,MAAM,CAAC,aAAa;4FACZ,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;aACrG;YACD,IAAI,IAAI,CAAC,gBAAgB,EAAE;gBACvB,OAAO,IAAI,CAAC,gBAAgB,CAAC;aAChC;SACJ;QAED,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC1C,MAAM,aAAa,GAAkB,EAAE,CAAC;QAExC,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;QAE5G,IAAI,MAAM,GAAG,EAAE,eAAe,EAAE,mBAAiB,CAAC,gBAAgB,EAAE,aAAa,EAAE,CAAC;QAEpF,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAC9D,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,CAAC,QAA4B,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5H,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC;QAC/B,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,oBAAoB,CAAC,MAAwB,EAAE,IAAsB;QAC3E,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAAC,MAAyC;QAC1E,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,uDAAuD,MAAM,CAAC,eAAe,oBAAoB,MAAM,CAAC,WAAW,GAAG,CACzH,CAAC;QACF,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAEjC,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;QACrE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC,iCAAiC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IAES,iCAAiC,CAAC,IAAsB;QAC9D,OAAO;IACX,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,MAAsC;QACpE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,MAAM,CAAC,CAAC;QAC1D,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACjC,IAAI,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;YAClE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACnD,OAAO,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC3D;QACD,OAAO;IACX,CAAC;IAES,KAAK,CAAC,8BAA8B,CAAC,IAAsB;QACjE,OAAO;IACX,CAAC;IAED,OAAO,CAAC,OAAsB;QAC1B,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,OAAO,CAAC,MAAM,CAAC,IAAI,cAAc,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QAC1F,MAAM,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC;QACzC,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC/D,IAAI,CAAC,aAAa,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,yDAAyD,eAAe,EAAE,CAAC,CAAC;SAC/F;QAED,aAAa,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IACpH,CAAC;IAES,kBAAkB,CAAC,OAAsB,EAAE,MAAW;;QAC5D,IAAI,QAAQ,GAAG,8BAA8B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACnE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1B,IAAI,OAAO,GAAuB,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,sDAAI,CAAC;QACvD,IAAI,MAAM,YAAY,mCAAe,EAAE;YACnC,OAAO,GAAG,MAAA,MAAA,MAAM,CAAC,KAAK,0CAAE,QAAQ,kDAAI,CAAC;YACrC,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC;SAC7B;QACD,MAAM,WAAW,GAAG,8BAAmB,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QACzF,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;IACjF,CAAC;IAED,gBAAgB,CAAC,SAAiB;QAC9B,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC9C,CAAC;IAEM,QAAQ;QACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACzC,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,cAAe,CAAC,IAAI,CAAC,CAAC,CAAC;QAChG,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC5B,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC;IACtC,CAAC;IAEM,OAAO,CAAC,UAAqC;QAChD,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAC9B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAES,aAAa;QACnB,OAAO,IAAI,CAAC,gBAAgB,KAAK,SAAS,CAAC;IAC/C,CAAC;IAED,WAAW,CAAC,QAA4B;QACpC,IAAA,sBAAW,EAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,cAAc,CAAC,QAA4B;QACvC,IAAA,iBAAM,EAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,oBAAoB,CAAC,MAAgC;QAC3D,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IACrE,CAAC;;AA1KsB,kCAAgB,GAAG,OAAO,CAAC;AAElD;IAAC,IAAA,kBAAM,EAAC,eAAM,CAAC;8BACG,eAAM;iDAAC;AAEzB;IAAC,IAAA,kBAAM,EAAC,6CAAoB,CAAC;;yDACkB;AAE/C;IAAC,IAAA,kBAAM,EAAC,6CAAoB,CAAC;;yDACkB;AAE/C;IAAC,IAAA,kBAAM,EAAC,0CAAsB,CAAC;;qDACc;AAbpC,iBAAiB;IAD7B,IAAA,sBAAU,GAAE;IAuBI,WAAA,IAAA,uBAAW,EAAC,yCAAkB,CAAC,CAAA;IAAE,WAAA,IAAA,oBAAQ,GAAE,CAAA;;GAtB/C,iBAAiB,CA4K7B;AA5KY,8CAAiB"}

package/lib/common/protocol/glsp-server.spec.d.ts

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

package/lib/common/protocol/glsp-server.spec.d.ts.map

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

package/lib/common/protocol/glsp-server.spec.js

@@ -0,0 +1,119 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const inversify_1 = require("inversify");
+const sinon = require("sinon");
+const global_action_provider_1 = require("../actions/global-action-provider");
+const client_session_manager_1 = require("../session/client-session-manager");
+const mock = require("../test/mock-util");
+const logger_1 = require("../utils/logger");
+const glsp_client_proxy_1 = require("./glsp-client-proxy");
+const glsp_server_1 = require("./glsp-server");
+const glsp_server_listener_1 = require("./glsp-server-listener");
+const assert = require("assert");
+describe('test DefaultGLSPServer', () => {
+    const container = new inversify_1.Container();
+    const clientSessionId = 'myClientSession';
+    const diagramType = 'myDiagram';
+    const applicationId = 'Test';
+    const protocolVersion = '1.0.0';
+    const serverActionKinds = new Map();
+    serverActionKinds.set(diagramType, ['A1', 'A2']);
+    const sessionManager = new mock.StubClientSessionManager();
+    const spy_sessionManager_getOrCreate = sinon.spy(sessionManager, 'getOrCreateClientSession');
+    const spy_sessionManager_dispose = sinon.spy(sessionManager, 'disposeClientSession');
+    const listener1 = new mock.StubGLSPServerListener();
+    const spy_listener1_initialize = sinon.spy(listener1, 'serverInitialized');
+    const spy_listener1_shutdown = sinon.spy(listener1, 'serverShutDown');
+    const listener2 = new mock.StubGLSPServerListener();
+    const spy_listener2_initialize = sinon.spy(listener2, 'serverInitialized');
+    const spy_listener2_shutdown = sinon.spy(listener2, 'serverShutDown');
+    container.load(new inversify_1.ContainerModule(bind => {
+        bind(logger_1.Logger).toConstantValue(new mock.StubLogger());
+        bind(glsp_client_proxy_1.GLSPClientProxy).toConstantValue(new mock.StubGLSPClientProxy());
+        bind(glsp_client_proxy_1.JsonRpcGLSPClientProxy).toConstantValue(new mock.StubGLSPClientProxy());
+        bind(client_session_manager_1.ClientSessionManager).toConstantValue(sessionManager);
+        bind(global_action_provider_1.GlobalActionProvider).toConstantValue({ clientActionKinds: new Map(), serverActionKinds });
+        bind(glsp_server_listener_1.GLSPServerListener).toConstantValue(listener1);
+    }));
+    const glspServer = container.resolve(glsp_server_1.DefaultGLSPServer);
+    beforeEach(() => {
+        spy_sessionManager_getOrCreate.restore();
+        spy_sessionManager_dispose.restore();
+        spy_listener1_initialize.restore();
+        spy_listener1_shutdown.restore();
+        spy_listener2_initialize.restore();
+        spy_listener2_shutdown.restore();
+    });
+    it('Test calls before server initialization (should throw errors)', async () => {
+        assert.rejects(() => glspServer.initializeClientSession({ clientSessionId: 'id', diagramType: 'type' }));
+        assert.rejects(() => glspServer.disposeClientSession({ clientSessionId: 'id' }));
+        assert.throws(() => glspServer.process({ clientId: 'id', action: { kind: 'action' } }));
+    });
+    it('addListener - add existing listener', () => {
+        const originalSize = glspServer['serverListeners'].length;
+        glspServer.addListener(listener1);
+        (0, chai_1.expect)(glspServer['serverListeners'].length).to.be.equal(originalSize);
+    });
+    it('addListener - add new listener', () => {
+        const originalSize = glspServer['serverListeners'].length;
+        glspServer.addListener(listener2);
+        (0, chai_1.expect)(glspServer['serverListeners']).to.include(listener2);
+        (0, chai_1.expect)(glspServer['serverListeners'].length).to.be.equal(originalSize + 1);
+    });
+    it('removeListener - remove non-existing listener', () => {
+        const originalSize = glspServer['serverListeners'].length;
+        glspServer.removeListener({});
+        (0, chai_1.expect)(glspServer['serverListeners'].length).to.be.equal(originalSize);
+    });
+    it('removeListener - remove existing listener', () => {
+        const originalSize = glspServer['serverListeners'].length;
+        glspServer.removeListener(listener2);
+        (0, chai_1.expect)(glspServer['serverListeners'].length).to.be.equal(originalSize - 1);
+    });
+    it('initialize - with wrong protocol version', async () => {
+        const initializeParameters = { applicationId, protocolVersion: 'abc' };
+        assert.rejects(glspServer.initialize(initializeParameters));
+    });
+    it('initialize - with correct parameters', async () => {
+        const initializeParameters = { applicationId, protocolVersion };
+        const result = await glspServer.initialize(initializeParameters);
+        (0, chai_1.expect)(result.protocolVersion).to.be.equal(protocolVersion);
+        (0, chai_1.expect)(result.serverActions[diagramType]).to.be.equal(serverActionKinds.get(diagramType));
+        (0, chai_1.expect)(result.serverActions[diagramType]).to.be.equal(serverActionKinds.get(diagramType));
+        (0, chai_1.expect)(spy_listener1_initialize.calledWith(glspServer));
+        (0, chai_1.expect)(spy_listener2_initialize.notCalled);
+    });
+    it('initialize - subsequent call with same parameters', async () => {
+        const initializeParameters = { applicationId, protocolVersion };
+        const result = await glspServer.initialize(initializeParameters);
+        (0, chai_1.expect)(result.protocolVersion).to.be.equal(protocolVersion);
+        (0, chai_1.expect)(result.serverActions[diagramType]).to.be.equal(serverActionKinds.get(diagramType));
+        (0, chai_1.expect)(result.serverActions[diagramType]).to.be.equal(serverActionKinds.get(diagramType));
+    });
+    it('initialize -  subsequent call with other parameters', async () => {
+        const initializeParameters = { applicationId: 'someOtherApp', protocolVersion: 'AnotherProtocolVersion' };
+        await assert.rejects(() => glspServer.initialize(initializeParameters));
+    });
+    it('initialize client session', async () => {
+        const initializeClientSessionParameters = {
+            clientSessionId,
+            diagramType
+        };
+        await glspServer.initializeClientSession(initializeClientSessionParameters);
+        (0, chai_1.expect)(spy_sessionManager_getOrCreate.calledWith(initializeClientSessionParameters));
+    });
+    it('dispose client session', async () => {
+        const disposeClientSessionParameters = {
+            clientSessionId
+        };
+        await glspServer.disposeClientSession(disposeClientSessionParameters);
+        (0, chai_1.expect)(spy_sessionManager_dispose.calledWith(clientSessionId));
+    });
+    it('shutdown server', async () => {
+        glspServer.shutdown();
+        (0, chai_1.expect)(spy_listener1_shutdown.calledWith(glspServer));
+        (0, chai_1.expect)(spy_listener2_shutdown.notCalled);
+    });
+});
+//# sourceMappingURL=glsp-server.spec.js.map

package/lib/common/protocol/glsp-server.spec.js.map

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

package/lib/common/session/client-session-factory.d.ts

@@ -0,0 +1,42 @@
+/********************************************************************************
+ * Copyright (c) 2022-2023 STMicroelectronics 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
+ ********************************************************************************/
+import { InitializeClientSessionParameters } from '@eclipse-glsp/protocol';
+import { Container, ContainerModule } from 'inversify';
+import { GLSPClientProxy } from '../protocol/glsp-client-proxy';
+import { ClientSession } from './client-session';
+export declare const ClientSessionFactory: unique symbol;
+/**
+ * Handles the construction of new {@link ClientSession}. A client session factory has to know
+ * how to derive the client session specific injector and its entrypoint (i.e. the {@link ActionDispatcher}
+ * from a given client session id and a given diagram type.
+ */
+export interface ClientSessionFactory {
+    /**
+     * Create a new {@link ClientSession} based on the given client session id and diagram type.
+     *
+     * @param clientSessionId The client session id.
+     * @param diagramType     The diagram type.
+     * @returns A new instance of {@link ClientSession} that correlates to the given input parameters.
+     */
+    create(params: InitializeClientSessionParameters): ClientSession;
+}
+export declare class DefaultClientSessionFactory implements ClientSessionFactory {
+    protected serverContainer: Container;
+    protected diagramModules: Map<string, ContainerModule[]>;
+    protected glspClient: GLSPClientProxy;
+    create(params: InitializeClientSessionParameters): ClientSession;
+}
+//# sourceMappingURL=client-session-factory.d.ts.map

package/lib/common/session/client-session-factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-session-factory.d.ts","sourceRoot":"","sources":["../../../src/common/session/client-session-factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,iCAAiC,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,eAAe,EAAsB,MAAM,WAAW,CAAC;AAI3E,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,aAAa,EAAwB,MAAM,kBAAkB,CAAC;AAGvE,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACjC;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa,CAAC;CACpE;AAED,qBACa,2BAA4B,YAAW,oBAAoB;IAEpE,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC;IAGrC,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IAGzD,SAAS,CAAC,UAAU,EAAE,eAAe,CAAC;IAEtC,MAAM,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa;CAenE"}

package/lib/common/session/client-session-factory.js

@@ -0,0 +1,54 @@
+"use strict";
+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.DefaultClientSessionFactory = exports.ClientSessionFactory = void 0;
+const inversify_1 = require("inversify");
+const action_dispatcher_1 = require("../actions/action-dispatcher");
+const client_session_module_1 = require("../di/client-session-module");
+const service_identifiers_1 = require("../di/service-identifiers");
+const glsp_client_proxy_1 = require("../protocol/glsp-client-proxy");
+const glsp_server_error_1 = require("../utils/glsp-server-error");
+const client_session_1 = require("./client-session");
+const client_session_initializer_1 = require("./client-session-initializer");
+exports.ClientSessionFactory = Symbol('ClientSessionFactory');
+let DefaultClientSessionFactory = class DefaultClientSessionFactory {
+    create(params) {
+        const { clientSessionId: id, diagramType, args } = params;
+        const diagramModules = this.diagramModules.get(diagramType);
+        if (!diagramModules || diagramModules.length === 0) {
+            throw new glsp_server_error_1.GLSPServerError(`Could not retrieve diagram module configuration for diagram type: '${diagramType}''`);
+        }
+        const sessionModule = (0, client_session_module_1.createClientSessionModule)(id, this.glspClient);
+        const sessionContainer = this.serverContainer.createChild();
+        sessionContainer.load(...diagramModules, sessionModule);
+        const initializers = sessionContainer.getAll(client_session_initializer_1.ClientSessionInitializer);
+        initializers.forEach(service => service.initialize(args));
+        const actionDispatcher = sessionContainer.get(action_dispatcher_1.ActionDispatcher);
+        return new client_session_1.DefaultClientSession(id, diagramType, actionDispatcher, sessionContainer);
+    }
+};
+__decorate([
+    (0, inversify_1.inject)(service_identifiers_1.InjectionContainer),
+    __metadata("design:type", inversify_1.Container)
+], DefaultClientSessionFactory.prototype, "serverContainer", void 0);
+__decorate([
+    (0, inversify_1.inject)(service_identifiers_1.DiagramModules),
+    __metadata("design:type", Map)
+], DefaultClientSessionFactory.prototype, "diagramModules", void 0);
+__decorate([
+    (0, inversify_1.inject)(glsp_client_proxy_1.GLSPClientProxy),
+    __metadata("design:type", Object)
+], DefaultClientSessionFactory.prototype, "glspClient", void 0);
+DefaultClientSessionFactory = __decorate([
+    (0, inversify_1.injectable)()
+], DefaultClientSessionFactory);
+exports.DefaultClientSessionFactory = DefaultClientSessionFactory;
+//# sourceMappingURL=client-session-factory.js.map

package/lib/common/session/client-session-factory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-session-factory.js","sourceRoot":"","sources":["../../../src/common/session/client-session-factory.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAA2E;AAC3E,oEAAgE;AAChE,uEAAwE;AACxE,mEAA+E;AAC/E,qEAAgE;AAChE,kEAA6D;AAC7D,qDAAuE;AACvE,6EAAwE;AAE3D,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAmB5D,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAUpC,MAAM,CAAC,MAAyC;QAC5C,MAAM,EAAE,eAAe,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;QAC1D,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC5D,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAChD,MAAM,IAAI,mCAAe,CAAC,sEAAsE,WAAW,IAAI,CAAC,CAAC;SACpH;QAED,MAAM,aAAa,GAAG,IAAA,iDAAyB,EAAC,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACrE,MAAM,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC;QAC5D,gBAAgB,CAAC,IAAI,CAAC,GAAG,cAAc,EAAE,aAAa,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,gBAAgB,CAAC,MAAM,CAA2B,qDAAwB,CAAC,CAAC;QACjG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1D,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAmB,oCAAgB,CAAC,CAAC;QAClF,OAAO,IAAI,qCAAoB,CAAC,EAAE,EAAE,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;IACzF,CAAC;CACJ,CAAA;AAxBG;IAAC,IAAA,kBAAM,EAAC,wCAAkB,CAAC;8BACA,qBAAS;oEAAC;AAErC;IAAC,IAAA,kBAAM,EAAC,oCAAc,CAAC;8BACG,GAAG;mEAA4B;AAEzD;IAAC,IAAA,kBAAM,EAAC,mCAAe,CAAC;;+DACc;AAR7B,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CAyBvC;AAzBY,kEAA2B"}

package/lib/common/session/client-session-factory.spec.d.ts

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

package/lib/common/session/client-session-factory.spec.d.ts.map

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