no longer need to handle redis pubsub message

Moving some event to private api #41 - untested
sharproject · Dec 20, 2023 · dd12dbb · dd12dbb
1 parent 654d25d
commit dd12dbb
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 335 deletions.
diff --git a/server/cdn-service/src/main.rs b/server/cdn-service/src/main.rs
@@ -3,13 +3,11 @@ mod types;
 mod upload_images;
 
 mod util;
-mod ws;
 
 use dotenv::dotenv;
 use salvo::prelude::TcpListener;
 use salvo::{Listener, Server};
 
-use crate::ws::handle_socket_message;
 mod route;
 
 #[tokio::main]
@@ -24,8 +22,6 @@ async fn main() {
 
     dbg!(&redis_client.get_connection_info().addr.to_string());
 
-    handle_socket_message(redis_client.clone()).await;
-
     println!("Server started on port 3000 🚀");
     let acceptor = TcpListener::new("0.0.0.0:3000").bind().await;
     Server::new(acceptor)

diff --git a/server/cdn-service/src/route/mod.rs b/server/cdn-service/src/route/mod.rs
@@ -18,7 +18,7 @@ pub fn route(redis: RedisClient) -> salvo::Router {
         redis: redis.clone(),
     }));
 
-    router = router.push(Router::with_path("/private/gen_token").post(GenToken {
+    router = router.push(Router::with_path("/gen_token").post(GenToken {
         redis: redis.clone(),
     }));
 
@@ -99,7 +99,6 @@ impl salvo::Handler for GenToken {
         }
         res.render(Json(sender_data.unwrap()));
     }
-
 }
 
 struct GetImageData {

diff --git a/server/cdn-service/src/types.rs b/server/cdn-service/src/types.rs
@@ -69,13 +69,5 @@ impl FromRedisValue for TokenStorageTableNode {
         })
     }
 }
-pub enum WsError {
-    DecodePayloadError,
-}
-pub struct SendWsErrorMetaInput {
-    pub from: String,
-    pub url: String,
-    pub id: String,
-}
 
 pub type RedisClient = redis::Client;
diff --git a/server/cdn-service/src/util/mod.rs b/server/cdn-service/src/util/mod.rs
@@ -1,4 +1,4 @@
-use crate::types::{RedisClient, SendWsErrorMetaInput, SenderData, TokenStorageTableNode, WsError};
+use crate::types::{RedisClient, SenderData, TokenStorageTableNode};
 use redis::{AsyncCommands, JsonAsyncCommands};
 use serde_json::json;
 use tokio_stream::StreamExt;
@@ -61,22 +61,6 @@ pub async fn send_uploaded_message(
     return false;
 }
 
-pub async fn send_ws_error(error: WsError, meta: SendWsErrorMetaInput, redis: &RedisClient) {
-    let sender_data = SenderData {
-        url: meta.from,
-        message_type: "rep".to_string(),
-        from: meta.url,
-        header: serde_json::Value::Null,
-        payload: serde_json::Value::Null,
-        error: serde_json::Value::String(match error {
-            WsError::DecodePayloadError => "decode payload error".to_string(),
-        }),
-        id: meta.id.to_string(),
-    };
-
-    let _ = send_service_message(redis, &sender_data, false).await;
-}
-
 pub fn gen_token(uuid: String) -> String {
     uuid
 }

diff --git a/server/cdn-service/src/ws/mod.rs b/server/cdn-service/src/ws/mod.rs
diff --git a/server/comic/util/genUploadToken.go b/server/comic/util/genUploadToken.go
@@ -8,7 +8,7 @@ import (
 	"github.com/Folody-Team/Shartube/LocalTypes"
 )
 
-var genTokenUrl = "http://shartube-upload-server:3000/private/gen_token"
+var genTokenUrl = "http://shartube-upload-server:3000/gen_token"
 
 type GenSingleUploadTokenPayload[T any] struct {
 	ID        string `json:"id"`