From 4cbcdef9c2b708da2e471557a292d9c54563a554 Mon Sep 17 00:00:00 2001
From: legop3 <minecratfd8@gmail.com>
Date: Tue, 18 Nov 2025 17:07:14 -0500
Subject: [PATCH] guh

---
 server/src/services/videoAuthService.js | 28 ++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/server/src/services/videoAuthService.js b/server/src/services/videoAuthService.js
index 549a4bf5..e7374fc9 100644
--- a/server/src/services/videoAuthService.js
+++ b/server/src/services/videoAuthService.js
@@ -22,17 +22,31 @@ function getPathPrefix() {
 }
 
 const whepPathPrefix = getPathPrefix().replace(/\/+$/, '').replace(/^\/+/, '');
+const whepPrefixSegments = whepPathPrefix ? whepPathPrefix.split('/').filter(Boolean) : [];
 
 function extractRoverId(path) {
-  let clean = (path || '').replace(/^\//, '');
-  if (!clean) return '';
-  if (clean.endsWith('/whep')) {
-    clean = clean.slice(0, -'/whep'.length);
+  const segments = (path || '').split('/').filter(Boolean);
+  if (!segments.length) {
+    return '';
   }
-  if (whepPathPrefix && clean.startsWith(`${whepPathPrefix}/`)) {
-    clean = clean.slice(whepPathPrefix.length + 1);
+
+  let start = 0;
+  if (
+    whepPrefixSegments.length &&
+    whepPrefixSegments.every((segment, idx) => segments[idx] === segment)
+  ) {
+    start = whepPrefixSegments.length;
   }
-  return clean;
+
+  let end = segments.length;
+  if (segments[end - 1] === 'whep') {
+    end -= 1;
+  }
+
+  if (end - start !== 1) {
+    return '';
+  }
+  return segments[start] || '';
 }
 
 function canView(socket) {