test[protocol]: gdscript protocol generation test

Author: jaysunxiao

protocol/src/test/gdscript/zfoogd/ByteBuffer.gd

@@ -1,4 +1,4 @@
-const ProtocolManager = preload("./ProtocolManager.gd")
+class_name ByteBuffer
 
 const EMPTY: String = ""
 
@@ -71,9 +71,6 @@ func isReadable() -> bool:
 func toBytes() -> PackedByteArray:
 	return buffer.data_array.slice(0, writeOffset)
 
-func newInstance(protocolId: int) -> Object:
-	return ProtocolManager.newInstance(protocolId)
-
 # -------------------------------------------------write/read-------------------------------------------------
 func writeBytes(value: PackedByteArray):
 	var length: int = value.size()
@@ -304,14 +301,12 @@ func readString() -> String:
 	readOffset += length
 	return value
 
-func writePacket(packet, protocolId):
-	var protocolRegistration = ProtocolManager.getProtocol(protocolId)
-	protocolRegistration.write(self, packet)
+func writePacket(packet: Object, protocol: Object):
+	protocol.write(self, packet)
 	pass
 
-func readPacket(protocolId) -> Object:
-	var protocolRegistration = ProtocolManager.getProtocol(protocolId)
-	return protocolRegistration.read(self)
+func readPacket(protocol: Object) -> Object:
+	return protocol.read(self)
 
 func writeBoolArray(array):
 	if (array == null):
@@ -449,24 +444,21 @@ func readStringArray() -> Array[String]:
 			array.append(readString())
 	return array
 
-func writePacketArray(array, protocolId):
+func writePacketArray(array: Array, protocol: Object):
 	if (array == null):
 		writeInt(0)
 	else:
-		var protocolRegistration = ProtocolManager.getProtocol(protocolId)
 		writeInt(array.size())
 		for element in array:
-			protocolRegistration.write(self, element)
+			protocol.write(self, element)
 	pass
 
-func readPacketArray(protocolId) -> Array:
-	var protocolRegistration = ProtocolManager.getProtocol(protocolId)
-	var protocol = ProtocolManager.getProtocolClass(protocolId)
+func readPacketArray(protocol: Object) -> Array:
 	var array = Array([], typeof(protocol), StringName("RefCounted"), protocol)
 	var size = readInt()
 	if (size > 0):
 		for index in range(size):
-			array.append(protocolRegistration.read(self))
+			array.append(protocol.read(self))
 	#var a = array.get_typed_class_name()
 	#var b = array.get_typed_script()
 	#var c = array.get_typed_builtin()
@@ -537,26 +529,23 @@ func readIntStringMap() -> Dictionary[int, String]:
 			map[key] = value
 	return map
 
-func writeIntPacketMap(map, protocolId):
+func writeIntPacketMap(map: Dictionary, protocol: Object):
 	if (map == null):
 		writeInt(0)
 	else:
-		var protocolRegistration = ProtocolManager.getProtocol(protocolId)
 		writeInt(map.size())
 		for key in map:
 			writeInt(key)
-			protocolRegistration.write(self, map[key])
+			protocol.write(self, map[key])
 	pass
 
-func readIntPacketMap(protocolId) -> Dictionary:
-	var protocolRegistration = ProtocolManager.getProtocol(protocolId)
-	var protocol = ProtocolManager.getProtocolClass(protocolId)
+func readIntPacketMap(protocol: Object) -> Dictionary:
 	var map = Dictionary({}, TYPE_INT, "", null, typeof(protocol), StringName("RefCounted"), protocol)
 	var size = readInt()
 	if (size > 0):
 		for index in range(size):
 			var key = readInt()
-			var value = protocolRegistration.read(self)
+			var value = protocol.read(self)
 			map[key] = value
 	return map
 
@@ -620,26 +609,23 @@ func readLongStringMap() -> Dictionary[int, String]:
 			map[key] = value
 	return map
 
-func writeLongPacketMap(map, protocolId):
+func writeLongPacketMap(map: Dictionary, protocol: Object):
 	if (map == null):
 		writeInt(0)
 	else:
-		var protocolRegistration = ProtocolManager.getProtocol(protocolId)
 		writeInt(map.size())
 		for key in map:
 			writeLong(key)
-			protocolRegistration.write(self, map[key])
+			protocol.write(self, map[key])
 	pass
 
-func readLongPacketMap(protocolId) -> Dictionary:
-	var protocolRegistration = ProtocolManager.getProtocol(protocolId)
-	var protocol = ProtocolManager.getProtocolClass(protocolId)
+func readLongPacketMap(protocol: Object) -> Dictionary:
 	var map = Dictionary({}, TYPE_INT, "", null, typeof(protocol), StringName("RefCounted"), protocol)
 	var size = readInt()
 	if (size > 0):
 		for index in range(size):
 			var key = readLong()
-			var value = protocolRegistration.read(self)
+			var value = protocol.read(self)
 			map[key] = value
 	return map
 
@@ -703,25 +689,22 @@ func readStringStringMap() -> Dictionary[String, String]:
 			map[key] = value
 	return map
 
-func writeStringPacketMap(map, protocolId):
+func writeStringPacketMap(map: Dictionary, protocol: Object):
 	if (map == null):
 		writeInt(0)
 	else:
-		var protocolRegistration = ProtocolManager.getProtocol(protocolId)
 		writeInt(map.size())
 		for key in map:
 			writeString(key)
-			protocolRegistration.write(self, map[key])
+			protocol.write(self, map[key])
 	pass
 
-func readStringPacketMap(protocolId) -> Dictionary:
-	var protocolRegistration = ProtocolManager.getProtocol(protocolId)
-	var protocol = ProtocolManager.getProtocolClass(protocolId)
+func readStringPacketMap(protocol: Object) -> Dictionary:
 	var map = Dictionary({}, TYPE_STRING, "", null, typeof(protocol), StringName("RefCounted"), protocol)
 	var size = readInt()
 	if (size > 0):
 		for index in range(size):
 			var key = readString()
-			var value = protocolRegistration.read(self)
+			var value = protocol.read(self)
 			map[key] = value
 	return map

protocol/src/test/gdscript/zfoogd/ProtocolManager.gd

@@ -1,48 +1,20 @@
-const EmptyObject = preload("./packet/EmptyObject.gd")
-const VeryBigObject = preload("./packet/VeryBigObject.gd")
-const ComplexObject = preload("./packet/ComplexObject.gd")
-const NormalObject = preload("./packet/NormalObject.gd")
-const ObjectA = preload("./packet/ObjectA.gd")
-const ObjectB = preload("./packet/ObjectB.gd")
-const SimpleObject = preload("./packet/SimpleObject.gd")
+static var protocols: Dictionary[int, Object] = {
+	0 : EmptyObject,
+	1 : VeryBigObject,
+	100 : ComplexObject,
+	101 : NormalObject,
+	102 : ObjectA,
+	103 : ObjectB,
+	104 : SimpleObject
+}
 
-static var protocols: Dictionary[int, RefCounted] = {}
-static var protocolClassMap: Dictionary[int, Object] = {}
-
-static func initProtocol():
-	protocols[0] = EmptyObject.EmptyObjectRegistration.new()
-	protocolClassMap[0] = EmptyObject
-	protocols[1] = VeryBigObject.VeryBigObjectRegistration.new()
-	protocolClassMap[1] = VeryBigObject
-	protocols[100] = ComplexObject.ComplexObjectRegistration.new()
-	protocolClassMap[100] = ComplexObject
-	protocols[101] = NormalObject.NormalObjectRegistration.new()
-	protocolClassMap[101] = NormalObject
-	protocols[102] = ObjectA.ObjectARegistration.new()
-	protocolClassMap[102] = ObjectA
-	protocols[103] = ObjectB.ObjectBRegistration.new()
-	protocolClassMap[103] = ObjectB
-	protocols[104] = SimpleObject.SimpleObjectRegistration.new()
-	protocolClassMap[104] = SimpleObject
-	pass
-
-static func getProtocol(protocolId: int):
-	return protocols[protocolId]
-
-static func getProtocolClass(protocolId: int):
-	return protocolClassMap[protocolId]
-
-static func newInstance(protocolId: int):
-	var protocol = protocolClassMap[protocolId]
-	return protocol.new()
-
-static func write(buffer, packet):
+static func write(buffer: ByteBuffer, packet: Object) -> void:
 	var protocolId: int = packet.protocolId()
 	buffer.writeShort(protocolId)
-	var protocol = protocols[protocolId]
-	protocol.write(buffer, packet)
+	packet.write(buffer, packet)
+	pass
 
-static func read(buffer):
+static func read(buffer: ByteBuffer) -> Object:
 	var protocolId = buffer.readShort()
 	var protocol = protocols[protocolId]
 	var packet = protocol.read(buffer)