shipmail 0.5.6 → 0.5.7

package/dist/index.d.cts

@@ -882,7 +882,10 @@ type OutboundHeader = {
 type MessageMetadata = Readonly<Record<string, string | number | boolean | null>>;
 type SendMessageParams = {
     readonly mailbox_id?: string | undefined;
-    /** Sending mailbox: `hello@example.com` or `Acme Support <hello@example.com>`. */
+    /**
+     * Sending mailbox: `hello@example.com` or `Acme Support <hello@example.com>`.
+     * For a transactional sender, pass the bare sender address. Shipmail adds its name and Reply-To.
+     */
     readonly from?: string | undefined;
     readonly to: readonly EmailRecipientInput[];
     readonly cc?: readonly EmailRecipientInput[] | undefined;

package/dist/index.d.ts

@@ -882,7 +882,10 @@ type OutboundHeader = {
 type MessageMetadata = Readonly<Record<string, string | number | boolean | null>>;
 type SendMessageParams = {
     readonly mailbox_id?: string | undefined;
-    /** Sending mailbox: `hello@example.com` or `Acme Support <hello@example.com>`. */
+    /**
+     * Sending mailbox: `hello@example.com` or `Acme Support <hello@example.com>`.
+     * For a transactional sender, pass the bare sender address. Shipmail adds its name and Reply-To.
+     */
     readonly from?: string | undefined;
     readonly to: readonly EmailRecipientInput[];
     readonly cc?: readonly EmailRecipientInput[] | undefined;

package/dist/index.js

@@ -1695,17 +1695,26 @@ var Webhooks = class extends ApiResource {
 };
 
 // src/version.ts
-var VERSION = "0.5.6";
+var VERSION = "0.5.7";
 
 // src/client.ts
 var DEFAULT_BASE_URL = "https://shipmail.to/api/v1";
 var DEFAULT_MAX_RETRIES = 2;
 var DEFAULT_TIMEOUT = 3e4;
+var MAX_RETRY_AFTER_MS = 6e4;
+function parseRetryAfter(value) {
+  if (!value?.trim()) return void 0;
+  const seconds = Number(value);
+  if (Number.isFinite(seconds) && seconds >= 0) return seconds * 1e3;
+  if (/^[+-]?[\d.]+$/.test(value.trim())) return void 0;
+  const date = Date.parse(value);
+  return Number.isFinite(date) ? Math.max(0, date - Date.now()) : void 0;
+}
 function isRetryableStatus(status) {
   return status === 429 || status >= 500;
 }
 function calculateBackoff(attempt, retryAfterMs) {
-  if (retryAfterMs !== void 0 && retryAfterMs > 0) {
+  if (retryAfterMs !== void 0 && Number.isFinite(retryAfterMs) && retryAfterMs >= 0) {
     return retryAfterMs;
   }
   const base2 = Math.min(2 ** attempt * 500, 8e3);
@@ -1748,6 +1757,9 @@ var ShipmailClient = class {
       this.defaultHeaders = config.defaultHeaders ? { ...config.defaultHeaders } : {};
       this.organizationId = config.organizationId;
     }
+    if (!Number.isSafeInteger(this.maxRetries) || this.maxRetries < 0) {
+      throw new RangeError("maxRetries must be a non-negative safe integer");
+    }
     this.audiences = new Audiences(this);
     this.automations = new Automations(this);
     this.bookingPages = new BookingPages(this);
@@ -1783,9 +1795,13 @@ var ShipmailClient = class {
     const url = this.buildUrl(options.path, options.query);
     let lastError;
     const methodOpts = options.methodOptions;
+    const retryHeaders = new Headers({ ...this.defaultHeaders, ...methodOpts?.headers });
+    const method = options.method.toUpperCase();
+    const idempotencyKey = methodOpts?.idempotencyKey || retryHeaders.get("Idempotency-Key");
+    const canRetry = ["GET", "HEAD", "OPTIONS"].includes(method) || ["POST", "PATCH", "PUT"].includes(method) && Boolean(idempotencyKey?.trim());
+    let retryAfterMs;
     for (let attempt = 0; attempt <= this.maxRetries; attempt++) {
       if (attempt > 0) {
-        const retryAfterMs = lastError instanceof RateLimitError && lastError.retryAfter !== void 0 ? lastError.retryAfter * 1e3 : void 0;
         const delay = calculateBackoff(attempt - 1, retryAfterMs);
         await new Promise((resolve) => setTimeout(resolve, delay));
       }
@@ -1822,7 +1838,10 @@ var ShipmailClient = class {
         });
       } catch (err) {
         lastError = new ConnectionError(err instanceof Error ? err.message : "Request failed");
-        if (attempt < this.maxRetries) continue;
+        if (canRetry && !methodOpts?.signal?.aborted && attempt < this.maxRetries) {
+          retryAfterMs = void 0;
+          continue;
+        }
         throw lastError;
       }
       if (response.ok) {
@@ -1842,7 +1861,14 @@ var ShipmailClient = class {
           retryable: isRetryableStatus(response.status)
         });
       }
-      if (!lastError.retryable || attempt >= this.maxRetries) {
+      retryAfterMs = parseRetryAfter(response.headers.get("Retry-After"));
+      if (retryAfterMs === void 0 && lastError instanceof RateLimitError) {
+        const seconds = lastError.retryAfter;
+        if (typeof seconds === "number" && Number.isFinite(seconds) && seconds >= 0) {
+          retryAfterMs = seconds * 1e3;
+        }
+      }
+      if (!canRetry || !lastError.retryable || attempt >= this.maxRetries || retryAfterMs !== void 0 && retryAfterMs > MAX_RETRY_AFTER_MS) {
         throw lastError;
       }
     }