alchemy 0.15.11 → 0.15.13

package/lib/upstash/redis.d.ts

@@ -0,0 +1,202 @@
+import type { Context } from "../context.js";
+import { Resource } from "../resource.js";
+import type { Secret } from "../secret.js";
+import { UpstashApi } from "./api.js";
+/**
+ * Available regions for Upstash Redis databases
+ */
+export type UpstashRegion = "us-east-1" | "us-west-1" | "us-west-2" | "eu-west-1" | "eu-central-1" | "ap-southeast-1" | "ap-southeast-2" | "ap-northeast-1" | "sa-east-1";
+/**
+ * Properties for creating or updating an UpstashRedis database
+ */
+export interface UpstashRedisProps {
+    /**
+     * Name of the database
+     */
+    name: string;
+    /**
+     * Primary region for the database
+     */
+    primaryRegion: UpstashRegion;
+    /**
+     * Read regions for the database
+     */
+    readRegions?: UpstashRegion[];
+    /**
+     * Monthly budget for the database
+     */
+    budget?: number;
+    /**
+     * Whether to enable eviction for the database
+     */
+    eviction?: boolean;
+    /**
+     * API key to use (overrides environment variable)
+     */
+    apiKey?: Secret;
+    /**
+     * Email to use (overrides environment variable)
+     */
+    email?: string;
+}
+/**
+ * Output returned after UpstashRedis creation/update
+ */
+export interface UpstashRedis extends Resource<"upstash::Redis">, UpstashRedisProps {
+    /**
+     * ID of the database
+     */
+    id: string;
+    /**
+     * Type of the database in terms of pricing model
+     */
+    databaseType: string;
+    /**
+     * Region where database is hosted
+     */
+    region: "global";
+    /**
+     * Database port for clients to connect
+     */
+    port: number;
+    /**
+     * Creation time of the database as Unix time
+     */
+    createdAt: number;
+    /**
+     * State of database (active or deleted)
+     */
+    state: string;
+    /**
+     * Password of the database
+     */
+    password: Secret;
+    /**
+     * Email or team id of the owner of the database
+     */
+    userEmail: string;
+    /**
+     * Endpoint URL of the database
+     */
+    endpoint: string;
+    /**
+     * Whether TLS is enabled
+     */
+    tls: boolean;
+    /**
+     * REST token for the database
+     */
+    restToken: Secret;
+    /**
+     * Read-only REST token for the database
+     */
+    readOnlyRestToken: Secret;
+}
+/**
+ * Create and manage Upstash Redis databases
+ *
+ * @example
+ * // Create a basic Redis database in us-east-1:
+ * const redis = await UpstashRedis("my-redis", {
+ *   name: "my-redis",
+ *   primaryRegion: "us-east-1"
+ * });
+ *
+ * @example
+ * // Create a Redis database with read replicas:
+ * const redis = await UpstashRedis("my-redis", {
+ *   name: "my-redis",
+ *   primaryRegion: "us-east-1",
+ *   readRegions: ["us-west-1", "us-west-2"]
+ * });
+ *
+ * @example
+ * // Create a Redis database with a monthly budget:
+ * const redis = await UpstashRedis("my-redis", {
+ *   name: "my-redis",
+ *   primaryRegion: "us-east-1",
+ *   budget: 100
+ * });
+ */
+export declare const UpstashRedis: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<UpstashRedis>, id: string, props: UpstashRedisProps) => Promise<UpstashRedis>);
+/**
+ * Response from Upstash API for database operations
+ */
+interface UpstashDatabaseResponse {
+    database_id: string;
+    database_name: string;
+    database_type: string;
+    region: "global";
+    type: string;
+    port: number;
+    creation_time: number;
+    state: string;
+    password: string;
+    user_email: string;
+    endpoint: string;
+    tls: boolean;
+    rest_token: string;
+    read_only_rest_token: string;
+    eviction: boolean;
+    read_regions?: UpstashRegion[];
+}
+/**
+ * Parameters for creating a Redis database
+ */
+export interface CreateRedisDatabaseParams {
+    name: string;
+    primary_region: UpstashRegion;
+    read_regions?: UpstashRegion[];
+    region: "global";
+    tls: boolean;
+    budget?: number;
+}
+/**
+ * Delete a Redis database
+ *
+ * @param api Upstash API client
+ * @param databaseId ID of the database to delete
+ */
+export declare function deleteRedisDatabase(api: UpstashApi, databaseId: string): Promise<void>;
+/**
+ * Rename a Redis database
+ *
+ * @param api Upstash API client
+ * @param databaseId ID of the database to rename
+ * @param name New name for the database
+ */
+export declare function renameRedisDatabase(api: UpstashApi, databaseId: string, name: string): Promise<void>;
+/**
+ * Update read regions for a Redis database
+ *
+ * @param api Upstash API client
+ * @param databaseId ID of the database to update
+ * @param readRegions Array of read regions
+ */
+export declare function updateRedisReadRegions(api: UpstashApi, databaseId: string, readRegions: UpstashRegion[]): Promise<void>;
+/**
+ * Enable or disable eviction for a Redis database
+ *
+ * @param api Upstash API client
+ * @param databaseId ID of the database to update
+ * @param enable Whether to enable or disable eviction
+ */
+export declare function setRedisEviction(api: UpstashApi, databaseId: string, enable: boolean): Promise<void>;
+/**
+ * Get information about a Redis database
+ *
+ * @param api Upstash API client
+ * @param databaseId ID of the database to get information about
+ * @returns Database information
+ */
+export declare function getRedisDatabase(api: UpstashApi, databaseId: string): Promise<UpstashDatabaseResponse>;
+/**
+ * Create a new Redis database
+ *
+ * @param api Upstash API client
+ * @param params Parameters for the new database
+ * @returns Created database information
+ */
+export declare function createRedisDatabase(api: UpstashApi, params: CreateRedisDatabaseParams): Promise<UpstashDatabaseResponse>;
+export {};
+//# sourceMappingURL=redis.d.ts.map

package/lib/upstash/redis.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../src/upstash/redis.ts"],"names":[],"mappings":"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"}

package/lib/upstash/redis.js

@@ -0,0 +1,178 @@
+import { alchemy } from "../alchemy.js";
+import { Resource } from "../resource.js";
+import { UpstashApi } from "./api.js";
+import { UpstashError } from "./error.js";
+/**
+ * Create and manage Upstash Redis databases
+ *
+ * @example
+ * // Create a basic Redis database in us-east-1:
+ * const redis = await UpstashRedis("my-redis", {
+ *   name: "my-redis",
+ *   primaryRegion: "us-east-1"
+ * });
+ *
+ * @example
+ * // Create a Redis database with read replicas:
+ * const redis = await UpstashRedis("my-redis", {
+ *   name: "my-redis",
+ *   primaryRegion: "us-east-1",
+ *   readRegions: ["us-west-1", "us-west-2"]
+ * });
+ *
+ * @example
+ * // Create a Redis database with a monthly budget:
+ * const redis = await UpstashRedis("my-redis", {
+ *   name: "my-redis",
+ *   primaryRegion: "us-east-1",
+ *   budget: 100
+ * });
+ */
+export const UpstashRedis = Resource("upstash::Redis", async function (id, props) {
+    const api = new UpstashApi({
+        apiKey: props.apiKey,
+        email: props.email,
+    });
+    if (this.phase === "delete") {
+        await deleteRedisDatabase(api, this.output.id);
+        return this.destroy();
+    }
+    const eviction = props.eviction ?? false;
+    // @ts-ignore This is overridden during update/create
+    let database = {};
+    if (this.phase === "update") {
+        // Update name if changed
+        if (props.name !== this.output.name) {
+            await renameRedisDatabase(api, this.output.id, props.name);
+        }
+        // Update read regions if changed
+        if (JSON.stringify(props.readRegions) !==
+            JSON.stringify(this.output.readRegions)) {
+            await updateRedisReadRegions(api, this.output.id, props.readRegions || []);
+        }
+        // Handle eviction setting if changed
+        if (props.eviction !== undefined &&
+            props.eviction !== this.output.eviction) {
+            await setRedisEviction(api, this.output.id, props.eviction);
+        }
+        // Get updated database info
+        database = await getRedisDatabase(api, this.output.id);
+    }
+    if (this.phase === "create") {
+        database = await createRedisDatabase(api, {
+            budget: props.budget,
+            name: props.name,
+            primary_region: props.primaryRegion,
+            read_regions: props.readRegions,
+            region: "global",
+            tls: true,
+        });
+        if (eviction) {
+            await setRedisEviction(api, database.database_id, eviction);
+        }
+    }
+    return this.create({
+        id: database.database_id,
+        name: database.database_name,
+        databaseType: database.database_type,
+        region: database.region,
+        port: database.port,
+        createdAt: database.creation_time,
+        state: database.state,
+        password: alchemy.secret(database.password),
+        userEmail: database.user_email,
+        endpoint: database.endpoint,
+        tls: database.tls,
+        restToken: alchemy.secret(database.rest_token),
+        readOnlyRestToken: alchemy.secret(database.read_only_rest_token),
+        primaryRegion: props.primaryRegion,
+        readRegions: props.readRegions,
+        budget: props.budget,
+        eviction: props.eviction ?? false,
+    });
+});
+/**
+ * Delete a Redis database
+ *
+ * @param api Upstash API client
+ * @param databaseId ID of the database to delete
+ */
+export async function deleteRedisDatabase(api, databaseId) {
+    const response = await api.delete(`/redis/database/${databaseId}`);
+    if (!response.ok && response.status !== 404) {
+        throw new UpstashError(`Error deleting database: ${response.statusText}`, response.status, response);
+    }
+}
+/**
+ * Rename a Redis database
+ *
+ * @param api Upstash API client
+ * @param databaseId ID of the database to rename
+ * @param name New name for the database
+ */
+export async function renameRedisDatabase(api, databaseId, name) {
+    const response = await api.post(`/redis/rename/${databaseId}`, {
+        name,
+    });
+    if (!response.ok) {
+        throw new UpstashError(`API error updating name: ${response.statusText}`, response.status, response);
+    }
+}
+/**
+ * Update read regions for a Redis database
+ *
+ * @param api Upstash API client
+ * @param databaseId ID of the database to update
+ * @param readRegions Array of read regions
+ */
+export async function updateRedisReadRegions(api, databaseId, readRegions) {
+    const response = await api.post(`/redis/update-regions/${databaseId}`, {
+        read_regions: readRegions,
+    });
+    if (!response.ok) {
+        throw new UpstashError(`API error updating regions: ${response.statusText}`, response.status, response);
+    }
+}
+/**
+ * Enable or disable eviction for a Redis database
+ *
+ * @param api Upstash API client
+ * @param databaseId ID of the database to update
+ * @param enable Whether to enable or disable eviction
+ */
+export async function setRedisEviction(api, databaseId, enable) {
+    const evictionEndpoint = enable ? "enable-eviction" : "disable-eviction";
+    const response = await api.post(`/redis/${evictionEndpoint}/${databaseId}`, {});
+    if (!response.ok) {
+        console.warn(`API error updating eviction (status: ${response.status}): ${response.statusText}. (Eviction may already be set)`);
+    }
+}
+/**
+ * Get information about a Redis database
+ *
+ * @param api Upstash API client
+ * @param databaseId ID of the database to get information about
+ * @returns Database information
+ */
+export async function getRedisDatabase(api, databaseId) {
+    const response = await api.get(`/redis/database/${databaseId}`);
+    if (!response.ok) {
+        throw new UpstashError(`API error: ${response.statusText}`, response.status, response);
+    }
+    return await response.json();
+}
+/**
+ * Create a new Redis database
+ *
+ * @param api Upstash API client
+ * @param params Parameters for the new database
+ * @returns Created database information
+ */
+export async function createRedisDatabase(api, params) {
+    const response = await api.post("/redis/database", params);
+    if (!response.ok) {
+        throw new UpstashError(`API error creating database: ${response.statusText}`, response.status, response);
+    }
+    return await response.json();
+}
+//# sourceMappingURL=redis.js.map

package/lib/upstash/redis.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../src/upstash/redis.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "0.15.11",
+  "version": "0.15.13",
   "type": "module",
   "module": "./lib/index.js",
   "scripts": {
@@ -26,6 +26,7 @@
     "./shadcn": "./lib/shadcn/index.js",
     "./stripe": "./lib/stripe/index.js",
     "./test/bun": "./lib/test/bun.js",
+    "./upstash": "./lib/upstash/index.js",
     "./web/astro": "./lib/web/astro/index.js",
     "./web/tailwind": "./lib/web/tailwind/index.js",
     "./web/vite": "./lib/web/vite/index.js",

package/src/cloudflare/account-api-token.ts

@@ -3,12 +3,16 @@ import type { Context } from "../context.js";
 import { Resource } from "../resource.js";
 import type { Secret } from "../secret.js";
 import { sha256 } from "../util/sha256.js";
-import { type CloudflareApiOptions, createCloudflareApi } from "./api.js";
+import { createCloudflareApi, type CloudflareApiOptions } from "./api.js";
+import {
+  PermissionGroups,
+  type PermissionGroupName,
+} from "./permission-groups.js";
 
 /**
  * Permission group for a token policy
  */
-export interface TokenPolicyPermissionGroup {
+export type TokenPolicyPermissionGroup = {
   /**
    * ID of the permission group
    */
@@ -18,7 +22,7 @@ export interface TokenPolicyPermissionGroup {
    * Optional metadata for the permission group
    */
   meta?: Record<string, any>;
-}
+};
 
 /**
  * Policy that defines what the token can access
@@ -32,14 +36,27 @@ export interface TokenPolicy {
   /**
    * Permission groups to include in the policy
    */
-  permissionGroups: TokenPolicyPermissionGroup[];
+  permissionGroups: (PermissionGroupName | TokenPolicyPermissionGroup)[];
 
   /**
    * Resources the policy applies to
    */
-  resources: Record<string, string>;
+  resources: {
+    [key in TokenPolicyResourceKey]?: string;
+  };
 }
 
+/**
+ * @see https://developers.cloudflare.com/fundamentals/api/reference/permissions/
+ */
+type TokenPolicyResourceKey =
+  | `com.cloudflare.api.account`
+  | `com.cloudflare.api.account.${string}`
+  // | `com.cloudflare.api.account.zone`
+  | `com.cloudflare.api.account.zone.${string}`
+  // | `com.cloudflare.api.user`
+  | `com.cloudflare.api.user.${string}`;
+
 /**
  * Condition for token usage (e.g., IP restrictions)
  */
@@ -120,8 +137,7 @@ interface CloudflareApiToken {
  * Output returned after Account API Token creation/update
  */
 export interface AccountApiToken
-  extends Resource<"cloudflare::AccountApiToken">,
-    AccountApiTokenProps {
+  extends Resource<"cloudflare::AccountApiToken"> {
   /**
    * The ID of the token
    *
@@ -129,6 +145,11 @@ export interface AccountApiToken
    */
   id: string;
 
+  /**
+   * Name of the token
+   */
+  name: string;
+
   /**
    * Status of the token
    */
@@ -147,7 +168,7 @@ export interface AccountApiToken
    *
    * An alias of {@link id}
    */
-  accessKeyId: string;
+  accessKeyId: Secret;
 
   /**
    * Secret access key for the token
@@ -156,7 +177,7 @@ export interface AccountApiToken
    *
    * @see https://developers.cloudflare.com/r2/api/tokens/#get-s3-api-credentials-from-an-api-token
    */
-  secretAccessKey: string;
+  secretAccessKey: Secret;
 }
 
 /**
@@ -169,21 +190,13 @@ export interface AccountApiToken
  * @see https://developers.cloudflare.com/api/resources/accounts/subresources/tokens/methods/create/
  *
  * @example
- * // First, fetch all permission groups
- * const permissions = await PermissionGroups("cloudflare-permissions", {
- *   accountId: cfAccountId,
- * });
- *
  * // Create a token with read-only permissions for specific zones
  * const readOnlyToken = await AccountApiToken("readonly-token", {
  *   name: "Readonly Zone Token",
  *   policies: [
  *     {
  *       effect: "allow",
- *       permissionGroups: [
- *         { id: permissions["Zone Read"].id },
- *         { id: permissions["Analytics Read"].id }
- *       ],
+ *       permissionGroups: ["Zone Read", "Analytics Read"],
  *       resources: {
  *         "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
  *         "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*"
@@ -200,9 +213,7 @@ export interface AccountApiToken
  *   policies: [
  *     {
  *       effect: "allow",
- *       permissionGroups: [
- *         { id: permissions["Worker Routes Edit"].id }
- *       ],
+ *       permissionGroups: ["Worker Routes Edit"],
  *       resources: {
  *         "com.cloudflare.api.account.worker.route.*": "*"
  *       }
@@ -217,6 +228,21 @@ export interface AccountApiToken
  *     }
  *   }
  * });
+ *
+ * @example
+ * // Create a token with bucket access permissions
+ * const storageToken = await AccountApiToken("account-access-token", {
+ *   name: "alchemy-account-access-token",
+ *   policies: [
+ *     {
+ *       effect: "allow",
+ *       permissionGroups: ["Workers R2 Storage Write"],
+ *       resources: {
+ *         "com.cloudflare.api.account": "*",
+ *       },
+ *     },
+ *   ],
+ * });
  */
 export const AccountApiToken = Resource(
   "cloudflare::AccountApiToken",
@@ -251,16 +277,34 @@ export const AccountApiToken = Resource(
       return this.destroy();
     }
 
+    const permissionGroups = await PermissionGroups(
+      "cloudflare-permission-groups",
+      props,
+    );
+
     // Transform our properties to API format
     const apiPayload = {
       name: props.name,
       policies: props.policies.map((policy) => ({
         effect: policy.effect,
-        permission_groups: policy.permissionGroups.map((pg) => ({
-          id: pg.id,
-          meta: pg.meta || {},
-        })),
-        resources: policy.resources,
+        permission_groups: policy.permissionGroups.map((pg) =>
+          typeof pg === "string"
+            ? {
+                id: permissionGroups[pg].id,
+              }
+            : {
+                id: pg.id,
+                meta: pg.meta || {},
+              },
+        ),
+        resources: Object.fromEntries(
+          Object.entries(policy.resources).map(([key, value]) => {
+            if (key === "com.cloudflare.api.account") {
+              return [`com.cloudflare.api.account.${api.accountId}`, value];
+            }
+            return [key, value];
+          }),
+        ),
       })),
       // Format dates for Cloudflare API (removing milliseconds)
       ...(props.expiresOn
@@ -339,14 +383,6 @@ export const AccountApiToken = Resource(
       id: tokenData.id,
       name: tokenData.name,
       status: tokenData.status,
-      policies: tokenData.policies.map((policy) => ({
-        effect: policy.effect,
-        permissionGroups: policy.permission_groups.map((pg) => ({
-          id: pg.id,
-          meta: pg.meta,
-        })),
-        resources: policy.resources,
-      })),
       ...(tokenData.expires_on ? { expiresOn: tokenData.expires_on } : {}),
       ...(tokenData.not_before ? { notBefore: tokenData.not_before } : {}),
       ...(tokenData.condition
@@ -362,8 +398,8 @@ export const AccountApiToken = Resource(
           }
         : {}),
       value: tokenValue,
-      accessKeyId: tokenData.id,
-      secretAccessKey: sha256(tokenValue.unencrypted),
+      accessKeyId: alchemy.secret(tokenData.id),
+      secretAccessKey: alchemy.secret(sha256(tokenValue.unencrypted)),
     });
   },
 );

package/src/cloudflare/permission-groups.ts

@@ -32,6 +32,14 @@ interface PermissionGroupsResponse {
   messages: any[];
 }
 
+export type PermissionGroupName = R2PermissionGroups;
+
+export type R2PermissionGroups =
+  | "Workers R2 Storage Write"
+  | "Workers R2 Storage Read"
+  | "Workers R2 Storage Bucket Item Write"
+  | "Workers R2 Storage Bucket Item Read";
+
 /**
  * All Cloudflare permission groups mapped by name to ID
  *