Remote patches

roblox-aurora · Nov 9, 2021 · ccad202 · ccad202
1 parent 2f87117
commit ccad202
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 78 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rbxts/zircon",
-  "version": "0.12.0-beta.0",
+  "version": "0.12.2-beta.0",
   "description": "",
   "main": "out/init.lua",
   "scripts": {

diff --git a/src/Client/BuiltInConsole/UI/DockedConsole.tsx b/src/Client/BuiltInConsole/UI/DockedConsole.tsx
@@ -83,7 +83,7 @@ class ZirconConsoleComponent extends Roact.Component<DockedConsoleProps, DockedC
 		this.sizeYMotor.onStep((value) => setSizeY(value));
 		this.outputTransparencyMotor.onStep((value) => setOutputTransparency(value));
 
-		const DispatchToServer = Remotes.Client.Get(RemoteId.DispatchToServer);
+		const DispatchToServer = Remotes.Client.WaitFor(RemoteId.DispatchToServer).expect();
 		this.dispatch = DispatchToServer;
 	}
 

diff --git a/src/Client/index.tsx b/src/Client/index.tsx
@@ -157,7 +157,7 @@ namespace ZirconClient {
 			Players.LocalPlayer.FindFirstChildOfClass("PlayerGui"),
 		);
 
-		const GetPlayerOptions = Remotes.Client.Get(RemoteId.GetPlayerPermissions);
+		const GetPlayerOptions = Remotes.Client.WaitFor(RemoteId.GetPlayerPermissions).expect();
 		GetPlayerOptions.CallServerAsync().then((permissions) => {
 			ZirconClientStore.dispatch({
 				type: ConsoleActionName.SetConfiguration,
@@ -174,87 +174,92 @@ namespace ZirconClient {
 	}
 
 	if (IsClient) {
-		const StandardOutput = Remotes.Client.Get(RemoteId.StandardOutput);
-		const StandardError = Remotes.Client.Get(RemoteId.StandardError);
+		Remotes.Client.WaitFor(RemoteId.StandardOutput).then((StandardOutput) => {
+			StandardOutput.Connect((message) => {
+				switch (message.type) {
+					case ZirconNetworkMessageType.ZirconiumOutput: {
+						ZirconClientStore.dispatch({
+							type: ConsoleActionName.AddOutput,
+							message: {
+								type: ZirconMessageType.ZirconiumOutput,
+								context: ZirconContext.Server,
+								message,
+							},
+						});
+						break;
+					}
+					case ZirconNetworkMessageType.ZirconSerilogMessage: {
+						ZirconClientStore.dispatch({
+							type: ConsoleActionName.AddOutput,
+							message: {
+								type: ZirconMessageType.StructuredLog,
+								context: ZirconContext.Server,
+								data: message.data,
+							},
+						});
+						break;
+					}
+					case ZirconNetworkMessageType.ZirconStandardOutputMessage: {
+						ZirconClientStore.dispatch({
+							type: ConsoleActionName.AddOutput,
+							message: {
+								type: ZirconMessageType.ZirconLogOutputMesage,
+								context: ZirconContext.Server,
+								message,
+							},
+						});
+						break;
+					}
+				}
+			});
 
-		ZirconClientStore.dispatch({
-			type: ConsoleActionName.AddOutput,
-			message: {
-				type: ZirconMessageType.ZirconLogOutputMesage,
-				context: ZirconContext.Client,
+			ZirconClientStore.dispatch({
+				type: ConsoleActionName.AddOutput,
 				message: {
-					type: ZirconNetworkMessageType.ZirconStandardOutputMessage,
-					message: `Loaded Zircon v${PKG_VERSION}`,
-					level: ZirconLogLevel.Debug,
-					time: DateTime.now().UnixTimestamp,
-					tag: "INIT",
-					data: {
-						Variables: [],
+					type: ZirconMessageType.ZirconLogOutputMesage,
+					context: ZirconContext.Client,
+					message: {
+						type: ZirconNetworkMessageType.ZirconStandardOutputMessage,
+						message: `Loaded Zircon v${PKG_VERSION}`,
+						level: ZirconLogLevel.Debug,
+						time: DateTime.now().UnixTimestamp,
+						tag: "INIT",
+						data: {
+							Variables: [],
+						},
 					},
 				},
-			},
-		});
-
-		StandardOutput.Connect((message) => {
-			switch (message.type) {
-				case ZirconNetworkMessageType.ZirconiumOutput: {
-					ZirconClientStore.dispatch({
-						type: ConsoleActionName.AddOutput,
-						message: { type: ZirconMessageType.ZirconiumOutput, context: ZirconContext.Server, message },
-					});
-					break;
-				}
-				case ZirconNetworkMessageType.ZirconSerilogMessage: {
-					ZirconClientStore.dispatch({
-						type: ConsoleActionName.AddOutput,
-						message: {
-							type: ZirconMessageType.StructuredLog,
-							context: ZirconContext.Server,
-							data: message.data,
-						},
-					});
-					break;
-				}
-				case ZirconNetworkMessageType.ZirconStandardOutputMessage: {
-					ZirconClientStore.dispatch({
-						type: ConsoleActionName.AddOutput,
-						message: {
-							type: ZirconMessageType.ZirconLogOutputMesage,
-							context: ZirconContext.Server,
-							message,
-						},
-					});
-					break;
-				}
-			}
+			});
 		});
 
-		StandardError.Connect((err) => {
-			switch (err.type) {
-				case ZirconNetworkMessageType.ZirconiumParserError:
-				case ZirconNetworkMessageType.ZirconiumRuntimeError: {
-					ZirconClientStore.dispatch({
-						type: ConsoleActionName.AddOutput,
-						message: {
-							type: ZirconMessageType.ZirconiumError,
-							context: ZirconContext.Server,
-							error: err,
-						},
-					});
-					break;
+		Remotes.Client.WaitFor(RemoteId.StandardError).then((StandardError) => {
+			StandardError.Connect((err) => {
+				switch (err.type) {
+					case ZirconNetworkMessageType.ZirconiumParserError:
+					case ZirconNetworkMessageType.ZirconiumRuntimeError: {
+						ZirconClientStore.dispatch({
+							type: ConsoleActionName.AddOutput,
+							message: {
+								type: ZirconMessageType.ZirconiumError,
+								context: ZirconContext.Server,
+								error: err,
+							},
+						});
+						break;
+					}
+					case ZirconNetworkMessageType.ZirconStandardErrorMessage: {
+						ZirconClientStore.dispatch({
+							type: ConsoleActionName.AddOutput,
+							message: {
+								type: ZirconMessageType.ZirconLogErrorMessage,
+								context: ZirconContext.Server,
+								error: err,
+							},
+						});
+						break;
+					}
 				}
-				case ZirconNetworkMessageType.ZirconStandardErrorMessage: {
-					ZirconClientStore.dispatch({
-						type: ConsoleActionName.AddOutput,
-						message: {
-							type: ZirconMessageType.ZirconLogErrorMessage,
-							context: ZirconContext.Server,
-							error: err,
-						},
-					});
-					break;
-				}
-			}
+			});
 		});
 	}
 }

diff --git a/src/Services/ClientDispatchService.ts b/src/Services/ClientDispatchService.ts
@@ -15,7 +15,7 @@ export namespace ZirconClientDispatchService {
 	/** @internal */
 	export const dependencies = ["ClientRegistryService"];
 
-	const DispatchToServer = Remotes.Client.Get(RemoteId.DispatchToServer);
+	const DispatchToServer = Remotes.Client.WaitFor(RemoteId.DispatchToServer).expect();
 	export function Dispatch(input: string) {
 		DispatchToServer.SendToServer(input);
 	}