@openchambery/relay-server 1.19.0-beta.37 → 1.19.0-beta.39

package/DOCUMENTATION.md

@@ -1,6 +1,6 @@
 # Relay Server Package Documentation
 
-`packages/relay-server/` owns the self-hosted Layer 1 Relay server, the `openchamber-relay` CLI, and the package release and deployment contract.
+`packages/relay-server/` owns the self-hosted Layer 1 Relay server, the isolated Push Relay process, the `openchamber-relay` and `openchamber-push-relay` CLIs, and the package release and deployment contract.
 
 ## Purpose and security boundary
 
@@ -12,6 +12,8 @@ Relay v1 admission accepts anonymous Client route requests. Per-IP, global, pend
 
 The Relay keeps process-local routing state only. Hosts reconnect after Relay restarts, and a control disconnect retains its Host route for the 30-second grace period.
 
+Layer 1 and Push are separate processes in this package. Layer 1 never holds APNs credentials or the device-token database. Push never sees Relay tunnel frames, pairing secrets, or client bearer credentials. Give Apple secrets only to the Push process. SQLite token storage is single-instance: one Push process per database file.
+
 ## Quick deployment
 
 Install the package, then start the Relay:
@@ -27,6 +29,18 @@ The default listener is `127.0.0.1:8787` and the WebSocket path is `/ws`. Deploy
 openchamber-relay --public-url wss://relay.example.com/ws
 ```
 
+Push is a second executable from the same package. Default listen address is `127.0.0.1:8788`:
+
+```sh
+export OPENCHAMBER_PUSH_RELAY_APNS_KEY_ID='<apns-key-id>'
+export OPENCHAMBER_PUSH_RELAY_APNS_TEAM_ID='<apns-team-id>'
+export OPENCHAMBER_PUSH_RELAY_APNS_BUNDLE_ID=com.yee94.openchamber
+export OPENCHAMBER_PUSH_RELAY_APNS_P8_PATH=/etc/openchamber/AuthKey.p8
+openchamber-push-relay --host 127.0.0.1 --port 8788
+```
+
+The Host maps the effective Relay `wss://`/`ws://` URL to the same host as `https://`/`http://` `/v1/push/send`. Set `OPENCHAMBER_PUSH_RELAY_URL` on the Host to override. After a Relay switch, the Host re-registers persisted tokens and binds them before the first send.
+
 ### Caddy
 
 ```caddyfile
@@ -39,6 +53,24 @@ relay.example.com {
 
 Run the Relay with `--public-url wss://relay.example.com/ws`. Caddy proxies WebSocket upgrades for `/ws` and serves `/healthz` and `/readyz` through the same upstream. `header_up X-Forwarded-For {remote_host}` replaces the inbound value with the single client source IP.
 
+Shared hostname with Push:
+
+```caddyfile
+relay.example.com {
+    handle /v1/push/* {
+        reverse_proxy 127.0.0.1:8788 {
+            header_up X-Forwarded-For {remote_host}
+        }
+    }
+
+    handle {
+        reverse_proxy 127.0.0.1:8787 {
+            header_up X-Forwarded-For {remote_host}
+        }
+    }
+}
+```
+
 ### Nginx
 
 ```nginx
@@ -60,11 +92,11 @@ server {
 }
 ```
 
-Run the Relay with `--public-url wss://relay.example.com/ws`. The `/ws` path in the public URL and Relay configuration must match. `proxy_set_header X-Forwarded-For $remote_addr;` replaces the inbound value with the single client source IP.
+Run the Relay with `--public-url wss://relay.example.com/ws`. The `/ws` path in the public URL and Relay configuration must match. `proxy_set_header X-Forwarded-For $remote_addr;` replaces the inbound value with the single client source IP. For Push on the same hostname, proxy `/v1/push/` to `127.0.0.1:8788` and keep `/` including `/ws` on `127.0.0.1:8787`, replacing `X-Forwarded-For` on both locations.
 
 ## Docker
 
-Each non-dry-run OpenChamber release publishes a multi-platform Relay image for `linux/amd64` and `linux/arm64` to Docker Hub. CI builds each architecture natively in parallel (`ubuntu-latest` and `ubuntu-24.04-arm`), then merges digests into a single multi-arch manifest tagged as:
+Each non-dry-run OpenChamber `v*` release and each `relay/v*` Relay-only release publishes a multi-platform Relay image for `linux/amd64` and `linux/arm64` to Docker Hub. The image default entrypoint is Layer 1. The same image includes Node 24 plus `openchamber-push-relay` source/bin/package files. Layer 1 is compiled with Bun 1.3.14; Push is not Bun-compiled and runs under Node 24 (`node:sqlite`). The container user is non-root, ports `8787` and `8788` are exposed, and the image health check uses Node against Layer 1 `/healthz`. CI builds each architecture natively in parallel (`ubuntu-latest` and `ubuntu-24.04-arm`), then merges digests into a single multi-arch manifest tagged as:
 
 ```text
 <DOCKERHUB_USERNAME>/openchamber-relay:<version>
@@ -109,6 +141,27 @@ curl -fsS https://relay.example.com/healthz
 curl -fsS https://relay.example.com/readyz
 ```
 
+Layer 1 plus Push from the same immutable image uses [`docker-compose.relay-push.remote.yml`](../../docker-compose.relay-push.remote.yml). Layer 1 receives no APNs secrets. Push receives only APNs Key ID / Team ID / Bundle ID and the `.p8` Docker secret path, plus a persistent SQLite volume, with a read-only root filesystem. Caddy serves one hostname: `/v1/push/*` to `push:8788`, everything else including `/ws` to `relay:8787`, each replacing `X-Forwarded-For` once. Both services have health checks; Caddy waits until both are healthy.
+
+```sh
+OPENCHAMBER_RELAY_IMAGE='<dockerhub-username>/openchamber-relay:<version>@sha256:<manifest-digest>' \
+RELAY_DOMAIN=relay.example.com \
+ACME_EMAIL=admin@example.com \
+OPENCHAMBER_PUSH_RELAY_APNS_KEY_ID='<apns-key-id>' \
+OPENCHAMBER_PUSH_RELAY_APNS_TEAM_ID='<apns-team-id>' \
+OPENCHAMBER_PUSH_RELAY_APNS_BUNDLE_ID=com.yee94.openchamber \
+OPENCHAMBER_PUSH_RELAY_APNS_P8_FILE=/etc/openchamber/AuthKey.p8 \
+docker compose -f docker-compose.relay-push.remote.yml up -d
+```
+
+```sh
+docker compose -f docker-compose.relay-push.remote.yml ps
+curl -fsS https://relay.example.com/healthz
+curl -fsS https://relay.example.com/readyz
+```
+
+Public `/healthz` and `/readyz` are Layer 1. Push health remains on the internal `8788` listener and the Compose health check. Existing Layer-1-only Compose files keep their previous behavior.
+
 From the repository root, build and start the supplied service. The compatibility assets are [`Dockerfile.relay`](../../Dockerfile.relay) and [`docker-compose.relay.yml`](../../docker-compose.relay.yml):
 
 ```sh
@@ -117,7 +170,7 @@ OPENCHAMBER_RELAY_PUBLISHED_PORT=8787 \
 docker compose -f docker-compose.relay.yml up -d --build
 ```
 
-Compose publishes `127.0.0.1:${OPENCHAMBER_RELAY_PUBLISHED_PORT:-8787}` by default; use `OPENCHAMBER_RELAY_PUBLISHED_PORT` to select the host port. The Compose service uses an ephemeral filesystem and keeps Host identity keys on each OpenChamber Host. Its image health check calls `GET /healthz`. Terminate public TLS at an external reverse proxy and publish `wss://relay.example.com/ws`. A public Relay port binding requires firewall rules and TLS; loopback publishing with a TLS reverse proxy is the deployment path.
+Compose publishes `127.0.0.1:${OPENCHAMBER_RELAY_PUBLISHED_PORT:-8787}` by default; use `OPENCHAMBER_RELAY_PUBLISHED_PORT` to select the host port. The Compose service uses an ephemeral filesystem and keeps Host identity keys on each OpenChamber Host. Its image health check uses Node to call Layer 1 `GET /healthz`. Terminate public TLS at an external reverse proxy and publish `wss://relay.example.com/ws`. A public Relay port binding requires firewall rules and TLS; loopback publishing with a TLS reverse proxy is the deployment path.
 
 ## Connect Hosts
 
@@ -134,7 +187,7 @@ Existing clients switch to a new Relay after a new pairing flow; generate a fres
 
 ## Configuration
 
-Configuration precedence is command flags, then `OPENCHAMBER_RELAY_SERVER_*` variables, then defaults. `--host`, `--port`, `--path`, `--public-url`, `--trust-proxy`, `--no-trust-proxy`, `--json`, and `--quiet` are available.
+Configuration precedence is command flags, then `OPENCHAMBER_RELAY_SERVER_*` variables, then defaults. `--host`, `--port`, `--path`, `--public-url`, `--trust-proxy`, `--no-trust-proxy`, `--json`, and `--quiet` are available. Push flags are `--host`, `--port`, `--trust-proxy`, `--no-trust-proxy`, `--json`, and `--quiet`, with `OPENCHAMBER_PUSH_RELAY_*` variables.
 
 `OPENCHAMBER_RELAY_SERVER_PUBLIC_URL` affects startup output. `OPENCHAMBER_RELAY_SERVER_PATH` selects the actual WebSocket upgrade endpoint. Relay listens on loopback by default. Enable `OPENCHAMBER_RELAY_SERVER_TRUST_PROXY=true` when a trusted reverse proxy fully isolates Relay ingress and replaces any client-supplied `X-Forwarded-For` value with one canonical client IP. Relay accepts one forwarded IP in this mode.
 
@@ -179,12 +232,44 @@ For an IPv6 literal in a public URL, enclose the host in brackets: `wss://[2001:
 | `OPENCHAMBER_RELAY_SERVER_MAX_ADMISSION_ENTRIES` | `10000` | tracked role/IP admission records |
 | `OPENCHAMBER_RELAY_SERVER_ID_ATTEMPTS` | `4` | random connection-ID attempts |
 
+Host Push URL (OpenChamber Host, not the Push process):
+
+| Variable | Default | Unit / purpose |
+| --- | --- | --- |
+| `OPENCHAMBER_PUSH_RELAY_URL` | derived from the effective Relay URL | explicit `…/v1/push/send` override |
+| `OPENCHAMBER_PUSH_RELAY_DISABLED` | unset | `true` disables Push Relay on the Host |
+
+Push process:
+
+| Variable | Default | Unit / purpose |
+| --- | --- | --- |
+| `OPENCHAMBER_PUSH_RELAY_HOST` | `127.0.0.1` | Listener address |
+| `OPENCHAMBER_PUSH_RELAY_PORT` | `8788` | TCP port |
+| `OPENCHAMBER_PUSH_RELAY_TRUST_PROXY` | `false` | Read one canonical client IP from proxy-replaced `X-Forwarded-For` |
+| `OPENCHAMBER_PUSH_RELAY_DATABASE_PATH` | `./data/push-relay.sqlite` | SQLite file |
+| `OPENCHAMBER_PUSH_RELAY_TIMESTAMP_SKEW_MS` | `300000` | ms signed `ts` window |
+| `OPENCHAMBER_PUSH_RELAY_REPLAY_MS` | `600000` | ms replay-record lifetime; at least twice timestamp skew |
+| `OPENCHAMBER_PUSH_RELAY_MAX_REPLAY_ENTRIES` | `10000` | replay records |
+| `OPENCHAMBER_PUSH_RELAY_REGISTER_LIMIT_PER_MINUTE` | `60` | register requests per client IP per minute |
+| `OPENCHAMBER_PUSH_RELAY_SEND_LIMIT_PER_MINUTE` | `60` | send requests per client IP per minute |
+| `OPENCHAMBER_PUSH_RELAY_SERVER_SEND_LIMIT_PER_MINUTE` | `120` | send requests per `serverId` per minute |
+| `OPENCHAMBER_PUSH_RELAY_MAX_TOKENS` | `100000` | persisted device-token bindings |
+| `OPENCHAMBER_PUSH_RELAY_MAX_IN_FLIGHT` | `64` | concurrent APNs deliveries |
+| `OPENCHAMBER_PUSH_RELAY_APNS_KEY_ID` | required | Apple APNs key ID |
+| `OPENCHAMBER_PUSH_RELAY_APNS_TEAM_ID` | required | Apple Team ID |
+| `OPENCHAMBER_PUSH_RELAY_APNS_BUNDLE_ID` | `com.yee94.openchamber` | App bundle ID |
+| `OPENCHAMBER_PUSH_RELAY_APNS_P8` | required unless path set | APNs `.p8` PEM |
+| `OPENCHAMBER_PUSH_RELAY_APNS_P8_PATH` | unset | Path to the `.p8` file |
+
+TestFlight and App Store Hosts use `OPENCHAMBER_APNS_ENVIRONMENT=production`. Each send request carries `env`; the Push process does not pick sandbox vs production itself.
+
 ## Operations
 
 - `GET` and `HEAD` requests to `/healthz` return process health. `/readyz` returns ready status after the listener reaches running state.
 - `SIGTERM` and `SIGINT` begin graceful Relay shutdown. Docker grants a 30-second stop period.
 - Hosts automatically reconnect after a Relay process restart. Relay state remains ephemeral.
-- Keep logs and metrics snapshots free of URL query strings, `sig`, `pk`, `grant`, and encrypted payloads.
+- Keep logs and metrics snapshots free of URL query strings, `sig`, `pk`, `grant`, encrypted payloads, APNs `.p8` material, and device tokens.
+- Run one Push process per SQLite database file.
 
 ### systemd
 

package/README.md

@@ -2,6 +2,8 @@
 
 `openchamber-relay` is the self-hosted Layer 1 relay for OpenChamber remote access. It gives OpenChamber Hosts an outbound Relay connection and carries encrypted client traffic through that connection.
 
+The same `@openchambery/relay-server` package also ships `openchamber-push-relay`, an isolated APNs push process. Layer 1 never receives Apple credentials. Push never terminates E2EE tunnels.
+
 The Relay routes opaque Layer 2/3 frames verbatim. E2EE terminates at the OpenChamber Host and Client, so the Relay has routing metadata and transport state while the endpoints hold application plaintext, pairing secrets, and client bearer credentials. Host Relay connections authenticate with the Host's long-lived P-256 signing key. Relay reachability grants transport access; endpoint validation continues to enforce pairing and client credentials.
 
 ## Architecture and transport
@@ -19,10 +21,19 @@ Relay state lives in process memory. Hosts reconnect after a Relay restart. A di
 
 Relay v1 accepts anonymous Client route requests. Admission, connection, frame, queue, and socket limits bound this public entry point.
 
+## Dual-process security boundary
+
+Layer 1 (`openchamber-relay`) and Push (`openchamber-push-relay`) are separate processes in one package:
+
+- Layer 1 authenticates Hosts, brokers WebSocket routes, and forwards opaque frames. It has no APNs key, no device-token database, and no `/v1/push/*` handlers.
+- Push verifies Host signatures, binds `token → serverId` in a local SQLite database, and holds the project APNs `.p8` key. It has no access to Relay tunnels, pairing secrets, or client bearer credentials.
+- Deploy them as two containers from the same immutable image. Give APNs Key ID / Team ID / Bundle ID and the `.p8` secret only to the Push container. Keep Layer 1 free of those secrets.
+- SQLite is a single-writer store. Run one Push instance per database file. Do not share that volume across replicas.
+
 ## Requirements
 
-- `@openchambery/relay-server` installation: Node.js 22 or later and a supported package manager such as npm, pnpm, yarn, or Bun.
-- Single-file bundle build: Bun. This repository uses Bun 1.3.14.
+- `@openchambery/relay-server` installation: Node.js 22.13 or later and a supported package manager such as npm, pnpm, yarn, or Bun. Push uses Node's built-in `node:sqlite`.
+- Single-file Layer 1 bundle build: Bun. This repository uses Bun 1.3.14. Do not Bun-compile the Push entry; Docker runs it with Node 24.
 - Public deployment: a DNS name, TLS certificate, reverse proxy, and firewall policy appropriate for the deployment.
 
 ## Install and quick start
@@ -36,6 +47,20 @@ openchamber-relay --public-url wss://relay.example.com/ws
 
 The default listener is `127.0.0.1:8787` and the default WebSocket upgrade path is `/ws`. Keep this loopback listener behind a TLS reverse proxy and set `--public-url` to the public `ws://` or `wss://` URL with the same path.
 
+Start the isolated Push process from the same package. The default listener is `127.0.0.1:8788`. APNs Key ID, Team ID, and a `.p8` value or file path are required:
+
+```sh
+export OPENCHAMBER_PUSH_RELAY_APNS_KEY_ID='<apns-key-id>'
+export OPENCHAMBER_PUSH_RELAY_APNS_TEAM_ID='<apns-team-id>'
+export OPENCHAMBER_PUSH_RELAY_APNS_BUNDLE_ID=com.yee94.openchamber
+export OPENCHAMBER_PUSH_RELAY_APNS_P8_PATH=/etc/openchamber/AuthKey.p8
+openchamber-push-relay --host 127.0.0.1 --port 8788
+```
+
+Keep Push on loopback behind the same TLS reverse proxy. Route only `/v1/push/*` to port 8788.
+
+OpenChamber Hosts do not need a separate Push URL when they already have a Relay URL. The effective `wss://` or `ws://` Relay URL maps to the same host as `https://` or `http://` `/v1/push/send` (register is `/v1/push/register-token`). Set `OPENCHAMBER_PUSH_RELAY_URL` on the Host to override that mapping. After a Relay switch, the Host re-registers persisted device tokens and binds them again before the first send.
+
 ### Build a standalone executable
 
 Run these commands from the repository root. `bun build --compile` creates a single executable for the current platform and architecture.
@@ -91,6 +116,18 @@ Available CLI options:
 --version, -v
 ```
 
+Push CLI options:
+
+```text
+--host HOST
+--port PORT
+--trust-proxy | --no-trust-proxy
+--json
+--quiet, -q
+--help, -h
+--version, -v
+```
+
 ## Connect OpenChamber Hosts
 
 Set the public Relay URL in every OpenChamber Host environment, then start the Host and create a Relay pairing link or enable Relay pairing in the application.
@@ -120,6 +157,24 @@ relay.example.com {
 
 Run the Relay with `--public-url wss://relay.example.com/ws`. Caddy forwards WebSocket upgrades and serves `/healthz` and `/readyz` from the same upstream. The `X-Forwarded-For` rule writes one canonical Client source IP.
 
+When Push shares the hostname, send `/v1/push/*` to the Push listener and replace `X-Forwarded-For` once on each upstream:
+
+```caddyfile
+relay.example.com {
+    handle /v1/push/* {
+        reverse_proxy 127.0.0.1:8788 {
+            header_up X-Forwarded-For {remote_host}
+        }
+    }
+
+    handle {
+        reverse_proxy 127.0.0.1:8787 {
+            header_up X-Forwarded-For {remote_host}
+        }
+    }
+}
+```
+
 ### Nginx
 
 ```nginx
@@ -143,6 +198,8 @@ server {
 
 Run the Relay with `--public-url wss://relay.example.com/ws`. Nginx writes one canonical Client source IP with `$remote_addr` and forwards WebSocket upgrades over HTTP/1.1.
 
+To share the hostname with Push, proxy `/v1/push/` to `127.0.0.1:8788` and keep `/` (including `/ws`) on `127.0.0.1:8787`. Replace `X-Forwarded-For` with `$remote_addr` on both locations.
+
 ## Trusted proxies and capacity
 
 Enable `OPENCHAMBER_RELAY_SERVER_TRUST_PROXY=true` or `--trust-proxy` when a trusted reverse proxy fully isolates Relay ingress and replaces each inbound `X-Forwarded-For` value with one canonical Client IP.
@@ -195,6 +252,43 @@ Trusted-proxy mode accepts exactly one valid IP address in `X-Forwarded-For`. Cl
 | `OPENCHAMBER_RELAY_SERVER_MAX_ADMISSION_ENTRIES` | `10000` | tracked role/IP admission records |
 | `OPENCHAMBER_RELAY_SERVER_ID_ATTEMPTS` | `4` | random connection-ID attempts |
 
+### Host Push URL override
+
+These variables belong on the OpenChamber Host, not on the Push process:
+
+| Variable | Default | Unit / purpose |
+| --- | --- | --- |
+| `OPENCHAMBER_PUSH_RELAY_URL` | derived from the effective Relay `ws`/`wss` URL | Host override for `https://` or `http://` `…/v1/push/send` |
+| `OPENCHAMBER_PUSH_RELAY_DISABLED` | unset | Host-only; `true` skips Push Relay and uses direct APNs |
+
+The derived send URL always uses `/v1/push/send` on the same host and port as the Relay URL. `wss` maps to `https`; `ws` maps to `http`. Register is the same origin with `/v1/push/register-token`.
+
+### Push process environment
+
+Command flags take precedence over `OPENCHAMBER_PUSH_RELAY_*` variables, which take precedence over defaults. APNs Key ID, Team ID, and `.p8` material are required.
+
+| Variable | Default | Unit / purpose |
+| --- | --- | --- |
+| `OPENCHAMBER_PUSH_RELAY_HOST` | `127.0.0.1` | Listener address |
+| `OPENCHAMBER_PUSH_RELAY_PORT` | `8788` | TCP port |
+| `OPENCHAMBER_PUSH_RELAY_TRUST_PROXY` | `false` | Read one canonical Client IP from proxy-replaced `X-Forwarded-For` |
+| `OPENCHAMBER_PUSH_RELAY_DATABASE_PATH` | `./data/push-relay.sqlite` | SQLite file; directory must be writable |
+| `OPENCHAMBER_PUSH_RELAY_TIMESTAMP_SKEW_MS` | `300000` | ms signed `ts` window |
+| `OPENCHAMBER_PUSH_RELAY_REPLAY_MS` | `600000` | ms replay-record lifetime; at least twice timestamp skew |
+| `OPENCHAMBER_PUSH_RELAY_MAX_REPLAY_ENTRIES` | `10000` | replay records |
+| `OPENCHAMBER_PUSH_RELAY_REGISTER_LIMIT_PER_MINUTE` | `60` | register requests per Client IP per minute |
+| `OPENCHAMBER_PUSH_RELAY_SEND_LIMIT_PER_MINUTE` | `60` | send requests per Client IP per minute |
+| `OPENCHAMBER_PUSH_RELAY_SERVER_SEND_LIMIT_PER_MINUTE` | `120` | send requests per `serverId` per minute |
+| `OPENCHAMBER_PUSH_RELAY_MAX_TOKENS` | `100000` | persisted device-token bindings |
+| `OPENCHAMBER_PUSH_RELAY_MAX_IN_FLIGHT` | `64` | concurrent APNs deliveries |
+| `OPENCHAMBER_PUSH_RELAY_APNS_KEY_ID` | required | Apple APNs key ID |
+| `OPENCHAMBER_PUSH_RELAY_APNS_TEAM_ID` | required | Apple Team ID |
+| `OPENCHAMBER_PUSH_RELAY_APNS_BUNDLE_ID` | `com.yee94.openchamber` | App bundle ID |
+| `OPENCHAMBER_PUSH_RELAY_APNS_P8` | required unless path set | APNs `.p8` PEM; literal `\n` accepted |
+| `OPENCHAMBER_PUSH_RELAY_APNS_P8_PATH` | unset | Path to the `.p8` file; used when `APNS_P8` is empty |
+
+TestFlight and App Store Hosts send `env: production` (`OPENCHAMBER_APNS_ENVIRONMENT=production` on the Host). Xcode development builds use `sandbox`. The Push process does not choose the APNs environment; each send request carries it.
+
 ## systemd
 
 Create `/etc/openchamber-relay.env`:
@@ -236,11 +330,12 @@ sudo systemctl status openchamber-relay
 - `SIGTERM` and `SIGINT` start graceful Relay shutdown. Hosts reconnect after a process restart.
 - Size Host, Client, pending, socket, frame, and queue limits for expected concurrency and message volume.
 - Keep the default loopback listener, terminate public TLS at a reverse proxy, restrict ingress with firewall rules, and publish the matching `wss://` URL.
-- Keep logs and metrics snapshots free of URL query strings, `sig`, `pk`, `grant`, encrypted payloads, pairing material, and bearer credentials.
+- Keep logs and metrics snapshots free of URL query strings, `sig`, `pk`, `grant`, encrypted payloads, pairing material, bearer credentials, APNs `.p8` contents, Key ID / Team ID values, and device tokens.
+- Run a single Push process per SQLite file. WAL mode does not make multi-instance sharing safe.
 
 ## Docker delivery assets
 
-Each non-dry-run OpenChamber release publishes a Docker Hub image for `linux/amd64` and `linux/arm64` as `<DOCKERHUB_USERNAME>/openchamber-relay:<version>` and `<DOCKERHUB_USERNAME>/openchamber-relay:latest`. The release pipeline requires the `DOCKERHUB_USERNAME` GitHub Actions repository variable and a `DOCKERHUB_TOKEN` repository secret with Docker Hub Read and Write permissions. Image publication must succeed before the GitHub Release is finalized.
+Each non-dry-run OpenChamber `v*` release and each `relay/v*` Relay-only release publishes a Docker Hub image for `linux/amd64` and `linux/arm64` as `<DOCKERHUB_USERNAME>/openchamber-relay:<version>` and `<DOCKERHUB_USERNAME>/openchamber-relay:latest`. The image default entrypoint is Layer 1. The same image also contains Node 24 and the `openchamber-push-relay` source/bin/package files. Layer 1 is a Bun 1.3.14 compile standalone; Push is executed with Node 24 and `node:sqlite`. The container runs as a non-root user, exposes `8787` and `8788`, and health-checks Layer 1 with Node. The release pipeline requires the `DOCKERHUB_USERNAME` GitHub Actions repository variable and a `DOCKERHUB_TOKEN` repository secret with Docker Hub Read and Write permissions. Image publication must succeed before the GitHub Release is finalized. `relay/v*` publishes the same npm package and Docker image without desktop, mobile, TestFlight, or OTA artifacts.
 
 The `Relay Docker` workflow can republish only the current Relay package version without creating or modifying a GitHub Release or other platform artifacts.
 
@@ -270,6 +365,23 @@ docker compose -f docker-compose.relay.remote.yml up -d
 
 `OPENCHAMBER_RELAY_IMAGE` is required so the repository never binds this reusable deployment file to a personal registry namespace. Use an immutable version-and-digest reference in production.
 
+To run Layer 1 and Push from that same immutable image, with APNs secrets only on Push, a persistent SQLite volume, read-only root filesystems, and Caddy routing `/v1/push/*` to Push, use [`docker-compose.relay-push.remote.yml`](../../docker-compose.relay-push.remote.yml):
+
+```sh
+OPENCHAMBER_RELAY_IMAGE='<dockerhub-username>/openchamber-relay:<version>@sha256:<manifest-digest>' \
+RELAY_DOMAIN=relay.example.com \
+ACME_EMAIL=admin@example.com \
+OPENCHAMBER_PUSH_RELAY_APNS_KEY_ID='<apns-key-id>' \
+OPENCHAMBER_PUSH_RELAY_APNS_TEAM_ID='<apns-team-id>' \
+OPENCHAMBER_PUSH_RELAY_APNS_BUNDLE_ID=com.yee94.openchamber \
+OPENCHAMBER_PUSH_RELAY_APNS_P8_FILE=/etc/openchamber/AuthKey.p8 \
+docker compose -f docker-compose.relay-push.remote.yml up -d
+```
+
+The Push container reads the `.p8` from the Docker secret path `/run/secrets/apns_p8`. Layer 1 does not receive that secret. Inspect both health checks with `docker compose -f docker-compose.relay-push.remote.yml ps`. Public `/healthz` and `/readyz` are Layer 1. Push `/healthz` stays on the internal listener.
+
+Existing Layer-1-only Compose files keep their current behavior: [`docker-compose.relay.yml`](../../docker-compose.relay.yml) for loopback, and [`docker-compose.relay.remote.yml`](../../docker-compose.relay.remote.yml) for public Layer 1 without Push.
+
 The repository provides optional Docker delivery assets at [`Dockerfile.relay`](../../Dockerfile.relay) and [`docker-compose.relay.yml`](../../docker-compose.relay.yml). The Compose service publishes `127.0.0.1:${OPENCHAMBER_RELAY_PUBLISHED_PORT:-8787}` and accepts `OPENCHAMBER_RELAY_SERVER_PUBLIC_URL` plus selected Relay limits.
 
 ```sh
@@ -291,6 +403,9 @@ These assets define an optional follow-on deployment path. Validate the image, p
 | Per-Client IP limits behave as proxy limits | Enable trusted-proxy mode, fully isolate Relay ingress behind that proxy, and configure a single replaced `X-Forwarded-For` IP. |
 | Existing clients continue using an earlier endpoint | Refresh the candidate or create a new pairing link after changing `OPENCHAMBER_RELAY_URL`. |
 | WebSocket application traffic fails while HTTP works | Confirm the Host endpoint mints and supplies a short-lived `oc_url_token` for the WebSocket path. |
+| Push register or send returns 404 on the public hostname | Confirm the reverse proxy sends `/v1/push/*` to the Push listener on port 8788, not to Layer 1. |
+| Push container is unhealthy | Confirm APNs Key ID / Team ID / Bundle ID and the `.p8` secret path, and that the SQLite volume is writable by the non-root user. |
+| Device tokens stop receiving after a Relay URL change | Confirm the Host re-registered against the new Push origin before the first send, or set `OPENCHAMBER_PUSH_RELAY_URL` explicitly. |
 
 ## Development and test coverage
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openchambery/relay-server",
-  "version": "1.19.0-beta.37",
+  "version": "1.19.0-beta.39",
   "description": "Self-hosted private relay server for OpenChamber",
   "private": false,
   "type": "module",

package/src/push/apns.js

@@ -6,6 +6,7 @@ const APNS_HOST = {
   sandbox: 'https://api.sandbox.push.apple.com',
 };
 const JWT_TTL_MS = 50 * 60 * 1000;
+const SESSION_TTL_MS = 30 * 60 * 1000;
 const REQUEST_TIMEOUT_MS = 5_000;
 const MAX_RESPONSE_BYTES = 4_096;
 export const DEAD_TOKEN_REASONS = new Set(['BadDeviceToken', 'Unregistered', 'DeviceTokenNotForTopic']);
@@ -15,6 +16,7 @@ const normalizePem = (value) => (typeof value === 'string' ? value.replace(/\\n/
 export const createApnsProvider = (options = {}) => {
   const clock = { now: Date.now, setTimeout, clearTimeout, ...options.clock };
   const connect = options.http2?.connect ?? http2.connect;
+  const sessionTtlMs = options.sessionTtlMs ?? SESSION_TTL_MS;
   let privateKey;
   try {
     privateKey = crypto.createPrivateKey(normalizePem(options.p8));
@@ -41,17 +43,21 @@ export const createApnsProvider = (options = {}) => {
   };
 
   const dropSession = (env, client) => {
-    if (sessions.get(env) === client) sessions.delete(env);
+    const current = sessions.get(env);
+    if (current?.client === client) sessions.delete(env);
     try { client.close(); } catch { /* session already gone */ }
   };
 
   const getSession = (env) => {
     const existing = sessions.get(env);
-    if (existing && !existing.closed && existing.destroyed !== true) return existing;
+    if (existing?.client && !existing.client.closed && existing.client.destroyed !== true) {
+      if (clock.now() - existing.createdAt < sessionTtlMs) return existing.client;
+      dropSession(env, existing.client);
+    }
     const client = connect(APNS_HOST[env]);
     client.on('error', () => dropSession(env, client));
-    client.on('close', () => { if (sessions.get(env) === client) sessions.delete(env); });
-    sessions.set(env, client);
+    client.on('close', () => { if (sessions.get(env)?.client === client) sessions.delete(env); });
+    sessions.set(env, { client, createdAt: clock.now() });
     return client;
   };
 
@@ -69,9 +75,14 @@ export const createApnsProvider = (options = {}) => {
     };
     if (input.collapseId) headers['apns-collapse-id'] = input.collapseId;
     let req;
-    try { req = client.request(headers); } catch { resolve({ ok: false }); return; }
+    try { req = client.request(headers); } catch {
+      dropSession(input.env, client);
+      resolve({ ok: false });
+      return;
+    }
     let status = 0;
-    let responseBody = '';
+    const chunks = [];
+    let responseBytes = 0;
     let settled = false;
     const finish = (result) => {
       if (settled) return;
@@ -84,19 +95,25 @@ export const createApnsProvider = (options = {}) => {
       finish({ ok: false });
     }, options.requestTimeoutMs ?? REQUEST_TIMEOUT_MS);
     req.on('response', (responseHeaders) => { status = Number(responseHeaders[':status']) || 0; });
-    req.setEncoding('utf8');
     req.on('data', (chunk) => {
-      if (responseBody.length < MAX_RESPONSE_BYTES) responseBody += chunk.slice(0, MAX_RESPONSE_BYTES - responseBody.length);
+      if (responseBytes >= MAX_RESPONSE_BYTES) return;
+      const buf = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+      const take = buf.length > MAX_RESPONSE_BYTES - responseBytes ? buf.subarray(0, MAX_RESPONSE_BYTES - responseBytes) : buf;
+      chunks.push(take);
+      responseBytes += take.length;
     });
     req.on('end', () => {
       if (status === 200) { finish({ ok: true }); return; }
       let reason = '';
-      try { reason = JSON.parse(responseBody)?.reason || ''; } catch { /* non-JSON */ }
+      try { reason = JSON.parse(Buffer.concat(chunks, responseBytes).toString('utf8'))?.reason || ''; } catch { /* non-JSON */ }
       if (reason === 'ExpiredProviderToken') { finish({ ok: false, expired: true }); return; }
       if (status === 410 || DEAD_TOKEN_REASONS.has(reason)) { finish({ ok: false, drop: true }); return; }
       finish({ ok: false });
     });
-    req.on('error', () => finish({ ok: false }));
+    req.on('error', () => {
+      if (!settled) dropSession(input.env, client);
+      finish({ ok: false });
+    });
     req.end(JSON.stringify(input.payload));
   });
 
@@ -110,9 +127,9 @@ export const createApnsProvider = (options = {}) => {
       return { ok: first.ok === true, drop: first.drop === true ? true : undefined };
     },
     close() {
-      for (const [env, client] of sessions) {
+      for (const [env, entry] of sessions) {
         sessions.delete(env);
-        try { client.close(); } catch { /* ignore */ }
+        try { entry.client.close(); } catch { /* ignore */ }
       }
       cachedJwt = null;
     },

package/src/push/config.js

@@ -4,7 +4,7 @@ import { isIP } from 'node:net';
 export const DEFAULT_HOST = '127.0.0.1';
 export const DEFAULT_PORT = 8788;
 export const DEFAULT_DATABASE_PATH = './data/push-relay.sqlite';
-export const DEFAULT_BUNDLE_ID = 'com.openchamber.app';
+export const DEFAULT_BUNDLE_ID = 'com.yee94.openchamber';
 export const ENV_PREFIX = 'OPENCHAMBER_PUSH_RELAY_';
 export const DEFAULT_LIMITS = {
   timestampSkewMs: 300_000,

package/src/push/guard.js

@@ -57,24 +57,89 @@ export const createSlidingWindowLimiter = ({ windowMs, maxCount, maxEntries, now
 
 export const createInFlightGate = (maxInFlight) => {
   const maxWaiters = maxInFlight;
+  let generation = 1;
   let active = 0;
+  let accepting = true;
   const waiters = [];
+  const idleWaiters = [];
+  const notifyIdle = () => {
+    if (active !== 0) return;
+    while (idleWaiters.length) idleWaiters.shift()();
+  };
   return {
     acquire() {
-      if (active < maxInFlight) { active += 1; return Promise.resolve(true); }
+      if (!accepting) return Promise.resolve(false);
+      if (active < maxInFlight) {
+        active += 1;
+        return Promise.resolve(generation);
+      }
       if (waiters.length >= maxWaiters) return Promise.resolve(false);
-      return new Promise((resolve) => { waiters.push(resolve); });
+      const gen = generation;
+      return new Promise((resolve) => {
+        waiters.push(() => {
+          if (!accepting || generation !== gen) { resolve(false); return; }
+          resolve(generation);
+        });
+      });
+    },
+    release(ticket) {
+      if (ticket !== generation) return;
+      if (accepting) {
+        const next = waiters.shift();
+        if (next) { next(); return; }
+      } else {
+        while (waiters.length) waiters.shift()();
+      }
+      active = Math.max(0, active - 1);
+      notifyIdle();
     },
-    release() {
-      const next = waiters.shift();
-      if (next) next(true);
-      else active = Math.max(0, active - 1);
+    rejectWaiters() {
+      accepting = false;
+      while (waiters.length) waiters.shift()();
     },
-    clear() {
-      while (waiters.length) waiters.shift()(false);
+    reset() {
+      generation += 1;
+      accepting = true;
       active = 0;
+      waiters.length = 0;
+      while (idleWaiters.length) idleWaiters.shift()();
+    },
+    whenIdle() {
+      if (active === 0) return Promise.resolve();
+      return new Promise((resolve) => { idleWaiters.push(resolve); });
     },
     get active() { return active; },
     get waiting() { return waiters.length; },
   };
 };
+
+export const createWorkTracker = () => {
+  let generation = 1;
+  let active = 0;
+  const idleWaiters = [];
+  const notifyIdle = () => {
+    if (active !== 0) return;
+    while (idleWaiters.length) idleWaiters.shift()();
+  };
+  return {
+    begin() {
+      active += 1;
+      const gen = generation;
+      return () => {
+        if (gen !== generation) return;
+        active = Math.max(0, active - 1);
+        notifyIdle();
+      };
+    },
+    whenIdle() {
+      if (active === 0) return Promise.resolve();
+      return new Promise((resolve) => { idleWaiters.push(resolve); });
+    },
+    reset() {
+      generation += 1;
+      active = 0;
+      while (idleWaiters.length) idleWaiters.shift()();
+    },
+    get active() { return active; },
+  };
+};

package/src/push/server.js

@@ -3,11 +3,12 @@ import http from 'node:http';
 import { createApnsProvider } from './apns.js';
 import { normalizePushRelayOptions, resolvePushRelayClientIp, formatPushRelayUrl } from './config.js';
 import { deriveServerId, verifyP1363 } from './crypto.js';
-import { createInFlightGate, createReplayGuard, createSlidingWindowLimiter } from './guard.js';
+import { createInFlightGate, createReplayGuard, createSlidingWindowLimiter, createWorkTracker } from './guard.js';
 import { JSON_BODY_BYTES, validateRegisterBody, validateSendBody } from './schema.js';
 import { createTokenStore } from './store.js';
 
 const WINDOW_MS = 60_000;
+const STOP_DEADLINE_MS = 5_500;
 
 const sendJson = (response, status, payload, method = 'GET') => {
   if (response.writableEnded) return;
@@ -25,6 +26,10 @@ const readBody = (request, maxBytes) => new Promise((resolve, reject) => {
     error.code = 'PAYLOAD_TOO_LARGE';
     fail(error);
   };
+  const drain = () => {
+    request.removeListener('data', onData);
+    request.resume();
+  };
   const declared = Number(request.headers['content-length']);
   if (Number.isFinite(declared) && declared > maxBytes) {
     tooLarge();
@@ -33,15 +38,16 @@ const readBody = (request, maxBytes) => new Promise((resolve, reject) => {
   }
   const chunks = [];
   let size = 0;
-  request.on('data', (chunk) => {
+  const onData = (chunk) => {
     size += chunk.length;
     if (size > maxBytes) {
+      drain();
       tooLarge();
-      request.destroy();
       return;
     }
     chunks.push(chunk);
-  });
+  };
+  request.on('data', onData);
   request.on('end', () => succeed(Buffer.concat(chunks)));
   request.on('error', fail);
 });
@@ -65,6 +71,7 @@ export const createPushRelayServer = (options = {}) => {
   }
   const liveStore = () => {
     if (!ownedStore) return store;
+    if (state === 'stopping') return store;
     try { store.count(); return store; } catch {
       store = createTokenStore(config.databasePath);
       return store;
@@ -75,6 +82,7 @@ export const createPushRelayServer = (options = {}) => {
   const sendIpLimit = createSlidingWindowLimiter({ windowMs: WINDOW_MS, maxCount: limits.sendLimitPerMinute, maxEntries: limits.maxRateLimitEntries, now: () => clock.now() });
   const sendServerLimit = createSlidingWindowLimiter({ windowMs: WINDOW_MS, maxCount: limits.serverSendLimitPerMinute, maxEntries: limits.maxRateLimitEntries, now: () => clock.now() });
   const inFlight = createInFlightGate(limits.maxInFlight);
+  const httpWork = createWorkTracker();
   const reasons = { authRejected: 0, policyRejected: 0, limited: 0, replayRejected: 0 };
   let server = null; let startPromise = null; let stopPromise = null; let abortStart = null; let state = 'idle'; let generation = 0;
   const snapshot = () => {
@@ -93,9 +101,12 @@ export const createPushRelayServer = (options = {}) => {
     const authError = authenticate(parsed.publicKeyJwk, `${parsed.ts}.${parsed.token}.${parsed.platform}`, parsed.sig, parsed.ts);
     if (authError) return { status: 401, body: { error: authError } };
     const serverId = deriveServerId(parsed.publicKeyJwk);
+    const replayKey = `register.${serverId}.${parsed.ts}.${parsed.sig.toString('base64url')}`;
+    if (replay.has(replayKey)) return { status: 200, body: { ok: true } };
     const tokens = liveStore();
     const existing = tokens.get(parsed.token);
     if (!existing && tokens.count() >= limits.maxTokens) { reasons.limited += 1; return { status: 429, body: { error: 'token_limit' } }; }
+    if (!replay.remember(replayKey)) { reasons.limited += 1; return { status: 429, body: { error: 'rate_limited' } }; }
     tokens.upsert(parsed.token, serverId, parsed.platform, clock.now());
     return { status: 200, body: { ok: true } };
   };
@@ -105,7 +116,7 @@ export const createPushRelayServer = (options = {}) => {
     const authError = authenticate(parsed.publicKeyJwk, `${parsed.ts}.${sorted.join(',')}.${parsed.title}`, parsed.sig, parsed.ts);
     if (authError) return { status: 401, body: { error: authError } };
     const serverId = deriveServerId(parsed.publicKeyJwk);
-    const replayKey = `${serverId}.${parsed.ts}.${parsed.sig.toString('base64url')}`;
+    const replayKey = `send.${serverId}.${parsed.ts}.${parsed.sig.toString('base64url')}`;
     if (replay.has(replayKey)) { reasons.replayRejected += 1; return { status: 401, body: { error: 'replay' } }; }
     if (!replay.remember(replayKey)) { reasons.limited += 1; return { status: 429, body: { error: 'rate_limited' } }; }
     if (!sendServerLimit.allow(serverId)) { reasons.limited += 1; return { status: 429, body: { error: 'rate_limited' } }; }
@@ -125,7 +136,7 @@ export const createPushRelayServer = (options = {}) => {
       } catch {
         return { token, ok: false };
       } finally {
-        inFlight.release();
+        inFlight.release(acquired);
       }
     }));
     return { status: 200, body: { results } };
@@ -142,10 +153,11 @@ export const createPushRelayServer = (options = {}) => {
     }
     const isRegister = pathname === '/v1/push/register-token';
     const isSend = pathname === '/v1/push/send';
-    if (request.method !== 'POST' || (!isRegister && !isSend)) { response.writeHead(404); response.end(); return; }
+    if (request.method !== 'POST' || (!isRegister && !isSend) || state !== 'running') { response.writeHead(404); response.end(); return; }
     const ip = resolveClientIp(request);
     const limiter = isRegister ? registerIpLimit : sendIpLimit;
     if (!limiter.allow(ip)) { reasons.limited += 1; sendJson(response, 429, { error: 'rate_limited' }); return; }
+    const endHttp = httpWork.begin();
     readBody(request, limits.jsonBodyBytes ?? JSON_BODY_BYTES).then(async (buffer) => {
       let body;
       try { body = JSON.parse(buffer.toString('utf8')); } catch { reasons.policyRejected += 1; sendJson(response, 400, { error: 'invalid_request' }); return; }
@@ -160,7 +172,7 @@ export const createPushRelayServer = (options = {}) => {
     }).catch((error) => {
       if (error?.code === 'PAYLOAD_TOO_LARGE') { reasons.policyRejected += 1; sendJson(response, 413, { error: 'payload_too_large' }); return; }
       sendJson(response, 500, { error: 'internal' });
-    });
+    }).finally(endHttp);
   };
 
   const start = () => {
@@ -168,6 +180,8 @@ export const createPushRelayServer = (options = {}) => {
     if (state === 'stopping') return stopPromise.then(() => start());
     if (startPromise) return startPromise;
     liveStore();
+    inFlight.reset();
+    httpWork.reset();
     if (ownedApns && state === 'stopped') apns = openApns();
     state = 'starting';
     const localGeneration = ++generation;
@@ -208,19 +222,36 @@ export const createPushRelayServer = (options = {}) => {
     state = 'stopping';
     generation += 1;
     const localServer = server;
-    stopPromise = new Promise((resolve) => {
-      inFlight.clear();
+    stopPromise = Promise.resolve().then(async () => {
+      inFlight.rejectWaiters();
       replay.clear();
       registerIpLimit.clear();
       sendIpLimit.clear();
       sendServerLimit.clear();
+      let deadlineTimer = null;
+      try {
+        const closed = new Promise((resolve) => {
+          if (!localServer) { resolve(); return; }
+          localServer.close(() => resolve());
+          try { localServer.closeIdleConnections?.(); } catch { /* ignore */ }
+        });
+        const httpIdle = httpWork.whenIdle().then(() => {
+          try { localServer?.closeIdleConnections?.(); } catch { /* ignore */ }
+        });
+        const graceful = Promise.all([closed, inFlight.whenIdle(), httpIdle]);
+        const deadline = new Promise((resolve) => {
+          deadlineTimer = clock.setTimeout(() => resolve('deadline'), STOP_DEADLINE_MS);
+        });
+        const winner = await Promise.race([graceful.then(() => 'graceful'), deadline]);
+        if (winner === 'deadline') {
+          try { localServer?.closeAllConnections?.(); } catch { /* ignore */ }
+        }
+      } finally {
+        if (deadlineTimer !== null) try { clock.clearTimeout(deadlineTimer); } catch { /* ignore */ }
+      }
       try { apns.close?.(); } catch { /* ignore */ }
-      if (!localServer) return resolve();
-      localServer.close(() => resolve());
-      clock.setTimeout(resolve, 100);
-    }).then(() => {
-      if (server === localServer) { server = null; state = 'stopped'; }
       if (ownedStore) try { store.close(); } catch { /* ignore */ }
+      if (server === localServer) { server = null; state = 'stopped'; }
       stopPromise = null;
     });
     return stopPromise;