From 25ee3088058491e06da84504627b28625a68de98 Mon Sep 17 00:00:00 2001 From: srgooglo Date: Tue, 22 Jun 2021 16:12:13 +0200 Subject: [PATCH] getHostAddress from net lib --- src/server/index.js | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/src/server/index.js b/src/server/index.js index 8d6983b..cb885ff 100644 --- a/src/server/index.js +++ b/src/server/index.js @@ -1,18 +1,6 @@ const fs = require("fs") const express = require("express") -function getIPAddress() { - var interfaces = require('os').networkInterfaces(); - for (var devName in interfaces) { - var iface = interfaces[devName]; - - for (var i = 0; i < iface.length; i++) { - var alias = iface[i]; - if (alias.family === 'IPv4' && alias.address !== '127.0.0.1' && !alias.internal) - return alias.address; - } - } - return '0.0.0.0'; - } +const { net } = require("corenode") const { objectToArrayMap } = require("@corenode/utils") const tokenizer = require("corenode/dist/libs/tokenizer") @@ -20,6 +8,7 @@ const tokenizer = require("corenode/dist/libs/tokenizer") const classes = require("../classes") const nethub = require("../lib/nethub") const { getLocalEndpoints, fetchController, serverManifest } = require("../lib") +const hostAddress = net.getHostAddress() ?? "localhost" const defaultMiddlewares = [ require('cors')(), @@ -63,7 +52,7 @@ class Server { //* set server basics this.httpServer = require("express")() - + //* set id's this.id = this.params.id ?? runtime.helpers.getRootPackage().name this.usid = tokenizer.generateUSID() @@ -74,7 +63,7 @@ class Server { this._onRequest = {} - this.localOrigin = `http://${getIPAddress()}:${this.port}` + this.localOrigin = `http://${hostAddress}:${this.port}` this.nethubOrigin = "" if (this.params.autoInit) { @@ -105,9 +94,9 @@ class Server { if (typeof controller === "function") { controller = new classes.Controller(route, controller) } - + const endpoint = { method: method, route: route, controller: controller } - + this.endpoints[route] = endpoint this.routes.push(route) @@ -235,7 +224,7 @@ class Server { this.registerEndpoint("get", "/map", (req, res) => { const methods = {} - + this.routes.forEach((route) => { const endpoint = this.endpoints[route] ?? {}