alchemy 0.93.7 → 0.93.10

package/src/cloudflare/bucket.ts

@@ -320,7 +320,7 @@ export type R2Bucket = _R2Bucket & {
       | Blob,
     options?: Pick<R2PutOptions, "httpMetadata">,
   ): Promise<PutR2ObjectResponse>;
-  delete(key: string): Promise<Response>;
+  delete(key: string): Promise<Response | void>;
   list(options?: R2ListOptions): Promise<R2Objects>;
 };
 
@@ -463,7 +463,6 @@ export async function R2Bucket(
 ): Promise<R2Bucket> {
   const scope = Scope.current;
   const isLocal = scope.local && props.dev?.remote !== true;
-  const api = await createCloudflareApi(props);
   const bucket = await _R2Bucket(id, {
     ...props,
     dev: {
@@ -472,6 +471,9 @@ export async function R2Bucket(
     },
   });
 
+  let _api: CloudflareApi | undefined;
+  const api = async () => (_api ??= await createCloudflareApi(props));
+
   let _miniflare: mf.Miniflare | undefined;
   const miniflare = () => {
     if (_miniflare) {
@@ -505,9 +507,10 @@ export async function R2Bucket(
         }
         return null;
       }
-      return headObject(api, {
+      return headObject(await api(), {
         bucketName: bucket.name,
         key,
+        jurisdiction: bucket.jurisdiction,
       });
     },
     get: async (key: string) => {
@@ -519,9 +522,10 @@ export async function R2Bucket(
         }
         return null;
       }
-      const response = await getObject(api, {
+      const response = await getObject(await api(), {
         bucketName: bucket.name,
         key,
+        jurisdiction: bucket.jurisdiction,
       });
       if (response.ok) {
         return parseR2Object(key, response);
@@ -535,7 +539,7 @@ export async function R2Bucket(
       if (isLocal) {
         return (await localBucket()).list(options);
       }
-      return listObjects(api, bucket.name, {
+      return listObjects(await api(), bucket.name, {
         ...options,
         jurisdiction: bucket.jurisdiction,
       });
@@ -565,11 +569,12 @@ export async function R2Bucket(
           options,
         );
       }
-      const response = await putObject(api, {
+      const response = await putObject(await api(), {
         bucketName: bucket.name,
         key: key,
         object: value,
         options: options,
+        jurisdiction: bucket.jurisdiction,
       });
       const body = (await response.json()) as {
         result: {
@@ -591,10 +596,12 @@ export async function R2Bucket(
     delete: async (key: string) => {
       if (isLocal) {
         await (await localBucket()).delete(key);
+        return;
       }
-      return deleteObject(api, {
+      return deleteObject(await api(), {
         bucketName: bucket.name,
         key: key,
+        jurisdiction: bucket.jurisdiction,
       });
     },
   };
@@ -1239,12 +1246,17 @@ export async function getBucketLockRules(
 
 export async function headObject(
   api: CloudflareApi,
-  { bucketName, key }: { bucketName: string; key: string },
+  {
+    bucketName,
+    key,
+    jurisdiction,
+  }: { bucketName: string; key: string; jurisdiction?: R2BucketJurisdiction },
 ): Promise<R2ObjectMetadata | null> {
   const response = await withRetries(
     async () =>
       await api.get(
         `/accounts/${api.accountId}/r2/buckets/${bucketName}/objects/${key}`,
+        { headers: withJurisdiction({ jurisdiction }) },
       ),
   );
   // for some reason HEAD returns 404 for keys that exist, this is the best we can do without using S3 API
@@ -1269,16 +1281,23 @@ const withRetries = (f: () => Promise<Response>) => {
 
 export async function getObject(
   api: CloudflareApi,
-  { bucketName, key }: { bucketName: string; key: string },
+  {
+    bucketName,
+    key,
+    jurisdiction,
+  }: { bucketName: string; key: string; jurisdiction?: R2BucketJurisdiction },
 ) {
   return await withRetries(async () => {
     const response = await api.get(
       `/accounts/${api.accountId}/r2/buckets/${bucketName}/objects/${key}`,
       {
-        headers: {
-          "Content-Type": "application/octet-stream",
-          Accept: "application/octet-stream",
-        },
+        headers: withJurisdiction(
+          { jurisdiction },
+          {
+            "Content-Type": "application/octet-stream",
+            Accept: "application/octet-stream",
+          },
+        ),
       },
     );
     if (!response.ok && response.status !== 404) {
@@ -1346,21 +1365,26 @@ export async function putObject(
     key,
     object,
     options,
+    jurisdiction,
   }: {
     bucketName: string;
     key: string;
     object: PutObjectObject;
     options?: Pick<R2PutOptions, "httpMetadata">;
+    jurisdiction?: R2BucketJurisdiction;
   },
 ): Promise<Response> {
   // Using withExponentialBackoff for reliability
   return await withRetries(async () => {
-    const headers: Record<string, string> = {
-      "Content-Type": "application/octet-stream",
-      ...(options?.httpMetadata
-        ? mapHttpMetadataToHeaders(options?.httpMetadata)
-        : {}),
-    };
+    const headers: Record<string, string> = withJurisdiction(
+      { jurisdiction },
+      {
+        "Content-Type": "application/octet-stream",
+        ...(options?.httpMetadata
+          ? mapHttpMetadataToHeaders(options?.httpMetadata)
+          : {}),
+      },
+    );
 
     const response = await api.put(
       `/accounts/${api.accountId}/r2/buckets/${bucketName}/objects/${key}`,
@@ -1378,11 +1402,16 @@ export async function putObject(
 
 export async function deleteObject(
   api: CloudflareApi,
-  { bucketName, key }: { bucketName: string; key: string },
+  {
+    bucketName,
+    key,
+    jurisdiction,
+  }: { bucketName: string; key: string; jurisdiction?: R2BucketJurisdiction },
 ) {
   return await withRetries(async () => {
     const response = await api.delete(
       `/accounts/${api.accountId}/r2/buckets/${bucketName}/objects/${key}`,
+      { headers: withJurisdiction({ jurisdiction }) },
     );
 
     if (!response.ok && response.status !== 404) {

package/src/cloudflare/miniflare/tunnel.ts

@@ -38,11 +38,16 @@ export async function createTunnel(
     getMiniflare,
     mode: "remote",
     transformRequest: (request) => {
-      if (request.url.origin === remote.origin) {
-        request.url.protocol = proxy.url.protocol;
-        request.url.host = proxy.url.host;
-        request.url.port = proxy.url.port;
-        request.headers.set("host", proxy.url.host);
+      const originalUrl = request.headers.get("alchemy-original-url");
+      if (originalUrl) {
+        const parsed = new URL(originalUrl);
+        request.url.protocol = parsed.protocol;
+        request.url.host = parsed.host;
+        request.url.port = parsed.port;
+        request.url.pathname = parsed.pathname;
+        request.url.search = parsed.search;
+        request.headers.set("host", parsed.host);
+        request.headers.delete("alchemy-original-url");
       }
     },
     getWorkerName: (request) => {

package/src/stripe/price.ts

@@ -62,6 +62,16 @@ export type PriceRecurring =
 type TaxBehavior = Stripe.PriceCreateParams.TaxBehavior;
 type BillingScheme = Stripe.PriceCreateParams.BillingScheme;
 
+// Stripe SDK >=19 returns `*_decimal` fields as a `Stripe.Decimal` class
+// instance (which holds a BigInt internally) rather than a plain string.
+// Resource state must remain JSON-serialisable, so coerce to string here.
+// Older SDKs that already return strings flow through unchanged.
+const toDecimalString = (value: unknown): string | undefined => {
+  if (value == null) return undefined;
+  const str = typeof value === "string" ? value : String(value);
+  return str || undefined;
+};
+
 /**
  * Properties for price tier configuration
  */
@@ -529,9 +539,9 @@ export const Price = Resource(
       const tiers = price.tiers
         ? price.tiers.map((tier) => ({
             flatAmount: tier.flat_amount || undefined,
-            flatAmountDecimal: tier.flat_amount_decimal || undefined,
+            flatAmountDecimal: toDecimalString(tier.flat_amount_decimal),
             unitAmount: tier.unit_amount || undefined,
-            unitAmountDecimal: tier.unit_amount_decimal || undefined,
+            unitAmountDecimal: toDecimalString(tier.unit_amount_decimal),
             upTo: tier.up_to === null ? ("inf" as const) : tier.up_to!,
           }))
         : undefined;
@@ -551,7 +561,7 @@ export const Price = Resource(
           typeof price.product === "string" ? price.product : price.product.id,
         currency: price.currency,
         unitAmount: price.unit_amount || undefined,
-        unitAmountDecimal: price.unit_amount_decimal || undefined,
+        unitAmountDecimal: toDecimalString(price.unit_amount_decimal),
         active: price.active,
         billingScheme: price.billing_scheme as BillingScheme,
         nickname: price.nickname || undefined,