wiki-server 0.21.2 → 0.22.0

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

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [16.x, 18.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

package/Gruntfile.js

@@ -5,7 +5,6 @@ module.exports = function( grunt ) {
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-mocha-test');
   grunt.loadNpmTasks('grunt-git-authors');
-  grunt.loadNpmTasks('grunt-retire');
 
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
@@ -42,11 +41,6 @@ module.exports = function( grunt ) {
       ]
     },
 
-    retire: {
-      node: ['.'],
-      options: {packageOnly: true}
-    },
-
     watch: {
       all: {
         files: ['lib/*.coffee', 'test/*.coffee'],

package/lib/search.coffee

@@ -131,7 +131,7 @@ module.exports = exports = (argv) ->
           )
         when "remove"
           itself.start()
-          searchPageRemove(item.slug, item.title, (e) ->
+          searchPageRemove(item.slug, (e) ->
             process.nextTick( ->
               serial(queue.shift())
             )

package/lib/server.coffee

@@ -23,6 +23,7 @@ fs = require 'fs'
 path = require 'path'
 http = require 'http'
 url = require 'url'
+{ pipeline } = require 'node:stream/promises'
 
 # From npm
 mkdirp = require 'mkdirp'
@@ -42,7 +43,7 @@ methodOverride = require 'method-override'
 sessions = require 'client-sessions'
 bodyParser = require 'body-parser'
 errorHandler = require 'errorhandler'
-request = require 'request'
+
 
 
 # Local files
@@ -584,20 +585,18 @@ module.exports = exports = (argv) ->
     requestURL = 'http://' + remoteHost + '/' + remoteResource
     console.log("PROXY Request: ", requestURL)
     if requestURL.endsWith('.json') or requestURL.endsWith('.png') or requestURL.endsWith('.jpg') or pathParts[0] is "plugin"
-      requestOptions = {
-        host: remoteHost
-        port: 80
-        path: remoteResource
-      }
-      try
-        request
-          .get(requestURL, requestOptions)
-          .on('error', (err) ->
-            console.log("ERROR: Request ", requestURL, err))
-          .pipe(res)
-      catch error
-        console.log "PROXY Error", error
-        res.status(500).end()
+      fetch(requestURL, {timeout: 2000})
+      .then (fetchRes) ->
+        if fetchRes.ok
+          return fetchRes
+        throw new Error(fetchRes.statusText)
+      .then (fetchRes) ->
+        res.set('content-type', fetchRes.headers.get('content-type'))
+        res.set('last-modified', fetchRes.headers.get('last-modified'))
+        await pipeline(fetchRes.body, res)
+      .catch (err) ->
+        console.log("ERROR: Proxy Request ", requestURL, err)
+        res.status(500).end()  
     else
       res.status(400).end()
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wiki-server",
   "description": "A Federated Wiki Server",
-  "version": "0.21.2",
+  "version": "0.22.0",
   "author": {
     "name": "Ward Cunningham",
     "email": "ward@c2.com",
@@ -21,8 +21,8 @@
   ],
   "dependencies": {
     "@mapbox/sanitize-caja": "^0.1.4",
-    "async": "^2.6.3",
-    "body-parser": "^1.19.0",
+    "async": "^3.2.4",
+    "body-parser": "^1.20.2",
     "client-sessions": "^0.8.0",
     "coffeescript": "^2.5.0",
     "cookie-parser": "^1.4.4",
@@ -30,32 +30,30 @@
     "express": "^4.17.1",
     "express-hbs": "^2.3.3",
     "flates": "0.0.5",
-    "glob": "^7.1.4",
+    "glob": "^7.2.3",
     "lodash": "^4.17.19",
-    "method-override": "^2.3.10",
-    "minisearch": "^6.0.0",
-    "mkdirp": "^0.5.5",
+    "method-override": "^3.0.0",
+    "minisearch": "^6.0.1",
+    "mkdirp": "^0.5.6",
     "morgan": "^1.9.1",
-    "node-fetch": "^2.6.1",
-    "request": "^2.88.0",
-    "write-file-atomic": "^2.4.3",
-    "xml2js": "^0.4.23"
+    "node-fetch": "^2.6.8",
+    "write-file-atomic": "^5.0.0",
+    "xml2js": "^0.5.0"
   },
   "scripts": {
     "test": "grunt mochaTest"
   },
   "devDependencies": {
-    "grunt": "^1.0.4",
+    "grunt": "^1.6.1",
     "grunt-contrib-watch": "^1.0.0",
     "grunt-git-authors": "^3.2.0",
     "grunt-mocha-test": "^0.13.2",
-    "grunt-retire": "^1.0.8",
-    "mocha": "^9.2.2",
+    "mocha": "^10.2.0",
     "should": "^13.2.3",
-    "supertest": "^4.0.2",
+    "supertest": "^6.3.3",
     "wiki-client": "^0.24.0",
-    "wiki-plugin-activity": "^0.4.6",
-    "wiki-plugin-video": "^0.2.10"
+    "wiki-plugin-activity": "^0.5.0",
+    "wiki-plugin-video": "^0.3.0"
   },
   "engines": {
     "node": ">=12.x"