wiki-server 0.22.2 → 0.24.0

package/.github/workflows/node.js.yml

@@ -16,11 +16,11 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x, 21.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v3
       with:

package/lib/page.coffee

@@ -87,6 +87,25 @@ module.exports = exports = (argv) ->
   # Reads and writes are async, but serially queued to avoid race conditions.
   queue = []
 
+  tryDefaults = (file, cb) ->
+    lastDefault = (cb) ->
+      defloc = path.join(argv.root, 'default-data', 'pages', file)
+      fs.exists defloc, (exists) ->
+        if exists
+          cb(defloc)
+        else
+          cb(null)
+    if argv.defaults
+      defloc = path.join(argv.data, '..', argv.defaults, 'pages', file)
+      console.log 'firstDefault', defloc
+      fs.exists defloc, (exists) ->
+        if exists
+          cb(defloc)
+        else
+          lastDefault(cb)
+    else
+      lastDefault(cb)
+
   # Main file io function, when called without page it reads,
   # when called with page it writes.
   fileio = (action, file, page, cb) ->
@@ -175,12 +194,10 @@ module.exports = exports = (argv) ->
           if exists
             load_parse(loc, cb, {plugin: undefined})
           else
-            defloc = path.join(argv.root, 'default-data', 'pages', file)
-            fs.exists(defloc, (exists) ->
-              if exists
+            tryDefaults(file, (defloc) ->
+              if defloc
                 load_parse(defloc, cb)
               else
-
                 glob "wiki-plugin-*/pages", {cwd: argv.packageDir}, (e, plugins) ->
                   if e then return cb(e)
 

package/lib/search.coffee

@@ -46,9 +46,6 @@ module.exports = exports = (argv) ->
 
   searchPageUpdate = (slug, page, cb) ->
     # to update we have to remove the page first, and then readd it
-    timeLabel = "SITE INDEX update #{slug} - #{wikiName}"
-    console.time timeLabel
-    
     try
       pageText = page.story.reduce( extractPageText, '')
     catch err
@@ -66,37 +63,29 @@ module.exports = exports = (argv) ->
         'title': page.title
         'content': pageText
       }
-    console.timeEnd timeLabel
     cb()
 
   searchPageRemove = (slug, cb) ->
     # remove page from index
     timeLabel = "SITE INDEX page remove #{slug} - #{wikiName}"
-    console.time timeLabel
     try
       siteIndex.discard slug 
     catch err
       # swallow error, if the page was not in index
       console.log "removing #{slug} from index #{wikiName} failed", err unless err.message.includes('not in the index')
-    console.timeEnd timeLabel
     cb()
 
   searchSave = (siteIndex, cb) ->
     # save index to file
-    timeLabel = "SITE INDEX #{wikiName} : Saved"
-    console.time timeLabel
-
     fs.exists argv.status, (exists) ->
       if exists
         writeFileAtomic siteIndexLoc, JSON.stringify(siteIndex), (e) ->
-          console.timeEnd timeLabel
           return cb(e) if e
           touch indexUpdateFlag, (err) ->
             cb()
       else
         mkdirp argv.status, ->
           writeFileAtomic siteIndexLoc, JSON.stringify(siteIndex), (e) ->
-            console.timeEnd timeLabel
             return cb(e) if e
             touch indexUpdateFlag, (err) ->
               cb()
@@ -104,8 +93,6 @@ module.exports = exports = (argv) ->
 
   searchRestore = (cb) ->
     # restore index, or create if it doesn't already exist
-    timeLabel = "SITE INDEX #{wikiName} : Restored"
-    console.time timeLabel
     fs.exists siteIndexLoc, (exists) ->
       if exists
         fs.readFile(siteIndexLoc, (err, data) ->
@@ -115,7 +102,6 @@ module.exports = exports = (argv) ->
               fields: ['title', 'content']
           catch e
             return cb(e)
-          console.timeEnd timeLabel
           process.nextTick( ->
             serial(queue.shift())))
 
@@ -150,19 +136,16 @@ module.exports = exports = (argv) ->
     try
       if currentItem.text?
         switch currentItem.type
-          when 'paragraph'
-            pageText += ' ' + currentItem.text.replace /\[{2}|\[(?:[\S]+)|\]{1,2}/g, ''
-          when 'markdown'
-            # really need to extract text from the markdown, but for now just remove link brackets, urls...
-            pageText += ' ' + currentItem.text.replace /\[{2}|\[(?:[\S]+)|\]{1,2}|\\n/g, ' '
-          when 'html'
-            pageText += ' ' + currentItem.text.replace /<[^\>]*>?/g, ''
+          when 'paragraph', 'markdown', 'html', 'reference'
+            noLinks = currentItem.text.replace /\[{2}|\[(?:[\S]+)|\]{1,2}/g, ''
+            # strip out all tags.
+            pageText += noLinks.replace(/<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>/g, ' ')
           else
             if currentItem.text?
               for line in currentItem.text.split /\r\n?|\n/
                 pageText += ' ' + line.replace /\[{2}|\[(?:[\S]+)|\]{1,2}/g, '' unless line.match /^[A-Z]+[ ].*/
     catch err
-      throw new Error("Error extracting text from #{currentIndex}, #{err}")
+      throw new Error("Error extracting text from #{currentIndex}, #{err}, #{err.stack}")
     pageText
 
 
@@ -192,8 +175,8 @@ module.exports = exports = (argv) ->
     # we save the pagehandler, so we can recreate the site index if it is removed
     searchPageHandler = pagehandler if !searchPageHandler?
 
-    timeLabel = "SITE INDEX #{wikiName} : Created"
-    console.time timeLabel
+    #timeLabel = "SITE INDEX #{wikiName} : Created"
+    #console.time timeLabel
 
     pagehandler.slugs (e, slugs) ->
       if e
@@ -227,7 +210,7 @@ module.exports = exports = (argv) ->
   
       Promise.all(indexPromises)
       .then () ->
-        console.timeEnd timeLabel
+        # console.timeEnd timeLabel
         process.nextTick ( ->
           serial(queue.shift()))
       

package/lib/server.coffee

@@ -33,7 +33,9 @@ glob = require 'glob'
 async = require 'async'
 f = require('flates')
 sanitize = require '@mapbox/sanitize-caja'
-fetch = require 'node-fetch'
+
+# node-fetch is now ESM only
+fetch = (...args) => import('node-fetch').then(({default: fetch}) => fetch(...args));
 
 # Express 4 middleware
 logger = require 'morgan'
@@ -145,7 +147,7 @@ module.exports = exports = (argv) ->
     # assume http, as we know no better at this point and we need to specify a protocol.
     remoteURL = new URL("http://#{remote}/#{slug}.json").toString()
     # set a two second timeout
-    fetch(remoteURL, {timeout: 2000})
+    fetch(remoteURL, {signal: AbortSignal.timeout(2000)})
     .then (res) ->
       if res.ok
         return res
@@ -652,7 +654,7 @@ module.exports = exports = (argv) ->
       if not page.journal
         page.journal = []
       if action.fork
-        page.journal.push({type: "fork", site: action.fork})
+        page.journal.push({type: "fork", site: action.fork, date: action.date - 1})
         delete action.fork
       page.journal.push(action)
       pagehandler.put req.params[0], page, (e) ->
@@ -674,7 +676,13 @@ module.exports = exports = (argv) ->
       pagehandler.saveToRecycler req.params[0], (err) ->
         if err and err isnt 'page does not exist' 
           console.log "Error saving #{req.params[0]} before fork: #{err}"
-        remoteGet(action.fork, req.params[0], actionCB)
+        if action.forkPage
+          forkPageCopy = JSON.parse(JSON.stringify(action.forkPage))
+          delete action.forkPage
+          actionCB(null, forkPageCopy)
+        else
+          # Legacy path, new clients will provide forkPage on implicit forks.
+          remoteGet(action.fork, req.params[0], actionCB)
     else if action.type is 'create'
       # Prevent attempt to write circular structure
       itemCopy = JSON.parse(JSON.stringify(action.item))
@@ -688,10 +696,10 @@ module.exports = exports = (argv) ->
     else if action.type == 'fork'
       pagehandler.saveToRecycler req.params[0], (err) ->
         if err then console.log "Error saving #{req.params[0]} before fork: #{err}"
-        if action.item # push
-          itemCopy = JSON.parse(JSON.stringify(action.item))
-          delete action.item
-          actionCB(null, itemCopy)
+        if action.forkPage # push
+          forkPageCopy = JSON.parse(JSON.stringify(action.forkPage))
+          delete action.forkPage
+          actionCB(null, forkPageCopy)
         else # pull
           remoteGet(action.site, req.params[0], actionCB)
     else

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wiki-server",
   "description": "A Federated Wiki Server",
-  "version": "0.22.2",
+  "version": "0.24.0",
   "author": {
     "name": "Ward Cunningham",
     "email": "ward@c2.com",
@@ -28,7 +28,7 @@
     "cookie-parser": "^1.4.4",
     "errorhandler": "^1.5.1",
     "express": "^4.17.1",
-    "express-hbs": "^2.3.3",
+    "express-hbs": "^2.5.0",
     "flates": "0.0.5",
     "glob": "^7.2.3",
     "lodash": "^4.17.19",
@@ -36,7 +36,7 @@
     "minisearch": "^6.0.1",
     "mkdirp": "^0.5.6",
     "morgan": "^1.9.1",
-    "node-fetch": "^2.6.8",
+    "node-fetch": "^3.3.2",
     "write-file-atomic": "^5.0.0",
     "xml2js": "^0.5.0"
   },
@@ -51,12 +51,12 @@
     "mocha": "^10.2.0",
     "should": "^13.2.3",
     "supertest": "^6.3.3",
-    "wiki-client": "^0.27.0",
+    "wiki-client": "^0.29.0",
     "wiki-plugin-activity": "^0.5.0",
     "wiki-plugin-video": "^0.3.0"
   },
   "engines": {
-    "node": ">=12.x"
+    "node": ">=18.x"
   },
   "testling": {
     "harness": "mocha"

package/test/server.coffee

@@ -4,7 +4,7 @@ server = require '..'
 path = require 'path'
 random = require '../lib/random_id'
 testid = random()
-argv = require('../lib/defaultargs.coffee')({data: path.join('/tmp', 'sfwtests', testid), packageDir: path.join(__dirname, '..', 'node_modules'), port: 55555, security_legacy: true})
+argv = require('../lib/defaultargs.coffee')({data: path.join('/tmp', 'sfwtests', testid), packageDir: path.join(__dirname, '..', 'node_modules'), port: 55557, security_legacy: true})
 
 describe 'server', ->
   app = {}
@@ -21,7 +21,7 @@ describe 'server', ->
     ))
 
 
-  request = request('http://localhost:55555')
+  request = request('http://localhost:55557')
 
   # location of the test page
   loc = path.join('/tmp', 'sfwtests', testid, 'pages', 'adsf-test-page')

package/test/sitemap.coffee

@@ -19,6 +19,7 @@ describe 'sitemap', ->
 
 
   request = request('http://localhost:55556')
+  fs.mkdirSync path.join('/tmp', 'sfwtests', testid, 'pages'), {recursive: true}
 
   # location of the sitemap
   sitemapLoc = path.join('/tmp', 'sfwtests', testid, 'status', 'sitemap.json')