wrangler 0.0.0-e95e5a0 → 0.0.0-e98613f8

package/src/utils/collectKeyValues.ts

@@ -0,0 +1,14 @@
+/**
+ * a function that takes an array of strings in `key:value` format
+ * (typically from yargs or config) and returns back
+ * a neat object with the keys and values
+ */
+export function collectKeyValues(array?: string[]) {
+	return (
+		array?.reduce<Record<string, string>>((recordsToCollect, v) => {
+			const [key, ...value] = v.split(":");
+			recordsToCollect[key] = value.join(":");
+			return recordsToCollect;
+		}, {}) || {}
+	);
+}

package/src/whoami.tsx

@@ -1,70 +1,169 @@
 import { Text, render } from "ink";
 import Table from "ink-table";
-import React from "react";
+import React, { Fragment } from "react";
 import { fetchListResult, fetchResult } from "./cfetch";
 import { logger } from "./logger";
-import { getAPIToken } from "./user";
+import { getAPIToken, getAuthFromEnv, getScopes } from "./user";
 
 export async function whoami() {
-  logger.log("Getting User settings...");
-  const user = await getUserInfo();
-  render(<WhoAmI user={user}></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>
-    </>
-  ) : (
-    <Text>You are not authenticated. Please run `wrangler login`.</Text>
-  );
+	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 }) {
-  return (
-    <Text>
-      👋 You are logged in with an {props.tokenType} Token, associated with the
-      email &apos;{props.email}&apos;!
-    </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>;
+	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;
-  accounts: AccountInfo[];
+	apiToken: string;
+	authType: string;
+	email: string | undefined;
+	accounts: AccountInfo[];
+	tokenPermissions: string[] | undefined;
 }
 
 export async function getUserInfo(): Promise<UserInfo | undefined> {
-  const apiToken = getAPIToken();
-  return apiToken
-    ? {
-        apiToken,
-        authType: "OAuth",
-        email: await getEmail(),
-        accounts: await getAccounts(),
-      }
-    : 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> {
-  const { email } = await fetchResult<{ email: string }>("/user");
-  return email;
+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");
+	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,17 +1,22 @@
+import type { Environment } from "./config";
+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: string;
-  /**
-   * An account ID.
-   */
-  accountId: string;
+	/**
+	 * An API token.
+	 *
+	 * @link https://api.cloudflare.com/#user-api-tokens-properties
+	 */
+	apiToken: ApiCredentials;
+	/**
+	 * An account ID.
+	 */
+	accountId: string;
 }
 
 /**
@@ -23,150 +28,218 @@ export type CfScriptFormat = "modules" | "service-worker";
  * A module type.
  */
 export type CfModuleType =
-  | "esm"
-  | "commonjs"
-  | "compiled-wasm"
-  | "text"
-  | "buffer";
+	| "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;
+	/**
+	 * 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;
+export interface CfVars {
+	[key: string]: unknown;
 }
 
 /**
  * A KV namespace.
  */
-interface CfKvNamespace {
-  binding: string;
-  id: string;
+export interface CfKvNamespace {
+	binding: string;
+	id: string;
 }
 
 /**
  * A binding to a wasm module (in service-worker format)
  */
 
-interface CfWasmModuleBindings {
-  [key: string]: string;
+export interface CfWasmModuleBindings {
+	[key: string]: string;
 }
 
 /**
  * A binding to a text blob (in service-worker format)
  */
 
-interface CfTextBlobBindings {
-  [key: string]: string;
+export interface CfTextBlobBindings {
+	[key: string]: string;
 }
 
 /**
  * A binding to a data blob (in service-worker format)
  */
 
-interface CfDataBlobBindings {
-  [key: string]: string;
+export interface CfDataBlobBindings {
+	[key: string]: string;
 }
 
 /**
  * A Durable Object.
  */
-interface CfDurableObject {
-  name: string;
-  class_name: string;
-  script_name?: string;
+export interface CfDurableObject {
+	name: string;
+	class_name: string;
+	script_name?: string;
+	environment?: string;
+}
+
+export interface CfQueue {
+	binding: string;
+	queue_name: string;
+}
+
+export interface CfR2Bucket {
+	binding: string;
+	bucket_name: string;
+}
+
+export const D1_BETA_PREFIX = `__D1_BETA__` as const;
+export type D1PrefixedBinding = `${typeof D1_BETA_PREFIX}${string}`;
+
+// TODO: figure out if this is duplicated in packages/wrangler/src/config/environment.ts
+export interface CfD1Database {
+	// For now, all D1 bindings are alpha
+	binding: D1PrefixedBinding;
+	database_id: string;
+	database_name?: string;
+	preview_database_id?: string;
+	database_internal_env?: string;
+	migrations_table?: string;
+	migrations_dir?: string;
+}
+
+interface CfService {
+	binding: string;
+	service: string;
+	environment?: string;
+}
+
+interface CfDispatchNamespace {
+	binding: string;
+	namespace: string;
+}
+
+interface CfLogfwdr {
+	schema: string | undefined;
+	bindings: CfLogfwdrBinding[];
 }
 
-interface CfR2Bucket {
-  binding: string;
-  bucket_name: string;
+interface CfLogfwdrBinding {
+	name: string;
+	destination: string;
 }
 
 interface CfUnsafeBinding {
-  name: string;
-  type: string;
+	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[];
-  }[];
+	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;
-    unsafe: CfUnsafeBinding[] | undefined;
-  };
-  migrations: CfDurableObjectMigrations | undefined;
-  compatibility_date: string | undefined;
-  compatibility_flags: string[] | undefined;
-  usage_model: "bundled" | "unbound" | undefined;
+	/**
+	 * 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;
+		queues: CfQueue[] | undefined;
+		r2_buckets: CfR2Bucket[] | undefined;
+		d1_databases: CfD1Database[] | 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;
+	keepVars: boolean | undefined;
+	logpush: boolean | undefined;
 }
 
 export interface CfWorkerContext {
-  env: string | undefined;
-  legacyEnv: boolean | undefined;
-  zone: { id: string; host: string } | undefined;
+	env: string | undefined;
+	legacyEnv: boolean | undefined;
+	zone: string | undefined;
+	host: string | undefined;
+	routes: Route[] | undefined;
+	sendMetrics: boolean | undefined;
+}
+
+// Prefix binding with identifier which will then get picked up by the D1 shim.
+// Once the D1 Api is out of beta, this function can be removed.
+export function identifyD1BindingsAsBeta(
+	dbs: Environment["d1_databases"]
+): CfD1Database[] | undefined {
+	return dbs?.map((db) => ({
+		...db,
+		binding: `${D1_BETA_PREFIX}${db.binding}`,
+	}));
+}
+
+// Remove beta prefix
+export function removeD1BetaPrefix(binding: D1PrefixedBinding): string {
+	return binding.slice(D1_BETA_PREFIX.length);
 }

package/src/yargs-types.ts

@@ -0,0 +1,24 @@
+import type { ArgumentsCamelCase, Argv } from "yargs";
+
+/**
+ * Yargs options included in every wrangler command.
+ */
+export interface CommonYargsOptions {
+	v: boolean | undefined;
+	config: string | undefined;
+	env: string | undefined;
+}
+
+export type YargvToInterface<T> = T extends Argv<infer P>
+	? ArgumentsCamelCase<P>
+	: never;
+
+/**
+ * Given some Yargs Options function factory, extract the interface
+ * that corresponds to the yargs arguments
+ */
+export type YargsOptionsToInterface<
+	T extends (yargs: Argv<CommonYargsOptions>) => Argv
+> = T extends (yargs: Argv<CommonYargsOptions>) => Argv<infer P>
+	? ArgumentsCamelCase<P>
+	: never;