@eclipse-glsp/server 2.4.0-next.117 → 2.4.0-next.118

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.
Files changed (6) hide show
  1. package/lib/common/features/model/request-model-action-handler.d.ts +3 -2
  2. package/lib/common/features/model/request-model-action-handler.d.ts.map +1 -1
  3. package/lib/common/features/model/request-model-action-handler.js +16 -5
  4. package/lib/common/features/model/request-model-action-handler.js.map +1 -1
  5. package/package.json +3 -3
  6. package/src/common/features/model/request-model-action-handler.ts +19 -7
package/lib/common/features/model/request-model-action-handler.d.ts CHANGED
@@ -31,7 +31,8 @@ export declare class RequestModelActionHandler implements ActionHandler {
31
31
  protected progressService: ProgressService;
32
32
  execute(action: RequestModelAction): Promise<Action[]>;
33
33
  protected handleReconnect(action: RequestModelAction): Promise<void>;
34
- protected reportModelLoading(message: string): ProgressMonitor;
35
- protected reportModelLoadingFinished(monitor: ProgressMonitor): void;
34
+ protected reportModelLoading(message: string): ProgressMonitor | undefined;
35
+ protected reportModelLoadingFinished(monitor?: ProgressMonitor): void;
36
+ protected handleModelLoadingError(error: unknown, monitor?: ProgressMonitor): void;
36
37
  }
37
38
  //# sourceMappingURL=request-model-action-handler.d.ts.map
package/lib/common/features/model/request-model-action-handler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"request-model-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/model/request-model-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAgB,MAAM,wBAAwB,CAAC;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,qBACa,yBAA0B,YAAW,aAAa;IAC3D,WAAW,WAA6B;IAGxC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAGzB,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAGjD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAG7C,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAGjC,SAAS,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;IAGpD,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAErC,OAAO,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAkB5C,eAAe,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAW1E,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe;IAK9D,SAAS,CAAC,0BAA0B,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;CAIvE"}
1
+ {"version":3,"file":"request-model-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/features/model/request-model-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAgB,MAAM,wBAAwB,CAAC;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,qBACa,yBAA0B,YAAW,aAAa;IAC3D,WAAW,WAA6B;IAGxC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAGzB,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAGjD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAG7C,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAGjC,SAAS,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;IAGpD,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAErC,OAAO,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAuB5C,eAAe,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAW1E,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAK1E,SAAS,CAAC,0BAA0B,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI;IAKrE,SAAS,CAAC,uBAAuB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI;CAMrF"}
package/lib/common/features/model/request-model-action-handler.js CHANGED
@@ -44,11 +44,16 @@ let RequestModelActionHandler = class RequestModelActionHandler {
44
44
  this.modelState.setAll((_a = action.options) !== null && _a !== void 0 ? _a : {});
45
45
  const isReconnecting = client_options_util_1.ClientOptionsUtil.isReconnecting(action.options);
46
46
  const progress = this.reportModelLoading('Model loading in progress');
47
- if (isReconnecting) {
48
- await this.handleReconnect(action);
47
+ try {
48
+ if (isReconnecting) {
49
+ await this.handleReconnect(action);
50
+ }
51
+ else {
52
+ await this.sourceModelStorage.loadSourceModel(action);
53
+ }
49
54
  }
50
- else {
51
- await this.sourceModelStorage.loadSourceModel(action);
55
+ catch (err) {
56
+ this.handleModelLoadingError(err, progress);
52
57
  }
53
58
  this.reportModelLoadingFinished(progress);
54
59
  return this.submissionHandler.submitInitialModel(action);
@@ -71,7 +76,13 @@ let RequestModelActionHandler = class RequestModelActionHandler {
71
76
  }
72
77
  reportModelLoadingFinished(monitor) {
73
78
  this.actionDispatcher.dispatch(protocol_1.StatusAction.create('', { severity: 'NONE' }));
74
- monitor.end();
79
+ monitor === null || monitor === void 0 ? void 0 : monitor.end();
80
+ }
81
+ handleModelLoadingError(error, monitor) {
82
+ // In case of an error we end progress reporting and rethrow the error so
83
+ // that it can be handled by the default error handler
84
+ monitor === null || monitor === void 0 ? void 0 : monitor.end();
85
+ throw error;
75
86
  }
76
87
  };
77
88
  exports.RequestModelActionHandler = RequestModelActionHandler;
package/lib/common/features/model/request-model-action-handler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"request-model-action-handler.js","sourceRoot":"","sources":["../../../../src/common/features/model/request-model-action-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAkF;AAClF,yCAA+C;AAC/C,uEAAmE;AAEnE,yEAAoE;AACpE,+CAA4C;AAC5C,mEAAgF;AAChF,+CAA2C;AAC3C,yEAAoE;AACpE,iEAA4D;AAGrD,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAA/B;QACH,gBAAW,GAAG,CAAC,6BAAkB,CAAC,IAAI,CAAC,CAAC;IA0D5C,CAAC;IAtCG,KAAK,CAAC,OAAO,CAAC,MAA0B;;QACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC;QACzD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAA,MAAM,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC;QAE7C,MAAM,cAAc,GAAG,uCAAiB,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAExE,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,2BAA2B,CAAC,CAAC;QAEtE,IAAI,cAAc,EAAE,CAAC;YACjB,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAC1D,CAAC;QACD,IAAI,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC;QAE1C,OAAO,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC7D,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,MAA0B;;QACtD,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAC1C,IAAI,YAAY,EAAE,CAAC;YACf,oEAAoE;YACpE,8EAA8E;YAC9E,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,mCAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QAC7E,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAC1D,CAAC;IACL,CAAC;IAES,kBAAkB,CAAC,OAAe;QACxC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,uBAAY,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACnF,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAES,0BAA0B,CAAC,OAAwB;QACzD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,uBAAY,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAC9E,OAAO,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC;CACJ,CAAA;AA3DY,8DAAyB;AAIxB;IADT,IAAA,kBAAM,EAAC,eAAM,CAAC;8BACG,eAAM;yDAAC;AAGf;IADT,IAAA,kBAAM,EAAC,yCAAkB,CAAC;;qEACsB;AAGvC;IADT,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;mEACoB;AAGnC;IADT,IAAA,kBAAM,EAAC,wBAAU,CAAC;;6DACc;AAGvB;IADT,IAAA,kBAAM,EAAC,iDAAsB,CAAC;8BACF,iDAAsB;oEAAC;AAG1C;IADT,IAAA,kBAAM,EAAC,kCAAe,CAAC;;kEACmB;oCAnBlC,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CA2DrC"}
1
+ {"version":3,"file":"request-model-action-handler.js","sourceRoot":"","sources":["../../../../src/common/features/model/request-model-action-handler.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.4.0-next.117+6064bdb",
3
+ "version": "2.4.0-next.118+079fa99",
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.4.0-next.117+6064bdb",
61
+ "@eclipse-glsp/graph": "2.4.0-next.118+079fa99",
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": "6064bdbe4f9590c6ce92e98914154ddfd18abdcd"
81
+ "gitHead": "079fa991b7f977b842a10fee0e4337a8346c5b7d"
82
82
  }
package/src/common/features/model/request-model-action-handler.ts CHANGED
@@ -54,11 +54,16 @@ export class RequestModelActionHandler implements ActionHandler {
54
54
 
55
55
  const progress = this.reportModelLoading('Model loading in progress');
56
56
 
57
- if (isReconnecting) {
58
- await this.handleReconnect(action);
59
- } else {
60
- await this.sourceModelStorage.loadSourceModel(action);
57
+ try {
58
+ if (isReconnecting) {
59
+ await this.handleReconnect(action);
60
+ } else {
61
+ await this.sourceModelStorage.loadSourceModel(action);
62
+ }
63
+ } catch (err) {
64
+ this.handleModelLoadingError(err, progress);
61
65
  }
66
+
62
67
  this.reportModelLoadingFinished(progress);
63
68
 
64
69
  return this.submissionHandler.submitInitialModel(action);
@@ -75,13 +80,20 @@ export class RequestModelActionHandler implements ActionHandler {
75
80
  }
76
81
  }
77
82
 
78
- protected reportModelLoading(message: string): ProgressMonitor {
83
+ protected reportModelLoading(message: string): ProgressMonitor | undefined {
79
84
  this.actionDispatcher.dispatch(StatusAction.create(message, { severity: 'INFO' }));
80
85
  return this.progressService.start(message);
81
86
  }
82
87
 
83
- protected reportModelLoadingFinished(monitor: ProgressMonitor): void {
88
+ protected reportModelLoadingFinished(monitor?: ProgressMonitor): void {
84
89
  this.actionDispatcher.dispatch(StatusAction.create('', { severity: 'NONE' }));
85
- monitor.end();
90
+ monitor?.end();
91
+ }
92
+
93
+ protected handleModelLoadingError(error: unknown, monitor?: ProgressMonitor): void {
94
+ // In case of an error we end progress reporting and rethrow the error so
95
+ // that it can be handled by the default error handler
96
+ monitor?.end();
97
+ throw error;
86
98
  }
87
99
  }