@eclipse-glsp/server 2.7.0-next.7 → 2.7.0-next.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/common/actions/action-dispatcher.d.ts.map +1 -1
- package/lib/common/actions/action-dispatcher.js +6 -0
- package/lib/common/actions/action-dispatcher.js.map +1 -1
- package/lib/common/actions/global-action-provider.d.ts.map +1 -1
- package/lib/common/actions/global-action-provider.js +1 -1
- package/lib/common/actions/global-action-provider.js.map +1 -1
- package/lib/common/di/client-session-module.d.ts +8 -1
- package/lib/common/di/client-session-module.d.ts.map +1 -1
- package/lib/common/di/client-session-module.js +9 -1
- package/lib/common/di/client-session-module.js.map +1 -1
- package/lib/common/di/server-module.d.ts +3 -2
- package/lib/common/di/server-module.d.ts.map +1 -1
- package/lib/common/di/server-module.js +5 -1
- package/lib/common/di/server-module.js.map +1 -1
- package/lib/common/launch/jsonrpc-server-launcher.d.ts +1 -1
- package/lib/common/launch/jsonrpc-server-launcher.d.ts.map +1 -1
- package/lib/common/launch/jsonrpc-server-launcher.js +4 -1
- package/lib/common/launch/jsonrpc-server-launcher.js.map +1 -1
- package/lib/common/operations/create-operation-handler.d.ts +8 -2
- package/lib/common/operations/create-operation-handler.d.ts.map +1 -1
- package/lib/common/operations/create-operation-handler.js +16 -2
- package/lib/common/operations/create-operation-handler.js.map +1 -1
- package/lib/common/protocol/glsp-server.d.ts +7 -2
- package/lib/common/protocol/glsp-server.d.ts.map +1 -1
- package/lib/common/protocol/glsp-server.js +23 -2
- package/lib/common/protocol/glsp-server.js.map +1 -1
- package/lib/common/session/client-session-manager.d.ts +8 -1
- package/lib/common/session/client-session-manager.d.ts.map +1 -1
- package/lib/common/session/client-session-manager.js +4 -1
- package/lib/common/session/client-session-manager.js.map +1 -1
- package/package.json +3 -3
- package/src/common/actions/action-dispatcher.ts +6 -0
- package/src/common/actions/global-action-provider.ts +2 -3
- package/src/common/di/client-session-module.ts +9 -1
- package/src/common/di/server-module.ts +9 -2
- package/src/common/launch/jsonrpc-server-launcher.ts +4 -1
- package/src/common/operations/create-operation-handler.ts +16 -3
- package/src/common/protocol/glsp-server.ts +23 -1
- package/src/common/session/client-session-manager.ts +12 -1
- package/src/common/test/mock-util.ts +4 -0
- package/src/node/actions/action-dispatcher.spec.ts +39 -17
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,QAAQ,EACR,UAAU,EACV,UAAU,EAEV,aAAa,EACb,cAAc,EAIjB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAE3D;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC7B;;;;;;;OAOG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExC;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,WAAW,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;;OAMG;IACH,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACjD,uBAAuB,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAEpD;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,OAAO,CAAC,GAAG,SAAS,cAAc,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAE9E;;;;;;;;;;;;;;;;OAgBG;IACH,YAAY,CAAC,GAAG,SAAS,cAAc,EACnC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,EAC1B,SAAS,CAAC,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC;CAC/B;AAED,eAAO,MAAM,mBAAmB,eAAgC,CAAC;AAEjE;;;;;;;;;GASG;AACH,MAAM,WAAW,mBAAmB;IAChC;;;OAGG;IACH,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAE/B;;;;;;;OAOG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;CACxC;AAED;;;GAGG;AACH,qBACa,uBAAwB,YAAW,gBAAgB,EAAE,UAAU;IACxE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,SAAU;IAG1D,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAGzB,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAG3B,SAAS,CAAC,aAAa,EAAE,mBAAmB,CAAC;IAE7C,SAAS,CAAC,WAAW,sBAA6B;IAElD,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,CAAM;IACzC,SAAS,CAAC,QAAQ,CAAC,eAAe,oDAA2D;IAC7F,SAAS,CAAC,QAAQ,CAAC,eAAe,8BAAqC;IACvE,SAAS,CAAC,aAAa,SAAK;IAG5B,SAAS,CAAC,UAAU,IAAI,IAAI;IAM5B,SAAS,CAAC,iBAAiB,IAAI,MAAM;IAIrC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAavB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;cAYnC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,6 +86,12 @@ let DefaultActionDispatcher = DefaultActionDispatcher_1 = class DefaultActionDis
|
|
|
86
86
|
const handledOnClient = this.clientActionForwarder.handle(action);
|
|
87
87
|
const actionHandlers = this.actionHandlerRegistry.get(action.kind);
|
|
88
88
|
if (!handledOnClient && actionHandlers.length === 0) {
|
|
89
|
+
// Stale response (e.g. late `RejectAction`) for a pending request that's already
|
|
90
|
+
// gone — protocol signal, not a handler invocation; drop silently.
|
|
91
|
+
if (protocol_1.ResponseAction.is(action)) {
|
|
92
|
+
this.logger.debug(`Stale response '${action.kind}' (responseId='${action.responseId}') has no handler; dropping.`);
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
89
95
|
throw new glsp_server_error_1.GLSPServerError(`No handler registered for action kind: ${action.kind}`);
|
|
90
96
|
}
|
|
91
97
|
const responses = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action-dispatcher.js","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"action-dispatcher.js","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-action-provider.d.ts","sourceRoot":"","sources":["../../../src/common/actions/global-action-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAsB,MAAM,WAAW,CAAC;AAM3E,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAC/C;AAED,qBACa,2BAA4B,YAAW,oBAAoB;IACpE,SAAgB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;gBAGnB,eAAe,EAAE,SAAS,EAC9B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC;IAY1E,sBAAsB,CAAC,eAAe,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,SAAS;
|
|
1
|
+
{"version":3,"file":"global-action-provider.d.ts","sourceRoot":"","sources":["../../../src/common/actions/global-action-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAsB,MAAM,WAAW,CAAC;AAM3E,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAC/C;AAED,qBACa,2BAA4B,YAAW,oBAAoB;IACpE,SAAgB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;gBAGnB,eAAe,EAAE,SAAS,EAC9B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC;IAY1E,sBAAsB,CAAC,eAAe,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,SAAS;IAWzF,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,GAAG,IAAI;CAM1E"}
|
|
@@ -49,7 +49,7 @@ let DefaultGlobalActionProvider = class DefaultGlobalActionProvider {
|
|
|
49
49
|
createDiagramContainer(serverContainer, modules) {
|
|
50
50
|
const container = serverContainer.createChild();
|
|
51
51
|
const clientSessionModule = (0, client_session_module_1.createClientSessionModule)({
|
|
52
|
-
clientId:
|
|
52
|
+
clientId: client_session_module_1.TEMPORARY_CLIENT_ID,
|
|
53
53
|
glspClient: { process: () => { } },
|
|
54
54
|
clientActionKinds: []
|
|
55
55
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-action-provider.js","sourceRoot":"","sources":["../../../src/common/actions/global-action-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAqD;AACrD,yCAA2E;AAC3E,
|
|
1
|
+
{"version":3,"file":"global-action-provider.js","sourceRoot":"","sources":["../../../src/common/actions/global-action-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAqD;AACrD,yCAA2E;AAC3E,uEAA6F;AAC7F,mEAA+E;AAC/E,sFAAiF;AACjF,uEAAkE;AAErD,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAU5D,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAGpC,YACgC,eAA0B,EAC9B,cAA8C;QAEtE,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;QAC7B,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE;YAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,sBAAsB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACxE,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAA2B,qDAAwB,CAAC,CAAC;YAC1F,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YAC7C,SAAS,CAAC,SAAS,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;IAED,sBAAsB,CAAC,eAA0B,EAAE,OAA0B;QACzE,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC;QAChD,MAAM,mBAAmB,GAAG,IAAA,iDAAyB,EAAC;YAClD,QAAQ,EAAE,2CAAmB;YAC7B,UAAU,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE;YACjC,iBAAiB,EAAE,EAAE;SACxB,CAAC,CAAC;QACH,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,EAAE,mBAAmB,CAAC,CAAC;QAChD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,eAAe,CAAC,WAAmB,EAAE,gBAA2B;;QAC5D,MAAM,eAAe,GAAG,gBAAgB,CAAC,GAAG,CAAwB,+CAAqB,CAAC,CAAC;QAC3F,MAAM,oBAAoB,GAAG,MAAA,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC;QACrE,eAAe,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,sBAAW,EAAC,oBAAoB,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QACvG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;IAC5D,CAAC;CACJ,CAAA;AAlCY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,sBAAU,GAAE;IAKJ,WAAA,IAAA,kBAAM,EAAC,wCAAkB,CAAC,CAAA;IAC1B,WAAA,IAAA,kBAAM,EAAC,oCAAc,CAAC,CAAA;qCADsB,qBAAS;QACd,GAAG;GALtC,2BAA2B,CAkCvC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022-
|
|
2
|
+
* Copyright (c) 2022-2026 STMicroelectronics and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -20,6 +20,13 @@ export interface ClientSessionModuleOptions {
|
|
|
20
20
|
glspClient: GLSPClientProxy;
|
|
21
21
|
clientActionKinds: string[];
|
|
22
22
|
}
|
|
23
|
+
/**
|
|
24
|
+
* Synthetic `ClientId` used by framework probes that load diagram modules onto a throwaway
|
|
25
|
+
* container — e.g. {@link DefaultGlobalActionProvider} scraping action-kind metadata at server
|
|
26
|
+
* startup. Adopters can detect this id in their `ClientSessionInitializer`s to suppress
|
|
27
|
+
* setup-time diagnostics that don't apply when no real GLSP client is connected.
|
|
28
|
+
*/
|
|
29
|
+
export declare const TEMPORARY_CLIENT_ID = "tempId";
|
|
23
30
|
/**
|
|
24
31
|
* Creates the DI module that binds client session specific configuration
|
|
25
32
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-session-module.d.ts","sourceRoot":"","sources":["../../../src/common/di/client-session-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,MAAM,WAAW,0BAA0B;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,eAAe,CAAC;IAC5B,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC/B;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,0BAA0B,GAAG,eAAe,CAO9F"}
|
|
1
|
+
{"version":3,"file":"client-session-module.d.ts","sourceRoot":"","sources":["../../../src/common/di/client-session-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,MAAM,WAAW,0BAA0B;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,eAAe,CAAC;IAC5B,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC/B;AAED;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,WAAW,CAAC;AAE5C;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,0BAA0B,GAAG,eAAe,CAO9F"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TEMPORARY_CLIENT_ID = void 0;
|
|
3
4
|
exports.createClientSessionModule = createClientSessionModule;
|
|
4
5
|
/********************************************************************************
|
|
5
|
-
* Copyright (c) 2022-
|
|
6
|
+
* Copyright (c) 2022-2026 STMicroelectronics and others.
|
|
6
7
|
*
|
|
7
8
|
* This program and the accompanying materials are made available under the
|
|
8
9
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -20,6 +21,13 @@ const protocol_1 = require("@eclipse-glsp/protocol");
|
|
|
20
21
|
const di_1 = require("@eclipse-glsp/protocol/lib/di");
|
|
21
22
|
const inversify_1 = require("inversify");
|
|
22
23
|
const service_identifiers_1 = require("./service-identifiers");
|
|
24
|
+
/**
|
|
25
|
+
* Synthetic `ClientId` used by framework probes that load diagram modules onto a throwaway
|
|
26
|
+
* container — e.g. {@link DefaultGlobalActionProvider} scraping action-kind metadata at server
|
|
27
|
+
* startup. Adopters can detect this id in their `ClientSessionInitializer`s to suppress
|
|
28
|
+
* setup-time diagnostics that don't apply when no real GLSP client is connected.
|
|
29
|
+
*/
|
|
30
|
+
exports.TEMPORARY_CLIENT_ID = 'tempId';
|
|
23
31
|
/**
|
|
24
32
|
* Creates the DI module that binds client session specific configuration
|
|
25
33
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-session-module.js","sourceRoot":"","sources":["../../../src/common/di/client-session-module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client-session-module.js","sourceRoot":"","sources":["../../../src/common/di/client-session-module.ts"],"names":[],"mappings":";;;AAqCA,8DAOC;AA5CD;;;;;;;;;;;;;;kFAckF;AAClF,qDAAyD;AACzD,sDAA6D;AAC7D,yCAA4C;AAC5C,+DAAoE;AAQpE;;;;;GAKG;AACU,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAE5C;;GAEG;AACH,SAAgB,yBAAyB,CAAC,OAAmC;IACzE,OAAO,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACzD,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAClD,IAAA,iBAAY,EAAC,OAAO,EAAE,8BAAQ,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClE,IAAI,CAAC,0BAAe,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC1D,IAAI,CAAC,uCAAiB,CAAC,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022-
|
|
2
|
+
* Copyright (c) 2022-2026 STMicroelectronics and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { GLSPServer, GLSPServerListener } from '@eclipse-glsp/protocol';
|
|
16
|
+
import { GLSPServer, GLSPServerInitializer, GLSPServerListener } from '@eclipse-glsp/protocol';
|
|
17
17
|
import { ContainerModule, interfaces } from 'inversify';
|
|
18
18
|
import { GlobalActionProvider } from '../actions/global-action-provider';
|
|
19
19
|
import { ClientSessionFactory } from '../session/client-session-factory';
|
|
@@ -63,5 +63,6 @@ export declare class ServerModule extends GLSPModule {
|
|
|
63
63
|
protected bindGlobalActionProvider(): BindingTarget<GlobalActionProvider>;
|
|
64
64
|
protected bindInjectionContainer(): BindingTarget<interfaces.Container>;
|
|
65
65
|
protected configureGLSPServerListeners(binding: MultiBinding<GLSPServerListener>): void;
|
|
66
|
+
protected configureGLSPServerInitializers(binding: MultiBinding<GLSPServerInitializer>): void;
|
|
66
67
|
}
|
|
67
68
|
//# sourceMappingURL=server-module.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-module.d.ts","sourceRoot":"","sources":["../../../src/common/di/server-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"server-module.d.ts","sourceRoot":"","sources":["../../../src/common/di/server-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC/F,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAA+B,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEtG,OAAO,EAAE,oBAAoB,EAA+B,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAAE,oBAAoB,EAA+B,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAAE,aAAa,EAAsB,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,YAAa,SAAQ,UAAU;IACxC,OAAc,eAAe,SAAqB;IAClD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAa;IAE9E;;;;;;;;;;OAUG;IACH,sBAAsB,CAAC,aAAa,EAAE,aAAa,EAAE,GAAG,iBAAiB,EAAE,eAAe,EAAE,GAAG,YAAY;IAS3G,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI;IAqBzH,SAAS,CAAC,kBAAkB,IAAI,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IAI7E,SAAS,CAAC,cAAc,IAAI,aAAa,CAAC,UAAU,CAAC;IAIrD,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE,SAAS,CAAC,sBAAsB,IAAI,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC;IAIvE,SAAS,CAAC,4BAA4B,CAAC,OAAO,EAAE,YAAY,CAAC,kBAAkB,CAAC,GAAG,IAAI;IAIvF,SAAS,CAAC,+BAA+B,CAAC,OAAO,EAAE,YAAY,CAAC,qBAAqB,CAAC,GAAG,IAAI;CAGhG"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ServerModule = void 0;
|
|
4
4
|
/********************************************************************************
|
|
5
|
-
* Copyright (c) 2022-
|
|
5
|
+
* Copyright (c) 2022-2026 STMicroelectronics and others.
|
|
6
6
|
*
|
|
7
7
|
* This program and the accompanying materials are made available under the
|
|
8
8
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -74,6 +74,7 @@ class ServerModule extends glsp_module_1.GLSPModule {
|
|
|
74
74
|
(0, binding_target_1.applyBindingTarget)(context, client_session_factory_1.ClientSessionFactory, this.bindClientSessionFactory()).inSingletonScope();
|
|
75
75
|
(0, binding_target_1.applyBindingTarget)(context, client_session_manager_1.ClientSessionManager, this.bindClientSessionManager()).inSingletonScope();
|
|
76
76
|
this.configureMultiBinding(new multi_binding_1.MultiBinding(protocol_1.GLSPServerListener), binding => this.configureGLSPServerListeners(binding));
|
|
77
|
+
this.configureMultiBinding(new multi_binding_1.MultiBinding(protocol_1.GLSPServerInitializer), binding => this.configureGLSPServerInitializers(binding));
|
|
77
78
|
(0, binding_target_1.applyBindingTarget)(context, global_action_provider_1.GlobalActionProvider, this.bindGlobalActionProvider()).inSingletonScope();
|
|
78
79
|
if (!isBound(service_identifiers_1.InjectionContainer)) {
|
|
79
80
|
(0, binding_target_1.applyBindingTarget)(context, service_identifiers_1.InjectionContainer, this.bindInjectionContainer());
|
|
@@ -100,6 +101,9 @@ class ServerModule extends glsp_module_1.GLSPModule {
|
|
|
100
101
|
configureGLSPServerListeners(binding) {
|
|
101
102
|
binding.add({ service: client_session_manager_1.ClientSessionManager });
|
|
102
103
|
}
|
|
104
|
+
configureGLSPServerInitializers(binding) {
|
|
105
|
+
// Can be overridden to add contributions
|
|
106
|
+
}
|
|
103
107
|
}
|
|
104
108
|
exports.ServerModule = ServerModule;
|
|
105
109
|
ServerModule.DIAGRAM_MODULES = 'Diagram_Modules';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-module.js","sourceRoot":"","sources":["../../../src/common/di/server-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"server-module.js","sourceRoot":"","sources":["../../../src/common/di/server-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2023 EclipseSource and others.
|
|
2
|
+
* Copyright (c) 2023-2026 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonrpc-server-launcher.d.ts","sourceRoot":"","sources":["../../../src/common/launch/jsonrpc-server-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAEH,eAAe,EACf,UAAU,EAIb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAsB,MAAM,WAAW,CAAC;AAC3E,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,eAAO,MAAM,qBAAqB,iEAAiE,CAAC;AAEpG,MAAM,WAAW,qBAAqB;IAClC,MAAM,EAAE,UAAU,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC,iBAAiB,CAAC;IAC5C,SAAS,EAAE,SAAS,CAAC;CACxB;AAED,8BACsB,yBAAyB,CAAC,CAAC,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC5E,UACmB,MAAM,EAAE,MAAM,CAAC;IAElC,SAAS,CAAC,eAAe,wDAA+D;IACxF,SAAS,CAAC,sBAAsB,SAAyB;;IAWzD,SAAS,CAAC,qBAAqB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IAOtE,SAAS,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,OAAO,CAAC,iBAAiB,GAAG,IAAI;IAQjF,SAAS,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,OAAO,CAAC,iBAAiB,GAAG,eAAe;IAU3F,SAAS,CAAC,yBAAyB,CAAC,cAAc,EAAE,qBAAqB,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"jsonrpc-server-launcher.d.ts","sourceRoot":"","sources":["../../../src/common/launch/jsonrpc-server-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAEH,eAAe,EACf,UAAU,EAIb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAsB,MAAM,WAAW,CAAC;AAC3E,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,eAAO,MAAM,qBAAqB,iEAAiE,CAAC;AAEpG,MAAM,WAAW,qBAAqB;IAClC,MAAM,EAAE,UAAU,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC,iBAAiB,CAAC;IAC5C,SAAS,EAAE,SAAS,CAAC;CACxB;AAED,8BACsB,yBAAyB,CAAC,CAAC,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC5E,UACmB,MAAM,EAAE,MAAM,CAAC;IAElC,SAAS,CAAC,eAAe,wDAA+D;IACxF,SAAS,CAAC,sBAAsB,SAAyB;;IAWzD,SAAS,CAAC,qBAAqB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI;IAOtE,SAAS,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,OAAO,CAAC,iBAAiB,GAAG,IAAI;IAQjF,SAAS,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,OAAO,CAAC,iBAAiB,GAAG,eAAe;IAU3F,SAAS,CAAC,yBAAyB,CAAC,cAAc,EAAE,qBAAqB,GAAG,IAAI;IAahF,SAAS,CAAC,iBAAiB,CAAC,cAAc,EAAE,qBAAqB,GAAG,eAAe;CAKtF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/********************************************************************************
|
|
3
|
-
* Copyright (c) 2023 EclipseSource and others.
|
|
3
|
+
* Copyright (c) 2023-2026 EclipseSource and others.
|
|
4
4
|
*
|
|
5
5
|
* This program and the accompanying materials are made available under the
|
|
6
6
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -64,6 +64,9 @@ let JsonRpcGLSPServerLauncher = class JsonRpcGLSPServerLauncher extends glsp_ser
|
|
|
64
64
|
configureClientConnection(serverInstance) {
|
|
65
65
|
(0, protocol_1.configureClientConnection)(serverInstance.clientConnection, serverInstance.server);
|
|
66
66
|
serverInstance.clientConnection.onNotification(protocol_1.JsonrpcGLSPClient.ShutdownNotification, () => this.disposeServerInstance(serverInstance));
|
|
67
|
+
// A connection may be unceremoniously be closed (e.g., closing/reloading the browser) in which
|
|
68
|
+
// case the server must still be disposed
|
|
69
|
+
serverInstance.clientConnection.onClose(() => this.disposeServerInstance(serverInstance));
|
|
67
70
|
this.logger.info('Starting GLSP server connection');
|
|
68
71
|
}
|
|
69
72
|
createClientProxy(serverInstance) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonrpc-server-launcher.js","sourceRoot":"","sources":["../../../src/common/launch/jsonrpc-server-launcher.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,qDAOgC;AAChC,yCAA2E;AAE3E,4CAAyC;AACzC,iEAA4D;AAE/C,QAAA,qBAAqB,GAAG,8DAA8D,CAAC;AAS7F,IAAe,yBAAyB,GAAxC,MAAe,yBAA6B,SAAQ,yCAAqB;IAO5E;QACI,KAAK,EAAE,CAAC;QAJF,oBAAe,GAAG,IAAI,GAAG,EAAoD,CAAC;QAC9E,2BAAsB,GAAG,6BAAqB,CAAC;QAIrD,IAAI,CAAC,SAAS,CAAC,IAAI,CACf,qBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YACnB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;QACnF,CAAC,CAAC,CACL,CAAC;IACN,CAAC;IAES,qBAAqB,CAAC,QAA+B;QAC3D,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QACvD,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC3B,QAAQ,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;QAC/B,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;IACxC,CAAC;IAES,oBAAoB,CAAC,gBAA2C;QACtE,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC,CAAC;QACnF,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAa,qBAAU,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,EAAE,CAAC;QACzD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACrD,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAES,mBAAmB,CAAC,gBAA2C;QACrE,OAAO,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;YAC9B,IAAI,CAAC,0BAAe,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;gBACvC,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,6BAAkB,CAAC,CAAC;gBACxD,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;gBACnC,OAAO,KAAK,CAAC;YACjB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAES,yBAAyB,CAAC,cAAqC;QACrE,IAAA,oCAAyB,EAAC,cAAc,CAAC,gBAAgB,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;QAElF,cAAc,CAAC,gBAAgB,CAAC,cAAc,CAAC,4BAAiB,CAAC,oBAAoB,EAAE,GAAG,EAAE,CACxF,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAC7C,CAAC;
|
|
1
|
+
{"version":3,"file":"jsonrpc-server-launcher.js","sourceRoot":"","sources":["../../../src/common/launch/jsonrpc-server-launcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022-
|
|
2
|
+
* Copyright (c) 2022-2026 STMicroelectronics and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -27,6 +27,9 @@ export interface CreateEdgeOperationHandler extends OperationHandler {
|
|
|
27
27
|
getTriggerActions(): TriggerEdgeCreationAction[];
|
|
28
28
|
createCommand(operation: CreateEdgeOperation): MaybePromise<Command | undefined>;
|
|
29
29
|
}
|
|
30
|
+
export declare namespace CreateEdgeOperationHandler {
|
|
31
|
+
function is(object: unknown): object is CreateEdgeOperationHandler;
|
|
32
|
+
}
|
|
30
33
|
export interface CreateNodeOperationHandler extends OperationHandler {
|
|
31
34
|
readonly label: string;
|
|
32
35
|
elementTypeIds: string[];
|
|
@@ -34,13 +37,16 @@ export interface CreateNodeOperationHandler extends OperationHandler {
|
|
|
34
37
|
getTriggerActions(): TriggerNodeCreationAction[];
|
|
35
38
|
createCommand(operation: CreateNodeOperation): MaybePromise<Command | undefined>;
|
|
36
39
|
}
|
|
40
|
+
export declare namespace CreateNodeOperationHandler {
|
|
41
|
+
function is(object: unknown): object is CreateNodeOperationHandler;
|
|
42
|
+
}
|
|
37
43
|
/**
|
|
38
44
|
* A special {@link OperationHandler} that is responsible for the handling of a node or edge creation operation. Depending on its
|
|
39
45
|
* operation type the triggered actions are {@link TriggerNodeCreationAction} or {@link TriggerEdgeCreationAction}s.
|
|
40
46
|
*/
|
|
41
47
|
export type CreateOperationHandler = CreateNodeOperationHandler | CreateEdgeOperationHandler;
|
|
42
|
-
export type CreateOperationKind = typeof CreateNodeOperation.KIND | typeof CreateEdgeOperation.KIND;
|
|
43
48
|
export declare namespace CreateOperationHandler {
|
|
44
49
|
function is(object: unknown): object is CreateOperationHandler;
|
|
45
50
|
}
|
|
51
|
+
export type CreateOperationKind = typeof CreateNodeOperation.KIND | typeof CreateEdgeOperation.KIND;
|
|
46
52
|
//# sourceMappingURL=create-operation-handler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/operations/create-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,mBAAmB,EACnB,mBAAmB,EAInB,YAAY,EACZ,yBAAyB,EACzB,yBAAyB,EAC5B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD;;;GAGG;AACH,MAAM,WAAW,0BAA2B,SAAQ,gBAAgB;IAChE,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,OAAO,mBAAmB,CAAC,IAAI,CAAC;IAC/C,iBAAiB,IAAI,yBAAyB,EAAE,CAAC;IACjD,aAAa,CAAC,SAAS,EAAE,mBAAmB,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;CACpF;AAED,MAAM,WAAW,0BAA2B,SAAQ,gBAAgB;IAChE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,OAAO,mBAAmB,CAAC,IAAI,CAAC;IAC/C,iBAAiB,IAAI,yBAAyB,EAAE,CAAC;IACjD,aAAa,CAAC,SAAS,EAAE,mBAAmB,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;CACpF;
|
|
1
|
+
{"version":3,"file":"create-operation-handler.d.ts","sourceRoot":"","sources":["../../../src/common/operations/create-operation-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,mBAAmB,EACnB,mBAAmB,EAInB,YAAY,EACZ,yBAAyB,EACzB,yBAAyB,EAC5B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD;;;GAGG;AACH,MAAM,WAAW,0BAA2B,SAAQ,gBAAgB;IAChE,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,OAAO,mBAAmB,CAAC,IAAI,CAAC;IAC/C,iBAAiB,IAAI,yBAAyB,EAAE,CAAC;IACjD,aAAa,CAAC,SAAS,EAAE,mBAAmB,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;CACpF;AAED,yBAAiB,0BAA0B,CAAC;IACxC,SAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,0BAA0B,CAExE;CACJ;AAED,MAAM,WAAW,0BAA2B,SAAQ,gBAAgB;IAChE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,OAAO,mBAAmB,CAAC,IAAI,CAAC;IAC/C,iBAAiB,IAAI,yBAAyB,EAAE,CAAC;IACjD,aAAa,CAAC,SAAS,EAAE,mBAAmB,GAAG,YAAY,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;CACpF;AAED,yBAAiB,0BAA0B,CAAC;IACxC,SAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,0BAA0B,CAExE;CACJ;AAED;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG,0BAA0B,GAAG,0BAA0B,CAAC;AAE7F,yBAAiB,sBAAsB,CAAC;IACpC,SAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,sBAAsB,CAQpE;CACJ;AAED,MAAM,MAAM,mBAAmB,GAAG,OAAO,mBAAmB,CAAC,IAAI,GAAG,OAAO,mBAAmB,CAAC,IAAI,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CreateOperationHandler = void 0;
|
|
3
|
+
exports.CreateOperationHandler = exports.CreateNodeOperationHandler = exports.CreateEdgeOperationHandler = void 0;
|
|
4
4
|
/********************************************************************************
|
|
5
|
-
* Copyright (c) 2022-
|
|
5
|
+
* Copyright (c) 2022-2026 STMicroelectronics and others.
|
|
6
6
|
*
|
|
7
7
|
* This program and the accompanying materials are made available under the
|
|
8
8
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -18,6 +18,20 @@ exports.CreateOperationHandler = void 0;
|
|
|
18
18
|
********************************************************************************/
|
|
19
19
|
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
20
20
|
const operation_handler_1 = require("./operation-handler");
|
|
21
|
+
var CreateEdgeOperationHandler;
|
|
22
|
+
(function (CreateEdgeOperationHandler) {
|
|
23
|
+
function is(object) {
|
|
24
|
+
return CreateOperationHandler.is(object) && object.operationType === protocol_1.CreateEdgeOperation.KIND;
|
|
25
|
+
}
|
|
26
|
+
CreateEdgeOperationHandler.is = is;
|
|
27
|
+
})(CreateEdgeOperationHandler || (exports.CreateEdgeOperationHandler = CreateEdgeOperationHandler = {}));
|
|
28
|
+
var CreateNodeOperationHandler;
|
|
29
|
+
(function (CreateNodeOperationHandler) {
|
|
30
|
+
function is(object) {
|
|
31
|
+
return CreateOperationHandler.is(object) && object.operationType === protocol_1.CreateNodeOperation.KIND;
|
|
32
|
+
}
|
|
33
|
+
CreateNodeOperationHandler.is = is;
|
|
34
|
+
})(CreateNodeOperationHandler || (exports.CreateNodeOperationHandler = CreateNodeOperationHandler = {}));
|
|
21
35
|
var CreateOperationHandler;
|
|
22
36
|
(function (CreateOperationHandler) {
|
|
23
37
|
function is(object) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-operation-handler.js","sourceRoot":"","sources":["../../../src/common/operations/create-operation-handler.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDASgC;AAEhC,2DAAuD;
|
|
1
|
+
{"version":3,"file":"create-operation-handler.js","sourceRoot":"","sources":["../../../src/common/operations/create-operation-handler.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDASgC;AAEhC,2DAAuD;AAcvD,IAAiB,0BAA0B,CAI1C;AAJD,WAAiB,0BAA0B;IACvC,SAAgB,EAAE,CAAC,MAAe;QAC9B,OAAO,sBAAsB,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,aAAa,KAAK,8BAAmB,CAAC,IAAI,CAAC;IAClG,CAAC;IAFe,6BAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,0BAA0B,0CAA1B,0BAA0B,QAI1C;AAUD,IAAiB,0BAA0B,CAI1C;AAJD,WAAiB,0BAA0B;IACvC,SAAgB,EAAE,CAAC,MAAe;QAC9B,OAAO,sBAAsB,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,aAAa,KAAK,8BAAmB,CAAC,IAAI,CAAC;IAClG,CAAC;IAFe,6BAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,0BAA0B,0CAA1B,0BAA0B,QAI1C;AAQD,IAAiB,sBAAsB,CAUtC;AAVD,WAAiB,sBAAsB;IACnC,SAAgB,EAAE,CAAC,MAAe;QAC9B,OAAO,CACH,MAAM,YAAY,oCAAgB;YAClC,IAAA,wBAAa,EAAC,MAAM,EAAE,eAAe,CAAC;YACtC,IAAA,wBAAa,EAAC,MAAM,EAAE,OAAO,CAAC;YAC9B,IAAA,uBAAY,EAAC,MAAM,EAAE,gBAAgB,CAAC;YACtC,IAAA,0BAAe,EAAC,MAAM,EAAE,mBAAmB,EAAE,IAAI,CAAC,CACrD,CAAC;IACN,CAAC;IARe,yBAAE,KAQjB,CAAA;AACL,CAAC,EAVgB,sBAAsB,sCAAtB,sBAAsB,QAUtC"}
|
|
@@ -13,12 +13,13 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { ActionMessage, Args, DisposeClientSessionParameters, GLSPClientProxy, GLSPServer, GLSPServerListener, InitializeClientSessionParameters, InitializeParameters, InitializeResult, MaybePromise, RequestAction, ResponseAction } from '@eclipse-glsp/protocol';
|
|
16
|
+
import { ActionMessage, Args, DisposeClientSessionParameters, GLSPClientProxy, GLSPServer, GLSPServerInitializer, GLSPServerListener, InitializeClientSessionParameters, InitializeParameters, InitializeResult, MaybePromise, RequestAction, ResponseAction } from '@eclipse-glsp/protocol';
|
|
17
17
|
import { GlobalActionProvider } from '../actions/global-action-provider';
|
|
18
18
|
import { ClientSession } from '../session/client-session';
|
|
19
19
|
import { ClientSessionManager } from '../session/client-session-manager';
|
|
20
20
|
import { Logger } from '../utils/logger';
|
|
21
21
|
export declare class DefaultGLSPServer implements GLSPServer {
|
|
22
|
+
protected initializers: GLSPServerInitializer[];
|
|
22
23
|
static readonly PROTOCOL_VERSION = "1.0.0";
|
|
23
24
|
protected logger: Logger;
|
|
24
25
|
protected sessionManager: ClientSessionManager;
|
|
@@ -28,10 +29,14 @@ export declare class DefaultGLSPServer implements GLSPServer {
|
|
|
28
29
|
protected applicationId: string;
|
|
29
30
|
protected clientSessions: Map<string, ClientSession>;
|
|
30
31
|
protected serverListeners: GLSPServerListener[];
|
|
31
|
-
constructor(serverListeners?: GLSPServerListener[]);
|
|
32
|
+
constructor(serverListeners?: GLSPServerListener[], initializers?: GLSPServerInitializer[]);
|
|
32
33
|
protected validateProtocolVersion(params: InitializeParameters): void;
|
|
33
34
|
protected validateServerInitialized(): void;
|
|
34
35
|
initialize(params: InitializeParameters): Promise<InitializeResult>;
|
|
36
|
+
protected initializeServer(params: InitializeParameters, result: InitializeResult): Promise<InitializeResult>;
|
|
37
|
+
/**
|
|
38
|
+
* @deprecated Register a `GLSPServerInitializer` instead.
|
|
39
|
+
*/
|
|
35
40
|
protected handleInitializeArgs(result: InitializeResult, args: Args | undefined): MaybePromise<InitializeResult>;
|
|
36
41
|
initializeClientSession(params: InitializeClientSessionParameters): Promise<void>;
|
|
37
42
|
protected handleInitializeClientSessionArgs(args: Args | undefined): MaybePromise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-server.d.ts","sourceRoot":"","sources":["../../../src/common/protocol/glsp-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,aAAa,EACb,IAAI,EACJ,8BAA8B,EAC9B,eAAe,EACf,UAAU,EACV,kBAAkB,EAClB,iCAAiC,EACjC,oBAAoB,EACpB,gBAAgB,EAChB,YAAY,EAGZ,aAAa,EACb,cAAc,EAIjB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGzC,qBACa,iBAAkB,YAAW,UAAU;
|
|
1
|
+
{"version":3,"file":"glsp-server.d.ts","sourceRoot":"","sources":["../../../src/common/protocol/glsp-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,aAAa,EACb,IAAI,EACJ,8BAA8B,EAC9B,eAAe,EACf,UAAU,EACV,qBAAqB,EACrB,kBAAkB,EAClB,iCAAiC,EACjC,oBAAoB,EACpB,gBAAgB,EAChB,YAAY,EAGZ,aAAa,EACb,cAAc,EAIjB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGzC,qBACa,iBAAkB,YAAW,UAAU;IAwBI,SAAS,CAAC,YAAY,EAAE,qBAAqB,EAAE;IAvBnG,gBAAuB,gBAAgB,WAAW;IAGlD,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAGzB,SAAS,CAAC,cAAc,EAAE,oBAAoB,CAAC;IAG/C,SAAS,CAAC,cAAc,EAAE,oBAAoB,CAAC;IAG/C,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAE3C,SAAS,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAE9C,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC;IAEhC,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACrD,SAAS,CAAC,eAAe,EAAE,kBAAkB,EAAE,CAAM;gBAGJ,eAAe,GAAE,kBAAkB,EAAO,EAC7B,YAAY,GAAE,qBAAqB,EAAO;IAMxG,SAAS,CAAC,uBAAuB,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI;IAQrE,SAAS,CAAC,yBAAyB,IAAI,IAAI;IAM9B,UAAU,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC;cA8BhE,gBAAgB,CAAC,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAYnH;;OAEG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,gBAAgB,EAAE,IAAI,EAAE,IAAI,GAAG,SAAS,GAAG,YAAY,CAAC,gBAAgB,CAAC;IAInG,uBAAuB,CAAC,MAAM,EAAE,iCAAiC,GAAG,OAAO,CAAC,IAAI,CAAC;IAY9F,SAAS,CAAC,iCAAiC,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC;IAI1E,oBAAoB,CAAC,MAAM,EAAE,8BAA8B,GAAG,OAAO,CAAC,IAAI,CAAC;cAUxE,8BAA8B,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrF,OAAO,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;cAkBrB,mBAAmB,CAC/B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,aAAa,CAAC,cAAc,CAAC,EACrC,QAAQ,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;IAwBhB,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,GAAG,IAAI;IAIhF,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;IAa3F,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IAIpD,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAIvD,QAAQ,IAAI,IAAI;IAOvB,SAAS,CAAC,aAAa,IAAI,OAAO;IAIlC,WAAW,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO;IAKlD,cAAc,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO;IAKrD,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,kBAAkB,GAAG,kBAAkB,EAAE;CAGzF"}
|
|
@@ -37,7 +37,8 @@ const glsp_server_error_1 = require("../utils/glsp-server-error");
|
|
|
37
37
|
const logger_1 = require("../utils/logger");
|
|
38
38
|
const client_action_1 = require("./client-action");
|
|
39
39
|
let DefaultGLSPServer = DefaultGLSPServer_1 = class DefaultGLSPServer {
|
|
40
|
-
constructor(serverListeners = []) {
|
|
40
|
+
constructor(serverListeners = [], initializers = []) {
|
|
41
|
+
this.initializers = initializers;
|
|
41
42
|
this.serverListeners = [];
|
|
42
43
|
this.clientSessions = new Map();
|
|
43
44
|
serverListeners.forEach(listener => this.addListener(listener));
|
|
@@ -68,11 +69,29 @@ let DefaultGLSPServer = DefaultGLSPServer_1 = class DefaultGLSPServer {
|
|
|
68
69
|
const serverActions = {};
|
|
69
70
|
this.actionProvider.actionKinds.forEach((kinds, diagramType) => (serverActions[diagramType] = kinds));
|
|
70
71
|
let result = { protocolVersion: DefaultGLSPServer_1.PROTOCOL_VERSION, serverActions };
|
|
72
|
+
result = await this.initializeServer(params, result);
|
|
73
|
+
// keep for backwards compatibility
|
|
74
|
+
// eslint-disable-next-line @typescript-eslint/no-deprecated
|
|
71
75
|
result = await this.handleInitializeArgs(result, params.args);
|
|
72
76
|
this.getListenersToNotify('serverInitialized').forEach((listener) => listener.serverInitialized(this));
|
|
73
77
|
this.initializeResult = result;
|
|
74
78
|
return result;
|
|
75
79
|
}
|
|
80
|
+
async initializeServer(params, result) {
|
|
81
|
+
for (const initializer of this.initializers) {
|
|
82
|
+
try {
|
|
83
|
+
result = await initializer.initializeServer(this, params, result);
|
|
84
|
+
}
|
|
85
|
+
catch (error) {
|
|
86
|
+
this.logger.error(`Error during server initialization from ${initializer.constructor.name}:`, error);
|
|
87
|
+
throw error;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
return result;
|
|
91
|
+
}
|
|
92
|
+
/**
|
|
93
|
+
* @deprecated Register a `GLSPServerInitializer` instead.
|
|
94
|
+
*/
|
|
76
95
|
handleInitializeArgs(result, args) {
|
|
77
96
|
return result;
|
|
78
97
|
}
|
|
@@ -205,6 +224,8 @@ exports.DefaultGLSPServer = DefaultGLSPServer = DefaultGLSPServer_1 = __decorate
|
|
|
205
224
|
(0, inversify_1.injectable)(),
|
|
206
225
|
__param(0, (0, inversify_1.multiInject)(protocol_1.GLSPServerListener)),
|
|
207
226
|
__param(0, (0, inversify_1.optional)()),
|
|
208
|
-
|
|
227
|
+
__param(1, (0, inversify_1.multiInject)(protocol_1.GLSPServerInitializer)),
|
|
228
|
+
__param(1, (0, inversify_1.optional)()),
|
|
229
|
+
__metadata("design:paramtypes", [Array, Array])
|
|
209
230
|
], DefaultGLSPServer);
|
|
210
231
|
//# sourceMappingURL=glsp-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"glsp-server.js","sourceRoot":"","sources":["../../../src/common/protocol/glsp-server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"glsp-server.js","sourceRoot":"","sources":["../../../src/common/protocol/glsp-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022-
|
|
2
|
+
* Copyright (c) 2022-2026 STMicroelectronics and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -41,6 +41,12 @@ export interface ClientSessionManager {
|
|
|
41
41
|
* @returns The client session for the given id o `undefined` if no session is present with the given id.
|
|
42
42
|
*/
|
|
43
43
|
getSession(clientSessionId: string): ClientSession | undefined;
|
|
44
|
+
/**
|
|
45
|
+
* Return all currently active {@link ClientSession}s.
|
|
46
|
+
*
|
|
47
|
+
* @returns An array of all currently active {@link ClientSession}s.
|
|
48
|
+
*/
|
|
49
|
+
getSessions(): Array<ClientSession>;
|
|
44
50
|
/**
|
|
45
51
|
* Return all currently active {@link ClientSession}s for the given diagram type.
|
|
46
52
|
*
|
|
@@ -89,6 +95,7 @@ export declare class DefaultClientSessionManager implements ClientSessionManager
|
|
|
89
95
|
protected getListenersToNotify(clientSession: ClientSession, method: keyof ClientSessionListener): ClientSessionListener[];
|
|
90
96
|
getOrCreateClientSession(params: InitializeClientSessionParameters): ClientSession;
|
|
91
97
|
getSession(clientSessionId: string): ClientSession | undefined;
|
|
98
|
+
getSessions(): ClientSession[];
|
|
92
99
|
getSessionsByType(diagramType: string): ClientSession[];
|
|
93
100
|
disposeClientSession(clientSessionId: string): boolean;
|
|
94
101
|
addListener(listener: ClientSessionListener, ...clientSessionIds: string[]): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-session-manager.d.ts","sourceRoot":"","sources":["../../../src/common/session/client-session-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,iCAAiC,EAAU,MAAM,wBAAwB,CAAC;AAGnH,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC;;;;;;;;;;OAUG;IACH,wBAAwB,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa,CAAC;IAEnF;;;;;OAKG;IACH,UAAU,CAAC,eAAe,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAAC;IAE/D;;;;;OAKG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC;IAE7D;;;;;;;OAOG;IACH,oBAAoB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC;IAEvD;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,qBAAqB,EAAE,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAErF;;;;;OAKG;IACH,cAAc,CAAC,QAAQ,EAAE,qBAAqB,GAAG,OAAO,CAAC;IAEzD;;;;;OAKG;IACH,eAAe,CAAC,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACxD;AAID,qBACa,2BAA4B,YAAW,oBAAoB,EAAE,kBAAkB;IAC1D,cAAc,EAAE,oBAAoB,CAAC;IAEnE,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAoC;IACxF,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAA8C;IAEvG,SAAS,CAAC,oBAAoB,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,qBAAqB,GAAG,qBAAqB,EAAE;IAM1H,wBAAwB,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa;IAiBlF,UAAU,CAAC,eAAe,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI9D,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE;IAIvD,oBAAoB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO;IAYtD,WAAW,CAAC,QAAQ,EAAE,qBAAqB,EAAE,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO;IAOpF,SAAS,CAAC,iBAAiB,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,qBAAqB,GAAG,OAAO;IAO9F,cAAc,CAAC,QAAQ,EAAE,qBAAqB,GAAG,OAAO;IAMxD,eAAe,CAAC,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,IAAI;IAQpD,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;CAI3C"}
|
|
1
|
+
{"version":3,"file":"client-session-manager.d.ts","sourceRoot":"","sources":["../../../src/common/session/client-session-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,iCAAiC,EAAU,MAAM,wBAAwB,CAAC;AAGnH,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC;;;;;;;;;;OAUG;IACH,wBAAwB,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa,CAAC;IAEnF;;;;;OAKG;IACH,UAAU,CAAC,eAAe,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAAC;IAE/D;;;;OAIG;IACH,WAAW,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IAEpC;;;;;OAKG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC;IAE7D;;;;;;;OAOG;IACH,oBAAoB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC;IAEvD;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,qBAAqB,EAAE,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAErF;;;;;OAKG;IACH,cAAc,CAAC,QAAQ,EAAE,qBAAqB,GAAG,OAAO,CAAC;IAEzD;;;;;OAKG;IACH,eAAe,CAAC,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACxD;AAID,qBACa,2BAA4B,YAAW,oBAAoB,EAAE,kBAAkB;IAC1D,cAAc,EAAE,oBAAoB,CAAC;IAEnE,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAoC;IACxF,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAA8C;IAEvG,SAAS,CAAC,oBAAoB,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,qBAAqB,GAAG,qBAAqB,EAAE;IAM1H,wBAAwB,CAAC,MAAM,EAAE,iCAAiC,GAAG,aAAa;IAiBlF,UAAU,CAAC,eAAe,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI9D,WAAW,IAAI,aAAa,EAAE;IAI9B,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE;IAIvD,oBAAoB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO;IAYtD,WAAW,CAAC,QAAQ,EAAE,qBAAqB,EAAE,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO;IAOpF,SAAS,CAAC,iBAAiB,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,qBAAqB,GAAG,OAAO;IAO9F,cAAc,CAAC,QAAQ,EAAE,qBAAqB,GAAG,OAAO;IAMxD,eAAe,CAAC,GAAG,gBAAgB,EAAE,MAAM,EAAE,GAAG,IAAI;IAQpD,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;CAI3C"}
|
|
@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.DefaultClientSessionManager = exports.ClientSessionManager = void 0;
|
|
13
13
|
/********************************************************************************
|
|
14
|
-
* Copyright (c) 2022-
|
|
14
|
+
* Copyright (c) 2022-2026 STMicroelectronics and others.
|
|
15
15
|
*
|
|
16
16
|
* This program and the accompanying materials are made available under the
|
|
17
17
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -60,6 +60,9 @@ let DefaultClientSessionManager = class DefaultClientSessionManager {
|
|
|
60
60
|
getSession(clientSessionId) {
|
|
61
61
|
return this.clientSessions.get(clientSessionId);
|
|
62
62
|
}
|
|
63
|
+
getSessions() {
|
|
64
|
+
return Array.from(this.clientSessions.values());
|
|
65
|
+
}
|
|
63
66
|
getSessionsByType(diagramType) {
|
|
64
67
|
return Array.from(this.clientSessions.values()).filter(session => session.diagramType === diagramType);
|
|
65
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-session-manager.js","sourceRoot":"","sources":["../../../src/common/session/client-session-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAmH;AACnH,yCAA+C;AAC/C,kEAA6D;AAE7D,qEAAgE;AAGnD,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"client-session-manager.js","sourceRoot":"","sources":["../../../src/common/session/client-session-manager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/server",
|
|
3
|
-
"version": "2.7.0-next.
|
|
3
|
+
"version": "2.7.0-next.9+a58ea45",
|
|
4
4
|
"description": "A js server framework for Eclipse GLSP",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"eclipse",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"watch": "tsc -w"
|
|
59
59
|
},
|
|
60
60
|
"dependencies": {
|
|
61
|
-
"@eclipse-glsp/graph": "2.7.0-next.
|
|
61
|
+
"@eclipse-glsp/graph": "2.7.0-next.9+a58ea45",
|
|
62
62
|
"@eclipse-glsp/protocol": "next",
|
|
63
63
|
"@types/uuid": "8.3.1",
|
|
64
64
|
"commander": "^8.3.0",
|
|
@@ -78,5 +78,5 @@
|
|
|
78
78
|
"publishConfig": {
|
|
79
79
|
"access": "public"
|
|
80
80
|
},
|
|
81
|
-
"gitHead": "
|
|
81
|
+
"gitHead": "a58ea45de80be3d2fcf46e0934af141b213f6187"
|
|
82
82
|
}
|
|
@@ -219,6 +219,12 @@ export class DefaultActionDispatcher implements ActionDispatcher, Disposable {
|
|
|
219
219
|
|
|
220
220
|
const actionHandlers = this.actionHandlerRegistry.get(action.kind);
|
|
221
221
|
if (!handledOnClient && actionHandlers.length === 0) {
|
|
222
|
+
// Stale response (e.g. late `RejectAction`) for a pending request that's already
|
|
223
|
+
// gone — protocol signal, not a handler invocation; drop silently.
|
|
224
|
+
if (ResponseAction.is(action)) {
|
|
225
|
+
this.logger.debug(`Stale response '${action.kind}' (responseId='${action.responseId}') has no handler; dropping.`);
|
|
226
|
+
return;
|
|
227
|
+
}
|
|
222
228
|
throw new GLSPServerError(`No handler registered for action kind: ${action.kind}`);
|
|
223
229
|
}
|
|
224
230
|
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { distinctAdd } from '@eclipse-glsp/protocol';
|
|
17
17
|
import { Container, ContainerModule, inject, injectable } from 'inversify';
|
|
18
|
-
import { createClientSessionModule } from '../di/client-session-module';
|
|
18
|
+
import { TEMPORARY_CLIENT_ID, createClientSessionModule } from '../di/client-session-module';
|
|
19
19
|
import { DiagramModules, InjectionContainer } from '../di/service-identifiers';
|
|
20
20
|
import { ClientSessionInitializer } from '../session/client-session-initializer';
|
|
21
21
|
import { ActionHandlerRegistry } from './action-handler-registry';
|
|
@@ -50,8 +50,7 @@ export class DefaultGlobalActionProvider implements GlobalActionProvider {
|
|
|
50
50
|
createDiagramContainer(serverContainer: Container, modules: ContainerModule[]): Container {
|
|
51
51
|
const container = serverContainer.createChild();
|
|
52
52
|
const clientSessionModule = createClientSessionModule({
|
|
53
|
-
clientId:
|
|
54
|
-
|
|
53
|
+
clientId: TEMPORARY_CLIENT_ID,
|
|
55
54
|
glspClient: { process: () => {} },
|
|
56
55
|
clientActionKinds: []
|
|
57
56
|
});
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022-
|
|
2
|
+
* Copyright (c) 2022-2026 STMicroelectronics and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -24,6 +24,14 @@ export interface ClientSessionModuleOptions {
|
|
|
24
24
|
clientActionKinds: string[];
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
+
/**
|
|
28
|
+
* Synthetic `ClientId` used by framework probes that load diagram modules onto a throwaway
|
|
29
|
+
* container — e.g. {@link DefaultGlobalActionProvider} scraping action-kind metadata at server
|
|
30
|
+
* startup. Adopters can detect this id in their `ClientSessionInitializer`s to suppress
|
|
31
|
+
* setup-time diagnostics that don't apply when no real GLSP client is connected.
|
|
32
|
+
*/
|
|
33
|
+
export const TEMPORARY_CLIENT_ID = 'tempId';
|
|
34
|
+
|
|
27
35
|
/**
|
|
28
36
|
* Creates the DI module that binds client session specific configuration
|
|
29
37
|
*/
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022-
|
|
2
|
+
* Copyright (c) 2022-2026 STMicroelectronics and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { GLSPServer, GLSPServerListener } from '@eclipse-glsp/protocol';
|
|
16
|
+
import { GLSPServer, GLSPServerInitializer, GLSPServerListener } from '@eclipse-glsp/protocol';
|
|
17
17
|
import { ContainerModule, interfaces } from 'inversify';
|
|
18
18
|
import { DefaultGlobalActionProvider, GlobalActionProvider } from '../actions/global-action-provider';
|
|
19
19
|
import { DefaultGLSPServer } from '../protocol/glsp-server';
|
|
@@ -77,6 +77,9 @@ export class ServerModule extends GLSPModule {
|
|
|
77
77
|
this.configureMultiBinding(new MultiBinding<GLSPServerListener>(GLSPServerListener), binding =>
|
|
78
78
|
this.configureGLSPServerListeners(binding)
|
|
79
79
|
);
|
|
80
|
+
this.configureMultiBinding(new MultiBinding<GLSPServerInitializer>(GLSPServerInitializer), binding =>
|
|
81
|
+
this.configureGLSPServerInitializers(binding)
|
|
82
|
+
);
|
|
80
83
|
|
|
81
84
|
applyBindingTarget(context, GlobalActionProvider, this.bindGlobalActionProvider()).inSingletonScope();
|
|
82
85
|
|
|
@@ -112,4 +115,8 @@ export class ServerModule extends GLSPModule {
|
|
|
112
115
|
protected configureGLSPServerListeners(binding: MultiBinding<GLSPServerListener>): void {
|
|
113
116
|
binding.add({ service: ClientSessionManager });
|
|
114
117
|
}
|
|
118
|
+
|
|
119
|
+
protected configureGLSPServerInitializers(binding: MultiBinding<GLSPServerInitializer>): void {
|
|
120
|
+
// Can be overridden to add contributions
|
|
121
|
+
}
|
|
115
122
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2023 EclipseSource and others.
|
|
2
|
+
* Copyright (c) 2023-2026 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -83,6 +83,9 @@ export abstract class JsonRpcGLSPServerLauncher<T> extends GLSPServerLauncher<T>
|
|
|
83
83
|
serverInstance.clientConnection.onNotification(JsonrpcGLSPClient.ShutdownNotification, () =>
|
|
84
84
|
this.disposeServerInstance(serverInstance)
|
|
85
85
|
);
|
|
86
|
+
// A connection may be unceremoniously be closed (e.g., closing/reloading the browser) in which
|
|
87
|
+
// case the server must still be disposed
|
|
88
|
+
serverInstance.clientConnection.onClose(() => this.disposeServerInstance(serverInstance));
|
|
86
89
|
|
|
87
90
|
this.logger.info('Starting GLSP server connection');
|
|
88
91
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022-
|
|
2
|
+
* Copyright (c) 2022-2026 STMicroelectronics and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -38,6 +38,12 @@ export interface CreateEdgeOperationHandler extends OperationHandler {
|
|
|
38
38
|
createCommand(operation: CreateEdgeOperation): MaybePromise<Command | undefined>;
|
|
39
39
|
}
|
|
40
40
|
|
|
41
|
+
export namespace CreateEdgeOperationHandler {
|
|
42
|
+
export function is(object: unknown): object is CreateEdgeOperationHandler {
|
|
43
|
+
return CreateOperationHandler.is(object) && object.operationType === CreateEdgeOperation.KIND;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
41
47
|
export interface CreateNodeOperationHandler extends OperationHandler {
|
|
42
48
|
readonly label: string;
|
|
43
49
|
elementTypeIds: string[];
|
|
@@ -45,14 +51,19 @@ export interface CreateNodeOperationHandler extends OperationHandler {
|
|
|
45
51
|
getTriggerActions(): TriggerNodeCreationAction[];
|
|
46
52
|
createCommand(operation: CreateNodeOperation): MaybePromise<Command | undefined>;
|
|
47
53
|
}
|
|
54
|
+
|
|
55
|
+
export namespace CreateNodeOperationHandler {
|
|
56
|
+
export function is(object: unknown): object is CreateNodeOperationHandler {
|
|
57
|
+
return CreateOperationHandler.is(object) && object.operationType === CreateNodeOperation.KIND;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
|
|
48
61
|
/**
|
|
49
62
|
* A special {@link OperationHandler} that is responsible for the handling of a node or edge creation operation. Depending on its
|
|
50
63
|
* operation type the triggered actions are {@link TriggerNodeCreationAction} or {@link TriggerEdgeCreationAction}s.
|
|
51
64
|
*/
|
|
52
65
|
export type CreateOperationHandler = CreateNodeOperationHandler | CreateEdgeOperationHandler;
|
|
53
66
|
|
|
54
|
-
export type CreateOperationKind = typeof CreateNodeOperation.KIND | typeof CreateEdgeOperation.KIND;
|
|
55
|
-
|
|
56
67
|
export namespace CreateOperationHandler {
|
|
57
68
|
export function is(object: unknown): object is CreateOperationHandler {
|
|
58
69
|
return (
|
|
@@ -64,3 +75,5 @@ export namespace CreateOperationHandler {
|
|
|
64
75
|
);
|
|
65
76
|
}
|
|
66
77
|
}
|
|
78
|
+
|
|
79
|
+
export type CreateOperationKind = typeof CreateNodeOperation.KIND | typeof CreateEdgeOperation.KIND;
|
|
@@ -19,6 +19,7 @@ import {
|
|
|
19
19
|
DisposeClientSessionParameters,
|
|
20
20
|
GLSPClientProxy,
|
|
21
21
|
GLSPServer,
|
|
22
|
+
GLSPServerInitializer,
|
|
22
23
|
GLSPServerListener,
|
|
23
24
|
InitializeClientSessionParameters,
|
|
24
25
|
InitializeParameters,
|
|
@@ -63,7 +64,10 @@ export class DefaultGLSPServer implements GLSPServer {
|
|
|
63
64
|
protected clientSessions: Map<string, ClientSession>;
|
|
64
65
|
protected serverListeners: GLSPServerListener[] = [];
|
|
65
66
|
|
|
66
|
-
constructor(
|
|
67
|
+
constructor(
|
|
68
|
+
@multiInject(GLSPServerListener) @optional() serverListeners: GLSPServerListener[] = [],
|
|
69
|
+
@multiInject(GLSPServerInitializer) @optional() protected initializers: GLSPServerInitializer[] = []
|
|
70
|
+
) {
|
|
67
71
|
this.clientSessions = new Map<string, ClientSession>();
|
|
68
72
|
serverListeners.forEach(listener => this.addListener(listener));
|
|
69
73
|
}
|
|
@@ -103,12 +107,30 @@ export class DefaultGLSPServer implements GLSPServer {
|
|
|
103
107
|
|
|
104
108
|
let result = { protocolVersion: DefaultGLSPServer.PROTOCOL_VERSION, serverActions };
|
|
105
109
|
|
|
110
|
+
result = await this.initializeServer(params, result);
|
|
111
|
+
// keep for backwards compatibility
|
|
112
|
+
// eslint-disable-next-line @typescript-eslint/no-deprecated
|
|
106
113
|
result = await this.handleInitializeArgs(result, params.args);
|
|
107
114
|
this.getListenersToNotify('serverInitialized').forEach((listener: GLSPServerListener) => listener.serverInitialized!(this));
|
|
108
115
|
this.initializeResult = result;
|
|
109
116
|
return result;
|
|
110
117
|
}
|
|
111
118
|
|
|
119
|
+
protected async initializeServer(params: InitializeParameters, result: InitializeResult): Promise<InitializeResult> {
|
|
120
|
+
for (const initializer of this.initializers) {
|
|
121
|
+
try {
|
|
122
|
+
result = await initializer.initializeServer(this, params, result);
|
|
123
|
+
} catch (error: unknown) {
|
|
124
|
+
this.logger.error(`Error during server initialization from ${initializer.constructor.name}:`, error);
|
|
125
|
+
throw error;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
return result;
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
/**
|
|
132
|
+
* @deprecated Register a `GLSPServerInitializer` instead.
|
|
133
|
+
*/
|
|
112
134
|
protected handleInitializeArgs(result: InitializeResult, args: Args | undefined): MaybePromise<InitializeResult> {
|
|
113
135
|
return result;
|
|
114
136
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2022-
|
|
2
|
+
* Copyright (c) 2022-2026 STMicroelectronics and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -47,6 +47,13 @@ export interface ClientSessionManager {
|
|
|
47
47
|
*/
|
|
48
48
|
getSession(clientSessionId: string): ClientSession | undefined;
|
|
49
49
|
|
|
50
|
+
/**
|
|
51
|
+
* Return all currently active {@link ClientSession}s.
|
|
52
|
+
*
|
|
53
|
+
* @returns An array of all currently active {@link ClientSession}s.
|
|
54
|
+
*/
|
|
55
|
+
getSessions(): Array<ClientSession>;
|
|
56
|
+
|
|
50
57
|
/**
|
|
51
58
|
* Return all currently active {@link ClientSession}s for the given diagram type.
|
|
52
59
|
*
|
|
@@ -129,6 +136,10 @@ export class DefaultClientSessionManager implements ClientSessionManager, GLSPSe
|
|
|
129
136
|
return this.clientSessions.get(clientSessionId);
|
|
130
137
|
}
|
|
131
138
|
|
|
139
|
+
getSessions(): ClientSession[] {
|
|
140
|
+
return Array.from(this.clientSessions.values());
|
|
141
|
+
}
|
|
142
|
+
|
|
132
143
|
getSessionsByType(diagramType: string): ClientSession[] {
|
|
133
144
|
return Array.from(this.clientSessions.values()).filter(session => session.diagramType === diagramType);
|
|
134
145
|
}
|
|
@@ -169,6 +169,10 @@ export class StubClientSessionManager implements ClientSessionManager {
|
|
|
169
169
|
return undefined;
|
|
170
170
|
}
|
|
171
171
|
|
|
172
|
+
getSessions(): ClientSession[] {
|
|
173
|
+
return [];
|
|
174
|
+
}
|
|
175
|
+
|
|
172
176
|
getSessionsByType(diagramType: string): ClientSession[] {
|
|
173
177
|
return [];
|
|
174
178
|
}
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { Action, Deferred, RequestAction, ResponseAction, UpdateModelAction } from '@eclipse-glsp/protocol';
|
|
16
|
+
import { Action, Deferred, RejectAction, RequestAction, ResponseAction, UpdateModelAction } from '@eclipse-glsp/protocol';
|
|
17
17
|
import { expect } from 'chai';
|
|
18
18
|
import { Container, ContainerModule } from 'inversify';
|
|
19
19
|
import * as sinon from 'sinon';
|
|
@@ -95,6 +95,13 @@ describe('test DefaultActionDispatcher', () => {
|
|
|
95
95
|
const spy_handler1_execute = sinon.stub(handler1, 'execute').returns([]);
|
|
96
96
|
const spy_handler2_execute = sinon.stub(handler2, 'execute').returns([]);
|
|
97
97
|
const spy_handler3_execute = sinon.stub(handler3, 'execute').returns([]);
|
|
98
|
+
// Stubs created at the describe-level survive sandbox.restore(), so call counts
|
|
99
|
+
// would accumulate across tests and break `.calledOnce` assertions.
|
|
100
|
+
beforeEach(() => {
|
|
101
|
+
spy_handler1_execute.resetHistory();
|
|
102
|
+
spy_handler2_execute.resetHistory();
|
|
103
|
+
spy_handler3_execute.resetHistory();
|
|
104
|
+
});
|
|
98
105
|
const handlerMockImpl = (kind: string): ActionHandler[] => {
|
|
99
106
|
switch (kind) {
|
|
100
107
|
case action1:
|
|
@@ -129,9 +136,9 @@ describe('test DefaultActionDispatcher', () => {
|
|
|
129
136
|
// Test execution
|
|
130
137
|
await actionDispatcher.dispatchAll([{ kind: action1 }, { kind: action2 }, { kind: action3 }]);
|
|
131
138
|
// Check if all handlers have been called
|
|
132
|
-
expect(spy_handler1_execute.calledOnce);
|
|
133
|
-
expect(spy_handler2_execute.calledOnce);
|
|
134
|
-
expect(spy_handler3_execute.calledOnce);
|
|
139
|
+
expect(spy_handler1_execute.calledOnce).to.be.true;
|
|
140
|
+
expect(spy_handler2_execute.calledOnce).to.be.true;
|
|
141
|
+
expect(spy_handler3_execute.calledOnce).to.be.true;
|
|
135
142
|
// Check if all handlers have been called in the right order
|
|
136
143
|
sinon.assert.callOrder(spy_handler1_execute, spy_handler2_execute, spy_handler3_execute);
|
|
137
144
|
});
|
|
@@ -156,9 +163,9 @@ describe('test DefaultActionDispatcher', () => {
|
|
|
156
163
|
actionDispatcher.dispatch({ kind: action2 });
|
|
157
164
|
await actionDispatcher.dispatch({ kind: action3 });
|
|
158
165
|
// Check if all handlers have been called
|
|
159
|
-
expect(spy_handler1_execute.calledOnce);
|
|
160
|
-
expect(spy_handler2_execute.calledOnce);
|
|
161
|
-
expect(spy_handler3_execute.calledOnce);
|
|
166
|
+
expect(spy_handler1_execute.calledOnce).to.be.true;
|
|
167
|
+
expect(spy_handler2_execute.calledOnce).to.be.true;
|
|
168
|
+
expect(spy_handler3_execute.calledOnce).to.be.true;
|
|
162
169
|
// Check if all handlers have been called in the right order
|
|
163
170
|
sinon.assert.callOrder(spy_handler1_execute, spy_handler2_execute, spy_handler3_execute);
|
|
164
171
|
});
|
|
@@ -176,8 +183,8 @@ describe('test DefaultActionDispatcher', () => {
|
|
|
176
183
|
const spy_handler2_execute = sinon.spy(handler2, 'execute');
|
|
177
184
|
// Test execution
|
|
178
185
|
await actionDispatcher.dispatch({ kind: action1 });
|
|
179
|
-
expect(spy_handler1_execute.calledOnce);
|
|
180
|
-
expect(spy_handler2_execute.calledOnce);
|
|
186
|
+
expect(spy_handler1_execute.calledOnce).to.be.true;
|
|
187
|
+
expect(spy_handler2_execute.calledOnce).to.be.true;
|
|
181
188
|
sinon.assert.callOrder(spy_handler1_execute, spy_handler2_execute);
|
|
182
189
|
});
|
|
183
190
|
});
|
|
@@ -208,8 +215,8 @@ describe('test DefaultActionDispatcher', () => {
|
|
|
208
215
|
// Add a delay so that the action dispatcher has time to dispatch the handler response
|
|
209
216
|
await mock.delay(200);
|
|
210
217
|
// Check if all handlers have been called
|
|
211
|
-
expect(spy_requestHandler_execute.calledOnce);
|
|
212
|
-
expect(spy_responseHandler_execute.calledOnce);
|
|
218
|
+
expect(spy_requestHandler_execute.calledOnce).to.be.true;
|
|
219
|
+
expect(spy_responseHandler_execute.calledOnce).to.be.true;
|
|
213
220
|
});
|
|
214
221
|
|
|
215
222
|
it('dispatch - multiple actions & multiple response', async () => {
|
|
@@ -249,10 +256,10 @@ describe('test DefaultActionDispatcher', () => {
|
|
|
249
256
|
// Add a delay so that the action dispatcher has time to dispatch the handler response
|
|
250
257
|
await mock.delay(100);
|
|
251
258
|
// Check if all handlers have been called correctly
|
|
252
|
-
expect(spy_requestHandler1_execute.calledOnce);
|
|
253
|
-
expect(spy_requestHandler2_execute.calledOnce);
|
|
254
|
-
expect(spy_responseHandler1_execute.calledOnce);
|
|
255
|
-
expect(spy_responseHandler2_execute.calledThrice);
|
|
259
|
+
expect(spy_requestHandler1_execute.calledOnce).to.be.true;
|
|
260
|
+
expect(spy_requestHandler2_execute.calledOnce).to.be.true;
|
|
261
|
+
expect(spy_responseHandler1_execute.calledOnce).to.be.true;
|
|
262
|
+
expect(spy_responseHandler2_execute.calledThrice).to.be.true;
|
|
256
263
|
// Check if all handlers have been called in the right order
|
|
257
264
|
sinon.assert.callOrder(spy_requestHandler1_execute, spy_requestHandler2_execute);
|
|
258
265
|
sinon.assert.callOrder(spy_responseHandler1_execute, spy_responseHandler2_execute);
|
|
@@ -286,10 +293,10 @@ describe('test DefaultActionDispatcher', () => {
|
|
|
286
293
|
await actionDispatcher.dispatch({ kind: intermediateAction });
|
|
287
294
|
expect(spy_postUpdateHandler_execute.called).to.be.false;
|
|
288
295
|
await actionDispatcher.dispatch(updateModelAction);
|
|
289
|
-
expect(spy_postUpdateHandler_execute.calledOnce);
|
|
296
|
+
expect(spy_postUpdateHandler_execute.calledOnce).to.be.true;
|
|
290
297
|
// Check that action does not get dispatched again
|
|
291
298
|
await actionDispatcher.dispatch(updateModelAction);
|
|
292
|
-
expect(spy_postUpdateHandler_execute.calledOnce);
|
|
299
|
+
expect(spy_postUpdateHandler_execute.calledOnce).to.be.true;
|
|
293
300
|
});
|
|
294
301
|
});
|
|
295
302
|
|
|
@@ -502,6 +509,21 @@ describe('test DefaultActionDispatcher', () => {
|
|
|
502
509
|
expect(lateResponse.responseId).to.equal('');
|
|
503
510
|
});
|
|
504
511
|
|
|
512
|
+
it('dispatch - drops a stale ResponseAction with no matching pending request and no handler', async () => {
|
|
513
|
+
// Late `RejectAction`s (and any other ResponseAction that arrives after the matching
|
|
514
|
+
// pending request is gone) used to throw "No handler registered" because the dispatcher
|
|
515
|
+
// tried to route them as regular actions. They are protocol signals, not handler
|
|
516
|
+
// invocations — `doDispatch` swallows them with a debug log instead.
|
|
517
|
+
clientActionForwarderStub.shouldForwardToClient.returns(false);
|
|
518
|
+
clientActionForwarderStub.handle.returns(false);
|
|
519
|
+
registry_get_stub.callsFake(() => []);
|
|
520
|
+
|
|
521
|
+
const lateReject = RejectAction.create('late reject', { responseId: 'never-pending' });
|
|
522
|
+
|
|
523
|
+
// No throw, no client-forward — the dispatch resolves cleanly.
|
|
524
|
+
await actionDispatcher.dispatch(lateReject);
|
|
525
|
+
});
|
|
526
|
+
|
|
505
527
|
it('request - resolves when response intercept happens from inside doDispatch', async () => {
|
|
506
528
|
// A local handler for the request kind returns the matching response action directly.
|
|
507
529
|
// The response is dispatched via dispatchResponses() -> dispatch() and intercepted
|