@thzero/library_server 0.14.6 → 0.14.7

package/boot/index.js

@@ -1,4 +1,6 @@
-import internalIp from 'internal-ip';
+// import internalIp from 'internal-ip';
+// Until author fixes the issue with version 7+
+import {internalIpV6, internalIpV4} from '@thzero/library_server/utility/internalIp';
 
 import { createTerminus } from '@godaddy/terminus';
 
@@ -105,7 +107,7 @@ class BootMain {
 		await listen(this.port);
 		this.address = serverHttp.address() ? serverHttp.address().address : null;
 		if (this.address === '::')
-			this.address = await internalIp.v4();
+			this.address = await internalIpV4();
 
 		await this._initServer(serverHttp);
 

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@thzero/library_server",
-  "version": "0.14.6",
+  "version": "0.14.7",
   "version_major": 0,
   "version_minor": 14,
-  "version_patch": 6,
+  "version_patch": 7,
   "version_date": "10/20/2021",
   "description": "An opinionated library of common functionality to bootstrap a Koa based API application using MongoDb and Firebase.",
   "author": "thZero",
@@ -34,7 +34,6 @@
     "dayjs-plugin-utc": "^0.1.2",
     "easy-rbac": "^3.1.1",
     "esm": "^3.2.25",
-    "internal-ip": "^7.0.0",
     "koa": "^2.13.4",
     "koa-body": "^4.2.0",
     "koa-helmet": "^6.1.0",

package/utility/internalIp/index.js

@@ -0,0 +1,49 @@
+import {networkInterfaces} from 'os';
+import defaultGateway from 'default-gateway';
+import ip from 'ipaddr.js';
+
+function findIp(gateway) {
+	const gatewayIp = ip.parse(gateway);
+
+	// Look for the matching interface in all local interfaces.
+	for (const addresses of Object.values(networkInterfaces())) {
+		for (const {cidr} of addresses) {
+			const net = ip.parseCIDR(cidr);
+
+			// eslint-disable-next-line unicorn/prefer-regexp-test
+			if (net[0] && net[0].kind() === gatewayIp.kind() && gatewayIp.match(net)) {
+				return net[0].toString();
+			}
+		}
+	}
+}
+
+async function async(family) {
+	try {
+		const {gateway} = await defaultGateway[family]();
+		return findIp(gateway);
+	} catch {}
+}
+
+function sync(family) {
+	try {
+		const {gateway} = defaultGateway[family].sync();
+		return findIp(gateway);
+	} catch {}
+}
+
+export async function internalIpV6() {
+	return async('v6');
+}
+
+export async function internalIpV4() {
+	return async('v4');
+}
+
+export function internalIpV6Sync() {
+	return sync('v6');
+}
+
+export function internalIpV4Sync() {
+	return sync('v4');
+}