@eyepop.ai/eyepop 1.11.4 → 1.11.6

package/dist/eyepop.index.d.mts

@@ -861,6 +861,7 @@ declare abstract class WebrtcBase {
     constructor(getSession: () => Promise<WorkerSession>, client: HttpClient, ingressId: string, urlBasePath: string, requestLogger: Logger);
     close(): Promise<void>;
     ingressId(): string;
+    protected gresUrl(session: WorkerSession, location?: string | null): URL;
     protected onLocalOffer(offer: RTCSessionDescriptionInit): Promise<WebrtcBase>;
     protected abstract onRemoteAnswer(answer: RTCSessionDescription): Promise<WebrtcBase>;
     protected sendLocalCandidates(candidates: RTCIceCandidate[]): Promise<WebrtcBase>;

package/dist/eyepop.index.d.ts

@@ -861,6 +861,7 @@ declare abstract class WebrtcBase {
     constructor(getSession: () => Promise<WorkerSession>, client: HttpClient, ingressId: string, urlBasePath: string, requestLogger: Logger);
     close(): Promise<void>;
     ingressId(): string;
+    protected gresUrl(session: WorkerSession, location?: string | null): URL;
     protected onLocalOffer(offer: RTCSessionDescriptionInit): Promise<WebrtcBase>;
     protected abstract onRemoteAnswer(answer: RTCSessionDescription): Promise<WebrtcBase>;
     protected sendLocalCandidates(candidates: RTCIceCandidate[]): Promise<WebrtcBase>;

package/dist/eyepop.index.js

@@ -9192,6 +9192,21 @@ var WebrtcBase = class _WebrtcBase {
   ingressId() {
     return this._ingressId;
   }
+  gresUrl(session, location = null) {
+    let urlPath;
+    if (location) {
+      urlPath = import_path.default.join(this._urlPath, location);
+    } else {
+      urlPath = this._urlPath;
+    }
+    let baseUrl;
+    if (session.baseUrl?.endsWith("/")) {
+      baseUrl = session.baseUrl;
+    } else {
+      baseUrl = session.baseUrl + "/";
+    }
+    return new URL(urlPath, baseUrl);
+  }
   async onLocalOffer(offer) {
     if (!this._pc) {
       throw new Error("onLocalOffer no peer connection");
@@ -9202,7 +9217,7 @@ var WebrtcBase = class _WebrtcBase {
     this._offerData = _WebrtcBase.parseOffer(offer.sdp);
     await this._pc.setLocalDescription(offer);
     const session = await this._getSession();
-    const ingressUrl = new URL(this._urlPath, session.baseUrl);
+    const ingressUrl = this.gresUrl(session);
     this._requestLogger.debug("before POST: %s", ingressUrl);
     const headers = {
       ...session.authenticationHeaders(),
@@ -9231,12 +9246,7 @@ var WebrtcBase = class _WebrtcBase {
     }
     let urlPath = void 0;
     const session = await this._getSession();
-    if (this._location) {
-      urlPath = import_path.default.join(this._urlPath, this._location);
-    } else {
-      urlPath = this._urlPath;
-    }
-    const ingressUrl = new URL(urlPath, session.baseUrl);
+    const ingressUrl = this.gresUrl(session, this._location);
     this._requestLogger.debug("before PATCH: %s", ingressUrl);
     const headers = {
       ...session.authenticationHeaders(),
@@ -9413,12 +9423,12 @@ var WebrtcBase = class _WebrtcBase {
 // worker/webrtc_whip.ts
 var WebrtcWhip = class extends WebrtcBase {
   constructor(stream, getSession, client, requestLogger) {
-    super(getSession, client, (0, import_uuid.v4)().toString(), "/liveIngress/whip", requestLogger);
+    super(getSession, client, (0, import_uuid.v4)().toString(), "liveIngress/whip", requestLogger);
     this._stream = stream;
   }
   async start() {
     const session = await this._getSession();
-    const ingressUrl = new URL(this._urlPath, session.baseUrl);
+    const ingressUrl = this.gresUrl(session);
     this._requestLogger.debug("before GET: %s", ingressUrl);
     const response = await this._client.fetch(ingressUrl, {
       headers: session.authenticationHeaders(),
@@ -9496,7 +9506,7 @@ var WebrtcWhip = class extends WebrtcBase {
 // worker/webrtc_whep.ts
 var WebrtcWhep = class extends WebrtcBase {
   constructor(ingressId, getSession, client, requestLogger) {
-    super(getSession, client, ingressId, "/liveIngress/whep", requestLogger);
+    super(getSession, client, ingressId, "liveIngress/whep", requestLogger);
     this._stream = null;
   }
   async close() {
@@ -9519,7 +9529,7 @@ var WebrtcWhep = class extends WebrtcBase {
   }
   async start() {
     const session = await this._getSession();
-    const egressUrl = new URL(this._urlPath, session.baseUrl);
+    const egressUrl = this.gresUrl(session);
     this._requestLogger.debug("before GET: %s", egressUrl);
     const response = await this._client.fetch(egressUrl, {
       headers: session.authenticationHeaders(),
@@ -9633,8 +9643,7 @@ if ("document" in globalThis && "implementation" in globalThis.document) {
     console.debug("EyePop: creating HttpClient in browser");
     return new BrowserHttpClient();
   };
-}
-if (typeof navigator !== "undefined" && navigator.product === "ReactNative") {
+} else if (typeof navigator !== "undefined" && navigator.product === "ReactNative") {
   class ReactNativeHttpClient {
     constructor() {
     }