agentmail 0.1.6 → 0.1.7

package/dist/cjs/api/resources/threads/client/Client.js

@@ -43,7 +43,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Threads = void 0;
+exports.ThreadsClient = void 0;
+const BaseClient_js_1 = require("../../../../BaseClient.js");
 const headers_js_1 = require("../../../../core/headers.js");
 const core = __importStar(require("../../../../core/index.js"));
 const json_js_1 = require("../../../../core/json.js");
@@ -51,13 +52,13 @@ const environments = __importStar(require("../../../../environments.js"));
 const errors = __importStar(require("../../../../errors/index.js"));
 const serializers = __importStar(require("../../../../serialization/index.js"));
 const AgentMail = __importStar(require("../../../index.js"));
-class Threads {
-    constructor(_options = {}) {
-        this._options = _options;
+class ThreadsClient {
+    constructor(options = {}) {
+        this._options = (0, BaseClient_js_1.normalizeClientOptionsWithAuth)(options);
     }
     /**
      * @param {AgentMail.ListThreadsRequest} request
-     * @param {Threads.RequestOptions} requestOptions - Request-specific configuration.
+     * @param {ThreadsClient.RequestOptions} requestOptions - Request-specific configuration.
      *
      * @throws {@link AgentMail.NotFoundError}
      *
@@ -69,7 +70,7 @@ 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) {
@@ -95,7 +96,8 @@ class Threads {
             if (ascending != null) {
                 _queryParams.ascending = ascending.toString();
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)({ Authorization: yield this._getAuthorizationHeader() }), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.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",
@@ -104,6 +106,8 @@ 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 {
@@ -153,29 +157,32 @@ 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 = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.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 = (0, headers_js_1.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 {
@@ -227,15 +234,16 @@ 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 = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.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 = (0, headers_js_1.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,
@@ -243,6 +251,8 @@ 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 };
@@ -282,17 +292,5 @@ 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}`;
-        });
-    }
 }
-exports.Threads = Threads;
+exports.ThreadsClient = ThreadsClient;

package/dist/cjs/api/resources/webhooks/client/Client.d.ts

@@ -1,38 +1,39 @@
 import type { BaseClientOptions, BaseRequestOptions } from "../../../../BaseClient.js";
+import { type NormalizedClientOptionsWithAuth } from "../../../../BaseClient.js";
 import * as core from "../../../../core/index.js";
 import * as AgentMail from "../../../index.js";
-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/cjs/api/resources/webhooks/client/Client.js

@@ -43,20 +43,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Webhooks = void 0;
+exports.WebhooksClient = void 0;
+const BaseClient_js_1 = require("../../../../BaseClient.js");
 const headers_js_1 = require("../../../../core/headers.js");
 const core = __importStar(require("../../../../core/index.js"));
 const environments = __importStar(require("../../../../environments.js"));
 const errors = __importStar(require("../../../../errors/index.js"));
 const serializers = __importStar(require("../../../../serialization/index.js"));
 const AgentMail = __importStar(require("../../../index.js"));
-class Webhooks {
-    constructor(_options = {}) {
-        this._options = _options;
+class WebhooksClient {
+    constructor(options = {}) {
+        this._options = (0, BaseClient_js_1.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()
@@ -66,7 +67,7 @@ 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) {
@@ -75,7 +76,8 @@ class Webhooks {
             if (pageToken != null) {
                 _queryParams.page_token = pageToken;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.mergeOnlyDefinedHeaders)({ Authorization: yield this._getAuthorizationHeader() }), requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.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",
@@ -84,6 +86,8 @@ 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 {
@@ -122,29 +126,32 @@ 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 = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.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 = (0, headers_js_1.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 {
@@ -195,7 +202,7 @@ 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}
      *
@@ -210,8 +217,9 @@ class Webhooks {
     }
     __create(request, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
-            const _headers = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.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 = (0, headers_js_1.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",
@@ -228,6 +236,8 @@ 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 {
@@ -277,29 +287,32 @@ 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 = (0, headers_js_1.mergeHeaders)((_a = this._options) === null || _a === void 0 ? void 0 : _a.headers, (0, headers_js_1.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 = (0, headers_js_1.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 };
@@ -339,17 +352,5 @@ 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}`;
-        });
-    }
 }
-exports.Webhooks = Webhooks;
+exports.WebhooksClient = WebhooksClient;

package/dist/cjs/api/resources/webhooks/types/CreateWebhookRequest.d.ts

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

package/dist/cjs/api/resources/webhooks/types/Webhook.d.ts

@@ -2,7 +2,7 @@ import type * as AgentMail from "../../../index.js";
 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/cjs/api/resources/webhooks/types/index.d.ts

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

package/dist/cjs/api/resources/webhooks/types/index.js

@@ -16,8 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ClientId.js"), exports);
 __exportStar(require("./CreateWebhookRequest.js"), exports);
-__exportStar(require("./EventType.js"), exports);
-__exportStar(require("./EventTypes.js"), exports);
 __exportStar(require("./InboxIds.js"), exports);
 __exportStar(require("./ListWebhooksResponse.js"), exports);
 __exportStar(require("./Url.js"), exports);

package/dist/cjs/api/resources/websockets/client/Client.d.ts

@@ -1,6 +1,7 @@
 import type { BaseClientOptions } from "../../../../BaseClient.js";
+import { type NormalizedClientOptionsWithAuth } from "../../../../BaseClient.js";
 import { WebsocketsSocket } from "./Socket.js";
-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/cjs/api/resources/websockets/client/Client.js

@@ -43,15 +43,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Websockets = void 0;
+exports.WebsocketsClient = void 0;
+const BaseClient_js_1 = require("../../../../BaseClient.js");
 const headers_js_1 = require("../../../../core/headers.js");
 const core = __importStar(require("../../../../core/index.js"));
 const environments = __importStar(require("../../../../environments.js"));
-const errors = __importStar(require("../../../../errors/index.js"));
 const Socket_js_1 = require("./Socket.js");
-class Websockets {
-    constructor(_options = {}) {
-        this._options = _options;
+class WebsocketsClient {
+    constructor(options = {}) {
+        this._options = (0, BaseClient_js_1.normalizeClientOptionsWithAuth)(options);
     }
     connect() {
         return __awaiter(this, arguments, void 0, function* (args = {}) {
@@ -61,7 +61,8 @@ class Websockets {
             if (authToken != null) {
                 _queryParams.auth_token = authToken;
             }
-            const _headers = (0, headers_js_1.mergeHeaders)((0, headers_js_1.mergeOnlyDefinedHeaders)({ Authorization: yield this._getAuthorizationHeader() }), headers);
+            const _authRequest = yield this._options.authProvider.getAuthRequest();
+            const _headers = (0, headers_js_1.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: [],
@@ -72,17 +73,5 @@ class Websockets {
             return new Socket_js_1.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}`;
-        });
-    }
 }
-exports.Websockets = Websockets;
+exports.WebsocketsClient = WebsocketsClient;

package/dist/cjs/api/resources/websockets/client/Socket.d.ts

@@ -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/cjs/api/resources/websockets/types/Subscribe.d.ts

@@ -1,5 +1,9 @@
+import type * as AgentMail from "../../../index.js";
 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/cjs/api/resources/websockets/types/Subscribed.d.ts

@@ -1,5 +1,9 @@
+import type * as AgentMail from "../../../index.js";
 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/cjs/auth/BearerAuthProvider.d.ts

@@ -0,0 +1,14 @@
+import * as core from "../core/index.js";
+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>;
+}