From de086f54c613b7013ca6f0289c3ce28d01278626 Mon Sep 17 00:00:00 2001
From: Yotam Mann <hi@yotammann.info>
Date: Tue, 11 Jun 2024 16:09:27 -0400
Subject: [PATCH] Removing double-encoding of urls (#1254)

* Removing double-encoding of urls, testing baseUrl

* testing file with space

* updating version
---
 Tone/core/context/ToneAudioBuffer.test.ts |  65 +++++++++++++++++-----
 Tone/core/context/ToneAudioBuffer.ts      |  24 +-------
 package-lock.json                         |   4 +-
 package.json                              |   2 +-
 test/audio/name with space.wav            | Bin 0 -> 264646 bytes
 5 files changed, 55 insertions(+), 40 deletions(-)
 create mode 100644 test/audio/name with space.wav

diff --git a/Tone/core/context/ToneAudioBuffer.test.ts b/Tone/core/context/ToneAudioBuffer.test.ts
index 3258ab32..7af757ff 100644
--- a/Tone/core/context/ToneAudioBuffer.test.ts
+++ b/Tone/core/context/ToneAudioBuffer.test.ts
@@ -115,6 +115,57 @@ describe("ToneAudioBuffer", () => {
 				},
 			});
 		});
+
+		it("can load an audio file with a space in the name", async () => {
+			const buffer = new ToneAudioBuffer(
+				"./test/audio/name with space.wav"
+			);
+			expect(buffer.loaded).to.be.false;
+			await ToneAudioBuffer.loaded();
+			expect(buffer.loaded).to.be.true;
+		});
+
+		it("can load an encoded audio file with a space in the name", async () => {
+			const buffer = new ToneAudioBuffer(
+				"./test/audio/" + encodeURIComponent("name with space.wav")
+			);
+			expect(buffer.loaded).to.be.false;
+			await ToneAudioBuffer.loaded();
+			expect(buffer.loaded).to.be.true;
+		});
+	});
+
+	context("baseUrl", () => {
+		afterEach(() => {
+			// reset baseUrl
+			ToneAudioBuffer.baseUrl = "";
+		});
+
+		it("can resolve a url without a baseUrl", async () => {
+			const buffer = new ToneAudioBuffer("./test/audio/sine.wav");
+			expect(buffer.loaded).to.be.false;
+			await ToneAudioBuffer.loaded();
+			expect(buffer.loaded).to.be.true;
+			expect(buffer.duration).to.be.closeTo(3, 0.01);
+		});
+
+		it("can resolve a url with a baseUrl", async () => {
+			ToneAudioBuffer.baseUrl = "./test/audio";
+			const buffer = new ToneAudioBuffer("sine.wav");
+			expect(buffer.loaded).to.be.false;
+			await ToneAudioBuffer.loaded();
+			expect(buffer.loaded).to.be.true;
+			expect(buffer.duration).to.be.closeTo(3, 0.01);
+		});
+
+		it("can resolve a url with a baseUrl that has a trailing slash", async () => {
+			ToneAudioBuffer.baseUrl = "./test/audio/";
+			const buffer = new ToneAudioBuffer("sine.wav");
+			expect(buffer.loaded).to.be.false;
+			await ToneAudioBuffer.loaded();
+			expect(buffer.loaded).to.be.true;
+			expect(buffer.duration).to.be.closeTo(3, 0.01);
+		});
 	});
 
 	context("loading", () => {
@@ -141,20 +192,6 @@ describe("ToneAudioBuffer", () => {
 			expect(hadError).to.equal(true);
 		});
 
-		it("can load a file with fallback extensions", async () => {
-			const buffer = await ToneAudioBuffer.load(
-				"./test/audio/sine.[nope|nada|wav]"
-			);
-			expect(buffer).to.exist;
-		});
-
-		it("takes the first supported format when multiple extensions are provided", async () => {
-			const buffer = await ToneAudioBuffer.load(
-				"./test/audio/sine.[wav|nope]"
-			);
-			expect(buffer).to.exist;
-		});
-
 		it("instance .load method returns Promise", (done) => {
 			const promise = new ToneAudioBuffer().load(testFile);
 			expect(promise).to.have.property("then");
diff --git a/Tone/core/context/ToneAudioBuffer.ts b/Tone/core/context/ToneAudioBuffer.ts
index be983737..d9584f8f 100644
--- a/Tone/core/context/ToneAudioBuffer.ts
+++ b/Tone/core/context/ToneAudioBuffer.ts
@@ -372,20 +372,6 @@ export class ToneAudioBuffer extends Tone {
 	 * Loads a url using fetch and returns the AudioBuffer.
 	 */
 	static async load(url: string): Promise<AudioBuffer> {
-		// test if the url contains multiple extensions
-		const matches = url.match(/\[([^\]\[]+\|.+)\]$/);
-		if (matches) {
-			const extensions = matches[1].split("|");
-			let extension = extensions[0];
-			for (const ext of extensions) {
-				if (ToneAudioBuffer.supportsType(ext)) {
-					extension = ext;
-					break;
-				}
-			}
-			url = url.replace(matches[0], extension);
-		}
-
 		// make sure there is a slash between the baseUrl and the url
 		const baseUrl =
 			ToneAudioBuffer.baseUrl === "" ||
@@ -393,15 +379,7 @@ export class ToneAudioBuffer extends Tone {
 				? ToneAudioBuffer.baseUrl
 				: ToneAudioBuffer.baseUrl + "/";
 
-		// encode special characters in file path
-		const location = document.createElement("a");
-		location.href = baseUrl + url;
-		location.pathname = (location.pathname + location.hash)
-			.split("/")
-			.map(encodeURIComponent)
-			.join("/");
-
-		const response = await fetch(location.href);
+		const response = await fetch(baseUrl + url);
 		if (!response.ok) {
 			throw new Error(`could not load url: ${url}`);
 		}
diff --git a/package-lock.json b/package-lock.json
index 7a52ded5..73c191fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "tone",
-	"version": "15.0.0",
+	"version": "15.1.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "tone",
-			"version": "15.0.0",
+			"version": "15.1.0",
 			"license": "MIT",
 			"dependencies": {
 				"standardized-audio-context": "^25.3.70",
diff --git a/package.json b/package.json
index 48635227..f6c48107 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "tone",
-	"version": "15.0.0",
+	"version": "15.1.0",
 	"description": "A Web Audio framework for making interactive music in the browser.",
 	"type": "module",
 	"main": "build/esm/index.js",
diff --git a/test/audio/name with space.wav b/test/audio/name with space.wav
new file mode 100644
index 0000000000000000000000000000000000000000..a66b5c18c665b3dca446ae74de699aedc3d88233
GIT binary patch
literal 264646
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

literal 0
HcmV?d00001