Code refactoring for xiaomi source

This commit is contained in:
Alex X
2026-01-17 10:06:13 +03:00
parent 9a1eac8ef4
commit 425fcffbe1
5 changed files with 14 additions and 40 deletions
+9 -21
View File
@@ -21,7 +21,7 @@ func Dial(host, transport string) (*Conn, error) {
_, isTCP := conn.(*tcpConn)
c := &Conn{
conn: conn,
Conn: conn,
isTCP: isTCP,
channels: [4]*dataChannel{
newDataChannel(0, 10), nil, newDataChannel(250, 100), nil,
@@ -32,7 +32,7 @@ func Dial(host, transport string) (*Conn, error) {
}
type Conn struct {
conn net.Conn
net.Conn
isTCP bool
err error
@@ -116,7 +116,7 @@ func (c *Conn) worker() {
buf := make([]byte, 1200)
for {
n, err := c.conn.Read(buf)
n, err := c.Conn.Read(buf)
if err != nil {
c.err = fmt.Errorf("%s: %w", "cs2", err)
return
@@ -136,7 +136,7 @@ func (c *Conn) worker() {
// For TCP we should send ping every second to keep connection alive.
// Based on PCAP analysis: official Mi Home app sends PING every ~1s.
if now := time.Now(); now.After(keepaliveTS) {
_, _ = c.conn.Write([]byte{magic, msgPing, 0, 0})
_, _ = c.Conn.Write([]byte{magic, msgPing, 0, 0})
keepaliveTS = now.Add(time.Second)
}
@@ -151,7 +151,7 @@ func (c *Conn) worker() {
if pushed >= 0 {
// For UDP we should send ACK.
ack := []byte{magic, msgDrwAck, 0, 6, magicDrw, ch, 0, 1, seqHI, seqLO}
_, _ = c.conn.Write(ack)
_, _ = c.Conn.Write(ack)
}
}
@@ -161,7 +161,7 @@ func (c *Conn) worker() {
}
case msgPing:
_, _ = c.conn.Write([]byte{magic, msgPong, 0, 0})
_, _ = c.Conn.Write([]byte{magic, msgPong, 0, 0})
case msgPong, msgP2PRdyUDP, msgP2PRdyTCP, msgClose: // skip it
case msgDrwAck: // only for UDP
if c.cmdAck != nil {
@@ -184,18 +184,6 @@ func (c *Conn) Version() string {
return "CS2"
}
func (c *Conn) RemoteAddr() net.Addr {
return c.conn.RemoteAddr()
}
func (c *Conn) SetDeadline(t time.Time) error {
return c.conn.SetDeadline(t)
}
func (c *Conn) Close() error {
return c.conn.Close()
}
func (c *Conn) Error() error {
if c.err != nil {
return c.err
@@ -221,7 +209,7 @@ func (c *Conn) WriteCommand(cmd uint32, data []byte) error {
c.seqCh0++
if c.isTCP {
_, err := c.conn.Write(req)
_, err := c.Conn.Write(req)
return err
}
@@ -237,7 +225,7 @@ func (c *Conn) WriteCommand(cmd uint32, data []byte) error {
}
for {
if _, err := c.conn.Write(req); err != nil {
if _, err := c.Conn.Write(req); err != nil {
return err
}
<-timeout.C
@@ -278,7 +266,7 @@ func (c *Conn) WritePacket(hdr, payload []byte) error {
copy(req[offset:], hdr)
copy(req[offset+hdrSize:], hdr)
_, err := c.conn.Write(req)
_, err := c.Conn.Write(req)
return err
}