@upstash/qstash 2.7.13 → 2.7.15

package/hono.js

@@ -60,11 +60,14 @@ var Receiver = class {
    * If that fails, the signature is invalid and a `SignatureError` is thrown.
    */
   async verify(request) {
-    const isValid = await this.verifyWithKey(this.currentSigningKey, request);
-    if (isValid) {
-      return true;
+    let payload;
+    try {
+      payload = await this.verifyWithKey(this.currentSigningKey, request);
+    } catch {
+      payload = await this.verifyWithKey(this.nextSigningKey, request);
     }
-    return this.verifyWithKey(this.nextSigningKey, request);
+    this.verifyBodyAndUrl(payload, request);
+    return true;
   }
   /**
    * Verify signature with a specific signing key
@@ -76,7 +79,10 @@ var Receiver = class {
     }).catch((error) => {
       throw new SignatureError(error.message);
     });
-    const p = jwt.payload;
+    return jwt.payload;
+  }
+  verifyBodyAndUrl(payload, request) {
+    const p = payload;
     if (request.url !== void 0 && p.sub !== request.url) {
       throw new SignatureError(`invalid subject: ${p.sub}, want: ${request.url}`);
     }
@@ -85,7 +91,6 @@ var Receiver = class {
     if (p.body.replace(padding, "") !== bodyHash.replace(padding, "")) {
       throw new SignatureError(`body hash does not match, want: ${p.body}, got: ${bodyHash}`);
     }
-    return true;
   }
 };
 
@@ -236,7 +241,7 @@ var HttpClient = class {
       attempts: 1,
       backoff: () => 0
     } : {
-      attempts: config.retry?.retries ? config.retry.retries + 1 : 5,
+      attempts: config.retry?.retries ?? 5,
       backoff: config.retry?.backoff ?? ((retryCount) => Math.exp(retryCount) * 50)
     };
   }
@@ -281,13 +286,15 @@ var HttpClient = class {
     const [url, requestOptions] = this.processRequest(request);
     let response = void 0;
     let error = void 0;
-    for (let index = 0; index < this.retry.attempts; index++) {
+    for (let index = 0; index <= this.retry.attempts; index++) {
       try {
         response = await fetch(url.toString(), requestOptions);
         break;
       } catch (error_) {
         error = error_;
-        await new Promise((r) => setTimeout(r, this.retry.backoff(index)));
+        if (index < this.retry.attempts) {
+          await new Promise((r) => setTimeout(r, this.retry.backoff(index)));
+        }
       }
     }
     if (!response) {
@@ -459,7 +466,6 @@ var Chat = class _Chat {
    * @param request ChatRequest with messages
    * @returns Chat completion or stream
    */
-  // eslint-disable-next-line @typescript-eslint/require-await
   createThirdParty = async (request) => {
     const { baseUrl, token, owner, organization } = request.provider;
     if (owner === "upstash")
@@ -520,63 +526,6 @@ var Chat = class _Chat {
   };
 };
 
-// src/client/llm/utils.ts
-function appendLLMOptionsIfNeeded(request, headers, http) {
-  if (!request.api)
-    return;
-  const provider = request.api.provider;
-  const analytics = request.api.analytics;
-  if (provider?.owner === "upstash") {
-    handleUpstashProvider(request, headers, http, analytics);
-    return;
-  }
-  if (!("provider" in request.api))
-    return;
-  const { baseUrl, token } = validateProviderConfig(provider);
-  const analyticsConfig = analytics ? setupAnalytics({ name: analytics.name, token: analytics.token }, token, baseUrl, "custom") : void 0;
-  if (analyticsConfig) {
-    setAnalyticsHeaders(headers, analyticsConfig);
-    request.url = analyticsConfig.baseURL;
-  } else {
-    request.url = `${baseUrl}/v1/chat/completions`;
-    headers.set("Authorization", `Bearer ${token}`);
-  }
-}
-function handleUpstashProvider(request, headers, http, analytics) {
-  if (analytics) {
-    const analyticsConfig = setupAnalytics(
-      { name: analytics.name, token: analytics.token },
-      //@ts-expect-error hacky way to get bearer token
-      String(http.authorization).split("Bearer ")[1],
-      request.api?.provider?.baseUrl,
-      "upstash"
-    );
-    setAnalyticsHeaders(headers, analyticsConfig);
-    request.url = analyticsConfig.baseURL;
-  } else {
-    request.api = { name: "llm" };
-  }
-}
-function validateProviderConfig(provider) {
-  if (!provider?.baseUrl)
-    throw new Error("baseUrl cannot be empty or undefined!");
-  if (!provider.token)
-    throw new Error("token cannot be empty or undefined!");
-  return { baseUrl: provider.baseUrl, token: provider.token };
-}
-function setAnalyticsHeaders(headers, analyticsConfig) {
-  headers.set("Helicone-Auth", analyticsConfig.defaultHeaders?.["Helicone-Auth"] ?? "");
-  headers.set("Authorization", analyticsConfig.defaultHeaders?.Authorization ?? "");
-  if (analyticsConfig.defaultHeaders?.["Helicone-Target-Url"]) {
-    headers.set("Helicone-Target-Url", analyticsConfig.defaultHeaders["Helicone-Target-Url"]);
-  }
-}
-function ensureCallbackPresent(request) {
-  if (request.api?.name === "llm" && !request.callback) {
-    throw new TypeError("Callback cannot be undefined when using LLM");
-  }
-}
-
 // src/client/messages.ts
 var Messages = class {
   http;
@@ -625,6 +574,144 @@ var Messages = class {
   }
 };
 
+// src/client/api/base.ts
+var BaseProvider = class {
+  baseUrl;
+  token;
+  owner;
+  constructor(baseUrl, token, owner) {
+    this.baseUrl = baseUrl;
+    this.token = token;
+    this.owner = owner;
+  }
+  getUrl() {
+    return `${this.baseUrl}/${this.getRoute().join("/")}`;
+  }
+};
+
+// src/client/api/llm.ts
+var LLMProvider = class extends BaseProvider {
+  apiKind = "llm";
+  organization;
+  constructor(baseUrl, token, owner, organization) {
+    super(baseUrl, token, owner);
+    this.organization = organization;
+  }
+  getRoute() {
+    return this.owner === "anthropic" ? ["v1", "messages"] : ["v1", "chat", "completions"];
+  }
+  getHeaders(options) {
+    if (this.owner === "upstash" && !options.analytics) {
+      return {};
+    }
+    const header = this.owner === "anthropic" ? "x-api-key" : "authorization";
+    const headerValue = this.owner === "anthropic" ? this.token : `Bearer ${this.token}`;
+    const headers = { [header]: headerValue };
+    if (this.owner === "openai" && this.organization) {
+      headers["OpenAI-Organization"] = this.organization;
+    }
+    return headers;
+  }
+  /**
+   * Checks if callback exists and adds analytics in place if it's set.
+   *
+   * @param request
+   * @param options
+   */
+  onFinish(providerInfo, options) {
+    if (options.analytics) {
+      return updateWithAnalytics(providerInfo, options.analytics);
+    }
+    return providerInfo;
+  }
+};
+var upstash = () => {
+  return new LLMProvider("https://qstash.upstash.io/llm", "", "upstash");
+};
+
+// src/client/api/utils.ts
+var getProviderInfo = (api, upstashToken) => {
+  const { name, provider, ...parameters } = api;
+  const finalProvider = provider ?? upstash();
+  if (finalProvider.owner === "upstash" && !finalProvider.token) {
+    finalProvider.token = upstashToken;
+  }
+  if (!finalProvider.baseUrl)
+    throw new TypeError("baseUrl cannot be empty or undefined!");
+  if (!finalProvider.token)
+    throw new TypeError("token cannot be empty or undefined!");
+  if (finalProvider.apiKind !== name) {
+    throw new TypeError(
+      `Unexpected api name. Expected '${finalProvider.apiKind}', received ${name}`
+    );
+  }
+  const providerInfo = {
+    url: finalProvider.getUrl(),
+    baseUrl: finalProvider.baseUrl,
+    route: finalProvider.getRoute(),
+    appendHeaders: finalProvider.getHeaders(parameters),
+    owner: finalProvider.owner
+  };
+  return finalProvider.onFinish(providerInfo, parameters);
+};
+var processApi = (request, upstashToken) => {
+  if (!request.api) {
+    return request;
+  }
+  const { url, appendHeaders, owner } = getProviderInfo(request.api, upstashToken);
+  if (request.api.name === "llm") {
+    const callback = request.callback;
+    if (!callback) {
+      throw new TypeError("Callback cannot be undefined when using LLM api.");
+    }
+    return {
+      ...request,
+      // @ts-expect-error undici header conflict
+      headers: new Headers({
+        ...request.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
+      }),
+      url,
+      api: void 0
+    };
+  }
+};
+function updateWithAnalytics(providerInfo, analytics) {
+  switch (analytics.name) {
+    case "helicone": {
+      providerInfo.appendHeaders["Helicone-Auth"] = `Bearer ${analytics.token}`;
+      if (providerInfo.owner === "upstash") {
+        updateProviderInfo(providerInfo, "https://qstash.helicone.ai", [
+          "llm",
+          ...providerInfo.route
+        ]);
+      } else {
+        providerInfo.appendHeaders["Helicone-Target-Url"] = providerInfo.baseUrl;
+        updateProviderInfo(providerInfo, "https://gateway.helicone.ai", providerInfo.route);
+      }
+      return providerInfo;
+    }
+    default: {
+      throw new Error("Unknown analytics provider");
+    }
+  }
+}
+function updateProviderInfo(providerInfo, baseUrl, route) {
+  providerInfo.baseUrl = baseUrl;
+  providerInfo.route = route;
+  providerInfo.url = `${baseUrl}/${route.join("/")}`;
+}
+
 // src/client/utils.ts
 var isIgnoredHeader = (header) => {
   const lowerCaseHeader = header.toLowerCase();
@@ -657,7 +744,7 @@ function processHeaders(request) {
   if (request.deduplicationId !== void 0) {
     headers.set("Upstash-Deduplication-Id", request.deduplicationId);
   }
-  if (request.contentBasedDeduplication !== void 0) {
+  if (request.contentBasedDeduplication) {
     headers.set("Upstash-Content-Based-Deduplication", "true");
   }
   if (request.retries !== void 0) {
@@ -679,7 +766,16 @@ function processHeaders(request) {
   return headers;
 }
 function getRequestPath(request) {
-  return request.url ?? request.urlGroup ?? request.topic ?? `api/${request.api?.name}`;
+  const nonApiPath = request.url ?? request.urlGroup ?? request.topic;
+  if (nonApiPath)
+    return nonApiPath;
+  if (request.api?.name === "llm")
+    return `api/llm`;
+  if (request.api?.name === "email") {
+    const providerInfo = getProviderInfo(request.api, "not-needed");
+    return providerInfo.baseUrl;
+  }
+  throw new QstashError(`Failed to infer request path for ${JSON.stringify(request)}`);
 }
 var NANOID_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
 var NANOID_LENGTH = 21;
@@ -692,10 +788,18 @@ function decodeBase64(base64) {
     const intArray = Uint8Array.from(binString, (m) => m.codePointAt(0));
     return new TextDecoder().decode(intArray);
   } catch (error) {
-    console.warn(
-      `Upstash Qstash: Failed while decoding base64 "${base64}". Decoding with atob and returning it instead. ${error}`
-    );
-    return atob(base64);
+    try {
+      const result = atob(base64);
+      console.warn(
+        `Upstash QStash: Failed while decoding base64 "${base64}". Decoding with atob and returning it instead. ${error}`
+      );
+      return result;
+    } catch (error2) {
+      console.warn(
+        `Upstash QStash: Failed to decode base64 "${base64}" with atob. Returning it as it is. ${error2}`
+      );
+      return base64;
+    }
   }
 }
 
@@ -786,11 +890,12 @@ var Queue = class {
   async enqueueJSON(request) {
     const headers = prefixHeaders(new Headers(request.headers));
     headers.set("Content-Type", "application/json");
-    ensureCallbackPresent(request);
-    appendLLMOptionsIfNeeded(request, headers, this.http);
+    request.headers = headers;
+    const upstashToken = String(this.http.authorization).split("Bearer ")[1];
+    const nonApiRequest = processApi(request, upstashToken);
     const response = await this.enqueue({
-      ...request,
-      body: JSON.stringify(request.body),
+      ...nonApiRequest,
+      body: JSON.stringify(nonApiRequest.body),
       headers
     });
     return response;
@@ -870,6 +975,9 @@ var Schedules = class {
     if (request.scheduleId !== void 0) {
       headers.set("Upstash-Schedule-Id", request.scheduleId);
     }
+    if (request.queueName !== void 0) {
+      headers.set("Upstash-Queue-Name", request.queueName);
+    }
     return await this.http.request({
       method: "POST",
       headers,
@@ -1085,12 +1193,12 @@ var Client = class {
   async publishJSON(request) {
     const headers = prefixHeaders(new Headers(request.headers));
     headers.set("Content-Type", "application/json");
-    ensureCallbackPresent(request);
-    appendLLMOptionsIfNeeded(request, headers, this.http);
+    request.headers = headers;
+    const upstashToken = String(this.http.authorization).split("Bearer ")[1];
+    const nonApiRequest = processApi(request, upstashToken);
     const response = await this.publish({
-      ...request,
-      headers,
-      body: JSON.stringify(request.body)
+      ...nonApiRequest,
+      body: JSON.stringify(nonApiRequest.body)
     });
     return response;
   }
@@ -1124,16 +1232,17 @@ var Client = class {
    * Batch publish messages to QStash, serializing each body to JSON.
    */
   async batchJSON(request) {
-    for (const message of request) {
+    const batchPayload = request.map((message) => {
       if ("body" in message) {
         message.body = JSON.stringify(message.body);
       }
       message.headers = new Headers(message.headers);
-      ensureCallbackPresent(message);
-      appendLLMOptionsIfNeeded(message, message.headers, this.http);
-      message.headers.set("Content-Type", "application/json");
-    }
-    const response = await this.batch(request);
+      const upstashToken = String(this.http.authorization).split("Bearer ")[1];
+      const nonApiMessage = processApi(message, upstashToken);
+      nonApiMessage.headers.set("Content-Type", "application/json");
+      return nonApiMessage;
+    });
+    const response = await this.batch(batchPayload);
     return response;
   }
   /**

package/hono.mjs

@@ -1,6 +1,6 @@
 import {
   serve
-} from "./chunk-Q6E5NF42.mjs";
+} from "./chunk-Y52A3KZT.mjs";
 
 // platforms/hono.ts
 var serve2 = (routeFunction, options) => {

package/index.d.mts

@@ -1,5 +1,5 @@
-import { R as RateLimit, C as ChatRateLimit, S as Step, F as FailureFunctionPayload } from './client-DEZq0-qk.mjs';
-export { A as AddEndpointsRequest, $ as AnalyticsConfig, a0 as AnalyticsSetup, B as BodyInit, y as Chat, D as ChatCompletion, I as ChatCompletionChunk, z as ChatCompletionMessage, T as ChatRequest, f as Client, n as CreateScheduleRequest, p as Endpoint, t as Event, u as EventPayload, E as EventsRequest, v as GetEventsPayload, G as GetEventsResponse, H as HTTPMethods, w as HeadersInit, M as Message, k as MessagePayload, l as Messages, O as OpenAIChatModel, N as PromptChatRequest, _ as ProviderReturnType, P as PublishBatchRequest, e as PublishJsonRequest, d as PublishRequest, j as PublishResponse, g as PublishToApiResponse, i as PublishToUrlGroupsResponse, h as PublishToUrlResponse, Q as QueueRequest, c as Receiver, a as ReceiverConfig, q as RemoveEndpointsRequest, x as RequestOptions, m as Schedule, o as Schedules, b as SignatureError, s as State, K as StreamDisabled, J as StreamEnabled, L as StreamParameter, U as UrlGroup, r as UrlGroups, V as VerifyRequest, W as WithCursor, X as custom, Y as openai, a1 as setupAnalytics, Z as upstash } from './client-DEZq0-qk.mjs';
+import { R as RateLimit, C as ChatRateLimit, S as Step, F as FailureFunctionPayload, L as LLMOwner, B as BaseProvider, E as EmailOwner, P as ProviderInfo } from './client-RORrka04.mjs';
+export { A as AddEndpointsRequest, y as BodyInit, I as Chat, K as ChatCompletion, N as ChatCompletionChunk, J as ChatCompletionMessage, _ as ChatRequest, h as Client, p as CreateScheduleRequest, r as Endpoint, v as Event, w as EventPayload, g as EventsRequest, x as GetEventsPayload, G as GetEventsResponse, H as HTTPMethods, z as HeadersInit, M as Message, m as MessagePayload, n as Messages, Y as OpenAIChatModel, Z as PromptChatRequest, d as PublishBatchRequest, f as PublishJsonRequest, e as PublishRequest, l as PublishResponse, i as PublishToApiResponse, k as PublishToUrlGroupsResponse, j as PublishToUrlResponse, Q as QueueRequest, c as Receiver, a as ReceiverConfig, s as RemoveEndpointsRequest, D as RequestOptions, o as Schedule, q as Schedules, b as SignatureError, u as State, T as StreamDisabled, O as StreamEnabled, X as StreamParameter, U as UrlGroup, t as UrlGroups, V as VerifyRequest, W as WithCursor, a1 as anthropic, a2 as custom, a0 as openai, $ as upstash } from './client-RORrka04.mjs';
 import 'neverthrow';
 
 /**
@@ -64,4 +64,27 @@ declare const formatWorkflowError: (error: unknown) => FailureFunctionPayload;
  */
 declare function decodeBase64(base64: string): string;
 
-export { ChatRateLimit, QStashWorkflowAbort, QStashWorkflowError, QstashChatRatelimitError, QstashDailyRatelimitError, QstashError, QstashRatelimitError, RateLimit, decodeBase64, formatWorkflowError };
+type AnalyticsConfig = {
+    name: "helicone";
+    token: string;
+};
+type AnalyticsSetup = {
+    baseURL?: string;
+    defaultHeaders?: Record<string, string | undefined>;
+};
+declare const setupAnalytics: (analytics: AnalyticsConfig | undefined, providerApiKey: string, providerBaseUrl?: string, provider?: LLMOwner) => AnalyticsSetup;
+
+declare class EmailProvider extends BaseProvider<"email", EmailOwner> {
+    readonly apiKind = "email";
+    readonly batch: boolean;
+    constructor(baseUrl: string, token: string, owner: EmailOwner, batch: boolean);
+    getRoute(): string[];
+    getHeaders(_options: unknown): Record<string, string>;
+    onFinish(providerInfo: ProviderInfo, _options: unknown): ProviderInfo;
+}
+declare const resend: ({ token, batch, }: {
+    token: string;
+    batch?: boolean;
+}) => EmailProvider;
+
+export { ChatRateLimit, QStashWorkflowAbort, QStashWorkflowError, QstashChatRatelimitError, QstashDailyRatelimitError, QstashError, QstashRatelimitError, RateLimit, decodeBase64, formatWorkflowError, resend, setupAnalytics };

package/index.d.ts

@@ -1,5 +1,5 @@
-import { R as RateLimit, C as ChatRateLimit, S as Step, F as FailureFunctionPayload } from './client-DEZq0-qk.js';
-export { A as AddEndpointsRequest, $ as AnalyticsConfig, a0 as AnalyticsSetup, B as BodyInit, y as Chat, D as ChatCompletion, I as ChatCompletionChunk, z as ChatCompletionMessage, T as ChatRequest, f as Client, n as CreateScheduleRequest, p as Endpoint, t as Event, u as EventPayload, E as EventsRequest, v as GetEventsPayload, G as GetEventsResponse, H as HTTPMethods, w as HeadersInit, M as Message, k as MessagePayload, l as Messages, O as OpenAIChatModel, N as PromptChatRequest, _ as ProviderReturnType, P as PublishBatchRequest, e as PublishJsonRequest, d as PublishRequest, j as PublishResponse, g as PublishToApiResponse, i as PublishToUrlGroupsResponse, h as PublishToUrlResponse, Q as QueueRequest, c as Receiver, a as ReceiverConfig, q as RemoveEndpointsRequest, x as RequestOptions, m as Schedule, o as Schedules, b as SignatureError, s as State, K as StreamDisabled, J as StreamEnabled, L as StreamParameter, U as UrlGroup, r as UrlGroups, V as VerifyRequest, W as WithCursor, X as custom, Y as openai, a1 as setupAnalytics, Z as upstash } from './client-DEZq0-qk.js';
+import { R as RateLimit, C as ChatRateLimit, S as Step, F as FailureFunctionPayload, L as LLMOwner, B as BaseProvider, E as EmailOwner, P as ProviderInfo } from './client-RORrka04.js';
+export { A as AddEndpointsRequest, y as BodyInit, I as Chat, K as ChatCompletion, N as ChatCompletionChunk, J as ChatCompletionMessage, _ as ChatRequest, h as Client, p as CreateScheduleRequest, r as Endpoint, v as Event, w as EventPayload, g as EventsRequest, x as GetEventsPayload, G as GetEventsResponse, H as HTTPMethods, z as HeadersInit, M as Message, m as MessagePayload, n as Messages, Y as OpenAIChatModel, Z as PromptChatRequest, d as PublishBatchRequest, f as PublishJsonRequest, e as PublishRequest, l as PublishResponse, i as PublishToApiResponse, k as PublishToUrlGroupsResponse, j as PublishToUrlResponse, Q as QueueRequest, c as Receiver, a as ReceiverConfig, s as RemoveEndpointsRequest, D as RequestOptions, o as Schedule, q as Schedules, b as SignatureError, u as State, T as StreamDisabled, O as StreamEnabled, X as StreamParameter, U as UrlGroup, t as UrlGroups, V as VerifyRequest, W as WithCursor, a1 as anthropic, a2 as custom, a0 as openai, $ as upstash } from './client-RORrka04.js';
 import 'neverthrow';
 
 /**
@@ -64,4 +64,27 @@ declare const formatWorkflowError: (error: unknown) => FailureFunctionPayload;
  */
 declare function decodeBase64(base64: string): string;
 
-export { ChatRateLimit, QStashWorkflowAbort, QStashWorkflowError, QstashChatRatelimitError, QstashDailyRatelimitError, QstashError, QstashRatelimitError, RateLimit, decodeBase64, formatWorkflowError };
+type AnalyticsConfig = {
+    name: "helicone";
+    token: string;
+};
+type AnalyticsSetup = {
+    baseURL?: string;
+    defaultHeaders?: Record<string, string | undefined>;
+};
+declare const setupAnalytics: (analytics: AnalyticsConfig | undefined, providerApiKey: string, providerBaseUrl?: string, provider?: LLMOwner) => AnalyticsSetup;
+
+declare class EmailProvider extends BaseProvider<"email", EmailOwner> {
+    readonly apiKind = "email";
+    readonly batch: boolean;
+    constructor(baseUrl: string, token: string, owner: EmailOwner, batch: boolean);
+    getRoute(): string[];
+    getHeaders(_options: unknown): Record<string, string>;
+    onFinish(providerInfo: ProviderInfo, _options: unknown): ProviderInfo;
+}
+declare const resend: ({ token, batch, }: {
+    token: string;
+    batch?: boolean;
+}) => EmailProvider;
+
+export { ChatRateLimit, QStashWorkflowAbort, QStashWorkflowError, QstashChatRatelimitError, QstashDailyRatelimitError, QstashError, QstashRatelimitError, RateLimit, decodeBase64, formatWorkflowError, resend, setupAnalytics };