linny-r 1.1.6 → 1.1.8

package/README.md

@@ -5,7 +5,8 @@
 <a href="https://en.wikipedia.org/wiki/Unit_commitment_problem_in_electrical_power_production" target="_blank">unit commitment problems</a> (UCP) and
 <a href="https://en.wikipedia.org/wiki/Generation_expansion_planning" target="_blank">generation expansion planning</a> (GEP).</p>
 
-The graphical language and WYSIWYG model editor are developed by **Pieter Bots** at Delft University of Technology.
+The graphical language and WYSIWYG model editor are developed by **Pieter Bots** at
+<a href="https://tudelft.nl" target="_blank">Delft University of Technology</a>.
  
 Originally implemented in Delphi Pascal, Linny-R is now developed in HTML+CSS+JavaScript
 so as to be platform-independent and 100% transparent open source (under the MIT license).
@@ -13,21 +14,21 @@ The software comprises a server that runs on Node.js, and a graphical user inter
 
 You can play with the most recent release of Linny-R on 
 <a href="https://sysmod.tbm.tudelft.nl/linny-r" target="_blank">this server hosted at TU Delft</a>.    
-Note that this server imposes restrictions on solver time and the total number of blocks it will solve per run.    
+Note that this server imposes restrictions on solver time and the total number of blocks it will solve per run.
 If you install Linny-R on your own machine, no such restrictions apply.
 
 Documentation for Linny-R is still scant, but it is growing. You can contribute yourself (in "wiki fashion")
-via the official documentation site https://linny-r.info.
+via the official documentation site <a href="https://linny-r.info" target="_blank">https://linny-r.info</a>.
 
 ### Installing Node.js
 
 Linny-R is developed as a JavaScript package, and requires that **Node.js** is installed on your computer. 
-Node.js can be downloaded from https://nodejs.org. 
+This software can be downloaded from <a href="https://nodejs.org" target="_blank">https://nodejs.org</a>. 
 Make sure that you choose the correct installer for your computer.
-Linny-R is developed using the *current* release. Presently (October 2022) this is 18.10.0. 
+Linny-R is developed using the _current_ release. Presently (October 2022) this is 18.10.0. 
 
 Run the installer and accept the default settings.
-There is **no** need to install the optional Tools for Native Modules.
+There is **no** need to install the optional _Tools for Native Modules_.
 
 Open the Command Line Interface (CLI) of your computer. 
 On macOS, this will be `Terminal`, on Windows `Command Prompt`. 
@@ -101,13 +102,13 @@ and the sub-directory `static`. This `static` directory should contain three HTM
 
 It should also contain the style sheet `linny-r.css` required by the GUI.
 
-The subdirectories of `static` contain files that are served to the browser by the script
+The sub-directories of `static` contain files that are served to the browser by the script
 `server.js` when it is running in Node.js. 
 
 ### Configuring the MILP solver
 
 Linny-R presently supports two MILP solvers: Gurobi  and LP_solve. 
-Gurobi is *considerably* more powerful than the open source LP_solve solver that has powered Linny-R since 2009,
+Gurobi is _considerably_ more powerful than the open source LP_solve solver that has powered Linny-R since 2009,
 but it requires a license.
 Academic licenses can be obtained by students and staff of eligible institutions. 
 
@@ -167,7 +168,7 @@ Open the Command Line Interface (CLI) of your computer, change to your `WORKING_
 This response should be something similar to:
 
 <pre>
-Node.js server for Linny-R version 1.0
+Node.js server for Linny-R version 1.1.8
 Node.js version: v18.10.0
 ... etc.
 </pre>
@@ -191,7 +192,7 @@ stating the name of the solver.
 You can then test the GUI by creating a simple model.
 Make one that has at least one process that outputs a product, 
 and this product must have a price or a set lower bound, otherwise the model will have no objective function.
-Then click on the *Solve* button at the bottom of the left-hand tool bar.
+Then click on the _Solve_ button at the bottom of the left-hand tool bar.
 The Linny-R icon in the upper left corner should start rotating, while the status bar at the bottom should display:
 
 <pre>
@@ -211,10 +212,10 @@ Solve block 1 a
 The user workspace is created when the server is run for the first time.
 The sub-directories of this directory `user` are used by Linny-R to store files.
 
-* `channel` and `callback` will be used to interact with Linny-R via its *Receiver* 
+* `channel` and `callback` will be used to interact with Linny-R via its _Receiver_ 
 * `diagrams` will be used to render Scalable Vector Graphics (SVG) files as
   Portable Network Graphics (PNG) using Inkscape (if installed)
-* `modules` will contain models stored in the `local host` *repository*
+* `modules` will contain models stored in the `local host` _repository_
 * `solver` will contain the files that are exchanged with the Mixed Integer Linear Programming (MILP) solver
   (the names of the files that will appear in this directory may vary, depending on the MILP-solver you use)
 
@@ -239,7 +240,7 @@ When you download a diagram, it will be saved as a .svg file.
 These files can be viewed and edited using Inkscape, an open source vector graphics editor. 
 
 As it may be tedious to first save a diagram as SVG and then render it manually as a bitmap image, 
-Linny-R features a *Render diagram as bitmap* button on the top toolbar, and on the bottom toolbar of the *Chart manager*.
+Linny-R features a *Render diagram as bitmap* button on the top toolbar, and on the bottom toolbar of the _Chart manager_.
 When you click it, Linny-R will send the image as SVG to the server. 
 The server script will save the SVG in the `user/diagrams` sub-directory, 
 and then try to execute an Inkscape command that will convert this SVG to a PNG image file in the same directory.
@@ -261,8 +262,8 @@ so you need to do this yourself.
 To facilitate start-up, you can create a shortcut icon on your desktop. 
 
 On a Windows machine, change to your Linny-R folder, right-click on the batch file `linny-r.bat`,
-and select the *Create shortcut* option. 
-Then right-click on the shortcut file to edit its properties, and click the *Change Icon* button.
+and select the _Create shortcut_ option. 
+Then right-click on the shortcut file to edit its properties, and click the _Change Icon_ button.
 The dialog that then appears will allow you to go to the sub-folder `node_modules\linny-r\static\images`,
 where you should select the file `linny-r.ico`.
 Finally, rename the shortcut to `Linny-R` and move or copy it to your desktop.
@@ -281,8 +282,7 @@ and from there drag/drop the file `linny-r.icns` on the icon shown in the top le
 
 If you have not configured a "click-start" icon as described above, 
 you must start a modeling session with Linny-R by opening a CLI box,
-then change to the Linny-R directory, type `node server`,
-open your browser, and then navigate to http://127.0.0.1:5050
+then change to the Linny-R directory and type `linny-r`.
 
 To shut down the server, click on the local host icon in the upper right corner of the Linny-R GUI in your browser.
 Alternatively, you can stop the server by repeatedly pressing ``Ctrl+C`` in the CLI box.
@@ -306,7 +306,8 @@ you will see the command line options that allow you to run models in various wa
 ### Troubleshooting problems
 
 If during any of the steps above you encounter problems, please try to diagnose them and resolve them yourself.
-You can find a lot of useful information on the Linny-R documentatio website: https://linny-r.info
+You can find a lot of useful information on the Linny-R documentatio website:
+<a href="https://linny-r.info" target="_blank">https://linny-r.info</a>.
 
 To diagnose a problem, always look in the CLI box where Node.js is running, 
 as informative server-side error messages will appear there.

package/console.js

@@ -42,22 +42,48 @@ SOFTWARE.
 global.NODE = true;
 
 const
-    VERSION_NUMBER = '1.1.2',
     WORKING_DIRECTORY = process.cwd(),
     path = require('path'),
-    MAIN_DIRECTORY = path.join(WORKING_DIRECTORY, 'node_modules', 'linny-r'),
+    MODULE_DIRECTORY = path.join(WORKING_DIRECTORY, 'node_modules', 'linny-r'),
     // Load the required Node.js modules
+    child_process = require('child_process'),
     fs = require('fs'),
     os = require('os'),
     readline = require('readline'),
     // Get the platform name (win32, macOS, linux) of the user's computer
-    PLATFORM = os.platform();
+    PLATFORM = os.platform(),
+    // Get version of the installed Linny-R package 
+    VERSION_INFO = getVersionInfo();
+    
+function getVersionInfo() {
+  // Reads version info from `package.json`
+  const info = {
+      current: 0,
+      current_time: 0,
+      latest: '0',
+      latest_time: 0,
+      up_to_date: false
+    };
+  try {
+    info.current = require('./package.json').version;
+  } catch(err) {
+    console.log('ERROR: Failed to read package.json');
+    console.log(err);
+    console.log('This indicates that Linny-R is not installed properly.');
+    process.exit();    
+  }
+  // NOTE: unlike the Linny-R server, the console does not routinely
+  // check whether version is up-to-date is optional because this is
+  // a time-consuming action that would reduce multi-run performance.
+  // See command line options (much further down)
+  console.log('\nLinny-R Console version', info.current);
+  return info;
+}
 
-// Immediately output some configuration information to the console
-console.log('\nNode.js Linny-R console version', VERSION_NUMBER);
+// Output some configuration information to the console
 console.log('Node.js version:', process.version);
 console.log('Platform:', PLATFORM, '(' + os.type() + ')');
-console.log('Main directory:', MAIN_DIRECTORY);
+console.log('Module directory:', MODULE_DIRECTORY);
 console.log('Working directory:', WORKING_DIRECTORY);
 
 const
@@ -86,6 +112,7 @@ Usage:  node console [options]
 Possible options are:
   channel=[identifier]  will start listening at the specified channel
                         (FUTURE OPTION)
+  check                 will report whether current version is up-to-date
   model=[path]          will load model file in [path]
   module=[name@repo]    will load model [name] from repository [repo]
                         (if @repo is blank, repository "local host" is used)
@@ -125,9 +152,8 @@ function checkNodeModule(name) {
 // XML-related functions defined in `linny-r-utils.js`
 global.XML_PARSER = new DOMParser();
 
-// @@TO DO: Check for Linny-R software updates
-// For now, simply set the version number 
-global.LINNY_R_VERSION = '1.1.0';
+// Set the current version number 
+global.LINNY_R_VERSION = VERSION_INFO.current;
 
 ///////////////////////////////////////////////////////////////////////////////
 //     Class definitions must precede instatiation of Linny-R components     //
@@ -675,17 +701,21 @@ function commandLineSettings() {
   // Sets default settings, and then checks the command line arguments
   const settings = {
       cli_name: (PLATFORM.startsWith('win') ? 'Command Prompt' : 'Terminal'),
-      run: false,
+      check: false,
       preferred_solver: '',
+      run: false,
       solver: '',
       solver_path: '',
-      user_dir: path.join(WORKING_DIRECTORY, 'user')
+      user_dir: path.join(WORKING_DIRECTORY, 'user'),
+      verbose: false
     };
   let show_usage = process.argv.length < 3;
   for(let i = 2; i < process.argv.length; i++) {
     const lca = process.argv[i].toLowerCase();
     if(lca === 'help' || lca === '?' || lca.startsWith('-')) {
       show_usage = true;
+    } else if(lca === 'check') {
+      settings.check = true;
     } else if(lca === 'run') {
       settings.run = true;
     } else if(lca === 'verbose') {
@@ -767,6 +797,8 @@ function commandLineSettings() {
     console.log(usage);
     process.exit();
   }
+  // Perform version check only if asked for
+  if(settings.check) checkForUpdates();
   // Check whether MILP solver(s) and Inkscape have been installed
   const path_list = process.env.PATH.split(path.delimiter);
   let gurobi_path = '',
@@ -876,6 +908,35 @@ function createWorkspace() {
   return ws;
 }
 
+function checkForUpdates() {
+  // Check for newer version of the Node.js package `linny-r`
+  // NOTE: use `info` as shorthand for the global constant
+  const info = VERSION_INFO;
+  try {
+    const
+        json = child_process.execSync('npm show linny-r time version --json'),
+        obj = JSON.parse(json);
+    info.latest = obj.version;
+    info.latest_time = new Date(Date.parse(obj.time[info.latest]));
+    info.current_time = new Date(Date.parse(obj.time[info.current]));
+    info.up_to_date = info.current === info.latest;
+  } catch(err) {
+    // `latest` = 0 indicates that version check failed
+    info.latest = 0;
+  }
+  if(!info.latest) {
+    console.log('WARNING: Could not check for updates');
+  } else if(!info.up_to_date) {
+    console.log('UPDATE: Version ' + info.latest + ' was released on ' +
+        info.latest_time.toString());
+  } else {
+    console.log('Version ' + info.latest + ' is up-to-date (released on ' +
+        info.latest_time.toString() + ')');    
+  }
+  // Return TRUE if current version is the latest one
+  return info.up_to_date;
+}
+
 // Initialize the solver
 const SOLVER = new MILPSolver(SETTINGS, WORKSPACE);
 /*

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "linny-r",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "Executable graphical language with WYSIWYG editor for MILP models",
   "main": "server.js",
   "scripts": {
-    "postinstall": "post-install.js",
+    "postinstall": "node post-install.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {

package/post-install.js

@@ -52,21 +52,24 @@ const
     path = require('path'),
     os = require('os'),
     PLATFORM = os.platform(),
-    WORKING_DIRECTORY = process.cwd(),
+    mod_dir = path.join('node_modules', 'linny-r'),
+    // NOTE: working directory for this script is the *module* directory,
+    // which is two levels deeper than the actual working directory
+    WORKING_DIRECTORY = process.cwd().replace(path.sep + mod_dir, ''),
     lines = [
         '# The first line (without the comment symbol #) should be like this:',
         '# cd ',
         '',
         '# Then this command to launch the Linny-R server should work:',
-        'node ' + path.join('node_modules', 'linny-r', 'server') + ' launch'
+        `node ${mod_dir}${path.sep}server launch`
       ];
 let sp;
 if(PLATFORM.startsWith('win')) {
   sp = path.join(WORKING_DIRECTORY, 'linny-r.bat');
-  lines[1] += 'C:\\path\\to\\main\\Linny-R\\directory';
+  lines[1] += 'C:\\path\\to\\\\your\\Linny-R\\directory';
 } else {
   sp = path.join(WORKING_DIRECTORY, 'linny-r.command'); 
-  lines[1] += '/path/to/main/Linny-R/directory';
+  lines[1] += '/path/to/your/Linny-R/directory';
 }
 lines[2] = 'cd ' + WORKING_DIRECTORY;
 try {
@@ -76,7 +79,7 @@ try {
     // Only write the script content if the file it does not yet exist
     console.log('Creating launch script:', sp);
     let code = lines.join(os.EOL);
-    if(PLATFORM.startsWith('win')) code = code.replace('#', '::');
+    if(PLATFORM.startsWith('win')) code = code.replaceAll('#', '::');
     fs.writeFileSync(sp, code, 'utf8');
   }
 } catch(err) {

package/server.js

@@ -38,17 +38,11 @@ SOFTWARE.
 ///////////////////////////////////////////////////////////////////////////////
 
 const
-    // The version number of this Linny-R server in Node.js
-    VERSION_NUMBER = '1.1.2',
-    
-    // The URL of the official Linny-R website (with the most recent release)
-    PUBLIC_LINNY_R_URL = 'https://sysmod.tbm.tudelft.nl/linny-r',
-
     // The current working directory (from where Node.js was started) is
     // assumed to be the main directory
     path = require('path'),
     WORKING_DIRECTORY = process.cwd(),
-    MAIN_DIRECTORY = path.join(WORKING_DIRECTORY, 'node_modules', 'linny-r'),
+    MODULE_DIRECTORY = path.join(WORKING_DIRECTORY, 'node_modules', 'linny-r'),
     
     // Get the required built-in Node.js modules
     child_process = require('child_process'),
@@ -59,16 +53,57 @@ const
     os = require('os'),
 
     // Get the platform name (win32, macOS, linux) of the user's computer
-    PLATFORM = os.platform();    
+    PLATFORM = os.platform(),    
+
+    // Get version of the installed Linny-R package 
+    VERSION_INFO = getVersionInfo();
+    
+function getVersionInfo() {
+  // Reads version info from `package.json`
+  const info = {
+      current: 0,
+      current_time: 0,
+      latest: '0',
+      latest_time: 0,
+      up_to_date: false
+    };
+  try {
+    info.current = require('./package.json').version;
+  } catch(err) {
+    console.log('ERROR: Failed to read package.json');
+    console.log(err);
+    console.log('This indicates that Linny-R is not installed properly.');
+    process.exit();    
+  }
+  try {
+    const
+        json = child_process.execSync('npm show linny-r time version --json'),
+        obj = JSON.parse(json);
+    info.latest = obj.version;
+    info.latest_time = new Date(Date.parse(obj.time[info.latest]));
+    info.current_time = new Date(Date.parse(obj.time[info.current]));
+    info.up_to_date = info.current === info.latest;
+  } catch(err) {
+    // `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');
+  } else if(!info.up_to_date) {
+    console.log('UPDATE: Version ' + info.latest + ' was released on ' +
+        info.latest_time.toString());
+  }
+  return info;
+}
 
-// Immediately output some configuration information to the console
-console.log('\nNode.js server for Linny-R version', VERSION_NUMBER);
+// Output some configuration information to the console
 console.log('Node.js version:', process.version);
 console.log('Platform:', PLATFORM, '(' + os.type() + ')');
-console.log('Main directory:', MAIN_DIRECTORY);
+console.log('Module directory:', MODULE_DIRECTORY);
 console.log('Working directory:', WORKING_DIRECTORY);
 
-// Only then require the Node.js modules that are not "built-in"
+// Only now require the Node.js modules that are not "built-in"
 
 const
     { DOMParser } = checkNodeModule('@xmldom/xmldom');
@@ -83,12 +118,10 @@ function checkNodeModule(name) {
   }
 }
 
+
 // Load class MILPSolver
 const MILPSolver = require('./static/scripts/linny-r-milp.js');
 
-///////////////////////////////////////////////////////////////////////////////
-//                Code executed at start-up continues here                   //
-///////////////////////////////////////////////////////////////////////////////
 
 // Default settings are used unless these are overruled by arguments on the
 // command line. Possible arguments are:
@@ -135,54 +168,25 @@ if(SETTINGS.launch) {
         });
 }
 
-// Version check & update functionality
-// ====================================
-// This section of code implements server responses to requests made by the
-// browser immediately after loading the GUI page (`index.html`), or when the
-// user clicks on the link "Version ..." below the Linny-R logo in the upper
-// left corner of the GUI page.
-
-const
-
-VERSION_MESSAGE = `<!DOCTYPE html>
-<html lang="en-US">
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-  <title>Linny-R version information</title>
-  <link rel="shortcut icon" type="image/png" href="../images/icon.png">
-  <style>
-    body {
-      font-family: sans-serif;
-      font-size: 16px;
-    }
-    #linny-r-logo {
-      height: 40px;
-      margin-bottom: -10px;
-    }
-  </style>
-</head>
-<body>
-  <img id="linny-r-logo" src="../images/logo.png">
-  %1%
-</body>
-</html>`,
-
-NO_INTERNET_MESSAGE = `
-<h3>Version check failed</h3>
-<p>
-  No contact with the on-line Linny-R server --
-  please check your internet connection.
-</p>`,
-
-UP_TO_DATE_MESSAGE = `
-<h3>Version JS-%1% is up-to-date</h3>
-<p>Released on %2%</p>`,
+// Version check functionality
+// ===========================
+// This section of code implements server responses to the request made
+// by the browser immediately after loading the GUI page (`index.html`)
 
-DOWNLOAD_MESSAGE = `
-<h3>Latest version is %1%</h3>
-<p>Released on %2%</p>`,
+function autoCheck(res) {
+  // Serves a string with the current version number plus info on a
+  // newer release if this is available
+  let check = VERSION_INFO.current + '|';
+  if(VERSION_INFO.up_to_date) {
+    check += 'up-to-date';
+  } else {
+    check += VERSION_INFO.latest + '|' + VERSION_INFO.latest_time;
+  }
+  servePlainText(res, check);
+}
 
-SHUTDOWN_MESSAGE = `<!DOCTYPE html>
+// HTML page to show then the server is shut down by the user
+const SHUTDOWN_MESSAGE = `<!DOCTYPE html>
 <html lang="en-US">
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
@@ -197,12 +201,14 @@ SHUTDOWN_MESSAGE = `<!DOCTYPE html>
 </head>
 <body>
   <h3>Linny-R server (127.0.0.1) is shutting down</h3>
-  <p>To upgrade and/or restart Linny-R, please switch to your
-      ${SETTINGS.cli_name} window and there at the prompt:
-  <p>To upgrade to a newer version of Linny-R, first type:</p>
+  <p>To restart Linny-R, switch to your ${SETTINGS.cli_name} window
+     and there at the prompt` +
+(VERSION_INFO.up_to_date ? '' : `
+  first type:</p>
   <p>&nbsp;&nbsp;<tt>npm update linny-r</tt><p>
-  <p>To restart the server, type:</p>
-  <p>&nbsp;&nbsp;<tt>node server</tt></p>
+  to upgrade to Linny-R version ${VERSION_INFO.latest}, and then`) +
+` type:</p>
+  <p>&nbsp;&nbsp;<tt>node node_modules\\linny-r\\server</tt></p>
   <p>
     Then switch back to this window, and click
     <button type="button"
@@ -213,104 +219,6 @@ SHUTDOWN_MESSAGE = `<!DOCTYPE html>
 </body>
 </html>`;
 
-
-function compareVersions(v1, v2) {
-  // Robust comparison of version numbers
-  nrs1 = (v1 + '.0.0.0').split('.');
-  nrs2 = (v2 + '.0.0.0').split('.');
-  for(i = 0; i < 4; i++) {
-    nrs1[i] = nrs1[i].padStart(6, '0');
-    nrs2[i] = nrs2[i].padStart(6, '0');
-  }
-  v1 = nrs1.slice(0, 4).join('.');
-  v2 = nrs2.slice(0, 4).join('.');
-  if(v1 > v2) return 1;
-  if(v1 < v2) return -1;
-  return 0;
-}
-
-function checkVersion(res, version) {
-  // Check whether current version is the most recent
-  console.log('Check version:', version);
-  if(!version) {
-    serveHTML(res, '<h3>No version number specified</h3>');
-    return;
-  }
-  version = version.split('-').pop();
-  getTextFromURL(PUBLIC_LINNY_R_URL + '/check-version/?info',
-      // The `on_ok` function
-      (data, res) => {
-          const
-              info = data.split('|');
-          // Should be [version, release date]
-          if(info.length === 2) {
-            if(compareVersions(version, info[0]) >= 0) {
-              message = UP_TO_DATE_MESSAGE.replace(
-                  '%1%', info[0]).replace('%2%', info[1]);
-            } else {
-              message = DOWNLOAD_MESSAGE.replace(
-                  '%1%', info[0]).replace('%2%', info[1]);
-            }
-            serveHTML(res, VERSION_MESSAGE.replace('%1%', message));
-          }
-        },
-      // The `on_error` function
-      (error, res) => {
-          console.log(error);
-          serveHTML(res, NO_INTERNET_MESSAGE);
-        },
-      // The response object
-      res);
-}
-
-function autoCheck(res) {
-  // Compares the version number in the static file `index.html`
-  // with the version number in the corresponding file on the official
-  // Linny-R website, and serves a status string that indicates whether
-  // a newer release is available
-  const gpath = path.join(MAIN_DIRECTORY, 'static', 'index.html');
-  // Read the globals script
-  fs.readFile(gpath, 'utf8', (err, data) => {
-      let v_match = null;
-      if(err) {
-        console.log('WARNING: Failed to read file', gpath);
-      } else {
-        // Extract the version number
-        v_match = data.match(/LINNY_R_VERSION = '(.+?)'/);
-        if(!v_match) console.log('WARNING: No version number found');
-      }
-      if(!v_match) {
-        servePlainText(res,'no version');
-        return;
-      }
-      let version = v_match[1];
-      // Get the current `index.html` file from the official Linny-R server 
-      getTextFromURL(PUBLIC_LINNY_R_URL + '/check-version/?info',
-          // The `on_ok` function: compare versions and return status
-          (data, res) => {
-              let check = 'no match';
-              const
-                  info = data.split('|');
-              // Should be [version, release date]
-              if(info.length === 2) {
-                if(compareVersions(version, info[0]) >= 0) {
-                  check = 'up-to-date';
-                } else {
-                  check = info[0] + '|' + info[1];
-                }
-              }
-              servePlainText(res, check);
-            },
-          // The `on_error` function
-          (error, res) => {
-              console.log(error);
-              servePlainText(res, 'no match');
-            },
-          // The response object
-          res);       
-    });
-}
-
 // Repository functionality
 // ========================
 // For repository services, the Linny-R JavaScript application communicates with
@@ -1111,10 +1019,6 @@ function processRequest(req, res, cmd, data) {
     SERVER.close();
   } else if(cmd === '/auto-check') {
     autoCheck(res);
-  } else if(cmd === '/auto-update') {
-    autoUpdate(res);
-  } else if(cmd === '/check-version') {
-    checkVersion(res, (new URLSearchParams(data)).get('v'));
   } else if(cmd === '/repo/') {
     repo(res, new URLSearchParams(data));
   } else if(cmd === '/load-data/') {
@@ -1172,7 +1076,7 @@ function serveStaticFile(res, path) {
     console.log('Static file:', path);
     path = '/static' + path;
   }
-  fs.readFile(MAIN_DIRECTORY + path, (err, data) => {
+  fs.readFile(MODULE_DIRECTORY + path, (err, data) => {
       if(err) {
         console.log(err);
         res.writeHead(404);
@@ -1536,7 +1440,7 @@ function createLaunchScript() {
       // Only write the script content if the file it does not yet exist
       console.log('Creating launch script:', sp);
       let code = lines.join(os.EOL);
-      if(PLATFORM.startsWith('win')) code = code.replace('#', '::');
+      if(PLATFORM.startsWith('win')) code = code.replaceAll('#', '::');
       fs.writeFileSync(sp, code, 'utf8');
     }
   } catch(err) {

package/static/index.html

@@ -54,16 +54,17 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   <!-- NOTE: do not display the page until after software update check -->
   <style>body { display: none; }</style>
   <script>
+    // Create global variables
     var
       // NODE = false indicates that modules need not export their properties
       NODE = false,
       // Version number and release date
-      LINNY_R_VERSION = '1.1.2',
-      VERSION_RELEASE_DATE = '2022-10-11 10:25',
+      LINNY_R_VERSION = '0',
+      VERSION_RELEASE_DATE = 0,
       // Linny-R server hosting public channels
       PUBLIC_LINNY_R_URL = 'https://sysmod.tbm.tudelft.nl/linny-r',
       // Create the XML parser
-      XML_PARSER = new DOMParser();
+      XML_PARSER = new DOMParser(),
       // NOTE: global variables will be initialized when page has loaded
       // The controller object (User Interface)
       UI = null,
@@ -86,14 +87,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
       // Stack for undo/redo operations
       UNDO_STACK = null,
       // The virtual machine
-      VM = null;
+      VM = null,
     
     // Load audio files
-    var SOUNDS = {
-        notification: new Audio('sounds/notification.wav'),
-        warning: new Audio('sounds/warning.wav'),
-        error: new Audio('sounds/error.wav')
-      };
+      SOUNDS = {
+          notification: new Audio('sounds/notification.wav'),
+          warning: new Audio('sounds/warning.wav'),
+          error: new Audio('sounds/error.wav')
+        };
       
       
     function loadLinnyR() {
@@ -149,14 +150,17 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
             console.log('Version check:', data);
             const info = data.split('|');
             if(info.length > 1) {
-              UI.check_update_modal.element('msg').innerHTML = [
-                  '<a href="https://sysmod.tbm.tudelft.nl/linny-r/docs/?15" ',
-                  'target="_blank">Version <strong>',
-                  info[0], '</strong></a> released on ', info[1],
-                  ' can be installed.'].join('');
-              UI.check_update_modal.show();
-              UI.check_update_modal.element('buttons').style.display = 'block';
-            } else if(data.trim() !== 'up-to-date') {
+              LINNY_R_VERSION = info[0];
+              if(info[1] !== 'up-to-date') {
+                UI.check_update_modal.element('msg').innerHTML = [
+                    '<a href="https://sysmod.tbm.tudelft.nl/linny-r/docs/?15" ',
+                    'target="_blank">Version <strong>',
+                    info[1], '</strong></a> released on ', info[2],
+                    ' can be installed.'].join('');
+                UI.check_update_modal.show();
+                UI.check_update_modal.element('buttons').style.display = 'block';
+              }
+            } else {
               UI.warn('Version check failed: "' + data + '"');
             }
           })