Merge branch 'consume-output-of-balancer' of https://github.com/Victo…

…r-M-Giraldo/opentogethertube into consume-output-of-balancer

client/src/components/UserList.vue

@@ -147,6 +147,7 @@ export const UserList = defineComponent({
 				await API.post("/user", { username: inputUsername.value });
 				showEditName.value = false;
 				setUsernameFailureText.value = "";
+				roomapi.notify("usernameChanged");
 			} catch (err) {
 				setUsernameFailureText.value = err.response
 					? err.response.data.error.message

client/src/util/roomapi.ts

@@ -1,5 +1,5 @@
 import { OttRoomConnection } from "@/plugins/connection";
-import { RoomRequestType } from "ott-common/models/messages";
+import { ClientMessageNotify, RoomRequestType } from "ott-common/models/messages";
 import { ClientId, Role } from "ott-common/models/types";
 import { VideoId } from "ott-common/models/video";
 
@@ -151,4 +151,11 @@ class RoomApi {
 			},
 		});
 	}
+
+	notify(message: ClientMessageNotify["message"]) {
+		this.connection.send({
+			action: "notify",
+			message,
+		});
+	}
 }

common/models/messages.ts

@@ -120,6 +120,7 @@ export type ClientMessage =
 	| ClientMessageKickMe
 	| ClientMessagePlayerStatus
 	| ClientMessageAuthenticate
+	| ClientMessageNotify
 	| ClientMessageRoomRequest;
 
 interface ClientMessageBase {
@@ -144,6 +145,16 @@ export interface ClientMessageAuthenticate extends ClientMessageBase {
 	token: AuthToken;
 }
 
+/**
+ * Used to notify the monolith of events that occur on the client that imply a change in state that needs to be propagated to other clients.
+ *
+ * Currently only used to notify the monolith of a username change.
+ */
+export interface ClientMessageNotify extends ClientMessageBase {
+	action: "notify";
+	message: "usernameChanged";
+}
+
 export interface ClientMessageRoomRequest extends ClientMessageBase {
 	action: "req";
 	request: RoomRequest;

crates/ott-balancer/src/service.rs

@@ -76,11 +76,15 @@ impl Service<Request<IncomingBody>> for BalancerService {
             warn!("no route found for {}", req.uri().path());
             return Box::pin(async move { Ok(not_found()) });
         };
-        tracing::Span::current().record("handler", route.handler());
-        info!("inbound request");
+        let handler = **route.handler();
+        tracing::Span::current().record("handler", handler);
+        match handler {
+            "status" | "health" | "metrics" => debug!("inbound request"),
+            _ => info!("inbound request"),
+        }
 
         Box::pin(async move {
-            let res = match **route.handler() {
+            let res = match handler {
                 "health" => mk_response("OK".to_owned()),
                 "status" => {
                     let ctx_read = ctx.read().await;

server/clientmanager.ts

@@ -7,6 +7,7 @@ import { Request } from "express";
 import { createSubscriber, redisClient } from "./redisclient";
 import {
 	ClientMessage,
+	ClientMessageKickMe,
 	RoomRequest,
 	RoomRequestType,
 	ServerMessage,
@@ -151,6 +152,12 @@ async function onClientMessage(client: Client, msg: ClientMessage) {
 			await makeRoomRequest(client, request);
 		} else if (msg.action === "req") {
 			await makeRoomRequest(client, msg.request);
+		} else if (msg.action === "notify") {
+			if (msg.message === "usernameChanged") {
+				onUserModified(client.token!);
+			} else {
+				log.warn(`Unknown notify message: ${msg.message}`);
+			}
 		} else {
 			log.warn(`Unknown client message: ${(msg as { action: string }).action}`);
 			return;

server/services/direct.ts

@@ -91,7 +91,9 @@ export default class DirectVideoAdapter extends ServiceAdapter {
 		}
 		const fileInfo = await this.ffprobe.getFileInfo(link);
 		const duration = Math.ceil(this.getDuration(fileInfo));
-		const title = fileInfo.format?.tags?.title ?? fileName;
+		const title =
+			fileInfo.format?.tags?.title ??
+			decodeURIComponent(fileName).slice(0, -extension.length - 1);
 		const video: Video = {
 			service: this.serviceId,
 			id: link,