Updates necessary for ngrok-rust 0.14.0

Cargo.toml

@@ -17,12 +17,13 @@ mio = { version = "=0.8.6" }
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
 napi = { version = "2.12.1", default-features = false, features = ["napi4", "tokio_rt"] }
 napi-derive = "2.12.1"
-ngrok = { version = "0.13.1" }
+ngrok = { version = "0.14.0-pre.6" }
 parking_lot = "0.12.1"
 rustls-pemfile = "1.0.1"
 tokio = { version = "1.23.0", features = ["sync"] }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
+url = "2.4.0"
 
 [build-dependencies]
 napi-build = "2.0.1"

src/http.rs

@@ -19,7 +19,7 @@ impl NgrokHttpTunnelBuilder {
     #[napi]
     pub fn scheme(&mut self, scheme: String) -> &Self {
         let mut builder = self.tunnel_builder.lock();
-        *builder = builder.clone().scheme(
+        builder.scheme(
             Scheme::from_str(scheme.as_str())
                 .unwrap_or_else(|_| panic!("Unknown scheme: {scheme:?}")),
         );
@@ -29,67 +29,65 @@ impl NgrokHttpTunnelBuilder {
     #[napi]
     pub fn domain(&mut self, domain: String) -> &Self {
         let mut builder = self.tunnel_builder.lock();
-        *builder = builder.clone().domain(domain);
+        builder.domain(domain);
         self
     }
     /// Certificates to use for client authentication at the ngrok edge.
     #[napi]
     pub fn mutual_tlsca(&mut self, mutual_tlsca: Uint8Array) -> &Self {
         let mut builder = self.tunnel_builder.lock();
-        *builder = builder
-            .clone()
-            .mutual_tlsca(Bytes::from(mutual_tlsca.to_vec()));
+        builder.mutual_tlsca(Bytes::from(mutual_tlsca.to_vec()));
         self
     }
     /// Enable gzip compression for HTTP responses.
     #[napi]
     pub fn compression(&mut self) -> &Self {
         let mut builder = self.tunnel_builder.lock();
-        *builder = builder.clone().compression();
+        builder.compression();
         self
     }
     /// Convert incoming websocket connections to TCP-like streams.
     #[napi]
     pub fn websocket_tcp_conversion(&mut self) -> &Self {
         let mut builder = self.tunnel_builder.lock();
-        *builder = builder.clone().websocket_tcp_conversion();
+        builder.websocket_tcp_conversion();
         self
     }
     /// Reject requests when 5XX responses exceed this ratio.
     /// Disabled when 0.
     #[napi]
     pub fn circuit_breaker(&mut self, circuit_breaker: f64) -> &Self {
         let mut builder = self.tunnel_builder.lock();
-        *builder = builder.clone().circuit_breaker(circuit_breaker);
+        builder.circuit_breaker(circuit_breaker);
         self
     }
 
     /// request_header adds a header to all requests to this edge.
     #[napi]
     pub fn request_header(&mut self, name: String, value: String) -> &Self {
         let mut builder = self.tunnel_builder.lock();
-        *builder = builder.clone().request_header(name, value);
+        builder.request_header(name, value);
         self
     }
     /// response_header adds a header to all responses coming from this edge.
     #[napi]
     pub fn response_header(&mut self, name: String, value: String) -> &Self {
         let mut builder = self.tunnel_builder.lock();
-        *builder = builder.clone().response_header(name, value);
+        builder.response_header(name, value);
         self
     }
     /// remove_request_header removes a header from requests to this edge.
     #[napi]
     pub fn remove_request_header(&mut self, name: String) -> &Self {
         let mut builder = self.tunnel_builder.lock();
-        *builder = builder.clone().remove_request_header(name);
+        builder.remove_request_header(name);
         self
     }
     /// remove_response_header removes a header from responses from this edge.
     #[napi]
     pub fn remove_response_header(&mut self, name: String) -> &Self {
         let mut builder = self.tunnel_builder.lock();
-        *builder = builder.clone().remove_response_header(name);
+        builder.remove_response_header(name);
         self
     }
 
@@ -98,7 +96,7 @@ impl NgrokHttpTunnelBuilder {
     #[napi]
     pub fn basic_auth(&mut self, username: String, password: String) -> &Self {
         let mut builder = self.tunnel_builder.lock();
-        *builder = builder.clone().basic_auth(username, password);
+        builder.basic_auth(username, password);
         self
     }
 
@@ -116,22 +114,22 @@ impl NgrokHttpTunnelBuilder {
         let mut oauth = OauthOptions::new(provider);
         if let Some(allow_emails) = allow_emails {
             allow_emails.iter().for_each(|v| {
-                oauth = oauth.clone().allow_email(v);
+                oauth.allow_email(v);
             });
         }
         if let Some(allow_domains) = allow_domains {
             allow_domains.iter().for_each(|v| {
-                oauth = oauth.clone().allow_domain(v);
+                oauth.allow_domain(v);
             });
         }
         if let Some(scopes) = scopes {
             scopes.iter().for_each(|v| {
-                oauth = oauth.clone().scope(v);
+                oauth.scope(v);
             });
         }
 
         let mut builder = self.tunnel_builder.lock();
-        *builder = builder.clone().oauth(oauth);
+        builder.oauth(oauth);
         self
     }
 
@@ -150,22 +148,22 @@ impl NgrokHttpTunnelBuilder {
         let mut oidc = OidcOptions::new(issuer_url, client_id, client_secret);
         if let Some(allow_emails) = allow_emails {
             allow_emails.iter().for_each(|v| {
-                oidc = oidc.clone().allow_email(v);
+                oidc.allow_email(v);
             });
         }
         if let Some(allow_domains) = allow_domains {
             allow_domains.iter().for_each(|v| {
-                oidc = oidc.clone().allow_domain(v);
+                oidc.allow_domain(v);
             });
         }
         if let Some(scopes) = scopes {
             scopes.iter().for_each(|v| {
-                oidc = oidc.clone().scope(v);
+                oidc.scope(v);
             });
         }
 
         let mut builder = self.tunnel_builder.lock();
-        *builder = builder.clone().oidc(oidc);
+        builder.oidc(oidc);
         self
     }
 
@@ -174,7 +172,7 @@ impl NgrokHttpTunnelBuilder {
     #[napi]
     pub fn webhook_verification(&mut self, provider: String, secret: String) -> &Self {
         let mut builder = self.tunnel_builder.lock();
-        *builder = builder.clone().webhook_verification(provider, secret);
+        builder.webhook_verification(provider, secret);
         self
     }
 }

src/lib.rs

@@ -2,7 +2,7 @@ use napi::{
     Error,
     Status,
 };
-use ngrok::prelude::NgrokError;
+use ngrok::prelude::Error as NgrokError;
 
 pub mod config;
 pub mod connect;