@upstash/qstash 2.7.13 → 2.7.14

package/solidjs.js

@@ -61,11 +61,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
@@ -77,7 +80,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}`);
     }
@@ -86,7 +92,14 @@ 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;
+  }
+};
+
+// src/client/api/utils.ts
+var appendAPIOptions = (request, headers) => {
+  if (request.api?.name === "email") {
+    headers.set("Authorization", request.api.provider.token);
+    request.method = request.method ?? "POST";
   }
 };
 
@@ -523,7 +536,7 @@ var Chat = class _Chat {
 
 // src/client/llm/utils.ts
 function appendLLMOptionsIfNeeded(request, headers, http) {
-  if (!request.api)
+  if (request.api?.name === "email" || !request.api)
     return;
   const provider = request.api.provider;
   const analytics = request.api.analytics;
@@ -680,7 +693,15 @@ 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/${request.api.name}`;
+  if (request.api?.name === "email") {
+    return request.api.provider.baseUrl;
+  }
+  throw new QstashError(`Failed to infer request path for ${JSON.stringify(request)}`);
 }
 var NANOID_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
 var NANOID_LENGTH = 21;
@@ -693,10 +714,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;
+    }
   }
 }
 
@@ -789,6 +818,7 @@ var Queue = class {
     headers.set("Content-Type", "application/json");
     ensureCallbackPresent(request);
     appendLLMOptionsIfNeeded(request, headers, this.http);
+    appendAPIOptions(request, headers);
     const response = await this.enqueue({
       ...request,
       body: JSON.stringify(request.body),
@@ -871,6 +901,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,
@@ -2474,6 +2507,7 @@ var Client = class {
     headers.set("Content-Type", "application/json");
     ensureCallbackPresent(request);
     appendLLMOptionsIfNeeded(request, headers, this.http);
+    appendAPIOptions(request, headers);
     const response = await this.publish({
       ...request,
       headers,
@@ -2518,6 +2552,7 @@ var Client = class {
       message.headers = new Headers(message.headers);
       ensureCallbackPresent(message);
       appendLLMOptionsIfNeeded(message, message.headers, this.http);
+      appendAPIOptions(message, message.headers);
       message.headers.set("Content-Type", "application/json");
     }
     const response = await this.batch(request);

package/solidjs.mjs

@@ -1,8 +1,8 @@
-import "./chunk-CIVGPRQN.mjs";
+import "./chunk-AROUU44N.mjs";
 import {
   Receiver,
   serve
-} from "./chunk-Q6E5NF42.mjs";
+} from "./chunk-Q2AGFQYM.mjs";
 
 // platforms/solidjs.ts
 var verifySignatureSolidjs = (handler, config) => {

package/svelte.d.mts

@@ -1,5 +1,5 @@
 import { RequestHandler } from '@sveltejs/kit';
-import { a2 as RouteFunction, a3 as WorkflowServeOptions } from './client-DEZq0-qk.mjs';
+import { a3 as RouteFunction, a4 as WorkflowServeOptions } from './client-kxUsvnWj.mjs';
 import 'neverthrow';
 
 type VerifySignatureConfig = {

package/svelte.d.ts

@@ -1,5 +1,5 @@
 import { RequestHandler } from '@sveltejs/kit';
-import { a2 as RouteFunction, a3 as WorkflowServeOptions } from './client-DEZq0-qk.js';
+import { a3 as RouteFunction, a4 as WorkflowServeOptions } from './client-kxUsvnWj.js';
 import 'neverthrow';
 
 type VerifySignatureConfig = {

package/svelte.js

@@ -61,11 +61,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
@@ -77,7 +80,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}`);
     }
@@ -86,7 +92,14 @@ 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;
+  }
+};
+
+// src/client/api/utils.ts
+var appendAPIOptions = (request, headers) => {
+  if (request.api?.name === "email") {
+    headers.set("Authorization", request.api.provider.token);
+    request.method = request.method ?? "POST";
   }
 };
 
@@ -523,7 +536,7 @@ var Chat = class _Chat {
 
 // src/client/llm/utils.ts
 function appendLLMOptionsIfNeeded(request, headers, http) {
-  if (!request.api)
+  if (request.api?.name === "email" || !request.api)
     return;
   const provider = request.api.provider;
   const analytics = request.api.analytics;
@@ -680,7 +693,15 @@ 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/${request.api.name}`;
+  if (request.api?.name === "email") {
+    return request.api.provider.baseUrl;
+  }
+  throw new QstashError(`Failed to infer request path for ${JSON.stringify(request)}`);
 }
 var NANOID_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
 var NANOID_LENGTH = 21;
@@ -693,10 +714,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;
+    }
   }
 }
 
@@ -789,6 +818,7 @@ var Queue = class {
     headers.set("Content-Type", "application/json");
     ensureCallbackPresent(request);
     appendLLMOptionsIfNeeded(request, headers, this.http);
+    appendAPIOptions(request, headers);
     const response = await this.enqueue({
       ...request,
       body: JSON.stringify(request.body),
@@ -871,6 +901,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,
@@ -2474,6 +2507,7 @@ var Client = class {
     headers.set("Content-Type", "application/json");
     ensureCallbackPresent(request);
     appendLLMOptionsIfNeeded(request, headers, this.http);
+    appendAPIOptions(request, headers);
     const response = await this.publish({
       ...request,
       headers,
@@ -2518,6 +2552,7 @@ var Client = class {
       message.headers = new Headers(message.headers);
       ensureCallbackPresent(message);
       appendLLMOptionsIfNeeded(message, message.headers, this.http);
+      appendAPIOptions(message, message.headers);
       message.headers.set("Content-Type", "application/json");
     }
     const response = await this.batch(request);

package/svelte.mjs

@@ -1,8 +1,8 @@
-import "./chunk-CIVGPRQN.mjs";
+import "./chunk-AROUU44N.mjs";
 import {
   Receiver,
   serve
-} from "./chunk-Q6E5NF42.mjs";
+} from "./chunk-Q2AGFQYM.mjs";
 
 // platforms/svelte.ts
 var verifySignatureSvelte = (handler, config) => {

package/workflow.d.mts

@@ -1,2 +1,2 @@
-export { af as AsyncStepFunction, a8 as DisabledWorkflowContext, F as FailureFunctionPayload, ai as FinishCondition, ak as LogLevel, ah as ParallelCallState, ad as RawStep, aj as RequiredExceptFields, a2 as RouteFunction, S as Step, ag as StepFunction, ac as StepType, ab as StepTypes, ae as SyncStepFunction, a4 as Workflow, a9 as WorkflowClient, a7 as WorkflowContext, am as WorkflowLogger, al as WorkflowLoggerOptions, aa as WorkflowReceiver, a3 as WorkflowServeOptions, a5 as processOptions, a6 as serve } from './client-DEZq0-qk.mjs';
+export { ag as AsyncStepFunction, a9 as DisabledWorkflowContext, F as FailureFunctionPayload, aj as FinishCondition, al as LogLevel, ai as ParallelCallState, ae as RawStep, ak as RequiredExceptFields, a3 as RouteFunction, S as Step, ah as StepFunction, ad as StepType, ac as StepTypes, af as SyncStepFunction, a5 as Workflow, aa as WorkflowClient, a8 as WorkflowContext, an as WorkflowLogger, am as WorkflowLoggerOptions, ab as WorkflowReceiver, a4 as WorkflowServeOptions, a6 as processOptions, a7 as serve } from './client-kxUsvnWj.mjs';
 import 'neverthrow';

package/workflow.d.ts

@@ -1,2 +1,2 @@
-export { af as AsyncStepFunction, a8 as DisabledWorkflowContext, F as FailureFunctionPayload, ai as FinishCondition, ak as LogLevel, ah as ParallelCallState, ad as RawStep, aj as RequiredExceptFields, a2 as RouteFunction, S as Step, ag as StepFunction, ac as StepType, ab as StepTypes, ae as SyncStepFunction, a4 as Workflow, a9 as WorkflowClient, a7 as WorkflowContext, am as WorkflowLogger, al as WorkflowLoggerOptions, aa as WorkflowReceiver, a3 as WorkflowServeOptions, a5 as processOptions, a6 as serve } from './client-DEZq0-qk.js';
+export { ag as AsyncStepFunction, a9 as DisabledWorkflowContext, F as FailureFunctionPayload, aj as FinishCondition, al as LogLevel, ai as ParallelCallState, ae as RawStep, ak as RequiredExceptFields, a3 as RouteFunction, S as Step, ah as StepFunction, ad as StepType, ac as StepTypes, af as SyncStepFunction, a5 as Workflow, aa as WorkflowClient, a8 as WorkflowContext, an as WorkflowLogger, am as WorkflowLoggerOptions, ab as WorkflowReceiver, a4 as WorkflowServeOptions, a6 as processOptions, a7 as serve } from './client-kxUsvnWj.js';
 import 'neverthrow';

package/workflow.js

@@ -66,11 +66,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
@@ -82,7 +85,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}`);
     }
@@ -91,7 +97,14 @@ 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;
+  }
+};
+
+// src/client/api/utils.ts
+var appendAPIOptions = (request, headers) => {
+  if (request.api?.name === "email") {
+    headers.set("Authorization", request.api.provider.token);
+    request.method = request.method ?? "POST";
   }
 };
 
@@ -528,7 +541,7 @@ var Chat = class _Chat {
 
 // src/client/llm/utils.ts
 function appendLLMOptionsIfNeeded(request, headers, http) {
-  if (!request.api)
+  if (request.api?.name === "email" || !request.api)
     return;
   const provider = request.api.provider;
   const analytics = request.api.analytics;
@@ -685,7 +698,15 @@ 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/${request.api.name}`;
+  if (request.api?.name === "email") {
+    return request.api.provider.baseUrl;
+  }
+  throw new QstashError(`Failed to infer request path for ${JSON.stringify(request)}`);
 }
 var NANOID_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
 var NANOID_LENGTH = 21;
@@ -698,10 +719,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;
+    }
   }
 }
 
@@ -794,6 +823,7 @@ var Queue = class {
     headers.set("Content-Type", "application/json");
     ensureCallbackPresent(request);
     appendLLMOptionsIfNeeded(request, headers, this.http);
+    appendAPIOptions(request, headers);
     const response = await this.enqueue({
       ...request,
       body: JSON.stringify(request.body),
@@ -876,6 +906,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,
@@ -1093,6 +1126,7 @@ var Client = class {
     headers.set("Content-Type", "application/json");
     ensureCallbackPresent(request);
     appendLLMOptionsIfNeeded(request, headers, this.http);
+    appendAPIOptions(request, headers);
     const response = await this.publish({
       ...request,
       headers,
@@ -1137,6 +1171,7 @@ var Client = class {
       message.headers = new Headers(message.headers);
       ensureCallbackPresent(message);
       appendLLMOptionsIfNeeded(message, message.headers, this.http);
+      appendAPIOptions(message, message.headers);
       message.headers.set("Content-Type", "application/json");
     }
     const response = await this.batch(request);

package/workflow.mjs

@@ -6,7 +6,7 @@ import {
   WorkflowLogger,
   processOptions,
   serve
-} from "./chunk-Q6E5NF42.mjs";
+} from "./chunk-Q2AGFQYM.mjs";
 export {
   DisabledWorkflowContext,
   StepTypes,