@rbxts/tether 1.2.3 → 1.2.5

package/out/builtin-middlewares.luau

@@ -3,6 +3,7 @@ local TS = _G[script]
 local RunService = TS.import(script, TS.getModule(script, "@rbxts", "services")).RunService
 local repr = TS.import(script, TS.getModule(script, "@rbxts", "repr").out)
 local DropRequest = TS.import(script, script.Parent, "middleware").DropRequest
+local bufferToString = TS.import(script, script.Parent, "utility").bufferToString
 local BLOB_SIZE = 5
 local BuiltinMiddlewares = {}
 do
@@ -68,31 +69,6 @@ do
 		end
 	end
 	_container.rateLimit = rateLimit
-	local function bufferToString(buf)
-		local s = { "{ " }
-		do
-			local i = 0
-			local _shouldIncrement = false
-			while true do
-				if _shouldIncrement then
-					i += 1
-				else
-					_shouldIncrement = true
-				end
-				if not (i < buffer.len(buf)) then
-					break
-				end
-				local byte = buffer.readu8(buf, i)
-				local _arg0 = tostring(byte)
-				table.insert(s, _arg0)
-				if i < buffer.len(buf) - 1 then
-					table.insert(s, ", ")
-				end
-			end
-		end
-		table.insert(s, " }")
-		return table.concat(s, "")
-	end
 	local horizontalLine = "------------------------------------"
 	--[[
 		*

package/out/message-emitter.d.ts

@@ -103,7 +103,7 @@ export declare class MessageEmitter<MessageData> extends Destroyable {
     };
     private validateData;
     private initialize;
-    private readMessageFromPacket;
+    private onRemoteFire;
     private executeFunctions;
     private executeEventCallbacks;
     private once;

package/out/message-emitter.luau

@@ -11,8 +11,9 @@ local _middleware = TS.import(script, script.Parent, "middleware")
 local DropRequest = _middleware.DropRequest
 local MiddlewareProvider = _middleware.MiddlewareProvider
 -- TODO: error when trying to do something like server.emit() from the server
+local messageSerializer = createBinarySerializer({ "object_raw", { { "message", { "u8" } }, { "data", { "literal", {}, -1 } } } })
 local remotes = Networking.createEvent("@rbxts/tether:message-emitter@remotes")
-local metaGenerationFailed = "[@rbxts/tether]: Failed to generate message metadata - make sure you are using Flamework macro-friendly types in your schemas"
+local metaGenerationFailed = "[@rbxts/tether]: Failed to generate message metadata - make sure you have the Flamework transformer and are using Flamework macro-friendly types in your schemas"
 local guardFailed = function(message)
 	return `[@rbxts/tether]: Type validation guard failed for message '{message}' - check your sent data`
 end
@@ -225,8 +226,9 @@ do
 						updateData = updateData,
 						getRawData = getPacket,
 					}
+					local players = Players:GetPlayers()
 					for _, globalMiddleware in self.middleware:getClientGlobal() do
-						for _1, player in Players:GetPlayers() do
+						for _1, player in players do
 							if not self:validateData(message, data) then
 								return nil
 							end
@@ -237,7 +239,7 @@ do
 						end
 					end
 					for _, middleware in self.middleware:getClient(message) do
-						for _1, player in Players:GetPlayers() do
+						for _1, player in players do
 							if not self:validateData(message, data) then
 								return nil
 							end
@@ -353,6 +355,7 @@ do
 			local numberKind = tonumber(kind)
 			emitter.guards[numberKind] = guard
 			if serializerMetadata == nil then
+				emitter.serializers[numberKind] = messageSerializer
 				continue
 			end
 			emitter:addSerializer(numberKind, serializerMetadata)
@@ -372,21 +375,26 @@ do
 	function MessageEmitter:initialize()
 		if RunService:IsClient() then
 			self.janitor:Add(self.clientEvents.sendClientMessage:connect(function(serializedPacket)
-				local sentMessage = self:readMessageFromPacket(serializedPacket)
-				self:executeEventCallbacks(sentMessage, serializedPacket)
-				self:executeFunctions(sentMessage, serializedPacket)
+				return self:onRemoteFire(serializedPacket)
+			end))
+			self.janitor:Add(self.clientEvents.sendUnreliableClientMessage:connect(function(serializedPacket)
+				return self:onRemoteFire(serializedPacket)
 			end))
 		else
 			self.janitor:Add(self.serverEvents.sendServerMessage:connect(function(player, serializedPacket)
-				local sentMessage = self:readMessageFromPacket(serializedPacket)
-				self:executeEventCallbacks(sentMessage, serializedPacket, player)
-				self:executeFunctions(sentMessage, serializedPacket)
+				return self:onRemoteFire(serializedPacket, player)
+			end))
+			self.janitor:Add(self.serverEvents.sendUnreliableServerMessage:connect(function(player, serializedPacket)
+				return self:onRemoteFire(serializedPacket, player)
 			end))
 		end
 		return self
 	end
-	function MessageEmitter:readMessageFromPacket(serializedPacket)
-		return buffer.readu8(serializedPacket.buffer, 0)
+	function MessageEmitter:onRemoteFire(serializedPacket, player)
+		local _binding = messageSerializer.deserialize(serializedPacket.buffer, serializedPacket.blobs)
+		local message = _binding.message
+		self:executeEventCallbacks(message, serializedPacket, player)
+		self:executeFunctions(message, serializedPacket)
 	end
 	function MessageEmitter:executeFunctions(message, serializedPacket)
 		local isServer = RunService:IsServer()
@@ -476,18 +484,17 @@ do
 	end
 	function MessageEmitter:getPacket(message, data)
 		local serializer = self:getSerializer(message)
-		if serializer ~= nil and data ~= nil then
-			return serializer.serialize({
+		if serializer == nil then
+			warn(`[@rbxts/tether]: Failed to get packet for message '{message}', no serializer was found`)
+			return messageSerializer.serialize({
 				message = message,
-				data = data,
+				data = nil,
 			})
 		end
-		local buf = buffer.create(1)
-		buffer.writeu8(buf, 0, message)
-		return {
-			buffer = buf,
-			blobs = {},
-		}
+		return serializer.serialize({
+			message = message,
+			data = data,
+		})
 	end
 	function MessageEmitter:addSerializer(message, meta)
 		self.serializers[message] = self:createMessageSerializer(meta)

package/out/utility.d.ts

@@ -0,0 +1 @@
+export declare function bufferToString(buf: buffer): string;

package/out/utility.luau

@@ -0,0 +1,29 @@
+-- Compiled with roblox-ts v3.0.0
+local function bufferToString(buf)
+	local s = { "{ " }
+	do
+		local i = 0
+		local _shouldIncrement = false
+		while true do
+			if _shouldIncrement then
+				i += 1
+			else
+				_shouldIncrement = true
+			end
+			if not (i < buffer.len(buf)) then
+				break
+			end
+			local byte = buffer.readu8(buf, i)
+			local _arg0 = tostring(byte)
+			table.insert(s, _arg0)
+			if i < buffer.len(buf) - 1 then
+				table.insert(s, ", ")
+			end
+		end
+	end
+	table.insert(s, " }")
+	return table.concat(s, "")
+end
+return {
+	bufferToString = bufferToString,
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rbxts/tether",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "main": "out/init.lua",
   "scripts": {
     "build": "rbxtsc",