@eyepop.ai/eyepop 3.9.0 → 3.10.1

package/dist/eyepop.index.mjs

@@ -9016,9 +9016,9 @@ var WebrtcBase = class _WebrtcBase {
     const sections = answer.split("m=");
     for (let i = 0; i < sections.length; i++) {
       const section = sections[i];
-      if (section.startsWith("video")) {
+      if (section && section.startsWith("video")) {
         sections[i] = WebrtcWhip.setVideoBitrate(WebrtcWhip.setCodec(section, videoCodec), videoBitrate);
-      } else if (section.startsWith("audio")) {
+      } else if (section && section.startsWith("audio")) {
         sections[i] = WebrtcWhip.setAudioBitrate(WebrtcWhip.setCodec(section, audioCodec), audioBitrate, audioVoice);
       }
     }
@@ -9057,7 +9057,11 @@ var WebrtcBase = class _WebrtcBase {
   static setVideoBitrate(section, bitrate) {
     let lines = section.split("\r\n");
     for (let i = 0; i < lines.length; i++) {
-      if (lines[i].startsWith("c=")) {
+      const line = lines[i];
+      if (!line) {
+        continue;
+      }
+      if (line.startsWith("c=")) {
         lines = [...lines.slice(0, i + 1), "b=TIAS:" + (bitrate * 1024).toString(), ...lines.slice(i + 1)];
         break;
       }
@@ -9068,8 +9072,12 @@ var WebrtcBase = class _WebrtcBase {
     let opusPayloadFormat = "";
     let lines = section.split("\r\n");
     for (let i = 0; i < lines.length; i++) {
-      if (lines[i].startsWith("a=rtpmap:") && lines[i].toLowerCase().includes("opus/")) {
-        opusPayloadFormat = lines[i].slice("a=rtpmap:".length).split(" ")[0];
+      const line = lines[i];
+      if (!line) {
+        continue;
+      }
+      if (line.startsWith("a=rtpmap:") && line.toLowerCase().includes("opus/")) {
+        opusPayloadFormat = line.slice("a=rtpmap:".length).split(" ")[0] || "";
         break;
       }
     }
@@ -9077,7 +9085,11 @@ var WebrtcBase = class _WebrtcBase {
       return section;
     }
     for (let i = 0; i < lines.length; i++) {
-      if (lines[i].startsWith("a=fmtp:" + opusPayloadFormat + " ")) {
+      const line = lines[i];
+      if (!line) {
+        continue;
+      }
+      if (line.startsWith("a=fmtp:" + opusPayloadFormat + " ")) {
         if (voice) {
           lines[i] = "a=fmtp:" + opusPayloadFormat + " minptime=10;useinbandfec=1;maxaveragebitrate=" + ((bitrate ?? 0) * 1024).toString();
         } else {
@@ -9581,7 +9593,7 @@ var LoadMediaStreamJob = class extends AbstractJob {
       true,
       this._requestLogger
     );
-    whip.start().then((value) => {
+    whip.start().then((_) => {
       this._requestLogger.debug("direct whip for ingressId=%s successful", whip.ingressId());
     }).catch((reason) => {
       this._controller.abort(reason);
@@ -9612,7 +9624,7 @@ var LoadMediaStreamJob = class extends AbstractJob {
 // shims/local_file.ts
 var resolvePath;
 if ("document" in globalThis && "implementation" in globalThis.document) {
-  resolvePath = async (source, logger) => {
+  resolvePath = async (_source, _logger) => {
     throw new DOMException("resolving a path to a file is not supported in browser");
   };
 } else {
@@ -9634,7 +9646,7 @@ if ("document" in globalThis && "implementation" in globalThis.document) {
       yield chunk;
     }
   }
-  resolvePath = async (source, logger) => {
+  resolvePath = async (source, _) => {
     const mime = require_mime_types();
     const filehandle = __require("fs/promises");
     const fd = await filehandle.open(source.path, "r");
@@ -9763,7 +9775,7 @@ var Semaphore = class {
       this.permits -= 1;
       return Promise.resolve(true);
     }
-    let resolver = (b) => void 0;
+    let resolver = (_) => void 0;
     const promise = new Promise((r) => {
       resolver = r;
     });
@@ -9893,7 +9905,7 @@ if ("document" in globalThis && "implementation" in globalThis.document) {
     return session;
   };
 } else {
-  authenticateBrowserSession = (auth0, options) => {
+  authenticateBrowserSession = (_auth0, _options) => {
     return Promise.reject("auth0 login not supported server-side");
   };
 }
@@ -9927,6 +9939,14 @@ var Endpoint = class {
   eyepopUrl() {
     if (this._options.eyepopUrl) {
       return this._options.eyepopUrl.replace(/\/+$/, "");
+    } else {
+      return "https://compute.eyepop.ai";
+    }
+  }
+  // TODO: deprecated Web API endpoint needed for POP_ID support
+  eyepopWebApiUrl() {
+    if (this._options.eyepopUrl) {
+      return this._options.eyepopUrl.replace(/\/+$/, "").replace(/compute\./, "web-api.");
     } else {
       return "https://api.eyepop.ai";
     }
@@ -9974,10 +9994,10 @@ var Endpoint = class {
       this._token = this._options.auth.session.accessToken;
       this._expire_token_time = this._options.auth.session.validUntil / 1e3;
     } else if (this._options.auth.oAuth2 !== void 0) {
-    } else if (this._options.auth.secretKey !== void 0) {
+    } else if (this._options.auth.apiKey !== void 0) {
     } else if (this._options.auth.isLocal !== void 0) {
     } else {
-      return Promise.reject("option secretKey or environment variable EYEPOP_SECRET_KEY is required");
+      return Promise.reject("option apiKey or environment variable EYEPOP_API_KEY is required");
     }
     if (this._options.platformSupport?.createHttpClient !== void 0) {
       this._client = await this._options.platformSupport.createHttpClient(this._requestLogger);
@@ -10009,7 +10029,7 @@ var Endpoint = class {
       validUntil: this._expire_token_time * 1e3
     };
   }
-  statusHandler401(statusCode) {
+  statusHandler401(_statusCode) {
     this._token = null;
     this._expire_token_time = null;
   }
@@ -10072,15 +10092,12 @@ var Endpoint = class {
           const session = await authenticateBrowserSession(this._options.auth.oAuth2, this._options);
           this._token = session.accessToken;
           this._expire_token_time = session.validUntil / 1e3;
-        } else if (this._options.auth.secretKey !== void 0 && this._options.eyepopUrl) {
-          const secretKeyAuth = this._options.auth;
-          const body = { secret_key: secretKeyAuth.secretKey };
-          const headers = { "Content-Type": "application/json" };
-          const post_url = `${this.eyepopUrl()}/authentication/token`;
+        } else if (this._options.auth.apiKey !== void 0 && this._options.eyepopUrl) {
+          const headers = { "Authorization": `Bearer ${this._options.auth.apiKey}` };
+          const post_url = `${this.eyepopUrl()}/v1/auth/authenticate`;
           const response = await this._client.fetch(post_url, {
             method: "POST",
-            headers,
-            body: JSON.stringify(body)
+            headers
           });
           if (response.status != 200) {
             const message = await response.text();
@@ -10109,7 +10126,21 @@ var TransientPopId = /* @__PURE__ */ ((TransientPopId2) => {
 })(TransientPopId || {});
 
 // worker/worker_endpoint.ts
-var WorkerEndpoint = class extends Endpoint {
+var SessionStatus = /* @__PURE__ */ ((SessionStatus2) => {
+  SessionStatus2["UNKNOWN"] = "unknown";
+  SessionStatus2["PENDING"] = "pending";
+  SessionStatus2["RUNNING"] = "running";
+  SessionStatus2["STOPPED"] = "stopped";
+  SessionStatus2["FAILED"] = "failed";
+  SessionStatus2["ERROR"] = "error";
+  SessionStatus2["PIPELINE_CREATING"] = "pipeline_creating";
+  SessionStatus2["PIPELINE_OK"] = "pipeline_ok";
+  SessionStatus2["PIPELINE_CHECKING"] = "pipeline_checking";
+  SessionStatus2["PIPELINE_ERROR"] = "pipeline_error";
+  return SessionStatus2;
+})(SessionStatus || {});
+var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
   constructor(options) {
     super(options);
     this.setStatusRetryHandlers(/* @__PURE__ */ new Map([[404, (statusCode) => this.statusHandler404(statusCode)]]));
@@ -10138,7 +10169,7 @@ var WorkerEndpoint = class extends Endpoint {
     }
     return super.disconnect(wait);
   }
-  statusHandler404(statusCode) {
+  statusHandler404(_) {
     this._pipelineId = null;
     this._baseUrl = null;
   }
@@ -10191,10 +10222,17 @@ var WorkerEndpoint = class extends Endpoint {
     });
     if (response.status != 204) {
       const message = await response.text();
-      return Promise.reject(`Unexpected status ${response.status}: ${message}`);
+      throw new Error(`Unexpected status ${response.status}: ${message}`);
     }
     if (this._pipeline) {
       this._pipeline.pop = pop;
+    } else {
+      this._pipeline = {
+        id: this._pipelineId || "unknown",
+        state: "idle",
+        startTime: (/* @__PURE__ */ new Date()).toString(),
+        pop
+      };
     }
   }
   _authenticationHeaders(session) {
@@ -10414,11 +10452,11 @@ var WorkerEndpoint = class extends Endpoint {
       throw e;
     }
   }
-  jobDone(job) {
+  jobDone(_) {
     this._limit?.release();
     this.updateState();
   }
-  jobStatus(job, statusCode) {
+  jobStatus(_, statusCode) {
     if (statusCode == 404) {
       this.statusHandler404(statusCode);
     } else if (statusCode == 401) {
@@ -10426,15 +10464,20 @@ var WorkerEndpoint = class extends Endpoint {
     }
   }
   async reconnect() {
-    if (!this._client) {
-      return Promise.reject("endpoint not initialized");
-    }
-    let config_url;
     if (this.options().popId == "transient" /* Transient */) {
-      config_url = `${this.eyepopUrl()}/workers/config`;
+      await this.startComputeSession();
+      this._pipelineId = await this.startTransientPipeline();
     } else {
-      config_url = `${this.eyepopUrl()}/pops/${this.options().popId}/config?auto_start=false`;
+      await this.startWebApiSessionWithPopId();
     }
+    this.updateState();
+    return Promise.resolve(this);
+  }
+  async startWebApiSessionWithPopId() {
+    if (!this._client) {
+      throw new Error("endpoint not initialized");
+    }
+    const config_url = `${this.eyepopWebApiUrl()}/pops/${this.options().popId}/config?auto_start=false`;
     const headers = {
       Authorization: await this.authorizationHeader()
     };
@@ -10458,11 +10501,11 @@ var WorkerEndpoint = class extends Endpoint {
       } else {
         this.updateState("Error" /* Error */, message);
       }
-      return Promise.reject(`Unexpected status ${response.status}: ${message}`);
+      throw new Error(`Unexpected status ${response.status}: ${message}`);
     }
     let config = await response.json();
     if (!config.base_url && this.options().autoStart) {
-      const auto_start_config_url = `${this.eyepopUrl()}/pops/${this.options().popId}/config?auto_start=true`;
+      const auto_start_config_url = `${this.eyepopWebApiUrl()}/pops/${this.options().popId}/config?auto_start=true`;
       this._requestLogger.debug("pop was not running, trying to autostart with: %s", auto_start_config_url);
       const headers2 = {
         Authorization: await this.authorizationHeader()
@@ -10473,7 +10516,7 @@ var WorkerEndpoint = class extends Endpoint {
       if (response.status != 200) {
         this.updateState("Error" /* Error */);
         const message = await response.text();
-        return Promise.reject(`Unexpected status ${response.status}: ${message}`);
+        throw new Error(`Unexpected status ${response.status}: ${message}`);
       }
       config = await response.json();
     }
@@ -10481,17 +10524,11 @@ var WorkerEndpoint = class extends Endpoint {
     this._baseUrl = baseUrl.toString();
     if (this._baseUrl) {
       this._baseUrl = this._baseUrl.replace(/\/+$/, "");
-      if (this.options().popId == "transient" /* Transient */) {
-        this._pipelineId = await this.startTransientPipeline();
-        this._popName = this.options().popId || null;
-      } else {
-        this._pipelineId = config.pipeline_id;
-        this._popName = config.name;
-      }
+      this._pipelineId = config.pipeline_id;
+      this._popName = config.name;
       if (!this._pipelineId || !this._baseUrl) {
-        return Promise.reject(`Pop not started`);
+        throw new Error("Pop not started");
       }
-      this._baseUrl = this._baseUrl.replace(/\/+$/, "");
       const get_url = `${this._baseUrl}/pipelines/${this._pipelineId}`;
       const headers2 = {
         Authorization: await this.authorizationHeader()
@@ -10502,7 +10539,7 @@ var WorkerEndpoint = class extends Endpoint {
       });
       if (response2.status > 200) {
         const message = await response2.text();
-        return Promise.reject(`Unexpected status ${response2.status}: ${message}`);
+        throw new Error(`Unexpected status ${response2.status}: ${message}`);
       }
       this._pipeline = await response2.json();
       if (this.options().stopJobs) {
@@ -10519,18 +10556,95 @@ var WorkerEndpoint = class extends Endpoint {
         });
         if (response3.status >= 300) {
           const message = await response3.text();
-          return Promise.reject(`Unexpected status ${response3.status}: ${message}`);
+          throw new Error(`Unexpected status ${response3.status}: ${message}`);
         }
       }
     }
-    this.updateState();
-    return Promise.resolve(this);
+  }
+  async startComputeSession() {
+    if (!this._client) {
+      throw new Error("endpoint not initialized");
+    }
+    let session = null;
+    const sessionsUrl = `${this.eyepopUrl()}/v1/sessions`;
+    this._requestLogger.debug("fetching sessions from: %s", sessionsUrl);
+    const headers = {
+      Authorization: await this.authorizationHeader()
+    };
+    let response = await this._client.fetch(sessionsUrl, {
+      headers
+    });
+    let sessions;
+    if (response.status == 404) {
+      sessions = [];
+    } else if (response.status != 200) {
+      this.updateState("Error" /* Error */);
+      const message = await response.text();
+      throw new Error(`Unexpected status ${response.status} fetching compute sessions: ${message}`);
+    } else {
+      const response_content = await response.json();
+      sessions = response_content;
+    }
+    if (sessions.length > 0) {
+      this._logger.debug(`User has ${sessions.length} sessions, inspecting for active session`);
+      for (let s of sessions) {
+        if (!_WorkerEndpoint.SESSION_DEAD.has(s.session_status)) {
+          session = s;
+          this._logger.debug(`Use active session ${s.session_uuid} with pipeline ${s.pipeline_uuid}`);
+          break;
+        }
+      }
+    }
+    if (!session) {
+      this._requestLogger.debug("creating a new session at: %s", sessionsUrl);
+      response = await this._client.fetch(sessionsUrl, {
+        headers,
+        method: "POST"
+      });
+      if (response.status != 200) {
+        this.updateState("Error" /* Error */);
+        const message = await response.text();
+        throw new Error(`Unexpected status ${response.status} creating a compute session: ${message}`);
+      } else {
+        sessions = await response.json();
+      }
+      if (sessions.length == 0) {
+        throw new Error("Unexpected, no compute session after attempt to create one");
+      }
+      session = sessions[0] || null;
+    }
+    if (!session) {
+      throw new Error("unexpected undefined session");
+    }
+    let isReady = false;
+    const deadline = Date.now() + _WorkerEndpoint.WAIT_FOR_IS_READY;
+    while (!isReady) {
+      const health_url = `${session.session_endpoint}/health`;
+      response = await this._client.fetch(health_url, {
+        headers
+      });
+      if (response.status < 300) {
+        isReady = true;
+      } else if (Date.now() > deadline) {
+        throw new Error(`Created session ${session.session_uuid} did not become healthy after ${_WorkerEndpoint.WAIT_FOR_IS_READY / 1e3} seconds`);
+      } else {
+        this._logger.debug(`session ${session.session_uuid} health check status ${response.status}, wait and poll for update`);
+        await sleep(_WorkerEndpoint.CHECK_FOR_IS_READY_INTERVAL);
+      }
+    }
+    this._baseUrl = session.session_endpoint;
+    this._pipeline = null;
+    if (session.pipeline_uuid) {
+      this._pipelineId = session.pipeline_uuid;
+    } else {
+      this._pipelineId = null;
+    }
   }
   async startTransientPipeline() {
     const client = this._client;
     const baseUrl = this._baseUrl;
     if (client == null || baseUrl == null) {
-      return Promise.reject("endpoint not initialized");
+      throw new Error("endpoint not initialized");
     }
     let pop;
     if (this._pipeline && this._pipeline.pop) {
@@ -10563,12 +10677,22 @@ var WorkerEndpoint = class extends Endpoint {
     });
     if (response.status != 200) {
       const message = await response.text();
-      return Promise.reject(`Unexpected status ${response.status}: ${message}`);
+      throw new Error(`Unexpected status ${response.status}: ${message}`);
     }
     const result = await response.json();
     return result["id"];
   }
 };
+_WorkerEndpoint.SESSION_DEAD = /* @__PURE__ */ new Set([
+  "error" /* ERROR */,
+  "failed" /* FAILED */,
+  "stopped" /* STOPPED */,
+  "pipeline_error" /* PIPELINE_ERROR */,
+  "unknown" /* UNKNOWN */
+]);
+_WorkerEndpoint.WAIT_FOR_IS_READY = 60 * 1e3;
+_WorkerEndpoint.CHECK_FOR_IS_READY_INTERVAL = 250;
+var WorkerEndpoint = _WorkerEndpoint;
 
 // shims/websockets.ts
 var createWebSocket;
@@ -11004,7 +11128,7 @@ var DataEndpoint = class extends Endpoint {
       return Promise.reject("endpoint not initialized");
     }
     const accountUuidQuery = this._accountId ? `?account_uuid=${this._accountId}` : "";
-    const config_url = `${this.eyepopUrl()}/configs${accountUuidQuery}`;
+    const config_url = `${this.eyepopUrl()}/v1/configs${accountUuidQuery}`;
     let headers = {
       Authorization: await this.authorizationHeader()
     };
@@ -11582,7 +11706,7 @@ var DataEndpoint = class extends Endpoint {
       throw e;
     }
   }
-  jobDone(job) {
+  jobDone(_job) {
     this._limit?.release();
   }
   async dispatchChangeEvent(change_event) {
@@ -11602,6 +11726,7 @@ var DataEndpoint = class extends Endpoint {
         for (let handler of this._account_event_handlers) {
           await handler(change_event);
         }
+        break;
       // dataset event types
       case "asset_added" /* asset_added */:
       case "asset_removed" /* asset_removed */:
@@ -11699,6 +11824,23 @@ var DataEndpoint = class extends Endpoint {
       method: "DELETE"
     });
   }
+  async listVlmAbilityEvaluations(vlm_ability_uuid) {
+    return this.request(`/vlm_abilities/${vlm_ability_uuid}/evaluations`, {
+      method: "GET"
+    });
+  }
+  async getVlmAbilityEvaluation(vlm_ability_uuid, source) {
+    return this.request(`/vlm_abilities/${vlm_ability_uuid}/evaluations/${source}`, {
+      method: "GET"
+    });
+  }
+  async startVlmAbilityEvaluation(vlm_ability_uuid, evaluate_request) {
+    return this.request(`/vlm_abilities/${vlm_ability_uuid}/evaluations`, {
+      method: "POST",
+      body: JSON.stringify(evaluate_request),
+      headers: { "Content-Type": "application/json" }
+    });
+  }
 };
 
 // worker/webrtc_whep.ts
@@ -11763,7 +11905,7 @@ var WebrtcWhep = class extends WebrtcBase {
     return new Promise(async (resolve, reject) => {
       pc.ontrack = (evt) => {
         this._requestLogger.debug(`new track: ${evt.track.kind}`);
-        this._stream = evt.streams[0];
+        this._stream = evt.streams[0] || null;
         resolve(this);
       };
       pc.oniceconnectionstatechange = () => {
@@ -11799,21 +11941,24 @@ var stringToBooleanSafe = (str) => {
 };
 var EyePop;
 ((EyePop2) => {
-  const envSecretKey = readEnv("EYEPOP_SECRET_KEY");
-  const defaultAuth = envSecretKey ? {
-    secretKey: envSecretKey
+  const envApiKey = readEnv("EYEPOP_API_KEY");
+  const defaultAuth = envApiKey ? {
+    apiKey: envApiKey
   } : void 0;
   EyePop2.endpoint = workerEndpoint;
   function workerEndpoint(opts = {}) {
     if (opts.isLocalMode === void 0) {
       opts.isLocalMode = stringToBooleanSafe(readEnv("EYEPOP_LOCAL_MODE"));
     }
-    _fill_default_options(opts, opts.isLocalMode ? "http://127.0.0.1:8080" : void 0);
+    if (opts.isLocalMode) {
+      opts.eyepopUrl = "http://127.0.0.1:8080";
+    }
+    _fill_default_options(opts);
     if (opts.auth === void 0) {
       if (opts.isLocalMode) {
         opts.auth = { isLocal: true };
       } else {
-        throw new Error("auth option or EYEPOP_SECRET_KEY environment variable is required");
+        throw new Error("auth option or EYEPOP_API_KEY environment variable is required");
       }
     }
     if (opts.popId === void 0) {
@@ -11840,7 +11985,7 @@ var EyePop;
   function dataEndpoint(opts = {}) {
     _fill_default_options(opts);
     if (opts.auth === void 0) {
-      throw new Error("auth option or EYEPOP_SECRET_KEY environment variable is required");
+      throw new Error("auth option or EYEPOP_API_KEY environment variable is required");
     }
     if (opts.accountId === void 0) {
       opts.accountId = readEnv("EYEPOP_ACCOUNT_ID");
@@ -11855,20 +12000,23 @@ var EyePop;
     return new DataEndpoint(opts);
   }
   EyePop2.dataEndpoint = dataEndpoint;
-  function _fill_default_options(opts, default_eyepop_url = "https://api.eyepop.ai") {
-    if (opts.auth === void 0) {
+  function _fill_default_options(opts) {
+    if (!opts.auth) {
       opts.auth = defaultAuth;
     }
-    if (opts.eyepopUrl === void 0) {
-      opts.eyepopUrl = readEnv("EYEPOP_URL") || default_eyepop_url;
+    if (!opts.eyepopUrl && opts.auth && opts.auth.session && opts.auth.session.eyepopUrl) {
+      opts.eyepopUrl = opts.auth.session.eyepopUrl;
     }
-    if (opts.jobQueueLength === void 0) {
-      opts.jobQueueLength = 1024;
+    if (!opts.eyepopUrl) {
+      opts.eyepopUrl = readEnv("EYEPOP_URL");
     }
-    if (opts.auth !== void 0) {
+    if (!opts.eyepopUrl) {
+      opts.eyepopUrl = "https://compute.eyepop.ai";
+    }
+    if (opts.auth) {
       if (opts.auth.oAuth2 !== void 0) {
         if (typeof opts.auth.oAuth2 === "boolean") {
-          if (opts.eyepopUrl.startsWith("https://web-api.staging.eyepop.xyz")) {
+          if (opts.eyepopUrl && opts.eyepopUrl.match(/https:(.*).staging.eyepop.xyz/i)) {
             opts.auth = {
               oAuth2: {
                 domain: "dev-eyepop.us.auth0.com",
@@ -11889,11 +12037,9 @@ var EyePop;
           }
         }
       }
-      if (opts.auth.session !== void 0) {
-        if (opts.auth.session.eyepopUrl) {
-          opts.eyepopUrl = opts.auth.session.eyepopUrl;
-        }
-      }
+    }
+    if (!opts.jobQueueLength) {
+      opts.jobQueueLength = 128;
     }
   }
 })(EyePop || (EyePop = {}));
@@ -11934,6 +12080,7 @@ export {
   PopComponentType,
   PredictionVersion,
   Semaphore,
+  SessionStatus,
   Stream,
   TranscodeMode,
   TransientPopId,