]> git.r.bdr.sh - rbdr/mobius/blobdiff - hotline/transaction.go
Refactoring, cleanup, test backfilling
[rbdr/mobius] / hotline / transaction.go
index 8fbdf35c0d652a71076c13fe776a625439c59c5c..f8c7dfda71437a57f1deec3eba80d2468013c9a1 100644 (file)
 package hotline
 
 import (
+       "bufio"
+       "bytes"
        "encoding/binary"
        "errors"
        "fmt"
-       "github.com/jhalter/mobius/concat"
+       "io"
+       "log/slog"
        "math/rand"
-       "net"
+       "slices"
 )
 
-const (
-       tranError          = 0
-       tranGetMsgs        = 101
-       tranNewMsg         = 102
-       tranOldPostNews    = 103
-       tranServerMsg      = 104
-       tranChatSend       = 105
-       tranChatMsg        = 106
-       tranLogin          = 107
-       tranSendInstantMsg = 108
-       tranShowAgreement  = 109
-       tranDisconnectUser = 110
-       // tranDisconnectMsg        = 111 TODO: implement friendly disconnect
-       tranInviteNewChat        = 112
-       tranInviteToChat         = 113
-       tranRejectChatInvite     = 114
-       tranJoinChat             = 115
-       tranLeaveChat            = 116
-       tranNotifyChatChangeUser = 117
-       tranNotifyChatDeleteUser = 118
-       tranNotifyChatSubject    = 119
-       tranSetChatSubject       = 120
-       tranAgreed               = 121
-       tranGetFileNameList      = 200
-       tranDownloadFile         = 202
-       tranUploadFile           = 203
-       tranNewFolder            = 205
-       tranDeleteFile           = 204
-       tranGetFileInfo          = 206
-       tranSetFileInfo          = 207
-       tranMoveFile             = 208
-       // tranMakeFileAlias        = 209 TODO: implement file alias command
-       tranDownloadFldr = 210
-       // tranDownloadInfo         = 211 TODO: implement file transfer queue
-       // tranDownloadBanner     = 212 TODO: figure out what this is used for
-       tranUploadFldr        = 213
-       tranGetUserNameList   = 300
-       tranNotifyChangeUser  = 301
-       tranNotifyDeleteUser  = 302
-       tranGetClientInfoText = 303
-       tranSetClientUserInfo = 304
-       tranListUsers         = 348
-       // tranUpdateUser         = 349 TODO: implement user updates from the > 1.5 account editor
-       tranNewUser            = 350
-       tranDeleteUser         = 351
-       tranGetUser            = 352
-       tranSetUser            = 353
-       tranUserAccess         = 354
-       tranUserBroadcast      = 355
-       tranGetNewsCatNameList = 370
-       tranGetNewsArtNameList = 371
-       tranDelNewsItem        = 380
-       tranNewNewsFldr        = 381
-       tranNewNewsCat         = 382
-       tranGetNewsArtData     = 400
-       tranPostNewsArt        = 410
-       tranDelNewsArt         = 411
-       tranKeepAlive          = 500
+var (
+       TranError                = [2]byte{0x00, 0x00} // 0
+       TranGetMsgs              = [2]byte{0x00, 0x65} // 101
+       TranNewMsg               = [2]byte{0x00, 0x66} // 102
+       TranOldPostNews          = [2]byte{0x00, 0x67} // 103
+       TranServerMsg            = [2]byte{0x00, 0x68} // 104
+       TranChatSend             = [2]byte{0x00, 0x69} // 105
+       TranChatMsg              = [2]byte{0x00, 0x6A} // 106
+       TranLogin                = [2]byte{0x00, 0x6B} // 107
+       TranSendInstantMsg       = [2]byte{0x00, 0x6C} // 108
+       TranShowAgreement        = [2]byte{0x00, 0x6D} // 109
+       TranDisconnectUser       = [2]byte{0x00, 0x6E} // 110
+       TranDisconnectMsg        = [2]byte{0x00, 0x6F} // 111
+       TranInviteNewChat        = [2]byte{0x00, 0x70} // 112
+       TranInviteToChat         = [2]byte{0x00, 0x71} // 113
+       TranRejectChatInvite     = [2]byte{0x00, 0x72} // 114
+       TranJoinChat             = [2]byte{0x00, 0x73} // 115
+       TranLeaveChat            = [2]byte{0x00, 0x74} // 116
+       TranNotifyChatChangeUser = [2]byte{0x00, 0x75} // 117
+       TranNotifyChatDeleteUser = [2]byte{0x00, 0x76} // 118
+       TranNotifyChatSubject    = [2]byte{0x00, 0x77} // 119
+       TranSetChatSubject       = [2]byte{0x00, 0x78} // 120
+       TranAgreed               = [2]byte{0x00, 0x79} // 121
+       TranServerBanner         = [2]byte{0x00, 0x7A} // 122
+       TranGetFileNameList      = [2]byte{0x00, 0xC8} // 200
+       TranDownloadFile         = [2]byte{0x00, 0xCA} // 202
+       TranUploadFile           = [2]byte{0x00, 0xCB} // 203
+       TranNewFolder            = [2]byte{0x00, 0xCD} // 205
+       TranDeleteFile           = [2]byte{0x00, 0xCC} // 204
+       TranGetFileInfo          = [2]byte{0x00, 0xCE} // 206
+       TranSetFileInfo          = [2]byte{0x00, 0xCF} // 207
+       TranMoveFile             = [2]byte{0x00, 0xD0} // 208
+       TranMakeFileAlias        = [2]byte{0x00, 0xD1} // 209
+       TranDownloadFldr         = [2]byte{0x00, 0xD2} // 210
+       TranDownloadInfo         = [2]byte{0x00, 0xD3} // 211
+       TranDownloadBanner       = [2]byte{0x00, 0xD4} // 212
+       TranUploadFldr           = [2]byte{0x00, 0xD5} // 213
+       TranGetUserNameList      = [2]byte{0x01, 0x2C} // 300
+       TranNotifyChangeUser     = [2]byte{0x01, 0x2D} // 301
+       TranNotifyDeleteUser     = [2]byte{0x01, 0x2E} // 302
+       TranGetClientInfoText    = [2]byte{0x01, 0x2F} // 303
+       TranSetClientUserInfo    = [2]byte{0x01, 0x30} // 304
+       TranListUsers            = [2]byte{0x01, 0x5C} // 348
+       TranUpdateUser           = [2]byte{0x01, 0x5D} // 349
+       TranNewUser              = [2]byte{0x01, 0x5E} // 350
+       TranDeleteUser           = [2]byte{0x01, 0x5F} // 351
+       TranGetUser              = [2]byte{0x01, 0x60} // 352
+       TranSetUser              = [2]byte{0x01, 0x61} // 353
+       TranUserAccess           = [2]byte{0x01, 0x62} // 354
+       TranUserBroadcast        = [2]byte{0x01, 0x63} // 355
+       TranGetNewsCatNameList   = [2]byte{0x01, 0x72} // 370
+       TranGetNewsArtNameList   = [2]byte{0x01, 0x73} // 371
+       TranDelNewsItem          = [2]byte{0x01, 0x7C} // 380
+       TranNewNewsFldr          = [2]byte{0x01, 0x7D} // 381
+       TranNewNewsCat           = [2]byte{0x01, 0x7E} // 382
+       TranGetNewsArtData       = [2]byte{0x01, 0x90} // 400
+       TranPostNewsArt          = [2]byte{0x01, 0x9A} // 410
+       TranDelNewsArt           = [2]byte{0x01, 0x9B} // 411
+       TranKeepAlive            = [2]byte{0x01, 0xF4} // 500
 )
 
 type Transaction struct {
-       clientID *[]byte
-
-       Flags      byte   // Reserved (should be 0)
-       IsReply    byte   // Request (0) or reply (1)
-       Type       []byte // Requested operation (user defined)
-       ID         []byte // Unique transaction ID (must be != 0)
-       ErrorCode  []byte // Used in the reply (user defined, 0 = no error)
-       TotalSize  []byte // Total data size for the transaction (all parts)
-       DataSize   []byte // Size of data in this transaction part. This allows splitting large transactions into smaller parts.
-       ParamCount []byte // Number of the parameters for this transaction
+       Flags      byte     // Reserved (should be 0)
+       IsReply    byte     // Request (0) or reply (1)
+       Type       TranType // Requested operation (user defined)
+       ID         [4]byte  // Unique transaction ID (must be != 0)
+       ErrorCode  [4]byte  // Used in the reply (user defined, 0 = no error)
+       TotalSize  [4]byte  // Total data size for the fields in this transaction.
+       DataSize   [4]byte  // Size of data in this transaction part. This allows splitting large transactions into smaller parts.
+       ParamCount [2]byte  // Number of the parameters for this transaction
        Fields     []Field
+
+       clientID   [2]byte // Internal identifier for target client
+       readOffset int     // Internal offset to track read progress
+}
+
+type TranType [2]byte
+
+var tranTypeNames = map[TranType]string{
+       TranChatMsg:            "Receive Chat",
+       TranNotifyChangeUser:   "TranNotifyChangeUser",
+       TranError:              "TranError",
+       TranShowAgreement:      "TranShowAgreement",
+       TranUserAccess:         "TranUserAccess",
+       TranNotifyDeleteUser:   "TranNotifyDeleteUser",
+       TranAgreed:             "TranAgreed",
+       TranChatSend:           "Send Chat",
+       TranDelNewsArt:         "TranDelNewsArt",
+       TranDelNewsItem:        "TranDelNewsItem",
+       TranDeleteFile:         "TranDeleteFile",
+       TranDeleteUser:         "TranDeleteUser",
+       TranDisconnectUser:     "TranDisconnectUser",
+       TranDownloadFile:       "TranDownloadFile",
+       TranDownloadFldr:       "TranDownloadFldr",
+       TranGetClientInfoText:  "TranGetClientInfoText",
+       TranGetFileInfo:        "TranGetFileInfo",
+       TranGetFileNameList:    "TranGetFileNameList",
+       TranGetMsgs:            "TranGetMsgs",
+       TranGetNewsArtData:     "TranGetNewsArtData",
+       TranGetNewsArtNameList: "TranGetNewsArtNameList",
+       TranGetNewsCatNameList: "TranGetNewsCatNameList",
+       TranGetUser:            "TranGetUser",
+       TranGetUserNameList:    "tranHandleGetUserNameList",
+       TranInviteNewChat:      "TranInviteNewChat",
+       TranInviteToChat:       "TranInviteToChat",
+       TranJoinChat:           "TranJoinChat",
+       TranKeepAlive:          "TranKeepAlive",
+       TranLeaveChat:          "TranJoinChat",
+       TranListUsers:          "TranListUsers",
+       TranMoveFile:           "TranMoveFile",
+       TranNewFolder:          "TranNewFolder",
+       TranNewNewsCat:         "TranNewNewsCat",
+       TranNewNewsFldr:        "TranNewNewsFldr",
+       TranNewUser:            "TranNewUser",
+       TranUpdateUser:         "TranUpdateUser",
+       TranOldPostNews:        "TranOldPostNews",
+       TranPostNewsArt:        "TranPostNewsArt",
+       TranRejectChatInvite:   "TranRejectChatInvite",
+       TranSendInstantMsg:     "TranSendInstantMsg",
+       TranSetChatSubject:     "TranSetChatSubject",
+       TranMakeFileAlias:      "TranMakeFileAlias",
+       TranSetClientUserInfo:  "TranSetClientUserInfo",
+       TranSetFileInfo:        "TranSetFileInfo",
+       TranSetUser:            "TranSetUser",
+       TranUploadFile:         "TranUploadFile",
+       TranUploadFldr:         "TranUploadFldr",
+       TranUserBroadcast:      "TranUserBroadcast",
+       TranDownloadBanner:     "TranDownloadBanner",
+}
+
+func (t TranType) LogValue() slog.Value {
+       return slog.StringValue(tranTypeNames[t])
 }
 
-func NewTransaction(t int, clientID *[]byte, fields ...Field) *Transaction {
-       typeSlice := make([]byte, 2)
-       binary.BigEndian.PutUint16(typeSlice, uint16(t))
-
-       idSlice := make([]byte, 4)
-       binary.BigEndian.PutUint32(idSlice, rand.Uint32())
-
-       return &Transaction{
-               clientID:  clientID,
-               Flags:     0x00,
-               IsReply:   0x00,
-               Type:      typeSlice,
-               ID:        idSlice,
-               ErrorCode: []byte{0, 0, 0, 0},
-               Fields:    fields,
+// NewTransaction creates a new Transaction with the specified type, client ID, and optional fields.
+func NewTransaction(t, clientID [2]byte, fields ...Field) Transaction {
+       transaction := Transaction{
+               Type:     t,
+               clientID: clientID,
+               Fields:   fields,
        }
+
+       binary.BigEndian.PutUint32(transaction.ID[:], rand.Uint32())
+
+       return transaction
 }
 
-// ReadTransaction parses a byte slice into a struct.  The input slice may be shorter or longer
-// that the transaction size depending on what was read from the network connection.
-func ReadTransaction(buf []byte) (*Transaction, int, error) {
-       totalSize := binary.BigEndian.Uint32(buf[12:16])
+// Write implements io.Writer interface for Transaction.
+// Transactions read from the network are read as complete tokens with a bufio.Scanner, so
+// the arg p is guaranteed to have the full byte payload of a complete transaction.
+func (t *Transaction) Write(p []byte) (n int, err error) {
+       // Make sure we have the minimum number of bytes for a transaction.
+       if len(p) < 22 {
+               return 0, errors.New("buffer too small")
+       }
 
-       // the buf may include extra bytes that are not part of the transaction
-       // tranLen represents the length of bytes that are part of the transaction
+       // Read the total size field.
+       totalSize := binary.BigEndian.Uint32(p[12:16])
        tranLen := int(20 + totalSize)
 
-       if tranLen > len(buf) {
-               return nil, 0, errors.New("buflen too small for tranLen")
-       }
-       fields, err := ReadFields(buf[20:22], buf[22:tranLen])
-       if err != nil {
-               return nil, 0, err
-       }
+       paramCount := binary.BigEndian.Uint16(p[20:22])
 
-       return &Transaction{
-               Flags:      buf[0],
-               IsReply:    buf[1],
-               Type:       buf[2:4],
-               ID:         buf[4:8],
-               ErrorCode:  buf[8:12],
-               TotalSize:  buf[12:16],
-               DataSize:   buf[16:20],
-               ParamCount: buf[20:22],
-               Fields:     fields,
-       }, tranLen, nil
-}
+       t.Flags = p[0]
+       t.IsReply = p[1]
+       copy(t.Type[:], p[2:4])
+       copy(t.ID[:], p[4:8])
+       copy(t.ErrorCode[:], p[8:12])
+       copy(t.TotalSize[:], p[12:16])
+       copy(t.DataSize[:], p[16:20])
+       copy(t.ParamCount[:], p[20:22])
 
-func readN(conn net.Conn, n int) ([]Transaction, error) {
-       buf := make([]byte, 1400)
-       i := 0
-       for {
-               readLen, err := conn.Read(buf)
-               if err != nil {
-                       return nil, err
-               }
+       scanner := bufio.NewScanner(bytes.NewReader(p[22:tranLen]))
+       scanner.Split(fieldScanner)
 
-               transactions, _, err := readTransactions(buf[:readLen])
-               //              spew.Fdump(os.Stderr, transactions)
-               if err != nil {
-                       return nil, err
+       for i := 0; i < int(paramCount); i++ {
+               if !scanner.Scan() {
+                       return 0, fmt.Errorf("error scanning field: %w", scanner.Err())
                }
 
-               i += len(transactions)
-
-               if n == i {
-                       return transactions, nil
+               var field Field
+               if _, err := field.Write(scanner.Bytes()); err != nil {
+                       return 0, fmt.Errorf("error reading field: %w", err)
                }
+               t.Fields = append(t.Fields, field)
+       }
+
+       if err := scanner.Err(); err != nil {
+               return 0, fmt.Errorf("scanner error: %w", err)
        }
+
+       return len(p), nil
 }
 
-func readTransactions(buf []byte) ([]Transaction, int, error) {
-       var transactions []Transaction
+const tranHeaderLen = 20 // fixed length of transaction fields before the variable length fields
 
-       bufLen := len(buf)
+// transactionScanner implements bufio.SplitFunc for parsing incoming byte slices into complete tokens
+func transactionScanner(data []byte, _ bool) (advance int, token []byte, err error) {
+       // The bytes that contain the size of a transaction are from 12:16, so we need at least 16 bytes
+       if len(data) < 16 {
+               return 0, nil, nil
+       }
 
-       var bytesRead = 0
-       for bytesRead < bufLen {
-               t, tReadLen, err := ReadTransaction(buf[bytesRead:])
-               if err != nil {
-                       return transactions, bytesRead, err
-               }
-               bytesRead += tReadLen
+       totalSize := binary.BigEndian.Uint32(data[12:16])
 
-               transactions = append(transactions, *t)
+       // tranLen represents the length of bytes that are part of the transaction
+       tranLen := int(tranHeaderLen + totalSize)
+       if tranLen > len(data) {
+               return 0, nil, nil
        }
 
-       return transactions, bytesRead, nil
+       return tranLen, data[0:tranLen], nil
 }
 
 const minFieldLen = 4
@@ -199,8 +251,8 @@ func ReadFields(paramCount []byte, buf []byte) ([]Field, error) {
                }
 
                fields = append(fields, Field{
-                       ID:        fieldID,
-                       FieldSize: fieldSize,
+                       ID:        [2]byte(fieldID),
+                       FieldSize: [2]byte(fieldSize),
                        Data:      buf[4 : 4+fieldSizeInt],
                })
 
@@ -214,31 +266,46 @@ func ReadFields(paramCount []byte, buf []byte) ([]Field, error) {
        return fields, nil
 }
 
-func (t Transaction) Payload() []byte {
+// Read implements the io.Reader interface for Transaction
+func (t *Transaction) Read(p []byte) (int, error) {
        payloadSize := t.Size()
 
        fieldCount := make([]byte, 2)
        binary.BigEndian.PutUint16(fieldCount, uint16(len(t.Fields)))
 
-       var fieldPayload []byte
+       bbuf := new(bytes.Buffer)
+
        for _, field := range t.Fields {
-               fieldPayload = append(fieldPayload, field.Payload()...)
+               f := field
+               _, err := bbuf.ReadFrom(&f)
+               if err != nil {
+                       return 0, fmt.Errorf("error reading field: %w", err)
+               }
        }
 
-       return concat.Slices(
+       buf := slices.Concat(
                []byte{t.Flags, t.IsReply},
-               t.Type,
-               t.ID,
-               t.ErrorCode,
+               t.Type[:],
+               t.ID[:],
+               t.ErrorCode[:],
                payloadSize,
                payloadSize, // this is the dataSize field, but seeming the same as totalSize
                fieldCount,
-               fieldPayload,
+               bbuf.Bytes(),
        )
+
+       if t.readOffset >= len(buf) {
+               return 0, io.EOF // All bytes have been read
+       }
+
+       n := copy(p, buf[t.readOffset:])
+       t.readOffset += n
+
+       return n, nil
 }
 
 // Size returns the total size of the transaction payload
-func (t Transaction) Size() []byte {
+func (t *Transaction) Size() []byte {
        bs := make([]byte, 4)
 
        fieldSize := 0
@@ -251,9 +318,9 @@ func (t Transaction) Size() []byte {
        return bs
 }
 
-func (t Transaction) GetField(id int) Field {
+func (t *Transaction) GetField(id [2]byte) Field {
        for _, field := range t.Fields {
-               if id == int(binary.BigEndian.Uint16(field.ID)) {
+               if id == field.ID {
                        return field
                }
        }