diff --git a/crates/sshx-server/src/grpc.rs b/crates/sshx-server/src/grpc.rs index d68cb61..746dbcb 100644 --- a/crates/sshx-server/src/grpc.rs +++ b/crates/sshx-server/src/grpc.rs @@ -195,19 +195,19 @@ async fn handle_update(tx: &ServerTx, session: &Session, update: ClientUpdate) - } Some(ClientMessage::Data(data)) => { if let Err(err) = session.add_data(Sid(data.id), data.data, data.seq) { - return send_err(tx, format!("add data: {:?}", err)).await; + return send_err(tx, format!("add data: {err:?}")).await; } } Some(ClientMessage::CreatedShell(new_shell)) => { let id = Sid(new_shell.id); let center = (new_shell.x, new_shell.y); if let Err(err) = session.add_shell(id, center) { - return send_err(tx, format!("add shell: {:?}", err)).await; + return send_err(tx, format!("add shell: {err:?}")).await; } } Some(ClientMessage::ClosedShell(id)) => { if let Err(err) = session.close_shell(Sid(id)) { - return send_err(tx, format!("close shell: {:?}", err)).await; + return send_err(tx, format!("close shell: {err:?}")).await; } } Some(ClientMessage::Pong(ts)) => { diff --git a/crates/sshx-server/tests/common/mod.rs b/crates/sshx-server/tests/common/mod.rs index f86b06c..f28de4e 100644 --- a/crates/sshx-server/tests/common/mod.rs +++ b/crates/sshx-server/tests/common/mod.rs @@ -153,7 +153,7 @@ impl ClientSocket { let msg = self.inner.next().await.unwrap().unwrap(); match msg { Message::Close(Some(frame)) => assert!(frame.code == code.into()), - _ => panic!("unexpected non-close message over WebSocket: {:?}", msg), + _ => panic!("unexpected non-close message over WebSocket: {msg:?}"), } } diff --git a/crates/sshx/src/main.rs b/crates/sshx/src/main.rs index d91f50e..b9d93d4 100644 --- a/crates/sshx/src/main.rs +++ b/crates/sshx/src/main.rs @@ -93,7 +93,7 @@ async fn start(args: Args) -> Result<()> { let mut controller = Controller::new(&args.server, &name, runner, args.enable_readers).await?; if args.quiet { if let Some(write_url) = controller.write_url() { - println!("{}", write_url); + println!("{write_url}"); } else { println!("{}", controller.url()); } diff --git a/src/lib/Session.svelte b/src/lib/Session.svelte index ca155c9..07800bb 100644 --- a/src/lib/Session.svelte +++ b/src/lib/Session.svelte @@ -132,7 +132,10 @@ onMount(async () => { // The page hash sets the end-to-end encryption key. const key = window.location.hash?.slice(1).split(",")[0] ?? ""; - const writePassword = window.location.hash?.slice(1).split(",")[1] ?? null; + const writePassword = ((passwd) => + passwd === "manually" ? prompt("Write key here:") : passwd)( + window.location.hash?.slice(1).split(",")[1], + ); encrypt = await Encrypt.new(key); const encryptedZeros = await encrypt.zeros();