From b3574552e2646aa64aa8b9c2aa7845f80c68aea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Fri, 21 Jul 2023 17:25:26 +0200
Subject: [PATCH] Use new built in public IP detection

---
 lib/reforger/server.js | 54 +++++++++++++++++++-----------------------
 package.json           |  1 -
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/lib/reforger/server.js b/lib/reforger/server.js
index 69aa368..f3836ba 100644
--- a/lib/reforger/server.js
+++ b/lib/reforger/server.js
@@ -3,7 +3,6 @@ var events = require('events')
 var fs = require('fs.extra')
 var Gamedig = require('gamedig')
 var path = require('path')
-var publicIp = require('public-ip')
 var slugify = require('slugify')
 
 var queryInterval = 5000
@@ -89,7 +88,7 @@ Server.prototype.makeServerConfig = function () {
   return {
     bindAddress: '',
     bindPort: this.port,
-    publicAddress: this.ip,
+    publicAddress: '',
     publicPort: this.port,
     a2s: {
       address: '127.0.0.1',
@@ -172,39 +171,36 @@ Server.prototype.start = function () {
   }
 
   var self = this
-  publicIp.v4().then(function (ip) {
-    self.ip = ip
-    var config = self.makeServerConfig()
-    self.saveServerConfig(config, function (err) {
-      if (err) {
-        console.log(err)
-        return
-      }
+  var config = self.makeServerConfig()
+  self.saveServerConfig(config, function (err) {
+    if (err) {
+      console.log(err)
+      return
+    }
 
-      var instance = childProcess.spawn(self.serverBinary(), self.serverArguments(), { cwd: self.config.path })
+    var instance = childProcess.spawn(self.serverBinary(), self.serverArguments(), { cwd: self.config.path })
 
-      instance.on('error', function (err) {
-        console.error('Failed to start server', self.title, err)
-      })
+    instance.on('error', function (err) {
+      console.error('Failed to start server', self.title, err)
+    })
 
-      instance.on('close', function (code) {
-        clearInterval(self.queryStatusInterval)
-        self.state = null
-        self.pid = null
-        self.instance = null
-
-        self.emit('state')
-      })
-
-      self.pid = instance.pid
-      self.instance = instance
-      self.headlessClientInstances = []
-      self.queryStatusInterval = setInterval(function () {
-        self.queryStatus()
-      }, queryInterval)
+    instance.on('close', function (code) {
+      clearInterval(self.queryStatusInterval)
+      self.state = null
+      self.pid = null
+      self.instance = null
 
       self.emit('state')
     })
+
+    self.pid = instance.pid
+    self.instance = instance
+    self.headlessClientInstances = []
+    self.queryStatusInterval = setInterval(function () {
+      self.queryStatus()
+    }, queryInterval)
+
+    self.emit('state')
   })
 
   return this
diff --git a/package.json b/package.json
index 0e3fc85..2e8ccb7 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,6 @@
     "lodash": "^4.17.10",
     "morgan": "^1.8.1",
     "multer": "^1.3.0",
-    "public-ip": "^4.0.4",
     "raw-loader": "^0.5.1",
     "serve-static": "^1.12.1",
     "slugify": "^1.1.0",