parse user agent from header

hanydd · Oct 30, 2024 · 5bdd741 · 5bdd741
1 parent 0774318
commit 5bdd741
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/src/routes/postPortVideo.ts b/src/routes/postPortVideo.ts
@@ -7,7 +7,7 @@ import { config } from "../config";
 import * as youtubeID from "../utils/youtubeID";
 import * as biliID from "../utils/bilibiliID";
 import { getVideoDetails } from "../utils/getVideoDetails";
-import { parseUserAgent } from "../utils/userAgent";
+import { parseUserAgentFromHeaders } from "../utils/userAgent";
 import { getMatchVideoUUID, getPortSegmentUUID } from "../utils/getSubmissionUUID";
 import { isUserVIP } from "../utils/isUserVIP";
 import { Logger } from "../utils/logger";
@@ -175,7 +175,7 @@ export async function postPortVideo(req: Request, res: Response): Promise<Respon
 
     // prepare to be saved
     const isVIP = await isUserVIP(userID);
-    const userAgent = req.query.userAgent ?? req.body.userAgent ?? parseUserAgent(req.get("user-agent")) ?? "";
+    const userAgent = req.query.userAgent ?? req.body.userAgent ?? parseUserAgentFromHeaders(req.headers) ?? "";
     const timeSubmitted = Date.now();
     const matchVideoUUID = getMatchVideoUUID(bvID, ytbID, userID, paramBiliDuration, ytbDuration, timeSubmitted);
     const startingVotes = 0;

diff --git a/src/routes/postSkipSegments.ts b/src/routes/postSkipSegments.ts
@@ -16,7 +16,7 @@ import { getReputation } from "../utils/reputation";
 import { HashedUserID, UserID } from "../types/user.model";
 import { isUserVIP } from "../utils/isUserVIP";
 import { isUserTempVIP } from "../utils/isUserTempVIP";
-import { parseUserAgent } from "../utils/userAgent";
+import { parseUserAgentFromHeaders } from "../utils/userAgent";
 import { getService } from "../utils/getService";
 import axios from "axios";
 import { vote } from "./voteOnSponsorTime";
@@ -485,7 +485,7 @@ function preprocessInput(req: Request) {
         segment.segment = segment.segment.map((time) => typeof segment.segment[0] === "string" ? time?.replace(",", ".") : time);
     });
 
-    const userAgent = req.query.userAgent ?? req.body.userAgent ?? parseUserAgent(req.get("user-agent")) ?? "";
+    const userAgent = req.query.userAgent ?? req.body.userAgent ?? parseUserAgentFromHeaders(req.headers) ?? "";
 
     return { videoID, userID, service, videoDuration, videoDurationParam, segments, userAgent };
 }

diff --git a/src/utils/userAgent.ts b/src/utils/userAgent.ts
@@ -1,13 +1,8 @@
-export function parseUserAgent(userAgent: string): string {
-    const ua = userAgent.toLowerCase();
+import { IncomingHttpHeaders } from "http";
 
-    if (ua.match(/(com.google.android.youtube\/)|(com.vanced.android.youtube\/)|(^YouTube\/)|(^Dalvik\/)/)) {
-        return `Vanced/${ua.match(/.android.youtube\/([^\s]+)/)[1]}`;
+export function parseUserAgentFromHeaders(headers: IncomingHttpHeaders): string {
+    if (!headers.origin) {
+        return "";
     }
-
-    if (ua.match(/(mpv_sponsorblock\/)|(^python-requests)|(^GuzzleHttp\/)|(^PostmanRuntime\/)/)) {
-        return ua;
-    }
-
-    return "";
-}
+    return headers.origin.split("://").at(-1) + (headers["x-ext-version"] ? `/${headers["x-ext-version"]}` : "");
+}