Fix buffer overflow in readEnvPipe

readEnvPipe writes a null terminator to buffer[sz] without a bounds
check; if a write was >1024 the write overflows the buffer.

Signed-off-by: Wesley Hershberger <wesley.hershberger@gmail.com>

CMakeLists.txt

@@ -1,5 +1,5 @@
 ###
-### Copyright 2015-2017 Oliver Giles
+### Copyright 2015-2026 Oliver Giles
 ###
 ### This file is part of Laminar
 ###
@@ -16,15 +16,65 @@
 ### You should have received a copy of the GNU General Public License
 ### along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ###
+cmake_minimum_required(VERSION 3.18)
 project(laminar)
-cmake_minimum_required(VERSION 2.8)
-cmake_policy(SET CMP0058 NEW)
+
+if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+    # ld.lld is a default option on FreeBSD
+    set(LLVM_LINKER_IS_LLD ON)
+endif()
+
+# ld.lld specific options. There is no sane way in cmake
+# to detect if toolchain is actually using ld.lld
+if (LLVM_LINKER_IS_LLD)
+    if (NOT DEFINED LINKER_EMULATION_FLAGS)
+        if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "amd64")
+            set(LINKER_EMULATION_FLAGS "-melf_x86_64")
+        elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+            set(LINKER_EMULATION_FLAGS "-melf_x86_64")
+        elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
+            set(LINKER_EMULATION_FLAGS "-maarch64elf")
+        elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "powerpc64le")
+            set(LINKER_EMULATION_FLAGS "-melf64lppc")
+        elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "powerpc64")
+            set(LINKER_EMULATION_FLAGS "-melf64ppc")
+        elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "riscv64")
+            # llvm17 & riscv64 requires extra step, it is necessary to
+            # patch 'Elf64.e_flags' (48-th byte) in binary-blob object files
+            # with value 0x5 - to change soft_float ABI to hard_float ABI
+            # so they can link with rest of the object files.
+            set(LINKER_EMULATION_FLAGS "-melf64lriscv")
+        elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm")
+            set(LINKER_EMULATION_FLAGS "-marmelf")
+        elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7")
+            set(LINKER_EMULATION_FLAGS "-marmelf")
+        else()
+            message(FATAL_ERROR
+                "Unsupported '${CMAKE_SYSTEM_PROCESSOR}' translation to emulation flag. "
+                "Please set it explicitly 'cmake -DLINKER_EMULATION_FLAGS=\"-melf_your_arch\" ...'")
+        endif()
+    endif()
+endif()
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_CXX_STANDARD 20)
 
-add_definitions("-std=c++11 -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror -DDEBUG")
 
+# Allow passing in the version string, for e.g. patched/packaged versions
+if(NOT LAMINAR_VERSION AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
+    execute_process(COMMAND git describe --tags --abbrev=8 --dirty
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE LAMINAR_VERSION
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
+if(NOT LAMINAR_VERSION)
+    set(LAMINAR_VERSION xx-unversioned)
+endif()
+set_source_files_properties(src/version.cpp PROPERTIES COMPILE_DEFINITIONS
+	LAMINAR_VERSION=${LAMINAR_VERSION})
+
 # This macro takes a list of files, gzips them and converts the output into
 # object files so they can be linked directly into the application.
 # ld generates symbols based on the string argument given to its executable,
@@ -43,7 +93,11 @@ macro(generate_compressed_bins BASEDIR)
             DEPENDS ${BASEDIR}/${FILE}
         )
         add_custom_command(OUTPUT ${OUTPUT_FILE}
-            COMMAND ld -r -b binary -o ${OUTPUT_FILE} ${COMPRESSED_FILE}
+            COMMAND ${CMAKE_LINKER} ${LINKER_EMULATION_FLAGS} -r -b binary -o ${OUTPUT_FILE} ${COMPRESSED_FILE}
+            COMMAND ${CMAKE_OBJCOPY}
+              --rename-section .data=.rodata.alloc,load,readonly,data,contents
+              --add-section .note.GNU-stack=/dev/null
+              --set-section-flags .note.GNU-stack=contents,readonly ${OUTPUT_FILE}
             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${COMPRESSED_FILE}
         )
         list(APPEND COMPRESSED_BINS ${OUTPUT_FILE})
@@ -58,46 +112,103 @@ add_custom_command(OUTPUT laminar.capnp.c++ laminar.capnp.h
 
 # Zip and compile statically served resources
 generate_compressed_bins(${CMAKE_SOURCE_DIR}/src/resources index.html js/app.js
-    favicon.ico favicon-152.png icon.png)
+    style.css manifest.webmanifest favicon.ico favicon-152.png icon.png)
+
+# The code that allows dynamic modifying of index.html requires knowing its original size
+add_custom_command(OUTPUT index_html_size.h
+    COMMAND sh -c '( echo -n "\\#define INDEX_HTML_UNCOMPRESSED_SIZE " && wc -c < "${CMAKE_SOURCE_DIR}/src/resources/index.html" ) > index_html_size.h'
+    DEPENDS src/resources/index.html)
 
 # Download 3rd-party frontend JS libs...
-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js
-        js/vue.min.js EXPECTED_MD5 ae2fca1cfa0e31377819b1b0ffef704c)
-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js
-        js/vue-router.min.js EXPECTED_MD5 5d3e35710dbe02de78c39e3e439b8d4e)
-file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js
-        js/ansi_up.js EXPECTED_MD5 158566dc1ff8f2804de972f7e841e2f6)
-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.min.js
-        js/Chart.min.js EXPECTED_MD5 0d3004601c1a855a3d203502549528a7)
-file(DOWNLOAD https://raw.githubusercontent.com/tomsouthall/Chart.HorizontalBar.js/v1.04/Chart.HorizontalBar.js
-        js/Chart.HorizontalBar.js EXPECTED_MD5 95070a38e69bc56534e1b2086d985270)
-file(DOWNLOAD https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css
-        css/bootstrap.min.css EXPECTED_MD5 5d5357cb3704e1f43a1f5bfed2aebf42)
+file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js
+    ${CMAKE_BINARY_DIR}/js/vue.min.js EXPECTED_MD5 fb192338844efe86ec759a40152fcb8e)
+file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v5.2.1/ansi_up.js
+    ${CMAKE_BINARY_DIR}/js/ansi_up.js EXPECTED_MD5 77202f7815d9d7f7764793d93598ba88)
+file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.9.1/chart.min.js
+    ${CMAKE_BINARY_DIR}/js/Chart.min.js EXPECTED_MD5 7dd5ea7d2cf22a1c42b43c40093d2669)
 # ...and compile them
-generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue-router.min.js js/vue.min.js
-    js/ansi_up.js js/Chart.min.js js/Chart.HorizontalBar.js css/bootstrap.min.css)
+generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue.min.js
+    js/ansi_up.js js/Chart.min.js)
 # (see resources.cpp where these are fetched)
 
+set(LAMINARD_CORE_SOURCES
+    src/conf.cpp
+    src/database.cpp
+    src/laminar.cpp
+    src/leader.cpp
+    src/http.cpp
+    src/resources.cpp
+    src/rpc.cpp
+    src/run.cpp
+    src/server.cpp
+    src/version.cpp
+    laminar.capnp.c++
+    index_html_size.h
+)
+
+find_package(CapnProto REQUIRED)
+include_directories(${CAPNP_INCLUDE_DIRS})
+
+find_package(SQLite3 REQUIRED)
+include_directories(${SQLite3_INCLUDE_DIRS})
+
+if(NOT TARGET SQLite3::SQLite3) # CMake < 4.3
+  add_library(SQLite3::SQLite3 ALIAS SQLite::SQLite3)
+endif()
+
+find_package(ZLIB REQUIRED)
+include_directories(${ZLIB_INCLUDE_DIRS})
+
+find_package(Threads REQUIRED)
+include_directories(${Threads_INCLUDE_DIRS})
+
 ## 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})
-# TODO: some alternative to boost::filesystem?
-target_link_libraries(laminard capnp-rpc capnp kj-async kj pthread boost_filesystem boost_system sqlite3 z)
+add_executable(laminard ${LAMINARD_CORE_SOURCES} src/main.cpp ${COMPRESSED_BINS})
+target_link_libraries(laminard CapnProto::capnp-rpc CapnProto::capnp CapnProto::kj-http CapnProto::kj-async
+                               CapnProto::kj Threads::Threads SQLite3::SQLite3 ZLIB::ZLIB)
+
+if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+    pkg_check_modules(INOTIFY REQUIRED libinotify)
+    target_link_libraries(laminard ${INOTIFY_LINK_LIBRARIES})
+endif()
 
 ## Client
-add_executable(laminarc src/client.cpp laminar.capnp.c++)
-target_link_libraries(laminarc capnp-rpc capnp kj-async kj pthread)
+add_executable(laminarc src/client.cpp src/version.cpp laminar.capnp.c++)
+target_link_libraries(laminarc CapnProto::capnp-rpc CapnProto::capnp CapnProto::kj-async CapnProto::kj Threads::Threads)
+
+## Manpages
+macro(gzip SOURCE)
+    get_filename_component(OUT_FILE ${SOURCE} NAME)
+    add_custom_command(OUTPUT ${OUT_FILE}.gz
+        COMMAND gzip < ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE} > ${OUT_FILE}.gz
+        DEPENDS ${SOURCE})
+endmacro()
+add_custom_target(laminar-manpages ALL DEPENDS laminard.8.gz laminarc.1.gz)
+gzip(etc/laminard.8)
+gzip(etc/laminarc.1)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/laminard.8.gz DESTINATION share/man/man8)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/laminarc.1.gz DESTINATION share/man/man1)
 
 ## Tests
 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-async kj pthread boost_filesystem boost_system 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)
+    target_link_libraries(laminar-tests ${GTEST_LIBRARIES} CapnProto::capnp-rpc CapnProto::capnp CapnProto::kj-http CapnProto::kj-async CapnProto::kj
+                                        Threads::Threads SQLite3::SQLite3 ZLIB::ZLIB)
 endif()
 
-set(SYSTEMD_UNITDIR /lib/systemd/system CACHE PATH "Path to systemd unit files")
-install(TARGETS laminard laminarc RUNTIME DESTINATION usr/bin)
-install(FILES laminar.service DESTINATION ${SYSTEMD_UNITDIR})
-install(FILES laminar.conf DESTINATION etc)
+set(BASH_COMPLETIONS_DIR /usr/share/bash-completion/completions CACHE PATH "Path to bash completions directory")
+set(ZSH_COMPLETIONS_DIR /usr/share/zsh/site-functions CACHE PATH "Path to zsh completions directory")
+install(TARGETS laminard RUNTIME DESTINATION sbin)
+install(TARGETS laminarc RUNTIME DESTINATION bin)
+install(FILES etc/laminar.conf DESTINATION /etc)
+install(FILES etc/laminarc-completion.bash DESTINATION ${BASH_COMPLETIONS_DIR} RENAME laminarc)
+install(FILES etc/laminarc-completion.zsh DESTINATION ${ZSH_COMPLETIONS_DIR} RENAME _laminarc)
+
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+    set(SYSTEMD_UNITDIR /lib/systemd/system CACHE PATH "Path to systemd unit files")
+    configure_file(etc/laminar.service.in laminar.service @ONLY)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/laminar.service DESTINATION ${SYSTEMD_UNITDIR})
+endif()

README.md

@@ -1,24 +1,41 @@
-# Laminar CI
+# Laminar CI [![status](https://ci.ohwg.net/badge/laminar.svg)](https://ci.ohwg.net/jobs/laminar)
 
-Laminar (http://laminar.ohwg.net) is a lightweight and modular Continuous Integration service for Linux. It is self-hosted and developer-friendly, eschewing a configuration UI in favor of simple version-controllable configuration files and scripts.
+Laminar (https://laminar.ohwg.net) is a lightweight and modular Continuous Integration service for Linux. It is self-hosted and developer-friendly, eschewing a configuration UI in favour of simple version-controllable configuration files and scripts.
 
 Laminar encourages the use of existing GNU/Linux tools such as `bash` and `cron` instead of reinventing them.
 
 Although the status and progress front-end is very user-friendly, administering a Laminar instance requires writing shell scripts and manually editing configuration files. That being said, there is nothing esoteric here and the [guide](http://laminar.ohwg.net/docs.html) should be straightforward for anyone with even very basic Linux server administration experience.
 
-See [the website](http://laminar.ohwg.net) and the [documentation](http://laminar.ohwg.net/docs.html) for more information.
+See [the website](https://laminar.ohwg.net) and the [documentation](https://laminar.ohwg.net/docs.html) for more information.
 
 ## Building from source
 
-First install development packages for `capnproto (git)`, `rapidjson`, `websocketpp`, `sqlite` and `boost-filesystem` 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 13 (Trixie), this can be done with:
+
+```bash
+sudo apt install capnproto cmake g++ libboost-dev libcapnp-dev libsqlite3-dev \
+  make rapidjson-dev zlib1g-dev pkg-config
+```
+
+Then compile and install laminar with:
 
 ```bash
 git clone https://github.com/ohwgiles/laminar.git
 cd laminar
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/
-make -j4
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+make -j "$(nproc)"
+# Warning: the following will overwrite an existing /etc/laminar.conf
 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.
+
+## Contributing
+
+Issues and pull requests via GitHub are most welcome. All pull requests must adhere to the [Developer Certificate of Origin](https://developercertificate.org/).

UserManual.md

@@ -17,32 +17,62 @@ Throughout this document, the fixed base path `/var/lib/laminar` is used. This i
 
 # Installing Laminar
 
-Pre-built packages are available for Debian 9 (Stretch) and CentOS 7 on x86_64. Alternatively, Laminar may be built from source for any Linux distribution.
+Pre-built upstream packages are available for Debian on x86_64 and armhf, and for Rocky/CentOS/RHEL on x86_64.
+Please see the [GitHub releases page](https://github.com/ohwgiles/laminar/releases) for the latest versions.
 
-## Installation from binaries
+Also, Laminar may be built from source for any Linux distribution.
 
-Alternatively to the source-based approach shown above, precompiled packages are supplied for x86_64 Debian 9 (Stretch) and CentOS 7
+## Installation from upstream packages
 
 Under Debian:
 
 ```bash
-wget https://github.com/ohwgiles/laminar/releases/download/0.6/laminar-0.6-1-amd64.deb
-sudo apt install laminar-0.6-1-amd64.deb
+wget https://github.com/ohwgiles/laminar/releases/download/1.3/laminar_1.3-1.upstream-debian11_amd64.deb
+sudo apt install ./laminar_1.3-1.upstream-debian11_amd64.deb
 ```
 
-Under CentOS:
+Under Rocky/CentOS/RHEL:
 
 ```bash
-wget https://github.com/ohwgiles/laminar/releases/download/0.5/laminar-0.6-1.x86_64.rpm
-sudo yum install laminar-0.6-1.x86_64.rpm
+wget https://github.com/ohwgiles/laminar/releases/download/1.3/laminar-1.3.upstream_rocky8-1.x86_64.rpm
+sudo dnf install ./laminar-1.3.upstream_rocky8-1.x86_64.rpm
 ```
 
-Both install packages will create a new `laminar` user and install (but not activate) a systemd service for launching the laminar daemon.
+Both install packages will create a new `laminar` system user and install (but not activate) a systemd service for launching the laminar daemon.
 
 ## Building from source
 
 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 (so scripts with `#!/bin/bash` will fail to execute) and it does not 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, for example:
+
+```bash
+docker run -d --name laminar_server -p 8080:8080 -v path/to/laminardir:/var/lib/laminar --env-file path/to/laminar.conf laminar:latest
+```
+
+The [`-v` flag](https://docs.docker.com/storage/volumes/#choose-the--v-or---mount-flag) is necessary to persist job scripts and artefacts beyond the container lifetime.
+
+The [`--env-file` flag](https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file) is necessary to pass configuration from `laminar.conf` to `laminard` because `laminard` does not read `/etc/laminar.conf` directly but expects variables within to be exported by `systemd` or other process supervisor.
+
+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
@@ -57,21 +87,19 @@ Laminar's configuration file may be found at `/etc/laminar.conf`. Laminar will s
 
 Edit `/etc/laminar.conf` and change `LAMINAR_BIND_HTTP` to `IPADDR:PORT`, `unix:PATH/TO/SOCKET` or `unix-abstract:SOCKETNAME`. `IPADDR` may be `*` to bind on all interfaces. The default is `*:8080`.
 
-Do not attempt to run laminar on port 80. This requires running as `root`, and Laminar will not drop privileges when executing job scripts! For a more complete integrated solution (including SSL), run laminar as a reverse proxy behind a regular webserver.
+Do not attempt to run laminar on port 80. This requires running as `root`, and Laminar will not drop privileges when executing job scripts! For a more complete integrated solution (including SSL), run laminar behind a regular webserver acting as a reverse proxy.
 
 ## 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).
+Laminar uses Server Sent Events to provide a responsive, auto-updating display without polling. Most frontend webservers should handle this without any extra configuration.
 
-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).
+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).
+See [this example configuration file for nginx](https://github.com/ohwgiles/laminar/blob/master/examples/nginx-ssl-reverse-proxy.conf).
 
 ## More configuration options
 
@@ -90,45 +118,54 @@ tar xzf hello-2.10.tar.gz
 cd hello-2.10
 ./configure
 make
+
+# save permanently to the job's run archive directory
+mv ./hello "$ARCHIVE/"
 ```
 
+If everything went well, the path to the freshly compiled `hello` binary is `$LAMINAR_HOME/archive/hello/latest/hello`, which prints
+```
+Hello, world!
+```
+upon execution.
+
 Laminar uses your script's exit code to determine whether to mark the run as successful or failed. If your script is written in bash, the [`-e` option](http://tldp.org/LDP/abs/html/options.html) is helpful for this. See also [Exit and Exit Status](http://tldp.org/LDP/abs/html/exit-status.html).
 
 Don't forget to mark the script executable:
 
 ```bash
-chmod +x /var/lib/laminar/cfg/hello.run
+chmod +x /var/lib/laminar/cfg/jobs/hello.run
 ```
 
 ---
 
 # Triggering a run
 
-When triggering a run, the job is first added to a queue of upcoming tasks. If the server is busy, the job may wait in this queue for a while. It will only be assigned a job number when it leaves this queue and starts executing. The job number may be useful to the client that triggers the run, so there are a few ways to trigger a run.
-
-To add the `hello` job to the queue ("fire-and-forget"), execute
+To queue execution of the `hello` job, run
 
 ```bash
 laminarc queue hello
 ```
 
-In this case, laminarc returns immediately, with its error code indicating whether adding the job to the queue was sucessful.
+In this case, `laminarc` returns immediately, with its error code indicating whether adding the job to the queue was sucessful. The run number will be printed to standard output.
 
-To queue the job and wait until it leaves the queue and starts executing, use
+If the server is busy, a run may wait in the queue for some time. To have `laminarc` instead block until the run leaves the queue and starts executing, use
 
 ```bash
 laminarc start hello
 ```
 
-In this case, laminarc blocks until the job starts executing, or returns immediately if queueing failed. The run number will be printed to standard output.
+In this case, `laminarc` blocks until the job starts executing, or returns immediately if queueing failed. The run number will be printed to standard output.
 
-To launch and run the `hello` job to completion, execute
+Finally, to launch and run the `hello` job to completion, execute
 
 ```bash
 laminarc run hello
 ```
 
-In all cases, a started run means the `/var/lib/laminar/cfg/hello.run` script will be executed, with a working directory of `/var/lib/laminar/run/hello/1` (or current run number)
+In this case, laminarc's return value indicates whether the run completed successfully.
+
+In all cases, a started run means the `/var/lib/laminar/cfg/jobs/hello.run` script will be executed, with a working directory of `/var/lib/laminar/run/hello/1` (or current run number)
 
 The result and log output should be visible in the Web UI at http://localhost:8080/jobs/hello/1
 
@@ -138,10 +175,25 @@ Also note that all the above commands can simultaneously trigger multiple differ
 laminarc queue test-host test-target
 ```
 
+A human-readable reason for the trigger can be set using the environment variable `LAMINAR_REASON`, which will be stored in the database and displayed in the web UI:
+
+```bash
+LAMINAR_REASON="Smoke detected" laminarc run activate-sprinklers
+```
+
+
 ## Isn't there a "Build Now" button I can click?
 
 This is against the design principles of Laminar and was deliberately excluded. Laminar's web UI is strictly read-only, making it simple to deploy in mixed-permission or public environments without an authentication layer. Furthermore, Laminar tries to encourage ideal continuous integration, where manual triggering is an anti-pattern. Want to make a release? Push a git tag and implement a post-receive hook. Want to re-run a build due to sporadic failure/flaky tests? Fix the tests locally and push a patch. Experience shows that a manual trigger such as a "Build Now" button is often used as a crutch to avoid doing the correct thing, negatively impacting traceability and quality.
 
+## Listing jobs from the command line
+
+`laminarc` may be used to inspect the server state:
+
+- `laminarc show-jobs`: Lists all files matching `/var/lib/laminar/cfg/jobs/*.run` on the server side.
+- `laminarc show-running`: Lists all currently running jobs and their run numbers.
+- `laminarc show-queued`: Lists all jobs waiting in the queue.
+
 ## Triggering a job at a certain time
 
 This is what `cron` is for. To trigger a build of `hello` every day at 0300, add
@@ -152,7 +204,6 @@ This is what `cron` is for. To trigger a build of `hello` every day at 0300, add
 
 to `laminar`'s crontab. For more information about `cron`, see `man crontab`.
 
-`LAMINAR_REASON` is an optional human-readable string that will be displayed in the web UI as the cause of the build.
 
 ## Triggering on a git commit
 
@@ -163,6 +214,8 @@ This is what [git hooks](https://git-scm.com/book/gr/v2/Customizing-Git-Git-Hook
 LAMINAR_REASON="Push to git repository" laminarc queue example-build
 ```
 
+For a more advanced example, see [examples/git-post-receive-hook-notes](https://github.com/ohwgiles/laminar/blob/master/examples/git-post-receive-hook-notes)
+
 What if your git server is not the same machine as the laminar instance?
 
 ## Triggering on a remote laminar instance
@@ -183,13 +236,13 @@ Then, point `laminarc` to the new location using an environment variable:
 LAMINAR_HOST=192.168.1.1:9997 laminarc queue example
 ```
 
-If you need more flexibility, consider running the communication channel as a regular unix socket and applying user and group permissions to the file. To achieve this, set
+If you need more flexibility, consider running the communication channel as a regular unix socket. Setting
 
 ```
 LAMINAR_BIND_RPC=unix:/var/run/laminar.sock
 ```
 
-or similar path in `/etc/laminar.conf`.
+or similar path in `/etc/laminar.conf` will result in a socket with group read/write permissions (`660`), so any user in the `laminar` system group can queue a job.
 
 This can be securely and flexibly combined with remote triggering using `ssh`. There is no need to allow the client full shell access to the server machine, the ssh server can restrict certain users to certain commands (in this case `laminarc`). See [the authorized_keys section of the sshd man page](https://man.openbsd.org/sshd#AUTHORIZED_KEYS_FILE_FORMAT) for further information.
 
@@ -197,11 +250,17 @@ This can be securely and flexibly combined with remote triggering using `ssh`. T
 
 Consider using [webhook](https://github.com/adnanh/webhook) or a similar application to call `laminarc`.
 
+## Viewing job logs
+
+A job's console output can be viewed on the Web UI at http://localhost:8080/jobs/$JOB/$RUN.
+
+Additionally, the raw log output may be fetched over a plain HTTP request to http://localhost:8080/log/$JOB/$RUN. The response will be chunked, allowing this mechanism to also be used for in-progress jobs. Furthermore, the special endpoint http://localhost:8080/log/$JOB/latest will redirect to the most recent log output. Be aware that the use of this endpoint may be subject to races when new jobs start.
+
 ---
 
 # Job chains
 
-A typical pipeline may involve several steps, such as build, test and deploy. Depending on the project, these may be broken up into seperate laminar jobs for maximal flexibility.
+A typical pipeline may involve several steps, such as build, test and deploy. Depending on the project, these may be broken up into separate laminar jobs for maximal flexibility.
 
 The preferred way to accomplish this in Laminar is to use the same method as [regular run triggering](#Triggering-a-run), that is, calling `laminarc` directly in your `example.run` scripts.
 
@@ -222,7 +281,7 @@ else
   laminarc run example-downstream-regular
 fi
 
-laminarc run example-test-$TARGET_PLATFORM
+laminarc run "example-test-$TARGET_PLATFORM"
 ```
 
 `laminarc` reads the `$JOB` and `$RUN` variables set by `laminard` and passes them as part of the queue/start/run request so the dependency chain can always be traced back.
@@ -231,7 +290,7 @@ laminarc run example-test-$TARGET_PLATFORM
 
 # Parameterized runs
 
-Any argument passed to `laminarc` of the form `var=value` will be exposed as an environment variable in the corresponding build scripts. For example:
+Any argument passed to `laminarc` of the form `KEY=VALUE` will be exposed as an environment variable in the corresponding build scripts. For example:
 
 ```bash
 laminarc queue example foo=bar
@@ -283,22 +342,20 @@ Then in `example.run`
 
 ```bash
 #!/bin/bash
-echo $foo            # prints "bar"
+echo "$foo"           # prints "bar"
 ```
 
-This works because laminarc reads `$JOB` and `$NUM` and passes them to the laminar daemon as part of the `set` request. (It is thus possible to set environment variables on other jobs by overriding these variables, but this is not very useful).
-
 ---
 
 # Archiving artefacts
 
-Laminar's default behaviour is to remove the run directory `/var/lib/laminar/run/JOB/RUN` after its completion. This prevents the typical CI disk usage explosion and encourages the user to judiciously select artefacts for archive.
+Laminar's default behaviour is to remove the run directory `/var/lib/laminar/run/$JOB/$RUN` after its completion. This prevents the typical CI disk usage explosion and encourages the user to judiciously select artefacts for archive.
 
-Laminar provides an archive directory `/var/lib/laminar/archive/JOB/RUN` and exposes its path in `$ARCHIVE`. `example-build.after` might look like this:
+Laminar provides an archive directory `/var/lib/laminar/archive/$JOB/$RUN` and exposes its path in `$ARCHIVE`. `example-build.after` might look like this:
 
 ```bash
 #!/bin/bash -xe
-cp example.out $ARCHIVE/
+cp example.out "$ARCHIVE/"
 ```
 
 This folder structure has been chosen to make it easy for system administrators to host the archive on a separate partition or network drive.
@@ -329,15 +386,17 @@ fi
 
 Of course, you can make this as pretty as you like. A [helper script](#Helper-scripts) can be a good choice here.
 
-If you want to send to different addresses dependending on the job, replace `engineering@company.com` above with a variable, e.g. `$RECIPIENTS`, and set `RECIPIENTS=nora@company.com,joe@company.com` in `/var/lib/laminar/cfg/jobs/JOB.env`. See [Environment variables](#Environment-variables).
+If you want to send to different addresses depending on the job, replace `engineering@company.com` above with a variable, e.g. `$RECIPIENTS`, and set `RECIPIENTS=nora@company.com,joe@company.com` in `/var/lib/laminar/cfg/jobs/$JOB.env`. See [Environment variables](#Environment-variables).
 
 You could also update the `$RECIPIENTS` variable dynamically based on the build itself. For example, if your run script accepts a parameter `$rev` which is a git commit id, as part of your job's `.after` script you could do the following:
 
 ```bash
-author_email=$(git show -s --format='%ae' $rev)
-laminarc set RECIPIENTS $author_email
+author_email=$(git show -s --format='%ae' "$rev")
+laminarc set RECIPIENTS "$author_email"
 ```
 
+See [examples/notify-email-pretty](https://github.com/ohwgiles/laminar/blob/master/examples/notify-email-pretty) and [examples/notify-email-text-log](https://github.com/ohwgiles/laminar/blob/master/examples/notify-email-text-log).
+
 ---
 
 # Helper scripts
@@ -372,96 +431,152 @@ For example, the following script creates a tarball containing both compiled out
 git clone /path/to/sources .
 make
 # Use a hardlink so the arguments to tar will be relative to the CWD
-ln $WORKSPACE/StaticAsset.bin ./
+ln "$WORKSPACE/StaticAsset.bin" ./
 tar zc a.out StaticAsset.bin > MyProject.tar.gz
 # Archive the artefact (consider moving this to the .after script)
-mv MyProject.tar.gz $ARCHIVE/
+mv MyProject.tar.gz "$ARCHIVE/"
 ```
 
 For a project with a large git history, it can be more efficient to store the sources in the workspace:
 
 ```bash
 #!/bin/bash -ex
-cd $WORKSPACE/myproject
+cd "$WORKSPACE/myproject"
 git pull
 cd -
 
-cmake $WORKSPACE/myproject
+cmake "$WORKSPACE/myproject"
 make -j4
 ```
 
-**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 the job has multiple simultaneous runs. 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 [locks](#Locks) to temporarily take exclusive control of a resource.
+Laminar will automatically create the workspace for a job if it doesn't exist when a job is executed. In this case, the `/var/lib/laminar/cfg/jobs/$JOB.init` will be executed if it exists. This is an excellent place to prepare the workspace to a state where subsequent builds can rely on its content:
 
-Laminar will automatically create the workspace for a job if it doesn't exist when a job is executed. In this case, the `/var/lib/laminar/cfg/jobs/JOBNAME.init` will be executed if it exists. This is an excellent place to prepare the workspace to a state where subsequent builds can rely on its content.
+```bash
+#!/bin/bash -e
+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 [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:
+
+```bash
+#!/bin/bash -xe
+
+# This script expects to be passed the parameter 'rev' which
+# should refer to a specific git commit in its source repository.
+# The commit ids could have been read from a server-side
+# post-commit git hook, where many commits could have been pushed
+# at once, but we want to check them all individually. This means
+# this job can be executed several times (with different values
+# for $rev) simultaneously.
+
+# Locked subshell for modifying the workspace
+(
+  flock 200
+  cd "$WORKSPACE"
+  # Download all the latest commits
+  git fetch
+  git checkout "$rev"
+  cd -
+  # Fast copy (hard-link) the source from the specific checkout
+  # to the build dir. This relies on the fact that git unlinks
+  # during checkout, effectively implementing copy-on-write.
+  cp -al "$WORKSPACE/src" src
+) 200>"$WORKSPACE"
+
+# run the (much longer) regular build process
+make -C src
+```
 
 ---
 
-# Abort on timeout
+# Aborting running jobs
 
-To configure a maximum execution time in seconds for a job, add a line to `/var/lib/laminar/cfg/jobs/JOBNAME.conf`:
+## After a timeout
+
+To configure a maximum execution time in seconds for a job, add a line to `/var/lib/laminar/cfg/jobs/$JOB.conf`:
 
 ```
 TIMEOUT=120
 ```
 
+## Manually
+
+`laminarc abort $JOB $RUN`
+
 ---
 
-# 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).
 
-```
-EXECUTORS=3
-```
+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.
 
-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`:
+## Defining a context
 
-```
-EXECUTORS=3
-TAGS=tag1,tag2
-```
-
-To add a tag to a job, add the following to `/var/lib/laminar/cfg/jobs/JOBNAME.conf`:
-
-```
-TAGS=tag2
-```
-
-If Laminar cannot find any node configuration, it will assume a single node with 6 executors and no tags.
-
-## 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:
+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=1
-TAGS=remote-target
 ```
 
-In each node's `.env` file, set the individual device's IP address:
+## 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. There are two ways to associate jobs and contexts. You can specify a comma-separated list of patterns `JOBS` in the context configuration file `/var/lib/laminar/cfg/contexts/$CONTEXT.conf`:
+
+```
+JOBS=amd64-target-*,usage-monitor
+```
+
+This approach is often preferred when you have many jobs that need to share limited resources.
+
+Alternatively, you can set
+
+```
+CONTEXTS=my-env-*,special_context
+```
+
+in `/var/lib/laminar/cfg/jobs/$JOB.conf`. This approach is often preferred when you have a small number of jobs that require exclusive access to an environment and you can supply alternative environments (e.g. target devices), because new contexts can be added without modifying the job configuration.
+
+In both cases, Laminar will iterate over the known contexts and associate the run with the first matching 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.env`:
+
+```
+DUT_IP=192.168.3.2
+FOO=bar
+```
+
+This environment will then be available the run script of jobs associated with this context. Note that these definitions are not expanded by a shell, so `FOO="bar"` would result in a variable `FOO` whose contents *include* double-quotes.
+
+---
+
+# 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 [context](#Contexts) for each, `/var/lib/laminar/cfg/contexts/target{1,2}.conf`:
+
+```
+EXECUTORS=1
+```
+
+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:
@@ -469,11 +584,11 @@ This means the job script `/var/lib/laminar/cfg/jobs/myproject-test.run` can be
 ```bash
 #!/bin/bash -e
 
-ssh root@$TARGET_IP /bin/bash -xe <<"EOF"
+ssh "root@$TARGET_IP" /bin/bash -xe <<"EOF"
   uname -a
   ...
 EOF
-scp root@$TARGET_IP:result.xml "$ARCHIVE/"
+scp "root@$TARGET_IP:result.xml" "$ARCHIVE/"
 ```
 
 Don't forget to add the `laminar` user's public ssh key to the remote's `authorized_keys`.
@@ -493,57 +608,111 @@ docker run --rm -ti -v $PWD:/root ubuntu /bin/bash -xe <<EOF
 EOF
 ```
 
+For more advanced usage, see [examples/docker-advanced](https://github.com/ohwgiles/laminar/blob/master/examples/docker-advanced)
+
 ---
 
-# Locks
+# Colours in log output
 
-*Locks* are a simple way to control access to shared resources. Any string may be used as a lock name. The command `laminarc lock mylock` locks `mylock`. Subsequent calls to `laminarc lock mylock` will block until `laminarc release mylock` is called a corresponding number of times.
+Laminar's frontend supports ANSI colours using the [ansi-up library](https://github.com/drudru/ansi_up). Unfortunately, there is no standard way of convincing applications to output colours when not connected to a tty. It is recommended to set [CLICOLOR_FORCE=1](https://bixense.com/clicolors/) in Laminar's [global environment file](#Environment-variables), plus any of the following environment variables that may be relevant (please submit more):
 
-**CAUTION**: Locks are independent of any other job control mechanism in laminar, and will not be released automatically. Making sure calls to lock and release are symmetric is the administrator's responsibility.
+* git: `GIT_CONFIG_PARAMETERS='color.status=always' 'color.ui=always'`
+* google test: `GTEST_COLOR=1`
+* grep: `GREP_OPTIONS=--color=always`
 
-An example use builds on the situation described in [Data sharing and Workspaces](#Data-sharing-and-Workspaces), where a large git repository is stored in the workspace. Conisder this run script:
+More intrusive options for other common tools which do not support enabling colours via environment variable:
 
-```bash
-#!/bin/bash -x
-
-# This script expects to be passed the parameter `rev` which
-# should refer to a specific git commit in its source repository.
-# The commit ids could have been read from a server-side
-# post-commit git hook, where many commits could have been pushed
-# at once, but we want to check them all individually. This means
-# this job can be executed several times (with different commit ids)
-# at once.
-
-cd $WORKSPACE
-# Acquire a lock for modifying the workspace
-laminarc lock $JOB-workspace
-# Download all the latest commits
-git fetch
-git checkout $rev
-cd -
-# Fast copy (hard-link) the specific checkout to the build dir
-cp -al $WORKSPACE/src src
-# Release the lock to allow other jobs to do the same
-laminarc release $JOB-workspace
-
-# run the (much longer) build process
-set -e
-cmake src
-make
-```
+* gcc and clang: Add `-fdiagnostics-color=always` to compile flags
 
 ---
 
 # Customizing the WebUI
 
-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.
+## Organising jobs into groups
 
-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).
+*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.
+
+## Adding a description to a job
+
+Edit `/var/lib/laminar/cfg/jobs/$JOB.conf`:
+
+```
+DESCRIPTION=Anything here will appear on the job page in the frontend <em>unescaped</em>.
+```
+
+## 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 HTML template
+
+If it exists, the file `/var/lib/laminar/custom/index.html` will be served by laminar instead of the default markup that is bundled into the Laminar binary. This file can be used to change any aspect of Laminar's WebUI, for example adding menu links or adding a custom stylesheet. Any required assets will need to be served directly from your [HTTP reverse proxy](#Service-configuration) or other HTTP server.
+
+An example customization can be found at [cweagans/semantic-laminar-theme](https://github.com/cweagans/semantic-laminar-theme).
+
+---
+
+# Badges
+
+Laminar will serve a job's current status as a pretty badge at the url `/badge/$JOB.svg`. This can be used as a link to your server instance from your Github README.md file or cat blog:
+
+```
+<a href="https://my-example-laminar-server.com/jobs/my-project">
+  <img src="https://my-example-laminar-server.com/badge/my-project.svg">
+</a>
+```
 
 ---
 
 # Reference
 
+## LAMINAR_HOME directory scheme
+
+```
+$LAMINAR_HOME/
+├── cfg/
+│   ├── before
+│   ├── jobs/
+│   │   ├── $JOB.init
+│   │   ├── $JOB.env
+│   │   ├── $JOB.before
+│   │   ├── $JOB.run
+│   │   ├── $JOB.after
+│   │   └── $JOB.conf
+│   ├── after
+│   │   scripts/
+│   │   ├── foo
+│   │   └── bar
+│   ├── env
+│   ├── contexts/
+│   │   ├── $CONTEXT.env
+│   │   └── $CONTEXT.conf
+│   └── groups.conf
+├── archive/
+│   └── $JOB/
+│       └── $RUN/           # $ARCHIVE
+├── run/
+│   └── $JOB/
+│       └── $RUN/           # run directory (ephemeral)
+│       └── workspace/      # $WORKSPACE
+├── custom/
+│   └── index.html
+└── laminar.sqlite
+```
+
+The user running `laminard` (by default the system user `laminar`)
+- must have read/write access to `laminar.sqlite`,
+- read/execute access to the contents of `cfg` and `custom` and
+- write access to `archive` and `run` if the running jobs are to have the ability to archive artefacts or utilize the workspace, respectively.
+
 ## Service configuration file
 
 `laminard` reads the following variables from the environment, which are expected to be sourced by `systemd` from `/etc/laminar.conf`:
@@ -557,15 +726,13 @@ This directory is also a good place to add any extra assets needed for this cust
 
 ## 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
@@ -578,15 +745,18 @@ 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`
 
+Note that definitions in these files are not expanded by a shell, so `FOO="bar"` would result in a variable `FOO` whose contents *include* double-quotes.
+
 Finally, variables supplied on the command-line call to `laminarc queue`, `laminarc start` or `laminarc run` will be available. See [parameterized runs](#Parameterized-runs)
 
 ## laminarc
@@ -595,9 +765,16 @@ Finally, variables supplied on the command-line call to `laminarc queue`, `lamin
 
 - `queue [JOB [PARAMS...]]...` adds one or more jobs to the queue with optional parameters, returning immediately.
 - `start [JOB [PARAMS...]]...` starts one or more jobs with optional parameters, returning when the jobs begin execution.
-- `run [JOB [PARAMS...]]...` triggers one or more jobs with optional parameters and waits for the completion of all jobs. Returns a non-zero error code if any job failed.
-- `set [VARIABLE=VALUE]...` sets one or more variables to be exported in subsequent scripts for the run identified by the `$JOB` and `$RUN` environment variables
-- `lock [NAME]` acquires the [lock](#Locks) named `NAME`
-- `release [NAME]` releases the lock named `NAME`
+- `run [JOB [PARAMS...]]...` triggers one or more jobs with optional parameters and waits for the completion of all jobs.
+- `--next` may be passed before `JOB` in order to place the job at the front of the queue instead of at the end.
+- `set [KEY=VALUE]...` sets one or more variables to be exported in subsequent scripts for the run identified by the `JOB` and `RUN` environment variables
+- `show-jobs` shows the known jobs on the server (`$LAMINAR_HOME/cfg/jobs/*.run`).
+- `show-running` shows the currently running jobs with their numbers.
+- `show-queued` shows the names of the jobs waiting in the queue.
+- `abort JOB RUN` manually aborts a currently running job by name and number.
 
 `laminarc` connects to `laminard` using the address supplied by the `LAMINAR_HOST` environment variable. If it is not set, `laminarc` will first attempt to use `LAMINAR_BIND_RPC`, which will be available if `laminarc` is executed from a script within `laminard`. If neither `LAMINAR_HOST` nor `LAMINAR_BIND_RPC` is set, `laminarc` will assume a default host of `unix-abstract:laminar`.
+
+`laminarc` reads the environment variable `LAMINAR_REASON` for a human-readable reason. See [Triggering a run](#Triggering-a-run).
+
+All commands return zero on success or a non-zero code if the command could not be executed. `laminarc run` will return a non-zero exit status if any executed job failed.

docker-build-centos.sh

@@ -1,84 +0,0 @@
-#!/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 - .)
-
-DOCKER_TAG=$(docker build -q - <<EOS
-FROM centos:7
-RUN yum -y install epel-release && yum -y install rpm-build cmake3 make gcc 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/3079784bfaf3ba05edacfc63d6d494b76a85a3a5.tar.gz
-wget -O websocketpp.tar.gz https://github.com/zaphoyd/websocketpp/archive/0.7.0.tar.gz
-wget -O rapidjson.tar.gz https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz
-md5sum -c <<EOF
-c5c04c1892a381e30bd032a6bceef111  capnproto.tar.gz
-5027c20cde76fdaef83a74acfcf98e23  websocketpp.tar.gz
-badd12c511e081fec6c89c43a7027bce  rapidjson.tar.gz
-EOF
-
-tar xzf capnproto.tar.gz
-tar xzf websocketpp.tar.gz
-tar xzf rapidjson.tar.gz
-
-cd /build/capnproto-3079784bfaf3ba05edacfc63d6d494b76a85a3a5/c++/
-cmake3 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=off .
-make -j4
-make install
-
-cd /build/websocketpp-0.7.0/
-cmake3 .
-make install
-
-cd /build/rapidjson-1.1.0/
-cmake3 -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 boost-filesystem zlib
-
-%description
-Lightweight Continuous Integration Service
-
-%prep
-
-%build
-cmake3 -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
-
-%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}
-chown -R laminar: %{_sharedstatedir}/laminar
-EOF
-
-rpmbuild -ba laminar.spec
-mv rpmbuild/RPMS/x86_64/laminar-$VERSION-1.x86_64.rpm /output/
-EOS

docker-build-debian.sh

@@ -1,74 +0,0 @@
-#!/bin/bash -e
-
-OUTPUT_DIR=$PWD
-
-SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
-
-VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)
-
-DOCKER_TAG=$(docker build -q - <<EOS
-FROM debian:9-slim
-RUN apt-get update && apt-get install -y wget cmake g++ libsqlite3-dev libboost-filesystem1.62-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
-
-wget -O capnproto.tar.gz https://github.com/capnproto/capnproto/archive/3079784bfaf3ba05edacfc63d6d494b76a85a3a5.tar.gz
-wget -O websocketpp.tar.gz https://github.com/zaphoyd/websocketpp/archive/0.7.0.tar.gz
-wget -O rapidjson.tar.gz https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz
-md5sum -c <<EOF
-c5c04c1892a381e30bd032a6bceef111  capnproto.tar.gz
-5027c20cde76fdaef83a74acfcf98e23  websocketpp.tar.gz
-badd12c511e081fec6c89c43a7027bce  rapidjson.tar.gz
-EOF
-
-tar xzf capnproto.tar.gz
-tar xzf websocketpp.tar.gz
-tar xzf rapidjson.tar.gz
-
-cd /build/capnproto-3079784bfaf3ba05edacfc63d6d494b76a85a3a5/c++/
-cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=off .
-make -j4
-make install
-
-cd /build/websocketpp-0.7.0/
-cmake .
-make install
-
-cd /build/rapidjson-1.1.0/
-cmake -DRAPIDJSON_BUILD_EXAMPLES=off .
-make install
-
-cd /build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ /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: libsqlite3-0, libboost-filesystem1.62.0, zlib1g
-Description: Lightweight Continuous Integration Service
-EOF
-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}
-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
-EOS

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=/usr && \
+    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" ]

etc/laminar.conf

@@ -43,6 +43,16 @@
 ###
 #LAMINAR_KEEP_RUNDIRS=0
 
+
+###
+### LAMINAR_BASE_URL
+###
+### Base url for the frontend. This affects the <base href> tag and needs
+### to be set if Laminar runs behind a reverse-proxy that hosts Laminar
+### within a subfolder (rather than at a subdomain root)
+###
+#LAMINAR_BASE_URL=/
+
 ###
 ### LAMINAR_ARCHIVE_URL
 ###
@@ -51,4 +61,4 @@
 ### uses a very naive and inefficient method. Best to let a real
 ### webserver handle serving those requests.
 ###
-#LAMINAR_ARCHIVE_URL=http://backbone.example.com/ci/archive
+#LAMINAR_ARCHIVE_URL=http://backbone.example.com/ci/archive/

etc/laminar.service.in

@@ -1,10 +1,13 @@
 [Unit]
 Description=Laminar continuous integration service
+After=network.target
+Documentation=man:laminard(8)
+Documentation=https://laminar.ohwg.net/docs.html
 
 [Service]
 User=laminar
 EnvironmentFile=-/etc/laminar.conf
-ExecStart=/usr/bin/laminard
+ExecStart=@CMAKE_INSTALL_PREFIX@/sbin/laminard -v
 
 [Install]
 WantedBy=multi-user.target

etc/laminarc-completion.bash

@@ -0,0 +1,28 @@
+# Bash completion file for laminarc
+# vim: ft=sh
+
+_laminarc() {
+	local cur prev words cword
+	_init_completion || return
+	if [ "$cword" -gt 1 ]; then
+		case "${words[1]}" in
+			queue|start|run)
+				if [ "$cword" -eq 2 ]; then
+					COMPREPLY+=($(compgen -W "$(laminarc show-jobs)" -- ${cur}))
+				fi
+				;;
+			abort)
+				if [ "$cword" -eq 2 ]; then
+					COMPREPLY+=($(compgen -W "$(laminarc show-running | cut -d : -f 1)" -- ${cur}))
+				elif [ "$cword" -eq 3 ]; then
+					COMPREPLY+=($(compgen -W "$(laminarc show-running | cut -d : -f 2)" -- ${cur}))
+				fi
+				;;
+		esac
+	else
+		local cmds="queue start run set show-jobs show-queued show-running abort"
+		COMPREPLY+=($(compgen -W "${cmds}" -- ${cur}))
+	fi
+}
+
+complete  -F _laminarc laminarc

etc/laminarc-completion.zsh

@@ -0,0 +1,34 @@
+#compdef laminarc
+#autoload
+
+_laminarc() {
+	if (( CURRENT == 2 )); then
+		_values "Operation" \
+			"queue" \
+			"start" \
+			"run" \
+			"set" \
+			"show-jobs" \
+			"show-queued" \
+			"show-running" \
+			"abort"
+	else
+		case "${words[2]}" in
+			queue|start|run)
+				if (( CURRENT == 3 )); then
+					_values "Jobs" $(laminarc show-jobs)
+				fi
+				;;
+			abort)
+				if (( CURRENT == 3 )); then
+					_values "Jobs" $(laminarc show-running | cut -d : -f 1)
+				elif (( CURRENT == 4 )); then
+					_values "Runs" $(laminarc show-running | cut -d : -f 2)
+				fi
+				;;
+		esac
+	fi
+}
+
+_laminarc
+# vim: ft=zsh

etc/laminarc.1

@@ -0,0 +1,74 @@
+.Dd Apr 04, 2019
+.Dt LAMINARC 1
+.Sh NAME
+.Nm laminarc
+\-
+Laminar CI client application
+.Sh SYNOPSIS
+.Nm laminarc Li queue \fIJOB\fR [\fIPARAM=VALUE...\fR] ...
+.Nm laminarc Li start \fIJOB\fR [\fIPARAM=VALUE...\fR] ...
+.Nm laminarc Li run \fIJOB\fR [\fIPARAM=VALUE...\fR] ...
+.Nm laminarc Li set \fIPARAM=VALUE...\fR
+.Nm laminarc Li show-jobs
+.Nm laminarc Li show-running
+.Nm laminarc Li show-queued
+.Nm laminarc Li abort \fIJOB\fR \fINUMBER\fR
+.Sh DESCRIPTION
+The
+.Nm laminarc
+program connects to a Laminar server and perform one of following operations:
+.Bl -tag
+.It Sy queue
+adds job(s) (with optional parameters) to the queue and returns immediately.
+.It Sy start
+adds job(s) (with optional parameters) to the queue and returns when the jobs
+begin execution.
+.It Sy run
+adds job(s) (with optional parameters) to the queue and returns when the jobs
+complete execution. The exit code will be non-zero if any of the runs does
+not complete successfully.
+.It \t
+\fB--next\fR may be passed to \fBqueue\fR, \fBstart\fR or \fBrun\fR in order
+to place the job at the front of the queue instead of at the end.
+.It Sy set
+sets one or more parameters to be exported as environment variables in subsequent
+scripts for the run identified by the $JOB and $RUN environment variables.
+This is primarily intended for use from within a job execution, where those
+variables are already set by the server.
+.It Sy show-jobs
+list jobs known to the server.
+.It Sy show-running
+list the currently running jobs with their numbers.
+.It Sy show-queued
+list the names and numbers of the jobs waiting in the queue.
+.It Sy abort
+manually abort a currently running job by name and number.
+.El
+.Pp
+The laminar server to connect to is read from the
+.Ev LAMINAR_HOST
+environment variable. If empty, it falls back to
+.Ev LAMINAR_BIND_RPC
+and finally defaults to
+.Ad unix-abstract:laminar
+.Sh ENVIRONMENT
+.Bl -tag
+.It Ev LAMINAR_HOST
+address of server to connect. May be of the form
+.Ad IP:PORT,
+.Ad unix:PATH/TO/SOCKET
+or
+.Ad unix-abstract:NAME
+.It Ev LAMINAR_BIND_RPC
+fallback server address variable. It is set by
+.Nm laminard
+during execution of scripts.
+.El
+.Sh SEE ALSO
+.Xr laminard 8
+.Sh AUTHORS
+.An Oliver Giles
+created Laminar CI.
+.An Dmitry Bogatov
+created this manual page for the Debian project (but it can be used
+by others).

etc/laminard.8

@@ -0,0 +1,56 @@
+.Dd Apr 03, 2019
+.Dt LAMINARD 1
+.Sh NAME
+.Nm laminard
+\-
+Laminar CI server
+.Sh SYNOPSIS
+.Nm laminard Op Fl v
+.Sh DESCRIPTION
+Start Laminar CI server in the foreground. If option
+.Fl v
+is specified, verbose logging is enabled. Other aspects of
+operation are controlled by environment variables.
+.Sh ENVIRONMENT
+.Bl -tag
+.It Ev LAMINAR_HOME
+Root location containing laminar configuration, database, build
+workspaces and archive.
+.Pp
+Default: /var/lib/laminar
+.It Ev LAMINAR_BIND_HTTP
+Interface on which laminard will bind to serve the Web UI.
+May be of the form IP:PORT, unix:PATH/TO/SOCKET or unix-abstract:NAME
+.Pp
+Default: *:8080
+.It Ev LAMINAR_BIND_HRPC
+Interface on which laminard will bind to accept RPC from laminarc.
+May be of the form IP:PORT, unix:PATH/TO/SOCKET or unix-abstract:NAME
+.Pp
+Default: unix-abstract:laminar
+.It Ev LAMINAR_TITLE
+Page title to show in web frontend
+.It Ev LAMINAR_KEEP_RUNDIRS
+Setting this prevents the immediate deletion of job rundirs
+$LAMINAR_HOME/run/$JOB/$RUN. Value should be an integer represeting
+the number of rundirs to keep.
+.Pp
+Default: 0
+.It Ev LAMINAR_ARCHIVE_URL
+Base url used to request artifacts. Laminar can serve build artifacts
+(and it will if you leave this unset), but it uses a very naive and
+inefficient method. Best to let a real webserver handle serving those
+requests.
+.El
+.Sh FILES
+.Bl -tag
+.It Pa /etc/laminar.conf
+Variable assignments in this file are exported by systemd or other
+init system before launching the system-wide installation of Laminar.
+.El
+.Sh AUTHORS
+.An Oliver Giles
+created Laminar CI.
+.An Dmitry Bogatov
+created this manual page for Debian project (but it can be used
+by others).

example-scripts/format-test-results

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-cat <<EOF
-<!doctype html>
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Laminar</title>
-<link href="/css/bootstrap.min.css" rel="stylesheet">
-</head>
-<body>
-<div class="col-xs-12">
-<h2>Test report for $lJobName #$lBuildNum</h2>
-EOF
-xsltproc "$(dirname ${BASH_SOURCE[0]})/testreport.xsl" "$1";
-cat <<EOF
-</div>
-</body>
-</html>
-EOF

example-scripts/junit-bs-style.xsl

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:output method="html" indent="no"/>
-<xsl:template match="testsuite">
-<h3>Test Suite: <xsl:value-of select="@name" /></h3>
-<dl class="dl-horizontal">
- <dt>Tests run:</dt><dd><xsl:value-of select="@tests" /></dd>
- <dt>Failures:</dt><dd><xsl:value-of select="@failures" /></dd>
- <dt>Errors:</dt><dd><xsl:value-of select="@errors" /></dd>
- <dt>Elapsed time:</dt><dd><xsl:value-of select="@time" /></dd>
-</dl>
-<ul class="list-group">
-<xsl:apply-templates select="testcase" />
-</ul>
-<xsl:apply-templates select="system-out" />
-<xsl:apply-templates select="system-err" />
-</xsl:template>
-
-<xsl:template match="testcase">
-<xsl:choose>
- <xsl:when test="*">
-  <li class="list-group-item list-group-item-danger"><xsl:value-of select="@name" />
-   <xsl:apply-templates select="failure" />
-  </li>
- </xsl:when>
- <xsl:otherwise>
-  <li class="list-group-item list-group-item-success"><xsl:value-of select="@name" /></li>
- </xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-
-<xsl:template match="failure">
-<pre>
-<xsl:value-of select="@message"/>
-</pre>
-</xsl:template>
-
-<xsl:template match="system-out"><h5>Standard output:</h5><pre><xsl:value-of select="." /></pre></xsl:template>
-<xsl:template match="system-err"><h5>Standard error:</h5><pre><xsl:value-of select="." /></pre></xsl:template>
-
-</xsl:stylesheet>
-

examples/docker-advanced

@@ -0,0 +1,53 @@
+#!/bin/bash -eu
+
+# Any failing command in a pipe will cause an error, instead
+# of just an error in the last command in the pipe
+set -o pipefail
+
+# Log commands executed
+set -x
+
+# Simple way of getting the docker build tag:
+tag=$(docker build -q - <<\EOF
+	FROM debian:bookworm
+	RUN apt-get update && apt-get install -y build-essential
+EOF
+)
+
+# But -q suppresses the log output. If you want to keep it,
+# you could use the following fancier way:
+
+exec {pfd}<><(:) # get a new pipe
+docker build - <<\EOF |
+	FROM debian:bookworm
+	RUN apt-get update && apt-get install -y build-essential
+EOF
+tee >(awk '/Successfully built/{print $3}' >&$pfd) # parse output to pipe
+read tag <&$pfd # read tag back from pipe
+exec {pfd}<&- # close pipe
+
+# Alternatively, you can use the -t option to docker build
+# to give the built image a name to refer to later. But then
+# you need to ensure that it does not conflict with any other
+# images, and handle cases where multiple instances of the
+# job attempt to update the tagged image.
+
+# If you want the image to be cleaned up on exit:
+trap "docker rmi $tag" EXIT
+
+# Now use the image to build something:
+docker run -i --rm \
+	-v "$PWD:$PWD" \
+	-w "$PWD" \
+	-u $(id -u):$(id -g) \
+	$tag /bin/bash -eux \
+<<EOF
+	# The passed options mean we keep our current working
+	# directory and user, so no permission problems on the
+	# artifacts produced within the container.
+	echo 'main(){puts("hello world");}' | gcc -x c -static -o hello -
+EOF
+
+# Test the result
+./hello
+

examples/format-test-results

@@ -0,0 +1,117 @@
+#!/bin/bash
+
+# This example script takes the XML output of a gtest run and formats
+# it as HTML. It can easily be adapted to other XML test output formats
+# such as JUnit or CTest
+
+# Prepare xml with ./path/to/test --gtest_output=xml:path/to/output.xml
+
+# Usage: format-test-results test_result.xml > output.html
+
+if [ ! -f "$1" ]; then
+  echo "File not found: \"$1\""
+  exit 1
+fi
+
+xsltproc --stringparam JOB $JOB --stringparam RUN $RUN <(cat <<\EOF
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="html" indent="yes" />
+
+<xsl:template match="/">
+<html>
+ <head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>Test report for <xsl:value-of select="$JOB" /> #<xsl:value-of select="$RUN" /></title>
+  <style>
+   body { font-family: Helvetica Neue, Helvetica, Arial, sans-serif; }
+   label:hover { cursor: pointer; }
+   label:before { content: '+ ' }
+   input[type=checkbox].toggle-collapse { display: none; }
+   input[type=checkbox].toggle-collapse~.collapsible { display: none; }
+   input[type=checkbox].toggle-collapse:checked~.collapsible { display: block; }
+   code { white-space: pre-wrap; color: white; }
+   .failure { background-color: #c73030; color: white; }
+   table { min-width: 720px; border-collapse: collapse; }
+   td, th { padding: 5px; }
+   tr:nth-child(even) td { padding: 0; }
+   tr:nth-child(even) { border-bottom: 1px solid #b3abab; }
+   .testcase { padding: 5px; }
+   .testcase.success:before { content: '✔ '; color: green; }
+  </style>
+ </head>
+ <body>
+  <h1><xsl:value-of select="$JOB" /> #<xsl:value-of select="$RUN" /></h1>
+  <h2>Test Report</h2>
+  <table>
+   <thead>
+    <tr>
+     <th>Suite</th>
+     <th>Tests run</th>
+     <th>Failures</th>
+     <th>Errors</th>
+     <th>Elapsed time</th>
+    </tr>
+   </thead>
+  <xsl:apply-templates select="testsuites" />
+  </table>
+ </body>
+</html>
+</xsl:template>
+
+<xsl:template match="testsuite">
+<xsl:variable name="result">
+ <xsl:choose>
+  <xsl:when test="(@failures &gt; 0) or (@errors &gt; 0)">failure</xsl:when>
+  <xsl:otherwise>success</xsl:otherwise>
+ </xsl:choose>
+</xsl:variable>
+<tr class="{$result}">
+ <td>
+  <label for="suite-{@name}"><xsl:value-of select="@name" /></label>
+ </td>
+ <td><xsl:value-of select="@tests" /></td>
+ <td><xsl:value-of select="@failures" /></td>
+ <td><xsl:value-of select="@errors" /></td>
+ <td><xsl:value-of select="@time" /></td>
+</tr>
+<tr class="toggle-target">
+ <td colspan="5">
+  <input class="toggle-collapse" id="suite-{@name}" type="checkbox" />
+  <div class="collapsible" style="padding-left: 15px;">
+   <xsl:apply-templates select="testcase" />
+  </div>
+ </td>
+</tr>
+</xsl:template>
+
+<xsl:template match="testcase">
+<xsl:choose>
+ <!-- has child nodes? -->
+ <xsl:when test="*">
+  <div class="testcase failure">
+   <xsl:value-of select="@name" /><br />
+   <xsl:apply-templates select="failure" />
+  </div>
+ </xsl:when>
+ <xsl:otherwise>
+  <div class="testcase success">
+   <xsl:value-of select="@name" />
+  </div>
+ </xsl:otherwise>
+</xsl:choose>
+</xsl:template>
+
+<xsl:template match="failure">
+<div style="padding: 5px; background-color: #313235">
+ <code>
+  <xsl:value-of select="@message"/>
+ </code>
+</div>
+</xsl:template>
+
+</xsl:stylesheet>
+
+EOF
+) "$1"

examples/git-post-receive-hook-notes

@@ -0,0 +1,42 @@
+#!/bin/bash -e
+# Simple post-receive hook that triggers a laminar run
+# for every commit pushed to every branch, and annotates
+# the commit with the run number using a git note.
+# On the cloned repository, useful config is
+#  git config --add remote.origin.fetch "+refs/notes/*:refs/notes/*"
+# to automatically fetch all notes from the origin, and
+#  git config --add notes.displayRef "refs/notes/*"
+# to display all notes in the git log by default
+
+# The laminar job to trigger
+LAMINAR_JOB=my-project
+
+# Default notes ref is refs/notes/commits
+NOTES_REF=refs/notes/ci
+
+# For each ref pushed...
+while read old new ref; do
+	# Skip tags, notes, etc. Only do heads.
+	# Extend this to only trigger on specific branches.
+	if [[ $ref != refs/heads/* ]]; then
+		continue
+	fi
+	# Otherwise, for each new commit in the ref...
+	# (to only trigger on the newest, set commit=$new and delete the loop)
+	git rev-list $([[ $old =~ ^0+$ ]] && echo $new || echo $old..$new) | while read commit; do
+		# Queue the laminar run
+		run=$(laminarc queue $LAMINAR_JOB commit=$commit ref=$ref)
+		echo "Started Laminar $run for commit $commit to ref $ref"
+
+		# Add a git note about the run
+		blob=$(echo -n "Laminar-Run: $run" | git hash-object -w --stdin)
+		if last_note=$(git show-ref -s $NOTES_REF); then
+			git read-tree $last_note
+			p_arg=-p
+		fi
+		git update-index --add --cacheinfo 100644 $blob $commit
+		tree=$(git write-tree)
+		new_note=$(echo "Notes added by post-receive hook" | git commit-tree $tree $p_arg $last_note)
+		git update-ref $NOTES_REF $new_note $last_note
+	done
+done

examples/nginx-ssl-reverse-proxy.conf

@@ -0,0 +1,52 @@
+server {
+  listen [::]:80;
+  listen 80;
+  server_name laminar.example.com;
+
+  # rule for letsencrypt ACME challenge requests
+  location ^~ /.well-known/acme-challenge/ {
+    default_type "text/plain";
+    alias /srv/www/acme-challenge/;
+  }
+
+  # redirect all other http to https
+  return 301 https://$server_name$request_uri;
+}
+
+server {
+  # http2 is recommended because browsers will only open a small number of concurrent SSE streams over http1
+  listen [::]:443 ssl http2;
+  listen 443 ssl http2;
+  server_name laminar.example.com;
+
+  # modern tls only, see https://syslink.pl/cipherlist/ for a more complete example
+  ssl_protocols TLSv1.3;
+  ssl_ciphers EECDH+AESGCM:EDH+AESGCM;
+
+  # set according to ACME/letsencrypt client
+  ssl_certificate /path/to/certificate.crt;
+  ssl_certificate_key /path/to/private.key;
+
+  # use "location /" if laminar is to be accessible at the (sub)domain root.
+  # alteratively, use a subdirectory such as "location /my-laminar/" and ensure that
+  # LAMINAR_BASE_URL=/my-laminar/ accordingly.
+  location / {
+    # set proxy_pass according to LAMINAR_BIND_HTTP.
+    # note that the laminar default for LAMINAR_BIND_HTTP is *:8080, which binds on all interfaces
+    # instead of just the loopback device and is almost certainly not what you want if you are using
+    # a reverse proxy. It should be set to 127.0.0.1:8080 at a minimum, or use unix sockets for more
+    # fine-grained control of permissions.
+    # see http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_pass
+    # and https://laminar.ohwg.net/docs.html#Running-on-a-different-HTTP-port-or-Unix-socket
+    proxy_pass http://127.0.0.1:8080/;
+
+    # required to allow laminar's SSE stream to pass correctly
+    proxy_http_version 1.1;
+    proxy_set_header Connection "";
+  }
+
+  # have nginx serve artefacts directly rather than having laminard do it
+  location /archive/ {
+    alias /var/lib/laminar/archive/;
+  }
+}

examples/notify-email-pretty

@@ -0,0 +1,55 @@
+#!/bin/bash -e
+
+# IMPORTANT: change these to appropriate values, or fetch them, for example
+# from the environment or from $(git show -s --format='%ae' $rev)
+TO_EMAIL=engineering@example.com
+FROM_EMAIL=laminar@example.com
+
+LAMINAR_URL=${LAMINAR_BASE_URL:-http://localhost:8080}
+LAMINAR_TITLE=${LAMINAR_TITLE:-Laminar CI}
+
+if [[ $RESULT = "success" ]]; then
+ SVGICON=$(cat <<-EOF
+	<svg viewBox="0 0 100 100" width="24px">
+	<path fill="#74af77" d="m 23,46 c -6,0 -17,3 -17,11 0,8 9,30 12,32 3,2 14,5 20,-2 6,-6 24,-36
+	                          56,-71 5,-3 -9,-8 -23,-2 -13,6 -33,42 -41,47 -6,-3 -5,-12 -8,-15 z" />
+	</svg>
+	EOF
+ )
+else
+ SVGICON=$(cat <<-EOF
+	<svg viewBox="0 0 100 100" width="24px">
+	<path fill="#883d3d" d="m 19,20 c 2,8 12,29 15,32 -5,5 -18,21 -21,26 2,3 8,15 11,18 4,-6 17,-21
+	           21,-26 5,5 11,15 15,20 8,-2 15,-9 20,-15 -3,-3 -17,-18 -20,-24 3,-5 23,-26 30,-33 -3,-5 -8,-9
+	           -12,-12 -6,5 -26,26 -29,30 -6,-8 -11,-15 -15,-23 -3,0 -12,5 -15,7 z" />
+	</svg>
+	EOF
+ )
+fi
+
+sendmail -t <<EOF
+From: $FROM_EMAIL
+To: $TO_EMAIL
+Subject: $JOB #$RUN: $RESULT
+Mime-Version: 1.0
+Content-Type: text/html; charset=utf-8
+
+<html lang="en">
+ <body bgcolor="#efefef" style="margin: 0; font-family: Helvetica Neue, Helvetica, Arial, sans-serif">
+  <table width="100%" border="0" cellspacing="0" cellpadding="0">
+   <tr><td align="center">
+    <table border="0" cellspacing="0" cellpadding="15" bgcolor="#ffffff">
+     <tr bgcolor="#2f3340">
+      <td style="font-size: 28px; color: #ffffff;">$LAMINAR_TITLE</td></tr>
+     <tr>
+      <td style="font-size: 26px">
+       $SVGICON
+       <a href="$LAMINAR_URL/jobs/$JOB/$RUN">$JOB #$RUN</a>
+      </td>
+     </tr>
+    </table>
+   </td></tr>
+  </table>
+ </body>
+</html>
+EOF

examples/notify-email-text-log

@@ -0,0 +1,18 @@
+#!/bin/bash -e
+
+# IMPORTANT: change these to appropriate values, or fetch them, for example
+# from the environment or from $(git show -s --format='%ae' $rev)
+TO_EMAIL=engineering@example.com
+FROM_EMAIL=laminar@example.com
+
+LAMINAR_URL=${LAMINAR_BASE_URL:-http://localhost:8080}
+
+sendmail -t <<EOF
+From: $FROM_EMAIL
+To: $TO_EMAIL
+Subject: $JOB #$RUN: $RESULT
+Mime-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+
+$(curl -s $LAMINAR_URL/log/$JOB/$RUN)
+EOF

examples/notify-telegram

@@ -0,0 +1,18 @@
+#!/bin/bash -e
+
+# Sends a message from a specified bot to a specific telegram chat ID.
+# See https://core.telegram.org/bots
+
+# IMPORTANT: modify this to your real bot token and chat ID
+BOT_TOKEN=123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11
+CHAT_ID=10000000
+
+LAMINAR_URL=${LAMINAR_BASE_URL:-http://localhost:8080}
+
+[[ $(curl -sS https://api.telegram.org/bot$BOT_TOKEN/sendMessage \
+	-d chat_id=$CHAT_ID \
+	-d parse_mode=HTML \
+	-d text="<a href=\"$LAMINAR_URL/jobs/$JOB/$RUN\">$JOB #$RUN</a> $RESULT" \
+	| jq .ok) == true ]]
+
+

examples/plot-build-time-dist

@@ -0,0 +1,46 @@
+#!/usr/bin/env gnuplot
+
+# Deeper insights can be obtained by querying Laminar's database directly.
+# This example uses gnuplot to create a graph of the distribution of the
+# average run time of jobs.
+
+# The following will output a png...
+set terminal pngcairo size 800,580 enhanced font 'Helvetica,10'
+set output 'build-time-distribution.png'
+# ..comment it out to use an interactive widget
+
+# plot style
+set tics font "Helvetica,10"
+set title font "Helvetica,11"
+set xtics nomirror
+set ytics nomirror
+set border 3 back lt 1 lc rgb "#808080"
+set grid back lt 0 lc rgb "#d0d0d0" lw 0.5
+set style line 1 lt 1 lc rgb "#7483af" lw 2
+
+# Fetch the path to Laminar's sqlite database
+db = system("echo $LAMINAR_HOME") . '/laminar.sqlite'
+
+# Label the axes
+set xtics ("<30s" 0, "30s-1m" 1, "1m-5m" 2, "5m-10m" 3, "10m-20m" 4, "20m-40m" 5, "40m-60m" 6, ">60m" 7)
+set ylabel "Number of jobs"
+set xlabel "Average run time"
+set title "Distribution of average run times"
+
+plot '< sqlite3 -separator $''\n'' ' . db . ' \
+  "WITH ba AS (SELECT name,AVG(completedAt-startedAt) a FROM builds GROUP BY name) SELECT \
+    COUNT(CASE WHEN               a <    30 THEN 1 END), \
+    COUNT(CASE WHEN a >=   30 AND a <    60 THEN 1 END), \
+    COUNT(CASE WHEN a >=   60 AND a <   300 THEN 1 END), \
+    COUNT(CASE WHEN a >=  300 AND a <   600 THEN 1 END), \
+    COUNT(CASE WHEN a >=  600 AND a <  1200 THEN 1 END), \
+    COUNT(CASE WHEN a >= 1200 AND a <  2400 THEN 1 END), \
+    COUNT(CASE WHEN a >= 2400 AND a <  3600 THEN 1 END), \
+    COUNT(CASE WHEN a >= 3600               THEN 1 END) FROM ba;"' \
+  using 0:1 with linespoints title '' ls 1
+
+# uncomment this if using an interactive window
+#pause mouse close
+
+# Release the output
+set output

pkg/debian13-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-debian13
+
+DOCKER_TAG=$(docker build -q - <<EOS
+FROM debian:13-slim
+RUN apt-get update && apt-get install -y wget cmake g++ capnproto libcapnp-dev rapidjson-dev libsqlite3-dev libboost-dev zlib1g-dev pkg-config
+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=/usr -DLAMINAR_VERSION=$VERSION -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-1.0.1, 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/debian13-armhf.sh

@@ -0,0 +1,65 @@
+#!/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-debian13
+
+DOCKER_TAG=$(docker build -q - <<EOS
+FROM debian:13-slim
+RUN dpkg --add-architecture armhf && apt-get update && apt-get install -y wget cmake pkg-config crossbuild-essential-armhf capnproto libcapnp-dev:armhf rapidjson-dev:armhf 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_PREFIX_PATH /usr/lib/arm-linux-gnueabihf)
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(ENV{PKG_CONFIG_PATH} "/usr/lib/arm-linux-gnueabihf/pkgconfig")
+EOF
+
+cd /build
+cmake \
+	-DCMAKE_TOOLCHAIN_FILE=toolchain.cmake \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DLAMINAR_VERSION=$VERSION \
+	-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-1.0.1, 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/debian14-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-debian14
+
+DOCKER_TAG=$(docker build -q - <<EOS
+FROM debian:forky-slim
+RUN apt-get update && apt-get install -y wget cmake g++ capnproto libcapnp-dev rapidjson-dev libsqlite3-dev libboost-dev zlib1g-dev pkg-config
+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=/usr -DLAMINAR_VERSION=$VERSION -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-1.1.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/debian14-armhf.sh

@@ -0,0 +1,65 @@
+#!/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-debian14
+
+DOCKER_TAG=$(docker build -q - <<EOS
+FROM debian:forky-slim
+RUN dpkg --add-architecture armhf && apt-get update && apt-get install -y wget cmake pkg-config crossbuild-essential-armhf capnproto libcapnp-dev:armhf rapidjson-dev:armhf 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_PREFIX_PATH /usr/lib/arm-linux-gnueabihf)
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(ENV{PKG_CONFIG_PATH} "/usr/lib/arm-linux-gnueabihf/pkgconfig")
+EOF
+
+cd /build
+cmake \
+	-DCMAKE_TOOLCHAIN_FILE=toolchain.cmake \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DLAMINAR_VERSION=$VERSION \
+	-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-1.1.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/opensuse16.0-x86_64.sh

@@ -0,0 +1,62 @@
+#!/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_opensuse16
+
+DOCKER_TAG=$(docker build -q - <<EOS
+FROM opensuse/leap:16
+RUN zypper --non-interactive refresh && zypper --non-interactive update && zypper --non-interactive install -y rpm-build cmake make gcc-c++ wget sqlite3-devel boost-devel zlib-devel capnproto libcapnp-devel rapidjson-devel
+EOS
+)
+
+# use /usr/sr/packages for opensuse instead of /root/rpmbuild
+docker run --rm -i -v $SOURCE_DIR:/usr/src/packages/SOURCES/laminar-$VERSION:ro -v $OUTPUT_DIR:/output $DOCKER_TAG bash -xe <<EOS
+mkdir /build
+cd /build
+
+cat <<EOF > laminar.spec
+Summary: Lightweight Continuous Integration Service
+Name: laminar
+Version: $VERSION
+Release: 1
+License: GPL
+URL: https://laminar.ohwg.net/
+BuildArch: x86_64
+BuildRequires: cmake make gcc-c++ sqlite3-devel boost-devel zlib-devel capnproto libcapnp-devel rapidjson-devel
+
+%description
+Lightweight Continuous Integration Service
+
+%prep
+
+%build
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DLAMINAR_VERSION=$VERSION -DSYSTEMD_UNITDIR=%{_unitdir} %{_sourcedir}/laminar-$VERSION
+pwd
+make %{?_smp_mflags}
+
+%install
+%make_install
+
+%files
+%{_bindir}/laminarc
+%{_sbindir}/laminard
+%{_unitdir}/laminar.service
+%config(noreplace) %{_sysconfdir}/laminar.conf
+%{_datarootdir}/bash-completion/completions/laminarc
+%{_datarootdir}/zsh/site-functions/_laminarc
+%{_mandir}/man8/laminard.8.gz
+%{_mandir}/man1/laminarc.1.gz
+
+%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 /usr/src/packages/RPMS/x86_64/laminar-$VERSION-1.x86_64.rpm /output/
+EOS

pkg/rocky10-x86_64.sh

@@ -0,0 +1,75 @@
+#!/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_rocky10
+
+DOCKER_TAG=$(docker build -q - <<EOS
+FROM rockylinux/rockylinux:10
+RUN dnf -y update && dnf -y install rpm-build cmake make gcc-c++ wget sqlite-devel boost-devel zlib-devel systemd-units
+RUN mkdir /rapidjson && pushd /rapidjson && \
+	wget -O rapidjson.tar.gz https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz && \
+	echo "badd12c511e081fec6c89c43a7027bce  rapidjson.tar.gz" | md5sum -c && \
+	tar xzf rapidjson.tar.gz && \
+	cd rapidjson-1.1.0 && \
+	cmake -DRAPIDJSON_BUILD_EXAMPLES=off . && \
+	make install && \
+	popd && rm -rf /rapidjson
+RUN mkdir /capnproto && pushd /capnproto && \
+	wget -O capnproto.tar.gz https://github.com/capnproto/capnproto/archive/v1.5.0.tar.gz && \
+	echo "cd64102577a89714b9d58494a7e34cee  capnproto.tar.gz" | md5sum -c && \
+	tar xzf capnproto.tar.gz && \
+	cd capnproto-1.5.0/c++ && \
+	cmake -DCMAKE_CXX_FLAGS=-fPIE -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=off . && \
+	make -j4 && \
+	make install && \
+	popd && rm -rf /capnproto
+EOS
+)
+
+docker run --rm -i -v $SOURCE_DIR:/root/rpmbuild/SOURCES/laminar-$VERSION:ro -v $OUTPUT_DIR:/output $DOCKER_TAG bash -xe <<EOS
+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=/usr -DLAMINAR_VERSION=$VERSION -DSYSTEMD_UNITDIR=%{_unitdir} %{_sourcedir}/laminar-$VERSION
+pwd
+make
+
+%install
+%make_install
+
+%files
+%{_bindir}/laminarc
+%{_sbindir}/laminard
+%{_unitdir}/laminar.service
+%config(noreplace) %{_sysconfdir}/laminar.conf
+%{_datarootdir}/bash-completion/completions/laminarc
+%{_datarootdir}/zsh/site-functions/_laminarc
+%{_mandir}/man8/laminard.8.gz
+%{_mandir}/man1/laminarc.1.gz
+
+%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/rocky9-x86_64.sh

@@ -0,0 +1,75 @@
+#!/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_rocky9
+
+DOCKER_TAG=$(docker build -q - <<EOS
+FROM rockylinux/rockylinux:9
+RUN dnf -y update && dnf -y install rpm-build cmake make gcc-c++ wget sqlite-devel boost-devel zlib-devel systemd-units
+RUN mkdir /rapidjson && pushd /rapidjson && \
+	wget -O rapidjson.tar.gz https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz && \
+	echo "badd12c511e081fec6c89c43a7027bce  rapidjson.tar.gz" | md5sum -c && \
+	tar xzf rapidjson.tar.gz && \
+	cd rapidjson-1.1.0 && \
+	cmake -DRAPIDJSON_BUILD_EXAMPLES=off . && \
+	make install && \
+	popd && rm -rf /rapidjson
+RUN mkdir /capnproto && pushd /capnproto && \
+	wget -O capnproto.tar.gz https://github.com/capnproto/capnproto/archive/v1.5.0.tar.gz && \
+	echo "cd64102577a89714b9d58494a7e34cee  capnproto.tar.gz" | md5sum -c && \
+	tar xzf capnproto.tar.gz && \
+	cd capnproto-1.5.0/c++ && \
+	cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=off . && \
+	make -j4 && \
+	make install && \
+	popd && rm -rf /capnproto
+EOS
+)
+
+docker run --rm -i -v $SOURCE_DIR:/root/rpmbuild/SOURCES/laminar-$VERSION:ro -v $OUTPUT_DIR:/output $DOCKER_TAG bash -xe <<EOS
+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=/usr -DLAMINAR_VERSION=$VERSION -DSYSTEMD_UNITDIR=%{_unitdir} %{_sourcedir}/laminar-$VERSION
+pwd
+make
+
+%install
+%make_install
+
+%files
+%{_bindir}/laminarc
+%{_sbindir}/laminard
+%{_unitdir}/laminar.service
+%config(noreplace) %{_sysconfdir}/laminar.conf
+%{_datarootdir}/bash-completion/completions/laminarc
+%{_datarootdir}/zsh/site-functions/_laminarc
+%{_mandir}/man8/laminard.8.gz
+%{_mandir}/man1/laminarc.1.gz
+
+%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/ubuntu2204-amd64.sh

@@ -0,0 +1,49 @@
+#!/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-ubuntu2204
+
+DOCKER_TAG=$(docker build -q - <<EOS
+FROM ubuntu:22.04
+RUN apt-get update && apt-get install -y wget cmake g++ capnproto libcapnp-dev rapidjson-dev libsqlite3-dev libboost-dev zlib1g-dev pkg-config
+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=/usr -DLAMINAR_VERSION=$VERSION -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.8.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/ubuntu2404-amd64.sh

@@ -0,0 +1,49 @@
+#!/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-ubuntu2404
+
+DOCKER_TAG=$(docker build -q - <<EOS
+FROM ubuntu:24.04
+RUN apt-get update && apt-get install -y wget cmake g++ capnproto libcapnp-dev rapidjson-dev libsqlite3-dev libboost-dev zlib1g-dev pkg-config
+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=/usr -DLAMINAR_VERSION=$VERSION -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-1.0.1, 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
+

src/client.cpp

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2017 Oliver Giles
+/// Copyright 2015-2022 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -17,15 +17,22 @@
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
 #include "laminar.capnp.h"
+#include "log.h"
 
 #include <capnp/ez-rpc.h>
 #include <kj/vector.h>
 
+#include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
+#include <unistd.h>
 
-#define EFAILED 55
+#define EXIT_BAD_ARGUMENT     1
+#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) {
@@ -36,20 +43,13 @@ static int setParams(int argc, char** argv, T& request) {
         n++;
     }
 
-    int argsConsumed = n;
-
     char* job = getenv("JOB");
     char* num = getenv("RUN");
     char* reason = getenv("LAMINAR_REASON");
 
-    if(job && num) n+=2;
-    else if(reason) n++;
+    auto params = request.initParams(n + (job&&num?2:0) + (reason?1:0));
 
-    if(n == 0) return argsConsumed;
-
-    auto params = request.initParams(n);
-
-    for(int i = 0; i < argsConsumed; ++i) {
+    for(int i = 0; i < n; ++i) {
         char* name = argv[i];
         char* val = strchr(name, '=');
         *val++ = '\0';
@@ -57,26 +57,76 @@ static int setParams(int argc, char** argv, T& request) {
         params[i].setValue(val);
     }
 
+    int argsConsumed = n;
+
     if(job && num) {
-        params[argsConsumed].setName("=parentJob");
-        params[argsConsumed].setValue(job);
-        params[argsConsumed+1].setName("=parentBuild");
-        params[argsConsumed+1].setValue(num);
-    } else if(reason) {
-        params[argsConsumed].setName("=reason");
-        params[argsConsumed].setValue(reason);
+        params[n].setName("=parentJob");
+        params[n++].setValue(job);
+        params[n].setName("=parentBuild");
+        params[n++].setValue(num);
+    }
+    if(reason) {
+        params[n].setName("=reason");
+        params[n].setValue(reason);
     }
 
     return argsConsumed;
 }
 
-int main(int argc, char** argv) {
-    if(argc < 2) {
-        fprintf(stderr, "Usage: %s <command> [parameters...]\n", argv[0]);
-        return EINVAL;
+static void printTriggerLink(const char* job, uint run) {
+    if(getenv("__LAMINAR_SETENV_PIPE")) {
+        // use a private ANSI CSI sequence to mark the JOB:NUM so the
+        // frontend can recognise it and generate a hyperlink.
+        printf("\033[{%s:%d\033\\\n", job, run);
+    } else {
+        // not called from within a laminar job, let's not confuse
+        // scripts with ANSI sequences.
+        printf("%s:%d\n", job, run);
     }
+}
+
+static void usage(std::ostream& out) {
+    out << "laminarc version " << laminar_version() << "\n";
+    out << "Usage: laminarc [-h|--help] COMMAND\n";
+    out << "  -h|--help       show this help message\n";
+    out << "where COMMAND is:\n";
+    out << "  queue JOB_LIST...     queues one or more jobs for execution and returns immediately.\n";
+    out << "  start JOB_LIST...     queues one or more jobs for execution and blocks until it starts.\n";
+    out << "  run JOB_LIST...       queues one or more jobs for execution and blocks until it finishes.\n";
+    out << "                        JOB_LIST may be prepended with --next, in this case the job will\n";
+    out << "                        be pushed to the front of the queue instead of the end.\n";
+    out << "  set PARAMETER_LIST... sets the given parameters as environment variables in the currently\n";
+    out << "                        running job. Fails if run outside of a job context.\n";
+    out << "  abort NAME NUMBER     aborts the run identified by NAME and NUMBER.\n";
+    out << "  show-jobs             lists all known jobs.\n";
+    out << "  show-queued           lists currently queued jobs.\n";
+    out << "  show-running          lists currently running jobs.\n";
+    out << "JOB_LIST is of the form:\n";
+    out << "  [JOB_NAME [PARAMETER_LIST...]]...\n";
+    out << "PARAMETER_LIST is of the form:\n";
+    out << "  [KEY=VALUE]...\n";
+    out << "Example:\n";
+    out << "  laminarc start \\\n";
+    out << "    nightly-build branch=master type=release \\\n";
+    out << "    nightly-build branch=master type=debug\n";
+}
+
+int main(int argc, char** argv) {
+    if(argc < 2)
+        return usage(std::cerr), EXIT_BAD_ARGUMENT;
+    else if(strcmp("-h", argv[1]) == 0 || strcmp("--help", argv[1]) == 0)
+        return usage(std::cout), EXIT_SUCCESS;
+
+    struct: public kj::TaskSet::ErrorHandler {
+        void taskFailed(kj::Exception&& e) override {
+            fprintf(stderr, "%s\n", e.getDescription().cStr());
+            ret = EXIT_OPERATION_FAILED;
+        }
+        int ret = 0;
+    } errorHandler;
+    kj::TaskSet ts(errorHandler);
+    int& ret = errorHandler.ret;
 
-    int ret = 0;
     const char* address = getenv("LAMINAR_HOST") ?: getenv("LAMINAR_BIND_RPC") ?: "unix-abstract:laminar";
 
     capnp::EzRpcClient client(address);
@@ -84,114 +134,122 @@ int main(int argc, char** argv) {
 
     auto& waitScope = client.getWaitScope();
 
-    if(strcmp(argv[1], "queue") == 0) {
-        if(argc < 3) {
-            fprintf(stderr, "Usage %s queue <jobName>\n", argv[0]);
-            return EINVAL;
+    int jobNameIndex = 2;
+    bool frontOfQueue = false;
+
+    if(strcmp(argv[1], "queue") == 0 || strcmp(argv[1], "start") == 0 || strcmp(argv[1], "run") == 0) {
+        if(argc < 3 || (strcmp(argv[2], "--next") == 0 && argc < 4)) {
+            fprintf(stderr, "Usage %s %s JOB_LIST...\n", argv[0], argv[1]);
+            return EXIT_BAD_ARGUMENT;
         }
-        kj::Vector<capnp::RemotePromise<LaminarCi::QueueResults>> promises;
-        int jobNameIndex = 2;
-        // make a request for each job specified on the commandline
+        if(strcmp(argv[2], "--next") == 0) {
+            frontOfQueue = true;
+            jobNameIndex++;
+        }
+    }
+
+    if(strcmp(argv[1], "queue") == 0) {
         do {
             auto req = laminar.queueRequest();
             req.setJobName(argv[jobNameIndex]);
+            req.setFrontOfQueue(frontOfQueue);
             int n = setParams(argc - jobNameIndex - 1, &argv[jobNameIndex + 1], req);
-            promises.add(req.send());
+            ts.add(req.send().then([&ret,argv,jobNameIndex](capnp::Response<LaminarCi::QueueResults> resp){
+                if(resp.getResult() != LaminarCi::MethodResult::SUCCESS) {
+                    fprintf(stderr, "Failed to queue job '%s'\n", argv[jobNameIndex]);
+                    ret = EXIT_OPERATION_FAILED;
+                } else
+                    printTriggerLink(argv[jobNameIndex], resp.getBuildNum());
+            }));
             jobNameIndex += n + 1;
         } while(jobNameIndex < argc);
-        // pend on the promises
-        for(auto& p : promises) {
-            if(p.wait(waitScope).getResult() != LaminarCi::MethodResult::SUCCESS) {
-                fprintf(stderr, "Failed to queue job '%s'\n", argv[2]);
-                return ENOENT;
-            }
-        }
-    } else if(strcmp(argv[1], "start") == 0 || strcmp(argv[1], "trigger") == 0) {
-        if(strcmp(argv[1], "trigger") == 0)
-            fprintf(stderr, "Warning: 'trigger' is deprecated, use 'queue' for the old behavior\n");
-        if(argc < 3) {
-            fprintf(stderr, "Usage %s queue <jobName>\n", argv[0]);
-            return EINVAL;
-        }
-        kj::Vector<capnp::RemotePromise<LaminarCi::StartResults>> promises;
-        struct: public kj::TaskSet::ErrorHandler {
-            void taskFailed(kj::Exception&&) override {}
-        } ignoreFailed;
-        kj::TaskSet ts(ignoreFailed);
-        int jobNameIndex = 2;
-        // make a request for each job specified on the commandline
+    } else if(strcmp(argv[1], "start") == 0) {
         do {
             auto req = laminar.startRequest();
             req.setJobName(argv[jobNameIndex]);
+            req.setFrontOfQueue(frontOfQueue);
             int n = setParams(argc - jobNameIndex - 1, &argv[jobNameIndex + 1], req);
             ts.add(req.send().then([&ret,argv,jobNameIndex](capnp::Response<LaminarCi::StartResults> resp){
                 if(resp.getResult() != LaminarCi::MethodResult::SUCCESS) {
                     fprintf(stderr, "Failed to start job '%s'\n", argv[2]);
-                    ret = ENOENT;
-                }
-                printf("%s:%d\n", argv[jobNameIndex], resp.getBuildNum());
+                    ret = EXIT_OPERATION_FAILED;
+                } else
+                    printTriggerLink(argv[jobNameIndex], resp.getBuildNum());
             }));
             jobNameIndex += n + 1;
         } while(jobNameIndex < argc);
-        ts.onEmpty().wait(waitScope);
     } else if(strcmp(argv[1], "run") == 0) {
-        if(argc < 3) {
-            fprintf(stderr, "Usage %s run <jobName>\n", argv[0]);
-            return EINVAL;
-        }
-        struct: public kj::TaskSet::ErrorHandler {
-            void taskFailed(kj::Exception&&) override {}
-        } ignoreFailed;
-        kj::TaskSet ts(ignoreFailed);
-        int jobNameIndex = 2;
-        // make a request for each job specified on the commandline
         do {
             auto req = laminar.runRequest();
             req.setJobName(argv[jobNameIndex]);
+            req.setFrontOfQueue(frontOfQueue);
             int n = setParams(argc - jobNameIndex - 1, &argv[jobNameIndex + 1], req);
             ts.add(req.send().then([&ret,argv,jobNameIndex](capnp::Response<LaminarCi::RunResults> resp){
-                printf("%s:%d\n", argv[jobNameIndex], resp.getBuildNum());
-                if(resp.getResult() != LaminarCi::JobResult::SUCCESS) {
-                    ret = EFAILED;
-                }
+                if(resp.getResult() == LaminarCi::JobResult::UNKNOWN)
+                    fprintf(stderr, "Failed to start job '%s'\n", argv[2]);
+                else
+                    printTriggerLink(argv[jobNameIndex], resp.getBuildNum());
+                if(resp.getResult() != LaminarCi::JobResult::SUCCESS)
+                    ret = EXIT_RUN_FAILED;
             }));
             jobNameIndex += n + 1;
         } while(jobNameIndex < argc);
-        ts.onEmpty().wait(waitScope);
     } else if(strcmp(argv[1], "set") == 0) {
         if(argc < 3) {
             fprintf(stderr, "Usage %s set param=value\n", argv[0]);
-            return EINVAL;
+            return EXIT_BAD_ARGUMENT;
         }
-        auto req = laminar.setRequest();
-        char* eq = strchr(argv[2], '=');
-        char* job = getenv("JOB");
-        char* num = getenv("RUN");
-        if(job && num && eq) {
-            char* name = argv[2];
-            *eq++ = '\0';
-            char* val = eq;
-            req.setJobName(job);
-            req.setBuildNum(atoi(num));
-            req.getParam().setName(name);
-            req.getParam().setValue(val);
-            req.send().wait(waitScope);
+        if(char* pipeNum = getenv("__LAMINAR_SETENV_PIPE")) {
+            LSYSCALL(write(atoi(pipeNum), argv[2], strlen(argv[2])));
         } else {
-            fprintf(stderr, "Missing $JOB or $RUN or param is not in the format key=value\n");
-            return EINVAL;
+            fprintf(stderr, "Must be run from within a laminar job\n");
+            return EXIT_BAD_ARGUMENT;
+        }
+    } else if(strcmp(argv[1], "abort") == 0) {
+        if(argc != 4) {
+            fprintf(stderr, "Usage %s abort <jobName> <jobNumber>\n", argv[0]);
+            return EXIT_BAD_ARGUMENT;
+        }
+        auto req = laminar.abortRequest();
+        req.getRun().setJob(argv[2]);
+        req.getRun().setBuildNum(atoi(argv[3]));
+        ts.add(req.send().then([&ret](capnp::Response<LaminarCi::AbortResults> resp){
+            if(resp.getResult() != LaminarCi::MethodResult::SUCCESS)
+                ret = EXIT_OPERATION_FAILED;
+        }));
+    } else if(strcmp(argv[1], "show-jobs") == 0) {
+        if(argc != 2) {
+            fprintf(stderr, "Usage: %s show-jobs\n", argv[0]);
+            return EXIT_BAD_ARGUMENT;
+        }
+        auto jobs = laminar.listKnownRequest().send().wait(waitScope);
+        for(auto it : jobs.getResult()) {
+            printf("%s\n", it.cStr());
+        }
+    } else if(strcmp(argv[1], "show-queued") == 0) {
+        if(argc != 2) {
+            fprintf(stderr, "Usage: %s show-queued\n", argv[0]);
+            return EXIT_BAD_ARGUMENT;
+        }
+        auto queued = laminar.listQueuedRequest().send().wait(waitScope);
+        for(auto it : queued.getResult()) {
+            printf("%s:%d\n", it.getJob().cStr(), it.getBuildNum());
+        }
+    } else if(strcmp(argv[1], "show-running") == 0) {
+        if(argc != 2) {
+            fprintf(stderr, "Usage: %s show-running\n", argv[0]);
+            return EXIT_BAD_ARGUMENT;
+        }
+        auto running = laminar.listRunningRequest().send().wait(waitScope);
+        for(auto it : running.getResult()) {
+            printf("%s:%d\n", it.getJob().cStr(), it.getBuildNum());
         }
-    } else if(strcmp(argv[1], "lock") == 0) {
-        auto req = laminar.lockRequest();
-        req.setLockName(argv[2]);
-        req.send().wait(waitScope);
-    } else if(strcmp(argv[1], "release") == 0) {
-        auto req = laminar.releaseRequest();
-        req.setLockName(argv[2]);
-        req.send().wait(waitScope);
     } else {
         fprintf(stderr, "Unknown command %s\n", argv[1]);
-        return EINVAL;
+        return EXIT_BAD_ARGUMENT;
     }
 
+    ts.onEmpty().wait(waitScope);
+
     return ret;
 }

src/conf.h

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2015-2026 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,9 +16,9 @@
 /// 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_CONF_H_
-#define LAMINAR_CONF_H_
+#pragma once
 
+#include <string>
 #include <unordered_map>
 
 class StringMap : public std::unordered_map<std::string, std::string> {
@@ -40,5 +40,3 @@ int StringMap::convert(std::string e);
 // beginning with '#'
 StringMap parseConfFile(const char* path);
 
-
-#endif // LAMINAR_CONF_H_

src/context.h

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2015-2026 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,28 +16,22 @@
 /// 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_
+#pragma once
 
 #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);
+    std::set<std::string> jobPatterns;
 };
 
-
-#endif // LAMINAR_NODE_H_

src/database.cpp

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2016 Oliver Giles
+/// Copyright 2015-2018 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -20,9 +20,43 @@
 
 #include <sqlite3.h>
 #include <string.h>
+#include <math.h>
+#include <cstdint>
+
+struct StdevCtx {
+    double mean;
+    double M2;
+    int64_t count;
+};
+
+static void stdevStep(sqlite3_context *ctx, int, sqlite3_value **args)
+{
+    StdevCtx* p = static_cast<StdevCtx*>(sqlite3_aggregate_context(ctx, sizeof(StdevCtx)));
+    // Welford's Online Algorithm
+    if(sqlite3_value_numeric_type(args[0]) != SQLITE_NULL) {
+        p->count++;
+        double val = sqlite3_value_double(args[0]);
+        double delta = val - p->mean;
+        p->mean += delta / p->count;
+        p->M2 += delta * (val - p->mean);
+    }
+}
+
+static void stdevFinalize(sqlite3_context *context){
+    StdevCtx* p = static_cast<StdevCtx*>(sqlite3_aggregate_context(context, 0));
+    if(p && p->count > 1)
+        sqlite3_result_double(context, sqrt(p->M2 / (p->count-1)));
+    else
+        sqlite3_result_null(context);
+}
 
 Database::Database(const char *path) {
     sqlite3_open(path, &hdl);
+    int create_func_flags = SQLITE_UTF8;
+#if SQLITE_VERSION_NUMBER >= 3008003
+    create_func_flags |= SQLITE_DETERMINISTIC;
+#endif
+    sqlite3_create_function(hdl, "STDEV", 1, create_func_flags, NULL, NULL, stdevStep, stdevFinalize);
 }
 
 Database::~Database() {
@@ -60,6 +94,10 @@ void Database::Statement::bindValue(int i, ulong e) {
     sqlite3_bind_int64(stmt, i, static_cast<int64_t>(e));
 }
 
+void Database::Statement::bindValue(int i, long long e) {
+    sqlite3_bind_int64(stmt, i, static_cast<int64_t>(e));
+}
+
 void Database::Statement::bindValue(int i, const char* e) {
     sqlite3_bind_text(stmt, i, e, -1, nullptr);
 }
@@ -96,6 +134,14 @@ template<> ulong Database::Statement::fetchColumn(int col) {
     return static_cast<ulong>(sqlite3_column_int64(stmt, col));
 }
 
+template<> long long Database::Statement::fetchColumn(int col) {
+    return sqlite3_column_int64(stmt, col);
+}
+
+template<> double Database::Statement::fetchColumn(int col) {
+    return sqlite3_column_double(stmt, col);
+}
+
 bool Database::Statement::row() {
     return sqlite3_step(stmt) == SQLITE_ROW;
 }

src/database.h

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2016 Oliver Giles
+/// Copyright 2015-2026 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,12 +16,15 @@
 /// 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_DATABASE_H_
-#define LAMINAR_DATABASE_H_
+#pragma once
 
 #include <string>
 #include <functional>
 
+// Definition needed for musl
+typedef unsigned int uint;
+typedef unsigned long ulong;
+
 struct sqlite3;
 struct sqlite3_stmt;
 
@@ -122,6 +125,7 @@ private:
         void bindValue(int i, uint e);
         void bindValue(int i, long e);
         void bindValue(int i, unsigned long e);
+        void bindValue(int i, long long e);
         void bindValue(int i, const char* e);
         void bindValue(int i, const std::string& e);
 
@@ -151,5 +155,5 @@ template<> int Database::Statement::fetchColumn(int col);
 template<> uint Database::Statement::fetchColumn(int col);
 template<> long Database::Statement::fetchColumn(int col);
 template<> ulong Database::Statement::fetchColumn(int col);
+template<> double Database::Statement::fetchColumn(int col);
 
-#endif // LAMINAR_DATABASE_H_

src/http.cpp

@@ -0,0 +1,309 @@
+///
+/// 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 == "/jobs" || resource == "/wallboard") {
+        scope.type = MonitorScope::ALL;
+        return kj::mv(scope);
+    }
+
+    if(resource.substr(0, 5) != "/jobs")
+        return nullptr;
+
+    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) {
+            // Even single threaded, if load causes this timeout to be serviced
+            // before writeEvents has created a fulfiller, or if an exception
+            // caused the destruction of the promise but attach(peer) hasn't yet
+            // removed it from the eventPeers list, we will see a null fulfiller
+            // here
+            if(p->fulfiller) {
+                // 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");
+            // Disables nginx reverse-proxy's buffering. Necessary for streamed events.
+            responseHeaders.add("X-Accel-Buffering", "no");
+            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)) {
+        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);
+            auto s = stream.get();
+            auto lw = kj::heap<WithSetRef<LogWatcher>>(logWatchers);
+            lw->job = name;
+            lw->run = num;
+            auto promise = writeLogChunk(lw.get(), stream.get()).attach(kj::mv(stream)).attach(kj::mv(lw));
+            return s->write(output.data(), output.size()).attach(kj::mv(output)).then([p=kj::mv(promise),complete]() mutable {
+                if(complete)
+                    return kj::Promise<void>(kj::READY_NOW);
+                return kj::mv(p);
+            });
+        }
+    } 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()
+{
+    LASSERT(logWatchers.size() == 0);
+    LASSERT(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(log_chunk);
+            lw->fulfiller->fulfill(kj::mv(eot));
+        }
+    }
+}
+
+void Http::setHtmlTemplate(std::string tmpl)
+{
+    resources->setHtmlTemplate(tmpl);
+}

src/http.h

@@ -0,0 +1,67 @@
+///
+/// Copyright 2019-2026 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/>
+///
+#pragma once
+
+#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;
+
+class Laminar;
+class 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);
+
+    // Allows supplying a custom HTML template. Pass an empty string to use the default.
+    void setHtmlTemplate(std::string tmpl = std::string());
+
+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;
+};
+

src/interface.h

@@ -1,140 +0,0 @@
-///
-/// Copyright 2015 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>
-
-typedef std::unordered_map<std::string, std::string> ParamMap;
-
-// 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)
-    {}
-
-    // 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;
-};
-
-// 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() =default;
-    virtual void sendMessage(std::string payload) = 0;
-    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;
-};
-
-// 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() =default;
-
-    // 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;
-
-    // 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;
-
-    // Fetches the content of an artifact given its filename relative to
-    // $LAMINAR_HOME/archive. This shouldn't be used, because the sysadmin
-    // should have configured a real webserver to serve these things.
-    virtual bool getArtefact(std::string path, std::string& result) = 0;
-
-    // Fetches the content of $LAMINAR_HOME/custom/style.css or an empty
-    // string. This shouldn't be used, because the sysadmin should have
-    // configured a real webserver to serve these things.
-    virtual std::string getCustomCss() = 0;
-
-    // Abort all running jobs
-    virtual void abortAll() = 0;
-
-    // Callback for laminar to reap child processes.
-    virtual void reapChildren() = 0;
-
-    // Callback to handle a configuration modification notification
-    virtual void notifyConfigChanged() = 0;
-};
-
-#endif // LAMINAR_INTERFACE_H_
-

src/laminar.capnp

@@ -2,12 +2,18 @@
 
 interface LaminarCi {
 
-    queue @0 (jobName :Text, params :List(JobParam)) -> (result :MethodResult);
-    start @1 (jobName :Text, params :List(JobParam)) -> (result :MethodResult, buildNum :UInt32);
-    run @2 (jobName :Text, params :List(JobParam)) -> (result :JobResult, buildNum :UInt32);
-    set @3 (jobName :Text, buildNum :UInt32, param :JobParam) -> (result :MethodResult);
-    lock @4 (lockName :Text) -> ();
-    release @5 (lockName :Text) -> ();
+    queue @0 (jobName :Text, params :List(JobParam), frontOfQueue :Bool) -> (result :MethodResult, buildNum :UInt32);
+    start @1 (jobName :Text, params :List(JobParam), frontOfQueue :Bool) -> (result :MethodResult, buildNum :UInt32);
+    run @2 (jobName :Text, params :List(JobParam), frontOfQueue :Bool) -> (result :JobResult, buildNum :UInt32);
+    listQueued @3 () -> (result :List(Run));
+    listRunning @4 () -> (result :List(Run));
+    listKnown @5 () -> (result :List(Text));
+    abort @6 (run :Run) -> (result :MethodResult);
+
+    struct Run {
+        job @0 :Text;
+        buildNum @1 :UInt32;
+    }
 
     struct JobParam {
         name @0 :Text;

src/laminar.h

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2017 Oliver Giles
+/// Copyright 2015-2026 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,81 +16,121 @@
 /// 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_LAMINAR_H_
-#define LAMINAR_LAMINAR_H_
+#pragma once
 
-#include "interface.h"
 #include "run.h"
-#include "node.h"
+#include "monitorscope.h"
+#include "context.h"
 #include "database.h"
 
+#include <list>
 #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 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();
-    ~Laminar() 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(), bool frontOfQueue = false);
 
-    // 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;
+    // 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;
-    bool getArtefact(std::string path, std::string& result) override;
-    std::string getCustomCss() override;
-    void abortAll() override;
-    void reapChildren() 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);
+
+    // Aborts a single job
+    bool abort(std::string job, uint buildNum);
+
+    // Abort all running jobs
+    void abortAll();
 
 private:
     bool loadConfiguration();
+    void loadCustomizations();
     void assignNewJobs();
-    bool stepRun(std::shared_ptr<Run> run);
-    void handleRunLog(std::shared_ptr<Run> run, std::string log);
-    void runFinished(Run*);
-    bool nodeCanQueue(const Node&, const Run&) const;
+    bool canQueue(const Context& ctx, const Run& run) const;
+    bool tryStartRun(std::shared_ptr<Run> run, int queueIndex);
+    void handleRunFinished(Run*);
     // expects that Json has started an array
-    void populateArtifacts(Json& out, std::string job, uint num) const;
+    void populateArtifacts(Json& out, std::string job, uint num, kj::Path subdir = kj::Path::parse(".")) const;
 
-    Run* activeRun(std::string name, uint num) {
-        auto it = activeJobs.byRun().find(boost::make_tuple(name, num));
-        return it == activeJobs.byRun().end() ? nullptr : it->get();
+    Run* activeRun(const std::string name, uint num) {
+        auto it = activeJobs.byNameNumber().find(boost::make_tuple(name, num));
+        return it == activeJobs.byNameNumber().end() ? nullptr : it->get();
     }
 
     std::list<std::shared_ptr<Run>> queuedJobs;
 
     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> jobDescriptions;
+
+    std::unordered_map<std::string, std::string> jobGroups;
 
     RunSet activeJobs;
     Database* db;
-    Server* srv;
-    NodeMap nodes;
-    std::string homeDir;
-    std::set<LaminarClient*> clients;
-    std::set<LaminarWaiter*> waiters;
+    Server& srv;
+    ContextMap contexts;
+    kj::Path homePath;
+    kj::Own<const kj::Directory> fsHome;
     uint numKeepRunDirs;
     std::string archiveUrl;
+
+    kj::Own<Http> http;
+    kj::Own<Rpc> rpc;
 };
 
-#endif // LAMINAR_LAMINAR_H_

src/leader.cpp

@@ -0,0 +1,348 @@
+///
+/// Copyright 2019-2020 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 "log.h"
+#include <string>
+#include <unistd.h>
+#include <queue>
+#include <dirent.h>
+#if defined(__FreeBSD__)
+#include <sys/procctl.h>
+#else
+#include <sys/prctl.h>
+#endif
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <kj/async-io.h>
+#include <kj/async-unix.h>
+#include <kj/filesystem.h>
+
+#include "run.h"
+
+const int SET_ENV_BUF_SIZE = 1024;
+
+// short syntax helper for kj::Path
+template<typename T>
+inline kj::Path operator/(const kj::Path& p, const T& ext) {
+    return p.append(ext);
+}
+template<typename T>
+inline kj::Path operator/(const kj::PathPtr& p, const T& ext) {
+    return p.append(ext);
+}
+
+struct Script {
+    kj::Path path;
+    kj::Path cwd;
+    bool runOnAbort;
+};
+
+static void aggressive_recursive_kill(pid_t parent) {
+    DIR* proc = opendir("/proc");
+    if(!proc)
+        return;
+
+    while(struct dirent* de = readdir(proc)) {
+        if(!isdigit(*de->d_name))
+            continue;
+
+        char status_file[640];
+        sprintf(status_file, "/proc/%s/status", de->d_name);
+
+        FILE* status_fp = fopen(status_file, "rb");
+        if(!status_fp)
+            continue;
+
+        char status_buffer[512];
+        int n = fread(status_buffer, 1, 512, status_fp);
+        if(char* p = (char*)memmem(status_buffer, n, "PPid:\t", 6)) {
+            pid_t ppid = strtol(p + 6, NULL, 10);
+            if(ppid == parent) {
+                pid_t pid = atoi(de->d_name);
+                aggressive_recursive_kill(pid);
+                fprintf(stderr, "[laminar] sending SIGKILL to pid %d\n", pid);
+                kill(pid, SIGKILL);
+            }
+        }
+        fclose(status_fp);
+    }
+    closedir(proc);
+}
+
+
+class Leader final : public kj::TaskSet::ErrorHandler {
+public:
+    Leader(kj::AsyncIoContext& ioContext, kj::Filesystem& fs, const char* jobName, uint runNumber);
+    RunState run();
+
+private:
+    void taskFailed(kj::Exception&& exception) override;
+    kj::Promise<void> step(std::queue<Script>& scripts);
+    kj::Promise<void> reapChildProcesses();
+    kj::Promise<void> readEnvPipe(kj::AsyncInputStream* stream, char* buffer);
+
+    kj::TaskSet tasks;
+    RunState result;
+    kj::AsyncIoContext& ioContext;
+    const kj::Directory& home;
+    kj::PathPtr rootPath;
+    std::string jobName;
+    uint runNumber;
+    pid_t currentGroupId;
+    pid_t currentScriptPid;
+    std::queue<Script> scripts;
+    int setEnvPipe[2];
+    bool aborting;
+};
+
+Leader::Leader(kj::AsyncIoContext &ioContext, kj::Filesystem &fs, const char *jobName, uint runNumber) :
+    tasks(*this),
+    result(RunState::SUCCESS),
+    ioContext(ioContext),
+    home(fs.getCurrent()),
+    rootPath(fs.getCurrentPath()),
+    jobName(jobName),
+    runNumber(runNumber),
+    aborting(false)
+{
+    tasks.add(ioContext.unixEventPort.onSignal(SIGTERM).then([this](siginfo_t) {
+        while(scripts.size() && (!scripts.front().runOnAbort))
+            scripts.pop();
+        // TODO: probably shouldn't do this if we are already in a runOnAbort script
+        kill(-currentGroupId, SIGTERM);
+        return this->ioContext.provider->getTimer().afterDelay(2*kj::SECONDS).then([this]{
+            aborting = true;
+            aggressive_recursive_kill(getpid());
+        });
+    }));
+
+    LSYSCALL(pipe(setEnvPipe));
+    auto event = ioContext.lowLevelProvider->wrapInputFd(setEnvPipe[0], kj::LowLevelAsyncIoProvider::TAKE_OWNERSHIP);
+    auto buffer = kj::heapArrayBuilder<char>(SET_ENV_BUF_SIZE);
+    tasks.add(readEnvPipe(event, buffer.asPtr().begin()).attach(kj::mv(event), kj::mv(buffer)));
+}
+
+RunState Leader::run()
+{
+    kj::Path cfgDir{"cfg"};
+
+    // create the run directory
+    kj::Path rd{"run",jobName,std::to_string(runNumber)};
+    bool createWorkdir = true;
+    KJ_IF_MAYBE(ls, home.tryLstat(rd)) {
+        LASSERT(ls->type == kj::FsNode::Type::DIRECTORY);
+        LLOG(WARNING, "Working directory already exists, removing", rd.toString());
+        if(home.tryRemove(rd) == false) {
+            LLOG(WARNING, "Failed to remove working directory");
+            createWorkdir = false;
+        }
+    }
+    if(createWorkdir && home.tryOpenSubdir(rd, kj::WriteMode::CREATE|kj::WriteMode::CREATE_PARENT) == nullptr) {
+        LLOG(ERROR, "Could not create working directory", rd.toString());
+        return RunState::FAILED;
+    }
+
+    // create an archive directory
+    kj::Path archive = kj::Path{"archive",jobName,std::to_string(runNumber)};
+    if(home.exists(archive)) {
+        LLOG(WARNING, "Archive directory already exists", archive.toString());
+    } else if(home.tryOpenSubdir(archive, kj::WriteMode::CREATE|kj::WriteMode::CREATE_PARENT) == nullptr) {
+        LLOG(ERROR, "Could not create archive directory", archive.toString());
+        return RunState::FAILED;
+    }
+
+    // create a workspace for this job if it doesn't exist
+    kj::Path ws{"run",jobName,"workspace"};
+    if(!home.exists(ws)) {
+        home.openSubdir(ws, kj::WriteMode::CREATE|kj::WriteMode::CREATE_PARENT);
+        // prepend the workspace init script
+        if(home.exists(cfgDir/"jobs"/(jobName+".init")))
+            scripts.push({cfgDir/"jobs"/(jobName+".init"), kj::mv(ws), false});
+    }
+
+    // add scripts
+    // global before-run script
+    if(home.exists(cfgDir/"before"))
+        scripts.push({cfgDir/"before", rd.clone(), false});
+    // job before-run script
+    if(home.exists(cfgDir/"jobs"/(jobName+".before")))
+        scripts.push({cfgDir/"jobs"/(jobName+".before"), rd.clone(), false});
+    // main run script. must exist.
+    scripts.push({cfgDir/"jobs"/(jobName+".run"), rd.clone(), false});
+    // job after-run script
+    if(home.exists(cfgDir/"jobs"/(jobName+".after")))
+        scripts.push({cfgDir/"jobs"/(jobName+".after"), rd.clone(), true});
+    // global after-run script
+    if(home.exists(cfgDir/"after"))
+        scripts.push({cfgDir/"after", rd.clone(), true});
+
+    // Start executing scripts
+    return step(scripts).then([this](){
+        return result;
+    }).wait(ioContext.waitScope);
+}
+
+void Leader::taskFailed(kj::Exception &&exception)
+{
+    LLOG(ERROR, exception);
+}
+
+kj::Promise<void> Leader::step(std::queue<Script> &scripts)
+{
+    if(scripts.empty())
+        return kj::READY_NOW;
+
+    Script currentScript = kj::mv(scripts.front());
+    scripts.pop();
+
+    pid_t pid = fork();
+    if(pid == 0) { // child
+        // unblock all signals
+        sigset_t mask;
+        sigfillset(&mask);
+        sigprocmask(SIG_UNBLOCK, &mask, nullptr);
+
+        // create a new process group to help us deal with any wayward forks
+        setpgid(0, 0);
+
+        std::string buildNum = std::to_string(runNumber);
+
+        LSYSCALL(chdir(currentScript.cwd.toString(false).cStr()));
+
+        setenv("RESULT", to_string(result).c_str(), true);
+
+        // pass the pipe through a variable to allow laminarc to send new env back
+        char pipeNum[4];
+        sprintf(pipeNum, "%d", setEnvPipe[1]);
+        setenv("__LAMINAR_SETENV_PIPE", pipeNum, 1);
+
+        fprintf(stderr, "[laminar] Executing %s\n", currentScript.path.toString().cStr());
+        kj::String execPath = (rootPath/currentScript.path).toString(true);
+
+        execl(execPath.cStr(), execPath.cStr(), NULL);
+        fprintf(stderr, "[laminar] Failed to execute %s\n", currentScript.path.toString().cStr());
+        _exit(1);
+    }
+
+    currentScriptPid = pid;
+    currentGroupId = pid;
+
+    return reapChildProcesses().then([&](){
+        return step(scripts);
+    });
+}
+
+kj::Promise<void> Leader::reapChildProcesses()
+{
+    return ioContext.unixEventPort.onSignal(SIGCHLD).then([this](siginfo_t) -> kj::Promise<void> {
+        while(true) {
+            int status;
+            errno = 0;
+            pid_t pid = waitpid(-1, &status, WNOHANG);
+            if(pid == -1 && errno == ECHILD) {
+                // all children exited
+                return kj::READY_NOW;
+            } else if(pid == 0) {
+                // child processes are still running
+                if(currentScriptPid) {
+                    // We could get here if a more deeply nested process was reparented to us
+                    // before the primary script executed. Quietly wait until the process we're
+                    // waiting for is done
+                    return reapChildProcesses();
+                }
+                // we were aborted by the primary process already, just wait until all
+                // SIGKILLs are processed
+                if(aborting) {
+                    return reapChildProcesses();
+                }
+                // Otherwise, reparented orphans are on borrowed time
+                // TODO list wayward processes?
+                fprintf(stderr, "[laminar] sending SIGHUP to adopted child processes\n");
+                kill(-currentGroupId, SIGHUP);
+                return ioContext.provider->getTimer().afterDelay(5*kj::SECONDS).then([this]{
+                    // TODO: should we mark the job as failed if we had to kill reparented processes?
+                    aggressive_recursive_kill(getpid());
+                    return reapChildProcesses();
+                }).exclusiveJoin(reapChildProcesses());
+            } else if(pid == currentScriptPid) {
+                // the script we were waiting for is done
+                // if we already marked as failed, preserve that
+                if(result == RunState::SUCCESS) {
+                    if(WIFSIGNALED(status) && (WTERMSIG(status) == SIGTERM || WTERMSIG(status) == SIGKILL))
+                        result = RunState::ABORTED;
+                    else if(WEXITSTATUS(status) != 0)
+                        result = RunState::FAILED;
+                }
+                currentScriptPid = 0;
+            } else {
+                // some reparented process was reaped
+            }
+        }
+    });
+}
+
+kj::Promise<void> Leader::readEnvPipe(kj::AsyncInputStream *stream, char *buffer) {
+    return stream->tryRead(buffer, 1, SET_ENV_BUF_SIZE - 1).then([this,stream,buffer](size_t sz) {
+        if(sz > 0) {
+            buffer[sz] = '\0';
+            if(char* eq = strchr(buffer, '=')) {
+                *eq++ = '\0';
+                setenv(buffer, eq, 1);
+            }
+            return readEnvPipe(stream, kj::mv(buffer));
+        }
+        return kj::Promise<void>(kj::READY_NOW);
+    });
+}
+
+int leader_main(void) {
+    auto ioContext = kj::setupAsyncIo();
+    auto fs = kj::newDiskFilesystem();
+
+    kj::UnixEventPort::captureSignal(SIGTERM);
+    // Don't use captureChildExit or onChildExit because they don't provide a way to
+    // reap orphaned child processes. Stick with the more fundamental onSignal.
+    kj::UnixEventPort::captureSignal(SIGCHLD);
+
+    // Becoming a subreaper means any descendent process whose parent process disappears
+    // will be reparented to this one instead of init (or higher layer subreaper).
+    // We do this so that the run will wait until all descedents exit before executing
+    // the next step.
+    #if defined(__FreeBSD__)
+    procctl(P_PID, 0, PROC_REAP_ACQUIRE, NULL);
+    #else
+    prctl(PR_SET_CHILD_SUBREAPER, 1, NULL, NULL, NULL);
+    #endif
+
+    // Become the leader of a new process group. This is so that all child processes
+    // will also get a kill signal when the run is aborted
+    setpgid(0, 0);
+
+    // Environment inherited from main laminard process
+    const char* jobName = getenv("JOB");
+    std::string name(jobName);
+    uint runNumber = atoi(getenv("RUN"));
+
+    if(!jobName || !runNumber)
+        return EXIT_FAILURE;
+
+    Leader leader(ioContext, *fs, jobName, runNumber);
+
+    // Parent process will cast back to RunState
+    return int(leader.run());
+}

src/leader.h

@@ -0,0 +1,34 @@
+///
+/// Copyright 2019-2026 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/>
+///
+#pragma once
+
+// Main function for the leader process which is responsible for
+// executing all the scripts which make up a Run. Separating this
+// into its own process allows for a cleaner process tree view,
+// where it's obvious which script belongs to which run of which
+// job, and allows this leader process to act as a subreaper for
+// any wayward child processes.
+
+// This could have been implemented as a separate process, but
+// instead we just fork & exec /proc/self/exe from the main laminar
+// daemon, and distinguish based on argv[0]. This saves installing
+// another binary and avoids some associated pitfalls.
+
+int leader_main(void);
+

src/log.h

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015 Oliver Giles
+/// Copyright 2015-2026 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,22 +16,55 @@
 /// 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_LOG_H_
-#define LAMINAR_LOG_H_
+#pragma once
 
 #include <kj/debug.h>
+#include <utility>
 
-// Simple override to prevent full paths to source files from
-// appearing in log messages. Assumes / is the path separator.
-// @see kj/debug.h
-
-#define _LBASENAME(path) strrchr(path, '/') ? strrchr(path, '/') + 1 : path
+// Prevent full file paths from appearing in log messages. With compiler
+// optimization, this compile-time method should completely prevent the
+// 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...>) {
+        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)
 
+// Provide alternative implementations to those from kj/debug.h which
+// use __FILE__ directly and thus cause the full path to be encoded in
+// the final binary
 #define LLOG(severity, ...) \
   if (!::kj::_::Debug::shouldLog(::kj::_::Debug::Severity::severity)) {} else \
-    ::kj::_::Debug::log(_LBASENAME(__FILE__), __LINE__, ::kj::_::Debug::Severity::severity, \
-                        #__VA_ARGS__, __VA_ARGS__)
+    ::kj::_::Debug::log(__FILE_BASE__, __LINE__, \
+      ::kj::_::Debug::Severity::severity, #__VA_ARGS__, __VA_ARGS__)
 
+#define LASSERT(cond, ...) \
+  if (KJ_LIKELY(cond)) {} else \
+    for (::kj::_::Debug::Fault f(__FILE_BASE__, __LINE__, \
+      ::kj::Exception::Type::FAILED, #cond, #__VA_ARGS__, ##__VA_ARGS__);; f.fatal())
 
-#endif // LAMINAR_LOG_H_
+#define LSYSCALL(call, ...) \
+  if (auto _kjSyscallResult = ::kj::_::Debug::syscall([&](){return (call);}, false)) {} else \
+    for (::kj::_::Debug::Fault f(__FILE_BASE__, __LINE__, \
+      _kjSyscallResult.getErrorNumber(), #call, #__VA_ARGS__, ##__VA_ARGS__);; f.fatal())
+
+const char* laminar_version();
 

src/main.cpp

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2016 Oliver Giles
+/// Copyright 2015-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -17,30 +17,97 @@
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
 #include "laminar.h"
+#include "leader.h"
+#include "server.h"
 #include "log.h"
 
+#include <fcntl.h>
+#include <iostream>
+#include <kj/async-unix.h>
+#include <kj/filesystem.h>
 #include <signal.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.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/";
+}
+
+static void usage(std::ostream& out) {
+    out << "laminard version " << laminar_version() << "\n";
+    out << "Usage:\n";
+    out << "  -h|--help       show this help message\n";
+    out << "  -v              enable verbose output\n";
+}
+
+static void on_sighup(int)
+{
+	constexpr const char msg[] = "Laminar received and ignored SIGHUP\n";
+	// write(2) is safe to call inside signal handler.
+	write(STDERR_FILENO, msg, sizeof(msg) - 1);
 }
 
 int main(int argc, char** argv) {
+    if(argv[0][0] == '{')
+        return leader_main();
+
     for(int i = 1; i < argc; ++i) {
         if(strcmp(argv[i], "-v") == 0) {
             kj::_::Debug::setLogLevel(kj::_::Debug::Severity::INFO);
+        } else if(strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
+            return usage(std::cout), EXIT_SUCCESS;
+        } else {
+            std::cerr << "Unknown argument " << argv[i] << "\n";
+            return usage(std::cerr), EXIT_FAILURE;
         }
     }
 
-    laminar = new Laminar;
+    // The parent process hopefully connected stdin to /dev/null, but
+    // do it again here just in case. This is important because stdin
+    // is inherited to job runs via the leader process, and some
+    // processes misbehave if they can successfully block on reading
+    // from stdin.
+    close(STDIN_FILENO);
+    LASSERT(open("/dev/null", O_RDONLY) == STDIN_FILENO);
+
+    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();
+    signal(SIGHUP, &on_sighup);
+
+    printf("laminard version %s started\n", laminar_version());
+
+    server->start();
 
     delete laminar;
+    delete server;
 
     LLOG(INFO, "Clean exit");
     return 0;

src/monitorscope.h

@@ -0,0 +1,60 @@
+///
+/// Copyright 2015-2026 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/>
+///
+#pragma once
+
+#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;
+};
+

src/resources.cpp

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2017 Oliver Giles
+/// Copyright 2015-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -17,34 +17,101 @@
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
 #include "resources.h"
+#include "log.h"
+#include "index_html_size.h"
 #include <string.h>
+#include <zlib.h>
 
 #define INIT_RESOURCE(route, name, content_type) \
     extern const char _binary_##name##_z_start[];\
     extern const char _binary_##name##_z_end[]; \
     resources.emplace(route, Resource{_binary_ ## name ## _z_start, _binary_ ## name ## _z_end, content_type})
 
-#define CONTENT_TYPE_HTML "text/html; charset=utf-8"
-#define CONTENT_TYPE_ICO  "image/x-icon"
-#define CONTENT_TYPE_PNG  "image/png"
-#define CONTENT_TYPE_JS   "application/javascript; charset=utf-8"
-#define CONTENT_TYPE_CSS  "text/css; charset=utf-8"
+#define CONTENT_TYPE_HTML     "text/html; charset=utf-8"
+#define CONTENT_TYPE_ICO      "image/x-icon"
+#define CONTENT_TYPE_PNG      "image/png"
+#define CONTENT_TYPE_JS       "application/javascript; charset=utf-8"
+#define CONTENT_TYPE_CSS      "text/css; charset=utf-8"
+#define CONTENT_TYPE_MANIFEST "application/manifest+json; charset=utf-8"
+
+#define GZIP_FORMAT 16
 
 Resources::Resources()
 {
-    INIT_RESOURCE("/", index_html, CONTENT_TYPE_HTML);
     INIT_RESOURCE("/favicon.ico", favicon_ico, CONTENT_TYPE_ICO);
     INIT_RESOURCE("/favicon-152.png", favicon_152_png, CONTENT_TYPE_PNG);
     INIT_RESOURCE("/icon.png", icon_png, CONTENT_TYPE_PNG);
     INIT_RESOURCE("/js/app.js", js_app_js, CONTENT_TYPE_JS);
-    INIT_RESOURCE("/js/Chart.HorizontalBar.js", js_Chart_HorizontalBar_js, CONTENT_TYPE_JS);
     INIT_RESOURCE("/js/ansi_up.js", js_ansi_up_js, CONTENT_TYPE_JS);
     INIT_RESOURCE("/js/vue.min.js", js_vue_min_js, CONTENT_TYPE_JS);
-    INIT_RESOURCE("/js/vue-router.min.js", js_vue_router_min_js, CONTENT_TYPE_JS);
     INIT_RESOURCE("/js/ansi_up.js", js_ansi_up_js, CONTENT_TYPE_JS);
     INIT_RESOURCE("/js/Chart.min.js", js_Chart_min_js, CONTENT_TYPE_JS);
-    INIT_RESOURCE("/js/Chart.HorizontalBar.js", js_Chart_HorizontalBar_js, CONTENT_TYPE_JS);
-    INIT_RESOURCE("/css/bootstrap.min.css", css_bootstrap_min_css, CONTENT_TYPE_CSS);
+    INIT_RESOURCE("/style.css", style_css, CONTENT_TYPE_CSS);
+    INIT_RESOURCE("/manifest.webmanifest", manifest_webmanifest, CONTENT_TYPE_MANIFEST);
+    // Configure the default template
+    setHtmlTemplate(std::string());
+}
+
+void Resources::setHtmlTemplate(std::string tmpl) {
+    extern const char _binary_index_html_z_start[];
+    extern const char _binary_index_html_z_end[];
+
+    z_stream strm;
+    memset(&strm, 0, sizeof(z_stream));
+
+    if(!tmpl.empty()) {
+        // deflate
+        index_html.resize(tmpl.size());
+        deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, MAX_WBITS|GZIP_FORMAT, 8, Z_DEFAULT_STRATEGY);
+        strm.next_in = (unsigned char*) tmpl.data();
+        strm.avail_in = tmpl.size();
+        strm.next_out = (unsigned char*) index_html.data();
+        strm.avail_out = tmpl.size();
+        if(deflate(&strm, Z_FINISH) != Z_STREAM_END) {
+            LLOG(FATAL, "Failed to compress index.html");
+        }
+        index_html.resize(strm.total_out);
+    } else {
+        // use the default template from compile-time asset
+        if(const char* baseUrl = getenv("LAMINAR_BASE_URL")) {
+            // The administrator needs to customize the <base href>. Unfortunately this seems
+            // to be the only thing that needs to be customizable but cannot be done via dynamic
+            // DOM manipulation without heavy compromises. So replace the static char array with
+            // a modified buffer accordingly.
+            std::string tmp;
+            tmp.resize(INDEX_HTML_UNCOMPRESSED_SIZE);
+            // inflate
+            inflateInit2(&strm, MAX_WBITS|GZIP_FORMAT);
+            strm.next_in = (unsigned char*) _binary_index_html_z_start;
+            strm.avail_in = _binary_index_html_z_end - _binary_index_html_z_start;
+            strm.next_out = (unsigned char*) tmp.data();
+            strm.avail_out = INDEX_HTML_UNCOMPRESSED_SIZE;
+            if(inflate(&strm, Z_FINISH) != Z_STREAM_END) {
+                LLOG(FATAL, "Failed to uncompress index_html");
+            }
+            // replace
+            // There's no validation on the replacement string, so you can completely mangle
+            // the html if you like. This isn't really an issue because if you can modify laminar's
+            // environment you already have elevated permissions
+            if(auto it = tmp.find("base href=\"/"))
+                tmp.replace(it+11, 1, baseUrl);
+            // deflate
+            index_html.resize(tmp.size());
+            deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, MAX_WBITS|GZIP_FORMAT, 8, Z_DEFAULT_STRATEGY);
+            strm.next_in = (unsigned char*) tmp.data();
+            strm.avail_in = tmp.size();
+            strm.next_out = (unsigned char*) index_html.data();
+            strm.avail_out = tmp.size();
+            if(deflate(&strm, Z_FINISH) != Z_STREAM_END) {
+                LLOG(FATAL, "Failed to compress index.html");
+            }
+            index_html.resize(strm.total_out);
+        } else {
+            index_html = std::string(_binary_index_html_z_start, _binary_index_html_z_end);
+        }
+    }
+    // update resource map
+    resources["/"] = Resource{index_html.data(), index_html.data() + index_html.size(), CONTENT_TYPE_HTML};
 }
 
 inline bool beginsWith(std::string haystack, const char* needle) {
@@ -54,7 +121,7 @@ inline bool beginsWith(std::string haystack, const char* needle) {
 bool Resources::handleRequest(std::string path, const char** start, const char** end, const char** content_type) {
     // need to keep the list of "application links" synchronised with the angular
     // application. We cannot return a 404 for any of these
-    auto it = beginsWith(path,"/jobs")
+    auto it = beginsWith(path,"/jobs") || path == "/wallboard"
             ? resources.find("/")
             : resources.find(path);
 

src/resources.h

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2017 Oliver Giles
+/// Copyright 2015-2026 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,8 +16,7 @@
 /// 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_RESOURCES_H_
-#define LAMINAR_RESOURCES_H_
+#pragma once
 
 #include <unordered_map>
 #include <utility>
@@ -34,13 +33,16 @@ public:
     // type. Function returns false if no resource for the given path exists
     bool handleRequest(std::string path, const char** start, const char** end, const char** content_type);
 
+    // Allows providing a custom HTML template. Pass an empty string to use the default.
+    void setHtmlTemplate(std::string templ = std::string());
+
 private:
     struct Resource {
         const char* start;
         const char* end;
         const char* content_type;
     };
-    std::unordered_map<std::string, const Resource> resources;
+    std::unordered_map<std::string, Resource> resources;
+    std::string index_html;
 };
 
-#endif // LAMINAR_RESOURCES_H_

src/resources/index.html

@@ -1,252 +1,224 @@
 <!doctype html>
-<html>
+<html lang="en">
 <head>
  <base href="/">
  <meta charset="utf-8">
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <meta name="apple-mobile-web-app-capable" content="yes" />
- <link rel="apple-touch-icon-precomposed" href="/favicon-152.png">
+ <link rel="apple-touch-icon-precomposed" href="favicon-152.png">
+ <link rel="icon" href="favicon.ico">
+ <link rel="manifest" href="/manifest.webmanifest">
  <title>Laminar</title>
- <script src="/js/vue.min.js"></script>
- <script src="/js/vue-router.min.js"></script>
- <script src="/js/ansi_up.js"></script>
- <script src="/js/Chart.min.js"></script>
- <script src="/js/Chart.HorizontalBar.js"></script>
- <link href="/css/bootstrap.min.css" rel="stylesheet">
- <link href="/custom/style.css" rel="stylesheet">
- <script src="/js/app.js" defer></script>
- <style>
-  body, html { height: 100%; }
-  .navbar { margin-bottom: 0; border-radius: 0; }
-  .navbar-brand { margin: 0 -15px; padding: 7px 15px }
-  .navbar-brand>img { display: inline; }
-  a.navbar-btn { color: #9d9d9d; }
-  a.navbar-btn.active { color: #fff; }
-  a.navbar-btn:hover { color: #fff; text-decoration: none; }
-  a.navbar-btn:focus { color: #fff; }
-  .bell { margin: 8px 15px; color: #9d9d9d; }
-  .bell:hover { text-decoration: none; color: #9d9d9d; cursor: pointer; }
-  .bell.active { color: #333; }
-  dt,dd { line-height: 2; }
-  canvas {
-   width: 100% !important;
-   max-width: 800px;
-   height: auto !important;
-  }
-  .progress {
-   height: 10px;
-   margin-top: 5px;
-   margin-bottom: 0;
-  }
-  table#joblist tr:first-child td { border-top: 0; }
-  #popup-connecting {
-    position: fixed;
-    background: white;
-    border: 1px solid #ddd;
-    bottom: 10px;
-    right: 10px;
-    padding: 20px;
-  }
-  span.status {
-    display: inline-block;
-    width: 1em;
-    text-align: center;
-    font-family: sans-serif;
-  }
-  span.success { color: forestgreen; }
-  span.failed { color: firebrick; }
-  span.aborted { color: indigo; }
-  span.spin {
-    color: steelblue;
-    animation: 2s linear infinite spin;
-  }
-  @keyframes spin {
-    to { transform: rotate(360deg); }
-  }
- </style>
+ <script src="js/vue.min.js"></script>
+ <script src="js/ansi_up.js"></script>
+ <script src="js/Chart.min.js"></script>
+ <script src="js/app.js" defer></script>
+
+ <link href="style.css" rel="stylesheet">
 </head>
 <body>
- <template id="home"><div>
-  <ol class="breadcrumb"><li class="active">Home</li></ol>
-  <div class="container-fluid"><div class="row">
-   <div class="col-sm-5 col-md-4 col-lg-3 dash">
-    <table class="table table-bordered">
-     <tr v-for="job in jobsQueued">
-      <td><router-link :to="'/jobs/'+job.name">{{job.name}}</router-link> <i>queued</i></td>
-     </tr>
-     <tr v-for="job in jobsRunning">
-      <td><span v-html="runIcon(job.result)"></span> <router-link :to="'/jobs/'+job.name">{{job.name}}</router-link> <router-link :to="'/jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link>
-       <small class="pull-right">{{formatDuration(job.started, job.completed)}}</small>
-       <div class="progress">
-         <div class="progress-bar progress-bar-striped" :class="'progress-bar-'+(job.overtime?'warning':'info')" :class="job.etc?'':'active'" :style="'width:'+(!job.etc?'100':job.progress)+'%'"></div>
-       </div>
-      </td>
-     </tr>
-     <tr v-for="job in jobsRecent">
-      <td><span v-html="runIcon(job.result)"></span> <router-link :to="'/jobs/'+job.name">{{job.name}}</router-link> <router-link :to="'/jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link><br><small>Took {{formatDuration(job.started, job.completed)}} at {{formatDate(job.started)}}</small></td>
-     </tr>
-    </table>
+ <template id="home"><div id="page-home-main">
+  <nav>
+   <table class="table striped">
+    <tr v-for="job in jobsQueued">
+     <td>
+      <span v-html="runIcon(job.result)"></span>
+      <router-link :to="'jobs/'+job.name">{{job.name}}</router-link>
+      <router-link :to="'jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link>
+      <i>queued</i>
+     </td>
+    </tr>
+    <tr v-for="job in jobsRunning">
+     <td>
+      <span v-html="runIcon(job.result)"></span>
+      <router-link :to="'jobs/'+job.name">{{job.name}}</router-link>
+      <router-link :to="'jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link>
+      <small style="float:right;">{{formatDuration(job.started, job.completed)}}</small>
+      <div class="progress" style="margin-top: 5px;">
+       <div class="progress-bar" :class="{overtime:job.overtime,indeterminate:!job.etc}" :style="job.etc && {width:job.progress+'%'}"></div>
+      </div>
+     </td>
+    </tr>
+    <tr v-for="job in jobsRecent">
+     <td>
+      <span v-html="runIcon(job.result)"></span>
+      <router-link :to="'jobs/'+job.name">{{job.name}}</router-link>
+      <router-link :to="'jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link><br>
+      <small>Took {{formatDuration(job.started, job.completed)}} at {{formatDate(job.started)}}</small>
+     </td>
+    </tr>
+   </table>
+  </nav>
+  <section style="border-left: 1px solid #d0d0d0;">
+   <div id="page-home-stats">
+    <div>
+     <h3>Recent regressions</h3>
+     <table>
+      <tr v-for="job in resultChanged" v-if="job.lastFailure>job.lastSuccess"><td><router-link :to="'jobs/'+job.name+'/'+job.lastFailure">{{job.name}} #{{job.lastFailure}}</router-link> since <router-link :to="'jobs/'+job.name+'/'+job.lastSuccess">#{{job.lastSuccess}}</router-link></tr>
+     </table>
+    </div>
+    <div>
+     <h3>Low pass rates</h3>
+     <table>
+      <tr v-for="job in lowPassRates"><td><router-link :to="'jobs/'+job.name">{{job.name}}</router-link></td><td>{{Math.round(job.passRate*100)}}&nbsp;%</td></tr>
+     </table>
+    </div>
+    <div>
+     <h3>Utilization</h3>
+     <div><canvas id="chartUtil"></canvas></div>
+    </div>
    </div>
-   <div class="col-sm-7 col-md-8 col-lg-9"><div class="row">
-    <div class="col-md-6">
-     <div class="panel panel-default">
-      <div class="panel-heading">Total builds per day this week</div>
-      <div class="panel-body">
-       <canvas id="chartBpd"></canvas>
-      </div>
-     </div>
-    </div>
-    <div class="col-md-6">
-     <div class="panel panel-default">
-      <div class="panel-heading">Builds per job in the last 24 hours</div>
-      <div class="panel-body" id="chartStatus">
-       <canvas id="chartBpj"></canvas>
-      </div>
-     </div>
-    </div>
-    <div class="col-md-6">
-     <div class="panel panel-default">
-      <div class="panel-heading">Average build time per job this week</div>
-      <div class="panel-body">
-       <canvas id="chartTpj"></canvas>
-      </div>
-     </div>
-    </div>
-    <div class="col-md-6">
-     <div class="panel panel-default">
-      <div class="panel-heading">Current executor utilization</div>
-      <div class="panel-body">
-       <canvas id="chartUtil"></canvas>
-      </div>
-     </div>
-    </div>
-   </div></div>
-  </div></div> 
+   <div id="page-home-plots">
+    <div><canvas id="chartBpd"></canvas></div>
+    <div><canvas id="chartBpj"></canvas></div>
+    <div><canvas id="chartTpj"></canvas></div>
+    <div><canvas id="chartBuildTimeChanges"></canvas></div>
+   </div>
+  </section>
  </div></template>
- 
+  
  <template id="jobs"><div>
-  <ol class="breadcrumb"><li><router-link to="/">Home</router-link></li><li class="active">Jobs</li></ol>
-  <div class="container-fluid"><div class="row">
-   <div class="col-xs-12">
-    <div class="pull-right">
-     <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>
-    </ul>
-    <table class="table table-striped" id="joblist">
-     <tr   v-for="job in filteredJobs">
-      <td><router-link :to="'/jobs/'+job.name">{{job.name}}</router-link></td>
-      <td class="text-center"><span v-html="runIcon(job.result)"></span> <router-link :to="'/jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link></td>
-      <td class="text-center">{{formatDate(job.started)}}</td>
-      <td class="text-center">{{formatDuration(job.started,job.completed)}}</td>
-     </tr>
-    </table>
+  <nav style="display: grid; grid-auto-flow: column; justify-content: space-between; align-items: end; padding: 10px 15px;">
+   <div style="display:grid; grid-auto-flow: column; grid-gap: 15px; padding: 5px 0;">
+    <a v-show="ungrouped.length" :class="{'active':group==null}" href v-on:click.prevent="group = null">Ungrouped Jobs</a>
+    <a v-for="g in Object.keys(groups)" :class="{'active':g==group}" href v-on:click.prevent="group = g">{{g}}</a>
    </div>
-  </div></div>
+   <div style="display: grid; grid-auto-flow: column; align-items: center; gap: 15px">
+    <router-link :to="wallboardLink()" style="display: inherit;" title="Wallboard">
+     <svg width="18" viewBox="0 0 13 13">
+      <g fill="#728494">
+       <rect x="0" y="2" width="6" height="4" />
+       <rect x="0" y="7" width="6" height="4" />
+       <rect x="7" y="2" width="6" height="4" />
+       <rect x="7" y="7" width="6" height="4" />
+      </g>
+     </svg>
+    </router-link>
+    <input class="form-control" id="jobFilter" v-model="search" placeholder="Filter...">
+   </div>
+  </nav>
+  <table class="striped" id="job-list">
+    <tr v-for="job in filteredJobs()">
+    <td><router-link :to="'jobs/'+job.name">{{job.name}}</router-link></td>
+    <td style="white-space: nowrap;"><span v-html="runIcon(job.result)"></span> <router-link :to="'jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link></td>
+    <td>{{formatDate(job.started)}}</td>
+    <td>{{formatDuration(job.started,job.completed)}}</td>
+    </tr>
+  </table>
  </div></template>
  
- <template id="job"><div>
-  <ol class="breadcrumb"><li><router-link to="/">Home</router-link></li><li><router-link to="/jobs">Jobs</router-link></li><li class="active">{{$route.params.name}}</li></ol></ol>
-  <div class="container-fluid">
-   <div class="row">
-    <div class="col-sm-5 col-md-6 col-lg-7">
-    <h3>{{$route.params.name}}</h3>
-    <dl class="dl-horizontal">
-     <dt>Last Successful Run</dt>
-     <dd><router-link v-if="lastSuccess" :to="'/jobs/'+$route.params.name+'/'+lastSuccess.number">#{{lastSuccess.number}}</router-link> {{lastSuccess?' - at '+formatDate(lastSuccess.started):'never'}}</dd>
-     <dt>Last Failed Run</dt>
-     <dd><router-link v-if="lastFailed" :to="'/jobs/'+$route.params.name+'/'+lastFailed.number">#{{lastFailed.number}}</router-link> {{lastFailed?' - at '+formatDate(lastFailed.started):'never'}}</dd>
-    </dl>
-    </div>
-    <div class="col-sm-7 col-md-6 col-lg-5">
-    <div class="panel panel-default">
-      <div class="panel-heading">Build time</div>
-      <div class="panel-body">
-      <canvas id="chartBt"></canvas>
-      </div>
-    </div>
-    </div>
+ <template id="wallboard"><div class="wallboard">
+  <router-link :to="'jobs/'+job.name+'/'+job.number" tag="div" v-for="job in wallboardJobs()" :data-result="job.result">
+   <span style="font-size: 36px; font-weight: bold;">{{job.name}} #{{job.number}}</span><br>
+   <span style="font-size: 30px;">{{formatDate(job.started)}}</span><br>
+   <span style="font-size: 26px;">{{job.reason}}</span>
+  </router-link>
+ </div></template>
+
+ <template id="job"><div id="page-job-main">
+  <div style="padding: 15px;">
+   <h2>{{route.params.name}}</h2>
+   <div v-html="description"></div>
+   <dl>
+    <dt>Last Successful Run</dt>
+    <dd><router-link v-if="lastSuccess" :to="'jobs/'+route.params.name+'/'+lastSuccess.number">#{{lastSuccess.number}}</router-link> {{lastSuccess?' - at '+formatDate(lastSuccess.started):'never'}}</dd>
+    <dt>Last Failed Run</dt>
+    <dd><router-link v-if="lastFailed" :to="'jobs/'+route.params.name+'/'+lastFailed.number">#{{lastFailed.number}}</router-link> {{lastFailed?' - at '+formatDate(lastFailed.started):'never'}}</dd>
+   </dl>
+  </div>
+  <div style="display: grid; justify-content: center; padding: 15px;">
+   <canvas id="chartBt"></canvas>
+  </div>
+  <div style="grid-column: 1/-1">
+   <table class="striped">
+    <thead><tr>
+     <th><a class="sort" :class="(sort.field=='result'?sort.order:'')" v-on:click="do_sort('result')">&nbsp;</a></th>
+     <th>Run <a class="sort" :class="(sort.field=='number'?sort.order:'')" v-on:click="do_sort('number')">&nbsp;</a></th>
+     <th class="text-center">Started <a class="sort" :class="(sort.field=='started'?sort.order:'')" v-on:click="do_sort('started')">&nbsp;</a></th>
+     <th class="text-center">Duration <a class="sort" :class="(sort.field=='duration'?sort.order:'')" v-on:click="do_sort('duration')">&nbsp;</a></th>
+     <th class="text-center vp-sm-hide">Reason <a class="sort" :class="(sort.field=='reason'?sort.order:'')" v-on:click="do_sort('reason')">&nbsp;</a></th>
+    </tr></thead>
+    <tr v-for="job in jobsQueued.concat(jobsRunning).concat(jobsRecent)" track-by="$index">
+     <td style="width:1px"><span v-html="runIcon(job.result)"></span></td>
+     <td><router-link :to="'jobs/'+route.params.name+'/'+job.number">#{{job.number}}</router-link></td>
+     <td class="text-center"><span v-if="job.result!='queued'">{{formatDate(job.started)}}</span></td>
+     <td class="text-center"><span v-if="job.result!='queued'">{{formatDuration(job.started, job.completed)}}</span></td>
+     <td class="text-center vp-sm-hide">{{job.reason}}</td>
+    </tr>
+   </table>
+   <div style="float: right; margin: 15px; display: inline-grid; grid-auto-flow: column; gap: 10px; align-items: center">
+    <button v-on:click="page_prev" :disabled="sort.page==0">&laquo;</button>
+    <span>Page {{sort.page+1}} of {{pages}}</span>
+    <button class="btn" v-on:click="page_next" :disabled="sort.page==pages-1">&raquo;</button>
    </div>
-   <div class="row"><div class="col-xs-12">
-    <table class="table table-striped"><thead>
-     <tr><th>Run</th><th class="text-center">Started</th><th class="text-center">Duration</th><th class="text-center hidden-xs">Reason</th></tr></thead>
-     <tr v-show="nQueued">
-      <td colspan="4"><i>{{nQueued}} run(s) queued</i></td>
-     </tr>
-     <tr v-for="job in jobsRunning" track-by="$index">
-      <td><span v-html="runIcon(job.result)"></span> <router-link :to="'/jobs/'+$route.params.name+'/'+job.number">#{{job.number}}</router-link></td>
-      <td class="text-center">{{formatDate(job.started)}}</td>
-      <td class="text-center">{{formatDuration(job.started, job.completed)}}</td>
-      <td class="text-center hidden-xs">{{job.reason}}</td>
-     </tr>
-     <tr v-for="job in jobsRecent" track-by="$index">
-      <td><span v-html="runIcon(job.result)"></span> <router-link :to="'/jobs/'+$route.params.name+'/'+job.number">#{{job.number}}</router-link></td>
-      <td class="text-center">{{formatDate(job.started)}}</td>
-      <td class="text-center">{{formatDuration(job.started, job.completed)}}</td>
-      <td class="text-center hidden-xs">{{job.reason}}</td>
-     </tr>
-    </table>
-   </div></div>
   </div>
  </div></template>
  
- <template id="run"><div>
-  <ol class="breadcrumb"><li><router-link to="/">Home</router-link></li><li><router-link to="/jobs">Jobs</router-link></li><li><router-link :to="'/jobs/'+$route.params.name">{{$route.params.name}}</router-link></li><li class="active">#{{$route.params.number}}</li></ol></ol>
-  <div class="container-fluid">
-   <div class="row">
-    <div class="col-sm-5 col-md-6 col-lg-7">
-     <h3 style="float:left"><span v-html="runIcon(job.result)"></span> {{$route.params.name}} #{{$route.params.number}}</h3>
-     <nav class="pull-left">
-      <ul class="pagination" style="margin:15px 20px">
-       <li v-show="$route.params.number > 1"><router-link :to="'/jobs/'+$route.params.name+'/'+($route.params.number-1)">&laquo;</router-link></li>
-       <li v-show="latestNum > $route.params.number"><router-link :to="'/jobs/'+$route.params.name+'/'+(parseInt($route.params.number)+1)">&raquo;</router-link></li>
-      </ul>
-     </nav>
-     <div style="clear:both;"></div>
-     <dl class="dl-horizontal">
-      <dt>Reason</dt><dd>{{job.reason}}</dd>
-      <dt>Queued for</dt><dd>{{job.queued}}s</dd>
-      <dt>Started</dt><dd>{{formatDate(job.started)}}</dd>
-      <dt v-show="runComplete(job)">Completed</dt><dd v-show="job.completed">{{formatDate(job.completed)}}</dd>
-      <dt>Duration</dt><dd>{{formatDuration(job.started, job.completed)}}</dd>
-     </dl>
-    </div>
-    <div class="col-sm-7 col-md-6 col-lg-5">
-     <div class="progress" v-show="job.result == 'running'">
-      <div class="progress-bar  progress-bar-striped" :class="'progress-bar-'+(job.overtime?'warning':'info')" :class="job.etc?'':'active'" :style="{width:!job.etc?100:job.progress + '%'}"></div>
-     </div>
-     <div class="panel panel-default" v-show="job.artifacts.length">
-      <div class="panel-heading">Artifacts</div>
-      <div class="panel-body">
-       <ul class="list-unstyled" style="margin-bottom: 0">
-        <li v-for="art in job.artifacts"><a :href="art.url" target="_self">{{art.filename}}</a></li>
-       </ul>
-      </div>
-     </div>
+ <template id="run"><div style="display: grid; grid-template-rows: auto 1fr">
+  <div style="padding: 15px">
+   <div style="display: grid; grid-template-columns: auto 25px auto auto 1fr 400px; gap: 5px; align-items: center">
+    <h2 style="white-space: nowrap"><span v-html="runIcon(job.result)"></span> <router-link :to="'jobs/'+route.params.name">{{route.params.name}}</router-link> #{{route.params.number}}</h2>
+    <span></span>
+    <router-link :disabled="route.params.number == 1" :to="'jobs/'+route.params.name+'/'+(route.params.number-1)" tag="button">&laquo;</router-link>
+    <router-link :disabled="route.params.number == latestNum" :to="'jobs/'+route.params.name+'/'+(parseInt(route.params.number)+1)" tag="button">&raquo;</router-link>
+    <span></span>
+    <div class="progress" v-show="job.result == 'running'">
+     <div class="progress-bar" :class="{overtime:job.overtime,indeterminate:!job.etc}" :style="job.etc && {width:job.progress+'%'}"></div>
     </div>
    </div>
-   <div class="row"><div class="col-xs-12">
-    <button type="button" class="btn btn-default btn-xs pull-right" :class="{'active':autoscroll}" v-on:click="autoscroll = !autoscroll" style="margin-top:10px">Autoscroll</button>
-    <h4>Console output</h4>
-    <pre v-html="log"></pre>
-   </div></div>
+   <div id="page-run-detail">
+    <dl>
+     <dt>Reason</dt><dd>{{job.reason}}</dd>
+     <dt v-show="job.upstream.num > 0">Upstream</dt><dd v-show="job.upstream.num > 0"><router-link :to="'jobs/'+job.upstream.name">{{job.upstream.name}}</router-link> <router-link :to="'jobs/'+job.upstream.name+'/'+job.upstream.num">#{{job.upstream.num}}</router-link></li></dd>
+     <dt>Queued for</dt><dd>{{formatDuration(job.queued, job.started ? job.started : Math.floor(Date.now()/1000))}}</dd>
+     <dt v-show="job.started">Started</dt><dd v-show="job.started">{{formatDate(job.started)}}</dd>
+     <dt v-show="runComplete(job)">Completed</dt><dd v-show="job.completed">{{formatDate(job.completed)}}</dd>
+     <dt v-show="job.started">Duration</dt><dd v-show="job.started">{{formatDuration(job.started, job.completed)}}</dd>
+    </dl>
+    <dl v-show="job.artifacts.length">
+     <dt>Artifacts</dt>
+     <dd>
+      <ul style="margin-bottom: 0">
+       <li v-for="art in job.artifacts"><a :href="art.url" target="_self">{{art.filename}}</a> [{{ art.size | iecFileSize }}]</li>
+      </ul>
+     </dd>
+    </dl>
+   </div>
+  </div>
+  <div class="console-log">
+   <code></code>
+   <span v-show="!logComplete" v-html="runIcon('running')" style="display: block;"></span>
   </div>
  </div></template>
 
- <div id="app">
-  <nav class="navbar navbar-inverse">
-   <div>
-    <router-link to="/" class="navbar-brand"><img src="/icon.png">{{title}}</router-link>
-    <router-link to="/jobs" class="btn navbar-btn pull-right">Jobs</router-link>
+ <main id="app" style="display: grid; grid-template-rows: auto 1fr auto; height: 100%;">
+  <nav id="nav-top" style="display: grid; grid-template-columns: auto auto 1fr auto auto; grid-gap: 15px;">
+   <router-link to="." style="display: grid; grid-auto-flow: column; align-items: center; margin: 5px; font-size: 20px;">
+    <img src="icon.png"> {{title}}
+   </router-link>
+   <div id="nav-top-links" style="display: grid; grid-auto-flow: column; justify-content: start; gap: 15px; padding: 0 15px; align-items: center; font-size: 16px;">
+    <router-link to="jobs">Jobs</router-link>
+    <router-link v-for="(crumb,i) in route.path.slice(1).split('/').slice(1,-1)" :to="route.path.split('/').slice(0,i+3).join('/')">{{crumb}}</router-link>
+   </div>
+   <div></div>
+   <span class="version">{{version}}</span>
+   <div style="display: grid; align-items: center; padding: 0 15px">
+    <a v-on:click="toggleNotifications(!notify)" class="nav-icon" :class="{active:notify}" v-show="supportsNotifications" :title="(notify?'Disable':'Enable')+' notifications'">
+     <svg width="18" viewBox="0 0 12 12">
+      <g stroke-width="0.5">
+       <path d="m 6,9 c -1,0 -1,0 -1,1 0,1 2,1 2,0 0,-1 0,-1 -1,-1 z" />
+       <path d="m 1,10 c 3,-3 1,-9 5,-9 4,0 2,6 5,9 1,1 -3,-1 -5,-1 -2,0 -6,2 -5,1 z" />
+      </g>
+     </svg>
+    </a>
    </div>
   </nav>
-  <a v-on:click="toggleNotifications(!notify)" v-show="supportsNotifications" class="bell pull-right" :class="{'active':notify}" :title="(notify?'Disable':'Enable')+' notifications'">&#128276;</a>
   <router-view></router-view>
-  <div v-show="!connected" id="popup-connecting"><span class="status spin">⚙&#xfe0e;</span>&nbsp;Connecting...</div>
- </div>
+  <div id="connecting-overlay" :class="{shown:!connected}">
+   <div><span v-html="runIcon('running')"></span> Connecting...</div>
+  </div>
+ </main>
 </body>
 </html>
 

src/resources/manifest.webmanifest

@@ -0,0 +1,21 @@
+{
+  "short_name": "Laminar",
+  "name": "Laminar",
+  "description": "Lightweight Continuous Integration",
+  "icons": [
+    {
+      "src": "/icon.png",
+      "type": "image/png",
+      "sizes": "36x36"
+    },
+    {
+      "src": "/favicon-152.png",
+      "type": "image/png",
+      "sizes": "152x152"
+    }
+  ],
+  "start_url": "/",
+  "background_color": "#2F3340",
+  "display": "standalone",
+  "scope": "/"
+}

src/resources/style.css

@@ -0,0 +1,327 @@
+/* colour scheme */
+:root {
+ --main-bg: #fff;
+ --main-fg: #333;
+ --nav-bg: #2F3340;
+ --nav-bg-darker: #292b33;
+ --nav-fg: #d0d0d0;
+ --nav-fg-light: #fafafa;
+ --icon-enabled: #d8cb83;
+ --success: #74af77;
+ --failure: #883d3d;
+ --running: #4786ab;
+ --warning: #de9a34;
+ --link-fg: #2f4579;
+ --alt-row-bg: #fafafa;
+ --border-grey: #d0d0d0;
+}
+
+/* basic resets */
+html { box-sizing: border-box; }
+*, *:before, *:after { box-sizing: inherit; }
+body, h1, h2, h3, h4, h5, h6, p, ol, ul {
+ margin: 0;
+ padding: 0;
+ font-weight: normal;
+}
+ol, ul { list-style: none; } 
+body, html { height: 100%; }
+body {
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 16px;
+ color: var(--main-fg);
+}
+
+/* main header bar */
+#nav-top         { background-color: var(--nav-bg); }
+#nav-top-links   { background-color: var(--nav-bg-darker); }
+#nav-top a       { color: var(--nav-fg); }
+#nav-top a:hover { color: white; text-decoration: none; }
+
+.version {
+ align-self: center;
+ font-size: x-small;
+ color: rgba(255,255,255,0.3);
+}
+
+/* navbar svg icons (enable notifications) */
+.nav-icon            { display: inherit; }
+.nav-icon svg        { fill: var(--nav-fg); stroke: #000; }
+.nav-icon:hover      { cursor: pointer; }
+.nav-icon:hover svg  { fill: var(--nav-fg-light); }
+.nav-icon.active svg { fill: var(--icon-enabled); }
+
+/* anchors */  
+a              { color: var(--link-fg); text-decoration: none; }
+a:visited      { color: var(--link-fg); }
+a:active       { color: var(--link-fg); }
+a:hover        { text-decoration: underline; }
+
+/* charts */
+canvas {
+ width: 100% !important;
+ max-width: 800px;
+ height: auto !important;
+}
+
+#popup-connecting {
+ position: fixed;
+ background: white;
+ border: 1px solid #ddd;
+ bottom: 10px;
+ right: 10px;
+ padding: 20px;
+}
+
+/* status icons */
+.status {
+ display: inline-block;
+ width: 1em;
+ vertical-align: middle;
+ margin-top: -2px; /* pixel-pushing */
+}
+svg.success path   { fill: var(--success); }
+svg.failed path    { fill: var(--failure); }
+svg.running circle { stroke: var(--running); }
+svg.queued circle  { fill: var(--nav-fg); }
+svg.queued path    { stroke: white; }
+
+/* sort indicators */
+a.sort {
+ position: relative;
+ margin-left: 7px;
+}
+a.sort:before, a.sort:after {
+ border: 4px solid transparent;
+ content: "";
+ position: absolute;
+ display: block;
+ height: 0;
+ width: 0;
+ right: 0;
+ top: 50%;
+}
+a.sort:before {
+ border-bottom-color: var(--border-grey);
+ margin-top: -9px;
+}
+a.sort:after {
+ border-top-color: var(--border-grey);
+ margin-top: 1px;
+}
+a.sort.dsc:after { border-top-color: var(--main-fg); }
+a.sort.asc:before { border-bottom-color: var(--main-fg); }
+a.sort:hover { text-decoration: none; cursor:pointer; }
+a.sort:not(.asc):hover:before { border-bottom-color: var(--main-fg);  }
+a.sort:not(.dsc):hover:after { border-top-color: var(--main-fg);  }
+
+/* job group tabs */
+a.active { color: var(--main-fg); }
+a.active:hover { text-decoration: none; }
+
+/* run console ansi colors (based on base16-default-dark and base16-bright) */
+:root {
+  --ansi-black: #181818;
+  --ansi-red: #ab4642;
+  --ansi-green: #a1b56c;
+  --ansi-yellow: #f7ca88;
+  --ansi-blue: #7cafc2;
+  --ansi-magenta: #ba8baf;
+  --ansi-cyan: #86c1b9;
+  --ansi-white: #d8d8d8;
+  --ansi-brightblack: #000000;
+  --ansi-brightred: #fb0120;
+  --ansi-brightgreen: #a1c659;
+  --ansi-brightyellow: #fda331;
+  --ansi-brightblue: #6fb3d2;
+  --ansi-brightmagenta: #d381c3;
+  --ansi-brightcyan: #76c7b7;
+  --ansi-brightwhite: #e0e0e0;
+}
+.ansi-black-fg { color: var(--ansi-black); } .ansi-black-bg { background-color: var(--ansi-black); }
+.ansi-red-fg { color: var(--ansi-red); } .ansi-red-bg { background-color: var(--ansi-red); }
+.ansi-green-fg { color: var(--ansi-green); } .ansi-green-bg { background-color: var(--ansi-green); }
+.ansi-yellow-fg { color: var(--ansi-yellow); } .ansi-yellow-bg { background-color: var(--ansi-yellow); }
+.ansi-blue-fg { color: var(--ansi-blue); } .ansi-blue-bg { background-color: var(--ansi-blue); }
+.ansi-magenta-fg { color: var(--ansi-magenta); } .ansi-magenta-bg { background-color: var(--ansi-magenta); }
+.ansi-cyan-fg { color: var(--ansi-cyan); } .ansi-cyan-bg { background-color: var(--ansi-cyan); }
+.ansi-white-fg { color: var(--ansi-white); } .ansi-white-bg { background-color: var(--ansi-white); }
+.ansi-bright-black-fg { color: var(--ansi-brightblack); } .ansi-bright-black-bg { background-color: var(--ansi-brightblack); }
+.ansi-bright-red-fg { color: var(--ansi-brightred); } .ansi-bright-red-bg { background-color: var(--ansi-brightred); }
+.ansi-bright-green-fg { color: var(--ansi-brightgreen); } .ansi-bright-green-bg { background-color: var(--ansi-brightgreen); }
+.ansi-bright-yellow-fg { color: var(--ansi-brightyellow); } .ansi-bright-yellow-bg { background-color: var(--ansi-brightyellow); }
+.ansi-bright-blue-fg { color: var(--ansi-brightblue); } .ansi-bright-blue-bg { background-color: var(--ansi-brightblue); }
+.ansi-bright-magenta-fg { color: var(--ansi-brightmagenta); } .ansi-bright-magenta-bg { background-color: var(--ansi-brightmagenta); }
+.ansi-bright-cyan-fg { color: var(--ansi-brightcyan); } .ansi-bright-cyan-bg { background-color: var(--ansi-brightcyan); }
+.ansi-bright-white-fg { color: var(--ansi-brightwhite); } .ansi-bright-white-bg { background-color: var(--ansi-brightwhite); }
+
+/* run console */
+.console-log { padding: 15px; background-color: var(--ansi-black); }
+.console-log code { white-space: pre-wrap; color: var(--ansi-white); }
+.console-log a { color: var(--ansi-brightwhite); text-decoration: underline dotted; }
+
+/* text input (job filtering) */
+input { padding: 5px 8px; }
+
+/* description list (run detail) */
+dl { display: grid; grid-template-columns: auto 1fr; }
+dt { text-align: right; font-weight: bold; min-width: 85px; }
+dt,dd { line-height: 2; }
+  
+/* tables */
+table { border-spacing: 0; width: 100%; }
+th { text-align: left; border-bottom: 1px solid var(--border-grey); }
+td, th { padding: 8px; }
+table.striped td { border-top: 1px solid var(--border-grey); }
+table.striped tr:nth-child(even) { background-color: var(--alt-row-bg); }
+td:first-child, th:first-child { padding-left: 15px; }
+td:last-child, th:last-child { padding-right: 15px; }
+
+/* next/prev navigation buttons */
+button {
+ border: 1px solid var(--border-grey);
+ background-color: var(--alt-row-bg);
+ padding: 6px;
+ min-width: 29px;
+}
+button[disabled]       { cursor: not-allowed; color: var(--border-grey); }
+button:not([disabled]) { cursor: pointer; color: var(--main-fg); }
+
+/* progress bar */
+.progress {
+ width: 100%;
+ height: 8px;
+ border: 1px solid;
+ border-radius: 4px;
+ overflow: hidden;
+ border-color: var(--border-grey);
+ background-color: var(--alt-row-bg);
+}
+.progress-bar {
+ height: 100%;
+ background-color: var(--running);
+ background-image: linear-gradient(45deg, transparent 35%, rgba(255,255,255,0.18) 35% 65%, transparent 65%);
+ background-size: 1rem;
+ transition: width .6s linear;
+}
+.progress-bar.overtime { background-color: var(--warning); }
+.progress-bar.indeterminate {
+ animation: animate-stripes 1s linear infinite;
+}
+@keyframes animate-stripes {
+ from { background-position: 1rem 0; } to { background-position: 0 0; }
+}
+
+/* wallboard */
+.wallboard {
+ display: flex;
+ flex-wrap: wrap-reverse;
+ flex-direction: row-reverse;
+ gap: 20px;
+ padding: 20px;
+ position: fixed;
+ height: 100%;
+ width: 100%;
+ overflow: auto;
+ background-color: #000
+}
+.wallboard > div {
+ padding: 30px;
+ flex-grow: 1;
+ background-color: var(--failure);
+ color: var(--nav-fg-light);
+}
+.wallboard > div:hover {
+  cursor: pointer;
+}
+.wallboard > div[data-result="running"] {
+  animation: wallboard-bg-fade 2s ease infinite;
+}
+@keyframes wallboard-bg-fade {
+  from { background-color: #4786ab; }
+  50% { background-color: #446597; }
+  to { background-color: #4786ab; }
+}
+.wallboard > div[data-result="success"] {
+  background-color: var(--success);
+  color: var(--main-fg);
+}
+
+/* connecting overlay */
+#connecting-overlay {
+ position: fixed;
+ top: 0; right: 0; bottom: 0; left: 0;
+ display: grid;
+ align-content: end; justify-content: end;
+ color: var(--nav-fg-light);
+ font-size: 18px;
+ padding: 30px;
+ visibility: hidden;
+ background-color: rgba(0,0,0,0.75);
+ opacity: 0;
+ transition: opacity 0.5s ease, visibility 0s 0.5s;
+}
+#connecting-overlay.shown {
+ visibility: visible;
+ opacity: 1;
+ transition: opacity 0.5s ease 2s;
+}
+#connecting-overlay > div { opacity: 1; }
+
+/* responsive layout */
+#page-home-main {
+ display: grid;
+ grid-template-columns: auto 1fr;
+}
+@media (max-width: 865px) {
+ #page-home-main {
+  grid-template-columns: 1fr;
+ }
+ .vp-sm-hide { display: none; }
+}
+#page-home-stats {
+ display: grid;
+ grid-template-columns: 1fr 1fr 1fr;
+ padding: 15px;
+ gap: 15px;
+ max-width: 1600px;
+ margin: auto;
+ text-align: center;
+}
+@media (max-width: 650px) {
+ #page-home-stats {
+  grid-template-columns: 1fr;
+ }
+}
+#page-home-plots {
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ padding: 5px;
+ gap: 5px;
+ max-width: 1600px;
+ margin: auto;
+}
+@media (max-width: 1095px) {
+ #page-home-plots {
+  grid-template-columns: 1fr;
+ }
+}
+#page-job-main {
+ display: grid;
+ grid-template: auto 1fr / minmax(550px, 1fr) 1fr;
+}
+@media (max-width: 965px) {
+ #page-job-main {
+  grid-template: auto auto 1fr / 1fr;
+ }
+}
+#page-run-detail {
+  display: grid;
+  grid-template-columns: minmax(400px, auto) 1fr;
+  gap: 5px;
+}
+@media (max-width: 780px) {
+ #page-run-detail {
+  grid-template-columns: 1fr;
+ }
+}

src/rpc.cpp

@@ -0,0 +1,182 @@
+///
+/// Copyright 2015-2022 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);
+        std::shared_ptr<Run> run = laminar.queueJob(jobName, params(context.getParams().getParams()), context.getParams().getFrontOfQueue());
+        if(Run* r = run.get()) {
+            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, 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()), context.getParams().getFrontOfQueue());
+        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()), context.getParams().getFrontOfQueue());
+        if(run) {
+            return run->whenFinished().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;
+        }
+    }
+
+    // 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[i].setJob(it->name);
+            res[i].setBuildNum(it->build);
+            i++;
+        }
+        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,34 @@
+///
+/// Copyright 2019-2026 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/>
+///
+#pragma once
+
+#include <capnp/ez-rpc.h>
+#include <capnp/rpc-twoparty.h>
+#include <capnp/rpc.capnp.h>
+
+class Laminar;
+
+class Rpc {
+public:
+    Rpc(Laminar&li);
+    kj::Promise<void> accept(kj::Own<kj::AsyncIoStream>&& connection);
+
+    capnp::Capability::Client rpcInterface;
+};
+

src/run.cpp

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2017 Oliver Giles
+/// Copyright 2015-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -17,20 +17,29 @@
 /// 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"
 
+#include <sys/wait.h>
 #include <iostream>
 #include <unistd.h>
 #include <signal.h>
 
-#include <boost/filesystem.hpp>
-namespace fs = boost::filesystem;
+#if defined(__FreeBSD__)
+#include <sys/sysctl.h>
+#include <sys/limits.h>
+#endif
+
+// short syntax helper for kj::Path
+template<typename T>
+inline kj::Path operator/(const kj::Path& p, const T& ext) {
+    return p.append(ext);
+}
 
 std::string to_string(const RunState& rs) {
     switch(rs) {
-    case RunState::PENDING: return "pending";
+    case RunState::QUEUED: return "queued";
     case RunState::RUNNING: return "running";
     case RunState::ABORTED: return "aborted";
     case RunState::FAILED: return "failed";
@@ -41,119 +50,161 @@ std::string to_string(const RunState& rs) {
 }
 
 
-Run::Run() {
-    result = RunState::SUCCESS;
-    lastResult = RunState::UNKNOWN;
+Run::Run(std::string name, uint num, ParamMap pm, kj::Path&& rootPath) :
+    result(RunState::SUCCESS),
+    name(name),
+    build(num),
+    params(kj::mv(pm)),
+    queuedAt(time(nullptr)),
+    rootPath(kj::mv(rootPath)),
+    started(kj::newPromiseAndFulfiller<void>()),
+    startedFork(started.promise.fork()),
+    finished(kj::newPromiseAndFulfiller<RunState>()),
+    finishedFork(finished.promise.fork())
+{
+    for(auto it = params.begin(); it != params.end();) {
+        if(it->first[0] == '=') {
+            if(it->first == "=parentJob") {
+                parentName = it->second;
+            } else if(it->first == "=parentBuild") {
+                parentBuild = atoi(it->second.c_str());
+            } else if(it->first == "=reason") {
+                reasonMsg = it->second;
+            } else {
+                LLOG(ERROR, "Unknown internal job parameter", it->first);
+            }
+            it = params.erase(it);
+        } else
+            ++it;
+    }
 }
 
 Run::~Run() {
     LLOG(INFO, "Run destroyed");
 }
 
-std::string Run::reason() const {
-    if(!parentName.empty()) {
-        return std::string("Triggered by upstream ") + parentName + " #" + std::to_string(parentBuild);
+static void setEnvFromFile(const kj::Path& rootPath, kj::Path file) {
+    StringMap vars = parseConfFile((rootPath/file).toString(true).cStr());
+    for(auto& it : vars) {
+        setenv(it.first.c_str(), it.second.c_str(), true);
     }
+}
+
+kj::Promise<RunState> Run::start(RunState lastResult, std::shared_ptr<Context> ctx, const kj::Directory &fsHome, std::function<kj::Promise<int>(kj::Maybe<pid_t>&)> getPromise)
+{
+    kj::Path cfgDir{"cfg"};
+
+    // add job timeout if specified
+    if(fsHome.exists(cfgDir/"jobs"/(name+".conf"))) {
+        timeout = parseConfFile((rootPath/cfgDir/"jobs"/(name+".conf")).toString(true).cStr()).get<int>("TIMEOUT", 0);
+    }
+
+    int plog[2];
+    LSYSCALL(pipe(plog));
+
+    // Fork a process leader to run all the steps of the job. This gives us a nice
+    // process tree output (job name and number as the process name) and helps
+    // contain any wayward descendent processes.
+    pid_t leader;
+    LSYSCALL(leader = fork());
+
+    if(leader == 0) {
+        // All output from this process will be captured in the plog pipe
+        close(plog[0]);
+        dup2(plog[1], STDOUT_FILENO);
+        dup2(plog[1], STDERR_FILENO);
+        close(plog[1]);
+
+        // All initial/fixed env vars can be set here. Dynamic ones, including
+        // "RESULT" and any set by `laminarc set` have to be handled in the subprocess.
+
+        // add environment files
+        if(fsHome.exists(cfgDir/"env"))
+            setEnvFromFile(rootPath, cfgDir/"env");
+        if(fsHome.exists(cfgDir/"contexts"/(ctx->name+".env")))
+            setEnvFromFile(rootPath, cfgDir/"contexts"/(ctx->name+".env"));
+        if(fsHome.exists(cfgDir/"jobs"/(name+".env")))
+            setEnvFromFile(rootPath, cfgDir/"jobs"/(name+".env"));
+
+        // parameterized vars
+        for(auto& pair : params) {
+            setenv(pair.first.c_str(), pair.second.c_str(), false);
+        }
+
+        std::string PATH = (rootPath/"cfg"/"scripts").toString(true).cStr();
+        if(const char* p = getenv("PATH")) {
+            PATH.append(":");
+            PATH.append(p);
+        }
+
+        std::string runNumStr = std::to_string(build);
+
+        setenv("PATH", PATH.c_str(), true);
+        setenv("RUN", runNumStr.c_str(), true);
+        setenv("JOB", name.c_str(), true);
+        setenv("CONTEXT", ctx->name.c_str(), true);
+        setenv("LAST_RESULT", to_string(lastResult).c_str(), true);
+        setenv("WORKSPACE", (rootPath/"run"/name/"workspace").toString(true).cStr(), true);
+        setenv("ARCHIVE", (rootPath/"archive"/name/runNumStr).toString(true).cStr(), true);
+        // RESULT set in leader process
+
+        // leader process assumes $LAMINAR_HOME as CWD
+        LSYSCALL(chdir(rootPath.toString(true).cStr()));
+        setenv("PWD", rootPath.toString(true).cStr(), 1);
+
+        // We could just fork/wait over all the steps here directly, but then we
+        // can't set a nice name for the process tree. There is pthread_setname_np,
+        // but it's limited to 16 characters, which most of the time probably isn't
+        // enough. Instead, we'll just exec ourselves and handle that in laminard's
+        // main() by calling leader_main()
+        char* procName;
+        if(asprintf(&procName, "{laminar} %s:%d", name.data(), build) > 0)
+#if defined(__FreeBSD__)
+        {
+            int  sysctl_rq[] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
+            size_t self_exe_len = PATH_MAX;
+            char self_exe[PATH_MAX];
+
+            if (sysctl(sysctl_rq, 4, self_exe, &self_exe_len, NULL, 0))
+                _exit(EXIT_FAILURE);
+
+            execl(self_exe, procName, NULL); // does not return
+        }
+#else
+            execl("/proc/self/exe", procName, NULL); // does not return
+#endif
+        _exit(EXIT_FAILURE);
+    }
+
+    // All good, we've "started"
+    startedAt = time(nullptr);
+    context = ctx;
+
+    output_fd = plog[0];
+    close(plog[1]);
+    pid = leader;
+
+    // notifies the rpc client if the start command was used
+    started.fulfiller->fulfill();
+
+    return getPromise(pid).then([this](int status){
+        // The leader process passes a RunState through the return value.
+        // Check it didn't die abnormally, then cast to get it back.
+        result = WIFEXITED(status) ? RunState(WEXITSTATUS(status)) : RunState::ABORTED;
+        finished.fulfiller->fulfill(RunState(result));
+        return result;
+    });
+}
+
+std::string Run::reason() const {
     return reasonMsg;
 }
 
-bool Run::step() {
-    if(scripts.size()) {
-        currentScript = scripts.front();
-        scripts.pop();
-
-        int pfd[2];
-        pipe(pfd);
-        pid_t pid = fork();
-        if(pid == 0) { // child
-            // reset signal mask (SIGCHLD blocked in Laminar::start)
-            sigset_t mask;
-            sigemptyset(&mask);
-            sigaddset(&mask, SIGCHLD);
-            sigprocmask(SIG_UNBLOCK, &mask, nullptr);
-
-            // set pgid == pid for easy killing on abort
-            setpgid(0, 0);
-
-            close(pfd[0]);
-            dup2(pfd[1], 1);
-            dup2(pfd[1], 2);
-            close(pfd[1]);
-            std::string buildNum = std::to_string(build);
-
-            std::string PATH = (fs::path(laminarHome)/"cfg"/"scripts").string() + ":";
-            if(const char* p = getenv("PATH")) {
-                PATH.append(p);
-            }
-
-            chdir(currentScript.cwd.c_str());
-
-            // conf file env vars
-            for(std::string file : env) {
-                StringMap vars = parseConfFile(file.c_str());
-                for(auto& it : vars) {
-                    setenv(it.first.c_str(), it.second.c_str(), true);
-                }
-            }
-            // parameterized vars
-            for(auto& pair : params) {
-                setenv(pair.first.c_str(), pair.second.c_str(), false);
-            }
-
-            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("RESULT", to_string(result).c_str(), true);
-            setenv("LAST_RESULT", to_string(lastResult).c_str(), true);
-            setenv("WORKSPACE", (fs::path(laminarHome)/"run"/name/"workspace").string().c_str(), true);
-            setenv("ARCHIVE", (fs::path(laminarHome)/"archive"/name/buildNum.c_str()).string().c_str(), true);
-
-            fprintf(stderr, "[laminar] Executing %s\n", currentScript.path.c_str());
-            execl(currentScript.path.c_str(), currentScript.path.c_str(), NULL);
-            // cannot use LLOG because stdout/stderr are captured
-            fprintf(stderr, "[laminar] Failed to execute %s\n", currentScript.path.c_str());
-            _exit(1);
-        }
-
-        LLOG(INFO, "Forked", currentScript.path, currentScript.cwd, pid);
-        close(pfd[1]);
-        fd = pfd[0];
-        this->pid = pid;
-
-        return false;
-    } else {
+bool Run::abort() {
+    // if the Maybe is empty, wait() was already called on this process
+    KJ_IF_MAYBE(p, pid) {
+        kill(-*p, SIGTERM);
         return true;
     }
-}
-
-void Run::addScript(std::string scriptPath, std::string scriptWorkingDir) {
-    scripts.push({scriptPath, scriptWorkingDir});
-}
-
-void Run::addEnv(std::string path) {
-    env.push_back(path);
-}
-
-void Run::abort() {
-    // clear all pending scripts
-    std::queue<Script>().swap(scripts);
-    kill(-pid, SIGTERM);
-}
-
-void Run::reaped(int status) {
-    // once state is non-success it cannot change again
-    if(result != RunState::SUCCESS)
-        return;
-
-    if(WIFSIGNALED(status) && (WTERMSIG(status) == SIGTERM || WTERMSIG(status) == SIGKILL))
-        result = RunState::ABORTED;
-    else if(status != 0)
-        result = RunState::FAILED;
-    // otherwise preserve earlier status
-}
-
-void Run::complete() {
-    notifyCompletion(this);
+    return false;
 }

src/run.h

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2017 Oliver Giles
+/// Copyright 2015-2026 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,21 +16,21 @@
 /// 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_RUN_H_
-#define LAMINAR_RUN_H_
+#pragma once
 
 #include <string>
-#include <queue>
-#include <list>
 #include <functional>
-#include <ostream>
 #include <unordered_map>
 #include <memory>
 #include <kj/async.h>
+#include <kj/filesystem.h>
+
+// Definition needed for musl
+typedef unsigned int uint;
 
 enum class RunState {
     UNKNOWN,
-    PENDING,
+    QUEUED,
     RUNNING,
     ABORTED,
     FAILED,
@@ -39,75 +39,65 @@ enum class RunState {
 
 std::string to_string(const RunState& rs);
 
-class Node;
+class Context;
 
-// Represents an execution of a job. Not much more than POD
+typedef std::unordered_map<std::string, std::string> ParamMap;
+
+// Represents an execution of a job.
 class Run {
 public:
-    Run();
+    Run(std::string name, uint num, ParamMap params, kj::Path&& rootPath);
     ~Run();
 
     // copying this class would be asking for trouble...
     Run(const Run&) = delete;
     Run& operator=(const Run&) = delete;
 
-    // executes the next script (if any), returning true if there is nothing
-    // more to be done - in this case the caller should call complete()
-    bool step();
-
-    // call this when all scripts are done to get the notifyCompletion callback
-    void complete();
-
-    // adds a script to the queue of scripts to be executed by this run
-    void addScript(std::string scriptPath, std::string scriptWorkingDir);
-
-    // adds a script to the queue using the runDir as the scripts CWD
-    void addScript(std::string script) { addScript(script, runDir); }
-
-    // adds an environment file that will be sourced before this run
-    void addEnv(std::string path);
+    kj::Promise<RunState> start(RunState lastResult, std::shared_ptr<Context> ctx, const kj::Directory &fsHome, std::function<kj::Promise<int>(kj::Maybe<pid_t>&)> getPromise);
 
     // aborts this run
-    void abort();
-
-    // called when a process owned by this run has been reaped. The status
-    // may be used to set the run's job status
-    void reaped(int status);
+    bool abort();
 
     std::string reason() const;
 
-    std::function<void(Run*)> notifyCompletion;
-    std::shared_ptr<Node> node;
+    kj::Promise<void> whenStarted() { return startedFork.addBranch(); }
+    kj::Promise<RunState> whenFinished() { return finishedFork.addBranch(); }
+
+    std::shared_ptr<Context> context;
     RunState result;
-    RunState lastResult;
-    std::string laminarHome;
     std::string name;
-    std::string runDir;
     std::string parentName;
     int parentBuild = 0;
-    std::string reasonMsg;
     uint build = 0;
     std::string log;
-    pid_t pid;
-    int fd;
+    kj::Maybe<pid_t> pid;
+    int output_fd;
     std::unordered_map<std::string, std::string> params;
-    kj::Promise<void> timeout = kj::NEVER_DONE;
-    kj::PromiseFulfillerPair<void> started = kj::newPromiseAndFulfiller<void>();
+    int timeout = 0;
 
     time_t queuedAt;
     time_t startedAt;
 private:
+    // adds a script to the queue of scripts to be executed by this run
+    void addScript(kj::Path scriptPath, kj::Path scriptWorkingDir, bool runOnAbort = false);
+
+    // adds an environment file that will be sourced before this run
+    void addEnv(kj::Path path);
 
     struct Script {
-        std::string path;
-        std::string cwd;
+        kj::Path path;
+        kj::Path cwd;
+        bool runOnAbort;
     };
 
-    std::queue<Script> scripts;
-    Script currentScript;
-    std::list<std::string> env;
-};
+    kj::Path rootPath;
+    std::string reasonMsg;
 
+    kj::PromiseFulfillerPair<void> started;
+    kj::ForkedPromise<void> startedFork;
+    kj::PromiseFulfillerPair<RunState> finished;
+    kj::ForkedPromise<RunState> finishedFork;
+};
 
 // All this below is a somewhat overengineered method of keeping track of
 // currently executing builds (Run objects). This would probably scale
@@ -115,6 +105,7 @@ private:
 // be executing thousands of builds at the same time
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/hashed_index.hpp>
+#include <boost/multi_index/indexed_by.hpp>
 #include <boost/multi_index/member.hpp>
 #include <boost/multi_index/composite_key.hpp>
 #include <boost/multi_index/global_fun.hpp>
@@ -131,9 +122,7 @@ struct _run_same {
 };
 
 // A single Run can be fetched by...
-struct _run_index : bmi::indexed_by<
-        // their current running pid
-        bmi::hashed_unique<bmi::member<Run, pid_t, &Run::pid>>,
+typedef bmi::indexed_by<
         bmi::hashed_unique<bmi::composite_key<
             std::shared_ptr<Run>,
         // a combination of their job name and build number
@@ -146,27 +135,22 @@ struct _run_index : bmi::indexed_by<
         bmi::ordered_non_unique<bmi::member<Run, time_t, &Run::startedAt>>,
         // or by their job name
         bmi::ordered_non_unique<bmi::member<Run, std::string, &Run::name>>
-    >
-{};
+    > _run_index;
 
 struct RunSet: public boost::multi_index_container<
     std::shared_ptr<Run>,
     _run_index
 > {
-    typename bmi::nth_index<RunSet, 0>::type& byPid() { return get<0>(); }
-    typename bmi::nth_index<RunSet, 0>::type const& byPid() const { return get<0>(); }
+    typename bmi::nth_index<RunSet, 0>::type& byNameNumber() { return get<0>(); }
+    typename bmi::nth_index<RunSet, 0>::type const& byNameNumber() const { return get<0>(); }
 
-    typename bmi::nth_index<RunSet, 1>::type& byRun() { return get<1>(); }
-    typename bmi::nth_index<RunSet, 1>::type const& byRun() const { return get<1>(); }
+    typename bmi::nth_index<RunSet, 1>::type& byRunPtr() { return get<1>(); }
+    typename bmi::nth_index<RunSet, 1>::type const& byRunPtr() const { return get<1>(); }
 
-    typename bmi::nth_index<RunSet, 2>::type& byRunPtr() { return get<2>(); }
-    typename bmi::nth_index<RunSet, 2>::type const& byRunPtr() const { return get<2>(); }
+    typename bmi::nth_index<RunSet, 2>::type& byStartedAt() { return get<2>(); }
+    typename bmi::nth_index<RunSet, 2>::type const& byStartedAt() const { return get<2>(); }
 
-    typename bmi::nth_index<RunSet, 3>::type& byStartedAt() { return get<3>(); }
-    typename bmi::nth_index<RunSet, 3>::type const& byStartedAt() const { return get<3>(); }
-
-    typename bmi::nth_index<RunSet, 4>::type& byJobName() { return get<4>(); }
-    typename bmi::nth_index<RunSet, 4>::type const& byJobName() const { return get<4>(); }
+    typename bmi::nth_index<RunSet, 3>::type& byJobName() { return get<3>(); }
+    typename bmi::nth_index<RunSet, 3>::type const& byJobName() const { return get<3>(); }
 };
 
-#endif // LAMINAR_RUN_H_

src/server.cpp

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2018 Oliver Giles
+/// Copyright 2015-2026 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -17,435 +17,28 @@
 /// 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 <websocketpp/config/core.hpp>
-#include <websocketpp/server.hpp>
-
 #include <sys/eventfd.h>
+#include <sys/stat.h>
 #include <sys/inotify.h>
-#include <sys/signal.h>
-#include <sys/signalfd.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
 
-// Configuration struct for the websocketpp template library.
-struct wsconfig : public websocketpp::config::core {
-//    static const websocketpp::log::level elog_level =
-//        websocketpp::log::elevel::info;
-
-//    static const websocketpp::log::level alog_level =
-//        websocketpp::log::alevel::access_core |
-//        websocketpp::log::alevel::message_payload ;
-
-    static const websocketpp::log::level elog_level =
-        websocketpp::log::elevel::none;
-
-    static const websocketpp::log::level alog_level =
-        websocketpp::log::alevel::none;
-
-    typedef struct { LaminarClient* lc; } connection_base;
-};
-typedef websocketpp::server<wsconfig> websocket;
-
-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);
-        ParamMap params;
-        for(auto p : context.getParams().getParams()) {
-            params[p.getName().cStr()] = p.getValue().cStr();
-        }
-        LaminarCi::MethodResult result = laminar.queueJob(jobName, params)
-                ? 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);
-        ParamMap params;
-        for(auto p : context.getParams().getParams()) {
-            params[p.getName().cStr()] = p.getValue().cStr();
-        }
-        std::shared_ptr<Run> run = laminar.queueJob(jobName, params);
-        if(Run* r = run.get()) {
-            return r->started.promise.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);
-        ParamMap params;
-        for(auto p : context.getParams().getParams()) {
-            params[p.getName().cStr()] = p.getValue().cStr();
-        }
-        std::shared_ptr<Run> run = laminar.queueJob(jobName, params);
-        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().getJobName();
-        uint buildNum = context.getParams().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;
-    }
-
-    // Take a named lock
-    kj::Promise<void> lock(LockContext context) override {
-        std::string lockName = context.getParams().getLockName();
-        LLOG(INFO, "RPC lock", lockName);
-        auto& lockList = locks[lockName];
-        lockList.emplace_back(kj::newPromiseAndFulfiller<void>());
-        if(lockList.size() == 1)
-            lockList.front().fulfiller->fulfill();
-        return std::move(lockList.back().promise);
-    }
-
-    // Release a named lock
-    kj::Promise<void> release(ReleaseContext context) override {
-        std::string lockName = context.getParams().getLockName();
-        LLOG(INFO, "RPC release", lockName);
-        auto& lockList = locks[lockName];
-        if(lockList.size() == 0) {
-            LLOG(INFO, "Attempt to release unheld lock", lockName);
-            return kj::READY_NOW;
-        }
-        lockList.erase(lockList.begin());
-        if(lockList.size() > 0)
-            lockList.front().fulfiller->fulfill();
-        return kj::READY_NOW;
-    }
-private:
-    // 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<std::string, std::list<kj::PromiseFulfillerPair<void>>> locks;
-    std::unordered_map<const Run*, std::list<kj::PromiseFulfillerPair<RunState>>> runWaiters;
-};
-
-
-// This is the implementation of the HTTP/Websocket interface. It exposes
-// 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 Server::HttpImpl {
-public:
-    HttpImpl(LaminarInterface& l) :
-        laminar(l)
-    {
-        // debug logging
-        // wss.set_access_channels(websocketpp::log::alevel::all);
-        // wss.set_error_channels(websocketpp::log::elevel::all);
-
-        // TODO: This could be used in the future to trigger actions on the
-        // server in response to a web client request. Currently not supported.
-        // wss.set_message_handler([](std::weak_ptr<void> s, websocket::message_ptr msg){
-        //     msg->get_payload();
-        // });
-
-        // Handle plain HTTP requests by delivering the binary resource
-        wss.set_http_handler([this](websocketpp::connection_hdl hdl){
-            websocket::connection_ptr c = wss.get_con_from_hdl(hdl);
-            const char* start, *end, *content_type;
-            std::string resource = c->get_resource();
-            if(resource.compare(0, strlen("/archive/"), "/archive/") == 0) {
-                std::string file(resource.substr(strlen("/archive/")));
-                std::string content;
-                if(laminar.getArtefact(file, content)) {
-                    c->set_status(websocketpp::http::status_code::ok);
-                    c->append_header("Content-Transfer-Encoding", "binary");
-                    c->set_body(content);
-                } else {
-                    c->set_status(websocketpp::http::status_code::not_found);
-                }
-            } else if(resource.compare("/custom/style.css") == 0) {
-                c->set_status(websocketpp::http::status_code::ok);
-                c->append_header("Content-Type", "text/css; charset=utf-8");
-                c->append_header("Content-Transfer-Encoding", "binary");
-                c->set_body(laminar.getCustomCss());
-            } else if(resources.handleRequest(resource, &start, &end, &content_type)) {
-                c->set_status(websocketpp::http::status_code::ok);
-                c->append_header("Content-Type", content_type);
-                c->append_header("Content-Encoding", "gzip");
-                c->append_header("Content-Transfer-Encoding", "binary");
-                std::string response(start,end);
-                c->set_body(response);
-            } else {
-                // 404
-                c->set_status(websocketpp::http::status_code::not_found);
-            }
-        });
-
-        // Handle new websocket connection. Parse the URL to determine
-        // the client's scope of interest, register the client for update
-        // messages, and call sendStatus.
-        wss.set_open_handler([this](websocketpp::connection_hdl hdl){
-            websocket::connection_ptr c = wss.get_con_from_hdl(hdl);
-            std::string res = c->get_resource();
-            if(res.substr(0, 5) == "/jobs") {
-                if(res.length() == 5) {
-                    c->lc->scope.type = MonitorScope::ALL;
-                } else {
-                    res = res.substr(5);
-                    size_t split = res.find('/',1);
-                    std::string job = res.substr(1,split-1);
-                    if(!job.empty()) {
-                        c->lc->scope.job = job;
-                        c->lc->scope.type = MonitorScope::JOB;
-                    }
-                    if(split != std::string::npos) {
-                        size_t split2 = res.find('/', split+1);
-                        std::string run = res.substr(split+1, split2-split);
-                        if(!run.empty()) {
-                            c->lc->scope.num = static_cast<uint>(atoi(run.c_str()));
-                            c->lc->scope.type = MonitorScope::RUN;
-                        }
-                        if(split2 != std::string::npos && res.compare(split2, 4, "/log") == 0) {
-                            c->lc->scope.type = MonitorScope::LOG;
-                        }
-                    }
-                }
-            }
-            // registerClient can happen after a successful websocket handshake.
-            // However, the connection might not be closed gracefully, so the
-            // corresponding deregister operation happens in the connection
-            // destructor rather than the close handler
-            laminar.registerClient(c->lc);
-            laminar.sendStatus(c->lc);
-        });
-    }
-
-    // Return a new connection object linked with the context defined below.
-    // This is a bit untidy, it would be better to make them a single object,
-    // but I didn't yet figure it out
-    websocket::connection_ptr newConnection(LaminarClient* lc) {
-        websocket::connection_ptr c = wss.get_connection();
-        c->lc = lc;
-        return c;
-    }
-
-    void connectionDestroyed(LaminarClient* lc) {
-        // This will be called for all connections, not just websockets, so
-        // the laminar instance should silently ignore unknown clients
-        laminar.deregisterClient(lc);
-    }
-
-private:
-    Resources resources;
-    LaminarInterface& laminar;
-    websocket wss;
-};
-
-// 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;
-};
-
-// Context for a WebsocketConnection (implements LaminarClient)
-// This object maps read and write handlers between the websocketpp library
-// and the corresponding kj async methods
-struct Server::WebsocketConnection : public LaminarClient {
-    WebsocketConnection(kj::Own<kj::AsyncIoStream>&& stream, Server::HttpImpl& http) :
-        http(http),
-        stream(kj::mv(stream)),
-        cn(http.newConnection(this)),
-        writePaf(kj::newPromiseAndFulfiller<void>())
-    {
-        cn->set_write_handler([this](websocketpp::connection_hdl, const char* s, size_t sz) {
-            outputBuffer.append(std::string(s, sz));
-            writePaf.fulfiller->fulfill();
-            return std::error_code();
-        });
-        cn->start();
-    }
-
-    virtual ~WebsocketConnection() noexcept(true) override {
-        // Removes the connection from the list of registered clients. Must be
-        // here rather than in the websocket closing handshake because connections
-        // might be unexpectedly/aggressively closed and any references must be
-        // removed.
-        http.connectionDestroyed(this);
-    }
-
-    kj::Promise<void> pend() {
-        return stream->tryRead(ibuf, 1, sizeof(ibuf)).then([this](size_t sz){
-            cn->read_some(ibuf, sz);
-            if(sz == 0 || cn->get_state() == websocketpp::session::state::closed) {
-                return kj::Promise<void>(kj::READY_NOW);
-            }
-            return pend();
-        });
-    }
-
-    kj::Promise<void> writeTask() {
-        return writePaf.promise.then([this]() {
-            std::string payload;
-            // clear the outputBuffer for more context, and take a chunk
-            // to send now
-            payload.swap(outputBuffer);
-            writePaf = kj::newPromiseAndFulfiller<void>();
-            KJ_ASSERT(!payload.empty());
-            return stream->write(payload.data(), payload.size()).then([this](){
-                if(cn->get_state() == websocketpp::session::state::closed) {
-                    return kj::Promise<void>(kj::READY_NOW);
-                }
-                return writeTask();
-            }).attach(kj::mv(payload));
-        });
-    }
-
-    void sendMessage(std::string payload) override {
-        cn->send(payload, websocketpp::frame::opcode::text);
-    }
-
-    HttpImpl& http;
-    kj::Own<kj::AsyncIoStream> stream;
-    websocket::connection_ptr cn;
-    std::string outputBuffer;
-    kj::PromiseFulfillerPair<void> writePaf;
-    char ibuf[131072];
-};
-
-Server::Server(LaminarInterface& li, kj::StringPtr rpcBindAddress,
-               kj::StringPtr httpBindAddress) :
-    rpcInterface(kj::heap<RpcImpl>(li)),
-    laminarInterface(li),
-    httpInterface(kj::heap<HttpImpl>(li)),
-    ioContext(kj::setupAsyncIo()),
+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();
-        return acceptHttpClient(addr->listen());
-    }));
-
-    // handle SIGCHLD
-    {
-        sigset_t mask;
-        sigemptyset(&mask);
-        sigaddset(&mask, SIGCHLD);
-        sigprocmask(SIG_BLOCK, &mask, nullptr);
-        int sigchld = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC);
-        auto event = ioContext.lowLevelProvider->wrapInputFd(sigchld, kj::LowLevelAsyncIoProvider::TAKE_OWNERSHIP);
-        auto buffer = kj::heapArrayBuilder<char>(PROC_IO_BUFSIZE);
-        reapWatch = handleFdRead(event, buffer.asPtr().begin(), [this](const char* buf, size_t){
-            const struct signalfd_siginfo* siginfo = reinterpret_cast<const struct signalfd_siginfo*>(buf);
-            KJ_ASSERT(siginfo->ssi_signo == SIGCHLD);
-            laminarInterface.reapChildren();
-        }).attach(std::move(event)).attach(std::move(buffer));
-    }
-
-    // handle watched paths
-    {
-        inotify_fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
-        auto event = ioContext.lowLevelProvider->wrapInputFd(inotify_fd, kj::LowLevelAsyncIoProvider::TAKE_OWNERSHIP);
-        auto buffer = kj::heapArrayBuilder<char>(PROC_IO_BUFSIZE);
-        pathWatch = handleFdRead(event, buffer.asPtr().begin(), [this](const char*, size_t){
-            laminarInterface.notifyConfigChanged();
-        }).attach(std::move(event)).attach(std::move(buffer));
-    }
 }
 
 Server::~Server() {
@@ -465,15 +58,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
+    // 4. return: http connections will be destructed when class is deleted
 }
 
 void Server::stop() {
@@ -482,10 +72,14 @@ void Server::stop() {
     eventfd_write(efd_quit, 1);
 }
 
-void Server::addDescriptor(int fd, std::function<void(const char*,size_t)> cb) {
+kj::Promise<void> Server::readDescriptor(int fd, std::function<void(const char*,size_t)> cb) {
     auto event = this->ioContext.lowLevelProvider->wrapInputFd(fd, kj::LowLevelAsyncIoProvider::TAKE_OWNERSHIP);
     auto buffer = kj::heapArrayBuilder<char>(PROC_IO_BUFSIZE);
-    childTasks.add(handleFdRead(event, buffer.asPtr().begin(), cb).attach(std::move(event)).attach(std::move(buffer)));
+    return handleFdRead(event, buffer.asPtr().begin(), cb).attach(std::move(event)).attach(std::move(buffer));
+}
+
+void Server::addTask(kj::Promise<void>&& task) {
+    childTasks.add(kj::mv(task));
 }
 
 kj::Promise<void> Server::addTimeout(int seconds, std::function<void ()> cb) {
@@ -494,29 +88,70 @@ kj::Promise<void> Server::addTimeout(int seconds, std::function<void ()> cb) {
     }).eagerlyEvaluate(nullptr);
 }
 
-void Server::addWatchPath(const char* dpath) {
-    inotify_add_watch(inotify_fd, dpath, IN_ONLYDIR | IN_CLOSE_WRITE | IN_CREATE | IN_DELETE);
+kj::Promise<int> Server::onChildExit(kj::Maybe<pid_t> &pid) {
+    return ioContext.unixEventPort.onChildExit(pid);
 }
 
-kj::Promise<void> Server::acceptHttpClient(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 conn = kj::heap<WebsocketConnection>(kj::mv(connection), *httpInterface);
-            // delete the connection when either the read or write task completes
-            httpConnections.add(conn->pend().exclusiveJoin(conn->writeTask()).attach(kj::mv(conn)));
-            return acceptHttpClient(kj::mv(listener));
-        }));
+Server::PathWatcher& Server::watchPaths(std::function<void()> fn)
+{
+    struct PathWatcherImpl final : 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,rpcBindAddress](kj::Own<kj::NetworkAddress>&& addr) {
+        kj::Own<kj::ConnectionReceiver> listener = addr->listen();
+        if(rpcBindAddress.startsWith("unix:"))
+            chmod(rpcBindAddress.slice(strlen("unix:")).cStr(), 0660);
+        return acceptRpcClient(rpc, kj::mv(listener));
+    }));
+
+}
+
+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,httpBindAddress](kj::Own<kj::NetworkAddress>&& addr) {
+        kj::Own<kj::ConnectionReceiver> listener = addr->listen();
+        if(httpBindAddress.startsWith("unix:"))
+            chmod(httpBindAddress.slice(strlen("unix:")).cStr(), 0660);
+        return http.startServer(ioContext.lowLevelProvider->getTimer(), kj::mv(listener));
+    }).catch_([this,&http,httpBindAddress](kj::Exception&&e) mutable -> kj::Promise<void> {
+        if(e.getType() == kj::Exception::Type::DISCONNECTED) {
+            LLOG(ERROR, "HTTP disconnect, restarting server", e.getDescription());
+            listenHttp(http, httpBindAddress);
+            return kj::READY_NOW;
+        }
+        // otherwise propagate the exception
+        return kj::mv(e);
+    }));
+}
+
+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));
-        }));
+    return cr.accept().then([this, &rpc, l = kj::mv(listener)](kj::Own<kj::AsyncIoStream>&& connection) mutable {
+            addTask(rpc.accept(kj::mv(connection)));
+            return acceptRpcClient(rpc, kj::mv(l));
+        });
 }
 
 // returns a promise which will read a chunk of data from the file descriptor
@@ -533,8 +168,8 @@ kj::Promise<void> Server::handleFdRead(kj::AsyncInputStream* stream, char* buffe
 }
 
 void Server::taskFailed(kj::Exception &&exception) {
-    // An unexpected http connection close can cause an exception, so don't re-throw.
-    // TODO: consider re-throwing selected exceptions
-    LLOG(INFO, exception);
     //kj::throwFatalException(kj::mv(exception));
+    // prettier
+    fprintf(stderr, "fatal: %s\n", exception.getDescription().cStr());
+    exit(EXIT_FAILURE);
 }

src/server.h

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2017 Oliver Giles
+/// Copyright 2015-2026 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,65 +16,58 @@
 /// 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_SERVER_H_
-#define LAMINAR_SERVER_H_
+#pragma once
 
 #include <kj/async-io.h>
+#include <kj/compat/http.h>
 #include <capnp/message.h>
 #include <capnp/capability.h>
 #include <functional>
+#include <sys/types.h>
 
-struct LaminarInterface;
+class Laminar;
+class Http;
+class 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();
 
     // add a file descriptor to be monitored for output. The callback will be
     // invoked with the read data
-    void addDescriptor(int fd, std::function<void(const char*,size_t)> cb);
+    kj::Promise<void> readDescriptor(int fd, std::function<void(const char*,size_t)> cb);
 
+    void addTask(kj::Promise<void> &&task);
     // add a one-shot timer callback
     kj::Promise<void> addTimeout(int seconds, std::function<void()> cb);
 
-    // add a path to be watched for changes
-    void addWatchPath(const char* dpath);
+    // get a promise which resolves when a child process exits
+    kj::Promise<int> onChildExit(kj::Maybe<pid_t>& pid);
+
+    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> acceptHttpClient(kj::Own<kj::ConnectionReceiver>&& listener);
-    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:
-    struct WebsocketConnection;
-    class HttpImpl;
-
     int efd_quit;
-    capnp::Capability::Client rpcInterface;
-    LaminarInterface& laminarInterface;
-    kj::Own<HttpImpl> httpInterface;
-    kj::AsyncIoContext ioContext;
+    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_

src/version.cpp

@@ -0,0 +1,25 @@
+///
+/// Copyright 2020 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/>
+///
+
+#define str(x) #x
+#define xstr(x) str(x)
+
+const char* laminar_version() {
+    return xstr(LAMINAR_VERSION);
+}

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([=, this](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,156 @@
+///
+/// Copyright 2019-2022 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 "laminar.capnp.h"
+#include "eventsource.h"
+#include "tempdir.h"
+#include "laminar.h"
+#include "log.h"
+#include "server.h"
+#include "conf.h"
+
+#include <capnp/rpc-twoparty.h>
+#include <gtest/gtest.h>
+
+class LaminarFixture : public ::testing::Test {
+public:
+    LaminarFixture() {
+        home = tmp.path.toString(true).cStr();
+        bind_rpc = std::string("unix:/") + home + "/rpc.sock";
+        bind_http = std::string("unix:/") + home + "/http.sock";
+        settings.home = home.c_str();
+        settings.bind_rpc = bind_rpc.c_str();
+        settings.bind_http = bind_http.c_str();
+        settings.archive_url = "/test-archive/";
+    }
+    ~LaminarFixture() noexcept(true) {}
+
+    void SetUp() override {
+        tmp.init();
+        server = new Server(*ioContext);
+        laminar = new Laminar(*server, settings);
+    }
+
+    void TearDown() override {
+        delete server;
+        delete laminar;
+        tmp.clean();
+    }
+
+    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, const char* configContent = nullptr) {
+        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");
+        }
+        if(configContent) {
+            KJ_IF_MAYBE(f, tmp.fs->tryOpenFile(kj::Path{"cfg", "jobs", std::string(name) + ".conf"}, kj::WriteMode::CREATE)) {
+                (*f)->writeAll(configContent);
+            }
+        }
+    }
+
+    struct RunExec {
+        LaminarCi::JobResult result;
+        kj::String log;
+    };
+
+    RunExec runJob(const char* name, kj::Maybe<StringMap> params = nullptr) {
+        auto req = client().runRequest();
+        req.setJobName(name);
+        KJ_IF_MAYBE(p, params) {
+            auto params = req.initParams(p->size());
+            int i = 0;
+            for(auto kv : *p) {
+                params[i].setName(kv.first);
+                params[i].setValue(kv.second);
+                i++;
+            }
+        }
+        auto res = req.send().wait(ioContext->waitScope);
+        std::string path = std::string{"/log/"} + name + "/" + std::to_string(res.getBuildNum());
+        kj::HttpHeaderTable headerTable;
+        kj::String log = kj::newHttpClient(ioContext->lowLevelProvider->getTimer(), headerTable,
+                                           *ioContext->provider->getNetwork().parseAddress(bind_http.c_str()).wait(ioContext->waitScope))
+                ->request(kj::HttpMethod::GET, path, kj::HttpHeaders(headerTable)).response.wait(ioContext->waitScope).body
+                ->readAllText().wait(ioContext->waitScope);
+        return { res.getResult(), kj::mv(log) };
+    }
+
+    void setNumExecutors(int nexec) {
+        KJ_IF_MAYBE(f, tmp.fs->tryOpenFile(kj::Path{"cfg", "contexts", "default.conf"},
+                kj::WriteMode::CREATE | kj::WriteMode::MODIFY | kj::WriteMode::CREATE_PARENT)) {
+            std::string content = "EXECUTORS=" + std::to_string(nexec);
+            (*f)->writeAll(content);
+        }
+    }
+
+    kj::String stripLaminarLogLines(const kj::String& str) {
+        auto out = kj::heapString(str.size());
+        char *o = out.begin();
+        for(const char *p = str.cStr(), *e = p + str.size(); p < e;) {
+            const char *nl = strchrnul(p, '\n');
+            if(!kj::StringPtr{p}.startsWith("[laminar]")) {
+                memcpy(o, p, nl - p + 1);
+                o += nl - p + 1;
+            }
+            p = nl + 1;
+        }
+        *o = '\0';
+        return out;
+    }
+
+    StringMap parseFromString(kj::StringPtr content) {
+        char tmp[16] = "/tmp/lt.XXXXXX";
+        int fd = mkstemp(tmp);
+        LSYSCALL(write(fd, content.begin(), content.size()));
+        close(fd);
+        StringMap map = parseConfFile(tmp);
+        unlink(tmp);
+        return map;
+    }
+
+    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,188 @@
+///
+/// Copyright 2019-2022 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"
+#include "conf.h"
+
+// TODO: consider handling this differently
+kj::AsyncIoContext* LaminarFixture::ioContext;
+
+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"));
+}
+
+TEST_F(LaminarFixture, JobNotifyHomePage) {
+    defineJob("foo", "true");
+    auto es = eventSource("/");
+
+    runJob("foo");
+
+    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");
+
+    runJob("job1");
+    runJob("job2");
+
+    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_F(LaminarFixture, FailedStatus) {
+    defineJob("job1", "false");
+    auto run = runJob("job1");
+    ASSERT_EQ(LaminarCi::JobResult::FAILED, run.result);
+}
+
+TEST_F(LaminarFixture, WorkingDirectory) {
+    defineJob("job1", "pwd");
+    auto run = runJob("job1");
+    ASSERT_EQ(LaminarCi::JobResult::SUCCESS, run.result);
+    std::string cwd{tmp.path.append(kj::Path{"run","job1","1"}).toString(true).cStr()};
+    EXPECT_EQ(cwd + "\n", stripLaminarLogLines(run.log).cStr());
+}
+
+
+TEST_F(LaminarFixture, Environment) {
+    defineJob("foo", "env");
+    auto run = runJob("foo");
+
+    std::string ws{tmp.path.append(kj::Path{"run","foo","workspace"}).toString(true).cStr()};
+    std::string archive{tmp.path.append(kj::Path{"archive","foo","1"}).toString(true).cStr()};
+
+    StringMap map = parseFromString(run.log);
+    EXPECT_EQ("1", map["RUN"]);
+    EXPECT_EQ("foo", map["JOB"]);
+    EXPECT_EQ("success", map["RESULT"]);
+    EXPECT_EQ("unknown", map["LAST_RESULT"]);
+    EXPECT_EQ(ws, map["WORKSPACE"]);
+    EXPECT_EQ(archive, map["ARCHIVE"]);
+}
+
+TEST_F(LaminarFixture, ParamsToEnv) {
+    defineJob("foo", "env");
+    StringMap params;
+    params["foo"] = "bar";
+    auto run = runJob("foo", params);
+    StringMap map = parseFromString(run.log);
+    EXPECT_EQ("bar", map["foo"]);
+}
+
+TEST_F(LaminarFixture, Abort) {
+    defineJob("job1", "sleep inf");
+    auto req = client().runRequest();
+    req.setJobName("job1");
+    auto res = req.send();
+    // There isn't a nice way of knowing when the leader process is ready to
+    // handle SIGTERM. Just wait until it prints something to the log
+    ioContext->waitScope.poll();
+    kj::HttpHeaderTable headerTable;
+    char _;
+    kj::newHttpClient(ioContext->lowLevelProvider->getTimer(), headerTable,
+                      *ioContext->provider->getNetwork().parseAddress(bind_http.c_str()).wait(ioContext->waitScope))
+            ->request(kj::HttpMethod::GET, "/log/job1/1", kj::HttpHeaders(headerTable)).response.wait(ioContext->waitScope).body
+            ->tryRead(&_, 1, 1).wait(ioContext->waitScope);
+    // now it should be ready to abort
+    ASSERT_TRUE(laminar->abort("job1", 1));
+    EXPECT_EQ(LaminarCi::JobResult::ABORTED, res.wait(ioContext->waitScope).getResult());
+}
+
+TEST_F(LaminarFixture, JobDescription) {
+    defineJob("foo", "true", "DESCRIPTION=bar");
+    auto es = eventSource("/jobs/foo");
+    ioContext->waitScope.poll();
+    ASSERT_EQ(1, es->messages().size());
+    auto json = es->messages().front().GetObject();
+    ASSERT_TRUE(json.HasMember("data"));
+    auto data = json["data"].GetObject();
+    ASSERT_TRUE(data.HasMember("description"));
+    EXPECT_STREQ("bar", data["description"].GetString());
+}
+
+TEST_F(LaminarFixture, QueueFront) {
+    setNumExecutors(0);
+    defineJob("foo", "true");
+    defineJob("bar", "true");
+    auto es = eventSource("/");
+    auto req1 = client().queueRequest();
+    req1.setJobName("foo");
+    auto res1 = req1.send();
+    auto req2 = client().queueRequest();
+    req2.setFrontOfQueue(true);
+    req2.setJobName("bar");
+    auto res2 = req2.send();
+    ioContext->waitScope.poll();
+    setNumExecutors(2);
+    ioContext->waitScope.poll();
+    ASSERT_GE(es->messages().size(), 5);
+    auto started1 = es->messages().at(3).GetObject();
+    EXPECT_STREQ("job_started", started1["type"].GetString());
+    EXPECT_STREQ("bar", started1["data"]["name"].GetString());
+    auto started2 = es->messages().at(4).GetObject();
+    EXPECT_STREQ("job_started", started2["type"].GetString());
+    EXPECT_STREQ("foo", started2["data"]["name"].GetString());
+}

test/main.cpp

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2018 Oliver Giles
+/// Copyright 2019 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,28 +16,25 @@
 /// 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>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/document.h>
-#include "laminar.h"
+#include <kj/debug.h>
 
-class TestLaminarClient : public LaminarClient {
-public:
-    virtual void sendMessage(std::string p) { payload = p; }
-    std::string payload;
-};
+#include "laminar-fixture.h"
+#include "leader.h"
 
-class LaminarTest : public ::testing::Test {
-protected:
-    Laminar laminar;
-};
+// gtest main supplied in order to call captureChildExit and handle process leader
+int main(int argc, char **argv) {
+    if(argv[0][0] == '{')
+        return leader_main();
 
-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));
+    // TODO: consider handling this differently
+    auto ioContext = kj::setupAsyncIo();
+    LaminarFixture::ioContext = &ioContext;
+
+    kj::UnixEventPort::captureChildExit();
+    //kj::_::Debug::setLogLevel(kj::_::Debug::Severity::INFO);
+
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
 }

test/tempdir.h

@@ -0,0 +1,60 @@
+///
+/// Copyright 2018-2022 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_TEMPDIR_H_
+#define LAMINAR_TEMPDIR_H_
+
+#include "log.h"
+
+#include <kj/filesystem.h>
+#include <stdlib.h>
+
+class TempDir {
+public:
+    TempDir() :
+        path(mkdtemp()),
+        fs(kj::newDiskFilesystem()->getRoot().openSubdir(path, kj::WriteMode::MODIFY))
+    {
+    }
+    ~TempDir() noexcept {
+        kj::newDiskFilesystem()->getRoot().remove(path);
+    }
+    void init() {
+        // set up empty directory structure
+        fs->openSubdir(kj::Path{"cfg"}, kj::WriteMode::CREATE);
+        fs->openSubdir(kj::Path{"cfg", "jobs"}, kj::WriteMode::CREATE);
+        fs->openSubdir(kj::Path{"cfg", "contexts"}, kj::WriteMode::CREATE);
+    }
+    void clean() {
+        // rm -rf in config folder
+        for(kj::StringPtr name : fs->listNames()) {
+            fs->remove(kj::Path{name});
+        }
+    }
+
+    kj::Path path;
+    kj::Own<const kj::Directory> fs;
+private:
+    static kj::Path mkdtemp() {
+        char dir[] = "/tmp/laminar-test-XXXXXX";
+        LASSERT(::mkdtemp(dir) != nullptr, "mkdtemp failed");
+        return kj::Path::parse(&dir[1]);
+    }
+};
+
+#endif // LAMINAR_TEMPDIR_H_

test/test-run.cpp

@@ -1,122 +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 "run.h"
-#include "log.h"
-#include "node.h"
-#include "conf.h"
-
-class RunTest : public ::testing::Test {
-protected:
-    virtual ~RunTest() noexcept override {}
-
-    void SetUp() override {
-        run.node = node;
-    }
-    void wait() {
-        int state = -1;
-        waitpid(run.pid, &state, 0);
-        run.reaped(state);
-    }
-    void runAll() {
-        while(!run.step())
-            wait();
-    }
-    std::string readAllOutput() {
-        std::string res;
-        char tmp[64];
-        for(ssize_t n = read(run.fd, tmp, 64); n > 0; n = read(run.fd, tmp, 64))
-            res += std::string(tmp, n);
-        // strip the first "[laminar] executing.. line
-        return strchr(res.c_str(), '\n') + 1;
-    }
-    StringMap parseFromString(std::string content) {
-        char tmp[16] = "/tmp/lt.XXXXXX";
-        int fd = mkstemp(tmp);
-        write(fd, content.data(), content.size());
-        close(fd);
-        StringMap map = parseConfFile(tmp);
-        unlink(tmp);
-        return map;
-    }
-
-    class Run run;
-    std::shared_ptr<Node> node = std::shared_ptr<Node>(new Node);
-};
-
-TEST_F(RunTest, WorkingDirectory) {
-    run.addScript("/bin/pwd", "/home");
-    runAll();
-    EXPECT_EQ("/home\n", readAllOutput());
-}
-
-TEST_F(RunTest, SuccessStatus) {
-    run.addScript("/bin/true");
-    runAll();
-    EXPECT_EQ(RunState::SUCCESS, run.result);
-}
-
-TEST_F(RunTest, FailedStatus) {
-    run.addScript("/bin/false");
-    runAll();
-    EXPECT_EQ(RunState::FAILED, run.result);
-}
-
-TEST_F(RunTest, Environment) {
-    run.name = "foo";
-    run.build = 1234;
-    run.laminarHome = "/tmp";
-    run.addScript("/usr/bin/env");
-    runAll();
-    StringMap map = parseFromString(readAllOutput());
-    EXPECT_EQ("1234", map["RUN"]);
-    EXPECT_EQ("foo", map["JOB"]);
-    EXPECT_EQ("success", map["RESULT"]);
-    EXPECT_EQ("unknown", map["LAST_RESULT"]);
-    EXPECT_EQ("/tmp/run/foo/workspace", map["WORKSPACE"]);
-    EXPECT_EQ("/tmp/archive/foo/1234", map["ARCHIVE"]);
-}
-
-TEST_F(RunTest, ParamsToEnv) {
-    run.params["foo"] = "bar";
-    run.addScript("/usr/bin/env");
-    runAll();
-    StringMap map = parseFromString(readAllOutput());
-    EXPECT_EQ("bar", map["foo"]);
-}
-
-TEST_F(RunTest, Abort) {
-    run.addScript("/usr/bin/yes");
-    run.step();
-    usleep(200); // TODO fix
-    run.abort();
-    wait();
-    EXPECT_EQ(RunState::ABORTED, run.result);
-}
-
-TEST_F(RunTest, AbortAfterFailed) {
-    run.addScript("/bin/false");
-    runAll();
-    run.addScript("/usr/bin/yes");
-    run.step();
-    usleep(200); // TODO fix
-    run.abort();
-    wait();
-    EXPECT_EQ(RunState::FAILED, run.result);
-}

test/test-server.cpp

@@ -1,145 +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 <boost/filesystem.hpp>
-#include <thread>
-#include <sys/socket.h>
-#include "server.h"
-#include "log.h"
-#include "interface.h"
-#include "laminar.capnp.h"
-
-namespace fs = boost::filesystem;
-
-class TempDir : public fs::path {
-public:
-    TempDir(const char* tmpl) {
-        char* t = strdup(tmpl);
-        mkdtemp(t);
-        *static_cast<fs::path*>(this) = t;
-        free(t);
-    }
-    ~TempDir() {
-        fs::remove_all(*this);
-    }
-};
-
-class MockLaminar : public LaminarInterface {
-public:
-    LaminarClient* client = nullptr;
-    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_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(sendStatus, void(LaminarClient* client));
-    MOCK_METHOD4(setParam, bool(std::string job, uint buildNum, std::string param, std::string value));
-    MOCK_METHOD2(getArtefact, bool(std::string path, std::string& result));
-    MOCK_METHOD0(getCustomCss, std::string());
-    MOCK_METHOD0(abortAll, void());
-    MOCK_METHOD0(reapChildren, void());
-    MOCK_METHOD0(notifyConfigChanged, void());
-};
-
-class ServerTest : public ::testing::Test {
-protected:
-    ServerTest() :
-        tempDir("/tmp/laminar-test-XXXXXX")
-    {
-    }
-    void SetUp() override {
-        EXPECT_CALL(mockLaminar, registerWaiter(testing::_));
-        EXPECT_CALL(mockLaminar, deregisterWaiter(testing::_));
-        server = new Server(mockLaminar, "unix:"+fs::path(tempDir/"rpc.sock").string(), "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-conf.cpp

@@ -1,5 +1,5 @@
 ///
-/// Copyright 2018 Oliver Giles
+/// Copyright 2018-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,8 +16,9 @@
 /// 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 "conf.h"
+#include "log.h"
+#include <gtest/gtest.h>
 
 class ConfTest : public ::testing::Test {
 protected:
@@ -30,7 +31,7 @@ protected:
     }
     void parseConf(std::string conf) {
         lseek(fd, SEEK_SET, 0);
-        write(fd, conf.data(), conf.size());
+        LSYSCALL(write(fd, conf.data(), conf.size()));
         cfg = parseConfFile(tmpFile);
     }
     StringMap cfg;

test/unit-database.cpp

@@ -73,3 +73,11 @@ TEST_F(DatabaseTest, MultiRow) {
     });
     EXPECT_EQ(10, i);
 }
+
+TEST_F(DatabaseTest, StdevFunc) {
+    double res = 0;
+    db.stmt("with a (x) as (values (7),(3),(45),(23)) select stdev(x) from a").fetch<double>([&](double r){
+        res = r;
+    });
+    EXPECT_FLOAT_EQ(19.0700463205171, res);
+}