linny-r 1.1.15 → 1.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linny-r",
-  "version": "1.1.15",
+  "version": "1.1.17",
   "description": "Executable graphical language with WYSIWYG editor for MILP models",
   "main": "server.js",
   "scripts": {

package/server.js

@@ -75,9 +75,12 @@ function getVersionInfo() {
     console.log('This indicates that Linny-R is not installed properly.');
     process.exit();    
   }
+  console.log('\nNode.js server for Linny-R version', info.current);
+  console.log('Looking for newer version on https://npmjs.com');
   try {
     const
-        json = child_process.execSync('npm show linny-r time version --json'),
+        json = child_process.execSync( 
+            'npm show linny-r time version --json', {timeout: 5000}),
         obj = JSON.parse(json);
     info.latest = obj.version;
     info.latest_time = new Date(Date.parse(obj.time[info.latest]));
@@ -87,12 +90,13 @@ function getVersionInfo() {
     // `latest` = 0 indicates that version check failed
     info.latest = 0;
   }
-  console.log('\nNode.js server for Linny-R version', info.current);
   if(!info.latest) {
-    console.log('WARNING: Could not check for updates');
+    console.log(connectionErrorText('Could not connect to https://nodejs.com'));
   } else if(!info.up_to_date) {
     console.log('UPDATE: Version ' + info.latest + ' was released on ' +
         info.latest_time.toString());
+  } else {
+    console.log('Linny-R software is up-to-date');
   }
   return info;
 }
@@ -433,7 +437,7 @@ function repositoryByName(name) {
     while(rbn.length < 2) rbn.push('');
     if(rbn[0] === name) return rbn;
   }
-  console.log(`ERROR: Repository "${name}" not found`);
+  console.log(`ERROR: Repository "${name}" not registered on this computer`);
   return false;
 }
 
@@ -485,7 +489,7 @@ function repoAdd(res, sp) {
   // Error callback function is used twice, so define it here
   const noConnection = (error, res) => {
         console.log(error);
-        servePlainText(res, 'ERROR: Failed to connect to ' + url);
+        servePlainText(res, connectionErrorText('Failed to connect to ' + url));
       };
   // Verify that the URL points to a Linny-R repository
   postRequest(url, {action: 'id'},
@@ -596,8 +600,8 @@ function repoDir(res, rname) {
           // The `on_error` function
           (error, res) => {
               console.log(error);
-              servePlainText(res,
-                  `ERROR: Failed to access remote repository "${rname}"`);
+              servePlainText(res, connectionErrorText(
+                  `Failed to access remote repository "${rname}"`));
           },
           res);
     } else {
@@ -751,7 +755,7 @@ function repoAccess(res, rname, rtoken) {
       // The `on_error` function
       (error, res) => {
           console.log(error);
-          servePlainText(res, 'ERROR: Failed to connect to' + r[1]);
+          servePlainText(res, connectionErrorText('Failed to connect to' + r[1]));
         },
       res);
 }
@@ -808,7 +812,7 @@ function repoStore(res, rname, mname, mxml) {
             // The `on_error` function
             (error, res) => {
                 console.log(error);
-                servePlainText(res, 'ERROR: Failed to connect to' + r[1]);
+                servePlainText(res, connectionErrorText('Failed to connect to' + r[1]));
               },
             res);
       } else {
@@ -870,7 +874,7 @@ function loadData(res, url) {
       getTextFromURL(url,
           (data, res) => servePlainText(res, data),
           (error, res) => servePlainText(res,
-              `ERROR: Failed to get data from <tt>${url}</tt>`),
+              connectionErrorText(`Failed to get data from <tt>${url}</tt>`)),
           res);
     } catch(err) {
       console.log(err);
@@ -1378,6 +1382,10 @@ function formData(obj) {
   return fields.join('&');
 }
 
+function connectionErrorText(msg) {
+  return 'WARNING: ' + msg + ' - Please check your internet connection';
+}
+
 //
 // Functions used during initialization
 //

package/static/scripts/linny-r-model.js

@@ -2019,10 +2019,9 @@ class LinnyRModel {
       this.timeout_period = Math.max(0,
           safeStrToInt(nodeContentByTag(node, 'timeout-period')));
       // Legacy models have tag "optimization-period" instead of "block-length"
-      const bl_tag = nodeContentByTag(node, 'block-length') ||
+      const bl_str = nodeContentByTag(node, 'block-length') ||
           nodeContentByTag(node, 'optimization-period'); 
-      this.block_length = Math.max(1,
-          safeStrToInt(nodeContentByTag(node, bl_tag)));
+      this.block_length = Math.max(1, safeStrToInt(node, bl_str));
       this.start_period = Math.max(1,
           safeStrToInt(nodeContentByTag(node, 'start-period')));
       this.end_period = Math.max(1,