packaging for 0.3

Author: cwilling

Makefile

@@ -5,7 +5,9 @@ TEST_FILES = test-status.js \
 		src/scripts/modules/cpuinfo.js \
 		src/scripts/modules/sainsmartrelay.js
 
-DESTDIR = /
+DESTDIR ?=
+
+PKGVERSION ?= 0.3
 
 # Where any app files are installed
 RUNDIR = /usr/share/brewable
@@ -16,9 +18,18 @@ USER = pi
 # Where daemon log files will be
 LOGDIR = /var/log/brewable
 
+# PID file
+PIDFILE = /var/run/brewable/pid
+
+# Default server port
+PORT = 8888
+
+# Default interval (seconds) between checking job progress
+INTERVAL = 60
+
 
 
-build: default.conf client server
+default: brewable
 
 
 test: test.js
@@ -29,45 +40,60 @@ default.conf:	default.conf.in
 		-e 's:%RUNDIR%:$(RUNDIR):' \
 		-e 's:%USER%:$(USER):' \
 		-e 's:%LOGDIR%:$(LOGDIR):' \
+		-e 's:%PIDFILE%:$(PIDFILE):' \
+		-e 's:%PORT%:$(PORT):' \
+		-e 's:%INTERVAL%:$(INTERVAL):' \
 		> default.conf
 
 node_modules:
 	npm install
 
-#client: node_modules
-client:
+client: node_modules
 	./node_modules/.bin/rollup --config client.config.js
+	touch client
 
 test.js: $(TEST_FILES)
 	./node_modules/.bin/rollup --config test.config.js
 	chmod a+x test.js
 
-#server: node_modules
-server:
+server: node_modules src/scripts/brewable.js
 	patch -p0 < websocket-no-binaries.diff
 	./node_modules/.bin/rollup --config server.config.js
 	patch -p0 -R < websocket-no-binaries.diff
 	chmod a+x build/js/brewableserverbundle.js
+	touch server
 
 
-brewable: server client
+brewable: server client makeself.make
 	./makeself.make
 
-install: build brewable
+install: brewable default.conf
 	mkdir -p $(DESTDIR)/etc/default
 	mkdir -p $(DESTDIR)/etc/init.d
 	mkdir -p $(DESTDIR)/usr/bin
 	install -m 0755 brewable $(DESTDIR)/usr/bin
 	install -m 0644 default.conf $(DESTDIR)/etc/default/brewable
 	install -m 0755 rcbrewable $(DESTDIR)/etc/init.d/brewable
-	bash -c './postinst configure'
+#	bash -c './postinst configure'
+
+uninstall:
+	rm $(DESTDIR)/etc/default/brewable
+	rm $(DESTDIR)/etc/init.d/brewable
+	rm $(DESTDIR)/usr/bin/brewable
+
+pkg:	brewable default.conf rcbrewable
+	rm -rf brewable-$(PKGVERSION); mkdir -p brewable-$(PKGVERSION);
+	install -m 0755 brewable brewable-$(PKGVERSION)
+	install -m 0755 default.conf brewable-$(PKGVERSION)
+	install -m 0755 rcbrewable brewable-$(PKGVERSION)
+	install -m 0755 Makefile brewable-$(PKGVERSION)
+	tar cvf brewable-$(PKGVERSION)-armv61-1.tar.gz brewable-$(PKGVERSION)
+	
 
 clean:
-	rm -f default.conf
-	rm -rf build
-	rm -f test.js
+	rm -rf default.conf test.js brewable-$(PKGVERSION)*
 
-distclean:
-	rm -rf node_modules
+distclean: clean
+	rm -rf node_modules brewable client server
 
-.PHONY: default.conf node_modules brewable test
+.PHONY:

client.config.js

@@ -19,7 +19,7 @@ export default {
   targets: [
     { dest: 'build/js/brewableclientbundle.js', format: 'iife' },
   ],
-  sourceMap: 'inline',
+  sourceMap: 'none',
   plugins: [
     progress({
       clearLine: true // default: true

default.conf.in

@@ -2,3 +2,6 @@
 BREWABLE_RUN_DIR=%RUNDIR%
 BREWABLE_USER=%USER%
 BREWABLE_LOG_DIR=%LOGDIR%
+BREWABLE_PID_FILE=%PIDFILE%
+BREWABLE_PORT=%PORT%
+BREWABLE_JOBCHECKINTERVAL=%INTERVAL%

makeself.make

@@ -2,16 +2,14 @@
 
 NODEEXE=$(which node)
 BREWTEMPDIR=`mktemp -d  /tmp/brewtemp.XXXXXX` || exit 1
-TARGET=build/brewable
-echo "Making self in $BREWTEMPDIR"
+TARGET=$(pwd)/brewable
 
 echo './node brewableserverbundle.js "$@"' > $BREWTEMPDIR/run.sh
 chmod a+x $BREWTEMPDIR/run.sh
 cp $NODEEXE $BREWTEMPDIR
-cp -p build/js/brewable* $BREWTEMPDIR
-makeself $BREWTEMPDIR $TARGET 0.7 ./run.sh
+cp -p build/js/brewable*.js $BREWTEMPDIR
+makeself --noprogress --nox11 $BREWTEMPDIR $TARGET 0.3 ./run.sh
 sed -i  -e 's/quiet="n"/quiet="y"/' \
-	-e 's/noprogress=n/noprogress=y/' \
 	$TARGET
 
 rm -rf $BREWTEMPDIR

rcbrewable

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2016 Christoph Willing (Brisbane, Australia)
+# Copyright (c) 2016-2017 Christoph Willing (Brisbane, Australia)
 # All rights reserved.
 #
 # Author: Christoph Willing, 2016
@@ -14,7 +14,7 @@
 # Default-Start:     3 5
 # Default-Stop:      0 1 2 6
 # Short-Description: brewable temperature controller daemon
-# Description:       The brewable daemon starts a tornado web server
+# Description:       The brewable daemon starts a nodejs web server
 #	enabling remote browser control of a temperature control system.
 #	We want it to be active in runlevels 3 and 5,
 #	as these are the runlevels with the network available.
@@ -31,31 +31,55 @@ test -r $BREWABLE_CONFIG || { echo "$BREWABLE_CONFIG not found";
 . $BREWABLE_CONFIG
 
 # Check for server file
-BREWABLE_SERVER=$BREWABLE_RUN_DIR/brewable
+BREWABLE_SERVER=/usr/bin/brewable
 test -x $BREWABLE_SERVER || { echo "$BREWABLE_SERVER not installed";
 	if [ "$1" = "stop" ]; then exit 0;
 	else exit 5; fi; }
 
 brewable_start () {
     echo "Starting brewable"
+
+    # Ensure the pid can be written by the application
+    PIDDIR=$(dirname $BREWABLE_PID_FILE)
+    mkdir -p $PIDDIR 
+    chown $BREWABLE_USER $PIDDIR
+
+    # Ensure logs can be written somewhere
     mkdir -p $BREWABLE_LOG_DIR
     touch /var/log/brewable/brewable_stdout.log
     touch /var/log/brewable/brewable_stderr.log
     chown -R $BREWABLE_USER:$BREWABLE_USER $BREWABLE_LOG_DIR
+
+    mkdir -p BREWABLE_RUN_DIR
     cd $BREWABLE_RUN_DIR
-    su -c $BREWABLE_SERVER $BREWABLE_USER \
+    su -c \
+        $BREWABLE_SERVER \
+        $BREWABLE_USER \
+        -- \
+        port=$BREWABLE_PORT \
+        interval=$BREWABLE_JOBCHECKINTERVAL \
             1>/var/log/brewable/brewable_stdout.log \
             2>/var/log/brewable/brewable_stderr.log \
             &
 }
 
 brewable_stop () {
     echo "Stopping brewable"
-    ps -ef \
-        | grep -v grep \
-        | grep "python $BREWABLE_SERVER" \
-        | awk '{print $2}' \
-        | xargs kill
+
+    pid=$(cat $BREWABLE_PID_FILE)
+    case $pid in
+        ''|*[!0-9]*)
+            ps -ef \
+                | grep -v grep \
+                | grep "node brewable" \
+                | awk '{print $2}' \
+                | xargs kill -HUP
+            ;;
+
+        *)
+            kill -HUP $pid
+            ;;
+    esac
 }
 
 case "$1" in

src/scripts/brewable.js

@@ -1,15 +1,5 @@
 
-//var events = require('events');
-//import events from 'events';
-
-//var server = require("./modules/server");
-//var router = require("./modules/router");
-//var requestHandlers = require("./modules/requestHandlers");
-//var Queue = require("./modules/queue.js");
-//var gpioworker = require("./modules/gpioworker");
-
 import start from "./modules/server";
-//import router from "./modules/router";
 import route from "./modules/router";
 import { index as rhindex } from "./modules/requestHandlers";
 import { favicon as rhfavicon } from "./modules/requestHandlers";
@@ -18,6 +8,19 @@ import { ws as rhws } from "./modules/requestHandlers";
 import Queue from "./modules/queue";
 import { gpioWorker as gpioworker } from "./modules/gpioworker";
 
+var fs = require("fs");
+var path = require("path");
+
+var DEFAULT_PORT = 8888;
+var DEFAULT_JOBCHECK_INTERVAL = 60;
+var PIDDIR = "/var/run/brewable";
+
+
+console.log("pid=" + process.pid);
+if (fs.existsSync(PIDDIR)) {
+  process.umask(0);
+  fs.writeFile(path.join(PIDDIR, "pid"), process.pid.toString(), {mode:parseInt('0644',8)});
+}
 
 // Command line options
 var options = {};
@@ -28,7 +31,7 @@ process.argv.forEach((val) => {
     var opt = val.split('=');
     options[opt[0]] = opt[1];
   }
-  if (val == "help") {
+  if (val == "help" || val == "--help") {
     showUsage();
     process.exit();
   }
@@ -37,31 +40,30 @@ process.argv.forEach((val) => {
 if ("port" in options) {
   options.port = parseInt(options.port);
 } else {
-  options.port = 8888;
+  options.port = DEFAULT_PORT;
 }
-//console.log("options: " + JSON.stringify(options));
 
 if ("interval" in options) {
   options.jobCheckInterval = parseInt(options.interval);
 } else {
-  options.jobCheckInterval = 30; // seconds
+  options.jobCheckInterval = DEFAULT_JOBCHECK_INTERVAL; // seconds
 }
-//console.log("options: " + JSON.stringify(options));
 
 function showUsage() {
   console.log("\nUsage:");
-  console.log("    brewable [options]");
+  console.log("    \x1b[4mbrewable [options]\x1b[0m");
   console.log("\nOptions:");
-  console.log("    port=<n>");
+  console.log("    \x1b[4mport=<n>\x1b[0m");
   console.log("    where <n> is a valid port number (default is 8888)");
-  console.log("\n    interval=<n>");
+  console.log("\n    \x1b[4minterval=<n>\x1b[0m");
   console.log("    where <n> is the interval, in seconds, between processings of current jobs");
-  console.log("    (default is 60)");
+  console.log("    (default is " + DEFAULT_JOBCHECK_INTERVAL + ")");
+  console.log("\n    \x1b[4mhelp\x1b[0m");
+  console.log("    show this usage message.");
   console.log("\nExample:");
   console.log("    brewable port=8686 interval=30\n");
 }
 
-//global.eventEmitter = new events.EventEmitter();
 import { eventEmitter } from "./modules/gpioworker";
 var clients = [];
 
@@ -86,8 +88,6 @@ var messageWaiting = function () {
 };
 
 var input_queue = new Queue({'name':'input_queue','interval':200, 'action':messageWaiting});
-//var output_queue = new Queue({'name':'output_queue'});
-//var output_queue = new Queue({'action':function(){console.log("SOME action!");}});
 var output_queue = new Queue({'name':'output_queue', 'action':updateClients});
 
 
@@ -109,19 +109,18 @@ input_queue.start();
 output_queue.start();
 start(route, handle, clients, input_queue, options);
 
+/* millseconds i.e.
+  10000 = 10s
+  30000 = 30s
+*/
 setInterval( function() {
   //console.log("\nDoing device updates");
   worker.updateDevices();
 }, 2000);
 
-/* millseconds i.e.
-  10000 = 10s
-  30000 = 30s
-*/
 setInterval( function() {
-  console.log("jobCheckInterval = " + new Date());
+  //console.log("jobCheckInterval = " + new Date());
   worker.processRunningJobs();
-//}, (30000 + Math.floor((Math.random() * 1000) + 1)));
 }, ((1000 * options.jobCheckInterval) + Math.floor((Math.random() * 1000) + 1)));
 
 process.on('SIGHUP', () => {
@@ -141,5 +140,4 @@ process.on('SIGTERM', () => {
 });
 
 
-
 /* ex:set ai shiftwidth=2 inputtab=spaces smarttab noautotab: */

src/scripts/modules/gpioworker.js

@@ -545,7 +545,7 @@ gpioWorker.prototype.setupJobRun = function (options) {
 };
 
 gpioWorker.prototype.processRunningJobs = function () {
-  console.log("processRunningJobs()");
+  //console.log("processRunningJobs()");
   //this.runningJobs.forEach( function (job, index) {
   this.runningJobs.forEach( function (job) {
     //console.log("Process job: " + index + " (" + job.jobName + ")");

test-status.js

@@ -1,4 +1,6 @@
-//import { default as gpio } from './src/scripts/modules/jsogpio';
+import { default as gpio } from './src/scripts/modules/jsogpio';
+
+console.log("pid=" + process.pid);
 
 var options = {};
 process.argv.forEach((val, index) => {