Fixed blank error messages over RPC from websocket commands

twitchdev · May 24, 2023 · 7c44046 · 7c44046
1 parent cbd1b14
commit 7c44046
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/internal/events/websocket/mock_server/rpc_handler.go b/internal/events/websocket/mock_server/rpc_handler.go
@@ -39,9 +39,10 @@ func RPCReconnectHandler(args rpc.RPCArgs) rpc.RPCResponse {
 	log.Printf("Initiating reconnect testing...")
 
 	if serverManager.reconnectTesting {
-		log.Printf("Error on RPC call (EventSubWebSocketReconnect): Cannot execute reconnect testing while its already in progress. Aborting.")
+		log.Printf("Error on RPC call (EventSubWebSocketReconnect): Cannot execute reconnect testing while its already in progress. Discarding duplicate reconnect command.")
 		return rpc.RPCResponse{
 			ResponseCode: COMMAND_RESPONSE_FAILED_ON_SERVER,
+			DetailedInfo: "Error on RPC call (EventSubWebSocketReconnect): Cannot execute reconnect testing while its already in progress. Discarding duplicate reconnect command.",
 		}
 	}
 
@@ -51,6 +52,7 @@ func RPCReconnectHandler(args rpc.RPCArgs) rpc.RPCResponse {
 		log.Printf("Error on RPC call (EventSubWebSocketReconnect): Primary server not in server list.")
 		return rpc.RPCResponse{
 			ResponseCode: COMMAND_RESPONSE_FAILED_ON_SERVER,
+			DetailedInfo: "Error on RPC call (EventSubWebSocketReconnect): Primary server not in server list.",
 		}
 	}
 
@@ -111,6 +113,7 @@ func RPCFireEventSubHandler(args rpc.RPCArgs) rpc.RPCResponse {
 		log.Printf("Error on RPC call (EventSubWebSocketForwardEvent): Primary server not in server list.")
 		return rpc.RPCResponse{
 			ResponseCode: COMMAND_RESPONSE_FAILED_ON_SERVER,
+			DetailedInfo: "Primary server not in server list.",
 		}
 	}
 
@@ -234,7 +237,7 @@ func RPCSubscriptionHandler(args rpc.RPCArgs) rpc.RPCResponse {
 		log.Printf("Error on RPC call (EventSubWebSocketSubscription): Primary server not in server list.")
 		return rpc.RPCResponse{
 			ResponseCode: COMMAND_RESPONSE_FAILED_ON_SERVER,
-			DetailedInfo: "See server console for more details.",
+			DetailedInfo: "Primary server not in server list.",
 		}
 	}
 

diff --git a/internal/events/websocket/websocket_cmd.go b/internal/events/websocket/websocket_cmd.go
@@ -50,7 +50,7 @@ func ForwardWebsocketCommand(cmd string, p WebsocketCommandParameters) error {
 
 	switch reply.ResponseCode {
 	case mock_server.COMMAND_RESPONSE_SUCCESS:
-		color.New().Add(color.FgGreen).Println(fmt.Sprintf("✔ Forwarded for use in mock EventSub WebSocket server"))
+		color.New().Add(color.FgGreen).Println(fmt.Sprintf("✔ Forwarded for use in mock EventSub WebSocket server\n"))
 		return nil
 
 	case mock_server.COMMAND_RESPONSE_FAILED_ON_SERVER: