wiki-server 0.19.1 → 0.20.0

package/AUTHORS.txt

@@ -17,3 +17,4 @@ Peter deHaan <pdehaan@users.noreply.github.com>
 winckell benjamin <winckell.benjamin.isart@gmail.com>
 Eric Dobbs <eric@dobbse.net>
 Joshua Benuck <joshua_benuck@yahoo.com>
+Tom Lieber <tom@alltom.com>

package/lib/defaultargs.coffee

@@ -28,7 +28,7 @@ module.exports = (argv) ->
   argv.status or= path.join(argv.data, 'status')
   argv.assets or= path.join(argv.data, 'assets')
   argv.recycler or= path.join(argv.data, 'recycle')
-  argv.url or= 'http://localhost' + (':' + argv.port) unless argv.port is 80
+  argv.url or= 'http://localhost' + (if argv.port is 80 then '' else ':' + argv.port)
   argv.id or= path.join(argv.status, 'owner.json')
   argv.uploadLimit or= '5mb'
   argv.cookieSecret or= require('crypto').randomBytes(64).toString('hex')

package/lib/server.coffee

@@ -22,6 +22,7 @@
 fs = require 'fs'
 path = require 'path'
 http = require 'http'
+url = require 'url'
 
 # From npm
 mkdirp = require 'mkdirp'
@@ -31,6 +32,7 @@ glob = require 'glob'
 async = require 'async'
 f = require('flates')
 sanitize = require '@mapbox/sanitize-caja'
+fetch = require 'node-fetch'
 
 # Express 4 middleware
 logger = require 'morgan'
@@ -139,33 +141,24 @@ module.exports = exports = (argv) ->
 
 
   remoteGet = (remote, slug, cb) ->
-    [host, port] = remote.split(':')
-    getopts = {
-      host: host
-      port: port or 80
-      path: "/#{slug}.json"
-    }
-    # TODO: This needs more robust error handling, just trying to
-    # keep it from taking down the server.
-    http.get(getopts, (resp) ->
-      responsedata = ''
-      resp.on 'data', (chunk) ->
-        responsedata += chunk
-
-      resp.on 'error', (e) ->
-        cb(e, 'Page not found', 404)
-
-      resp.on 'end', ->
-        if resp.statusCode == 404
-          cb(null, 'Page not found', 404)
-        else if responsedata
-          cb(null, JSON.parse(responsedata), resp.statusCode)
-        else
-          cb(null, 'Page not found', 404)
-
-    ).on 'error', (e) ->
-      cb(e, 'Page not found', 404)
-
+    # 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})
+    .then (res) ->
+      if res.ok
+        return res
+      throw new Error(res.statusText)
+    .then (res) ->
+      return res.json()
+    .then (json) ->
+      cb(null, json, 200)
+    .catch (err) ->
+      console.error('Unable to fetch remote resource', remote, slug, err)
+      cb(err, 'Page not found', 404)
+    
+
+      
   #### Express configuration ####
   # Set up all the standard express server options,
   # including hbs to use handlebars/mustache templates
@@ -233,7 +226,7 @@ module.exports = exports = (argv) ->
     plugins.map (plugin) ->
       pluginName = plugin.slice(12, -7)
       pluginPath = '/plugins/' + pluginName
-      app.use(pluginPath, express.static(path.join(argv.packageDir, plugin), staticPathOptions))
+      app.use(pluginPath, cors, express.static(path.join(argv.packageDir, plugin), staticPathOptions))
 
   # Add static routes to the security client.
   if argv.security != './security'
@@ -306,7 +299,7 @@ module.exports = exports = (argv) ->
       info.pages.push(pageDiv)
     res.render('static.html', info)
 
-  app.get ///([a-z0-9-]+)\.html$///, (req, res, next) ->
+  app.get ///^\/([a-z0-9-]+)\.html$///, (req, res, next) ->
     slug = req.params[0]
     log(slug)
     if slug is 'runtests'
@@ -453,20 +446,24 @@ 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) ->
-      if e then return res.e e
+
       doRecyclermap = (file, cb) ->
-        pagehandler.get file, (e, page, status) ->
-          return cb() if file.match /^\./
-          if e
+        recycleFile = 'recycler/' + file
+        pagehandler.get recycleFile, (e, page, status) ->
+          if e or status is 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 then return res.e e
       async.map files, doRecyclermap, (e, recyclermap) ->
         return cb(e) if e
+        # remove any empty items
+        recyclermap = recyclermap.filter( (el) -> return !!el )
         res.send(recyclermap)
 
   # Fetching page from the recycler
@@ -678,7 +675,8 @@ module.exports = exports = (argv) ->
     # otherwise ask pagehandler for it.
     if action.fork
       pagehandler.saveToRecycler req.params[0], (err) ->
-        if err then console.log "Error saving #{req.params[0]} before fork: #{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)
     else if action.type is 'create'
       # Prevent attempt to write circular structure

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wiki-server",
   "description": "A Federated Wiki Server",
-  "version": "0.19.1",
+  "version": "0.20.0",
   "author": {
     "name": "Ward Cunningham",
     "email": "ward@c2.com",
@@ -36,6 +36,7 @@
     "minisearch": "^2.1.3",
     "mkdirp": "^0.5.5",
     "morgan": "^1.9.1",
+    "node-fetch": "^2.6.1",
     "request": "^2.88.0",
     "write-file-atomic": "^2.4.3",
     "xml2js": "^0.4.23"
@@ -52,12 +53,12 @@
     "mocha": "^8.0.1",
     "should": "^13.2.3",
     "supertest": "^4.0.2",
-    "wiki-client": "^0.22.1",
+    "wiki-client": "^0.23.0",
     "wiki-plugin-activity": "^0.4.6",
     "wiki-plugin-video": "^0.2.10"
   },
   "engines": {
-    "node": ">=8.x"
+    "node": ">=12.x"
   },
   "testling": {
     "harness": "mocha"