Page MenuHomePhabricator
Differential D6784

[keyserver] Fix rust-node-addon after deprecation of --experimental-specifier-resolution=node
ClosedPublic
Actions

Authored by ashoat on Feb 20 2023, 9:57 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 19, 12:41 PM
Unknown Object (File)
Sat, Apr 19, 1:17 AM
Unknown Object (File)
Fri, Apr 18, 1:27 PM
Unknown Object (File)
Fri, Apr 18, 10:12 AM
Unknown Object (File)
Fri, Apr 18, 7:04 AM
Unknown Object (File)
Fri, Apr 18, 5:03 AM
Unknown Object (File)
Thu, Apr 17, 7:12 PM
Unknown Object (File)
Wed, Apr 9, 1:28 PM
View All Files
Subscribers
atul
• jon
tomek

Details

Reviewers
• jon
varun
• max
Commits
rCOMM9acb9c0e57f2: [keyserver] Fix rust-node-addon after deprecation of --experimental-specifier…
Summary

Context in ENG-3059. rust-node-addon was broken by D6695, but --experimental-specifier-resolution=node is going away so we need another solution.

I got this solution from this GitHub comment.

Depends on D6783

Test Plan

Confirm I could import rust-node-addon and call methods on it from @jon's jonringer/identity-deleteuserrpc branch

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

ashoat created this revision.Feb 20 2023, 9:57 AM
Herald added subscribers: atul, tomek. · View Herald TranscriptFeb 20 2023, 9:57 AM
ashoat added a reviewer: • max.Feb 20 2023, 9:58 AM
Harbormaster returned this revision to the author for changes because remote builds failed.Feb 20 2023, 10:08 AM
Harbormaster failed remote builds in B16624: Diff 22731!
ashoat updated this revision to Diff 22734.Feb 20 2023, 11:03 AM

Flow had an error because it thinks import.meta.url might not be set, so I added an invariant to make sure it is always set

Harbormaster returned this revision to the author for changes because remote builds failed.Feb 20 2023, 11:06 AM
Harbormaster failed remote builds in B16626: Diff 22734!
ashoat requested review of this revision.Feb 20 2023, 11:24 AM
ashoat updated this revision to Diff 22739.Feb 20 2023, 11:47 AM

Rebase on D6785 to fix iOS CI build

• jon accepted this revision.Feb 20 2023, 12:15 PM

Forced call to getRustAPI() on master, asserted it was broken, patch this in, and fixed the call.

This revision is now accepted and ready to land.Feb 20 2023, 12:15 PM
Harbormaster completed remote builds in B16631: Diff 22739.Feb 20 2023, 12:18 PM
Closed by commit rCOMM9acb9c0e57f2: [keyserver] Fix rust-node-addon after deprecation of --experimental-specifier… (authored by ashoat). · Explain WhyFeb 20 2023, 12:25 PM
This revision was automatically updated to reflect the committed changes.
ashoat added a commit: rCOMM9acb9c0e57f2: [keyserver] Fix rust-node-addon after deprecation of --experimental-specifier….
ashoat mentioned this in D6690: [keyserver] Unifying API interface and adding Tunnelbroker types.Feb 20 2023, 2:41 PM

Revision Contents
Changeset List

PathSize
keyserver/
addons/
rust-node-addon/
17 lines
3 lines

Diff 22742

View Options

keyserver/addons/rust-node-addon/index.js

use derive_more::{Display, Error, From}; use derive_more::{Display, Error, From};
use futures_core::Stream; use futures_core::Stream;
use futures_util::StreamExt; use futures_util::{StreamExt, TryStreamExt};
use reqwest::Url; use reqwest::{
multipart::{Form, Part},
Body, Url,
};
use tracing::{debug, trace, warn}; use tracing::{debug, trace, warn};
// publicly re-export some reqwest types // publicly re-export some reqwest types
pub use reqwest::Error as ReqwestError; pub use reqwest::Error as ReqwestError;
pub use reqwest::StatusCode; pub use reqwest::StatusCode;
#[derive(From, Error, Debug, Display)] #[derive(From, Error, Debug, Display)]
pub enum BlobServiceError { pub enum BlobServiceError {
▲ Show 20 Lines • Show All 91 Lines • ▼ Show 20 Lines ) -> BlobResult<impl Stream<Item = BlobResult<Vec<u8>>>> {
} }
let error = handle_http_error(response.status()); let error = handle_http_error(response.status());
if let Ok(message) = response.text().await { if let Ok(message) = response.text().await {
trace!("Error response message: {}", message); trace!("Error response message: {}", message);
} }
Err(error) Err(error)
} }
/// Uploads a blob. Returns `BlobServiceError::AlreadyExists` if blob with given hash
/// already exists.
///
/// # Example
/// ```rust
/// use std::io::{Error, ErrorKind};
///
/// let client =
/// BlobServiceClient::new("http://localhost:50053".parse()?);
///
/// let stream = async_stream::stream! {
/// yield Ok(vec![1, 2, 3]);
/// yield Ok(vec![4, 5, 6]);
/// yield Err(Error::new(ErrorKind::Other, "Oops"));
/// };
/// client.upload_blob(&blob_hash, stream).await?;
/// ```
pub async fn upload_blob<H, S>(
&self,
blob_hash: H,
data_stream: S,
) -> BlobResult<()>
where
H: Into<String>,
S: futures_core::stream::TryStream + Send + Sync + 'static,
S::Error: Into<Box<dyn std::error::Error + Send + Sync>>,
Vec<u8>: From<S::Ok>,
bartekAuthorUnsubmitted
Done
Inline Actions

Requirements of the reqwest body stream:
A stream of Result<impl Into<Vec<u8>>, impl Into<Box<dyn Error>>>

bartek: Requirements of the reqwest body stream: A stream of `Result<impl Into<Vec<u8>>, impl…
{
debug!("Revoke holder request");
michalUnsubmitted
Not Done
Inline Actions

Wrong message?

michal: Wrong message?
let url = self.get_blob_url(None)?;
let stream = data_stream.map_ok(Vec::from);
let streaming_body = Body::wrap_stream(stream);
let form = Form::new()
.text("blob_hash", blob_hash.into())
.part("blob_data", Part::stream(streaming_body));
let response = self.http_client.put(url).multipart(form).send().await?;
debug!("Response status: {}", response.status());
if response.status().is_success() {
trace!("Blob upload successful");
return Ok(());
}
let error = handle_http_error(response.status());
if let Ok(message) = response.text().await {
trace!("Error response message: {}", message);
}
Err(error)
}
} }
// private helper methods // private helper methods
impl BlobServiceClient { impl BlobServiceClient {
fn get_blob_url( fn get_blob_url(
&self, &self,
blob_hash: Option<&str>, blob_hash: Option<&str>,
) -> Result<Url, BlobServiceError> { ) -> Result<Url, BlobServiceError> {
Show All 24 Lines
View Options

keyserver/addons/rust-node-addon/package.json

use derive_more::{Display, Error, From}; use derive_more::{Display, Error, From};
use futures_core::Stream; use futures_core::Stream;
use futures_util::StreamExt; use futures_util::{StreamExt, TryStreamExt};
use reqwest::Url; use reqwest::{
multipart::{Form, Part},
Body, Url,
};
use tracing::{debug, trace, warn}; use tracing::{debug, trace, warn};
// publicly re-export some reqwest types // publicly re-export some reqwest types
pub use reqwest::Error as ReqwestError; pub use reqwest::Error as ReqwestError;
pub use reqwest::StatusCode; pub use reqwest::StatusCode;
#[derive(From, Error, Debug, Display)] #[derive(From, Error, Debug, Display)]
pub enum BlobServiceError { pub enum BlobServiceError {
▲ Show 20 Lines • Show All 91 Lines • ▼ Show 20 Lines ) -> BlobResult<impl Stream<Item = BlobResult<Vec<u8>>>> {
} }
let error = handle_http_error(response.status()); let error = handle_http_error(response.status());
if let Ok(message) = response.text().await { if let Ok(message) = response.text().await {
trace!("Error response message: {}", message); trace!("Error response message: {}", message);
} }
Err(error) Err(error)
} }
/// Uploads a blob. Returns `BlobServiceError::AlreadyExists` if blob with given hash
/// already exists.
///
/// # Example
/// ```rust
/// use std::io::{Error, ErrorKind};
///
/// let client =
/// BlobServiceClient::new("http://localhost:50053".parse()?);
///
/// let stream = async_stream::stream! {
/// yield Ok(vec![1, 2, 3]);
/// yield Ok(vec![4, 5, 6]);
/// yield Err(Error::new(ErrorKind::Other, "Oops"));
/// };
/// client.upload_blob(&blob_hash, stream).await?;
/// ```
pub async fn upload_blob<H, S>(
&self,
blob_hash: H,
data_stream: S,
) -> BlobResult<()>
where
H: Into<String>,
S: futures_core::stream::TryStream + Send + Sync + 'static,
S::Error: Into<Box<dyn std::error::Error + Send + Sync>>,
Vec<u8>: From<S::Ok>,
bartekAuthorUnsubmitted
Done
Inline Actions

Requirements of the reqwest body stream:
A stream of Result<impl Into<Vec<u8>>, impl Into<Box<dyn Error>>>

bartek: Requirements of the reqwest body stream: A stream of `Result<impl Into<Vec<u8>>, impl…
{
debug!("Revoke holder request");
michalUnsubmitted
Not Done
Inline Actions

Wrong message?

michal: Wrong message?
let url = self.get_blob_url(None)?;
let stream = data_stream.map_ok(Vec::from);
let streaming_body = Body::wrap_stream(stream);
let form = Form::new()
.text("blob_hash", blob_hash.into())
.part("blob_data", Part::stream(streaming_body));
let response = self.http_client.put(url).multipart(form).send().await?;
debug!("Response status: {}", response.status());
if response.status().is_success() {
trace!("Blob upload successful");
return Ok(());
}
let error = handle_http_error(response.status());
if let Ok(message) = response.text().await {
trace!("Error response message: {}", message);
}
Err(error)
}
} }
// private helper methods // private helper methods
impl BlobServiceClient { impl BlobServiceClient {
fn get_blob_url( fn get_blob_url(
&self, &self,
blob_hash: Option<&str>, blob_hash: Option<&str>,
) -> Result<Url, BlobServiceError> { ) -> Result<Url, BlobServiceError> {
Show All 24 Lines