Merge pull request #10 from hcp-uw/tapestry

Tapestry

Author: robertkoller

cmd/mosaic-node/main.go

@@ -1,49 +1,17 @@
 package main
 
 import (
-
 	"fmt"
-	//"os"
 
 	//"github.com/hcp-uw/mosaic/internal/cli"
 	"github.com/hcp-uw/mosaic/internal/daemon"
 )
 
 func main() {
-	//if len(os.Args) > 1 {
-	//	cli.Run(os.Args)
-	//	return
-	//}
+
 	if err := daemon.StartServer(); err != nil {
 		panic(err)
 	}
-	fmt.Println("welcome to mosaic")
-
-
-	file, err := os.ReadFile("output_file.jpg")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	fileSize := len(file)
-
-	encoder, err := encoding.NewEncoder(8, 4, "./files", "./files/.bin")
-
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	//err = encoder.EncodeFile("/pictures/pic.jpg")
-	//if err != nil {
-	//	fmt.Println(err)
-	//}
-
-	//fmt.Println(fileSize)
-
-	err = encoder.DecodeShards("pictures/pic.jpg", fileSize)
-	if err != nil {
-		log.Fatal(err)
-	}
-
 
+	fmt.Println("welcome to mosaic")
 }

cmd/mosaic-stun/main.go

@@ -0,0 +1,46 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/hcp-uw/mosaic/internal/stun"
+)
+
+func main() {
+	port := flag.String("port", "3478", "Port to listen on (server mode)")
+
+	runServer(*port)
+}
+
+func runServer(port string) {
+	config := &stun.ServerConfig{
+		ListenAddress: ":" + port,
+		ClientTimeout: 30 * 1000000000, // 30 seconds in nanoseconds
+		PingInterval:  10 * 1000000000, // 10 seconds in nanoseconds
+		MaxQueueSize:  100,
+		EnableLogging: true,
+	}
+
+	server := stun.NewServer(config)
+
+	if err := server.Start(config); err != nil {
+		log.Fatalf("Failed to start server: %v", err)
+	}
+
+	fmt.Printf("STUN server running on port %s\n", port)
+	fmt.Println("Press Ctrl+C to stop")
+
+	// Wait for interrupt signal
+	sigChan := make(chan os.Signal, 1)
+	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
+	<-sigChan
+
+	fmt.Println("\nShutting down server...")
+	server.Stop()
+}
+

internal/cli/CLI.go

@@ -10,8 +10,8 @@ import (
 	"syscall"
 
 	"github.com/hcp-uw/mosaic/internal/cli/client"
-	"github.com/hcp-uw/mosaic/internal/cli/handlers/helpers"
 	"github.com/hcp-uw/mosaic/internal/cli/protocol"
+	"github.com/hcp-uw/mosaic/internal/daemon/handlers/helpers"
 )
 
 //go:embed HelpMessage.txt
@@ -64,15 +64,15 @@ func Run(Args []string) {
 		}
 		version()
 	case "join":
-		if len(args) != 3 {
+		if len(args) != 4 {
 			fmt.Println()
 			fmt.Println("Usage:")
-			fmt.Println("- mos join network    Join the network.")
+			fmt.Println("- mos join network <Server address to connect to (e.g., 127.0.0.1:3478)> Join the network.")
 			os.Exit(1)
 		}
 		switch args[2] {
 		case "network":
-			joinNetwork()
+			joinNetwork(args[3])
 		default:
 			fmt.Println("Unknown argument:", args[2])
 			os.Exit(1)
@@ -255,15 +255,15 @@ func Run(Args []string) {
 }
 
 // Connects the user to the mosaic network
-func joinNetwork() {
-	resp, err := client.SendRequest("joinNetwork", protocol.JoinRequest{})
+func joinNetwork(serverAddr string) {
+	resp, err := client.SendRequest("joinNetwork", protocol.JoinRequest{ServerAddress: serverAddr})
 	exitOnErr(err, "Error joining network.")
 
 	var cmdResp protocol.JoinResponse
 	if err := mapToStruct(resp.Data, &cmdResp); err != nil {
 		exitOnErr(err, "Error parsing response.")
 	}
-	message := fmt.Sprintf("\nJoined network successfully.\n- Connected to %d peers.\n", cmdResp.Peers)
+	message := fmt.Sprintf("\nJoined network successfully.\n- Connected to %d peers.\n")
 	fmt.Println(message)
 }
 

internal/cli/handlers/joinNetwork.go

@@ -47,12 +47,12 @@ type NetworkStatusResponse struct {
 }
 
 type JoinRequest struct {
+	ServerAddress string `json:"ServerAddress"`
 }
 
 type JoinResponse struct {
 	Success bool   `json:"success"`
 	Details string `json:"details"`
-	Peers   int    `json:"peers"`
 }
 
 type NodeStatusRequest struct {

internal/cli/protocol/protocol.go

@@ -3,8 +3,8 @@ package handlers
 import (
 	"fmt"
 
-	"github.com/hcp-uw/mosaic/internal/cli/handlers/helpers"
 	"github.com/hcp-uw/mosaic/internal/cli/protocol"
+	"github.com/hcp-uw/mosaic/internal/daemon/handlers/helpers"
 )
 
 // Deletes a file from the network and returns an DeleteFileResponse

internal/cli/handlers/deleteFile.go internal/daemon/handlers/deleteFile.gointernal/cli/handlers/deleteFile.go renamed to internal/daemon/handlers/deleteFile.go

@@ -3,8 +3,8 @@ package handlers
 import (
 	"fmt"
 
-	"github.com/hcp-uw/mosaic/internal/cli/handlers/helpers"
 	"github.com/hcp-uw/mosaic/internal/cli/protocol"
+	"github.com/hcp-uw/mosaic/internal/daemon/handlers/helpers"
 )
 
 // Deletes a file from the network and returns an DeleteFolderResponse

internal/cli/handlers/deleteFolder.go internal/daemon/handlers/deleteFolder.gointernal/cli/handlers/deleteFolder.go renamed to internal/daemon/handlers/deleteFolder.go

@@ -3,8 +3,8 @@ package handlers
 import (
 	"fmt"
 
-	"github.com/hcp-uw/mosaic/internal/cli/handlers/helpers"
 	"github.com/hcp-uw/mosaic/internal/cli/protocol"
+	"github.com/hcp-uw/mosaic/internal/daemon/handlers/helpers"
 )
 
 // Deletes a file from the network and returns an DeleteFileResponse

internal/cli/handlers/downloadFile.go internal/daemon/handlers/downloadFile.gointernal/cli/handlers/downloadFile.go renamed to internal/daemon/handlers/downloadFile.go

@@ -3,8 +3,8 @@ package handlers
 import (
 	"fmt"
 
-	"github.com/hcp-uw/mosaic/internal/cli/handlers/helpers"
 	"github.com/hcp-uw/mosaic/internal/cli/protocol"
+	"github.com/hcp-uw/mosaic/internal/daemon/handlers/helpers"
 )
 
 // Deletes a file from the network and returns an DownloadFolderResponse

internal/cli/handlers/downloadFolder.go …ternal/daemon/handlers/downloadFolder.gointernal/cli/handlers/downloadFolder.go renamed to internal/daemon/handlers/downloadFolder.go internal/cli/handlers/downloadFolder.go renamed to internal/daemon/handlers/downloadFolder.go

@@ -3,8 +3,8 @@ package handlers
 import (
 	"fmt"
 
-	"github.com/hcp-uw/mosaic/internal/cli/handlers/helpers"
 	"github.com/hcp-uw/mosaic/internal/cli/protocol"
+	"github.com/hcp-uw/mosaic/internal/daemon/handlers/helpers"
 )
 
 // Deletes all user data and returns a EmptyStorageResponse