Merge pull request #89 from ayamzh/mazheng

AlexStocks · web-flow · commit 1054b175caba · 2025-09-01T18:52:37.000+08:00
upgrade the go version to 1.25
diff --git a/change_log.md b/change_log.md
@@ -14,6 +14,11 @@
 ## develop history ##
 ---
 
+- 2025/09/01
+    > Improvement
+    * upgrade the go version to v1.25 in go.mod
+    * using any instead of interface{} throughout the codebase
+
 - 2020/01/11
     > Feature
     * Imp: enlarge time wheel span from 2 mimutes to 15 minutes
diff --git a/examples/echo/tcp-echo/client/app/handler.go b/examples/echo/tcp-echo/client/app/handler.go
@@ -63,7 +63,7 @@ func (h *EchoMessageHandler) OnClose(session getty.Session) {
 	client.removeSession(session)
 }
 
-func (h *EchoMessageHandler) OnMessage(session getty.Session, pkg interface{}) {
+func (h *EchoMessageHandler) OnMessage(session getty.Session, pkg any) {
 	p, ok := pkg.(*EchoPackage)
 	if !ok {
 		log.Error("illegal packge{%#v}", pkg)
diff --git a/examples/echo/tcp-echo/client/app/readwriter.go b/examples/echo/tcp-echo/client/app/readwriter.go
@@ -36,7 +36,7 @@ func NewEchoPackageHandler() *EchoPackageHandler {
 	return &EchoPackageHandler{}
 }
 
-func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (interface{}, int, error) {
+func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (any, int, error) {
 	var (
 		err error
 		len int
@@ -57,7 +57,7 @@ func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (interface{}, i
 	return &pkg, len, nil
 }
 
-func (h *EchoPackageHandler) Write(ss getty.Session, pkg interface{}) ([]byte, error) {
+func (h *EchoPackageHandler) Write(ss getty.Session, pkg any) ([]byte, error) {
 	var (
 		ok        bool
 		err       error
diff --git a/examples/echo/tcp-echo/server/app/handler.go b/examples/echo/tcp-echo/server/app/handler.go
@@ -133,7 +133,7 @@ func (h *EchoMessageHandler) OnClose(session getty.Session) {
 	h.rwlock.Unlock()
 }
 
-func (h *EchoMessageHandler) OnMessage(session getty.Session, pkg interface{}) {
+func (h *EchoMessageHandler) OnMessage(session getty.Session, pkg any) {
 	p, ok := pkg.(*EchoPackage)
 	if !ok {
 		log.Error("illegal packge{%#v}", pkg)
diff --git a/examples/echo/tcp-echo/server/app/readwriter.go b/examples/echo/tcp-echo/server/app/readwriter.go
@@ -39,7 +39,7 @@ func NewEchoPackageHandler() *EchoPackageHandler {
 	return &EchoPackageHandler{}
 }
 
-func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (interface{}, int, error) {
+func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (any, int, error) {
 	var (
 		err error
 		len int
@@ -60,7 +60,7 @@ func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (interface{}, i
 	return &pkg, len, nil
 }
 
-func (h *EchoPackageHandler) Write(ss getty.Session, pkg interface{}) ([]byte, error) {
+func (h *EchoPackageHandler) Write(ss getty.Session, pkg any) ([]byte, error) {
 	var (
 		ok        bool
 		err       error
diff --git a/examples/echo/udp-echo/client/app/handler.go b/examples/echo/udp-echo/client/app/handler.go
@@ -62,7 +62,7 @@ func (h *EchoMessageHandler) OnClose(session getty.Session) {
 	h.client.removeSession(session)
 }
 
-func (h *EchoMessageHandler) OnMessage(session getty.Session, udpCtx interface{}) {
+func (h *EchoMessageHandler) OnMessage(session getty.Session, udpCtx any) {
 	ctx, ok := udpCtx.(getty.UDPContext)
 	if !ok {
 		log.Error("illegal UDPContext{%#v}", udpCtx)
diff --git a/examples/echo/udp-echo/client/app/readwriter.go b/examples/echo/udp-echo/client/app/readwriter.go
@@ -37,7 +37,7 @@ func NewEchoPackageHandler() *EchoPackageHandler {
 	return &EchoPackageHandler{}
 }
 
-func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (interface{}, int, error) {
+func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (any, int, error) {
 	var (
 		err error
 		len int
@@ -58,7 +58,7 @@ func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (interface{}, i
 	return &pkg, len, nil
 }
 
-func (h *EchoPackageHandler) Write(ss getty.Session, udpCtx interface{}) ([]byte, error) {
+func (h *EchoPackageHandler) Write(ss getty.Session, udpCtx any) ([]byte, error) {
 	var (
 		ok        bool
 		err       error
diff --git a/examples/echo/udp-echo/server/app/handler.go b/examples/echo/udp-echo/server/app/handler.go
@@ -143,7 +143,7 @@ func (h *EchoMessageHandler) OnClose(session getty.Session) {
 	h.rwlock.Unlock()
 }
 
-func (h *EchoMessageHandler) OnMessage(session getty.Session, udpCtx interface{}) {
+func (h *EchoMessageHandler) OnMessage(session getty.Session, udpCtx any) {
 	ctx, ok := udpCtx.(getty.UDPContext)
 	if !ok {
 		log.Error("illegal UDPContext{%#v}", udpCtx)
diff --git a/examples/echo/udp-echo/server/app/readwriter.go b/examples/echo/udp-echo/server/app/readwriter.go
@@ -37,7 +37,7 @@ func NewEchoPackageHandler() *EchoPackageHandler {
 	return &EchoPackageHandler{}
 }
 
-func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (interface{}, int, error) {
+func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (any, int, error) {
 	var (
 		err error
 		len int
@@ -58,7 +58,7 @@ func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (interface{}, i
 	return &pkg, len, nil
 }
 
-func (h *EchoPackageHandler) Write(ss getty.Session, udpCtx interface{}) ([]byte, error) {
+func (h *EchoPackageHandler) Write(ss getty.Session, udpCtx any) ([]byte, error) {
 	var (
 		ok        bool
 		err       error
diff --git a/examples/echo/ws-echo/client/app/handler.go b/examples/echo/ws-echo/client/app/handler.go
@@ -63,7 +63,7 @@ func (h *EchoMessageHandler) OnClose(session getty.Session) {
 	client.removeSession(session)
 }
 
-func (h *EchoMessageHandler) OnMessage(session getty.Session, pkg interface{}) {
+func (h *EchoMessageHandler) OnMessage(session getty.Session, pkg any) {
 	p, ok := pkg.(*EchoPackage)
 	if !ok {
 		log.Error("illegal packge{%#v}", pkg)
diff --git a/examples/echo/ws-echo/client/app/readwriter.go b/examples/echo/ws-echo/client/app/readwriter.go
@@ -36,7 +36,7 @@ func NewEchoPackageHandler() *EchoPackageHandler {
 	return &EchoPackageHandler{}
 }
 
-func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (interface{}, int, error) {
+func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (any, int, error) {
 	var (
 		err error
 		len int
@@ -57,7 +57,7 @@ func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (interface{}, i
 	return &pkg, len, nil
 }
 
-func (h *EchoPackageHandler) Write(ss getty.Session, pkg interface{}) ([]byte, error) {
+func (h *EchoPackageHandler) Write(ss getty.Session, pkg any) ([]byte, error) {
 	var (
 		ok        bool
 		err       error
diff --git a/examples/echo/ws-echo/server/app/handler.go b/examples/echo/ws-echo/server/app/handler.go
@@ -107,7 +107,7 @@ func (h *EchoMessageHandler) OnClose(session getty.Session) {
 	h.rwlock.Unlock()
 }
 
-func (h *EchoMessageHandler) OnMessage(session getty.Session, pkg interface{}) {
+func (h *EchoMessageHandler) OnMessage(session getty.Session, pkg any) {
 	p, ok := pkg.(*EchoPackage)
 	if !ok {
 		log.Error("illegal packge{%#v}, %s", pkg, string(pkg.([]byte)))
diff --git a/examples/echo/ws-echo/server/app/readwriter.go b/examples/echo/ws-echo/server/app/readwriter.go
@@ -36,7 +36,7 @@ func NewEchoPackageHandler() *EchoPackageHandler {
 	return &EchoPackageHandler{}
 }
 
-func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (interface{}, int, error) {
+func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (any, int, error) {
 	// log.Debug("get client package:%s", gxstrings.String(data))
 	var (
 		err error
@@ -60,7 +60,7 @@ func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (interface{}, i
 	// return data, len(data), nil
 }
 
-func (h *EchoPackageHandler) Write(ss getty.Session, pkg interface{}) ([]byte, error) {
+func (h *EchoPackageHandler) Write(ss getty.Session, pkg any) ([]byte, error) {
 	var (
 		ok        bool
 		err       error
diff --git a/examples/echo/wss-echo/client/app/handler.go b/examples/echo/wss-echo/client/app/handler.go
@@ -63,7 +63,7 @@ func (h *EchoMessageHandler) OnClose(session getty.Session) {
 	client.removeSession(session)
 }
 
-func (h *EchoMessageHandler) OnMessage(session getty.Session, pkg interface{}) {
+func (h *EchoMessageHandler) OnMessage(session getty.Session, pkg any) {
 	p, ok := pkg.(*EchoPackage)
 	if !ok {
 		log.Error("illegal packge{%#v}", pkg)
diff --git a/examples/echo/wss-echo/client/app/readwriter.go b/examples/echo/wss-echo/client/app/readwriter.go
@@ -36,7 +36,7 @@ func NewEchoPackageHandler() *EchoPackageHandler {
 	return &EchoPackageHandler{}
 }
 
-func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (interface{}, int, error) {
+func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (any, int, error) {
 	var (
 		err error
 		len int
@@ -57,7 +57,7 @@ func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (interface{}, i
 	return &pkg, len, nil
 }
 
-func (h *EchoPackageHandler) Write(ss getty.Session, pkg interface{}) ([]byte, error) {
+func (h *EchoPackageHandler) Write(ss getty.Session, pkg any) ([]byte, error) {
 	var (
 		ok        bool
 		err       error
diff --git a/examples/echo/wss-echo/server/app/handler.go b/examples/echo/wss-echo/server/app/handler.go
@@ -107,7 +107,7 @@ func (h *EchoMessageHandler) OnClose(session getty.Session) {
 	h.rwlock.Unlock()
 }
 
-func (h *EchoMessageHandler) OnMessage(session getty.Session, pkg interface{}) {
+func (h *EchoMessageHandler) OnMessage(session getty.Session, pkg any) {
 	p, ok := pkg.(*EchoPackage)
 	if !ok {
 		log.Error("illegal packge{%#v}, %s", pkg, string(pkg.([]byte)))
diff --git a/examples/echo/wss-echo/server/app/readwriter.go b/examples/echo/wss-echo/server/app/readwriter.go
@@ -36,7 +36,7 @@ func NewEchoPackageHandler() *EchoPackageHandler {
 	return &EchoPackageHandler{}
 }
 
-func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (interface{}, int, error) {
+func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (any, int, error) {
 	// log.Debug("get client package:%s", gxstrings.String(data))
 	var (
 		err error
@@ -60,7 +60,7 @@ func (h *EchoPackageHandler) Read(ss getty.Session, data []byte) (interface{}, i
 	// return data, len(data), nil
 }
 
-func (h *EchoPackageHandler) Write(ss getty.Session, pkg interface{}) ([]byte, error) {
+func (h *EchoPackageHandler) Write(ss getty.Session, pkg any) ([]byte, error) {
 	var (
 		ok        bool
 		err       error
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/AlexStocks/getty
 
-go 1.20
+go 1.25
 
 require (
 	github.com/AlexStocks/goext v0.3.2
diff --git a/transport/client_test.go b/transport/client_test.go
@@ -35,11 +35,11 @@ import (
 
 type PackageHandler struct{}
 
-func (h *PackageHandler) Read(ss Session, data []byte) (interface{}, int, error) {
+func (h *PackageHandler) Read(ss Session, data []byte) (any, int, error) {
 	return nil, 0, nil
 }
 
-func (h *PackageHandler) Write(ss Session, pkg interface{}) ([]byte, error) {
+func (h *PackageHandler) Write(ss Session, pkg any) ([]byte, error) {
 	return nil, nil
 }
 
@@ -69,7 +69,7 @@ func (h *MessageHandler) OnOpen(session Session) error {
 }
 func (h *MessageHandler) OnError(session Session, err error)         {}
 func (h *MessageHandler) OnClose(session Session)                    {}
-func (h *MessageHandler) OnMessage(session Session, pkg interface{}) {}
+func (h *MessageHandler) OnMessage(session Session, pkg any) {}
 func (h *MessageHandler) OnCron(session Session)                     {}
 
 type Package struct{}
diff --git a/transport/connection.go b/transport/connection.go
@@ -66,7 +66,7 @@ type Connection interface {
 	// SetWriteTimeout sets deadline for the future write calls.
 	SetWriteTimeout(time.Duration)
 	// Send pkg data to peer
-	Send(interface{}) (int, error)
+	Send(any) (int, error)
 	// CloseConn close connection
 	CloseConn(int)
 	// SetSession sets related session
@@ -124,7 +124,7 @@ func (c *gettyConn) GetActive() time.Time {
 	return launchTime.Add(time.Duration(c.active.Load()))
 }
 
-func (c *gettyConn) send(interface{}) (int, error) {
+func (c *gettyConn) send(any) (int, error) {
 	return 0, nil
 }
 
@@ -288,7 +288,7 @@ func (t *gettyTCPConn) recv(p []byte) (int, error) {
 }
 
 // tcp connection write
-func (t *gettyTCPConn) Send(pkg interface{}) (int, error) {
+func (t *gettyTCPConn) Send(pkg any) (int, error) {
 	var (
 		err         error
 		currentTime time.Time
@@ -361,7 +361,7 @@ func (t *gettyTCPConn) CloseConn(waitSec int) {
 // ///////////////////////////////////////
 
 type UDPContext struct {
-	Pkg      interface{}
+	Pkg      any
 	PeerAddr *net.UDPAddr
 }
 
@@ -436,7 +436,7 @@ func (u *gettyUDPConn) recv(p []byte) (int, *net.UDPAddr, error) {
 }
 
 // write udp packet, @ctx should be of type UDPContext
-func (u *gettyUDPConn) Send(udpCtx interface{}) (int, error) {
+func (u *gettyUDPConn) Send(udpCtx any) (int, error) {
 	var (
 		err         error
 		currentTime time.Time
@@ -602,7 +602,7 @@ func (w *gettyWSConn) updateWriteDeadline() error {
 }
 
 // websocket connection write
-func (w *gettyWSConn) Send(pkg interface{}) (int, error) {
+func (w *gettyWSConn) Send(pkg any) (int, error) {
 	var (
 		err error
 		ok  bool
diff --git a/transport/getty.go b/transport/getty.go
@@ -49,13 +49,13 @@ type Reader interface {
 	// The return value is (nil, pkgLen, nil) as case 3.
 	// The return value is (pkg, pkgLen, nil) as case 4.
 	// The handleTcpPackage may invoke func Read many times as case 5.
-	Read(Session, []byte) (interface{}, int, error)
+	Read(Session, []byte) (any, int, error)
 }
 
 // Writer is used to marshal pkg and write to session
 type Writer interface {
 	// Write if @Session is udpGettySession, the second parameter is UDPContext.
-	Write(Session, interface{}) ([]byte, error)
+	Write(Session, any) ([]byte, error)
 }
 
 // ReadWriter interface use for handle application packages
@@ -90,7 +90,7 @@ type EventListener interface {
 	// !!!In short, ur OnMessage callback func should return asap.
 	//
 	// If this is a udp event listener, the second parameter type is UDPContext.
-	OnMessage(Session, interface{})
+	OnMessage(Session, any)
 }
 
 // EndPoint represents the identity of the client/server
diff --git a/transport/session.go b/transport/session.go
diff --git a/util/logger.go b/util/logger.go

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func (h *EchoMessageHandler) OnClose(session getty.Session) {`
`63`	`63`	`client.removeSession(session)`
`64`	`64`	`}`
`65`	`65`
`66`		`-func (h *EchoMessageHandler) OnMessage(session getty.Session, pkg interface{}) {`
	`66`	`+func (h *EchoMessageHandler) OnMessage(session getty.Session, pkg any) {`
`67`	`67`	`p, ok := pkg.(*EchoPackage)`
`68`	`68`	`if !ok {`
`69`	`69`	`log.Error("illegal packge{%#v}", pkg)`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ func (h *EchoMessageHandler) OnClose(session getty.Session) {`
`133`	`133`	`h.rwlock.Unlock()`
`134`	`134`	`}`
`135`	`135`
`136`		`-func (h *EchoMessageHandler) OnMessage(session getty.Session, pkg interface{}) {`
	`136`	`+func (h *EchoMessageHandler) OnMessage(session getty.Session, pkg any) {`
`137`	`137`	`p, ok := pkg.(*EchoPackage)`
`138`	`138`	`if !ok {`
`139`	`139`	`log.Error("illegal packge{%#v}", pkg)`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func (h *EchoMessageHandler) OnClose(session getty.Session) {`
`62`	`62`	`h.client.removeSession(session)`
`63`	`63`	`}`
`64`	`64`
`65`		`-func (h *EchoMessageHandler) OnMessage(session getty.Session, udpCtx interface{}) {`
	`65`	`+func (h *EchoMessageHandler) OnMessage(session getty.Session, udpCtx any) {`
`66`	`66`	`ctx, ok := udpCtx.(getty.UDPContext)`
`67`	`67`	`if !ok {`
`68`	`68`	`log.Error("illegal UDPContext{%#v}", udpCtx)`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ func (h *EchoMessageHandler) OnClose(session getty.Session) {`
`143`	`143`	`h.rwlock.Unlock()`
`144`	`144`	`}`
`145`	`145`
`146`		`-func (h *EchoMessageHandler) OnMessage(session getty.Session, udpCtx interface{}) {`
	`146`	`+func (h *EchoMessageHandler) OnMessage(session getty.Session, udpCtx any) {`
`147`	`147`	`ctx, ok := udpCtx.(getty.UDPContext)`
`148`	`148`	`if !ok {`
`149`	`149`	`log.Error("illegal UDPContext{%#v}", udpCtx)`