Merge pull request #1327 from StochSS/develop

Release v2.4.8
StochSS · Aug 16, 2022 · 4947d9a · 4947d9a
2 parents d5ccccc + ff9404d
commit 4947d9a
Show file tree

Hide file tree

Showing 97 changed files with 5,615 additions and 3,166 deletions.
diff --git a/__version__.py b/__version__.py
@@ -5,7 +5,7 @@
 # @website https://github.com/stochss/stochss
 # =============================================================================
 
-__version__ = '2.4.7'
+__version__ = '2.4.8'
 __title__ = 'StochSS'
 __description__ = 'StochSS is an integrated development environment (IDE) \
                     for simulation of biochemical networks.'

diff --git a/client/app.js b/client/app.js
@@ -100,31 +100,45 @@ let registerRenderSubview = (parent, view, hook) => {
 let getXHR = (endpoint, {
   always = function (err, response, body) {}, success = function (err, response, body) {},
   error = function (err, response, body) {}}={}) => {
-  xhr({uri: endpoint, json: true}, function (err, response, body) {
-    if(response.statusCode < 400) {
-      success(err, response, body);
-    }else if(response.statusCode < 500) {
-      error(err, response, body);
-    }else{
-      console.log("Critical Error Detected");
-    }
-    always(err, response, body);
-  });
+  try {
+    xhr({uri: endpoint, json: true}, function (err, response, body) {
+      if(response.statusCode < 400) {
+        success(err, response, body);
+      }else if(response.statusCode < 500) {
+        error(err, response, body);
+      }else{
+        console.log("Critical Error Detected");
+      }
+      always(err, response, body);
+    });
+  }catch(exception){
+    console.log(exception);
+    let response = {Reason: "Network Error", Message: exception};
+    let body = {response: response, err: exception}
+    error(exception, response, body);
+  }
 };
 
 let postXHR = (endpoint, data, {
   always = function (err, response, body) {}, success = function (err, response, body) {},
   error = function (err, response, body) {}}={}, isJSON) => {
-  xhr({uri: endpoint, json: isJSON !== undefined ? isJSON : true, method: "post", body: data}, function (err, response, body) {
-    if(response.statusCode < 400) {
-      success(err, response, body);
-    }else if(response.statusCode < 500) {
-      error(err, response, body);
-    }else{
-      console.log("Critical Error Detected");
-    }
-    always(err, response, body);
-  });
+  try {
+    xhr({uri: endpoint, json: isJSON !== undefined ? isJSON : true, method: "post", body: data}, function (err, response, body) {
+      if(response.statusCode < 400) {
+        success(err, response, body);
+      }else if(response.statusCode < 500) {
+        error(err, response, body);
+      }else{
+        console.log("Critical Error Detected");
+      }
+      always(err, response, body);
+    });
+  }catch(exception){
+    console.log(exception);
+    let response = {Reason: "Network Error", Message: exception};
+    let body = {response: response, err: exception}
+    error(exception, response, body);
+  }
 };
 
 let getBrowser = () => {