sashakoshka/hopp
sashakoshka/hopp
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

METADAPT-B can now send very large messages

Browse Source
This commit is contained in:
Sasha Koshka 2025-04-04 15:42:15 -04:00
parent a0b49e950e
commit 174634a330
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
metadapta_test.go
View File

@ -78,7 +78,6 @@ func TestConnA(test *testing.T) {
test.Fatal("CLIENT wrong error:", err) test.Fatal("CLIENT wrong error:", err)
} }
test.Log("CLIENT done") test.Log("CLIENT done")
// TODO test error from trans/connection closed by other side
} }
func TestEncodeMessageA(test *testing.T) { func TestEncodeMessageA(test *testing.T) {

12
metadaptb.go
View File

@ -85,23 +85,21 @@ type Stream interface {
} }
func encodeMessageB(writer io.Writer, method uint16, data []byte) error { func encodeMessageB(writer io.Writer, method uint16, data []byte) error {
buffer := make([]byte, 4 + len(data)) buffer := make([]byte, 10 + len(data))
tape.EncodeI16(buffer[:2], method) tape.EncodeI16(buffer[:2], method)
length, ok := tape.U16CastSafe(len(data)) tape.EncodeI64(buffer[2:10], uint64(len(data)))
if !ok { return ErrPayloadTooLarge } copy(buffer[10:], data)
tape.EncodeI16(buffer[2:4], length)
copy(buffer[4:], data)
_, err := writer.Write(buffer) _, err := writer.Write(buffer)
return err return err
} }
func decodeMessageB(reader io.Reader) (uint16, []byte, error) { func decodeMessageB(reader io.Reader) (uint16, []byte, error) {
headerBuffer := [4]byte { } headerBuffer := [10]byte { }
_, err := io.ReadFull(reader, headerBuffer[:]) _, err := io.ReadFull(reader, headerBuffer[:])
if err != nil { return 0, nil, err } if err != nil { return 0, nil, err }
method, err := tape.DecodeI16[uint16](headerBuffer[:2]) method, err := tape.DecodeI16[uint16](headerBuffer[:2])
if err != nil { return 0, nil, err } if err != nil { return 0, nil, err }
length, err := tape.DecodeI16[uint16](headerBuffer[2:4]) length, err := tape.DecodeI64[uint64](headerBuffer[2:10])
if err != nil { return 0, nil, err } if err != nil { return 0, nil, err }
payloadBuffer := make([]byte, int(length)) payloadBuffer := make([]byte, int(length))
_, err = io.ReadFull(reader, payloadBuffer) _, err = io.ReadFull(reader, payloadBuffer)

15
metadaptb_test.go
View File

@ -11,7 +11,7 @@ func TestEncodeMessageB(test *testing.T) {
payload := []byte { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 } payload := []byte { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 }
err := encodeMessageB(buffer, 0x6B12, payload) err := encodeMessageB(buffer, 0x6B12, payload)
correct := []byte { correct := []byte {
0x6B, 0x12, 0x6B, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x06, 0x00, 0x06,
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
} }
@ -23,18 +23,9 @@ func TestEncodeMessageB(test *testing.T) {
} }
} }
func TestEncodeMessageBErr(test *testing.T) {
buffer := new(bytes.Buffer)
payload := make([]byte, 0x10000)
err := encodeMessageB(buffer, 0x6B12, payload)
if !errors.Is(err, ErrPayloadTooLarge) {
test.Fatalf("wrong error: %v", err)
}
}
func TestDecodeMessageB(test *testing.T) { func TestDecodeMessageB(test *testing.T) {
method, payload, err := decodeMessageB(bytes.NewReader([]byte { method, payload, err := decodeMessageB(bytes.NewReader([]byte {
0x6B, 0x12, 0x6B, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x06, 0x00, 0x06,
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
})) }))
@ -52,7 +43,7 @@ func TestDecodeMessageB(test *testing.T) {
func TestDecodeMessageBErr(test *testing.T) { func TestDecodeMessageBErr(test *testing.T) {
_, _, err := decodeMessageB(bytes.NewReader([]byte { _, _, err := decodeMessageB(bytes.NewReader([]byte {
0x6B, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x12,
0x01, 0x06, 0x01, 0x06,
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
})) }))