Merge pull request #3 from CodeShellDev/main

Update Dev

Author: CodeShellDev

Dockerfile

@@ -5,6 +5,8 @@ ARG IMAGE_TAG
 ENV IMAGE_TAG=$IMAGE_TAG
 LABEL org.opencontainers.image.version=$IMAGE_TAG
 
+ENV PORT=5555
+
 ARG TARGETOS
 ARG TARGETARCH
 

internals/config/config.go

@@ -16,7 +16,11 @@ var ENV = &structure.ENV{
 }
 
 func Load() {
-	ENV.LOG_LEVEL = os.Getenv("LOG_LEVEL")
+	logLevel := os.Getenv("LOG_LEVEL")
+
+	if logLevel != "" {
+		ENV.LOG_LEVEL = logLevel
+	}
 
 	ENV.PORT = os.Getenv("PORT")
 

internals/server/http.go

@@ -3,7 +3,6 @@ package server
 import (
 	"encoding/json"
 	"net/http"
-	"strconv"
 	"time"
 
 	"github.com/codeshelldev/gotl/pkg/logger"
@@ -14,10 +13,10 @@ import (
 )
 
 type RequestBody struct {
-    IP        string `json:"ip,omitempty"`
-    Addr        string `json:"addr,omitempty"`
-    Mac         string `json:"mac,omitempty"`
-    StartupTime string `json:"startupTime,omitempty"`
+    IP        	string 	`json:"ip,omitempty"`
+    Addr        string 	`json:"addr,omitempty"`
+    Mac         string 	`json:"mac,omitempty"`
+    StartupTime *int   	`json:"startupTime,omitempty"`
 }
 
 func httpHandler(w http.ResponseWriter, req *http.Request) {
@@ -92,11 +91,9 @@ func httpHandler(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	if body.StartupTime != "" {
-		startupTime, err := strconv.Atoi(body.StartupTime)
-
+	if body.StartupTime != nil {
 		if err == nil {
-			time.Sleep(time.Duration(startupTime) * time.Second)
+			time.Sleep(time.Duration(*body.StartupTime) * time.Second)
 
 			reachable, err = tryPing(client, body.Addr, 
 				func() (bool, error) {
@@ -142,7 +139,7 @@ func httpHandler(w http.ResponseWriter, req *http.Request) {
 }
 
 func tryPingInterval(client *websocket.Conn, interval, retries int, addr string) (bool, error) {
-	ticker := time.NewTicker(time.Duration(config.ENV.PING_INTERVAL) * time.Second)
+	ticker := time.NewTicker(time.Duration(interval) * time.Second)
 	defer ticker.Stop()
 
 	count := 0
@@ -164,7 +161,7 @@ func tryPingInterval(client *websocket.Conn, interval, retries int, addr string)
 			return false, err
 		}
 
-		if count >= config.ENV.PING_RETRIES {
+		if count >= retries {
 			break
 		}
 	}

internals/server/server.go

@@ -2,6 +2,8 @@ package server
 
 import (
 	"net/http"
+
+	"github.com/codeshelldev/gotl/pkg/logger"
 )
 
 func Handle() http.Handler {
@@ -11,5 +13,11 @@ func Handle() http.Handler {
 
     mux.HandleFunc("/ws", websocketHandler)
 
-	return mux
+	final := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		mux.ServeHTTP(w, r)
+
+		logger.Info(r.Method, " ", r.URL.Path, " ", r.URL.RawQuery)
+	})
+
+	return final
 }