deps: bump charm & charm-sync

Author: wad4444

package-lock.json

@@ -11,8 +11,17 @@
 		"test:build": "rbxtsc --type=game -p testing -i testing/include",
 		"serve": "rojo serve testing/testing.project.json"
 	},
-	"keywords": ["WCS", "Combat", "CombatSystem", "CombatHandler"],
-	"files": ["out", "!**/*.tsbuildinfo", "!out/tests/*"],
+	"keywords": [
+		"WCS",
+		"Combat",
+		"CombatSystem",
+		"CombatHandler"
+	],
+	"files": [
+		"out",
+		"!**/*.tsbuildinfo",
+		"!out/tests/*"
+	],
 	"author": "wad4444",
 	"license": "MIT",
 	"devDependencies": {
@@ -36,8 +45,8 @@
 	"dependencies": {
 		"@flamework/core": "^1.2.3",
 		"@flamework/networking": "^1.2.3",
-		"@rbxts/charm": "^0.6.0",
-		"@rbxts/charm-payload-converter": "^1.0.1",
+		"@rbxts/charm": "^0.10.0",
+		"@rbxts/charm-sync": "^0.3.0",
 		"@rbxts/flamework-binary-serializer": "^0.6.0",
 		"@rbxts/immut": "^0.4.4-ts.0",
 		"@rbxts/janitor": "^1.17.0-ts.1",

package.json

@@ -1,6 +1,5 @@
 import { Reflect } from "@flamework/core";
-import { subscribe, sync } from "@rbxts/charm";
-import { fromSerializeablePayload } from "@rbxts/charm-payload-converter";
+import { subscribe } from "@rbxts/charm";
 import { t } from "@rbxts/t";
 import {
 	clientAtom,
@@ -21,11 +20,11 @@ import {
 import { ClientEvents, ClientFunctions } from "./networking";
 import {
 	type SerializedData,
-	dispatchSerializer,
 	messageSerializer,
 } from "./serdes";
 import type { UnknownSkill } from "./skill";
 import type { UnknownStatus } from "./statusEffect";
+import CharmSync from "@rbxts/charm-sync";
 
 let currentInstance: Client | undefined = undefined;
 export type WCS_Client = Client;
@@ -34,7 +33,7 @@ class Client {
 	private isActive = false;
 	private registeredModules: ModuleScript[] = [];
 
-	private clientSyncer = sync.client({
+	private clientSyncer = CharmSync.client({
 		atoms: { atom: clientAtom },
 	});
 
@@ -80,12 +79,8 @@ class Client {
 		setActiveHandler(this);
 		this.setupCharacterReplication();
 
-		ClientEvents.sync.connect((serialized) => {
-			const payloads = dispatchSerializer.deserialize(
-				serialized.buffer,
-				serialized.blobs,
-			);
-			this.clientSyncer.sync(...payloads.map(fromSerializeablePayload));
+		ClientEvents.sync.connect((...payloads) => {
+			this.clientSyncer.sync(...payloads);
 		});
 		ClientEvents.start();
 

src/source/client.ts

@@ -1,4 +1,6 @@
 import { Networking } from "@flamework/networking";
+import type { SyncPayload } from "@rbxts/charm-sync";
+import type { CharacterData } from "exports";
 import type { SerializedData } from "./serdes";
 
 interface ClientToServerEvents {
@@ -11,7 +13,11 @@ interface ClientToServerEvents {
 }
 
 interface ServerToClientEvents {
-	sync(serialized: SerializedData): void;
+	sync(
+		...payloads: SyncPayload<{
+			atom: Charm.Atom<CharacterData | undefined>;
+		}>[]
+	): void;
 	messageToClient(serialized: SerializedData): void;
 	messageToClient_urel: Networking.Unreliable<
 		(serialized: SerializedData) => void

src/source/networking.ts

@@ -1,12 +1,5 @@
-import type Charm from "@rbxts/charm";
-import type { SerializeablePayload } from "@rbxts/charm-payload-converter";
 import { createBinarySerializer } from "@rbxts/flamework-binary-serializer";
-import type { CharacterData } from "exports";
 
-export const dispatchSerializer =
-	createBinarySerializer<
-		SerializeablePayload<{ atom: Charm.Atom<CharacterData | undefined> }>[]
-	>();
 export const skillRequestSerializer =
 	createBinarySerializer<
 		[Name: string, Action: "End" | "Start", StarterParams: unknown[]]

src/source/serdes.ts

@@ -1,6 +1,6 @@
 import { Reflect } from "@flamework/core";
-import { atom, sync } from "@rbxts/charm";
-import { toSerializeablePayload } from "@rbxts/charm-payload-converter";
+import { atom } from "@rbxts/charm";
+import CharmSync from "@rbxts/charm-sync";
 import { Players } from "@rbxts/services";
 import { t } from "@rbxts/t";
 import {
@@ -20,7 +20,6 @@ import {
 import { ServerEvents, ServerFunctions } from "./networking";
 import {
 	type SerializedData,
-	dispatchSerializer,
 	messageSerializer,
 	skillRequestSerializer,
 } from "./serdes";
@@ -35,7 +34,7 @@ class Server {
 
 	/** @internal */
 	public atom = atom<Map<string, CharacterData>>(new Map());
-	private syncer = sync.server({
+	private syncer = CharmSync.server({
 		atoms: { atom: this.atom },
 		preserveHistory: true,
 	});
@@ -92,7 +91,7 @@ class Server {
 			if (!correspondingId) return;
 			assignedIdentifiers.set(player, correspondingId);
 
-			type ModifiedPayload = Charm.SyncPayload<{
+			type ModifiedPayload = CharmSync.SyncPayload<{
 				atom: Charm.Atom<CharacterData | undefined>;
 			}>;
 			const modified: ModifiedPayload[] = [];
@@ -107,23 +106,24 @@ class Server {
 							data: { atom: characterData },
 						});
 					}
-				} else {
-					const data = payload.data.atom;
-					if (data === undefined) continue;
+					continue;
+				}
 
-					const characterData = data.get(correspondingId);
-					if (characterData === undefined) continue;
+				print(payload.data);
 
-					modified.push({
-						type: "patch",
-						data: { atom: characterData },
-					});
-				}
+				const data = payload.data.atom;
+				if (data === undefined) continue;
+
+				const characterData = data.get(correspondingId);
+				if (characterData === undefined) continue;
+
+				modified.push({
+					type: "patch",
+					data: { atom: characterData as never },
+				});
 			}
 
-			const serializeable = modified.map(toSerializeablePayload);
-			const serialized = dispatchSerializer.serialize(serializeable);
-			ServerEvents.sync.fire(player, serialized);
+			ServerEvents.sync.fire(player, ...modified);
 		});
 		ServerEvents.start.connect((player) => this.syncer.hydrate(player));