v0.3.1

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.3.1
+## Bug fix
+1. Fix several bugs about websocket router.
+
 # v0.3.0
 ## Changes
 1. New plugin system.

skynet/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "skynet"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 authors = ["MXWXZ <[email protected]>"]
 description = "Service integration and management system, optimized for home-lab use."

skynet/src/request.rs

@@ -37,6 +37,7 @@ use skynet_api::{
     },
     plugin::{self, Body, WSMessage},
     request::{Request, Router, RouterType},
+    tracing::debug,
     HyUuid, Result, Skynet,
 };
 
@@ -142,7 +143,7 @@ pub async fn error_middleware(
             }
 
             let (req, rsp) = rsp.into_parts();
-            if !cli.verbose && !rsp.status().is_success() {
+            if !cli.verbose && (rsp.status().is_client_error() || rsp.status().is_server_error()) {
                 Ok(ServiceResponse::new(req, rsp.drop_body()).map_into_left_body())
             } else {
                 Ok(ServiceResponse::new(req, rsp).map_into_right_body())
@@ -312,7 +313,19 @@ fn ws_handler(
                         _ = rx.recv() =>{
                             break;
                         },
-                        Some(Ok(msg)) = stream.next() => {
+                        msg = stream.next() => {
+                            let msg = if let Some(msg) = msg {
+                                msg
+                            } else {
+                                break;
+                            };
+                            let msg = match msg {
+                                Ok(msg) => msg,
+                                Err(e) => {
+                                    debug!(error = %e, "Websocket error");
+                                    continue;
+                                }
+                            };
                             match msg {
                                 Message::Ping(bytes) => {
                                     if session.pong(&bytes).await.is_err() {