mailchannels-sdk 0.6.1 → 0.7.0

package/dist/mailchannels.mjs

@@ -50,6 +50,12 @@ var ErrorCode = /* @__PURE__ */ ((ErrorCode2) => {
   ErrorCode2[ErrorCode2["UnprocessableEntity"] = 422] = "UnprocessableEntity";
   return ErrorCode2;
 })(ErrorCode || {});
+const createError = (message, statusCode = null) => {
+  return {
+    message,
+    statusCode
+  };
+};
 const getStatusError = (response, errors = {}) => {
   const statusText = errors[response.status] || "Unknown error.";
   const payload = response._data ?? response.data;
@@ -61,12 +67,11 @@ const getStatusError = (response, errors = {}) => {
   } else if (Array.isArray(payload?.errors) && payload.errors?.length) {
     details = payload.errors.join(", ");
   }
-  return details ? `${statusText} ${details}` : statusText;
+  return createError(details ? `${statusText} ${details}` : statusText, response.status ?? null);
+};
+const getResultError = (e, fallback) => {
+  return createError(e instanceof Error ? e.message : fallback);
 };
-function getResultError(result, error, fallback) {
-  if (result.error) return result.error;
-  return error instanceof Error ? error.message : fallback;
-}
 
 const isValidEmail = (email) => {
   return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email);
@@ -125,13 +130,13 @@ const clean = (data) => {
 };
 const validateLimit = (limit, max) => {
   if (typeof limit === "number" && (limit < 1 || max && limit > max)) {
-    return "The limit value " + (max ? `must be between 1 and ${max}.` : "is invalid. Only positive values are allowed.");
+    return createError("The limit value " + (max ? `must be between 1 and ${max}.` : "is invalid. Only positive values are allowed."));
   }
   return null;
 };
 const validateOffset = (offset) => {
   if (typeof offset === "number" && offset < 0) {
-    return "Offset must be greater than or equal to 0.";
+    return createError("Offset must be greater than or equal to 0.");
   }
   return null;
 };
@@ -159,21 +164,21 @@ class Emails {
    * ```
    */
   async send(options, dryRun = false) {
+    let error = null;
     const { cc, bcc, from, to, html, text, mustaches, dkim } = options;
-    const result = { success: false, data: null, error: null };
     const parsedFrom = parseRecipient(from);
     if (!parsedFrom || !parsedFrom.email) {
-      result.error = "No sender provided. Use the `from` option to specify a sender";
-      return result;
+      error = createError("No sender provided. Use the `from` option to specify a sender");
+      return { success: false, data: null, error };
     }
     const parsedTo = parseArrayRecipients(to);
     if (!parsedTo || !parsedTo.length) {
-      result.error = "No recipients provided. Use the `to` option to specify at least one recipient";
-      return result;
+      error = createError("No recipients provided. Use the `to` option to specify at least one recipient");
+      return { success: false, data: null, error };
     }
     if (!text && !html) {
-      result.error = "No email content provided";
-      return result;
+      error = createError("No email content provided");
+      return { success: false, data: null, error };
     }
     const content = [];
     const template_type = mustaches ? "mustache" : void 0;
@@ -205,33 +210,29 @@ class Emails {
     const response = await this.mailchannels.post("/tx/v1/send", {
       query: { "dry-run": dryRun },
       body: payload,
-      onResponse: async ({ response: response2 }) => {
-        if (response2.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response2, {
+      onResponseError: async ({ response: response2 }) => {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: "Bad Request.",
           [ErrorCode.Forbidden]: "User does not have access to this feature.",
           [ErrorCode.PayloadTooLarge]: "The total message size should not exceed 30MB. This includes the message itself, headers, and the combined size of any attachments."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to send email.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to send email.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { success: false, data: null, error };
+    const data = clean({
       rendered: response.data,
       requestId: response.request_id,
-      results: response.results?.map((result2) => ({
-        index: result2.index,
-        messageId: result2.message_id,
-        reason: result2.reason,
-        status: result2.status
+      results: response.results?.map((result) => ({
+        index: result.index,
+        messageId: result.message_id,
+        reason: result.reason,
+        status: result.status
       }))
     });
-    return result;
+    return { success: !!data, data, error: null };
   }
   /**
    * Validates a domain's email authentication setup by retrieving its DKIM, SPF, and Domain Lockdown status. This endpoint checks whether the domain is properly configured for secure email delivery.
@@ -251,9 +252,9 @@ class Emails {
    * ```
    */
   async checkDomain(options) {
+    let error = null;
     const { dkim, domain, senderId } = options;
     const dkimOptions = dkim ? Array.isArray(dkim) ? dkim : [dkim] : void 0;
-    const result = { data: null, error: null };
     const payload = {
       dkim_settings: dkimOptions?.map(({ domain: domain2, privateKey, selector }) => ({
         dkim_domain: domain2,
@@ -266,17 +267,17 @@ class Emails {
     const response = await this.mailchannels.post("/tx/v1/check-domain", {
       body: payload,
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: "Bad Request.",
           [ErrorCode.Forbidden]: "User does not have access to this feature."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to check domain.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to check domain.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       dkim: response.check_results.dkim.map((dkimResults) => ({
         domain: dkimResults.dkim_domain,
         keyStatus: dkimResults.dkim_key_status,
@@ -289,7 +290,7 @@ class Emails {
       spf: response.check_results.spf,
       references: response.references
     });
-    return result;
+    return { data, error: null };
   }
   /**
    * Create a DKIM key pair for a specified domain and selector using the specified algorithm and key length, for the current customer.
@@ -304,11 +305,11 @@ class Emails {
    * ```
    */
   async createDkimKey(domain, options) {
-    const result = { data: null, error: null };
+    let error = null;
     if (!options.selector || options.selector.length > 63) {
-      result.error = "Selector must be between 1 and 63 characters.";
+      error = createError("Selector must be between 1 and 63 characters.");
+      return { data: null, error };
     }
-    if (result.error) return result;
     const payload = {
       algorithm: options.algorithm,
       key_length: options.length,
@@ -317,17 +318,17 @@ class Emails {
     const response = await this.mailchannels.post(`/tx/v1/domains/${domain}/dkim-keys`, {
       body: payload,
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: "Bad Request.",
           [ErrorCode.Conflict]: "Key pair already created for domain, and selector."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to create DKIM key.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to create DKIM key.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       algorithm: response.algorithm,
       createdAt: response.created_at,
       dnsRecords: response.dkim_dns_records,
@@ -340,7 +341,7 @@ class Emails {
       status: response.status,
       statusModifiedAt: response.status_modified_at
     });
-    return result;
+    return { data, error: null };
   }
   /**
    * Search for DKIM keys by domain, with optional filters. If selector is provided, at most one key will be returned.
@@ -355,13 +356,13 @@ class Emails {
    * ```
    */
   async getDkimKeys(domain, options) {
-    const result = { data: null, error: null };
+    let error = null;
     if (options?.selector && options.selector.length > 63) {
-      result.error = "Selector must be between 1 and 63 characters.";
-      return result;
+      error = createError("Selector must be between 1 and 63 characters.");
+      return { data: null, error };
     }
-    result.error = validateLimit(options?.limit, 100) || validateOffset(options?.offset);
-    if (result.error) return result;
+    error = validateLimit(options?.limit, 100) || validateOffset(options?.offset);
+    if (error) return { data: null, error };
     const payload = {
       selector: options?.selector,
       status: options?.status,
@@ -372,16 +373,16 @@ class Emails {
     const response = await this.mailchannels.get(`/tx/v1/domains/${domain}/dkim-keys`, {
       query: payload,
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: "Bad Request."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch DKIM keys.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch DKIM keys.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean(response.keys.map((key) => ({
+    if (!response) return { data: null, error };
+    const data = clean(response.keys.map((key) => ({
       algorithm: key.algorithm,
       createdAt: key.created_at,
       dnsRecords: key.dkim_dns_records,
@@ -394,7 +395,7 @@ class Emails {
       status: key.status,
       statusModifiedAt: key.status_modified_at
     })));
-    return result;
+    return { data, error: null };
   }
   /**
    * Update fields of an existing DKIM key pair for the specified domain and selector, for the current customer. Currently, only the `status` field can be updated.
@@ -409,31 +410,26 @@ class Emails {
    * })
    */
   async updateDkimKey(domain, options) {
-    const result = { success: false, error: null };
+    let error = null;
     if (!options.selector || options.selector.length > 63) {
-      result.error = "Selector must be between 1 and 63 characters.";
-      return result;
+      error = createError("Selector must be between 1 and 63 characters.");
+      return { success: false, error };
     }
     const payload = {
       status: options.status
     };
     await this.mailchannels.patch(`/tx/v1/domains/${domain}/dkim-keys/${options.selector}`, {
       body: payload,
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response, {
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response, {
           [ErrorCode.BadRequest]: "Bad Request.",
           [ErrorCode.NotFound]: "Specified key pair not found, or no active key for rotation. This may also occur if the DKIM domain or selector path parameter is missing."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to update DKIM key.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to update DKIM key.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Rotate an active DKIM key pair. Mark the original key as `rotated`, and create a new key pair with the required new key selector, reusing the same algorithm and key length. The rotated key remains valid for signing for a 3-day grace period, and is automatically changed to `retired` 2 weeks after rotation. Publish the new key to its DNS TXT record before rotated key expires for signing as emails sent with an unpublished key will fail DKIM validation by receiving providers. After the grace period, only the new key is valid for signing if published.
@@ -452,14 +448,14 @@ class Emails {
    * ```
    */
   async rotateDkimKey(domain, selector, options) {
-    const result = { data: null, error: null };
+    let error = null;
     if (!selector || selector.length > 63) {
-      result.error = "Selector must be between 1 and 63 characters.";
-      return result;
+      error = createError("Selector must be between 1 and 63 characters.");
+      return { data: null, error };
     }
     if (!options.newKey.selector || options.newKey.selector.length > 63) {
-      result.error = "New key selector must be between 1 and 63 characters.";
-      return result;
+      error = createError("New key selector must be between 1 and 63 characters.");
+      return { data: null, error };
     }
     const payload = {
       new_key: {
@@ -469,18 +465,18 @@ class Emails {
     const response = await this.mailchannels.post(`/tx/v1/domains/${domain}/dkim-keys/${selector}/rotate`, {
       body: payload,
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: "Bad Request.",
           [ErrorCode.NotFound]: "Specified key pair not found.",
           [ErrorCode.Conflict]: "Key pair already created for domain, and provided new key selector."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to rotate DKIM key.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to rotate DKIM key.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       new: {
         algorithm: response.new_key.algorithm,
         createdAt: response.new_key.created_at,
@@ -508,7 +504,7 @@ class Emails {
         statusModifiedAt: response.rotated_key.status_modified_at
       }
     });
-    return result;
+    return { data, error: null };
   }
 }
 
@@ -526,33 +522,28 @@ class Webhooks {
    * ```
    */
   async enroll(endpoint) {
-    const result = { success: false, error: null };
+    let error = null;
     if (!endpoint) {
-      result.error = "No endpoint provided.";
-      return result;
+      error = createError("No endpoint provided.");
+      return { success: false, error };
     }
     if (endpoint.length > 8e3) {
-      result.error = "The endpoint exceeds the maximum length of 8000 characters.";
-      return result;
+      error = createError("The endpoint exceeds the maximum length of 8000 characters.");
+      return { success: false, error };
     }
     await this.mailchannels.post("/tx/v1/webhook", {
       query: {
         endpoint
       },
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response, {
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response, {
           [ErrorCode.Conflict]: `Endpoint '${endpoint}' is already enrolled to receive notifications.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to enroll webhook.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to enroll webhook.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Retrieves all registered webhook endpoints associated with the customer.
@@ -563,18 +554,18 @@ class Webhooks {
    * ```
    */
   async list() {
-    const result = { data: null, error: null };
+    let error = null;
     const response = await this.mailchannels.get("/tx/v1/webhook", {
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2);
+        error = getStatusError(response2);
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch webhooks.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch webhooks.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean(response.map(({ webhook }) => webhook));
-    return result;
+    if (!response) return { data: null, error };
+    const data = clean(response.map(({ webhook }) => webhook));
+    return { data, error: null };
   }
   /**
    * Deletes all registered webhook endpoints for the customer.
@@ -585,20 +576,15 @@ class Webhooks {
    * ```
    */
   async delete() {
-    const result = { success: false, error: null };
+    let error = null;
     await this.mailchannels.delete("/tx/v1/webhook", {
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (!response.ok) {
-          result.error = getStatusError(response);
-          return;
-        }
-        result.success = true;
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response);
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to delete webhooks.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to delete webhooks.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Retrieves the public key used to verify signatures on incoming webhook payloads.
@@ -610,24 +596,24 @@ class Webhooks {
    * ```
    */
   async getSigningKey(id) {
-    const result = { data: null, error: null };
+    let error = null;
     const response = await this.mailchannels.get("/tx/v1/webhook/public-key", {
       query: {
         id
       },
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: "Bad Request.",
           [ErrorCode.NotFound]: `The key '${id}' is not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to get signing key.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to get signing key.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({ key: response.key });
-    return result;
+    if (!response) return { data: null, error };
+    const data = clean({ key: response.key });
+    return { data, error: null };
   }
   /**
    * Validates whether your enrolled webhook(s) respond with an HTTP `2xx` status code. Sends a test request to each webhook containing your customer handle, a hardcoded event type (`test`), a hardcoded sender email (`test@mailchannels.com`), a timestamp, a request ID (provided or generated), and an SMTP ID. The response includes the HTTP status code and body returned by each webhook.
@@ -639,31 +625,31 @@ class Webhooks {
    * ```
    */
   async validate(requestId) {
-    const result = { data: null, error: null };
+    let error = null;
     if (requestId && requestId.length > 28) {
-      result.error = "The request id should not exceed 28 characters.";
-      return result;
+      error = createError("The request id should not exceed 28 characters.");
+      return { data: null, error };
     }
     const response = await this.mailchannels.post("/tx/v1/webhook/validate", {
       body: {
         request_id: requestId
       },
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: "Bad Request.",
           [ErrorCode.NotFound]: "No webhooks found for the account."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to validate webhooks.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to validate webhooks.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       allPassed: response.all_passed,
       results: response.results
     });
-    return result;
+    return { data, error: null };
   }
 }
 
@@ -684,17 +670,17 @@ class SubAccounts {
    * ```
    */
   async create(companyName, handle) {
-    const result = { data: null, error: null };
+    let error = null;
     const isValidCompany = SubAccounts.COMPANY_PATTERN.test(companyName);
     if (!isValidCompany) {
-      result.error = "Invalid company name. Company name must be between 3 and 128 characters.";
-      return result;
+      error = createError("Invalid company name. Company name must be between 3 and 128 characters.");
+      return { data: null, error };
     }
     if (handle) {
       const isValidHandle = SubAccounts.HANDLE_PATTERN.test(handle);
       if (!isValidHandle) {
-        result.error = "Invalid handle. Sub-account handle must be between 3 and 128 characters and contain only lowercase letters and numbers.";
-        return result;
+        error = createError("Invalid handle. Sub-account handle must be between 3 and 128 characters and contain only lowercase letters and numbers.");
+        return { data: null, error };
       }
     }
     const response = await this.mailchannels.post("/tx/v1/sub-account", {
@@ -703,22 +689,22 @@ class SubAccounts {
         handle
       },
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.Forbidden]: "The parent account does not have permission to create sub-accounts.",
           [ErrorCode.Conflict]: `Sub-account with handle '${handle}' already exists.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to create sub-account.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to create sub-account.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       companyName: response.company_name,
       enabled: response.enabled,
       handle: response.handle
     });
-    return result;
+    return { data, error: null };
   }
   /**
    * Retrieves all sub-accounts associated with the parent account. The response is paginated with a default limit of 1000 sub-accounts per page and an offset of 0.
@@ -730,25 +716,25 @@ class SubAccounts {
    * ```
    */
   async list(options) {
-    const result = { data: null, error: null };
-    result.error = validateLimit(options?.limit, 1e3) || validateOffset(options?.offset);
-    if (result.error) return result;
+    let error = null;
+    error = validateLimit(options?.limit, 1e3) || validateOffset(options?.offset);
+    if (error) return { data: null, error };
     const response = await this.mailchannels.get("/tx/v1/sub-account", {
       query: options,
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2);
+        error = getStatusError(response2);
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch sub-accounts.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch sub-accounts.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean(response.map((account) => ({
+    if (!response) return { data: null, error };
+    const data = clean(response.map((account) => ({
       companyName: account.company_name,
       enabled: account.enabled,
       handle: account.handle
     })));
-    return result;
+    return { data, error: null };
   }
   /**
    * Deletes the sub-account identified by its handle.
@@ -759,24 +745,19 @@ class SubAccounts {
    * ```
    */
   async delete(handle) {
-    const result = { success: false, error: null };
+    let error = null;
     if (!handle) {
-      result.error = "No handle provided.";
-      return result;
+      error = createError("No handle provided.");
+      return { success: false, error };
     }
     await this.mailchannels.delete(`/tx/v1/sub-account/${handle}`, {
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (!response.ok) {
-          result.error = getStatusError(response);
-          return;
-        }
-        result.success = true;
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response);
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to delete sub-account.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to delete sub-account.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Suspends the sub-account identified by its handle. This action disables the account, preventing it from sending any emails until it is reactivated.
@@ -788,26 +769,21 @@ class SubAccounts {
    * ```
    */
   async suspend(handle) {
-    const result = { success: false, error: null };
+    let error = null;
     if (!handle) {
-      result.error = "No handle provided.";
-      return result;
+      error = createError("No handle provided.");
+      return { success: false, error };
     }
     await this.mailchannels.post(`/tx/v1/sub-account/${handle}/suspend`, {
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response, {
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response, {
           [ErrorCode.NotFound]: `The specified sub-account '${handle}' does not exist.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to suspend sub-account.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to suspend sub-account.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Activates a suspended sub-account identified by its handle, restoring its ability to send emails.
@@ -819,27 +795,22 @@ class SubAccounts {
    * ```
    */
   async activate(handle) {
-    const result = { success: false, error: null };
+    let error = null;
     if (!handle) {
-      result.error = "No handle provided.";
-      return result;
+      error = createError("No handle provided.");
+      return { success: false, error };
     }
     await this.mailchannels.post(`/tx/v1/sub-account/${handle}/activate`, {
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response, {
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response, {
           [ErrorCode.Forbidden]: "The parent account does not have permission to activate the sub-account.",
           [ErrorCode.NotFound]: `The specified sub-account '${handle}' does not exist.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to activate sub-account.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to activate sub-account.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Creates a new API key for the specified sub-account.
@@ -851,29 +822,29 @@ class SubAccounts {
    * ```
    */
   async createApiKey(handle) {
-    const result = { data: null, error: null };
+    let error = null;
     if (!handle) {
-      result.error = "No handle provided.";
-      return result;
+      error = createError("No handle provided.");
+      return { data: null, error };
     }
     const response = await this.mailchannels.post(`/tx/v1/sub-account/${handle}/api-key`, {
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.Forbidden]: "You can't create API keys for this sub-account.",
           [ErrorCode.NotFound]: `Sub-account with handle '${handle}' not found.`,
           [ErrorCode.UnprocessableEntity]: "You have reached the limit of API keys you can create for this sub-account."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to create sub-account API key.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to create sub-account API key.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       id: response.id,
       value: response.key
     });
-    return result;
+    return { data, error: null };
   }
   /**
    * Retrieves details of all API keys associated with the specified sub-account. For security reasons, the full API key is not returned; only the key ID and a partially redacted version are provided.
@@ -886,29 +857,29 @@ class SubAccounts {
    * ```
    */
   async listApiKeys(handle, options) {
-    const result = { data: null, error: null };
+    let error = null;
     if (!handle) {
-      result.error = "No handle provided.";
-      return result;
+      error = createError("No handle provided.");
+      return { data: null, error };
     }
-    result.error = validateLimit(options?.limit, 1e3) || validateOffset(options?.offset);
-    if (result.error) return result;
+    error = validateLimit(options?.limit, 1e3) || validateOffset(options?.offset);
+    if (error) return { data: null, error };
     const response = await this.mailchannels.get(`/tx/v1/sub-account/${handle}/api-key`, {
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.NotFound]: `Sub-account with handle '${handle}' not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch sub-account API keys.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch sub-account API keys.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean(response.map((key) => ({
+    if (!response) return { data: null, error };
+    const data = clean(response.map((key) => ({
       id: key.id,
       value: key.key
     })));
-    return result;
+    return { data, error: null };
   }
   /**
    * Deletes the API key identified by its ID for the specified sub-account.
@@ -921,26 +892,21 @@ class SubAccounts {
    * ```
    */
   async deleteApiKey(handle, id) {
-    const result = { success: false, error: null };
+    let error = null;
     if (!handle) {
-      result.error = "No handle provided.";
-      return result;
+      error = createError("No handle provided.");
+      return { success: false, error };
     }
     await this.mailchannels.delete(`/tx/v1/sub-account/${handle}/api-key/${id}`, {
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response, {
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response, {
           [ErrorCode.BadRequest]: "Missing or invalid API key ID."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to delete sub-account API key.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to delete sub-account API key.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Creates a new SMTP password for the specified sub-account.
@@ -952,30 +918,30 @@ class SubAccounts {
    * ```
    */
   async createSmtpPassword(handle) {
-    const result = { data: null, error: null };
+    let error = null;
     if (!handle) {
-      result.error = "No handle provided.";
-      return result;
+      error = createError("No handle provided.");
+      return { data: null, error };
     }
     const response = await this.mailchannels.post(`/tx/v1/sub-account/${handle}/smtp-password`, {
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.Forbidden]: "You can't create SMTP passwords for this sub-account.",
           [ErrorCode.NotFound]: `Sub-account with handle '${handle}' not found.`,
           [ErrorCode.UnprocessableEntity]: "You have reached the limit of SMTP passwords you can create for this sub-account."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to create sub-account SMTP password.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to create sub-account SMTP password.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       enabled: response.enabled,
       id: response.id,
       value: response.smtp_password
     });
-    return result;
+    return { data, error: null };
   }
   /**
    * Retrieves details of all SMTP passwords associated with the specified sub-account. For security, the full SMTP password is not returned; only the password ID and a partially redacted version are provided.
@@ -987,28 +953,28 @@ class SubAccounts {
    * ```
    */
   async listSmtpPasswords(handle) {
-    const result = { data: null, error: null };
+    let error = null;
     if (!handle) {
-      result.error = "No handle provided.";
-      return result;
+      error = createError("No handle provided.");
+      return { data: null, error };
     }
     const response = await this.mailchannels.get(`/tx/v1/sub-account/${handle}/smtp-password`, {
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.NotFound]: `Sub-account with handle '${handle}' not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch sub-account SMTP passwords.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch sub-account SMTP passwords.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean(response.map((password) => ({
+    if (!response) return { data: null, error };
+    const data = clean(response.map((password) => ({
       enabled: password.enabled,
       id: password.id,
       value: password.smtp_password
     })));
-    return result;
+    return { data, error: null };
   }
   /**
    * Deletes the SMTP password identified by its ID for the specified sub-account.
@@ -1021,26 +987,21 @@ class SubAccounts {
    * ```
    */
   async deleteSmtpPassword(handle, id) {
-    const result = { success: false, error: null };
+    let error = null;
     if (!handle) {
-      result.error = "No handle provided.";
-      return result;
+      error = createError("No handle provided.");
+      return { success: false, error };
     }
     await this.mailchannels.delete(`/tx/v1/sub-account/${handle}/smtp-password/${id}`, {
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response, {
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response, {
           [ErrorCode.BadRequest]: "Missing or invalid SMTP password ID."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to delete sub-account SMTP password.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to delete sub-account SMTP password.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Retrieves the limit of a specified sub-account. A value of `-1` indicates that the sub-account inherits the parent account's limit, allowing the sub-account to utilize any remaining capacity within the parent account's allocation.
@@ -1052,24 +1013,24 @@ class SubAccounts {
    * ```
    */
   async getLimit(handle) {
-    const result = { data: null, error: null };
+    let error = null;
     if (!handle) {
-      result.error = "No handle provided.";
-      return result;
+      error = createError("No handle provided.");
+      return { data: null, error };
     }
     const response = await this.mailchannels.get(`/tx/v1/sub-account/${handle}/limit`, {
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.NotFound]: `Sub-account with handle '${handle}' not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch sub-account limit.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch sub-account limit.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean(response);
-    return result;
+    if (!response) return { data: null, error };
+    const data = clean(response);
+    return { data, error: null };
   }
   /**
    * Sets the limit for the specified sub-account.
@@ -1082,28 +1043,23 @@ class SubAccounts {
    * ```
    */
   async setLimit(handle, limit) {
-    const result = { success: false, error: null };
+    let error = null;
     if (!handle) {
-      result.error = "No handle provided.";
-      return result;
+      error = createError("No handle provided.");
+      return { success: false, error };
     }
     await this.mailchannels.put(`/tx/v1/sub-account/${handle}/limit`, {
       body: limit,
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response, {
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response, {
           [ErrorCode.BadRequest]: "Bad Request.",
           [ErrorCode.NotFound]: `Sub-account with handle '${handle}' not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to set sub-account limit.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to set sub-account limit.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Deletes the limit for the specified sub-account. After a successful deletion, the specified sub-account will be limited to the parent account's limit.
@@ -1115,26 +1071,21 @@ class SubAccounts {
    * ```
    */
   async deleteLimit(handle) {
-    const result = { success: false, error: null };
+    let error = null;
     if (!handle) {
-      result.error = "No handle provided.";
-      return result;
+      error = createError("No handle provided.");
+      return { success: false, error };
     }
     await this.mailchannels.delete(`/tx/v1/sub-account/${handle}/limit`, {
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response, {
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response, {
           [ErrorCode.NotFound]: `Sub-account with handle '${handle}' not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to delete sub-account limit.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to delete sub-account limit.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Retrieves usage statistics for the specified sub-account during the current billing period.
@@ -1146,28 +1097,28 @@ class SubAccounts {
    * ```
    */
   async getUsage(handle) {
-    const result = { data: null, error: null };
+    let error = null;
     if (!handle) {
-      result.error = "No handle provided.";
-      return result;
+      error = createError("No handle provided.");
+      return { data: null, error };
     }
     const response = await this.mailchannels.get(`/tx/v1/sub-account/${handle}/usage`, {
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.NotFound]: `Sub-account with handle '${handle}' not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch sub-account usage.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch sub-account usage.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       endDate: response.period_end_date,
       startDate: response.period_start_date,
       total: response.total_usage
     });
-    return result;
+    return { data, error: null };
   }
 }
 
@@ -1185,7 +1136,7 @@ class Metrics {
    * ```
    */
   async engagement(options) {
-    const result = { data: null, error: null };
+    let error = null;
     const response = await this.mailchannels.get("/tx/v1/metrics/engagement", {
       query: {
         start_time: options?.startTime,
@@ -1194,16 +1145,16 @@ class Metrics {
         interval: options?.interval
       },
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: "Bad Request."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch engagement metrics.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch engagement metrics.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       buckets: {
         click: mapBuckets(response.buckets.click),
         clickTrackingDelivered: mapBuckets(response.buckets.click_tracking_delivered),
@@ -1217,7 +1168,7 @@ class Metrics {
       openTrackingDelivered: response.open_tracking_delivered,
       startTime: response.start_time
     });
-    return result;
+    return { data, error: null };
   }
   /**
    * Retrieve performance metrics for messages sent from your account, including counts of processed, delivered, hard-bounced events. Supports optional filters for time range, and campaign ID.
@@ -1229,7 +1180,7 @@ class Metrics {
    * ```
    */
   async performance(options) {
-    const result = { data: null, error: null };
+    let error = null;
     const response = await this.mailchannels.get("/tx/v1/metrics/performance", {
       query: {
         start_time: options?.startTime,
@@ -1238,16 +1189,16 @@ class Metrics {
         interval: options?.interval
       },
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: "Bad Request."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch performance metrics.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch performance metrics.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       bounced: response.bounced,
       buckets: {
         bounced: mapBuckets(response.buckets.bounced),
@@ -1259,7 +1210,7 @@ class Metrics {
       processed: response.processed,
       startTime: response.start_time
     });
-    return result;
+    return { data, error: null };
   }
   /**
    * Retrieve recipient behaviour metrics for messages sent from your account, including counts of unsubscribed events. Supports optional filters for time range, and campaign ID.
@@ -1271,7 +1222,7 @@ class Metrics {
    * ```
    */
   async recipientBehaviour(options) {
-    const result = { data: null, error: null };
+    let error = null;
     const response = await this.mailchannels.get("/tx/v1/metrics/recipient-behaviour", {
       query: {
         start_time: options?.startTime,
@@ -1280,16 +1231,16 @@ class Metrics {
         interval: options?.interval
       },
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: "Bad Request."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch recipient behaviour metrics.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch recipient behaviour metrics.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       buckets: {
         unsubscribeDelivered: mapBuckets(response.buckets.unsubscribe_delivered),
         unsubscribed: mapBuckets(response.buckets.unsubscribed)
@@ -1299,7 +1250,7 @@ class Metrics {
       unsubscribeDelivered: response.unsubscribe_delivered,
       unsubscribed: response.unsubscribed
     });
-    return result;
+    return { data, error: null };
   }
   /**
    * Retrieve volume metrics for messages sent from your account, including counts of processed, delivered and dropped events. Supports optional filters for time range and campaign ID.
@@ -1311,7 +1262,7 @@ class Metrics {
    * ```
    */
   async volume(options) {
-    const result = { data: null, error: null };
+    let error = null;
     const response = await this.mailchannels.get("/tx/v1/metrics/volume", {
       query: {
         start_time: options?.startTime,
@@ -1320,16 +1271,16 @@ class Metrics {
         interval: options?.interval
       },
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: "Bad Request."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch volume metrics.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch volume metrics.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       buckets: {
         delivered: mapBuckets(response.buckets.delivered),
         dropped: mapBuckets(response.buckets.dropped),
@@ -1341,7 +1292,7 @@ class Metrics {
       processed: response.processed,
       startTime: response.start_time
     });
-    return result;
+    return { data, error: null };
   }
   /**
    * Retrieves usage statistics during the current billing period.
@@ -1352,22 +1303,22 @@ class Metrics {
    * ```
    */
   async usage() {
-    const result = { data: null, error: null };
+    let error = null;
     const response = await this.mailchannels.get("/tx/v1/usage", {
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2);
+        error = getStatusError(response2);
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch usage metrics.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch usage metrics.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       endDate: response.period_end_date,
       startDate: response.period_start_date,
       total: response.total_usage
     });
-    return result;
+    return { data, error: null };
   }
   /**
    * Retrieves a list of senders, either sub-accounts or campaigns, with their associated message metrics. Sorted by total # of sent messages (processed + dropped). Supports optional filter for time range, and optional settings for limit, offset, and sort order. Note: senders without any messages in the given time range will not be included in the results. The default time range is from one month ago to now, and the default sort order is descending.
@@ -1380,9 +1331,9 @@ class Metrics {
    * ```
    */
   async senders(type, options) {
-    const result = { data: null, error: null };
-    result.error = validateLimit(options?.limit, 1e3) || validateOffset(options?.offset);
-    if (result.error) return result;
+    let error = null;
+    error = validateLimit(options?.limit, 1e3) || validateOffset(options?.offset);
+    if (error) return { data: null, error };
     const response = await this.mailchannels.get(`/tx/v1/metrics/senders/${type}`, {
       query: {
         start_time: options?.startTime,
@@ -1392,16 +1343,16 @@ class Metrics {
         sort_order: options?.sortOrder
       },
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: "Bad Request."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch senders metrics.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch senders metrics.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       endTime: response.end_time,
       limit: response.limit,
       offset: response.offset,
@@ -1409,7 +1360,7 @@ class Metrics {
       startTime: response.start_time,
       total: response.total
     });
-    return result;
+    return { data, error: null };
   }
 }
 
@@ -1428,7 +1379,7 @@ class Suppressions {
    * });
    */
   async create(options) {
-    const result = { success: false, error: null };
+    let error = null;
     const { addToSubAccounts, entries } = options;
     const payload = {
       add_to_sub_accounts: addToSubAccounts,
@@ -1441,22 +1392,17 @@ class Suppressions {
     };
     await this.mailchannels.post("/tx/v1/suppression-list", {
       body: payload,
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response, {
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response, {
           [ErrorCode.BadRequest]: "Bad Request.",
           [ErrorCode.Conflict]: "Conflict. One or more suppression entries in the request already exist and cannot be created again.",
           [ErrorCode.PayloadTooLarge]: "Payload too large. The request exceeds the maximum allowed total of 1000 suppression entries for the parent account and/or its sub-accounts."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to create suppression entries.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to create suppression entries.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Deletes suppression entry associated with the account based on the specified recipient and source.
@@ -1469,25 +1415,20 @@ class Suppressions {
    * ```
    */
   async delete(recipient, source) {
-    const result = { success: false, error: null };
+    let error = null;
     await this.mailchannels.delete(`/tx/v1/suppression-list/recipients/${recipient}`, {
       query: {
         source
       },
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response, {
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response, {
           [ErrorCode.BadRequest]: "Bad Request."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to delete suppression entry.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to delete suppression entry.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Retrieve suppression entries associated with the specified account. Supports filtering by recipient, source and creation date range. The response is paginated, with a default limit of `1000` entries per page and an offset of `0`.
@@ -1499,9 +1440,9 @@ class Suppressions {
    * @param options - Options to filter and customize the suppression entries retrieval.
    */
   async list(options) {
-    const result = { data: null, error: null };
-    result.error = validateLimit(options?.limit, 1e3) || validateOffset(options?.offset);
-    if (result.error) return result;
+    let error = null;
+    error = validateLimit(options?.limit, 1e3) || validateOffset(options?.offset);
+    if (error) return { data: null, error };
     const payload = {
       recipient: options?.recipient,
       source: options?.source,
@@ -1513,16 +1454,16 @@ class Suppressions {
     const response = await this.mailchannels.get("/tx/v1/suppression-list", {
       query: payload,
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: "Bad Request."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch suppression entries.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch suppression entries.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean(response.suppression_list.map((entry) => ({
+    if (!response) return { data: null, error };
+    const data = clean(response.suppression_list.map((entry) => ({
       createdAt: entry.created_at,
       notes: entry.notes,
       recipient: entry.recipient,
@@ -1530,7 +1471,7 @@ class Suppressions {
       source: entry.source,
       types: entry.suppression_types
     })));
-    return result;
+    return { data, error: null };
   }
 }
 
@@ -1551,8 +1492,8 @@ class Domains {
    * ```
    */
   async provision(options) {
+    let error = null;
     const { associateKey, overwrite, ...payload } = options;
-    const result = { data: null, error: null };
     const response = await this.mailchannels.post("/inbound/v1/domains", {
       query: {
         "associate-key": associateKey,
@@ -1560,18 +1501,19 @@ class Domains {
       },
       body: payload,
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: "Bad Request, returned in the case that an error occurs while converting an A-label domain to a U-label domain name.",
           [ErrorCode.Forbidden]: "The limit on associated domains is reached or you are attempting to associate a domain with a subscription that is not your own.",
           [ErrorCode.Conflict]: `The domain '${options.domain}' is already provisioned, and is associated with a different customer.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to provision domain.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to provision domain.");
       return null;
     });
-    result.data = clean(response);
-    return result;
+    if (!response) return { data: null, error };
+    const data = clean(response);
+    return { data, error: null };
   }
   /**
    * Provision up to 1000 domains to use MailChannels Inbound.
@@ -1594,15 +1536,15 @@ class Domains {
    * ```
    */
   async bulkProvision(options, domains) {
+    let error = null;
     const { associateKey, overwrite, subscriptionHandle } = options;
-    const result = { data: null, error: null };
     if (!domains || !domains.length) {
-      result.error = "No domains provided.";
-      return result;
+      error = createError("No domains provided.");
+      return { data: null, error };
     }
     if (domains.length > 1e3) {
-      result.error = "The maximum number of domains to be provisioned is 1000.";
-      return result;
+      error = createError("The maximum number of domains to be provisioned is 1000.");
+      return { data: null, error };
     }
     const response = await this.mailchannels.post("/inbound/v1/domains/batch", {
       query: {
@@ -1612,18 +1554,18 @@ class Domains {
       },
       body: { domains },
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: "Bad Request, returned in the case that a domain name fails RFC 5891 validation.",
           [ErrorCode.Forbidden]: "The limit on associated domains is reached or you are attempting to associate a domain with a subscription that is not your own."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to provision domains.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to provision domains.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean(response);
-    return result;
+    if (!response) return { data: null, error };
+    const data = clean(response);
+    return { data, error: null };
   }
   /**
    * Fetch a list of all domains associated with this API key.
@@ -1635,24 +1577,24 @@ class Domains {
    * ```
    */
   async list(options) {
-    const result = { data: null, error: null };
-    result.error = validateLimit(options?.limit, 5e3) || validateOffset(options?.offset);
-    if (result.error) return result;
+    let error = null;
+    error = validateLimit(options?.limit, 5e3) || validateOffset(options?.offset);
+    if (error) return { data: null, error };
     const response = await this.mailchannels.get("/inbound/v1/domains", {
       query: options,
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2);
+        error = getStatusError(response2);
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch domains.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch domains.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       domains: response.domains,
       total: response.total
     });
-    return result;
+    return { data, error: null };
   }
   /**
    * De-provision a domain to cease protecting it with MailChannels Inbound.
@@ -1664,27 +1606,22 @@ class Domains {
    * ```
    */
   async delete(domain) {
-    const result = { success: false, error: null };
+    let error = null;
     if (!domain) {
-      result.error = "No domain provided.";
-      return result;
+      error = createError("No domain provided.");
+      return { success: false, error };
     }
     await this.mailchannels.delete(`/inbound/v1/domains/${domain}`, {
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response, {
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response, {
           [ErrorCode.Forbidden]: "The domain is associated with an api key that is different than the one in the request, or the domain in the request is an alias domain.",
           [ErrorCode.NotFound]: `The domain '${domain}' was not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to delete domain.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to delete domain.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Add an entry to a domain blocklist or safelist.
@@ -1701,34 +1638,34 @@ class Domains {
    */
   async addListEntry(domain, options) {
     const { listName, item } = options;
-    const result = { data: null, error: null };
+    let error = null;
     if (!domain) {
-      result.error = "No domain provided.";
-      return result;
+      error = createError("No domain provided.");
+      return { data: null, error };
     }
     if (!listName) {
-      result.error = "No list name provided.";
-      return result;
+      error = createError("No list name provided.");
+      return { data: null, error };
     }
     const response = await this.mailchannels.post(`/inbound/v1/domains/${domain}/lists/${listName}`, {
       body: { item },
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.Forbidden]: "The domain is associated with an api key that is different than the one in the request, the domain is associated with a different customer, or the domain in the request is an alias domain.",
           [ErrorCode.NotFound]: `The domain '${domain}' was not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to add domain list entry.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to add domain list entry.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       action: response.action,
       item: response.item,
       type: response.item_type
     });
-    return result;
+    return { data, error: null };
   }
   /**
    * Get domain list entries.
@@ -1741,33 +1678,33 @@ class Domains {
    * ```
    */
   async listEntries(domain, listName) {
-    const result = { data: null, error: null };
+    let error = null;
     if (!domain) {
-      result.error = "No domain provided.";
-      return result;
+      error = createError("No domain provided.");
+      return { data: null, error };
     }
     if (!listName) {
-      result.error = "No list name provided.";
-      return result;
+      error = createError("No list name provided.");
+      return { data: null, error };
     }
     const response = await this.mailchannels.get(`/inbound/v1/domains/${domain}/lists/${listName}`, {
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.Forbidden]: "The domain is associated with an api key that is different than the one in the request, the domain is associated with a different customer, or the domain in the request is an alias domain.",
           [ErrorCode.NotFound]: `The domain '${domain}' was not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch domain list entries.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch domain list entries.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean(response.map(({ action, item, item_type }) => ({
+    if (!response) return { data: null, error };
+    const data = clean(response.map(({ action, item, item_type }) => ({
       action,
       item,
       type: item_type
     })));
-    return result;
+    return { data, error: null };
   }
   /**
    * Delete item from domain list.
@@ -1784,32 +1721,27 @@ class Domains {
    */
   async deleteListEntry(domain, options) {
     const { listName, item } = options;
-    const result = { success: false, error: null };
+    let error = null;
     if (!domain) {
-      result.error = "No domain provided.";
-      return result;
+      error = createError("No domain provided.");
+      return { success: false, error };
     }
     if (!listName) {
-      result.error = "No list name provided.";
-      return result;
+      error = createError("No list name provided.");
+      return { success: false, error };
     }
     await this.mailchannels.delete(`/inbound/v1/domains/${domain}/lists/${listName}`, {
       query: { item },
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response, {
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response, {
           [ErrorCode.Forbidden]: "The domain is associated with an api key that is different than the one in the request, the domain is associated with a different customer, or the domain in the request is an alias domain.",
           [ErrorCode.NotFound]: `The domain '${domain}' was not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to delete domain list entry.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to delete domain list entry.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Generate a link that allows a user to log in as a domain administrator.
@@ -1821,28 +1753,28 @@ class Domains {
    * ```
    */
   async createLoginLink(domain) {
-    const result = { data: null, error: null };
+    let error = null;
     if (!domain) {
-      result.error = "No domain provided.";
-      return result;
+      error = createError("No domain provided.");
+      return { data: null, error };
     }
     const response = await this.mailchannels.get(`/inbound/v1/domains/${domain}/login-link`, {
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.Unauthorized]: "The domain does not belong to this customer.",
           [ErrorCode.Forbidden]: "The domain is associated with an api key that is different than the one in the request, the domain is associated with a different customer, or the domain in the request is an alias domain.",
           [ErrorCode.NotFound]: `The domain '${domain}' was not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to create login link.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to create login link.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       link: response.loginLink
     });
-    return result;
+    return { data, error: null };
   }
   /**
    * Sets the list of downstream addresses for the domain. This action deletes any existing downstream address for the domain before creating new ones. If the `records` parameter is an empty array, all downstream address records will be deleted.
@@ -1862,32 +1794,27 @@ class Domains {
    * ```
    */
   async setDownstreamAddress(domain, records = []) {
-    const result = { success: false, error: null };
+    let error = null;
     if (!domain) {
-      result.error = "No domain provided.";
-      return result;
+      error = createError("No domain provided.");
+      return { success: false, error };
     }
     if (records.length > 10) {
-      result.error = "The maximum of records to be set is 10.";
-      return result;
+      error = createError("The maximum of records to be set is 10.");
+      return { success: false, error };
     }
     await this.mailchannels.put(`/inbound/v1/domains/${domain}/downstream-address`, {
       body: { records },
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response, {
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response, {
           [ErrorCode.Forbidden]: "The domain is associated with an api key that is different than the one in the request, the domain is associated with a different customer, or the domain in the request is an alias domain.",
           [ErrorCode.NotFound]: `The domain '${domain}' was not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to set downstream address.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to set downstream address.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Retrieve stored downstream addresses for the domain.
@@ -1900,28 +1827,28 @@ class Domains {
    * ```
    */
   async listDownstreamAddresses(domain, options) {
-    const result = { data: null, error: null };
+    let error = null;
     if (!domain) {
-      result.error = "No domain provided.";
-      return result;
+      error = createError("No domain provided.");
+      return { data: null, error };
     }
-    result.error = validateLimit(options?.limit) || validateOffset(options?.offset);
-    if (result.error) return result;
+    error = validateLimit(options?.limit) || validateOffset(options?.offset);
+    if (error) return { data: null, error };
     const response = await this.mailchannels.get(`/inbound/v1/domains/${domain}/downstream-address`, {
       query: options,
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.Forbidden]: "The domain is associated with an api key that is different than the one in the request, the domain is associated with a different customer, or the domain in the request is an alias domain.",
           [ErrorCode.NotFound]: `The domain '${domain}' was not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to list downstream addresses.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to list downstream addresses.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean(response.records);
-    return result;
+    if (!response) return { data: null, error };
+    const data = clean(response.records);
+    return { data, error: null };
   }
   /**
    * Update the API key that is associated with a domain.
@@ -1934,32 +1861,27 @@ class Domains {
    * ```
    */
   async updateApiKey(domain, key) {
-    const result = { success: false, error: null };
+    let error = null;
     if (!domain) {
-      result.error = "No domain provided.";
-      return result;
+      error = createError("No domain provided.");
+      return { success: false, error };
     }
     if (!key) {
-      result.error = "No API key provided.";
-      return result;
+      error = createError("No API key provided.");
+      return { success: false, error };
     }
     await this.mailchannels.put(`/inbound/v1/domains/${domain}/api-key`, {
       body: { apiKey: key },
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response, {
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response, {
           [ErrorCode.Forbidden]: "The domain is associated with an api key that is different than the one in the request, the domain is associated with a different customer, or the domain in the request is an alias domain.",
           [ErrorCode.NotFound]: "The domain does not exist."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to update domain API key.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to update domain API key.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Generate a batch of links that allow a user to log in as a domain administrator to their different domains.
@@ -1971,31 +1893,31 @@ class Domains {
    * ```
    */
   async bulkCreateLoginLinks(domains) {
-    const result = { data: null, error: null };
+    let error = null;
     if (!domains || !domains.length) {
-      result.error = "No domains provided.";
-      return result;
+      error = createError("No domains provided.");
+      return { data: null, error };
     }
     if (domains.length > 1e3) {
-      result.error = "The maximum number of domains to create login links for is 1000.";
-      return result;
+      error = createError("The maximum number of domains to create login links for is 1000.");
+      return { data: null, error };
     }
     const response = await this.mailchannels.post("/inbound/v1/domains/batch/login-link", {
       body: {
         domains: domains.map((domain) => ({ domain }))
       },
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: "Bad Request."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to create login links.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to create login links.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean(response);
-    return result;
+    if (!response) return { data: null, error };
+    const data = clean(response);
+    return { data, error: null };
   }
 }
 
@@ -2016,28 +1938,28 @@ class Lists {
    * ```
    */
   async addListEntry(options) {
+    let error = null;
     const { listName, item } = options;
-    const result = { data: null, error: null };
     if (!listName) {
-      result.error = "No list name provided.";
-      return result;
+      error = createError("No list name provided.");
+      return { data: null, error };
     }
     const response = await this.mailchannels.post(`/inbound/v1/lists/${listName}`, {
       body: { item },
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2);
+        error = getStatusError(response2);
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to add list entry.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to add list entry.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       action: response.action,
       item: response.item,
       type: response.item_type
     });
-    return result;
+    return { data, error: null };
   }
   /**
    * Get account-level list entries.
@@ -2049,26 +1971,26 @@ class Lists {
    * ```
    */
   async listEntries(listName) {
-    const result = { data: null, error: null };
+    let error = null;
     if (!listName) {
-      result.error = "No list name provided.";
-      return result;
+      error = createError("No list name provided.");
+      return { data: null, error };
     }
     const response = await this.mailchannels.get(`/inbound/v1/lists/${listName}`, {
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2);
+        error = getStatusError(response2);
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch list entries.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch list entries.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean(response.map(({ action, item, item_type }) => ({
+    if (!response) return { data: null, error };
+    const data = clean(response.map(({ action, item, item_type }) => ({
       action,
       item,
       type: item_type
     })));
-    return result;
+    return { data, error: null };
   }
   /**
    * Delete item from account-level list.
@@ -2084,25 +2006,20 @@ class Lists {
    */
   async deleteListEntry(options) {
     const { listName, item } = options;
-    const result = { success: false, error: null };
+    let error = null;
     if (!listName) {
-      result.error = "No list name provided.";
-      return result;
+      error = createError("No list name provided.");
+      return { success: false, error };
     }
     await this.mailchannels.delete(`/inbound/v1/lists/${listName}`, {
       query: { item },
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response);
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response);
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to delete list entry.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to delete list entry.");
     });
-    return result;
+    return { success: !error, error };
   }
 }
 
@@ -2124,10 +2041,10 @@ class Users {
    */
   async create(email, options) {
     const { admin, filter, listEntries } = options || {};
-    const result = { data: null, error: null };
+    let error = null;
     if (!email) {
-      result.error = "No email address provided.";
-      return result;
+      error = createError("No email address provided.");
+      return { data: null, error };
     }
     const response = await this.mailchannels.put("/inbound/v1/users", {
       query: {
@@ -2139,16 +2056,16 @@ class Users {
         list_entries: listEntries
       },
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.BadRequest]: `The email address '${email}' is invalid.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to create user.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to create user.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       email: response.recipient.email_address,
       roles: response.recipient.roles,
       filter: response.recipient.filter,
@@ -2158,7 +2075,7 @@ class Users {
         action
       }))
     });
-    return result;
+    return { data, error: null };
   }
   /**
    * Add item to recipient user list
@@ -2175,34 +2092,34 @@ class Users {
    */
   async addListEntry(email, options) {
     const { listName, item } = options;
-    const result = { data: null, error: null };
+    let error = null;
     if (!email) {
-      result.error = "No email provided.";
-      return result;
+      error = createError("No email provided.");
+      return { data: null, error };
     }
     if (!listName) {
-      result.error = "No list name provided.";
-      return result;
+      error = createError("No list name provided.");
+      return { data: null, error };
     }
     const response = await this.mailchannels.post(`/inbound/v1/users/${email}/lists/${listName}`, {
       body: { item },
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.Forbidden]: "The domain is associated with an api key that is different than the one in the request, the domain is associated with a different customer, or the domain in the request is an alias domain.",
           [ErrorCode.NotFound]: `The recipient '${email}' was not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to add user list entry.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to add user list entry.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean({
+    if (!response) return { data: null, error };
+    const data = clean({
       action: response.action,
       item: response.item,
       type: response.item_type
     });
-    return result;
+    return { data, error: null };
   }
   /**
    * Get recipient list entries.
@@ -2215,33 +2132,33 @@ class Users {
    * ```
    */
   async listEntries(email, listName) {
-    const result = { data: null, error: null };
+    let error = null;
     if (!email) {
-      result.error = "No email provided.";
-      return result;
+      error = createError("No email provided.");
+      return { data: null, error };
     }
     if (!listName) {
-      result.error = "No list name provided.";
-      return result;
+      error = createError("No list name provided.");
+      return { data: null, error };
     }
     const response = await this.mailchannels.get(`/inbound/v1/users/${email}/lists/${listName}`, {
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.Forbidden]: "The domain is associated with an api key that is different than the one in the request, the domain is associated with a different customer, or the domain in the request is an alias domain.",
           [ErrorCode.NotFound]: `The recipient '${email}' was not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch user list entries.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch user list entries.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean(response.map(({ action, item, item_type }) => ({
+    if (!response) return { data: null, error };
+    const data = clean(response.map(({ action, item, item_type }) => ({
       action,
       item,
       type: item_type
     })));
-    return result;
+    return { data, error: null };
   }
   /**
    * Delete item from recipient list.
@@ -2258,32 +2175,27 @@ class Users {
    */
   async deleteListEntry(email, options) {
     const { listName, item } = options;
-    const result = { success: false, error: null };
+    let error = null;
     if (!email) {
-      result.error = "No email provided.";
-      return result;
+      error = createError("No email provided.");
+      return { success: false, error };
     }
     if (!listName) {
-      result.error = "No list name provided.";
-      return result;
+      error = createError("No list name provided.");
+      return { success: false, error };
     }
     await this.mailchannels.delete(`/inbound/v1/users/${email}/lists/${listName}`, {
       query: { item },
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response, {
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response, {
           [ErrorCode.Forbidden]: "The domain is associated with an api key that is different than the one in the request, the domain is associated with a different customer, or the domain in the request is an alias domain.",
           [ErrorCode.NotFound]: `The recipient '${email}' was not found.`
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to delete user list entry.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to delete user list entry.");
     });
-    return result;
+    return { success: !error, error };
   }
 }
 
@@ -2300,20 +2212,15 @@ class Service {
    * ```
    */
   async status() {
-    const result = { success: false, error: null };
+    let error = null;
     await this.mailchannels.get("/inbound/v1/status", {
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response);
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response);
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch service status.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch service status.");
     });
-    return result;
+    return { success: !error, error };
   }
   /**
    * Get a list of your subscriptions to MailChannels Inbound
@@ -2324,20 +2231,20 @@ class Service {
    * ```
    */
   async subscriptions() {
-    const result = { data: null, error: null };
+    let error = null;
     const response = await this.mailchannels.get("/inbound/v1/subscriptions", {
       onResponseError: async ({ response: response2 }) => {
-        result.error = getStatusError(response2, {
+        error = getStatusError(response2, {
           [ErrorCode.NotFound]: "We could not find a customer that matched the customerHandle."
         });
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to fetch subscriptions.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to fetch subscriptions.");
       return null;
     });
-    if (!response) return result;
-    result.data = clean(response);
-    return result;
+    if (!response) return { data: null, error };
+    const data = clean(response);
+    return { data, error: null };
   }
   /**
    * Submit a false negative or false positive report.
@@ -2351,25 +2258,20 @@ class Service {
    * ```
    */
   async report(options) {
-    const result = { success: false, error: null };
+    let error = null;
     const { type, ...payload } = options;
     await this.mailchannels.post("/inbound/v1/report", {
       query: {
         report_type: type
       },
       body: payload,
-      ignoreResponseError: true,
-      onResponse: async ({ response }) => {
-        if (response.ok) {
-          result.success = true;
-          return;
-        }
-        result.error = getStatusError(response);
+      onResponseError: async ({ response }) => {
+        error = getStatusError(response);
       }
-    }).catch((error) => {
-      result.error = getResultError(result, error, "Failed to submit report.");
+    }).catch((e) => {
+      error ||= getResultError(e, "Failed to submit report.");
     });
-    return result;
+    return { success: !error, error };
   }
 }