zsyp 1.4.1 → 2.0.0

package/index.js

@@ -1,18 +1,13 @@
-try {
-  process.loadEnvFile('/etc/default/zsyp');
-} catch {
-  console.error('Failed to load config file.');
-}
-
-const makeApp = require('./lib/app');
+import './lib/env.js';
+import makeApp from './lib/app.js';
 
 const { ZSYP_PORT: PORT = 3090 } = process.env;
 
 const app = makeApp();
 
-module.exports = app;
+export default app;
 
-if (!module.parent) {
+if (import.meta.main) {
   app.listen(PORT);
   console.log('Listening on port', PORT);
 }

package/lib/app.js

@@ -1,14 +1,13 @@
-const { json } = require('node:stream/consumers');
-const connect = require('@pirxpilot/connect');
-const mniam = require('mniam');
-const router = require('./router');
-const event = require('./event');
-
-module.exports = makeApp;
+import { json } from 'node:stream/consumers';
+import connect from '@pirxpilot/connect';
+import mniam from 'mniam';
+import * as event from './event.js';
+import ping from './ping.js';
+import router from './router.js';
 
 const { ZSYP_DOMAINS: domains, ZSYP_DB: database = 'mongodb://localhost/zsyp' } = process.env;
 
-function makeApp(opts = {}) {
+export default function makeApp(opts = {}) {
   const app = connect();
 
   opts.db = mniam.db(database);
@@ -18,6 +17,7 @@ function makeApp(opts = {}) {
 
   app.use('/csp', router({ ...opts, name: 'csp', domains }));
   app.use('/event', router({ ...opts, converter: event.converter }));
+  app.use('/_/ping', ping(opts));
 
   return app;
 }

package/lib/converter.js

@@ -1,6 +1,4 @@
-module.exports = makeConverter;
-
-function makeConverter({ converter }) {
+export default function makeConverter({ converter }) {
   async function convert(req, _res, next) {
     try {
       const { item, meta } = await converter(req.body);

package/lib/env.js

@@ -0,0 +1,5 @@
+try {
+  process.loadEnvFile('/etc/default/zsyp');
+} catch {
+  console.error('Failed to load config file.');
+}

package/lib/event.js

@@ -1,13 +1,9 @@
-const { ObjectId } = require('mongodb');
-const { createHash } = require('node:crypto');
-const stackParser = require('error-stack-parser');
-const { resolve } = require('./source-map');
+import { createHash } from 'node:crypto';
+import stackParser from 'error-stack-parser';
+import { ObjectId } from 'mongodb';
+import { resolve } from './source-map.js';
 
-module.exports = {
-  converter
-};
-
-async function converter(event) {
+export async function converter(event) {
   const { type = 'event' } = event;
   let item;
   let name;

package/lib/filter.js

@@ -1,8 +1,4 @@
-module.exports = makeFilter;
-
-/* global URL */
-
-function makeFilter({ domains }) {
+export default function makeFilter({ domains }) {
   if (!domains) {
     return;
   }

package/lib/from.js

@@ -1,8 +1,6 @@
-const { parse } = require('useragent');
+import { parse } from 'useragent';
 
-module.exports = from;
-
-function from(req, _res, next) {
+export default function from(req, _res, next) {
   const { headers, body } = req;
   const ua = body?.from?.ua ?? headers['user-agent'];
   const { family, major, os, device } = parse(ua);

package/lib/logger.js

@@ -1,8 +1,8 @@
-const debug = require('debug')('zsyp:logger');
+import Debug from 'debug';
 
-module.exports = makeLogger;
+const debug = Debug('zsyp:logger');
 
-function makeLogger({ db, name }) {
+export default function makeLogger({ db, name }) {
   const cache = Object.create(null);
 
   const getCollection = name ? () => collectionFromCache(name) : ({ name }) => collectionFromCache(name);

package/lib/ping.js

@@ -0,0 +1,24 @@
+export default function makePing({ db }) {
+  const pingsCollection = db.collection({ name: 'ping' });
+
+  return ping;
+
+  async function ping(req, res) {
+    if (req.method !== 'GET' && req.path !== '/') {
+      res.statusCode = 404;
+      res.end();
+      return;
+    }
+    try {
+      await pingsCollection.insertOne({
+        timestamp: new Date()
+      });
+      res.statusCode = 204; // empty
+      res.end();
+    } catch (error) {
+      console.error(error);
+      res.statusCode = 500;
+      res.end();
+    }
+  }
+}

package/lib/router.js

@@ -1,11 +1,9 @@
-const from = require('./from');
-const makeFilter = require('./filter');
-const makeConverter = require('./converter');
-const makeLogger = require('./logger');
+import makeConverter from './converter.js';
+import makeFilter from './filter.js';
+import from from './from.js';
+import makeLogger from './logger.js';
 
-module.exports = router;
-
-function router(opts) {
+export default function router(opts) {
   const stack = [respond, from, makeFilter(opts), makeConverter(opts), makeLogger(opts), opts.finalMiddleware].filter(
     Boolean
   );

package/lib/source-map.js

@@ -1,12 +1,7 @@
-const { readFile } = require('node:fs').promises;
-const path = require('node:path');
-const { SourceMapConsumer } = require('source-map');
-const { LRUCache: LRU } = require('lru-cache');
-
-module.exports = {
-  resolve,
-  clear
-};
+import { readFile } from 'node:fs/promises';
+import path from 'node:path';
+import { LRUCache as LRU } from 'lru-cache';
+import { SourceMapConsumer } from 'source-map';
 
 const { ZSYP_SOURCE_MAP_DIR = '/var/lib/zsyp', ZSYP_SOURCE_MAP_CACHE_SIZE = 30 } = process.env;
 
@@ -16,7 +11,7 @@ const cache = new LRU({
   dispose: smc => smc?.destroy()
 });
 
-async function resolve({ an, av }, frame) {
+export async function resolve({ an, av }, frame) {
   const [source, line, column] = frame;
   const smc = await loadSourceMap(an, av, source);
   if (!smc) {
@@ -33,7 +28,7 @@ async function resolve({ an, av }, frame) {
   return resolved;
 }
 
-function clear() {
+export function clear() {
   cache.clear();
 }
 

package/package.json

@@ -1,13 +1,17 @@
 {
   "name": "zsyp",
-  "version": "1.4.1",
+  "version": "2.0.0",
   "description": "CSP violation reports logger.",
   "author": {
     "name": "Damian Krzeminski",
     "email": "pirxpilot@furkot.com",
     "url": "https://pirxpilot.me"
   },
-  "repository": "pirxpilot/zsyp",
+  "type": "module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/pirxpilot/zsyp.git"
+  },
   "license": "MIT",
   "keywords": [
     "zsyp",
@@ -26,7 +30,7 @@
     "useragent": "^2.3.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.0.6",
+    "@biomejs/biome": "2.2.7",
     "supertest-fetch": "~2"
   },
   "scripts": {