wiki-server 0.26.0-rc.9 → 0.26.1

package/lib/random_id.js

@@ -11,4 +11,3 @@
 // chars that defaults to 16 and returns a random id.
 
 export default (chars = 16) => [...Array(chars)].map(() => Math.floor(Math.random() * 16).toString(16)).join('')
-

package/lib/server.js

@@ -135,6 +135,8 @@ export default async argv => {
 
   app.startOpts = argv
 
+  const wikiName = new URL(argv.url).hostname
+
   const log = (...stuff) => {
     if (argv.debug) console.log(stuff)
   }
@@ -254,10 +256,22 @@ export default async argv => {
 
   // use logger, at least in development, probably needs a param to configure (or turn off).
   // use stream to direct to somewhere other than stdout.
-  logger.token('vhost', (req, res) => {
-    return colorString(req.hostname)
-  })
-  app.use(logger(':vhost :method :url :status :res[content-length] - :response-time ms'))
+  const vhost = colorString(wikiName)
+  app.use(
+    logger((tokens, req, res) => {
+      return [
+        vhost,
+        tokens.method(req, res),
+        tokens.url(req, res),
+        tokens.status(req, res),
+        tokens.res(req, res, 'content-length'),
+        '-',
+        tokens['response-time'](req, res),
+        'ms',
+      ].join(' ')
+    }),
+  )
+
   app.use(cookieParser())
   app.use(bodyParser.json({ limit: argv.uploadLimit }))
   app.use(bodyParser.urlencoded({ extended: true, limit: argv.uploadLimit }))
@@ -495,7 +509,7 @@ export default async argv => {
       if (!err) {
         res.sendFile(favLoc, { dotfiles: 'allow' })
       } else {
-        res.sendFile(defaultFavLoc)
+        res.sendFile(defaultFavLoc, { dotfiles: 'allow' })
       }
     })
   })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wiki-server",
   "description": "A Federated Wiki Server",
-  "version": "0.26.0-rc.9",
+  "version": "0.26.1",
   "type": "module",
   "author": {
     "name": "Ward Cunningham",
@@ -58,7 +58,7 @@
   "devDependencies": {
     "@eslint/js": "^9.39.1",
     "eslint": "^9.39.1",
-    "globals": "^16.5.0",
+    "globals": "^17.2.0",
     "grunt-git-authors": "^3.2.0",
     "prettier": "^3.7.3",
     "supertest": "^7.1.4",