wrangler 2.0.16 → 2.0.19

package/src/publish.ts

@@ -469,21 +469,34 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 		if (!props.dryRun) {
 			// Upload the script so it has time to propagate.
 			// We can also now tell whether available_on_subdomain is set
-			available_on_subdomain = (
-				await fetchResult<{ available_on_subdomain: boolean }>(
-					workerUrl,
-					{
-						method: "PUT",
-						body: createWorkerUploadForm(worker),
-					},
-					new URLSearchParams({
-						include_subdomain_availability: "true",
-						// pass excludeScript so the whole body of the
-						// script doesn't get included in the response
-						excludeScript: "true",
-					})
-				)
-			).available_on_subdomain;
+			const result = await fetchResult<{
+				available_on_subdomain: boolean;
+				id: string | null;
+				etag: string | null;
+				pipeline_hash: string | null;
+			}>(
+				workerUrl,
+				{
+					method: "PUT",
+					body: createWorkerUploadForm(worker),
+				},
+				new URLSearchParams({
+					include_subdomain_availability: "true",
+					// pass excludeScript so the whole body of the
+					// script doesn't get included in the response
+					excludeScript: "true",
+				})
+			);
+
+			available_on_subdomain = result.available_on_subdomain;
+
+			// Print some useful information returned after publishing
+			// Not all fields will be populated for every worker
+			// These fields are likely to be scraped by tools, so do not rename
+			if (result.id) logger.log("Worker ID: ", result.id);
+			if (result.etag) logger.log("Worker ETag: ", result.etag);
+			if (result.pipeline_hash)
+				logger.log("Worker PipelineHash: ", result.pipeline_hash);
 		}
 	} finally {
 		if (typeof destination !== "string") {

package/src/pubsub/pubsub-commands.tsx

@@ -3,6 +3,7 @@ import { readConfig } from "../config";
 import { confirm } from "../dialogs";
 import { CommandLineArgsError } from "../index";
 import { logger } from "../logger";
+import * as metrics from "../metrics";
 import { parseHumanDuration } from "../parse";
 import { requireAuth } from "../user";
 import * as pubsub from ".";
@@ -50,6 +51,9 @@ export function pubSubCommands(
 							logger.log(`Creating Pub/SubNamespace ${args.name}...`);
 							await pubsub.createPubSubNamespace(accountId, namespace);
 							logger.log(`Success! Created Pub/Sub Namespace ${args.name}`);
+							metrics.sendMetricsEvent("create pubsub namespace", {
+								sendMetrics: config.send_metrics,
+							});
 						}
 					)
 					.command(
@@ -63,6 +67,9 @@ export function pubSubCommands(
 							const accountId = await requireAuth(config);
 
 							logger.log(await pubsub.listPubSubNamespaces(accountId));
+							metrics.sendMetricsEvent("list pubsub namespaces", {
+								sendMetrics: config.send_metrics,
+							});
 						}
 					)
 					.command(
@@ -89,6 +96,9 @@ export function pubSubCommands(
 								logger.log(`Deleting namespace ${args.name}...`);
 								await pubsub.deletePubSubNamespace(accountId, args.name);
 								logger.log(`Deleted namespace ${args.name}.`);
+								metrics.sendMetricsEvent("delete pubsub namespace", {
+									sendMetrics: config.send_metrics,
+								});
 							}
 						}
 					)
@@ -111,6 +121,9 @@ export function pubSubCommands(
 							logger.log(
 								await pubsub.describePubSubNamespace(accountId, args.name)
 							);
+							metrics.sendMetricsEvent("view pubsub namespace", {
+								sendMetrics: config.send_metrics,
+							});
 						}
 					)
 					.epilogue(pubsub.pubSubBetaWarning);
@@ -178,6 +191,9 @@ export function pubSubCommands(
 					logger.log(
 						await pubsub.createPubSubBroker(accountId, args.namespace, broker)
 					);
+					metrics.sendMetricsEvent("create pubsub broker", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -247,6 +263,9 @@ export function pubSubCommands(
 						)
 					);
 					logger.log(`Successfully updated Pub/Sub Broker ${args.name}`);
+					metrics.sendMetricsEvent("update pubsub broker", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -268,6 +287,9 @@ export function pubSubCommands(
 					const accountId = await requireAuth(config);
 
 					logger.log(await pubsub.listPubSubBrokers(accountId, args.namespace));
+					metrics.sendMetricsEvent("list pubsub brokers", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -306,6 +328,9 @@ export function pubSubCommands(
 								args.name
 							);
 							logger.log(`Deleted Pub/Sub Broker ${args.name}.`);
+							metrics.sendMetricsEvent("delete pubsub broker", {
+								sendMetrics: config.send_metrics,
+							});
 						}
 					}
 				)
@@ -338,6 +363,9 @@ export function pubSubCommands(
 								args.name
 							)
 						);
+						metrics.sendMetricsEvent("view pubsub broker", {
+							sendMetrics: config.send_metrics,
+						});
 					}
 				);
 
@@ -413,6 +441,9 @@ export function pubSubCommands(
 							parsedExpiration
 						)
 					);
+					metrics.sendMetricsEvent("issue pubsub broker credentials", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -458,6 +489,9 @@ export function pubSubCommands(
 					);
 
 					logger.log(`Revoked ${args.jti.length} credential(s).`);
+					metrics.sendMetricsEvent("revoke pubsub broker credentials", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -502,6 +536,9 @@ export function pubSubCommands(
 					);
 
 					logger.log(`Unrevoked ${numTokens} credential(s)`);
+					metrics.sendMetricsEvent("unrevoke pubsub broker credentials", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -535,6 +572,9 @@ export function pubSubCommands(
 							args.name
 						)
 					);
+					metrics.sendMetricsEvent("list pubsub broker revoked credentials", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 
@@ -567,6 +607,9 @@ export function pubSubCommands(
 							args.name
 						)
 					);
+					metrics.sendMetricsEvent("list pubsub broker public-keys", {
+						sendMetrics: config.send_metrics,
+					});
 				}
 			);
 

package/src/user/user.tsx

@@ -209,7 +209,6 @@ import assert from "node:assert";
 import { webcrypto as crypto } from "node:crypto";
 import { mkdirSync, rmSync, writeFileSync } from "node:fs";
 import http from "node:http";
-import os from "node:os";
 import path from "node:path";
 import url from "node:url";
 import { TextEncoder } from "node:util";
@@ -224,6 +223,7 @@ import {
 	purgeConfigCaches,
 	saveToConfigCache,
 } from "../config-cache";
+import { getGlobalWranglerConfigPath } from "../global-wrangler-config-path";
 import isInteractive from "../is-interactive";
 import { logger } from "../logger";
 import openInBrowser from "../open-in-browser";
@@ -270,7 +270,7 @@ interface AuthTokens {
  * The path to the config file that holds user authentication data,
  * relative to the user's home directory.
  */
-export const USER_AUTH_CONFIG_FILE = ".wrangler/config/default.toml";
+export const USER_AUTH_CONFIG_FILE = "config/default.toml";
 
 /**
  * The data that may be read from the `USER_CONFIG_FILE`.
@@ -368,6 +368,11 @@ function getAuthTokens(config?: UserAuthConfig): AuthTokens | undefined {
 				refreshToken: { value: refresh_token ?? "" },
 			};
 		} else if (api_token) {
+			logger.warn(
+				"It looks like you have used Wrangler 1's `config` command to login with an API token.\n" +
+					"This is no longer supported in the current version of Wrangler.\n" +
+					"If you wish to authenticate via an API token then please set the `CLOUDFLARE_API_TOKEN` environment variable."
+			);
 			return { apiToken: api_token };
 		}
 	} catch {
@@ -396,12 +401,8 @@ export function reinitialiseAuthTokens(config?: UserAuthConfig): void {
 }
 
 export function getAPIToken(): ApiCredentials | undefined {
-	if ("apiToken" in LocalState) {
-		logger.warn(
-			"It looks like you have used Wrangler 1's `config` command to login with an API token.\n" +
-				"This is no longer supported in the current version of Wrangler.\n" +
-				"If you wish to authenticate via an API token then please set the `CLOUDFLARE_API_TOKEN` environment variable."
-		);
+	if (LocalState.apiToken) {
+		return { apiToken: LocalState.apiToken };
 	}
 
 	const localAPIToken = getAuthFromEnv();
@@ -410,11 +411,7 @@ export function getAPIToken(): ApiCredentials | undefined {
 	const storedAccessToken = LocalState.accessToken?.value;
 	if (storedAccessToken) return { apiToken: storedAccessToken };
 
-	if (!process.stdout.isTTY) {
-		throw new Error(
-			"In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/api/tokens/create/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN."
-		);
-	}
+	return undefined;
 }
 
 interface AccessContext {
@@ -846,11 +843,15 @@ async function generatePKCECodes(): Promise<PKCECodes> {
  * and updates the user auth state with the new credentials.
  */
 export function writeAuthConfigFile(config: UserAuthConfig) {
-	mkdirSync(path.join(os.homedir(), ".wrangler/config/"), {
+	const authConfigFilePath = path.join(
+		getGlobalWranglerConfigPath(),
+		USER_AUTH_CONFIG_FILE
+	);
+	mkdirSync(path.dirname(authConfigFilePath), {
 		recursive: true,
 	});
 	writeFileSync(
-		path.join(os.homedir(), USER_AUTH_CONFIG_FILE),
+		path.join(authConfigFilePath),
 		TOML.stringify(config as TOML.JsonMap),
 		{ encoding: "utf-8" }
 	);
@@ -859,9 +860,11 @@ export function writeAuthConfigFile(config: UserAuthConfig) {
 }
 
 export function readAuthConfigFile(): UserAuthConfig {
-	const toml = parseTOML(
-		readFileSync(path.join(os.homedir(), USER_AUTH_CONFIG_FILE))
+	const authConfigFilePath = path.join(
+		getGlobalWranglerConfigPath(),
+		USER_AUTH_CONFIG_FILE
 	);
+	const toml = parseTOML(readFileSync(authConfigFilePath));
 	return toml;
 }
 
@@ -1045,7 +1048,7 @@ export async function logout(): Promise<void> {
 		},
 	});
 	await response.text(); // blank text? would be nice if it was something meaningful
-	rmSync(path.join(os.homedir(), USER_AUTH_CONFIG_FILE));
+	rmSync(path.join(getGlobalWranglerConfigPath(), USER_AUTH_CONFIG_FILE));
 	logger.log(`Successfully logged out.`);
 }
 
@@ -1114,8 +1117,14 @@ export async function requireAuth(config: {
 }): Promise<string> {
 	const loggedIn = await loginOrRefreshIfRequired();
 	if (!loggedIn) {
-		// didn't login, let's just quit
-		throw new Error("Did not login, quitting...");
+		if (!isInteractive()) {
+			throw new Error(
+				"In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/api/tokens/create/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN."
+			);
+		} else {
+			// didn't login, let's just quit
+			throw new Error("Did not login, quitting...");
+		}
 	}
 	const accountId = config.account_id || (await getAccountId());
 	if (!accountId) {

package/src/worker-namespace.ts

@@ -1,6 +1,7 @@
 import { fetchResult } from "./cfetch";
 import { readConfig } from "./config";
 import { logger } from "./logger";
+import * as metrics from "./metrics";
 import { requireAuth } from "./user";
 import { printWranglerBanner } from ".";
 import type { ConfigPath } from ".";
@@ -113,6 +114,9 @@ export function workerNamespaceCommands(
 			const config = readConfig(args.config as ConfigPath, args);
 			const accountId = await requireAuth(config);
 			await listWorkerNamespaces(accountId);
+			metrics.sendMetricsEvent("list worker namespaces", {
+				sendMetrics: config.send_metrics,
+			});
 		})
 		.command(
 			"get <name>",
@@ -128,6 +132,9 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await getWorkerNamespaceInfo(accountId, args.name);
+				metrics.sendMetricsEvent("view worker namespace", {
+					sendMetrics: config.send_metrics,
+				});
 			}
 		)
 		.command(
@@ -145,6 +152,9 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await createWorkerNamespace(accountId, args.name);
+				metrics.sendMetricsEvent("create worker namespace", {
+					sendMetrics: config.send_metrics,
+				});
 			}
 		)
 		.command(
@@ -162,6 +172,9 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await deleteWorkerNamespace(accountId, args.name);
+				metrics.sendMetricsEvent("delete worker namespace", {
+					sendMetrics: config.send_metrics,
+				});
 			}
 		)
 		.command(
@@ -185,6 +198,9 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await renameWorkerNamespace(accountId, args.oldName, args.newName);
+				metrics.sendMetricsEvent("rename worker namespace", {
+					sendMetrics: config.send_metrics,
+				});
 			}
 		);
 }

package/templates/static-asset-facade.js

@@ -1,6 +1,10 @@
 // DO NOT IMPORT THIS DIRECTLY
 import worker from "__ENTRY_POINT__";
-import { getAssetFromKV } from "__KV_ASSET_HANDLER__";
+import {
+	getAssetFromKV,
+	NotFoundError,
+	MethodNotAllowedError,
+} from "__KV_ASSET_HANDLER__";
 import manifest from "__STATIC_CONTENT_MANIFEST";
 const ASSET_MANIFEST = JSON.parse(manifest);
 
@@ -33,11 +37,13 @@ export default {
 
 			return response;
 		} catch (e) {
+			if (e instanceof NotFoundError || e instanceof MethodNotAllowedError) {
+				// if a known error is thrown then serve from actual worker
+				return worker.fetch(request, env, ctx);
+			}
+			// otherwise it's a real error, so throw it
 			console.error(e);
-			// if an error is thrown then serve from actual worker
-			return worker.fetch(request, env, ctx);
-			// TODO: throw here if worker is not available
-			// (which implies it may be a service-worker)
+			return new Response(e.message, { status: 500 });
 		}
 	},
 };

package/templates/tsconfig.json

@@ -15,7 +15,7 @@
 		"lib": [
 			"es2021"
 		] /* Specify a set of bundled library declaration files that describe the target runtime environment. */,
-		// "jsx": "preserve",                                /* Specify what JSX code is generated. */
+		"jsx": "react" /* Specify what JSX code is generated. */,
 		// "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
 		// "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
 		// "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */
@@ -42,7 +42,7 @@
 
 		/* JavaScript Support */
 		"allowJs": true /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */,
-		"checkJs": true /* Enable error reporting in type-checked JavaScript files. */,
+		"checkJs": false /* Enable error reporting in type-checked JavaScript files. */,
 		// "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */
 
 		/* Emit */