CLI used to configure HTTP port, visible on network and easy connect

server port

Author: PiterWeb

src/cli/cli.go

@@ -7,18 +7,21 @@ import (
 func init() {
 	networkVisible := flag.Bool("network_visible", false, "Indicate to use all network interfaces (0.0.0.0) instead of loopback-only (127.0.0.1)")
 	httpPort := flag.Uint("port", 8080, "Port used for serving http Web client")
-
+	easyConnectPort := flag.Uint("easyport", 8081, "Port used for Easy Connect Server")
+	
 	flag.Parse()
 
 	config = configT{
 		networkVisible: *networkVisible,
 		httpPort:       uint16(*httpPort),
+		easyConnectPort: uint16(*easyConnectPort),
 	}
 }
 
 type configT struct {
 	networkVisible bool
 	httpPort       uint16
+	easyConnectPort uint16
 }
 
 func (c configT) GetNetworkVisible() bool {
@@ -29,6 +32,10 @@ func (c configT) GetHTTPPort() uint16 {
 	return c.httpPort
 }
 
+func (c configT) GetEasyConnectPort() uint16 {
+	return c.easyConnectPort
+}
+
 var config configT
 
 func GetConfig() configT {

src/net/http/http.go

@@ -7,9 +7,22 @@ import (
 	"io/fs"
 	"net/http"
 	"strings"
+
+	"github.com/PiterWeb/RemoteController/src/cli"
 )
 
-func InitHTTPAssets(serverMux *http.ServeMux, clientPort uint16, assets embed.FS) error {
+func InitHTTPAssets(serverMux *http.ServeMux, assets embed.FS) error {
+
+	config := cli.GetConfig()
+	clientPort := config.GetHTTPPort()
+
+	var addr string
+
+	if config.GetNetworkVisible() {
+		addr = fmt.Sprintf("0.0.0.0:%d", clientPort)
+	} else {
+		addr = fmt.Sprintf("127.0.0.1:%d", clientPort)
+	}
 
 	staticFS, err := fs.Sub(assets, "frontend/build")
 
@@ -21,7 +34,7 @@ func InitHTTPAssets(serverMux *http.ServeMux, clientPort uint16, assets embed.FS
 
 	httpServer := &http.Server{
 		Handler: serverMux,
-		Addr:    fmt.Sprintf("127.0.0.1:%d", clientPort),
+		Addr:    addr,
 	}
 
 	err = httpServer.ListenAndServe()

src/oninit/oninit_linux.go

@@ -6,14 +6,13 @@ import (
 	"net/http"
 
 	LRPSignals "github.com/PiterWeb/LibreRemotePlaySignals/v1"
+	"github.com/PiterWeb/RemoteController/src/cli"
 	net_http "github.com/PiterWeb/RemoteController/src/net/http"
 	"github.com/PiterWeb/RemoteController/src/net/websocket"
 )
 
 func Execute(assets embed.FS) error {
 
-	serverPort := uint16(8080)
-
 	httpServerMux := http.NewServeMux()
 
 	websocket.SetupWebsocketHandler(httpServerMux)
@@ -22,22 +21,20 @@ func Execute(assets embed.FS) error {
 	errChan := make(chan error, 2)
 
 	go func() {
-		err := net_http.InitHTTPAssets(httpServerMux, serverPort, assets)
+		err := net_http.InitHTTPAssets(httpServerMux, assets)
 
 		if err != nil {
 			errChan <- err
 		}
 	}()
-
-	easyConnectPort := uint16(8081)
 
 	go func() {
 
 		options := LRPSignals.ServerOptions{
-			Port: easyConnectPort,
+			Port: cli.GetConfig().GetEasyConnectPort(),
 		}
 
-		log.Println("Easy Connect Server started on port 8081")
+		log.Printf("Easy Connect Server started on port %d\n", options.Port)
 		err := LRPSignals.InitServer(options, ips_channel)
 		if err != nil {
 			errChan <- err

src/oninit/oninit_windows.go

@@ -16,15 +16,13 @@ func Execute(assets embed.FS) error {
 		return err
 	}
 
-	serverPort := uint16(8080)
-
 	httpServerMux := http.NewServeMux()
 
 	ips_channel := make(chan []string, 1)
 	errChan := make(chan error, 2)
 
 	go func() {
-		err := net_http.InitHTTPAssets(httpServerMux, serverPort, assets)
+		err := net_http.InitHTTPAssets(httpServerMux, assets)
 
 		if err != nil {
 			errChan <- err