@eclipse-glsp-examples/workflow-server-bundled 2.4.0-next.116 → 2.4.0-next.118

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp-examples/workflow-server-bundled",
-  "version": "2.4.0-next.116+8a91563",
+  "version": "2.4.0-next.118+079fa99",
   "description": "GLSP node server for the workflow example (bundled)",
   "keywords": [
     "eclipse",
@@ -49,5 +49,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8a915638b16e3c4338307ab08ef13fd18daef9c4"
+  "gitHead": "079fa991b7f977b842a10fee0e4337a8346c5b7d"
 }

package/wf-glsp-server-node.js

@@ -63425,11 +63425,16 @@ let RequestModelActionHandler = class RequestModelActionHandler {
         this.modelState.setAll((_a = action.options) !== null && _a !== void 0 ? _a : {});
         const isReconnecting = client_options_util_1.ClientOptionsUtil.isReconnecting(action.options);
         const progress = this.reportModelLoading('Model loading in progress');
-        if (isReconnecting) {
-            await this.handleReconnect(action);
+        try {
+            if (isReconnecting) {
+                await this.handleReconnect(action);
+            }
+            else {
+                await this.sourceModelStorage.loadSourceModel(action);
+            }
         }
-        else {
-            await this.sourceModelStorage.loadSourceModel(action);
+        catch (err) {
+            this.handleModelLoadingError(err, progress);
         }
         this.reportModelLoadingFinished(progress);
         return this.submissionHandler.submitInitialModel(action);
@@ -63452,7 +63457,13 @@ let RequestModelActionHandler = class RequestModelActionHandler {
     }
     reportModelLoadingFinished(monitor) {
         this.actionDispatcher.dispatch(protocol_1.StatusAction.create('', { severity: 'NONE' }));
-        monitor.end();
+        monitor === null || monitor === void 0 ? void 0 : monitor.end();
+    }
+    handleModelLoadingError(error, monitor) {
+        // In case of an error we end progress reporting and rethrow the error so
+        // that it can be handled by the default error handler
+        monitor === null || monitor === void 0 ? void 0 : monitor.end();
+        throw error;
     }
 };
 exports.RequestModelActionHandler = RequestModelActionHandler;
@@ -67146,6 +67157,9 @@ function applyRoute(route, index) {
     args[args_util_1.ArgsUtil.KEY_EDGE_SOURCE_POINT_Y] = source.y;
     args[args_util_1.ArgsUtil.KEY_EDGE_TARGET_POINT_X] = target.x;
     args[args_util_1.ArgsUtil.KEY_EDGE_TARGET_POINT_Y] = target.y;
+    if (!edge.args) {
+        edge.args = args;
+    }
     return edge;
 }
 exports.applyRoute = applyRoute;