mxyx

Author: mxyx0412

src/main/offsetStore.ts

@@ -138,7 +138,7 @@ interface IOffsetsStore {
 }
 
 //// "https://cdn.jsdelivr.net/gh/OhMyGuus/BetterCrewlink-Offsets@main/"; // "https://raw.githubusercontent.com/OhMyGuus/BetterCrewlink-Offsets/main"
-
+/*
 const BASE_URL = "https://offsets.mxyx.club";
 const BASE_URL_error = "https://github.moeyy.xyz/https://raw.githubusercontent.com/OhMyGuus/BetterCrewlink-Offsets/main";
 
@@ -159,6 +159,28 @@ async function fetchOffsetLookupJson(error: boolean = false): Promise<IOffsetsLo
 				throw Errors.LOOKUP_FETCH_ERROR;
             }
         });
+}*/
+
+//// "https://cdn.jsdelivr.net/gh/OhMyGuus/BetterCrewlink-Offsets@main/"; // "https://raw.githubusercontent.com/OhMyGuus/BetterCrewlink-Offsets/main"
+
+const BASE_URL = "https://offsets.mxyx.club";
+const BASE_URL_error = "https://github.moeyy.xyz/https://raw.githubusercontent.com/OhMyGuus/BetterCrewlink-Offsets/main";
+
+const store = new Store<IOffsetsStore>({name: "offsets"});
+const lookupStore = new Store<IOffsetsLookup>({name: "lookup"});
+
+async function fetchOffsetLookupJson(error: boolean = false): Promise<IOffsetsLookup> {
+    const url = error ? BASE_URL_error : BASE_URL;
+    return fetch(`${url}/lookup.json`)
+        .then((response) => response.json())
+        .then((data) => { return data as IOffsetsLookup })
+        .catch((_) => {
+            if (!error) {
+                return fetchOffsetLookupJson(true);
+            } else {
+                throw Errors.LOOKUP_FETCH_ERROR;
+            }
+        });
 }
 
 export async function fetchOffsetLookup(): Promise<IOffsetsLookup> {
@@ -174,9 +196,7 @@ export async function fetchOffsetLookup(): Promise<IOffsetsLookup> {
 }
 
 async function fetchOffsetsJson(is_64bit: boolean, filename: string, error: boolean = false): Promise<IOffsets> {
-	const GetUrl = SettingsStore.get('CDN_Url', 'nullUrl');
-	const CDN_Url = GetUrl == 'nullUrl' ? BASE_URL : GetUrl;
-	const url = error ? BASE_URL_error : CDN_Url;
+    const url = error ? BASE_URL_error : BASE_URL;
     const OFFSETS_URL = `${url}/offsets`;
     return fetch(`${OFFSETS_URL}/${is_64bit ? 'x64' : 'x86'}/${filename}`)
         .then((response) => response.json())
@@ -185,7 +205,7 @@ async function fetchOffsetsJson(is_64bit: boolean, filename: string, error: bool
             if (!error) {
                 return fetchOffsetsJson(is_64bit, filename, true);
             } else {
-				throw Errors.OFFSETS_FETCH_ERROR;
+                throw Errors.OFFSETS_FETCH_ERROR;
             }
         });
 }