feat(http): file server prints local network address

http/file_server.ts

@@ -806,21 +806,21 @@
 
   const useTls = !!(keyFile && certFile);
 
   function onListen({ port, hostname }: { port: number; hostname: string }) {
     const networkAddress = getNetworkAddress();
     const protocol = useTls ? "https" : "http";
     let message = `Listening on:\n- Local: ${protocol}://${hostname}:${port}`;
-    if (networkAddress) {
+    if (networkAddress && !DENO_DEPLOYMENT_ID) {
       message += `\n- Network: ${protocol}://${networkAddress}:${port}`;
     }
     console.log(message);
   }
 
   if (useTls) {
     Deno.serve({
       port,
       hostname: host,
       onListen,
       cert: Deno.readTextFileSync(certFile),
       key: Deno.readTextFileSync(keyFile),
     }, handler);
@@ -828,7 +828,7 @@
     Deno.serve({
       port,
       hostname: host,
       onListen,
     }, handler);
   }
 }
@@ -838,13 +838,13 @@
  * inspired by the util of the same name in `npm:serve`
  * https://github.com/vercel/serve/blob/1ea55b1b5004f468159b54775e4fb3090fedbb2b/source/utilities/http.ts#L33
  */
 function getNetworkAddress() {
   for (const { family, address } of Deno.networkInterfaces()) {
     if (family === "IPv4" && !address.startsWith("127.")) {
       return address;
     }
   }
 }
 
 function printUsage() {
   console.log(`Deno File Server ${VERSION}

http/file_server_test.ts

@@ -975,42 +975,87 @@ Deno.test(
 
 Deno.test("file_server prints local and network urls", async () => {
   const port = await getAvailablePort();
+  const process = spawnDeno([
+    "--allow-net",
+    "--allow-read",
+    "--allow-sys=networkInterfaces",
+    "http/file_server.ts",
+    "--port",
+    `${port}`,
+  ]);
+  const output = await readUntilMatch(process.stdout, "Network:");
+  const networkAdress = Deno.networkInterfaces().find((i) =>
+    i.family === "IPv4" && !i.address.startsWith("127")
+  )?.address;
+  assertEquals(
+    output,
+    `Listening on:\n- Local: http://localhost:${port}\n- Network: http://${networkAdress}:${port}\n`,
+  );
+  process.stdout.cancel();
+  process.stderr.cancel();
+  process.kill();
+  await process.status;
+});
+
+Deno.test("file_server prints only local address on Deploy", async () => {
+  const port = await getAvailablePort();
+  const process = spawnDeno([
+    "--allow-net",
+    "--allow-read",
+    "--allow-sys=networkInterfaces",
+    "--allow-env=DENO_DEPLOYMENT_ID",
+    "http/file_server.ts",
+    "--port",
+    `${port}`,
+  ], {
+    env: {
+      DENO_DEPLOYMENT_ID: "abcdef",
+    },
+  });
+  const output = await readUntilMatch(process.stdout, "Local:");
+  console.log(output);
+  assertEquals(
+    output,
+    `Listening on:\n- Local: http://localhost:${port}\n`,
+  );
+  process.stdout.cancel();
+  process.stderr.cancel();
+  process.kill();
+  await process.status;
+});
+
+/** Spawn deno child process with the options convenient for testing */
+function spawnDeno(args: string[], opts?: Deno.CommandOptions) {
   const cmd = new Deno.Command(Deno.execPath(), {
     args: [
       "run",
       "--no-lock",
       "--quiet",
-      "--allow-net",
-      "--allow-read",
-      "--allow-sys=networkInterfaces",
       "--config",
       "deno.json",
-      "http/file_server.ts",
-      "--port",
-      `${port}`,
+      ...args,
     ],
     stdout: "piped",
+    stderr: "piped",
+    ...opts,
   });
-  const process = cmd.spawn();
-  const reader = process.stdout.getReader();
+  return cmd.spawn();
+}
+
+async function readUntilMatch(
+  source: ReadableStream,
+  match: string,
+) {
+  const reader = source.getReader();
   let buf = new Uint8Array(0);
   const dec = new TextDecoder();
-  while (!dec.decode(buf).includes("Network:")) {
+  while (!dec.decode(buf).includes(match)) {
     const { value } = await reader.read();
     if (!value) {
       break;
     }
     buf = concat([buf, value]);
   }
-  const networkAdress = Deno.networkInterfaces().find((i) =>
-    i.family === "IPv4" && !i.address.startsWith("127")
-  )?.address;
-  assertEquals(
-    dec.decode(buf),
-    `Listening on:\n- Local: http://localhost:${port}\n- Network: http://${networkAdress}:${port}\n`,
-  );
-
-  reader.cancel();
-  process.kill();
-  await process.status;
-});
+  reader.releaseLock();
+  return dec.decode(buf);
+}