utilitas 1989.9.9 → 1989.9.13

package/index.mjs

@@ -10,7 +10,6 @@ export * as mailjet from 'node-mailjet';
 export * as math from 'mathjs';
 export * as mysql from 'mysql2/promise';
 export * as ping from 'ping';
-export * as publicIp from 'public-ip';
 export * as qs from 'qs';
 export * as redis from 'ioredis';
 export * as sentry from '@sentry/node';

package/lib/email.mjs

@@ -21,7 +21,7 @@ const init = async (options) => {
                 client = engine(options);
                 break;
             case 'MAILJET':
-                engine = await import('node-mailjet');
+                engine = (await import('node-mailjet')).default;
                 client = engine.connect(options.apiKey, options.apiSecret);
                 break;
             default:

package/lib/event.mjs

@@ -81,7 +81,7 @@ const bulk = async (absDir, options) => {
         file => /\.mjs$/i.test(file) && !file.startsWith('.')
     ), []];
     for (let file of files) {
-        const mod = await import(path.join(absDir, file));
+        const mod = { ...await import(path.join(absDir, file)) };
         if (!mod.run) { continue; }
         mod.name = mod.name || file.replace(/^(.*)\.mjs$/i, '$1');
         pmsRun.push(load(mod, options));

package/lib/network.mjs

@@ -1,9 +1,9 @@
+import { getCurrentIp } from './shot.mjs';
 import * as shell from './shell.mjs';
 import * as utilitas from './utilitas.mjs';
 import fetch from 'node-fetch';
 import geoIp from 'fast-geoip';
 import libPing from 'ping';
-import publicIp from 'public-ip';
 
 const log = (content) => { return utilitas.modLog(content, 'network'); };
 
@@ -87,7 +87,7 @@ const pickFastestHttpServer = async (urls, options = {}) => {
 };
 
 const getCurrentPosition = async () => {
-    const ip = await publicIp.v4();
+    const ip = await getCurrentIp();
     utilitas.assert(ip, 'Network is unreachable.', 500);
     const loc = await geoIp.lookup(ip);
     utilitas.assert(loc, 'Error detecting geolocation.', 500);

package/lib/shot.mjs

@@ -24,6 +24,14 @@ const checkVersion = async (pack) => {
     }
 };
 
+const getCurrentIp = async (options) => {
+    const resp = await get(
+        'https://ifconfig.me/all.json', { encode: 'JSON', ...options || {} }
+    );
+    utilitas.assert(resp?.content?.ip_addr, 'Error detecting IP address.', 500);
+    return options?.raw ? resp : resp.content.ip_addr;
+};
+
 const getCurrentPosition = async () => {
     const url = 'https://geolocation-db.com/json/';
     const rp = await fetch(url).then(res => res.json());
@@ -67,9 +75,11 @@ const get = async (url, options) => {
     };
 }
 
+export default get;
 export {
     checkVersion,
     get,
     getCurrentPosition,
+    getCurrentIp,
     getVersionOnNpm,
 };

package/package.json

@@ -1,11 +1,14 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for Node.js.",
-    "version": "1989.9.9",
+    "version": "1989.9.13",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",
     "type": "module",
+    "engines": {
+        "node": ">=16.x"
+    },
     "scripts": {
         "start": "node index.mjs",
         "debug": "node --inspect --trace-warnings debug.mjs",
@@ -34,7 +37,7 @@
         "mathjs": "^10.1.0",
         "mysql2": "^2.3.3",
         "node-fetch": "^2.6.7",
-        "node-mailjet": "^3.3.4",
+        "node-mailjet": "^3.3.5",
         "ping": "^0.4.1",
         "public-ip": "^5.0.0",
         "qs": "^6.10.3",