@inovus-medical/docs 0.2.1 → 0.4.0

package/assets/styles.css

@@ -102,8 +102,7 @@ a:hover { text-decoration: underline; }
 .layout {
   display: grid;
   grid-template-columns: var(--sidebar-w) minmax(0, 1fr) var(--toc-w);
-  max-width: 1400px;
-  margin: 0 auto;
+  width: 100%;
 }
 .sidebar {
   position: sticky; top: var(--header-h); align-self: start;

package/bin/cli.js

@@ -58,16 +58,18 @@ async function run() {
   if (cmd === 'dev') {
     const { pageCount, outPath, contentDir } = await build({ root, inDir, outDir })
     console.log(`✓ Built ${pageCount} page(s) from ${contentDir === '.' ? 'repo root' : contentDir + '/'}`)
-    serve({ dir: outPath, port })
-    console.log(`→ Serving http://localhost:${port}  (watching ${contentDir === '.' ? 'repo root' : contentDir + '/'} for changes)`)
+    const { port: actual } = await serve({ dir: outPath, port })
+    const busy = actual !== port ? `  (port ${port} was busy)` : ''
+    console.log(`→ Serving http://localhost:${actual}${busy}  (watching ${contentDir === '.' ? 'repo root' : contentDir + '/'} for changes)`)
     watchAndRebuild({ root, inDir: contentDir, outDir })
     return
   }
 
   if (cmd === 'serve') {
     const outPath = path.join(root, outDir)
-    serve({ dir: outPath, port })
-    console.log(`→ Serving ${outDir}/ at http://localhost:${port}`)
+    const { port: actual } = await serve({ dir: outPath, port })
+    const busy = actual !== port ? `  (port ${port} was busy)` : ''
+    console.log(`→ Serving ${outDir}/ at http://localhost:${actual}${busy}`)
     return
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inovus-medical/docs",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "description": "Turn a folder of markdown into a themed, Cloudflare-ready docs site.",
   "type": "module",
   "bin": {

package/src/serve.js

@@ -40,24 +40,47 @@ async function resolveFile(dir, urlPath) {
   }
 }
 
-export function serve({ dir, port = 8788 }) {
-  const server = http.createServer(async (req, res) => {
-    const file = await resolveFile(dir, req.url || '/')
-    if (file) {
-      res.writeHead(200, { 'content-type': TYPES[path.extname(file)] || 'application/octet-stream' })
-      createReadStream(file).pipe(res)
-      return
-    }
-    const notFound = path.join(dir, '404.html')
-    try {
-      const body = await fs.readFile(notFound)
-      res.writeHead(404, { 'content-type': 'text/html; charset=utf-8' })
-      res.end(body)
-    } catch {
-      res.writeHead(404, { 'content-type': 'text/plain' })
-      res.end('Not found')
-    }
+/**
+ * Start a static server for `dir`. If the requested port is busy, automatically tries the
+ * next ones (up to maxAttempts) instead of crashing. Resolves with the server and the
+ * actual port it bound to.
+ */
+export function serve({ dir, port = 8788, maxAttempts = 25 }) {
+  return new Promise((resolve, reject) => {
+    const server = http.createServer(async (req, res) => {
+      try {
+        const file = await resolveFile(dir, req.url || '/')
+        if (file) {
+          res.writeHead(200, { 'content-type': TYPES[path.extname(file)] || 'application/octet-stream' })
+          createReadStream(file).pipe(res)
+          return
+        }
+        const notFound = path.join(dir, '404.html')
+        try {
+          const body = await fs.readFile(notFound)
+          res.writeHead(404, { 'content-type': 'text/html; charset=utf-8' })
+          res.end(body)
+        } catch {
+          res.writeHead(404, { 'content-type': 'text/plain' })
+          res.end('Not found')
+        }
+      } catch (err) {
+        // A single bad request should never take down the dev server.
+        res.writeHead(500, { 'content-type': 'text/plain' })
+        res.end('Internal error: ' + err.message)
+      }
+    })
+
+    let attempt = 0
+    server.on('error', (err) => {
+      if (err.code === 'EADDRINUSE' && attempt < maxAttempts) {
+        attempt++
+        server.listen(port + attempt)
+      } else {
+        reject(err)
+      }
+    })
+    server.once('listening', () => resolve({ server, port: server.address().port }))
+    server.listen(port)
   })
-  server.listen(port)
-  return server
 }