update pkg to support both vanilla node and express

Author: Recidvst

.gitignore

@@ -3,3 +3,4 @@ node_modules
 yarn.lock
 yarn-error.log
 package-lock.json
+.idea/

.npmignore

@@ -3,3 +3,4 @@ node_modules
 yarn.lock
 yarn-error.log
 package-lock.json
+.idea/

README.MD

@@ -1,7 +1,7 @@
 
 # Node/Express GNU Clacks
 
-A man is not dead while his name is still spoken. Add an 'X-Clacks-Overhead' Header to your Node/Express app.
+A man is not dead while his name is still spoken. Add an 'X-Clacks-Overhead' Header to your vanilla Node or Express app.
 
 See [http://www.gnuterrypratchett.com](http://www.gnuterrypratchett.com "GNU Terry Pratchett")
 
@@ -16,22 +16,50 @@ npm install node-gnu-clacks --save
 ```
 
 ## Usage
-- Import the module and tell your app to use as middleware.
+- Import the module and tell your app to use as middleware:
+
+```js
+const { node: gnuHeaderNode } = require('node-gnu-clacks');
+const { express: gnuHeaderExpress } = require('node-gnu-clacks');
+```
+
+_note: you can also use `const gnuHeader = require('node-gnu-clacks');` for express apps for backwards compatibility with v1._
 
 ## Options
-- Optionally, add an array of names to be passed along with the default, 'Terry Pratchett'.
+**string[] ghosts = ['Terry Pratchett']**  
+
+Add an array of names to be passed. This is in addition to the default, 'Terry Pratchett', which will always be added.
 
-## Example
+## Example with a vanilla Node app
 
 ```js
+const http = require('http');
+const { node: gnuHeaderNode } = require('node-gnu-clacks');
 
-const express = require('express');
-const gnuHeader = require('node-gnu-clacks');
+http.createServer((req, res) => {
+    const addClacksHeader = gnuHeaderNode(['Moist', 'Adora', 'Reacher']);
+    addClacksHeader(res);
+    
+    res.writeHead(200, {'Content-Type': 'text/plain'});
+    res.end('A man is not dead while his name is still spoken.\n');
+}).listen(3000);
+```
+
+## Example with an Express app
+
+```js
+const express = require('lib/express');
+const { express: gnuHeaderExpress } = require('node-gnu-clacks');
 
 const app = express();
 
-app.use(gnuHeader());
+app.use(gnuHeaderExpress());
 or
-app.use(gnuHeader(['Moist', 'Adora', 'Reacher']));
+app.use(gnuHeaderExpress(['Moist', 'Adora', 'Reacher']));
+
+app.get('/', (req, res) => {
+    res.send('A man is not dead while his name is still spoken.');
+});
 
+app.listen(3000);
 ```

index.js

@@ -1,29 +1,10 @@
-/**
- * GNU-clacks Node/Express middleware.
- *
- *  - `ghosts`: provide an array of (string) names to be transmitted through the clacks (default: Terry Pratchett)
- *
- * @param {string} ghosts
- * @return {function}
- */
+// Main entry point to export both Node and Express versions
+const expressVersion = require('./lib/express');
+const nodeVersion = require('./lib/node');
 
-module.exports = function (ghosts) {
-    ghosts = ghosts || [];
+// default export
+module.exports = expressVersion;
 
-    if (!Array.isArray(ghosts)) return function (req, res, next) {
-        res.setHeader('X-Clacks-Overhead', 'GNU Terry Pratchett');
-        next()
-    }
-    else {
-        ghosts.unshift('GNU Terry Pratchett');
-        ghosts = ghosts.join(', ').toString();
-
-        return function (req, res, next) {
-            if (ghosts.length > 0) {
-                res.setHeader('X-Clacks-Overhead', ghosts);
-            }
-            next();
-        }
-    }
-
-};
+// named exports
+module.exports.express = expressVersion;
+module.exports.node = nodeVersion;

lib/express.js

@@ -0,0 +1,22 @@
+/**
+ * GNU-clacks Express middleware.
+ *
+ * - `ghosts`: provide an array of (string) names to be transmitted through the clacks
+ *             (default: ['Terry Pratchett'] if not provided or input is not an array).
+ *
+ * @param {string[]} [ghosts=[]] - An optional array of names to be transmitted.
+ *                                 Defaults to an empty array, which will be replaced
+ *                                 by ['Terry Pratchett'] in the implementation.
+ * @return {function} Middleware function for use in Express.js applications.
+ */
+
+module.exports = function (ghosts = []) {
+    ghosts = Array.isArray(ghosts) ? ghosts : [ghosts];
+
+    const clacksValue = ['GNU Terry Pratchett', ...ghosts.map(name => `GNU ${name}`)].join(', ');
+
+    return function (req, res, next) {
+        res.setHeader('X-Clacks-Overhead', clacksValue);
+        next();
+    };
+};

lib/node.js

@@ -0,0 +1,22 @@
+/**
+ * Sets the X-Clacks-Overhead HTTP header for Node.js HTTP responses.
+ *
+ * - `ghosts`: An optional array of string names to be transmitted through the clacks.
+ *             If not provided or if the input is not an array, defaults to ['Terry Pratchett'].
+ *
+ * @param {string[]} [ghosts=[]] - An optional array of names to be transmitted.
+ *                                 Defaults to an empty array, which implies that 'GNU Terry Pratchett'
+ *                                 will be added by default.
+ * @return {function(http.ServerResponse)} - A function that takes a Node.js HTTP ServerResponse object
+ *                                           and sets the X-Clacks-Overhead header on it.
+ */
+
+module.exports = function (ghosts = []) {
+    ghosts = Array.isArray(ghosts) ? ghosts : [ghosts];
+
+    const clacksValue = ['GNU Terry Pratchett', ...ghosts.map(name => `GNU ${name}`)].join(', ');
+
+    return function (response) {
+        response.setHeader('X-Clacks-Overhead', clacksValue);
+    }
+}

package.json

@@ -10,7 +10,7 @@
     "clacks",
     "terry pratchett"
   ],
-  "main": "index.js",
+  "main": "lib/express.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },