Skip to content

Open source AI coding agent. Designed for large projects and real world tasks.

fix smtp email issue, /version endpoint, some other logging/cleanup

Dane Schneider565fd9e7e758
diff --git a/app/server/email/email.go b/app/server/email/email.go
index f14f9b77..8930a88c 100644
--- a/app/server/email/email.go
+++ b/app/server/email/email.go
@@ -21,11 +21,10 @@ func SendVerificationEmail(email string, pin string) error {
textBody := fmt.Sprintf("Hi there,\n\nYour pin is: %s", pin)
if os.Getenv("IS_CLOUD") == "" {
- return sendEmailViaSES(email, subject, htmlBody, textBody)
- } else {
return sendEmailViaSMTP(email, subject, htmlBody, textBody)
+ } else {
+ return sendEmailViaSES(email, subject, htmlBody, textBody)
}
-
}
if os.Getenv("GOENV") == "development" {
diff --git a/app/server/handlers/plans_exec.go b/app/server/handlers/plans_exec.go
index 7d7bdea5..9635567a 100644
--- a/app/server/handlers/plans_exec.go
+++ b/app/server/handlers/plans_exec.go
@@ -8,6 +8,7 @@ import (
"net/http"
"os"
"plandex-server/db"
+ "plandex-server/host"
"plandex-server/model"
modelPlan "plandex-server/model/plan"
"plandex-server/types"
@@ -20,7 +21,7 @@ import (
const TrialMaxReplies = 10
func TellPlanHandler(w http.ResponseWriter, r *http.Request) {
- log.Println("Received request for TellPlanHandler")
+ log.Println("Received request for TellPlanHandler", "ip:", host.Ip)
auth := authenticate(w, r, true)
if auth == nil {
@@ -103,7 +104,7 @@ func TellPlanHandler(w http.ResponseWriter, r *http.Request) {
}
func BuildPlanHandler(w http.ResponseWriter, r *http.Request) {
- log.Println("Received request for BuildPlanHandler")
+ log.Println("Received request for BuildPlanHandler", "ip:", host.Ip)
auth := authenticate(w, r, true)
if auth == nil {
return
@@ -166,7 +167,7 @@ func BuildPlanHandler(w http.ResponseWriter, r *http.Request) {
}
func ConnectPlanHandler(w http.ResponseWriter, r *http.Request) {
- log.Println("Received request for ConnectPlanHandler")
+ log.Println("Received request for ConnectPlanHandler", "ip:", host.Ip)
vars := mux.Vars(r)
planId := vars["planId"]
@@ -207,7 +208,7 @@ func ConnectPlanHandler(w http.ResponseWriter, r *http.Request) {
}
func StopPlanHandler(w http.ResponseWriter, r *http.Request) {
- log.Println("Received request for StopPlanHandler")
+ log.Println("Received request for StopPlanHandler", "ip:", host.Ip)
vars := mux.Vars(r)
planId := vars["planId"]
@@ -270,7 +271,7 @@ func StopPlanHandler(w http.ResponseWriter, r *http.Request) {
}
func RespondMissingFileHandler(w http.ResponseWriter, r *http.Request) {
- log.Println("Received request for RespondMissingFileHandler")
+ log.Println("Received request for RespondMissingFileHandler", "ip:", host.Ip)
vars := mux.Vars(r)
planId := vars["planId"]
diff --git a/app/server/handlers/proxy_helper.go b/app/server/handlers/proxy_helper.go
index 0c1d4f10..d6201b76 100644
--- a/app/server/handlers/proxy_helper.go
+++ b/app/server/handlers/proxy_helper.go
@@ -44,8 +44,10 @@ func proxyActivePlanMethod(w http.ResponseWriter, r *http.Request, planId, branc
return
} else {
log.Printf("Forwarding request to %s\n", modelStream.InternalIp)
- proxyUrl := fmt.Sprintf("http://%s:%s/plans/%s/%s/%s", modelStream.InternalIp, os.Getenv("EXTERNAL_PORT"), planId, branch, method)
+ proxyUrl := fmt.Sprintf("http://%s:%s/plans/%s/%s/%s", modelStream.InternalIp, os.Getenv("PORT"), planId, branch, method)
proxyUrl += "?proxy=true"
+
+ log.Printf("Proxy url: %s\n", proxyUrl)
proxyRequest(w, r, proxyUrl)
return
}
diff --git a/app/server/host/ip.go b/app/server/host/ip.go
index 0b77dcdf..5468e04f 100644
--- a/app/server/host/ip.go
+++ b/app/server/host/ip.go
@@ -18,7 +18,7 @@ func LoadIp() error {
return nil
}
- if os.Getenv("IS_AWS_ECS") != "" {
+ if os.Getenv("IS_CLOUD") != "" {
var err error
Ip, err = getAwsIp()
@@ -45,7 +45,9 @@ type ecsMetadata struct {
var awsIp string
func getAwsIp() (string, error) {
- const ecsMetadataURL = "http://169.254.170.2/v2/metadata"
+ ecsMetadataURL := os.Getenv("ECS_CONTAINER_METADATA_URI")
+
+ log.Printf("Getting ECS metadata from %s\n", ecsMetadataURL)
resp, err := http.Get(ecsMetadataURL)
if err != nil {
diff --git a/app/server/routes.go b/app/server/routes.go
index e5f7dcaf..6cef9189 100644
--- a/app/server/routes.go
+++ b/app/server/routes.go
@@ -3,6 +3,7 @@ package main
import (
"fmt"
"net/http"
+ "os"
"plandex-server/handlers"
"github.com/gorilla/mux"
@@ -12,7 +13,19 @@ func routes() *mux.Router {
r := mux.NewRouter()
r.HandleFunc("/health", func(w http.ResponseWriter, r *http.Request) {
- fmt.Fprintf(w, "OK")
+ fmt.Fprint(w, "OK")
+ })
+
+ r.HandleFunc("/version", func(w http.ResponseWriter, r *http.Request) {
+ // get version from version.txt
+ bytes, err := os.ReadFile("version.txt")
+
+ if err != nil {
+ http.Error(w, "Error getting version", http.StatusInternalServerError)
+ return
+ }
+
+ fmt.Fprint(w, string(bytes))
})
r.HandleFunc("/accounts/start_trial", handlers.StartTrialHandler).Methods("POST")
diff --git a/releases/server/versions/0.7.1.md b/releases/server/versions/0.7.1.md
new file mode 100644
index 00000000..435d3cb8
--- /dev/null
+++ b/releases/server/versions/0.7.1.md
@@ -0,0 +1,2 @@
+- Fix for SMTP email issue
+- Add '/version' endpoint to server
\ No newline at end of file
diff --git a/releases/server/versions/CHANGELOG.md b/releases/server/versions/CHANGELOG.md
deleted file mode 100644
index e69de29b..00000000