wiki-server 0.26.0-rc.1 → 0.26.0-rc.3

package/lib/page.js

@@ -14,8 +14,6 @@ const fs = require('fs')
 const path = require('path')
 const events = require('events')
 
-const async = require('async')
-
 const random_id = require('./random_id')
 const synopsis = require('wiki-client/lib/synopsis')
 
@@ -379,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/search.js

@@ -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, ' ')

package/lib/server.js

@@ -28,7 +28,6 @@ const { pipeline } = require('node:stream/promises')
 // From npm
 const express = require('express')
 const hbs = require('express-hbs')
-const async = require('async')
 const f = require('flates')
 
 const createDOMPurify = require('dompurify')
@@ -511,32 +510,34 @@ module.exports = exports = argv => {
   // 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)
+        })
     })
   })
 
@@ -642,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)
+        })
     })
   })
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wiki-server",
   "description": "A Federated Wiki Server",
-  "version": "0.26.0-rc.1",
+  "version": "0.26.0-rc.3",
   "author": {
     "name": "Ward Cunningham",
     "email": "ward@c2.com",
@@ -30,7 +30,6 @@
     "jon r <jon@allmende.io>"
   ],
   "dependencies": {
-    "async": "^3.2.4",
     "body-parser": "^2.2.0",
     "client-sessions": "^0.8.0",
     "coffeescript": "^2.5.0",