@upstash/qstash 2.7.17 → 2.7.19

package/{chunk-IJTMXF3U.mjs → chunk-L2DZYBAR.mjs}

@@ -1,7 +1,7 @@
 import {
   Receiver,
   serve
-} from "./chunk-2V6WQVIN.mjs";
+} from "./chunk-S5ODGXCI.mjs";
 
 // node_modules/defu/dist/defu.mjs
 function isPlainObject(value) {

package/{chunk-JR675EKS.mjs → chunk-RNFKMAEP.mjs}

@@ -1,11 +1,12 @@
 import {
   BaseProvider
-} from "./chunk-2V6WQVIN.mjs";
+} from "./chunk-S5ODGXCI.mjs";
 
 // src/client/api/email.ts
 var EmailProvider = class extends BaseProvider {
   apiKind = "email";
   batch;
+  method = "POST";
   constructor(baseUrl, token, owner, batch) {
     super(baseUrl, token, owner);
     this.batch = batch;
@@ -15,7 +16,7 @@ var EmailProvider = class extends BaseProvider {
   }
   getHeaders(_options) {
     return {
-      "upstash-forward-authorization": `Bearer ${this.token}`
+      authorization: `Bearer ${this.token}`
     };
   }
   onFinish(providerInfo, _options) {

package/{chunk-2V6WQVIN.mjs → chunk-S5ODGXCI.mjs}

@@ -201,6 +201,7 @@ var HttpClient = class {
   authorization;
   options;
   retry;
+  headers;
   constructor(config) {
     this.baseUrl = config.baseUrl.replace(/\/$/, "");
     this.authorization = config.authorization;
@@ -212,6 +213,7 @@ var HttpClient = class {
       attempts: config.retry?.retries ?? 5,
       backoff: config.retry?.backoff ?? ((retryCount) => Math.exp(retryCount) * 50)
     };
+    this.headers = config.headers;
   }
   async request(request) {
     const { response } = await this.requestWithBackoff(request);
@@ -564,6 +566,7 @@ var BaseProvider = class {
 var LLMProvider = class extends BaseProvider {
   apiKind = "llm";
   organization;
+  method = "POST";
   constructor(baseUrl, token, owner, organization) {
     super(baseUrl, token, owner);
     this.organization = organization;
@@ -640,15 +643,24 @@ var getProviderInfo = (api, upstashToken) => {
     baseUrl: finalProvider.baseUrl,
     route: finalProvider.getRoute(),
     appendHeaders: finalProvider.getHeaders(parameters),
-    owner: finalProvider.owner
+    owner: finalProvider.owner,
+    method: finalProvider.method
   };
   return finalProvider.onFinish(providerInfo, parameters);
 };
-var processApi = (request, upstashToken) => {
+var safeJoinHeaders = (headers, record) => {
+  const joinedHeaders = new Headers(record);
+  for (const [header, value] of headers.entries()) {
+    joinedHeaders.set(header, value);
+  }
+  return joinedHeaders;
+};
+var processApi = (request, headers, upstashToken) => {
   if (!request.api) {
+    request.headers = headers;
     return request;
   }
-  const { url, appendHeaders, owner } = getProviderInfo(request.api, upstashToken);
+  const { url, appendHeaders, owner, method } = getProviderInfo(request.api, upstashToken);
   if (request.api.name === "llm") {
     const callback = request.callback;
     if (!callback) {
@@ -656,21 +668,15 @@ var processApi = (request, upstashToken) => {
     }
     return {
       ...request,
-      // @ts-expect-error undici header conflict
-      headers: new Headers({
-        ...request.headers,
-        ...appendHeaders
-      }),
+      method: request.method ?? method,
+      headers: safeJoinHeaders(headers, appendHeaders),
       ...owner === "upstash" && !request.api.analytics ? { api: { name: "llm" }, url: void 0, callback } : { url, api: void 0 }
     };
   } else {
     return {
       ...request,
-      // @ts-expect-error undici header conflict
-      headers: new Headers({
-        ...request.headers,
-        ...appendHeaders
-      }),
+      method: request.method ?? method,
+      headers: safeJoinHeaders(headers, appendHeaders),
       url,
       api: void 0
     };
@@ -718,6 +724,16 @@ function prefixHeaders(headers) {
   }
   return headers;
 }
+function wrapWithGlobalHeaders(headers, globalHeaders) {
+  if (!globalHeaders) {
+    return headers;
+  }
+  const finalHeaders = new Headers(globalHeaders);
+  headers.forEach((value, key) => {
+    finalHeaders.set(key, value);
+  });
+  return finalHeaders;
+}
 function processHeaders(request) {
   const headers = prefixHeaders(new Headers(request.headers));
   headers.set("Upstash-Method", request.method ?? "POST");
@@ -864,7 +880,10 @@ var Queue = class {
     if (!this.queueName) {
       throw new Error("Please provide a queue name to the Queue constructor");
     }
-    const headers = processHeaders(request);
+    const headers = wrapWithGlobalHeaders(
+      processHeaders(request),
+      this.http.headers
+    );
     const destination = getRequestPath(request);
     const response = await this.http.request({
       path: ["v2", "enqueue", this.queueName, destination],
@@ -880,13 +899,11 @@ var Queue = class {
   async enqueueJSON(request) {
     const headers = prefixHeaders(new Headers(request.headers));
     headers.set("Content-Type", "application/json");
-    request.headers = headers;
     const upstashToken = String(this.http.authorization).split("Bearer ")[1];
-    const nonApiRequest = processApi(request, upstashToken);
+    const nonApiRequest = processApi(request, headers, upstashToken);
     const response = await this.enqueue({
       ...nonApiRequest,
-      body: JSON.stringify(nonApiRequest.body),
-      headers
+      body: JSON.stringify(nonApiRequest.body)
     });
     return response;
   }
@@ -970,7 +987,7 @@ var Schedules = class {
     }
     return await this.http.request({
       method: "POST",
-      headers,
+      headers: wrapWithGlobalHeaders(headers, this.http.headers),
       path: ["v2", "schedules", request.destination],
       body: request.body
     });
@@ -1096,7 +1113,9 @@ var Client = class {
     this.http = new HttpClient({
       retry: config.retry,
       baseUrl: config.baseUrl ? config.baseUrl.replace(/\/$/, "") : "https://qstash.upstash.io",
-      authorization: `Bearer ${config.token}`
+      authorization: `Bearer ${config.token}`,
+      //@ts-expect-error caused by undici and bunjs type overlap
+      headers: prefixHeaders(new Headers(config.headers))
     });
     this.token = config.token;
   }
@@ -1171,7 +1190,10 @@ var Client = class {
     return new Chat(this.http, this.token);
   }
   async publish(request) {
-    const headers = processHeaders(request);
+    const headers = wrapWithGlobalHeaders(
+      processHeaders(request),
+      this.http.headers
+    );
     const response = await this.http.request({
       path: ["v2", "publish", getRequestPath(request)],
       body: request.body,
@@ -1187,9 +1209,8 @@ var Client = class {
   async publishJSON(request) {
     const headers = prefixHeaders(new Headers(request.headers));
     headers.set("Content-Type", "application/json");
-    request.headers = headers;
     const upstashToken = String(this.http.authorization).split("Bearer ")[1];
-    const nonApiRequest = processApi(request, upstashToken);
+    const nonApiRequest = processApi(request, headers, upstashToken);
     const response = await this.publish({
       ...nonApiRequest,
       body: JSON.stringify(nonApiRequest.body)
@@ -1202,7 +1223,7 @@ var Client = class {
   async batch(request) {
     const messages = [];
     for (const message of request) {
-      const headers = processHeaders(message);
+      const headers = wrapWithGlobalHeaders(processHeaders(message), this.http.headers);
       const headerEntries = Object.fromEntries(headers.entries());
       messages.push({
         destination: getRequestPath(message),
@@ -1230,9 +1251,8 @@ var Client = class {
       if ("body" in message) {
         message.body = JSON.stringify(message.body);
       }
-      message.headers = new Headers(message.headers);
       const upstashToken = String(this.http.authorization).split("Bearer ")[1];
-      const nonApiMessage = processApi(message, upstashToken);
+      const nonApiMessage = processApi(message, new Headers(message.headers), upstashToken);
       nonApiMessage.headers.set("Content-Type", "application/json");
       return nonApiMessage;
     });

package/{client-BY4y-4To.d.ts → client-CdYtp0E1.d.mts}

@@ -127,6 +127,10 @@ type ProviderInfo = {
      * provider owner
      */
     owner: Owner;
+    /**
+     * method to use in the request
+     */
+    method: HTTPMethods;
 };
 type ApiKind = "llm" | "email";
 type Owner = EmailOwner | LLMOwner;
@@ -153,6 +157,7 @@ type PublishLLMApi = PublishApi<"llm", BaseProvider<"llm", LLMOwner>> & LLMOptio
 
 declare abstract class BaseProvider<TName extends ApiKind, TOwner = Owner> {
     abstract readonly apiKind: TName;
+    abstract readonly method: HTTPMethods;
     readonly baseUrl: string;
     token: string;
     readonly owner: TOwner;
@@ -171,6 +176,7 @@ declare abstract class BaseProvider<TName extends ApiKind, TOwner = Owner> {
 declare class LLMProvider<TOwner extends LLMOwner> extends BaseProvider<"llm", LLMOwner> {
     readonly apiKind = "llm";
     readonly organization?: string;
+    readonly method = "POST";
     constructor(baseUrl: string, token: string, owner: TOwner, organization?: string);
     getRoute(): string[];
     getHeaders(options: LLMOptions): Record<string, string>;
@@ -356,6 +362,7 @@ type UpstashResponse<TResult> = TResult & {
 type Requester = {
     request: <TResult = unknown>(request: UpstashRequest) => Promise<UpstashResponse<TResult>>;
     requestStream: (request: UpstashRequest) => AsyncIterable<ChatCompletionChunk>;
+    headers?: Headers;
 };
 type RetryConfig = false | {
     /**
@@ -1568,6 +1575,11 @@ type ClientConfig = {
      * Configure how the client should retry requests.
      */
     retry?: RetryConfig;
+    /**
+     * Global headers to send with each request.
+     * These can be overridden by the headers in the request.
+     */
+    headers?: HeadersInit;
 };
 type PublishBatchRequest<TBody = BodyInit> = PublishRequest<TBody> & {
     queueName?: string;

package/{client-BY4y-4To.d.mts → client-CdYtp0E1.d.ts}

@@ -127,6 +127,10 @@ type ProviderInfo = {
      * provider owner
      */
     owner: Owner;
+    /**
+     * method to use in the request
+     */
+    method: HTTPMethods;
 };
 type ApiKind = "llm" | "email";
 type Owner = EmailOwner | LLMOwner;
@@ -153,6 +157,7 @@ type PublishLLMApi = PublishApi<"llm", BaseProvider<"llm", LLMOwner>> & LLMOptio
 
 declare abstract class BaseProvider<TName extends ApiKind, TOwner = Owner> {
     abstract readonly apiKind: TName;
+    abstract readonly method: HTTPMethods;
     readonly baseUrl: string;
     token: string;
     readonly owner: TOwner;
@@ -171,6 +176,7 @@ declare abstract class BaseProvider<TName extends ApiKind, TOwner = Owner> {
 declare class LLMProvider<TOwner extends LLMOwner> extends BaseProvider<"llm", LLMOwner> {
     readonly apiKind = "llm";
     readonly organization?: string;
+    readonly method = "POST";
     constructor(baseUrl: string, token: string, owner: TOwner, organization?: string);
     getRoute(): string[];
     getHeaders(options: LLMOptions): Record<string, string>;
@@ -356,6 +362,7 @@ type UpstashResponse<TResult> = TResult & {
 type Requester = {
     request: <TResult = unknown>(request: UpstashRequest) => Promise<UpstashResponse<TResult>>;
     requestStream: (request: UpstashRequest) => AsyncIterable<ChatCompletionChunk>;
+    headers?: Headers;
 };
 type RetryConfig = false | {
     /**
@@ -1568,6 +1575,11 @@ type ClientConfig = {
      * Configure how the client should retry requests.
      */
     retry?: RetryConfig;
+    /**
+     * Global headers to send with each request.
+     * These can be overridden by the headers in the request.
+     */
+    headers?: HeadersInit;
 };
 type PublishBatchRequest<TBody = BodyInit> = PublishRequest<TBody> & {
     queueName?: string;

package/cloudflare.d.mts

@@ -1,4 +1,4 @@
-import { a3 as RouteFunction, a4 as WorkflowServeOptions } from './client-BY4y-4To.mjs';
+import { a3 as RouteFunction, a4 as WorkflowServeOptions } from './client-CdYtp0E1.mjs';
 import 'neverthrow';
 
 type WorkflowBindings = {

package/cloudflare.d.ts

@@ -1,4 +1,4 @@
-import { a3 as RouteFunction, a4 as WorkflowServeOptions } from './client-BY4y-4To.js';
+import { a3 as RouteFunction, a4 as WorkflowServeOptions } from './client-CdYtp0E1.js';
 import 'neverthrow';
 
 type WorkflowBindings = {

package/cloudflare.js

@@ -237,6 +237,7 @@ var HttpClient = class {
   authorization;
   options;
   retry;
+  headers;
   constructor(config) {
     this.baseUrl = config.baseUrl.replace(/\/$/, "");
     this.authorization = config.authorization;
@@ -248,6 +249,7 @@ var HttpClient = class {
       attempts: config.retry?.retries ?? 5,
       backoff: config.retry?.backoff ?? ((retryCount) => Math.exp(retryCount) * 50)
     };
+    this.headers = config.headers;
   }
   async request(request) {
     const { response } = await this.requestWithBackoff(request);
@@ -600,6 +602,7 @@ var BaseProvider = class {
 var LLMProvider = class extends BaseProvider {
   apiKind = "llm";
   organization;
+  method = "POST";
   constructor(baseUrl, token, owner, organization) {
     super(baseUrl, token, owner);
     this.organization = organization;
@@ -660,15 +663,24 @@ var getProviderInfo = (api, upstashToken) => {
     baseUrl: finalProvider.baseUrl,
     route: finalProvider.getRoute(),
     appendHeaders: finalProvider.getHeaders(parameters),
-    owner: finalProvider.owner
+    owner: finalProvider.owner,
+    method: finalProvider.method
   };
   return finalProvider.onFinish(providerInfo, parameters);
 };
-var processApi = (request, upstashToken) => {
+var safeJoinHeaders = (headers, record) => {
+  const joinedHeaders = new Headers(record);
+  for (const [header, value] of headers.entries()) {
+    joinedHeaders.set(header, value);
+  }
+  return joinedHeaders;
+};
+var processApi = (request, headers, upstashToken) => {
   if (!request.api) {
+    request.headers = headers;
     return request;
   }
-  const { url, appendHeaders, owner } = getProviderInfo(request.api, upstashToken);
+  const { url, appendHeaders, owner, method } = getProviderInfo(request.api, upstashToken);
   if (request.api.name === "llm") {
     const callback = request.callback;
     if (!callback) {
@@ -676,21 +688,15 @@ var processApi = (request, upstashToken) => {
     }
     return {
       ...request,
-      // @ts-expect-error undici header conflict
-      headers: new Headers({
-        ...request.headers,
-        ...appendHeaders
-      }),
+      method: request.method ?? method,
+      headers: safeJoinHeaders(headers, appendHeaders),
       ...owner === "upstash" && !request.api.analytics ? { api: { name: "llm" }, url: void 0, callback } : { url, api: void 0 }
     };
   } else {
     return {
       ...request,
-      // @ts-expect-error undici header conflict
-      headers: new Headers({
-        ...request.headers,
-        ...appendHeaders
-      }),
+      method: request.method ?? method,
+      headers: safeJoinHeaders(headers, appendHeaders),
       url,
       api: void 0
     };
@@ -738,6 +744,16 @@ function prefixHeaders(headers) {
   }
   return headers;
 }
+function wrapWithGlobalHeaders(headers, globalHeaders) {
+  if (!globalHeaders) {
+    return headers;
+  }
+  const finalHeaders = new Headers(globalHeaders);
+  headers.forEach((value, key) => {
+    finalHeaders.set(key, value);
+  });
+  return finalHeaders;
+}
 function processHeaders(request) {
   const headers = prefixHeaders(new Headers(request.headers));
   headers.set("Upstash-Method", request.method ?? "POST");
@@ -884,7 +900,10 @@ var Queue = class {
     if (!this.queueName) {
       throw new Error("Please provide a queue name to the Queue constructor");
     }
-    const headers = processHeaders(request);
+    const headers = wrapWithGlobalHeaders(
+      processHeaders(request),
+      this.http.headers
+    );
     const destination = getRequestPath(request);
     const response = await this.http.request({
       path: ["v2", "enqueue", this.queueName, destination],
@@ -900,13 +919,11 @@ var Queue = class {
   async enqueueJSON(request) {
     const headers = prefixHeaders(new Headers(request.headers));
     headers.set("Content-Type", "application/json");
-    request.headers = headers;
     const upstashToken = String(this.http.authorization).split("Bearer ")[1];
-    const nonApiRequest = processApi(request, upstashToken);
+    const nonApiRequest = processApi(request, headers, upstashToken);
     const response = await this.enqueue({
       ...nonApiRequest,
-      body: JSON.stringify(nonApiRequest.body),
-      headers
+      body: JSON.stringify(nonApiRequest.body)
     });
     return response;
   }
@@ -990,7 +1007,7 @@ var Schedules = class {
     }
     return await this.http.request({
       method: "POST",
-      headers,
+      headers: wrapWithGlobalHeaders(headers, this.http.headers),
       path: ["v2", "schedules", request.destination],
       body: request.body
     });
@@ -1116,7 +1133,9 @@ var Client = class {
     this.http = new HttpClient({
       retry: config.retry,
       baseUrl: config.baseUrl ? config.baseUrl.replace(/\/$/, "") : "https://qstash.upstash.io",
-      authorization: `Bearer ${config.token}`
+      authorization: `Bearer ${config.token}`,
+      //@ts-expect-error caused by undici and bunjs type overlap
+      headers: prefixHeaders(new Headers(config.headers))
     });
     this.token = config.token;
   }
@@ -1191,7 +1210,10 @@ var Client = class {
     return new Chat(this.http, this.token);
   }
   async publish(request) {
-    const headers = processHeaders(request);
+    const headers = wrapWithGlobalHeaders(
+      processHeaders(request),
+      this.http.headers
+    );
     const response = await this.http.request({
       path: ["v2", "publish", getRequestPath(request)],
       body: request.body,
@@ -1207,9 +1229,8 @@ var Client = class {
   async publishJSON(request) {
     const headers = prefixHeaders(new Headers(request.headers));
     headers.set("Content-Type", "application/json");
-    request.headers = headers;
     const upstashToken = String(this.http.authorization).split("Bearer ")[1];
-    const nonApiRequest = processApi(request, upstashToken);
+    const nonApiRequest = processApi(request, headers, upstashToken);
     const response = await this.publish({
       ...nonApiRequest,
       body: JSON.stringify(nonApiRequest.body)
@@ -1222,7 +1243,7 @@ var Client = class {
   async batch(request) {
     const messages = [];
     for (const message of request) {
-      const headers = processHeaders(message);
+      const headers = wrapWithGlobalHeaders(processHeaders(message), this.http.headers);
       const headerEntries = Object.fromEntries(headers.entries());
       messages.push({
         destination: getRequestPath(message),
@@ -1250,9 +1271,8 @@ var Client = class {
       if ("body" in message) {
         message.body = JSON.stringify(message.body);
       }
-      message.headers = new Headers(message.headers);
       const upstashToken = String(this.http.authorization).split("Bearer ")[1];
-      const nonApiMessage = processApi(message, upstashToken);
+      const nonApiMessage = processApi(message, new Headers(message.headers), upstashToken);
       nonApiMessage.headers.set("Content-Type", "application/json");
       return nonApiMessage;
     });

package/cloudflare.mjs

@@ -1,6 +1,6 @@
 import {
   serve
-} from "./chunk-2V6WQVIN.mjs";
+} from "./chunk-S5ODGXCI.mjs";
 
 // platforms/cloudflare.ts
 var getArgs = (args) => {

package/h3.d.mts

@@ -1,6 +1,6 @@
 import * as h3 from 'h3';
 import { H3Event } from 'h3';
-import { a3 as RouteFunction, a4 as WorkflowServeOptions } from './client-BY4y-4To.mjs';
+import { a3 as RouteFunction, a4 as WorkflowServeOptions } from './client-CdYtp0E1.mjs';
 import 'neverthrow';
 
 type VerifySignatureConfig = {

package/h3.d.ts

@@ -1,6 +1,6 @@
 import * as h3 from 'h3';
 import { H3Event } from 'h3';
-import { a3 as RouteFunction, a4 as WorkflowServeOptions } from './client-BY4y-4To.js';
+import { a3 as RouteFunction, a4 as WorkflowServeOptions } from './client-CdYtp0E1.js';
 import 'neverthrow';
 
 type VerifySignatureConfig = {