@eyepop.ai/eyepop 0.13.0 → 0.14.1

package/dist/index.d.mts

@@ -208,7 +208,7 @@ declare class EyePopPlot {
 declare class EyePopSdk {
     private static readonly envSecretKey;
     static defaultAuth: SecretKeyAuth | undefined;
-    static endpoint({ auth, popId, eyepopUrl, autoStart, stopJobs, jobQueueLength, logger, ...opts }?: Options): Endpoint;
+    static endpoint(opts?: Options): Endpoint;
     static plot(context: CanvasRenderingContext2D): EyePopPlot;
 }
 

package/dist/index.d.ts

@@ -208,7 +208,7 @@ declare class EyePopPlot {
 declare class EyePopSdk {
     private static readonly envSecretKey;
     static defaultAuth: SecretKeyAuth | undefined;
-    static endpoint({ auth, popId, eyepopUrl, autoStart, stopJobs, jobQueueLength, logger, ...opts }?: Options): Endpoint;
+    static endpoint(opts?: Options): Endpoint;
     static plot(context: CanvasRenderingContext2D): EyePopPlot;
 }
 

package/dist/index.js

@@ -8619,11 +8619,11 @@ var require_mime_types = __commonJS({
       }
       return exts[0];
     }
-    function lookup(path) {
-      if (!path || typeof path !== "string") {
+    function lookup(path2) {
+      if (!path2 || typeof path2 !== "string") {
         return false;
       }
-      var extension2 = extname("x." + path).toLowerCase().substr(1);
+      var extension2 = extname("x." + path2).toLowerCase().substr(1);
       if (!extension2) {
         return false;
       }
@@ -9313,6 +9313,7 @@ function v4(options, buf, offset) {
 var v4_default = v4;
 
 // src/webrtc_base.ts
+var import_path = __toESM(require("path"));
 var WebrtcBase = class _WebrtcBase {
   constructor(getSession, client, ingressId, urlBasePath, requestLogger) {
     this._getSession = getSession;
@@ -9322,6 +9323,7 @@ var WebrtcBase = class _WebrtcBase {
     this._urlPath = `${urlBasePath}/${this._ingressId}`;
     this._pc = null;
     this._eTag = "";
+    this._location = null;
     this._queuedCandidates = [];
     this._offerData = null;
   }
@@ -9360,6 +9362,7 @@ var WebrtcBase = class _WebrtcBase {
       return Promise.reject(`unknown status code for POST '${ingressUrl}': ${response.status} (${response.statusText})`);
     }
     this._eTag = response.headers.get("ETag") ?? "";
+    this._location = response.headers.get("Location");
     return this.onRemoteAnswer(new RTCSessionDescription({
       type: "answer",
       sdp: await response.text()
@@ -9369,8 +9372,14 @@ var WebrtcBase = class _WebrtcBase {
     if (!this._offerData) {
       throw new Error("sendLocalCandidates no offerData");
     }
+    let urlPath = void 0;
     const session = await this._getSession();
-    const ingressUrl = new URL(this._urlPath, session.baseUrl);
+    if (this._location) {
+      urlPath = import_path.default.join(this._urlPath, this._location);
+    } else {
+      urlPath = this._urlPath;
+    }
+    const ingressUrl = new URL(urlPath, session.baseUrl);
     this._requestLogger.debug("before PATCH: %s", ingressUrl);
     const headers = {
       "Authorization": `Bearer ${session.accessToken}`,
@@ -9545,7 +9554,7 @@ var WebrtcBase = class _WebrtcBase {
 };
 
 // src/webrtc_whip.ts
-var WebrtcWhip = class _WebrtcWhip extends WebrtcBase {
+var WebrtcWhip = class extends WebrtcBase {
   constructor(stream, getSession, client, requestLogger) {
     super(getSession, client, v4_default().toString(), "/liveIngress/whip", requestLogger);
     this._stream = stream;
@@ -9577,17 +9586,6 @@ var WebrtcWhip = class _WebrtcWhip extends WebrtcBase {
     if (!this._pc) {
       throw new Error("onLocalOffer no peer connection");
     }
-    answer = new RTCSessionDescription({
-      type: "answer",
-      sdp: _WebrtcWhip.editAnswer(
-        answer.sdp,
-        "h264/90000",
-        void 0,
-        5e3,
-        void 0,
-        true
-      )
-    });
     await this._pc.setRemoteDescription(new RTCSessionDescription(answer));
     if (this._queuedCandidates.length !== 0) {
       await this.sendLocalCandidates(this._queuedCandidates);
@@ -10034,6 +10032,7 @@ var Endpoint = class {
   }
   async uploadPath(source) {
     if (!this._baseUrl || !this._pipelineId || !this._client || !this._limit) {
+      console.log(this);
       throw new Error("endpoint not connected, use connect() before process()");
     }
     await this._limit.acquire();
@@ -10167,7 +10166,8 @@ var Endpoint = class {
         }
         config = await response.json();
       }
-      this._baseUrl = config.base_url;
+      const baseUrl = new URL(config.base_url, this.eyepopUrl());
+      this._baseUrl = baseUrl.toString();
       this._pipelineId = config.pipeline_id;
       this._popName = config.name;
       this._requestLogger.debug("after GET %s: %s / %s", config_url, this._baseUrl, this._pipelineId);
@@ -10352,46 +10352,60 @@ var readEnv = (env) => {
   return void 0;
 };
 var _EyePopSdk = class _EyePopSdk {
-  static endpoint({
-    auth = this.defaultAuth,
-    popId = readEnv("EYEPOP_POP_ID"),
-    eyepopUrl = readEnv("EYEPOP_URL"),
-    autoStart = true,
-    stopJobs = true,
-    jobQueueLength = 1024,
-    logger,
-    ...opts
-  } = {}) {
-    if (auth.oAuth2 !== void 0 && popId) {
-      if (typeof auth.oAuth2 === "boolean") {
-        auth = {
-          oAuth2: {
-            domain: "eyepop.us.auth0.com",
-            clientId: "Lb9ubA9Hf3jlaqWLUx8XgA0zvotgViCl",
-            audience: "https://api.eyepop.ai",
-            scope: "admin:clouds"
-          }
-        };
+  static endpoint(opts = {}) {
+    if (typeof opts.auth == "undefined") {
+      if (typeof _EyePopSdk.defaultAuth == "undefined") {
+        throw new Error("auth option or EYEPOP_SECRET_KEY environment variable is required");
       }
+      opts.auth = _EyePopSdk.defaultAuth;
+    }
+    if (typeof opts.popId == "undefined") {
+      opts.popId = readEnv("EYEPOP_POP_ID");
+    }
+    if (typeof opts.eyepopUrl == "undefined") {
+      opts.eyepopUrl = readEnv("EYEPOP_URL") || "https://api.eyepop.ai";
+    }
+    if (typeof opts.autoStart == "undefined") {
+      opts.autoStart = true;
+    }
+    if (typeof opts.stopJobs == "undefined") {
+      opts.stopJobs = true;
     }
-    if (auth.session !== void 0) {
-      if (auth.session.popId) {
-        popId = auth.session.popId;
+    if (typeof opts.jobQueueLength == "undefined") {
+      opts.jobQueueLength = 1024;
+    }
+    if (typeof opts.auth.oAuth2 != "undefined" && opts.popId) {
+      if (typeof opts.auth.oAuth2 === "boolean") {
+        if (opts.eyepopUrl.startsWith("https://staging-api.eyepop.ai")) {
+          opts.auth = {
+            oAuth2: {
+              domain: "dev-eyepop.us.auth0.com",
+              clientId: "jktx3YO2UnbkNPvr05PQWf26t1kNTJyg",
+              audience: "https://dev-app.eyepop.ai",
+              scope: "admin:clouds"
+            }
+          };
+        } else {
+          opts.auth = {
+            oAuth2: {
+              domain: "eyepop.us.auth0.com",
+              clientId: "Lb9ubA9Hf3jlaqWLUx8XgA0zvotgViCl",
+              audience: "https://api.eyepop.ai",
+              scope: "admin:clouds"
+            }
+          };
+        }
       }
-      if (auth.session.eyepopUrl) {
-        eyepopUrl = auth.session.eyepopUrl;
+    }
+    if (opts.auth.session !== void 0) {
+      if (opts.auth.session.popId) {
+        opts.popId = opts.auth.session.popId;
+      }
+      if (opts.auth.session.eyepopUrl) {
+        opts.eyepopUrl = opts.auth.session.eyepopUrl;
       }
     }
-    const options = {
-      auth,
-      popId,
-      eyepopUrl: eyepopUrl ?? "https://api.eyepop.ai",
-      autoStart,
-      stopJobs,
-      jobQueueLength,
-      logger
-    };
-    const endpoint = new Endpoint(options);
+    const endpoint = new Endpoint(opts);
     return endpoint;
   }
   static plot(context) {