alchemy 0.66.0 → 0.68.0

package/lib/cloudflare/assets.js

@@ -1,5 +1,6 @@
-import * as fs from "node:fs/promises";
-import * as path from "pathe";
+import crypto from "node:crypto";
+import fs from "node:fs/promises";
+import path from "pathe";
 import { Resource } from "../resource.js";
 import { getContentType } from "../util/content-type.js";
 import ignore from "../util/ignore-matcher.js";
@@ -9,7 +10,7 @@ import ignore from "../util/ignore-matcher.js";
  *
  * @example
  * // Create a basic assets bundle from a local directory
- * const staticAssets = await Assets("static", {
+ * const staticAssets = await Assets({
  *   path: "./src/assets"
  * });
  *
@@ -22,75 +23,82 @@ import ignore from "../util/ignore-matcher.js";
  *   }
  * });
  */
-export const Assets = Resource("cloudflare::Asset", {
-    alwaysUpdate: true,
-}, async function (id, props) {
-    if (this.phase === "delete") {
-        return this.destroy();
-    }
-    try {
-        // Check if the assets directory exists
-        const stats = await fs.stat(props.path);
-        if (!stats.isDirectory()) {
-            throw new Error(`Assets path ${props.path} is not a directory`);
-        }
-    }
-    catch (_error) {
-        throw new Error(`Assets directory ${props.path} does not exist or is not accessible`);
-    }
-    // Recursively get all files in the assets directory
-    const ignoreMatcher = await createIgnoreMatcher(props.path);
-    const filesList = await getFilesRecursively(props.path, ignoreMatcher);
-    // Create asset file objects
-    const files = filesList.map((filePath) => {
-        const relativePath = path.relative(props.path, filePath);
-        return {
-            path: path.normalize(relativePath),
-            filePath: path.normalize(filePath),
-            contentType: getContentType(filePath) ?? "application/null",
-        };
-    });
-    // Get current timestamp
-    const now = Date.now();
-    // Construct the output
-    return this({
-        id,
+export async function Assets(props) {
+    return {
         type: "assets",
-        path: props.path,
-        files,
-        createdAt: this.output?.createdAt || now,
-        updatedAt: now,
-    });
-});
-async function createIgnoreMatcher(dir) {
-    const ignoreMatcher = ignore().add(".assetsignore");
-    const ignorePath = path.join(dir, ".assetsignore");
-    try {
-        const content = await fs.readFile(ignorePath, "utf-8");
-        ignoreMatcher.add(content.split("\n"));
-    }
-    catch {
-        // ignore
-    }
-    return ignoreMatcher;
+        ...props,
+    };
 }
-// Helper functions for file operations
-async function getFilesRecursively(dir, ignoreMatcher) {
-    const files = await fs.readdir(dir, { withFileTypes: true });
-    const result = [];
-    await Promise.all(files.map(async (file) => {
-        const filePath = path.join(dir, file.name);
-        if (ignoreMatcher.ignores(file.name)) {
-            return;
-        }
-        if (file.isDirectory() ||
-            (file.isSymbolicLink() && (await fs.stat(filePath)).isDirectory())) {
-            result.push(...(await getFilesRecursively(filePath, ignoreMatcher)));
+(function (Assets) {
+    /**
+     * Recursively read the metadata for all assets in a directory, skipping files that are ignored by the .assetsignore file
+     *
+     * @param root Path to the directory
+     * @returns Metadata for all assets in the directory
+     */
+    Assets.read = async (root) => {
+        const matcher = ignore().add(".assetsignore");
+        const ignorePath = path.join(root, ".assetsignore");
+        try {
+            const content = await fs.readFile(ignorePath, "utf-8");
+            matcher.add(content.split("\n"));
         }
-        else {
-            result.push(filePath);
+        catch {
+            // ignore
         }
-    }));
-    return result;
-}
+        const readDirectory = async (directory) => {
+            const files = await fs.readdir(directory);
+            const result = [];
+            await Promise.all(files.map(async (file) => {
+                const absolutePath = path.join(directory, file);
+                const relativePath = path.relative(root, absolutePath);
+                if (matcher.ignores(relativePath)) {
+                    return;
+                }
+                const stat = await fs.stat(absolutePath);
+                if (stat.isDirectory()) {
+                    result.push(...(await readDirectory(absolutePath)));
+                }
+                else {
+                    if (stat.size > 26214400) {
+                        throw new Error(`File "${absolutePath}" is too large to upload as an asset to Cloudflare (the file is ${(stat.size / 1024 / 1024).toFixed(2)} MB; the maximum size is 25MB).`);
+                    }
+                    result.push({
+                        path: absolutePath,
+                        name: relativePath.startsWith("/")
+                            ? relativePath
+                            : `/${relativePath}`,
+                        hash: await computeHash(absolutePath),
+                        size: stat.size,
+                        type: getContentType(absolutePath) ?? "application/null",
+                    });
+                }
+            }));
+            return result;
+        };
+        return await readDirectory(root);
+    };
+    /**
+     * Calculate the SHA-256 hash and size of a file
+     *
+     * @param filePath Path to the file
+     * @returns Hash (first 32 chars of SHA-256) and size of the file
+     */
+    const computeHash = async (filePath) => {
+        const contents = await fs.readFile(filePath);
+        const hash = crypto.createHash("sha256");
+        hash.update(contents);
+        const extension = path.extname(filePath).substring(1);
+        hash.update(extension);
+        return hash.digest("hex").slice(0, 32);
+    };
+})(Assets || (Assets = {}));
+// we are deprecating the Assets resource (it is now just a function)
+// but, a user may still have a resource that depends on it, so we register a no-op dummy resource so that it can be cleanly deleted
+Resource("cloudflare::Asset", async function () {
+    if (this.phase === "delete") {
+        return this.destroy();
+    }
+    throw new Error("Not implemented");
+});
 //# sourceMappingURL=assets.js.map

package/lib/cloudflare/assets.js.map

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

package/lib/cloudflare/auth.d.ts

@@ -1,19 +1,93 @@
-import type { Secret } from "../secret.ts";
-import type { CloudflareApiOptions } from "./api.ts";
-export interface CloudflareApiTokenAuthOptions {
-    type: "api-token";
-    apiToken: Secret<string>;
+import { Credentials } from "../auth.ts";
+import { OAuthClient } from "../util/oauth-client.ts";
+export declare namespace CloudflareAuth {
+    const client: OAuthClient;
+    type Metadata = {
+        id: string;
+        name: string;
+    };
+    const ALL_SCOPES: {
+        "access:read": string;
+        "access:write": string;
+        "account:read": string;
+        "agw:read": string;
+        "agw:run": string;
+        "ai:read": string;
+        "ai:write": string;
+        "aiaudit:read": string;
+        "aiaudit:write": string;
+        "aig:read": string;
+        "aig:write": string;
+        "auditlogs:read": string;
+        "browser:read": string;
+        "browser:write": string;
+        "cfone:read": string;
+        "cfone:write": string;
+        "cloudchamber:write": string;
+        "constellation:write": string;
+        "containers:write": string;
+        "d1:write": string;
+        "dex:read": string;
+        "dex:write": string;
+        "dns_analytics:read": string;
+        "dns_records:edit": string;
+        "dns_records:read": string;
+        "dns_settings:read": string;
+        "firstpartytags:write": string;
+        "lb:edit": string;
+        "lb:read": string;
+        "logpush:read": string;
+        "logpush:write": string;
+        "notification:read": string;
+        "notification:write": string;
+        "pages:read": string;
+        "pages:write": string;
+        "pipelines:read": string;
+        "pipelines:setup": string;
+        "pipelines:write": string;
+        "query_cache:write": string;
+        "queues:write": string;
+        "r2_catalog:write": string;
+        "radar:read": string;
+        "rag:read": string;
+        "rag:write": string;
+        "secrets_store:read": string;
+        "secrets_store:write": string;
+        "sso-connector:read": string;
+        "sso-connector:write": string;
+        "ssl_certs:write": string;
+        "teams:pii": string;
+        "teams:read": string;
+        "teams:secure_location": string;
+        "teams:write": string;
+        "url_scanner:read": string;
+        "url_scanner:write": string;
+        "user:read": string;
+        "vectorize:write": string;
+        "workers:write": string;
+        "workers_builds:read": string;
+        "workers_builds:write": string;
+        "workers_kv:write": string;
+        "workers_observability:read": string;
+        "workers_observability:write": string;
+        "workers_observability_telemetry:write": string;
+        "workers_routes:write": string;
+        "workers_scripts:write": string;
+        "workers_tail:read": string;
+        "zone:read": string;
+    };
+    const DEFAULT_SCOPES: string[];
+    /**
+     * Format Cloudflare credentials as headers, refreshing OAuth credentials if expired.
+     * If the credentials are OAuth, the `profile` is required so we can read and write the updated credentials.
+     */
+    const formatHeadersWithRefresh: (input: {
+        profile: string | undefined;
+        credentials: Credentials;
+    }) => Promise<Record<string, string>>;
+    /**
+     * Format Cloudflare credentials as headers.
+     */
+    const formatHeaders: (credentials: Credentials) => Record<string, string>;
 }
-export interface CloudflareApiKeyAuthOptions {
-    type: "api-key";
-    apiKey: Secret;
-    apiEmail: string;
-}
-export interface CloudflareWranglerAuthOptions {
-    type: "wrangler";
-}
-export type CloudflareAuthOptions = CloudflareApiTokenAuthOptions | CloudflareApiKeyAuthOptions | CloudflareWranglerAuthOptions;
-export declare const isCloudflareAuthOptions: (input?: CloudflareApiOptions | CloudflareAuthOptions) => input is CloudflareAuthOptions;
-export declare function normalizeAuthOptions(input?: CloudflareApiOptions | CloudflareAuthOptions): Promise<CloudflareAuthOptions>;
-export declare function getCloudflareAuthHeaders(authOptions: CloudflareAuthOptions): Promise<Record<string, string>>;
 //# sourceMappingURL=auth.d.ts.map

package/lib/cloudflare/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/cloudflare/auth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAIrD,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;CAC1B;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,UAAU,CAAC;CAClB;AAED,MAAM,MAAM,qBAAqB,GAC7B,6BAA6B,GAC7B,2BAA2B,GAC3B,6BAA6B,CAAC;AAElC,eAAO,MAAM,uBAAuB,GAClC,QAAQ,oBAAoB,GAAG,qBAAqB,KACnD,KAAK,IAAI,qBAQX,CAAC;AAEF,wBAAsB,oBAAoB,CACxC,KAAK,CAAC,EAAE,oBAAoB,GAAG,qBAAqB,GACnD,OAAO,CAAC,qBAAqB,CAAC,CA+BhC;AAED,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,qBAAqB,GACjC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAyBjC"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/cloudflare/auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,yBAAiB,cAAc,CAAC;IACvB,MAAM,MAAM,aAQjB,CAAC;IAEH,KAAY,QAAQ,GAAG;QACrB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACK,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAkFtB,CAAC;IACK,MAAM,cAAc,UAkB1B,CAAC;IAEF;;;OAGG;IACI,MAAM,wBAAwB,GAAU,OAAO;QACpD,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,WAAW,EAAE,WAAW,CAAC;KAC1B,oCAgBA,CAAC;IAEF;;OAEG;IACI,MAAM,aAAa,GACxB,aAAa,WAAW,KACvB,MAAM,CAAC,MAAM,EAAE,MAAM,CAYvB,CAAC;CACH"}

package/lib/cloudflare/auth.js

@@ -1,64 +1,143 @@
-import { alchemy } from "../alchemy.js";
-import { getRefreshedWranglerConfig } from "./oauth.js";
-import { getUserEmailFromApiKey } from "./user.js";
-export const isCloudflareAuthOptions = (input) => {
-    return (input !== undefined &&
-        "type" in input &&
-        (input.type === "api-token" ||
-            input.type === "api-key" ||
-            input.type === "wrangler"));
-};
-export async function normalizeAuthOptions(input) {
-    if (isCloudflareAuthOptions(input)) {
-        return input;
-    }
-    const email = async (apiKey) => input?.email ??
-        process.env.CLOUDFLARE_EMAIL ??
-        (await getUserEmailFromApiKey(apiKey.unencrypted));
-    if (input?.apiKey) {
-        return {
-            type: "api-key",
-            apiKey: input.apiKey,
-            apiEmail: await email(input.apiKey),
-        };
-    }
-    if (input?.apiToken) {
-        return { type: "api-token", apiToken: input.apiToken };
-    }
-    if (process.env.CLOUDFLARE_API_KEY) {
-        const key = alchemy.secret(process.env.CLOUDFLARE_API_KEY);
-        return { type: "api-key", apiKey: key, apiEmail: await email(key) };
-    }
-    if (process.env.CLOUDFLARE_API_TOKEN) {
-        return {
-            type: "api-token",
-            apiToken: alchemy.secret(process.env.CLOUDFLARE_API_TOKEN),
-        };
-    }
-    return { type: "wrangler" };
-}
-export async function getCloudflareAuthHeaders(authOptions) {
-    switch (authOptions.type) {
-        case "api-token":
-            return { Authorization: `Bearer ${authOptions.apiToken.unencrypted}` };
-        case "api-key":
-            return {
-                "X-Auth-Key": authOptions.apiKey.unencrypted,
-                "X-Auth-Email": authOptions.apiEmail,
-            };
-        case "wrangler": {
-            const wranglerConfig = await getRefreshedWranglerConfig();
-            if (wranglerConfig.isErr()) {
-                throw new Error([
-                    wranglerConfig.error.message,
-                    "Please run `alchemy login`, or set either CLOUDFLARE_API_TOKEN or CLOUDFLARE_API_KEY in your environment.",
-                    "Learn more: https://alchemy.run/guides/cloudflare/",
-                ].join("\n"));
-            }
-            return {
-                Authorization: `Bearer ${wranglerConfig.value.oauth_token}`,
-            };
+import assert from "node:assert";
+import { Credentials } from "../auth.js";
+import { OAuthClient } from "../util/oauth-client.js";
+export var CloudflareAuth;
+(function (CloudflareAuth) {
+    CloudflareAuth.client = new OAuthClient({
+        clientId: "6d8c2255-0773-45f6-b376-2914632e6f91",
+        redirectUri: "http://localhost:9976/auth/callback",
+        endpoints: {
+            authorize: "https://dash.cloudflare.com/oauth2/authorize",
+            token: "https://dash.cloudflare.com/oauth2/token",
+            revoke: "https://dash.cloudflare.com/oauth2/revoke",
+        },
+    });
+    CloudflareAuth.ALL_SCOPES = {
+        // TODO: Verify descriptions marked with `//*`
+        "access:read": "Read Cloudflare Access", //*
+        "access:write": "Write Cloudflare Access", //*
+        "account:read": "See your account info such as account details, analytics, and memberships.",
+        "agw:read": "Read API Gateway", //*
+        "agw:run": "Run API Gateway", //*
+        "ai:read": "Read access to Workers AI catalog and assets",
+        "ai:write": "See and change Workers AI catalog and assets",
+        "aiaudit:read": "Read AI Audit", //*
+        "aiaudit:write": "Write AI Audit", //*
+        "aig:read": "Read AI Gateway", //*
+        "aig:write": "Write AI Gateway", //*
+        "auditlogs:read": "Read audit logs", //*
+        "browser:read": "Read Browser", //*
+        "browser:write": "Write Browser", //*
+        "cfone:read": "Read Cloudflare One", //*
+        "cfone:write": "Write Cloudflare One", //*
+        "cloudchamber:write": "Manage Cloudchamber",
+        "constellation:write": "Write Constellation", //*
+        "containers:write": "Manage Workers Containers",
+        "d1:write": "See and change D1 Databases.",
+        "dex:read": "Read DEX", //*
+        "dex:write": "Write DEX", //*
+        "dns_analytics:read": "Read DNS analytics",
+        "dns_records:edit": "Edit DNS records",
+        "dns_records:read": "Read DNS records",
+        "dns_settings:read": "Read DNS settings",
+        "firstpartytags:write": "Write First Party Tags", //*
+        "lb:edit": "Edit Load Balancer", //*
+        "lb:read": "Read Load Balancer", //*
+        "logpush:read": "Read Logpush", //*
+        "logpush:write": "Write Logpush", //*
+        "notification:read": "Read Notifications", //*
+        "notification:write": "Write Notifications", //*
+        "pages:read": "Read access to Pages projects, settings, and deployments.",
+        "pages:write": "See and change Pages projects, settings, and deployments.",
+        "pipelines:read": "Read access to Pipelines configurations and data",
+        "pipelines:setup": "Setup access to Pipelines configurations and data",
+        "pipelines:write": "See and change Pipelines configurations and data",
+        "query_cache:write": "Write Query Cache", //*
+        "queues:write": "See and change Queues settings and data",
+        "r2_catalog:write": "Write R2 Catalog", //*
+        "radar:read": "Read Radar", //*
+        "rag:read": "Read RAG", //*
+        "rag:write": "Write RAG", //*
+        "secrets_store:read": "Read access to secrets + stores within the Secrets Store",
+        "secrets_store:write": "See and change secrets + stores within the Secrets Store",
+        "sso-connector:read": "Read SSO Connector", //*
+        "sso-connector:write": "Write SSO Connector", //*
+        "ssl_certs:write": "See and manage mTLS certificates for your account",
+        "teams:pii": "Read Teams PII", //*
+        "teams:read": "Read Teams", //*
+        "teams:secure_location": "Read Secure Location", //*
+        "teams:write": "Write Teams", //*
+        "url_scanner:read": "Read URL Scanner", //*
+        "url_scanner:write": "Write URL Scanner", //*
+        "user:read": "See your user info such as name, email address, and account memberships.",
+        "vectorize:write": "Write Vectorize", //*
+        "workers:write": "See and change Cloudflare Workers data such as zones, KV storage, namespaces, scripts, and routes.",
+        "workers_builds:read": "Read Workers Builds", //*
+        "workers_builds:write": "Write Workers Builds", //*
+        "workers_kv:write": "See and change Cloudflare Workers KV Storage data such as keys and namespaces.",
+        "workers_observability:read": "Read Workers Observability", //*
+        "workers_observability:write": "Write Workers Observability", //*
+        "workers_observability_telemetry:write": "Write Workers Observability Telemetry", //*
+        "workers_routes:write": "See and change Cloudflare Workers data such as filters and routes.",
+        "workers_scripts:write": "See and change Cloudflare Workers scripts, durable objects, subdomains, triggers, and tail data.",
+        "workers_tail:read": "See Cloudflare Workers tail and script data.",
+        "zone:read": "Grants read level access to account zone.",
+        // Not granted yet
+        // "connectivity:admin":
+        //   "See, change, and bind to Connectivity Directory services, including creating services targeting Cloudflare Tunnel.",
+    };
+    CloudflareAuth.DEFAULT_SCOPES = [
+        "account:read",
+        "user:read",
+        "workers:write",
+        "workers_kv:write",
+        "workers_routes:write",
+        "workers_scripts:write",
+        "workers_tail:read",
+        "d1:write",
+        "pages:write",
+        "zone:read",
+        "ssl_certs:write",
+        "ai:write",
+        "queues:write",
+        "pipelines:write",
+        "secrets_store:write",
+        "containers:write",
+        "cloudchamber:write",
+    ];
+    /**
+     * Format Cloudflare credentials as headers, refreshing OAuth credentials if expired.
+     * If the credentials are OAuth, the `profile` is required so we can read and write the updated credentials.
+     */
+    CloudflareAuth.formatHeadersWithRefresh = async (input) => {
+        // if the credentials are not expired, return them as is
+        if (!Credentials.isOAuthExpired(input.credentials)) {
+            return CloudflareAuth.formatHeaders(input.credentials);
         }
-    }
-}
+        assert(input.profile, "Profile is required for OAuth credentials");
+        const credentials = await Credentials.getRefreshed({
+            provider: "cloudflare",
+            profile: input.profile,
+        }, async (credentials) => {
+            return await CloudflareAuth.client.refresh(credentials);
+        });
+        return CloudflareAuth.formatHeaders(credentials);
+    };
+    /**
+     * Format Cloudflare credentials as headers.
+     */
+    CloudflareAuth.formatHeaders = (credentials) => {
+        switch (credentials.type) {
+            case "api-key":
+                return {
+                    "X-Auth-Key": credentials.apiKey,
+                    "X-Auth-Email": credentials.email,
+                };
+            case "api-token":
+                return { Authorization: `Bearer ${credentials.apiToken}` };
+            case "oauth":
+                return { Authorization: `Bearer ${credentials.access}` };
+        }
+    };
+})(CloudflareAuth || (CloudflareAuth = {}));
 //# sourceMappingURL=auth.js.map

package/lib/cloudflare/auth.js.map

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

package/lib/cloudflare/bindings.d.ts

@@ -4,7 +4,6 @@
  * https://developers.cloudflare.com/api/resources/workers/subresources/scripts/methods/update/
  */
 import type { Secret } from "../secret.ts";
-import type { AiGateway } from "./ai-gateway.ts";
 import type { Ai } from "./ai.ts";
 import type { AnalyticsEngineDataset } from "./analytics-engine.ts";
 import type { Assets } from "./assets.ts";
@@ -15,6 +14,7 @@ import type { Container } from "./container.ts";
 import type { D1Database } from "./d1-database.ts";
 import type { DispatchNamespace } from "./dispatch-namespace.ts";
 import type { DurableObjectNamespace } from "./durable-object-namespace.ts";
+import type { HyperdriveRef } from "./hyperdrive-ref.ts";
 import type { Hyperdrive } from "./hyperdrive.ts";
 import type { Images } from "./images.ts";
 import type { KVNamespace } from "./kv-namespace.ts";
@@ -22,6 +22,7 @@ import type { Pipeline } from "./pipeline.ts";
 import type { Queue } from "./queue.ts";
 import type { RateLimit } from "./rate-limit.ts";
 import type { SecretKey } from "./secret-key.ts";
+import type { SecretRef as CloudflareSecretRef } from "./secret-ref.ts";
 import type { Secret as CloudflareSecret } from "./secret.ts";
 import type { VectorizeIndex } from "./vectorize-index.ts";
 import type { VersionMetadata } from "./version-metadata.ts";
@@ -40,12 +41,21 @@ export declare namespace Bindings {
 /**
  * L2 Binding Resources.
  */
-export type Binding = Ai | AiGateway | Assets | Container | CloudflareSecret | D1Database | DispatchNamespace | AnalyticsEngineDataset | DurableObjectNamespace<any> | Hyperdrive | Images | KVNamespace | Pipeline | Queue | RateLimit | R2Bucket | {
+export type Binding = Ai | Assets | Container | CloudflareSecret | CloudflareSecretRef | D1Database | DispatchNamespace | AnalyticsEngineDataset | DurableObjectNamespace<any> | Hyperdrive | HyperdriveRef | Images | KVNamespace | Pipeline | Queue | RateLimit | R2Bucket | {
     type: "kv_namespace";
     id: string;
-} | Secret | SecretKey | string | VectorizeIndex | Worker | WorkerStub | WorkerRef | Workflow | BrowserRendering | VersionMetadata | Self | Json;
-export type Self = typeof Self;
-export declare const Self: unique symbol;
+} | Secret | SecretKey | string | VectorizeIndex | Worker | WorkerStub | WorkerRef | WorkerEntrypoint | Workflow | BrowserRendering | VersionMetadata | Self | Json;
+export type Self<RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded> = {
+    type: "cloudflare::Worker::Self";
+    __entrypoint__?: string;
+    __rpc__?: RPC;
+};
+export declare const Self: {
+    readonly type: "cloudflare::Worker::Self";
+};
+export type WorkerEntrypoint = (Worker | WorkerRef) & {
+    __entrypoint__?: string;
+};
 export type Json<T = any> = {
     type: "json";
     json: T;
@@ -303,6 +313,8 @@ export interface WorkerBindingService {
     environment?: string;
     /** Service namespace */
     namespace?: string;
+    /** Service entrypoint */
+    entrypoint?: string;
 }
 /**
  * Tail Consumer binding type