vela 0.15.2 → 0.15.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vela",
-	"version": "0.15.2",
+	"version": "0.15.4",
 	"type": "module",
 	"description": "A CLI for creating and updating SvelteKit projects",
 	"license": "MIT",
@@ -50,7 +50,7 @@
 		"package-manager-detector": "^1.8.0",
 		"picocolors": "^1.1.1",
 		"pocketbase": "^0.28.0",
-		"pocketbase-server": "^0.40.5-beta.2",
+		"pocketbase-server": "^0.40.5-beta.5",
 		"stripe": "^22.6.2",
 		"sv": "~1.0.1",
 		"svelte": "^5.56.10",

package/templates/minimal/_env.example

@@ -0,0 +1,7 @@
+# What this app reads from its environment. Copy to .env for development; on a
+# server, `vela env set KEY -t <target>`. Values here are examples, not defaults.
+
+# PocketBase superuser the app authenticates as. `vela create` writes these to
+# .env; a deploy creates its own on the server the first time.
+POCKETBASE_SUPERUSER_EMAIL=admin@example.com
+POCKETBASE_SUPERUSER_PASSWORD=change-me

package/templates/server/apply.sh

@@ -36,7 +36,9 @@ require_release_id "$RELEASE"
 
 APP_NAME=$INSTANCE
 APP_ID=$INSTANCE
+SITE_NAME=""
 ENV_TAG=prod
+PREVIEW=0
 DOMAIN=""
 MANAGED=""
 HEALTH_PATH=/
@@ -54,6 +56,8 @@ while [ $# -gt 0 ]; do
 		--name) APP_NAME=$2; shift 2 ;;
 		--app-id) APP_ID=$2; shift 2 ;;
 		--env) ENV_TAG=$2; shift 2 ;;
+		--site-name) SITE_NAME=$2; shift 2 ;;
+		--preview) PREVIEW=$2; shift 2 ;;
 		--domain) DOMAIN=$2; shift 2 ;;
 		--managed) MANAGED=$2; shift 2 ;;
 		--health-path) HEALTH_PATH=$2; shift 2 ;;
@@ -183,10 +187,22 @@ else
 	PRIMARY_URL="http://127.0.0.1:$WEB_PORT"
 fi
 
-# Production secrets live in $ETC/env and are managed only by `vela env`.
-# Nothing here reads or rewrites that file.
+# The instance's own env layer is managed only by `vela env`. Nothing here
+# reads or rewrites it; the file is created so a first `vela env list` has
+# something to read.
 [ -f "$ETC/env" ] || { : > "$ETC/env"; chmod 0600 "$ETC/env"; chown root:root "$ETC/env"; }
 
+# The shared layers - app-wide, and one for every preview - live under
+# /etc/vela/scopes, and the units are templates on the instance name alone, so
+# they reach those layers through fixed-name symlinks written here. A link to a
+# layer nobody has written yet dangles, which systemd skips like a missing file.
+link_scope "$APP_ID" all "$ETC"
+if [ "$PREVIEW" = "1" ]; then
+	link_scope "$APP_ID" preview "$ETC"
+else
+	rm -f "$ETC/scope.preview.env" "$ETC/scope.preview.public.env"
+fi
+
 runtime_tmp=$(mktemp "$ETC/.runtime.XXXXXX")
 {
 	printf '# Generated by vela on each deploy. Edit /etc/vela/apps/%s/env instead.\n' "$INSTANCE"
@@ -194,6 +210,12 @@ runtime_tmp=$(mktemp "$ETC/.runtime.XXXXXX")
 	printf 'HOST=127.0.0.1\n'
 	printf 'PORT=%s\n' "$WEB_PORT"
 	runtime_origin_lines "$DOMAIN" "$PRIMARY_URL"
+	# Caddy is the only thing that reaches the app, so without these
+	# `getClientAddress()` is always 127.0.0.1. Caddy replaces any
+	# X-Forwarded-For a client sends with the address it saw (or, on a managed
+	# route, the one the Worker reports), so the last entry is the visitor.
+	printf 'ADDRESS_HEADER=x-forwarded-for\n'
+	printf 'XFF_DEPTH=1\n'
 	# Only an instance with a PocketBase gets pointed at one: a URL to a port
 	# nothing listens on is not a setting, it is a trap. Kept for one more
 	# deploy when the backend is being removed, so that a failed deploy can put
@@ -203,6 +225,10 @@ runtime_tmp=$(mktemp "$ETC/.runtime.XXXXXX")
 		printf 'POCKETBASE_URL=http://127.0.0.1:%s\n' "$PB_PORT"
 	fi
 	printf 'VELA_DATA_DIR=%s\n' "$APP_DATA_DIR"
+	# PocketBase names the app in its emails after APP_NAME, and links them to
+	# ORIGIN (above) unless APP_URL says otherwise. The name is the one
+	# src/lib/site.ts declares, so it is set from code on every deploy.
+	[ -z "$SITE_NAME" ] || printf 'APP_NAME=%s\n' "$SITE_NAME"
 	printf 'VELA_APP_ID=%s\n' "$APP_ID"
 	printf 'VELA_APP_NAME=%s\n' "$APP_NAME"
 	printf 'VELA_ENV=%s\n' "$ENV_TAG"
@@ -401,6 +427,13 @@ if [ -n "$LINK_NAME" ]; then
 		|| rm -f "$link_tmp" || true
 fi
 
+# The units come from the same upload as this script, so a server provisioned
+# by an older CLI gets the current ones on its next deploy rather than running
+# the old env file list against new layers nothing reads.
+for unit in vela-web@.service vela-pb@.service; do
+	cmp -s "$SCRIPT_DIR/systemd/$unit" "/etc/systemd/system/$unit" \
+		|| install -m 0644 "$SCRIPT_DIR/systemd/$unit" "/etc/systemd/system/$unit"
+done
 systemctl daemon-reload
 
 if [ "$BACKEND" = "1" ]; then
@@ -456,7 +489,8 @@ state_merge "$INSTANCE" "$(jq -c -n \
 	--arg health "$HEALTH_PATH" --arg pb "$PB_VERSION" \
 	--arg sha "$GIT_SHA" --arg at "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
 	--argjson web "$WEB_PORT" --argjson pbport "$PB_PORT" --argjson backend "$BACKEND" \
-	'{appId: $app, name: $name, env: $env, instance: $instance,
+	--argjson preview "$PREVIEW" \
+	'{appId: $app, name: $name, env: $env, instance: $instance, preview: ($preview == 1),
 	  activeRelease: $release, previousRelease: $previous, domain: $domain,
 	  managed: $managed, url: $url,
 	  healthCheckPath: $health, pocketbaseVersion: $pb, gitSha: $sha,

package/templates/server/lib.sh

@@ -10,6 +10,19 @@ VELA_PORT_RANGE=${VELA_PORT_RANGE:-900}
 
 app_dir() { printf '%s/apps/%s' "$VELA_ROOT" "$1"; }
 etc_dir() { printf '%s/apps/%s' "$VELA_ETC" "$1"; }
+# scope_dir <app-id> <all|preview> - an env layer shared by several instances.
+# Its own tree because the production instance is named after the app id, so
+# /etc/vela/apps/<app-id> is production's directory, not the app's.
+scope_dir() { printf '%s/scopes/%s/%s' "$VELA_ETC" "$1" "$2"; }
+# link_scope <app-id> <all|preview> <etc-dir> - point an instance's fixed-name
+# scope.<layer>.env and scope.<layer>.public.env at that layer's files.
+# `-n` replaces an existing link rather than following it; the targets are files,
+# so there is never a directory for a plain `ln -sf` to descend into.
+link_scope() {
+	local dir; dir=$(scope_dir "$1" "$2")
+	ln -sfn "$dir/env" "$3/scope.$2.env"
+	ln -sfn "$dir/env.public" "$3/scope.$2.public.env"
+}
 state_file() { printf '%s/apps/%s/state.json' "$VELA_ROOT" "$1"; }
 
 log() { printf '  %s\n' "$*" >&2; }
@@ -227,13 +240,17 @@ unit_active() { systemctl is-active --quiet "$1"; }
 # A fourth argument is the public host to ask as, the way Caddy would. An app
 # serving several hosts has no pinned origin and tells its sites apart by
 # `Host`; asked as 127.0.0.1 it may rightly answer that it serves no such site.
+#
+# X-Forwarded-For always, as Caddy would send it: the app reads the client
+# address from it (ADDRESS_HEADER), and adapter-node throws from
+# `getClientAddress()` on a request without one.
 wait_for_http() {
 	local url=$1 attempts=${2:-60} delay=${3:-0.5} host=${4:-} code
 	local i=0
-	local -a as=()
-	[ -z "$host" ] || as=(-H "Host: $host" -H 'X-Forwarded-Proto: https')
+	local -a as=(-H 'X-Forwarded-For: 127.0.0.1')
+	[ -z "$host" ] || as+=(-H "Host: $host" -H 'X-Forwarded-Proto: https')
 	while [ "$i" -lt "$attempts" ]; do
-		code=$(curl -sS -o /dev/null -w '%{http_code}' --max-time 5 ${as[@]+"${as[@]}"} "$url" 2>/dev/null || echo 000)
+		code=$(curl -sS -o /dev/null -w '%{http_code}' --max-time 5 "${as[@]}" "$url" 2>/dev/null || echo 000)
 		case "$code" in
 			2*|3*|401|403) return 0 ;;
 		esac

package/templates/server/systemd/vela-pb@.service

@@ -10,7 +10,15 @@ User=vela
 Group=vela
 WorkingDirectory=/var/lib/vela/apps/%i
 
+# Three layers, each secret and public, then what vela derives. Later wins.
+# The scope.* names are symlinks apply.sh writes into the app-wide and preview
+# layers under /etc/vela/scopes; a layer that does not exist is skipped.
+EnvironmentFile=-/etc/vela/apps/%i/scope.all.env
+EnvironmentFile=-/etc/vela/apps/%i/scope.all.public.env
+EnvironmentFile=-/etc/vela/apps/%i/scope.preview.env
+EnvironmentFile=-/etc/vela/apps/%i/scope.preview.public.env
 EnvironmentFile=-/etc/vela/apps/%i/env
+EnvironmentFile=-/etc/vela/apps/%i/env.public
 EnvironmentFile=/etc/vela/apps/%i/runtime.env
 
 ExecStart=/var/lib/vela/apps/%i/bin/pocketbase \

package/templates/server/systemd/vela-web@.service

@@ -12,7 +12,15 @@ WorkingDirectory=/var/lib/vela/apps/%i/current
 
 # Production secrets first, vela-generated runtime settings second, so PORT and
 # POCKETBASE_URL always match what the server actually assigned.
+# Three layers, each secret and public, then what vela derives. Later wins.
+# The scope.* names are symlinks apply.sh writes into the app-wide and preview
+# layers under /etc/vela/scopes; a layer that does not exist is skipped.
+EnvironmentFile=-/etc/vela/apps/%i/scope.all.env
+EnvironmentFile=-/etc/vela/apps/%i/scope.all.public.env
+EnvironmentFile=-/etc/vela/apps/%i/scope.preview.env
+EnvironmentFile=-/etc/vela/apps/%i/scope.preview.public.env
 EnvironmentFile=-/etc/vela/apps/%i/env
+EnvironmentFile=-/etc/vela/apps/%i/env.public
 EnvironmentFile=/etc/vela/apps/%i/runtime.env
 
 ExecStart=/usr/bin/node /var/lib/vela/apps/%i/current/build/index.js

package/templates/static/_env.example

@@ -0,0 +1,2 @@
+# What this app reads from its environment. Copy to .env for development; on a
+# server, `vela env set KEY -t <target>`. Values here are examples, not defaults.