wiki-server 0.26.0-rc.0 → 0.26.0-rc.2

package/lib/page.js

@@ -13,9 +13,6 @@
 const fs = require('fs')
 const path = require('path')
 const events = require('events')
-const glob = require('glob')
-
-const async = require('async')
 
 const random_id = require('./random_id')
 const synopsis = require('wiki-client/lib/synopsis')
@@ -35,6 +32,25 @@ module.exports = exports = argv => {
     if (e) throw e
   })
 
+  // create a list of plugin pages.
+  const pluginPages = new Map()
+  Object.keys(require.main.require('./package').dependencies)
+    .filter(depend => depend.startsWith('wiki-plugin'))
+    .forEach(plugin => {
+      const pagesPath = path.join(
+        path.dirname(require.resolve(`${plugin}/package`, { paths: require.main.paths })),
+        'pages',
+      )
+      fs.readdir(pagesPath, { withFileTypes: true }, (err, entries) => {
+        if (err) return
+        entries.forEach(entry => {
+          if (entry.isFile() && !pluginPages.has(entry.name)) {
+            pluginPages.set(entry.name, { pluginName: plugin, pluginPath: entry.parentPath })
+          }
+        })
+      })
+    })
+
   // #### Private utility methods. ####
   const load_parse = (loc, cb, annotations = {}) => {
     let page
@@ -46,14 +62,13 @@ module.exports = exports = argv => {
         const errorPage = path.basename(loc)
         const errorPagePath = path.dirname(loc)
         const recyclePage = path.resolve(errorPagePath, '..', 'recycle', errorPage)
-        // TODO: fs.exists depreciated
-        fs.exists(path.dirname(recyclePage), exists => {
-          if (exists) {
+        fs.access(path.dirname(recyclePage), fs.constants.F_OK, err => {
+          if (!err) {
             fs.rename(loc, recyclePage, err => {
               if (err) {
-                console.log('ERROR: moving problem page #{loc} to recycler', err)
+                console.log(`ERROR: moving problem page ${loc} to recycler`, err)
               } else {
-                console.log('ERROR: problem page #{loc} moved to recycler')
+                console.log(`ERROR: problem page ${loc} moved to recycler`)
               }
             })
           } else {
@@ -63,9 +78,9 @@ module.exports = exports = argv => {
               } else {
                 fs.rename(loc, recyclePage, err => {
                   if (err) {
-                    console.log('ERROR: moving problem page #{loc} to recycler', err)
+                    console.log(`ERROR: moving problem page ${loc} to recycler`, err)
                   } else {
-                    console.log('ERROR: problem page #{loc} moved to recycler')
+                    console.log(`ERROR: problem page ${loc} moved to recycler`)
                   }
                 })
               }
@@ -104,9 +119,8 @@ module.exports = exports = argv => {
   const tryDefaults = (file, cb) => {
     const lastDefault = cb => {
       const defloc = path.join(argv.root, 'default-data', 'pages', file)
-      // TODO: fs.exists depreciated
-      fs.exists(defloc, exists => {
-        if (exists) {
+      fs.access(defloc, fs.constants.F_OK, err => {
+        if (!err) {
           cb(defloc)
         } else {
           cb(null)
@@ -115,10 +129,8 @@ module.exports = exports = argv => {
     }
     if (argv.defaults) {
       const defloc = path.join(argv.data, '..', argv.defaults, 'pages', file)
-      console.log('firstDefault', defloc)
-      // TODO: fs.exists depreciated
-      fs.exists(defloc, exists => {
-        if (exists) {
+      fs.access(defloc, fs.constants.F_OK, err => {
+        if (!err) {
           cb(defloc)
         } else {
           lastDefault(cb)
@@ -138,22 +150,19 @@ module.exports = exports = argv => {
       case 'delete':
         if (file.startsWith('recycler/')) {
           // delete from recycler
-          // TODO: fs.exists depreciated
-          fs.exists(loc, exists => {
-            if (exists)
+          fs.access(loc, fs.constants.F_OK, err => {
+            if (!err)
               fs.unlink(loc, err => {
                 cb(err)
               })
           })
         } else {
           // move page to recycler
-          // TODO: fs.exists depreciated
-          fs.exists(loc, exists => {
-            if (exists) {
+          fs.access(loc, fs.constants.F_OK, err => {
+            if (!err) {
               const recycleLoc = path.join(argv.recycler, file)
-              // TODO: fs.exists depreciated
-              fs.exists(path.dirname(recycleLoc), exists => {
-                if (exists) {
+              fs.access(path.dirname(recycleLoc), fs.constants.F_OK, err => {
+                if (!err) {
                   fs.rename(loc, recycleLoc, err => {
                     cb(err)
                   })
@@ -203,13 +212,11 @@ module.exports = exports = argv => {
           return
         }
 
-        // TODO: fs.exists depreciated
-        fs.exists(loc, exists => {
-          if (exists) {
+        fs.access(loc, fs.constants.F_OK, err => {
+          if (!err) {
             const recycleLoc = path.join(argv.recycler, file)
-            // TODO: fs.exists depreciated
-            fs.exists(path.dirname(recycleLoc), exists => {
-              if (exists) {
+            fs.access(path.dirname(recycleLoc), fs.constants.F_OK, err => {
+              if (!err) {
                 copyFile(loc, recycleLoc, err => {
                   cb(err)
                 })
@@ -229,42 +236,20 @@ module.exports = exports = argv => {
         break
       }
       case 'get':
-        // TODO: fs.exists depreciated
-        fs.exists(loc, exists => {
-          if (exists) {
+        fs.access(loc, fs.constants.F_OK, err => {
+          if (!err) {
             load_parse(loc, cb, { plugin: undefined })
           } else {
             tryDefaults(file, defloc => {
               if (defloc) {
                 load_parse(defloc, cb)
               } else {
-                glob('wiki-plugin-*/pages', { cwd: argv.packageDir }, (e, plugins) => {
-                  if (e) return cb(e)
-
-                  // if no plugins found
-                  if (plugins.length === 0) {
-                    cb(null, 'Page not found', 404)
-                  }
-
-                  let count = plugins.length
-                  const giveUp = () => {
-                    count -= 1
-                    if (count === 0) {
-                      cb(null, 'Page not found', 404)
-                    }
-                  }
-                  plugins.forEach(plugin => {
-                    const pluginName = plugin.slice(12, -6)
-                    const pluginloc = path.join(argv.packageDir, plugin, file)
-                    fs.exists(pluginloc, exists => {
-                      if (exists) {
-                        load_parse(pluginloc, cb, { plugin: pluginName })
-                      } else {
-                        giveUp()
-                      }
-                    })
-                  })
-                })
+                if (pluginPages.has(file)) {
+                  const { pluginName, pluginPath } = pluginPages.get(file)
+                  load_parse(path.join(pluginPath, file), cb, { plugin: pluginName.slice(12) })
+                } else {
+                  cb(null, 'Page not found', 404)
+                }
               }
             })
           }
@@ -272,11 +257,11 @@ module.exports = exports = argv => {
         break
       case 'put':
         page = JSON.stringify(page, null, 2)
-        fs.exists(path.dirname(loc), exists => {
-          if (exists) {
+        fs.access(path.dirname(loc), fs.constants.F_OK, err => {
+          if (!err) {
             fs.writeFile(loc, page, err => {
               if (err) {
-                console.log('ERROR: write file #{loc} ', err)
+                console.log(`ERROR: write file ${loc} `, err)
               }
               cb(err)
             })
@@ -285,7 +270,7 @@ module.exports = exports = argv => {
               if (err) cb(err)
               fs.writeFile(loc, page, err => {
                 if (err) {
-                  console.log('ERROR: write file #{loc} ', err)
+                  console.log(`ERROR: write file ${loc} `, err)
                 }
                 cb(err)
               })
@@ -294,7 +279,7 @@ module.exports = exports = argv => {
         })
         break
       default:
-        console.log('pagehandler: unrecognized action #{action}')
+        console.log(`pagehandler: unrecognized action ${action}`)
     }
   }
 
@@ -392,43 +377,46 @@ module.exports = exports = argv => {
       }
       return collaborativeLinks
     }
+
     fs.readdir(argv.db, (e, files) => {
       if (e) return cb(e)
-      // used to make sure all of the files are read
-      // and processesed in the site map before responding
-      const doSitemap = (file, cb) => {
-        itself.get(file, (e, page, status) => {
-          if (file.match(/^\./)) return cb()
-          if (e || status === 404) {
-            console.log('Problem building sitemap:', file, 'e: ', e, 'status:', status)
-            return cb() // Ignore errors in the pagehandler get.
-          }
-          let pageLinksMap
-          try {
-            pageLinksMap = page.story.reduce(extractPageLinks, new Map())
-          } catch (err) {
-            console.log('METADATA *** #{wikiName} reduce to extract links on #{file} failed', err.message)
-            pageLinksMap = []
-          }
-          //
-          const pageLinks = pageLinksMap.size > 0 ? Object.fromEntries(pageLinksMap) : undefined
-
-          cb(null, {
-            slug: file,
-            title: page.title,
-            date: editDate(page.journal),
-            synopsis: synopsis(page),
-            links: pageLinks,
+      const doSitemap = async file => {
+        return new Promise(resolve => {
+          itself.get(file, (e, page, status) => {
+            if (file.match(/^\./)) return resolve(null)
+            if (e || status === 404) {
+              console.log('Problem building sitemap:', file, 'e: ', e, 'status:', status)
+              return resolve(null) // Ignore errors in the pagehandler get.
+            }
+            let pageLinksMap
+            try {
+              pageLinksMap = page.story.reduce(extractPageLinks, new Map())
+            } catch (err) {
+              console.log(`METADATA *** ${wikiName} reduce to extract links on ${file} failed`, err.message)
+              pageLinksMap = []
+            }
+            //
+            const pageLinks = pageLinksMap.size > 0 ? Object.fromEntries(pageLinksMap) : undefined
+
+            resolve({
+              slug: file,
+              title: page.title,
+              date: editDate(page.journal),
+              synopsis: synopsis(page),
+              links: pageLinks,
+            })
           })
         })
       }
-      async.map(files, doSitemap, (e, sitemap) => {
-        if (e) return cb(e)
-        cb(
-          null,
-          sitemap.filter(item => item != null),
-        )
-      })
+
+      Promise.all(files.map(doSitemap))
+        .then(sitemap => {
+          cb(
+            null,
+            sitemap.filter(item => item != null),
+          )
+        })
+        .catch(e => cb(e))
     })
   }
 

package/lib/plugins.js

@@ -9,7 +9,6 @@
 // support server-side plugins
 
 const fs = require('node:fs')
-const glob = require('glob')
 const { pathToFileURL } = require('node:url')
 // forward = require './forward'
 
@@ -24,8 +23,8 @@ module.exports = exports = argv => {
 
   const startServer = (params, plugin) => {
     const server = `${argv.packageDir}/${plugin}/server/server.js`
-    fs.exists(server, exists => {
-      if (exists) {
+    fs.access(server, fs.constants.F_OK, err => {
+      if (!err) {
         console.log('starting plugin', plugin)
         import(pathToFileURL(server))
           .then(exported => {
@@ -43,11 +42,12 @@ module.exports = exports = argv => {
     // emitter = new events.EventEmitter()
     // forward.init params.app, emitter
     // params.emitter = emitter
-    glob('wiki-plugin-*', { cwd: argv.packageDir }, (e, plugins) => {
-      plugins.forEach(plugin => {
+
+    Object.keys(require.main.require('./package').dependencies)
+      .filter(depend => depend.startsWith('wiki-plugin'))
+      .forEach(plugin => {
         startServer(params, plugin)
       })
-    })
   }
 
   return { startServers }

package/lib/search.js

@@ -85,8 +85,8 @@ module.exports = exports = argv => {
 
   const searchSave = (siteIndex, cb) => {
     // save index to file
-    fs.exists(argv.status, exists => {
-      if (exists) {
+    fs.access(argv.status, fs.constants.F_OK, err => {
+      if (!err) {
         writeFileAtomic(siteIndexLoc, JSON.stringify(siteIndex), e => {
           if (e) return cb(e)
           touch(indexUpdateFlag, () => {
@@ -108,8 +108,8 @@ module.exports = exports = argv => {
 
   const searchRestore = cb => {
     // restore index, or create if it doesn't already exist
-    fs.exists(siteIndexLoc, exists => {
-      if (exists) {
+    fs.access(siteIndexLoc, fs.constants.F_OK, err => {
+      if (!err) {
         fs.readFile(siteIndexLoc, (err, data) => {
           if (err) return cb(err)
           try {
@@ -169,8 +169,12 @@ module.exports = exports = argv => {
       .replace(/<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>/g, ' ')
       .replace(/<(?:[^>])+>/g, ' ')
       .replace(/(https?:.*?)(?=\p{White_Space}|\p{Quotation_Mark}|$)/gu, match => {
-        const myUrl = url.parse(match)
-        return myUrl.hostname + ' ' + myUrl.pathname
+        try {
+          const myUrl = new URL(match)
+          return myUrl.hostname
+        } catch {
+          return ' '
+        }
       })
       .replace(/[\p{P}\p{Emoji}\p{Symbol}}]+/gu, ' ')
       .replace(/[\p{White_Space}\n\t]+/gu, ' ')
@@ -250,7 +254,7 @@ module.exports = exports = argv => {
     // we save the pagehandler, so we can recreate the site index if it is removed
     searchPageHandler = searchPageHandler ?? pagehandler
 
-    //timeLabel = "SITE INDEX #{wikiName} : Created"
+    //timeLabel = `SITE INDEX ${wikiName} : Created`
     //console.time timeLabel
 
     pagehandler.slugs((e, slugs) => {

package/lib/security.js

@@ -41,8 +41,8 @@ module.exports = exports = (log, loga, argv) => {
 
   // Retrieve owner infomation from identity file in status directory
   security.retrieveOwner = cb => {
-    fs.exists(idFile, exists => {
-      if (exists) {
+    fs.access(idFile, fs.constants.F_OK, err => {
+      if (!err) {
         fs.readFile(idFile, (err, data) => {
           if (err) return cb(err)
           owner += data

package/lib/server.js

@@ -28,8 +28,6 @@ const { pipeline } = require('node:stream/promises')
 // From npm
 const express = require('express')
 const hbs = require('express-hbs')
-const glob = require('glob')
-const async = require('async')
 const f = require('flates')
 
 const createDOMPurify = require('dompurify')
@@ -38,8 +36,7 @@ const { JSDOM } = require('jsdom')
 const window = new JSDOM('').window
 const DOMPurify = createDOMPurify(window)
 
-// node-fetch is now ESM only
-const fetch = (...args) => import('node-fetch').then(({ default: fetch }) => fetch(...args))
+// Using native fetch API (available in Node.js 18+)
 
 // Express 4 middleware
 const logger = require('morgan')
@@ -163,7 +160,7 @@ module.exports = exports = argv => {
 
   const remoteGet = (remote, slug, cb) => {
     // assume http, as we know no better at this point and we need to specify a protocol.
-    const remoteURL = new URL('http://#{remote}/#{slug}.json').toString()
+    const remoteURL = new URL(`http://${remote}/${slug}.json`).toString()
     // set a two second timeout
     fetch(remoteURL, { signal: AbortSignal.timeout(2000) })
       .then(res => {
@@ -271,13 +268,16 @@ module.exports = exports = argv => {
   app.use('/assets', cors, express.static(argv.assets))
 
   // Add static routes to the plugins client.
-  glob('wiki-plugin-*/client', { cwd: argv.packageDir }, (e, plugins) => {
-    plugins.map(plugin => {
-      const pluginName = plugin.slice(12, -7)
-      const pluginPath = '/plugins/' + pluginName
-      app.use(pluginPath, cors, express.static(path.join(argv.packageDir, plugin), staticPathOptions))
+  Object.keys(require.main.require('./package').dependencies)
+    .filter(depend => depend.startsWith('wiki-plugin'))
+    .forEach(plugin => {
+      const clientPath = path.join(
+        path.dirname(require.resolve(`${plugin}/package`, { paths: require.main.paths })),
+        'client',
+      )
+      const pluginPath = '/plugins/' + plugin.slice(12)
+      app.use(pluginPath, cors, express.static(clientPath, staticPathOptions))
     })
-  })
 
   // Add static routes to the security client.
   if (argv.security != './security') {
@@ -387,32 +387,17 @@ module.exports = exports = argv => {
   app.get('/system/factories.json', (req, res) => {
     res.status(200)
     res.header('Content-Type', 'application/json')
-    // Plugins are located in packages in argv.packageDir, with package names of the form wiki-plugin-*
-    glob(path.join(argv.packageDir, 'wiki-plugin-*', 'factory.json'), (e, files) => {
-      if (e) {
-        return res.e(e)
-      }
-
-      const doFactories = (file, cb) => {
-        fs.readFile(file, (err, data) => {
-          if (err) {
-            return cb()
-          }
-          try {
-            const factory = JSON.parse(data)
-            cb(null, factory)
-          } catch (err) {
-            return cb()
-          }
-        })
-      }
-      async.map(files, doFactories, (e, factories) => {
-        if (e) {
-          res.e(e)
+    const factories = []
+    Object.keys(require.main.require('./package').dependencies)
+      .filter(depend => depend.startsWith('wiki-plugin'))
+      .forEach(plugin => {
+        try {
+          factories.push(require.main.require(`${plugin}/factory`))
+        } catch {
+          // do nothing if plugin doesn't have a factory category.
         }
-        res.end(JSON.stringify(factories))
       })
-    })
+    res.end(JSON.stringify(factories))
   })
 
   // ###### Json Routes ######
@@ -444,7 +429,7 @@ module.exports = exports = argv => {
   // If themes doesn't exist send 404 and let the client
   // deal with it.
   app.get(/^\/theme\/(\w+\.\w+)$/, cors, (req, res) => {
-    res.sendFile(path.join(argv.status, 'theme', req.params[0]), e => {
+    res.sendFile(path.join(argv.status, 'theme', req.params[0]), { dotfiles: 'allow' }, e => {
       if (e) {
         // swallow the error if the theme does not exist...
         if (req.path === '/theme/style.css') {
@@ -462,9 +447,9 @@ module.exports = exports = argv => {
   const favLoc = path.join(argv.status, 'favicon.png')
   const defaultFavLoc = path.join(argv.root, 'default-data', 'status', 'favicon.png')
   app.get('/favicon.png', cors, (req, res) => {
-    fs.exists(favLoc, exists => {
-      if (exists) {
-        res.sendFile(favLoc)
+    fs.access(favLoc, fs.constants.F_OK, err => {
+      if (!err) {
+        res.sendFile(favLoc, { dotfiles: 'allow' })
       } else {
         res.sendFile(defaultFavLoc)
       }
@@ -484,9 +469,9 @@ module.exports = exports = argv => {
   // save it.
   app.post('/favicon.png', authorized, (req, res) => {
     const favicon = req.body.image.replace(/^data:image\/png;base64,/, '')
-    const buf = new Buffer(favicon, 'base64')
-    fs.exists(argv.status, exists => {
-      if (exists) {
+    const buf = Buffer.from(favicon, 'base64')
+    fs.access(argv.status, fs.constants.F_OK, err => {
+      if (!err) {
         fs.writeFile(favLoc, buf, e => {
           if (e) {
             return res.e(e)
@@ -508,7 +493,7 @@ module.exports = exports = argv => {
 
   // Redirect remote favicons to the server they are needed from.
   app.get(/^\/remote\/([a-zA-Z0-9:.-]+\/favicon.png)$/, (req, res) => {
-    const remotefav = 'http://#{req.params[0]}'
+    const remotefav = `http://${req.params[0]}`
     res.redirect(remotefav)
   })
 
@@ -519,38 +504,40 @@ module.exports = exports = argv => {
   // negative space outward pointing arrows nicely indicates that items can be removed
   const recyclerFavLoc = path.join(argv.root, 'default-data', 'status', 'recycler.png')
   app.get('/recycler/favicon.png', authorized, (req, res) => {
-    res.sendFile(recyclerFavLoc)
+    res.sendFile(recyclerFavLoc, { dotfiles: 'allow' })
   })
 
   // Send an array of pages currently in the recycler via json
   app.get('/recycler/system/slugs.json', authorized, (req, res) => {
     fs.readdir(argv.recycler, (e, files) => {
-      const doRecyclermap = (file, cb) => {
-        const recycleFile = 'recycler/' + file
-        pagehandler.get(recycleFile, (e, page, status) => {
-          if (e || status === 404) {
-            console.log('Problem building recycler map:', file, 'e: ', e)
-            // this will leave an undefined/empty item in the array, which we will filter out later
-            return cb()
-          }
-          cb(null, {
-            slug: file,
-            title: page.title,
+      if (e) {
+        return res.e(e)
+      }
+      const doRecyclermap = async file => {
+        return new Promise(resolve => {
+          const recycleFile = 'recycler/' + file
+          pagehandler.get(recycleFile, (e, page, status) => {
+            if (e || status === 404) {
+              console.log('Problem building recycler map:', file, 'e: ', e)
+              // this will leave an undefined/empty item in the array, which we will filter out later
+              return resolve(null)
+            }
+            resolve({
+              slug: file,
+              title: page.title,
+            })
           })
         })
       }
 
-      if (e) {
-        return res.e(e)
-      }
-      async.map(files, doRecyclermap, (e, recyclermap) => {
-        if (e) {
-          return res.e(e)
-        }
-        // remove any empty items
-        recyclermap = recyclermap.filter(el => !!el)
-        res.send(recyclermap)
-      })
+      Promise.all(files.map(doRecyclermap))
+        .then(recyclermap => {
+          recyclermap = recyclermap.filter(el => !!el)
+          res.send(recyclermap)
+        })
+        .catch(error => {
+          res.e(error)
+        })
     })
   })
 
@@ -590,21 +577,21 @@ module.exports = exports = argv => {
 
   // Returns a list of installed plugins. (does this get called anymore!)
   app.get('/system/plugins.json', cors, (req, res) => {
-    glob('wiki-plugin-*', { cwd: argv.packageDir }, (e, files) => {
-      if (e) {
-        return res.e(e)
-      }
-      // extract the plugin name from the name of the directory it's installed in
-      files = files.map(file => file.slice(12))
-      res.send(files)
-    })
+    try {
+      const pluginNames = Object.keys(require.main.require('./package').dependencies)
+        .filter(depend => depend.startsWith('wiki-plugin'))
+        .map(name => name.slice(12))
+      res.send(pluginNames)
+    } catch (e) {
+      return res.e(e)
+    }
   })
   //{
   const sitemapLoc = path.join(argv.status, 'sitemap.json')
   app.get('/system/sitemap.json', cors, (req, res) => {
-    fs.exists(sitemapLoc, exists => {
-      if (exists) {
-        res.sendFile(sitemapLoc)
+    fs.access(sitemapLoc, fs.constants.F_OK, err => {
+      if (!err) {
+        res.sendFile(sitemapLoc, { dotfiles: 'allow' })
       } else {
         // only createSitemap if we are not already creating one
         if (!sitemaphandler.isWorking()) {
@@ -612,7 +599,7 @@ module.exports = exports = argv => {
         }
         // wait for the sitemap file to be written, before sending
         sitemaphandler.once('finished', () => {
-          res.sendFile(sitemapLoc)
+          res.sendFile(sitemapLoc, { dotfiles: 'allow' })
         })
       }
     })
@@ -620,15 +607,15 @@ module.exports = exports = argv => {
 
   const xmlSitemapLoc = path.join(argv.status, 'sitemap.xml')
   app.get('/sitemap.xml', cors, (req, res) => {
-    fs.exists(sitemapLoc, exists => {
-      if (exists) {
-        res.sendFile(xmlSitemapLoc)
+    fs.access(sitemapLoc, fs.constants.F_OK, err => {
+      if (!err) {
+        res.sendFile(xmlSitemapLoc, { dotfiles: 'allow' })
       } else {
         if (!sitemaphandler.isWorking()) {
           sitemaphandler.createSitemap(pagehandler)
         }
         sitemaphandler.once('finished', () => {
-          res.sendFile(xmlSitemapLoc)
+          res.sendFile(xmlSitemapLoc, { dotfiles: 'allow' })
         })
       }
     })
@@ -636,16 +623,16 @@ module.exports = exports = argv => {
 
   const searchIndexLoc = path.join(argv.status, 'site-index.json')
   app.get('/system/site-index.json', cors, (req, res) => {
-    fs.exists(searchIndexLoc, exists => {
-      if (exists) {
-        res.sendFile(searchIndexLoc)
+    fs.access(searchIndexLoc, fs.constants.F_OK, err => {
+      if (!err) {
+        res.sendFile(searchIndexLoc, { dotfiles: 'allow' })
       } else {
         // only create index if we are not already creating one
         if (!searchhandler.isWorking()) {
           searchhandler.createIndex(pagehandler)
         }
         searchhandler.once('indexed', () => {
-          res.sendFile(searchIndexLoc)
+          res.sendFile(searchIndexLoc, { dotfiles: 'allow' })
         })
       }
     })
@@ -656,28 +643,29 @@ module.exports = exports = argv => {
       if (e) {
         return res.e(e)
       }
-      async.map(
-        sitemap,
-        (stub, done) => {
+      const pagePromises = sitemap.map(stub => {
+        return new Promise((resolve, reject) => {
           pagehandler.get(stub.slug, (error, page) => {
-            if (e) {
-              return done(e)
+            if (error) {
+              return reject(error)
             }
-            done(null, { slug: stub.slug, page })
+            resolve({ slug: stub.slug, page })
           })
-        },
-        (e, pages) => {
-          if (e) {
-            return res.e(e)
-          }
-          res.json(
-            pages.reduce((dict, combined) => {
-              dict[combined.slug] = combined.page
-              return dict
-            }, {}),
-          )
-        },
-      )
+        })
+      })
+
+      Promise.all(pagePromises)
+        .then(pages => {
+          const pageExport = pages.reduce((dict, combined) => {
+            dict[combined.slug] = combined.page
+            return dict
+          }, {})
+          // TODO: this fails for a very large site
+          res.json(pageExport)
+        })
+        .catch(error => {
+          res.e(error)
+        })
     })
   })
 
@@ -692,32 +680,31 @@ module.exports = exports = argv => {
 
   app.get('/system/version.json', admin, (req, res) => {
     const versions = {}
-    const wikiModule = module.parent.parent.parent
+    const wikiModule = require.main
     versions[wikiModule.require('./package').name] = wikiModule.require('./package').version
     versions[wikiModule.require('wiki-server/package').name] = wikiModule.require('wiki-server/package').version
     versions[wikiModule.require('wiki-client/package').name] = wikiModule.require('wiki-client/package').version
+
     versions['security'] = {}
-    versions['plugins'] = {}
+    Object.keys(require.main.require('./package').dependencies)
+      .filter(depend => depend.startsWith('wiki-security'))
+      .forEach(key => {
+        versions.security[key] = wikiModule.require(`${key}/package`).version
+      })
 
-    glob('+(wiki-security-*|wiki-plugin-*)', { cwd: argv.packageDir }, (e, plugins) => {
-      plugins.map(plugin => {
-        if (plugin.includes('wiki-security')) {
-          versions.security[wikiModule.require(plugin + '/package').name] = wikiModule.require(
-            plugin + '/package',
-          ).version
-        } else {
-          versions.plugins[wikiModule.require(plugin + '/package').name] = wikiModule.require(
-            plugin + '/package',
-          ).version
-        }
-        res.json(versions)
+    versions['plugins'] = {}
+    Object.keys(require.main.require('./package').dependencies)
+      .filter(depend => depend.startsWith('wiki-plugin'))
+      .forEach(key => {
+        versions.plugins[key] = wikiModule.require(`${key}/package`).version
       })
-    })
+
+    res.json(versions)
   })
 
   // ##### Proxy routes #####
 
-  app.get('/proxy/*', authorized, (req, res) => {
+  app.get('/proxy/*splat', authorized, (req, res) => {
     const pathParts = req.originalUrl.split('/')
     const remoteHost = pathParts[2]
     pathParts.splice(0, 3)
@@ -731,7 +718,7 @@ module.exports = exports = argv => {
       requestURL.endsWith('.jpg') ||
       pathParts[0] === 'plugin'
     ) {
-      fetch(requestURL, { timeout: 2000 })
+      fetch(requestURL, { signal: AbortSignal.timeout(2000) })
         .then(async fetchRes => {
           if (fetchRes.ok) {
             res.set('content-type', fetchRes.headers.get('content-type'))

package/lib/sitemap.js

@@ -119,8 +119,8 @@ module.exports = exports = argv => {
   }
 
   const sitemapSave = (sitemap, cb) => {
-    fs.exists(argv.status, exists => {
-      if (exists) {
+    fs.access(argv.status, fs.constants.F_OK, err => {
+      if (!err) {
         writeFileAtomic(sitemapLoc, JSON.stringify(sitemap), e => {
           if (e) return cb(e)
           cb()
@@ -136,8 +136,8 @@ module.exports = exports = argv => {
   }
 
   const sitemapRestore = cb => {
-    fs.exists(sitemapLoc, exists => {
-      if (exists) {
+    fs.access(sitemapLoc, fs.constants.F_OK, err => {
+      if (!err) {
         fs.readFile(sitemapLoc, (err, data) => {
           if (err) return cb(err)
           try {
@@ -172,8 +172,8 @@ module.exports = exports = argv => {
     const xmlmap = { urlset: { $: { xmlns: 'http://www.sitemaps.org/schemas/sitemap/0.9' }, url: xmlmapPages } }
     const builder = new xml2js.Builder()
     const xml = builder.buildObject(xmlmap)
-    fs.exists(argv.status, exists => {
-      if (exists) {
+    fs.access(argv.status, fs.constants.F_OK, err => {
+      if (!err) {
         writeFileAtomic(xmlSitemapLoc, xml, e => {
           if (e) return cb(e)
           cb()

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wiki-server",
   "description": "A Federated Wiki Server",
-  "version": "0.26.0-rc.0",
+  "version": "0.26.0-rc.2",
   "author": {
     "name": "Ward Cunningham",
     "email": "ward@c2.com",
@@ -30,22 +30,19 @@
     "jon r <jon@allmende.io>"
   ],
   "dependencies": {
-    "async": "^3.2.4",
     "body-parser": "^2.2.0",
     "client-sessions": "^0.8.0",
     "coffeescript": "^2.5.0",
     "cookie-parser": "^1.4.4",
     "dompurify": "^3.1.0",
     "errorhandler": "^1.5.1",
-    "express": "^4.21.2",
+    "express": "^5.1.0",
     "express-hbs": "^2.5.0",
     "flates": "0.0.5",
-    "glob": "^7.2.3",
     "jsdom": "^26.0.0",
     "method-override": "^3.0.0",
     "minisearch": "^7.1.0",
     "morgan": "^1.9.1",
-    "node-fetch": "^3.3.2",
     "write-file-atomic": "^6.0.0",
     "xml2js": "^0.6.2"
   },