fix: no response logic

SetsuikiHyoryu · SetsuikiHyoryu · commit 5f520a6ff8cf · 2024-06-17T07:45:31.000+09:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "full_rust_web"
+name = "rust_server_sample"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Rust 全栈式开发 Web 应用
+# Rust TCP/HTTP Socket Server
 
 ## 目录结构
 
@@ -9,7 +9,55 @@
 | http       | HTTP 模块目录   |
 | httpserver | HTTP 服务器目录 |
 
-## 工作流
+## 运行方式
+
+### TCP 服务器
+
+#### 启动 TCP 服务器
+
+```shell
+# `--package` or `-p`
+cargo run --package tcpserver
+```
+
+#### 运行 TCP 客户端访问服务器
+
+```shell
+# `--package` or `-p`
+cargo run --package tcpclient
+```
+
+执行成功后终端中会打印：  
+`Response from server: "Hello"`
+
+### HTTP 服务器
+
+#### 启动 HTTP 服务器
+
+```shell
+# `--package` or `-p`
+# 运行于 http://localhost:8000
+cargo run --package httpserver
+```
+
+#### 暴露的 HTTP 接口
+
+| 接口                                                                       | 响应        |
+| -------------------------------------------------------------------------- | ----------- |
+| <http://localhost:8000>                                                    | index.html  |
+| <http://localhost:8000/health>                                             | health.html |
+| <http://localhost:8000/style.css>                                          | style.css   |
+| <http://localhost:8000/api/shipping/orders>                                | orders.json |
+| <http://localhost:8000/anyelse>（“anyelse” 可改为接口中未列出的任意文字 ） | 404.html    |
+
+#### HTTP 模块单元测试
+
+```shell
+# `--package` or `-p`
+cargo test --package http
+```
+
+## 制作流程
 
 ### 1. 创建 Workspace
 
diff --git a/httpserver/public/health.html b/httpserver/public/health.html
@@ -7,6 +7,6 @@
     <link href="style.css" rel="stylesheet" />
   </head>
   <body>
-    <h1>Please check health</h1>
+    <h1>Check health</h1>
   </body>
 </html>
diff --git a/httpserver/src/handler.rs b/httpserver/src/handler.rs
@@ -67,7 +67,7 @@ impl Handler for StaticPageHandler {
 
                     HttpResonse::new("200", Some(headers), Some(contents))
                 }
-                None => HttpResonse::default(),
+                None => HttpResonse::new("404", None, Self::load_file("404.html")),
             },
         };
 
@@ -99,18 +99,23 @@ impl WebServiceHandler {
 
 impl Handler for WebServiceHandler {
     fn handler(request: &HttpRequest) -> HttpResonse {
+        let default_response = HttpResonse::new("404", None, Self::load_file("404.html"));
+
         let Resource::Path(url) = &request.resource;
         let url = url.split('/').collect::<Vec<&str>>();
-        let is_orders = url.len() > 3 && url[3] == "orders";
+
+        if url.len() < 4 {
+            return default_response;
+        }
 
         match url[2] {
-            "shipping" if is_orders => {
+            "shipping" if url[3] == "orders" => {
                 let headers = HashMap::from([("Content-Type", "application/json")]);
                 let body = serde_json::to_string(&Self::load_json()).unwrap();
                 HttpResonse::new("200", Some(headers), Some(body))
             }
 
-            _ => HttpResonse::new("404", None, Self::load_file("404.html")),
+            _ => default_response,
         }
     }
 }
diff --git a/httpserver/src/server.rs b/httpserver/src/server.rs
@@ -13,7 +13,7 @@ impl<'a> Server<'a> {
 
     pub fn run(&self) {
         let listener = TcpListener::bind(self.socket_address).unwrap();
-        println!("Running on {}", self.socket_address);
+        println!("Running on http://{}", self.socket_address);
 
         for stream in listener.incoming() {
             println!("Connection established!");
diff --git a/tcpclient/src/main.rs b/tcpclient/src/main.rs
@@ -25,7 +25,7 @@ fn handle_response(mut stream: TcpStream) -> Result<()> {
     let _bypes_length = stream.read(&mut buffer)?;
 
     let response = str::from_utf8(&buffer);
-    println!("Response from server: {:?}", response);
+    println!("Response from server: {:?}", response.unwrap());
 
     Ok(())
 }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ fn handle_response(mut stream: TcpStream) -> Result<()> {`
`25`	`25`	`let _bypes_length = stream.read(&mut buffer)?;`
`26`	`26`
`27`	`27`	`let response = str::from_utf8(&buffer);`
`28`		`- println!("Response from server: {:?}", response);`
	`28`	`+ println!("Response from server: {:?}", response.unwrap());`
`29`	`29`
`30`	`30`	`Ok(())`
`31`	`31`	`}`