wrangler 0.0.0-e8e684c7 → 0.0.0-e9106dfa5

package/src/whoami.tsx

@@ -1,169 +0,0 @@
-import { Text, render } from "ink";
-import Table from "ink-table";
-import React, { Fragment } from "react";
-import { fetchListResult, fetchResult } from "./cfetch";
-import { logger } from "./logger";
-import { getAPIToken, getAuthFromEnv, getScopes } from "./user";
-
-export async function whoami() {
-	logger.log("Getting User settings...");
-	const user = await getUserInfo();
-	const { unmount } = render(<WhoAmI user={user}></WhoAmI>);
-	unmount();
-}
-
-export function WhoAmI({ user }: { user: UserInfo | undefined }) {
-	return user ? (
-		<>
-			<Email tokenType={user.authType} email={user.email}></Email>
-			<Accounts accounts={user.accounts}></Accounts>
-			<Permissions
-				tokenType={user.authType}
-				tokenPermissions={user.tokenPermissions}
-			/>
-		</>
-	) : (
-		<Text>You are not authenticated. Please run `wrangler login`.</Text>
-	);
-}
-
-function Email(props: { tokenType: string; email: string | undefined }) {
-	return props.email === undefined ? (
-		<Text>
-			👋 You are logged in with an {props.tokenType}. Unable to retrieve email
-			for this user. Are you missing the `User-&gt;User Details-&gt;Read`
-			permission?
-		</Text>
-	) : (
-		<Text>
-			👋 You are logged in with an {props.tokenType}, associated with the email
-			&apos;{props.email}&apos;!
-		</Text>
-	);
-}
-
-function Accounts(props: { accounts: AccountInfo[] }) {
-	const accounts = props.accounts.map((account) => ({
-		"Account Name": account.name,
-		"Account ID": account.id,
-	}));
-	return <Table data={accounts}></Table>;
-}
-
-function Permissions(props: {
-	tokenPermissions: string[] | undefined;
-	tokenType: string;
-}) {
-	const permissions =
-		props.tokenPermissions?.map((scope) => scope.split(":")) || [];
-	return props.tokenType === "OAuth Token" ? (
-		props.tokenPermissions ? (
-			<>
-				<Text>
-					🔓 Token Permissions: If scopes are missing, you may need to logout
-					and re-login.
-				</Text>
-				<Text>Scope (Access)</Text>
-				{permissions.map(([scope, access], index) => (
-					<Fragment key={`${scope}${index}`}>
-						<Text>
-							- {scope} {access && `(${access})`}
-						</Text>
-					</Fragment>
-				))}
-			</>
-		) : null
-	) : (
-		<Text>
-			🔓 To see token permissions visit
-			https://dash.cloudflare.com/profile/api-tokens
-		</Text>
-	);
-}
-
-export interface UserInfo {
-	apiToken: string;
-	authType: string;
-	email: string | undefined;
-	accounts: AccountInfo[];
-	tokenPermissions: string[] | undefined;
-}
-
-export async function getUserInfo(): Promise<UserInfo | undefined> {
-	const apiToken = getAPIToken();
-	if (!apiToken) return;
-
-	const tokenPermissions = await getTokenPermissions();
-
-	const usingEnvAuth = !!getAuthFromEnv();
-	const usingGlobalAuthKey = "authKey" in apiToken;
-	return {
-		apiToken: usingGlobalAuthKey ? apiToken.authKey : apiToken.apiToken,
-		authType: usingGlobalAuthKey
-			? "Global API Key"
-			: usingEnvAuth
-			? "API Token"
-			: "OAuth Token",
-		email: "authEmail" in apiToken ? apiToken.authEmail : await getEmail(),
-		accounts: await getAccounts(),
-		tokenPermissions,
-	};
-}
-
-async function getEmail(): Promise<string | undefined> {
-	try {
-		const { email } = await fetchResult<{ email: string }>("/user");
-		return email;
-	} catch (e) {
-		if ((e as { code?: number }).code === 9109) {
-			return undefined;
-		} else {
-			throw e;
-		}
-	}
-}
-
-type AccountInfo = { name: string; id: string };
-
-async function getAccounts(): Promise<AccountInfo[]> {
-	return await fetchListResult<AccountInfo>("/accounts");
-}
-
-async function getTokenPermissions(): Promise<string[] | undefined> {
-	// Tokens can either be API tokens or Oauth tokens.
-	// Here we only extract permissions from OAuth tokens.
-
-	return getScopes() as string[];
-
-	// In future we may be able to get the token permissions on an API token,
-	// but currently we cannot as that permission is not able to be added to
-	// an API token.
-
-	// try {
-	// 	// First we get the token identifier (only returned on API tokens)
-	// 	const { id } = await fetchResult<{ id: string }>("/user/tokens/verify");
-
-	// 	// Get the token permissions for the current token
-	// 	const { policies } = await fetchResult<{
-	// 		policies: { id: string; name: string }[];
-	// 	}>(`/user/tokens/${id}`);
-
-	// 	return policies.map((p) => p.name);
-	// } catch (e) {
-	// 	if ((e as { code?: number }).code === 1000) {
-	// 		// Invalid token - Oauth token
-
-	// 		// Get scopes
-	// 		const scopes = getScopes() as string[];
-	// 		// We may not get scopes back if they are not currently cached,
-	// 		// however next time an access token is requested,
-	// 		// the scopes will be added to the cache.
-	// 		return scopes;
-	// 	} else if ((e as { code?: number }).code === 9109) {
-	// 		// Token cannot view its permissions
-	// 		return undefined;
-	// 	} else {
-	// 		throw e;
-	// 	}
-	// }
-}

package/src/worker.ts

@@ -1,204 +0,0 @@
-import type { Route } from "./config/environment";
-import type { ApiCredentials } from "./user";
-
-/**
- * A Cloudflare account.
- */
-export interface CfAccount {
-	/**
-	 * An API token.
-	 *
-	 * @link https://api.cloudflare.com/#user-api-tokens-properties
-	 */
-	apiToken: ApiCredentials;
-	/**
-	 * An account ID.
-	 */
-	accountId: string;
-}
-
-/**
- * The type of Worker
- */
-export type CfScriptFormat = "modules" | "service-worker";
-
-/**
- * A module type.
- */
-export type CfModuleType =
-	| "esm"
-	| "commonjs"
-	| "compiled-wasm"
-	| "text"
-	| "buffer";
-
-/**
- * An imported module.
- */
-export interface CfModule {
-	/**
-	 * The module name.
-	 *
-	 * @example
-	 * './src/index.js'
-	 */
-	name: string;
-	/**
-	 * The module content, usually JavaScript or WASM code.
-	 *
-	 * @example
-	 * export default {
-	 *   async fetch(request) {
-	 *     return new Response('Ok')
-	 *   }
-	 * }
-	 */
-	content: string | Buffer;
-	/**
-	 * The module type.
-	 *
-	 * If absent, will default to the main module's type.
-	 */
-	type?: CfModuleType;
-}
-
-/**
- * A map of variable names to values.
- */
-interface CfVars {
-	[key: string]: unknown;
-}
-
-/**
- * A KV namespace.
- */
-interface CfKvNamespace {
-	binding: string;
-	id: string;
-}
-
-/**
- * A binding to a wasm module (in service-worker format)
- */
-
-interface CfWasmModuleBindings {
-	[key: string]: string;
-}
-
-/**
- * A binding to a text blob (in service-worker format)
- */
-
-interface CfTextBlobBindings {
-	[key: string]: string;
-}
-
-/**
- * A binding to a data blob (in service-worker format)
- */
-
-interface CfDataBlobBindings {
-	[key: string]: string;
-}
-
-/**
- * A Durable Object.
- */
-interface CfDurableObject {
-	name: string;
-	class_name: string;
-	script_name?: string;
-	environment?: string;
-}
-
-interface CfR2Bucket {
-	binding: string;
-	bucket_name: string;
-}
-
-interface CfService {
-	binding: string;
-	service: string;
-	environment?: string;
-}
-
-interface CfDispatchNamespace {
-	binding: string;
-	namespace: string;
-}
-
-interface CfLogfwdr {
-	schema: string | undefined;
-	bindings: CfLogfwdrBinding[];
-}
-
-interface CfLogfwdrBinding {
-	name: string;
-	destination: string;
-}
-
-interface CfUnsafeBinding {
-	name: string;
-	type: string;
-}
-
-export interface CfDurableObjectMigrations {
-	old_tag?: string;
-	new_tag: string;
-	steps: {
-		new_classes?: string[];
-		renamed_classes?: {
-			from: string;
-			to: string;
-		}[];
-		deleted_classes?: string[];
-	}[];
-}
-
-/**
- * Options for creating a `CfWorker`.
- */
-export interface CfWorkerInit {
-	/**
-	 * The name of the worker.
-	 */
-	name: string | undefined;
-	/**
-	 * The entrypoint module.
-	 */
-	main: CfModule;
-	/**
-	 * The list of additional modules.
-	 */
-	modules: CfModule[] | undefined;
-	/**
-	 * All the bindings
-	 */
-	bindings: {
-		vars: CfVars | undefined;
-		kv_namespaces: CfKvNamespace[] | undefined;
-		wasm_modules: CfWasmModuleBindings | undefined;
-		text_blobs: CfTextBlobBindings | undefined;
-		data_blobs: CfDataBlobBindings | undefined;
-		durable_objects: { bindings: CfDurableObject[] } | undefined;
-		r2_buckets: CfR2Bucket[] | undefined;
-		services: CfService[] | undefined;
-		dispatch_namespaces: CfDispatchNamespace[] | undefined;
-		logfwdr: CfLogfwdr | undefined;
-		unsafe: CfUnsafeBinding[] | undefined;
-	};
-	migrations: CfDurableObjectMigrations | undefined;
-	compatibility_date: string | undefined;
-	compatibility_flags: string[] | undefined;
-	usage_model: "bundled" | "unbound" | undefined;
-	keep_bindings: boolean | undefined;
-}
-
-export interface CfWorkerContext {
-	env: string | undefined;
-	legacyEnv: boolean | undefined;
-	zone: string | undefined;
-	host: string | undefined;
-	routes: Route[] | undefined;
-	sendMetrics: boolean | undefined;
-}

package/src/zones.ts

@@ -1,167 +0,0 @@
-import { fetchListResult } from "./cfetch";
-import type { Route } from "./config/environment";
-
-/**
- * An object holding information about a zone for publishing.
- */
-export interface Zone {
-	id: string;
-	host: string;
-}
-
-export function getHostFromRoute(route: Route): string | undefined {
-	return typeof route === "string"
-		? getHostFromUrl(route)
-		: typeof route === "object"
-		? "zone_name" in route
-			? getHostFromUrl(route.zone_name)
-			: getHostFromUrl(route.pattern)
-		: undefined;
-}
-
-/**
- * Try to compute the a zone ID and host name for one or more routes.
- *
- * When we're given a route, we do 2 things:
- * - We try to extract a host from it
- * - We try to get a zone id from the host
- */
-export async function getZoneForRoute(route: Route): Promise<Zone | undefined> {
-	const host = getHostFromRoute(route);
-	const id =
-		typeof route === "object" && "zone_id" in route
-			? route.zone_id
-			: host
-			? await getZoneIdFromHost(host)
-			: undefined;
-	return id && host ? { id, host } : undefined;
-}
-
-/**
- * Given something that resembles a URL, try to extract a host from it.
- */
-function getHostFromUrl(urlLike: string): string | undefined {
-	// strip leading * / *.
-	urlLike = urlLike.replace(/^\*(\.)?/g, "");
-
-	if (!(urlLike.startsWith("http://") || urlLike.startsWith("https://"))) {
-		urlLike = "http://" + urlLike;
-	}
-	return new URL(urlLike).host;
-}
-
-/**
- * Given something that resembles a host, try to infer a zone id from it.
- *
- * It's hard to get a 'valid' domain from a string, so we don't even try to validate TLDs, etc.
- * For each domain-like part of the host (e.g. w.x.y.z) try to get a zone id for it by
- * lopping off subdomains until we get a hit from the API.
- */
-export async function getZoneIdFromHost(host: string): Promise<string> {
-	const hostPieces = host.split(".");
-
-	while (hostPieces.length > 1) {
-		const zones = await fetchListResult<{ id: string }>(
-			`/zones`,
-			{},
-			new URLSearchParams({ name: hostPieces.join(".") })
-		);
-		if (zones.length > 0) {
-			return zones[0].id;
-		}
-		hostPieces.shift();
-	}
-
-	throw new Error(`Could not find zone for ${host}`);
-}
-
-/**
- * An object holding information about an assigned worker route, returned from the API
- */
-interface WorkerRoute {
-	id: string;
-	pattern: string;
-	script: string;
-}
-
-/**
- * Given a zone within the user's account, return a list of all assigned worker routes
- */
-export async function getRoutesForZone(zone: string): Promise<WorkerRoute[]> {
-	const routes = await fetchListResult<WorkerRoute>(
-		`/zones/${zone}/workers/routes`
-	);
-	return routes;
-}
-
-/**
- * Given two strings, return the levenshtein distance between them as a simple text match heuristic
- */
-function distanceBetween(a: string, b: string, cache = new Map()): number {
-	if (cache.has(`${a}|${b}`)) {
-		return cache.get(`${a}|${b}`);
-	}
-	let result;
-	if (b == "") {
-		result = a.length;
-	} else if (a == "") {
-		result = b.length;
-	} else if (a[0] === b[0]) {
-		result = distanceBetween(a.slice(1), b.slice(1), cache);
-	} else {
-		result =
-			1 +
-			Math.min(
-				distanceBetween(a.slice(1), b, cache),
-				distanceBetween(a, b.slice(1), cache),
-				distanceBetween(a.slice(1), b.slice(1), cache)
-			);
-	}
-	cache.set(`${a}|${b}`, result);
-	return result;
-}
-
-/**
- * Given an invalid route, sort the valid routes by closeness to the invalid route (levenstein distance)
- */
-export function findClosestRoute(
-	providedRoute: string,
-	assignedRoutes: WorkerRoute[]
-): WorkerRoute[] {
-	return assignedRoutes.sort((a, b) => {
-		const distanceA = distanceBetween(providedRoute, a.pattern);
-		const distanceB = distanceBetween(providedRoute, b.pattern);
-		return distanceA - distanceB;
-	});
-}
-
-/**
- * Given a route (must be assigned and within the correct zone), return the name of the worker assigned to it
- */
-export async function getWorkerForZone(worker: string) {
-	const zone = await getZoneForRoute(worker);
-	if (!zone) {
-		throw new Error(
-			`The route '${worker}' is not part of one of your zones. Either add this zone from the Cloudflare dashboard, or try using a route within one of your existing zones.`
-		);
-	}
-	const routes = await getRoutesForZone(zone.id);
-
-	const scriptName = routes.find((route) => route.pattern === worker)?.script;
-
-	if (!scriptName) {
-		const closestRoute = findClosestRoute(worker, routes)?.[0];
-
-		if (!closestRoute) {
-			throw new Error(
-				`The route '${worker}' has no workers assigned. You can assign a worker to it from wrangler.toml or the Cloudflare dashboard`
-			);
-		} else {
-			throw new Error(
-				`The route '${worker}' has no workers assigned. Did you mean to tail the route '${closestRoute.pattern}'?`
-			);
-		}
-	}
-
-	return scriptName;
-}

package/templates/first-party-worker-module-facade.ts

@@ -1,18 +0,0 @@
-// @ts-ignore entry point will get replaced
-import worker from "__ENTRY_POINT__";
-// @ts-ignore entry point will get replaced
-export * from "__ENTRY_POINT__";
-
-type Env = {
-	// TODO: type this
-};
-
-/**
- * Setup globals/vars as required
- */
-
-export default {
-	async fetch(request: Request, env: Env, ctx: ExecutionContext) {
-		return worker.fetch(request, env, ctx);
-	},
-};

package/templates/format-dev-errors.ts

@@ -1,32 +0,0 @@
-// @ts-expect-error We'll swap in the entry point during build
-import Worker from "__ENTRY_POINT__";
-
-// @ts-expect-error
-export * from "__ENTRY_POINT__";
-
-export default {
-	async fetch(req: Request, env: unknown, ctx: ExecutionContext) {
-		try {
-			return await Worker.fetch(req, env, ctx);
-		} catch (err) {
-			return new Response(
-				`<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8" />
-		<title>Error</title>
-	</head>
-	<body>
-		<pre>${(err as Error).stack}</pre>
-	</body>
-</html>`,
-				{
-					status: 500,
-					headers: {
-						"Content-Type": "text/html",
-					},
-				}
-			);
-		}
-	},
-};

package/templates/serve-static-assets.ts

@@ -1,63 +0,0 @@
-// @ts-expect-error
-import worker from "__ENTRY_POINT__";
-import {
-	getAssetFromKV,
-	NotFoundError,
-	MethodNotAllowedError,
-	// @ts-expect-error
-} from "__KV_ASSET_HANDLER__";
-// @ts-expect-error
-import manifest from "__STATIC_CONTENT_MANIFEST";
-import type * as kvAssetHandler from "@cloudflare/kv-asset-handler";
-
-const ASSET_MANIFEST = JSON.parse(manifest);
-
-// @ts-expect-error
-export * from "__ENTRY_POINT__";
-
-export default {
-	async fetch(
-		request: Request,
-		env: { __STATIC_CONTENT: string },
-		ctx: ExecutionContext
-	) {
-		let options = {
-			ASSET_MANIFEST,
-			ASSET_NAMESPACE: env.__STATIC_CONTENT,
-			cacheControl: __CACHE_CONTROL_OPTIONS__,
-			serveSinglePageApp: __SERVE_SINGLE_PAGE_APP__,
-		};
-
-		try {
-			const page = await (
-				getAssetFromKV as typeof kvAssetHandler.getAssetFromKV
-			)(
-				{
-					request,
-					waitUntil(promise: Promise<unknown>) {
-						return ctx.waitUntil(promise);
-					},
-				},
-				options
-			);
-
-			// allow headers to be altered
-			const response = new Response(page.body, page);
-
-			response.headers.set("X-XSS-Protection", "1; mode=block");
-			response.headers.set("X-Content-Type-Options", "nosniff");
-			response.headers.set("X-Frame-Options", "DENY");
-			response.headers.set("Referrer-Policy", "unsafe-url");
-			response.headers.set("Feature-Policy", "none");
-
-			return response;
-		} catch (e) {
-			if (e instanceof NotFoundError || e instanceof MethodNotAllowedError) {
-				// if a known error is thrown then serve from actual worker
-				return await worker.fetch(request, env, ctx);
-			}
-			// otherwise it's a real error, so throw it
-			throw e;
-		}
-	},
-};

package/templates/service-bindings-module-facade.js

@@ -1,54 +0,0 @@
-import worker from "__ENTRY_POINT__";
-const Workers = __WORKERS__;
-
-export * from "__ENTRY_POINT__";
-
-export default {
-	async fetch(req, env, ctx) {
-		const facadeEnv = { ...env };
-		// For every Worker definition that's available,
-		// create a fetcher for it on the facade env.
-		// for const [name,  binding] of env
-		// if Workers[name]
-		// const details = Workers[name];
-
-		for (const [name, details] of Object.entries(Workers)) {
-			if (details) {
-				facadeEnv[name] = {
-					async fetch(...reqArgs) {
-						const reqFromArgs = new Request(...reqArgs);
-						if (details.headers) {
-							for (const [key, value] of Object.entries(details.headers)) {
-								// In remote mode, you need to add a couple of headers
-								// to make sure it's talking to the 'dev' preview session
-								// (much like wrangler dev already does via proxy.ts)
-								reqFromArgs.headers.set(key, value);
-							}
-							return env[name].fetch(reqFromArgs);
-						}
-
-						const url = new URL(reqFromArgs.url);
-						url.protocol = details.protocol;
-						url.host = details.host;
-						if (details.port !== undefined) url.port = details.port;
-
-						const request = new Request(url.toString(), reqFromArgs);
-						return fetch(request);
-					},
-				};
-			} else {
-				// This means there's no dev binding available.
-				// Let's use whatever's available, or put a shim with a message.
-				facadeEnv[name] = facadeEnv[name] || {
-					async fetch() {
-						return new Response(
-							`You should start up wrangler dev --local on the ${name} worker`,
-							{ status: 404 }
-						);
-					},
-				};
-			}
-		}
-		return worker.fetch(req, facadeEnv, ctx);
-	},
-};