add reconnect to websocket, add get world json object
This commit is contained in:
@@ -5,22 +5,13 @@ import (
|
||||
)
|
||||
|
||||
func (app *application) ShowText(w http.ResponseWriter, r *http.Request) {
|
||||
data, err := app.foundryApp.HandleWSRequest("/join")
|
||||
data, err := app.foundryApp.Test()
|
||||
if err != nil {
|
||||
app.slogger.Error("", "error", err)
|
||||
w.Write([]byte(err.Error()))
|
||||
return
|
||||
}
|
||||
|
||||
// setupData, err := models.ParseSetupModel(data)
|
||||
// if err != nil {
|
||||
// app.slogger.Error("", "error", err)
|
||||
// w.Write([]byte(err.Error()))
|
||||
// return
|
||||
// }
|
||||
|
||||
// fmt.Printf("JSON msg: %t\n", setupData.IsAdmin)
|
||||
|
||||
w.Write(data)
|
||||
}
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ func (app *application) healthcheckHandler(w http.ResponseWriter, r *http.Reques
|
||||
"status": app.foundryApp.Status,
|
||||
"is_available": app.foundryApp.IsAvailable,
|
||||
},
|
||||
"config": app.foundryApp.GetHTTP(),
|
||||
}
|
||||
err := app.writeJSON(w, http.StatusOK, env, nil)
|
||||
if err != nil {
|
||||
|
||||
@@ -6,6 +6,7 @@ import (
|
||||
"flag"
|
||||
"log"
|
||||
"log/slog"
|
||||
"net/http/cookiejar"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
@@ -84,7 +85,7 @@ func (app *application) parseFlags() *requests.FoundryHttpRequest {
|
||||
var mode string
|
||||
flag.StringVar(&mode, "service_mode", "api", "Type of service mode(api|discord|tg)")
|
||||
|
||||
foundryHttpData := requests.FoundryHttpRequest{SessionID: ""}
|
||||
foundryHttpData := requests.FoundryHttpRequest{SessionID: nil}
|
||||
flag.StringVar(&foundryHttpData.Host, "foundry_host", "127.0.0.1", "Address to connect to Foundry")
|
||||
flag.StringVar(&foundryHttpData.Password, "foundry_pass", "", "Password to connect to Foundry")
|
||||
|
||||
@@ -112,6 +113,12 @@ func main() {
|
||||
app := application{foundryApp: &foundry.FoundryApi{}}
|
||||
|
||||
foundryHttpData := app.parseFlags()
|
||||
jar, err := cookiejar.New(nil)
|
||||
if err != nil {
|
||||
app.slogger.Error("Error", "text", err.Error())
|
||||
return
|
||||
}
|
||||
foundryHttpData.Jar = jar
|
||||
|
||||
app.slogger.Info("", "dsn", app.cfg.db.dsn)
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ func (app *application) serve() error {
|
||||
}
|
||||
|
||||
app.slogger.Info("Stopped server", "addr", srv.Addr)
|
||||
err = <-shutdownError
|
||||
// err = <-shutdownError
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user