Installation fix, wind in knots, etc. (#56)

* Added option to display wind speed in knots, in combination with either imperial or metric units.
* Fixed build error possibly triggered by some unknown security update.
* Fixed possible out-of-memory error during installation on Raspberry Pi with only 1 GB RAM.
* Fixed Settings dialog layout when indoor/outdoor temperature options are disabled.

Author: kshetline

.gitignore

@@ -2,6 +2,7 @@
 
 # compiled output
 /dist
+/tsc-out
 /server/dist
 /server/tsc-out
 /tmp

CHANGELOG.md

@@ -1,11 +1,18 @@
+## 2.10.0
+
+* Added option to display wind speed in knots, in combination with either imperial or metric units.
+* Fixed build error possibly triggered by some unknown security update.
+* Fixed possible out-of-memory error during installation on Raspberry Pi with only 1 GB RAM.
+* Fixed Settings dialog layout when indoor/outdoor temperature options are disabled.
+
 ## 2.9.3
 
 * Moved settings button into lower right corner.
 * Improved retrieval and display of ΔTAI/ΔUT1.
-* Fix browser Reload button.
+* Fixed browser Reload button.
 * Provided option to disable kiosk mode for auto-start browser.
 * Server stability improvements.
-* Reduce calls to Google geocoding API.
+* Reduced calls to Google geocoding API.
 
 ## 2.9.2
 
@@ -30,9 +37,9 @@
 
 ## 2.8.2
 
-* Update timezones to 2020d.
-* Fix and improve ephemeris rise/set tracks.
-* Fix Raspbian detection.
+* Updated timezones to 2020d.
+* Fixed and improve ephemeris rise/set tracks.
+* Fixed Raspbian detection.
 
 ## 2.8.0
 

README.md

@@ -107,7 +107,9 @@ When connecting the 433 MHz receiver module follow the same precautions as speci
 
 <img src="https://shetline.com/readme/aw-clock/2.8.0/wind_barbs.png" width=820 height=55 alt="wind barbs">
 
-Wind speed is displayed using *wind barbs*. When using imperial units, the wind barbs represent wind speed in knots, rounded to the nearest multiple of 5 knots, up to a maximum of 100 knots. In metric mode the wind barbs represent wind speed in meters per second, in increments of 2.5 m/s (in the diagram above, divide the captions by 2 for m/s).
+Wind speed is displayed using *wind barbs*. When using imperial units, the wind barbs represent wind speed in knots, rounded to the nearest multiple of 5 knots, up to a maximum of 100 knots. In metric mode the wind barbs, by default, represent wind speed in meters per second, in increments of 2.5 m/s (in the diagram above, divide the captions by 2 for m/s).
+
+In the Settings dialog, however, you can choose to display wind speed in knots while still using metric (°C, cm) for temperature and precipitation. When using imperial units (°F, in) wind speed (apart from wind barbs) is by default shown in mph, but you can optionally use knots for the textual display of wind speed as well.
 
 | &nbsp;    | Imperial | Metric  |
 | --------- | -------- | ------- |
@@ -326,3 +328,5 @@ For reference, here’s a break down of the steps performed by a full installati
 To greatly improve the speed and reliability of automated installations and updates, the often troublesome node-sass has been moved into a separate `sass` directory. To set up node-sass, `cd` into the `sass` directory and enter `npm i`. This prepares you for translating the source file `styles.scss` into `styles.css`.
 
 Once this is set up, you can use `npm run build:sass` to make sure any changes you make to `styles.scss` are carried over into `styles.css`. `styles.css` is also automatically updated any time you use `npm start`.
+
+To update any changes made to `build.ts`, use `npm run build:build`

build.js

@@ -23,12 +23,11 @@ if [ -f "node_path.txt" ]; then
   if [ "$path" == "failed" ]; then
     exit;
   elif [ -n "$path" ]; then
-    echo "here"
     args=(--path \""$path"\")
     path="${args[*]}"
   fi
 fi
 
 echo "Starting main installer..."
 # shellcheck disable=SC2090,SC2048,SC2086
-npm run build:prod -- $path --bash $*
+node build.js -p $path --bash $*

build.sh

@@ -1,7 +1,7 @@
 import * as Chalk from 'chalk';
 import { exec } from 'child_process';
-import * as copyfiles from 'copyfiles';
 import * as fs from 'fs';
+import * as os from 'os';
 import * as readline from 'readline';
 import { Key } from 'readline';
 import { asLines, isFunction, isNumber, isObject, isString, processMillis, toBoolean, toNumber } from '@tubular/util';
@@ -10,6 +10,14 @@ import { convertPinToGpio } from './server/src/rpi-pin-conversions';
 import { ErrorMode, getSudoUser, getUserHome, monitorProcess, monitorProcessLines, sleep, spawn } from './server/src/process-util';
 import { promisify } from 'util';
 
+const enoughRam = os.totalmem() / 0x40000000 > 1.5;
+
+// Deal with weird issue where 'copyfiles' gets imported in an inconsistent manner.
+let copyfiles: any = require('copyfiles');
+
+if (copyfiles.default)
+  copyfiles = copyfiles.default;
+
 readline.emitKeypressEvents(process.stdin);
 process.stdin.setRawMode(true);
 
@@ -452,7 +460,18 @@ function getWebpackSummary(s: string): string {
 
 async function npmInit(): Promise<void> {
   if (!npmInitDone) {
-    await monitorProcess(spawn('npm', ['init', '--yes'], { cwd: path.join(__dirname, 'server', 'dist') }), spin);
+    const file = path.join(__dirname, 'server', 'dist', 'package.json');
+    const packageJson = {
+      name: 'aw-clock-server',
+      version: '0.0.0',
+      description: 'AW-Clock Server',
+      main: 'app.js',
+      license: 'MIT',
+      dependencies: {}
+    };
+
+    fs.writeFileSync(file, JSON.stringify(packageJson, null, 2));
+    await monitorProcess(spawn('chown', [user, file]), spin, ErrorMode.ANY_ERROR);
     npmInitDone = true;
   }
 }
@@ -882,7 +901,12 @@ async function doClientBuild(): Promise<void> {
     await monitorProcess(spawn('rm', uid, ['-Rf', 'dist']), spin);
 
   const opts = { shell: true, env: process.env };
-  const output = getWebpackSummary(await monitorProcess(spawn('webpack', uid, prod ? ['--env', 'mode=prod'] : [], opts), spin));
+  const args = ['run', 'build:client' + (enoughRam ? '' : ':tiny')];
+
+  if (prod)
+    args.push('--', '--env', 'mode=prod');
+
+  const output = getWebpackSummary(await monitorProcess(spawn('npm', uid, args, opts), spin));
 
   stepDone();
 
@@ -905,26 +929,32 @@ async function doServerBuild(): Promise<void> {
     await monitorProcess(spawn('rm', uid, ['-Rf', 'server/dist']), spin);
 
   const opts = { shell: true, cwd: path.join(__dirname, 'server'), env: process.env };
-  const output = getWebpackSummary(await monitorProcess(spawn('npm', uid, ['run', isWindows ? 'build-win' : 'build'], opts), spin));
+  const output = getWebpackSummary(await monitorProcess(spawn('npm', uid,
+    ['run', isWindows ? 'build-win' : 'build' + (enoughRam ? '' : ':tiny')], opts), spin));
 
   stepDone();
 
   if (output?.trim())
     console.log(chalk.mediumGray(output));
 
-  if (doAcu) {
+  if (doAcu || doDht) {
     showStep();
-    write('Adding Acu-Rite wireless temperature/humidity sensor support' + trailingSpace);
-    await npmInit();
-    await monitorProcess(spawn('npm', uid, ['i', 'rpi-acu-rite-temperature@2.x'], { cwd: path.join(__dirname, 'server', 'dist') }), spin);
-    stepDone();
-  }
 
-  if (doDht) {
-    showStep();
-    write('Adding DHT wired temperature/humidity sensor support' + trailingSpace);
+    const args = ['i', '-P', 'rpi-acu-rite-temperature@2', 'node-dht-sensor@0.4'];
+
+    if (doAcu && doDht)
+      write('Adding wireless and wired temp/humidity sensor support' + trailingSpace);
+    else if (doAcu) {
+      args.splice(3, 1);
+      write('Adding Acu-Rite wireless temperature/humidity sensor support' + trailingSpace);
+    }
+    else {
+      args.splice(2, 1);
+      write('Adding DHT wired temperature/humidity sensor support' + trailingSpace);
+    }
+
     await npmInit();
-    await monitorProcess(spawn('npm', uid, ['i', 'node-dht-sensor@0.4.x'], { cwd: path.join(__dirname, 'server', 'dist') }), spin);
+    await monitorProcess(spawn('npm', uid, args, { cwd: path.join(__dirname, 'server', 'dist') }), spin);
     stepDone();
   }
 }
@@ -1053,8 +1083,7 @@ async function doServiceDeployment(): Promise<void> {
     totalSteps += noStop ? 0 : 1;
     totalSteps += (doNpmI || !fs.existsSync('node_modules') || !fs.existsSync('package-lock.json')) ? 1 : 0;
     totalSteps += (doNpmI || !fs.existsSync('server/node_modules') || !fs.existsSync('server/package-lock.json')) ? 1 : 0;
-    totalSteps += doAcu ? 1 : 0;
-    totalSteps += doDht ? 1 : 0;
+    totalSteps += doAcu || doDht ? 1 : 0;
     totalSteps += (doStdDeploy || doDedicated ? 1 : 0);
     totalSteps += (doLaunch || doReboot ? 1 : 0);
 
@@ -1068,6 +1097,14 @@ async function doServiceDeployment(): Promise<void> {
       totalSteps += 9 + (doUpdateUpgrade ? 1 : 0);
       console.log(chalk.cyan(sol + '- Dedicated device setup -'));
 
+      if (doUpdateUpgrade) {
+        showStep();
+        write('Updating/upgrading packages' + trailingSpace);
+        await monitorProcess(spawn('apt-get', ['update', '-y']), spin, ErrorMode.NO_ERRORS);
+        await monitorProcess(spawn('apt-get', ['upgrade', '-y']), spin, ErrorMode.NO_ERRORS);
+        stepDone();
+      }
+
       if (!noStop) {
         showStep();
         write('Stopping weatherService if currently running' + trailingSpace);
@@ -1083,7 +1120,7 @@ async function doServiceDeployment(): Promise<void> {
             console.log(backspace + trailingSpace);
             console.error(err);
             console.log('\npolkit is requiring interactive authentication to stop weatherService.');
-            console.log('Please enter "sudo service stop weatherService" at the prompt below.');
+            console.log('Please enter "sudo service weatherService stop" at the prompt below.');
             console.log('\nWhen that is done, restart this installation with either: ');
             console.log('    sudo ./build.sh --nostop -i        (for interactive set-up)');
             console.log('    sudo ./build.sh --nostop -ddev     (for automated set-up)');
@@ -1096,14 +1133,6 @@ async function doServiceDeployment(): Promise<void> {
         stepDone();
       }
 
-      if (doUpdateUpgrade) {
-        showStep();
-        write('Updating/upgrading packages' + trailingSpace);
-        await monitorProcess(spawn('apt-get', ['update', '-y']), spin, ErrorMode.NO_ERRORS);
-        await monitorProcess(spawn('apt-get', ['upgrade', '-y']), spin, ErrorMode.NO_ERRORS);
-        stepDone();
-      }
-
       await install('pigpio', false, true);
       await install(chromium);
       await install('unclutter');

build.ts

@@ -33,6 +33,24 @@ current_node_version() {
   printf %s "$version"
 }
 
+current_npm_version() {
+  local version=0
+
+  if [ "$(command -v npm)" ]; then
+    version=$(npm --version 2>&1)
+
+    if [[ $version =~ "No such file" ]]; then
+      version=-1
+    else
+      local pattern='([0-9]+)'
+      [[ $version =~ $pattern ]]
+      version="${BASH_REMATCH[1]}"
+    fi
+  fi
+
+  printf %s "$version"
+}
+
 # shellcheck disable=SC2155
 export NVM_DIR="$(nvm_install_dir)"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
@@ -161,6 +179,13 @@ if [ ! -f ".first-time-install" ] || [ ! -d "node_modules/@tubular/util" ] || [
   touch .first-time-install
 fi
 
+npm_version="$(current_npm_version)"
+
+if (( npm_version < 7 )); then
+  echo "Updating npm to at least version 7"
+  sudo npm i -g "npm@>=7"
+fi
+
 pattern='^(.*\/\.nvm\/[^:]*):'
 [[ $PATH =~ $pattern ]]
 echo "${BASH_REMATCH[1]}" > node_path.txt