add endpoints for ip and captcha challenge as json

cmd/ogamed/main.go

@@ -245,7 +245,9 @@ func start(c *cli.Context) error {
 	// CAPTCHA Handler
 	e.GET("/bot/captcha", wrapper.GetCaptchaHandler)
 	e.POST("/bot/captcha/solve", wrapper.GetCaptchaSolverHandler)
+	e.GET("/bot/captcha/challenge", wrapper.GetCaptchaChallengeHandler)
 
+	e.GET("/bot/ip", wrapper.GetPublicIPHandler)
 	e.GET("/bot/server", wrapper.GetServerHandler)
 	e.GET("/bot/server-data", wrapper.GetServerDataHandler)
 	e.POST("/bot/set-user-agent", wrapper.SetUserAgentHandler)

pkg/wrapper/handlers.go

@@ -1405,3 +1405,43 @@ func GetCaptchaSolverHandler(c echo.Context) error {
 	}
 	return c.Redirect(http.StatusTemporaryRedirect, "/")
 }
+
+// CaptchaChallenge ...
+type CaptchaChallenge struct {
+	ID       string
+	Question string
+	Icons    string
+}
+
+// GetCaptchaChallengeHandler ...
+func GetCaptchaChallengeHandler(c echo.Context) error {
+	bot := c.Get("bot").(*OGame)
+	_, err := GFLogin(bot.client, bot.ctx, bot.lobby, bot.Username, bot.password, bot.otpSecret, "")
+	var captchaErr *CaptchaRequiredError
+	if errors.As(err, &captchaErr) {
+		questionRaw, iconsRaw, err := StartCaptchaChallenge(bot.GetClient(), bot.ctx, captchaErr.ChallengeID)
+		if err != nil {
+			return c.JSON(http.StatusInternalServerError, ErrorResp(500, err.Error()))
+		}
+		questionB64 := base64.StdEncoding.EncodeToString(questionRaw)
+		iconsB64 := base64.StdEncoding.EncodeToString(iconsRaw)
+		return c.JSON(http.StatusOK, SuccessResp(CaptchaChallenge{
+			ID:       captchaErr.ChallengeID,
+			Question: questionB64,
+			Icons:    iconsB64,
+		}))
+	} else if err != nil {
+		return c.JSON(http.StatusInternalServerError, ErrorResp(500, err.Error()))
+	}
+	return c.JSON(http.StatusOK, SuccessResp(CaptchaChallenge{}))
+}
+
+// GetPublicIPHandler ...
+func GetPublicIPHandler(c echo.Context) error {
+	bot := c.Get("bot").(*OGame)
+	ip, err := bot.GetPublicIP()
+	if err != nil {
+		return c.JSON(http.StatusInternalServerError, ErrorResp(500, err.Error()))
+	}
+	return c.JSON(http.StatusOK, SuccessResp(ip))
+}