@vercel/queue 0.0.0-alpha.32 → 0.0.0-alpha.33

package/dist/nextjs-pages.js

@@ -100,6 +100,9 @@ var InvalidLimitError = class extends Error {
 };
 
 // src/client.ts
+function isDebugEnabled() {
+  return process.env.VERCEL_QUEUE_DEBUG === "1" || process.env.VERCEL_QUEUE_DEBUG === "true";
+}
 async function consumeStream(stream) {
   const reader = stream.getReader();
   try {
@@ -111,6 +114,31 @@ async function consumeStream(stream) {
     reader.releaseLock();
   }
 }
+function parseRetryAfter(headers) {
+  const retryAfterHeader = headers.get("Retry-After");
+  if (retryAfterHeader) {
+    const parsed = parseInt(retryAfterHeader, 10);
+    return Number.isNaN(parsed) ? void 0 : parsed;
+  }
+  return void 0;
+}
+function throwCommonHttpError(status, statusText, errorText, operation, badRequestDefault = "Invalid parameters") {
+  if (status === 400) {
+    throw new BadRequestError(errorText || badRequestDefault);
+  }
+  if (status === 401) {
+    throw new UnauthorizedError(errorText || void 0);
+  }
+  if (status === 403) {
+    throw new ForbiddenError(errorText || void 0);
+  }
+  if (status >= 500) {
+    throw new InternalServerError(
+      errorText || `Server error: ${status} ${statusText}`
+    );
+  }
+  throw new Error(`Failed to ${operation}: ${status} ${statusText}`);
+}
 function parseQueueHeaders(headers) {
   const messageId = headers.get("Vqs-Message-Id");
   const deliveryCountStr = headers.get("Vqs-Delivery-Count") || "0";
@@ -121,7 +149,7 @@ function parseQueueHeaders(headers) {
     return null;
   }
   const deliveryCount = parseInt(deliveryCountStr, 10);
-  if (isNaN(deliveryCount)) {
+  if (Number.isNaN(deliveryCount)) {
     return null;
   }
   return {
@@ -135,24 +163,22 @@ function parseQueueHeaders(headers) {
 var QueueClient = class {
   baseUrl;
   basePath;
-  customHeaders = {};
+  customHeaders;
+  providedToken;
   /**
    * Create a new Vercel Queue Service client
-   * @param options Client configuration options
+   * @param options QueueClient configuration options
    */
   constructor(options = {}) {
     this.baseUrl = options.baseUrl || process.env.VERCEL_QUEUE_BASE_URL || "https://vercel-queue.com";
     this.basePath = options.basePath || process.env.VERCEL_QUEUE_BASE_PATH || "/api/v2/messages";
-    const VERCEL_QUEUE_HEADER_PREFIX = "VERCEL_QUEUE_HEADER_";
-    this.customHeaders = Object.fromEntries(
-      Object.entries(process.env).filter(([key]) => key.startsWith(VERCEL_QUEUE_HEADER_PREFIX)).map(([key, value]) => [
-        // This allows headers to use dashes independent of shell used
-        key.replace(VERCEL_QUEUE_HEADER_PREFIX, "").replaceAll("__", "-"),
-        value || ""
-      ])
-    );
+    this.customHeaders = options.headers || {};
+    this.providedToken = options.token;
   }
   async getToken() {
+    if (this.providedToken) {
+      return this.providedToken;
+    }
     const token = await (0, import_oidc.getVercelOidcToken)();
     if (!token) {
       throw new Error(
@@ -161,6 +187,45 @@ var QueueClient = class {
     }
     return token;
   }
+  /**
+   * Internal fetch wrapper that automatically handles debug logging
+   * when VERCEL_QUEUE_DEBUG is enabled
+   */
+  async fetch(url, init) {
+    const method = init.method || "GET";
+    if (isDebugEnabled()) {
+      const logData = {
+        method,
+        url,
+        headers: init.headers
+      };
+      const body = init.body;
+      if (body !== void 0 && body !== null) {
+        if (body instanceof ArrayBuffer) {
+          logData.bodySize = body.byteLength;
+        } else if (body instanceof Uint8Array) {
+          logData.bodySize = body.byteLength;
+        } else if (typeof body === "string") {
+          logData.bodySize = body.length;
+        } else {
+          logData.bodyType = typeof body;
+        }
+      }
+      console.debug("[VQS Debug] Request:", JSON.stringify(logData, null, 2));
+    }
+    const response = await fetch(url, init);
+    if (isDebugEnabled()) {
+      const logData = {
+        method,
+        url,
+        status: response.status,
+        statusText: response.statusText,
+        headers: response.headers
+      };
+      console.debug("[VQS Debug] Response:", JSON.stringify(logData, null, 2));
+    }
+    return response;
+  }
   /**
    * Send a message to a queue
    * @param options Send message options
@@ -190,32 +255,21 @@ var QueueClient = class {
       headers.set("Vqs-Retention-Seconds", retentionSeconds.toString());
     }
     const body = transport.serialize(payload);
-    const response = await fetch(`${this.baseUrl}${this.basePath}`, {
+    const response = await this.fetch(`${this.baseUrl}${this.basePath}`, {
       method: "POST",
       body,
       headers
     });
     if (!response.ok) {
-      if (response.status === 400) {
-        const errorText = await response.text();
-        throw new BadRequestError(errorText || "Invalid parameters");
-      }
-      if (response.status === 401) {
-        throw new UnauthorizedError();
-      }
-      if (response.status === 403) {
-        throw new ForbiddenError();
-      }
+      const errorText = await response.text();
       if (response.status === 409) {
         throw new Error("Duplicate idempotency key detected");
       }
-      if (response.status >= 500) {
-        throw new InternalServerError(
-          `Server error: ${response.status} ${response.statusText}`
-        );
-      }
-      throw new Error(
-        `Failed to send message: ${response.status} ${response.statusText}`
+      throwCommonHttpError(
+        response.status,
+        response.statusText,
+        errorText,
+        "send message"
       );
     }
     const responseData = await response.json();
@@ -255,7 +309,7 @@ var QueueClient = class {
     if (limit !== void 0) {
       headers.set("Vqs-Limit", limit.toString());
     }
-    const response = await fetch(`${this.baseUrl}${this.basePath}`, {
+    const response = await this.fetch(`${this.baseUrl}${this.basePath}`, {
       method: "GET",
       headers
     });
@@ -263,32 +317,18 @@ var QueueClient = class {
       throw new QueueEmptyError(queueName, consumerGroup);
     }
     if (!response.ok) {
-      if (response.status === 400) {
-        const errorText = await response.text();
-        throw new BadRequestError(errorText || "Invalid parameters");
-      }
-      if (response.status === 401) {
-        throw new UnauthorizedError();
-      }
-      if (response.status === 403) {
-        throw new ForbiddenError();
-      }
+      const errorText = await response.text();
       if (response.status === 423) {
-        const retryAfterHeader = response.headers.get("Retry-After");
-        let retryAfter;
-        if (retryAfterHeader) {
-          const parsed = parseInt(retryAfterHeader, 10);
-          retryAfter = isNaN(parsed) ? void 0 : parsed;
-        }
-        throw new MessageLockedError("next message", retryAfter);
-      }
-      if (response.status >= 500) {
-        throw new InternalServerError(
-          `Server error: ${response.status} ${response.statusText}`
+        throw new MessageLockedError(
+          "next message",
+          parseRetryAfter(response.headers)
         );
       }
-      throw new Error(
-        `Failed to receive messages: ${response.status} ${response.statusText}`
+      throwCommonHttpError(
+        response.status,
+        response.statusText,
+        errorText,
+        "receive messages"
       );
     }
     for await (const multipartMessage of (0, import_mixpart.parseMultipartStream)(response)) {
@@ -337,7 +377,7 @@ var QueueClient = class {
     if (skipPayload) {
       headers.set("Vqs-Skip-Payload", "1");
     }
-    const response = await fetch(
+    const response = await this.fetch(
       `${this.baseUrl}${this.basePath}/${encodeURIComponent(messageId)}`,
       {
         method: "GET",
@@ -345,38 +385,24 @@ var QueueClient = class {
       }
     );
     if (!response.ok) {
-      if (response.status === 400) {
-        const errorText = await response.text();
-        throw new BadRequestError(errorText || "Invalid parameters");
-      }
-      if (response.status === 401) {
-        throw new UnauthorizedError();
-      }
-      if (response.status === 403) {
-        throw new ForbiddenError();
-      }
+      const errorText = await response.text();
       if (response.status === 404) {
         throw new MessageNotFoundError(messageId);
       }
-      if (response.status === 423) {
-        const retryAfterHeader = response.headers.get("Retry-After");
-        let retryAfter;
-        if (retryAfterHeader) {
-          const parsed = parseInt(retryAfterHeader, 10);
-          retryAfter = isNaN(parsed) ? void 0 : parsed;
-        }
-        throw new MessageLockedError(messageId, retryAfter);
-      }
       if (response.status === 409) {
         throw new MessageNotAvailableError(messageId);
       }
-      if (response.status >= 500) {
-        throw new InternalServerError(
-          `Server error: ${response.status} ${response.statusText}`
+      if (response.status === 423) {
+        throw new MessageLockedError(
+          messageId,
+          parseRetryAfter(response.headers)
         );
       }
-      throw new Error(
-        `Failed to receive message by ID: ${response.status} ${response.statusText}`
+      throwCommonHttpError(
+        response.status,
+        response.statusText,
+        errorText,
+        "receive message by ID"
       );
     }
     if (skipPayload && response.status === 204) {
@@ -446,7 +472,7 @@ var QueueClient = class {
    */
   async deleteMessage(options) {
     const { queueName, consumerGroup, messageId, ticket } = options;
-    const response = await fetch(
+    const response = await this.fetch(
       `${this.baseUrl}${this.basePath}/${encodeURIComponent(messageId)}`,
       {
         method: "DELETE",
@@ -460,31 +486,22 @@ var QueueClient = class {
       }
     );
     if (!response.ok) {
-      if (response.status === 400) {
-        throw new BadRequestError("Missing or invalid ticket");
-      }
-      if (response.status === 401) {
-        throw new UnauthorizedError();
-      }
-      if (response.status === 403) {
-        throw new ForbiddenError();
-      }
+      const errorText = await response.text();
       if (response.status === 404) {
         throw new MessageNotFoundError(messageId);
       }
       if (response.status === 409) {
         throw new MessageNotAvailableError(
           messageId,
-          "Invalid ticket, message not in correct state, or already processed"
+          errorText || "Invalid ticket, message not in correct state, or already processed"
         );
       }
-      if (response.status >= 500) {
-        throw new InternalServerError(
-          `Server error: ${response.status} ${response.statusText}`
-        );
-      }
-      throw new Error(
-        `Failed to delete message: ${response.status} ${response.statusText}`
+      throwCommonHttpError(
+        response.status,
+        response.statusText,
+        errorText,
+        "delete message",
+        "Missing or invalid ticket"
       );
     }
     return { deleted: true };
@@ -508,7 +525,7 @@ var QueueClient = class {
       ticket,
       visibilityTimeoutSeconds
     } = options;
-    const response = await fetch(
+    const response = await this.fetch(
       `${this.baseUrl}${this.basePath}/${encodeURIComponent(messageId)}`,
       {
         method: "PATCH",
@@ -523,33 +540,22 @@ var QueueClient = class {
       }
     );
     if (!response.ok) {
-      if (response.status === 400) {
-        throw new BadRequestError(
-          "Missing ticket or invalid visibility timeout"
-        );
-      }
-      if (response.status === 401) {
-        throw new UnauthorizedError();
-      }
-      if (response.status === 403) {
-        throw new ForbiddenError();
-      }
+      const errorText = await response.text();
       if (response.status === 404) {
         throw new MessageNotFoundError(messageId);
       }
       if (response.status === 409) {
         throw new MessageNotAvailableError(
           messageId,
-          "Invalid ticket, message not in correct state, or already processed"
+          errorText || "Invalid ticket, message not in correct state, or already processed"
         );
       }
-      if (response.status >= 500) {
-        throw new InternalServerError(
-          `Server error: ${response.status} ${response.statusText}`
-        );
-      }
-      throw new Error(
-        `Failed to change visibility: ${response.status} ${response.statusText}`
+      throwCommonHttpError(
+        response.status,
+        response.statusText,
+        errorText,
+        "change visibility",
+        "Missing ticket or invalid visibility timeout"
       );
     }
     return { updated: true };
@@ -1123,7 +1129,7 @@ async function parseCallback(request) {
     messageId
   };
 }
-function handleCallback(handlers) {
+function createCallbackHandler(handlers, client) {
   for (const topicPattern in handlers) {
     if (topicPattern.includes("*")) {
       if (!validateWildcardPattern(topicPattern)) {
@@ -1158,7 +1164,6 @@ function handleCallback(handlers) {
           { status: 404 }
         );
       }
-      const client = new QueueClient();
       const topic = new Topic(client, queueName);
       const cg = topic.consumerGroup(consumerGroup);
       await cg.consume(consumerGroupHandler, { messageId });
@@ -1179,6 +1184,9 @@ function handleCallback(handlers) {
   }
   return routeHandler;
 }
+function handleCallback(handlers, client) {
+  return createCallbackHandler(handlers, client || new QueueClient());
+}
 
 // src/nextjs-pages.ts
 function getHeader(headers, name) {