Fix double encoding URI components in ToneAudioBuffer

Tone/core/context/ToneAudioBuffer.ts

@@ -5,6 +5,7 @@ import { optionsFromArguments } from "../util/Defaults";
 import { noOp } from "../util/Interface";
 import { isArray, isNumber, isString } from "../util/TypeCheck";
 import { assert } from "../util/Debug";
+import { encodeUnencodedURIComponent } from "../util/URI";
 
 interface ToneAudioBufferOptions {
 	url?: string | AudioBuffer | ToneAudioBuffer;
@@ -398,7 +399,7 @@ export class ToneAudioBuffer extends Tone {
 		location.href = baseUrl + url;
 		location.pathname = (location.pathname + location.hash)
 				.split("/")
-				.map(encodeURIComponent)
+				.map(encodeUnencodedURIComponent)
 				.join("/");
 
 		const response = await fetch(location.href);

Tone/core/util/URI.test.ts

@@ -0,0 +1,21 @@
+import { expect } from "chai";
+import { encodeUnencodedURIComponent } from "./URI";
+
+describe("URI", () => {
+	it("can encode a URI component without double-encoding", () => {
+		expect(encodeUnencodedURIComponent("")).to.equal("");
+		expect(encodeUnencodedURIComponent(" ")).to.equal("%20");
+		expect(encodeUnencodedURIComponent("%20")).to.equal("%20");
+		expect(encodeUnencodedURIComponent("%20 ")).to.equal("%20 "); // partially encoded strings are not encoded
+		expect(encodeUnencodedURIComponent("a")).to.equal("a");
+		expect(encodeUnencodedURIComponent("a%20b")).to.equal("a%20b");
+		expect(encodeUnencodedURIComponent("a b")).to.equal("a%20b");
+		expect(encodeUnencodedURIComponent("a+b")).to.equal("a%2Bb");
+		expect(encodeUnencodedURIComponent("a%2b")).to.equal("a%2b");
+		expect(encodeUnencodedURIComponent("something\t\telse")).to.equal("something%09%09else");
+		expect(encodeUnencodedURIComponent("something%09%09else")).to.equal("something%09%09else");
+		// Based on URL from issue reporter
+		const exampleUrl = "https://some.domain.com/v0/b/test.appspot.com/o/MyFolder%2FmusicInC%23ornot.mp3?alt=media&token=qwer123-qwer-asdf-1234-asdf324234";
+		expect(encodeUnencodedURIComponent(exampleUrl)).to.equal(exampleUrl);
+	});
+});

Tone/core/util/URI.ts

@@ -0,0 +1,14 @@
+const isURIComponentEncoded = (uriComponent: string): boolean =>
+	decodeURIComponent(uriComponent) !== uriComponent;
+
+/**
+ * Encodes via `encodeURIComponent` only if the given string is not encoded.
+ * If the given string is already encoded, it will be returned as is.
+ *
+ * Note that this will not encode a partially encoded string such as `'%20 '`.
+ *
+ * @param uriComponent The URI component to encode
+ */
+export const encodeUnencodedURIComponent = (uriComponent: string): string => {
+	return isURIComponentEncoded(uriComponent) ? uriComponent : encodeURIComponent(uriComponent);
+};