linny-r 1.1.0 → 1.1.2

package/README.md

@@ -39,24 +39,31 @@ The response should be the version number of Node.js, for example: v18.9.0.
 
 ### Installing Linny-R
 It is advisable to install Linny-R in a directory on your computer, not in a cloud. 
-In this installation guide, this directory is called `Linny-R`.
-At the command line, change to the Linny-R directory (if you are not there already) and type: 
+In this installation guide, the path to this directory is denoted by `WORKING_DIRECTORY`,
+but on a Windows machine you may choose something like `C:\Users\xyz\Documents\Linny-R`,
+and on a macOS machine probably `/Users/xyz/Linny-R`.
 
-``npm install linny-r``
+To install Linny-R in this directory, type at the command line prompt: 
 
-The Linny-R directory should now contain a new sub-directory `node_modules`, 
+``npm install --prefix WORKING_DIRECTORY linny-r``
+
+WORKING_DIRECTORY should now contain a new sub-directory `node_modules`, 
 and two JSON files `package.json` and `package-lock.json` that should **not** be removed,
 or you will have to re-install Linny-R.
 
-When configuring Linny-R for a network environment where individual users each have their personal work space (e.g., a virtual drive U:),
-you can instruct Linny-R to create the `user` directory in this work space by adding the argument `workspace=[path]` to the `node` command.
+After installation has been completed, `WORKING_DIRECTORY` will also have a sub-directory `user`
+and a script file to facilitate (single click) launch: on a macOS machine the shell script `linny-r.command`,
+on a Windows machine the batch script `linny-r.bat`. 
+
+When configuring Linny-R for a network environment
+where individual users each have their personal work space (e.g., a virtual drive U:),
+you can instruct Linny-R to create the `user` directory in this work space
+by adding the argument `workspace=[path]` to the `node` command that you use to start the Linny-R server.
 
-The directory should contain this file `README.md`,
+The `node_modules` directory should contain two sub-directories: `@xmldom` and `linny-r`.
+The `linny-r` directory should contain this file `README.md`,
 the files `server.js` and `console.js` that will be run by Node.js,
 and the sub-directory `static`. 
-After installation has been completed, it will have two more subdirectories `user` and `node_modules`,
-and a script file to facilitate (single click) launch: on a macOS machine the shell script `linny-r.command`,
-on a Windows machine the batch script `linny-r.bat`. 
 
 The `static` directory should contain three HTML files: 
 
@@ -68,20 +75,12 @@ 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 `server.js` when it is running in Node.js. 
 
-After installation has completed, the `Linny-R` directory should have this directory tree structure:
+After installation has completed, `WORKING_DIRECTORY` should have this directory tree structure:
 
 <pre>
-Linny-R
+WORKING_DIRECTORY
  |
- +- static
- |   |
- |   +  fonts
- |   |
- |   +- images
- |   |
- |   +- scripts
- |   |
- |   +- sounds
+ +- node_modules
  |
  +- user
      |
@@ -95,7 +94,7 @@ Linny-R
      |
      +-solver 
 </pre>
-
+ 
 The sub-directories of the `user` directory are used by Linny-R to store files.
 
 * `channel` and `callback` will be used to interact with Linny-R via its *Receiver* 
@@ -138,7 +137,7 @@ How to do this is explained on the page "Installing LP_solve on a Mac" on the Li
 https://linny-r.info 
 
 When you have downloaded the file (just `lp_solve` for macOS, `lp_solve.exe` for Windows), 
-you must copy or move this file to the main Linny-R directory,
+you must copy or move this file to your `WORKING_DIRECTORY`,
 as this is where Linny-R will look for it when it does not find Gurobi.
 
 On a macOS machine, you must then make the file `lp_solve` executable.
@@ -161,12 +160,13 @@ If you reach this stage, Linny-R will be able to run LP_solve.
 ### Running Linny-R
 
 Open the Command Line Interface (CLI) of your computer.
-On macOS, this will be `Terminal`, on Windows `Command Prompt`. 
+On macOS, open `Terminal`, change to your `WORKING_DIRECTORY` and type:
 
-At the CLI prompt, change to the main Linny-R directory that contains the file `server.js`.
-Then type:
+``node node_modules/linny-r/server``
 
-``node server``
+On Windows, open `Command Prompt`, change to your `WORKING_DIRECTORY` and type:
+
+``node node_modules\linny-r\server``
 
 The response should be something similar to:
 
@@ -175,7 +175,8 @@ Node.js server for Linny-R version 1.0
 Node.js version: v18.9.0
 </pre>
 
-followed by some data on your Linny-R configuration. The last line will be something like:
+followed by some data on your Linny-R configuration.
+The last line will be something like:
 
 <pre>
 Listening at: http://127.0.0.1:5050
@@ -219,11 +220,11 @@ Solve block 1 a
 Optionally, you can add more arguments to the `node` command:
 
 <pre>
+dpi=[number]       to overrule the default resolution (300 dpi) for Inkscape 
 launch             to automatically launch Linny-R in your default browser
 port=[number]      to overrule the default port number (5050)
 solver=[name]      to overrule the default sequence (Gurobi, LP_solve)
 workspace=[path]   to overrule the default path for the user directory
-dpi=[number]       to overrule the default resolution (300 dpi) for Inkscape 
 </pre>
 
 ### Installing Inkscape
@@ -257,7 +258,7 @@ 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.
-The dialog that then appears will allow you to go to the sub-folder `static\images`,
+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.
 
@@ -267,7 +268,7 @@ On a macOS machine, open Terminal and change to your Linny-R directory, and then
 
 to make the script file executable.
 To set the icon, click on the icon of `linny-r.command` (which still is plain) and open the Info dialog by pressing ``Cmd+I``.
-Then open your Linny-R folder in the Finder, change to the sub-folder `static/images`, 
+Then open your Linny-R folder in the Finder, change to the sub-folder `node_modules/linny-r/static/images`, 
 and from there drag/drop the file `linny-r.icns` on the icon shown in the top left corner of the Info dialog.
 
 
@@ -289,9 +290,9 @@ In that case, you can stop Node.js by stopping the Terminal.
 
 The console-only version of Linny-R allows you to run a Linny-R model without a web browser.
 This may be useful when you want run models from a script (shell script, Python, ...). 
-If you open a CLI box, change to the main Linny-R directory, and then type:
+If you open a CLI box, change to your `WORKING_DIRECTORY`, and then type:
 
-``node console``
+``node node_modules/linny-r/console``  _(on Windows, use backslashes)_
 
 you will see the command line options that allow you to run models in various ways.
 

package/console.js

@@ -41,31 +41,29 @@ SOFTWARE.
 // (this will make the "module" files linny-r-xxx.js export their properties)
 global.NODE = true;
 
-const VERSION_NUMBER = '1.0.0';
-    
-const MAIN_DIRECTORY = process.cwd();
-
-// Load the required Node.js modules
 const
+    VERSION_NUMBER = '1.1.2',
+    WORKING_DIRECTORY = process.cwd(),
+    path = require('path'),
+    MAIN_DIRECTORY = path.join(WORKING_DIRECTORY, 'node_modules', 'linny-r'),
+    // Load the required Node.js modules
     fs = require('fs'),
     os = require('os'),
-    path = require('path'),
-    readline = require('readline');
-
-// Get the platform name (win32, macOS, linux) of the user's computer
-const PLATFORM = os.platform();
+    readline = require('readline'),
+    // Get the platform name (win32, macOS, linux) of the user's computer
+    PLATFORM = os.platform();
 
 // Immediately output some configuration information to the console
 console.log('\nNode.js Linny-R console version', VERSION_NUMBER);
 console.log('Node.js version:', process.version);
 console.log('Platform:', PLATFORM, '(' + os.type() + ')');
 console.log('Main directory:', MAIN_DIRECTORY);
+console.log('Working directory:', WORKING_DIRECTORY);
 
-// Load the MILP solver (dependent on Node.js: `fs`, `os` and `path`)
-const MILPSolver = require('./static/scripts/linny-r-milp.js');
-    
-// Load the browser-compatible Linny-R scripts
 const
+    // Load the MILP solver (dependent on Node.js: `fs`, `os` and `path`)
+    MILPSolver = require('./static/scripts/linny-r-milp.js'),
+    // Load the browser-compatible Linny-R scripts
     config = require('./static/scripts/linny-r-config.js'),
     utils = require('./static/scripts/linny-r-utils.js'),
     vm = require('./static/scripts/linny-r-vm.js'),
@@ -681,7 +679,7 @@ function commandLineSettings() {
       preferred_solver: '',
       solver: '',
       solver_path: '',
-      user_dir: path.join(MAIN_DIRECTORY, 'user')
+      user_dir: path.join(WORKING_DIRECTORY, 'user')
     };
   let show_usage = process.argv.length < 3;
   for(let i = 2; i < process.argv.length; i++) {
@@ -812,7 +810,7 @@ function commandLineSettings() {
   }
   // Check if lp_solve(.exe) exists in main directory
   const
-      sp = path.join(MAIN_DIRECTORY,
+      sp = path.join(WORKING_DIRECTORY,
           'lp_solve' + (PLATFORM.startsWith('win') ? '.exe' : '')),
       need_lps = !settings.solver || settings.preferred_solver === 'lp_solve';
   try {

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "linny-r",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Executable graphical language with WYSIWYG editor for MILP models",
   "main": "server.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "install" : "scripts/install.js"
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
     "@xmldom/xmldom": ">=0.8.2"

package/server.js

@@ -39,15 +39,17 @@ SOFTWARE.
 
 const
     // The version number of this Linny-R server in Node.js
-    VERSION_NUMBER = '1.0.0',
+    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
-    MAIN_DIRECTORY = process.cwd(),
-
+    path = require('path'),
+    WORKING_DIRECTORY = process.cwd(),
+    MAIN_DIRECTORY = path.join(WORKING_DIRECTORY, 'node_modules', 'linny-r'),
+    
     // Get the required built-in Node.js modules
     child_process = require('child_process'),
     crypto = require('crypto'),
@@ -55,7 +57,6 @@ const
     http = require('http'),
     https = require('https'),
     os = require('os'),
-    path = require('path'),
 
     // Get the platform name (win32, macOS, linux) of the user's computer
     PLATFORM = os.platform();    
@@ -65,6 +66,7 @@ console.log('\nNode.js server for Linny-R version', VERSION_NUMBER);
 console.log('Node.js version:', process.version);
 console.log('Platform:', PLATFORM, '(' + os.type() + ')');
 console.log('Main directory:', MAIN_DIRECTORY);
+console.log('Working directory:', WORKING_DIRECTORY);
 
 // Only then require the Node.js modules that are not "built-in"
 
@@ -104,8 +106,6 @@ const SOLVER = new MILPSolver(SETTINGS, WORKSPACE);
 // Create launch script
 createLaunchScript();
 
-verifyScriptFiles();
-
 // Create the HTTP server
 const SERVER = http.createServer((req, res) => {
     const u = new URL(req.url, 'http://127.0.0.1:' + SETTINGS.port);
@@ -831,11 +831,11 @@ function receiver(res, sp) {
   let
       rpath = anyOSpath(sp.get('path') || ''),
       rfile = anyOSpath(sp.get('file') || '');
-  // Assume that path is relative tochannel directory unless it starts with
+  // Assume that path is relative to channel directory unless it starts with
   // a (back)slash or specifiess drive or volume
   if(!(rpath.startsWith(path.sep) || rpath.indexOf(':') >= 0 ||
-      rpath.startsWith(MAIN_DIRECTORY))) {
-    rpath = path.join(MAIN_DIRECTORY, rpath);
+      rpath.startsWith(WORKING_DIRECTORY))) {
+    rpath = path.join(WORKING_DIRECTORY, rpath);
   }
   // Verify that the channel path exists
   try {
@@ -1321,7 +1321,7 @@ function commandLineSettings() {
       preferred_solver: '',
       solver: '',
       solver_path: '',
-      user_dir: path.join(MAIN_DIRECTORY, 'user')
+      user_dir: path.join(WORKING_DIRECTORY, 'user')
     };
   for(let i = 2; i < process.argv.length; i++) {
     const lca = process.argv[i].toLowerCase();
@@ -1410,9 +1410,9 @@ function commandLineSettings() {
           'WARNING: Failed to access the Gurobi command line application');
     }
   }
-  // Check if lp_solve(.exe) exists in main directory
+  // Check if lp_solve(.exe) exists in working directory
   const
-      sp = path.join(MAIN_DIRECTORY,
+      sp = path.join(WORKING_DIRECTORY,
           'lp_solve' + (PLATFORM.startsWith('win') ? '.exe' : '')),
       need_lps = !settings.solver || settings.preferred_solver === 'lp_solve';
   try {
@@ -1518,17 +1518,17 @@ function createLaunchScript() {
       '# cd ',
       '',
       '# Then this command to launch the Linny-R server should work:',
-      'node server launch'
+      'node ' + path.join('node_modules', 'linny-r', 'server') + ' launch'
     ];
   let sp;
   if(PLATFORM.startsWith('win')) {
-    sp = path.join(MAIN_DIRECTORY, 'linny-r.bat');
+    sp = path.join(WORKING_DIRECTORY, 'linny-r.bat');
     lines[1] += 'C:\\path\\to\\main\\Linny-R\\directory';
   } else {
-    sp = path.join(MAIN_DIRECTORY, 'linny-r.command'); 
+    sp = path.join(WORKING_DIRECTORY, 'linny-r.command'); 
     lines[1] += '/path/to/main/Linny-R/directory';
   }
-  lines[2] = 'cd ' + MAIN_DIRECTORY;
+  lines[2] = 'cd ' + WORKING_DIRECTORY;
   try {
     try {
       fs.accessSync(sp);

package/static/index.html

@@ -51,6 +51,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 -->
 
   <link rel="shortcut icon" type="image/png" href="images/icon.png">
+  <!-- NOTE: do not display the page until after software update check -->
+  <style>body { display: none; }</style>
   <script>
     var
       // NODE = false indicates that modules need not export their properties
@@ -141,8 +143,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     }
     
     function checkForUpdates() {
-      UI.check_update_modal.element('reload-btn').style.display = 'none';
-      UI.check_update_modal.element('restart-btn').style.display = 'none';
       fetch('auto-check')
         .then((response) => response.text())
         .then((data) => {