fixed web worker intercepting each other's messages

src/lib/image-provider.ts

@@ -83,7 +83,6 @@ export class ImageProvider {
   stopUrlDownload() {
     for (let key in this.availableProviders) {
       let provider = this.availableProviders[key];
-
       provider.queue = this.createQueue(key);
       this.postMessage(provider.worker, 'stopDownloads', null);
     }

src/lib/image-providers/api-key.ts

@@ -0,0 +1,2 @@
+// TODO make the user input this
+export const apiKey = "f80f92019254471cca9d62ff91c21eee";

src/lib/image-providers/generic-provider.ts

@@ -1,11 +1,10 @@
-// All in worker process
+// All in worker process(es)
 
 import '../replace-diacritics';
-
 import { FuzzyMatcher } from "../fuzzy-matcher";
 import { FuzzyEventMap, ProviderPostEventMap, ProviderPostObject, ProviderReceiveEventMap, ImageContent, ImageProviderAPI, OnlineProviderType, ImageProviderName } from "../../models";
 
-//declare var self: Worker;
+declare var self: DedicatedWorkerGlobalScope;
 
 export abstract class GenericProvider {
   constructor(protected proxy: ProviderProxy<GenericProvider>) { }
@@ -66,8 +65,8 @@ export class GenericProviderManager<T extends GenericProvider> {
 
   // How worker handles receiving a message from main process
   private onMessage(event: MessageEvent) {
-    //self.name == this.providerName fixes issue where workers were intercepting each other's messages... no idea why.
-    if (event.data && event.data.event && self.name==this.providerName) {
+    //add back self.name == this.providerName to if statement if workers are intercepting each other's messages
+    if (event.data && event.data.event) {
       switch ((event.data.event as keyof ProviderReceiveEventMap)) {
         case 'fuzzyList':
           this._fuzzyMatcher.setFuzzyList((event.data.data as ProviderReceiveEventMap['fuzzyList']).list || null);

src/lib/image-providers/index.ts

@@ -1,4 +1,4 @@
 export const imageProviders = {
-  'steamCDN': new Worker(new URL('./steamcdn.worker', import.meta.url), {name: 'steamCDN'}),
   'sgdb': new Worker(new URL('./steamgriddb.worker', import.meta.url), {name: 'sgdb'}),
+  'steamCDN': new Worker(new URL('./steamcdn.worker', import.meta.url), {name: 'steamCDN'})
 }

src/lib/image-providers/steamcdn.worker.ts

@@ -1,10 +1,12 @@
 import { GenericProvider, GenericProviderManager, ProviderProxy } from "./generic-provider";
-import {apiKey} from "./steamgriddb.worker";
+import {apiKey} from "./api-key";
 import { xRequestWrapper } from "./x-request-wrapper";
 import SGDB from "steamgriddb";
 import { artworkTypes, steamArtworkDict } from '../artwork-types'
 import { imageProviderNames, sgdbIdRegex } from "./available-providers";
 
+//NOTE: Workers must not import from one another.
+
 export class SteamCDNProvider extends GenericProvider {
   private xrw: xRequestWrapper<SteamCDNProvider>;
   private client: any;
@@ -16,7 +18,6 @@ export class SteamCDNProvider extends GenericProvider {
   }
   retrieveUrls() {
     let self = this;
-    let imageGameId: string;
     this.xrw.promise = new Promise<void>((resolve) => {
       let idPromise: Promise<number> = null;
       if(sgdbIdRegex.test(self.proxy.title)) {

src/lib/image-providers/steamgriddb.worker.ts

@@ -2,11 +2,9 @@ import { GenericProvider, GenericProviderManager, ProviderProxy } from "./generi
 import { xRequestWrapper } from "./x-request-wrapper";
 import SGDB from "steamgriddb";
 import { imageProviderNames, sgdbIdRegex } from "./available-providers";
+import {apiKey} from "./api-key";
 
-
-
-// TODO make the user input this
-export const apiKey = "f80f92019254471cca9d62ff91c21eee";
+//NOTE: Workers must not import from one another.
 
 export class SteamGridDbProvider extends GenericProvider {
   private xrw: xRequestWrapper<SteamGridDbProvider>;

tsconfig.json

@@ -6,7 +6,7 @@
   },
   "compilerOptions": {
     "target": "es2022",
-    "lib": ["es2022"],
+    "lib": ["es2022", "webworker"],
     "module": "ESNext",
     "sourceMap": true,
     "emitDecoratorMetadata": true,