diff options
| -rw-r--r-- | build/server.js | 14 | ||||
| -rw-r--r-- | src/server/Utils.hx | 9 |
2 files changed, 17 insertions, 6 deletions
diff --git a/build/server.js b/build/server.js index 5d559b7..b896d56 100644 --- a/build/server.js +++ b/build/server.js @@ -4029,11 +4029,19 @@ server_Main.prototype = { var server_Utils = function() { }; server_Utils.__name__ = true; server_Utils.getGlobalIp = function(callback) { - js_node_Http.get("http://myexternalip.com/raw",null,function(r) { + js_node_Https.get("https://myexternalip.com/raw",function(r) { r.setEncoding("utf8"); - return r.on("data",callback); + var data_b = ""; + r.on("data",function(chunk) { + data_b += Std.string(chunk); + return; + }); + return r.on("end",function(_) { + callback(data_b); + return; + }); }).on("error",function(e) { - haxe_Log.trace("Warning: connection error, server is local.",{ fileName : "src/server/Utils.hx", lineNumber : 13, className : "server.Utils", methodName : "getGlobalIp"}); + haxe_Log.trace("Warning: connection error, server is local.",{ fileName : "src/server/Utils.hx", lineNumber : 16, className : "server.Utils", methodName : "getGlobalIp"}); callback("127.0.0.1"); return; }); diff --git a/src/server/Utils.hx b/src/server/Utils.hx index 218184d..4764751 100644 --- a/src/server/Utils.hx +++ b/src/server/Utils.hx @@ -1,14 +1,17 @@ package server; -import js.node.Http; +import js.node.Https; import js.node.Os; class Utils { public static function getGlobalIp(callback:(ip:String)->Void):Void { - Http.get("http://myexternalip.com/raw", r -> { + // untyped to skip second null argument for node < v10 + Https.get(untyped "https://myexternalip.com/raw", r -> { r.setEncoding("utf8"); - r.on("data", callback); + final data = new StringBuf(); + r.on("data", chunk -> data.add(chunk)); + r.on("end", _ -> callback(data.toString())); }).on("error", e -> { trace("Warning: connection error, server is local."); callback("127.0.0.1"); |