@eyepop.ai/eyepop 3.20.0 → 3.21.0

package/dist/eyepop.index.mjs

@@ -8679,6 +8679,9 @@ function pipelineIdFromSession(session) {
 }
 function sessionCreateBody(options) {
   const body = {};
+  if (options.accountId) {
+    body.account_uuid = options.accountId;
+  }
   if (options.sessionName) {
     body.session_name = options.sessionName;
   }
@@ -8728,6 +8731,42 @@ function pipelineErrorMessage(session) {
   }
   return null;
 }
+var ComputeApiError = class extends Error {
+  constructor(message, status, code) {
+    super(message);
+    this.name = "ComputeApiError";
+    this.status = status;
+    this.code = code;
+  }
+};
+var ComputeAccountMismatchError = class extends Error {
+  constructor(sessionUuid, sessionAccountId, accountId) {
+    super(`Compute session ${sessionUuid} runs under account ${sessionAccountId || "(none)"}, not the configured account ${accountId}`);
+    this.name = "ComputeAccountMismatchError";
+    this.sessionUuid = sessionUuid;
+    this.sessionAccountId = sessionAccountId;
+    this.accountId = accountId;
+  }
+};
+async function computeApiError(response, action) {
+  const code = await responseErrorCode(response);
+  const message = await responseErrorMessage(response);
+  return new ComputeApiError(`Unexpected status ${response.status} ${action}: ${message}`, response.status, code);
+}
+async function responseErrorCode(response) {
+  try {
+    const parsed = normalizedJsonValue(await response.clone().json());
+    if (!parsed || typeof parsed != "object") {
+      return void 0;
+    }
+    const record = parsed;
+    const nested = normalizedJsonValue(record["error"]);
+    const code = nested && typeof nested == "object" ? nested["code"] : record["code"];
+    return typeof code == "string" && code.length > 0 ? code : void 0;
+  } catch (_) {
+    return void 0;
+  }
+}
 async function responseErrorMessage(response) {
   const contentType = response.headers.get("content-type") || "";
   if (contentType.includes("application/json")) {
@@ -8831,8 +8870,7 @@ var ComputeSessionClient = class {
       if (response.status == 404) {
         sessions = [];
       } else if (response.status != 200) {
-        const message = await responseErrorMessage(response);
-        throw new Error(`Unexpected status ${response.status} fetching compute sessions: ${message}`);
+        throw await computeApiError(response, "fetching compute sessions");
       } else {
         const response_content = await responseJson(response);
         sessions = response_content;
@@ -8840,7 +8878,7 @@ var ComputeSessionClient = class {
       if (sessions.length > 0) {
         this.options.logger?.debug(`User has ${sessions.length} sessions, inspecting for usable session`);
         for (let s of sessions) {
-          if (!SESSION_DEAD.has(s.session_status) && !s.persistent && (!this.options.sessionName || s.session_name === this.options.sessionName)) {
+          if (!SESSION_DEAD.has(s.session_status) && !s.persistent && (!this.options.sessionName || s.session_name === this.options.sessionName) && (!this.options.accountId || s.account_uuid === this.options.accountId)) {
             session = s;
             this.options.logger?.debug(`Use active session ${s.session_uuid} with pipeline ${pipelineIdFromSession(s)}`);
             break;
@@ -8865,8 +8903,7 @@ var ComputeSessionClient = class {
       const query = "wait=true";
       const response = await this.options.httpClient.fetch(`${sessionsUrl}?${query}`, request);
       if (response.status != 200) {
-        const message = await responseErrorMessage(response);
-        throw new Error(`Unexpected status ${response.status} creating a compute session: ${message}`);
+        throw await computeApiError(response, "creating a compute session");
       } else {
         sessions = await responseJson(response);
       }
@@ -8891,14 +8928,16 @@ var ComputeSessionClient = class {
       headers
     });
     if (response.status == 404) {
-      throw new Error(`Unexpected status ${response.status} compute sessions ${sessionUuid} not found`);
+      throw new ComputeApiError(`Unexpected status ${response.status} compute sessions ${sessionUuid} not found`, response.status);
     } else if (response.status != 200) {
-      const message = await responseErrorMessage(response);
-      throw new Error(`Unexpected status ${response.status} fetching compute sessions: ${message}`);
+      throw await computeApiError(response, "fetching compute sessions");
     } else {
       const response_content = await responseJson(response);
       session = response_content;
     }
+    if (this.options.accountId && session.account_uuid !== this.options.accountId) {
+      throw new ComputeAccountMismatchError(sessionUuid, session.account_uuid, this.options.accountId);
+    }
     return session;
   }
   async sessionAuthorizationHeader(session) {
@@ -9283,7 +9322,6 @@ var VideoMode = /* @__PURE__ */ ((VideoMode2) => {
 var PopComponentType = /* @__PURE__ */ ((PopComponentType2) => {
   PopComponentType2["FORWARD"] = "forward";
   PopComponentType2["INFERENCE"] = "inference";
-  PopComponentType2["TRACING"] = "tracing";
   PopComponentType2["TRACKING"] = "tracking";
   PopComponentType2["CONTOUR_FINDER"] = "contour_finder";
   PopComponentType2["COMPONENT_FINDER"] = "component_finder";
@@ -9996,7 +10034,10 @@ var LoadFromJob = class extends AbstractJob {
       roi: this._params.roi,
       fps: this._params.fps,
       camera: this._params.camera,
-      version: this._version
+      version: this._version,
+      // undefined is dropped by JSON.stringify, so an unset option leaves
+      // the worker's own default to decide rather than pinning it here.
+      rtspForceNonCompliantUrl: this._params.rtspForceNonCompliantUrl
     };
     if (this._params.motionDetect) {
       Object.assign(body, this._params.motionDetect);
@@ -10750,6 +10791,7 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
     this._popName = null;
     this._sessionAccessToken = null;
     this._sessionAccessTokenValidUntil = null;
+    this._accountId = void 0;
     this._pipeline = null;
     this._pipelineCreatePromise = null;
   }
@@ -10799,6 +10841,7 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
       accessToken: session.accessToken,
       validUntil: session.validUntil,
       popId: this.options().popId,
+      accountId: this._accountId ?? this.options().accountId,
       baseUrl: this._baseUrl,
       pipelineId: this._pipelineId || void 0,
       authenticationHeaders: () => this._authenticationHeaders(session)
@@ -11354,6 +11397,7 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
         authorizationHeader: () => this.computeAuthorizationHeader(),
         sessionUuid: this.options().sessionUuid,
         sessionName: this.options().sessionName,
+        accountId: this.options().accountId,
         pipelineImage: this.options().pipelineImage,
         pipelineVersion: this.options().pipelineVersion,
         pop: this.options().pop,
@@ -11368,6 +11412,7 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
     this._sessionAccessToken = resolved.accessToken;
     this._sessionAccessTokenValidUntil = resolved.accessTokenValidUntil;
     this._baseUrl = resolved.session.session_endpoint;
+    this._accountId = resolved.session.account_uuid || void 0;
     this._pipeline = null;
     this._pipelineId = resolved.pipelineId;
     if (this.options().pop) {
@@ -12991,7 +13036,7 @@ var PointCloud = class {
     return placed;
   }
   /**
-   * Per axis (min, max) in metres over the placed points, or undefined if none were.
+   * Per axis (min, max) in meters over the placed points, or undefined if none were.
    *
    * The counterpart to DepthMap's finiteMin/finiteMax, which are one axis
    * because a depth map has one value per pixel.
@@ -13170,6 +13215,19 @@ var readEnv = (env) => {
   }
   return void 0;
 };
+var warnedAccountIdEnv = false;
+var readAccountUuidEnv = () => {
+  const accountUuid = readEnv("EYEPOP_ACCOUNT_UUID");
+  if (accountUuid !== void 0) {
+    return accountUuid;
+  }
+  const accountId = readEnv("EYEPOP_ACCOUNT_ID");
+  if (accountId !== void 0 && !warnedAccountIdEnv) {
+    warnedAccountIdEnv = true;
+    console.warn("EYEPOP_ACCOUNT_ID is deprecated, use EYEPOP_ACCOUNT_UUID instead");
+  }
+  return accountId;
+};
 var stringToBooleanSafe = (str) => {
   if (typeof str == "undefined") {
     return false;
@@ -13184,7 +13242,8 @@ var EyePop;
     apiKey: envApiKey
   } : void 0;
   EyePop2.endpoint = workerEndpoint;
-  function workerEndpoint(opts = {}) {
+  function workerEndpoint(options = {}) {
+    const opts = { ...options };
     if (opts.pop !== void 0) {
       validatePop(opts.pop);
     }
@@ -13208,6 +13267,9 @@ var EyePop;
     if (opts.sessionName === void 0) {
       opts.sessionName = readEnv("EYEPOP_SESSION_NAME");
     }
+    if (opts.accountId === void 0) {
+      opts.accountId = readAccountUuidEnv();
+    }
     if (opts.pipelineImage === void 0) {
       opts.pipelineImage = readEnv("EYEPOP_PIPELINE_IMAGE");
     }
@@ -13230,6 +13292,9 @@ var EyePop;
           if (auth.session.popId) {
             opts.popId = auth.session.popId;
           }
+          if (auth.session.accountId) {
+            opts.accountId = auth.session.accountId;
+          }
         }
       }
     }
@@ -13243,7 +13308,7 @@ var EyePop;
       throw new Error("apiKey/accessToken/session/oAuth2 option or EYEPOP_API_KEY environment variable is required");
     }
     if (opts.accountId === void 0) {
-      opts.accountId = readEnv("EYEPOP_ACCOUNT_ID");
+      opts.accountId = readAccountUuidEnv();
     }
     if (auth.session !== void 0) {
       if (auth.session !== void 0) {
@@ -13313,6 +13378,8 @@ export {
   AutoAnnotateStatus,
   AutoAnnotateTask,
   ChangeType,
+  ComputeAccountMismatchError,
+  ComputeApiError,
   ContourType,
   DEFAULT_PREDICTION_VERSION,
   DataApiType,