vela 0.15.0 → 0.15.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vela",
-	"version": "0.15.0",
+	"version": "0.15.2",
 	"type": "module",
 	"description": "A CLI for creating and updating SvelteKit projects",
 	"license": "MIT",
@@ -30,19 +30,20 @@
 		"format": "prettier --write .",
 		"test": "vitest run",
 		"prepare": "npm run build",
+		"version": "npm run build",
 		"lint:sh": "shellcheck -x -P SCRIPTDIR -S warning templates/server/*.sh",
 		"test:scripts": "bash scripts/test-server-scripts.sh"
 	},
 	"dependencies": {
 		"@clack/prompts": "^1.7.0",
 		"@faker-js/faker": "^10.6.0",
-		"@velastack/patterns": "^0.4.0",
+		"@velastack/patterns": "^0.4.1",
 		"@velastack/pocketbase-codegen": "^0.1.0",
 		"annotate-json-schema": "^0.1.1",
-		"commander": "^13.1.0",
+		"commander": "^15.0.0",
 		"cross-spawn": "^7.0.6",
 		"dedent": "^1.7.2",
-		"dotenv": "^17.4.2",
+		"dotenv": "^18.0.1",
 		"fetch-cookie": "^3.2.0",
 		"json-schema-faker": "^0.6.3",
 		"magic-string": "^1.2.3",

package/templates/server/apply.sh

@@ -77,6 +77,20 @@ PB_UNIT=$(unit_pb "$INSTANCE")
 
 lock_instance "$INSTANCE" "$LOCK_WAIT"
 
+# The instance was removed after this deploy began: a pull request closed while
+# its last push was still building, say. Going ahead would recreate what the
+# removal was for, so the upload is dropped instead - and with it the instance
+# directory, when the upload is all that is in it. A `shared/` left by a
+# non-purge destroy is kept. Checked before anything else, since a purge that
+# ran mid-upload may have taken part of the release with it.
+if removed_since_release "$INSTANCE" "$RELEASE"; then
+	rm -rf "${RELEASE_DIR:?}"
+	rmdir "$APP/releases" "$APP" 2>/dev/null || true
+	printf 'error: %s was removed at %s, after this deploy began (release %s) - not recreating it\n' \
+		"$INSTANCE" "$(removed_at "$INSTANCE")" "$RELEASE" >&2
+	exit "$REMOVED_EXIT"
+fi
+
 [ -d "$RELEASE_DIR" ] || die "release $RELEASE was not uploaded to $RELEASE_DIR"
 [ -f "$RELEASE_DIR/build/index.js" ] || die \
 	"release $RELEASE has no build/index.js - the app must build with @sveltejs/adapter-node"
@@ -447,6 +461,8 @@ state_merge "$INSTANCE" "$(jq -c -n \
 	  managed: $managed, url: $url,
 	  healthCheckPath: $health, pocketbaseVersion: $pb, gitSha: $sha,
 	  webPort: $web, pbPort: $pbport, backend: ($backend == 1), deployedAt: $at}')"
+# A deploy that began after the last removal is live; the mark has done its job.
+clear_removed "$INSTANCE"
 
 # ------------------------------------------------------------------ routing
 #
@@ -470,7 +486,17 @@ if [ -n "$DOMAIN" ]; then
 	tmp=$(mktemp "$VELA_ETC/caddy/.snippet.XXXXXX")
 	{
 		printf '# Managed by vela - app %s (%s)\n' "$APP_NAME" "$INSTANCE"
-		printf '%s {\n\treverse_proxy 127.0.0.1:%s\n}\n' "$hosts" "$WEB_PORT"
+		printf '%s {\n' "$hosts"
+		# The app precompresses its built assets but not rendered pages; Caddy
+		# passes an already-encoded response through untouched.
+		printf '\tencode zstd gzip\n'
+		# Files from static/ come back with an ETag and no Cache-Control, so a
+		# browser asks again on every view. Unhashed, so an hour rather than
+		# forever; `?` leaves whatever the app or PocketBase set alone.
+		printf '\t@static path *.jpg *.jpeg *.png *.gif *.webp *.avif *.svg *.ico *.woff *.woff2\n'
+		printf '\theader @static ?Cache-Control "public, max-age=3600"\n'
+		printf '\treverse_proxy 127.0.0.1:%s\n' "$WEB_PORT"
+		printf '}\n'
 	} > "$tmp"
 	caddy_install "$tmp" "$CADDY_SNIPPET" \
 		|| die "release $RELEASE is live, but the generated Caddy config for $DOMAIN is invalid and was not installed - routing is unchanged"

package/templates/server/destroy.sh

@@ -35,6 +35,10 @@ ETC=$(etc_dir "$INSTANCE")
 
 lock_instance "$INSTANCE" "$LOCK_WAIT"
 
+# Before anything else, and whether or not there turns out to be anything to
+# remove: a deploy still building elsewhere must not put the instance back.
+mark_removed "$INSTANCE"
+
 # Nothing to remove is a result, not an error: a preview that never deployed
 # still gets a cleanup run when its pull request closes. Nothing is touched,
 # so a mistyped name cannot do harm either way.

package/templates/server/lib.sh

@@ -58,6 +58,58 @@ require_provisioned() {
 	[ -f "$VELA_ETC/provisioned" ] || die "server is not provisioned - run 'vela provision' first"
 }
 
+# When an instance was last removed, so a deploy that was already under way
+# cannot bring it back.
+#
+# A deploy spends minutes building on its own machine before it reaches the
+# server and takes the instance lock; a destroy that lands in that window finds
+# nothing to remove, and the deploy then creates the instance that was meant
+# to be gone. CI does this whenever a pull request closes while a push to it
+# is still building: the cleanup runs first and the preview appears after it.
+#
+# destroy.sh records the server's clock here, whether or not there was anything
+# to remove. A release id starts with the server's clock at the moment its
+# deploy began, so apply.sh can tell a deploy that started before the removal
+# (refused) from one that started after it (a fresh deploy - the pull request
+# was reopened, say - which goes ahead and clears the mark). Kept under state/,
+# not the instance's own directory, which a purge deletes.
+
+# Exit status of that refusal, so the CLI can tell it apart from a failed deploy.
+# shellcheck disable=SC2034 # read by apply.sh
+REMOVED_EXIT=3
+removed_file() { printf '%s/state/removed/%s' "$VELA_ROOT" "$1"; }
+
+# usage: mark_removed <instance>
+mark_removed() {
+	local file
+	file=$(removed_file "$1")
+	mkdir -p "$(dirname "$file")"
+	# A mark only matters to a deploy that began before it, and no build takes a
+	# month; pruning keeps one file per pull request from piling up forever.
+	find "$(dirname "$file")" -maxdepth 1 -type f -mtime +30 -delete 2>/dev/null || true
+	date -u +%Y%m%dT%H%M%SZ > "$file"
+}
+
+# The stamp of the instance's last removal, or nothing.
+removed_at() {
+	local file
+	file=$(removed_file "$1")
+	if [ -f "$file" ]; then head -n1 "$file"; fi
+}
+
+# Whether `release` belongs to a deploy that began no later than the instance's
+# last removal. A tie counts as before: a deploy and a destroy in the same
+# second are far more likely to be the race than a deliberate redeploy.
+#
+# usage: removed_since_release <instance> <release>
+removed_since_release() {
+	local removed
+	removed=$(removed_at "$1")
+	[ -n "$removed" ] && ! [[ "${2%%-*}" > "$removed" ]]
+}
+
+clear_removed() { rm -f "$(removed_file "$1")"; }
+
 # Whether an instance was last deployed with a PocketBase backend: `true` or
 # `false`. Absent state, or state from before the flag existed, is treated as
 # having one, so this only ever answers `false` for an instance that was