From 55f0a026cbfa4d0a5681f8cb7919e623382a139e Mon Sep 17 00:00:00 2001
From: Robby Zambito <contact@robbyzambito.me>
Date: Sun, 2 Mar 2025 15:53:19 -0500
Subject: Added changes for remote deployment

Added example env files
Added justfile changes for deployment
Added changes in main to support auth methods
---
 .gitignore              |  2 +-
 deploy_host.example.env |  2 ++
 dev_host.example.env    |  2 ++
 justfile                | 17 ++++++++++++++++-
 main.go                 | 51 ++++++++++++++++++++++++++++++++++++++++++++++---
 5 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 deploy_host.example.env
 create mode 100644 dev_host.example.env

diff --git a/.gitignore b/.gitignore
index 3d26669..e4a3357 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 *~
 bin/
-
+.env
diff --git a/deploy_host.example.env b/deploy_host.example.env
new file mode 100644
index 0000000..ad9ec22
--- /dev/null
+++ b/deploy_host.example.env
@@ -0,0 +1,2 @@
+NATS_CREDS_FILE=/root/bsky-proxy.creds
+NATS_URL=tls://apex.zambito.xyz
\ No newline at end of file
diff --git a/dev_host.example.env b/dev_host.example.env
new file mode 100644
index 0000000..a11ab63
--- /dev/null
+++ b/dev_host.example.env
@@ -0,0 +1,2 @@
+DEPLOY_HOST=root@alpha.apex
+DEPLOY_DIR=src/bsky-nats-proxy
\ No newline at end of file
diff --git a/justfile b/justfile
index 6053b77..ce907b7 100644
--- a/justfile
+++ b/justfile
@@ -1,8 +1,23 @@
+set dotenv-load := true
+
 @default:
 	just --list
 
+clean:
+	rm -rf bin/
+
 run: build
 	bin/bluesky-nats-proxy
 
 build:
-	go build -o bin/bluesky-nats-proxy
\ No newline at end of file
+	go build -o bin/bluesky-nats-proxy
+
+deploy:
+    ssh -t {{env('DEPLOY_HOST')}} "\
+        cd {{env('DEPLOY_DIR')}} && \
+        git pull -f --rebase && \
+        just clean build run-daemon"
+
+run-daemon:
+   pkill bluesky-nats-proxy || true
+   ./bin/bluesky-nats &>> /var/log/bluesky-nats-proxy.log &
\ No newline at end of file
diff --git a/main.go b/main.go
index f0f17ac..c1f24dc 100644
--- a/main.go
+++ b/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"flag"
 	"fmt"
 	"log"
 	"log/slog"
@@ -18,11 +19,55 @@ import (
 	"github.com/nats-io/nats.go"
 )
 
+// printHelp outputs the usage information.
+func printHelp() {
+	fmt.Println("Usage: HTTP-to-NATS proxy server")
+	fmt.Println("\nThe following environment variables are supported:")
+	fmt.Println("    NATS_URL - NATS connection URL (default: nats://127.0.0.1:4222)")
+	fmt.Println("    NATS_USER - NATS username for authentication (optional)")
+	fmt.Println("    NATS_PASSWORD - NATS password for authentication (optional)")
+	fmt.Println("    NATS_TOKEN - NATS token for authentication (optional)")
+	fmt.Println("    NATS_NKEY - NATS NKEY for authentication (optional)")
+	fmt.Println("    NATS_NKEY_SEED - NATS NKEY seed for authentication (optional)")
+	fmt.Println("    NATS_CREDS_FILE - Path to NATS credentials file (optional)")
+}
+
 func main() {
-	// Connect to NATS
-	nc, err := nats.Connect(nats.DefaultURL)
+	helpFlag := flag.Bool("help", false, "Display help information about available environment variables")
+	flag.Parse()
+	if *helpFlag {
+		printHelp()
+		os.Exit(0)
+	}
+
+	// Read NATS connection info from environment variables
+	natsURL := os.Getenv("NATS_URL")
+	if natsURL == "" {
+		natsURL = nats.DefaultURL // defaults to "nats://127.0.0.1:4222"
+	}
+	natsUser := os.Getenv("NATS_USER")
+	natsPassword := os.Getenv("NATS_PASSWORD")
+	natsToken := os.Getenv("NATS_TOKEN")
+	natsNkey := os.Getenv("NATS_NKEY")
+	natsNkeySeed := os.Getenv("NATS_NKEY_SEED")
+	natsCredsFile := os.Getenv("NATS_CREDS_FILE")
+
+	// Set up NATS connection options
+	opts := []nats.Option{nats.Name("Web proxy")}
+
+	if natsUser != "" && natsPassword != "" {
+		opts = append(opts, nats.UserInfo(natsUser, natsPassword))
+	} else if natsToken != "" {
+		opts = append(opts, nats.Token(natsToken))
+	} else if natsNkey != "" && natsNkeySeed != "" {
+		log.Fatalln("NKEY connection not supported")
+	} else if natsCredsFile != "" {
+		opts = append(opts, nats.UserCredentials(natsCredsFile))
+	}
+
+	nc, err := nats.Connect(natsURL, opts...)
 	if err != nil {
-		log.Fatalf("Error connecting to NATS: %v", err)
+		log.Fatal("Error connecting to NATS:", err)
 	}
 	defer nc.Close()
 	log.Println("Connected to NATS")
-- 
cgit