agentmail 0.1.6 → 0.1.7

package/dist/esm/api/resources/threads/client/Client.mjs

@@ -8,20 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { mergeHeaders, mergeOnlyDefinedHeaders } from "../../../../core/headers.mjs";
+import { normalizeClientOptionsWithAuth } from "../../../../BaseClient.mjs";
+import { mergeHeaders } from "../../../../core/headers.mjs";
 import * as core from "../../../../core/index.mjs";
 import { toJson } from "../../../../core/json.mjs";
 import * as environments from "../../../../environments.mjs";
 import * as errors from "../../../../errors/index.mjs";
 import * as serializers from "../../../../serialization/index.mjs";
 import * as AgentMail from "../../../index.mjs";
-export class Threads {
-    constructor(_options = {}) {
-        this._options = _options;
+export class ThreadsClient {
+    constructor(options = {}) {
+        this._options = normalizeClientOptionsWithAuth(options);
     }
     /**
      * @param {AgentMail.ListThreadsRequest} request
-     * @param {Threads.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ThreadsClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link AgentMail.NotFoundError}
      *
@@ -33,7 +34,7 @@ export class Threads {
     }
     __list() {
         return __awaiter(this, arguments, void 0, function* (request = {}, requestOptions) {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { limit, pageToken, labels, before, after, ascending } = request;
             const _queryParams = {};
             if (limit != null) {
@@ -59,7 +60,8 @@ export class Threads {
             if (ascending != null) {
                 _queryParams.ascending = ascending.toString();
             }
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders({ Authorization: yield this._getAuthorizationHeader() }), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = mergeHeaders(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : ((_c = (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.AgentMailEnvironment.Production).http, "/v0/threads"),
                 method: "GET",
@@ -68,6 +70,8 @@ export class Threads {
                 timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
                 maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return {
@@ -117,29 +121,32 @@ export class Threads {
         });
     }
     /**
-     * @param {AgentMail.ThreadId} threadId
-     * @param {Threads.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {AgentMail.ThreadId} thread_id
+     * @param {ThreadsClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link AgentMail.NotFoundError}
      *
      * @example
      *     await client.threads.get("thread_id")
      */
-    get(threadId, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__get(threadId, requestOptions));
+    get(thread_id, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__get(thread_id, requestOptions));
     }
-    __get(threadId, requestOptions) {
+    __get(thread_id, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders({ Authorization: yield this._getAuthorizationHeader() }), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = mergeHeaders(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : ((_c = (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.AgentMailEnvironment.Production).http, `/v0/threads/${core.url.encodePathParam(serializers.ThreadId.jsonOrThrow(threadId, { omitUndefined: true }))}`),
+                url: core.url.join((_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : ((_c = (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.AgentMailEnvironment.Production).http, `/v0/threads/${core.url.encodePathParam(serializers.ThreadId.jsonOrThrow(thread_id, { omitUndefined: true }))}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams,
                 timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
                 maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return {
@@ -191,15 +198,16 @@ export class Threads {
     /**
      * @throws {@link AgentMail.NotFoundError}
      */
-    getAttachment(threadId, attachmentId, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__getAttachment(threadId, attachmentId, requestOptions));
+    getAttachment(thread_id, attachment_id, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__getAttachment(thread_id, attachment_id, requestOptions));
     }
-    __getAttachment(threadId, attachmentId, requestOptions) {
+    __getAttachment(thread_id, attachment_id, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders({ Authorization: yield this._getAuthorizationHeader() }), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = mergeHeaders(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : ((_c = (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.AgentMailEnvironment.Production).http, `/v0/threads/${core.url.encodePathParam(serializers.ThreadId.jsonOrThrow(threadId, { omitUndefined: true }))}/attachments/${core.url.encodePathParam(serializers.AttachmentId.jsonOrThrow(attachmentId, { omitUndefined: true }))}`),
+                url: core.url.join((_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : ((_c = (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.AgentMailEnvironment.Production).http, `/v0/threads/${core.url.encodePathParam(serializers.ThreadId.jsonOrThrow(thread_id, { omitUndefined: true }))}/attachments/${core.url.encodePathParam(serializers.AttachmentId.jsonOrThrow(attachment_id, { omitUndefined: true }))}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams,
@@ -207,6 +215,8 @@ export class Threads {
                 timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
                 maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: _response.body, rawResponse: _response.rawResponse };
@@ -246,16 +256,4 @@ export class Threads {
             }
         });
     }
-    _getAuthorizationHeader() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const bearer = (_a = (yield core.Supplier.get(this._options.apiKey))) !== null && _a !== void 0 ? _a : process === null || process === void 0 ? void 0 : process.env.AGENTMAIL_API_KEY;
-            if (bearer == null) {
-                throw new errors.AgentMailError({
-                    message: "Please specify a bearer by either passing it in to the constructor or initializing a AGENTMAIL_API_KEY environment variable",
-                });
-            }
-            return `Bearer ${bearer}`;
-        });
-    }
 }

package/dist/esm/api/resources/webhooks/client/Client.d.mts

@@ -1,38 +1,39 @@
 import type { BaseClientOptions, BaseRequestOptions } from "../../../../BaseClient.mjs";
+import { type NormalizedClientOptionsWithAuth } from "../../../../BaseClient.mjs";
 import * as core from "../../../../core/index.mjs";
 import * as AgentMail from "../../../index.mjs";
-export declare namespace Webhooks {
+export declare namespace WebhooksClient {
     interface Options extends BaseClientOptions {
     }
     interface RequestOptions extends BaseRequestOptions {
     }
 }
-export declare class Webhooks {
-    protected readonly _options: Webhooks.Options;
-    constructor(_options?: Webhooks.Options);
+export declare class WebhooksClient {
+    protected readonly _options: NormalizedClientOptionsWithAuth<WebhooksClient.Options>;
+    constructor(options?: WebhooksClient.Options);
     /**
      * @param {AgentMail.webhooks.ListWebhooksRequest} request
-     * @param {Webhooks.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {WebhooksClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @example
      *     await client.webhooks.list()
      */
-    list(request?: AgentMail.webhooks.ListWebhooksRequest, requestOptions?: Webhooks.RequestOptions): core.HttpResponsePromise<AgentMail.webhooks.ListWebhooksResponse>;
+    list(request?: AgentMail.webhooks.ListWebhooksRequest, requestOptions?: WebhooksClient.RequestOptions): core.HttpResponsePromise<AgentMail.webhooks.ListWebhooksResponse>;
     private __list;
     /**
-     * @param {AgentMail.webhooks.WebhookId} webhookId
-     * @param {Webhooks.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {AgentMail.webhooks.WebhookId} webhook_id
+     * @param {WebhooksClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link AgentMail.NotFoundError}
      *
      * @example
      *     await client.webhooks.get("webhook_id")
      */
-    get(webhookId: AgentMail.webhooks.WebhookId, requestOptions?: Webhooks.RequestOptions): core.HttpResponsePromise<AgentMail.webhooks.Webhook>;
+    get(webhook_id: AgentMail.webhooks.WebhookId, requestOptions?: WebhooksClient.RequestOptions): core.HttpResponsePromise<AgentMail.webhooks.Webhook>;
     private __get;
     /**
      * @param {AgentMail.webhooks.CreateWebhookRequest} request
-     * @param {Webhooks.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {WebhooksClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link AgentMail.ValidationError}
      *
@@ -42,18 +43,17 @@ export declare class Webhooks {
      *         eventTypes: ["message.received", "message.received"]
      *     })
      */
-    create(request: AgentMail.webhooks.CreateWebhookRequest, requestOptions?: Webhooks.RequestOptions): core.HttpResponsePromise<AgentMail.webhooks.Webhook>;
+    create(request: AgentMail.webhooks.CreateWebhookRequest, requestOptions?: WebhooksClient.RequestOptions): core.HttpResponsePromise<AgentMail.webhooks.Webhook>;
     private __create;
     /**
-     * @param {AgentMail.webhooks.WebhookId} webhookId
-     * @param {Webhooks.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {AgentMail.webhooks.WebhookId} webhook_id
+     * @param {WebhooksClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link AgentMail.NotFoundError}
      *
      * @example
      *     await client.webhooks.delete("webhook_id")
      */
-    delete(webhookId: AgentMail.webhooks.WebhookId, requestOptions?: Webhooks.RequestOptions): core.HttpResponsePromise<void>;
+    delete(webhook_id: AgentMail.webhooks.WebhookId, requestOptions?: WebhooksClient.RequestOptions): core.HttpResponsePromise<void>;
     private __delete;
-    protected _getAuthorizationHeader(): Promise<string>;
 }

package/dist/esm/api/resources/webhooks/client/Client.mjs

@@ -8,19 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { mergeHeaders, mergeOnlyDefinedHeaders } from "../../../../core/headers.mjs";
+import { normalizeClientOptionsWithAuth } from "../../../../BaseClient.mjs";
+import { mergeHeaders } from "../../../../core/headers.mjs";
 import * as core from "../../../../core/index.mjs";
 import * as environments from "../../../../environments.mjs";
 import * as errors from "../../../../errors/index.mjs";
 import * as serializers from "../../../../serialization/index.mjs";
 import * as AgentMail from "../../../index.mjs";
-export class Webhooks {
-    constructor(_options = {}) {
-        this._options = _options;
+export class WebhooksClient {
+    constructor(options = {}) {
+        this._options = normalizeClientOptionsWithAuth(options);
     }
     /**
      * @param {AgentMail.webhooks.ListWebhooksRequest} request
-     * @param {Webhooks.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {WebhooksClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @example
      *     await client.webhooks.list()
@@ -30,7 +31,7 @@ export class Webhooks {
     }
     __list() {
         return __awaiter(this, arguments, void 0, function* (request = {}, requestOptions) {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { limit, pageToken } = request;
             const _queryParams = {};
             if (limit != null) {
@@ -39,7 +40,8 @@ export class Webhooks {
             if (pageToken != null) {
                 _queryParams.page_token = pageToken;
             }
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders({ Authorization: yield this._getAuthorizationHeader() }), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = mergeHeaders(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : ((_c = (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.AgentMailEnvironment.Production).http, "/v0/webhooks"),
                 method: "GET",
@@ -48,6 +50,8 @@ export class Webhooks {
                 timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
                 maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return {
@@ -86,29 +90,32 @@ export class Webhooks {
         });
     }
     /**
-     * @param {AgentMail.webhooks.WebhookId} webhookId
-     * @param {Webhooks.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {AgentMail.webhooks.WebhookId} webhook_id
+     * @param {WebhooksClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link AgentMail.NotFoundError}
      *
      * @example
      *     await client.webhooks.get("webhook_id")
      */
-    get(webhookId, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__get(webhookId, requestOptions));
+    get(webhook_id, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__get(webhook_id, requestOptions));
     }
-    __get(webhookId, requestOptions) {
+    __get(webhook_id, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders({ Authorization: yield this._getAuthorizationHeader() }), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = mergeHeaders(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : ((_c = (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.AgentMailEnvironment.Production).http, `/v0/webhooks/${core.url.encodePathParam(serializers.webhooks.WebhookId.jsonOrThrow(webhookId, { omitUndefined: true }))}`),
+                url: core.url.join((_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : ((_c = (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.AgentMailEnvironment.Production).http, `/v0/webhooks/${core.url.encodePathParam(serializers.webhooks.WebhookId.jsonOrThrow(webhook_id, { omitUndefined: true }))}`),
                 method: "GET",
                 headers: _headers,
                 queryParameters: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams,
                 timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
                 maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return {
@@ -159,7 +166,7 @@ export class Webhooks {
     }
     /**
      * @param {AgentMail.webhooks.CreateWebhookRequest} request
-     * @param {Webhooks.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {WebhooksClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link AgentMail.ValidationError}
      *
@@ -174,8 +181,9 @@ export class Webhooks {
     }
     __create(request, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders({ Authorization: yield this._getAuthorizationHeader() }), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = mergeHeaders(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
                 url: core.url.join((_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : ((_c = (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.AgentMailEnvironment.Production).http, "/v0/webhooks"),
                 method: "POST",
@@ -192,6 +200,8 @@ export class Webhooks {
                 timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
                 maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return {
@@ -241,29 +251,32 @@ export class Webhooks {
         });
     }
     /**
-     * @param {AgentMail.webhooks.WebhookId} webhookId
-     * @param {Webhooks.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {AgentMail.webhooks.WebhookId} webhook_id
+     * @param {WebhooksClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link AgentMail.NotFoundError}
      *
      * @example
      *     await client.webhooks.delete("webhook_id")
      */
-    delete(webhookId, requestOptions) {
-        return core.HttpResponsePromise.fromPromise(this.__delete(webhookId, requestOptions));
+    delete(webhook_id, requestOptions) {
+        return core.HttpResponsePromise.fromPromise(this.__delete(webhook_id, requestOptions));
     }
-    __delete(webhookId, requestOptions) {
+    __delete(webhook_id, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
-            const _headers = mergeHeaders((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, mergeOnlyDefinedHeaders({ Authorization: yield this._getAuthorizationHeader() }), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = mergeHeaders(_authRequest.headers, (_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
             const _response = yield core.fetcher({
-                url: core.url.join((_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : ((_c = (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.AgentMailEnvironment.Production).http, `/v0/webhooks/${core.url.encodePathParam(serializers.webhooks.WebhookId.jsonOrThrow(webhookId, { omitUndefined: true }))}`),
+                url: core.url.join((_b = (yield core.Supplier.get(this._options.baseUrl))) !== null && _b !== void 0 ? _b : ((_c = (yield core.Supplier.get(this._options.environment))) !== null && _c !== void 0 ? _c : environments.AgentMailEnvironment.Production).http, `/v0/webhooks/${core.url.encodePathParam(serializers.webhooks.WebhookId.jsonOrThrow(webhook_id, { omitUndefined: true }))}`),
                 method: "DELETE",
                 headers: _headers,
                 queryParameters: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.queryParams,
                 timeoutMs: ((_f = (_d = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) !== null && _d !== void 0 ? _d : (_e = this._options) === null || _e === void 0 ? void 0 : _e.timeoutInSeconds) !== null && _f !== void 0 ? _f : 60) * 1000,
                 maxRetries: (_g = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.maxRetries) !== null && _g !== void 0 ? _g : (_h = this._options) === null || _h === void 0 ? void 0 : _h.maxRetries,
                 abortSignal: requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.abortSignal,
+                fetchFn: (_j = this._options) === null || _j === void 0 ? void 0 : _j.fetch,
+                logging: this._options.logging,
             });
             if (_response.ok) {
                 return { data: undefined, rawResponse: _response.rawResponse };
@@ -303,16 +316,4 @@ export class Webhooks {
             }
         });
     }
-    _getAuthorizationHeader() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const bearer = (_a = (yield core.Supplier.get(this._options.apiKey))) !== null && _a !== void 0 ? _a : process === null || process === void 0 ? void 0 : process.env.AGENTMAIL_API_KEY;
-            if (bearer == null) {
-                throw new errors.AgentMailError({
-                    message: "Please specify a bearer by either passing it in to the constructor or initializing a AGENTMAIL_API_KEY environment variable",
-                });
-            }
-            return `Bearer ${bearer}`;
-        });
-    }
 }

package/dist/esm/api/resources/webhooks/types/CreateWebhookRequest.d.mts

@@ -1,7 +1,7 @@
 import type * as AgentMail from "../../../index.mjs";
 export interface CreateWebhookRequest {
     url: AgentMail.webhooks.Url;
-    eventTypes: AgentMail.webhooks.EventTypes;
+    eventTypes: AgentMail.EventTypes;
     inboxIds?: AgentMail.webhooks.InboxIds;
     clientId?: AgentMail.webhooks.ClientId;
 }

package/dist/esm/api/resources/webhooks/types/Webhook.d.mts

@@ -2,7 +2,7 @@ import type * as AgentMail from "../../../index.mjs";
 export interface Webhook {
     webhookId: AgentMail.webhooks.WebhookId;
     url: AgentMail.webhooks.Url;
-    eventTypes?: AgentMail.webhooks.EventTypes;
+    eventTypes?: AgentMail.EventTypes;
     inboxIds?: AgentMail.webhooks.InboxIds;
     /** Secret for webhook signature verification. */
     secret: string;

package/dist/esm/api/resources/webhooks/types/index.d.mts

@@ -1,7 +1,5 @@
 export * from "./ClientId.mjs";
 export * from "./CreateWebhookRequest.mjs";
-export * from "./EventType.mjs";
-export * from "./EventTypes.mjs";
 export * from "./InboxIds.mjs";
 export * from "./ListWebhooksResponse.mjs";
 export * from "./Url.mjs";

package/dist/esm/api/resources/webhooks/types/index.mjs

@@ -1,7 +1,5 @@
 export * from "./ClientId.mjs";
 export * from "./CreateWebhookRequest.mjs";
-export * from "./EventType.mjs";
-export * from "./EventTypes.mjs";
 export * from "./InboxIds.mjs";
 export * from "./ListWebhooksResponse.mjs";
 export * from "./Url.mjs";

package/dist/esm/api/resources/websockets/client/Client.d.mts

@@ -1,6 +1,7 @@
 import type { BaseClientOptions } from "../../../../BaseClient.mjs";
+import { type NormalizedClientOptionsWithAuth } from "../../../../BaseClient.mjs";
 import { WebsocketsSocket } from "./Socket.mjs";
-export declare namespace Websockets {
+export declare namespace WebsocketsClient {
     interface Options extends BaseClientOptions {
     }
     interface ConnectArgs {
@@ -13,9 +14,8 @@ export declare namespace Websockets {
         reconnectAttempts?: number;
     }
 }
-export declare class Websockets {
-    protected readonly _options: Websockets.Options;
-    constructor(_options?: Websockets.Options);
-    connect(args?: Websockets.ConnectArgs): Promise<WebsocketsSocket>;
-    protected _getAuthorizationHeader(): Promise<string>;
+export declare class WebsocketsClient {
+    protected readonly _options: NormalizedClientOptionsWithAuth<WebsocketsClient.Options>;
+    constructor(options?: WebsocketsClient.Options);
+    connect(args?: WebsocketsClient.ConnectArgs): Promise<WebsocketsSocket>;
 }

package/dist/esm/api/resources/websockets/client/Client.mjs

@@ -8,14 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { mergeHeaders, mergeOnlyDefinedHeaders } from "../../../../core/headers.mjs";
+import { normalizeClientOptionsWithAuth } from "../../../../BaseClient.mjs";
+import { mergeHeaders } from "../../../../core/headers.mjs";
 import * as core from "../../../../core/index.mjs";
 import * as environments from "../../../../environments.mjs";
-import * as errors from "../../../../errors/index.mjs";
 import { WebsocketsSocket } from "./Socket.mjs";
-export class Websockets {
-    constructor(_options = {}) {
-        this._options = _options;
+export class WebsocketsClient {
+    constructor(options = {}) {
+        this._options = normalizeClientOptionsWithAuth(options);
     }
     connect() {
         return __awaiter(this, arguments, void 0, function* (args = {}) {
@@ -25,7 +25,8 @@ export class Websockets {
             if (authToken != null) {
                 _queryParams.auth_token = authToken;
             }
-            const _headers = mergeHeaders(mergeOnlyDefinedHeaders({ Authorization: yield this._getAuthorizationHeader() }), headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = mergeHeaders(_authRequest.headers, headers);
             const socket = new core.ReconnectingWebSocket({
                 url: core.url.join((_a = (yield core.Supplier.get(this._options.baseUrl))) !== null && _a !== void 0 ? _a : ((_b = (yield core.Supplier.get(this._options.environment))) !== null && _b !== void 0 ? _b : environments.AgentMailEnvironment.Production).websockets, "/v0"),
                 protocols: [],
@@ -36,16 +37,4 @@ export class Websockets {
             return new WebsocketsSocket({ socket });
         });
     }
-    _getAuthorizationHeader() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const bearer = (_a = (yield core.Supplier.get(this._options.apiKey))) !== null && _a !== void 0 ? _a : process === null || process === void 0 ? void 0 : process.env.AGENTMAIL_API_KEY;
-            if (bearer == null) {
-                throw new errors.AgentMailError({
-                    message: "Please specify a bearer by either passing it in to the constructor or initializing a AGENTMAIL_API_KEY environment variable",
-                });
-            }
-            return `Bearer ${bearer}`;
-        });
-    }
 }

package/dist/esm/api/resources/websockets/client/Socket.d.mts

@@ -4,7 +4,7 @@ export declare namespace WebsocketsSocket {
     interface Args {
         socket: core.ReconnectingWebSocket;
     }
-    type Response = AgentMail.Subscribed | AgentMail.MessageReceivedEvent | AgentMail.MessageSentEvent | AgentMail.MessageDeliveredEvent | AgentMail.MessageBouncedEvent | AgentMail.MessageComplainedEvent | AgentMail.MessageRejectedEvent;
+    type Response = AgentMail.Subscribed | AgentMail.MessageReceivedEvent | AgentMail.MessageSentEvent | AgentMail.MessageDeliveredEvent | AgentMail.MessageBouncedEvent | AgentMail.MessageComplainedEvent | AgentMail.MessageRejectedEvent | AgentMail.DomainVerifiedEvent;
     type EventHandlers = {
         open?: () => void;
         message?: (message: Response) => void;

package/dist/esm/api/resources/websockets/types/Subscribe.d.mts

@@ -1,5 +1,9 @@
+import type * as AgentMail from "../../../index.mjs";
 export interface Subscribe {
     type: "subscribe";
+    eventTypes?: AgentMail.EventTypes;
     /** IDs of the inboxes to subscribe to. */
-    inboxIds: string[];
+    inboxIds?: string[];
+    /** IDs of the pods to subscribe to. */
+    podIds?: string[];
 }

package/dist/esm/api/resources/websockets/types/Subscribed.d.mts

@@ -1,5 +1,9 @@
+import type * as AgentMail from "../../../index.mjs";
 export interface Subscribed {
     type: "subscribed";
+    eventTypes?: AgentMail.EventTypes;
     /** IDs of the inboxes that have been subscribed to. */
-    inboxIds: string[];
+    inboxIds?: string[];
+    /** IDs of the pods that have been subscribed to. */
+    podIds?: string[];
 }

package/dist/esm/auth/BearerAuthProvider.d.mts

@@ -0,0 +1,14 @@
+import * as core from "../core/index.mjs";
+export declare namespace BearerAuthProvider {
+    interface Options {
+        apiKey?: core.Supplier<core.BearerToken | undefined>;
+    }
+}
+export declare class BearerAuthProvider implements core.AuthProvider {
+    private readonly token;
+    constructor(options: BearerAuthProvider.Options);
+    static canCreate(options: BearerAuthProvider.Options): boolean;
+    getAuthRequest(_arg?: {
+        endpointMetadata?: core.EndpointMetadata;
+    }): Promise<core.AuthRequest>;
+}

package/dist/esm/auth/BearerAuthProvider.mjs

@@ -0,0 +1,35 @@
+// This file was auto-generated by Fern from our API Definition.
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import * as core from "../core/index.mjs";
+import * as errors from "../errors/index.mjs";
+export class BearerAuthProvider {
+    constructor(options) {
+        this.token = options.apiKey;
+    }
+    static canCreate(options) {
+        var _a;
+        return options.apiKey != null || ((_a = process.env) === null || _a === void 0 ? void 0 : _a.AGENTMAIL_API_KEY) != null;
+    }
+    getAuthRequest(_arg) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            const apiKey = (_a = (yield core.Supplier.get(this.token))) !== null && _a !== void 0 ? _a : (_b = process.env) === null || _b === void 0 ? void 0 : _b.AGENTMAIL_API_KEY;
+            if (apiKey == null) {
+                throw new errors.AgentMailError({
+                    message: "Please specify a apiKey by either passing it in to the constructor or initializing a AGENTMAIL_API_KEY environment variable",
+                });
+            }
+            return {
+                headers: { Authorization: `Bearer ${apiKey}` },
+            };
+        });
+    }
+}

package/dist/esm/auth/index.d.mts

@@ -0,0 +1 @@
+export { BearerAuthProvider } from "./BearerAuthProvider.mjs";

package/dist/esm/auth/index.mjs

@@ -0,0 +1 @@
+export { BearerAuthProvider } from "./BearerAuthProvider.mjs";

package/dist/esm/core/auth/AuthProvider.d.mts

@@ -1,4 +1,7 @@
+import type { EndpointMetadata } from "../fetcher/EndpointMetadata.mjs";
 import type { AuthRequest } from "./AuthRequest.mjs";
 export interface AuthProvider {
-    getAuthRequest(): Promise<AuthRequest>;
+    getAuthRequest(arg?: {
+        endpointMetadata?: EndpointMetadata;
+    }): Promise<AuthRequest>;
 }

package/dist/esm/core/auth/BearerToken.d.mts

@@ -1,5 +1,7 @@
 export type BearerToken = string;
+declare function toAuthorizationHeader(token: string | undefined): string | undefined;
 export declare const BearerToken: {
-    toAuthorizationHeader: (token: BearerToken | undefined) => string | undefined;
+    toAuthorizationHeader: typeof toAuthorizationHeader;
     fromAuthorizationHeader: (header: string) => BearerToken;
 };
+export {};