@rbxts/tether 1.2.4 → 1.2.6

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 = "------------------------------------"
 	--[[
 		*
@@ -120,17 +96,13 @@ do
 				local schemaString = if schema ~= nil then " " .. table.concat(string.split(repr(schema[2], {
 					pretty = true,
 				}), "\n"), "\n ") else "unknown"
-				local text = { "\n", horizontalLine, "\n", "Packet sent to ", (if RunService:IsServer() then "client" else "server"), "!\n", " - Message: ", message, "\n", " - Data: ", if data == nil then "undefined" else data, "\n", " - Raw data:\n", "   - Buffer: ", bufferToString(rawData.buffer), "\n", "   - Blobs: ", repr(rawData.blobs, {
+				local text = { "\n", horizontalLine, "\n", "Packet sent to ", (if RunService:IsServer() then "client" else "server"), "!\n", " - Message: ", message, "\n", " - Data: ", repr(data, {
+					pretty = true,
+				}), "\n", " - Raw data:\n", "   - Buffer: ", bufferToString(rawData.buffer), "\n", "   - Blobs: ", repr(rawData.blobs, {
 					pretty = false,
 					robloxClassName = true,
 				}), "\n", " - Packet size: ", bufferSize + blobsSize, " bytes\n", "   - Buffer: ", bufferSize, " bytes\n", "   - Blobs: ", blobsSize, " bytes\n", " - Schema: ", schemaString, "\n", horizontalLine, "\n" }
-				-- ▼ ReadonlyArray.join ▼
-				local _result = table.create(#text)
-				for _k, _v in text do
-					_result[_k] = tostring(_v)
-				end
-				-- ▲ ReadonlyArray.join ▲
-				print(table.concat(_result, ""))
+				print(table.concat(text, ""))
 			end
 		end
 	end

package/out/message-emitter.d.ts

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

package/out/message-emitter.luau

@@ -7,14 +7,16 @@ local _services = TS.import(script, TS.getModule(script, "@rbxts", "services"))
 local Players = _services.Players
 local RunService = _services.RunService
 local Destroyable = TS.import(script, TS.getModule(script, "@rbxts", "destroyable").out).default
+local repr = TS.import(script, TS.getModule(script, "@rbxts", "repr").out)
 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 guardFailed = function(message)
-	return `[@rbxts/tether]: Type validation guard failed for message '{message}' - check your sent data`
+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, data)
+	return `[@rbxts/tether]: Type validation guard failed for message '{message}' - check your sent data\nSent data: {repr(data)}`
 end
 local MessageEmitter
 do
@@ -225,8 +227,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 +240,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 +356,7 @@ do
 			local numberKind = tonumber(kind)
 			emitter.guards[numberKind] = guard
 			if serializerMetadata == nil then
+				emitter.serializers[numberKind] = messageSerializer
 				continue
 			end
 			emitter:addSerializer(numberKind, serializerMetadata)
@@ -365,7 +369,7 @@ do
 		local guard = _guards[_message]
 		local guardPassed = guard(data)
 		if not guardPassed then
-			warn(guardFailed(message))
+			warn(guardFailed(message, data))
 		end
 		return guardPassed
 	end
@@ -388,12 +392,9 @@ do
 		return self
 	end
 	function MessageEmitter:onRemoteFire(serializedPacket, player)
-		local sentMessage = self:readMessageFromPacket(serializedPacket)
-		self:executeEventCallbacks(sentMessage, serializedPacket, player)
-		self:executeFunctions(sentMessage, serializedPacket)
-	end
-	function MessageEmitter:readMessageFromPacket(serializedPacket)
-		return buffer.readu8(serializedPacket.buffer, 0)
+		local message = buffer.readu8(serializedPacket.buffer, 0)
+		self:executeEventCallbacks(message, serializedPacket, player)
+		self:executeFunctions(message, serializedPacket)
 	end
 	function MessageEmitter:executeFunctions(message, serializedPacket)
 		local isServer = RunService:IsServer()
@@ -483,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.4",
+  "version": "1.2.6",
   "main": "out/init.lua",
   "scripts": {
     "build": "rbxtsc",