tone 15.1.22 → 15.1.23

package/Tone/core/context/Context.ts

@@ -346,9 +346,9 @@ export class Context extends BaseContext {
 	//--------------------------------------------
 
 	/**
-	 * Maps a module name to promise of the addModule method
+	 * A set of unsettled promises returned by the addModule method
 	 */
-	private _workletPromise: null | Promise<void> = null;
+	private _workletPromises = new Set<Promise<void>>();
 
 	/**
 	 * Create an audio worklet node from a name and options. The module
@@ -370,17 +370,19 @@ export class Context extends BaseContext {
 			isDefined(this.rawContext.audioWorklet),
 			"AudioWorkletNode is only available in a secure context (https or localhost)"
 		);
-		if (!this._workletPromise) {
-			this._workletPromise = this.rawContext.audioWorklet.addModule(url);
-		}
-		await this._workletPromise;
+		const workletPromise = this.rawContext.audioWorklet.addModule(url);
+
+		this._workletPromises.add(workletPromise);
+		workletPromise.finally(() => this._workletPromises.delete(workletPromise));
+
+		return workletPromise;
 	}
 
 	/**
 	 * Returns a promise which resolves when all of the worklets have been loaded on this context
 	 */
 	protected async workletsAreReady(): Promise<void> {
-		(await this._workletPromise) ? this._workletPromise : Promise.resolve();
+		await Promise.all(this._workletPromises);
 	}
 
 	//---------------------------

package/Tone/core/worklet/ToneAudioWorklet.ts

@@ -59,7 +59,15 @@ export abstract class ToneAudioWorklet<
 		this._dummyParam = this._dummyGain.gain;
 
 		// Register the processor
-		this.context.addAudioWorkletModule(blobUrl).then(() => {
+		let workletPromise = ToneAudioWorklet._workletPromises.get(this.context);
+
+		if (workletPromise === undefined) {
+			workletPromise = this.context.addAudioWorkletModule(blobUrl);
+
+			ToneAudioWorklet._workletPromises.set(this.context, workletPromise);
+		}
+
+		workletPromise.then(() => {
 			// create the worklet when it's read
 			if (!this.disposed) {
 				this._worklet = this.context.createAudioWorkletNode(
@@ -73,6 +81,8 @@ export abstract class ToneAudioWorklet<
 		});
 	}
 
+	private static _workletPromises = new WeakMap<any, Promise<void>>();
+
 	dispose(): this {
 		super.dispose();
 		this._dummyGain.disconnect();

package/Tone/version.ts

@@ -1 +1 @@
-export const version: string = "15.1.22";
+export const version: string = "15.1.23";