wrangler 0.0.13 → 0.0.14

package/src/inspect.ts

@@ -315,9 +315,14 @@ export default function useInspector(props: InspectorProps) {
     };
   }, [
     props.inspectorUrl,
-    retryRemoteWebSocketConnectionSigil,
     props.logToTerminal,
     wsServer,
+    // We use a state value as a sigil to trigger a retry of the
+    // remote websocket connection. It's not used inside the effect,
+    // so react-hooks/exhaustive-deps doesn't complain if it's not
+    // included in the dependency array. But its presence is critical,
+    // so do NOT remove it from the dependency list.
+    retryRemoteWebSocketConnectionSigil,
   ]);
 
   /**

package/src/pages.tsx

@@ -850,6 +850,7 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
               }
             }`,
             };
+            scriptReadyResolve();
           }
         }
 

package/src/proxy.ts

@@ -11,7 +11,7 @@ import type {
 import WebSocket from "faye-websocket";
 import serveStatic from "serve-static";
 import type { CfPreviewToken } from "./api/preview";
-import { useEffect, useRef } from "react";
+import { useEffect, useRef, useState } from "react";
 
 /**
  * `usePreviewServer` is a React hook that creates a local development
@@ -80,6 +80,17 @@ export function usePreviewServer({
     { request: IncomingMessage; response: ServerResponse }[]
   >([]);
 
+  /**
+   * The session doesn't last forever, and will evetually drop
+   * (usually within 5-15 minutes). When that happens, we simply
+   * restart the effect, effectively restarting the server. We use
+   * a state sigil as an effect dependency to do so.
+   */
+  const [retryServerSetupSigil, setRetryServerSetupSigil] = useState<number>(0);
+  function retryServerSetup() {
+    setRetryServerSetupSigil((x) => x + 1);
+  }
+
   useEffect(() => {
     // If we don't have a token, that means either we're just starting up,
     // or we're refreshing the token.
@@ -119,6 +130,11 @@ export function usePreviewServer({
     const remote = connect(`https://${previewToken.host}`);
     cleanupListeners.push(() => remote.destroy());
 
+    // As mentioned above, the session may die at any point,
+    // so we need to restart the effect.
+    remote.on("close", retryServerSetup);
+    cleanupListeners.push(() => remote.off("close", retryServerSetup));
+
     /** HTTP/2 -> HTTP/2  */
     const handleStream = createStreamHandler(previewToken, remote, port);
     proxy.on("stream", handleStream);
@@ -209,9 +225,19 @@ export function usePreviewServer({
     cleanupListeners.push(() => proxy.off("upgrade", handleUpgrade));
 
     return () => {
-      cleanupListeners.forEach((d) => d());
+      cleanupListeners.forEach((cleanup) => cleanup());
     };
-  }, [previewToken, publicRoot, port, proxy]);
+  }, [
+    previewToken,
+    publicRoot,
+    port,
+    proxy,
+    // We use a state value as a sigil to trigger reconnecting the server.
+    // It's not used inside the effect, so react-hooks/exhaustive-deps
+    // doesn't complain if it's not included in the dependency array.
+    // But its presence is critical, so Do NOT remove it from the dependency list.
+    retryServerSetupSigil,
+  ]);
 
   // Start/stop the server whenever the
   // containing component is mounted/unmounted.

package/src/publish.ts

@@ -3,7 +3,7 @@ import path from "node:path";
 import { readFile } from "node:fs/promises";
 import * as esbuild from "esbuild";
 import type { Metafile } from "esbuild";
-import { execa } from "execa";
+import { execaCommand } from "execa";
 import tmp from "tmp-promise";
 import type { CfWorkerInit } from "./api/worker";
 import { toFormData } from "./api/form_data";
@@ -114,8 +114,8 @@ export default async function publish(props: Props): Promise<void> {
   if (props.config.build?.command) {
     // TODO: add a deprecation message here?
     console.log("running:", props.config.build.command);
-    const buildCommandPieces = props.config.build.command.split(" ");
-    await execa(buildCommandPieces[0], buildCommandPieces.slice(1), {
+    await execaCommand(props.config.build.command, {
+      shell: true,
       stdout: "inherit",
       stderr: "inherit",
       ...(props.config.build?.cwd && { cwd: props.config.build.cwd }),

package/wrangler-dist/cli.js

@@ -1359,7 +1359,7 @@ var require_react_development = __commonJS({
           }
           return dispatcher.useContext(Context, unstable_observedBits);
         }
-        function useState4(initialState) {
+        function useState5(initialState) {
           var dispatcher = resolveDispatcher();
           return dispatcher.useState(initialState);
         }
@@ -1947,7 +1947,7 @@ var require_react_development = __commonJS({
         exports2.useMemo = useMemo;
         exports2.useReducer = useReducer;
         exports2.useRef = useRef4;
-        exports2.useState = useState4;
+        exports2.useState = useState5;
         exports2.version = ReactVersion;
       })();
     }
@@ -68789,7 +68789,7 @@ var require_backend = __commonJS({
               });
               return a2;
             },
-            useState: function useState4(a2) {
+            useState: function useState5(a2) {
               var b2 = B2();
               a2 = b2 !== null ? b2.memoizedState : typeof a2 === "function" ? a2() : a2;
               w2.push({
@@ -83408,10 +83408,10 @@ var require_command = __commonJS({
     var getEscapedCommand2 = (file, args2) => {
       return normalizeArgs2(file, args2).map((arg2) => escapeArg2(arg2)).join(" ");
     };
-    var SPACES_REGEXP = / +/g;
+    var SPACES_REGEXP2 = / +/g;
     var parseCommand3 = (command2) => {
       const tokens = [];
-      for (const token of command2.trim().split(SPACES_REGEXP)) {
+      for (const token of command2.trim().split(SPACES_REGEXP2)) {
         const previousToken = tokens[tokens.length - 1];
         if (previousToken && previousToken.endsWith("\\")) {
           tokens[tokens.length - 1] = `${previousToken.slice(0, -1)} ${token}`;
@@ -107858,6 +107858,19 @@ var escapeArg = (arg2) => {
 };
 var joinCommand = (file, args2) => normalizeArgs(file, args2).join(" ");
 var getEscapedCommand = (file, args2) => normalizeArgs(file, args2).map((arg2) => escapeArg(arg2)).join(" ");
+var SPACES_REGEXP = / +/g;
+var parseCommand = (command2) => {
+  const tokens = [];
+  for (const token of command2.trim().split(SPACES_REGEXP)) {
+    const previousToken = tokens[tokens.length - 1];
+    if (previousToken && previousToken.endsWith("\\")) {
+      tokens[tokens.length - 1] = `${previousToken.slice(0, -1)} ${token}`;
+    } else {
+      tokens.push(token);
+    }
+  }
+  return tokens;
+};
 
 // ../../node_modules/execa/index.js
 var DEFAULT_MAX_BUFFER = 1e3 * 1e3 * 100;
@@ -107977,6 +107990,10 @@ function execa5(file, args2, options) {
   spawned.all = makeAllStream(spawned, parsed.options);
   return mergePromise(spawned, handlePromiseOnce);
 }
+function execaCommand(command2, options) {
+  const [file, ...args2] = parseCommand(command2);
+  return execa5(file, args2, options);
+}
 
 // node_modules/node-fetch/src/index.js
 init_import_meta_url();
@@ -112185,7 +112202,7 @@ var import_http = __toModule(require("http"));
 var import_react2 = __toModule(require_react());
 
 // package.json
-var version = "0.0.13";
+var version = "0.0.14";
 
 // src/inspect.ts
 function useInspector(props) {
@@ -112336,9 +112353,9 @@ function useInspector(props) {
     };
   }, [
     props.inspectorUrl,
-    retryRemoteWebSocketConnectionSigil,
     props.logToTerminal,
-    wsServer
+    wsServer,
+    retryRemoteWebSocketConnectionSigil
   ]);
   const messageBufferRef = (0, import_react2.useRef)([]);
   (0, import_react2.useEffect)(() => {
@@ -112552,6 +112569,10 @@ function usePreviewServer({
   const proxy = proxyServer.current ??= createProxyServer();
   const streamBufferRef = (0, import_react3.useRef)([]);
   const requestResponseBufferRef = (0, import_react3.useRef)([]);
+  const [retryServerSetupSigil, setRetryServerSetupSigil] = (0, import_react3.useState)(0);
+  function retryServerSetup() {
+    setRetryServerSetupSigil((x3) => x3 + 1);
+  }
   (0, import_react3.useEffect)(() => {
     if (!previewToken2) {
       const cleanupListeners2 = [];
@@ -112573,6 +112594,8 @@ function usePreviewServer({
     const assetPath = typeof publicRoot === "string" ? publicRoot : null;
     const remote = (0, import_node_http22.connect)(`https://${previewToken2.host}`);
     cleanupListeners.push(() => remote.destroy());
+    remote.on("close", retryServerSetup);
+    cleanupListeners.push(() => remote.off("close", retryServerSetup));
     const handleStream = createStreamHandler(previewToken2, remote, port);
     proxy.on("stream", handleStream);
     cleanupListeners.push(() => proxy.off("stream", handleStream));
@@ -112626,9 +112649,15 @@ function usePreviewServer({
     proxy.on("upgrade", handleUpgrade);
     cleanupListeners.push(() => proxy.off("upgrade", handleUpgrade));
     return () => {
-      cleanupListeners.forEach((d2) => d2());
+      cleanupListeners.forEach((cleanup) => cleanup());
     };
-  }, [previewToken2, publicRoot, port, proxy]);
+  }, [
+    previewToken2,
+    publicRoot,
+    port,
+    proxy,
+    retryServerSetupSigil
+  ]);
   (0, import_react3.useEffect)(() => {
     proxy.listen(port);
     console.log(`\u2B23 Listening at http://localhost:${port}`);
@@ -112970,7 +112999,8 @@ function Dev(props) {
     bindings: props.bindings,
     site: props.assetPaths,
     public: props.public,
-    port
+    port,
+    enableLocalPersistence: props.enableLocalPersistence
   }) : /* @__PURE__ */ import_react4.default.createElement(Remote, {
     name: props.name,
     bundle,
@@ -113025,7 +113055,8 @@ function Local(props) {
     bundle: props.bundle,
     format: props.format,
     bindings: props.bindings,
-    port: props.port
+    port: props.port,
+    enableLocalPersistence: props.enableLocalPersistence
   });
   useInspector({ inspectorUrl, port: 9229, logToTerminal: false });
   return null;
@@ -113062,9 +113093,7 @@ function useLocalWorker(props) {
         import_node_path8.default.join(__dirname, "../miniflare-config-stubs/package.empty.json"),
         "--port",
         port.toString(),
-        "--kv-persist",
-        "--cache-persist",
-        "--do-persist",
+        ...props.enableLocalPersistence ? ["--kv-persist", "--cache-persist", "--do-persist"] : [],
         ...Object.entries(bindings.vars || {}).flatMap(([key2, value]) => {
           return ["--binding", `${key2}=${value}`];
         }),
@@ -113164,18 +113193,19 @@ function useCustomBuild(expectedEntry, props) {
       return;
     let cmd, interval;
     console.log("running:", command2);
-    const commandPieces = command2.split(" ");
-    cmd = execa5(commandPieces[0], commandPieces.slice(1), {
+    cmd = execaCommand(command2, {
       ...cwd && { cwd },
+      shell: true,
       stderr: "inherit",
       stdout: "inherit"
     });
     if (watch_dir) {
-      (0, import_chokidar.watch)(watch_dir, { persistent: true, ignoreInitial: true }).on("all", (_event, _path) => {
-        console.log(`The file ${import_node_path8.default} changed, restarting build...`);
+      (0, import_chokidar.watch)(watch_dir, { persistent: true, ignoreInitial: true }).on("all", (_event, filePath) => {
+        console.log(`The file ${filePath} changed, restarting build...`);
         cmd.kill();
-        cmd = execa5(commandPieces[0], commandPieces.slice(1), {
+        cmd = execaCommand(command2, {
           ...cwd && { cwd },
+          shell: true,
           stderr: "inherit",
           stdout: "inherit"
         });
@@ -122963,6 +122993,7 @@ var pages = (yargs) => {
               }
             }`
         };
+        scriptReadyResolve();
       }
     }
     const { Miniflare, Log, LogLevel } = await import("miniflare");
@@ -123142,8 +123173,8 @@ async function publish(props) {
   const destination = await import_tmp_promise2.default.dir({ unsafeCleanup: true });
   if (props.config.build?.command) {
     console.log("running:", props.config.build.command);
-    const buildCommandPieces = props.config.build.command.split(" ");
-    await execa5(buildCommandPieces[0], buildCommandPieces.slice(1), {
+    await execaCommand(props.config.build.command, {
+      shell: true,
       stdout: "inherit",
       stderr: "inherit",
       ...props.config.build?.cwd && { cwd: props.config.build.cwd }
@@ -123510,7 +123541,7 @@ ${err2.message ?? err2}`);
             wrangler: version
           }
         }, null, "  ") + "\n");
-        await execa5("npm", ["install", "--prefer-offline"], {
+        await execa5("npm", ["install"], {
           stdio: "inherit"
         });
         console.log(`\u2728 Created package.json`);
@@ -123523,12 +123554,7 @@ ${err2.message ?? err2}`);
       if (!(packageJson.devDependencies?.wrangler || packageJson.dependencies?.wrangler)) {
         const shouldInstall = await confirm("Would you like to install wrangler into your package.json?");
         if (shouldInstall) {
-          await execa5("npm", [
-            "install",
-            `wrangler@${version}`,
-            "--save-dev",
-            "--prefer-offline"
-          ], {
+          await execa5("npm", ["install", `wrangler@${version}`, "--save-dev"], {
             stdio: "inherit"
           });
           console.log(`\u2728 Installed wrangler`);
@@ -123554,12 +123580,7 @@ ${err2.message ?? err2}`);
             types: ["@cloudflare/workers-types"]
           }
         }, null, "  ") + "\n");
-        await execa5("npm", [
-          "install",
-          "@cloudflare/workers-types",
-          "--save-dev",
-          "--prefer-offline"
-        ], { stdio: "inherit" });
+        await execa5("npm", ["install", "@cloudflare/workers-types", "--save-dev"], { stdio: "inherit" });
         console.log(`\u2728 Created tsconfig.json, installed @cloudflare/workers-types into devDependencies`);
         pathToTSConfig = import_posix.default.join(process.cwd(), "tsconfig.json");
       }
@@ -123568,12 +123589,7 @@ ${err2.message ?? err2}`);
       if (!(packageJson.devDependencies?.["@cloudflare/workers-types"] || packageJson.dependencies?.["@cloudflare/workers-types"])) {
         const shouldInstall = await confirm("Would you like to install the type definitions for Workers into your package.json?");
         if (shouldInstall) {
-          await execa5("npm", [
-            "install",
-            "@cloudflare/workers-types",
-            "--save-dev",
-            "--prefer-offline"
-          ], {
+          await execa5("npm", ["install", "@cloudflare/workers-types", "--save-dev"], {
             stdio: "inherit"
           });
           console.log(`\u2728 Installed @cloudflare/workers-types.
@@ -123693,6 +123709,9 @@ Please add "@cloudflare/workers-types" to compilerOptions.types in your tsconfig
     }).option("jsx-fragment", {
       describe: "The function that is called for each JSX fragment",
       type: "string"
+    }).option("experimental-enable-local-persistence", {
+      describe: "Enable persistence for this session (only for local mode)",
+      type: "boolean"
     });
   }, async (args2) => {
     const { filename, format: format3 } = args2;
@@ -123734,6 +123753,7 @@ Please add "@cloudflare/workers-types" to compilerOptions.types in your tsconfig
       initialMode: args2.local ? "local" : "remote",
       jsxFactory: args2["jsx-factory"] || envRootObj?.jsx_factory,
       jsxFragment: args2["jsx-fragment"] || envRootObj?.jsx_fragment,
+      enableLocalPersistence: args2["experimental-enable-local-persistence"] || false,
       accountId: config.account_id,
       assetPaths: getAssetPaths(config, args2.site, args2.siteInclude, args2.siteExclude),
       port: args2.port || config.dev?.port,
@@ -124015,14 +124035,14 @@ Please add "@cloudflare/workers-types" to compilerOptions.types in your tsconfig
         describe: "Binds the secret to the script of the specific environment."
       });
     }, async (args2) => {
-      if (args2.local) {
-        throw new NotImplementedError("--local not implemented for this command yet");
-      }
       const config = args2.config;
       const scriptName = args2.name || config.name;
       if (!scriptName) {
         throw new Error("Missing script name");
       }
+      if (args2.local) {
+        console.warn("`wrangler secret put` is a no-op in --local mode");
+      }
       if (!args2.local) {
         const loggedIn = await loginOrRefreshIfRequired();
         if (!loggedIn) {
@@ -124037,6 +124057,10 @@ Please add "@cloudflare/workers-types" to compilerOptions.types in your tsconfig
         }
       }
       const secretValue = await prompt("Enter a secret value:", "password");
+      if (args2.local) {
+        return;
+      }
+      console.log(`\u{1F300} Creating the secret for script ${scriptName}`);
       async function submitSecret() {
         return await fetchResult(`/accounts/${config.account_id}/workers/scripts/${scriptName}/secrets/`, {
           method: "PUT",
@@ -124049,7 +124073,7 @@ Please add "@cloudflare/workers-types" to compilerOptions.types in your tsconfig
         });
       }
       try {
-        console.log(await submitSecret());
+        await submitSecret();
       } catch (e3) {
         if (e3.code === 10007) {
           await fetchResult(`/accounts/${config.account_id}/workers/scripts/${scriptName}`, {
@@ -124068,9 +124092,10 @@ Please add "@cloudflare/workers-types" to compilerOptions.types in your tsconfig
               modules: []
             })
           });
-          console.log(await submitSecret());
+          await submitSecret();
         }
       }
+      console.log(`\u2728 Success! Uploaded secret ${args2.key}`);
     }).command("delete <key>", "Delete a secret variable from a script", (yargs) => {
       return yargs.positional("key", {
         describe: "The variable name to be accessible in the script.",
@@ -124083,14 +124108,14 @@ Please add "@cloudflare/workers-types" to compilerOptions.types in your tsconfig
         describe: "Binds the secret to the script of the specific environment."
       });
     }, async (args2) => {
-      if (args2.local) {
-        throw new NotImplementedError("--local not implemented for this command yet");
-      }
       const config = args2.config;
       const scriptName = args2.name || config.name;
       if (!scriptName) {
         throw new Error("Missing script name");
       }
+      if (args2.local) {
+        console.warn("`wrangler secret delete` is a no-op in --local mode");
+      }
       if (!args2.local) {
         const loggedIn = await loginOrRefreshIfRequired();
         if (!loggedIn) {
@@ -124104,9 +124129,13 @@ Please add "@cloudflare/workers-types" to compilerOptions.types in your tsconfig
           }
         }
       }
-      if (await confirm("Are you sure you want to delete this secret?")) {
-        console.log(`Deleting the secret ${args2.key} on script ${scriptName}.`);
-        console.log(await fetchResult(`/accounts/${config.account_id}/workers/scripts/${scriptName}/secrets/${args2.key}`, { method: "DELETE" }));
+      if (await confirm(`Are you sure you want to permanently delete the variable ${args2.key} on the script ${scriptName}?`)) {
+        console.log(`\u{1F300} Deleting the secret ${args2.key} on script ${scriptName}.`);
+        if (args2.local) {
+          return;
+        }
+        await fetchResult(`/accounts/${config.account_id}/workers/scripts/${scriptName}/secrets/${args2.key}`, { method: "DELETE" });
+        console.log(`\u2728 Success! Deleted secret ${args2.key}`);
       }
     }).command("list", "List all secrets for a script", (yargs) => {
       return yargs.option("name", {
@@ -124117,14 +124146,14 @@ Please add "@cloudflare/workers-types" to compilerOptions.types in your tsconfig
         describe: "Binds the secret to the script of the specific environment."
       });
     }, async (args2) => {
-      if (args2.local) {
-        throw new NotImplementedError("--local not implemented for this command yet");
-      }
       const config = args2.config;
       const scriptName = args2.name || config.name;
       if (!scriptName) {
         throw new Error("Missing script name");
       }
+      if (args2.local) {
+        console.warn("`wrangler secret list` is a no-op in --local mode");
+      }
       if (!args2.local) {
         const loggedIn = await loginOrRefreshIfRequired();
         if (!loggedIn) {
@@ -124138,7 +124167,10 @@ Please add "@cloudflare/workers-types" to compilerOptions.types in your tsconfig
           }
         }
       }
-      console.log(await fetchResult(`/accounts/${config.account_id}/workers/scripts/${scriptName}/secrets`));
+      if (args2.local) {
+        return;
+      }
+      console.log(JSON.stringify(await fetchResult(`/accounts/${config.account_id}/workers/scripts/${scriptName}/secrets`), null, "  "));
     });
   });
   wrangler.command("kv:namespace", "\u{1F5C2}\uFE0F  Interact with your Workers KV Namespaces", (namespaceYargs) => {