wrangler 3.28.2 → 3.28.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.28.2",
+  "version": "3.28.3",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -96,7 +96,7 @@
     "source-map": "0.6.1",
     "xxhash-wasm": "^1.0.1",
     "@cloudflare/kv-asset-handler": "0.3.1",
-    "miniflare": "3.20240129.2"
+    "miniflare": "3.20240129.3"
   },
   "devDependencies": {
     "@cloudflare/ai": "^1.0.35",
@@ -187,7 +187,7 @@
     "yargs": "^17.7.2",
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
     "@cloudflare/cli": "1.1.1",
-    "@cloudflare/pages-shared": "^0.11.12",
+    "@cloudflare/pages-shared": "^0.11.13",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "optionalDependencies": {

package/wrangler-dist/cli.d.ts

@@ -310,9 +310,9 @@ declare type CacheQueryOptions_3 = {
     ignoreMethod?: boolean;
 };
 
-declare type CacheRequest = unknown;
+declare type CacheRequest = any;
 
-declare type CacheResponse = unknown;
+declare type CacheResponse = any;
 
 declare const caches_2: CacheStorage_2;
 
@@ -352,6 +352,7 @@ declare const CacheStorage_2: {
  * No-op implementation of CacheStorage
  */
 declare class CacheStorage_3 {
+    constructor();
     open(cacheName: string): Promise<Cache_3>;
     get default(): Cache_3;
 }
@@ -23508,6 +23509,8 @@ declare interface StartDevWorkerOptions {
             hostname?: string;
             port?: number;
             secure?: boolean;
+            httpsKeyPath?: string;
+            httpsCertPath?: string;
         };
         /** Controls what request.url looks like inside the worker. */
         urlOverrides?: {
@@ -23717,6 +23720,8 @@ export declare interface UnstableDevOptions {
     bundle?: boolean;
     inspectorPort?: number;
     localProtocol?: "http" | "https";
+    httpsKeyPath?: string;
+    httpsCertPath?: string;
     assets?: string;
     site?: string;
     siteInclude?: string[];

package/wrangler-dist/cli.js

@@ -119621,7 +119621,7 @@ var import_node_assert2 = __toESM(require("node:assert"));
 var import_undici3 = __toESM(require_undici());
 
 // package.json
-var version = "3.28.2";
+var version = "3.28.3";
 var package_default = {
   name: "wrangler",
   version,
@@ -127782,7 +127782,32 @@ var path22 = __toESM(require("node:path"));
 var import_miniflare4 = require("miniflare");
 var CERT_EXPIRY_DAYS = 30;
 var ONE_DAY_IN_MS = 864e5;
-function getHttpsOptions() {
+function getHttpsOptions(customHttpsKeyPath, customHttpsCertPath) {
+  if (customHttpsKeyPath !== void 0 || customHttpsCertPath !== void 0) {
+    if (customHttpsKeyPath === void 0 || customHttpsCertPath === void 0) {
+      throw new UserError(
+        "Must specify both certificate path and key path to use a Custom Certificate."
+      );
+    }
+    if (!fs11.existsSync(customHttpsKeyPath)) {
+      throw new UserError(
+        "Missing Custom Certificate Key at " + customHttpsKeyPath
+      );
+    }
+    if (!fs11.existsSync(customHttpsCertPath)) {
+      throw new UserError(
+        "Missing Custom Certificate File at " + customHttpsCertPath
+      );
+    }
+    if (hasCertificateExpired(customHttpsKeyPath, customHttpsCertPath)) {
+      throw new UserError("Custom Certificate is invalid");
+    }
+    logger.log("Using custom certificate at ", customHttpsKeyPath);
+    return {
+      key: fs11.readFileSync(customHttpsKeyPath, "utf8"),
+      cert: fs11.readFileSync(customHttpsCertPath, "utf8")
+    };
+  }
   const certDirectory = path22.join(getGlobalWranglerConfigPath(), "local-cert");
   const keyPath = path22.join(certDirectory, "key.pem");
   const certPath = path22.join(certDirectory, "cert.pem");
@@ -128286,7 +128311,10 @@ async function buildMiniflareOptions(log2, config, proxyToUserWorkerAuthenticati
   const persistOptions = buildPersistOptions(config.localPersistencePath);
   let httpsOptions;
   if (config.localProtocol === "https") {
-    const cert = await getHttpsOptions();
+    const cert = await getHttpsOptions(
+      config.httpsKeyPath,
+      config.httpsCertPath
+    );
     httpsOptions = {
       httpsKey: cert.key,
       httpsCert: cert.cert
@@ -128422,6 +128450,8 @@ async function localPropsToConfigBundle(props) {
     crons: props.crons,
     queueConsumers: props.queueConsumers,
     localProtocol: props.localProtocol,
+    httpsKeyPath: props.httpsKeyPath,
+    httpsCertPath: props.httpsCertPath,
     localUpstream: props.localUpstream,
     upstreamProtocol: props.upstreamProtocol,
     inspect: props.inspect,
@@ -143494,6 +143524,14 @@ __name(collectKeyValues, "collectKeyValues");
 
 // src/deploy/index.ts
 async function standardPricingWarning(accountId, config) {
+  if (Date.now() >= Date.UTC(2024, 2, 1, 14)) {
+    if (config.usage_model !== void 0) {
+      logger.warn(
+        "The `usage_model` defined in wrangler.toml is deprecated and no longer used. Visit our developer docs for details: https://developers.cloudflare.com/workers/wrangler/configuration/#usage-model"
+      );
+    }
+    return;
+  }
   try {
     const { standard, reason } = await fetchResult(`/accounts/${accountId}/workers/standard`);
     if (!standard && reason !== "enterprise without override") {
@@ -149213,6 +149251,16 @@ function Options12(yargs) {
       describe: "Protocol to listen to requests on, defaults to http.",
       choices: ["http", "https"]
     },
+    "https-key-path": {
+      describe: "Path to a custom certificate key",
+      type: "string",
+      requiresArg: true
+    },
+    "https-cert-path": {
+      describe: "Path to a custom certificate",
+      type: "string",
+      requiresArg: true
+    },
     "persist-to": {
       describe: "Specify directory to use for local persistence (defaults to .wrangler/state)",
       type: "string",
@@ -149262,6 +149310,8 @@ var Handler12 = /* @__PURE__ */ __name(async ({
   service: requestedServices = [],
   liveReload,
   localProtocol,
+  httpsKeyPath,
+  httpsCertPath,
   persistTo,
   nodeCompat: legacyNodeCompat,
   experimentalLocal,
@@ -149578,6 +149628,8 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates/ for
     port: port2,
     inspectorPort,
     localProtocol,
+    httpsKeyPath,
+    httpsCertPath,
     compatibilityDate,
     compatibilityFlags,
     nodeCompat: legacyNodeCompat,
@@ -162421,6 +162473,14 @@ __name(noBundleWorker, "noBundleWorker");
 
 // src/versions/index.ts
 async function standardPricingWarning2(accountId, config) {
+  if (Date.now() >= Date.UTC(2024, 2, 1, 14)) {
+    if (config.usage_model !== void 0) {
+      logger.warn(
+        "The `usage_model` defined in wrangler.toml is deprecated and no longer used. Visit our developer docs for details: https://developers.cloudflare.com/workers/wrangler/configuration/#usage-model"
+      );
+    }
+    return;
+  }
   try {
     const { standard, reason } = await fetchResult(`/accounts/${accountId}/workers/standard`);
     if (!standard && reason !== "enterprise without override") {
@@ -163238,10 +163298,12 @@ ${tryRunningItIn}${oneOfThese}`
       logger.error(e3.message);
     } else {
       logger.error(e3 instanceof Error ? e3.message : e3);
-      logger.log(
-        `${fgGreenColor}%s${resetColor}`,
-        "If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
-      );
+      if (!(e3 instanceof UserError)) {
+        logger.log(
+          `${fgGreenColor}%s${resetColor}`,
+          "If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
+        );
+      }
     }
     if (
       // Only report the error if we didn't just handle it
@@ -165524,13 +165586,19 @@ async function startPreviewServer({
   previewToken,
   assetDirectory,
   localProtocol,
+  customHttpsKeyPath,
+  customHttpsCertPath,
   localPort: port2,
   ip: ip2,
   onReady
 }) {
   try {
     const abortController = new AbortController();
-    const server2 = await createProxyServer(localProtocol);
+    const server2 = await createProxyServer(
+      localProtocol,
+      customHttpsKeyPath,
+      customHttpsCertPath
+    );
     const proxy2 = {
       server: server2,
       terminator: (0, import_http_terminator2.createHttpTerminator)({
@@ -165755,8 +165823,10 @@ var HTTP1_HEADERS = /* @__PURE__ */ new Set([
   "transfer-encoding",
   "http2-settings"
 ]);
-async function createProxyServer(localProtocol) {
-  const server2 = localProtocol === "https" ? (0, import_node_https.createServer)(await getHttpsOptions()) : (0, import_node_http3.createServer)();
+async function createProxyServer(localProtocol, customHttpsKeyPath, customHttpsCertPath) {
+  const server2 = localProtocol === "https" ? (0, import_node_https.createServer)(
+    await getHttpsOptions(customHttpsKeyPath, customHttpsCertPath)
+  ) : (0, import_node_http3.createServer)();
   return server2.on("upgrade", (req) => {
     logger.log(
       (/* @__PURE__ */ new Date()).toLocaleTimeString(),
@@ -166109,6 +166179,8 @@ async function startRemoteServer(props) {
     previewToken,
     assetDirectory: props.isWorkersSite ? void 0 : props.assetPaths?.assetDirectory,
     localProtocol: props.localProtocol,
+    customHttpsKeyPath: props.httpsKeyPath,
+    customHttpsCertPath: props.httpsCertPath,
     localPort: props.port,
     ip: props.ip,
     onReady: async (ip2, port2) => {
@@ -166638,6 +166710,12 @@ function DevImplementation(props) {
 __name(DevImplementation, "DevImplementation");
 var ip;
 var port;
+var portUsable = false;
+var portUsablePromiseResolve;
+var portUsablePromise = new Promise(
+  (resolve19) => portUsablePromiseResolve = resolve19
+);
+var blockBrowserOpen = false;
 function InteractiveDevSession(props) {
   const toggles = useHotkeys({
     initial: {
@@ -166654,6 +166732,8 @@ function InteractiveDevSession(props) {
   port = props.initialPort;
   useTunnel(toggles.tunnel);
   const onReady = /* @__PURE__ */ __name((newIp, newPort, proxyData) => {
+    portUsable = true;
+    portUsablePromiseResolve();
     ip = newIp;
     port = newPort;
     props.onReady?.(newIp, newPort, proxyData);
@@ -166676,7 +166756,9 @@ function DevSession(props) {
         server: {
           hostname: props.initialIp,
           port: props.initialPort,
-          secure: props.localProtocol === "https"
+          secure: props.localProtocol === "https",
+          httpsKeyPath: props.httpsKeyPath,
+          httpsCertPath: props.httpsCertPath
         },
         inspector: {
           port: props.inspectorPort
@@ -166693,6 +166775,8 @@ function DevSession(props) {
       props.initialIp,
       props.initialPort,
       props.localProtocol,
+      props.httpsKeyPath,
+      props.httpsCertPath,
       props.localUpstream,
       props.inspectorPort,
       props.liveReload
@@ -166831,6 +166915,8 @@ function DevSession(props) {
       crons: props.crons,
       queueConsumers: props.queueConsumers,
       localProtocol: "http",
+      httpsKeyPath: props.httpsKeyPath,
+      httpsCertPath: props.httpsCertPath,
       localUpstream: props.localUpstream,
       upstreamProtocol: props.upstreamProtocol,
       inspect: props.inspect,
@@ -166851,6 +166937,8 @@ function DevSession(props) {
       port: props.initialPort,
       ip: props.initialIp,
       localProtocol: props.localProtocol,
+      httpsKeyPath: props.httpsKeyPath,
+      httpsCertPath: props.httpsCertPath,
       inspectorPort: props.inspectorPort,
       inspect: props.inspect,
       compatibilityDate: props.compatibilityDate,
@@ -166998,6 +167086,15 @@ function useHotkeys(props) {
           console.log();
           break;
         case "b": {
+          if (port === 0) {
+            if (!portUsable)
+              logger.info("Waiting for port...");
+            if (blockBrowserOpen)
+              return;
+            blockBrowserOpen = true;
+            await portUsablePromise;
+            blockBrowserOpen = false;
+          }
           if (ip === "0.0.0.0" || ip === "*") {
             await openInBrowser(`${localProtocol}://127.0.0.1:${port}`);
             return;
@@ -167107,7 +167204,9 @@ async function startDevServer(props) {
       server: {
         hostname: props.initialIp,
         port: props.initialPort,
-        secure: props.localProtocol === "https"
+        secure: props.localProtocol === "https",
+        httpsKeyPath: props.httpsKeyPath,
+        httpsCertPath: props.httpsCertPath
       },
       inspector: {
         port: props.inspectorPort
@@ -167184,6 +167283,8 @@ async function startDevServer(props) {
       crons: props.crons,
       queueConsumers: props.queueConsumers,
       localProtocol: props.localProtocol,
+      httpsKeyPath: props.httpsKeyPath,
+      httpsCertPath: props.httpsCertPath,
       localUpstream: props.localUpstream,
       upstreamProtocol: props.upstreamProtocol,
       inspect: true,
@@ -167228,6 +167329,8 @@ async function startDevServer(props) {
       port: props.initialPort,
       ip: props.initialIp,
       localProtocol: props.localProtocol,
+      httpsKeyPath: props.httpsKeyPath,
+      httpsCertPath: props.httpsCertPath,
       inspectorPort: props.inspectorPort,
       inspect: props.inspect,
       compatibilityDate: props.compatibilityDate,
@@ -167481,6 +167584,14 @@ function devOptions(yargs) {
   }).option("local-protocol", {
     describe: "Protocol to listen to requests on, defaults to http.",
     choices: ["http", "https"]
+  }).option("https-key-path", {
+    describe: "Path to a custom certificate key",
+    type: "string",
+    requiresArg: true
+  }).option("https-cert-path", {
+    describe: "Path to a custom certificate",
+    type: "string",
+    requiresArg: true
   }).options("local-upstream", {
     type: "string",
     describe: "Host to act as origin in local mode, defaults to dev.host or route"
@@ -167716,10 +167827,12 @@ async function startDev(args) {
           tsconfig: args.tsconfig ?? configParam.tsconfig,
           upstreamProtocol,
           localProtocol: args.localProtocol || configParam.dev.local_protocol,
+          httpsKeyPath: args.httpsKeyPath,
+          httpsCertPath: args.httpsCertPath,
           localUpstream: args.localUpstream ?? host,
           localPersistencePath,
           liveReload: args.liveReload || false,
-          accountId: configParam.account_id || getAccountFromCache()?.id,
+          accountId: args.accountId ?? configParam.account_id ?? getAccountFromCache()?.id,
           assetPaths,
           assetsConfig: configParam.assets,
           initialPort: args.port ?? configParam.dev.port ?? await getLocalPort(),
@@ -167824,10 +167937,12 @@ async function startApiDev(args) {
       tsconfig: args.tsconfig ?? configParam.tsconfig,
       upstreamProtocol,
       localProtocol: args.localProtocol ?? configParam.dev.local_protocol,
+      httpsKeyPath: args.httpsKeyPath,
+      httpsCertPath: args.httpsCertPath,
       localUpstream: args.localUpstream ?? host,
       localPersistencePath,
       liveReload: args.liveReload ?? false,
-      accountId: configParam.account_id ?? getAccountFromCache()?.id,
+      accountId: args.accountId ?? configParam.account_id ?? getAccountFromCache()?.id,
       assetPaths,
       assetsConfig: configParam.assets,
       //port can be 0, which means to use a random port
@@ -168135,10 +168250,17 @@ function getBindings(configParam, env5, local, args) {
     vectorize: configParam.vectorize,
     constellation: configParam.constellation,
     hyperdrive: configParam.hyperdrive.map((hyperdrive2) => {
-      if (!hyperdrive2.localConnectionString) {
+      const connectionStringFromEnv = process.env[`WRANGLER_HYPERDRIVE_LOCAL_CONNECTION_STRING_${hyperdrive2.binding}`];
+      if (!connectionStringFromEnv && !hyperdrive2.localConnectionString) {
         throw new UserError(
-          `In development, you should use a local postgres connection string to emulate hyperdrive functionality. Please setup postgres locally and set the value of "${hyperdrive2.binding}"'s "localConnectionString" to the postgres connection string in your wrangler.toml`
+          `When developing locally, you should use a local Postgres connection string to emulate Hyperdrive functionality. Please setup Postgres locally and set the value of the 'WRANGLER_HYPERDRIVE_LOCAL_CONNECTION_STRING_${hyperdrive2.binding}' variable or "${hyperdrive2.binding}"'s "localConnectionString" to the Postgres connection string.`
+        );
+      }
+      if (connectionStringFromEnv) {
+        logger.log(
+          `Found a non-empty WRANGLER_HYPERDRIVE_LOCAL_CONNECTION_STRING variable for binding. Hyperdrive will connect to this database during local development.`
         );
+        hyperdrive2.localConnectionString = connectionStringFromEnv;
       }
       return hyperdrive2;
     })
@@ -168225,6 +168347,8 @@ unstable_dev()'s behaviour will likely change in future releases`
     inspectorPort: options25?.inspectorPort ?? 0,
     v: void 0,
     localProtocol: options25?.localProtocol,
+    httpsKeyPath: options25?.httpsKeyPath,
+    httpsCertPath: options25?.httpsCertPath,
     assets: options25?.assets,
     site: options25?.site,
     // Root folder of static assets for Workers Sites
@@ -168528,7 +168652,10 @@ var ProxyController = class extends import_node_events3.EventEmitter {
     if (this._torndown)
       return;
     (0, import_node_assert20.default)(this.latestConfig !== void 0);
-    const cert = this.latestConfig.dev?.server?.secure || this.latestConfig.dev?.inspector?.secure ? getHttpsOptions() : void 0;
+    const cert = this.latestConfig.dev?.server?.secure || this.latestConfig.dev?.inspector?.secure ? getHttpsOptions(
+      this.latestConfig.dev.server?.httpsKeyPath,
+      this.latestConfig.dev.server?.httpsCertPath
+    ) : void 0;
     const proxyWorkerOptions = {
       host: this.latestConfig.dev?.server?.hostname,
       port: this.latestConfig.dev?.server?.port,
@@ -169075,6 +169202,23 @@ var import_miniflare18 = require("miniflare");
 // src/api/integrations/platform/caches.ts
 init_import_meta_url();
 var CacheStorage = class {
+  constructor() {
+    const unsupportedMethods = ["has", "delete", "keys", "match"];
+    unsupportedMethods.forEach((method) => {
+      Object.defineProperty(this, method, {
+        enumerable: false,
+        value: () => {
+          throw new Error(
+            `Failed to execute '${method}' on 'CacheStorage': the method is not implemented.`
+          );
+        }
+      });
+    });
+    Object.defineProperty(this, "default", {
+      enumerable: true,
+      value: this.default
+    });
+  }
   async open(cacheName) {
     return new Cache2();
   }