Merge pull request #370 from mchangrh/switch-axios

replace node-fetch with axios in src
2025-12-16 08:26:59 +03:00 · 2021-09-27 20:24:34 -04:00
parent 39baa4871a 6d76bea5c5
commit ad3f2088ef
8 changed files with 105 additions and 290 deletions
--- a/src/routes/getTotalStats.ts
+++ b/src/routes/getTotalStats.ts
@@ -1,7 +1,6 @@
 import { db } from "../databases/databases";
 import { config } from "../config";
 import { Request, Response } from "express";
-import fetch from "node-fetch";
 import axios from "axios";
 import { Logger } from "../utils/logger";

@@ -55,13 +54,12 @@ function updateExtensionUsers() {
    const mozillaAddonsUrl = "https://addons.mozilla.org/api/v3/addons/addon/sponsorblock/";
    const chromeExtensionUrl = "https://chrome.google.com/webstore/detail/sponsorblock-for-youtube/mnjggcdmjocbbbhaepdhchncahnbgone";

-    fetch(mozillaAddonsUrl)
-        .then(res => res.json() as Record<string, any>)
-        .then(data => {
-            firefoxUsersCache = data.average_daily_users;
-            fetch(chromeExtensionUrl)
-                .then(res => res.text())
-                .then(body => {
+    axios.get(mozillaAddonsUrl)
+        .then(res => {
+            firefoxUsersCache = res.data.average_daily_users;
+            axios.get(chromeExtensionUrl)
+                .then(res => {
+                    const body = res.data;
                    // 2021-01-05
                    // [...]<span><meta itemprop="interactionCount" content="UserDownloads:100.000+"/><meta itemprop="opera[...]
                    const matchingString = '"UserDownloads:';
--- a/src/routes/postSkipSegments.ts
+++ b/src/routes/postSkipSegments.ts
@@ -3,7 +3,6 @@ import { Logger } from "../utils/logger";
 import { db, privateDB } from "../databases/databases";
 import { getMaxResThumbnail, YouTubeAPI } from "../utils/youtubeApi";
 import { getSubmissionUUID } from "../utils/getSubmissionUUID";
-import fetch from "node-fetch";
 import { getHash } from "../utils/getHash";
 import { getIP } from "../utils/getIP";
 import { getFormattedTime } from "../utils/getFormattedTime";
@@ -20,6 +19,7 @@ import { UserID } from "../types/user.model";
 import { isUserVIP } from "../utils/isUserVIP";
 import { parseUserAgent } from "../utils/userAgent";
 import { getService } from "../utils/getService";
+import axios from "axios";

 type CheckResult = {
    pass: boolean,
@@ -80,28 +80,22 @@ async function sendWebhooks(apiVideoInfo: APIVideoInfo, userID: string, videoID:
        // Then send a notification to discord
        if (config.discordFirstTimeSubmissionsWebhookURL === null || userSubmissionCountRow.submissionCount > 1) return;

-        fetch(config.discordFirstTimeSubmissionsWebhookURL, {
-            method: "POST",
-            body: JSON.stringify({
-                "embeds": [{
-                    "title": data?.title,
-                    "url": `https://www.youtube.com/watch?v=${videoID}&t=${(parseInt(startTime.toFixed(0)) - 2)}`,
-                    "description": `Submission ID: ${UUID}\
-                        \n\nTimestamp: \
-                        ${getFormattedTime(startTime)} to ${getFormattedTime(endTime)}\
-                        \n\nCategory: ${segmentInfo.category}`,
-                    "color": 10813440,
-                    "author": {
-                        "name": userID,
-                    },
-                    "thumbnail": {
-                        "url": getMaxResThumbnail(data) || "",
-                    },
-                }],
-            }),
-            headers: {
-                "Content-Type": "application/json"
-            }
+        axios.post(config.discordFirstTimeSubmissionsWebhookURL, {
+            "embeds": [{
+                "title": data?.title,
+                "url": `https://www.youtube.com/watch?v=${videoID}&t=${(parseInt(startTime.toFixed(0)) - 2)}`,
+                "description": `Submission ID: ${UUID}\
+                    \n\nTimestamp: \
+                    ${getFormattedTime(startTime)} to ${getFormattedTime(endTime)}\
+                    \n\nCategory: ${segmentInfo.category}`,
+                "color": 10813440,
+                "author": {
+                    "name": userID,
+                },
+                "thumbnail": {
+                    "url": getMaxResThumbnail(data) || "",
+                },
+            }],
        })
            .then(res => {
                if (res.status >= 400) {
@@ -136,28 +130,22 @@ async function sendWebhooksNB(userID: string, videoID: string, UUID: string, sta
    // Send discord message
    if (config.discordNeuralBlockRejectWebhookURL === null) return;

-    fetch(config.discordNeuralBlockRejectWebhookURL, {
-        method: "POST",
-        body: JSON.stringify({
-            "embeds": [{
-                "title": ytData.items[0].snippet.title,
-                "url": `https://www.youtube.com/watch?v=${videoID}&t=${(parseFloat(startTime.toFixed(0)) - 2)}`,
-                "description": `**Submission ID:** ${UUID}\
-                    \n**Timestamp:** ${getFormattedTime(startTime)} to ${getFormattedTime(endTime)}\
-                    \n**Predicted Probability:** ${probability}\
-                    \n**Category:** ${category}\
-                    \n**Submitted by:** ${submittedBy}\
-                    \n**Total User Submissions:** ${submissionInfoRow.count}\
-                    \n**Ignored User Submissions:** ${submissionInfoRow.disregarded}`,
-                "color": 10813440,
-                "thumbnail": {
-                    "url": ytData.items[0].snippet.thumbnails.maxres ? ytData.items[0].snippet.thumbnails.maxres.url : "",
-                },
-            }],
-        }),
-        headers: {
-            "Content-Type": "application/json"
-        }
+    axios.post(config.discordNeuralBlockRejectWebhookURL, {
+        "embeds": [{
+            "title": ytData.items[0].snippet.title,
+            "url": `https://www.youtube.com/watch?v=${videoID}&t=${(parseFloat(startTime.toFixed(0)) - 2)}`,
+            "description": `**Submission ID:** ${UUID}\
+                \n**Timestamp:** ${getFormattedTime(startTime)} to ${getFormattedTime(endTime)}\
+                \n**Predicted Probability:** ${probability}\
+                \n**Category:** ${category}\
+                \n**Submitted by:** ${submittedBy}\
+                \n**Total User Submissions:** ${submissionInfoRow.count}\
+                \n**Ignored User Submissions:** ${submissionInfoRow.disregarded}`,
+            "color": 10813440,
+            "thumbnail": {
+                "url": ytData.items[0].snippet.thumbnails.maxres ? ytData.items[0].snippet.thumbnails.maxres.url : "",
+            },
+        }]
    })
        .then(res => {
            if (res.status >= 400) {
@@ -236,11 +224,11 @@ async function autoModerateSubmission(apiVideoInfo: APIVideoInfo,
        // Check NeuralBlock
        const neuralBlockURL = config.neuralBlockURL;
        if (!neuralBlockURL) return false;
-        const response = await fetch(`${neuralBlockURL}/api/checkSponsorSegments?vid=${submission.videoID}
-            &segments=${nbString.substring(0, nbString.length - 1)}`);
-        if (!response.ok) return false;
+        const response = await axios.get(`${neuralBlockURL}/api/checkSponsorSegments?vid=${submission.videoID}
+            &segments=${nbString.substring(0, nbString.length - 1)}`, { validateStatus: () => true });
+        if (response.status !== 200) return false;

-        const nbPredictions = await response.json() as Record<string, any>;
+        const nbPredictions = response.data;
        let nbDecision = false;
        let predictionIdx = 0; //Keep track because only sponsor categories were submitted
        for (let i = 0; i < segments.length; i++) {
@@ -531,12 +519,9 @@ async function checkRateLimit(userID:string, videoID: VideoID, timeSubmitted: nu
 }

 function proxySubmission(req: Request) {
-    fetch(`${config.proxySubmission}/api/skipSegments?userID=${req.query.userID}&videoID=${req.query.videoID}`, {
-        method: "POST",
-        body: req.body,
-    })
-        .then(async res => {
-            Logger.debug(`Proxy Submission: ${res.status} (${(await res.text())})`);
+    axios.post(`${config.proxySubmission}/api/skipSegments?userID=${req.query.userID}&videoID=${req.query.videoID}`, req.body)
+        .then(res => {
+            Logger.debug(`Proxy Submission: ${res.status} (${res.data})`);
        })
        .catch(() => {
            Logger.error("Proxy Submission: Failed to make call");
--- a/src/routes/voteOnSponsorTime.ts
+++ b/src/routes/voteOnSponsorTime.ts
@@ -1,7 +1,6 @@
 import { Request, Response } from "express";
 import { Logger } from "../utils/logger";
 import { isUserVIP } from "../utils/isUserVIP";
-import fetch from "node-fetch";
 import { getMaxResThumbnail, YouTubeAPI } from "../utils/youtubeApi";
 import { db, privateDB } from "../databases/databases";
 import { dispatchEvent, getVoteAuthor, getVoteAuthorRaw } from "../utils/webhookUtils";
@@ -13,6 +12,7 @@ import { UserID } from "../types/user.model";
 import { Category, CategoryActionType, HashedIP, IPAddress, SegmentUUID, Service, VideoID, VideoIDHash, Visibility } from "../types/segments.model";
 import { getCategoryActionType } from "../utils/categoryInfo";
 import { QueryCacher } from "../utils/queryCacher";
+import axios from "axios";

 const voteTypes = {
    normal: 0,
@@ -111,40 +111,34 @@ async function sendWebhooks(voteData: VoteData) {

            // Send discord message
            if (webhookURL !== null && !isUpvote) {
-                fetch(webhookURL, {
-                    method: "POST",
-                    body: JSON.stringify({
-                        "embeds": [{
-                            "title": data?.title,
-                            "url": `https://www.youtube.com/watch?v=${submissionInfoRow.videoID}&t=${(submissionInfoRow.startTime.toFixed(0) - 2)}`,
-                            "description": `**${voteData.row.votes} Votes Prior | \
-                                ${(voteData.row.votes + voteData.incrementAmount - voteData.oldIncrementAmount)} Votes Now | ${voteData.row.views} \
-                                Views**\n\n**Submission ID:** ${voteData.UUID}\
-                                \n**Category:** ${submissionInfoRow.category}\
-                                \n\n**Submitted by:** ${submissionInfoRow.userName}\n${submissionInfoRow.userID}\
-                                \n\n**Total User Submissions:** ${submissionInfoRow.count}\
-                                \n**Ignored User Submissions:** ${submissionInfoRow.disregarded}\
-                                \n\n**Timestamp:** \
-                                ${getFormattedTime(submissionInfoRow.startTime)} to ${getFormattedTime(submissionInfoRow.endTime)}`,
-                            "color": 10813440,
-                            "author": {
-                                "name": voteData.finalResponse?.webhookMessage ??
-                                        voteData.finalResponse?.finalMessage ??
-                                        getVoteAuthor(userSubmissionCountRow.submissionCount, voteData.isVIP, voteData.isOwnSubmission),
-                            },
-                            "thumbnail": {
-                                "url": getMaxResThumbnail(data) || "",
-                            },
-                        }],
-                    }),
-                    headers: {
-                        "Content-Type": "application/json"
-                    }
+                axios.post(webhookURL, {
+                    "embeds": [{
+                        "title": data?.title,
+                        "url": `https://www.youtube.com/watch?v=${submissionInfoRow.videoID}&t=${(submissionInfoRow.startTime.toFixed(0) - 2)}`,
+                        "description": `**${voteData.row.votes} Votes Prior | \
+                            ${(voteData.row.votes + voteData.incrementAmount - voteData.oldIncrementAmount)} Votes Now | ${voteData.row.views} \
+                            Views**\n\n**Submission ID:** ${voteData.UUID}\
+                            \n**Category:** ${submissionInfoRow.category}\
+                            \n\n**Submitted by:** ${submissionInfoRow.userName}\n${submissionInfoRow.userID}\
+                            \n\n**Total User Submissions:** ${submissionInfoRow.count}\
+                            \n**Ignored User Submissions:** ${submissionInfoRow.disregarded}\
+                            \n\n**Timestamp:** \
+                            ${getFormattedTime(submissionInfoRow.startTime)} to ${getFormattedTime(submissionInfoRow.endTime)}`,
+                        "color": 10813440,
+                        "author": {
+                            "name": voteData.finalResponse?.webhookMessage ??
+                                    voteData.finalResponse?.finalMessage ??
+                                    getVoteAuthor(userSubmissionCountRow.submissionCount, voteData.isVIP, voteData.isOwnSubmission),
+                        },
+                        "thumbnail": {
+                            "url": getMaxResThumbnail(data) || "",
+                        },
+                    }],
                })
-                    .then(async res => {
+                    .then(res => {
                        if (res.status >= 400) {
                            Logger.error("Error sending reported submission Discord hook");
-                            Logger.error(JSON.stringify((await res.text())));
+                            Logger.error(JSON.stringify((res.data)));
                            Logger.error("\n");
                        }
                    })
--- a/src/utils/webhookUtils.ts
+++ b/src/utils/webhookUtils.ts
@@ -1,6 +1,6 @@
 import { config } from "../config";
 import { Logger } from "../utils/logger";
-import fetch from "node-fetch";
+import axios from "axios";

 function getVoteAuthorRaw(submissionCount: number, isVIP: boolean, isOwnSubmission: boolean): string {
    if (isOwnSubmission) {
@@ -37,9 +37,10 @@ function dispatchEvent(scope: string, data: Record<string, unknown>): void {
        const scopes = webhook.scopes || [];
        if (!scopes.includes(scope.toLowerCase())) return;

-        fetch(webhookURL, {
+        axios.request({
+            url: webhookURL,
            method: "POST",
-            body: JSON.stringify(data),
+            data,
            headers: {
                "Authorization": authKey,
                "Event-Type": scope, // Maybe change this in the future?
--- a/src/utils/youtubeApi.ts
+++ b/src/utils/youtubeApi.ts
@@ -1,8 +1,8 @@
-import fetch from "node-fetch";
 import { config } from "../config";
 import { Logger } from "./logger";
 import { APIVideoData, APIVideoInfo } from "../types/youtubeApi.model";
 import DiskCache from "./diskCache";
+import axios from "axios";

 export class YouTubeAPI {
    static async listVideos(videoID: string, ignoreCache = false): Promise<APIVideoInfo> {
@@ -27,11 +27,11 @@ export class YouTubeAPI {
        if (!config.newLeafURLs || config.newLeafURLs.length <= 0) return { err: "NewLeaf URL not found", data: null };

        try {
-            const result = await fetch(`${config.newLeafURLs[Math.floor(Math.random() * config.newLeafURLs.length)]}/api/v1/videos/${videoID}`, { method: "GET" });
+            const result = await axios.get(`${config.newLeafURLs[Math.floor(Math.random() * config.newLeafURLs.length)]}/api/v1/videos/${videoID}`);

-            if (result.ok) {
-                const data = await result.json() as (Record<string, any>);
-                if (data.error as Record<string, string>) {
+            if (result.status === 200) {
+                const data = result.data;
+                if (data.error) {
                    Logger.warn(`NewLeaf API Error for ${videoID}: ${data.error}`);
                    return { err: data.error, data: null };
                }