实现websocket基本功能

internal/rpc/services/service_http_location.go

@@ -134,32 +134,32 @@ func (this *HTTPLocationService) FindAndInitHTTPLocationWebConfig(ctx context.Co
 	// 校验请求
 	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
 	if err != nil {
-		return nil, err
+		return nil, rpcutils.Wrap("ValidateRequest()", err)
 	}
 
 	webId, err := models.SharedHTTPLocationDAO.FindLocationWebId(req.LocationId)
 	if err != nil {
-		return nil, err
+		return nil, rpcutils.Wrap("FindLocationWebId()", err)
 	}
 
 	if webId <= 0 {
 		webId, err = models.SharedHTTPWebDAO.CreateWeb(nil)
 		if err != nil {
-			return nil, err
+			return nil, rpcutils.Wrap("CreateWeb()", err)
 		}
 		err = models.SharedHTTPLocationDAO.UpdateLocationWeb(req.LocationId, webId)
 		if err != nil {
-			return nil, err
+			return nil, rpcutils.Wrap("UpdateLocationWeb()", err)
 		}
 	}
 
 	config, err := models.SharedHTTPWebDAO.ComposeWebConfig(webId)
 	if err != nil {
-		return nil, err
+		return nil, rpcutils.Wrap("ComposeWebConfig()", err)
 	}
 	configJSON, err := json.Marshal(config)
 	if err != nil {
-		return nil, err
+		return nil, rpcutils.Wrap("json.Marshal()", err)
 	}
 	return &pb.FindAndInitHTTPLocationWebConfigResponse{
 		WebJSON: configJSON,

internal/rpc/services/service_http_web.go

@@ -257,7 +257,7 @@ func (this *HTTPWebService) UpdateHTTPWebLocations(ctx context.Context, req *pb.
 	return rpcutils.RPCUpdateSuccess()
 }
 
-// 跳转到HTTPS
+// 更改跳转到HTTPS设置
 func (this *HTTPWebService) UpdateHTTPWebRedirectToHTTPS(ctx context.Context, req *pb.UpdateHTTPWebRedirectToHTTPSRequest) (*pb.RPCUpdateSuccess, error) {
 	// 校验请求
 	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
@@ -271,3 +271,18 @@ func (this *HTTPWebService) UpdateHTTPWebRedirectToHTTPS(ctx context.Context, re
 	}
 	return rpcutils.RPCUpdateSuccess()
 }
+
+// 更改Websocket设置
+func (this *HTTPWebService) UpdateHTTPWebWebsocket(ctx context.Context, req *pb.UpdateHTTPWebWebsocketRequest) (*pb.RPCUpdateSuccess, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedHTTPWebDAO.UpdateWebsocket(req.WebId, req.WebsocketJSON)
+	if err != nil {
+		return nil, err
+	}
+	return rpcutils.RPCUpdateSuccess()
+}

internal/rpc/services/service_http_websocket.go

@@ -0,0 +1,41 @@
+package services
+
+import (
+	"context"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
+	rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type HTTPWebsocketService struct {
+}
+
+// 创建Websocket配置
+func (this *HTTPWebsocketService) CreateHTTPWebsocket(ctx context.Context, req *pb.CreateHTTPWebsocketRequest) (*pb.CreateHTTPWebsocketResponse, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	websocketId, err := models.SharedHTTPWebsocketDAO.CreateWebsocket(req.HandshakeTimeoutJSON, req.AllowAllOrigins, req.AllowedOrigins, req.RequestSameOrigin, req.RequestOrigin)
+	if err != nil {
+		return nil, err
+	}
+	return &pb.CreateHTTPWebsocketResponse{WebsocketId: websocketId}, nil
+}
+
+// 修改Websocket配置
+func (this *HTTPWebsocketService) UpdateHTTPWebsocket(ctx context.Context, req *pb.UpdateHTTPWebsocketRequest) (*pb.RPCUpdateSuccess, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedHTTPWebsocketDAO.UpdateWebsocket(req.WebsocketId, req.HandshakeTimeoutJSON, req.AllowAllOrigins, req.AllowedOrigins, req.RequestSameOrigin, req.RequestOrigin)
+	if err != nil {
+		return nil, err
+	}
+	return rpcutils.RPCUpdateSuccess()
+}

internal/rpc/utils/utils.go

@@ -127,3 +127,11 @@ func RPCUpdateSuccess() (*pb.RPCUpdateSuccess, error) {
 func RPCDeleteSuccess() (*pb.RPCDeleteSuccess, error) {
 	return &pb.RPCDeleteSuccess{}, nil
 }
+
+// 包装错误
+func Wrap(description string, err error) error {
+	if err == nil {
+		return errors.New(description)
+	}
+	return errors.New(description + ": " + err.Error())
+}