remove reference to helper script

more trouble than it's worth

CMakeLists.txt

@@ -85,9 +85,21 @@ generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue-router.min.js js/vue.min.js
     js/ansi_up.js js/Chart.min.js css/bootstrap.min.css)
 # (see resources.cpp where these are fetched)
 
+set(LAMINARD_CORE_SOURCES
+    src/database.cpp
+    src/server.cpp
+    src/laminar.cpp
+    src/conf.cpp
+    src/http.cpp
+    src/resources.cpp
+    src/rpc.cpp
+    src/run.cpp
+    laminar.capnp.c++
+    index_html_size.h
+)
+
 ## Server
-add_executable(laminard src/database.cpp src/main.cpp src/server.cpp src/laminar.cpp
-    src/conf.cpp src/resources.cpp src/run.cpp laminar.capnp.c++ ${COMPRESSED_BINS} index_html_size.h)
+add_executable(laminard ${LAMINARD_CORE_SOURCES} src/main.cpp ${COMPRESSED_BINS})
 target_link_libraries(laminard capnp-rpc capnp kj-http kj-async kj pthread sqlite3 z)
 
 ## Client
@@ -99,8 +111,8 @@ set(BUILD_TESTS FALSE CACHE BOOL "Build tests")
 if(BUILD_TESTS)
     find_package(GTest REQUIRED)
     include_directories(${GTEST_INCLUDE_DIRS} src)
-    add_executable(laminar-tests src/conf.cpp src/database.cpp src/laminar.cpp src/run.cpp src/server.cpp laminar.capnp.c++ src/resources.cpp ${COMPRESSED_BINS} test/test-conf.cpp test/test-database.cpp test/test-laminar.cpp test/test-run.cpp test/test-server.cpp)
-    target_link_libraries(laminar-tests ${GTEST_BOTH_LIBRARIES} gmock capnp-rpc capnp kj-http kj-async kj pthread sqlite3 z)
+    add_executable(laminar-tests ${LAMINARD_CORE_SOURCES} ${COMPRESSED_BINS} test/main.cpp test/laminar-functional.cpp test/unit-conf.cpp test/unit-database.cpp test/unit-run.cpp)
+    target_link_libraries(laminar-tests ${GTEST_LIBRARY} capnp-rpc capnp kj-http kj-async kj pthread sqlite3 z)
 endif()
 
 set(SYSTEMD_UNITDIR lib/systemd/system CACHE PATH "Path to systemd unit files")

README.md

@@ -10,7 +10,16 @@ See [the website](https://laminar.ohwg.net) and the [documentation](https://lami
 
 ## Building from source
 
-First install development packages for `capnproto (version 0.7.0 or newer)`, `rapidjson`, `sqlite` and `boost` (for the header-only `multi_index_container` library) from your distribution's repository or other source. Then:
+First install development packages for `capnproto (version 0.7.0 or newer)`, `rapidjson`, `sqlite` and `boost` (for the header-only `multi_index_container` library) from your distribution's repository or other source.
+
+On Debian Buster, this can be done with:
+
+```bash
+sudo apt install \
+		 capnproto cmake g++ libboost-dev libcapnp-dev libsqlite-dev libsqlite3-dev make rapidjson-dev zlib1g-dev
+```
+
+Then compile and install laminar with:
 
 ```bash
 git clone https://github.com/ohwgiles/laminar.git
@@ -22,3 +31,6 @@ sudo make install
 
 `make install` includes a systemd unit file. If you intend to use it, consider creating a new user `laminar` or modifying the user specified in the unit file.
 
+## Packaging for distributions
+
+The `pkg` directory contains shell scripts which use docker to build native packages (deb,rpm) for common Linux distributions. Note that these are very simple packages which may not completely conform to the distribution's packaging guidelines, however they may serve as a starting point for creating an official package, or may be useful if the official package lags.

UserManual.md

@@ -43,6 +43,33 @@ Both install packages will create a new `laminar` user and install (but not acti
 
 See the [development README](https://github.com/ohwgiles/laminar) for instructions for installing from source.
 
+## Building for Docker
+
+You can build an image that runs `laminard` by default, and contains `laminarc` for use based on `alpine:edge` using the `Dockerfile` in the `docker/` directory.
+
+```bash
+# from the repository root:
+docker build [-t image:tag] -f docker/Dockerfile .
+```
+
+Keep in mind that this is meant to be used as a base image to build from, so it contains only the minimum packages required to run laminar. The only shell available by default is sh and it does not even have ssh or git. You can use this image to run a basic build server, but it is recommended that you build a custom image from this base to better suit your needs.
+
+The container will execute `laminard` by default. To start a laminar server with docker you can simply run the image as a daemon.
+
+```bash
+docker run -d --name laminar_server -p 8080:8080 [-v laminardir|laminar.conf] laminar:latest
+```
+
+You can customize laminar and persist your data by mounting your laminar directory to `/var/lib/laminar` and/or mounting a custom configuration file to `/etc/laminar.conf`.
+
+Executing `laminarc` may be done in any of the usual ways, for example:
+
+```bash
+docker exec -i laminar_server laminarc queue example_task
+```
+
+Alternatively, you might [use an external `laminarc`](#Triggering-on-a-remote-laminar-instance).
+
 ---
 
 # Service configuration
@@ -61,20 +88,14 @@ Do not attempt to run laminar on port 80. This requires running as `root`, and L
 
 ## Running behind a reverse proxy
 
-Laminar relies on WebSockets to provide a responsive, auto-updating display without polling. This may require extra support from your frontend webserver.
+A reverse proxy is required if you want Laminar to share a port with other web services. It is also recommended to improve performance by serving artefacts directly or providing a caching layer for static assets.
 
-For nginx, see [NGINX Reverse Proxy](https://www.nginx.com/resources/admin-guide/reverse-proxy/) and [WebSocket proxying](http://nginx.org/en/docs/http/websocket.html).
+If you use [artefacts](#Archiving-artefacts), note that Laminar is not designed as a file server, and better performance will be achieved by allowing the frontend web server to serve the archive directory directly (e.g. using a `Location` directive).
 
-For Apache, see [Apache Reverse Proxy](https://httpd.apache.org/docs/2.4/howto/reverse_proxy.html) and [mod_proxy_wstunnel](https://httpd.apache.org/docs/2.4/mod/mod_proxy_wstunnel.html).
-
-If you use [artefacts](#Archiving-artefacts), note that Laminar is not designed as a file server, and better performance will be achieved by allowing the frontend web server to directly serve the archive directory directly (e.g. using a `Location` directive).
+Laminar uses Sever Sent Events to provide a responsive, auto-updating display without polling. Most frontend webservers should handle this without any extra configuration.
 
 If you use a reverse proxy to host Laminar at a subfolder instead of a subdomain root, the `<base href>` needs to be updated to ensure all links point to their proper targets. This can be done by setting `LAMINAR_BASE_URL` in `/etc/laminar.conf`.
 
-## Set the page title
-
-Change `LAMINAR_TITLE` in `/etc/laminar.conf` to your preferred page title. For further WebUI customization, consider using a [custom style sheet](#Customizing-the-WebUI).
-
 ## More configuration options
 
 See the [reference section](#Service-configuration-file)
@@ -414,7 +435,7 @@ echo Initializing workspace
 git clone git@example.com:company/project.git .
 ```
 
-**CAUTION**: By default, laminar permits multiple simultaneous runs of the same job. If a job can **modify** the workspace, this might result in inconsistent builds when simultaneous runs access the same content. This is unlikely to be an issue for nightly builds, but for SCM-triggered builds it will be. To solve this, use [nodes](#Nodes-and-Tags) to restrict simultaneous execution of jobs, or consider [flock](https://linux.die.net/man/1/flock).
+**CAUTION**: By default, laminar permits multiple simultaneous runs of the same job. If a job can **modify** the workspace, this might result in inconsistent builds when simultaneous runs access the same content. This is unlikely to be an issue for nightly builds, but for SCM-triggered builds it will be. To solve this, use [contexts](#Contexts) to restrict simultaneous execution of jobs, or consider [flock](https://linux.die.net/man/1/flock).
 
 The following example uses [flock](https://linux.die.net/man/1/flock) to efficiently share a git repository workspace between multiple simultaneous builds:
 
@@ -465,62 +486,71 @@ TIMEOUT=120
 
 ---
 
-# Nodes and Tags
+# Contexts
 
-In Laminar, a *node* is an abstract concept allowing more fine-grained control over job execution scheduling. Each node can be defined to support an integer number of *executors*, which defines how many runs can be executed simultaneously.
+In Laminar, each run of a job is associated with a context. The context defines an integer number of *executors*, which is the amount of runs which the context will accept simultaneously. A context may also provide additional environment variables.
 
-A typical example would be to allow only a few concurrent CPU-intensive jobs (such as compilation), while simultaneously allowing many more less-intensive jobs (such as monitoring or remote jobs). To create a node named `build` with 3 executors, create the file `/var/lib/laminar/cfg/nodes/build.conf` with the following content:
+Uses for this feature include limiting the amount of concurrent CPU-intensive jobs (such as compilation); and controlling access to jobs [executed remotely](#Remote-jobs).
+
+If no contexts are defined, Laminar will behave as if there is a single context named "default", with `6` executors. This is a reasonable default that allows simple setups to work without any consideration of contexts.
+
+## Defining a context
+
+To create a context named "my-env" which only allows a single run at once, create `/var/lib/laminar/cfg/contexts/my-env.conf` with the content:
 
 ```
-EXECUTORS=3
+EXECUTORS=1
 ```
 
-To associate jobs with nodes, laminar uses *tags*. Tags may be applied to nodes and jobs. If a node has tags, only jobs with a matching tag will be executed on it. If a node has no tags, it will accept any job. To tag a node, add them to `/var/lib/laminar/cfg/nodes/NODENAME.conf`:
+## Associating a job with a context
+
+When trying to start a job, laminar will wait until the job can be matched to a context which has at least one free executor. You can define which contexts the job will associate with by setting, for example,
 
 ```
-EXECUTORS=3
-TAGS=tag1,tag2
+CONTEXTS=my-env-*,special_context
 ```
 
-To add a tag to a job, add the following to `/var/lib/laminar/cfg/jobs/JOBNAME.conf`:
+in `/var/lib/laminar/cfg/jobs/JOB.conf`. For each of the patterns in the comma-separated list `CONTEXTS`, Laminar will iterate over the known contexts and associate the run with the first context with free executors. Patterns are [glob expressions](http://man7.org/linux/man-pages/man7/glob.7.html).
+
+If `CONTEXTS` is empty or absent (or if `JOB.conf` doesn't exist), laminar will behave as if `CONTEXTS=default` were defined.
+
+## Adding environment to a context
+
+Append desired environment variables to `/var/lib/laminar/cfg/contexts/CONTEXT_NAME.conf`:
 
 ```
-TAGS=tag2
+DUT_IP=192.168.3.2
+FOO=bar
 ```
 
-If Laminar cannot find any node configuration, it will assume a single node with 6 executors and no tags.
+This environment will then be available the run script of jobs associated with this context.
+
+
+
 
 ## Grouping jobs with tags
 
 Tags are also used to group jobs in the web UI. Each tag will presented as a tab in the "Jobs" page.
 
-## Node scripts
-
-If `/var/lib/laminar/cfg/nodes/NODENAME.before` exists, it will be executed before the run script of a job scheduled to that node. Similarly, if `/var/lib/laminar/cfg/nodes/NODENAME.after` exists, it will be executed after the run script of a job scheduled to that node.
-
-## Node environment
-
-If `/var/lib/laminar/cfg/nodes/NODENAME.env` exists and can be parsed as a list of `KEY=VALUE` pairs, these variables will be exposed as part of the run's environment.
 
 # Remote jobs
 
-Laminar provides no specific support, `bash`, `ssh` and possibly NFS are all you need. For example, consider two identical target devices on which test jobs can be run in parallel. You might create a [node](#Nodes-and-Tags) for each, `/var/lib/laminar/cfg/nodes/target{1,2}.conf` with a common tag:
+Laminar provides no specific support, `bash`, `ssh` and possibly NFS are all you need. For example, consider two identical target devices on which test jobs can be run in parallel. You might create a [context](#Contexts) for each, `/var/lib/laminar/cfg/contexts/target{1,2}.conf`:
 
 ```
 EXECUTORS=1
-TAGS=remote-target
 ```
 
-In each node's `.env` file, set the individual device's IP address:
+In each context's `.env` file, set the individual device's IP address:
 
 ```
 TARGET_IP=192.168.0.123
 ```
 
-And tag the job accordingly in `/var/lib/laminar/cfg/jobs/myproject-test.conf`:
+And mark the job accordingly in `/var/lib/laminar/cfg/jobs/myproject-test.conf`:
 
 ```
-TAGS=remote-target
+CONTEXTS=target*
 ```
 
 This means the job script `/var/lib/laminar/cfg/jobs/myproject-test.run` can be generic:
@@ -556,6 +586,24 @@ EOF
 
 # Customizing the WebUI
 
+## Organising jobs into groups
+
+*Groups* may be used to organise the "Jobs" page into tabs. Edit `/var/lib/laminar/cfg/groups.conf` and define the matched jobs as a [javascript regular expression](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions), for example:
+
+```
+Builds=compile-\w+
+My Fav Jobs=^(target-foo-(build|deploy)|run-benchmarks)$
+All=.*
+```
+
+Changes to this file are detected immediately and will be visible on next page refresh.
+
+## Setting the page title
+
+Change `LAMINAR_TITLE` in `/etc/laminar.conf` to your preferred page title. Laminar must be restarted for this change to take effect.
+
+## Custom stylesheet
+
 If it exists, the file `/var/lib/laminar/custom/style.css` will be served by laminar and may be used to change the appearance of Laminar's WebUI.
 
 This directory is also a good place to add any extra assets needed for this customization, but note that in this case you will need to serve this directory directly from your [HTTP reverse proxy](#Service-configuration) (highly recommended).
@@ -589,15 +637,13 @@ Laminar will serve a job's current status as a pretty badge at the url `/badge/J
 
 ## Script execution order
 
-When `$JOB` is triggered on `$NODE`, the following scripts (relative to `$LAMINAR_HOME/cfg`) may be executed:
+When `$JOB` is triggered, the following scripts (relative to `$LAMINAR_HOME/cfg`) may be executed:
 
 - `jobs/$JOB.init` if the [workspace](#Data-sharing-and-Workspaces) did not exist
 - `before`
-- `nodes/$NODE.before`
 - `jobs/$JOB.before`
 - `jobs/$JOB.run`
 - `jobs/$JOB.after`
-- `nodes/$NODE.after`
 - `after`
 
 ## Environment variables
@@ -610,13 +656,14 @@ The following variables are available in run scripts:
 - `LAST_RESULT` string previous run status
 - `WORKSPACE` path to this job's workspace
 - `ARCHIVE` path to this run's archive
+- `CONTEXT` the context of this run
 
 In addition, `$LAMINAR_HOME/cfg/scripts` is prepended to `$PATH`. See [helper scripts](#Helper-scripts).
 
 Laminar will also export variables in the form `KEY=VALUE` found in these files:
 
 - `env`
-- `nodes/$NODE.env`
+- `contexts/$CONTEXT.env`
 - `jobs/$JOB.env`
 
 Finally, variables supplied on the command-line call to `laminarc queue`, `laminarc start` or `laminarc run` will be available. See [parameterized runs](#Parameterized-runs)

docker/Dockerfile

@@ -0,0 +1,45 @@
+FROM alpine:edge
+
+EXPOSE 8080
+
+LABEL org.label-schema.name="laminar" \
+      org.label-schema.description="Fast and lightweight Continuous Integration" \
+      org.label-schema.usage="/usr/doc/UserManual.md" \
+      org.label-schema.url="https://laminar.ohwg.net" \
+      org.label-schema.vcs-url="https://github.com/ohwgiles/laminar" \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.docker.cmd="docker run -d -p 8080:8080 laminar"
+
+RUN apk add --no-cache -X http://dl-3.alpinelinux.org/alpine/edge/testing/ \
+        sqlite-dev \
+        zlib \
+        capnproto \
+        tini
+
+ADD UserManual.md /usr/doc/
+
+ADD . /build/laminar
+
+RUN apk add --no-cache --virtual .build -X http://dl-3.alpinelinux.org/alpine/edge/testing/ \
+        build-base \
+        cmake \
+        capnproto-dev \
+        boost-dev \
+        zlib-dev \
+        rapidjson-dev && \
+    cd /build/laminar && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ && \
+    make -j4 && \
+    make install && \
+    apk del .build && \
+    rm -rf /build
+
+# Create laminar system user in "users" group
+RUN adduser -SDh /var/lib/laminar -g 'Laminar' -G users laminar
+# Set the working directory to the laminar user's home
+WORKDIR /var/lib/laminar
+# Run the preceeding as the user laminar
+USER laminar
+
+ENTRYPOINT [ "/sbin/tini", "--" ]
+CMD [ "laminard" ]

pkg/centos7-x86_64.sh

@@ -2,9 +2,9 @@
 
 OUTPUT_DIR=$PWD
 
-SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
+SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]})/..)
 
-VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty | tr - .)
+VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty | tr - .)~upstream_centos7
 
 DOCKER_TAG=$(docker build -q - <<EOS
 FROM centos:7
@@ -72,7 +72,7 @@ make
 %post
 echo Creating laminar user with home in %{_sharedstatedir}/laminar
 useradd -r -d %{_sharedstatedir}/laminar -s %{_sbindir}/nologin laminar
-mkdir -p %{_sharedstatedir}/laminar/cfg/{jobs,nodes,scripts}
+mkdir -p %{_sharedstatedir}/laminar/cfg/{jobs,contexts,scripts}
 chown -R laminar: %{_sharedstatedir}/laminar
 EOF
 

pkg/centos8-x86_64.sh

@@ -0,0 +1,78 @@
+#!/bin/bash -e
+
+OUTPUT_DIR=$PWD
+
+SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]})/..)
+
+VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty | tr - .)~upstream_centos8
+
+DOCKER_TAG=$(docker build -q - <<EOS
+FROM centos:8
+RUN dnf -y install rpm-build cmake make gcc-c++ wget sqlite-devel boost-devel zlib-devel
+EOS
+)
+
+docker run --rm -i -v $SOURCE_DIR:/root/rpmbuild/SOURCES/laminar-$VERSION:ro -v $OUTPUT_DIR:/output $DOCKER_TAG bash -xe <<EOS
+mkdir /build
+cd /build
+
+wget -O capnproto.tar.gz https://github.com/capnproto/capnproto/archive/v0.7.0.tar.gz
+wget -O rapidjson.tar.gz https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz
+md5sum -c <<EOF
+a9de5f042f4cf05515c2d7dfc7f5df21  capnproto.tar.gz
+badd12c511e081fec6c89c43a7027bce  rapidjson.tar.gz
+EOF
+
+tar xzf capnproto.tar.gz
+tar xzf rapidjson.tar.gz
+
+cd /build/capnproto-0.7.0/c++/
+cmake3 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=off .
+make -j4
+make install
+
+cd /build/rapidjson-1.1.0/
+cmake -DRAPIDJSON_BUILD_EXAMPLES=off .
+make install
+
+cd
+cat <<EOF > laminar.spec
+Summary: Lightweight Continuous Integration Service
+Name: laminar
+Version: $VERSION
+Release: 1
+License: GPL
+BuildRequires: systemd-units
+Requires: sqlite-libs zlib
+
+%description
+Lightweight Continuous Integration Service
+
+%prep
+
+%build
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ -DSYSTEMD_UNITDIR=%{_unitdir} %{_sourcedir}/laminar-$VERSION
+pwd
+make
+
+%install
+%make_install
+
+%files
+%{_bindir}/laminarc
+%{_bindir}/laminard
+%{_unitdir}/laminar.service
+%config(noreplace) %{_sysconfdir}/laminar.conf
+%{_datarootdir}/bash-completion/completions/laminarc
+%{_datarootdir}/zsh/site-functions/_laminarc
+
+%post
+echo Creating laminar user with home in %{_sharedstatedir}/laminar
+useradd -r -d %{_sharedstatedir}/laminar -s %{_sbindir}/nologin laminar
+mkdir -p %{_sharedstatedir}/laminar/cfg/{jobs,contexts,scripts}
+chown -R laminar: %{_sharedstatedir}/laminar
+EOF
+
+rpmbuild -ba laminar.spec
+mv rpmbuild/RPMS/x86_64/laminar-$VERSION-1.x86_64.rpm /output/
+EOS

pkg/debian10-amd64.sh

@@ -0,0 +1,48 @@
+#!/bin/bash -e
+
+OUTPUT_DIR=$PWD
+
+SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]})/..)
+
+VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)-1~upstream-debian10
+
+DOCKER_TAG=$(docker build -q - <<EOS
+FROM debian:10-slim
+RUN apt-get update && apt-get install -y wget cmake g++ capnproto libcapnp-dev rapidjson-dev libsqlite3-dev libboost-dev zlib1g-dev
+EOS
+)
+
+docker run --rm -i -v $SOURCE_DIR:/laminar:ro -v $OUTPUT_DIR:/output $DOCKER_TAG bash -xe <<EOS
+
+mkdir /build
+cd /build
+
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ -DZSH_COMPLETIONS_DIR=/usr/share/zsh/functions/Completion/Unix /laminar
+make -j4
+mkdir laminar
+make DESTDIR=laminar install/strip
+
+mkdir laminar/DEBIAN
+cat <<EOF > laminar/DEBIAN/control
+Package: laminar
+Version: $VERSION
+Section: 
+Priority: optional
+Architecture: amd64
+Maintainer: Oliver Giles <web ohwg net>
+Depends: libcapnp-0.7.0, libsqlite3-0, zlib1g
+Description: Lightweight Continuous Integration Service
+EOF
+echo /etc/laminar.conf > laminar/DEBIAN/conffiles
+cat <<EOF > laminar/DEBIAN/postinst
+#!/bin/bash
+echo Creating laminar user with home in /var/lib/laminar
+useradd -r -d /var/lib/laminar -s /usr/sbin/nologin laminar
+mkdir -p /var/lib/laminar/cfg/{jobs,contexts,scripts}
+chown -R laminar: /var/lib/laminar
+EOF
+chmod +x laminar/DEBIAN/postinst
+
+dpkg-deb --build laminar
+mv laminar.deb /output/laminar_${VERSION}_amd64.deb
+EOS

pkg/debian10-armhf.sh

@@ -0,0 +1,63 @@
+#!/bin/bash -e
+
+OUTPUT_DIR=$PWD
+
+SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]})/..)
+
+VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)-1~upstream-debian10
+
+DOCKER_TAG=$(docker build -q - <<EOS
+FROM debian:10-slim
+RUN dpkg --add-architecture armhf && apt-get update && apt-get install -y wget cmake crossbuild-essential-armhf capnproto libcapnp-dev:armhf rapidjson-dev libsqlite3-dev:armhf libboost-dev:armhf zlib1g-dev:armhf
+EOS
+)
+
+docker run --rm -i -v $SOURCE_DIR:/laminar:ro -v $OUTPUT_DIR:/output $DOCKER_TAG bash -xe <<EOS
+
+mkdir /build
+cd /build
+
+cat > toolchain.cmake <<EOF
+SET(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
+SET(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
+set(CMAKE_LIBRARY_ARCHITECTURE arm-linux-gnueabihf)
+EOF
+
+cd /build
+cmake \
+	-DCMAKE_TOOLCHAIN_FILE=toolchain.cmake \
+	-DCMAKE_LINKER=/usr/bin/arm-linux-gnueabihf-ld \
+	-DCMAKE_OBJCOPY=/usr/bin/arm-linux-gnueabihf-objcopy \
+	-DCMAKE_STRIP=/usr/bin/arm-linux-gnueabihf-strip \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_INSTALL_PREFIX=/ \
+	-DZSH_COMPLETIONS_DIR=/usr/share/zsh/functions/Completion/Unix \
+	/laminar
+make -j4
+mkdir laminar
+make DESTDIR=laminar install/strip
+
+mkdir laminar/DEBIAN
+cat <<EOF > laminar/DEBIAN/control
+Package: laminar
+Version: $VERSION
+Section: 
+Priority: optional
+Architecture: armhf
+Maintainer: Oliver Giles <web ohwg net>
+Depends: libcapnp-0.7.0, libsqlite3-0, zlib1g
+Description: Lightweight Continuous Integration Service
+EOF
+echo /etc/laminar.conf > laminar/DEBIAN/conffiles
+cat <<EOF > laminar/DEBIAN/postinst
+#!/bin/bash
+echo Creating laminar user with home in /var/lib/laminar
+useradd -r -d /var/lib/laminar -s /usr/sbin/nologin laminar
+mkdir -p /var/lib/laminar/cfg/{jobs,contexts,scripts}
+chown -R laminar: /var/lib/laminar
+EOF
+chmod +x laminar/DEBIAN/postinst
+
+dpkg-deb --build laminar
+mv laminar.deb /output/laminar_${VERSION}_armhf.deb
+EOS

pkg/debian9-amd64.sh

@@ -2,9 +2,9 @@
 
 OUTPUT_DIR=$PWD
 
-SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
+SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]})/..)
 
-VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)
+VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)-1~upstream-debian9
 
 DOCKER_TAG=$(docker build -q - <<EOS
 FROM debian:9-slim
@@ -53,15 +53,16 @@ Maintainer: Oliver Giles <web ohwg net>
 Depends: libsqlite3-0, zlib1g
 Description: Lightweight Continuous Integration Service
 EOF
+echo /etc/laminar.conf > laminar/DEBIAN/conffiles
 cat <<EOF > laminar/DEBIAN/postinst
 #!/bin/bash
 echo Creating laminar user with home in /var/lib/laminar
 useradd -r -d /var/lib/laminar -s /usr/sbin/nologin laminar
-mkdir -p /var/lib/laminar/cfg/{jobs,nodes,scripts}
+mkdir -p /var/lib/laminar/cfg/{jobs,contexts,scripts}
 chown -R laminar: /var/lib/laminar
 EOF
 chmod +x laminar/DEBIAN/postinst
 
 dpkg-deb --build laminar
-mv laminar.deb /output/laminar-$VERSION-1-amd64.deb
+mv laminar.deb /output/laminar_${VERSION}_amd64.deb
 EOS

pkg/debian9-armhf.sh

@@ -2,9 +2,9 @@
 
 OUTPUT_DIR=$PWD
 
-SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
+SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]})/..)
 
-VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)
+VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)-1~upstream-debian9
 
 DOCKER_TAG=$(docker build -q - <<EOS
 FROM debian:9-slim
@@ -73,15 +73,16 @@ Maintainer: Oliver Giles <web ohwg net>
 Depends: libsqlite3-0, zlib1g
 Description: Lightweight Continuous Integration Service
 EOF
+echo /etc/laminar.conf > laminar/DEBIAN/conffiles
 cat <<EOF > laminar/DEBIAN/postinst
 #!/bin/bash
 echo Creating laminar user with home in /var/lib/laminar
 useradd -r -d /var/lib/laminar -s /usr/sbin/nologin laminar
-mkdir -p /var/lib/laminar/cfg/{jobs,nodes,scripts}
+mkdir -p /var/lib/laminar/cfg/{jobs,contexts,scripts}
 chown -R laminar: /var/lib/laminar
 EOF
 chmod +x laminar/DEBIAN/postinst
 
 dpkg-deb --build laminar
-mv laminar.deb /output/laminar-$VERSION-1-armhf.deb
+mv laminar.deb /output/laminar_${VERSION}_armhf.deb
 EOS

src/client.cpp

@@ -28,6 +28,9 @@
 #define EXIT_OPERATION_FAILED 2
 #define EXIT_RUN_FAILED       3
 
+// Definition needed for musl
+typedef unsigned int uint;
+
 template<typename T>
 static int setParams(int argc, char** argv, T& request) {
     int n = 0;

src/context.h

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2015-2019 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,28 +16,36 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#ifndef LAMINAR_NODE_H_
-#define LAMINAR_NODE_H_
+#ifndef LAMINAR_CONTEXT_H_
+#define LAMINAR_CONTEXT_H_
 
+#include <fnmatch.h>
 #include <string>
 #include <set>
-
 class Run;
 
-// Represents a group of executors. Currently almost unnecessary POD
-// abstraction, but may be enhanced in the future to support e.g. tags
-class Node {
+// Represents a context within which a Run will be executed. Allows applying
+// a certain environment to a set of Jobs, or setting a limit on the number
+// of parallel Runs
+class Context {
 public:
-    Node() {}
+    Context() {}
 
     std::string name;
     int numExecutors;
     int busyExecutors = 0;
-    std::set<std::string> tags;
 
-    // Attempts to queue the given run to this node. Returns true if succeeded.
-    bool queue(const Run& run);
+    bool canQueue(std::set<std::string>& patterns) {
+        if(busyExecutors >= numExecutors)
+            return false;
+
+        for(std::string pattern : patterns) {
+            if(fnmatch(pattern.c_str(), name.c_str(), FNM_EXTMATCH) == 0)
+                return true;
+        }
+        return false;
+    }
 };
 
 
-#endif // LAMINAR_NODE_H_
+#endif // LAMINAR_CONTEXT_H_

src/database.h

@@ -22,6 +22,10 @@
 #include <string>
 #include <functional>
 
+// Definition needed for musl
+typedef unsigned int uint;
+typedef unsigned long ulong;
+
 struct sqlite3;
 struct sqlite3_stmt;
 

src/http.cpp

@@ -0,0 +1,299 @@
+///
+/// Copyright 2015-2019 Oliver Giles
+///
+/// This file is part of Laminar
+///
+/// Laminar is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Laminar is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/// GNU General Public License for more details.
+///
+/// You should have received a copy of the GNU General Public License
+/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
+///
+#include "http.h"
+#include "resources.h"
+#include "monitorscope.h"
+#include "log.h"
+
+#include "laminar.h"
+
+// Helper class which wraps another class with calls to
+// adding and removing a pointer to itself from a passed
+// std::set reference. Used to keep track of currently
+// connected clients
+template<typename T, typename ...Args>
+struct WithSetRef : public T {
+    WithSetRef(std::set<T*>& set, Args&& ...args) :
+        T(std::forward(args)...),
+        _set(set)
+    {
+        _set.insert(this);
+    }
+    ~WithSetRef() {
+        _set.erase(this);
+    }
+private:
+    std::set<T*>& _set;
+};
+
+struct EventPeer {
+    MonitorScope scope;
+    std::list<std::string> pendingOutput;
+    kj::Own<kj::PromiseFulfiller<void>> fulfiller;
+};
+
+struct LogWatcher {
+    std::string job;
+    uint run;
+    std::list<std::string> pendingOutput;
+    kj::Own<kj::PromiseFulfiller<bool>> fulfiller;
+};
+
+kj::Maybe<MonitorScope> fromUrl(std::string resource, char* query) {
+    MonitorScope scope;
+
+    if(query) {
+        char *sk;
+        for(char* k = strtok_r(query, "&", &sk); k; k = strtok_r(nullptr, "&", &sk)) {
+            if(char* v = strchr(k, '=')) {
+                *v++ = '\0';
+                if(strcmp(k, "page") == 0)
+                    scope.page = atoi(v);
+                else if(strcmp(k, "field") == 0)
+                    scope.field = v;
+                else if(strcmp(k, "order") == 0)
+                    scope.order_desc = (strcmp(v, "dsc") == 0);
+            }
+        }
+    }
+
+    if(resource == "/") {
+        scope.type = MonitorScope::HOME;
+        return kj::mv(scope);
+    }
+
+    if(resource.substr(0, 5) != "/jobs")
+        return nullptr;
+
+    if(resource.length() == 5) {
+        scope.type = MonitorScope::ALL;
+        return kj::mv(scope);
+    }
+
+    resource = resource.substr(5);
+    size_t split = resource.find('/',1);
+    std::string job = resource.substr(1,split-1);
+    if(job.empty())
+        return nullptr;
+
+    scope.job = job;
+    scope.type = MonitorScope::JOB;
+    if(split == std::string::npos)
+        return kj::mv(scope);
+
+    size_t split2 = resource.find('/', split+1);
+    std::string run = resource.substr(split+1, split2-split);
+    if(run.empty())
+        return nullptr;
+
+    scope.num = static_cast<uint>(atoi(run.c_str()));
+    scope.type = MonitorScope::RUN;
+    return kj::mv(scope);
+}
+
+// Parses the url of the form /log/NAME/NUMBER, filling in the passed
+// references and returning true if successful. /log/NAME/latest is
+// also allowed, in which case the num reference is set to 0
+bool Http::parseLogEndpoint(kj::StringPtr url, std::string& name, uint& num) {
+    if(url.startsWith("/log/")) {
+        kj::StringPtr path = url.slice(5);
+        KJ_IF_MAYBE(sep, path.findFirst('/')) {
+            name = path.slice(0, *sep).begin();
+            kj::StringPtr tail = path.slice(*sep+1);
+            num = static_cast<uint>(atoi(tail.begin()));
+            name.erase(*sep);
+            if(tail == "latest")
+                num = laminar.latestRun(name);
+            if(num > 0)
+                return true;
+        }
+    }
+    return false;
+}
+
+kj::Promise<void> Http::cleanupPeers(kj::Timer& timer)
+{
+    return timer.afterDelay(15 * kj::SECONDS).then([&]{
+        for(EventPeer* p : eventPeers) {
+            // an empty SSE message is a colon followed by two newlines
+            p->pendingOutput.push_back(":\n\n");
+            p->fulfiller->fulfill();
+        }
+        return cleanupPeers(timer);
+    }).eagerlyEvaluate(nullptr);
+}
+
+kj::Promise<void> writeEvents(EventPeer* peer, kj::AsyncOutputStream* stream) {
+    auto paf = kj::newPromiseAndFulfiller<void>();
+    peer->fulfiller = kj::mv(paf.fulfiller);
+    return paf.promise.then([=]{
+        kj::Promise<void> p = kj::READY_NOW;
+        std::list<std::string> chunks = kj::mv(peer->pendingOutput);
+        for(std::string& s : chunks) {
+            p = p.then([=,&s]{
+                return stream->write(s.data(), s.size());
+            });
+        }
+        return p.attach(kj::mv(chunks)).then([=]{
+            return writeEvents(peer, stream);
+        });
+    });
+}
+
+kj::Promise<void> writeLogChunk(LogWatcher* client, kj::AsyncOutputStream* stream) {
+    auto paf = kj::newPromiseAndFulfiller<bool>();
+    client->fulfiller = kj::mv(paf.fulfiller);
+    return paf.promise.then([=](bool done){
+        kj::Promise<void> p = kj::READY_NOW;
+        std::list<std::string> chunks = kj::mv(client->pendingOutput);
+        for(std::string& s : chunks) {
+            p = p.then([=,&s]{
+                return stream->write(s.data(), s.size());
+            });
+        }
+        return p.attach(kj::mv(chunks)).then([=]{
+            return done ? kj::Promise<void>(kj::READY_NOW) : writeLogChunk(client, stream);
+        });
+    });
+}
+
+kj::Promise<void> Http::request(kj::HttpMethod method, kj::StringPtr url, const kj::HttpHeaders &headers, kj::AsyncInputStream &requestBody, HttpService::Response &response)
+{
+    const char* start, *end, *content_type;
+    std::string badge;
+    // for log requests
+    std::string name;
+    uint num;
+    kj::HttpHeaders responseHeaders(*headerTable);
+    responseHeaders.clear();
+    bool is_sse = false;
+    char* queryString = nullptr;
+    // Clients usually expect that http servers will ignore unknown query parameters,
+    // and expect to use this feature to work around browser limitations like there
+    // being no way to programatically force a resource to be reloaded from the server
+    // (without "Cache-Control: no-store", which is overkill). See issue #89.
+    // So first parse any query parameters we *are* interested in, then simply remove
+    // them from the URL, to make comparisions easier.
+    KJ_IF_MAYBE(queryIdx, url.findFirst('?')) {
+        const_cast<char*>(url.begin())[*queryIdx] = '\0';
+        queryString = const_cast<char*>(url.begin() + *queryIdx + 1);
+        url = url.begin();
+    }
+
+    KJ_IF_MAYBE(accept, headers.get(ACCEPT)) {
+        is_sse = (*accept == "text/event-stream");
+    }
+
+    if(is_sse) {
+        KJ_IF_MAYBE(s, fromUrl(url.cStr(), queryString)) {
+            responseHeaders.set(kj::HttpHeaderId::CONTENT_TYPE, "text/event-stream");
+            auto peer = kj::heap<WithSetRef<EventPeer>>(eventPeers);
+            peer->scope = *s;
+            std::string st = "data: " + laminar.getStatus(peer->scope) + "\n\n";
+            auto stream = response.send(200, "OK", responseHeaders);
+            return stream->write(st.data(), st.size()).attach(kj::mv(st)).then([=,s=stream.get(),p=peer.get()]{
+                return writeEvents(p,s);
+            }).attach(kj::mv(stream)).attach(kj::mv(peer));
+        }
+    } else if(url.startsWith("/archive/")) {
+        KJ_IF_MAYBE(file, laminar.getArtefact(url.slice(strlen("/archive/")))) {
+            auto array = (*file)->mmap(0, (*file)->stat().size);
+            responseHeaders.add("Content-Transfer-Encoding", "binary");
+            auto stream = response.send(200, "OK", responseHeaders, array.size());
+            return stream->write(array.begin(), array.size()).attach(kj::mv(array)).attach(kj::mv(file)).attach(kj::mv(stream));
+        }
+    } else if(parseLogEndpoint(url, name, num)) {
+        auto lw = kj::heap<WithSetRef<LogWatcher>>(logWatchers);
+        lw->job = name;
+        lw->run = num;
+        bool complete;
+        std::string output;
+        if(laminar.handleLogRequest(name, num, output, complete)) {
+            responseHeaders.set(kj::HttpHeaderId::CONTENT_TYPE, "text/plain; charset=utf-8");
+            responseHeaders.add("Content-Transfer-Encoding", "binary");
+            // Disables nginx reverse-proxy's buffering. Necessary for dynamic log output.
+            responseHeaders.add("X-Accel-Buffering", "no");
+            auto stream = response.send(200, "OK", responseHeaders, nullptr);
+            return stream->write(output.data(), output.size()).then([=,s=stream.get(),c=lw.get()]{
+                if(complete)
+                    return kj::Promise<void>(kj::READY_NOW);
+                return writeLogChunk(c, s);
+            }).attach(kj::mv(output)).attach(kj::mv(stream)).attach(kj::mv(lw));
+        }
+    } else if(url == "/custom/style.css") {
+        responseHeaders.set(kj::HttpHeaderId::CONTENT_TYPE, "text/css; charset=utf-8");
+        responseHeaders.add("Content-Transfer-Encoding", "binary");
+        std::string css = laminar.getCustomCss();
+        auto stream = response.send(200, "OK", responseHeaders, css.size());
+        return stream->write(css.data(), css.size()).attach(kj::mv(css)).attach(kj::mv(stream));
+    } else if(resources->handleRequest(url.cStr(), &start, &end, &content_type)) {
+        responseHeaders.set(kj::HttpHeaderId::CONTENT_TYPE, content_type);
+        responseHeaders.add("Content-Encoding", "gzip");
+        responseHeaders.add("Content-Transfer-Encoding", "binary");
+        auto stream = response.send(200, "OK", responseHeaders, end-start);
+        return stream->write(start, end-start).attach(kj::mv(stream));
+    } else if(url.startsWith("/badge/") && url.endsWith(".svg") && laminar.handleBadgeRequest(std::string(url.begin()+7, url.size()-11), badge)) {
+        responseHeaders.set(kj::HttpHeaderId::CONTENT_TYPE, "image/svg+xml");
+        responseHeaders.add("Cache-Control", "no-cache");
+        auto stream = response.send(200, "OK", responseHeaders, badge.size());
+        return stream->write(badge.data(), badge.size()).attach(kj::mv(badge)).attach(kj::mv(stream));
+    }
+    return response.sendError(404, "Not Found", responseHeaders);
+}
+
+Http::Http(Laminar &li) :
+  laminar(li),
+  resources(kj::heap<Resources>())
+{
+    kj::HttpHeaderTable::Builder builder;
+    ACCEPT = builder.add("Accept");
+    headerTable = builder.build();
+}
+
+Http::~Http()
+{
+    KJ_ASSERT(logWatchers.size() == 0);
+    KJ_ASSERT(eventPeers.size() == 0);
+}
+
+kj::Promise<void> Http::startServer(kj::Timer& timer, kj::Own<kj::ConnectionReceiver>&& listener)
+{
+    kj::Own<kj::HttpServer> server = kj::heap<kj::HttpServer>(timer, *headerTable, *this);
+    return server->listenHttp(*listener).attach(cleanupPeers(timer)).attach(kj::mv(listener)).attach(kj::mv(server));
+}
+
+void Http::notifyEvent(const char *data, std::string job)
+{
+    for(EventPeer* c : eventPeers) {
+        if(c->scope.wantsStatus(job)) {
+            c->pendingOutput.push_back("data: " + std::string(data) + "\n\n");
+            c->fulfiller->fulfill();
+        }
+    }
+}
+
+void Http::notifyLog(std::string job, uint run, std::string log_chunk, bool eot)
+{
+    for(LogWatcher* lw : logWatchers) {
+        if(lw->job == job && lw->run == run) {
+            lw->pendingOutput.push_back(kj::mv(log_chunk));
+            lw->fulfiller->fulfill(kj::mv(eot));
+        }
+    }
+}

src/http.h

@@ -0,0 +1,66 @@
+///
+/// Copyright 2019 Oliver Giles
+///
+/// This file is part of Laminar
+///
+/// Laminar is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Laminar is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/// GNU General Public License for more details.
+///
+/// You should have received a copy of the GNU General Public License
+/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
+///
+#ifndef LAMINAR_HTTP_H_
+#define LAMINAR_HTTP_H_
+
+#include <kj/memory.h>
+#include <kj/compat/http.h>
+#include <string>
+#include <set>
+
+// Definition needed for musl
+typedef unsigned int uint;
+typedef unsigned long ulong;
+
+struct Laminar;
+struct Resources;
+struct LogWatcher;
+struct EventPeer;
+
+class Http : public kj::HttpService {
+public:
+    Http(Laminar&li);
+    virtual ~Http();
+
+    kj::Promise<void> startServer(kj::Timer &timer, kj::Own<kj::ConnectionReceiver> &&listener);
+
+    void notifyEvent(const char* data, std::string job = nullptr);
+    void notifyLog(std::string job, uint run, std::string log_chunk, bool eot);
+
+private:
+    virtual kj::Promise<void> request(kj::HttpMethod method, kj::StringPtr url, const kj::HttpHeaders& headers,
+                                      kj::AsyncInputStream& requestBody, Response& response) override;
+    bool parseLogEndpoint(kj::StringPtr url, std::string &name, uint &num);
+
+    // With SSE, there is no notification if a client disappears. Also, an idle
+    // client must be kept alive if there is no activity in their MonitorScope.
+    // Deal with these by sending a periodic keepalive and reaping the client if
+    // the write fails.
+    kj::Promise<void> cleanupPeers(kj::Timer &timer);
+
+    Laminar& laminar;
+    std::set<EventPeer*> eventPeers;
+    kj::Own<kj::HttpHeaderTable> headerTable;
+    kj::Own<Resources> resources;
+    std::set<LogWatcher*> logWatchers;
+
+    kj::HttpHeaderId ACCEPT;
+};
+
+#endif //LAMINAR_HTTP_H_

src/interface.h

@@ -1,175 +0,0 @@
-///
-/// Copyright 2015-2019 Oliver Giles
-///
-/// This file is part of Laminar
-///
-/// Laminar is free software: you can redistribute it and/or modify
-/// it under the terms of the GNU General Public License as published by
-/// the Free Software Foundation, either version 3 of the License, or
-/// (at your option) any later version.
-///
-/// Laminar is distributed in the hope that it will be useful,
-/// but WITHOUT ANY WARRANTY; without even the implied warranty of
-/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/// GNU General Public License for more details.
-///
-/// You should have received a copy of the GNU General Public License
-/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
-///
-#ifndef LAMINAR_INTERFACE_H_
-#define LAMINAR_INTERFACE_H_
-
-#include "run.h"
-
-#include <string>
-#include <memory>
-#include <unordered_map>
-
-// Simple struct to define which information a frontend client is interested
-// in, both in initial request phase and real-time updates. It corresponds
-// loosely to frontend URLs
-struct MonitorScope {
-    enum Type {
-        HOME, // home page: recent builds and statistics
-        ALL,  // browse jobs
-        JOB,  // a specific job page
-        RUN,  // a specific run page
-        LOG   // a run's log page
-    };
-
-    MonitorScope(Type type = HOME, std::string job = std::string(), uint num = 0) :
-        type(type),
-        job(job),
-        num(num),
-        page(0),
-        field("number"),
-        order_desc(true)
-    {}
-
-    // whether this scope wants status information about the given job or run
-    bool wantsStatus(std::string ajob, uint anum = 0) const {
-        if(type == HOME || type == ALL) return true;
-        if(type == JOB) return ajob == job;
-        if(type == RUN) return ajob == job && anum == num;
-        return false;
-    }
-
-    bool wantsLog(std::string ajob, uint anum) const {
-        return type == LOG && ajob == job && anum == num;
-    }
-
-    Type type;
-    std::string job;
-    uint num = 0;
-    // sorting
-    uint page = 0;
-    std::string field;
-    bool order_desc;
-};
-
-// Represents a (websocket) client that wants to be notified about events
-// matching the supplied scope. Pass instances of this to LaminarInterface
-// registerClient and deregisterClient
-struct LaminarClient {
-    virtual ~LaminarClient() noexcept(false) {}
-    virtual void sendMessage(std::string payload) = 0;
-    // TODO: redesign
-    virtual void notifyJobFinished() {}
-    MonitorScope scope;
-};
-
-// Represents a (rpc) client that wants to be notified about run completion.
-// Pass instances of this to LaminarInterface registerWaiter and
-// deregisterWaiter
-struct LaminarWaiter {
-    virtual ~LaminarWaiter() =default;
-    virtual void complete(const Run*) = 0;
-};
-
-// Represents a file mapped in memory. Used to serve artefacts
-struct MappedFile {
-    virtual ~MappedFile() =default;
-    virtual const void* address() = 0;
-    virtual size_t size() = 0;
-};
-
-// The interface connecting the network layer to the application business
-// logic. These methods fulfil the requirements of both the HTTP/Websocket
-// and RPC interfaces.
-struct LaminarInterface {
-    virtual ~LaminarInterface() {}
-
-    // Queues a job, returns immediately. Return value will be nullptr if
-    // the supplied name is not a known job.
-    virtual std::shared_ptr<Run> queueJob(std::string name, ParamMap params = ParamMap()) = 0;
-
-    // Register a client (but don't give up ownership). The client will be
-    // notified with a JSON message of any events matching its scope
-    // (see LaminarClient and MonitorScope above)
-    virtual void registerClient(LaminarClient* client) = 0;
-
-    // Call this before destroying a client so that Laminar doesn't try
-    // to call LaminarClient::sendMessage on invalid data
-    virtual void deregisterClient(LaminarClient* client) = 0;
-
-    // Register a waiter (but don't give up ownership). The waiter will be
-    // notified with a callback of any run completion (see LaminarWaiter above)
-    virtual void registerWaiter(LaminarWaiter* waiter) = 0;
-
-    // Call this before destroying a waiter so that Laminar doesn't try
-    // to call LaminarWaiter::complete on invalid data
-    virtual void deregisterWaiter(LaminarWaiter* waiter) = 0;
-
-    // Return the latest known number of the named job
-    virtual uint latestRun(std::string job) = 0;
-
-    // Given a job name and number, return existence and (via reference params)
-    // its current log output and whether the job is ongoing
-    virtual bool handleLogRequest(std::string name, uint num, std::string& output, bool& complete) = 0;
-
-    // Synchronously send a snapshot of the current status to the given
-    // client (as governed by the client's MonitorScope). This is called on
-    // initial websocket connect.
-    virtual void sendStatus(LaminarClient* client) = 0;
-
-    // Implements the laminar client interface allowing the setting of
-    // arbitrary parameters on a run (usually itself) to be available in
-    // the environment of subsequent scripts.
-    virtual bool setParam(std::string job, uint buildNum, std::string param, std::string value) = 0;
-
-    // Gets the list of jobs currently waiting in the execution queue
-    virtual const std::list<std::shared_ptr<Run>>& listQueuedJobs() = 0;
-
-    // Gets the list of currently executing jobs
-    virtual const RunSet& listRunningJobs() = 0;
-
-    // Gets the list of known jobs - scans cfg/jobs for *.run files
-    virtual std::list<std::string> listKnownJobs() = 0;
-
-    // Fetches the content of an artifact given its filename relative to
-    // $LAMINAR_HOME/archive. Ideally, this would instead be served by a
-    // proper web server which handles this url.
-    virtual kj::Maybe<kj::Own<const kj::ReadableFile>> getArtefact(std::string path) = 0;
-
-    // Given the name of a job, populate the provided string reference with
-    // SVG content describing the last known state of the job. Returns false
-    // if the job is unknown.
-    virtual bool handleBadgeRequest(std::string job, std::string& badge) = 0;
-
-    // Fetches the content of $LAMINAR_HOME/custom/style.css or an empty
-    // string. Ideally, this would instead be served by a proper web server
-    // which handles this url.
-    virtual std::string getCustomCss() = 0;
-
-    // Aborts a single job
-    virtual bool abort(std::string job, uint buildNum) = 0;
-
-    // Abort all running jobs
-    virtual void abortAll() = 0;
-
-    // Callback to handle a configuration modification notification
-    virtual void notifyConfigChanged() = 0;
-};
-
-#endif // LAMINAR_INTERFACE_H_
-

src/laminar.cpp

@@ -20,6 +20,8 @@
 #include "server.h"
 #include "conf.h"
 #include "log.h"
+#include "http.h"
+#include "rpc.h"
 
 #include <sys/wait.h>
 #include <sys/mman.h>
@@ -35,7 +37,7 @@
 #include <rapidjson/writer.h>
 
 // rapidjson::Writer with a StringBuffer is used a lot in Laminar for
-// preparing JSON messages to send to Websocket clients. A small wrapper
+// preparing JSON messages to send to HTTP clients. A small wrapper
 // class here reduces verbosity later for this common use case.
 class Json : public rapidjson::Writer<rapidjson::StringBuffer> {
 public:
@@ -52,13 +54,6 @@ template<> Json& Json::set(const char* key, double value) { String(key); Double(
 template<> Json& Json::set(const char* key, const char* value) { String(key); String(value); return *this; }
 template<> Json& Json::set(const char* key, std::string value) { String(key); String(value.c_str()); return *this; }
 
-namespace {
-// Default values when none were supplied in $LAMINAR_CONF_FILE (/etc/laminar.conf)
-constexpr const char* INTADDR_RPC_DEFAULT = "unix-abstract:laminar";
-constexpr const char* INTADDR_HTTP_DEFAULT = "*:8080";
-constexpr const char* ARCHIVE_URL_DEFAULT = "/archive/";
-}
-
 // short syntax helpers for kj::Path
 template<typename T>
 inline kj::Path operator/(const kj::Path& p, const T& ext) {
@@ -71,19 +66,25 @@ inline kj::Path operator/(const std::string& p, const T& ext) {
 
 typedef std::string str;
 
-Laminar::Laminar(const char *home) :
-    homePath(kj::Path::parse(&home[1])),
-    fsHome(kj::newDiskFilesystem()->getRoot().openSubdir(homePath, kj::WriteMode::MODIFY))
+Laminar::Laminar(Server &server, Settings settings) :
+    settings(settings),
+    srv(server),
+    homePath(kj::Path::parse(&settings.home[1])),
+    fsHome(kj::newDiskFilesystem()->getRoot().openSubdir(homePath, kj::WriteMode::MODIFY)),
+    http(kj::heap<Http>(*this)),
+    rpc(kj::heap<Rpc>(*this))
 {
-    LASSERT(home[0] == '/');
+    LASSERT(settings.home[0] == '/');
 
-    archiveUrl = ARCHIVE_URL_DEFAULT;
-    if(char* envArchive = getenv("LAMINAR_ARCHIVE_URL")) {
-        archiveUrl = envArchive;
-        if(archiveUrl.back() != '/')
-            archiveUrl.append("/");
+    if(fsHome->exists(homePath/"cfg"/"nodes")) {
+        LLOG(ERROR, "Found node configuration directory cfg/nodes. Nodes have been deprecated, please migrate to contexts. Laminar will now exit.");
+        exit(EXIT_FAILURE);
     }
 
+    archiveUrl = settings.archive_url;
+    if(archiveUrl.back() != '/')
+        archiveUrl.append("/");
+
     numKeepRunDirs = 0;
 
     db = new Database((homePath/"laminar.sqlite").toString(true).cStr());
@@ -103,29 +104,23 @@ Laminar::Laminar(const char *home) :
         buildNums[name] = build;
     });
 
-    srv = nullptr;
+    srv.watchPaths([this]{
+        LLOG(INFO, "Reloading configuration");
+        loadConfiguration();
+        // config change may allow stuck jobs to dequeue
+        assignNewJobs();
+    }).addPath((homePath/"cfg"/"contexts").toString(true).cStr())
+      .addPath((homePath/"cfg"/"jobs").toString(true).cStr())
+      .addPath((homePath/"cfg").toString(true).cStr()); // for groups.conf
+
+    srv.listenRpc(*rpc, settings.bind_rpc);
+    srv.listenHttp(*http, settings.bind_http);
 
     // Load configuration, may be called again in response to an inotify event
     // that the configuration files have been modified
     loadConfiguration();
 }
 
-void Laminar::registerClient(LaminarClient* client) {
-    clients.insert(client);
-}
-
-void Laminar::deregisterClient(LaminarClient* client) {
-    clients.erase(client);
-}
-
-void Laminar::registerWaiter(LaminarWaiter *waiter) {
-    waiters.insert(waiter);
-}
-
-void Laminar::deregisterWaiter(LaminarWaiter *waiter) {
-    waiters.erase(waiter);
-}
-
 uint Laminar::latestRun(std::string job) {
     auto it = activeJobs.byJobName().equal_range(job);
     if(it.first == it.second) {
@@ -141,8 +136,6 @@ uint Laminar::latestRun(std::string job) {
     }
 }
 
-// TODO: reunify with sendStatus. The difference is that this method is capable of
-// returning "not found" to the caller, and sendStatus isn't
 bool Laminar::handleLogRequest(std::string name, uint num, std::string& output, bool& complete) {
     if(Run* run = activeRun(name, num)) {
         output = run->log;
@@ -216,40 +209,15 @@ void Laminar::populateArtifacts(Json &j, std::string job, uint num) const {
     }
 }
 
-void Laminar::sendStatus(LaminarClient* client) {
-    if(client->scope.type == MonitorScope::LOG) {
-        // If the requested job is currently in progress
-        if(const Run* run = activeRun(client->scope.job, client->scope.num)) {
-            client->sendMessage(run->log.c_str());
-        } else { // it must be finished, fetch it from the database
-            db->stmt("SELECT output, outputLen FROM builds WHERE name = ? AND number = ?")
-              .bind(client->scope.job, client->scope.num)
-              .fetch<str,int>([=](str maybeZipped, unsigned long sz) {
-                str log(sz+1,'\0');
-                if(sz >= COMPRESS_LOG_MIN_SIZE) {
-                    int res = ::uncompress((uint8_t*) log.data(), &sz,
-                         (const uint8_t*) maybeZipped.data(), maybeZipped.size());
-                    if(res == Z_OK)
-                        client->sendMessage(log);
-                    else
-                        LLOG(ERROR, "Failed to uncompress log");
-                } else {
-                    client->sendMessage(maybeZipped);
-                }
-            });
-            client->notifyJobFinished();
-        }
-        return;
-    }
-
+std::string Laminar::getStatus(MonitorScope scope) {
     Json j;
     j.set("type", "status");
     j.set("title", getenv("LAMINAR_TITLE") ?: "Laminar");
     j.set("time", time(nullptr));
     j.startObject("data");
-    if(client->scope.type == MonitorScope::RUN) {
+    if(scope.type == MonitorScope::RUN) {
         db->stmt("SELECT queuedAt,startedAt,completedAt,result,reason,parentJob,parentBuild FROM builds WHERE name = ? AND number = ?")
-        .bind(client->scope.job, client->scope.num)
+        .bind(scope.job, scope.num)
         .fetch<time_t, time_t, time_t, int, std::string, std::string, uint>([&](time_t queued, time_t started, time_t completed, int result, std::string reason, std::string parentJob, uint parentBuild) {
             j.set("queued", started-queued);
             j.set("started", started);
@@ -258,7 +226,7 @@ void Laminar::sendStatus(LaminarClient* client) {
             j.set("reason", reason);
             j.startObject("upstream").set("name", parentJob).set("num", parentBuild).EndObject(2);
         });
-        if(const Run* run = activeRun(client->scope.job, client->scope.num)) {
+        if(const Run* run = activeRun(scope.job, scope.num)) {
             j.set("queued", run->startedAt - run->queuedAt);
             j.set("started", run->startedAt);
             j.set("result", to_string(RunState::RUNNING));
@@ -270,30 +238,30 @@ void Laminar::sendStatus(LaminarClient* client) {
                 j.set("etc", run->startedAt + lastRuntime);
             });
         }
-        j.set("latestNum", int(buildNums[client->scope.job]));
+        j.set("latestNum", int(buildNums[scope.job]));
         j.startArray("artifacts");
-        populateArtifacts(j, client->scope.job, client->scope.num);
+        populateArtifacts(j, scope.job, scope.num);
         j.EndArray();
-    } else if(client->scope.type == MonitorScope::JOB) {
+    } else if(scope.type == MonitorScope::JOB) {
         const uint runsPerPage = 10;
         j.startArray("recent");
         // ORDER BY param cannot be bound
         std::string order_by;
-        std::string direction = client->scope.order_desc ? "DESC" : "ASC";
-        if(client->scope.field == "number")
+        std::string direction = scope.order_desc ? "DESC" : "ASC";
+        if(scope.field == "number")
             order_by = "number " + direction;
-        else if(client->scope.field == "result")
+        else if(scope.field == "result")
             order_by = "result " + direction + ", number DESC";
-        else if(client->scope.field == "started")
+        else if(scope.field == "started")
             order_by = "startedAt " + direction + ", number DESC";
-        else if(client->scope.field == "duration")
+        else if(scope.field == "duration")
             order_by = "(completedAt-startedAt) " + direction + ", number DESC";
         else
             order_by = "number DESC";
         std::string stmt = "SELECT number,startedAt,completedAt,result,reason FROM builds WHERE name = ? ORDER BY "
                 + order_by + " LIMIT ?,?";
         db->stmt(stmt.c_str())
-        .bind(client->scope.job, client->scope.page * runsPerPage, runsPerPage)
+        .bind(scope.job, scope.page * runsPerPage, runsPerPage)
         .fetch<uint,time_t,time_t,int,str>([&](uint build,time_t started,time_t completed,int result,str reason){
             j.StartObject();
             j.set("number", build)
@@ -305,23 +273,23 @@ void Laminar::sendStatus(LaminarClient* client) {
         });
         j.EndArray();
         db->stmt("SELECT COUNT(*),AVG(completedAt-startedAt) FROM builds WHERE name = ?")
-        .bind(client->scope.job)
+        .bind(scope.job)
         .fetch<uint,uint>([&](uint nRuns, uint averageRuntime){
             j.set("averageRuntime", averageRuntime);
             j.set("pages", (nRuns-1) / runsPerPage + 1);
             j.startObject("sort");
-            j.set("page", client->scope.page)
-             .set("field", client->scope.field)
-             .set("order", client->scope.order_desc ? "dsc" : "asc")
+            j.set("page", scope.page)
+             .set("field", scope.field)
+             .set("order", scope.order_desc ? "dsc" : "asc")
              .EndObject();
         });
         j.startArray("running");
-        auto p = activeJobs.byJobName().equal_range(client->scope.job);
+        auto p = activeJobs.byJobName().equal_range(scope.job);
         for(auto it = p.first; it != p.second; ++it) {
             const std::shared_ptr<Run> run = *it;
             j.StartObject();
             j.set("number", run->build);
-            j.set("node", run->node->name);
+            j.set("context", run->context->name);
             j.set("started", run->startedAt);
             j.set("result", to_string(RunState::RUNNING));
             j.set("reason", run->reason());
@@ -330,27 +298,27 @@ void Laminar::sendStatus(LaminarClient* client) {
         j.EndArray();
         int nQueued = 0;
         for(const auto& run : queuedJobs) {
-            if (run->name == client->scope.job) {
+            if (run->name == scope.job) {
                 nQueued++;
             }
         }
         j.set("nQueued", nQueued);
         db->stmt("SELECT number,startedAt FROM builds WHERE name = ? AND result = ? ORDER BY completedAt DESC LIMIT 1")
-        .bind(client->scope.job, int(RunState::SUCCESS))
+        .bind(scope.job, int(RunState::SUCCESS))
         .fetch<int,time_t>([&](int build, time_t started){
             j.startObject("lastSuccess");
             j.set("number", build).set("started", started);
             j.EndObject();
         });
         db->stmt("SELECT number,startedAt FROM builds WHERE name = ? AND result <> ? ORDER BY completedAt DESC LIMIT 1")
-        .bind(client->scope.job, int(RunState::SUCCESS))
+        .bind(scope.job, int(RunState::SUCCESS))
         .fetch<int,time_t>([&](int build, time_t started){
             j.startObject("lastFailed");
             j.set("number", build).set("started", started);
             j.EndObject();
         });
 
-    } else if(client->scope.type == MonitorScope::ALL) {
+    } else if(scope.type == MonitorScope::ALL) {
         j.startArray("jobs");
         db->stmt("SELECT name,number,startedAt,completedAt,result FROM builds b JOIN (SELECT name n,MAX(number) l FROM builds GROUP BY n) q ON b.name = q.n AND b.number = q.l")
         .fetch<str,uint,time_t,time_t,int>([&](str name,uint number, time_t started, time_t completed, int result){
@@ -360,11 +328,6 @@ void Laminar::sendStatus(LaminarClient* client) {
             j.set("result", to_string(RunState(result)));
             j.set("started", started);
             j.set("completed", completed);
-            j.startArray("tags");
-            for(const str& t: jobTags[name]) {
-                j.String(t.c_str());
-            }
-            j.EndArray();
             j.EndObject();
         });
         j.EndArray();
@@ -373,24 +336,23 @@ void Laminar::sendStatus(LaminarClient* client) {
             j.StartObject();
             j.set("name", run->name);
             j.set("number", run->build);
-            j.set("node", run->node->name);
+            j.set("context", run->context->name);
             j.set("started", run->startedAt);
-            j.startArray("tags");
-            for(const str& t: jobTags[run->name]) {
-                j.String(t.c_str());
-            }
-            j.EndArray();
             j.EndObject();
         }
         j.EndArray();
+        j.startObject("groups");
+        for(const auto& group : jobGroups)
+            j.set(group.first.c_str(), group.second);
+        j.EndObject();
     } else { // Home page
         j.startArray("recent");
         db->stmt("SELECT * FROM builds ORDER BY completedAt DESC LIMIT 15")
-        .fetch<str,uint,str,time_t,time_t,time_t,int>([&](str name,uint build,str node,time_t,time_t started,time_t completed,int result){
+        .fetch<str,uint,str,time_t,time_t,time_t,int>([&](str name,uint build,str context,time_t,time_t started,time_t completed,int result){
             j.StartObject();
             j.set("name", name)
              .set("number", build)
-             .set("node", node)
+             .set("context", context)
              .set("started", started)
              .set("completed", completed)
              .set("result", to_string(RunState(result)))
@@ -402,7 +364,7 @@ void Laminar::sendStatus(LaminarClient* client) {
             j.StartObject();
             j.set("name", run->name);
             j.set("number", run->build);
-            j.set("node", run->node->name);
+            j.set("context", run->context->name);
             j.set("started", run->startedAt);
             db->stmt("SELECT completedAt - startedAt FROM builds WHERE name = ? ORDER BY completedAt DESC LIMIT 1")
              .bind(run->name)
@@ -421,10 +383,10 @@ void Laminar::sendStatus(LaminarClient* client) {
         j.EndArray();
         int execTotal = 0;
         int execBusy = 0;
-        for(const auto& it : nodes) {
-            const std::shared_ptr<Node>& node = it.second;
-            execTotal += node->numExecutors;
-            execBusy += node->busyExecutors;
+        for(const auto& it : contexts) {
+            const std::shared_ptr<Context>& context = it.second;
+            execTotal += context->numExecutors;
+            execBusy += context->busyExecutors;
         }
         j.set("executorsTotal", execTotal);
         j.set("executorsBusy", execBusy);
@@ -512,80 +474,55 @@ void Laminar::sendStatus(LaminarClient* client) {
 
     }
     j.EndObject();
-    client->sendMessage(j.str());
+    return j.str();
 }
 
 Laminar::~Laminar() noexcept try {
     delete db;
-    delete srv;
 } catch (std::exception& e) {
     LLOG(ERROR, e.what());
     return;
 }
 
-void Laminar::run() {
-    const char* listen_rpc = getenv("LAMINAR_BIND_RPC") ?: INTADDR_RPC_DEFAULT;
-    const char* listen_http = getenv("LAMINAR_BIND_HTTP") ?: INTADDR_HTTP_DEFAULT;
-
-    srv = new Server(*this, listen_rpc, listen_http);
-    srv->addWatchPath((homePath/"cfg"/"nodes").toString(true).cStr());
-    srv->addWatchPath((homePath/"cfg"/"jobs").toString(true).cStr());
-    srv->start();
-}
-
-void Laminar::stop() {
-    srv->stop();
-}
-
 bool Laminar::loadConfiguration() {
     if(const char* ndirs = getenv("LAMINAR_KEEP_RUNDIRS"))
         numKeepRunDirs = static_cast<uint>(atoi(ndirs));
 
-    std::set<std::string> knownNodes;
+    std::set<std::string> knownContexts;
 
-    KJ_IF_MAYBE(nodeDir, fsHome->tryOpenSubdir(kj::Path{"cfg","nodes"})) {
-        for(kj::Directory::Entry& entry : (*nodeDir)->listEntries()) {
+    KJ_IF_MAYBE(contextsDir, fsHome->tryOpenSubdir(kj::Path{"cfg","contexts"})) {
+        for(kj::Directory::Entry& entry : (*contextsDir)->listEntries()) {
             if(!entry.name.endsWith(".conf"))
                 continue;
 
-            StringMap conf = parseConfFile((homePath/"cfg"/"nodes"/entry.name).toString(true).cStr());
+            StringMap conf = parseConfFile((homePath/"cfg"/"contexts"/entry.name).toString(true).cStr());
 
-            std::string nodeName(entry.name.cStr(), entry.name.findLast('.').orDefault(0));
-            auto existingNode = nodes.find(nodeName);
-            std::shared_ptr<Node> node = existingNode == nodes.end() ? nodes.emplace(nodeName, std::shared_ptr<Node>(new Node)).first->second : existingNode->second;
-            node->name = nodeName;
-            node->numExecutors = conf.get<int>("EXECUTORS", 6);
+            std::string name(entry.name.cStr(), entry.name.findLast('.').orDefault(0));
+            auto existing = contexts.find(name);
+            std::shared_ptr<Context> context = existing == contexts.end() ? contexts.emplace(name, std::shared_ptr<Context>(new Context)).first->second : existing->second;
+            context->name = name;
+            context->numExecutors = conf.get<int>("EXECUTORS", 6);
 
-            std::string tagString = conf.get<std::string>("TAGS");
-            std::set<std::string> tagList;
-            if(!tagString.empty()) {
-                std::istringstream iss(tagString);
-                std::string tag;
-                while(std::getline(iss, tag, ','))
-                    tagList.insert(tag);
-            }
-            std::swap(node->tags, tagList);
-
-            knownNodes.insert(nodeName);
+            knownContexts.insert(name);
         }
     }
 
-    // remove any nodes whose config files disappeared.
-    // if there are no known nodes, take care not to remove and re-add the default node
-    for(auto it = nodes.begin(); it != nodes.end();) {
-        if((it->first == "" && knownNodes.size() == 0) || knownNodes.find(it->first) != knownNodes.end())
+    // remove any contexts whose config files disappeared.
+    // if there are no known contexts, take care not to remove and re-add the default context.
+    for(auto it = contexts.begin(); it != contexts.end();) {
+        if((it->first == "default" && knownContexts.size() == 0) || knownContexts.find(it->first) != knownContexts.end())
             it++;
         else
-            it = nodes.erase(it);
+            it = contexts.erase(it);
     }
 
-    // add a default node
-    if(nodes.empty()) {
-        LLOG(INFO, "Creating a default node with 6 executors");
-        std::shared_ptr<Node> node(new Node);
-        node->name = "";
-        node->numExecutors = 6;
-        nodes.emplace("", node);
+    // add a default context
+    if(contexts.empty()) {
+        LLOG(INFO, "Creating a default context with 6 executors");
+        std::shared_ptr<Context> context(new Context);
+        context->name = "default";
+        context->numExecutors = 6;
+        contexts.emplace("default", context);
     }
 
     KJ_IF_MAYBE(jobsDir, fsHome->tryOpenSubdir(kj::Path{"cfg","jobs"})) {
@@ -596,19 +533,25 @@ bool Laminar::loadConfiguration() {
 
             std::string jobName(entry.name.cStr(), entry.name.findLast('.').orDefault(0));
 
-            std::string tags = conf.get<std::string>("TAGS");
-            if(!tags.empty()) {
-                std::istringstream iss(tags);
-                std::set<std::string> tagList;
-                std::string tag;
-                while(std::getline(iss, tag, ','))
-                    tagList.insert(tag);
-                jobTags[jobName] = tagList;
-            }
+            std::string ctxPtns = conf.get<std::string>("CONTEXTS");
 
+            if(!ctxPtns.empty()) {
+                std::istringstream iss(ctxPtns);
+                std::set<std::string> ctxPtnList;
+                std::string ctx;
+                while(std::getline(iss, ctx, ','))
+                    ctxPtnList.insert(ctx);
+                jobContexts[jobName].swap(ctxPtnList);
+            }
         }
     }
 
+    jobGroups.clear();
+    KJ_IF_MAYBE(groupsConf, fsHome->tryOpenFile(kj::Path{"cfg","groups.conf"}))
+        jobGroups = parseConfFile((homePath/"cfg"/"groups.conf").toString(true).cStr());
+    if(jobGroups.empty())
+        jobGroups["All Jobs"] = ".*";
+
     return true;
 }
 
@@ -618,6 +561,10 @@ std::shared_ptr<Run> Laminar::queueJob(std::string name, ParamMap params) {
         return nullptr;
     }
 
+    // If the job has no contexts (maybe there is no .conf file at all), add the default context
+    if(jobContexts[name].empty())
+        jobContexts.at(name).insert("default");
+
     std::shared_ptr<Run> run = std::make_shared<Run>(name, kj::mv(params), homePath.clone());
     queuedJobs.push_back(run);
 
@@ -627,24 +574,12 @@ std::shared_ptr<Run> Laminar::queueJob(std::string name, ParamMap params) {
         .startObject("data")
         .set("name", name)
         .EndObject();
-    const char* msg = j.str();
-    for(LaminarClient* c : clients) {
-        if(c->scope.wantsStatus(name))
-            c->sendMessage(msg);
-    }
+    http->notifyEvent(j.str(), name.c_str());
 
     assignNewJobs();
     return run;
 }
 
-void Laminar::notifyConfigChanged()
-{
-    LLOG(INFO, "Reloading configuration");
-    loadConfiguration();
-    // config change may allow stuck jobs to dequeue
-    assignNewJobs();
-}
-
 bool Laminar::abort(std::string job, uint buildNum) {
     if(Run* run = activeRun(job, buildNum)) {
         run->abort(true);
@@ -659,35 +594,12 @@ void Laminar::abortAll() {
     }
 }
 
-bool Laminar::nodeCanQueue(const Node& node, std::string jobName) const {
-    // if a node is too busy, it can't take the job
-    if(node.busyExecutors >= node.numExecutors)
-        return false;
-
-    // if the node has no tags, allow the build
-    if(node.tags.size() == 0)
-        return true;
-
-    auto it = jobTags.find(jobName);
-    // if the job has no tags, it cannot be run on this node
-    if(it == jobTags.end())
-        return false;
-
-    // otherwise, allow the build if job and node have a tag in common
-    for(const std::string& tag : it->second) {
-        if(node.tags.find(tag) != node.tags.end())
-            return true;
-    }
-
-    return false;
-}
-
 bool Laminar::tryStartRun(std::shared_ptr<Run> run, int queueIndex) {
-    for(auto& sn : nodes) {
-        std::shared_ptr<Node> node = sn.second;
+    for(auto& sc : contexts) {
+        std::shared_ptr<Context> ctx = sc.second;
 
-        if(nodeCanQueue(*node.get(), run->name) && run->configure(buildNums[run->name] + 1, node, *fsHome)) {
-            node->busyExecutors++;
+        if(ctx->canQueue(jobContexts.at(run->name)) && run->configure(buildNums[run->name] + 1, ctx, *fsHome)) {
+            ctx->busyExecutors++;
             // set the last known result if exists
             db->stmt("SELECT result FROM builds WHERE name = ? ORDER BY completedAt DESC LIMIT 1")
              .bind(run->name)
@@ -700,12 +612,12 @@ bool Laminar::tryStartRun(std::shared_ptr<Run> run, int queueIndex) {
                 runFinished(run.get());
             });
             if(run->timeout > 0) {
-                exec = exec.attach(srv->addTimeout(run->timeout, [r=run.get()](){
+                exec = exec.attach(srv.addTimeout(run->timeout, [r=run.get()](){
                     r->abort(true);
                 }));
             }
-            srv->addTask(kj::mv(exec));
-            LLOG(INFO, "Started job on node", run->name, run->build, node->name);
+            srv.addTask(kj::mv(exec));
+            LLOG(INFO, "Started job", run->name, run->build, ctx->name);
 
             // update next build number
             buildNums[run->name]++;
@@ -725,22 +637,8 @@ bool Laminar::tryStartRun(std::shared_ptr<Run> run, int queueIndex) {
              .fetch<uint>([&](uint etc){
                 j.set("etc", time(nullptr) + etc);
             });
-            j.startArray("tags");
-            for(const str& t: jobTags[run->name]) {
-                j.String(t.c_str());
-            }
-            j.EndArray();
             j.EndObject();
-            const char* msg = j.str();
-            for(LaminarClient* c : clients) {
-                if(c->scope.wantsStatus(run->name, run->build)
-                    // The run page also should know that another job has started
-                    // (so maybe it can show a previously hidden "next" button).
-                    // Hence this small hack:
-                        || (c->scope.type == MonitorScope::Type::RUN && c->scope.job == run->name))
-                    c->sendMessage(msg);
-            }
-
+            http->notifyEvent(j.str(), run->name.c_str());
             return true;
         }
     }
@@ -765,17 +663,14 @@ kj::Promise<void> Laminar::handleRunStep(Run* run) {
         return kj::READY_NOW;
     }
 
-    kj::Promise<int> exited = srv->onChildExit(run->current_pid);
+    kj::Promise<int> exited = srv.onChildExit(run->current_pid);
     // promise is fulfilled when the process is reaped. But first we wait for all
     // output from the pipe (Run::output_fd) to be consumed.
-    return srv->readDescriptor(run->output_fd, [this,run](const char*b,size_t n){
+    return srv.readDescriptor(run->output_fd, [this,run](const char*b,size_t n){
         // handle log output
         std::string s(b, n);
         run->log += s;
-        for(LaminarClient* c : clients) {
-            if(c->scope.wantsLog(run->name, run->build))
-                c->sendMessage(s);
-        }
+        http->notifyLog(run->name, run->build, s, false);
     }).then([p = std::move(exited)]() mutable {
         // wait until the process is reaped
         return kj::mv(p);
@@ -787,9 +682,9 @@ kj::Promise<void> Laminar::handleRunStep(Run* run) {
 }
 
 void Laminar::runFinished(Run * r) {
-    std::shared_ptr<Node> node = r->node;
+    std::shared_ptr<Context> ctx = r->context;
 
-    node->busyExecutors--;
+    ctx->busyExecutors--;
     LLOG(INFO, "Run completed", r->name, to_string(r->result));
     time_t completedAt = time(nullptr);
 
@@ -808,7 +703,7 @@ void Laminar::runFinished(Run * r) {
 
     std::string reason = r->reason();
     db->stmt("INSERT INTO builds VALUES(?,?,?,?,?,?,?,?,?,?,?,?)")
-     .bind(r->name, r->build, node->name, r->queuedAt, r->startedAt, completedAt, int(r->result),
+     .bind(r->name, r->build, ctx->name, r->queuedAt, r->startedAt, completedAt, int(r->result),
            maybeZipped, logsize, r->parentName, r->parentBuild, reason)
      .exec();
 
@@ -823,27 +718,12 @@ void Laminar::runFinished(Run * r) {
             .set("started", r->startedAt)
             .set("result", to_string(r->result))
             .set("reason", r->reason());
-    j.startArray("tags");
-    for(const str& t: jobTags[r->name]) {
-        j.String(t.c_str());
-    }
-    j.EndArray();
     j.startArray("artifacts");
     populateArtifacts(j, r->name, r->build);
     j.EndArray();
     j.EndObject();
-    const char* msg = j.str();
-    for(LaminarClient* c : clients) {
-        if(c->scope.wantsStatus(r->name, r->build))
-            c->sendMessage(msg);
-        c->notifyJobFinished();
-    }
-
-    // notify the waiters
-    for(LaminarWaiter* w : waiters) {
-        w->complete(r);
-    }
-
+    http->notifyEvent(j.str(), r->name);
+    http->notifyLog(r->name, r->build, "", true);
     // erase reference to run from activeJobs. Since runFinished is called in a
     // lambda whose context contains a shared_ptr<Run>, the run won't be deleted
     // until the context is destroyed at the end of the lambda execution.
@@ -884,7 +764,7 @@ bool Laminar::handleBadgeRequest(std::string job, std::string &badge) {
     db->stmt("SELECT result FROM builds WHERE name = ? ORDER BY number DESC LIMIT 1")
             .bind(job)
             .fetch<int>([&](int result){
-        rs = (RunState) result;
+        rs = RunState(result);
     });
     if(rs == RunState::UNKNOWN)
         return false;

src/laminar.h

@@ -19,54 +19,87 @@
 #ifndef LAMINAR_LAMINAR_H_
 #define LAMINAR_LAMINAR_H_
 
-#include "interface.h"
 #include "run.h"
-#include "node.h"
+#include "monitorscope.h"
+#include "context.h"
 #include "database.h"
 
 #include <unordered_map>
 #include <kj/filesystem.h>
+#include <kj/async-io.h>
 
-// Node name to node object map
-typedef std::unordered_map<std::string, std::shared_ptr<Node>> NodeMap;
+// Context name to context object map
+typedef std::unordered_map<std::string, std::shared_ptr<Context>> ContextMap;
 
 struct Server;
 class Json;
 
+class Http;
+class Rpc;
+
+struct Settings {
+    const char* home;
+    const char* bind_rpc;
+    const char* bind_http;
+    const char* archive_url;
+};
+
 // The main class implementing the application's business logic.
-// It owns a Server to manage the HTTP/websocket and Cap'n Proto RPC
-// interfaces and communicates via the LaminarInterface methods and
-// the LaminarClient objects (see interface.h)
-class Laminar final : public LaminarInterface {
+class Laminar final {
 public:
-    Laminar(const char* homePath);
-    ~Laminar() noexcept override;
+    Laminar(Server& server, Settings settings);
+    ~Laminar() noexcept;
 
-    // Runs the application forever
-    void run();
-    // Call this in a signal handler to make run() return
-    void stop();
+    // Queues a job, returns immediately. Return value will be nullptr if
+    // the supplied name is not a known job.
+    std::shared_ptr<Run> queueJob(std::string name, ParamMap params = ParamMap());
 
-    // Implementations of LaminarInterface
-    std::shared_ptr<Run> queueJob(std::string name, ParamMap params = ParamMap()) override;
-    void registerClient(LaminarClient* client) override;
-    void deregisterClient(LaminarClient* client) override;
-    void registerWaiter(LaminarWaiter* waiter) override;
-    void deregisterWaiter(LaminarWaiter* waiter) override;
-    uint latestRun(std::string job) override;
-    bool handleLogRequest(std::string name, uint num, std::string& output, bool& complete) override;
+    // Return the latest known number of the named job
+    uint latestRun(std::string job);
 
-    void sendStatus(LaminarClient* client) override;
-    bool setParam(std::string job, uint buildNum, std::string param, std::string value) override;
-    const std::list<std::shared_ptr<Run>>& listQueuedJobs() override;
-    const RunSet& listRunningJobs() override;
-    std::list<std::string> listKnownJobs() override;
-    kj::Maybe<kj::Own<const kj::ReadableFile>> getArtefact(std::string path) override;
-    bool handleBadgeRequest(std::string job, std::string& badge) override;
-    std::string getCustomCss() override;
-    bool abort(std::string job, uint buildNum) override;
-    void abortAll() override;
-    void notifyConfigChanged() override;
+    // Given a job name and number, return existence and (via reference params)
+    // its current log output and whether the job is ongoing
+    bool handleLogRequest(std::string name, uint num, std::string& output, bool& complete);
+
+    // Given a relevant scope, returns a JSON string describing the current
+    // server status. Content differs depending on the page viewed by the user,
+    // which should be provided as part of the scope.
+    std::string getStatus(MonitorScope scope);
+
+    // Implements the laminarc function of setting arbitrary parameters on a run,
+    // (typically the current run) which will be made available in the environment
+    // of subsequent scripts.
+    bool setParam(std::string job, uint buildNum, std::string param, std::string value);
+
+    // Gets the list of jobs currently waiting in the execution queue
+    const std::list<std::shared_ptr<Run>>& listQueuedJobs();
+
+    // Gets the list of currently executing jobs
+    const RunSet& listRunningJobs();
+
+    // Gets the list of known jobs - scans cfg/jobs for *.run files
+    std::list<std::string> listKnownJobs();
+
+    // Fetches the content of an artifact given its filename relative to
+    // $LAMINAR_HOME/archive. Ideally, this would instead be served by a
+    // proper web server which handles this url.
+    kj::Maybe<kj::Own<const kj::ReadableFile>> getArtefact(std::string path);
+
+    // Given the name of a job, populate the provided string reference with
+    // SVG content describing the last known state of the job. Returns false
+    // if the job is unknown.
+    bool handleBadgeRequest(std::string job, std::string& badge);
+
+    // Fetches the content of $LAMINAR_HOME/custom/style.css or an empty
+    // string. Ideally, this would instead be served by a proper web server
+    // which handles this url.
+    std::string getCustomCss();
+
+    // Aborts a single job
+    bool abort(std::string job, uint buildNum);
+
+    // Abort all running jobs
+    void abortAll();
 
 private:
     bool loadConfiguration();
@@ -74,7 +107,6 @@ private:
     bool tryStartRun(std::shared_ptr<Run> run, int queueIndex);
     kj::Promise<void> handleRunStep(Run *run);
     void runFinished(Run*);
-    bool nodeCanQueue(const Node&, std::string jobName) const;
     // expects that Json has started an array
     void populateArtifacts(Json& out, std::string job, uint num) const;
 
@@ -87,18 +119,22 @@ private:
 
     std::unordered_map<std::string, uint> buildNums;
 
-    std::unordered_map<std::string, std::set<std::string>> jobTags;
+    std::unordered_map<std::string, std::set<std::string>> jobContexts;
 
+    std::unordered_map<std::string, std::string> jobGroups;
+
+    Settings settings;
     RunSet activeJobs;
     Database* db;
-    Server* srv;
-    NodeMap nodes;
+    Server& srv;
+    ContextMap contexts;
     kj::Path homePath;
     kj::Own<const kj::Directory> fsHome;
-    std::set<LaminarClient*> clients;
-    std::set<LaminarWaiter*> waiters;
     uint numKeepRunDirs;
     std::string archiveUrl;
+
+    kj::Own<Http> http;
+    kj::Own<Rpc> rpc;
 };
 
 #endif // LAMINAR_LAMINAR_H_

src/log.h

@@ -27,26 +27,27 @@
 // paths from being encoded into the binary at all. Assumes / is the
 // path separator.
 namespace _ {
-	constexpr const char* static_basename_impl(const char* b, const char* t) {
-		return *t == '\0' ? b : static_basename_impl(*t == '/' ? t+1 : b, t+1);
-	}
-	constexpr const char* static_basename(const char* p) {
-		return static_basename_impl(p, p); 
-	}
-	constexpr int static_strlen(const char* s) {
-		return *s == '\0' ? 0 : static_strlen(s + 1) + 1;
-	}
-	template<int N, int...I>
-	static constexpr decltype(auto) static_alloc_str_impl(const char* str, std::integer_sequence<int, I...>) { 
-		return (struct {char buf[N+1];}) {str[I]..., 0};
-	}
-	template<int N>
-	static constexpr decltype(auto) static_alloc_str(const char* str) {
-		return static_alloc_str_impl<N>(str, std::make_integer_sequence<int, N>());
-	}
+    constexpr const char* static_basename_impl(const char* b, const char* t) {
+        return *t == '\0' ? b : static_basename_impl(*t == '/' ? t+1 : b, t+1);
+    }
+    constexpr const char* static_basename(const char* p) {
+        return static_basename_impl(p, p);
+    }
+    constexpr int static_strlen(const char* s) {
+        return *s == '\0' ? 0 : static_strlen(s + 1) + 1;
+    }
+    template<int N, int...I>
+    static constexpr decltype(auto) static_alloc_str_impl(const char* str, std::integer_sequence<int, I...>) {
+        typedef struct {char buf[N+1];} static_null_terminated;
+        return (static_null_terminated) {str[I]..., '\0'};
+    }
+    template<int N>
+    static constexpr decltype(auto) static_alloc_str(const char* str) {
+        return static_alloc_str_impl<N>(str, std::make_integer_sequence<int, N>());
+    }
 }
-#define __FILE_BASE__ (_::static_alloc_str<_::static_strlen(_::static_basename(__FILE__))>(_::static_basename(__FILE__)).buf)
-
+#define __FILE_BASE__ (::_::static_alloc_str<::_::static_strlen(::_::static_basename(__FILE__))>\
+                        (::_::static_basename(__FILE__)).buf)
 
 // Provide alternative implementations to those from kj/debug.h which
 // use __FILE__ directly and thus cause the full path to be encoded in

src/main.cpp

@@ -17,17 +17,31 @@
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
 #include "laminar.h"
+#include "server.h"
 #include "log.h"
 #include <signal.h>
 #include <kj/async-unix.h>
 #include <kj/filesystem.h>
 
 static Laminar* laminar;
+static Server* server;
 
 static void laminar_quit(int) {
-    laminar->stop();
+    // Abort current jobs. Most of the time this isn't necessary since
+    // systemd stop or other kill mechanism will send SIGTERM to the whole
+    // process group.
+    laminar->abortAll();
+    server->stop();
 }
 
+namespace {
+constexpr const char* INTADDR_RPC_DEFAULT = "unix-abstract:laminar";
+constexpr const char* INTADDR_HTTP_DEFAULT = "*:8080";
+constexpr const char* ARCHIVE_URL_DEFAULT = "/archive/";
+}
+
+
+
 int main(int argc, char** argv) {
     for(int i = 1; i < argc; ++i) {
         if(strcmp(argv[i], "-v") == 0) {
@@ -35,15 +49,27 @@ int main(int argc, char** argv) {
         }
     }
 
-    laminar = new Laminar(getenv("LAMINAR_HOME") ?: "/var/lib/laminar");
+    auto ioContext = kj::setupAsyncIo();
+
+    Settings settings;
+    // Default values when none were supplied in $LAMINAR_CONF_FILE (/etc/laminar.conf)
+    settings.home = getenv("LAMINAR_HOME") ?: "/var/lib/laminar";
+    settings.bind_rpc = getenv("LAMINAR_BIND_RPC") ?: INTADDR_RPC_DEFAULT;
+    settings.bind_http = getenv("LAMINAR_BIND_HTTP") ?: INTADDR_HTTP_DEFAULT;
+    settings.archive_url = getenv("LAMINAR_ARCHIVE_URL") ?: ARCHIVE_URL_DEFAULT;
+
+    server = new Server(ioContext);
+    laminar = new Laminar(*server, settings);
+
     kj::UnixEventPort::captureChildExit();
 
     signal(SIGINT, &laminar_quit);
     signal(SIGTERM, &laminar_quit);
 
-    laminar->run();
+    server->start();
 
     delete laminar;
+    delete server;
 
     LLOG(INFO, "Clean exit");
     return 0;

src/monitorscope.h

@@ -0,0 +1,63 @@
+///
+/// Copyright 2015-2019 Oliver Giles
+///
+/// This file is part of Laminar
+///
+/// Laminar is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Laminar is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/// GNU General Public License for more details.
+///
+/// You should have received a copy of the GNU General Public License
+/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
+///
+#ifndef LAMINAR_MONITORSCOPE_H_
+#define LAMINAR_MONITORSCOPE_H_
+
+#include <string>
+
+// Simple struct to define which information a frontend client is interested
+// in, both in initial request phase and real-time updates. It corresponds
+// loosely to frontend URLs
+struct MonitorScope {
+    enum Type {
+        HOME, // home page: recent builds and statistics
+        ALL,  // browse jobs
+        JOB,  // a specific job page
+        RUN,  // a specific run page
+    };
+
+    MonitorScope(Type type = HOME, std::string job = std::string(), uint num = 0) :
+        type(type),
+        job(job),
+        num(num),
+        page(0),
+        field("number"),
+        order_desc(true)
+    {}
+
+    // whether this scope wants status information for the specified job
+    bool wantsStatus(std::string ajob, uint anum = 0) const {
+        if(type == HOME || type == ALL) return true;
+        else return ajob == job;
+        // we could have checked that the run number matches, but actually the
+        // run page needs to know about a non-matching run number in order to
+        // know whether to display the "next" arrow.
+    }
+
+    Type type;
+    std::string job;
+    uint num ;
+    // sorting
+    uint page;
+    std::string field;
+    bool order_desc;
+};
+
+#endif // LAMINAR_MONITORSCOPE_H_
+

src/resources/index.html

@@ -207,8 +207,8 @@
      <input class="form-control" id="jobFilter" v-model="search" placeholder="Filter...">
     </div>
     <ul class="nav nav-tabs">
-     <li :class="{'active':tag==null}"><a href v-on:click.prevent="tag = null">All Jobs</a></li>
-     <li v-for="t in tags" :class="{'active':t==tag}"><a href v-on:click.prevent="tag = t">{{t}}</a></li>
+     <li v-show="ungrouped.length" :class="{'active':group==null}"><a href v-on:click.prevent="group = null">Ungrouped Jobs</a></li>
+     <li v-for="g in Object.keys(groups)" :class="{'active':g==group}"><a href v-on:click.prevent="group = g">{{g}}</a></li>
     </ul>
     <table class="table table-striped" id="joblist">
      <tr   v-for="job in filteredJobs()">

src/resources/js/app.js

@@ -22,30 +22,30 @@ const timeScale = function(max){
   ? { scale:function(v){return Math.round(v/60)/10}, label:'Minutes' }
   : { scale:function(v){return v;}, label:'Seconds' };
 }
-
-const WebsocketHandler = function() {
-  function setupWebsocket(path, next) {
-    let ws = new WebSocket(document.head.baseURI.replace(/^http/,'ws') + path.substr(1));
-    ws.onmessage = function(msg) {
+const ServerEventHandler = function() {
+  function setupEventSource(path, query, next) {
+    const es = new EventSource(document.head.baseURI + path.substr(1) + query);
+    es.path = path; // save for later in case we need to add query params
+    es.onmessage = function(msg) {
       msg = JSON.parse(msg.data);
-      // "status" is the first message the websocket always delivers.
+      // "status" is the first message the server always delivers.
       // Use this to confirm the navigation. The component is not
       // created until next() is called, so creating a reference
       // for other message types must be deferred. There are some extra
-      // subtle checks here. If this websocket already has a component,
+      // subtle checks here. If this eventsource already has a component,
       // then this is not the first time the status message has been
       // received. If the frontend requests an update, the status message
       // should not be handled here, but treated the same as any other
       // message. An exception is if the connection has been lost - in
       // that case we should treat this as a "first-time" status message.
-      // this.comp.ws is used as a proxy for this.
-      if (msg.type === 'status' && (!this.comp || !this.comp.ws)) {
+      // this.comp.es is used as a proxy for this.
+      if (msg.type === 'status' && (!this.comp || !this.comp.es)) {
         next(comp => {
           // Set up bidirectional reference
           // 1. needed to reference the component for other msg types
           this.comp = comp;
           // 2. needed to close the ws on navigation away
-          comp.ws = this;
+          comp.es = this;
           // Update html and nav titles
           document.title = comp.$root.title = msg.title;
           // Calculate clock offset (used by ProgressUpdater)
@@ -59,47 +59,35 @@ const WebsocketHandler = function() {
         if (!this.comp)
           return console.error("Page component was undefined");
         else {
+          this.comp.$root.connected = true;
           this.comp.$root.showNotify(msg.type, msg.data);
           if(typeof this.comp[msg.type] === 'function')
             this.comp[msg.type](msg.data);
         }
       }
-    };
-    ws.onclose = function(ev) {
-      // if this.comp isn't set, this connection has never been used
-      // and a re-connection isn't meaningful
-      if(!ev.wasClean && 'comp' in this) {
-        this.comp.$root.connected = false;
-        // remove the reference to the websocket from the component.
-        // This not only cleans up an unneeded reference but ensures a
-        // status message on reconnection is treated as "first-time"
-        delete this.comp.ws;
-        this.reconnectTimeout = setTimeout(()=>{
-          var newWs = setupWebsocket(path, (fn) => { fn(this.comp); });
-          // the next() callback won't happen if the server is still
-          // unreachable. Save the reference to the last component
-          // here so we can recover if/when it does return. This means
-          // passing this.comp in the next() callback above is redundant
-          // but necessary to keep the same implementation.
-          newWs.comp = this.comp;
-        }, 2000);
-      }
     }
-    return ws;
-  };
+    es.onerror = function() {
+      this.comp.$root.connected = false;
+    }
+    return es;
+  }
   return {
     beforeRouteEnter(to, from, next) {
-      setupWebsocket(to.path, (fn) => { next(fn); });
+      setupEventSource(to.path, '', (fn) => { next(fn); });
     },
     beforeRouteUpdate(to, from, next) {
-      this.ws.close();
-      clearTimeout(this.ws.reconnectTimeout);
-      setupWebsocket(to.path, (fn) => { fn(this); next(); });
+      this.es.close();
+      setupEventSource(to.path, '', (fn) => { fn(this); next(); });
     },
     beforeRouteLeave(to, from, next) {
-      this.ws.close();
-      clearTimeout(this.ws.reconnectTimeout);
+      this.es.close();
       next();
+    },
+    methods: {
+      query(q) {
+        this.es.close();
+        setupEventSource(this.es.path, '?' + Object.entries(q).map(([k,v])=>`${k}=${v}`).join('&'), (fn) => { fn(this); });
+      }
     }
   };
 }();
@@ -195,7 +183,7 @@ const Home = function() {
 
   return {
     template: '#home',
-    mixins: [WebsocketHandler, Utils, ProgressUpdater],
+    mixins: [ServerEventHandler, Utils, ProgressUpdater],
     data: function() {
       return state;
     },
@@ -427,12 +415,13 @@ const Jobs = function() {
   var state = {
     jobs: [],
     search: '',
-    tags: [],
-    tag: null
+    groups: {},
+    group: null,
+    ungrouped: []
   };
   return {
     template: '#jobs',
-    mixins: [WebsocketHandler, Utils, ProgressUpdater],
+    mixins: [ServerEventHandler, Utils, ProgressUpdater],
     data: function() { return state; },
     methods: {
       status: function(msg) {
@@ -449,13 +438,10 @@ const Jobs = function() {
             state.jobs.sort(function(a, b){return a.name < b.name ? -1 : a.name > b.name ? 1 : 0;});
           }
         }
-        var tags = {};
-        for (var i in state.jobs) {
-          for (var j in state.jobs[i].tags) {
-            tags[state.jobs[i].tags[j]] = true;
-          }
-        }
-        state.tags = Object.keys(tags);
+        state.groups = {};
+        Object.keys(msg.groups).map(k => state.groups[k] = new RegExp(msg.groups[k]));
+        state.ungrouped = state.jobs.filter(j => !Object.values(state.groups).some(r => r.test(j.name))).map(j => j.name);
+        state.group = state.ungrouped.length ? null : Object.keys(state.groups)[0];
       },
       job_started: function(data) {
         var updAt = null;
@@ -482,6 +468,8 @@ const Jobs = function() {
           // first execution of new job. TODO insert without resort
           state.jobs.unshift(data);
           state.jobs.sort(function(a, b){return a.name < b.name ? -1 : a.name > b.name ? 1 : 0;});
+          if(!Object.values(state.groups).some(r => r.test(data.name)))
+              state.ungrouped.push(data.name);
         } else {
           state.jobs[updAt] = data;
         }
@@ -504,19 +492,13 @@ const Jobs = function() {
         }
       },
       filteredJobs: function() {
-        var ret = state.jobs;
-        var tag = state.tag;
-        if (tag) {
-          ret = ret.filter(function(job) {
-            return job.tags.indexOf(tag) >= 0;
-          });
-        }
-        var search = this.search;
-        if (search) {
-          ret = ret.filter(function(job) {
-            return job.name.indexOf(search) > -1;
-          });
-        }
+        let ret = [];
+        if (state.group)
+          ret = state.jobs.filter(job => state.groups[state.group].test(job.name));
+        else
+          ret = state.jobs.filter(job => state.ungrouped.includes(job.name));
+        if (this.search)
+          ret = ret.filter(job => job.name.indexOf(this.search) > -1);
         return ret;
       },
     }
@@ -536,7 +518,7 @@ var Job = function() {
   var chtBt = null;
   return Vue.extend({
     template: '#job',
-    mixins: [WebsocketHandler, Utils, ProgressUpdater],
+    mixins: [ServerEventHandler, Utils, ProgressUpdater],
     data: function() {
       return state;
     },
@@ -634,11 +616,11 @@ var Job = function() {
       },
       page_next: function() {
         state.sort.page++;
-        this.ws.send(JSON.stringify(state.sort));
+        this.query(state.sort)
       },
       page_prev: function() {
         state.sort.page--;
-        this.ws.send(JSON.stringify(state.sort));
+        this.query(state.sort)
       },
       do_sort: function(field) {
         if(state.sort.field == field) {
@@ -647,7 +629,7 @@ var Job = function() {
           state.sort.order = 'dsc';
           state.sort.field = field;
         }
-        this.ws.send(JSON.stringify(state.sort));
+        this.query(state.sort)
       }
     }
   });
@@ -690,7 +672,7 @@ const Run = function() {
 
   return {
     template: '#run',
-    mixins: [WebsocketHandler, Utils, ProgressUpdater],
+    mixins: [ServerEventHandler, Utils, ProgressUpdater],
     data: function() {
       return state;
     },

src/rpc.cpp

@@ -0,0 +1,191 @@
+///
+/// Copyright 2015-2019 Oliver Giles
+///
+/// This file is part of Laminar
+///
+/// Laminar is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Laminar is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/// GNU General Public License for more details.
+///
+/// You should have received a copy of the GNU General Public License
+/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
+///
+#include "rpc.h"
+#include "laminar.capnp.h"
+#include "laminar.h"
+#include "log.h"
+
+namespace {
+
+// Used for returning run state to RPC clients
+LaminarCi::JobResult fromRunState(RunState state) {
+    switch(state) {
+    case RunState::SUCCESS: return LaminarCi::JobResult::SUCCESS;
+    case RunState::FAILED:  return LaminarCi::JobResult::FAILED;
+    case RunState::ABORTED: return LaminarCi::JobResult::ABORTED;
+    default:
+        return LaminarCi::JobResult::UNKNOWN;
+    }
+}
+
+}
+// This is the implementation of the Laminar Cap'n Proto RPC interface.
+// As such, it implements the pure virtual interface generated from
+// laminar.capnp with calls to the primary Laminar class
+class RpcImpl : public LaminarCi::Server {
+public:
+    RpcImpl(Laminar& l) :
+        LaminarCi::Server(),
+        laminar(l)
+    {
+    }
+
+    virtual ~RpcImpl() {
+    }
+
+    // Queue a job, without waiting for it to start
+    kj::Promise<void> queue(QueueContext context) override {
+        std::string jobName = context.getParams().getJobName();
+        LLOG(INFO, "RPC queue", jobName);
+        LaminarCi::MethodResult result = laminar.queueJob(jobName, params(context.getParams().getParams()))
+                ? LaminarCi::MethodResult::SUCCESS
+                : LaminarCi::MethodResult::FAILED;
+        context.getResults().setResult(result);
+        return kj::READY_NOW;
+    }
+
+    // Start a job, without waiting for it to finish
+    kj::Promise<void> start(StartContext context) override {
+        std::string jobName = context.getParams().getJobName();
+        LLOG(INFO, "RPC start", jobName);
+        std::shared_ptr<Run> run = laminar.queueJob(jobName, params(context.getParams().getParams()));
+        if(Run* r = run.get()) {
+            return r->whenStarted().then([context,r]() mutable {
+                context.getResults().setResult(LaminarCi::MethodResult::SUCCESS);
+                context.getResults().setBuildNum(r->build);
+            });
+        } else {
+            context.getResults().setResult(LaminarCi::MethodResult::FAILED);
+            return kj::READY_NOW;
+        }
+    }
+
+    // Start a job and wait for the result
+    kj::Promise<void> run(RunContext context) override {
+        std::string jobName = context.getParams().getJobName();
+        LLOG(INFO, "RPC run", jobName);
+        std::shared_ptr<Run> run = laminar.queueJob(jobName, params(context.getParams().getParams()));
+        if(Run* r = run.get()) {
+            return r->whenFinished().then([context,r](RunState state) mutable {
+                context.getResults().setResult(fromRunState(state));
+                context.getResults().setBuildNum(r->build);
+            });
+        } else {
+            context.getResults().setResult(LaminarCi::JobResult::UNKNOWN);
+            return kj::READY_NOW;
+        }
+    }
+
+    // Set a parameter on a running build
+    kj::Promise<void> set(SetContext context) override {
+        std::string jobName = context.getParams().getRun().getJob();
+        uint buildNum = context.getParams().getRun().getBuildNum();
+        LLOG(INFO, "RPC set", jobName, buildNum);
+
+        LaminarCi::MethodResult result = laminar.setParam(jobName, buildNum,
+            context.getParams().getParam().getName(), context.getParams().getParam().getValue())
+                ? LaminarCi::MethodResult::SUCCESS
+                : LaminarCi::MethodResult::FAILED;
+        context.getResults().setResult(result);
+        return kj::READY_NOW;
+    }
+
+    // List jobs in queue
+    kj::Promise<void> listQueued(ListQueuedContext context) override {
+        const std::list<std::shared_ptr<Run>>& queue = laminar.listQueuedJobs();
+        auto res = context.getResults().initResult(queue.size());
+        int i = 0;
+        for(auto it : queue) {
+            res.set(i++, it->name);
+        }
+        return kj::READY_NOW;
+    }
+
+    // List running jobs
+    kj::Promise<void> listRunning(ListRunningContext context) override {
+        const RunSet& active = laminar.listRunningJobs();
+        auto res = context.getResults().initResult(active.size());
+        int i = 0;
+        for(auto it : active) {
+            res[i].setJob(it->name);
+            res[i].setBuildNum(it->build);
+            i++;
+        }
+        return kj::READY_NOW;
+    }
+
+    // List known jobs
+    kj::Promise<void> listKnown(ListKnownContext context) override {
+        std::list<std::string> known = laminar.listKnownJobs();
+        auto res = context.getResults().initResult(known.size());
+        int i = 0;
+        for(auto it : known) {
+            res.set(i++, it);
+        }
+        return kj::READY_NOW;
+    }
+
+    kj::Promise<void> abort(AbortContext context) override {
+        std::string jobName = context.getParams().getRun().getJob();
+        uint buildNum = context.getParams().getRun().getBuildNum();
+        LLOG(INFO, "RPC abort", jobName, buildNum);
+        LaminarCi::MethodResult result = laminar.abort(jobName, buildNum)
+                ? LaminarCi::MethodResult::SUCCESS
+                : LaminarCi::MethodResult::FAILED;
+        context.getResults().setResult(result);
+        return kj::READY_NOW;
+    }
+
+private:
+    // Helper to convert an RPC parameter list to a hash map
+    ParamMap params(const capnp::List<LaminarCi::JobParam>::Reader& paramReader) {
+        ParamMap res;
+        for(auto p : paramReader) {
+            res[p.getName().cStr()] = p.getValue().cStr();
+        }
+        return res;
+    }
+
+    Laminar& laminar;
+    std::unordered_map<const Run*, std::list<kj::PromiseFulfillerPair<RunState>>> runWaiters;
+};
+
+Rpc::Rpc(Laminar& li) :
+    rpcInterface(kj::heap<RpcImpl>(li))
+{}
+
+// Context for an RPC connection
+struct RpcConnection {
+    RpcConnection(kj::Own<kj::AsyncIoStream>&& stream,
+                  capnp::Capability::Client bootstrap,
+                  capnp::ReaderOptions readerOpts) :
+        stream(kj::mv(stream)),
+        network(*this->stream, capnp::rpc::twoparty::Side::SERVER, readerOpts),
+        rpcSystem(capnp::makeRpcServer(network, bootstrap))
+    {
+    }
+    kj::Own<kj::AsyncIoStream> stream;
+    capnp::TwoPartyVatNetwork network;
+    capnp::RpcSystem<capnp::rpc::twoparty::VatId> rpcSystem;
+};
+
+kj::Promise<void> Rpc::accept(kj::Own<kj::AsyncIoStream>&& connection) {
+    auto server = kj::heap<RpcConnection>(kj::mv(connection), rpcInterface, capnp::ReaderOptions());
+    return server->network.onDisconnect().attach(kj::mv(server));
+}

src/rpc.h

@@ -0,0 +1,36 @@
+///
+/// Copyright 2019 Oliver Giles
+///
+/// This file is part of Laminar
+///
+/// Laminar is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Laminar is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/// GNU General Public License for more details.
+///
+/// You should have received a copy of the GNU General Public License
+/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
+///
+#ifndef LAMINAR_RPC_H_
+#define LAMINAR_RPC_H_
+
+#include <capnp/ez-rpc.h>
+#include <capnp/rpc-twoparty.h>
+#include <capnp/rpc.capnp.h>
+
+struct Laminar;
+
+class Rpc {
+public:
+    Rpc(Laminar&li);
+    kj::Promise<void> accept(kj::Own<kj::AsyncIoStream>&& connection);
+
+    capnp::Capability::Client rpcInterface;
+};
+
+#endif //LAMINAR_RPC_H_

src/run.cpp

@@ -17,7 +17,7 @@
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
 #include "run.h"
-#include "node.h"
+#include "context.h"
 #include "conf.h"
 #include "log.h"
 
@@ -51,7 +51,8 @@ Run::Run(std::string name, ParamMap pm, kj::Path&& rootPath) :
     params(kj::mv(pm)),
     queuedAt(time(nullptr)),
     rootPath(kj::mv(rootPath)),
-    started(kj::newPromiseAndFulfiller<void>())
+    started(kj::newPromiseAndFulfiller<void>()),
+    finished(kj::newPromiseAndFulfiller<RunState>())
 {
     for(auto it = params.begin(); it != params.end();) {
         if(it->first[0] == '=') {
@@ -74,7 +75,7 @@ Run::~Run() {
     LLOG(INFO, "Run destroyed");
 }
 
-bool Run::configure(uint buildNum, std::shared_ptr<Node> nd, const kj::Directory& fsHome)
+bool Run::configure(uint buildNum, std::shared_ptr<Context> nd, const kj::Directory& fsHome)
 {
     kj::Path cfgDir{"cfg"};
 
@@ -116,9 +117,6 @@ bool Run::configure(uint buildNum, std::shared_ptr<Node> nd, const kj::Directory
     // global before-run script
     if(fsHome.exists(cfgDir/"before"))
         addScript(cfgDir/"before", rd.clone());
-    // per-node before-run script
-    if(fsHome.exists(cfgDir/"nodes"/(nd->name+".before")))
-        addScript(cfgDir/"nodes"/(nd->name+".before"), rd.clone());
     // job before-run script
     if(fsHome.exists(cfgDir/"jobs"/(name+".before")))
         addScript(cfgDir/"jobs"/(name+".before"), rd.clone());
@@ -127,9 +125,6 @@ bool Run::configure(uint buildNum, std::shared_ptr<Node> nd, const kj::Directory
     // job after-run script
     if(fsHome.exists(cfgDir/"jobs"/(name+".after")))
         addScript(cfgDir/"jobs"/(name+".after"), rd.clone(), true);
-    // per-node after-run script
-    if(fsHome.exists(cfgDir/"nodes"/(nd->name+".after")))
-        addScript(cfgDir/"nodes"/(nd->name+".after"), rd.clone(), true);
     // global after-run script
     if(fsHome.exists(cfgDir/"after"))
         addScript(cfgDir/"after", rd.clone(), true);
@@ -137,8 +132,8 @@ bool Run::configure(uint buildNum, std::shared_ptr<Node> nd, const kj::Directory
     // add environment files
     if(fsHome.exists(cfgDir/"env"))
         addEnv(cfgDir/"env");
-    if(fsHome.exists(cfgDir/"nodes"/(nd->name+".env")))
-        addEnv(cfgDir/"nodes"/(nd->name+".env"));
+    if(fsHome.exists(cfgDir/"contexts"/(nd->name+".env")))
+        addEnv(cfgDir/"contexts"/(nd->name+".env"));
     if(fsHome.exists(cfgDir/"jobs"/(name+".env")))
         addEnv(cfgDir/"jobs"/(name+".env"));
 
@@ -150,7 +145,7 @@ bool Run::configure(uint buildNum, std::shared_ptr<Node> nd, const kj::Directory
     // All good, we've "started"
     startedAt = time(nullptr);
     build = buildNum;
-    node = nd;
+    context = nd;
 
     // notifies the rpc client if the start command was used
     started.fulfiller->fulfill();
@@ -211,8 +206,7 @@ bool Run::step() {
         setenv("PATH", PATH.c_str(), true);
         setenv("RUN", buildNum.c_str(), true);
         setenv("JOB", name.c_str(), true);
-        if(!node->name.empty())
-            setenv("NODE", node->name.c_str(), true);
+        setenv("CONTEXT", context->name.c_str(), true);
         setenv("RESULT", to_string(result).c_str(), true);
         setenv("LAST_RESULT", to_string(lastResult).c_str(), true);
         setenv("WORKSPACE", (rootPath/"run"/name/"workspace").toString(true).cStr(), true);
@@ -261,4 +255,6 @@ void Run::reaped(int status) {
     else if(status != 0)
         result = RunState::FAILED;
     // otherwise preserve earlier status
+
+    finished.fulfiller->fulfill(RunState(result));
 }

src/run.h

@@ -29,6 +29,9 @@
 #include <kj/async.h>
 #include <kj/filesystem.h>
 
+// Definition needed for musl
+typedef unsigned int uint;
+
 enum class RunState {
     UNKNOWN,
     PENDING,
@@ -40,7 +43,7 @@ enum class RunState {
 
 std::string to_string(const RunState& rs);
 
-class Node;
+class Context;
 
 typedef std::unordered_map<std::string, std::string> ParamMap;
 
@@ -54,8 +57,8 @@ public:
     Run(const Run&) = delete;
     Run& operator=(const Run&) = delete;
 
-    // Call this to "start" the run with a specific number and node
-    bool configure(uint buildNum, std::shared_ptr<Node> node, const kj::Directory &fsHome);
+    // Call this to "start" the run with a specific number and context
+    bool configure(uint buildNum, std::shared_ptr<Context> context, const kj::Directory &fsHome);
 
     // executes the next script (if any), returning true if there is nothing
     // more to be done.
@@ -71,8 +74,9 @@ public:
     std::string reason() const;
 
     kj::Promise<void>&& whenStarted() { return kj::mv(started.promise); }
+    kj::Promise<RunState>&& whenFinished() { return kj::mv(finished.promise); }
 
-    std::shared_ptr<Node> node;
+    std::shared_ptr<Context> context;
     RunState result;
     RunState lastResult;
     std::string name;
@@ -105,6 +109,7 @@ private:
     std::list<kj::Path> env;
     std::string reasonMsg;
     kj::PromiseFulfillerPair<void> started;
+    kj::PromiseFulfillerPair<RunState> finished;
 };
 
 

src/server.cpp

@@ -17,507 +17,29 @@
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
 #include "server.h"
-#include "interface.h"
-#include "laminar.capnp.h"
-#include "resources.h"
 #include "log.h"
+#include "rpc.h"
+#include "http.h"
+#include "laminar.h"
 
-#include <capnp/ez-rpc.h>
-#include <capnp/rpc-twoparty.h>
-#include <capnp/rpc.capnp.h>
 #include <kj/async-io.h>
 #include <kj/async-unix.h>
 #include <kj/threadlocal.h>
 
+#include <signal.h>
 #include <sys/eventfd.h>
 #include <sys/inotify.h>
-#include <sys/signal.h>
 #include <sys/signalfd.h>
 
-#include <rapidjson/document.h>
-
 // Size of buffer used to read from file descriptors. Should be
 // a multiple of sizeof(struct signalfd_siginfo) == 128
 #define PROC_IO_BUFSIZE 4096
 
-namespace {
-
-// Used for returning run state to RPC clients
-LaminarCi::JobResult fromRunState(RunState state) {
-    switch(state) {
-    case RunState::SUCCESS: return LaminarCi::JobResult::SUCCESS;
-    case RunState::FAILED:  return LaminarCi::JobResult::FAILED;
-    case RunState::ABORTED: return LaminarCi::JobResult::ABORTED;
-    default:
-        return LaminarCi::JobResult::UNKNOWN;
-    }
-}
-
-}
-
-// This is the implementation of the Laminar Cap'n Proto RPC interface.
-// As such, it implements the pure virtual interface generated from
-// laminar.capnp with calls to the LaminarInterface
-class RpcImpl : public LaminarCi::Server, public LaminarWaiter {
-public:
-    RpcImpl(LaminarInterface& l) :
-        LaminarCi::Server(),
-        laminar(l)
-    {
-        laminar.registerWaiter(this);
-    }
-
-    ~RpcImpl() override {
-        laminar.deregisterWaiter(this);
-    }
-
-    // Queue a job, without waiting for it to start
-    kj::Promise<void> queue(QueueContext context) override {
-        std::string jobName = context.getParams().getJobName();
-        LLOG(INFO, "RPC queue", jobName);
-        LaminarCi::MethodResult result = laminar.queueJob(jobName, params(context.getParams().getParams()))
-                ? LaminarCi::MethodResult::SUCCESS
-                : LaminarCi::MethodResult::FAILED;
-        context.getResults().setResult(result);
-        return kj::READY_NOW;
-    }
-
-    // Start a job, without waiting for it to finish
-    kj::Promise<void> start(StartContext context) override {
-        std::string jobName = context.getParams().getJobName();
-        LLOG(INFO, "RPC start", jobName);
-        std::shared_ptr<Run> run = laminar.queueJob(jobName, params(context.getParams().getParams()));
-        if(Run* r = run.get()) {
-            return r->whenStarted().then([context,r]() mutable {
-                context.getResults().setResult(LaminarCi::MethodResult::SUCCESS);
-                context.getResults().setBuildNum(r->build);
-            });
-        } else {
-            context.getResults().setResult(LaminarCi::MethodResult::FAILED);
-            return kj::READY_NOW;
-        }
-    }
-
-    // Start a job and wait for the result
-    kj::Promise<void> run(RunContext context) override {
-        std::string jobName = context.getParams().getJobName();
-        LLOG(INFO, "RPC run", jobName);
-        std::shared_ptr<Run> run = laminar.queueJob(jobName, params(context.getParams().getParams()));
-        if(const Run* r = run.get()) {
-            runWaiters[r].emplace_back(kj::newPromiseAndFulfiller<RunState>());
-            return runWaiters[r].back().promise.then([context,run](RunState state) mutable {
-                context.getResults().setResult(fromRunState(state));
-                context.getResults().setBuildNum(run->build);
-            });
-        } else {
-            context.getResults().setResult(LaminarCi::JobResult::UNKNOWN);
-            return kj::READY_NOW;
-        }
-    }
-
-    // Set a parameter on a running build
-    kj::Promise<void> set(SetContext context) override {
-        std::string jobName = context.getParams().getRun().getJob();
-        uint buildNum = context.getParams().getRun().getBuildNum();
-        LLOG(INFO, "RPC set", jobName, buildNum);
-
-        LaminarCi::MethodResult result = laminar.setParam(jobName, buildNum,
-            context.getParams().getParam().getName(), context.getParams().getParam().getValue())
-                ? LaminarCi::MethodResult::SUCCESS
-                : LaminarCi::MethodResult::FAILED;
-        context.getResults().setResult(result);
-        return kj::READY_NOW;
-    }
-
-    // List jobs in queue
-    kj::Promise<void> listQueued(ListQueuedContext context) override {
-        const std::list<std::shared_ptr<Run>>& queue = laminar.listQueuedJobs();
-        auto res = context.getResults().initResult(queue.size());
-        int i = 0;
-        for(auto it : queue) {
-            res.set(i++, it->name);
-        }
-        return kj::READY_NOW;
-    }
-
-    // List running jobs
-    kj::Promise<void> listRunning(ListRunningContext context) override {
-        const RunSet& active = laminar.listRunningJobs();
-        auto res = context.getResults().initResult(active.size());
-        int i = 0;
-        for(auto it : active) {
-            res[i].setJob(it->name);
-            res[i].setBuildNum(it->build);
-            i++;
-        }
-        return kj::READY_NOW;
-    }
-
-    // List known jobs
-    kj::Promise<void> listKnown(ListKnownContext context) override {
-        std::list<std::string> known = laminar.listKnownJobs();
-        auto res = context.getResults().initResult(known.size());
-        int i = 0;
-        for(auto it : known) {
-            res.set(i++, it);
-        }
-        return kj::READY_NOW;
-    }
-
-    kj::Promise<void> abort(AbortContext context) override {
-        std::string jobName = context.getParams().getRun().getJob();
-        uint buildNum = context.getParams().getRun().getBuildNum();
-        LLOG(INFO, "RPC abort", jobName, buildNum);
-        LaminarCi::MethodResult result = laminar.abort(jobName, buildNum)
-                ? LaminarCi::MethodResult::SUCCESS
-                : LaminarCi::MethodResult::FAILED;
-        context.getResults().setResult(result);
-        return kj::READY_NOW;
-    }
-
-private:
-    // Helper to convert an RPC parameter list to a hash map
-    ParamMap params(const capnp::List<LaminarCi::JobParam>::Reader& paramReader) {
-        ParamMap res;
-        for(auto p : paramReader) {
-            res[p.getName().cStr()] = p.getValue().cStr();
-        }
-        return res;
-    }
-
-    // Implements LaminarWaiter::complete
-    void complete(const Run* r) override {
-        for(kj::PromiseFulfillerPair<RunState>& w : runWaiters[r])
-            w.fulfiller->fulfill(RunState(r->result));
-        runWaiters.erase(r);
-    }
-private:
-    LaminarInterface& laminar;
-    std::unordered_map<const Run*, std::list<kj::PromiseFulfillerPair<RunState>>> runWaiters;
-};
-
-// This is the implementation of the HTTP/Websocket interface. It creates
-// websocket connections as LaminarClients and registers them with the
-// LaminarInterface so that status messages will be delivered to the client.
-// On opening a websocket connection, it delivers a status snapshot message
-// (see LaminarInterface::sendStatus)
-class HttpImpl : public kj::HttpService {
-public:
-    HttpImpl(LaminarInterface& laminar, kj::HttpHeaderTable&tbl) :
-        laminar(laminar),
-        responseHeaders(tbl)
-    {}
-    virtual ~HttpImpl() {}
-
-private:
-    class HttpChunkedClient : public LaminarClient {
-    public:
-        HttpChunkedClient(LaminarInterface& laminar) :
-            laminar(laminar)
-        {}
-        ~HttpChunkedClient() override {
-            laminar.deregisterClient(this);
-        }
-        void sendMessage(std::string payload) override {
-            chunks.push_back(kj::mv(payload));
-            fulfiller->fulfill();
-        }
-        void notifyJobFinished() override {
-            done = true;
-            fulfiller->fulfill();
-        }
-        LaminarInterface& laminar;
-        std::list<std::string> chunks;
-        // cannot use chunks.empty() because multiple fulfill()s
-        // could be coalesced
-        bool done = false;
-        kj::Own<kj::PromiseFulfiller<void>> fulfiller;
-    };
-
-    // Implements LaminarClient and holds the Websocket connection object.
-    // Automatically destructed when the promise created in request() resolves
-    // or is cancelled
-    class WebsocketClient : public LaminarClient {
-    public:
-        WebsocketClient(LaminarInterface& laminar, kj::Own<kj::WebSocket>&& ws) :
-            laminar(laminar),
-            ws(kj::mv(ws))
-        {}
-        ~WebsocketClient() override {
-            laminar.deregisterClient(this);
-        }
-        virtual void sendMessage(std::string payload) override {
-            messages.emplace_back(kj::mv(payload));
-            // sendMessage might be called several times before the event loop
-            // gets a chance to act on the fulfiller. So store the payload here
-            // where it can be fetched later and don't pass the payload with the
-            // fulfiller because subsequent calls to fulfill() are ignored.
-            fulfiller->fulfill();
-        }
-        LaminarInterface& laminar;
-        kj::Own<kj::WebSocket> ws;
-        std::list<std::string> messages;
-        kj::Own<kj::PromiseFulfiller<void>> fulfiller;
-    };
-
-    kj::Promise<void> websocketRead(WebsocketClient& lc)
-    {
-        return lc.ws->receive().then([&lc,this](kj::WebSocket::Message&& message) {
-            KJ_SWITCH_ONEOF(message) {
-                KJ_CASE_ONEOF(str, kj::String) {
-                    rapidjson::Document d;
-                    d.ParseInsitu(const_cast<char*>(str.cStr()));
-                    if(d.HasMember("page") && d["page"].IsInt() && d.HasMember("field") && d["field"].IsString() && d.HasMember("order") && d["order"].IsString()) {
-                        lc.scope.page = d["page"].GetInt();
-                        lc.scope.field = d["field"].GetString();
-                        lc.scope.order_desc = strcmp(d["order"].GetString(), "dsc") == 0;
-                        laminar.sendStatus(&lc);
-                        return websocketRead(lc);
-                    }
-                }
-                KJ_CASE_ONEOF(close, kj::WebSocket::Close) {
-                    // clean socket shutdown
-                    return lc.ws->close(close.code, close.reason);
-                }
-                KJ_CASE_ONEOF_DEFAULT {}
-            }
-            // unhandled/unknown message
-            return lc.ws->disconnect();
-        }, [](kj::Exception&& e){
-            // server logs suggest early catching here avoids fatal exception later
-            // TODO: reproduce in unit test
-            LLOG(WARNING, e.getDescription());
-            return kj::READY_NOW;
-        });
-    }
-
-    kj::Promise<void> websocketWrite(WebsocketClient& lc)
-    {
-        auto paf = kj::newPromiseAndFulfiller<void>();
-        lc.fulfiller = kj::mv(paf.fulfiller);
-        return paf.promise.then([this,&lc]{
-            kj::Promise<void> p = kj::READY_NOW;
-            std::list<std::string> messages = kj::mv(lc.messages);
-            for(std::string& s : messages) {
-                p = p.then([&s,&lc]{
-                    kj::String str = kj::str(s);
-                    return lc.ws->send(str).attach(kj::mv(str));
-                });
-            }
-            return p.attach(kj::mv(messages)).then([this,&lc]{
-                return websocketWrite(lc);
-            });
-        });
-    }
-
-    kj::Promise<void> websocketUpgraded(WebsocketClient& lc, std::string resource) {
-        // convert the requested URL to a MonitorScope
-        if(resource.substr(0, 5) == "/jobs") {
-            if(resource.length() == 5) {
-                lc.scope.type = MonitorScope::ALL;
-            } else {
-                resource = resource.substr(5);
-                size_t split = resource.find('/',1);
-                std::string job = resource.substr(1,split-1);
-                if(!job.empty()) {
-                    lc.scope.job = job;
-                    lc.scope.type = MonitorScope::JOB;
-                }
-                if(split != std::string::npos) {
-                    size_t split2 = resource.find('/', split+1);
-                    std::string run = resource.substr(split+1, split2-split);
-                    if(!run.empty()) {
-                        lc.scope.num = static_cast<uint>(atoi(run.c_str()));
-                        lc.scope.type = MonitorScope::RUN;
-                    }
-                    if(split2 != std::string::npos && resource.compare(split2, 4, "/log") == 0) {
-                        lc.scope.type = MonitorScope::LOG;
-                    }
-                }
-            }
-        }
-        laminar.registerClient(&lc);
-        kj::Promise<void> connection = websocketRead(lc).exclusiveJoin(websocketWrite(lc));
-        // registerClient can happen after a successful websocket handshake.
-        // However, the connection might not be closed gracefully, so the
-        // corresponding deregister operation happens in the WebsocketClient
-        // destructor rather than the close handler or a then() clause
-        laminar.sendStatus(&lc);
-        return connection;
-    }
-
-    // Parses the url of the form /log/NAME/NUMBER, filling in the passed
-    // references and returning true if successful. /log/NAME/latest is
-    // also allowed, in which case the num reference is set to 0
-    bool parseLogEndpoint(kj::StringPtr url, std::string& name, uint& num) {
-        if(url.startsWith("/log/")) {
-            kj::StringPtr path = url.slice(5);
-            KJ_IF_MAYBE(sep, path.findFirst('/')) {
-                name = path.slice(0, *sep).begin();
-                kj::StringPtr tail = path.slice(*sep+1);
-                num = static_cast<uint>(atoi(tail.begin()));
-                name.erase(*sep);
-                if(tail == "latest")
-                    num = laminar.latestRun(name);
-                if(num > 0)
-                    return true;
-            }
-        }
-        return false;
-    }
-
-    kj::Promise<void> writeLogChunk(HttpChunkedClient* client, kj::AsyncOutputStream* stream) {
-        auto paf = kj::newPromiseAndFulfiller<void>();
-        client->fulfiller = kj::mv(paf.fulfiller);
-        return paf.promise.then([=]{
-            kj::Promise<void> p = kj::READY_NOW;
-            std::list<std::string> chunks = kj::mv(client->chunks);
-            for(std::string& s : chunks) {
-                p = p.then([=,&s]{
-                    return stream->write(s.data(), s.size());
-                });
-            }
-            return p.attach(kj::mv(chunks)).then([=]{
-                return client->done ? kj::Promise<void>(kj::READY_NOW) : writeLogChunk(client, stream);
-            });
-        });
-    }
-
-    virtual kj::Promise<void> request(kj::HttpMethod method, kj::StringPtr url, const kj::HttpHeaders& headers,
-            kj::AsyncInputStream& requestBody, Response& response) override
-    {
-        if(headers.isWebSocket()) {
-            responseHeaders.clear();
-            kj::Own<WebsocketClient> lc = kj::heap<WebsocketClient>(laminar, response.acceptWebSocket(responseHeaders));
-            return websocketUpgraded(*lc, url.cStr()).attach(kj::mv(lc));
-        } else {
-            // handle regular HTTP request
-            const char* start, *end, *content_type;
-            std::string badge;
-            // for log requests
-            std::string name;
-            uint num;
-            responseHeaders.clear();
-            // Clients usually expect that http servers will ignore unknown query parameters,
-            // and expect to use this feature to work around browser limitations like there
-            // being no way to programatically force a resource to be reloaded from the server
-            // (without "Cache-Control: no-store", which is overkill). See issue #89.
-            // Since we currently don't handle any query parameters at all, the easiest way
-            // to achieve this is unconditionally remove all query parameters from the request.
-            // This will need to be redone if we ever accept query parameters, which probably
-            // will happen as part of issue #90.
-            KJ_IF_MAYBE(queryIdx, url.findFirst('?')) {
-                const_cast<char*>(url.begin())[*queryIdx] = '\0';
-                url = url.begin();
-            }
-            if(url.startsWith("/archive/")) {
-                KJ_IF_MAYBE(file, laminar.getArtefact(url.slice(strlen("/archive/")))) {
-                    auto array = (*file)->mmap(0, (*file)->stat().size);
-                    responseHeaders.add("Content-Transfer-Encoding", "binary");
-                    auto stream = response.send(200, "OK", responseHeaders, array.size());
-                    return stream->write(array.begin(), array.size()).attach(kj::mv(array)).attach(kj::mv(file)).attach(kj::mv(stream));
-                }
-            } else if(parseLogEndpoint(url, name, num)) {
-                kj::Own<HttpChunkedClient> cc = kj::heap<HttpChunkedClient>(laminar);
-                cc->scope.job = name;
-                cc->scope.num = num;
-                bool complete;
-                std::string output;
-                cc->scope.type = MonitorScope::LOG;
-                if(laminar.handleLogRequest(name, num, output, complete)) {
-                    responseHeaders.set(kj::HttpHeaderId::CONTENT_TYPE, "text/plain; charset=utf-8");
-                    responseHeaders.add("Content-Transfer-Encoding", "binary");
-                    // Disables nginx reverse-proxy's buffering. Necessary for dynamic log output.
-                    responseHeaders.add("X-Accel-Buffering", "no");
-                    auto stream = response.send(200, "OK", responseHeaders, nullptr);
-                    laminar.registerClient(cc.get());
-                    return stream->write(output.data(), output.size()).then([=,s=stream.get(),c=cc.get()]{
-                        if(complete)
-                            return kj::Promise<void>(kj::READY_NOW);
-                        return writeLogChunk(c, s);
-                    }).attach(kj::mv(output)).attach(kj::mv(stream)).attach(kj::mv(cc));
-                }
-            } else if(url == "/custom/style.css") {
-                responseHeaders.set(kj::HttpHeaderId::CONTENT_TYPE, "text/css; charset=utf-8");
-                responseHeaders.add("Content-Transfer-Encoding", "binary");
-                std::string css = laminar.getCustomCss();
-                auto stream = response.send(200, "OK", responseHeaders, css.size());
-                return stream->write(css.data(), css.size()).attach(kj::mv(css)).attach(kj::mv(stream));
-            } else if(resources.handleRequest(url.cStr(), &start, &end, &content_type)) {
-                responseHeaders.set(kj::HttpHeaderId::CONTENT_TYPE, content_type);
-                responseHeaders.add("Content-Encoding", "gzip");
-                responseHeaders.add("Content-Transfer-Encoding", "binary");
-                auto stream = response.send(200, "OK", responseHeaders, end-start);
-                return stream->write(start, end-start).attach(kj::mv(stream));
-            } else if(url.startsWith("/badge/") && url.endsWith(".svg") && laminar.handleBadgeRequest(std::string(url.begin()+7, url.size()-11), badge)) {
-                responseHeaders.set(kj::HttpHeaderId::CONTENT_TYPE, "image/svg+xml");
-                responseHeaders.add("Cache-Control", "no-cache");
-                auto stream = response.send(200, "OK", responseHeaders, badge.size());
-                return stream->write(badge.data(), badge.size()).attach(kj::mv(badge)).attach(kj::mv(stream));
-            }
-            return response.sendError(404, "Not Found", responseHeaders);
-        }
-    }
-
-    LaminarInterface& laminar;
-    Resources resources;
-    kj::HttpHeaders responseHeaders;
-};
-
-// Context for an RPC connection
-struct RpcConnection {
-    RpcConnection(kj::Own<kj::AsyncIoStream>&& stream,
-                  capnp::Capability::Client bootstrap,
-                  capnp::ReaderOptions readerOpts) :
-        stream(kj::mv(stream)),
-        network(*this->stream, capnp::rpc::twoparty::Side::SERVER, readerOpts),
-        rpcSystem(capnp::makeRpcServer(network, bootstrap))
-    {
-    }
-    kj::Own<kj::AsyncIoStream> stream;
-    capnp::TwoPartyVatNetwork network;
-    capnp::RpcSystem<capnp::rpc::twoparty::VatId> rpcSystem;
-};
-
-Server::Server(LaminarInterface& li, kj::StringPtr rpcBindAddress,
-               kj::StringPtr httpBindAddress) :
-    rpcInterface(kj::heap<RpcImpl>(li)),
-    laminarInterface(li),
-    ioContext(kj::setupAsyncIo()),
-    headerTable(),
-    httpService(kj::heap<HttpImpl>(li, headerTable)),
-    httpServer(kj::heap<kj::HttpServer>(ioContext.provider->getTimer(), headerTable, *httpService)),
+Server::Server(kj::AsyncIoContext& io) :
+    ioContext(io),
     listeners(kj::heap<kj::TaskSet>(*this)),
-    childTasks(*this),
-    httpConnections(*this),
-    httpReady(kj::newPromiseAndFulfiller<void>())
+    childTasks(*this)
 {
-    // RPC task
-    if(rpcBindAddress.startsWith("unix:"))
-        unlink(rpcBindAddress.slice(strlen("unix:")).cStr());
-    listeners->add(ioContext.provider->getNetwork().parseAddress(rpcBindAddress)
-              .then([this](kj::Own<kj::NetworkAddress>&& addr) {
-        return acceptRpcClient(addr->listen());
-    }));
-
-    // HTTP task
-    if(httpBindAddress.startsWith("unix:"))
-        unlink(httpBindAddress.slice(strlen("unix:")).cStr());
-    listeners->add(ioContext.provider->getNetwork().parseAddress(httpBindAddress)
-              .then([this](kj::Own<kj::NetworkAddress>&& addr) {
-        // TODO: a better way? Currently used only for testing
-        httpReady.fulfiller->fulfill();
-        kj::Own<kj::ConnectionReceiver> listener = addr->listen();
-        return httpServer->listenHttp(*listener).attach(kj::mv(listener));
-    }));
-
-    // handle watched paths
-    {
-        inotify_fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
-        pathWatch = readDescriptor(inotify_fd, [this](const char*, size_t){
-            laminarInterface.notifyConfigChanged();
-        });
-    }
 }
 
 Server::~Server() {
@@ -537,15 +59,12 @@ void Server::start() {
     // Shutdown sequence:
     // 1. stop accepting new connections
     listeners = nullptr;
-    // 2. abort current jobs. Most of the time this isn't necessary since
-    // systemd stop or other kill mechanism will send SIGTERM to the whole
-    // process group.
-    laminarInterface.abortAll();
-    // 3. wait for all children to close
+    // 2. wait for all children to close
     childTasks.onEmpty().wait(ioContext.waitScope);
-    // 4. run the loop once more to send any pending output to websocket clients
+    // TODO not sure the comments below are true
+    // 3. run the loop once more to send any pending output to http clients
     ioContext.waitScope.poll();
-    // 5. return: websockets will be destructed when class is deleted
+    // 4. return: http connections will be destructed when class is deleted
 }
 
 void Server::stop() {
@@ -574,17 +93,52 @@ kj::Promise<int> Server::onChildExit(kj::Maybe<pid_t> &pid) {
     return ioContext.unixEventPort.onChildExit(pid);
 }
 
-void Server::addWatchPath(const char* dpath) {
-    inotify_add_watch(inotify_fd, dpath, IN_ONLYDIR | IN_CLOSE_WRITE | IN_CREATE | IN_DELETE);
+Server::PathWatcher& Server::watchPaths(std::function<void()> fn)
+{
+    struct PathWatcherImpl : public PathWatcher {
+        PathWatcher& addPath(const char* path) override {
+            inotify_add_watch(fd, path, IN_ONLYDIR | IN_CLOSE_WRITE | IN_CREATE | IN_DELETE);
+            return *this;
+        }
+        int fd;
+    };
+    auto pwi = kj::heap<PathWatcherImpl>();
+    PathWatcher* pw = pwi.get();
+
+    pwi->fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
+    listeners->add(readDescriptor(pwi->fd, [fn](const char*, size_t){
+        fn();
+    }).attach(kj::mv(pwi)));
+    return *pw;
 }
 
-kj::Promise<void> Server::acceptRpcClient(kj::Own<kj::ConnectionReceiver>&& listener) {
+void Server::listenRpc(Rpc &rpc, kj::StringPtr rpcBindAddress)
+{
+    if(rpcBindAddress.startsWith("unix:"))
+        unlink(rpcBindAddress.slice(strlen("unix:")).cStr());
+    listeners->add(ioContext.provider->getNetwork().parseAddress(rpcBindAddress)
+              .then([this,&rpc](kj::Own<kj::NetworkAddress>&& addr) {
+        return acceptRpcClient(rpc, addr->listen());
+    }));
+
+}
+
+void Server::listenHttp(Http &http, kj::StringPtr httpBindAddress)
+{
+    if(httpBindAddress.startsWith("unix:"))
+        unlink(httpBindAddress.slice(strlen("unix:")).cStr());
+    listeners->add(ioContext.provider->getNetwork().parseAddress(httpBindAddress)
+              .then([this,&http](kj::Own<kj::NetworkAddress>&& addr) {
+        return http.startServer(ioContext.lowLevelProvider->getTimer(), addr->listen());
+    }));
+}
+
+kj::Promise<void> Server::acceptRpcClient(Rpc& rpc, kj::Own<kj::ConnectionReceiver>&& listener) {
     kj::ConnectionReceiver& cr = *listener.get();
     return cr.accept().then(kj::mvCapture(kj::mv(listener),
-        [this](kj::Own<kj::ConnectionReceiver>&& listener, kj::Own<kj::AsyncIoStream>&& connection) {
-            auto server = kj::heap<RpcConnection>(kj::mv(connection), rpcInterface, capnp::ReaderOptions());
-            childTasks.add(server->network.onDisconnect().attach(kj::mv(server)));
-            return acceptRpcClient(kj::mv(listener));
+        [this, &rpc](kj::Own<kj::ConnectionReceiver>&& listener, kj::Own<kj::AsyncIoStream>&& connection) {
+            addTask(rpc.accept(kj::mv(connection)));
+            return acceptRpcClient(rpc, kj::mv(listener));
         }));
 }
 

src/server.h

@@ -25,17 +25,14 @@
 #include <capnp/capability.h>
 #include <functional>
 
-struct LaminarInterface;
+struct Laminar;
+struct Http;
+struct Rpc;
 
-// This class abstracts the HTTP/Websockets and Cap'n Proto RPC interfaces
-// and manages the program's asynchronous event loop
+// This class manages the program's asynchronous event loop
 class Server final : public kj::TaskSet::ErrorHandler {
 public:
-    // Initializes the server with a LaminarInterface to handle requests from
-    // HTTP/Websocket or RPC clients and bind addresses for each of those
-    // interfaces. See the documentation for kj::AsyncIoProvider::getNetwork
-    // for a description of the address format
-    Server(LaminarInterface& li, kj::StringPtr rpcBindAddress, kj::StringPtr httpBindAddress);
+    Server(kj::AsyncIoContext& ioContext);
     ~Server();
     void start();
     void stop();
@@ -50,33 +47,28 @@ public:
 
     // get a promise which resolves when a child process exits
     kj::Promise<int> onChildExit(kj::Maybe<pid_t>& pid);
-    // add a path to be watched for changes
-    void addWatchPath(const char* dpath);
+
+    struct PathWatcher {
+        virtual PathWatcher& addPath(const char* path) = 0;
+    };
+
+    PathWatcher& watchPaths(std::function<void()>);
+
+    void listenRpc(Rpc& rpc, kj::StringPtr rpcBindAddress);
+    void listenHttp(Http& http, kj::StringPtr httpBindAddress);
 
 private:
-    kj::Promise<void> acceptRpcClient(kj::Own<kj::ConnectionReceiver>&& listener);
+    kj::Promise<void> acceptRpcClient(Rpc& rpc, kj::Own<kj::ConnectionReceiver>&& listener);
     kj::Promise<void> handleFdRead(kj::AsyncInputStream* stream, char* buffer, std::function<void(const char*,size_t)> cb);
 
     void taskFailed(kj::Exception&& exception) override;
 
 private:
     int efd_quit;
-    capnp::Capability::Client rpcInterface;
-    LaminarInterface& laminarInterface;
-    kj::AsyncIoContext ioContext;
-    kj::HttpHeaderTable headerTable;
-    kj::Own<kj::HttpService> httpService;
-    kj::Own<kj::HttpServer> httpServer;
+    kj::AsyncIoContext& ioContext;
     kj::Own<kj::TaskSet> listeners;
     kj::TaskSet childTasks;
-    kj::TaskSet httpConnections;
     kj::Maybe<kj::Promise<void>> reapWatch;
-    int inotify_fd;
-    kj::Maybe<kj::Promise<void>> pathWatch;
-
-    // TODO: restructure so this isn't necessary
-    friend class ServerTest;
-    kj::PromiseFulfillerPair<void> httpReady;
 };
 
 #endif // LAMINAR_SERVER_H_

test/eventsource.h

@@ -0,0 +1,71 @@
+///
+/// Copyright 2019 Oliver Giles
+///
+/// This file is part of Laminar
+///
+/// Laminar is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Laminar is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/// GNU General Public License for more details.
+///
+/// You should have received a copy of the GNU General Public License
+/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
+///
+#ifndef LAMINAR_EVENTSOURCE_H_
+#define LAMINAR_EVENTSOURCE_H_
+
+#include <kj/async-io.h>
+#include <kj/compat/http.h>
+#include <rapidjson/document.h>
+#include <vector>
+
+class EventSource {
+public:
+    EventSource(kj::AsyncIoContext& ctx, const char* httpConnectAddr, const char* path) :
+        networkAddress(ctx.provider->getNetwork().parseAddress(httpConnectAddr).wait(ctx.waitScope)),
+        httpClient(kj::newHttpClient(ctx.lowLevelProvider->getTimer(), headerTable, *networkAddress)),
+        headerTable(),
+        headers(headerTable),
+        buffer(kj::heapArrayBuilder<char>(BUFFER_SIZE))
+    {
+        headers.add("Accept", "text/event-stream");
+        auto resp = httpClient->request(kj::HttpMethod::GET, path, headers).response.wait(ctx.waitScope);
+        promise = waitForMessages(resp.body.get(), 0).attach(kj::mv(resp));
+    }
+
+    const std::vector<rapidjson::Document>& messages() {
+        return receivedMessages;
+    }
+
+private:
+    kj::Own<kj::NetworkAddress> networkAddress;
+    kj::Own<kj::HttpClient> httpClient;
+    kj::HttpHeaderTable headerTable;
+    kj::HttpHeaders headers;
+    kj::ArrayBuilder<char> buffer;
+    kj::Maybe<kj::Promise<void>> promise;
+    std::vector<rapidjson::Document> receivedMessages;
+
+    kj::Promise<void> waitForMessages(kj::AsyncInputStream* stream, ulong offset) {
+        return stream->read(buffer.asPtr().begin() + offset, 1, BUFFER_SIZE).then([=](size_t s) {
+            ulong end = offset + s;
+            buffer.asPtr().begin()[end] = '\0';
+            if(strcmp(&buffer.asPtr().begin()[end - 2], "\n\n") == 0) {
+                rapidjson::Document d;
+                d.Parse(buffer.begin() + strlen("data: "));
+                receivedMessages.emplace_back(kj::mv(d));
+                end = 0;
+            }
+            return waitForMessages(stream, end);
+        });
+    }
+
+    static const int BUFFER_SIZE = 1024;
+};
+
+#endif // LAMINAR_EVENTSOURCE_H_

test/laminar-fixture.h

@@ -0,0 +1,82 @@
+///
+/// Copyright 2019 Oliver Giles
+///
+/// This file is part of Laminar
+///
+/// Laminar is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Laminar is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/// GNU General Public License for more details.
+///
+/// You should have received a copy of the GNU General Public License
+/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
+///
+#ifndef LAMINAR_FIXTURE_H_
+#define LAMINAR_FIXTURE_H_
+
+#include <capnp/rpc-twoparty.h>
+#include <gtest/gtest.h>
+#include "laminar.capnp.h"
+#include "eventsource.h"
+#include "tempdir.h"
+#include "laminar.h"
+#include "server.h"
+
+class LaminarFixture : public ::testing::Test {
+public:
+    LaminarFixture() {
+        bind_rpc = std::string("unix:/") + tmp.path.toString(true).cStr() + "/rpc.sock";
+        bind_http = std::string("unix:/") + tmp.path.toString(true).cStr() + "/http.sock";
+        home = tmp.path.toString(true).cStr();
+        tmp.fs->openSubdir(kj::Path{"cfg", "jobs"}, kj::WriteMode::CREATE | kj::WriteMode::CREATE_PARENT);
+        settings.home = home.c_str();
+        settings.bind_rpc = bind_rpc.c_str();
+        settings.bind_http = bind_http.c_str();
+        settings.archive_url = "/test-archive/";
+        server = new Server(ioContext);
+        laminar = new Laminar(*server, settings);
+    }
+    ~LaminarFixture() noexcept(true) {
+        delete server;
+        delete laminar;
+    }
+
+    kj::Own<EventSource> eventSource(const char* path) {
+        return kj::heap<EventSource>(ioContext, bind_http.c_str(), path);
+    }
+
+    void defineJob(const char* name, const char* scriptContent) {
+        KJ_IF_MAYBE(f, tmp.fs->tryOpenFile(kj::Path{"cfg", "jobs", std::string(name) + ".run"},
+                kj::WriteMode::CREATE | kj::WriteMode::CREATE_PARENT | kj::WriteMode::EXECUTABLE)) {
+            (*f)->writeAll(std::string("#!/bin/sh\n") + scriptContent + "\n");
+        }
+    }
+
+    LaminarCi::Client client() {
+        if(!rpc) {
+            auto stream = ioContext.provider->getNetwork().parseAddress(bind_rpc).wait(ioContext.waitScope)->connect().wait(ioContext.waitScope);
+            auto net = kj::heap<capnp::TwoPartyVatNetwork>(*stream, capnp::rpc::twoparty::Side::CLIENT);
+            rpc = kj::heap<capnp::RpcSystem<capnp::rpc::twoparty::VatId>>(*net, nullptr).attach(kj::mv(net), kj::mv(stream));
+        }
+        static capnp::word scratch[4];
+        memset(scratch, 0, sizeof(scratch));
+        auto hostId = capnp::MallocMessageBuilder(scratch).getRoot<capnp::rpc::twoparty::VatId>();
+        hostId.setSide(capnp::rpc::twoparty::Side::SERVER);
+        return rpc->bootstrap(hostId).castAs<LaminarCi>();
+    }
+
+    kj::Own<capnp::RpcSystem<capnp::rpc::twoparty::VatId>> rpc;
+    TempDir tmp;
+    std::string home, bind_rpc, bind_http;
+    Settings settings;
+    Server* server;
+    Laminar* laminar;
+    static kj::AsyncIoContext ioContext;
+};
+
+#endif // LAMINAR_FIXTURE_H_

test/laminar-functional.cpp

@@ -0,0 +1,103 @@
+///
+/// Copyright 2019 Oliver Giles
+///
+/// This file is part of Laminar
+///
+/// Laminar is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Laminar is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/// GNU General Public License for more details.
+///
+/// You should have received a copy of the GNU General Public License
+/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
+///
+#include <kj/async-unix.h>
+#include "laminar-fixture.h"
+
+// TODO: consider handling this differently
+kj::AsyncIoContext LaminarFixture::ioContext = kj::setupAsyncIo();
+
+TEST_F(LaminarFixture, EmptyStatusMessageStructure) {
+    auto es = eventSource("/");
+    ioContext.waitScope.poll();
+    ASSERT_EQ(1, es->messages().size());
+
+    auto json = es->messages().front().GetObject();
+    EXPECT_STREQ("status", json["type"].GetString());
+    EXPECT_STREQ("Laminar", json["title"].GetString());
+    EXPECT_LT(time(nullptr) - json["time"].GetInt64(), 1);
+
+    auto data = json["data"].GetObject();
+    EXPECT_TRUE(data.HasMember("recent"));
+    EXPECT_TRUE(data.HasMember("running"));
+    EXPECT_TRUE(data.HasMember("queued"));
+    EXPECT_TRUE(data.HasMember("executorsTotal"));
+    EXPECT_TRUE(data.HasMember("executorsBusy"));
+    EXPECT_TRUE(data.HasMember("buildsPerDay"));
+    EXPECT_TRUE(data.HasMember("buildsPerJob"));
+    EXPECT_TRUE(data.HasMember("timePerJob"));
+    EXPECT_TRUE(data.HasMember("resultChanged"));
+    EXPECT_TRUE(data.HasMember("lowPassRates"));
+    EXPECT_TRUE(data.HasMember("buildTimeChanges"));
+    EXPECT_TRUE(data.HasMember("buildTimeDist"));
+}
+
+TEST_F(LaminarFixture, JobNotifyHomePage) {
+    defineJob("foo", "true");
+    auto es = eventSource("/");
+
+    auto req = client().runRequest();
+    req.setJobName("foo");
+    ASSERT_EQ(LaminarCi::JobResult::SUCCESS, req.send().wait(ioContext.waitScope).getResult());
+
+    // wait for job completed
+    ioContext.waitScope.poll();
+
+    ASSERT_EQ(4, es->messages().size());
+
+    auto job_queued = es->messages().at(1).GetObject();
+    EXPECT_STREQ("job_queued", job_queued["type"].GetString());
+    EXPECT_STREQ("foo", job_queued["data"]["name"].GetString());
+
+    auto job_started = es->messages().at(2).GetObject();
+    EXPECT_STREQ("job_started", job_started["type"].GetString());
+    EXPECT_STREQ("foo", job_started["data"]["name"].GetString());
+
+    auto job_completed = es->messages().at(3).GetObject();
+    EXPECT_STREQ("job_completed", job_completed["type"].GetString());
+    EXPECT_STREQ("foo", job_completed["data"]["name"].GetString());
+}
+
+TEST_F(LaminarFixture, OnlyRelevantNotifications) {
+    defineJob("job1", "true");
+    defineJob("job2", "true");
+
+    auto esHome = eventSource("/");
+    auto esJobs = eventSource("/jobs");
+    auto es1Job = eventSource("/jobs/job1");
+    auto es2Job = eventSource("/jobs/job2");
+    auto es1Run = eventSource("/jobs/job1/1");
+    auto es2Run = eventSource("/jobs/job2/1");
+
+    auto req1 = client().runRequest();
+    req1.setJobName("job1");
+    ASSERT_EQ(LaminarCi::JobResult::SUCCESS, req1.send().wait(ioContext.waitScope).getResult());
+    auto req2 = client().runRequest();
+    req2.setJobName("job2");
+    ASSERT_EQ(LaminarCi::JobResult::SUCCESS, req2.send().wait(ioContext.waitScope).getResult());
+    ioContext.waitScope.poll();
+
+    EXPECT_EQ(7, esHome->messages().size());
+    EXPECT_EQ(7, esJobs->messages().size());
+
+    EXPECT_EQ(4, es1Job->messages().size());
+    EXPECT_EQ(4, es2Job->messages().size());
+
+    EXPECT_EQ(4, es1Run->messages().size());
+    EXPECT_EQ(4, es2Run->messages().size());
+}

test/main.cpp

@@ -0,0 +1,28 @@
+///
+/// Copyright 2019 Oliver Giles
+///
+/// This file is part of Laminar
+///
+/// Laminar is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Laminar is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/// GNU General Public License for more details.
+///
+/// You should have received a copy of the GNU General Public License
+/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
+///
+#include <kj/async-unix.h>
+#include <gtest/gtest.h>
+
+// gtest main supplied in order to call captureChildExit
+int main(int argc, char **argv) {
+    kj::UnixEventPort::captureChildExit();
+
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}

test/test-laminar.cpp

@@ -1,47 +0,0 @@
-///
-/// Copyright 2018 Oliver Giles
-///
-/// This file is part of Laminar
-///
-/// Laminar is free software: you can redistribute it and/or modify
-/// it under the terms of the GNU General Public License as published by
-/// the Free Software Foundation, either version 3 of the License, or
-/// (at your option) any later version.
-///
-/// Laminar is distributed in the hope that it will be useful,
-/// but WITHOUT ANY WARRANTY; without even the implied warranty of
-/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/// GNU General Public License for more details.
-///
-/// You should have received a copy of the GNU General Public License
-/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
-///
-#include <gtest/gtest.h>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/document.h>
-#include "laminar.h"
-
-class TestLaminarClient : public LaminarClient {
-public:
-    virtual void sendMessage(std::string p) { payload = p; }
-    std::string payload;
-};
-
-class LaminarTest : public testing::Test {
-protected:
-    LaminarTest() :
-        testing::Test(),
-        laminar("/tmp")
-    {}
-    Laminar laminar;
-};
-
-TEST_F(LaminarTest, StatusMessageContainsTime) {
-    TestLaminarClient testClient;
-    laminar.sendStatus(&testClient);
-    rapidjson::Document d;
-    d.Parse(testClient.payload.c_str());
-    ASSERT_TRUE(d.IsObject());
-    ASSERT_TRUE(d.HasMember("time"));
-    EXPECT_GE(1, d["time"].GetInt() - time(nullptr));
-}

test/test-server.cpp

@@ -1,137 +0,0 @@
-///
-/// Copyright 2018 Oliver Giles
-///
-/// This file is part of Laminar
-///
-/// Laminar is free software: you can redistribute it and/or modify
-/// it under the terms of the GNU General Public License as published by
-/// the Free Software Foundation, either version 3 of the License, or
-/// (at your option) any later version.
-///
-/// Laminar is distributed in the hope that it will be useful,
-/// but WITHOUT ANY WARRANTY; without even the implied warranty of
-/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/// GNU General Public License for more details.
-///
-/// You should have received a copy of the GNU General Public License
-/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
-///
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-#include <thread>
-#include <sys/socket.h>
-#include "server.h"
-#include "log.h"
-#include "interface.h"
-#include "laminar.capnp.h"
-#include "tempdir.h"
-
-class MockLaminar : public LaminarInterface {
-public:
-    LaminarClient* client = nullptr;
-    ~MockLaminar() {}
-    virtual void registerClient(LaminarClient* c) override {
-        ASSERT_EQ(nullptr, client);
-        client = c;
-        EXPECT_CALL(*this, sendStatus(client)).Times(testing::Exactly(1));
-    }
-
-    virtual void deregisterClient(LaminarClient* c) override {
-        ASSERT_EQ(client, c);
-        client = nullptr;
-    }
-
-    // MOCK_METHOD does not seem to work with return values whose destructors have noexcept(false)
-    kj::Maybe<kj::Own<const kj::ReadableFile>> getArtefact(std::string path) override { return nullptr; }
-
-    MOCK_METHOD2(queueJob, std::shared_ptr<Run>(std::string name, ParamMap params));
-    MOCK_METHOD1(registerWaiter, void(LaminarWaiter* waiter));
-    MOCK_METHOD1(deregisterWaiter, void(LaminarWaiter* waiter));
-    MOCK_METHOD1(latestRun, uint(std::string));
-    MOCK_METHOD4(handleLogRequest, bool(std::string, uint, std::string&, bool&));
-
-    MOCK_METHOD1(sendStatus, void(LaminarClient* client));
-    MOCK_METHOD4(setParam, bool(std::string job, uint buildNum, std::string param, std::string value));
-    MOCK_METHOD0(listQueuedJobs, const std::list<std::shared_ptr<Run>>&());
-    MOCK_METHOD0(listRunningJobs, const RunSet&());
-    MOCK_METHOD0(listKnownJobs, std::list<std::string>());
-
-    MOCK_METHOD0(getCustomCss, std::string());
-    MOCK_METHOD2(handleBadgeRequest, bool(std::string, std::string&));
-    MOCK_METHOD2(abort, bool(std::string, uint));
-    MOCK_METHOD0(abortAll, void());
-    MOCK_METHOD0(notifyConfigChanged, void());
-};
-
-class ServerTest : public ::testing::Test {
-protected:
-    void SetUp() override {
-        EXPECT_CALL(mockLaminar, registerWaiter(testing::_));
-        EXPECT_CALL(mockLaminar, deregisterWaiter(testing::_));
-        server = new Server(mockLaminar, "unix:"+std::string(tempDir.path.append("rpc.sock").toString(true).cStr()), "127.0.0.1:8080");
-    }
-    void TearDown() override {
-        delete server;
-    }
-
-    LaminarCi::Client client() const {
-        return server->rpcInterface.castAs<LaminarCi>();
-    }
-    kj::WaitScope& ws() const {
-        return server->ioContext.waitScope;
-    }
-    void waitForHttpReady() {
-        server->httpReady.promise.wait(server->ioContext.waitScope);
-    }
-
-    kj::Network& network() { return server->ioContext.provider->getNetwork(); }
-    TempDir tempDir;
-    MockLaminar mockLaminar;
-    Server* server;
-};
-
-TEST_F(ServerTest, RpcQueue) {
-    auto req = client().queueRequest();
-    req.setJobName("foo");
-    EXPECT_CALL(mockLaminar, queueJob("foo", ParamMap())).Times(testing::Exactly(1));
-    req.send().wait(ws());
-}
-
-// Tests that agressively closed websockets are properly removed
-// and will not be attempted to be contacted again
-TEST_F(ServerTest, HttpWebsocketRST) {
-    waitForHttpReady();
-
-    // TODO: generalize
-    constexpr const char* WS =
-        "GET / HTTP/1.1\r\n"
-        "Host: localhost:8080\r\n"
-        "Connection: Upgrade\r\n"
-        "Upgrade: websocket\r\n"
-        "Sec-WebSocket-Key: GTFmrUCM9N6B32LdDE3Rzw==\r\n"
-        "Sec-WebSocket-Version: 13\r\n\r\n";
-
-    static char buffer[256];
-    network().parseAddress("localhost:8080").then([this](kj::Own<kj::NetworkAddress>&& addr){
-        return addr->connect().attach(kj::mv(addr)).then([this](kj::Own<kj::AsyncIoStream>&& stream){
-            kj::AsyncIoStream* s = stream.get();
-            return s->write(WS, strlen(WS)).then([this,s](){
-                // Read the websocket header response, ensure the client has been registered
-                return s->tryRead(buffer, 64, 256).then([this,s](size_t sz){
-                    EXPECT_LE(64, sz);
-                    EXPECT_NE(nullptr, mockLaminar.client);
-                    // agressively abort the connection
-                    struct linger so_linger;
-                    so_linger.l_onoff = 1;
-                    so_linger.l_linger = 0;
-                    s->setsockopt(SOL_SOCKET, SO_LINGER, &so_linger, sizeof(so_linger));
-                    return kj::Promise<void>(kj::READY_NOW);
-                });
-            }).attach(kj::mv(stream));
-        });
-    }).wait(ws());
-    ws().poll();
-    // Expect that the client has been cleared. If it has not, Laminar could
-    // try to write to the closed file descriptor, causing an exception
-    EXPECT_EQ(nullptr, mockLaminar.client);
-}

test/unit-run.cpp

@@ -19,7 +19,7 @@
 #include <gtest/gtest.h>
 #include "run.h"
 #include "log.h"
-#include "node.h"
+#include "context.h"
 #include "conf.h"
 #include "tempdir.h"
 
@@ -27,7 +27,7 @@ class RunTest : public testing::Test {
 protected:
     RunTest() :
         testing::Test(),
-        node(std::make_shared<Node>()),
+        context(std::make_shared<Context>()),
         tmp(),
         run("foo", ParamMap{}, tmp.path.clone())
     {
@@ -64,40 +64,43 @@ protected:
         return map;
     }
 
-    std::shared_ptr<Node> node;
+    std::shared_ptr<Context> context;
     TempDir tmp;
     class Run run;
 
-    void setRunLink(const char* path) {
-        tmp.fs->symlink(kj::Path{"cfg","jobs",run.name+".run"}, path, kj::WriteMode::CREATE|kj::WriteMode::CREATE_PARENT|kj::WriteMode::EXECUTABLE);
+    void setRunLink(const char * path) {
+        KJ_IF_MAYBE(f, tmp.fs->tryOpenFile(kj::Path{"cfg", "jobs", run.name + ".run"},
+                kj::WriteMode::CREATE | kj::WriteMode::CREATE_PARENT | kj::WriteMode::EXECUTABLE)) {
+            (f->get())->writeAll(std::string("#!/bin/sh\nexec ") + path + "\n");
+        }
     }
 };
 
 TEST_F(RunTest, WorkingDirectory) {
-    setRunLink("/bin/pwd");
-    run.configure(1, node, *tmp.fs);
+    setRunLink("pwd");
+    run.configure(1, context, *tmp.fs);
     runAll();
     std::string cwd{tmp.path.append(kj::Path{"run","foo","1"}).toString(true).cStr()};
     EXPECT_EQ(cwd + "\n", readAllOutput());
 }
 
 TEST_F(RunTest, SuccessStatus) {
-    setRunLink("/bin/true");
-    run.configure(1, node, *tmp.fs);
+    setRunLink("true");
+    run.configure(1, context, *tmp.fs);
     runAll();
     EXPECT_EQ(RunState::SUCCESS, run.result);
 }
 
 TEST_F(RunTest, FailedStatus) {
-    setRunLink("/bin/false");
-    run.configure(1, node, *tmp.fs);
+    setRunLink("false");
+    run.configure(1, context, *tmp.fs);
     runAll();
     EXPECT_EQ(RunState::FAILED, run.result);
 }
 
 TEST_F(RunTest, Environment) {
-    setRunLink("/usr/bin/env");
-    run.configure(1234, node, *tmp.fs);
+    setRunLink("env");
+    run.configure(1234, context, *tmp.fs);
     runAll();
 
     std::string ws{tmp.path.append(kj::Path{"run","foo","workspace"}).toString(true).cStr()};
@@ -113,17 +116,17 @@ TEST_F(RunTest, Environment) {
 }
 
 TEST_F(RunTest, ParamsToEnv) {
-    setRunLink("/usr/bin/env");
+    setRunLink("env");
     run.params["foo"] = "bar";
-    run.configure(1, node, *tmp.fs);
+    run.configure(1, context, *tmp.fs);
     runAll();
     StringMap map = parseFromString(readAllOutput());
     EXPECT_EQ("bar", map["foo"]);
 }
 
 TEST_F(RunTest, Abort) {
-    setRunLink("/usr/bin/yes");
-    run.configure(1, node, *tmp.fs);
+    setRunLink("yes");
+    run.configure(1, context, *tmp.fs);
     run.step();
     usleep(200); // TODO fix
     run.abort(false);