miolo 0.9.21 → 0.9.23

package/dist/server/miolo.server.node.mjs

@@ -1,5 +1,5 @@
 /**
- * miolo v0.9.21
+ * miolo v0.9.23
  *
  * Copyright (c) Donato Lorenzo <donato@afialapis.com>
  *
@@ -28,8 +28,9 @@ import koa_mount from 'koa-mount';
 import koa_serve from 'koa-static';
 import koa_favicon from 'koa-favicon';
 import { performance } from 'node:perf_hooks';
+import fs, { readFileSync } from 'node:fs';
+import { Reader } from '@maxmind/geoip2-node';
 import Router from '@koa/router';
-import { readFileSync } from 'node:fs';
 import jwt from 'jwt-simple';
 import passport from 'koa-passport';
 import LocalStrategy from 'passport-local';
@@ -453,11 +454,15 @@ var base_config = {
       // seconds to consider slow a request
       onStart: undefined,
       // (ctx, times) => { return begin_result}
-      onDone: undefined
-      // (ctx, begin_result, times) => {}
+      onDone: undefined,
+      // (ctx, begin_result, times) => {},
+      geoip: {
+        enabled: false,
+        db: '/var/lib/GeoIP/GeoLite2-City.mmdb',
+        local_ips: ['127.0.0.1']
+      }
     }
   },
-
   session: {
     salt: 'SUPER_SALTY_YES?',
     secret: 'SUPER_SECRET_KEY_KERE',
@@ -1132,6 +1137,61 @@ var init_static_middleware = function init_static_middleware(app, config) {
   }
 };
 
+var _geoip_reader = undefined;
+var _geoip_local_ips = ['127.0.0.1'];
+function _geoip_init(db, local_ips, logger) {
+  if (db === void 0) {
+    db = '/var/lib/GeoIP/GeoLite2-City.mmdb';
+  }
+  if (local_ips === void 0) {
+    local_ips = ['127.0.0.1'];
+  }
+  if (logger === void 0) {
+    logger = console;
+  }
+  try {
+    if (_geoip_reader != undefined) {
+      return _geoip_reader;
+    }
+    _geoip_local_ips = [].concat(_geoip_local_ips, local_ips || []);
+    var dbBuffer = fs.readFileSync(db);
+    _geoip_reader = Reader.openBuffer(dbBuffer);
+    return _geoip_reader;
+  } catch (error) {
+    logger.error("[geoip] Error initing:");
+    logger.error(error);
+    return undefined;
+  }
+}
+var geoip_localize_ip = function geoip_localize_ip(ip, config, logger) {
+  if (logger === void 0) {
+    logger = console;
+  }
+  if (_geoip_local_ips.indexOf(ip) >= 0) {
+    return {
+      local: true,
+      country: '',
+      city: ''
+    };
+  }
+  try {
+    var _resp$city;
+    var reader = _geoip_init(config == null ? void 0 : config.db, config == null ? void 0 : config.local_ipds, logger);
+    var resp = reader.city(ip);
+    return {
+      country: resp.country.isoCode,
+      city: (_resp$city = resp.city) == null || (_resp$city = _resp$city.names) == null ? void 0 : _resp$city.en
+    };
+  } catch (error) {
+    logger.error("[geoip] Error localizing IP " + ip + ":");
+    logger.error(error);
+  }
+  return {
+    country: '',
+    city: ''
+  };
+};
+
 var REQUEST_COUNTER = {
   total: 0
 };
@@ -1175,15 +1235,18 @@ function init_request_middleware(app, config) {
     lazy: (config == null ? void 0 : config.lazy) || 1,
     slow: (config == null ? void 0 : config.slow) || 2,
     onStart: (config == null ? void 0 : config.onStart) || _def_on_begin,
-    onDone: (config == null ? void 0 : config.onDone) || _def_on_done
+    onDone: (config == null ? void 0 : config.onDone) || _def_on_done,
+    geoip: (config == null ? void 0 : config.geoip) || {
+      enabled: false
+    }
   };
   function request_middleware(_x6, _x7) {
     return _request_middleware.apply(this, arguments);
   }
   function _request_middleware() {
     _request_middleware = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(ctx, next) {
-      var _ctx$session;
-      var logger, ip, started, clurl, sreq, sbody, begin_result, user, uid_desc, status, ststr, stcolor, stdesc, elapsed, tcolor, tname, ssession, rbody;
+      var _reqConfig$geoip, _geo_info, _geo_info2, _geo_info3, _geo_info4, _ctx$session;
+      var logger, ip, started, geo_enabled, geo_info, clurl, geo_string, sreq, sbody, begin_result, user, uid_desc, status, ststr, stcolor, stdesc, elapsed, tcolor, tname, ssession, rbody;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -1200,22 +1263,31 @@ function init_request_middleware(app, config) {
             ctx.requestId = REQUEST_COUNTER.total;
             ctx.request.ip = ip;
 
+            // If wanted, geo localize ip
+            geo_enabled = (reqConfig == null || (_reqConfig$geoip = reqConfig.geoip) == null ? void 0 : _reqConfig$geoip.enabled) === true;
+            geo_info = {};
+            if (geo_enabled) {
+              geo_info = geoip_localize_ip(ip, reqConfig.geoip, logger);
+            }
+            ctx.request.geoip = geo_info;
+
             // Log something
             clurl = ctx.request.url.indexOf('?') >= 0 ? ctx.request.url.substr(0, ctx.request.url.indexOf('?')) : ctx.request.url;
-            sreq = magenta(ip) + " " + cyan(ctx.request.method) + " " + cyan(clurl) + " [" + cyan_light(REQUEST_COUNTER[ip]) + "/" + cyan_light(ctx.requestId) + "]";
+            geo_string = geo_enabled ? ((_geo_info = geo_info) == null ? void 0 : _geo_info.local) === true ? '' : (_geo_info2 = geo_info) != null && _geo_info2.country ? (_geo_info3 = geo_info) != null && _geo_info3.city ? " (" + ((_geo_info4 = geo_info) == null ? void 0 : _geo_info4.city) + ", " + geo_info.country + ")" : " (" + geo_info.country + ")" : '' : '';
+            sreq = "" + magenta(ip) + geo_string + " " + cyan(ctx.request.method) + " " + cyan(clurl) + " [" + cyan_light(REQUEST_COUNTER[ip]) + "/" + cyan_light(ctx.requestId) + "]";
             sbody = ctx.request.body != undefined ? JSON.stringify(ctx.request.body) : '';
             logger.info(sreq + " - START");
             logger.debug(sreq + " - Body: " + sbody);
-            _context3.next = 15;
+            _context3.next = 20;
             return reqConfig.onStart(ctx, {
               started: started,
               description: 'pending'
             });
-          case 15:
+          case 20:
             begin_result = _context3.sent;
-            _context3.next = 18;
+            _context3.next = 23;
             return next();
-          case 18:
+          case 23:
             user = ctx == null || (_ctx$session = ctx.session) == null ? void 0 : _ctx$session.user;
             uid_desc = '';
             if (user != undefined) {
@@ -1245,15 +1317,15 @@ function init_request_middleware(app, config) {
             logger.debug(sreq + " - Session: " + ssession);
             rbody = ctx.body != undefined ? JSON.stringify(ctx.body) : '';
             logger.debug(sreq + " - Response: " + rbody);
-            _context3.next = 34;
+            _context3.next = 39;
             return reqConfig.onDone(ctx, begin_result, {
               started: started,
               elapsed: elapsed,
               description: tname
             });
-          case 34:
+          case 39:
             logger.info(sreq + " - DONE " + stdesc + uid_desc + " (" + tcolor(tname) + ": " + tcolor(elapsed) + ")");
-          case 35:
+          case 40:
           case "end":
             return _context3.stop();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "0.9.21",
+  "version": "0.9.23",
   "description": "all-in-one koa-based server",
   "author": "Donato Lorenzo <donato@afialapis.com>",
   "contributors": [
@@ -67,6 +67,7 @@
   "dependencies": {
     "@koa/cors": "^4.0.0",
     "@koa/router": "^12.0.1",
+    "@maxmind/geoip2-node": "^4.2.0",
     "calustra": "^0.10.4",
     "cron": "^2.3.1",
     "deepmerge": "^4.3.1",