wiki-server 0.24.2 → 0.25.0

package/lib/plugins.coffee

@@ -29,11 +29,12 @@ module.exports = exports = (argv) ->
 		fs.exists server, (exists) ->
 			if exists
 				console.log 'starting plugin', plugin
-				try
-					plugins[plugin] = require server
+				import(server).then((exported) ->
+					plugins[plugin] = exported
 					plugins[plugin].startServer?(params)
-				catch e
+				).catch((e) ->
 					console.log 'failed to start plugin', plugin, e?.stack or e
+				)
 
 	startServers = (params) ->
 		# emitter = new events.EventEmitter()

package/lib/server.coffee

@@ -163,15 +163,15 @@ module.exports = exports = (argv) ->
     .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
   # saved with a .html extension, and no layout.
 
-  # 
+  #
   staticPathOptions = {
     dotfiles: 'ignore'
     etag: true
@@ -186,11 +186,24 @@ module.exports = exports = (argv) ->
   app.engine('html', hbs.express4())
   app.set('view options', layout: false)
 
-    # use logger, at least in development, probably needs a param to configure (or turn off).
-    # use stream to direct to somewhere other than stdout.
-  wikiName = new URL(argv.url).hostname
-  logger.token('vhost', () ->
-    return wikiName)
+  # return deterministically colored strings
+  colorString = (str) ->
+    colorReset = '\x1b[0m'
+    hash = 0;
+    str.split('').forEach (char) ->
+      hash = char.charCodeAt(0) + ((hash << 5) - hash)
+    color = '\x1b[38;2'
+    for i in [0..2]
+      do (i) ->
+        value = (hash >> (i * 8)) & 0xff
+        color += ';' + value.toString()
+    color += 'm'
+    return color + str + colorReset
+
+  # use logger, at least in development, probably needs a param to configure (or turn off).
+  # use stream to direct to somewhere other than stdout.
+  logger.token('vhost', (req, res) ->
+    return colorString(req.hostname))
   app.use(logger(':vhost :method :url :status :res[content-length] - :response-time ms'))
   app.use(cookieParser())
   app.use(bodyParser.json({ limit: argv.uploadLimit}))
@@ -559,7 +572,7 @@ module.exports = exports = (argv) ->
             dict
           , {}))
       )
-  
+
   admin = (req, res, next) ->
     if securityhandler.isAdmin(req)
       next()
@@ -604,7 +617,7 @@ module.exports = exports = (argv) ->
           res.status(fetchRes.status).end()
       .catch (err) ->
         console.log("ERROR: Proxy Request ", requestURL, err)
-        res.status(500).end()  
+        res.status(500).end()
     else
       res.status(400).end()
 
@@ -681,7 +694,7 @@ module.exports = exports = (argv) ->
     # otherwise ask pagehandler for it.
     if action.fork
       pagehandler.saveToRecycler req.params[0], (err) ->
-        if err and err isnt 'page does not exist' 
+        if err and err isnt 'page does not exist'
           console.log "Error saving #{req.params[0]} before fork: #{err}"
         if action.forkPage
           forkPageCopy = JSON.parse(JSON.stringify(action.forkPage))

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wiki-server",
   "description": "A Federated Wiki Server",
-  "version": "0.24.2",
+  "version": "0.25.0",
   "author": {
     "name": "Ward Cunningham",
     "email": "ward@c2.com",
@@ -33,7 +33,7 @@
     "glob": "^7.2.3",
     "jsdom": "^24.0.0",
     "method-override": "^3.0.0",
-    "minisearch": "^6.3.0",
+    "minisearch": "^7.1.0",
     "morgan": "^1.9.1",
     "node-fetch": "^3.3.2",
     "write-file-atomic": "^5.0.0",
@@ -49,9 +49,9 @@
     "grunt-mocha-test": "^0.13.3",
     "mocha": "^10.4.0",
     "should": "^13.2.3",
-    "supertest": "^6.3.4",
+    "supertest": "^7.0.0",
     "wiki-client": "^0.29.1",
-    "wiki-plugin-activity": "^0.5.0",
+    "wiki-plugin-activity": "^0.6.0",
     "wiki-plugin-video": "^0.3.1"
   },
   "engines": {