Merge pull request #62 from Kumassy/feature/fix-api-service

fix api service is not working

Author: Kumassy

Cargo.lock

@@ -54,33 +54,34 @@ We also offer GUI. visit [ownserver-client-gui](https://github.com/Kumassy/ownse
 
 ```sh
 % ownserver -h
-ownserver 0.5.1
-
-USAGE:
-    ownserver [OPTIONS]
-
-FLAGS:
-    -h, --help       Prints help information
-    -V, --version    Prints version information
-
-OPTIONS:
-        --control-port <control-port>    Advanced settings [default: 5000]
-        --local-port <local-port>        Port of your local game server listens e.g.) 25565 for Minecraft [default:
-                                         3000]
-        --payload <payload>              tcp or udp [default: tcp]
-        --token-server <token-server>    Advanced settings [default: https://auth.ownserver.kumassy.com/v1/request_token]
+Expose your local game server to the Internet
+
+Usage: ownserver [OPTIONS] --endpoint <ENDPOINT>
+
+Options:
+      --endpoint <ENDPOINT>
+          Port and protocol of your local game server e.g.) `25565/tcp` for Minecraft
+      --api-port <API_PORT>
+          Advanced settings. You can inspect client's internal state at localhost:<api_port>.
+      --control-port <CONTROL_PORT>
+          Advanced settings [default: 5000]
+      --token-server <TOKEN_SERVER>
+          Advanced settings [default: https://auth.ownserver.kumassy.com/v2/request_token]
+      --periodic-ping-interval <PERIODIC_PING_INTERVAL>
+          [default: 15]
+  -h, --help
+          Print help
+  -V, --version
 
 # listen on local port
 % nc -kl 3000
 
-% ownserver --payload tcp --local-port 3000
-Connecting to auth server: https://auth.ownserver.kumassy.com/v1/request_token
-Your proxy server: shard-7924.ownserver.kumassy.com
-Connecting to proxy server: shard-7924.ownserver.kumassy.com:5000
-Your Client ID: client_755d0b36-f863-41e1-b5ff-c6c89fdb92a5
-+---------------------------------------------------------------------------------------------------+
-| Your server tcp://localhost:3000 is now available at tcp://shard-7924.ownserver.kumassy.com:17974 |
-+---------------------------------------------------------------------------------------------------+
+% ownserver --endpoint 3010/tcp
+Your Client ID: client_17638595-be9d-41b9-89bf-c678c1e98d10
+Endpoint Info:
++------------------------------------------------------------------------+
+| tcp://localhost:3010 <--> tcp://shard-2509.ownserver.kumassy.com:15335 |
++------------------------------------------------------------------------+
 
 # you can send any TCP packet to local port!
 % nc shard-7924.ownserver.kumassy.com 17974
@@ -100,7 +101,7 @@ via cargo
 java -Xmx1024M -Xms1024M -jar server.jar nogui
 
 # run ownserver client
-ownserver  -- --payload tcp --local-port 25565
+ownserver  -- --endpoint 25565/tcp
 ```
 
 share your public URL!
@@ -110,12 +111,12 @@ You can query endpoints and streams info using the client API.
 You need to specify local port to use the API: 
 
 ```
-% ownserver --payload tcp --local-port 3000 --api-port 9000
+% ownserver --endpoint 25565/tcp --api-port 9000
 
 % curl -s localhost:9000/endpoints
-[{"id":"client_be38a93b-b7a9-46da-9d9d-51df95cad828","local_port":3000,"remote_addr":"shard-5346.ownserver.kumassy.com:13574"}]
+[[{"id":"02291214-8647-4d08-ace3-032ac255bb14","protocol":"TCP","local_port":3010,"remote_port":19083}]]
 % curl -s localhost:9000/streams
-[{"id":"stream_24a3b5bb-336d-4b4e-baf3-7ef61bc1b78c"}]
+[{"stream_id":"5768354e-97c9-4c6a-8cd2-8163a1f3621c","remote_info":{"remote_peer_addr":"x.x.x.x:13367"}}]
 ```
 
 ## How it works

README.md

@@ -1,6 +1,6 @@
 [package]
 name = "ownserver"
-version = "0.7.0"
+version = "0.7.1"
 authors = ["Kumassy <kumassyii@gmail.com>"]
 edition = "2021"
 license = "MIT"
@@ -14,7 +14,7 @@ keywords = ["network", "networking", "game", "minecraft"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ownserver_lib = { version = "0.7.0", path = "../ownserver_lib" }
+ownserver_lib = { version = "0.7.1", path = "../ownserver_lib" }
 tokio = { version = "1", features = ["full"] }
 tokio-util = "0.7"
 tokio-tungstenite = { version = '0.22', features = ["rustls"] }

ownserver/Cargo.toml

@@ -78,19 +78,20 @@ async fn main() -> Result<()> {
 
     let store_ = store.clone();
 
+    if let Some(api_port) = cli.api_port {
+        info!("client side api is available at localhost:{}", api_port);
+        tokio::spawn(async move {
+            api::spawn_api(store_, api_port).await;
+        });
+    }
+
     info!("start client main loop");
-    run_client(&config, store_, cancellation_token,
+    run_client(&config, store, cancellation_token,
         RequestType::NewClient {
             endpoint_claims: cli.endpoint
         }
     ).await?;
 
-    if let Some(api_port) = cli.api_port {
-        info!("client side api is available at localhost:{}", api_port);
-        tokio::spawn(async move {
-            api::spawn_api(store, api_port).await;
-        });
-    }
 
     Ok(())
 }

ownserver/src/main.rs

@@ -1,6 +1,6 @@
 [package]
 name = "ownserver_lib"
-version = "0.7.0"
+version = "0.7.1"
 authors = ["Kumassy <kumassyii@gmail.com>"]
 edition = "2021"
 license = "MIT"

ownserver_lib/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "ownserver_server"
-version = "0.7.0"
+version = "0.7.1"
 authors = ["Kumassy <kumassyii@gmail.com>"]
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ownserver_lib = { version = "0.7.0", path = "../ownserver_lib" }
-ownserver = { version = "0.7.0", path = "../ownserver" }
+ownserver_lib = { version = "0.7.1", path = "../ownserver_lib" }
+ownserver = { version = "0.7.1", path = "../ownserver" }
 tokio-tungstenite = { version = '0.26', features = ["rustls"] }
 tokio = { version = "1.44", features = ["full", "tracing"] }
 tokio-util = "0.7"

ownserver_server/Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "ownserver_test"
-version = "0.7.0"
+version = "0.7.1"
 authors = ["Kumassy <kumassyii@gmail.com>"]
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ownserver_lib = { version = "0.7.0", path = "../ownserver_lib" }
-ownserver = { version = "0.7.0", path = "../ownserver" }
-ownserver_server = { version = "0.7.0", path = "../ownserver_server" }
+ownserver_lib = { version = "0.7.1", path = "../ownserver_lib" }
+ownserver = { version = "0.7.1", path = "../ownserver" }
+ownserver_server = { version = "0.7.1", path = "../ownserver_server" }
 tokio-tungstenite = { version = '0.26', features = ["rustls"] }
 tokio = { version = "1", features = ["full"] }
 tokio-util = "0.7"