Merge pull request #137 from yokowu/fix-vsix-port

fix: 修复插件下载端口不对

Author: yokowu

backend/config/config.go

@@ -2,6 +2,8 @@ package config
 
 import (
 	_ "embed"
+	"fmt"
+	"net/http"
 	"strings"
 
 	"github.com/spf13/viper"
@@ -19,6 +21,7 @@ type Config struct {
 
 	Server struct {
 		Addr string `mapstructure:"addr"`
+		Port string `mapstructure:"port"`
 	} `mapstructure:"server"`
 
 	Admin struct {
@@ -72,6 +75,17 @@ type Config struct {
 	} `mapstructure:"data_report"`
 }
 
+func (c *Config) GetBaseURL(req *http.Request) string {
+	scheme := "http"
+	if req.TLS != nil {
+		scheme = "https"
+	}
+	if proto := req.Header.Get("X-Forwarded-Proto"); proto != "" {
+		scheme = proto
+	}
+	return fmt.Sprintf("%s://%s:%s", scheme, req.Host, c.Server.Port)
+}
+
 func Init() (*Config, error) {
 	v := viper.New()
 	v.AutomaticEnv()
@@ -81,6 +95,7 @@ func Init() (*Config, error) {
 	v.SetDefault("debug", false)
 	v.SetDefault("logger.level", "info")
 	v.SetDefault("server.addr", ":8888")
+	v.SetDefault("server.port", "")
 	v.SetDefault("admin.user", "admin")
 	v.SetDefault("admin.password", "")
 	v.SetDefault("admin.limit", 100)

backend/internal/openai/handler/v1/v1.go

@@ -13,7 +13,6 @@ import (
 	"github.com/chaitin/MonkeyCode/backend/domain"
 	"github.com/chaitin/MonkeyCode/backend/internal/middleware"
 	"github.com/chaitin/MonkeyCode/backend/internal/proxy"
-	"github.com/chaitin/MonkeyCode/backend/pkg/request"
 )
 
 type V1Handler struct {
@@ -76,7 +75,7 @@ func (h *V1Handler) Version(c *web.Context) error {
 
 	return c.JSON(http.StatusOK, domain.VersionInfo{
 		Version: v.Version,
-		URL:     fmt.Sprintf("%s/api/v1/static/vsix/%s", request.GetBaseURL(c.Request()), v.Version),
+		URL:     fmt.Sprintf("%s/api/v1/static/vsix/%s", h.config.GetBaseURL(c.Request()), v.Version),
 	})
 }
 
@@ -183,7 +182,7 @@ func (h *V1Handler) Embeddings(c *web.Context) error {
 func (h *V1Handler) GetConfig(c *web.Context, req domain.ConfigReq) error {
 	key := middleware.GetApiKey(c)
 	req.Key = key.Key
-	req.BaseURL = request.GetBaseURL(c.Request())
+	req.BaseURL = h.config.GetBaseURL(c.Request())
 	resp, err := h.usecase.GetConfig(c.Request().Context(), &req)
 	if err != nil {
 		return err

backend/internal/user/handler/v1/user.go

@@ -18,7 +18,6 @@ import (
 	"github.com/chaitin/MonkeyCode/backend/domain"
 	"github.com/chaitin/MonkeyCode/backend/errcode"
 	"github.com/chaitin/MonkeyCode/backend/internal/middleware"
-	"github.com/chaitin/MonkeyCode/backend/pkg/request"
 	"github.com/chaitin/MonkeyCode/backend/pkg/session"
 	"github.com/chaitin/MonkeyCode/backend/pkg/vsix"
 )
@@ -126,7 +125,7 @@ func NewUserHandler(
 }
 
 func (h *UserHandler) VSCodeAuthInit(c *web.Context, req domain.VSCodeAuthInitReq) error {
-	req.BaseURL = request.GetBaseURL(c.Request())
+	req.BaseURL = h.cfg.GetBaseURL(c.Request())
 	resp, err := h.usecase.VSCodeAuthInit(c.Request().Context(), &req)
 	if err != nil {
 		return err
@@ -173,7 +172,9 @@ func (h *UserHandler) VSIXDownload(c *web.Context) error {
 		return err
 	}
 
-	cacheKey := h.generateCacheKey(v.Version, request.GetBaseURL(c.Request()))
+	host := c.Request().Host
+	h.logger.With("url", c.Request().URL).With("header", c.Request().Header).With("host", host).DebugContext(c.Request().Context(), "vsix download")
+	cacheKey := h.generateCacheKey(v.Version, h.cfg.GetBaseURL(c.Request()))
 
 	h.cacheMu.RLock()
 	if entry, exists := h.vsixCache[cacheKey]; exists {
@@ -192,7 +193,7 @@ func (h *UserHandler) VSIXDownload(c *web.Context) error {
 	h.cacheMu.RUnlock()
 
 	var buf bytes.Buffer
-	if err := vsix.ChangeVsixEndpoint(v.Path, "extension/package.json", request.GetBaseURL(c.Request()), &buf); err != nil {
+	if err := vsix.ChangeVsixEndpoint(v.Path, "extension/package.json", h.cfg.GetBaseURL(c.Request()), &buf); err != nil {
 		return err
 	}
 
@@ -559,7 +560,7 @@ func (h *UserHandler) UpdateSetting(c *web.Context, req domain.UpdateSettingReq)
 //	@Router			/api/v1/user/oauth/signup-or-in [get]
 func (h *UserHandler) OAuthSignUpOrIn(ctx *web.Context, req domain.OAuthSignUpOrInReq) error {
 	h.logger.With("req", req).DebugContext(ctx.Request().Context(), "OAuthSignUpOrIn")
-	req.BaseURL = request.GetBaseURL(ctx.Request())
+	req.BaseURL = h.cfg.GetBaseURL(ctx.Request())
 	resp, err := h.usecase.OAuthSignUpOrIn(ctx.Request().Context(), &req)
 	if err != nil {
 		return err

backend/internal/user/usecase/user.go

@@ -24,7 +24,6 @@ import (
 	"github.com/chaitin/MonkeyCode/backend/errcode"
 	"github.com/chaitin/MonkeyCode/backend/pkg/cvt"
 	"github.com/chaitin/MonkeyCode/backend/pkg/oauth"
-	"github.com/chaitin/MonkeyCode/backend/pkg/request"
 	"github.com/chaitin/MonkeyCode/backend/pkg/session"
 )
 
@@ -498,7 +497,7 @@ func (u *UserUsecase) OAuthSignUpOrIn(ctx context.Context, req *domain.OAuthSign
 func (u *UserUsecase) OAuthCallback(c *web.Context, req *domain.OAuthCallbackReq) error {
 	ctx := c.Request().Context()
 	req.IP = c.RealIP()
-	req.BaseURL = request.GetBaseURL(c.Request())
+	req.BaseURL = u.cfg.GetBaseURL(c.Request())
 	b, err := u.redis.Get(ctx, fmt.Sprintf("oauth:state:%s", req.State)).Result()
 	if err != nil {
 		return err

backend/pkg/request/request.go

@@ -195,14 +195,3 @@ func GetHeaderMap(header string) map[string]string {
 	}
 	return headerMap
 }
-
-func GetBaseURL(req *http.Request) string {
-	scheme := "http"
-	if req.TLS != nil {
-		scheme = "https"
-	}
-	if proto := req.Header.Get("X-Forwarded-Proto"); proto != "" {
-		scheme = proto
-	}
-	return fmt.Sprintf("%s://%s", scheme, req.Host)
-}