Merge remote-tracking branch 'lewisdoesstuff/master'

ajayyy · Nov 4, 2022 · 9a6f6f8 · 9a6f6f8
2 parents b407497 + 8b744af
commit 9a6f6f8
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 19 deletions.
diff --git a/config.json.example b/config.json.example
@@ -1,7 +1,9 @@
 {
     "serverAddress": "https://sponsor.ajay.app",
     "testingServerAddress": "https://sponsor.ajay.app/test",
+    "fallbackServerAddress": "",
     "serverAddressComment": "This specifies the default SponsorBlock server to connect to",
+    "fallbackAddressComment": "This specifies the server SponsorBlock will attempt to connect to if the primary one fails.",
     "categoryList": ["sponsor", "selfpromo", "exclusive_access", "interaction", "poi_highlight", "intro", "outro", "preview", "filler", "chapter", "music_offtopic"],
     "categorySupport": {
         "sponsor": ["skip", "mute", "full"],

diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json
@@ -505,6 +505,12 @@
     "customServerAddressDescription": {
         "message": "The address SponsorBlock uses to make calls to the server.\nUnless you have your own server instance, this should not be changed."
     },
+    "fallbackServerAddress": {
+        "message": "SponsorBlock Fallback Server Address"
+    },
+    "fallbackServerAddressDescription": {
+        "message": "The address SponsorBlock uses to make calls to the server if the main server is down."
+    },
     "save": {
         "message": "Save"
     },

diff --git a/public/options/options.html b/public/options/options.html
@@ -554,6 +554,26 @@ <h2>__MSG_exportOptions__</h2>
 						</div>
 					</div>
 				</div>
+
+				<div data-type="text-change" data-sync="fallbackServerAddress" data-dependent-on="testingServer" data-dependent-on-inverted="true">
+					<label class="optionLabel inline">
+						<span class="optionLabel">__MSG_fallbackServerAddress__:</span>
+
+						<input class="option-text-box" type="text" style="margin-right:10px">
+					</label>
+
+					<div class="small-description">__MSG_fallbackServerAddressDescription__</div>
+
+					<div class="next-line">
+						<div class="option-button text-change-set inline">
+							__MSG_save__
+						</div>
+
+						<div class="option-button text-change-reset inline">
+							__MSG_reset__
+						</div>
+					</div>
+				</div>
 
 			</div>
 

diff --git a/src/components/SponsorTimeEditComponent.tsx b/src/components/SponsorTimeEditComponent.tsx
@@ -696,11 +696,10 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
         this.saveEditTimes();
     }
 
-    async fetchSuggestions(description: string): Promise<void> {
+    async fetchSuggestions(description: string, fallbackServer = false): Promise<void> {
         if (this.props.contentContainer().channelIDInfo.status !== ChannelIDStatus.Found) return;
-
         this.fetchingSuggestions = true;
-        const result = await utils.asyncRequestToServer("GET", "/api/chapterNames", {
+        const result = await utils.asyncRequestToServer("GET", "/api/chapterNames", fallbackServer, {
             description,
             channelID: this.props.contentContainer().channelIDInfo.id
         });
@@ -713,7 +712,11 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                         label: n.description
                     }))
                 });
-            } catch (e) {} //eslint-disable-line no-empty
+            } catch (e) {
+                if (!fallbackServer) {
+                    this.fetchSuggestions(description, true);
+                }
+            } 
         }
 
         this.fetchingSuggestions = false;

diff --git a/src/config.ts b/src/config.ts
@@ -41,6 +41,7 @@ interface SBConfig {
     invidiousInstances: string[];
     supportInvidious: boolean;
     serverAddress: string;
+    fallbackServerAddress: string;
     minDuration: number;
     skipNoticeDuration: number;
     audioNotificationOnSkip: boolean;
@@ -181,6 +182,7 @@ const Config: SBObject = {
         invidiousInstances: ["invidious.snopyta.org"], // leave as default
         supportInvidious: false,
         serverAddress: CompileConfig.serverAddress,
+        fallbackServerAddress: CompileConfig.fallbackServerAddress,
         minDuration: 0,
         skipNoticeDuration: 4,
         audioNotificationOnSkip: false,

diff --git a/src/content.ts b/src/content.ts
@@ -155,6 +155,9 @@ let isAdPlaying = false;
 let lastResponseStatus: number;
 let retryCount = 0;
 
+// flips between true/false on server request failure
+let fallbackServer = false;
+
 // Contains all of the functions and variables needed by the skip notice
 const skipNoticeContentContainer: ContentContainer = () => ({
     vote,
@@ -1008,9 +1011,8 @@ async function sponsorsLookup(keepOldSubmissions = true) {
     const extraRequestData: Record<string, unknown> = {};
     const hashParams = getHashParams();
     if (hashParams.requiredSegment) extraRequestData.requiredSegment = hashParams.requiredSegment;
-
     const hashPrefix = (await utils.getHash(sponsorVideoID, 1)).slice(0, 4) as VideoID & HashedValue;
-    const response = await utils.asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, {
+    const response = await utils.asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, fallbackServer, {
         categories,
         actionTypes: getEnabledActionTypes(showChapterMessage),
         userAgent: `${chrome.runtime.id}`,
@@ -1019,7 +1021,6 @@ async function sponsorsLookup(keepOldSubmissions = true) {
 
     // store last response status
     lastResponseStatus = response?.status;
-
     if (response?.ok) {
         let recievedSegments: SponsorTime[] = JSON.parse(response.responseText)
                     ?.filter((video) => video.videoID === sponsorVideoID)
@@ -1170,7 +1171,7 @@ function getEnabledActionTypes(forceFullVideo = false): ActionType[] {
 
 async function lockedCategoriesLookup(): Promise<void> {
     const hashPrefix = (await utils.getHash(sponsorVideoID, 1)).slice(0, 4);
-    const response = await utils.asyncRequestToServer("GET", "/api/lockCategories/" + hashPrefix);
+    const response = await utils.asyncRequestToServer("GET", "/api/lockCategories/" + hashPrefix, fallbackServer);
 
     if (response.ok) {
         try {
@@ -1192,9 +1193,16 @@ function retryFetch(errorCode: number): void {
         return;
     }
 
+    fallbackServer = retryCount % 2 === 0 
     retryCount++;
-
-    const delay = errorCode === 404 ? (30000 + Math.random() * 30000) : (2000 + Math.random() * 10000);
+    let delay: number;
+    switch (errorCode) {
+        case 404:
+            delay = (30000 + Math.random() * 30000);
+            break;
+        default:
+            delay = retryCount <= 2 ? 0 : (2000 + Math.random() * 10000);
+    }
     retryFetchTimeout = setTimeout(() => {
         if (sponsorVideoID && sponsorTimes?.length === 0
                 || sponsorTimes.every((segment) => segment.source !== SponsorSourceType.Server)) {
@@ -1630,7 +1638,7 @@ function sendTelemetryAndCount(skippingSegments: SponsorTime[], secondsSkipped:
                 counted = true;
             }
 
-            if (fullSkip) utils.asyncRequestToServer("POST", "/api/viewedVideoSponsorTime?UUID=" + segment.UUID);
+            if (fullSkip) utils.asyncRequestToServer("POST", "/api/viewedVideoSponsorTime?UUID=" + segment.UUID, false);
         }
     }
 }
@@ -2236,7 +2244,7 @@ async function sendSubmitMessage() {
         }
     }
 
-    const response = await utils.asyncRequestToServer("POST", "/api/skipSegments", {
+    const response = await utils.asyncRequestToServer("POST", "/api/skipSegments", false, {
         videoID: sponsorVideoID,
         userID: Config.config.userID,
         segments: sponsorTimesSubmitting,

diff --git a/src/options.ts b/src/options.ts
@@ -175,7 +175,8 @@ async function init() {
                 textChangeSetButton.addEventListener("click", async () => {
                     // See if anything extra must be done
                     switch (option) {
-                        case "serverAddress": {
+                        case "serverAddress":
+                        case "fallbackServerAddress": {
                             const result = validateServerAddress(textChangeInput.value);
 
                             if (result !== null) {

diff --git a/src/utils.ts b/src/utils.ts
@@ -365,11 +365,17 @@ export default class Utils {
      * 
      * @param type The request type. "GET", "POST", etc.
      * @param address The address to add to the SponsorBlock server address
+     * @param fallback Use the fallback server URL if true.
      * @param callback 
      */    
-    async asyncRequestToServer(type: string, address: string, data = {}): Promise<FetchResponse> {
-        const serverAddress = Config.config.testingServer ? CompileConfig.testingServerAddress : Config.config.serverAddress;
-
+    async asyncRequestToServer(type: string, address: string, fallback = false, data = {}): Promise<FetchResponse> {
+        let serverAddress = Config.config.serverAddress;
+        if (Config.config.testingServer){
+            serverAddress = CompileConfig.testingServerAddress;
+        } else if (fallback && Config.config.fallbackServerAddress) {
+            serverAddress = Config.config.fallbackServerAddress;
+        }        
+
         return await (this.asyncRequestToCustomServer(type, serverAddress + address, data));
     }
 

diff --git a/src/utils/licenseKey.ts b/src/utils/licenseKey.ts
@@ -5,7 +5,7 @@ import * as CompileConfig from "../../config.json";
 const utils = new Utils();
 
 export async function checkLicenseKey(licenseKey: string): Promise<boolean> {
-    const result = await utils.asyncRequestToServer("GET", "/api/verifyToken", {
+    const result = await utils.asyncRequestToServer("GET", "/api/verifyToken", false,{
         licenseKey
     });
 
@@ -51,7 +51,7 @@ export async function fetchingChaptersAllowed(): Promise<boolean> {
         Config.forceSyncUpdate("payments");
 
         // Check for free access if no license key, and it is the first time
-        const result = await utils.asyncRequestToServer("GET", "/api/userInfo", {
+        const result = await utils.asyncRequestToServer("GET", "/api/userInfo", false,{
             value: "freeChaptersAccess",
             publicUserID: await utils.getHash(Config.config.userID)
         });

diff --git a/src/utils/warnings.ts b/src/utils/warnings.ts
@@ -42,7 +42,7 @@ export async function openWarningDialog(contentContainer: ContentContainer): Pro
                 {
                     name: chrome.i18n.getMessage("warningConfirmButton"),
                     listener: async () => {
-                        const result = await utils.asyncRequestToServer("POST", "/api/warnUser", {
+                        const result = await utils.asyncRequestToServer("POST", "/api/warnUser", false, {
                             userID: Config.config.userID,
                             enabled: false
                         });