Merge pull request ichtrojan#20 from ichtrojan/fix-handler

v1.0.6

horus.go

@@ -105,7 +105,11 @@ func (config InternalConfig) Watch(next func(http.ResponseWriter, *http.Request)
 			log.Fatal(err)
 		}
 
-		ipAddress, _, _ := net.SplitHostPort(request.RemoteAddr)
+		ipAddress, err := getIp()
+
+		if err != nil {
+			ipAddress, _, _ = net.SplitHostPort(request.RemoteAddr)
+		}
 
 		headers, err := json.Marshal(request.Header)
 
@@ -422,3 +426,17 @@ func writer(ws *websocket.Conn) {
 		}
 	}
 }
+
+func getIp() (string, error) {
+	resp, err := http.Get("https://api.ipify.org?format=text")
+
+	if err != nil {
+		return "", errors.New("unable to get ip")
+	}
+
+	defer resp.Body.Close()
+
+	ip, _ := ioutil.ReadAll(resp.Body)
+
+	return string(ip), nil
+}

views/public/js/components/Horus.vue

@@ -154,8 +154,14 @@ module.exports = {
       fetch("./logs?lastID=0")
         .then((response) => response.json())
         .then((data) => (this.logs = data));
+      let mode;
+      if (location.protocol != 'https:') {
+        mode = "ws"
+      }else{
+        mode = "wss"
+      }
 
-      this.connection = new WebSocket("ws://" + document.location.host + "/ws");
+      this.connection = new WebSocket(mode+"://" + document.location.host + "/ws");
 
       this.connection.onclose = () => {
         this.status = "disconnected";