@eyepop.ai/eyepop 3.17.2 → 3.18.0

package/dist/eyepop.index.mjs

@@ -8632,6 +8632,40 @@ var require_mime_types = __commonJS({
   }
 });
 
+// options.ts
+function nonEmptyCredential(value) {
+  return value && value.length > 0 ? value : void 0;
+}
+function resolveAuth(options) {
+  const apiKey = nonEmptyCredential(options.apiKey);
+  if (apiKey !== void 0) {
+    return { apiKey };
+  }
+  const accessToken = nonEmptyCredential(options.accessToken);
+  if (accessToken !== void 0) {
+    return { accessToken };
+  }
+  if (options.session !== void 0) {
+    return { session: options.session };
+  }
+  if (options.oAuth2 !== void 0) {
+    return { oAuth2: options.oAuth2 };
+  }
+  return options.auth;
+}
+function apiKeyCredential(auth) {
+  if (auth === void 0) {
+    return void 0;
+  }
+  return nonEmptyCredential(auth.apiKey);
+}
+function accessTokenCredential(auth) {
+  if (auth === void 0) {
+    return void 0;
+  }
+  return nonEmptyCredential(auth.accessToken);
+}
+
 // compute/compute_session.ts
 var SESSION_DEAD = /* @__PURE__ */ new Set(["error" /* ERROR */, "failed" /* FAILED */, "stopped" /* STOPPED */, "pipeline_error" /* PIPELINE_ERROR */, "unknown" /* UNKNOWN */]);
 var CHECK_FOR_IS_READY_INTERVAL = 250;
@@ -10470,17 +10504,19 @@ var Endpoint = class {
     if (!this._options.eyepopUrl) {
       return Promise.reject("option eyepopUrl or environment variable EYEPOP_URL is required");
     }
-    if (this._options.auth === void 0) {
+    const auth = resolveAuth(this._options);
+    if (auth === void 0) {
       return Promise.reject("cannot connect without defined auth option");
     }
-    if (this._options.auth.session !== void 0) {
-      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.apiKey !== void 0) {
-    } else if (this._options.auth.isLocal !== void 0) {
+    if (auth.session !== void 0) {
+      this._token = auth.session.accessToken;
+      this._expire_token_time = auth.session.validUntil / 1e3;
+    } else if (auth.oAuth2 !== void 0) {
+    } else if (accessTokenCredential(auth) !== void 0) {
+    } else if (apiKeyCredential(auth) !== void 0) {
+    } else if (auth.isLocal !== void 0) {
     } else {
-      return Promise.reject("option apiKey or environment variable EYEPOP_API_KEY is required");
+      return Promise.reject("option apiKey/accessToken or environment variable EYEPOP_API_KEY is required");
     }
     if (this._options.platformSupport?.createHttpClient !== void 0) {
       this._client = await this._options.platformSupport.createHttpClient(this._requestLogger);
@@ -10554,7 +10590,7 @@ var Endpoint = class {
     throw new Error("reconnect() not implemented");
   }
   async authorizationHeader() {
-    if (this._options.auth.isLocal !== void 0) {
+    if (resolveAuth(this._options)?.isLocal !== void 0) {
       return `Implicit`;
     }
     return `Bearer ${await this.currentAccessToken()}`;
@@ -10564,19 +10600,27 @@ var Endpoint = class {
     if (!this._token || this._expire_token_time < now) {
       this.updateState("Authenticating" /* Authenticating */);
       try {
+        const auth = resolveAuth(this._options);
         if (!this._client) {
           return Promise.reject("endpoint not connected");
-        } else if (this._options.auth.isLocal !== void 0) {
+        } else if (auth?.isLocal !== void 0) {
           this._token = "implicit";
           this._expire_token_time = Number.MAX_VALUE;
-        } else if (this._options.auth.session !== void 0) {
+        } else if (auth?.session !== void 0) {
           return Promise.reject("temporary access token expired");
-        } else if (this._options.auth.oAuth2 !== void 0 && this._options.eyepopUrl) {
-          const session = await authenticateBrowserSession(this._options.auth.oAuth2, this._options);
+        } else if (auth?.oAuth2 !== void 0 && this._options.eyepopUrl) {
+          const session = await authenticateBrowserSession(auth.oAuth2, this._options);
           this._token = session.accessToken;
           this._expire_token_time = session.validUntil / 1e3;
-        } else if (this._options.auth.apiKey !== void 0 && this._options.eyepopUrl) {
-          const headers = { "Authorization": `Bearer ${this._options.auth.apiKey}` };
+        } else if (accessTokenCredential(auth) !== void 0) {
+          this._token = accessTokenCredential(auth);
+          this._expire_token_time = Number.MAX_VALUE;
+        } else if (this._options.eyepopUrl) {
+          const credential = apiKeyCredential(auth);
+          if (credential === void 0) {
+            return Promise.reject("no valid auth option");
+          }
+          const headers = { Authorization: `Bearer ${credential}` };
           const post_url = `${this.eyepopUrl()}/v1/auth/authenticate`;
           const response = await this._client.fetch(post_url, {
             method: "POST",
@@ -10721,7 +10765,7 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
     }
   }
   _authenticationHeaders(session) {
-    return this._options.auth.isLocal !== void 0 ? {} : { Authorization: `Bearer ${session.accessToken}` };
+    return resolveAuth(this._options)?.isLocal !== void 0 ? {} : { Authorization: `Bearer ${session.accessToken}` };
   }
   /**
    * @deprecated Pop ids are only retained for backwards compatibility.
@@ -10792,13 +10836,7 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
           return { stream: streamSource.stream, mimeType: streamSource.mimeType };
         })
       );
-      const job = new UploadGroupJob(
-        sources,
-        params,
-        async () => this.session(),
-        this._client,
-        this._requestLogger
-      );
+      const job = new UploadGroupJob(sources, params, async () => this.session(), this._client, this._requestLogger);
       return job.start(
         () => {
           this.jobDone(job);
@@ -10829,13 +10867,7 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
         stream,
         mimeType: mimeTypes?.[i] ?? null
       }));
-      const job = new UploadGroupJob(
-        sources,
-        params,
-        async () => this.session(),
-        this._client,
-        this._requestLogger
-      );
+      const job = new UploadGroupJob(sources, params, async () => this.session(), this._client, this._requestLogger);
       return job.start(
         () => {
           this.jobDone(job);
@@ -10859,13 +10891,7 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
     await this._limit.acquire();
     try {
       this.updateState();
-      const job = new LoadFromGroupJob(
-        urls,
-        params,
-        async () => this.session(),
-        this._client,
-        this._requestLogger
-      );
+      const job = new LoadFromGroupJob(urls, params, async () => this.session(), this._client, this._requestLogger);
       return job.start(
         () => {
           this.jobDone(job);
@@ -11368,11 +11394,13 @@ var _WorkerEndpoint = class _WorkerEndpoint extends Endpoint {
     return super.authorizationHeader();
   }
   async computeAuthorizationHeader() {
-    if (this.options().auth.isLocal !== void 0) {
+    const auth = resolveAuth(this.options());
+    if (auth?.isLocal !== void 0) {
       return "Implicit";
     }
-    if (this.options().auth.apiKey !== void 0) {
-      return `Bearer ${this.options().auth.apiKey}`;
+    const credential = apiKeyCredential(auth) ?? accessTokenCredential(auth);
+    if (credential !== void 0) {
+      return `Bearer ${credential}`;
     }
     return super.authorizationHeader();
   }
@@ -11823,8 +11851,8 @@ var DataEndpoint = class extends Endpoint {
     this._accountId = options.accountId || null;
     this._account_event_handlers = [];
     this._dataset_uuid_to_event_handlers = /* @__PURE__ */ new Map();
-    const sessionAuth = options.auth;
-    if (sessionAuth.session !== void 0) {
+    const sessionAuth = resolveAuth(options);
+    if (sessionAuth?.session !== void 0) {
       const dataSession = sessionAuth.session;
       if (dataSession.accountId) {
         this._accountId = dataSession.accountId;
@@ -12752,11 +12780,11 @@ var EyePop;
       opts.eyepopUrl = "http://127.0.0.1:8080";
     }
     _fill_default_options(opts);
-    if (opts.auth === void 0) {
+    if (resolveAuth(opts) === void 0) {
       if (opts.isLocalMode) {
         opts.auth = { isLocal: true };
       } else {
-        throw new Error("auth option or EYEPOP_API_KEY environment variable is required");
+        throw new Error("apiKey/accessToken/session/oAuth2 option or EYEPOP_API_KEY environment variable is required");
       }
     }
     if (opts.sessionUuid === void 0) {
@@ -12780,11 +12808,12 @@ var EyePop;
     if (opts.stopJobs === void 0) {
       opts.stopJobs = true;
     }
-    if (opts.auth !== void 0) {
-      if (opts.auth.session !== void 0) {
-        if (opts.auth.session !== void 0) {
-          if (opts.auth.session.popId) {
-            opts.popId = opts.auth.session.popId;
+    const auth = resolveAuth(opts);
+    if (auth !== void 0) {
+      if (auth.session !== void 0) {
+        if (auth.session !== void 0) {
+          if (auth.session.popId) {
+            opts.popId = auth.session.popId;
           }
         }
       }
@@ -12794,16 +12823,17 @@ var EyePop;
   EyePop2.workerEndpoint = workerEndpoint;
   function dataEndpoint(opts = {}) {
     _fill_default_options(opts);
-    if (opts.auth === void 0) {
-      throw new Error("auth option or EYEPOP_API_KEY environment variable is required");
+    const auth = resolveAuth(opts);
+    if (auth === void 0) {
+      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");
     }
-    if (opts.auth.session !== void 0) {
-      if (opts.auth.session !== void 0) {
-        if (opts.auth.session.accountId) {
-          opts.accountId = opts.auth.session.accountId;
+    if (auth.session !== void 0) {
+      if (auth.session !== void 0) {
+        if (auth.session.accountId) {
+          opts.accountId = auth.session.accountId;
         }
       }
     }
@@ -12811,11 +12841,12 @@ var EyePop;
   }
   EyePop2.dataEndpoint = dataEndpoint;
   function _fill_default_options(opts) {
-    if (!opts.auth) {
-      opts.auth = defaultAuth;
+    if (resolveAuth(opts) === void 0 && defaultAuth) {
+      opts.apiKey = defaultAuth.apiKey;
     }
-    if (!opts.eyepopUrl && opts.auth && opts.auth.session && opts.auth.session.eyepopUrl) {
-      opts.eyepopUrl = opts.auth.session.eyepopUrl;
+    const auth = resolveAuth(opts);
+    if (!opts.eyepopUrl && auth && auth.session && auth.session.eyepopUrl) {
+      opts.eyepopUrl = auth.session.eyepopUrl;
     }
     if (!opts.eyepopUrl) {
       opts.eyepopUrl = readEnv("EYEPOP_URL");
@@ -12823,27 +12854,28 @@ var EyePop;
     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 && opts.eyepopUrl.match(/https:(.*).staging.eyepop.xyz/i)) {
-            opts.auth = {
-              oAuth2: {
-                domain: "dev-eyepop.us.auth0.com",
-                clientId: "jktx3YO2UnbkNPvr05PQWf26t1kNTJyg",
-                audience: "https://dev-app.eyepop.ai",
-                scope: "admin:clouds access:inference-api access:datasets"
-              }
-            };
+    if (auth) {
+      if (auth.oAuth2 !== void 0) {
+        if (typeof auth.oAuth2 === "boolean") {
+          const oAuth2 = opts.eyepopUrl && opts.eyepopUrl.match(/https:(.*).staging.eyepop.xyz/i) ? {
+            oAuth2: {
+              domain: "dev-eyepop.us.auth0.com",
+              clientId: "jktx3YO2UnbkNPvr05PQWf26t1kNTJyg",
+              audience: "https://dev-app.eyepop.ai",
+              scope: "admin:clouds access:inference-api access:datasets"
+            }
+          } : {
+            oAuth2: {
+              domain: "eyepop.us.auth0.com",
+              clientId: "Lb9ubA9Hf3jlaqWLUx8XgA0zvotgViCl",
+              audience: "https://api.eyepop.ai",
+              scope: "admin:clouds access:inference-api access:datasets"
+            }
+          };
+          if (opts.oAuth2 !== void 0) {
+            opts.oAuth2 = oAuth2.oAuth2;
           } else {
-            opts.auth = {
-              oAuth2: {
-                domain: "eyepop.us.auth0.com",
-                clientId: "Lb9ubA9Hf3jlaqWLUx8XgA0zvotgViCl",
-                audience: "https://api.eyepop.ai",
-                scope: "admin:clouds access:inference-api access:datasets"
-              }
-            };
+            opts.auth = oAuth2;
           }
         }
       }
@@ -12908,11 +12940,14 @@ export {
   WebrtcWhip,
   WorkerEndpoint,
   WorkflowPhase,
+  accessTokenCredential,
+  apiKeyCredential,
   index_default as default,
   encodeMultipartFormData,
   getBaseUrl,
   randomMultipartBoundary,
-  readableStreamFromString
+  readableStreamFromString,
+  resolveAuth
 };
 /*! Bundled license information: