Merge branch 'rc-v1' into 'v1'

v1 merge

See merge request subtype/subspace-api!7

Author: subtype

docker-compose.yml

@@ -10,6 +10,14 @@ services:
     networks:
       - proxy
       - api
+    labels:
+      - 'traefik.enable=true'
+      - 'traefik.http.routers.subspace-api.rule=Host(`api.subtype.space`)'
+      - 'traefik.http.routers.subspace-api.entrypoints=websecure'
+      - 'traefik.http.routers.subspace-api.tls=true'
+      - 'traefik.http.routers.subspace-api.tls.certresolver=cloudflare'
+      - 'traefik.docker.network=proxy'
+      - 'traefik.http.routers.subspace-api.middlewares=secureHeaders@file, generic-csp@file'
 
 networks:
   proxy:

package.json

@@ -12,7 +12,8 @@
   "type": "module",
   "scripts": {
     "build": "tsc && chmod 755 build/server.js",
-    "start": "node build/server.js"
+    "start": "node build/server.js",
+    "prod": "./run.sh prod"
   },
   "files": [
     "build"

run.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+# Helper shell script to run builds
+set -euo pipefail
+
+MODE=${1:-prod}
+BRANCH=${2:-rc-v1}
+LATEST_RELEASE="v1"
+
+echo "🚀 Starting subspace-api in '$MODE' mode (branch: $BRANCH)..."
+echo "🧹 Ensuring all subspace-api containers are stopped..."
+docker compose down || true
+docker compose -f docker-compose.dev.yml down || true
+
+
+case "$MODE" in
+  prod)
+    echo "📦 Pulling latest image from GitHub Container Registry..."
+    docker compose pull && docker compose up -d
+    ;;
+
+  rc|dev)
+    echo "🔀 Switching to branch '$BRANCH'..."
+    git fetch origin "$BRANCH"
+    git checkout "$BRANCH"
+    git pull origin "$BRANCH"
+
+    echo "🔧 Building $BRANCH build locally..."
+    docker compose -f docker-compose.dev.yml build
+    docker compose -f docker-compose.dev.yml up -d
+    ;;
+
+  *)
+    echo "Unknown mode: $MODE"
+    echo "Usage: $0 [dev|rc|prod] [branch (optional)]"
+    echo "Note: dev and rc flags currently do the same thing!"
+    exit 1
+    ;;
+esac
+
+echo "✅ Done! Mode: $MODE"

src/server.ts

@@ -70,9 +70,9 @@ server.use(limiter)
 
 logger.info('Initializing routes...')
 // Declare regular REST API routing
-server.use('/', express.json(), statusRouter)
-server.use('/v1/trmnl', express.json(), trmnlRouter)
-server.use('/health', express.json(), statusRouter)
+server.use('/', authOptional, express.json(), statusRouter)
+//server.use('/v1/trmnl', express.json(), trmnlRouter) disable this route because it's just not active right now
+server.use('/health', authOptional, express.json(), statusRouter)
 
 // reverse proxy
 server.set('trust proxy', 1)