cleanup

Author: drweissbrot

src/constants.ts

@@ -1,10 +1,8 @@
 import { SyncStorageKey } from '../types/enums';
 
 // NB! If these need changing, also update manifest.json
-export const LEETIFY_API_DOMAIN = 'api.leetify.com';
-export const LEETIFY_FRONTEND_DOMAIN = 'leetify.com';
-export const LEETIFY_API_URL = `https://${LEETIFY_API_DOMAIN}`;
-export const LEETIFY_FRONTEND_URL = `https://${LEETIFY_FRONTEND_DOMAIN}`;
+export const LEETIFY_API_URL = 'https://api.leetify.com';
+export const LEETIFY_FRONTEND_URL = 'https://leetify.com';
 
 export const getOptionDefaults = () => ({
 	[SyncStorageKey.OPTION_SYNC_UNRANKED_WINGMAN]: true,

src/gcpd.ts

@@ -15,7 +15,7 @@ class Gcpd {
 		return this.fetchMatchesRecursively({ tab, previouslyFoundMatchTimestamp, matches: [] });
 	}
 
-	private async fetchMatchesRecursively({
+	protected async fetchMatchesRecursively({
 		continueToken,
 		depth,
 		matches,

src/leetify-access-token.ts

@@ -19,7 +19,7 @@ class LeetifyAccessToken {
 		});
 
 		const leetifyAccessToken = await this.leetifyAccessTokenPromise;
-		this.leetifyAccessTokenPromise = null;
+		this.clearPromise();
 		await chrome.offscreen.closeDocument();
 
 		return leetifyAccessToken;

src/match-sync.ts

@@ -38,18 +38,6 @@ class MatchSync {
 		}
 	}
 
-	protected async initDomParser(): Promise<void> {
-		await this.setStatus({ status: SyncStatus.GCPD_PARSER_INITIALIZING });
-
-		await chrome.offscreen.createDocument({
-			justification: 'Parse Steam GCPD page',
-			reasons: ['DOM_PARSER'],
-			url: 'src/offscreen/dom-parser.html',
-		});
-
-		await this.setStatus({ status: SyncStatus.GCPD_PARSER_INITIALIZED });
-	}
-
 	public async setStatus(eventBody: SyncStatusEventBody): Promise<void> {
 		if (eventBody.status === SyncStatus.DONE) {
 			this.lastStatusEventBody = { status: SyncStatus.IDLE };
@@ -78,6 +66,18 @@ class MatchSync {
 		await chrome.runtime.sendMessage({ event: EventName.SYNC_STATUS, data: this.lastStatusEventBody });
 	}
 
+	protected async initDomParser(): Promise<void> {
+		await this.setStatus({ status: SyncStatus.GCPD_PARSER_INITIALIZING });
+
+		await chrome.offscreen.createDocument({
+			justification: 'Parse Steam GCPD page',
+			reasons: ['DOM_PARSER'],
+			url: 'src/offscreen/dom-parser.html',
+		});
+
+		await this.setStatus({ status: SyncStatus.GCPD_PARSER_INITIALIZED });
+	}
+
 	protected async syncAllMatches(leetifyAccessToken: string): Promise<boolean> {
 		const scrimmageSuccessful = await this.syncMatches(GcpdTab.SCRIMMAGE, leetifyAccessToken);
 		if (!scrimmageSuccessful) return false;

src/view-tab.ts

@@ -19,7 +19,7 @@ class ViewTab {
 		});
 	}
 
-	public async exists(): Promise<boolean> {
+	protected async exists(): Promise<boolean> {
 		if (!this.tab?.id) return false;
 
 		if (!await tabExists(this.tab.id)) {