Support multiple Telebit client bindings

telebitctl

@@ -4,7 +4,7 @@ set -eu
 ROOT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 SERVER_ENV="${TELEBIT_SERVER_ENV:-$ROOT_DIR/.env}"
 CLIENT_ENV="${TELEBIT_CLIENT_ENV:-$ROOT_DIR/telebit-client.env}"
-INSTALLED_CLIENT_ENV="${TELEBIT_INSTALLED_CLIENT_ENV:-$HOME/.config/telebit/client.env}"
+CLIENT_ENV_DIR="${TELEBIT_CLIENT_ENV_DIR:-$ROOT_DIR/.telebit-clients}"
 TELEBIT_BIN="${TELEBIT_BIN:-$ROOT_DIR/bin/telebit}"
 SIGNJWT_BIN="${SIGNJWT_BIN:-$ROOT_DIR/bin/signjwt}"
 
@@ -69,14 +69,36 @@ current_port() {
   sed -n 's#^LOCALS=https:[^:]*:\([0-9][0-9]*\).*#\1#p' "$CLIENT_ENV" | sed -n '1p'
 }
 
+safe_slug() {
+  case "$1" in
+    ""|*/*|*..*|.*|*-|-*|*[^A-Za-z0-9-]*)
+      die "Invalid slug: $1"
+      ;;
+  esac
+}
+
+client_env_path() {
+  slug="$1"
+  safe_slug "$slug"
+  printf '%s/%s.env\n' "$CLIENT_ENV_DIR" "$slug"
+}
+
+env_port() {
+  env_file="$1"
+  [ -f "$env_file" ] || return 1
+  sed -n 's#^LOCALS=https:[^:]*:\([0-9][0-9]*\).*#\1#p' "$env_file" | sed -n '1p'
+}
+
 write_client_env() {
   slug="$1"
   shared_key="$2"
-  port="${3:-$(current_port || true)}"
-  install="${4:-false}"
+  port="${3:-}"
+  env_file="${4:-$(client_env_path "$slug")}"
+  port="${port:-$(env_port "$env_file" || current_port || true)}"
   port="${port:-80}"
 
-  cat > "$CLIENT_ENV" <<EOF
+  mkdir -p "$(dirname "$env_file")"
+  cat > "$env_file" <<EOF
 TUNNEL_RELAY_URL=wss://$TUNNEL_DOMAIN/ws
 AUTH_URL=https://$TUNNEL_DOMAIN/api
 ACME_HTTP_01_RELAY_URL=https://$TUNNEL_DOMAIN/api/acme-relay
@@ -89,24 +111,19 @@ SECRET=$shared_key
 LOCALS=https:$slug.$DOMAIN:$port
 EOF
 
-  if [ "$install" = "true" ]; then
-    mkdir -p "$(dirname "$INSTALLED_CLIENT_ENV")"
-    cp "$CLIENT_ENV" "$INSTALLED_CLIENT_ENV"
-    printf 'Updated %s and %s\n' "$CLIENT_ENV" "$INSTALLED_CLIENT_ENV"
-  else
-    printf 'Updated %s\n' "$CLIENT_ENV"
-  fi
+  cp "$env_file" "$CLIENT_ENV"
+  printf 'Updated %s\n' "$env_file"
 }
 
 client_key() {
-  [ -f "$CLIENT_ENV" ] || return 1
-  sed -n 's/^SECRET=//p' "$CLIENT_ENV" | sed -n '1p'
+  env_file="${1:-$CLIENT_ENV}"
+  [ -f "$env_file" ] || return 1
+  sed -n 's/^SECRET=//p' "$env_file" | sed -n '1p'
 }
 
-bind_slug() {
-  load_server_env
-  slug="${1:?bind requires a slug}"
-  token=$(admin_token)
+create_device() {
+  slug="$1"
+  token="$2"
   response=$(curl -fsS -X POST "$MGMT_URL/devices" \
     -H "Authorization: Bearer $token" \
     -H "Content-Type: application/json" \
@@ -114,16 +131,29 @@ bind_slug() {
 
   shared_key=$(printf '%s\n' "$response" | sed -n 's/.*"shared_key":"\([^"]*\)".*/\1/p')
   [ -n "$shared_key" ] || die "Could not parse shared_key from response: $response"
+  printf '%s\n' "$shared_key"
+}
 
-  write_client_env "$slug" "$shared_key" "$(current_port || true)" false
+bind_slug() {
+  load_server_env
+  slug="${1:?bind requires a slug}"
+  env_file=$(client_env_path "$slug")
+  token=$(admin_token)
+  shared_key=$(create_device "$slug" "$token")
+  write_client_env "$slug" "$shared_key" "$(env_port "$env_file" || current_port || true)" "$env_file"
   printf 'Bound %s.%s\n' "$slug" "$DOMAIN"
 }
 
 release_slug() {
   load_server_env
   slug="${1:?release requires a slug}"
+  env_file=$(client_env_path "$slug")
   token=$(admin_token)
   delete_device "$slug" "$token" true
+  rm -f "$env_file"
+  if [ "$(current_slug || true)" = "$slug" ]; then
+    rm -f "$CLIENT_ENV"
+  fi
 }
 
 delete_device() {
@@ -152,9 +182,12 @@ refresh_auth() {
   load_server_env
   slug="${1:-$(current_slug || true)}"
   slug="${slug:-test}"
+  env_file=$(client_env_path "$slug")
   token=$(admin_token)
   delete_device "$slug" "$token" false >/dev/null 2>&1 || true
-  bind_slug "$slug"
+  shared_key=$(create_device "$slug" "$token")
+  write_client_env "$slug" "$shared_key" "$(env_port "$env_file" || current_port || true)" "$env_file"
+  printf 'Bound %s.%s\n' "$slug" "$DOMAIN"
 }
 
 up_client() {
@@ -162,12 +195,18 @@ up_client() {
   need_bin "$TELEBIT_BIN"
   slug="${1:?up requires a slug}"
   port="${2:?up requires a local port}"
-  key="$(client_key || true)"
-  [ -n "$key" ] || die "No client key found. Run: ./telebitctl bind $slug"
-  write_client_env "$slug" "$key" "$port" true >/dev/null
+  env_file=$(client_env_path "$slug")
+  key="$(client_key "$env_file" || true)"
+
+  if [ -z "$key" ]; then
+    token=$(admin_token)
+    key=$(create_device "$slug" "$token")
+  fi
+
+  write_client_env "$slug" "$key" "$port" "$env_file" >/dev/null
   unset SECRET DOMAIN TUNNEL_DOMAIN MGMT_URL POSTGRES_PASSWORD TELEBIT_PORT MGMT_PORT VENDOR_ID
   cd "$HOME"
-  exec "$TELEBIT_BIN" --env "$INSTALLED_CLIENT_ENV"
+  exec "$TELEBIT_BIN" --env "$env_file"
 }
 
 build_client() {