updated

Author: AspieSoft

go.mod

@@ -4,18 +4,16 @@ go 1.19
 
 require (
 	github.com/AspieSoft/go-regex-re2/v2 v2.0.8
-	github.com/AspieSoft/goutil/v5 v5.3.5
+	github.com/AspieSoft/goutil/compress/gzip v0.0.0-20230904214559-da8657ae1afb
+	github.com/AspieSoft/goutil/crypt v0.0.0-20230904214559-da8657ae1afb
+	github.com/AspieSoft/goutil/v7 v7.0.0
 	github.com/alphadose/haxmap v1.3.0
 	golang.org/x/net v0.14.0
 )
 
 require (
 	github.com/AspieSoft/go-syncterval v1.0.5 // indirect
 	github.com/AspieSoft/go-ttlcache v1.2.2 // indirect
-	github.com/andybalholm/brotli v1.0.5 // indirect
-	github.com/cespare/go-smaz v1.0.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
 	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
-	golang.org/x/sys v0.12.0 // indirect
 )

go.sum

@@ -4,22 +4,17 @@ github.com/AspieSoft/go-syncterval v1.0.5 h1:fzSNZofSX/7iBkLrWizMzGLGcBl3d+76cHy
 github.com/AspieSoft/go-syncterval v1.0.5/go.mod h1:r+mTZPOWvfS0Y5YAxKINGNt8eX76i2Lib0VeqAw3SW4=
 github.com/AspieSoft/go-ttlcache v1.2.2 h1:U6MMYY5PKANsB4/vhTiQsQ2U/y1P1yqMCxLw+qFNmCo=
 github.com/AspieSoft/go-ttlcache v1.2.2/go.mod h1:czwXaDat1SKWGJDXkoMZWZFip97MXxuU0KzqJ9zVLDo=
-github.com/AspieSoft/goutil/v5 v5.3.5 h1:VZylkfwz8JsYWE0WQ79UniHCJShyyMQ2hdvXy0t6Bp0=
-github.com/AspieSoft/goutil/v5 v5.3.5/go.mod h1:iPHq44uDE4RfhgPPo+O8ieNOiylLQ0h/fVpFTw/EigY=
+github.com/AspieSoft/goutil/compress/gzip v0.0.0-20230904214559-da8657ae1afb h1:+zDS/ek1JH864TvB5OBoofNTXIPuAKbj1QKxbOrDIm8=
+github.com/AspieSoft/goutil/compress/gzip v0.0.0-20230904214559-da8657ae1afb/go.mod h1:3YENrWBz3uY2QhIiPVTSgPiqG3jKzxU+agXzgIY4c4E=
+github.com/AspieSoft/goutil/crypt v0.0.0-20230904214559-da8657ae1afb h1:Gymr95fbt5mhCWsbwi8xHqUJNs0baASOu1C0/4BTAl4=
+github.com/AspieSoft/goutil/crypt v0.0.0-20230904214559-da8657ae1afb/go.mod h1:44ZZF9lZe33LxoLDVlyRUyfTCcZ5v58k9idWrMvT3GM=
+github.com/AspieSoft/goutil/v7 v7.0.0 h1:r4brwFmKsemshfTvhxRBwlhg3LJLblBO5/6NtKOhIgg=
+github.com/AspieSoft/goutil/v7 v7.0.0/go.mod h1:ploAhabVCZ4MHcvGzHPummkxc/ZOQSjkScR9UYXK2KI=
 github.com/alphadose/haxmap v1.3.0 h1:C/2LboOnPCZP27GmmSXOcwx360st0P8N0fTJ3voefKc=
 github.com/alphadose/haxmap v1.3.0/go.mod h1:rjHw1IAqbxm0S3U5tD16GoKsiAd8FWx5BJ2IYqXwgmM=
-github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
-github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/cespare/go-smaz v1.0.0 h1:CUrrqIzakjINfWkdyNrVhtDKcGmdKkdB9AW7ke5nJ+M=
-github.com/cespare/go-smaz v1.0.0/go.mod h1:h77Hd4Dz/EPofhYvhkSuEyM0+6vyP3ckmSoBxTcKyxk=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
 golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
 golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
 golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
 golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

websocket.go

@@ -10,7 +10,9 @@ import (
 	"time"
 
 	"github.com/AspieSoft/go-regex-re2/v2"
-	"github.com/AspieSoft/goutil/v5"
+	"github.com/AspieSoft/goutil/v7"
+	"github.com/AspieSoft/goutil/crypt"
+	goutil_GZIP "github.com/AspieSoft/goutil/compress/gzip"
 	"github.com/alphadose/haxmap"
 	"golang.org/x/net/websocket"
 )
@@ -127,9 +129,9 @@ func (s *Server) handleWS(ws *websocket.Conn){
 	}
 
 	clientID := s.clientUUID()
-	token := string(goutil.Crypt.RandBytes(32))
-	serverKey := string(goutil.Crypt.RandBytes(32))
-	encKey := string(goutil.Crypt.RandBytes(64))
+	token := string(crypt.RandBytes(32))
+	serverKey := string(crypt.RandBytes(32))
+	encKey := string(crypt.RandBytes(64))
 
 	client := Client{
 		ws: ws,
@@ -559,15 +561,15 @@ func MsgType[T goutil.SupportedType] (msg interface{}) interface{} {
 }
 
 func (s *Server) clientUUID() string {
-	uuid := goutil.Crypt.RandBytes(s.uuidSize)
+	uuid := crypt.RandBytes(s.uuidSize)
 
 	var hasID bool
 	_, hasID = s.clients.Get(string(uuid))
 
 	loops := 1000
 	for hasID && loops > 0 {
 		loops--
-		uuid = goutil.Crypt.RandBytes(s.uuidSize)
+		uuid = crypt.RandBytes(s.uuidSize)
 		_, hasID = s.clients.Get(string(uuid))
 	}
 
@@ -583,7 +585,7 @@ func gzip(b *[]byte) {
 	if !GzipEnabled {
 		return
 	}
-	if comp, err := goutil.GZIP.Zip(*b); err == nil {
+	if comp, err := goutil_GZIP.Zip(*b); err == nil {
 		*b = []byte(base64.StdEncoding.EncodeToString(comp))
 	}
 }
@@ -593,7 +595,7 @@ func gunzip(b *[]byte) {
 		return
 	}
 	if dec, err := base64.StdEncoding.DecodeString(string(*b)); err == nil {
-		if dec, err = goutil.GZIP.UnZip(dec); err == nil {
+		if dec, err = goutil_GZIP.UnZip(dec); err == nil {
 			*b = dec
 		}
 	}