mirror of
https://gitee.com/johng/gf
synced 2026-07-07 06:15:15 +08:00
This pull request standardizes the use of the Go 1.18+ `any` type alias
instead of `interface{}` throughout the codebase. The change improves
code readability and aligns with modern Go best practices. The update
touches many files, including core data structures, code generation
templates, logging utilities, and test data, ensuring consistency across
all usages.
**Type alias migration to `any`:**
* Replaced all instances of `interface{}` with `any` in core data
structures such as `garray` and in generated model structs (e.g.,
`TableUser`, `User1`, `User2`) to modernize type usage.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[3]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[4]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[5]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[6]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
* Updated function signatures, method parameters, and return types from
`interface{}` to `any` in various parts of the codebase, including code
generation, service logic, and logging utilities (e.g., `mlog`).
[[1]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[2]](diffhunk://#diff-2b1953fb78cf3593d8c2c7d911e95b65fd0b847c30ed0b4d167d16fe6d781235L54-R74)
[[3]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[4]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
[[5]](diffhunk://#diff-c5d51d56f487779a2b6207c7ad26c7a20bbadcc846ce094fe60ab4cabff58c51L107-R107)
[[6]](diffhunk://#diff-f96e6a9fdb416eb1804ceaba1fe0ac637bff22c43837f8bb849c2366ce72d4a1L116-R121)
[[7]](diffhunk://#diff-f94c83a1b08ae060d9346f4a6031fc4a7b9a0b894e02d9afaa09018b6598eac0L112-R112)
[[8]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L36-R36)
[[9]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L74-R74)
[[10]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L96-R96)
**Generated code and templates:**
* Adjusted generated files and code generation templates to output `any`
instead of `interface{}` for relevant struct fields and function
signatures, ensuring that new code generation aligns with the updated
convention.
[[1]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[2]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[3]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[4]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[5]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
[[6]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[7]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[8]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
**Container and utility updates:**
* Refactored the `garray` container implementation and related
constructors/methods to use `[]any` instead of `[]interface{}`, along
with corresponding function signatures.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L52-R52)
[[3]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L62-R62)
[[4]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L73-R86)
[[5]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L96-R97)
[[6]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L107-R114)
[[7]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L124-R124)
[[8]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L135-R143)
[[9]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L167-R167)
These changes collectively modernize the codebase and prepare it for
future Go developments by using the idiomatic `any` type.
191 lines
5.3 KiB
Go
191 lines
5.3 KiB
Go
// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
|
|
//
|
|
// This Source Code Form is subject to the terms of the MIT License.
|
|
// If a copy of the MIT was not distributed with this file,
|
|
// You can obtain one at https://github.com/gogf/gf.
|
|
|
|
package gtcp
|
|
|
|
import (
|
|
"crypto/tls"
|
|
"fmt"
|
|
"net"
|
|
"sync"
|
|
|
|
"github.com/gogf/gf/v2/container/gmap"
|
|
"github.com/gogf/gf/v2/errors/gcode"
|
|
"github.com/gogf/gf/v2/errors/gerror"
|
|
"github.com/gogf/gf/v2/text/gstr"
|
|
"github.com/gogf/gf/v2/util/gconv"
|
|
)
|
|
|
|
const (
|
|
// FreePortAddress marks the server listens using random free port.
|
|
FreePortAddress = ":0"
|
|
)
|
|
|
|
const (
|
|
defaultServer = "default"
|
|
)
|
|
|
|
// Server is a TCP server.
|
|
type Server struct {
|
|
mu sync.Mutex // Used for Server.listen concurrent safety. -- The golang test with data race checks this.
|
|
listen net.Listener // TCP address listener.
|
|
address string // Server listening address.
|
|
handler func(*Conn) // Connection handler.
|
|
tlsConfig *tls.Config // TLS configuration.
|
|
}
|
|
|
|
// Map for name to server, for singleton purpose.
|
|
var serverMapping = gmap.NewStrAnyMap(true)
|
|
|
|
// GetServer returns the TCP server with specified `name`,
|
|
// or it returns a new normal TCP server named `name` if it does not exist.
|
|
// The parameter `name` is used to specify the TCP server
|
|
func GetServer(name ...any) *Server {
|
|
serverName := defaultServer
|
|
if len(name) > 0 && name[0] != "" {
|
|
serverName = gconv.String(name[0])
|
|
}
|
|
return serverMapping.GetOrSetFuncLock(serverName, func() any {
|
|
return NewServer("", nil)
|
|
}).(*Server)
|
|
}
|
|
|
|
// NewServer creates and returns a new normal TCP server.
|
|
// The parameter `name` is optional, which is used to specify the instance name of the server.
|
|
func NewServer(address string, handler func(*Conn), name ...string) *Server {
|
|
s := &Server{
|
|
address: address,
|
|
handler: handler,
|
|
}
|
|
if len(name) > 0 && name[0] != "" {
|
|
serverMapping.Set(name[0], s)
|
|
}
|
|
return s
|
|
}
|
|
|
|
// NewServerTLS creates and returns a new TCP server with TLS support.
|
|
// The parameter `name` is optional, which is used to specify the instance name of the server.
|
|
func NewServerTLS(address string, tlsConfig *tls.Config, handler func(*Conn), name ...string) *Server {
|
|
s := NewServer(address, handler, name...)
|
|
s.SetTLSConfig(tlsConfig)
|
|
return s
|
|
}
|
|
|
|
// NewServerKeyCrt creates and returns a new TCP server with TLS support.
|
|
// The parameter `name` is optional, which is used to specify the instance name of the server.
|
|
func NewServerKeyCrt(address, crtFile, keyFile string, handler func(*Conn), name ...string) (*Server, error) {
|
|
s := NewServer(address, handler, name...)
|
|
if err := s.SetTLSKeyCrt(crtFile, keyFile); err != nil {
|
|
return nil, err
|
|
}
|
|
return s, nil
|
|
}
|
|
|
|
// SetAddress sets the listening address for server.
|
|
func (s *Server) SetAddress(address string) {
|
|
s.address = address
|
|
}
|
|
|
|
// GetAddress get the listening address for server.
|
|
func (s *Server) GetAddress() string {
|
|
return s.address
|
|
}
|
|
|
|
// SetHandler sets the connection handler for server.
|
|
func (s *Server) SetHandler(handler func(*Conn)) {
|
|
s.handler = handler
|
|
}
|
|
|
|
// SetTLSKeyCrt sets the certificate and key file for TLS configuration of server.
|
|
func (s *Server) SetTLSKeyCrt(crtFile, keyFile string) error {
|
|
tlsConfig, err := LoadKeyCrt(crtFile, keyFile)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
s.tlsConfig = tlsConfig
|
|
return nil
|
|
}
|
|
|
|
// SetTLSConfig sets the TLS configuration of server.
|
|
func (s *Server) SetTLSConfig(tlsConfig *tls.Config) {
|
|
s.tlsConfig = tlsConfig
|
|
}
|
|
|
|
// Close closes the listener and shutdowns the server.
|
|
func (s *Server) Close() error {
|
|
s.mu.Lock()
|
|
defer s.mu.Unlock()
|
|
if s.listen == nil {
|
|
return nil
|
|
}
|
|
return s.listen.Close()
|
|
}
|
|
|
|
// Run starts running the TCP Server.
|
|
func (s *Server) Run() (err error) {
|
|
if s.handler == nil {
|
|
err = gerror.NewCode(gcode.CodeMissingConfiguration, "start running failed: socket handler not defined")
|
|
return
|
|
}
|
|
if s.tlsConfig != nil {
|
|
// TLS Server
|
|
s.mu.Lock()
|
|
s.listen, err = tls.Listen("tcp", s.address, s.tlsConfig)
|
|
s.mu.Unlock()
|
|
if err != nil {
|
|
err = gerror.Wrapf(err, `tls.Listen failed for address "%s"`, s.address)
|
|
return
|
|
}
|
|
} else {
|
|
// Normal Server
|
|
var tcpAddr *net.TCPAddr
|
|
if tcpAddr, err = net.ResolveTCPAddr("tcp", s.address); err != nil {
|
|
err = gerror.Wrapf(err, `net.ResolveTCPAddr failed for address "%s"`, s.address)
|
|
return err
|
|
}
|
|
s.mu.Lock()
|
|
s.listen, err = net.ListenTCP("tcp", tcpAddr)
|
|
s.mu.Unlock()
|
|
if err != nil {
|
|
err = gerror.Wrapf(err, `net.ListenTCP failed for address "%s"`, s.address)
|
|
return err
|
|
}
|
|
}
|
|
// Listening loop.
|
|
for {
|
|
var conn net.Conn
|
|
if conn, err = s.listen.Accept(); err != nil {
|
|
err = gerror.Wrapf(err, `Listener.Accept failed`)
|
|
return err
|
|
} else if conn != nil {
|
|
go s.handler(NewConnByNetConn(conn))
|
|
}
|
|
}
|
|
}
|
|
|
|
// GetListenedAddress retrieves and returns the address string which are listened by current server.
|
|
func (s *Server) GetListenedAddress() string {
|
|
if !gstr.Contains(s.address, FreePortAddress) {
|
|
return s.address
|
|
}
|
|
var (
|
|
address = s.address
|
|
listenedPort = s.GetListenedPort()
|
|
)
|
|
address = gstr.Replace(address, FreePortAddress, fmt.Sprintf(`:%d`, listenedPort))
|
|
return address
|
|
}
|
|
|
|
// GetListenedPort retrieves and returns one port which is listened to by current server.
|
|
func (s *Server) GetListenedPort() int {
|
|
s.mu.Lock()
|
|
defer s.mu.Unlock()
|
|
if ln := s.listen; ln != nil {
|
|
return ln.Addr().(*net.TCPAddr).Port
|
|
}
|
|
return -1
|
|
}
|