From ee5bd3938eeaa0899c76a045fc23f1d6f6efd9ed Mon Sep 17 00:00:00 2001
From: Dorian Niemiec <dorian.niemiec@svrjs.org>
Date: Mon, 28 Aug 2023 04:29:23 +0200
Subject: [PATCH] Update to SVR.JS 3.4.24

---
 index.html          |  6 ++--
 licenses/index.html |  8 ++---
 svr.js              | 79 +++++++++++++++++++++++++++++----------------
 tests.html          |  4 +--
 4 files changed, 61 insertions(+), 36 deletions(-)
diff --git a/index.html b/index.html
index 7de5f2d..48c8f86 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>SVR.JS 3.4.23</title>
+    <title>SVR.JS 3.4.24</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta charset="UTF-8" />
     <style>
@@ -12,7 +12,7 @@
     </style>
   </head>
   <body>
-    <h1>Welcome to SVR.JS 3.4.23</h1>
+    <h1>Welcome to SVR.JS 3.4.24</h1>
     <br/>
     <img src="/logo.png" style="width: 256px;" />
     <br/>
@@ -110,7 +110,7 @@
     </div>
     <p>Changes:</p>
     <ul>
-      <li>Fixed server crashes while one of two ports are in use</li>
+      <li>Added reverse DNS lookup support.</li>
     </ul>
     <p>Bugs:</p>
     <ul>
diff --git a/licenses/index.html b/licenses/index.html
index 377d939..d5c88f5 100644
--- a/licenses/index.html
+++ b/licenses/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>SVR.JS 3.4.23 Licenses</title>
+    <title>SVR.JS 3.4.24 Licenses</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta charset="UTF-8" />
     <style>
@@ -12,8 +12,8 @@
     </style>
   </head>
   <body>
-    <h1>SVR.JS 3.4.23 Licenses</h1>
-    <h2>SVR.JS 3.4.23</h2>
+    <h1>SVR.JS 3.4.24 Licenses</h1>
+    <h2>SVR.JS 3.4.24</h2>
     <div style="display: inline-block; text-align: left; border-width: 2px; border-style: solid; border-color: gray; padding: 8px;">
       MIT License<br/>
       <br/>
@@ -37,7 +37,7 @@
       OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE<br/>
       SOFTWARE.<br/>
     </div>
-    <h2>Packages used by SVR.JS 3.4.23 and utilities</h2>
+    <h2>Packages used by SVR.JS 3.4.24 and utilities</h2>
     <div style="width: 100%; background-color: #ccc; border: 1px solid green; text-align: left; margin: 10px 0;">
       <div style="float: right;">License: MIT</div>
       <div style="font-size: 20px;">
diff --git a/svr.js b/svr.js
index 01b8932..8d8c06e 100644
--- a/svr.js
+++ b/svr.js
@@ -71,7 +71,7 @@ function deleteFolderRecursive(path) {
 }
 
 var os = require("os");
-var version = "3.4.23";
+var version = "3.4.24";
 var singlethreaded = false;
 
 if (process.versions) process.versions.svrjs = version; //Inject SVR.JS into process.versions
@@ -331,6 +331,7 @@ var http = require("http");
 http.STATUS_CODES[497] = "HTTP Request Sent to HTTPS Port";
 http.STATUS_CODES[598] = "Network Read Timeout Error";
 http.STATUS_CODES[599] = "Network Connect Timeout Error";
+var dns = require("dns");
 var url = require("url");
 if (url.URL && typeof URL == "undefined") URL = url.URL;
 try {
@@ -793,21 +794,33 @@ if (host != "[offline]" || ifaceEx) {
         return;
       }
       pubip = d.toString();
-      if (!domain) {
-        if (pubip.indexOf(":") == -1) {
-          var parts = pubip.split(".");
-          var p1 = parseInt(parts[0]).toString(16);
-          var p2 = parseInt(parts[1]).toString(16);
-          var p3 = parseInt(parts[2]).toString(16);
-          var p4 = parseInt(parts[3]).toString(16);
-          var pp = parseInt(pubport).toString(16);
-          domain = p1 + p2 + p3 + p4 + pp + ".nodesvr.doriantech.com";
-        } else {
-          domain = pubip.replace(/[^0-9a-zA-Z]/gi, "").toLowerCase() + ".nodesvrip6.doriantech.com";
+      if (domain) {
+        ipRequestCompleted = true;
+        process.emit("ipRequestCompleted");
+      } else {
+        var callbackDone = false;
+
+        var dnsTimeout = setTimeout(function() {
+          callbackDone = true;
+          ipRequestCompleted = true;
+          process.emit("ipRequestCompleted");
+        }, 3000);
+
+        try {
+          dns.reverse(pubip, function(err, hostnames) {
+            if(callbackDone) return;
+            clearTimeout(dnsTimeout);
+            if(!err && hostnames.length > 0) domain = hostnames[0];
+            ipRequestCompleted = true;
+            process.emit("ipRequestCompleted");
+          });
+        } catch(err) {
+          clearTimeout(dnsTimeout);
+          callbackDone = true;
+          ipRequestCompleted = true;
+          process.emit("ipRequestCompleted");
         }
       }
-      ipRequestCompleted = true;
-      process.emit("ipRequestCompleted");
     });
   });
   ipRequest.on("error", function () {
@@ -845,21 +858,33 @@ if (host != "[offline]" || ifaceEx) {
           return;
         }
         pubip = d.toString();
-        if (!domain) {
-          if (pubip.indexOf(":") == -1) {
-            var parts = pubip.split(".");
-            var p1 = parseInt(parts[0]).toString(16);
-            var p2 = parseInt(parts[1]).toString(16);
-            var p3 = parseInt(parts[2]).toString(16);
-            var p4 = parseInt(parts[3]).toString(16);
-            var pp = parseInt(pubport).toString(16);
-            domain = p1 + p2 + p3 + p4 + pp + ".nodesvr.doriantech.com";
-          } else {
-            domain = pubip.replace(/[^0-9a-zA-Z]/gi, "").toLowerCase() + ".nodesvrip6.doriantech.com";
+        if (domain) {
+          ipRequestCompleted = true;
+          process.emit("ipRequestCompleted");
+        } else {
+          var callbackDone = false;
+
+          var dnsTimeout = setTimeout(function() {
+            callbackDone = true;
+            ipRequestCompleted = true;
+            process.emit("ipRequestCompleted");
+          }, 3000);
+
+          try {
+            dns.reverse(pubip, function(err, hostnames) {
+              if(callbackDone) return;
+              clearTimeout(dnsTimeout);
+              if(!err && hostnames.length > 0) domain = hostnames[0];
+              ipRequestCompleted = true;
+              process.emit("ipRequestCompleted");
+            });
+          } catch(err) {
+            clearTimeout(dnsTimeout);
+            callbackDone = true;
+            ipRequestCompleted = true;
+            process.emit("ipRequestCompleted");
           }
         }
-        ipRequestCompleted = true;
-        process.emit("ipRequestCompleted");
       });
     });
     ipRequest2.on("error", function () {
diff --git a/tests.html b/tests.html
index 311ab14..facf3c3 100644
--- a/tests.html
+++ b/tests.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>SVR.JS 3.4.23 Tests</title>
+    <title>SVR.JS 3.4.24 Tests</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta charset="UTF-8" />
     <style>
@@ -12,7 +12,7 @@
     </style>
   </head>
   <body>
-    <h1>SVR.JS 3.4.23 Tests</h1>
+    <h1>SVR.JS 3.4.24 Tests</h1>
     <h2>Directory</h2>
     <iframe src="/testdir" width="50%" height="300px"></iframe>
     <h2>Directory (with query)</h2>
