Refactor types

init.go

@@ -10,10 +10,10 @@ var logger = plogger.NewLogger()
 func init() {
 	initResultCodes()
 
-	types.RegisterVariantType(1, types.NewPrimitiveS64(0))
-	types.RegisterVariantType(2, types.NewPrimitiveF64(0))
-	types.RegisterVariantType(3, types.NewPrimitiveBool(false))
+	types.RegisterVariantType(1, types.NewInt64(0))
+	types.RegisterVariantType(2, types.NewDouble(0))
+	types.RegisterVariantType(3, types.NewBool(false))
 	types.RegisterVariantType(4, types.NewString(""))
 	types.RegisterVariantType(5, types.NewDateTime(0))
-	types.RegisterVariantType(6, types.NewPrimitiveU64(0))
+	types.RegisterVariantType(6, types.NewUInt64(0))
 }

kerberos.go

@@ -152,10 +152,10 @@ func (ti *KerberosTicketInternalData) Decrypt(stream *ByteStreamIn, key []byte)
 			return fmt.Errorf("Failed to read Kerberos ticket internal data. %s", err.Error())
 		}
 
-		hash := md5.Sum(append(key, ticketKey.Value...))
+		hash := md5.Sum(append(key, *ticketKey...))
 		key = hash[:]
 
-		stream = NewByteStreamIn(data.Value, stream.LibraryVersions, stream.Settings)
+		stream = NewByteStreamIn(*data, stream.LibraryVersions, stream.Settings)
 	}
 
 	encryption := NewKerberosEncryption(key)

prudp_endpoint.go

@@ -449,7 +449,7 @@ func (pep *PRUDPEndPoint) readKerberosTicket(payload []byte) ([]byte, *types.PID
 	serverKey := DeriveKerberosKey(serverAccount.PID, []byte(serverAccount.Password))
 
 	ticket := NewKerberosTicketInternalData(pep.Server)
-	if err := ticket.Decrypt(NewByteStreamIn(ticketData.Value, pep.Server.LibraryVersions, pep.ByteStreamSettings()), serverKey); err != nil {
+	if err := ticket.Decrypt(NewByteStreamIn(*ticketData, pep.Server.LibraryVersions, pep.ByteStreamSettings()), serverKey); err != nil {
 		return nil, nil, 0, err
 	}
 
@@ -464,7 +464,7 @@ func (pep *PRUDPEndPoint) readKerberosTicket(payload []byte) ([]byte, *types.PID
 	sessionKey := ticket.SessionKey
 	kerberos := NewKerberosEncryption(sessionKey)
 
-	decryptedRequestData, err := kerberos.Decrypt(requestData.Value)
+	decryptedRequestData, err := kerberos.Decrypt(*requestData)
 	if err != nil {
 		return nil, nil, 0, err
 	}

test/auth.go

@@ -62,7 +62,7 @@ func login(packet nex.PRUDPPacketInterface) {
 		panic(err)
 	}
 
-	sourceAccount, _ := accountDetailsByUsername(strUserName.Value)
+	sourceAccount, _ := accountDetailsByUsername(string(*strUserName))
 	targetAccount, _ := accountDetailsByUsername(secureServerAccount.Username)
 
 	retval := types.NewQResultSuccess(0x00010001)
@@ -72,8 +72,8 @@ func login(packet nex.PRUDPPacketInterface) {
 	strReturnMsg := types.NewString("Test Build")
 
 	pConnectionData.StationURL = types.NewStationURL("prudps:/address=192.168.1.98;port=60001;CID=1;PID=2;sid=1;stream=10;type=2")
-	pConnectionData.SpecialProtocols = types.NewList[*types.PrimitiveU8]()
-	pConnectionData.SpecialProtocols.Type = types.NewPrimitiveU8(0)
+	pConnectionData.SpecialProtocols = types.NewList[*types.UInt8]()
+	pConnectionData.SpecialProtocols.Type = types.NewUInt8(0)
 	pConnectionData.StationURLSpecialProtocols = types.NewStationURL("")
 	pConnectionData.Time = types.NewDateTime(0).Now()
 

test/secure.go

@@ -17,9 +17,9 @@ var secureEndpoint *nex.PRUDPEndPoint
 type principalPreference struct {
 	types.Structure
 	*types.Data
-	ShowOnlinePresence  *types.PrimitiveBool
-	ShowCurrentTitle    *types.PrimitiveBool
-	BlockFriendRequests *types.PrimitiveBool
+	ShowOnlinePresence  *types.Bool
+	ShowCurrentTitle    *types.Bool
+	BlockFriendRequests *types.Bool
 }
 
 func (pp *principalPreference) WriteTo(writable types.Writable) {
@@ -31,7 +31,7 @@ func (pp *principalPreference) WriteTo(writable types.Writable) {
 type comment struct {
 	types.Structure
 	*types.Data
-	Unknown     *types.PrimitiveU8
+	Unknown     *types.UInt8
 	Contents    *types.String
 	LastChanged *types.DateTime
 }
@@ -154,12 +154,12 @@ func updateAndGetAllInformation(packet nex.PRUDPPacketInterface) {
 	responseStream := nex.NewByteStreamOut(secureEndpoint.LibraryVersions(), secureEndpoint.ByteStreamSettings())
 
 	(&principalPreference{
-		ShowOnlinePresence:  types.NewPrimitiveBool(true),
-		ShowCurrentTitle:    types.NewPrimitiveBool(true),
-		BlockFriendRequests: types.NewPrimitiveBool(false),
+		ShowOnlinePresence:  types.NewBool(true),
+		ShowCurrentTitle:    types.NewBool(true),
+		BlockFriendRequests: types.NewBool(false),
 	}).WriteTo(responseStream)
 	(&comment{
-		Unknown:     types.NewPrimitiveU8(0),
+		Unknown:     types.NewUInt8(0),
 		Contents:    types.NewString("Rewrite Test"),
 		LastChanged: types.NewDateTime(0),
 	}).WriteTo(responseStream)

types/any_data_holder.go

@@ -19,8 +19,8 @@ func RegisterDataHolderType(name string, rvType RVType) {
 // Structure body, so the receiver can properly decode it.
 type AnyDataHolder struct {
 	TypeName   *String
-	Length1    *PrimitiveU32 // Length of ObjectData + Length2
-	Length2    *PrimitiveU32 // Length of ObjectData
+	Length1    *UInt32 // Length of ObjectData + Length2
+	Length2    *UInt32 // Length of ObjectData
 	ObjectData RVType
 }
 
@@ -59,11 +59,13 @@ func (adh *AnyDataHolder) ExtractFrom(readable Readable) error {
 		return fmt.Errorf("Failed to read AnyDataHolder length 2. %s", err.Error())
 	}
 
-	if _, ok := AnyDataHolderObjects[adh.TypeName.Value]; !ok {
-		return fmt.Errorf("Unknown AnyDataHolder type: %s", adh.TypeName.Value)
+	typeName := string(*adh.TypeName)
+
+	if _, ok := AnyDataHolderObjects[typeName]; !ok {
+		return fmt.Errorf("Unknown AnyDataHolder type: %s", typeName)
 	}
 
-	adh.ObjectData = AnyDataHolderObjects[adh.TypeName.Value].Copy()
+	adh.ObjectData = AnyDataHolderObjects[typeName].Copy()
 
 	if err := adh.ObjectData.ExtractFrom(readable); err != nil {
 		return fmt.Errorf("Failed to read AnyDataHolder object data. %s", err.Error())
@@ -77,8 +79,8 @@ func (adh *AnyDataHolder) Copy() RVType {
 	copied := NewAnyDataHolder()
 
 	copied.TypeName = adh.TypeName.Copy().(*String)
-	copied.Length1 = adh.Length1.Copy().(*PrimitiveU32)
-	copied.Length2 = adh.Length2.Copy().(*PrimitiveU32)
+	copied.Length1 = adh.Length1.Copy().(*UInt32)
+	copied.Length2 = adh.Length2.Copy().(*UInt32)
 	copied.ObjectData = adh.ObjectData.Copy()
 
 	return copied
@@ -134,7 +136,7 @@ func (adh *AnyDataHolder) FormatToString(indentationLevel int) string {
 func NewAnyDataHolder() *AnyDataHolder {
 	return &AnyDataHolder{
 		TypeName: NewString(""),
-		Length1:  NewPrimitiveU32(0),
-		Length2:  NewPrimitiveU32(0),
+		Length1:  NewUInt32(0),
+		Length2:  NewUInt32(0),
 	}
 }

types/bool.go

@@ -0,0 +1,48 @@
+package types
+
+import "fmt"
+
+// Bool is a type alias for the Go basic type bool for use as an RVType
+type Bool bool
+
+// WriteTo writes the Bool to the given writable
+func (b Bool) WriteTo(writable Writable) {
+	writable.WritePrimitiveBool(bool(b))
+}
+
+// ExtractFrom extracts the Bool value from the given readable
+func (b *Bool) ExtractFrom(readable Readable) error {
+	value, err := readable.ReadPrimitiveBool()
+	if err != nil {
+		return err
+	}
+
+	*b = Bool(value)
+	return nil
+}
+
+// Copy returns a pointer to a copy of the Bool. Requires type assertion when used
+func (b Bool) Copy() RVType {
+	copy := b
+	return &copy
+}
+
+// Equals checks if the input is equal in value to the current instance
+func (b Bool) Equals(o RVType) bool {
+	other, ok := o.(*Bool)
+	if !ok {
+		return false
+	}
+	return b == *other
+}
+
+// String returns a string representation of the Bool
+func (b Bool) String() string {
+	return fmt.Sprintf("%t", b)
+}
+
+// NewBool returns a new Bool pointer
+func NewBool(input bool) *Bool {
+	b := Bool(input)
+	return &b
+}

types/buffer.go

@@ -2,24 +2,23 @@ package types
 
 import (
 	"bytes"
+	"encoding/hex"
 	"fmt"
 )
 
 // Buffer is an implementation of rdv::Buffer.
-// Wraps a primitive Go byte slice.
+// Type alias of []byte.
 // Same as QBuffer but with a uint32 length field.
-type Buffer struct {
-	Value []byte
-}
+type Buffer []byte
 
 // WriteTo writes the Buffer to the given writable
-func (b *Buffer) WriteTo(writable Writable) {
-	length := len(b.Value)
+func (b Buffer) WriteTo(writable Writable) {
+	length := len(b)
 
 	writable.WritePrimitiveUInt32LE(uint32(length))
 
 	if length > 0 {
-		writable.Write(b.Value)
+		writable.Write(b)
 	}
 }
 
@@ -35,31 +34,34 @@ func (b *Buffer) ExtractFrom(readable Readable) error {
 		return fmt.Errorf("Failed to read NEX Buffer data. %s", err.Error())
 	}
 
-	b.Value = value
-
+	*b = Buffer(value)
 	return nil
 }
 
 // Copy returns a pointer to a copy of the Buffer. Requires type assertion when used
-func (b *Buffer) Copy() RVType {
-	return NewBuffer(b.Value)
+func (b Buffer) Copy() RVType {
+	copied := make(Buffer, len(b))
+	copy(copied, b)
+
+	return &copied
 }
 
 // Equals checks if the input is equal in value to the current instance
-func (b *Buffer) Equals(o RVType) bool {
+func (b Buffer) Equals(o RVType) bool {
 	if _, ok := o.(*Buffer); !ok {
 		return false
 	}
 
-	return bytes.Equal(b.Value, o.(*Buffer).Value)
+	return bytes.Equal(b, *o.(*Buffer))
 }
 
 // String returns a string representation of the struct
-func (b *Buffer) String() string {
-	return fmt.Sprintf("%x", b.Value)
+func (b Buffer) String() string {
+	return hex.EncodeToString(b)
 }
 
 // NewBuffer returns a new Buffer
-func NewBuffer(data []byte) *Buffer {
-	return &Buffer{Value: data}
+func NewBuffer(input []byte) *Buffer {
+	b := Buffer(input)
+	return &b
 }

types/class_version_container.go

@@ -9,7 +9,7 @@ import (
 // Contains version info for Structures used in verbose RMC messages.
 type ClassVersionContainer struct {
 	Structure
-	ClassVersions *Map[*String, *PrimitiveU16]
+	ClassVersions *Map[*String, *UInt16]
 }
 
 // WriteTo writes the ClassVersionContainer to the given writable
@@ -25,7 +25,7 @@ func (cvc *ClassVersionContainer) ExtractFrom(readable Readable) error {
 // Copy returns a pointer to a copy of the ClassVersionContainer. Requires type assertion when used
 func (cvc *ClassVersionContainer) Copy() RVType {
 	copied := NewClassVersionContainer()
-	copied.ClassVersions = cvc.ClassVersions.Copy().(*Map[*String, *PrimitiveU16])
+	copied.ClassVersions = cvc.ClassVersions.Copy().(*Map[*String, *UInt16])
 
 	return copied
 }
@@ -62,11 +62,11 @@ func (cvc *ClassVersionContainer) FormatToString(indentationLevel int) string {
 // NewClassVersionContainer returns a new ClassVersionContainer
 func NewClassVersionContainer() *ClassVersionContainer {
 	cvc := &ClassVersionContainer{
-		ClassVersions: NewMap[*String, *PrimitiveU16](),
+		ClassVersions: NewMap[*String, *UInt16](),
 	}
 
 	cvc.ClassVersions.KeyType = NewString("")
-	cvc.ClassVersions.ValueType = NewPrimitiveU16(0)
+	cvc.ClassVersions.ValueType = NewUInt16(0)
 
 	return cvc
 }