back round 0 view raw

Use typed `Url` to construct XRPC URI #1

closed

opened by

bad-example.com 2 months ago targeting main from bad-example.com/jacquard: fix/url-leading-double-slash

this probably either does too much or too little:

could have fixed the double-slash thing by stripping trailing slash from the base uri or,
if you like typed URLs, it probably makes sense to do a bigger refactor toward them.

but it should at least fix https://tangled.org/@nonbinary.computer/jacquard/issues/7

options

unified split

Changed files

+9 -6

crates

jacquard

src

client.rs

+9 -6

crates/jacquard/src/client.rs

···

       10
       10
        
       use std::future::Future;

     

       11
       11
        
       

     

       12
       12
        
       use bytes::Bytes;

     

       13
       13
       -
       pub use error::{ClientError, Result};

     

       13
       13
       +
       pub use error::{ClientError, Result, TransportError};

     

       14
       14
        
       use http::{

     

       15
       15
        
           HeaderName, HeaderValue, Request,

     

       16
       16
        
           header::{AUTHORIZATION, CONTENT_TYPE, InvalidHeaderValue},

     
···

       152
       152
        
           R: XrpcRequest,

     

       153
       153
        
           C: XrpcClient + ?Sized,

     

       154
       154
        
       {

     

       155
       155
       -
           // Build URI: base_uri + /xrpc/ + NSID

     

       156
       156
       -
           let mut uri = format!("{}/xrpc/{}", client.base_uri(), R::NSID);

     

       155
       155
       +
           // Configure the XRPC endpoint

     

       156
       156
       +
           let mut url: reqwest::Url = client

     

       157
       157
       +
               .base_uri()

     

       158
       158
       +
               .parse()

     

       159
       159
       +
               .map_err(|e| error::EncodeError::Other(format!("failed to parse base_uri: {e}").into()))?;

     

       160
       160
       +
           url.set_path(&format!("/xrpc/{}", R::NSID));

     

       157
       161
        
       

     

       158
       162
        
           // Add query parameters for Query methods

     

       159
       163
        
           if let XrpcMethod::Query = R::METHOD {

     

       160
       164
        
               let qs = serde_html_form::to_string(&request).map_err(error::EncodeError::from)?;

     

       161
       165
        
               if !qs.is_empty() {

     

       162
       162
       -
                   uri.push('?');

     

       163
       163
       -
                   uri.push_str(&qs);

     

       166
       166
       +
                   url.set_query(Some(&qs))

     

       164
       167
        
               }

     

       165
       168
        
           }

     

       166
       169
        
       

     
···

       170
       173
        
               XrpcMethod::Procedure(_) => http::Method::POST,

     

       171
       174
        
           };

     

       172
       175
        
       

     

       173
       173
       -
           let mut builder = Request::builder().method(method).uri(&uri);

     

       176
       176
       +
           let mut builder = Request::builder().method(method).uri(&url.to_string());

     

       174
       177
        
       

     

       175
       178
        
           // Add Content-Type for procedures

     

       176
       179
        
           if let XrpcMethod::Procedure(encoding) = R::METHOD {