zsyp 1.2.3 → 1.3.1

package/index.js

@@ -2,9 +2,7 @@ require('dotenv').config({ path: '/etc/default/zsyp' });
 
 const makeApp = require('./lib/app');
 
-const {
-  ZSYP_PORT: PORT = 3090,
-} = process.env;
+const { ZSYP_PORT: PORT = 3090 } = process.env;
 
 const app = makeApp();
 

package/lib/app.js

@@ -6,10 +6,7 @@ const event = require('./event');
 
 module.exports = makeApp;
 
-const {
-  ZSYP_DOMAINS: domains,
-  ZSYP_DB: database = 'mongodb://localhost/zsyp'
-} = process.env;
+const { ZSYP_DOMAINS: domains, ZSYP_DB: database = 'mongodb://localhost/zsyp' } = process.env;
 
 function makeApp(opts = {}) {
   const app = connect();
@@ -23,4 +20,3 @@ function makeApp(opts = {}) {
 
   return app;
 }
-

package/lib/converter.js

@@ -1,14 +1,13 @@
 module.exports = makeConverter;
 
 function makeConverter({ converter }) {
-
-  async function convert(req, res, next) {
+  async function convert(req, _res, next) {
     try {
       const { item, meta } = await converter(req.body);
       req.item = item;
       req.meta = meta;
       return next();
-    } catch(e) {
+    } catch (e) {
       return next(e);
     }
   }
@@ -16,8 +15,7 @@ function makeConverter({ converter }) {
   return converter ? convert : keep;
 }
 
-function keep(req, res, next) {
+function keep(req, _res, next) {
   req.item = req.body;
   return next();
 }
-

package/lib/filter.js

@@ -3,7 +3,6 @@ module.exports = makeFilter;
 /* global URL */
 
 function makeFilter({ domains }) {
-
   if (!domains) {
     return;
   }
@@ -11,7 +10,7 @@ function makeFilter({ domains }) {
   const domainRe = domains && new RegExp(domains);
   return filter;
 
-  function filter({ body: csp }, res, next) {
+  function filter({ body: csp }, _res, next) {
     const uri = csp['csp-report']['document-uri'];
     const { hostname } = new URL(uri);
     if (domainRe.test(hostname)) {
@@ -19,4 +18,3 @@ function makeFilter({ domains }) {
     }
   }
 }
-

package/lib/from.js

@@ -2,15 +2,10 @@ const { parse } = require('useragent');
 
 module.exports = from;
 
-function from(req, res, next) {
+function from(req, _res, next) {
   const { headers, body } = req;
-  const ua = body?.from?.ua ??  headers['user-agent'];
-  const {
-    family,
-    major,
-    os,
-    device
-  } = parse(ua);
+  const ua = body?.from?.ua ?? headers['user-agent'];
+  const { family, major, os, device } = parse(ua);
   const data = {
     ua,
     browser: {

package/lib/logger.js

@@ -5,18 +5,19 @@ module.exports = makeLogger;
 function makeLogger({ db, name }) {
   const cache = Object.create(null);
 
-  const getCollection =  name ?
-    () => collectionFromCache(name) :
-    ({ name }) => collectionFromCache(name);
+  const getCollection = name ? () => collectionFromCache(name) : ({ name }) => collectionFromCache(name);
 
   return log;
 
-  function log({ from, item, meta }, res, next) {
+  function log({ from, item, meta }, _res, next) {
     debug('saving %j', item);
     getCollection(meta)
       .insertOne({ ...item, from })
       .then(() => next())
-      .catch(err => { console.error(err); next(); });
+      .catch(err => {
+        console.error(err);
+        next();
+      });
   }
 
   function collectionFromCache(name) {

package/lib/router.js

@@ -1,31 +1,43 @@
-const Router = require('router');
-
 const from = require('./from');
 const makeFilter = require('./filter');
 const makeConverter = require('./converter');
 const makeLogger = require('./logger');
 
-module.exports = function (opts) {
-  const router = new Router({
-    strict: true,
-    caseSensitive: true
-  });
+module.exports = router;
+
+function router(opts) {
+  const stack = [respond, from, makeFilter(opts), makeConverter(opts), makeLogger(opts), opts.finalMiddleware].filter(
+    Boolean
+  );
 
-  const stack = [
-    respond,
-    from,
-    makeFilter(opts),
-    makeConverter(opts),
-    makeLogger(opts),
-    opts.finalMiddleware
-  ].filter(Boolean);
+  return loop(stack);
+}
 
-  router.post('/', stack);
+function loop(stack) {
+  return (req, res, next) => {
+    let i = 0;
+    fn();
 
-  return router;
-};
+    function fn() {
+      const layer = stack[i++];
+      if (!layer) {
+        return next();
+      }
+      try {
+        layer(req, res, fn);
+      } catch (err) {
+        next(err);
+      }
+    }
+  };
+}
 
 function respond(req, res, next) {
+  if (req.method !== 'POST' && req.path !== '/') {
+    res.statusCode = 404;
+    res.end();
+    return;
+  }
   res.statusCode = 204; // empty
   res.end();
   next();

package/lib/source-map.js

@@ -1,5 +1,5 @@
-const { readFile } = require('fs').promises;
-const path = require('path');
+const { readFile } = require('node:fs').promises;
+const path = require('node:path');
 const { SourceMapConsumer } = require('source-map');
 const { LRUCache: LRU } = require('lru-cache');
 
@@ -8,20 +8,16 @@ module.exports = {
   clear
 };
 
-const {
-  ZSYP_SOURCE_MAP_DIR = '/var/lib/zsyp',
-  ZSYP_SOURCE_MAP_CACHE_SIZE = 30
-} = process.env;
-
+const { ZSYP_SOURCE_MAP_DIR = '/var/lib/zsyp', ZSYP_SOURCE_MAP_CACHE_SIZE = 30 } = process.env;
 
 const cache = new LRU({
   max: ZSYP_SOURCE_MAP_CACHE_SIZE,
   fetchMethod: fetchSourceMap,
-  dispose: smc => smc && smc.destroy()
+  dispose: smc => smc?.destroy()
 });
 
 async function resolve({ an, av }, frame) {
-  const [source, line, column ] = frame;
+  const [source, line, column] = frame;
   const smc = await loadSourceMap(an, av, source);
   if (!smc) {
     return frame;
@@ -48,7 +44,7 @@ function loadSourceMap(app, version, source) {
 
 async function fetchSourceMap(filename) {
   try {
-    const txt = await readFile(filename + '.map');
+    const txt = await readFile(`${filename}.map`);
     const map = JSON.parse(txt);
     return new SourceMapConsumer(map);
   } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zsyp",
-  "version": "1.2.3",
+  "version": "1.3.1",
   "description": "CSP violation reports logger.",
   "author": {
     "name": "Damian Krzeminski",
@@ -21,15 +21,14 @@
     "debug": "~2 || ~3 || ~4",
     "dotenv": "~16",
     "error-stack-parser": "^2.1.4",
-    "lru-cache": "~10",
+    "lru-cache": "~11",
     "mniam": "~4",
-    "router": "~1",
     "source-map": "^0.7.4",
     "useragent": "^2.3.0"
   },
   "devDependencies": {
-    "@pirxpilot/jshint": "~3",
-    "supertest": "~6"
+    "@biomejs/biome": "^1.9.4",
+    "supertest-fetch": "~2"
   },
   "scripts": {
     "test": "make check"