Add browser handler

Author: salvacorts

mlp-ea-decentralized/common/ga/cluster_test.go

@@ -1,3 +1,5 @@
+//+build !js
+
 package ga
 
 import (

mlp-ea-decentralized/common/ga/individualBroadcast.go

@@ -1,3 +1,5 @@
+//+build !js
+
 package ga
 
 import "github.com/hashicorp/memberlist"

mlp-ea-decentralized/common/ga/metrics.go

@@ -1,3 +1,5 @@
+//+build !js
+
 package ga
 
 import (

mlp-ea-decentralized/common/ga/nodeDelegate.go

@@ -1,3 +1,5 @@
+//+build !js
+
 package ga
 
 import (

mlp-ea-decentralized/common/ga/poolModel.go

@@ -8,6 +8,7 @@ import (
 	"math"
 	"math/rand"
 	"net"
+	"net/http"
 	"reflect"
 	"runtime"
 	"sync"
@@ -58,6 +59,8 @@ type PoolModel struct {
 	popSemaphore semaphore
 
 	// Clients communications
+	WebPort           int
+	WebPath           string
 	evaluations       int
 	wg                sync.WaitGroup
 	stop              chan bool
@@ -315,6 +318,7 @@ func (pool *PoolModel) handleEvaluate() {
 
 	var (
 		listenAddr = "0.0.0.0"
+		webPort    = pool.WebPort
 		nativePort = pool.grpcPort
 		wasmPort   = nativePort + 1
 	)
@@ -341,6 +345,10 @@ func (pool *PoolModel) handleEvaluate() {
 	}
 	defer lisNative.Close()
 
+	// Setup HTTP listener to serve webs
+	Log.Infof("Web Server for bowser collaborators at http://%s:%d/", listenAddr, wasmPort)
+	go http.ListenAndServe(fmt.Sprintf("%s:%d", listenAddr, webPort), http.FileServer(http.Dir(pool.WebPath)))
+
 	// Setup listener for wasm clients based on websockets
 	lisWasm, err := ws.Listen(fmt.Sprintf("ws://%s:%d", listenAddr, wasmPort), nil)
 	if err != nil {

mlp-ea-decentralized/native/client/client.go

@@ -10,7 +10,7 @@ import (
 )
 
 var (
-	serverAddr = flag.String("server", "127.0.0.1:3117", "Server address in format addr:port.")
+	serverAddr = flag.String("server", "127.0.0.1:2019", "Server address in format addr:port.")
 )
 
 func main() {

mlp-ea-decentralized/native/server/server.go

@@ -21,18 +21,20 @@ import (
 var (
 	// Opened ports
 	metricsPort     = flag.Int("metricsPort", 2222, "Port for prometheus metrics")
-	grpcPort        = flag.Int("grpcPort", 3117, "Port to listen for grpc requests")
+	grpcPort        = flag.Int("grpcPort", 2019, "Port to listen for grpc requests")
 	clusterPort     = flag.Int("clusterPort", 9999, "Listening port for gossip protocol")
-	clusterBoostrap = flag.String("clusterBoostrap", "", "comma separated list of peers already ina  cluster to join")
+	clusterBoostrap = flag.String("clusterBootstrap", "", "comma separated list of peers already in a cluster to join")
+	dataset         = flag.String("datasetPath", "../../../datasets/glass.csv", "Dataset to train MLP with")
+	webPath         = flag.String("webPath", "../../web/src/", "Webpage source code that will be served to browser-based collaborators")
+	webPort         = flag.Int("webPort", 8080, "Port to serve webpage to broser based collaborators")
 )
 
 func main() {
 	flag.Parse()
 
-	filename := "../../../datasets/glass.csv"
-	fileContent, err := ioutil.ReadFile(filename)
+	fileContent, err := ioutil.ReadFile(*dataset)
 	if err != nil {
-		logrus.Fatalf("Cannot open %s. Error: %s", filename, err.Error())
+		logrus.Fatalf("Cannot open %s. Error: %s", *dataset, err.Error())
 	}
 
 	// Patterns initialization
@@ -67,6 +69,8 @@ func main() {
 		mlp.NewRandMLP)
 
 	// Configure  extra pool settings
+	pool.WebPort = *webPort
+	pool.WebPath = *webPath
 	pool.Delegate = mlp.DelegateImpl{}
 	pool.KeepBest = false
 	pool.NMigrate = pool.PopSize / 10

mlp-ea-decentralized/web/src/go/main.go

@@ -18,7 +18,7 @@ func main() {
 	logger := WebLogger{}
 
 	client := ga.Client{
-		ServerAddr: "ws://127.0.0.1:3118",
+		ServerAddr: "ws://127.0.0.1:2019",
 		ID:         "clientWasm",
 		Log:        logrus.New(),
 		Delegate:   mlp.DelegateImpl{},