From 0218c2131f83771c28e0f088ed0285f18e93d9e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Art=D1=91m=20Mishin?= Date: Mon, 26 May 2025 04:34:59 +0300 Subject: [PATCH] chore: Update --- buffer.go | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ sink.go | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/buffer.go b/buffer.go index 865c7b6..ed55eed 100644 --- a/buffer.go +++ b/buffer.go @@ -30,6 +30,54 @@ type byteBuffer struct { writerCursor Cursor } +func (b *byteBuffer) WriteShortByteArray(data []byte) error { + if len(data) > 0xFFFF { + return ErrOutOfBounds.CreateEmpty() + } + if b.RemainingWriterBytes() < 2+len(data) { + return ErrOutOfBounds.CreateEmpty() + } + if err := b.WriteShortLE(int16(len(data))); err != nil { + return err + } + n, err := b.Write(data) + if err != nil { + return err + } + if n != len(data) { + return ErrOutOfBounds.CreateEmpty() + } + return nil +} + +func (b *byteBuffer) WriteByteArray(data []byte) error { + if len(data) > 0xFFFFFFFF { + return ErrOutOfBounds.CreateEmpty() + } + if b.RemainingWriterBytes() < 4+len(data) { + return ErrOutOfBounds.CreateEmpty() + } + if err := b.WriteIntLE(int32(len(data))); err != nil { + return err + } + n, err := b.Write(data) + if err != nil { + return err + } + if n != len(data) { + return ErrOutOfBounds.CreateEmpty() + } + return nil +} + +func (b *byteBuffer) WriteShortString(s string) error { + return b.WriteByteArray([]byte(s)) +} + +func (b *byteBuffer) WriteString(s string) error { + return b.WriteByteArray([]byte(s)) +} + func (b *byteBuffer) ReadShortByteArray() ([]byte, error) { if b.RemainingReaderBytes() < 2 { return nil, ErrOutOfBounds.CreateEmpty() diff --git a/sink.go b/sink.go index 4730df1..fbccc83 100644 --- a/sink.go +++ b/sink.go @@ -6,4 +6,39 @@ type Sink interface { type BufferedSink interface { Sink + WriteByte(b byte) error + WriteUByte(b uint8) error + + WriteShortLE(v int16) error + WriteShortBE(v int16) error + + WriteIntLE(v int32) error + WriteIntBE(v int32) error + + WriteLongLE(v int64) error + WriteLongBE(v int64) error + + WriteUShortLE(v uint16) error + WriteUShortBE(v uint16) error + + WriteUIntLE(v uint32) error + WriteUIntBE(v uint32) error + + WriteULongLE(v uint64) error + WriteULongBE(v uint64) error + + WriteFloatLE(v float32) error + WriteFloatBE(v float32) error + + WriteDoubleLE(v float64) error + WriteDoubleBE(v float64) error + + // WriteShortByteArray writes a size-prefixed byte array. + // Structure: [ShortLE : size][size bytes data] + WriteShortByteArray(data []byte) error + // WriteByteArray writes a size-prefixed byte array. + // Structure: [IntLE : size][size bytes data] + WriteByteArray(data []byte) error + WriteShortString(s string) error + WriteString(s string) error }