Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update library integration #165

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update library integration #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9696400
update library integration
wuan May 23, 2023
baf871e
fix unwrapping
wuan May 23, 2023
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
2 changes: 1 addition & 1 deletion client/vendor/magic-wormhole.rs
Open in desktop
Submodule magic-wormhole.rs updated 6 files
+8 −2 .github/workflows/push.yml
+1 −0 .gitignore
+33 −41 cli/src/main.rs
+194 −66 src/core.rs
+200 −62 src/core/test.rs
+2 −1 src/lib.rs
16 changes: 11 additions & 5 deletions client/wasm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::pin::Pin;
use std::task::{Context, Poll};
use thiserror::Error;

use magic_wormhole::{transfer, transit, AppID, Code, Wormhole, WormholeError};
use magic_wormhole::{transfer, transit, AppID, Code, Wormhole, WormholeError, MailboxConnection};
use wasm_bindgen::prelude::*;
use wasm_bindgen_futures::JsFuture;

Expand Down Expand Up @@ -120,10 +120,11 @@ pub async fn send(client: &Client, file: web_sys::File) -> Result<SendResult, Wa

let rendezvous = Box::new(client.rendezvous_url.as_str());
let config = transfer::APP_CONFIG.rendezvous_url(Cow::Owned(rendezvous.to_string()));
let (server_welcome, wormhole_future) = Wormhole::connect_without_code(config, 2).await?;
let connection = MailboxConnection::create(config, 2).await?;
let wormhole_future = Wormhole::connect(mailbox_connection);

Ok(SendResult {
code: server_welcome.code.0,
code: connection.code.0,
transit_server_url: client.transit_server_url.clone(),
f: Some(Box::pin(wormhole_future)),
file,
Expand Down Expand Up @@ -219,11 +220,16 @@ pub async fn receive(client: &Client, code: String) -> Result<ReceiveResult, Was
let rendezvous = Box::new(client.rendezvous_url.as_str());
let config = transfer::APP_CONFIG.rendezvous_url(Cow::Owned(rendezvous.to_string()));

let wormhole = match Wormhole::connect_with_code(config, Code(code), true).await {
Ok((_, x)) => x,
let connection = match MailboxConnection::connect(config, Code(code), false).await {
Ok(x) => x,
Err(e) => return Err(WasmWormholeError::BadCode(e)),
};

let wormhole = match Wormhole::connect(connection).await {
Ok(x) => x,
Err(e) => return Err(WasmWormholeError::WormholeConnectionFailed(e)),
};

let req = transfer::request_file(
wormhole,
vec![transit::RelayHint::new(
Expand Down