rx-player 3.29.0-dev.2022091600 → 3.29.0-dev.2022103100

package/src/transports/types.ts

@@ -23,6 +23,7 @@ import Manifest, {
   Period,
   Representation,
 } from "../manifest";
+import { ICdnMetadata } from "../parsers/manifest";
 import {
   IBifThumbnail,
   ILoadedManifestFormat,
@@ -52,6 +53,7 @@ export type ITransportFunction = (options : ITransportOptions) =>
 export interface ITransportPipelines {
   /** Functions allowing to load an parse the Manifest for this transport. */
   manifest : ITransportManifestPipeline;
+
   /** Functions allowing to load an parse audio segments. */
   audio : ISegmentPipeline<ILoadedAudioVideoSegmentFormat,
                            Uint8Array | ArrayBuffer | null>;
@@ -222,8 +224,9 @@ export interface ISegmentPipeline<
 
 /**
  * Segment loader function, allowing to load a segment of any type.
- * @param {string|null} url - URL at which the segment should be downloaded.
- * `null` if we do not have an URL (in which case the segment should be loaded
+ * @param {string|null} wantedCdn - CDN metadata for the CDN on which the
+ * segment should be downloaded.
+ * `null` if we do not have such CDN (in which case the segment should be loaded
  * through other means, such as information taken from the segment's content).
  * @param {Object} content - Content linked to the wanted segment.
  * @param {CancellationSignal} cancelSignal - Cancellation signal which will
@@ -237,7 +240,7 @@ export interface ISegmentPipeline<
  * the segment.
  */
 export type ISegmentLoader<TLoadedFormat> = (
-  url : string | null,
+  wantedCdn : ICdnMetadata | null,
   content : ISegmentContext,
   options : ISegmentLoaderOptions,
   cancelSignal : CancellationSignal,

package/src/utils/__tests__/event_emitter.test.ts

@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
 import { take } from "rxjs";
 import log from "../../log";
 import EventEmitter, {
@@ -32,9 +37,9 @@ describe("utils - EventEmitter", () => {
     });
 
     expect(wasCalled).toEqual(0);
-    eventEmitter.trigger("something", undefined);
+    (eventEmitter as any).trigger("something", undefined);
     expect(wasCalled).toEqual(1);
-    eventEmitter.trigger("nope", undefined);
+    (eventEmitter as any).trigger("nope", undefined);
     expect(wasCalled).toEqual(1);
     eventEmitter.removeEventListener();
   });
@@ -59,33 +64,33 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString).toEqual(0);
     expect(wasCalledWithObject).toEqual(0);
 
-    eventEmitter.trigger("something", undefined);
+    (eventEmitter as any).trigger("something", undefined);
     expect(wasCalledWithString).toEqual(0);
     expect(wasCalledWithObject).toEqual(0);
 
-    eventEmitter.trigger("something", "a");
+    (eventEmitter as any).trigger("something", "a");
     expect(wasCalledWithString).toEqual(1);
     expect(wasCalledWithObject).toEqual(0);
 
-    eventEmitter.trigger("nope", undefined);
+    (eventEmitter as any).trigger("nope", undefined);
     expect(wasCalledWithString).toEqual(1);
     expect(wasCalledWithObject).toEqual(0);
 
-    eventEmitter.trigger("nope", undefined);
+    (eventEmitter as any).trigger("nope", undefined);
     expect(wasCalledWithString).toEqual(1);
     expect(wasCalledWithObject).toEqual(0);
 
-    eventEmitter.trigger("something", { a: "b" });
+    (eventEmitter as any).trigger("something", { a: "b" });
     expect(wasCalledWithString).toEqual(1);
     expect(wasCalledWithObject).toEqual(1);
 
-    eventEmitter.trigger("something", "a");
-    eventEmitter.trigger("something", "a");
-    eventEmitter.trigger("something", "a");
+    (eventEmitter as any).trigger("something", "a");
+    (eventEmitter as any).trigger("something", "a");
+    (eventEmitter as any).trigger("something", "a");
     expect(wasCalledWithString).toEqual(4);
     expect(wasCalledWithObject).toEqual(1);
 
-    eventEmitter.trigger("nope", undefined);
+    (eventEmitter as any).trigger("nope", undefined);
     expect(wasCalledWithString).toEqual(4);
     expect(wasCalledWithObject).toEqual(1);
     eventEmitter.removeEventListener();
@@ -111,38 +116,38 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString).toEqual(0);
     expect(wasCalledWithObject).toEqual(0);
 
-    eventEmitter.trigger("something", undefined);
+    (eventEmitter as any).trigger("something", undefined);
     expect(wasCalledWithString).toEqual(0);
     expect(wasCalledWithObject).toEqual(0);
 
-    eventEmitter.trigger("something", "a");
+    (eventEmitter as any).trigger("something", "a");
     expect(wasCalledWithString).toEqual(1);
     expect(wasCalledWithObject).toEqual(0);
 
-    eventEmitter.trigger("nope", undefined);
+    (eventEmitter as any).trigger("nope", undefined);
     expect(wasCalledWithString).toEqual(1);
     expect(wasCalledWithObject).toEqual(0);
 
-    eventEmitter.trigger("nope", "a");
+    (eventEmitter as any).trigger("nope", "a");
     expect(wasCalledWithString).toEqual(2);
     expect(wasCalledWithObject).toEqual(0);
 
-    eventEmitter.trigger("something", { a: "b" });
+    (eventEmitter as any).trigger("something", { a: "b" });
     expect(wasCalledWithString).toEqual(2);
     expect(wasCalledWithObject).toEqual(1);
 
     eventEmitter.removeEventListener("something", callback);
-    eventEmitter.trigger("something", "a");
-    eventEmitter.trigger("something", "a");
-    eventEmitter.trigger("something", "a");
+    (eventEmitter as any).trigger("something", "a");
+    (eventEmitter as any).trigger("something", "a");
+    (eventEmitter as any).trigger("something", "a");
     expect(wasCalledWithString).toEqual(2);
     expect(wasCalledWithObject).toEqual(1);
 
-    eventEmitter.trigger("nope", undefined);
+    (eventEmitter as any).trigger("nope", undefined);
     expect(wasCalledWithString).toEqual(2);
     expect(wasCalledWithObject).toEqual(1);
 
-    eventEmitter.trigger("nope", "a");
+    (eventEmitter as any).trigger("nope", "a");
     expect(wasCalledWithString).toEqual(3);
     expect(wasCalledWithObject).toEqual(1);
     eventEmitter.removeEventListener();
@@ -192,7 +197,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(0);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("something", undefined);
+    (eventEmitter as any).trigger("something", undefined);
     expect(wasCalledWithString1).toEqual(0);
     expect(wasCalledWithObject1).toEqual(0);
     expect(wasCalledWithString2).toEqual(0);
@@ -200,7 +205,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(0);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("something", "a");
+    (eventEmitter as any).trigger("something", "a");
     expect(wasCalledWithString1).toEqual(1);
     expect(wasCalledWithObject1).toEqual(0);
     expect(wasCalledWithString2).toEqual(1);
@@ -216,7 +221,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(0);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("something", "a");
+    (eventEmitter as any).trigger("something", "a");
     expect(wasCalledWithString1).toEqual(2);
     expect(wasCalledWithObject1).toEqual(0);
     expect(wasCalledWithString2).toEqual(2);
@@ -224,7 +229,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(1);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("nope", undefined);
+    (eventEmitter as any).trigger("nope", undefined);
     expect(wasCalledWithString1).toEqual(2);
     expect(wasCalledWithObject1).toEqual(0);
     expect(wasCalledWithString2).toEqual(2);
@@ -232,7 +237,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(1);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("nope", "a");
+    (eventEmitter as any).trigger("nope", "a");
     expect(wasCalledWithString1).toEqual(3);
     expect(wasCalledWithObject1).toEqual(0);
     expect(wasCalledWithString2).toEqual(2);
@@ -240,7 +245,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(2);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("something", { a: "b" });
+    (eventEmitter as any).trigger("something", { a: "b" });
     expect(wasCalledWithString1).toEqual(3);
     expect(wasCalledWithObject1).toEqual(1);
     expect(wasCalledWithString2).toEqual(2);
@@ -256,7 +261,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(2);
     expect(wasCalledWithObject3).toEqual(1);
 
-    eventEmitter.trigger("something", { a: "b" });
+    (eventEmitter as any).trigger("something", { a: "b" });
     expect(wasCalledWithString1).toEqual(3);
     expect(wasCalledWithObject1).toEqual(2);
     expect(wasCalledWithString2).toEqual(2);
@@ -264,7 +269,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(2);
     expect(wasCalledWithObject3).toEqual(2);
 
-    eventEmitter.trigger("nope", { a: "b" });
+    (eventEmitter as any).trigger("nope", { a: "b" });
     expect(wasCalledWithString1).toEqual(3);
     expect(wasCalledWithObject1).toEqual(3);
     expect(wasCalledWithString2).toEqual(2);
@@ -320,7 +325,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(0);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("something", undefined);
+    (eventEmitter as any).trigger("something", undefined);
     expect(wasCalledWithString1).toEqual(0);
     expect(wasCalledWithObject1).toEqual(0);
     expect(wasCalledWithString2).toEqual(0);
@@ -328,7 +333,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(0);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("something", "a");
+    (eventEmitter as any).trigger("something", "a");
     expect(wasCalledWithString1).toEqual(1);
     expect(wasCalledWithObject1).toEqual(0);
     expect(wasCalledWithString2).toEqual(1);
@@ -344,7 +349,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(0);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("something", "a");
+    (eventEmitter as any).trigger("something", "a");
     expect(wasCalledWithString1).toEqual(2);
     expect(wasCalledWithObject1).toEqual(0);
     expect(wasCalledWithString2).toEqual(2);
@@ -352,7 +357,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(1);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("nope", undefined);
+    (eventEmitter as any).trigger("nope", undefined);
     expect(wasCalledWithString1).toEqual(2);
     expect(wasCalledWithObject1).toEqual(0);
     expect(wasCalledWithString2).toEqual(2);
@@ -360,7 +365,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(1);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("nope", "a");
+    (eventEmitter as any).trigger("nope", "a");
     expect(wasCalledWithString1).toEqual(3);
     expect(wasCalledWithObject1).toEqual(0);
     expect(wasCalledWithString2).toEqual(2);
@@ -368,7 +373,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(2);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("something", { a: "b" });
+    (eventEmitter as any).trigger("something", { a: "b" });
     expect(wasCalledWithString1).toEqual(3);
     expect(wasCalledWithObject1).toEqual(1);
     expect(wasCalledWithString2).toEqual(2);
@@ -384,7 +389,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(2);
     expect(wasCalledWithObject3).toEqual(1);
 
-    eventEmitter.trigger("something", { a: "b" });
+    (eventEmitter as any).trigger("something", { a: "b" });
     expect(wasCalledWithString1).toEqual(3);
     expect(wasCalledWithObject1).toEqual(1);
     expect(wasCalledWithString2).toEqual(2);
@@ -392,7 +397,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(2);
     expect(wasCalledWithObject3).toEqual(1);
 
-    eventEmitter.trigger("nope", { a: "b" });
+    (eventEmitter as any).trigger("nope", { a: "b" });
     expect(wasCalledWithString1).toEqual(3);
     expect(wasCalledWithObject1).toEqual(2);
     expect(wasCalledWithString2).toEqual(2);
@@ -448,7 +453,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(0);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("something", undefined);
+    (eventEmitter as any).trigger("something", undefined);
     expect(wasCalledWithString1).toEqual(0);
     expect(wasCalledWithObject1).toEqual(0);
     expect(wasCalledWithString2).toEqual(0);
@@ -456,7 +461,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(0);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("something", "a");
+    (eventEmitter as any).trigger("something", "a");
     expect(wasCalledWithString1).toEqual(1);
     expect(wasCalledWithObject1).toEqual(0);
     expect(wasCalledWithString2).toEqual(1);
@@ -472,7 +477,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(0);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("something", "a");
+    (eventEmitter as any).trigger("something", "a");
     expect(wasCalledWithString1).toEqual(2);
     expect(wasCalledWithObject1).toEqual(0);
     expect(wasCalledWithString2).toEqual(2);
@@ -480,7 +485,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(1);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("nope", undefined);
+    (eventEmitter as any).trigger("nope", undefined);
     expect(wasCalledWithString1).toEqual(2);
     expect(wasCalledWithObject1).toEqual(0);
     expect(wasCalledWithString2).toEqual(2);
@@ -488,7 +493,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(1);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("nope", "a");
+    (eventEmitter as any).trigger("nope", "a");
     expect(wasCalledWithString1).toEqual(3);
     expect(wasCalledWithObject1).toEqual(0);
     expect(wasCalledWithString2).toEqual(2);
@@ -496,7 +501,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(2);
     expect(wasCalledWithObject3).toEqual(0);
 
-    eventEmitter.trigger("something", { a: "b" });
+    (eventEmitter as any).trigger("something", { a: "b" });
     expect(wasCalledWithString1).toEqual(3);
     expect(wasCalledWithObject1).toEqual(1);
     expect(wasCalledWithString2).toEqual(2);
@@ -512,7 +517,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(2);
     expect(wasCalledWithObject3).toEqual(1);
 
-    eventEmitter.trigger("something", { a: "b" });
+    (eventEmitter as any).trigger("something", { a: "b" });
     expect(wasCalledWithString1).toEqual(3);
     expect(wasCalledWithObject1).toEqual(1);
     expect(wasCalledWithString2).toEqual(2);
@@ -520,7 +525,7 @@ describe("utils - EventEmitter", () => {
     expect(wasCalledWithString3).toEqual(2);
     expect(wasCalledWithObject3).toEqual(1);
 
-    eventEmitter.trigger("nope", { a: "b" });
+    (eventEmitter as any).trigger("nope", { a: "b" });
     expect(wasCalledWithString1).toEqual(3);
     expect(wasCalledWithObject1).toEqual(1);
     expect(wasCalledWithString2).toEqual(2);
@@ -568,7 +573,7 @@ describe("utils - EventEmitter", () => {
     eventEmitter.addEventListener("t", cb);
 
     expect(spy).toHaveBeenCalledTimes(0);
-    eventEmitter.trigger("t", undefined);
+    (eventEmitter as any).trigger("t", undefined);
 
     expect(spy).toHaveBeenCalledTimes(1);
     expect(spy).toHaveBeenCalledWith(errMessage, thrownErr);
@@ -595,23 +600,23 @@ describe("utils - fromEvent", () => {
           }
         },
         complete() {
-          eventEmitter.trigger("fooba", 6);
+          (eventEmitter as any).trigger("fooba", 6);
           expect(numberItemsReceived).toBe(2);
           expect(stringItemsReceived).toBe(3);
           done();
         },
       });
 
-    eventEmitter.trigger("test", undefined);
-    eventEmitter.trigger("fooba", undefined);
-    eventEmitter.trigger("fooba", 5);
-    eventEmitter.trigger("fooba", "a");
-    eventEmitter.trigger("test", undefined);
-    eventEmitter.trigger("test", undefined);
-    eventEmitter.trigger("test", undefined);
-    eventEmitter.trigger("fooba", "b");
-    eventEmitter.trigger("fooba", "c");
-    eventEmitter.trigger("fooba", 6);
+    (eventEmitter as any).trigger("test", undefined);
+    (eventEmitter as any).trigger("fooba", undefined);
+    (eventEmitter as any).trigger("fooba", 5);
+    (eventEmitter as any).trigger("fooba", "a");
+    (eventEmitter as any).trigger("test", undefined);
+    (eventEmitter as any).trigger("test", undefined);
+    (eventEmitter as any).trigger("test", undefined);
+    (eventEmitter as any).trigger("fooba", "b");
+    (eventEmitter as any).trigger("fooba", "c");
+    (eventEmitter as any).trigger("fooba", 6);
   });
 
   it("should remove the event listener on unsubscription", () => {
@@ -631,17 +636,17 @@ describe("utils - fromEvent", () => {
         }
       });
 
-    eventEmitter.trigger("test", undefined);
-    eventEmitter.trigger("fooba", undefined);
-    eventEmitter.trigger("fooba", 5);
-    eventEmitter.trigger("fooba", "a");
+    (eventEmitter as any).trigger("test", undefined);
+    (eventEmitter as any).trigger("fooba", undefined);
+    (eventEmitter as any).trigger("fooba", 5);
+    (eventEmitter as any).trigger("fooba", "a");
     subscription.unsubscribe();
-    eventEmitter.trigger("test", undefined);
-    eventEmitter.trigger("test", undefined);
-    eventEmitter.trigger("test", undefined);
-    eventEmitter.trigger("fooba", "b");
-    eventEmitter.trigger("fooba", "c");
-    eventEmitter.trigger("fooba", 6);
+    (eventEmitter as any).trigger("test", undefined);
+    (eventEmitter as any).trigger("test", undefined);
+    (eventEmitter as any).trigger("test", undefined);
+    (eventEmitter as any).trigger("fooba", "b");
+    (eventEmitter as any).trigger("fooba", "c");
+    (eventEmitter as any).trigger("fooba", 6);
 
     expect(stringItemsReceived).toBe(1);
     expect(numberItemsReceived).toBe(1);

package/src/utils/__tests__/initialization_segment_cache.test.ts

@@ -40,11 +40,11 @@ const representation2 = {
 const initSegment1 = {
   id: "init1",
   isInit: true,
+  url: "some.URLinit1",
   time: 0,
   end: 0,
   duration: 0,
   timescale: 1 as const,
-  mediaURLs: ["http://www.example.com/some.URLinit1"],
   complete: true,
   privateInfos: {},
 };
@@ -52,11 +52,11 @@ const initSegment1 = {
 const initSegment2 = {
   id: "init2",
   isInit: true,
+  url: "some.URLinit2",
   time: 0,
   end: 0,
   duration: 0,
   timescale: 1 as const,
-  mediaURLs: ["http://www.example.com/some.URLinit2"],
   complete: true,
   privateInfos: {},
 };
@@ -64,11 +64,11 @@ const initSegment2 = {
 const initSegment3 = {
   id: "init3",
   isInit: true,
+  url: "some.URLinit3",
   time: 0,
   end: 0,
   duration: 0,
   timescale: 1 as const,
-  mediaURLs: ["http://www.example.com/some.URLinit3"],
   complete: true,
   privateInfos: {},
 };
@@ -76,11 +76,11 @@ const initSegment3 = {
 const segment1 = {
   id: "seg1",
   isInit: false,
+  url: "some.URL1",
   time: 0,
   duration: 2,
   end: 2,
   timescale: 1 as const,
-  mediaURLs: ["http://www.example.com/some.URL2"],
   complete: true,
   privateInfos: {},
 };
@@ -88,11 +88,11 @@ const segment1 = {
 const segment2 = {
   id: "seg2",
   isInit: false,
+  url: "some.URL2",
   time: 2,
   duration: 2,
   end: 4,
   timescale: 1 as const,
-  mediaURLs: ["http://www.example.com/some.URL2"],
   complete: true,
   privateInfos: {},
 };
@@ -100,11 +100,11 @@ const segment2 = {
 const segment3 = {
   id: "seg3",
   isInit: false,
+  url: "some.URL3",
   time: 4,
   duration: 2,
   end: 6,
   timescale: 1 as const,
-  mediaURLs: ["http://www.example.com/some.URL3"],
   complete: true,
   privateInfos: {},
 };
@@ -112,11 +112,11 @@ const segment3 = {
 const segment4 = {
   id: "seg4",
   isInit: false,
+  url: "some.URL4",
   time: 6,
   duration: 2,
   end: 8,
   timescale: 1 as const,
-  mediaURLs: ["http://www.example.com/some.URL4"],
   complete: true,
   privateInfos: {},
 };

package/src/utils/__tests__/resolve_url.test.ts

@@ -15,7 +15,7 @@
  */
 
 import resolveURL, {
-  normalizeBaseURL,
+  getFilenameIndexInUrl,
 } from "../resolve_url";
 
 describe("utils - resolveURL", () => {
@@ -66,31 +66,35 @@ describe("utils - resolveURL", () => {
   });
 });
 
-describe("utils - normalizeBaseURL", () => {
-  it("should do nothing if there is no / in the given string", () => {
-    expect(normalizeBaseURL(";.<;L'dl'02984lirsahg;oliwr"))
-      .toBe(";.<;L'dl'02984lirsahg;oliwr");
+describe("utils - getFilenameIndexInUrl", () => {
+  it("should return the length for a string without slash", () => {
+    const str = ";.<;L'dl'02984lirsahg;oliwr";
+    expect(getFilenameIndexInUrl(str))
+      .toEqual(str.length);
   });
-  it("should remove the content of a string after the last /", () => {
-    expect(normalizeBaseURL(";ojdsfgje/eprowig/tohjroj/9ohyjwoij/s"))
-      .toBe(";ojdsfgje/eprowig/tohjroj/9ohyjwoij/");
+  it("should return the index after the last / if one in URL", () => {
+    expect(getFilenameIndexInUrl(";ojdsfgje/eprowig/tohjroj/9ohyjwoij/s"))
+      .toEqual(36);
   });
-  it("should do nothing if the only slash are part of the protocol", () => {
-    expect(normalizeBaseURL("http://www.example.com"))
-      .toBe("http://www.example.com");
-    expect(normalizeBaseURL("https://a.t"))
-      .toBe("https://a.t");
-    expect(normalizeBaseURL("ftp://s"))
-      .toBe("ftp://s");
+  it("should return length if the only slash are part of the protocol", () => {
+    const url1 = "http://www.example.com";
+    expect(getFilenameIndexInUrl(url1))
+      .toEqual(url1.length);
+    const url2 = "https://a.t";
+    expect(getFilenameIndexInUrl(url2))
+      .toEqual(url2.length);
+    const url3 = "ftp://s";
+    expect(getFilenameIndexInUrl(url3))
+      .toEqual(url3.length);
   });
   it("should not include slash coming in query parameters", () => {
-    expect(normalizeBaseURL("http://www.example.com?test/toto"))
-      .toBe("http://www.example.com");
-    expect(normalizeBaseURL("https://ww/ddd?test/toto/efewf/ffe/"))
-      .toBe("https://ww/");
-    expect(normalizeBaseURL("https://ww/rr/d?test/toto/efewf/ffe/"))
-      .toBe("https://ww/rr/");
-    expect(normalizeBaseURL("https://ww/rr/d/?test/toto/efewf/ffe/"))
-      .toBe("https://ww/rr/d/");
+    expect(getFilenameIndexInUrl("http://www.example.com?test/toto"))
+      .toEqual(22);
+    expect(getFilenameIndexInUrl("https://ww/ddd?test/toto/efewf/ffe/"))
+      .toEqual(11);
+    expect(getFilenameIndexInUrl("https://ww/rr/d?test/toto/efewf/ffe/"))
+      .toEqual(14);
+    expect(getFilenameIndexInUrl("https://ww/rr/d/?test/toto/efewf/ffe/"))
+      .toEqual(16);
   });
 });

package/src/utils/event_emitter.ts

@@ -29,8 +29,6 @@ export interface IEventEmitter<T> {
   removeEventListener<TEventName extends keyof T>(evt : TEventName,
                                                   fn : IListener<T, TEventName>) :
                                                    void;
-  trigger?<TEventName extends keyof T>(evt : TEventName,
-                                       arg : IArgs<T, TEventName>) : void;
 }
 
 // Type of the argument in the listener's callback
@@ -131,7 +129,7 @@ export default class EventEmitter<T> implements IEventEmitter<T> {
    * @param {*} arg - The eventual payload for that event. All triggered
    * callbacks will recieve this payload as argument.
    */
-  public trigger<TEventName extends keyof T>(
+  protected trigger<TEventName extends keyof T>(
     evt : TEventName,
     arg : IArgs<T, TEventName>
   ) : void {

package/src/utils/resolve_url.ts

@@ -91,14 +91,17 @@ export default function resolveURL(...args : Array<string|undefined>) : string {
 }
 
 /**
- * Remove string after the last '/'.
+ * In a given URL, find the index at which the filename begins.
+ * That is, this function finds the index of the last `/` character and returns
+ * the index after it, returning the length of the whole URL if no `/` was found
+ * after the scheme (i.e. in `http://`, the slashes are not considered).
  * @param {string} url
- * @returns {string}
+ * @returns {number}
  */
-function normalizeBaseURL(url : string) : string {
+function getFilenameIndexInUrl(url : string) : number {
   const indexOfLastSlash = url.lastIndexOf("/");
   if (indexOfLastSlash < 0) {
-    return url;
+    return url.length;
   }
 
   if (schemeRe.test(url)) {
@@ -106,7 +109,7 @@ function normalizeBaseURL(url : string) : string {
     if (firstSlashIndex >= 0 && indexOfLastSlash === firstSlashIndex + 1) {
       // The "/" detected is actually the one from the protocol part of the URL
       // ("https://")
-      return url;
+      return url.length;
     }
   }
 
@@ -114,10 +117,10 @@ function normalizeBaseURL(url : string) : string {
   if (indexOfQuestionMark >= 0 && indexOfQuestionMark < indexOfLastSlash) {
     // There are query parameters. Let's ignore them and re-run the logic
     // without
-    return normalizeBaseURL(url.substring(0, indexOfQuestionMark));
+    return getFilenameIndexInUrl(url.substring(0, indexOfQuestionMark));
   }
 
-  return url.substring(0, indexOfLastSlash + 1);
+  return indexOfLastSlash + 1;
 }
 
-export { normalizeBaseURL };
+export { getFilenameIndexInUrl };