Skip to content

Commit

Permalink
Allow project to be developed on Windows and non-Raspbian Linux
Browse files Browse the repository at this point in the history 
* Support for Windows development.
* Support for non-Raspbian Linux development.
* Improved build process, including optional automatic deployment of code on Raspberry Pi.
* Fix Firefox SVG problems.
* Add ability to proxy temperature/humidity sensor data.
  • Loading branch information
@kshetline
kshetline authored Mar 6, 2020
1 parent 0701227 commit cf53588
Show file tree
Hide file tree
Showing 21 changed files with 450 additions and 241 deletions.
79 changes: 47 additions & 32 deletions README.md
View file

Large diffs are not rendered by default.

149 changes: 117 additions & 32 deletions build.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as chalk from 'chalk';
import { ChildProcess, spawn } from 'child_process';
import * as Chalk from 'chalk';
import { ChildProcess, spawn as nodeSpawn } from 'child_process';
import * as copyfiles from 'copyfiles';
import * as fs from 'fs';
import { processMillis } from './server/src/util';
Expand All @@ -13,70 +13,144 @@ const SPIN_DELAY = 100;
const MAX_SPIN_DELAY = 100;
const NO_OP = () => {};

const isWindows = (process.platform === 'win32');

let spinStep = 0;
let lastSpin = 0;
let npmInitDone = false;
let doAcu = false;
let doDht = false;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
let doGps = false;
let doWwvb = false;
let doI2c = false;
let doStdDeploy = false;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
let doWwvb = false;
let isRaspberryPi = false;

const chalk = new Chalk.Instance();
let canSpin = true;
let backspace = '\x08';
let trailingSpace = ' '; // Two spaces

if (process.platform === 'linux') {
try {
if (fs.existsSync('/proc/cpuinfo')) {
const lines = fs.readFileSync('/proc/cpuinfo').toString().split('\n');

for (const line of lines) {
if (/\bModel\s*:\s*Raspberry Pi\b/i.test(line)) {
isRaspberryPi = true;
break;
}
}
}
}
catch (err) {
console.error(chalk.red('Raspberry Pi check failed'));
}
}

// Remove extraneous command line args, if present.
if (/[/\\]ts-node(?:\.cmd)?$/.test(process.argv[0] ?? ''))
if (/\bts-node\b/.test(process.argv[0] ?? ''))
process.argv.splice(0, 1);

if (/[/\\]build\.ts$/.test(process.argv[0] ?? ''))
if (/\bbuild\.ts\b/.test(process.argv[0] ?? ''))
process.argv.splice(0, 1);

if (process.argv.length === 0 && isRaspberryPi) {
console.warn(chalk.yellow('Warning: no build options specified.'));
console.warn(chalk.yellow('This could be OK, or this could mean you forgot the leading ') +
chalk.white('--') + chalk.yellow(' before your options.'));
}

process.argv.forEach(arg => {
if (arg === '--acu')
doAcu = true;
else if (arg === '--dht')
doDht = true;
else if (arg === '--gps')
doGps = doI2c = true;
else if (arg === '--pt') {
canSpin = false;
chalk.level = 0;
backspace = '';
trailingSpace = ' ';
}
else if (arg === '--sd')
doStdDeploy = true;
else if (arg === '--wwvb')
doWwvb = doI2c = true;
else {
if (arg !== '--help')
console.error('Unrecognized option "' + chalk.red(arg) + '"');

console.log('Usage: npm run build [-- [--acu] [--dht] [--gps] [--help] [--wwvb]]');
console.log('Usage: npm run build [-- [--acu] [--dht] [--help] [--pt] [--sd]]');
process.exit(0);
}
});

process.stdout.write(('' + doAcu + doGps + doWwvb).substr(0, 0));
if (doStdDeploy && !isRaspberryPi) {
console.error(chalk.red('--sd option is only valid on Raspberry Pi'));
process.exit(0);
}

function spawn(command: string, args: string[] = [], options?: any): ChildProcess {
if (isWindows) {
const cmd = process.env.comspec || 'cmd';

return nodeSpawn(cmd, ['/c', command, ...args], options);
}
else
return nodeSpawn(command, args, options);
}

function spin(): void {
const now = processMillis();

if (lastSpin < now - SPIN_DELAY) {
lastSpin = now;
process.stdout.write('\x08' + SPIN_CHARS.charAt(spinStep));
process.stdout.write(backspace + SPIN_CHARS.charAt(spinStep));
spinStep = (spinStep + 1) % 4;
}
}

function monitorProcess(proc: ChildProcess, doSpin = true): Promise<string> {
let errors = '';
let output = '';

doSpin = doSpin && canSpin;

return new Promise<string>((resolve, reject) => {
const slowSpin = setInterval(doSpin ? spin : NO_OP, MAX_SPIN_DELAY);

proc.stderr.on('data', doSpin ? spin : NO_OP);
proc.stderr.on('data', data => {
(doSpin ? spin : NO_OP)();
data = data.toString();
// This gets confusing, because a lot of non-error progress messaging goes to stderr, and the
// webpack process doesn't exit with an error for compilation errors unless you make it do so.
if (/\[webpack.Progress]/.test(data))
return;

errors += data;
});
proc.stdout.on('data', data => {
output += data.toString();
(doSpin ? spin : NO_OP)();
data = data.toString();
output += data;
errors = '';
});
proc.on('error', err => {
clearInterval(slowSpin);
reject(err);
});
proc.on('close', () => {
clearInterval(slowSpin);
resolve(output);

if (errors && (/\b(error|exception)\b/i.test(errors) || /[_0-9a-z](Error|Exception)\b/.test(errors)))
reject(errors);
else
resolve(output);
});
});
}
Expand Down Expand Up @@ -108,56 +182,67 @@ async function npmInit(): Promise<void> {
(async () => {
try {
console.log(chalk.cyan('Starting build...'));

process.stdout.write('Updating client ');
process.stdout.write('Updating client' + trailingSpace);
await monitorProcess(spawn('npm', ['--dev', 'update']));
console.log('\x08' + chalk.green(CHECK_MARK));
console.log(backspace + chalk.green(CHECK_MARK));

process.stdout.write('Building client ');
process.stdout.write('Building client' + trailingSpace);
if (fs.existsSync('dist'))
await monitorProcess(spawn('rm', ['-Rf', 'dist']));
let output = await monitorProcess(spawn('webpack'));
console.log('\x08' + chalk.green(CHECK_MARK));
console.log(backspace + chalk.green(CHECK_MARK));
console.log(chalk.hex('#808080')(getWebpackSummary(output)));

process.stdout.write('Updating server ');
process.stdout.write('Updating server' + trailingSpace);
await monitorProcess(spawn('npm', ['--dev', 'update'], { cwd: path.join(__dirname, 'server') }));
console.log('\x08' + chalk.green(CHECK_MARK));
console.log(backspace + chalk.green(CHECK_MARK));

process.stdout.write('Building server ');
process.stdout.write('Building server' + trailingSpace);
if (fs.existsSync('server/dist'))
await monitorProcess(spawn('rm', ['-Rf', 'server/dist']));
output = await monitorProcess(spawn('npm', ['run', 'build'], { cwd: path.join(__dirname, 'server') }));
console.log('\x08' + chalk.green(CHECK_MARK));
output = await monitorProcess(spawn('npm', ['run', isWindows ? 'build-win' : 'build'], { cwd: path.join(__dirname, 'server') }));
console.log(backspace + chalk.green(CHECK_MARK));
console.log(chalk.hex('#808080')(getWebpackSummary(output)));

if (doAcu) {
process.stdout.write('Adding Acu-Rite wireless temperature/humidity sensor support ');
process.stdout.write('Adding Acu-Rite wireless temperature/humidity sensor support' + trailingSpace);
await npmInit();
await monitorProcess(spawn('npm', ['i', 'rpi-acu-rite-temperature'], { cwd: path.join(__dirname, 'server', 'dist') }));
console.log('\x08' + chalk.green(CHECK_MARK));
await monitorProcess(spawn('npm', ['i', 'rpi-acu-rite-temperature@2.x'], { cwd: path.join(__dirname, 'server', 'dist') }));
console.log(backspace + chalk.green(CHECK_MARK));
}

if (doDht) {
process.stdout.write('Adding DHT wired temperature/humidity sensor support ');
process.stdout.write('Adding DHT wired temperature/humidity sensor support' + trailingSpace);
await npmInit();
await monitorProcess(spawn('npm', ['i', 'node-dht-sensor'], { cwd: path.join(__dirname, 'server', 'dist') }));
console.log('\x08' + chalk.green(CHECK_MARK));
await monitorProcess(spawn('npm', ['i', 'node-dht-sensor@0.4.x'], { cwd: path.join(__dirname, 'server', 'dist') }));
console.log(backspace + chalk.green(CHECK_MARK));
}

if (doI2c) {
process.stdout.write('Adding I²C serial bus support ');
process.stdout.write('Adding I²C serial bus support' + trailingSpace);
await npmInit();
await monitorProcess(spawn('npm', ['i', 'i2c-bus'], { cwd: path.join(__dirname, 'server', 'dist') }));
console.log('\x08' + chalk.green(CHECK_MARK));
console.log(backspace + chalk.green(CHECK_MARK));
}

process.stdout.write('Copying server to top-level dist directory ');
process.stdout.write('Copying server to top-level dist directory' + trailingSpace);
await (promisify(copyfiles) as any)(['server/dist/**/*', 'dist/'], { up: 2 });
console.log('\x08' + chalk.green(CHECK_MARK));
console.log(backspace + chalk.green(CHECK_MARK));

if (doStdDeploy) {
process.stdout.write('Moving server to ~/weather directory' + trailingSpace);

if (!fs.existsSync(process.env.HOME + '/weather'))
fs.mkdirSync(process.env.HOME + '/weather');
else
await monitorProcess(spawn('rm', ['-Rf', '~/weather/*'], { shell: true }));

await monitorProcess(spawn('mv', ['dist/*', '~/weather'], { shell: true }));
console.log(backspace + chalk.green(CHECK_MARK));
}
}
catch (err) {
console.log('\x08' + chalk.red(FAIL_MARK));
console.log(backspace + chalk.red(FAIL_MARK));
console.error(err);
}
})();
58 changes: 29 additions & 29 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit cf53588

Please sign in to comment.