Back up to previous prompts (#48)

* Tweak installation, and allow for master releases which don't trigger auto-update.
* Options to handle grief from polkit.
* New build input method to allow using up arrow to back up to a previous prompt.

Author: kshetline

build.ts

@@ -2,12 +2,17 @@ import * as Chalk from 'chalk';
 import { exec } from 'child_process';
 import * as copyfiles from 'copyfiles';
 import * as fs from 'fs';
+import * as readline from 'readline';
+import { Key } from 'readline';
 import { asLines, isFunction, isNumber, isObject, isString, processMillis, toBoolean, toNumber } from '@tubular/util';
 import * as path from 'path';
 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';
 
+readline.emitKeypressEvents(process.stdin);
+process.stdin.setRawMode(true);
+
 const CHECK_MARK = '\u2714';
 const FAIL_MARK = '\u2718';
 const SPIN_CHARS = '|/-\\';
@@ -29,6 +34,7 @@ let doStdDeploy = false;
 let doDedicated = false;
 let doLaunch = false;
 let doReboot = false;
+let noStop = false;
 let prod = false;
 let viaBash = false;
 let interactive = false;
@@ -60,7 +66,7 @@ chalk.paleYellow = chalk.hex('#FFFFAA');
 let backspace = '\x08';
 let sol = '\x1B[1G';
 let trailingSpace = '  '; // Two spaces
-let totalSteps = 3;
+let totalSteps = 2;
 let currentStep = 0;
 const settings: Record<string, string> = {
   AWC_ALLOW_ADMIN: 'false',
@@ -81,6 +87,7 @@ const settingsPath = '/etc/default/weatherService';
 const rpiSetupStuff = path.join(__dirname, 'raspberry_pi_setup');
 const serviceSrc = rpiSetupStuff + '/weatherService';
 const serviceDst = '/etc/init.d/.';
+const serviceDstFull = '/etc/init.d/weatherService';
 const fontSrc = rpiSetupStuff + '/fonts/';
 const fontDst = '/usr/local/share/fonts/';
 let chromium = 'chromium';
@@ -181,6 +188,9 @@ process.argv.forEach(arg => {
       onlyOnRaspberryPi.push(arg);
       onlyDedicated.push(arg);
       break;
+    case '--nostop':
+      noStop = true;
+      break;
     case '-p':
       prod = true;
       break;
@@ -227,21 +237,24 @@ process.argv.forEach(arg => {
 
         console.error('Unrecognized option "' + chalk.redBright(arg) + '"');
         console.log(helpMsg);
-        process.exit(0);
+        process.exit(1);
       }
   }
 });
 
+if (noStop)
+  doReboot = doLaunch = false;
+
 if (!treatAsRaspberryPi && onlyOnRaspberryPi.length > 0) {
   onlyOnRaspberryPi.forEach(opt =>
     console.error(chalk.redBright(opt) + ' option is only valid on Raspberry Pi'));
-  process.exit(0);
+  process.exit(1);
 }
 
 if (!doDedicated && onlyDedicated.length > 0) {
   onlyDedicated.forEach(opt =>
     console.error(chalk.redBright(opt) + ' option is only valid when used with the --ddev or -i options'));
-  process.exit(0);
+  process.exit(1);
 }
 
 if (treatAsRaspberryPi) {
@@ -289,14 +302,56 @@ if (treatAsRaspberryPi) {
 if (!isRaspberryPi && doAcu)
   console.warn(chalk.yellow('Warning: this setup will only generate fake wireless sensor data'));
 
-async function readLine(): Promise<string> {
+async function readUserInput(): Promise<string> {
   return new Promise<string>(resolve => {
-    const callback = (data: any) => {
-      process.stdin.off('data', callback);
-      resolve(data.toString().trim());
+    let buffer = '';
+    let length = 0;
+    const clearLine = () => write('\x08 \x08'.repeat(length));
+
+    const callback = (ch: string, key: Key) => {
+      if (ch === '\x03') { // ctrl-C
+        write('^C\n');
+        process.exit(130);
+      }
+      else if (ch === '\x15') { // ctrl-U
+        clearLine();
+        length = 0;
+      }
+      else if (key.name === 'enter' || key.name === 'return') {
+        write('\n');
+        process.stdin.off('keypress', callback);
+        resolve(buffer.substr(0, length).trim());
+      }
+      else if (key.name === 'backspace' || key.name === 'left') {
+        if (length > 0) {
+          write('\x08 \x08');
+          --length;
+        }
+      }
+      else if (key.name === 'delete') {
+        if (length > 0) {
+          write('\x08 \x08');
+          buffer = buffer.substr(0, --length) + buffer.substr(length + 1);
+        }
+      }
+      else if (key.name === 'up') {
+        clearLine();
+        write('\n');
+        process.stdin.off('keypress', callback);
+        resolve('\x18');
+      }
+      else if (key.name === 'right') {
+        if (length < buffer.length) {
+          write(buffer.charAt(length++));
+        }
+      }
+      else if (ch != null && ch >= ' ' && !key.ctrl && !key.meta) {
+        write(ch);
+        buffer = buffer.substr(0, length) + ch + buffer.substr(length++);
+      }
     };
 
-    process.stdin.on('data', callback);
+    process.stdin.on('keypress', callback);
   });
 }
 
@@ -611,7 +666,7 @@ function finalActionValidate(s: string): boolean {
 const finalAction = (doReboot ? 'R' : doLaunch ? 'L' : 'N');
 const finalOptions = '(l/r/n/)'.replace(finalAction.toLowerCase(), finalAction);
 
-const questions = [
+let questions = [
   { prompt: 'Perform initial update/upgrade?', ask: true, yn: true, deflt: doUpdateUpgrade ? 'Y' : 'N', validate: upgradeValidate },
   { prompt: 'Perform npm install? (N option for debug only)', ask: true, yn: true, deflt: doNpmI ? 'Y' : 'N', validate: npmIValidate },
   { name: 'AWC_PORT', prompt: 'HTTP server port.', ask: true, validate: portValidate },
@@ -654,6 +709,9 @@ if (NO_MORE_DARK_SKY) {
   questions.splice(7, 1);
 }
 
+if (noStop)
+  questions = questions.slice(0, -1);
+
 async function promptForConfiguration(): Promise<void> {
   console.log(chalk.cyan(sol + '- Configuration -'));
 
@@ -676,9 +734,13 @@ async function promptForConfiguration(): Promise<void> {
       write(': ');
     }
 
-    const response = await readLine();
+    const response = await readUserInput();
 
-    if (response) {
+    if (response === '\x18') {
+      i = Math.max(i - 2, -1);
+      continue;
+    }
+    else if (response) {
       const validation = q.validate ? q.validate(response) : true;
 
       if (isString(validation))
@@ -832,7 +894,7 @@ async function doServiceDeployment(): Promise<void> {
   showStep();
   write('Create or redeploy weatherService' + trailingSpace);
   await monitorProcess(spawn('cp', [serviceSrc, serviceDst], { shell: true }), spin, ErrorMode.ANY_ERROR);
-  await monitorProcess(spawn('chmod', ['+x', serviceDst], { shell: true }), spin, ErrorMode.ANY_ERROR);
+  await monitorProcess(spawn('chmod', ['+x', serviceDstFull], { shell: true }), spin, ErrorMode.ANY_ERROR);
 
   const settingsText =
     `# If you edit AWC_PORT below, be sure to update\n# ${userHome}/${autostartDst}/autostart accordingly.\n` +
@@ -897,7 +959,12 @@ async function doServiceDeployment(): Promise<void> {
     { shell: true }), spin, ErrorMode.ANY_ERROR);
   await monitorProcess(spawn('chmod', uid, ['+x', autostartDir + '/autostart*'],
     { shell: true }), spin, ErrorMode.ANY_ERROR);
-  await monitorProcess(spawn('service', ['weatherService', 'start']), spin);
+
+  if (noStop)
+    console.log(backspace + trailingSpace + '\n\nReboot to complete set-up.');
+  else
+    await monitorProcess(spawn('service', ['weatherService', 'start']), spin);
+
   stepDone();
 }
 
@@ -910,7 +977,7 @@ async function doServiceDeployment(): Promise<void> {
 
     if (isRaspberryPi && (nodeVersion < 10 || nodeVersion > 14)) {
       console.error(chalk.redBright(`Node.js version 10.x-14.x required. Version ${nodeVersionStr} found.`));
-      process.exit(0);
+      process.exit(1);
     }
 
     if (treatAsRaspberryPi && !isRaspberryPi) {
@@ -919,7 +986,7 @@ async function doServiceDeployment(): Promise<void> {
 
       if (!isDebian || !isLxde) {
         console.error(chalk.redBright('--tarp option (Treat As Raspberry Pi) only available for Linux Debian with LXDE'));
-        process.exit(0);
+        process.exit(1);
       }
     }
 
@@ -929,6 +996,7 @@ async function doServiceDeployment(): Promise<void> {
     if (interactive)
       await promptForConfiguration();
 
+    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;
@@ -945,10 +1013,34 @@ async function doServiceDeployment(): Promise<void> {
     if (doDedicated) {
       totalSteps += 9 + (doUpdateUpgrade ? 1 : 0);
       console.log(chalk.cyan(sol + '- Dedicated device setup -'));
-      showStep();
-      write('Stopping weatherService if currently running' + trailingSpace);
-      await monitorProcess(spawn('service', ['weatherService', 'stop']), spin, ErrorMode.NO_ERRORS);
-      stepDone();
+
+      if (!noStop) {
+        showStep();
+        write('Stopping weatherService if currently running' + trailingSpace);
+
+        try {
+          await monitorProcess(spawn('service', ['weatherService', 'stop']), spin, ErrorMode.ANY_ERROR);
+        }
+        catch (err) {
+          const msg = err.message || err.toString();
+
+          // Grief from polkit?
+          if (/Interactive authentication required/i.test(msg)) {
+            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('\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)');
+            process.exit(1);
+          }
+          // TODO: else? Probably just weatherService not installed yet
+          // Might check /unrecognized service|not loaded/ to be more certain.
+        }
+
+        stepDone();
+      }
 
       if (doUpdateUpgrade) {
         showStep();
@@ -965,6 +1057,7 @@ async function doServiceDeployment(): Promise<void> {
       for (let i = 0; i < 2; ++i) {
         try {
           await install('forever', true, false, i > 0);
+          break;
         }
         catch {
           if (i > 0)
@@ -1041,8 +1134,10 @@ async function doServiceDeployment(): Promise<void> {
       showStep();
       write('Press any key to stop reboot:' + trailingSpace);
 
-      if (!(await sleep(3000, spin, true)))
+      if (!(await sleep(5000, spin, true))) {
+        console.log();
         exec('reboot');
+      }
       else
         console.log();
     }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "scripts": {