fix websocket upgrader

osspkg · Jan 15, 2024 · 2d3c8d3 · 2d3c8d3
1 parent f71f2a6
commit 2d3c8d3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/examples/go.mod b/examples/go.mod
@@ -38,7 +38,7 @@ replace (
 
 require (
 	go.osspkg.com/goppy v0.0.0-00010101000000-000000000000
-	go.osspkg.com/goppy/app v0.3.0
+	go.osspkg.com/goppy/app v0.3.1
 	go.osspkg.com/goppy/auth v0.0.0-00010101000000-000000000000
 	go.osspkg.com/goppy/console v0.3.0
 	go.osspkg.com/goppy/geoip v0.0.0-00010101000000-000000000000
@@ -47,13 +47,13 @@ require (
 	go.osspkg.com/goppy/ormmysql v0.0.0-00010101000000-000000000000
 	go.osspkg.com/goppy/ormpgsql v0.0.0-00010101000000-000000000000
 	go.osspkg.com/goppy/ormsqlite v0.0.0-00010101000000-000000000000
-	go.osspkg.com/goppy/plugins v0.3.0
+	go.osspkg.com/goppy/plugins v0.3.1
 	go.osspkg.com/goppy/routine v0.3.0
 	go.osspkg.com/goppy/syscall v0.3.0
 	go.osspkg.com/goppy/tcp v0.0.0-00010101000000-000000000000
 	go.osspkg.com/goppy/udp v0.0.0-00010101000000-000000000000
 	go.osspkg.com/goppy/unixsocket v0.0.0-00010101000000-000000000000
-	go.osspkg.com/goppy/web v0.3.0
+	go.osspkg.com/goppy/web v0.3.1
 	go.osspkg.com/goppy/ws v0.0.0-00010101000000-000000000000
 	go.osspkg.com/goppy/xc v0.3.0
 	go.osspkg.com/goppy/xdns v0.0.0-00010101000000-000000000000

diff --git a/ws/internal/common.go b/ws/internal/common.go
@@ -7,6 +7,7 @@ package internal
 
 import (
 	"net/http"
+	"sync"
 	"time"
 
 	"github.com/gorilla/websocket"
@@ -24,11 +25,12 @@ var (
 	ErrUnknownEventID = errors.New("unknown event id")
 )
 
-func NewUpgrader() websocket.Upgrader {
-	return websocket.Upgrader{
-		EnableCompression: true,
+func NewUpgrader() *websocket.Upgrader {
+	return &websocket.Upgrader{
+		EnableCompression: false,
 		ReadBufferSize:    1024,
 		WriteBufferSize:   1024,
+		WriteBufferPool:   &sync.Pool{},
 		CheckOrigin: func(_ *http.Request) bool {
 			return true
 		},

diff --git a/ws/plugin_ws_server.go b/ws/plugin_ws_server.go
@@ -17,19 +17,19 @@ import (
 	"go.osspkg.com/goppy/xlog"
 )
 
-func WebsocketServerOptionCompression(enable bool) func(websocket.Upgrader) {
-	return func(upg websocket.Upgrader) {
-		upg.EnableCompression = enable
+func WebsocketServerOptionCompression(enable bool) func(*websocket.Upgrader) {
+	return func(u *websocket.Upgrader) {
+		u.EnableCompression = enable
 	}
 }
 
-func WebsocketServerOptionBuffer(read, write int) func(websocket.Upgrader) {
-	return func(upg websocket.Upgrader) {
-		upg.ReadBufferSize, upg.WriteBufferSize = read, write
+func WebsocketServerOptionBuffer(read, write int) func(*websocket.Upgrader) {
+	return func(u *websocket.Upgrader) {
+		u.ReadBufferSize, u.WriteBufferSize = read, write
 	}
 }
 
-func WithWebsocketServer(options ...func(websocket.Upgrader)) plugins.Plugin {
+func WithWebsocketServer(options ...func(*websocket.Upgrader)) plugins.Plugin {
 	return plugins.Plugin{
 		Inject: func(l xlog.Logger, ctx xc.Context) (*wssProvider, WebsocketServer) {
 			wsp := newWsServerProvider(l, ctx, options...)
@@ -55,7 +55,7 @@ type (
 	}
 )
 
-func newWsServerProvider(l xlog.Logger, ctx xc.Context, options ...func(websocket.Upgrader)) *wssProvider {
+func newWsServerProvider(l xlog.Logger, ctx xc.Context, options ...func(*websocket.Upgrader)) *wssProvider {
 	return &wssProvider{
 		log:  l,
 		serv: server.New(l, ctx.Context(), options...),

diff --git a/ws/plugin_ws_server_pool.go b/ws/plugin_ws_server_pool.go
@@ -16,7 +16,7 @@ import (
 	"go.osspkg.com/goppy/xlog"
 )
 
-func WithWebsocketServerPool(options ...func(websocket.Upgrader)) plugins.Plugin {
+func WithWebsocketServerPool(options ...func(*websocket.Upgrader)) plugins.Plugin {
 	return plugins.Plugin{
 		Inject: func(l xlog.Logger) WebsocketServerPool {
 			return &wssPool{
@@ -30,7 +30,7 @@ func WithWebsocketServerPool(options ...func(websocket.Upgrader)) plugins.Plugin
 
 type (
 	wssPool struct {
-		options []func(websocket.Upgrader)
+		options []func(*websocket.Upgrader)
 		pool    map[string]*server.Server
 		log     xlog.Logger
 		ctx     context.Context

diff --git a/ws/server/server.go b/ws/server/server.go
@@ -20,15 +20,15 @@ import (
 type Server struct {
 	clients map[string]*Connect
 	events  map[event.Id]EventHandler
-	upgrade websocket.Upgrader
+	upgrade *websocket.Upgrader
 	logger  xlog.Logger
 	ctx     context.Context
 	cancel  context.CancelFunc
 	mux     iosync.Lock
 	wg      iosync.Group
 }
 
-func New(l xlog.Logger, ctx context.Context, opts ...func(u websocket.Upgrader)) *Server {
+func New(l xlog.Logger, ctx context.Context, opts ...func(u *websocket.Upgrader)) *Server {
 	up := internal.NewUpgrader()
 	c, cancel := context.WithCancel(ctx)
 	for _, opt := range opts {