@eclipse-glsp/server 1.1.0-RC10 → 1.1.0-next.342c713.66

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

@@ -47,7 +47,7 @@ describe('test DefaultClientSessionFactory', () => {
     const factory = container.resolve(DefaultClientSessionFactory);
 
     it('create - new client session', () => {
-        const session = factory.create({ clientSessionId, diagramType });
+        const session = factory.create({ clientSessionId, diagramType, clientActionKinds: [] });
         expect(session.id).to.be.equal(clientSessionId);
         expect(session.diagramType).to.be.equal(diagramType);
         expect(session.container.parent).to.be.equal(container);
@@ -55,6 +55,6 @@ describe('test DefaultClientSessionFactory', () => {
     });
 
     it('create - unknown diagram type', () => {
-        expect(() => factory.create({ clientSessionId, diagramType: 'unknown-type' })).to.throw(GLSPServerError);
+        expect(() => factory.create({ clientSessionId, diagramType: 'unknown-type', clientActionKinds: [] })).to.throw(GLSPServerError);
     });
 });

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

@@ -52,18 +52,18 @@ export class DefaultClientSessionFactory implements ClientSessionFactory {
     protected glspClient: GLSPClientProxy;
 
     create(params: InitializeClientSessionParameters): ClientSession {
-        const { clientSessionId: id, diagramType, args } = params;
+        const { clientSessionId: clientId, diagramType, clientActionKinds, args } = params;
         const diagramModules = this.diagramModules.get(diagramType);
         if (!diagramModules || diagramModules.length === 0) {
             throw new GLSPServerError(`Could not retrieve diagram module configuration for diagram type: '${diagramType}''`);
         }
 
-        const sessionModule = createClientSessionModule(id, this.glspClient);
+        const sessionModule = createClientSessionModule({ clientId, glspClient: this.glspClient, clientActionKinds });
         const sessionContainer = this.serverContainer.createChild();
         sessionContainer.load(...diagramModules, sessionModule);
         const initializers = sessionContainer.getAll<ClientSessionInitializer>(ClientSessionInitializer);
         initializers.forEach(service => service.initialize(args));
         const actionDispatcher = sessionContainer.get<ActionDispatcher>(ActionDispatcher);
-        return new DefaultClientSession(id, diagramType, actionDispatcher, sessionContainer);
+        return new DefaultClientSession(clientId, diagramType, actionDispatcher, sessionContainer);
     }
 }

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

@@ -13,13 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { expect } from 'chai';
 import { Container, ContainerModule } from 'inversify';
+import * as sinon from 'sinon';
 import * as mock from '../test/mock-util';
 import { Logger } from '../utils/logger';
 import { ClientSessionFactory } from './client-session-factory';
 import { DefaultClientSessionManager } from './client-session-manager';
-import { expect } from 'chai';
-import * as sinon from 'sinon';
 
 describe('test DefaultClientSessionManager', () => {
     const testSession = mock.createClientSession('myId', 'myDiagram');
@@ -47,7 +47,8 @@ describe('test DefaultClientSessionManager', () => {
         // Test execution
         const createdSession = sessionManager.getOrCreateClientSession({
             clientSessionId: testSession.id,
-            diagramType: testSession.diagramType
+            diagramType: testSession.diagramType,
+            clientActionKinds: []
         });
         expect(createdSession).to.not.be.undefined;
         expect(createdSession.id).to.be.equal(testSession.id);

package/src/common/utils/client-options-util.ts

@@ -13,10 +13,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Args } from '@eclipse-glsp/protocol';
+import { ArgsUtil } from './args-util';
+
 export class ClientOptionsUtil {
     private static FILE_PREFIX = 'file://';
+    public static IS_RECONNECTING = 'isReconnecting';
 
     public static adaptUri(uri: string): string {
         return uri.replace(this.FILE_PREFIX, '');
     }
+
+    public static isReconnecting(options?: Args): boolean {
+        return ArgsUtil.getBoolean(options, ClientOptionsUtil.IS_RECONNECTING);
+    }
 }

package/src/common/utils/promise-queue.ts

@@ -62,14 +62,13 @@ export class PromiseQueue<T = void> {
             return false;
         }
 
-        try {
-            this.busy = true;
-            this.resolveQueuedPromise(element);
-        } catch (error) {
+        this.busy = true;
+        this.resolveQueuedPromise(element).catch(error => {
             element.reject(error);
             this.busy = false;
             this.dequeue();
-        }
+        });
+
         return true;
     }
 

package/src/common/utils/registry.spec.ts

@@ -13,14 +13,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { MultiRegistry, Registry } from './registry';
 import { expect } from 'chai';
+import { NullLogger } from './logger';
+import { MultiRegistry, Registry } from './registry';
 
 describe('Test Registry', () => {
     let registry: Registry<string, string>;
 
     beforeEach(() => {
         registry = new Registry();
+        registry['logger'] = new NullLogger();
     });
 
     it('register - with new key-value pair', () => {

package/src/common/utils/registry.ts

@@ -14,7 +14,8 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { remove } from '@eclipse-glsp/protocol/lib/utils/array-util';
-import { injectable } from 'inversify';
+import { inject, injectable } from 'inversify';
+import { Logger } from './logger';
 
 /**
  * A registry manages a set of key-value pairs and provides query functionality. In GLSP this is typically used to
@@ -27,6 +28,9 @@ import { injectable } from 'inversify';
 
 @injectable()
 export class Registry<K, V> {
+    @inject(Logger)
+    protected logger: Logger;
+
     protected elements: Map<K, V> = new Map();
     /**
      * Registers a new key-value pair.
@@ -36,11 +40,12 @@ export class Registry<K, V> {
      * @returns `true` if the pair was registered successfully, `false` if another pair with the same key is already
      *         registered.
      */
-    register(key: K, instance: V): boolean {
+    register(key: K, value: V): boolean {
         if (!this.hasKey(key)) {
-            this.elements.set(key, instance);
+            this.elements.set(key, value);
             return true;
         }
+        this.logger.warn('Could not register key-value pair. Key is already registered', { key, value });
         return false;
     }
 

package/src/node/abstract-json-model-storage.ts

@@ -14,8 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { MaybePromise, RequestModelAction, SaveModelAction, TypeGuard } from '@eclipse-glsp/protocol';
-import * as fs from 'fs-extra';
+import * as fs from 'fs';
 import { inject, injectable } from 'inversify';
+import * as os from 'os';
 import { fileURLToPath } from 'url';
 import { ModelState, SOURCE_URI_ARG } from '../common/features/model/model-state';
 import { SourceModelStorage } from '../common/features/model/source-model-storage';
@@ -91,7 +92,12 @@ export abstract class AbstractJsonModelStorage implements SourceModelStorage {
     }
 
     protected toPath(sourceUri: string): string {
-        return sourceUri.startsWith('file://') ? fileURLToPath(sourceUri) : sourceUri;
+        let path = sourceUri.startsWith('file://') ? fileURLToPath(sourceUri) : sourceUri;
+        if (os.platform() === 'win32') {
+            // Remove the leading slash if it exists (Windows paths don't have it)
+            path = path.replace(/^\//, '');
+        }
+        return path;
     }
 
     protected getFileUri(action: SaveModelAction): string {

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

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import * as cmd from 'commander';
-import * as fs from 'fs-extra';
+import * as fs from 'fs';
 import * as path from 'path';
 import { LogLevel, LoggerConfigOptions, asLogLevel } from '../../common/utils/logger';