anygatecloud/strom
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

monorepo fixes

Browse Source
This commit is contained in:
adman
2025-12-15 22:46:34 +01:00
parent 6108534a12
commit c58dbbe5b0
83 changed files with 2273 additions and 2042 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bot/connection.go
+19 -19
View File
@@ -7,8 +7,8 @@ import (
"io"
"net"
"github.com/admin-else/queser"
"github.com/admin-else/queser/generated"
"github.com/admin-else/strom/proto_base"
"github.com/admin-else/strom/proto_generated"
)
var BadPacketTypeError = errors.New("bad packet type")
@@ -27,23 +27,23 @@ const (
Client
)
func (a Actor) SendDirection() queser.Direction {
func (a Actor) SendDirection() proto_base.Direction {
switch a {
case Server:
return queser.ToClient
return proto_base.ToClient
case Client:
return queser.ToServer
return proto_base.ToServer
default:
panic("invalid actor")
}
}
func (a Actor) ReceiveDirection() queser.Direction {
func (a Actor) ReceiveDirection() proto_base.Direction {
switch a {
case Server:
return queser.ToServer
return proto_base.ToServer
case Client:
return queser.ToClient
return proto_base.ToClient
default:
panic("invalid actor")
}
@@ -54,7 +54,7 @@ type Conn struct {
R io.Reader
W io.Writer
CompressionThreshold int32
State queser.State
State proto_base.State
Actor Actor
Version string
}
@@ -65,13 +65,13 @@ func (c *Conn) Send(packet any) (err error) {
case UnCodablePacket:
rawPacketBytes = packet.Data
default:
packetIdentifier := generated.TypeToPacketIdentifier(c.Version, c.Actor.SendDirection(), c.State, packet)
packetIdentifier := proto_generated.TypeToPacketIdentifier(c.Version, c.Actor.SendDirection(), c.State, packet)
if packetIdentifier == "" {
err = BadPacketTypeError
return
}
rawPacketBuffer := bytes.NewBuffer(nil)
err = generated.EncodePacket(c.Version, c.Actor.SendDirection(), c.State, packetIdentifier, packet, rawPacketBuffer)
err = proto_generated.EncodePacket(c.Version, c.Actor.SendDirection(), c.State, packetIdentifier, packet, rawPacketBuffer)
if err != nil {
return
}
@@ -81,7 +81,7 @@ func (c *Conn) Send(packet any) (err error) {
if c.CompressionThreshold > 0 {
packetBuffer := bytes.NewBuffer(nil)
if int32(len(packetBytes)) >= c.CompressionThreshold {
err = queser.VarInt(len(packetBytes)).Encode(packetBuffer)
err = proto_base.VarInt(len(packetBytes)).Encode(packetBuffer)
if err != nil {
return
}
@@ -90,7 +90,7 @@ func (c *Conn) Send(packet any) (err error) {
return
}
} else {
err = queser.VarInt(0).Encode(packetBuffer)
err = proto_base.VarInt(0).Encode(packetBuffer)
if err != nil {
return
}
@@ -103,7 +103,7 @@ func (c *Conn) Send(packet any) (err error) {
} else {
packetBytes = rawPacketBytes
}
err = queser.VarInt(len(packetBytes)).Encode(c.W)
err = proto_base.VarInt(len(packetBytes)).Encode(c.W)
if err != nil {
return
}
@@ -112,7 +112,7 @@ func (c *Conn) Send(packet any) (err error) {
}
func (c *Conn) Receive() (packet any, err error) {
var rawPacketLen queser.VarInt
var rawPacketLen proto_base.VarInt
rawPacketLen, err = rawPacketLen.Decode(c.R)
if err != nil {
return
@@ -124,7 +124,7 @@ func (c *Conn) Receive() (packet any, err error) {
rawPacketBuffer := bytes.NewBuffer(rawPacketBytes)
var packetBytes []byte
if c.CompressionThreshold > 0 {
var packetLen queser.VarInt
var packetLen proto_base.VarInt
packetLen, err = packetLen.Decode(rawPacketBuffer)
if err != nil {
return
@@ -147,7 +147,7 @@ func (c *Conn) Receive() (packet any, err error) {
packetBytes = rawPacketBytes
}
packetBuff := bytes.NewBuffer(packetBytes)
packet, err = generated.DecodePacket(c.Version, c.Actor.ReceiveDirection(), c.State, packetBuff)
packet, err = proto_generated.DecodePacket(c.Version, c.Actor.ReceiveDirection(), c.State, packetBuff)
if err != nil {
packet = UnCodablePacket{Err: err, Data: packetBytes, Partial: packet}
err = nil
@@ -158,7 +158,7 @@ func (c *Conn) Receive() (packet any, err error) {
func Connect(addr string) (ret *Conn, err error) {
ret = &Conn{}
ret.Version = "1.21.8"
ret.State = queser.Handshaking
ret.State = proto_base.Handshaking
ret.CompressionThreshold = -1
ret.Actor = Client
ret.Conn, err = net.Dial("tcp", addr)
@@ -173,7 +173,7 @@ func Connect(addr string) (ret *Conn, err error) {
func Servee(c net.Conn) (ret *Conn) {
ret = &Conn{}
ret.Version = "1.21.8"
ret.State = queser.Handshaking
ret.State = proto_base.Handshaking
ret.CompressionThreshold = -1
ret.Actor = Server
ret.Conn = c