fixing #190

doing #190

Author: karldoenitz

.gitignore

@@ -16,4 +16,5 @@
 *.log
 external_tools/*/main
 *plan.md
-ignores/
+ignores/
+.DS_Store

web/urlpattern.go

@@ -16,6 +16,12 @@ const (
 	FnTeardownRequest = "TeardownRequest"
 )
 
+// websocket 定义函数名
+const (
+	FnWebSocketCommunicate = "Communicate"
+	FnWebSocketBaseHandler = "WSBaseHandler"
+)
+
 // UrlPatternHandle 是URL路由句柄，用来驱动url路由以及其映射的handler
 type UrlPatternHandle struct {
 	Handler    reflect.Type
@@ -73,6 +79,17 @@ func (urlPattern *UrlPattern) AppendRouterPattern(pattern Pattern, v interface {
 		fileRouter.PathPrefix("/").Handler(http.StripPrefix(pattern.Url, fileServer))
 		return
 	}
+	// 判断是否是Websocket
+	if _, isWSHandler := v.(*WSPatternHandle); isWSHandler {
+		var wsMiddleware []middleware
+		for _, mv := range pattern.Middleware {
+			m := convertHandleFuncMV(mv)
+			wsMiddleware = append(wsMiddleware, m)
+		}
+		wsMiddlewares := chainMiddleware(wsMiddleware...)
+		urlPattern.router.HandleFunc(pattern.Url, wsMiddlewares(v.Handle))
+		return
+	}
 	// 判断是否是handler
 	baseMiddleware := []middleware{HttpContextLogMiddleware, InternalServerErrorMiddleware}
 	for _, mv := range pattern.Middleware {
@@ -90,6 +107,16 @@ func (urlPattern *UrlPattern) Init() {
 		if handlerType.Kind() == reflect.Ptr {
 			handlerType = handlerType.Elem()
 		}
+		// 判断是否是 WSHandlerInterface 接口类型
+		// 判断 handlerType 是否包含成员变量 WSBaseHandler
+		_, isWSHandler := handlerType.FieldByName(FnWebSocketBaseHandler)
+		if isWSHandler {
+			urlPattern.AppendRouterPattern(pattern, &WSPatternHandle{
+				Handler:    handlerType,
+				requestUrl: pattern.Url,
+			})
+			continue
+		}
 		urlPattern.AppendRouterPattern(pattern, &UrlPatternHandle{
 			Handler:    handlerType,
 			requestUrl: pattern.Url,

web/wshandler.go

@@ -0,0 +1,55 @@
+package web
+
+import (
+	"net/http"
+	"reflect"
+
+	"github.com/gorilla/websocket"
+	"github.com/karldoenitz/Tigo/logger"
+)
+
+// 定义一个 Upgrader，用于处理 HTTP 升级请求
+var upgrader = websocket.Upgrader{
+	CheckOrigin: func(r *http.Request) bool {
+		return true // 开发时允许所有跨域，生产环境应严格校验 Origin 头
+	},
+}
+
+// SetWSUpgrader 设置 websocket 升级器
+//   - u: 自定义的升级器
+func SetWSUpgrader(u *websocket.Upgrader) {
+	upgrader = *u
+}
+
+type WSPatternHandle struct {
+	Handler    reflect.Type
+	requestUrl string
+}
+
+func (wsHandler WSPatternHandle) Handle(responseWriter http.ResponseWriter, request *http.Request) {
+	// 加载handler
+	handler := reflect.New(wsHandler.Handler)
+	// 1. 将 HTTP 连接升级为 WebSocket 连接
+	conn, err := upgrader.Upgrade(responseWriter, request, nil)
+	if err != nil {
+		logger.Error.Println("升级失败:", err)
+		return
+	}
+	defer func() {
+		// 关闭连接
+		_ = conn.Close()
+	}()
+	logger.Info.Printf("websocket | %s | connect success", wsHandler.requestUrl)
+	// 调用 Communicate 方法
+	VoidFuncCall(handler, FnWebSocketCommunicate, reflect.ValueOf(conn))
+}
+
+type WSBaseHandler struct {
+}
+
+func (h *WSBaseHandler) Communicate(conn *websocket.Conn) {
+	respMsg := []byte("Communicate is not implemented")
+	if err := conn.WriteMessage(websocket.TextMessage, respMsg); err != nil {
+		logger.Error.Println("发送错误:", err)
+	}
+}