Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions crates/sshx-server/src/grpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)) => {
Expand Down
2 changes: 1 addition & 1 deletion crates/sshx-server/tests/common/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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:?}"),
}
}

Expand Down
2 changes: 1 addition & 1 deletion crates/sshx/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
5 changes: 4 additions & 1 deletion src/lib/Session.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading