wrangler 0.0.0-e95bea2 → 0.0.0-e95e5a0

package/src/parse.ts

@@ -75,7 +75,7 @@ type TomlError = Error & {
 /**
  * A wrapper around `TOML.parse` that throws a `ParseError`.
  */
-export function parseTOML(input: string, file?: string): object {
+export function parseTOML(input: string, file?: string): TOML.JsonMap | never {
   try {
     return TOML.parse(input);
   } catch (err) {

package/src/proxy.ts

@@ -5,7 +5,7 @@ import WebSocket from "faye-websocket";
 import { useEffect, useRef, useState } from "react";
 import serveStatic from "serve-static";
 import { getHttpsOptions } from "./https-options";
-import { reportError } from "./reporting";
+import { logger } from "./logger";
 import type { CfPreviewToken } from "./create-worker-preview";
 import type {
   IncomingHttpHeaders,
@@ -72,11 +72,13 @@ export function usePreviewServer({
   publicRoot,
   localProtocol,
   localPort: port,
+  ip,
 }: {
   previewToken: CfPreviewToken | undefined;
-  publicRoot: undefined | string;
+  publicRoot: string | undefined;
   localProtocol: "https" | "http";
   localPort: number;
+  ip: string;
 }) {
   /** Creates an HTTP/1 proxy that sends requests over HTTP/2. */
   const [proxyServer, setProxyServer] = useState<HttpServer | HttpsServer>();
@@ -90,8 +92,7 @@ export function usePreviewServer({
       createProxyServer(localProtocol)
         .then((proxy) => setProxyServer(proxy))
         .catch(async (err) => {
-          console.error("Failed to create proxy server.", err);
-          await reportError(err);
+          logger.error("Failed to create proxy server:", err);
         });
     }
   }, [proxyServer, localProtocol]);
@@ -209,6 +210,10 @@ export function usePreviewServer({
       const request = message.pipe(remote.request(headers));
       request.on("response", (responseHeaders) => {
         const status = responseHeaders[":status"] ?? 500;
+
+        // log all requests to terminal
+        logger.log(new Date().toLocaleTimeString(), method, url, status);
+
         rewriteRemoteHostToLocalHostInHeaders(
           responseHeaders,
           previewToken.host,
@@ -287,23 +292,31 @@ export function usePreviewServer({
   // Start/stop the server whenever the
   // containing component is mounted/unmounted.
   useEffect(() => {
+    const abortController = new AbortController();
     if (proxyServer === undefined) {
       return;
     }
 
-    waitForPortToBeAvailable(port, { retryPeriod: 200, timeout: 2000 })
+    waitForPortToBeAvailable(port, {
+      retryPeriod: 200,
+      timeout: 2000,
+      abortSignal: abortController.signal,
+    })
       .then(() => {
-        proxyServer.listen(port);
-        console.log(`⬣ Listening at ${localProtocol}://localhost:${port}`);
+        proxyServer.listen(port, ip);
+        logger.log(`⬣ Listening at ${localProtocol}://${ip}:${port}`);
       })
       .catch((err) => {
-        console.error(`⬣ Failed to start server: ${err}`);
+        if ((err as { code: string }).code !== "ABORT_ERR") {
+          logger.error(`Failed to start server: ${err}`);
+        }
       });
 
     return () => {
       proxyServer.close();
+      abortController.abort();
     };
-  }, [port, proxyServer, localProtocol]);
+  }, [port, ip, proxyServer, localProtocol]);
 }
 
 function createHandleAssetsRequest(
@@ -340,18 +353,9 @@ async function createProxyServer(
       : createHttpServer();
 
   return server
-    .on("request", function (req, res) {
-      // log all requests
-      console.log(
-        new Date().toLocaleTimeString(),
-        req.method,
-        req.url,
-        res.statusCode
-      );
-    })
     .on("upgrade", (req) => {
       // log all websocket connections
-      console.log(
+      logger.log(
         new Date().toLocaleTimeString(),
         req.method,
         req.url,
@@ -361,7 +365,7 @@ async function createProxyServer(
     })
     .on("error", (err) => {
       // log all connection errors
-      console.error(new Date().toLocaleTimeString(), err);
+      logger.error(new Date().toLocaleTimeString(), err);
     });
 }
 
@@ -396,9 +400,16 @@ function createStreamHandler(
  */
 export async function waitForPortToBeAvailable(
   port: number,
-  options: { retryPeriod: number; timeout: number }
+  options: { retryPeriod: number; timeout: number; abortSignal: AbortSignal }
 ): Promise<void> {
   return new Promise((resolve, reject) => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (options.abortSignal as any).addEventListener("abort", () => {
+      const abortError = new Error("waitForPortToBeAvailable() aborted");
+      (abortError as Error & { code: string }).code = "ABORT_ERR";
+      doReject(abortError);
+    });
+
     const timeout = setTimeout(() => {
       doReject(new Error(`Timed out waiting for port ${port}`));
     }, options.timeout);