refactor: proto fixups (#585)

* refactor: comment

* refactor: restore binding to external address

Author: chesedo

cargo-shuttle/src/lib.rs

@@ -459,10 +459,18 @@ impl Shuttle {
             }
         });
 
+        let addr = if run_args.external {
+            std::net::IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0))
+        } else {
+            Ipv4Addr::LOCALHOST.into()
+        };
+
+        let addr = SocketAddr::new(addr, run_args.port);
+
         let start_request = StartRequest {
             deployment_id: id.as_bytes().to_vec(),
             service_name,
-            port: run_args.port as u32,
+            ip: addr.to_string(),
         };
 
         trace!(?start_request, "starting service");
@@ -479,15 +487,6 @@ impl Shuttle {
 
         trace!(response = ?response,  "client response: ");
 
-        // TODO: move to runtime
-        let addr = if run_args.external {
-            std::net::IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0))
-        } else {
-            Ipv4Addr::LOCALHOST.into()
-        };
-
-        let addr = SocketAddr::new(addr, run_args.port);
-
         println!(
             "\n{:>12} {} on http://{}",
             "Starting".bold().green(),

deployer/src/deployment/run.rs

@@ -288,7 +288,7 @@ async fn run(
     let start_request = tonic::Request::new(StartRequest {
         deployment_id: id.as_bytes().to_vec(),
         service_name: service_name.clone(),
-        port: address.port() as u32,
+        ip: address.to_string(),
     });
 
     info!("starting service");

proto/runtime.proto

@@ -13,6 +13,7 @@ service Runtime {
   // Stop a started service
   rpc Stop(StopRequest) returns (StopResponse);
 
+  // Subscribe to runtime logs
   rpc SubscribeLogs(SubscribeLogsRequest) returns (stream LogItem);
 }
 
@@ -37,8 +38,8 @@ message StartRequest {
   bytes deployment_id = 1;
   // Name of service to start
   string service_name = 2;
-  // Port to start the service on
-  uint32 port = 3;
+  // Address and port to start the service on
+  string ip = 3;
 }
 
 message StartResponse {

runtime/src/axum/mod.rs

@@ -1,6 +1,6 @@
 use std::convert::Infallible;
 use std::io::{BufReader, Read, Write};
-use std::net::{Ipv4Addr, SocketAddr};
+use std::net::SocketAddr;
 use std::ops::DerefMut;
 use std::os::unix::prelude::RawFd;
 use std::path::{Path, PathBuf};
@@ -97,12 +97,12 @@ impl Runtime for AxumWasm {
         request: tonic::Request<StartRequest>,
     ) -> Result<tonic::Response<StartResponse>, Status> {
         let StartRequest {
-            deployment_id,
-            port,
-            ..
+            deployment_id, ip, ..
         } = request.into_inner();
 
-        let address = SocketAddr::new(Ipv4Addr::LOCALHOST.into(), port as u16);
+        let address = SocketAddr::from_str(&ip)
+            .context("invalid socket address")
+            .map_err(|err| Status::invalid_argument(err.to_string()))?;
 
         let logs_tx = self.logs_tx.lock().unwrap().clone();
 

runtime/src/legacy/mod.rs

@@ -1,14 +1,9 @@
 use std::{
-    collections::BTreeMap,
-    iter::FromIterator,
-    net::{Ipv4Addr, SocketAddr},
-    ops::DerefMut,
-    path::PathBuf,
-    str::FromStr,
-    sync::Mutex,
+    collections::BTreeMap, iter::FromIterator, net::SocketAddr, ops::DerefMut, path::PathBuf,
+    str::FromStr, sync::Mutex,
 };
 
-use anyhow::anyhow;
+use anyhow::{anyhow, Context};
 use async_trait::async_trait;
 use shuttle_common::{storage_manager::StorageManager, LogItem};
 use shuttle_proto::{
@@ -128,9 +123,11 @@ where
         let StartRequest {
             deployment_id,
             service_name,
-            port,
+            ip,
         } = request.into_inner();
-        let service_address = SocketAddr::new(Ipv4Addr::LOCALHOST.into(), port as u16);
+        let service_address = SocketAddr::from_str(&ip)
+            .context("invalid socket address")
+            .map_err(|err| Status::invalid_argument(err.to_string()))?;
 
         let service_name = ServiceName::from_str(service_name.as_str())
             .map_err(|err| Status::from_error(Box::new(err)))?;