@jsenv/server 12.5.9 → 12.6.0

package/README.md

@@ -1,4 +1,4 @@
-# server [![npm package](https://img.shields.io/npm/v/@jsenv/server.svg?logo=npm&label=package)](https://www.npmjs.com/package/@jsenv/server) [![github workflow](https://github.com/jsenv/server/workflows/main/badge.svg)](https://github.com/jsenv/server/actions?workflow=main) [![codecov coverage](https://codecov.io/gh/jsenv/server/branch/main/graph/badge.svg)](https://codecov.io/gh/jsenv/server)
+# server [![npm package](https://img.shields.io/npm/v/@jsenv/server.svg?logo=npm&label=package)](https://www.npmjs.com/package/@jsenv/server)
 
 `@jsenv/server` helps to write flexible server code with a declarative API.
 
@@ -7,7 +7,6 @@ import { startServer } from "@jsenv/server"
 
 await startServer({
   protocol: "http",
-  ip: "127.0.0.1",
   port: 8080,
   requestToResponse: () => {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "12.5.9",
+  "version": "12.6.0",
   "description": "Write your Node.js server using pure functions",
   "license": "MIT",
   "author": {

package/src/internal/getServerOrigins.js

@@ -2,43 +2,37 @@ import { networkInterfaces } from "os"
 import { URL } from "url"
 
 export const getServerOrigins = ({ protocol, ip, port }) => {
+  const isInternalIp = ip === "127.0.0.1"
+  const internalOrigin = createServerOrigin({
+    protocol,
+    hostname: "localhost",
+    port,
+  })
+  if (isInternalIp) {
+    return { internal: internalOrigin }
+  }
+  const isAnyIp = !ip || ip === "::" || ip === "0.0.0.0"
   return {
-    main: createServerOrigin({ protocol, ip, port }),
-    external: createServerOrigin({ protocol, ip: getExternalIp(ip), port }),
+    internal: internalOrigin,
+    external: createServerOrigin({
+      protocol,
+      hostname: isAnyIp ? getExternalIp(ip) : ip,
+      port,
+    }),
   }
 }
 
-const createServerOrigin = ({ protocol, ip, port }) => {
+const createServerOrigin = ({ protocol, hostname, port }) => {
   const url = new URL("https://127.0.0.1:80")
-
   url.protocol = protocol
-  url.hostname = ipToHostname(ip)
+  url.hostname = hostname
   url.port = port
-
   return url.origin
 }
 
-const ipToHostname = (
-  ip,
-  {
-    preferLocalhost = true,
-    preferLocalIp = false,
-    preferExternalIp = false,
-  } = {},
-) => {
-  if (ip === "0.0.0.0" || !ip) {
-    if (preferLocalhost) return "localhost"
-    if (preferLocalIp) return "127.0.0.1"
-    if (preferExternalIp) return getExternalIp(ip) || "0.0.0.0"
-    return "0.0.0.0"
-  }
-  return ip
-}
-
 const getExternalIp = () => {
   const networkInterfaceMap = networkInterfaces()
   let internalIPV4NetworkAddress
-
   Object.keys(networkInterfaceMap).find((key) => {
     const networkAddressArray = networkInterfaceMap[key]
     return networkAddressArray.find((networkAddress) => {
@@ -48,6 +42,5 @@ const getExternalIp = () => {
       return true
     })
   })
-
   return internalIPV4NetworkAddress ? internalIPV4NetworkAddress.address : null
 }

package/src/internal/listen.js

@@ -20,7 +20,6 @@ const listen = async ({
         ip,
       })
     }
-
     listeningOperation.throwIfAborted()
     port = await startListening({ server, port, ip })
     listeningOperation.addAbortCallback(() => stopListening(server))
@@ -43,7 +42,6 @@ export const findFreePort = async (
   } = {},
 ) => {
   const findFreePortOperation = Abort.startOperation()
-
   try {
     findFreePortOperation.addAbortSignal(signal)
     findFreePortOperation.throwIfAborted()
@@ -61,7 +59,6 @@ export const findFreePort = async (
       }
       return testUntil(nextPort, ip)
     }
-
     const freePort = await testUntil(initialPort, ip)
     return freePort
   } finally {

package/src/startServer.js

@@ -40,6 +40,7 @@ import {
 export const startServer = async ({
   signal = new AbortController().signal,
   logLevel,
+  startLog = true,
   serverName = "server",
 
   protocol = "http",
@@ -47,7 +48,8 @@ export const startServer = async ({
   http1Allowed = true,
   redirectHttpToHttps,
   allowHttpRequestOnHttps = false,
-  ip = "0.0.0.0", // will it work on windows ? https://github.com/nodejs/node/issues/14900
+  listenAnyIp = false,
+  ip = listenAnyIp ? undefined : "127.0.0.1",
   port = 0, // assign a random available port
   portHint,
   privateKey,
@@ -207,7 +209,7 @@ export const startServer = async ({
 
   status = "opened"
   const serverOrigins = getServerOrigins({ protocol, ip, port })
-  const serverOrigin = serverOrigins.main
+  const serverOrigin = serverOrigins.internal
 
   const removeConnectionErrorListener = listenServerConnectionError(
     nodeServer,
@@ -734,9 +736,11 @@ export const startServer = async ({
   // ensure we don't try to handle new requests while server is stopping
   stopCallbackList.add(removeRequestListener)
 
-  logger.info(
-    `${serverName} started at ${serverOrigin} (${serverOrigins.external})`,
-  )
+  if (startLog) {
+    logger.info(
+      `${serverName} started at ${serverOrigin} (${serverOrigins.external})`,
+    )
+  }
 
   const addEffect = (callback) => {
     const cleanup = callback()
@@ -748,6 +752,7 @@ export const startServer = async ({
   return {
     getStatus: () => status,
     origin: serverOrigin,
+    origins: serverOrigins,
     nodeServer,
     stop,
     stoppedPromise,