Progate names to the server

This resolves #6.
ekzhang · Oct 7, 2023 · 85e3d07 · 85e3d07
1 parent d14641e
commit 85e3d07
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/crates/sshx-server/src/web/socket.rs b/crates/sshx-server/src/web/socket.rs
@@ -119,7 +119,9 @@ async fn handle_socket(mut socket: WebSocket, session: Arc<Session>) -> Result<(
  match msg {
  WsClient::Authenticate(_) => {}
  WsClient::SetName(name) => {
- session.update_user(user_id, |user| user.name = name)?;
+ if !name.is_empty() {
+ session.update_user(user_id, |user| user.name = name)?;
+ }
  }
  WsClient::SetCursor(cursor) => {
  session.update_user(user_id, |user| user.cursor = cursor)?;

diff --git a/src/lib/Session.svelte b/src/lib/Session.svelte
@@ -19,6 +19,7 @@
  import { slide } from "./action/slide";
  import { TouchZoom, INITIAL_ZOOM } from "./action/touchZoom";
  import { arrangeNewTerminal } from "./arrange";
+ import { settings } from "./settings";
 
  export let id: string;
 
@@ -180,6 +181,9 @@
 
  onConnect() {
  srocket?.send({ authenticate: encryptedZeros });
+ if ($settings.name) {
+ srocket?.send({ setName: $settings.name });
+ }
  connected = true;
  },
 
@@ -199,6 +203,10 @@
 
  onDestroy(() => srocket?.dispose());
 
+ $: if ($settings.name) {
+ srocket?.send({ setName: $settings.name });
+ }
+
  let counter = 0n;
 
  async function handleCreate() {