Merge pull request #97 from Akilan1999/approprirate-abstractions

Appropriate abstractions

.gitignore

@@ -21,3 +21,6 @@ generate/Test
 #ignore windows exe files
 *.exe
 dist/
+
+# ignore docker image files
+server/docker/containers/

Docs/Abstractions.md

@@ -0,0 +1,6 @@
+# Abstractions 
+The Abstractions package consists of black-boxed functions for P2PRC.
+
+## Functions
+- ```Init(<Project name>)```:  Initializes P2PRC with all the needed configurations. 
+- ```Start()```: Starts p2prc as a server and makes it possible to extend by adding other routes and functionality to P2PRC.

Docs/NAT-Traveral.md

@@ -0,0 +1,37 @@
+# NAT Traversal
+P2PRC currently supports TURN for NAT traversal. 
+
+## TURN 
+The current TURN implementation used is FRP. The TURN server is also required when 
+a P2PRC node is acting as a Server. The TURN server is determined based on the Node 
+with the least amount of latency based on the Nodes available on the IPTable. 
+Once a TURN server is determined there are 2 actions performed. The first one is 
+```/FRPPort``` to the TURN server to receive a port which is used to generate the external 
+port from the TURN server. The flow below describes the workflow.
+
+### Client mode
+- Call ```/FRPPort```
+```
+http://<turn server ip>:<server port no>/FRPport
+```
+- Call the TURN server in the following manner. The following is a sample code snippet below. 
+```go
+import (
+    "github.com/Akilan1999/p2p-rendering-computation/p2p/frp"
+)
+
+func main() {
+  serverPort, err := frp.GetFRPServerPort("http://" + <lowestLatencyIpAddress.Ipv4> + ":" + lowestLatencyIpAddress.ServerPort)
+   if err != nil {
+    return nil, err
+   }
+   // Create 1 second delay to allow FRP server to start
+   time.Sleep(1 * time.Second)
+   // Starts FRP as a client with
+   proxyPort, err := frp.StartFRPClientForServer(<lowestLatencyIpAddress.Ipv4>, serverPort, <the port you want to expose externally>)
+   if err != nil {
+     return nil, err
+   }
+}
+```
+

Docs/README.md

@@ -2,6 +2,7 @@
 # Table of contents
 1. [Introduction](Introduction.md)
 2. [Installation](Installation.md)
+3. [Abstractions](Abstractions.md)
 3. [Design Architecture](DesignArchtectureIntro.md)
    1. [Client Module](ClientArchitecture.md)
    2. [P2P Module](P2PArchitecture.md)
@@ -13,6 +14,5 @@
    4. [Config Module](ConfigImplementation.md)
    5. [Cli Module](CliImplementation.md)
    6. [Plugin Module](PluginImplementation.md)
-   7. [Generate Module](GenerateImplementation.md)
 5. [Problems](https://github.com/Akilan1999/p2p-rendering-computation/issues)   
 

README.md

@@ -45,6 +45,28 @@ This project aims to create a peer to peer (p2p) network, where a user can use t
 
 <br>
 
+## Extend your application with P2PRC 
+```go
+package main
+
+import "github.com/Akilan1999/p2p-rendering-computation/abstractions"
+
+func main() {
+    // Initialize with base p2prc config files
+    err := abstractions.Init("TEST")
+    if err != nil {
+        return
+    }
+
+    // start p2prc
+    _, err = abstractions.Start()
+    if err != nil {
+        return
+    }
+}
+```
+[Read more](Docs/Abstractions.md) ...
+
 ## Installation from source
 1. Ensure the Go compiler is installed 
    ```

abstractions/init.go

@@ -0,0 +1,27 @@
+package abstractions
+
+import (
+	"github.com/Akilan1999/p2p-rendering-computation/config"
+	"github.com/Akilan1999/p2p-rendering-computation/config/generate"
+	"github.com/Akilan1999/p2p-rendering-computation/server"
+	"github.com/gin-gonic/gin"
+)
+
+// Init Initialises p2prc
+func Init(name string, customConfig interface{}) (config *config.Config, err error) {
+	// set the config file with default paths
+	config, err = generate.SetDefaults(name, false, customConfig, false)
+	if err != nil {
+		return
+	}
+	return
+}
+
+// Start p2prc in a server mode
+func Start() (*gin.Engine, error) {
+	engine, err := server.Server()
+	if err != nil {
+		return nil, err
+	}
+	return engine, nil
+}

client/GroupTrackContainer.go

@@ -1,311 +1,310 @@
 package client
 
 import (
-	"encoding/json"
-	"errors"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
-	"github.com/google/uuid"
-	"io/ioutil"
-	"os"
+    "encoding/json"
+    "errors"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
+    "github.com/google/uuid"
+    "io/ioutil"
+    "os"
 )
 
 // Groups Data Structure type
 type Groups struct {
-	GroupList []*Group `json:"Groups"`
+    GroupList []*Group `json:"Groups"`
 }
 
 // Group Information about a single group
 type Group struct {
-	ID string `json:"ID"`
-	TrackContainerList []*TrackContainer `json:"TrackContainer"`
-	// Sneaky as required only when removing the element
-	// Set when GetGroup function is called
-	index int
+    ID                 string            `json:"ID"`
+    TrackContainerList []*TrackContainer `json:"TrackContainer"`
+    // Sneaky as required only when removing the element
+    // Set when GetGroup function is called
+    index int
 }
 
 // CreateGroup Creates a new group to add a set of track containers
-func CreateGroup() (*Group, error){
-	// Creating variable of type new group
-	var NewGroup Group
-	// Generate new UUID for group ID
-	id := uuid.New()
-	// Add new group id and prepend with the string "grp"
-	// The reason this is done is to differentiate between a
-	// group ID and docker container ID
-	NewGroup.ID = "grp" + id.String()
-	// Adding the new group to the
-	// GroupTrackContainer File
-	err := NewGroup.AddGroupToFile()
-	if err != nil {
-		return nil, err
-	}
+func CreateGroup() (*Group, error) {
+    // Creating variable of type new group
+    var NewGroup Group
+    // Generate new UUID for group ID
+    id := uuid.New()
+    // Add new group id and prepend with the string "grp"
+    // The reason this is done is to differentiate between a
+    // group ID and docker container ID
+    NewGroup.ID = "grp" + id.String()
+    // Adding the new group to the
+    // GroupTrackContainer File
+    err := NewGroup.AddGroupToFile()
+    if err != nil {
+        return nil, err
+    }
 
-	return &NewGroup,nil
+    return &NewGroup, nil
 }
 
 // RemoveGroup Removes group based on the group ID provided
 func RemoveGroup(GroupID string) error {
-	// Read group information from the
-	//grouptrackcontainer json file
-	groups, err := ReadGroup()
-	if err != nil {
-		return err
-	}
-	// Gets Group struct based on group ID
-	// provided
-	group, err := GetGroup(GroupID)
-	if err != nil {
-		return err
-	}
+    // Read group information from the
+    //grouptrackcontainer json file
+    groups, err := ReadGroup()
+    if err != nil {
+        return err
+    }
+    // Gets Group struct based on group ID
+    // provided
+    group, err := GetGroup(GroupID)
+    if err != nil {
+        return err
+    }
     // Remove Group struct from the groups variable
-	groups.GroupList = append(groups.GroupList[:group.index], groups.GroupList[group.index+1:]...)
+    groups.GroupList = append(groups.GroupList[:group.index], groups.GroupList[group.index+1:]...)
 
-	// Write new groups to the grouptrackcontainer json file
-	err = groups.WriteGroup()
-	if err != nil {
-		return err
-	}
+    // Write new groups to the grouptrackcontainer json file
+    err = groups.WriteGroup()
+    if err != nil {
+        return err
+    }
 
-	return nil
+    return nil
 }
 
 // AddContainerToGroup Adds container information to the Group based on the Group ID
 func AddContainerToGroup(ContainerID string, GroupID string) (*Group, error) {
-	// Gets container information based on container ID provided
-	containerInfo, err := GetContainerInformation(ContainerID)
-	if err != nil {
-		return nil, err
-	}
-	// Gets group information based on the group ID provided
-	group, err := GetGroup(GroupID)
-	if err != nil {
-		return nil, err
-	}
-	// Adds container information the group
-	group.AddContainer(containerInfo)
+    // Gets container information based on container ID provided
+    containerInfo, err := GetContainerInformation(ContainerID)
+    if err != nil {
+        return nil, err
+    }
+    // Gets group information based on the group ID provided
+    group, err := GetGroup(GroupID)
+    if err != nil {
+        return nil, err
+    }
+    // Adds container information the group
+    group.AddContainer(containerInfo)
 
-	// Get Groups information from reading the grouptrackcontainer.json file
-	groups, err := ReadGroup()
-	if err != nil {
-		return nil, err
-	}
+    // Get Groups information from reading the grouptrackcontainer.json file
+    groups, err := ReadGroup()
+    if err != nil {
+        return nil, err
+    }
     // Updating specific element in the group list with the added container
-	groups.GroupList[group.index] = group
-	// Write groups information on the grouptrackcontainer.json file
-	err = groups.WriteGroup()
-	if err != nil {
-		return nil, err
-	}
+    groups.GroupList[group.index] = group
+    // Write groups information on the grouptrackcontainer.json file
+    err = groups.WriteGroup()
+    if err != nil {
+        return nil, err
+    }
 
-	return group, nil
+    return group, nil
 }
 
 // RemoveContainerGroup Remove Container from the group ID specified
-func RemoveContainerGroup(ContainerID string, GroupID string) (*Group,error) {
-	// Get container information based on container ID provided
-	containerInfo, err := GetContainerInformation(ContainerID)
-	if err != nil {
-		return nil,err
-	}
-	// Gets group information based on the group ID provided
-	group, err := GetGroup(GroupID)
-	if err != nil {
-		return nil,err
-	}
-	// Remove container from the appropriate group
-	err = group.RemoveContainerGroup(containerInfo)
-	if err != nil {
-		return nil,err
-	}
-	// Get Groups information from reading the grouptrackcontainer.json file
-	groups, err := ReadGroup()
-	if err != nil {
-		return nil, err
-	}
-	// Updating specific element in the group list with the remove container
-	groups.GroupList[group.index] = group
-	// Write groups information on the grouptrackcontainer.json file
-	err = groups.WriteGroup()
-	if err != nil {
-		return nil, err
-	}
+func RemoveContainerGroup(ContainerID string, GroupID string) (*Group, error) {
+    // Get container information based on container ID provided
+    containerInfo, err := GetContainerInformation(ContainerID)
+    if err != nil {
+        return nil, err
+    }
+    // Gets group information based on the group ID provided
+    group, err := GetGroup(GroupID)
+    if err != nil {
+        return nil, err
+    }
+    // Remove container from the appropriate group
+    err = group.RemoveContainerGroup(containerInfo)
+    if err != nil {
+        return nil, err
+    }
+    // Get Groups information from reading the grouptrackcontainer.json file
+    groups, err := ReadGroup()
+    if err != nil {
+        return nil, err
+    }
+    // Updating specific element in the group list with the remove container
+    groups.GroupList[group.index] = group
+    // Write groups information on the grouptrackcontainer.json file
+    err = groups.WriteGroup()
+    if err != nil {
+        return nil, err
+    }
 
-	return group, nil
+    return group, nil
 }
 
 // RemoveContainerGroups Remove Container from groups (i.e which ever groups has information
 // about that container). This is mostly called when a container is deleted or removed from
 // the tracked container list
 func RemoveContainerGroups(ContainerID string) error {
-	// Get container information based on container ID provided
-	containerInfo, err := GetContainerInformation(ContainerID)
-	if err != nil {
-		return err
-	}
-	// Get Groups information from reading the grouptrackcontainer.json file
-	groups, err := ReadGroup()
-	if err != nil {
-		return err
-	}
-	// Removes container information from all groups it is found in
-	err = groups.RemoveContainerGroups(containerInfo)
-	if err != nil {
-		return err
-	}
-	// Write groups information on the grouptrackcontainer.json file
-	err = groups.WriteGroup()
-	if err != nil {
-		return err
-	}
+    // Get container information based on container ID provided
+    containerInfo, err := GetContainerInformation(ContainerID)
+    if err != nil {
+        return err
+    }
+    // Get Groups information from reading the grouptrackcontainer.json file
+    groups, err := ReadGroup()
+    if err != nil {
+        return err
+    }
+    // Removes container information from all groups it is found in
+    err = groups.RemoveContainerGroups(containerInfo)
+    if err != nil {
+        return err
+    }
+    // Write groups information on the grouptrackcontainer.json file
+    err = groups.WriteGroup()
+    if err != nil {
+        return err
+    }
 
-	return nil
+    return nil
 }
 
 // GetGroup Gets group information based on
 // group id provided
-func GetGroup(GroupID string) (*Group,error) {
-	// Read group information from the
-	//grouptrackcontainer json file
-	groups, err := ReadGroup()
-	if err != nil {
-		return nil, err
-	}
-	// Iterate through the set of groups and
-	// if the group ID matches then return it
-	for i, group := range groups.GroupList {
-		if group.ID == GroupID {
-			group.index = i
-			return group, nil
-		}
-	}
+func GetGroup(GroupID string) (*Group, error) {
+    // Read group information from the
+    //grouptrackcontainer json file
+    groups, err := ReadGroup()
+    if err != nil {
+        return nil, err
+    }
+    // Iterate through the set of groups and
+    // if the group ID matches then return it
+    for i, group := range groups.GroupList {
+        if group.ID == GroupID {
+            group.index = i
+            return group, nil
+        }
+    }
 
-	return nil,errors.New("Group not found. ")
+    return nil, errors.New("Group not found. ")
 }
 
 // AddGroupToFile Adds Group struct to the GroupTrackContainer File
 func (grp *Group) AddGroupToFile() error {
-	// Gets all group information from the
-	// GroupTrackContainer JSON file
+    // Gets all group information from the
+    // GroupTrackContainer JSON file
     groups, err := ReadGroup()
     if err != nil {
-    	return err
-	}
-	// Appending the newly created group
-	groups.GroupList = append(groups.GroupList, grp)
-	// Writing Group information to the GroupTrackContainer
-	// JSON file
-	err = groups.WriteGroup()
-	if err != nil {
-		return err
-	}
+        return err
+    }
+    // Appending the newly created group
+    groups.GroupList = append(groups.GroupList, grp)
+    // Writing Group information to the GroupTrackContainer
+    // JSON file
+    err = groups.WriteGroup()
+    if err != nil {
+        return err
+    }
 
-	return nil
+    return nil
 }
 
 // ReadGroup Function reads grouptrackcontainers.json and converts
 // result to Groups
-func ReadGroup() (*Groups,error) {
-	// Get Path from config
-	config, err := config.ConfigInit()
-	if err != nil {
-		return nil,err
-	}
-	jsonFile, err := os.Open(config.GroupTrackContainersPath)
-	// if we os.Open returns an error then handle it
-	if err != nil {
-		return nil,err
-	}
-	// defer the closing of our jsonFile so that we can parse it later on
-	defer jsonFile.Close()
-	// read our opened xmlFile as a byte array.
-	byteValue, _ := ioutil.ReadAll(jsonFile)
-	// we initialize our Users array
-	var groups Groups
-	// we unmarshal our byteArray which contains our
-	// jsonFile's content into 'users' which we defined above
-	json.Unmarshal(byteValue, &groups)
-	return &groups, nil
+func ReadGroup() (*Groups, error) {
+    // Get Path from config
+    config, err := config.ConfigInit(nil, nil)
+    if err != nil {
+        return nil, err
+    }
+    jsonFile, err := os.Open(config.GroupTrackContainersPath)
+    // if we os.Open returns an error then handle it
+    if err != nil {
+        return nil, err
+    }
+    // defer the closing of our jsonFile so that we can parse it later on
+    defer jsonFile.Close()
+    // read our opened xmlFile as a byte array.
+    byteValue, _ := ioutil.ReadAll(jsonFile)
+    // we initialize our Users array
+    var groups Groups
+    // we unmarshal our byteArray which contains our
+    // jsonFile's content into 'users' which we defined above
+    json.Unmarshal(byteValue, &groups)
+    return &groups, nil
 }
 
-
 // WriteGroup Function to write type Groups to the grouptrackcontainers.json file
-func (grp *Groups)WriteGroup() error {
-	file, err := json.MarshalIndent(grp, "", " ")
-	if err != nil {
-		return err
-	}
-	// Get Path from config
-	config, err := config.ConfigInit()
-	if err != nil {
-		return err
-	}
+func (grp *Groups) WriteGroup() error {
+    file, err := json.MarshalIndent(grp, "", " ")
+    if err != nil {
+        return err
+    }
+    // Get Path from config
+    config, err := config.ConfigInit(nil, nil)
+    if err != nil {
+        return err
+    }
     // Writes to the appropriate file
-	err = ioutil.WriteFile(config.GroupTrackContainersPath, file, 0644)
-	if err != nil {
-		return err
-	}
-	return nil
+    err = ioutil.WriteFile(config.GroupTrackContainersPath, file, 0644)
+    if err != nil {
+        return err
+    }
+    return nil
 }
 
 // AddContainer Adds a container to the Tracked container list of the group
-func (grp *Group)AddContainer(Container *TrackContainer) error {
-	grp.TrackContainerList = append(grp.TrackContainerList, Container)
-	return nil
+func (grp *Group) AddContainer(Container *TrackContainer) error {
+    grp.TrackContainerList = append(grp.TrackContainerList, Container)
+    return nil
 }
 
 // RemoveContainerGroup Removes container information from the group
-func (grp *Group)RemoveContainerGroup(Container *TrackContainer) error {
-	// Iterating through all container in the Group of Tracked Container
-	for i, container := range grp.TrackContainerList {
-		// If the container ID matches then remove the container from the group
-		if container.Id == Container.Id {
-			grp.TrackContainerList = append(grp.TrackContainerList[:i], grp.TrackContainerList[i+1:]...)
-		}
-	}
-	return nil
+func (grp *Group) RemoveContainerGroup(Container *TrackContainer) error {
+    // Iterating through all container in the Group of Tracked Container
+    for i, container := range grp.TrackContainerList {
+        // If the container ID matches then remove the container from the group
+        if container.Id == Container.Id {
+            grp.TrackContainerList = append(grp.TrackContainerList[:i], grp.TrackContainerList[i+1:]...)
+        }
+    }
+    return nil
 }
 
 // RemoveContainerGroups removes container found in all groups
-func (grp *Groups)RemoveContainerGroups(Container *TrackContainer) error {
-	// Iterating through all groups
-	for i,group := range grp.GroupList {
-		// Removes the container in the following group
-		// if it exists
-		err := group.RemoveContainerGroup(Container)
-		if err != nil {
-			return err
-		}
-		// Set group information to list groups
-		grp.GroupList[i] = group
-	}
-	return nil
+func (grp *Groups) RemoveContainerGroups(Container *TrackContainer) error {
+    // Iterating through all groups
+    for i, group := range grp.GroupList {
+        // Removes the container in the following group
+        // if it exists
+        err := group.RemoveContainerGroup(Container)
+        if err != nil {
+            return err
+        }
+        // Set group information to list groups
+        grp.GroupList[i] = group
+    }
+    return nil
 }
 
 // ModifyContainerGroups Modifies container information is all groups
 // available
-func (TC *TrackContainer)ModifyContainerGroups() error {
-	group, err := ReadGroup()
-	if err != nil {
-		return err
-	}
-	// Iterate though all groups and modify the container
-	// information in groups where the modified container
-	// ID matches
-	for i, _ := range group.GroupList {
-		// Checking in each group if the modified container ID exists
-		for j, _:= range group.GroupList[i].TrackContainerList {
-			// If there is match then change them
-			if group.GroupList[i].TrackContainerList[j].Id == TC.Id {
-				group.GroupList[i].TrackContainerList[j] = TC
-			}
-		}
-	}
+func (TC *TrackContainer) ModifyContainerGroups() error {
+    group, err := ReadGroup()
+    if err != nil {
+        return err
+    }
+    // Iterate though all groups and modify the container
+    // information in groups where the modified container
+    // ID matches
+    for i, _ := range group.GroupList {
+        // Checking in each group if the modified container ID exists
+        for j, _ := range group.GroupList[i].TrackContainerList {
+            // If there is match then change them
+            if group.GroupList[i].TrackContainerList[j].Id == TC.Id {
+                group.GroupList[i].TrackContainerList[j] = TC
+            }
+        }
+    }
 
-	// Write modified result to the Groups track container JSON file
-	err = group.WriteGroup()
-	if err != nil {
-		return err
-	}
+    // Write modified result to the Groups track container JSON file
+    err = group.WriteGroup()
+    if err != nil {
+        return err
+    }
 
-	return nil
-}
+    return nil
+}

client/GroupTrackContainer_test.go

@@ -2,7 +2,7 @@ package client
 
 import (
 	"fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/server/docker"
+	"github.com/Akilan1999/p2p-rendering-computation/server/docker"
 	"testing"
 )
 
@@ -46,14 +46,14 @@ func TestAddContainerToGroup(t *testing.T) {
 
 	// Creating and adding the container to the
 	// tracked list
-	container1 ,err := docker.BuildRunContainer(0,"false","")
+	container1, err := docker.BuildRunContainer(0, "false", "")
 	if err != nil {
 		fmt.Println(err)
 		t.Fail()
 	}
 
 	// Testing the AddTrackContainer Function and adding the first container created
-	err = AddTrackContainer(container1,"0.0.0.0")
+	err = AddTrackContainer(container1, "0.0.0.0")
 	if err != nil {
 		// Killing docker container created
 		err = docker.StopAndRemoveContainer(container1.ID)
@@ -66,7 +66,7 @@ func TestAddContainerToGroup(t *testing.T) {
 	}
 
 	// Adds container information to the group
-	Group, err := AddContainerToGroup(container1.ID,group.ID)
+	Group, err := AddContainerToGroup(container1.ID, group.ID)
 	if err != nil {
 		fmt.Println(err)
 		t.Fail()
@@ -109,14 +109,14 @@ func TestGroup_RemoveContainerGroup(t *testing.T) {
 
 	// Creating and adding the container to the
 	// tracked list
-	container1 ,err := docker.BuildRunContainer(0,"false","")
+	container1, err := docker.BuildRunContainer(0, "false", "")
 	if err != nil {
 		fmt.Println(err)
 		t.Fail()
 	}
 
 	// Testing the AddTrackContainer Function and adding the first container created
-	err = AddTrackContainer(container1,"0.0.0.0")
+	err = AddTrackContainer(container1, "0.0.0.0")
 	if err != nil {
 		// Killing docker container created
 		err = docker.StopAndRemoveContainer(container1.ID)
@@ -129,7 +129,7 @@ func TestGroup_RemoveContainerGroup(t *testing.T) {
 	}
 
 	// Adds container information to the group
-	Group, err := AddContainerToGroup(container1.ID,group.ID)
+	Group, err := AddContainerToGroup(container1.ID, group.ID)
 	if err != nil {
 		fmt.Println(err)
 		t.Fail()
@@ -138,7 +138,7 @@ func TestGroup_RemoveContainerGroup(t *testing.T) {
 	PrettyPrint(Group)
 
 	// Removing docker container from the group
-	Group, err = RemoveContainerGroup(container1.ID,group.ID)
+	Group, err = RemoveContainerGroup(container1.ID, group.ID)
 	if err != nil {
 		fmt.Println(err)
 		t.Fail()
@@ -182,7 +182,7 @@ func TestGroups_RemoveContainerGroups(t *testing.T) {
 		fmt.Println(err)
 		t.Fail()
 	}
-    // Created another group assigned to variable group 1
+	// Created another group assigned to variable group 1
 	group1, err := CreateGroup()
 	if err != nil {
 		fmt.Println(err)
@@ -191,14 +191,14 @@ func TestGroups_RemoveContainerGroups(t *testing.T) {
 
 	// Creating and adding the container to the
 	// tracked list
-	container1 ,err := docker.BuildRunContainer(0,"false","")
+	container1, err := docker.BuildRunContainer(0, "false", "")
 	if err != nil {
 		fmt.Println(err)
 		t.Fail()
 	}
 
 	// Testing the AddTrackContainer Function and adding the first container created
-	err = AddTrackContainer(container1,"0.0.0.0")
+	err = AddTrackContainer(container1, "0.0.0.0")
 	if err != nil {
 		// Killing docker container created
 		err = docker.StopAndRemoveContainer(container1.ID)
@@ -211,7 +211,7 @@ func TestGroups_RemoveContainerGroups(t *testing.T) {
 	}
 
 	// Adds container information to the group
-	Group, err := AddContainerToGroup(container1.ID,group.ID)
+	Group, err := AddContainerToGroup(container1.ID, group.ID)
 	if err != nil {
 		fmt.Println(err)
 		t.Fail()
@@ -220,7 +220,7 @@ func TestGroups_RemoveContainerGroups(t *testing.T) {
 	PrettyPrint(Group)
 
 	// Adds container information to the group
-	Group1, err := AddContainerToGroup(container1.ID,group1.ID)
+	Group1, err := AddContainerToGroup(container1.ID, group1.ID)
 	if err != nil {
 		fmt.Println(err)
 		t.Fail()

client/ServerSpecs.go

@@ -3,7 +3,7 @@ package client
 import (
 	"encoding/json"
 	"fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/server"
+	"github.com/Akilan1999/p2p-rendering-computation/server"
 	"io/ioutil"
 	"net/http"
 )

client/TrackContainers.go

@@ -1,149 +1,149 @@
 package client
 
 import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/server/docker"
-	"io/ioutil"
-	"os"
+    "encoding/json"
+    "errors"
+    "fmt"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
+    "github.com/Akilan1999/p2p-rendering-computation/server/docker"
+    "io/ioutil"
+    "os"
 )
 
 // TrackContainers This struct stores arrays of current containers running
 type TrackContainers struct {
-  	TrackContainerList []TrackContainer `json:"TrackContainer"`
+    TrackContainerList []TrackContainer `json:"TrackContainer"`
 }
 
 // TrackContainer Stores information of current containers
 type TrackContainer struct {
-	Id        string            `json:"ID"`
-	Container *docker.DockerVM  `json:"Container"`
-	IpAddress string            `json:"IpAddress"`
+    Id        string           `json:"ID"`
+    Container *docker.DockerVM `json:"Container"`
+    IpAddress string           `json:"IpAddress"`
 }
 
 // AddTrackContainer Adds new container which has been added to the track container
-func AddTrackContainer(d *docker.DockerVM,ipAddress string) error {
-	// Checking if pointer d is null
-	if d == nil {
-		return errors.New("d is nil")
-	}
-	//Get config information to derive paths for track containers json file
-	config,err := config.ConfigInit()
-	if err != nil {
-		return err
-	}
+func AddTrackContainer(d *docker.DockerVM, ipAddress string) error {
+    // Checking if pointer d is null
+    if d == nil {
+        return errors.New("d is nil")
+    }
+    //Get config information to derive paths for track containers json file
+    config, err := config.ConfigInit(nil, nil)
+    if err != nil {
+        return err
+    }
 
     // Getting information about the file trackcontainers.json file
     stat, err := os.Stat(config.TrackContainersPath)
-	if err != nil {
-		return err
-	}
-	// Initialize variable for TrackContainers
-	var trackContainers TrackContainers
-	// If the trackcontainers.json file is not empty then
-	// Read from that file
-	if stat.Size() != 0 {
-		// Reads tracked container file
-		trackContainersFile, err := ReadTrackContainers(config.TrackContainersPath)
-		if err != nil {
-			return err
-		}
-		trackContainers = *trackContainersFile
-	}
+    if err != nil {
+        return err
+    }
+    // Initialize variable for TrackContainers
+    var trackContainers TrackContainers
+    // If the trackcontainers.json file is not empty then
+    // Read from that file
+    if stat.Size() != 0 {
+        // Reads tracked container file
+        trackContainersFile, err := ReadTrackContainers(config.TrackContainersPath)
+        if err != nil {
+            return err
+        }
+        trackContainers = *trackContainersFile
+    }
 
-	// Initialize new variable with type struct TrackContainers and
-	// add container struct and ip address
-	var trackContainer TrackContainer
-	trackContainer.Id = d.ID
-	trackContainer.Container = d
-	trackContainer.IpAddress = ipAddress
+    // Initialize new variable with type struct TrackContainers and
+    // add container struct and ip address
+    var trackContainer TrackContainer
+    trackContainer.Id = d.ID
+    trackContainer.Container = d
+    trackContainer.IpAddress = ipAddress
 
-	// Adds new container as passed in the parameter to the struct
-	if &trackContainer == nil {
-		return errors.New("trackContainer variable is nil")
-	}
-	trackContainers.TrackContainerList = append(trackContainers.TrackContainerList, trackContainer)
+    // Adds new container as passed in the parameter to the struct
+    if &trackContainer == nil {
+        return errors.New("trackContainer variable is nil")
+    }
+    trackContainers.TrackContainerList = append(trackContainers.TrackContainerList, trackContainer)
 
-	// write modified information to the tracked json file
-	data,err := json.MarshalIndent(trackContainers, "", "\t")
-	if err != nil {
-		return err
-	}
-	err = ioutil.WriteFile(config.TrackContainersPath,data,0777)
-	if err != nil {
-		return err
-	}
+    // write modified information to the tracked json file
+    data, err := json.MarshalIndent(trackContainers, "", "\t")
+    if err != nil {
+        return err
+    }
+    err = ioutil.WriteFile(config.TrackContainersPath, data, 0777)
+    if err != nil {
+        return err
+    }
 
-	return nil
+    return nil
 }
 
 // RemoveTrackedContainer This function removos tracked container from the trackcontainer JSON file
 func RemoveTrackedContainer(id string) error {
-	//Get config information to derive paths for track containers json file
-	config,err := config.ConfigInit()
-	if err != nil {
-		return err
-	}
-	// Getting tracked container struct
-	trackedContainers, err := ReadTrackContainers(config.TrackContainersPath)
-	// Storing index of element to remove
-	var removeElement int
-	removeElement = -1
-	for i := range trackedContainers.TrackContainerList {
-		if trackedContainers.TrackContainerList[i].Id == id {
-			removeElement = i
-			break
-		}
-	}
-	// Checks if the element to be removed has been detected
-	if removeElement == -1 {
-		return errors.New("Container ID not found in the tracked list")
-	}
-	// Remove the detected element from the struct
-	trackedContainers.TrackContainerList = append(trackedContainers.TrackContainerList[:removeElement], trackedContainers.TrackContainerList[removeElement+1:]...)
+    //Get config information to derive paths for track containers json file
+    config, err := config.ConfigInit(nil, nil)
+    if err != nil {
+        return err
+    }
+    // Getting tracked container struct
+    trackedContainers, err := ReadTrackContainers(config.TrackContainersPath)
+    // Storing index of element to remove
+    var removeElement int
+    removeElement = -1
+    for i := range trackedContainers.TrackContainerList {
+        if trackedContainers.TrackContainerList[i].Id == id {
+            removeElement = i
+            break
+        }
+    }
+    // Checks if the element to be removed has been detected
+    if removeElement == -1 {
+        return errors.New("Container ID not found in the tracked list")
+    }
+    // Remove the detected element from the struct
+    trackedContainers.TrackContainerList = append(trackedContainers.TrackContainerList[:removeElement], trackedContainers.TrackContainerList[removeElement+1:]...)
 
-	// write modified information to the tracked json file
-	data,err := json.MarshalIndent(trackedContainers, "", "\t")
-	if err != nil {
-		return err
-	}
-	err = ioutil.WriteFile(config.TrackContainersPath,data,0777)
-	if err != nil {
-		return err
-	}
+    // write modified information to the tracked json file
+    data, err := json.MarshalIndent(trackedContainers, "", "\t")
+    if err != nil {
+        return err
+    }
+    err = ioutil.WriteFile(config.TrackContainersPath, data, 0777)
+    if err != nil {
+        return err
+    }
 
-	return nil
+    return nil
 }
 
 // ViewTrackedContainers View Containers currently tracked
-func ViewTrackedContainers() (error,*TrackContainers) {
-	config,err := config.ConfigInit()
-	if err != nil {
-		return err,nil
-	}
-	trackedContianers, err := ReadTrackContainers(config.TrackContainersPath)
-	if err != nil {
-		return err,nil
-	}
+func ViewTrackedContainers() (error, *TrackContainers) {
+    config, err := config.ConfigInit(nil, nil)
+    if err != nil {
+        return err, nil
+    }
+    trackedContianers, err := ReadTrackContainers(config.TrackContainersPath)
+    if err != nil {
+        return err, nil
+    }
 
-	return nil,trackedContianers
+    return nil, trackedContianers
 }
 
 // ReadTrackContainers Reads containers which are currently tracked
 func ReadTrackContainers(filename string) (*TrackContainers, error) {
-	buf, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return nil, err
-	}
+    buf, err := ioutil.ReadFile(filename)
+    if err != nil {
+        return nil, err
+    }
 
-	c := &TrackContainers{}
-	err = json.Unmarshal(buf, c)
-	if err != nil {
-		return nil, fmt.Errorf("in file %q: %v", filename, err)
-	}
+    c := &TrackContainers{}
+    err = json.Unmarshal(buf, c)
+    if err != nil {
+        return nil, fmt.Errorf("in file %q: %v", filename, err)
+    }
 
-	return c, nil
+    return c, nil
 }
 
 //func ModifyTrackContainers()
@@ -151,70 +151,70 @@ func ReadTrackContainers(filename string) (*TrackContainers, error) {
 // GetContainerInformation gets information about container based on
 // container ID provided
 func GetContainerInformation(ID string) (*TrackContainer, error) {
-	// Getting the current containers
-	err, CurrentContainers := ViewTrackedContainers()
-	if err != nil {
-		return nil, err
-	}
-	// Iterating through all tracked containers to get the container information
-	// of the ID passed through the function parameter
-	for _, container := range CurrentContainers.TrackContainerList {
-		if container.Container.ID == ID {
-			return &container, nil
-		}
-	}
-	return nil, errors.New("Container not found. ")
+    // Getting the current containers
+    err, CurrentContainers := ViewTrackedContainers()
+    if err != nil {
+        return nil, err
+    }
+    // Iterating through all tracked containers to get the container information
+    // of the ID passed through the function parameter
+    for _, container := range CurrentContainers.TrackContainerList {
+        if container.Container.ID == ID {
+            return &container, nil
+        }
+    }
+    return nil, errors.New("Container not found. ")
 }
 
 // ModifyContainerInformation Modifies information inside the container
-func (TC *TrackContainer)ModifyContainerInformation() error {
-	// Gets all the information of tracker containers
-	err, t := ViewTrackedContainers()
-	if err != nil {
-		return err
-	}
-	// Find the element where the containers match and
-	// change them
-	for i, container := range t.TrackContainerList {
-		if TC.Id == container.Id {
-			t.TrackContainerList[i] = *TC
-			break
-		}
-	}
-	// Write the modified information to the file
-	// write modified information to the tracked json file
-	err = t.WriteContainers()
-	if err != nil {
-		return err
-	}
+func (TC *TrackContainer) ModifyContainerInformation() error {
+    // Gets all the information of tracker containers
+    err, t := ViewTrackedContainers()
+    if err != nil {
+        return err
+    }
+    // Find the element where the containers match and
+    // change them
+    for i, container := range t.TrackContainerList {
+        if TC.Id == container.Id {
+            t.TrackContainerList[i] = *TC
+            break
+        }
+    }
+    // Write the modified information to the file
+    // write modified information to the tracked json file
+    err = t.WriteContainers()
+    if err != nil {
+        return err
+    }
 
-	return nil
+    return nil
 }
 
 // WriteContainers Write information back to the config file
-func (TC *TrackContainers)WriteContainers() error {
-	// Initialize config file
-	config,err := config.ConfigInit()
-	// write modified information to the tracked json file
-	data,err := json.MarshalIndent(TC, "", "\t")
-	if err != nil {
-		return err
-	}
-	err = ioutil.WriteFile(config.TrackContainersPath,data,0777)
-	if err != nil {
-		return err
-	}
+func (TC *TrackContainers) WriteContainers() error {
+    // Initialize config file
+    config, err := config.ConfigInit(nil, nil)
+    // write modified information to the tracked json file
+    data, err := json.MarshalIndent(TC, "", "\t")
+    if err != nil {
+        return err
+    }
+    err = ioutil.WriteFile(config.TrackContainersPath, data, 0777)
+    if err != nil {
+        return err
+    }
 
-	return nil
+    return nil
 }
 
 // CheckID Checks if the ID belongs to a group or a single container
-func CheckID(ID string) (string,error) {
+func CheckID(ID string) (string, error) {
     // For group checks if the 1st characters is "grp"
-	if ID[0:3] == "grp" {
-		return "group", nil
-	} else {
-		return "container", nil
-	}
-	return "",nil
-}
+    if ID[0:3] == "grp" {
+        return "group", nil
+    } else {
+        return "container", nil
+    }
+    return "", nil
+}

client/TrackContianers_test.go

@@ -2,20 +2,20 @@ package client
 
 import (
 	"fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/server/docker"
+	"github.com/Akilan1999/p2p-rendering-computation/server/docker"
 	"testing"
 )
 
 // Tests a scenario where the container are getting tracked
 func TestAddTrackContainer(t *testing.T) {
 	// Create docker container and get SSH port
-	container1 ,err := docker.BuildRunContainer(0,"false","")
+	container1, err := docker.BuildRunContainer(0, "false", "")
 	if err != nil {
 		fmt.Println(err)
 		t.Fail()
 	}
 	// Testing the AddTrackContainer Function
-	err = AddTrackContainer(container1,"0.0.0.0")
+	err = AddTrackContainer(container1, "0.0.0.0")
 	if err != nil {
 		// Killing docker container created
 		err = docker.StopAndRemoveContainer(container1.ID)
@@ -26,7 +26,7 @@ func TestAddTrackContainer(t *testing.T) {
 		fmt.Println(err)
 		t.Fail()
 	}
-    // Killing docker container created
+	// Killing docker container created
 	err = docker.StopAndRemoveContainer(container1.ID)
 	if err != nil {
 		fmt.Println(err)
@@ -38,20 +38,20 @@ func TestAddTrackContainer(t *testing.T) {
 // NOTE: This test can also be considered as a whole flow on the process of
 // tracked containers
 func TestRemoveTrackedContainer(t *testing.T) {
-	container1 ,err := docker.BuildRunContainer(0,"false","")
+	container1, err := docker.BuildRunContainer(0, "false", "")
 	if err != nil {
 		fmt.Println(err)
 		t.Fail()
 	}
 
-	container2 ,err := docker.BuildRunContainer(0,"false","")
+	container2, err := docker.BuildRunContainer(0, "false", "")
 	if err != nil {
 		fmt.Println(err)
 		t.Fail()
 	}
 
 	// Testing the AddTrackContainer Function and adding the first container created
-	err = AddTrackContainer(container1,"0.0.0.0")
+	err = AddTrackContainer(container1, "0.0.0.0")
 	if err != nil {
 		// Killing docker container created
 		err = docker.StopAndRemoveContainer(container1.ID)
@@ -70,7 +70,7 @@ func TestRemoveTrackedContainer(t *testing.T) {
 	}
 
 	// Testing the AddTrackContainer Function and the adding the second container created
-	err = AddTrackContainer(container2,"0.0.0.0")
+	err = AddTrackContainer(container2, "0.0.0.0")
 	if err != nil {
 		// Killing docker container created
 		err = docker.StopAndRemoveContainer(container2.ID)
@@ -106,7 +106,7 @@ func TestRemoveTrackedContainer(t *testing.T) {
 // Test function that checks if the ID belongs to
 // a group or container running
 func TestCheckID(t *testing.T) {
-    id := "grp123"
+	id := "grp123"
 	checkID, err := CheckID(id)
 	if err != nil {
 		fmt.Println(err)

client/clientIPTable/Iptable.go

@@ -1,16 +1,16 @@
 package clientIPTable
 
 import (
-	"encoding/json"
-	"fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/p2p"
-	"io"
-	"io/ioutil"
-	"mime/multipart"
-	"net/http"
-	"os"
-	"sync"
+    "encoding/json"
+    "fmt"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
+    "github.com/Akilan1999/p2p-rendering-computation/p2p"
+    "io"
+    "io/ioutil"
+    "mime/multipart"
+    "net/http"
+    "os"
+    "sync"
 )
 
 var mu sync.Mutex
@@ -18,136 +18,136 @@ var mu sync.Mutex
 // UpdateIpTable Does the following to update it's IP table
 func UpdateIpTable(IpAddress string, serverPort string, wg *sync.WaitGroup) error {
 
-	config, err := config.ConfigInit()
-	if err != nil {
-		return err
-	}
+    config, err := config.ConfigInit(nil, nil)
+    if err != nil {
+        return err
+    }
 
-	client := http.Client{}
+    client := http.Client{}
 
-	var resp []byte
+    var resp []byte
 
-	version := p2p.Ip4or6(IpAddress)
-	if version == "version 6" {
-		resp, err = UploadMultipartFile(client, "http://["+IpAddress+"]:"+serverPort+"/IpTable", "json", config.IPTable)
-		if err != nil {
-			return err
-		}
-	} else {
-		resp, err = UploadMultipartFile(client, "http://"+IpAddress+":"+serverPort+"/IpTable", "json", config.IPTable)
-		if err != nil {
-			return err
-		}
-	}
+    version := p2p.Ip4or6(IpAddress)
+    if version == "version 6" {
+        resp, err = UploadMultipartFile(client, "http://["+IpAddress+"]:"+serverPort+"/IpTable", "json", config.IPTable)
+        if err != nil {
+            return err
+        }
+    } else {
+        resp, err = UploadMultipartFile(client, "http://"+IpAddress+":"+serverPort+"/IpTable", "json", config.IPTable)
+        if err != nil {
+            return err
+        }
+    }
 
-	if resp == nil {
-		return nil
-	}
+    if resp == nil {
+        return nil
+    }
 
-	//resp, err := SendPostRequest("http://"+IpAddress+":8088/IpTable",
-	//	config.IPTable,
-	//	"json")
-	//
-	//if err != nil {
-	//	return err
-	//}
+    //resp, err := SendPostRequest("http://"+IpAddress+":8088/IpTable",
+    //	config.IPTable,
+    //	"json")
+    //
+    //if err != nil {
+    //	return err
+    //}
 
-	var ipStruct p2p.IpAddresses
-	json.Unmarshal(resp, &ipStruct)
+    var ipStruct p2p.IpAddresses
+    json.Unmarshal(resp, &ipStruct)
 
-	// Updates IP table based on information provided
-	// by the server
-	if len(ipStruct.IpAddress) > 0 {
-		err = ipStruct.SpeedTestUpdatedIPTable()
-		if err != nil {
-			return err
-		}
-	}
+    // Updates IP table based on information provided
+    // by the server
+    if len(ipStruct.IpAddress) > 0 {
+        err = ipStruct.SpeedTestUpdatedIPTable()
+        if err != nil {
+            return err
+        }
+    }
 
-	err = ipStruct.WriteIpTable()
-	if err != nil {
-		return err
-	}
+    err = ipStruct.WriteIpTable()
+    if err != nil {
+        return err
+    }
 
-	wg.Done()
+    wg.Done()
 
-	return nil
+    return nil
 }
 
 // UpdateIpTableListClient updates IP tables (Default 3 hops) based on server information available
 // on the ip tables
 func UpdateIpTableListClient() error {
-	// Get config information
-	Config, err := config.ConfigInit()
-	if err != nil {
-		return err
-	}
+    // Get config information
+    Config, err := config.ConfigInit(nil, nil)
+    if err != nil {
+        return err
+    }
 
-	// Ensure that the IP Table has Node pingable
-	err = p2p.LocalSpeedTestIpTable()
-	if err != nil {
-		return err
-	}
+    // Ensure that the IP Table has Node pingable
+    err = p2p.LocalSpeedTestIpTable()
+    if err != nil {
+        return err
+    }
 
-	// IP addresses to not append to struct due to
-	// duplication
+    // IP addresses to not append to struct due to
+    // duplication
 
-	Addresses, err := p2p.ReadIpTable()
-	var DoNotRead p2p.IpAddresses
+    Addresses, err := p2p.ReadIpTable()
+    var DoNotRead p2p.IpAddresses
 
-	currentIPV4, err := p2p.CurrentPublicIP()
-	if err != nil {
-		return err
-	}
+    currentIPV4, err := p2p.CurrentPublicIP()
+    if err != nil {
+        return err
+    }
 
-	var w sync.WaitGroup
+    var w sync.WaitGroup
 
-	// Run loop 2 times
-	for i := 0; i < 2; i++ {
-		// Gets information from IP table
-		Addresses, err = p2p.ReadIpTable()
-		if err != nil {
-			return err
-		}
+    // Run loop 2 times
+    for i := 0; i < 2; i++ {
+        // Gets information from IP table
+        Addresses, err = p2p.ReadIpTable()
+        if err != nil {
+            return err
+        }
 
-		//DoNotRead.IpAddress = append(DoNotRead.IpAddress, PublicIP)
+        //DoNotRead.IpAddress = append(DoNotRead.IpAddress, PublicIP)
 
-		// Updates IP table based on server IP table
-		for j := range Addresses.IpAddress {
+        // Updates IP table based on server IP table
+        for j := range Addresses.IpAddress {
 
-			Exists := false
-			// If the address is local then add to the local list
-			if currentIPV4 == Addresses.IpAddress[j].Ipv4 && Addresses.IpAddress[j].ServerPort == Config.ServerPort {
-				Exists = true
-			}
+            Exists := false
+            // If the address is local then add to the local list
+            if currentIPV4 == Addresses.IpAddress[j].Ipv4 && Addresses.IpAddress[j].ServerPort == Config.ServerPort {
+                Exists = true
+            }
 
-			// Check if IP addresses is there in the struct DoNotRead
-			for k := range DoNotRead.IpAddress {
-				if (DoNotRead.IpAddress[k].Ipv4 == Addresses.IpAddress[j].Ipv4 && DoNotRead.IpAddress[k].ServerPort == Addresses.IpAddress[j].ServerPort) || (DoNotRead.IpAddress[k].Ipv6 != "" && Addresses.IpAddress[j].Ipv6 == DoNotRead.IpAddress[k].Ipv6) {
-					Exists = true
-					break
-				}
-			}
+            // Check if IP addresses is there in the struct DoNotRead
+            for k := range DoNotRead.IpAddress {
+                if (DoNotRead.IpAddress[k].Ipv4 == Addresses.IpAddress[j].Ipv4 && DoNotRead.IpAddress[k].ServerPort == Addresses.IpAddress[j].ServerPort) || (DoNotRead.IpAddress[k].Ipv6 != "" && Addresses.IpAddress[j].Ipv6 == DoNotRead.IpAddress[k].Ipv6) {
+                    Exists = true
+                    break
+                }
+            }
 
-			// If the struct exists then continues
-			if Exists {
-				continue
-			}
+            // If the struct exists then continues
+            if Exists {
+                continue
+            }
 
-			w.Add(1)
-			if Addresses.IpAddress[j].Ipv6 != "" {
-				go UpdateIpTable(Addresses.IpAddress[j].Ipv6, Addresses.IpAddress[j].ServerPort, &w)
-			} else if Addresses.IpAddress[j].Ipv4 != currentIPV4 {
-				go UpdateIpTable(Addresses.IpAddress[j].Ipv4, Addresses.IpAddress[j].ServerPort, &w)
-			}
-			w.Wait()
+            w.Add(1)
+            if Addresses.IpAddress[j].Ipv6 != "" {
+                go UpdateIpTable(Addresses.IpAddress[j].Ipv6, Addresses.IpAddress[j].ServerPort, &w)
+            } else if Addresses.IpAddress[j].Ipv4 != currentIPV4 {
+                go UpdateIpTable(Addresses.IpAddress[j].Ipv4, Addresses.IpAddress[j].ServerPort, &w)
+            }
+            w.Wait()
 
-			//Appends server1 IP address to variable DoNotRead
-			DoNotRead.IpAddress = append(DoNotRead.IpAddress, Addresses.IpAddress[j])
-		}
-	}
+            //Appends server1 IP address to variable DoNotRead
+            DoNotRead.IpAddress = append(DoNotRead.IpAddress, Addresses.IpAddress[j])
+        }
+    }
 
-	return nil
+    return nil
 }
 
 // SendPostRequest Sends a file as a
@@ -197,58 +197,58 @@ func UpdateIpTableListClient() error {
 //}
 
 func UploadMultipartFile(client http.Client, uri, key, path string) ([]byte, error) {
-	body, writer := io.Pipe()
+    body, writer := io.Pipe()
 
-	req, err := http.NewRequest(http.MethodPost, uri, body)
-	if err != nil {
-		return nil, err
-	}
+    req, err := http.NewRequest(http.MethodPost, uri, body)
+    if err != nil {
+        return nil, err
+    }
 
-	mwriter := multipart.NewWriter(writer)
-	req.Header.Add("Content-Type", mwriter.FormDataContentType())
+    mwriter := multipart.NewWriter(writer)
+    req.Header.Add("Content-Type", mwriter.FormDataContentType())
 
-	errchan := make(chan error)
+    errchan := make(chan error)
 
-	go func() {
-		defer close(errchan)
-		defer writer.Close()
-		defer mwriter.Close()
+    go func() {
+        defer close(errchan)
+        defer writer.Close()
+        defer mwriter.Close()
 
-		w, err := mwriter.CreateFormFile(key, path)
-		if err != nil {
-			errchan <- err
-			return
-		}
+        w, err := mwriter.CreateFormFile(key, path)
+        if err != nil {
+            errchan <- err
+            return
+        }
 
-		in, err := os.Open(path)
-		if err != nil {
-			errchan <- err
-			return
-		}
-		defer in.Close()
+        in, err := os.Open(path)
+        if err != nil {
+            errchan <- err
+            return
+        }
+        defer in.Close()
 
-		if written, err := io.Copy(w, in); err != nil {
-			errchan <- fmt.Errorf("error copying %s (%d bytes written): %v", path, written, err)
-			return
-		}
+        if written, err := io.Copy(w, in); err != nil {
+            errchan <- fmt.Errorf("error copying %s (%d bytes written): %v", path, written, err)
+            return
+        }
 
-		if err := mwriter.Close(); err != nil {
-			errchan <- err
-			return
-		}
-	}()
+        if err := mwriter.Close(); err != nil {
+            errchan <- err
+            return
+        }
+    }()
 
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
+    resp, err := client.Do(req)
+    if err != nil {
+        return nil, err
+    }
 
-	content, err := ioutil.ReadAll(resp.Body)
+    content, err := ioutil.ReadAll(resp.Body)
 
-	if err != nil {
-		return nil, err
-	}
+    if err != nil {
+        return nil, err
+    }
 
-	return content, nil
+    return content, nil
 
 }

client/container.go

@@ -3,8 +3,8 @@ package client
 import (
 	"encoding/json"
 	"fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/p2p"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/server/docker"
+	"github.com/Akilan1999/p2p-rendering-computation/p2p"
+	"github.com/Akilan1999/p2p-rendering-computation/server/docker"
 	"io/ioutil"
 	"net/http"
 	"strconv"

client/grouptrackcontainers.json

@@ -0,0 +1 @@
+{}

client/trackcontainers.json

@@ -0,0 +1 @@
+{}

cmd/action.go

@@ -1,304 +1,277 @@
 package cmd
 
 import (
-	"fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/client"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/client/clientIPTable"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/generate"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/p2p"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/plugin"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/server"
-	"github.com/urfave/cli/v2"
+    "fmt"
+    "github.com/Akilan1999/p2p-rendering-computation/client"
+    "github.com/Akilan1999/p2p-rendering-computation/client/clientIPTable"
+    "github.com/Akilan1999/p2p-rendering-computation/config/generate"
+    "github.com/Akilan1999/p2p-rendering-computation/p2p"
+    "github.com/Akilan1999/p2p-rendering-computation/plugin"
+    "github.com/Akilan1999/p2p-rendering-computation/server"
+    "github.com/urfave/cli/v2"
 )
 
 var CliAction = func(ctx *cli.Context) error {
-	if Server {
-		err := server.Server()
-		if err != nil {
-			fmt.Print(err)
-		}
-		//server.Rpc()
-	}
+    if Server {
+        _, err := server.Server()
+        if err != nil {
+            fmt.Print(err)
+        }
+        //server.Rpc()
+        for {
 
-	//Listing servers and also updates IP tables (Default 3 hops)
-	if UpdateServerList {
-		err := clientIPTable.UpdateIpTableListClient()
-		if err != nil {
-			fmt.Print(err)
-		}
-		// Reads from ip table and passes it
-		// on to struct print function
-		//Servers, err := p2p.ReadIpTable()
-		//if err != nil {
-		//	return err
-		//}
-		//client.PrettyPrint(Servers)
-		p2p.PrintIpTable()
-	}
+        }
+    }
 
-	// Displays the IP table
-	if ServerList {
-		// Reads from ip table and passes it
-		// on to struct print function
-		//Servers, err := p2p.ReadIpTable()
-		//if err != nil {
-		//	return err
-		//}
-		p2p.PrintIpTable()
-	}
+    //Listing servers and also updates IP tables (Default 3 hops)
+    if UpdateServerList {
+        err := clientIPTable.UpdateIpTableListClient()
+        if err != nil {
+            fmt.Print(err)
+        }
+        // Reads from ip table and passes it
+        // on to struct print function
+        //Servers, err := p2p.ReadIpTable()
+        //if err != nil {
+        //	return err
+        //}
+        //client.PrettyPrint(Servers)
+        p2p.PrintIpTable()
+    }
 
-	// Add provided IP to the IP table
-	if AddServer != "" {
-		res, err := p2p.ReadIpTable()
-		if err != nil {
-			fmt.Println(err)
-		}
+    // Displays the IP table
+    if ServerList {
+        // Reads from ip table and passes it
+        // on to struct print function
+        //Servers, err := p2p.ReadIpTable()
+        //if err != nil {
+        //	return err
+        //}
+        p2p.PrintIpTable()
+    }
 
-		//Create variable of type IpAddress and set IP address
-		// to it
-		var IpAddr p2p.IpAddress
+    // Add provided IP to the IP table
+    if AddServer != "" {
+        res, err := p2p.ReadIpTable()
+        if err != nil {
+            fmt.Println(err)
+        }
 
-		//Checking if the address is a ipv4
-		// or ipv6 address
-		ip4Orip6 := p2p.Ip4or6(AddServer)
-		if ip4Orip6 == "version 6" {
-			IpAddr.Ipv6 = AddServer
-		} else {
-			IpAddr.Ipv4 = AddServer
-		}
+        //Create variable of type IpAddress and set IP address
+        // to it
+        var IpAddr p2p.IpAddress
 
-		// If a server port is provided then set it
-		if Ports != "" {
-			IpAddr.ServerPort = Ports
-		} else {
-			IpAddr.ServerPort = "8088"
-		}
-		// Append IP address to variable result which
-		// is a list
-		res.IpAddress = append(res.IpAddress, IpAddr)
-		// Adds the new server IP to the iptable
-		res.WriteIpTable()
+        //Checking if the address is a ipv4
+        // or ipv6 address
+        ip4Orip6 := p2p.Ip4or6(AddServer)
+        if ip4Orip6 == "version 6" {
+            IpAddr.Ipv6 = AddServer
+        } else {
+            IpAddr.Ipv4 = AddServer
+        }
 
-	}
+        // If a server port is provided then set it
+        if Ports != "" {
+            IpAddr.ServerPort = Ports
+        } else {
+            IpAddr.ServerPort = "8088"
+        }
+        // Append IP address to variable result which
+        // is a list
+        res.IpAddress = append(res.IpAddress, IpAddr)
+        // Adds the new server IP to the iptable
+        res.WriteIpTable()
 
-	// Displays all images available on the server side
-	if ViewImages != "" {
-		imageRes, err := client.ViewContainers(ViewImages)
+    }
 
-		if err != nil {
-			fmt.Print(err)
-		}
-		client.PrettyPrint(imageRes)
-	}
+    // Displays all images available on the server side
+    if ViewImages != "" {
+        imageRes, err := client.ViewContainers(ViewImages)
 
-	// Function called to stop and remove server from Docker
-	if RemoveVM != "" && ID != "" {
-		err := client.RemoveContianer(RemoveVM, ID)
-		if err != nil {
-			fmt.Print(err)
-		}
-	}
+        if err != nil {
+            fmt.Print(err)
+        }
+        client.PrettyPrint(imageRes)
+    }
 
-	//Call function to create Docker container
-	if CreateVM != "" {
+    // Function called to stop and remove server from Docker
+    if RemoveVM != "" {
+        if ID == "" {
+            fmt.Println("provide container ID via --ID or --id")
+        } else {
+            err := client.RemoveContianer(RemoveVM, ID)
+            if err != nil {
+                fmt.Print(err)
+            }
+        }
+    }
 
-		var PortsInt int
+    //Call function to create Docker container
+    if CreateVM != "" {
 
-		if Ports != "" {
-			// Convert Get Request value to int
-			fmt.Sscanf(Ports, "%d", &PortsInt)
-		}
+        var PortsInt int
 
-		// Calls function to do Api call to start the container on the server side
-		imageRes, err := client.StartContainer(CreateVM, PortsInt, GPU, ContainerName)
+        if Ports != "" {
+            // Convert Get Request value to int
+            fmt.Sscanf(Ports, "%d", &PortsInt)
+        }
 
-		if err != nil {
-			fmt.Print(err)
-		}
-		client.PrettyPrint(imageRes)
-	}
+        // Calls function to do Api call to start the container on the server side
+        imageRes, err := client.StartContainer(CreateVM, PortsInt, GPU, ContainerName)
 
-	//Call if specs flag is called
-	if Specs != "" {
-		specs, err := client.GetSpecs(Specs)
-		if err != nil {
-			return err
-		}
+        if err != nil {
+            fmt.Print(err)
+        }
+        client.PrettyPrint(imageRes)
+    }
 
-		// Pretty print
-		client.PrettyPrint(specs)
-	}
+    //Call if specs flag is called
+    if Specs != "" {
+        specs, err := client.GetSpecs(Specs)
+        if err != nil {
+            return err
+        }
 
-	//Sets default paths to the config file
-	if SetDefaultConfig {
-		err := config.SetDefaults()
-		if err != nil {
-			fmt.Print(err)
-		}
-	}
+        // Pretty print
+        client.PrettyPrint(specs)
+    }
 
-	//If the network interface flag is called
-	// Then all the network interfaces are displayed
-	if NetworkInterface {
-		err := p2p.ViewNetworkInterface()
-		if err != nil {
-			fmt.Print(err)
-		}
-	}
+    //Sets default paths to the config file
+    if SetDefaultConfig {
+        _, err := generate.SetDefaults("P2PRC", false, nil, false)
+        if err != nil {
+            fmt.Print(err)
+        }
+    }
 
-	// If the view plugin flag is called then display all
-	// plugins available
-	if ViewPlugin {
-		plugins, err := plugin.DetectPlugins()
-		if err != nil {
-			fmt.Print(err)
-		}
-		client.PrettyPrint(plugins)
-	}
+    //If the network interface flag is called
+    // Then all the network interfaces are displayed
+    if NetworkInterface {
+        err := p2p.ViewNetworkInterface()
+        if err != nil {
+            fmt.Print(err)
+        }
+    }
 
-	// If the flag Tracked Container is called or the flag
-	// --tc
-	if TrackedContainers {
-		err, trackedContainers := client.ViewTrackedContainers()
-		if err != nil {
-			fmt.Print(err)
-		}
-		client.PrettyPrint(trackedContainers)
-	}
+    // If the view plugin flag is called then display all
+    // plugins available
+    if ViewPlugin {
+        plugins, err := plugin.DetectPlugins()
+        if err != nil {
+            fmt.Print(err)
+        }
+        client.PrettyPrint(plugins)
+    }
 
-	//Executing plugin when the plugin flag is called
-	// --plugin
-	if ExecutePlugin != "" {
-		// To execute plugin requires the container ID or group ID provided when being executed
-		if ID != "" {
-			err := plugin.CheckRunPlugin(ExecutePlugin, ID)
-			if err != nil {
-				fmt.Println(err)
-			} else {
-				fmt.Println("Success")
-			}
-		} else {
-			fmt.Println("provide container ID")
-		}
+    // If the flag Tracked Container is called or the flag
+    // --tc
+    if TrackedContainers {
+        err, trackedContainers := client.ViewTrackedContainers()
+        if err != nil {
+            fmt.Print(err)
+        }
+        client.PrettyPrint(trackedContainers)
+    }
 
-	}
+    //Executing plugin when the plugin flag is called
+    // --plugin
+    if ExecutePlugin != "" {
+        // To execute plugin requires the container ID or group ID provided when being executed
+        if ID != "" {
+            err := plugin.CheckRunPlugin(ExecutePlugin, ID)
+            if err != nil {
+                fmt.Println(err)
+            } else {
+                fmt.Println("Success")
+            }
+        } else {
+            fmt.Println("provide container ID via --ID or --id")
+        }
 
-	// Executing function to create new group
-	// Creates new group and outputs JSON file
-	if CreateGroup {
-		group, err := client.CreateGroup()
-		if err != nil {
-			return err
-		}
-		client.PrettyPrint(group)
-	}
+    }
 
-	// Actions to be performed when the
-	// group flag is called
-	// --group <Group ID>
-	if Group != "" {
-		// Remove container from group based on group ID provided
-		// --rmcgroup --id <contianer id>
-		if RemoveContainerGroup && ID != "" {
-			group, err := client.RemoveContainerGroup(ID, Group)
-			if err != nil {
-				fmt.Println(err)
-			} else {
-				client.PrettyPrint(group)
-			}
-		} else if ID != "" { // Add container to group based on group ID provided
-			// --id <Container ID>
-			group, err := client.AddContainerToGroup(ID, Group)
-			if err != nil {
-				fmt.Println(err)
-			} else {
-				client.PrettyPrint(group)
-			}
-		} else { // View all information about current group
-			group, err := client.GetGroup(Group)
-			if err != nil {
-				fmt.Println(err)
-			} else {
-				client.PrettyPrint(group)
-			}
-		}
-	}
+    // Executing function to create new group
+    // Creates new group and outputs JSON file
+    if CreateGroup {
+        group, err := client.CreateGroup()
+        if err != nil {
+            return err
+        }
+        client.PrettyPrint(group)
+    }
 
-	// Execute function to remove entire group
-	// when remove group flag is called
-	// --rmgroup
-	if RemoveGroup != "" {
-		err := client.RemoveGroup(RemoveGroup)
-		if err != nil {
-			fmt.Println(err)
-		} else {
-			fmt.Println("Group Removed")
-		}
-	}
+    // Actions to be performed when the
+    // group flag is called
+    // --group <Group ID>
+    if Group != "" {
+        // Remove container from group based on group ID provided
+        // --rmcgroup --id <contianer id>
+        if RemoveContainerGroup && ID != "" {
+            group, err := client.RemoveContainerGroup(ID, Group)
+            if err != nil {
+                fmt.Println(err)
+            } else {
+                client.PrettyPrint(group)
+            }
+        } else if ID != "" { // Add container to group based on group ID provided
+            // --id <Container ID>
+            group, err := client.AddContainerToGroup(ID, Group)
+            if err != nil {
+                fmt.Println(err)
+            } else {
+                client.PrettyPrint(group)
+            }
+        } else { // View all information about current group
+            group, err := client.GetGroup(Group)
+            if err != nil {
+                fmt.Println(err)
+            } else {
+                client.PrettyPrint(group)
+            }
+        }
+    }
 
-	// Execute Function to view all groups
-	if Groups {
-		groups, err := client.ReadGroup()
-		if err != nil {
-			fmt.Println(err)
-		} else {
-			client.PrettyPrint(groups)
-		}
-	}
+    // Execute function to remove entire group
+    // when remove group flag is called
+    // --rmgroup
+    if RemoveGroup != "" {
+        err := client.RemoveGroup(RemoveGroup)
+        if err != nil {
+            fmt.Println(err)
+        } else {
+            fmt.Println("Group Removed")
+        }
+    }
 
-	// Starts server as a reverse proxy so that
-	// nodes can connect to each other behind NAT
-	//if FRPProxy {
-	//    err := frp.StartFRPProxyFromRandom()
-	//    if err != nil {
-	//        fmt.Println(err)
-	//    }
-	//}
+    // Execute Function to view all groups
+    if Groups {
+        groups, err := client.ReadGroup()
+        if err != nil {
+            fmt.Println(err)
+        } else {
+            client.PrettyPrint(groups)
+        }
+    }
 
-	// -- REMOVE ON REGULAR RELEASE --
-	// when flag --gen is called an extension
-	// of the project is created to repurpose
-	// the project for custom purpose
-	if Generate != "" {
-		var err error
-		// If the module name is provided
-		if Modulename != "" {
-			err = generate.GenerateNewProject(Generate, Modulename)
-		} else {
-			err = generate.GenerateNewProject(Generate, Generate)
-		}
-		if err != nil {
-			fmt.Println(err)
-		} else {
-			fmt.Println("Created new folder: " + Generate)
-			fmt.Println("1. Enter inside " + Generate + " directory")
-			fmt.Println("2. git remote add " + Generate + " <PATH to the github repo>")
-			fmt.Println("3. git push " + Generate + " <PATH to the github repo>")
-			fmt.Println("4. go mod tidy")
-			fmt.Println("5. sh install.sh " + Generate)
-			fmt.Println("6. ./" + Generate + " -h (This is to test if the binary is working)")
-		}
-	}
-	//--------------------------------
+    //--------------------------------
 
-	if PullPlugin != "" {
-		err := plugin.DownloadPlugin(PullPlugin)
-		if err != nil {
-			fmt.Println(err)
-		} else {
-			fmt.Println("Success")
-		}
-	}
+    if PullPlugin != "" {
+        err := plugin.DownloadPlugin(PullPlugin)
+        if err != nil {
+            fmt.Println(err)
+        } else {
+            fmt.Println("Success")
+        }
+    }
 
-	if RemovePlugin != "" {
-		err := plugin.DeletePlugin(RemovePlugin)
-		if err != nil {
-			fmt.Println(err)
-		} else {
-			fmt.Println("Success")
-		}
-	}
+    if RemovePlugin != "" {
+        err := plugin.DeletePlugin(RemovePlugin)
+        if err != nil {
+            fmt.Println(err)
+        } else {
+            fmt.Println("Success")
+        }
+    }
 
-	return nil
+    return nil
 }

cmd/flags.go

@@ -92,7 +92,7 @@ var AppConfigFlags = []cli.Flag{
 	&cli.StringFlag{
 		Name:        "RemoveVM",
 		Aliases:     []string{"rm"},
-		Usage:       "Stop and Remove Docker container",
+		Usage:       "Stop and Remove Docker container (IP:port) accompanied by container ID via --ID or --id",
 		EnvVars:     []string{"REMOVE_VM"},
 		Destination: &RemoveVM,
 	},
@@ -148,7 +148,7 @@ var AppConfigFlags = []cli.Flag{
 	&cli.BoolFlag{
 		Name:    "TrackedContainers",
 		Aliases: []string{"tc"},
-		Usage: "View containers which have " +
+		Usage: "View (currently running) containers which have " +
 			"been created from the client side ",
 		EnvVars:     []string{"TRACKED_CONTAINERS"},
 		Destination: &TrackedContainers,

config/config.go

@@ -1,75 +1,52 @@
 package config
 
 import (
-	"github.com/spf13/viper"
-	"io"
-	"os"
+    "encoding/json"
+    "io/ioutil"
+    "os"
 )
 
 var (
-	defaultPath    string
-	defaults       = map[string]interface{}{}
-	configName     = "config"
-	configType     = "json"
-	configFile     = "config.json"
-	configPaths    []string
-	defaultEnvName = "P2PRC"
+    //defaultPath    string
+    defaults       = map[string]interface{}{}
+    configName     = "config"
+    configType     = "json"
+    configFile     = "config.json"
+    configPaths    []string
+    defaultEnvName = "P2PRC"
 )
 
 type Config struct {
-	MachineName              string
-	IPTable                  string
-	DockerContainers         string
-	DefaultDockerFile        string
-	SpeedTestFile            string
-	IPV6Address              string
-	PluginPath               string
-	TrackContainersPath      string
-	ServerPort               string
-	GroupTrackContainersPath string
-	FRPServerPort            string
-	BehindNAT                string
-	//NetworkInterface  string
-	//NetworkInterfaceIPV6Index int
-}
-
-// Exists reports whether the named file or directory exists.
-func fileExists(name string) bool {
-	if _, err := os.Stat(name); err != nil {
-		if os.IsNotExist(err) {
-			return false
-		}
-	}
-	return true
-}
-
-// Copy the src file to dst. Any existing file will be overwritten and will not
-// copy file attributes.
-// Source: https://stackoverflow.com/questions/21060945/simple-way-to-copy-a-file
-func Copy(src, dst string) error {
-	in, err := os.Open(src)
-	if err != nil {
-		return err
-	}
-	defer in.Close()
-
-	out, err := os.Create(dst)
-	if err != nil {
-		return err
-	}
-	defer out.Close()
-
-	_, err = io.Copy(out, in)
-	if err != nil {
-		return err
-	}
-	return out.Close()
+    MachineName              string
+    IPTable                  string
+    DockerContainers         string
+    DefaultDockerFile        string
+    SpeedTestFile            string
+    IPV6Address              string
+    PluginPath               string
+    TrackContainersPath      string
+    ServerPort               string
+    GroupTrackContainersPath string
+    FRPServerPort            string
+    BehindNAT                string
+    CustomConfig             interface{}
+    //NetworkInterface  string
+    //NetworkInterfaceIPV6Index int
 }
 
 // GetPathP2PRC Getting P2PRC Directory from environment variable
-func GetPathP2PRC() (string, error) {
-	curDir := os.Getenv(defaultEnvName)
-	return curDir + "/", nil
+func GetPathP2PRC(Envname string) (string, error) {
+    if Envname != "" {
+        err := SetEnvName(Envname)
+        if err != nil {
+            return "", err
+        }
+    }
+    curDir := os.Getenv(defaultEnvName)
+    if curDir == "" {
+        return curDir, nil
+    }
+    return curDir + "/", nil
 }
 
 // SetEnvName Sets the environment name
@@ -77,120 +54,103 @@ func GetPathP2PRC() (string, error) {
 // your environment variable
 // This is useful when extending the use case of P2PRC
 func SetEnvName(EnvName string) error {
-	defaultEnvName = EnvName
-	// Handling error to be implemented only if needed
-	return nil
+    defaultEnvName = EnvName
+    // Handling error to be implemented only if needed
+    return nil
 }
 
-// GetCurrentPath Getting P2PRC Directory from environment variable
-func GetCurrentPath() (string, error) {
-	curDir := os.Getenv("PWD")
-	return curDir + "/", nil
+func GetEnvName() string {
+    return defaultEnvName
 }
 
-// SetDefaults This function to be called only during a
-// make install
-func SetDefaults() error {
-	//Setting current directory to default path
-	defaultPath, err := GetPathP2PRC()
-	if err != nil {
-		return err
-	}
+// ConfigInit Pass environment name as an optional parameter
+func ConfigInit(defaultsParameter map[string]interface{}, CustomConfig interface{}, envNameOptional ...string) (*Config, error) {
+    if len(envNameOptional) > 0 {
+        defaultEnvName = envNameOptional[0]
+    }
+    //
+    ////Setting current directory to default path
+    //defaultPath, err := GetPathP2PRC(defaultEnvName)
+    //if err != nil {
+    //    return nil, err
+    //}
+    ////Paths to search for config file
+    //configPaths = append(configPaths, defaultPath)
+    //
+    ////Add all possible configurations paths
+    //for _, v := range configPaths {
+    //    viper.AddConfigPath(v)
+    //}
+    //
+    ////Read config file
+    //if err := viper.ReadInConfig(); err != nil {
+    //    // If the error thrown is config file not found
+    //    //Sets default configuration to viper
+    //    for k, v := range defaults {
+    //        viper.SetDefault(k, v)
+    //    }
+    //    viper.SetConfigName(configName)
+    //    viper.SetConfigFile(configFile)
+    //    viper.SetConfigType(configType)
+    //
+    //    if err = viper.WriteConfig(); err != nil {
+    //        return nil, err
+    //    }
+    //}
+    //
+    //// Adds configuration to the struct
+    //var config Config
+    //if err := viper.Unmarshal(&config); err != nil {
+    //    return nil, err
+    //}
+    //
+    //return &config, nil
 
-	//Creates ip_table.json in the json directory
-	err = Copy("p2p/ip_table.json", "p2p/iptable/ip_table.json")
-	if err != nil {
-		return err
-	}
+    defaultPath, err := GetPathP2PRC(defaultEnvName)
+    if err != nil {
+        return nil, err
+    }
 
-	//Creates a copy of trackcontainers.json in the appropriate directory
-	err = Copy("client/trackcontainers.json", "client/trackcontainers/trackcontainers.json")
-	if err != nil {
-		return err
-	}
+    // Open our jsonFile
+    jsonFile, err := os.Open(defaultPath + configFile)
+    // if we os.Open returns an error then handle it
+    if err != nil {
+        return nil, err
+    }
 
-	//Creates a copy of trackcontainers.json in the appropriate directory
-	err = Copy("client/grouptrackcontainers.json", "client/trackcontainers/grouptrackcontainers.json")
-	if err != nil {
-		return err
-	}
+    // defer the closing of our jsonFile so that we can parse it later on
+    defer jsonFile.Close()
 
-	//Setting default paths for the config file
-	defaults["IPTable"] = defaultPath + "p2p/iptable/ip_table.json"
-	defaults["DefaultDockerFile"] = defaultPath + "server/docker/containers/docker-ubuntu-sshd/"
-	defaults["DockerContainers"] = defaultPath + "server/docker/containers/"
-	defaults["SpeedTestFile"] = defaultPath + "p2p/50.bin"
-	defaults["IPV6Address"] = ""
-	defaults["PluginPath"] = defaultPath + "plugin/deploy"
-	defaults["TrackContainersPath"] = defaultPath + "client/trackcontainers/trackcontainers.json"
-	defaults["GroupTrackContainersPath"] = defaultPath + "client/trackcontainers/grouptrackcontainers.json"
-	defaults["ServerPort"] = "8088"
-	defaults["FRPServerPort"] = "0"
-	defaults["BehindNAT"] = "True"
-	// Random name generator
-	hostname, err := os.Hostname()
-	if err != nil {
-		return err
-	}
+    byteValue, _ := ioutil.ReadAll(jsonFile)
 
-	defaults["MachineName"] = hostname
-	//defaults["NetworkInterface"] = "wlp0s20f3"
-	//defaults["NetworkInterfaceIPV6Index"] = "2"
+    var config Config
+    json.Unmarshal(byteValue, &config)
 
-	//Paths to search for config file
-	configPaths = append(configPaths, defaultPath)
+    if CustomConfig != nil {
+        // Convert Custom Config to byte
+        customConfigByte, err := json.Marshal(config.CustomConfig)
+        if err != nil {
+            return nil, err
+        }
 
-	if fileExists(defaultPath + "config.json") {
-		err := os.Remove(defaultPath + "config.json")
-		if err != nil {
-			return err
-		}
-	}
+        // Again map the byte to the CustomConfig interface
+        json.Unmarshal(customConfigByte, &CustomConfig)
+    }
 
-	//Calling configuration file
-	_, err = ConfigInit()
-	if err != nil {
-		return err
-	}
-	return nil
+    return &config, nil
 }
 
-func ConfigInit() (*Config, error) {
+func (c *Config) WriteConfig() error {
+    //Getting Current Directory from environment variable
+    //curDir := os.Getenv("REMOTEGAMING")
 
-	//Setting current directory to default path
-	defaultPath, err := GetPathP2PRC()
-	if err != nil {
-		return nil, err
-	}
-	//Paths to search for config file
-	configPaths = append(configPaths, defaultPath)
+    defaultPath, err := GetPathP2PRC(defaultEnvName)
+    if err != nil {
+        return err
+    }
 
-	//Add all possible configurations paths
-	for _, v := range configPaths {
-		viper.AddConfigPath(v)
-	}
+    file, _ := json.MarshalIndent(c, "", " ")
 
-	//Read config file
-	if err := viper.ReadInConfig(); err != nil {
-		// If the error thrown is config file not found
-		//Sets default configuration to viper
-		for k, v := range defaults {
-			viper.SetDefault(k, v)
-		}
-		viper.SetConfigName(configName)
-		viper.SetConfigFile(configFile)
-		viper.SetConfigType(configType)
-
-		if err = viper.WriteConfig(); err != nil {
-			return nil, err
-		}
-	}
-
-	// Adds configuration to the struct
-	var config Config
-	if err := viper.Unmarshal(&config); err != nil {
-		return nil, err
-	}
-
-	return &config, nil
+    _ = ioutil.WriteFile(defaultPath+"config.json", file, 0644)
+    return nil
 }

config/config_test.go

@@ -1,63 +0,0 @@
-package config
-
-import (
-	"fmt"
-	"os"
-	"testing"
-)
-
-func TestConfigInit(t *testing.T) {
-	_,err := ConfigInit()
-	if err != nil {
-		t.Error(err)
-	}
-}
-
-func TestSetDefaults(t *testing.T) {
-	err := SetDefaults()
-	if err != nil {
-		t.Error(err)
-	}
-}
-
-func TestGetCurrentPath(t *testing.T) {
-	path, err := GetCurrentPath()
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-	fmt.Println(path)
-}
-
-func TestGetPathP2PRC(t *testing.T) {
-	path, err := GetPathP2PRC()
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-	fmt.Println(path)
-}
-
-func TestSetEnvName(t *testing.T) {
-	// Create an Env variable TEST with the value "lol"
-	err := os.Setenv("TEST", "lol")
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-	// Sets the environment variable as the default to read
-	// for P2PRC
-	err = SetEnvName("TEST")
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-
-	// Checks if the output for the default read is "lol"
-	path, err := GetPathP2PRC()
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-	fmt.Println(path)
-}

config/generate/config_test.go

@@ -0,0 +1,64 @@
+package generate
+
+import (
+    "fmt"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
+    "os"
+    "testing"
+)
+
+// func TestConfigInit(t *testing.T) {
+//     _, err := config.ConfigInit(nil)
+//     if err != nil {
+//         t.Error(err)
+//     }
+// }
+
+// func TestSetDefaults(t *testing.T) {
+//     _, err := SetDefaults("", false)
+//     if err != nil {
+//         t.Error(err)
+//     }
+// }
+
+func TestGetCurrentPath(t *testing.T) {
+    path, err := GetCurrentPath()
+    if err != nil {
+        fmt.Println(err)
+        t.Error(err)
+    }
+    fmt.Println(path)
+}
+
+func TestGetPathP2PRC(t *testing.T) {
+    path, err := config.GetPathP2PRC("")
+    if err != nil {
+        fmt.Println(err)
+        t.Error(err)
+    }
+    fmt.Println(path)
+}
+
+func TestSetEnvName(t *testing.T) {
+    // Create an Env variable TEST with the value "lol"
+    err := os.Setenv("TEST", "lol")
+    if err != nil {
+        fmt.Println(err)
+        t.Error(err)
+    }
+    // Sets the environment variable as the default to read
+    // for P2PRC
+    err = config.SetEnvName("TEST")
+    if err != nil {
+        fmt.Println(err)
+        t.Error(err)
+    }
+
+    // Checks if the output for the default read is "lol"
+    path, err := config.GetPathP2PRC("")
+    if err != nil {
+        fmt.Println(err)
+        t.Error(err)
+    }
+    fmt.Println(path)
+}

config/generate/generate.go

@@ -0,0 +1,131 @@
+package generate
+
+import (
+    "github.com/Akilan1999/p2p-rendering-computation/config"
+    "os"
+)
+
+var (
+    defaults       = map[string]interface{}{}
+    configPaths    []string
+    defaultEnvName = "P2PRC"
+)
+
+// GetPathP2PRC Getting P2PRC Directory from environment variable
+func GetPathP2PRC() (string, error) {
+    curDir := os.Getenv(defaultEnvName)
+    return curDir + "/", nil
+}
+
+// SetEnvName Sets the environment name
+// This is to ensure that the Path of your project is detected from
+// your environment variable
+// This is useful when extending the use case of P2PRC
+func SetEnvName(EnvName string) error {
+    if EnvName != "" {
+        defaultEnvName = EnvName
+    }
+    // Handling error to be implemented only if needed
+    return nil
+}
+
+// GetCurrentPath Getting P2PRC Directory from environment variable
+func GetCurrentPath() (string, error) {
+    curDir := os.Getenv("PWD")
+    return curDir + "/", nil
+}
+
+// SetDefaults This function to be called only during a
+// make install
+func SetDefaults(envName string, forceDefault bool, CustomConfig interface{}, NoBoilerPlate bool, ConfigUpdate ...*config.Config) (*config.Config, error) {
+    //Setting current directory to default path
+    defaultPath, err := GetCurrentPath()
+    if err != nil {
+        return nil, err
+    }
+
+    // Set Env name
+    err = config.SetEnvName(envName)
+    if err != nil {
+        return nil, err
+    }
+
+    ////Creates ip_table.json in the json directory
+    //err = Copy("p2p/ip_table.json", "p2p/iptable/ip_table.json")
+    //if err != nil {
+    //    return err
+    //}
+    //
+    ////Creates a copy of trackcontainers.json in the appropriate directory
+    //err = Copy("client/trackcontainers.json", "client/trackcontainers/trackcontainers.json")
+    //if err != nil {
+    //    return err
+    //}
+    //
+    ////Creates a copy of trackcontainers.json in the appropriate directory
+    //err = Copy("client/grouptrackcontainers.json", "client/trackcontainers/grouptrackcontainers.json")
+    //if err != nil {
+    //    return err
+    //}
+
+    var Defaults config.Config
+
+    if len(ConfigUpdate) == 0 {
+        //Setting default paths for the config file
+        Defaults.IPTable = defaultPath + "p2p/iptable/ip_table.json"
+        Defaults.DefaultDockerFile = defaultPath + "server/docker/containers/docker-ubuntu-sshd/"
+        Defaults.DockerContainers = defaultPath + "server/docker/containers/"
+        Defaults.SpeedTestFile = defaultPath + "p2p/50.bin"
+        Defaults.IPV6Address = ""
+        Defaults.PluginPath = defaultPath + "plugin/deploy"
+        Defaults.TrackContainersPath = defaultPath + "client/trackcontainers/trackcontainers.json"
+        Defaults.GroupTrackContainersPath = defaultPath + "client/trackcontainers/grouptrackcontainers.json"
+        Defaults.ServerPort = "8088"
+        Defaults.FRPServerPort = "True"
+        Defaults.CustomConfig = CustomConfig
+        Defaults.BehindNAT = "True"
+        // Random name generator
+        hostname, err := os.Hostname()
+        if err != nil {
+            return nil, err
+        }
+
+        Defaults.MachineName = hostname
+    } else {
+        Defaults = *ConfigUpdate[0]
+    }
+
+    //defaults["NetworkInterface"] = "wlp0s20f3"
+    //defaults["NetworkInterfaceIPV6Index"] = "2"
+
+    //Paths to search for config file
+    configPaths = append(configPaths, defaultPath)
+
+    if fileExists(defaultPath+"config.json") && forceDefault {
+        err := os.Remove(defaultPath + "config.json")
+        if err != nil {
+            return nil, err
+        }
+    }
+
+    // write defaults to the config file
+    err = Defaults.WriteConfig()
+    if err != nil {
+        return nil, err
+    }
+
+    //Calling configuration file
+    Config, err := config.ConfigInit(defaults, nil, envName)
+    if err != nil {
+        return nil, err
+    }
+
+    if !NoBoilerPlate {
+        err = GenerateFiles()
+        if err != nil {
+            return nil, err
+        }
+    }
+
+    return Config, nil
+}

config/generate/generateFiles.go

@@ -0,0 +1,163 @@
+package generate
+
+import (
+	"github.com/Akilan1999/p2p-rendering-computation/p2p"
+	"github.com/go-git/go-git/v5"
+	"os"
+)
+
+// GenerateFiles Generates all the files needed to setup P2PRC
+func GenerateFiles(rootNodes ...p2p.IpAddress) (err error) {
+	err = GenerateIPTableFile(rootNodes)
+	err = GenerateDockerFiles()
+	err = GeneratePluginDirectory()
+	err = GenerateClientTrackContainers()
+	return
+}
+
+// GenerateIPTableFile Generates the IPTable file with the appropirate root node
+func GenerateIPTableFile(rootNodes []p2p.IpAddress) (err error) {
+	var rootnodes p2p.IpAddresses
+	var rootnode p2p.IpAddress
+
+	err = CreateIPTableFolderStructure()
+	if err != nil {
+		return err
+	}
+
+	// If root node addresses are not provided as optional parameters
+	if len(rootNodes) <= 0 {
+		rootnode.Name = "Node1"
+		rootnode.ServerPort = "8088"
+		rootnode.NAT = "False"
+		rootnode.Ipv4 = "64.227.168.102"
+
+		rootnodes.IpAddress = append(rootnodes.IpAddress, rootnode)
+	} else {
+		// if root nodes are provided then override them as the optional parameter
+		for i := range rootNodes {
+			rootnodes.IpAddress = append(rootnodes.IpAddress, rootNodes[i])
+		}
+	}
+
+	err = rootnodes.WriteIpTable()
+	return
+}
+
+// CreateIPTableFolderStructure Create folder structure for IPTable
+func CreateIPTableFolderStructure() (err error) {
+	path, err := GetCurrentPath()
+	if err != nil {
+		return err
+	}
+	if _, err = os.Stat(path + "p2p"); os.IsNotExist(err) {
+		if err = os.Mkdir(path+"p2p", os.ModePerm); err != nil {
+			return err
+		}
+	}
+	if _, err = os.Stat(path + "p2p/iptable"); os.IsNotExist(err) {
+		if err = os.Mkdir(path+"p2p/iptable", os.ModePerm); err != nil {
+			return err
+		}
+	}
+	if _, err = os.Stat(path + "p2p/iptable/ip_table.json"); os.IsNotExist(err) {
+		_, err = os.Create(path + "p2p/iptable/ip_table.json")
+		if err != nil {
+			return err
+		}
+	}
+
+	return
+}
+
+// GenerateDockerFiles Generate default docker files
+func GenerateDockerFiles() (err error) {
+	path, err := GetCurrentPath()
+	if err != nil {
+		return err
+	}
+	if _, err = os.Stat(path + "server"); os.IsNotExist(err) {
+		if err = os.Mkdir(path+"server", os.ModePerm); err != nil {
+			return err
+		}
+		if _, err = os.Stat(path + "server/docker"); os.IsNotExist(err) {
+			if err = os.Mkdir(path+"server/docker", os.ModePerm); err != nil {
+				return err
+			}
+		}
+		if _, err = os.Stat(path + "server/docker/containers"); os.IsNotExist(err) {
+			if err = os.Mkdir(path+"server/docker/containers", os.ModePerm); err != nil {
+				return err
+			}
+		}
+		if _, err = os.Stat(path + "server/docker/containers"); os.IsNotExist(err) {
+			if err = os.Mkdir(path+"server/docker/containers", os.ModePerm); err != nil {
+				return err
+			}
+		}
+		if _, err = os.Stat(path + "server/docker/containers/docker-ubuntu-sshd"); os.IsNotExist(err) {
+			if err = os.Mkdir(path+"server/docker/containers/docker-ubuntu-sshd", os.ModePerm); err != nil {
+				return err
+			}
+		}
+
+	}
+
+	// Clone base docker image
+	_, err = git.PlainClone(path+"server/docker/containers/docker-ubuntu-sshd", false, &git.CloneOptions{
+		URL:      "https://github.com/Akilan1999/docker-ubuntu-sshd",
+		Progress: os.Stdout,
+	})
+	if err != nil {
+		return err
+	}
+
+	return
+}
+
+// GeneratePluginDirectory Generates plugin directory structure
+func GeneratePluginDirectory() (err error) {
+	path, err := GetCurrentPath()
+	if err != nil {
+		return err
+	}
+	if _, err = os.Stat(path + "plugin"); os.IsNotExist(err) {
+		if err = os.Mkdir(path+"plugin", os.ModePerm); err != nil {
+			return err
+		}
+		if _, err = os.Stat(path + "plugin/deploy"); os.IsNotExist(err) {
+			if err = os.Mkdir(path+"plugin/deploy", os.ModePerm); err != nil {
+				return err
+			}
+		}
+	}
+	return
+}
+
+func GenerateClientTrackContainers() (err error) {
+	path, err := GetCurrentPath()
+	if err != nil {
+		return err
+	}
+	if _, err = os.Stat(path + "client"); os.IsNotExist(err) {
+		if err = os.Mkdir(path+"client", os.ModePerm); err != nil {
+			return err
+		}
+
+		if _, err = os.Stat(path + "client/trackcontainers.json"); os.IsNotExist(err) {
+			_, err = os.Create(path + "client/trackcontainers.json")
+			if err != nil {
+				return err
+			}
+		}
+
+		if _, err = os.Stat(path + "client/grouptrackcontainers.json"); os.IsNotExist(err) {
+			_, err = os.Create(path + "client/grouptrackcontainers.json")
+			if err != nil {
+				return err
+			}
+		}
+
+	}
+	return
+}

config/generate/gernerate_test.go

@@ -0,0 +1,35 @@
+package generate
+
+import (
+    "fmt"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
+    "testing"
+)
+
+type CustomConfig struct {
+    Test string
+}
+
+// Test case to generate defaults with custom data-structure
+func TestSetDefaults(t *testing.T) {
+    setDefaults, err := SetDefaults("", true, &CustomConfig{Test: "lol"}, true)
+    if err != nil {
+        fmt.Println(err)
+        t.Fail()
+        return
+    }
+
+    fmt.Println(setDefaults)
+
+    var c CustomConfig
+
+    _, err = config.ConfigInit(nil, &c)
+    if err != nil {
+        fmt.Println(err)
+        t.Fail()
+        return
+    }
+
+    fmt.Println(c)
+
+}

config/generate/helperFunctions.go

@@ -0,0 +1,39 @@
+package generate
+
+import (
+	"io"
+	"os"
+)
+
+// Exists reports whether the named file or directory exists.
+func fileExists(name string) bool {
+	if _, err := os.Stat(name); err != nil {
+		if os.IsNotExist(err) {
+			return false
+		}
+	}
+	return true
+}
+
+// Copy the src file to dst. Any existing file will be overwritten and will not
+// copy file attributes.
+// Source: https://stackoverflow.com/questions/21060945/simple-way-to-copy-a-file
+func Copy(src, dst string) error {
+	in, err := os.Open(src)
+	if err != nil {
+		return err
+	}
+	defer in.Close()
+
+	out, err := os.Create(dst)
+	if err != nil {
+		return err
+	}
+	defer out.Close()
+
+	_, err = io.Copy(out, in)
+	if err != nil {
+		return err
+	}
+	return out.Close()
+}

generate/generate.go

@@ -1,386 +0,0 @@
-// Package generate The purpose of this package is to ensure that we can extend the use-case of P2PRC.
-// We will create a project directory with the template to extend the use-case of P2PRC
-package generate
-
-import (
-	"fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
-	"github.com/otiai10/copy"
-	"go/ast"
-	"go/token"
-	modfile "golang.org/x/mod/modfile"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"strings"
-)
-
-// NewProject Struct information required when creating a new project
-type NewProject struct {
-	Name		string
-	Module		string
-	NewDir		string
-	P2PRCPath	string
-	CurrentModule	string
-	Option		*copy.Options
-	Token		*token.FileSet
-	AST		*ast.File
-	FileNameAST	string
-}
-
-// GenerateNewProject creates a new copy of the P2PRC
-// project for custom modification
-func GenerateNewProject(name string, module string) error {
-	// Create new variable of type NewProject
-	var newProject NewProject
-	//Setting module name to the new project
-	newProject.Module = module
-	// Get path of the current directory
-	curDir, err := config.GetCurrentPath()
-	if err != nil {
-		return err
-	}
-	// Folder name of the new generated project
-	newProject.NewDir = curDir + name + "/"
-	// Create a new folder based on name entered
-	err = CreateFolder(name, curDir)
-	if err != nil {
-		return err
-	}
-	// get path of P2PRC
-	P2PRCPATH, err := config.GetPathP2PRC()
-	if err != nil {
-		return err
-	}
-	// Assign P2PRC path to the newly generated project
-	newProject.P2PRCPath = P2PRCPATH
-	// Steps:
-	// - copy all files from P2PRC
-	// - remove go.mod and go.sum and create new ones
-
-	// Files we require to skip
-
-	var Options copy.Options
-
-	// IF YOU ARE RELEASING AN EXTENSION OF P2PRC
-	// MODIFY HERE (AN EXTENSION FROM YOUR EXTENSION :P)
-	// Skip or have the appropriate files and directories not needed
-	//----------------------------------------------------------------
-	// Action performed:
-	// - Ensuring main.go file exists
-	// - Ensuring generate.go file exists
-	// - Ensuring modifyGenerate.go file exists
-	// - Ensuring generate_test.go file exists
-	// - Ensuring server/server.go file exists
-	// - Ensuring server/gopsutil.go file exists
-	// - Ensuring server/gpu.go file exists
-	// - Ensuring cmd/action.go file exists
-	// - Ensuring cmd/flags.go file exists
-	// - Skipping all .go files apart from the ones listed above
-	// - Skipping go.mod file
-	// - Skipping go.sum file
-	// - Skipping .idea/ directory
-	// - Skipping Makefile file
-	// - Skipping <Project Name>/ directory
-	//----------------------------------------------------------------
-	Options.Skip = func(src string) (bool, error) {
-		switch {
-		case strings.HasSuffix(src, "main.go"):
-			return false, nil
-		case strings.HasSuffix(src, "generate.go"):
-			return false, nil
-		case strings.HasSuffix(src, "modifyGenerate.go"):
-			return false, nil
-		case strings.HasSuffix(src, "generate_test.go"):
-			return false, nil
-		case strings.HasSuffix(src, "server/server.go"):
-			return false, nil
-		case strings.HasSuffix(src, "server/gopsutil.go"):
-			return false, nil
-		case strings.HasSuffix(src, "server/gpu.go"):
-			return false, nil
-		case strings.HasSuffix(src, "cmd/action.go"):
-			return false, nil
-		case strings.HasSuffix(src, "cmd/flags.go"):
-			return false, nil
-		case strings.HasSuffix(src, "config/config.go"):
-			return false, nil
-		case strings.HasSuffix(src, "config/config_test.go"):
-			return false, nil
-		case strings.HasSuffix(src, ".go"):
-			return true, nil
-		case strings.HasSuffix(src, "go.mod"):
-			return true, nil
-		case strings.HasSuffix(src, "go.sum"):
-			return true, nil
-		case strings.HasSuffix(src, ".idea"):
-			return true, nil
-		case strings.HasSuffix(src, "Makefile"):
-			return true, nil
-		case strings.HasSuffix(src, name):
-			return true, nil
-		default:
-			return false, nil
-		}
-	}
-
-	// Storing type option in the struct new project
-	newProject.Option = &Options
-
-	// Copies all files from P2PRC to the new project created
-	err = copy.Copy(newProject.P2PRCPath, newProject.NewDir, *newProject.Option)
-	if err != nil {
-		return err
-	}
-
-	// Creating a new go.mod file in the appropriate directory
-	err = newProject.CreateGoMod()
-	if err != nil {
-		return err
-	}
-
-	// Get current project mod name
-	err = newProject.GetCurrentGoModule()
-	if err != nil {
-		return err
-	}
-
-	// Change the appropriate imports
-	err = newProject.ChangeImportFiles()
-	if err != nil {
-		return err
-	}
-
-	// Add changes inside the new project
-	err = newProject.GitAdd()
-	if err != nil {
-		return err
-	}
-
-	// commit changes inside the new project
-	err = newProject.GitCommit()
-	if err != nil {
-		return err
-	}
-	// Creates go.sum file
-	//err = newProject.CreateGoModTidy()
-	//if err != nil {
-	//	return err
-	//}
-
-	return nil
-}
-
-// CreateFolder Creates a new folder based on the name and path provided
-func CreateFolder(name string, path string) error {
-	//Create a folder/directory at a full qualified path
-	err := os.Mkdir(path+name, 0755)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// CreateGoMod Creates a new go module for the new project created
-func (a *NewProject) CreateGoMod() error {
-	// Create new go.mod in the appropriate directory
-	cmd := exec.Command("go", "mod", "init", a.Module)
-	cmd.Dir = a.NewDir
-	if err := cmd.Run(); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (a *NewProject) CreateGoModTidy() error {
-	// Installs all the appropriate dependencies and creates go.sum
-	cmd := exec.Command("go", "mod", "tidy")
-	cmd.Dir = a.NewDir
-	if err := cmd.Run(); err != nil {
-		return err
-	}
-	return nil
-}
-
-// ChangeImportFiles Changes Appropriate imports in the appropriate file
-func (a *NewProject) ChangeImportFiles() error {
-	// IF YOU ARE RELEASING AN EXTENSION OF P2PRC
-	// MODIFY HERE (AN EXTENSION FROM YOUR EXTENSION :P)
-	//----------------------------------------------------------------
-	// Action performed:
-	// Files we would need to modify the imports in
-	// - generate/generate.go -> config module
-	// - generate/generate_test.go -> config module
-	// - cmd/action.go -> config module, server module, generate module
-	// - cmd/flags.go -> config module, server module, generate module
-	// - server/server.go -> config module
-	// - main.go -> cmd module
-	//-----------------------------------------------------------------
-
-	//-----------------------------------------------------------------
-	// 1.0 - generate/generate.go -> config module
-	a.FileNameAST = a.NewDir + "generate/generate.go"
-	// Get AST information of the file
-	err := a.GetASTGoFile()
-	if err != nil {
-		return err
-	}
-	// Change the appropriate Go file
-	err = a.ChangeImports(a.CurrentModule+"/config", a.Module+"/config")
-	if err != nil {
-		return err
-	}
-	// Writes the change to the appropriate file
-	err = a.WriteGoAst()
-	if err != nil {
-		return err
-	}
-	//-----------------------------------------------------------------
-	// 1.1 - generate/generate_test.go -> config module
-	a.FileNameAST = a.NewDir + "generate/generate_test.go"
-	// Get AST information of the file
-	err = a.GetASTGoFile()
-	if err != nil {
-		return err
-	}
-	// Change the appropriate Go file
-	err = a.ChangeImports(a.CurrentModule+"/config", a.Module+"/config")
-	if err != nil {
-		return err
-	}
-	// Writes the change to the appropriate file
-	err = a.WriteGoAst()
-	if err != nil {
-		return err
-	}
-
-	//-----------------------------------------------------------------
-	//-----------------------------------------------------------------
-	// 2.0 - cmd/action.go -> config module, server module, generate module
-	a.FileNameAST = a.NewDir + "cmd/action.go"
-	// Get AST information of the file
-	err = a.GetASTGoFile()
-	if err != nil {
-		return err
-	}
-	// Change the appropriate Go file
-	err = a.ChangeImports(a.CurrentModule+"/config", a.Module+"/config")
-	if err != nil {
-		return err
-	}
-	err = a.ChangeImports(a.CurrentModule+"/server", a.Module+"/server")
-	if err != nil {
-		return err
-	}
-	err = a.ChangeImports(a.CurrentModule+"/generate", a.Module+"/generate")
-	if err != nil {
-		return err
-	}
-	// Writes the change to the appropriate file
-	err = a.WriteGoAst()
-	if err != nil {
-		return err
-	}
-	//-----------------------------------------------------------------
-	// 2.1 - cmd/flags.go -> config module, server module, generate module
-	a.FileNameAST = a.NewDir + "cmd/flags.go"
-	// Get AST information of the file
-	err = a.GetASTGoFile()
-	if err != nil {
-		return err
-	}
-	// Change the appropriate Go file
-	err = a.ChangeImports(a.CurrentModule+"/config", a.Module+"/config")
-	if err != nil {
-		return err
-	}
-	err = a.ChangeImports(a.CurrentModule+"/server", a.Module+"/server")
-	if err != nil {
-		return err
-	}
-	err = a.ChangeImports(a.CurrentModule+"/generate", a.Module+"/generate")
-	if err != nil {
-		return err
-	}
-	// Writes the change to the appropriate file
-	err = a.WriteGoAst()
-	if err != nil {
-		return err
-	}
-	//-----------------------------------------------------------------
-	//-----------------------------------------------------------------
-	// 3.0 - server/server.go -> config module
-	a.FileNameAST = a.NewDir + "server/server.go"
-	// Get AST information of the file
-	err = a.GetASTGoFile()
-	if err != nil {
-		return err
-	}
-	// Change the appropriate Go file
-	err = a.ChangeImports(a.CurrentModule+"/config", a.Module+"/config")
-	if err != nil {
-		return err
-	}
-	// Writes the change to the appropriate file
-	err = a.WriteGoAst()
-	if err != nil {
-		return err
-	}
-	//-----------------------------------------------------------------
-	//-----------------------------------------------------------------
-	// 4.0 - server/server.go -> config module
-	a.FileNameAST = a.NewDir + "main.go"
-	// Get AST information of the file
-	err = a.GetASTGoFile()
-	if err != nil {
-		return err
-	}
-	// Change the appropriate Go file
-	err = a.ChangeImports(a.CurrentModule+"/cmd", a.Module+"/cmd")
-	if err != nil {
-		return err
-	}
-	// Writes the change to the appropriate file
-	err = a.WriteGoAst()
-	if err != nil {
-		return err
-	}
-	//-----------------------------------------------------------------
-
-	return nil
-}
-
-// GetCurrentGoModule Gets the current go module name
-func (a *NewProject) GetCurrentGoModule() error {
-	goModBytes, err := ioutil.ReadFile(a.P2PRCPath + "go.mod")
-	if err != nil {
-		return err
-	}
-	modName := modfile.ModulePath(goModBytes)
-	fmt.Fprintf(os.Stdout, "modName=%+v\n", modName)
-
-	// Set current module to struct of file NewProject
-	a.CurrentModule = modName
-
-	return nil
-}
-
-func (a *NewProject) GitAdd() error {
-	// Installs all the appropriate dependencies and creates go.sum
-	cmd := exec.Command("git", "add", ".")
-	cmd.Dir = a.NewDir
-	if err := cmd.Run(); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (a *NewProject) GitCommit() error {
-	// Installs all the appropriate dependencies and creates go.sum
-	cmd := exec.Command("git", "commit", "-m=removed appropriate go files")
-	cmd.Dir = a.NewDir
-	if err := cmd.Run(); err != nil {
-		return err
-	}
-	return nil
-}

generate/generate_test.go

@@ -1,112 +0,0 @@
-package generate
-
-import (
-	"fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
-	"testing"
-)
-
-// Tests the create folder function creates a folder
-// This test will create a folder in the temporary
-// directory
-func TestCreateFolder(t *testing.T) {
-	err := CreateFolder("test", "/tmp/")
-	if err != nil {
-		t.Error(err)
-	}
-}
-
-// Testing if a new project is created successfully
-func TestGenerateNewProject(t *testing.T) {
-	// Checking if a new project is created successfully
-	err := GenerateNewProject("p2prctest","p2prctest")
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-}
-
-// Testing AST function to ensure imports are
-// working as intended
-func TestChangingImportAST(t *testing.T) {
-   // Create a new variable of type NewProject
-	var np NewProject
-	// Get current directory
-	path, err := config.GetCurrentPath()
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-	// Create testcase scenario
-	err = config.Copy(path + "testcaseAST.go", path + "/Test/testcaseAST.go")
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-	// Sets new directory to the folder test
-	np.NewDir = path + "Test/"
-	// Sets file name to be opened and modified in the AST
-	np.FileNameAST = path + "Test/" + "testcaseAST.go"
-	// Call the Read AST function
-	err = np.GetASTGoFile()
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-	// Change an import
-	err = np.ChangeImports("fmt", "lolol")
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-	// Write those saved changes
-	err = np.WriteGoAst()
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-
-}
-
-// Testing the if Go Mod is created
-func TestNewProject_CreateGoMod(t *testing.T) {
-	// Create a new variable of type NewProject
-	var np NewProject
-	path, err := config.GetCurrentPath()
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-	// Set new project name as Test
-	np.Name = "Test"
-	// Set new project module as github.com/Test
-	np.Module = "github.com/Test"
-	// Set Path of the new project
-	np.NewDir = path + "Test/"
-	// Creating a go.mod file
-	err = np.CreateGoMod()
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-}
-
-// Testing if the current go module is returned
-func TestNewProject_GetCurrentGoModule(t *testing.T) {
-	// Create a new variable of type NewProject
-	var np NewProject
-	path, err := config.GetPathP2PRC()
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-	// Set Current project path
-	np.P2PRCPath = path
-	// Get module name
-	err = np.GetCurrentGoModule()
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-	fmt.Println(np.CurrentModule)
-}

generate/modifyGenerate.go

@@ -1,49 +0,0 @@
-package generate
-
-import (
-	"go/parser"
-	"go/printer"
-	"go/token"
-	"os"
-)
-
-
-// GetASTGoFile Gets AST of the Go file provided
-func (np *NewProject)GetASTGoFile() error{
-	fset := token.NewFileSet()
-	node, err := parser.ParseFile(fset, np.FileNameAST, nil, parser.ParseComments)
-	if err != nil {
-		return err
-	}
-	//Write Token information to the struct
-	np.Token = fset
-	// Write AST information the struct
-	np.AST = node
-	return nil
-}
-
-// ChangeImports Changes import of the AST
-func (np *NewProject)ChangeImports(CurrentImport string,ChangedImport string) error {
-	// Iterating through the loop and changing the appropriate import
-	for i, spec := range np.AST.Imports {
-		// If the current import is found then change it
-		if spec.Path.Value == "\"" + CurrentImport + "\"" {
-			np.AST.Imports[i].Path.Value = "\"" + ChangedImport + "\""
-		}
-	}
-	return nil
-}
-
-// WriteGoAst Write changed imports back to the AST
-func (np *NewProject)WriteGoAst() error {
-	// write new AST to file
-	f, err := os.Create(np.FileNameAST)
-	if err != nil {
-		return nil
-	}
-	defer f.Close()
-	if err := printer.Fprint(f, np.Token, np.AST); err != nil {
-		return err
-	}
-	return nil
-}

generate/testcaseAST.go

@@ -1,9 +0,0 @@
-package generate
-
-import (
-	"fmt"
-)
-
-func TestCaseAST() {
-	fmt.Println("lol")
-}

go.mod

@@ -1,4 +1,4 @@
-module git.sr.ht/~akilan1999/p2p-rendering-computation
+module github.com/Akilan1999/p2p-rendering-computation
 
 go 1.15
 
@@ -12,7 +12,6 @@ require (
 	github.com/gin-gonic/gin v1.6.3
 	github.com/go-git/go-git/v5 v5.4.2
 	github.com/google/uuid v1.3.0
-	github.com/goombaio/namegenerator v0.0.0-20181006234301-989e774b106e
 	github.com/lithammer/shortuuid v3.0.0+incompatible
 	github.com/moby/sys/mount v0.2.0 // indirect
 	github.com/moby/term v0.0.0-20201110203204-bea5bbe245bf // indirect
@@ -20,11 +19,9 @@ require (
 	github.com/otiai10/copy v1.6.0
 	github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
 	github.com/shirou/gopsutil/v3 v3.22.10
-	github.com/spf13/viper v1.7.0
 	github.com/urfave/cli/v2 v2.3.0
 	gitlab.com/NebulousLabs/fastrand v0.0.0-20181126182046-603482d69e40 // indirect
 	gitlab.com/NebulousLabs/go-upnp v0.0.0-20181011194642-3a71999ed0d3
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
 	gopkg.in/yaml.v2 v2.4.0
 	gotest.tools/v3 v3.0.3 // indirect
 )

go.sum

@@ -65,7 +65,6 @@ github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c h1:/IBSNwUN8+eKzUzbJPqhK839ygXJ82sde8x3ogr6R28=
 github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
@@ -285,7 +284,6 @@ github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjr
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
 github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
@@ -451,8 +449,6 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
 github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
-github.com/goombaio/namegenerator v0.0.0-20181006234301-989e774b106e h1:XmA6L9IPRdUr28a+SK/oMchGgQy159wvzXA5tJ7l+40=
-github.com/goombaio/namegenerator v0.0.0-20181006234301-989e774b106e/go.mod h1:AFIo+02s+12CEg8Gzz9kzhCbmbq6JcKNrhHffCGA9z4=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
@@ -486,7 +482,6 @@ github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
@@ -558,7 +553,6 @@ github.com/lithammer/shortuuid v3.0.0+incompatible/go.mod h1:FR74pbAuElzOUuenUHT
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
@@ -589,7 +583,6 @@ github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eI
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
@@ -674,7 +667,6 @@ github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT9
 github.com/otiai10/mint v1.3.2 h1:VYWnrP5fXmz1MXvjuUvcBrXSjGE6xjON+axB/UrpO3E=
 github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc=
@@ -770,24 +762,19 @@ github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
-github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
-github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
 github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
-github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
-github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM=
 github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -807,7 +794,6 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
@@ -941,7 +927,6 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

main.go

@@ -1,10 +1,11 @@
 package main
 
 import (
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/cmd"
-	"github.com/urfave/cli/v2"
 	"log"
 	"os"
+
+	"github.com/Akilan1999/p2p-rendering-computation/cmd"
+	"github.com/urfave/cli/v2"
 )
 
 // VERSION specifies the version of the platform
@@ -12,7 +13,7 @@ var VERSION = "1.5.0"
 var mode string
 
 // Varaibles if mode is client
-var OS, Pull_location ,Run_script string
+var OS, Pull_location, Run_script string
 var List_servers, Ip_table bool
 
 func main() {
@@ -27,4 +28,4 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
-}
+}

p2p/frp/client.go

@@ -1,165 +1,178 @@
 package frp
 
 import (
-	"fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/server/docker"
-	"github.com/fatedier/frp/client"
-	"github.com/fatedier/frp/pkg/config"
-	"github.com/phayes/freeport"
-	"math/rand"
-	"strconv"
-	"time"
+    "github.com/Akilan1999/p2p-rendering-computation/server/docker"
+    "github.com/fatedier/frp/client"
+    "github.com/fatedier/frp/pkg/config"
+    "math/rand"
+    "strconv"
+    "time"
+    "github.com/phayes/freeport"
 )
 
 // Client This struct stores
 // client information with server
 // proxy connected
 type Client struct {
-	Name           string
-	Server         *Server
-	ClientMappings []ClientMapping
+    Name           string
+    Server         *Server
+    ClientMappings []ClientMapping
 }
 
 // ClientMapping Stores client mapping ports
 // to proxy server
 type ClientMapping struct {
-	LocalIP    string
-	LocalPort  int
-	RemotePort int
+    LocalIP    string
+    LocalPort  int
+    RemotePort int
 }
 
 // StartFRPClientForServer Starts Server using FRP server
 // returns back a port
-func StartFRPClientForServer(ipaddress string, port string, localport string) (string, error) {
-	// Setup server information
-	var s Server
-	s.address = ipaddress
-	// convert port to int
-	portInt, err := strconv.Atoi(port)
-	if err != nil {
-		return "", err
-	}
-	s.port = portInt
+// remote port is a custom external port a user would want
+// to open. This under the assumption the user knows the
+// exact port available in server doing the TURN connection.
+func StartFRPClientForServer(ipaddress string, port string, localport string, remoteport string) (string, error) {
+    // Setup server information
+    var s Server
+    s.address = ipaddress
+    // convert port to int
+    portInt, err := strconv.Atoi(port)
+    if err != nil {
+        return "", err
+    }
+    s.port = portInt
 
-	// Setup client information
-	var c Client
-	c.Name = "ServerPort"
-	c.Server = &s
+    // Setup client information
+    var c Client
+    c.Name = "ServerPort"
+    c.Server = &s
 
-	// converts localport to int
-	portInt, err = strconv.Atoi(localport)
-	if err != nil {
-		return "", err
-	}
+    // converts localport to int
+    portInt, err = strconv.Atoi(localport)
+    if err != nil {
+        return "", err
+    }
 
-	//random port
-	//randPort := rangeIn(10000, 99999)
-	OpenPorts, err := freeport.GetFreePorts(1)
-	if err != nil {
-		return "", err
-	}
-	c.ClientMappings = []ClientMapping{
-		{
-			LocalIP:    "localhost",
-			LocalPort:  portInt,
-			RemotePort: OpenPorts[0],
-		},
-	}
+    var OpenPorts []int
+    // if the remote port is
+    // not empty then set the remote port to that.
+    if remoteport != "" {
+        // converts localport to int
+        portIntRemote, err := strconv.Atoi(remoteport)
+        if err != nil {
+            return "", err
+        }
+        OpenPorts = append(OpenPorts, portIntRemote)
+    } else {
+        //random port
+        //randPort := rangeIn(10000, 99999)
+        OpenPorts, err = freeport.GetFreePorts(1)
+        if err != nil {
+            return "", err
+        }
+    }
+    c.ClientMappings = []ClientMapping{
+        {
+            LocalIP:    "localhost",
+            LocalPort:  portInt,
+            RemotePort: OpenPorts[0],
+        },
+    }
 
-	// Start client server
-	go c.StartFRPClient()
+    // Start client server
+    go c.StartFRPClient()
 
-	return strconv.Itoa(OpenPorts[0]), nil
+    return strconv.Itoa(OpenPorts[0]), nil
 
 }
 
 func StartFRPCDockerContainer(ipaddress string, port string, Docker *docker.DockerVM) (*docker.DockerVM, error) {
-	// setting new docker variable
+    // setting new docker variable
 
-	//var DockerFRP docker.DockerVM
+    //var DockerFRP docker.DockerVM
 
-	//DockerFRP = *Docker
-	//DockerFRP.Ports.PortSet = []docker.Port{}
-	// Setup server information
-	var s Server
-	s.address = ipaddress
-	// convert port to int
-	portInt, err := strconv.Atoi(port)
-	if err != nil {
-		return nil, err
-	}
-	s.port = portInt
+    //DockerFRP = *Docker
+    //DockerFRP.Ports.PortSet = []docker.Port{}
+    // Setup server information
+    var s Server
+    s.address = ipaddress
+    // convert port to int
+    portInt, err := strconv.Atoi(port)
+    if err != nil {
+        return nil, err
+    }
+    s.port = portInt
 
-	// Setup client information
-	var c Client
-	c.Name = "ServerPort"
-	c.Server = &s
+    // Setup client information
+    var c Client
+    c.Name = "ServerPort"
+    c.Server = &s
 
-	// set client mapping
-	//var clientMappings []ClientMapping
-	fmt.Println(len(Docker.Ports.PortSet))
-	for i, _ := range Docker.Ports.PortSet {
-		portMap := Docker.Ports.PortSet[i].ExternalPort
+    // set client mapping
+    //var clientMappings []ClientMapping
+    for i, _ := range Docker.Ports.PortSet {
+        portMap := Docker.Ports.PortSet[i].ExternalPort
 
-		serverPort, err := GetFRPServerPort("http://" + ipaddress + ":" + port)
-		if err != nil {
-			return nil, err
-		}
+        serverPort, err := GetFRPServerPort("http://" + ipaddress + ":" + port)
+        if err != nil {
+            return nil, err
+        }
 
-		//delay to allow the FRP server to start
-		time.Sleep(1 * time.Second)
+        //delay to allow the FRP server to start
+        time.Sleep(1 * time.Second)
 
-		proxyPort, err := StartFRPClientForServer(ipaddress, serverPort, strconv.Itoa(portMap))
-		if err != nil {
-			return nil, err
-		}
+        proxyPort, err := StartFRPClientForServer(ipaddress, serverPort, strconv.Itoa(portMap), "")
+        if err != nil {
+            return nil, err
+        }
 
-		portInt, err = strconv.Atoi(proxyPort)
-		if err != nil {
-			return nil, err
-		}
+        portInt, err = strconv.Atoi(proxyPort)
+        if err != nil {
+            return nil, err
+        }
 
-		Docker.Ports.PortSet[i].ExternalPort = portInt
-	}
+        Docker.Ports.PortSet[i].ExternalPort = portInt
+    }
 
-	return Docker, nil
+    return Docker, nil
 
 }
 
 // StartFRPClient Starts FRP client
 func (c *Client) StartFRPClient() error {
 
-	cfg := config.GetDefaultClientConf()
+    cfg := config.GetDefaultClientConf()
 
-	var proxyConfs map[string]config.ProxyConf
-	var visitorCfgs map[string]config.VisitorConf
+    var proxyConfs map[string]config.ProxyConf
+    var visitorCfgs map[string]config.VisitorConf
 
-	proxyConfs = make(map[string]config.ProxyConf)
+    proxyConfs = make(map[string]config.ProxyConf)
 
-	cfg.ServerAddr = c.Server.address
-	cfg.ServerPort = c.Server.port
+    cfg.ServerAddr = c.Server.address
+    cfg.ServerPort = c.Server.port
 
-	for i, _ := range c.ClientMappings {
-		var tcpcnf config.TCPProxyConf
-		tcpcnf.LocalIP = c.ClientMappings[i].LocalIP
-		tcpcnf.LocalPort = c.ClientMappings[i].LocalPort
-		tcpcnf.RemotePort = c.ClientMappings[i].RemotePort
+    for i, _ := range c.ClientMappings {
+        var tcpcnf config.TCPProxyConf
+        tcpcnf.LocalIP = c.ClientMappings[i].LocalIP
+        tcpcnf.LocalPort = c.ClientMappings[i].LocalPort
+        tcpcnf.RemotePort = c.ClientMappings[i].RemotePort
 
-		proxyConfs[tcpcnf.ProxyName] = &tcpcnf
-	}
+        proxyConfs[tcpcnf.ProxyName] = &tcpcnf
+    }
 
-	cli, err := client.NewService(cfg, proxyConfs, visitorCfgs, "")
-	if err != nil {
-		return err
-	}
+    cli, err := client.NewService(cfg, proxyConfs, visitorCfgs, "")
+    if err != nil {
+        return err
+    }
 
-	cli.Run()
+    cli.Run()
 
-	return nil
+    return nil
 }
 
 // helper function to generate random
 // number in a certain range
 func rangeIn(low, hi int) int {
-	return low + rand.Intn(hi-low)
+    return low + rand.Intn(hi-low)
 }

p2p/ip_table.json

@@ -6,8 +6,8 @@
    "IPV6": "",
    "Latency": 0,
    "ServerPort": "8088",
-    "NAT": "False",
-    "EscapeImplementation": "None"
+   "NAT": "False",
+   "EscapeImplementation": "None"
   }
  ]
 }

p2p/iptable.go

@@ -1,256 +1,257 @@
 package p2p
 
 import (
-	"encoding/json"
-	"fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"os"
-	"time"
+    "encoding/json"
+    "fmt"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
+    "io/ioutil"
+    "net"
+    "net/http"
+    "os"
+    "time"
 )
 
 // Get IP table Data
 
 type IpAddresses struct {
-	IpAddress []IpAddress `json:"ip_address"`
+    IpAddress []IpAddress `json:"ip_address"`
 }
 
 type IpAddress struct {
-	Name                 string        `json:"Name"`
-	Ipv4                 string        `json:"IPV4"`
-	Ipv6                 string        `json:"IPV6"`
-	Latency              time.Duration `json:"Latency"`
-	Download             float64       `json:"Download"`
-	Upload               float64       `json:"Upload"`
-	ServerPort           string        `json:"ServerPort"`
-	NAT                  string        `json:"NAT"`
-	EscapeImplementation string        `json:"EscapeImplementation"`
+    Name                 string        `json:"Name"`
+    Ipv4                 string        `json:"IPV4"`
+    Ipv6                 string        `json:"IPV6"`
+    Latency              time.Duration `json:"Latency"`
+    Download             float64       `json:"Download"`
+    Upload               float64       `json:"Upload"`
+    ServerPort           string        `json:"ServerPort"`
+    NAT                  string        `json:"NAT"`
+    EscapeImplementation string        `json:"EscapeImplementation"`
+    CustomInformation    []byte
 }
 
 type IP struct {
-	Query string
+    Query string
 }
 
 // ReadIpTable Read data from Ip tables from json file
 func ReadIpTable() (*IpAddresses, error) {
-	// Get Path from config
-	config, err := config.ConfigInit()
-	if err != nil {
-		return nil, err
-	}
-	jsonFile, err := os.Open(config.IPTable)
-	// if we os.Open returns an error then handle it
-	if err != nil {
-		return nil, err
-	}
+    // Get Path from config
+    config, err := config.ConfigInit(nil, nil)
+    if err != nil {
+        return nil, err
+    }
+    jsonFile, err := os.Open(config.IPTable)
+    // if we os.Open returns an error then handle it
+    if err != nil {
+        return nil, err
+    }
 
-	// defer the closing of our jsonFile so that we can parse it later on
-	defer jsonFile.Close()
+    // defer the closing of our jsonFile so that we can parse it later on
+    defer jsonFile.Close()
 
-	// read our opened xmlFile as a byte array.
-	byteValue, _ := ioutil.ReadAll(jsonFile)
+    // read our opened xmlFile as a byte array.
+    byteValue, _ := ioutil.ReadAll(jsonFile)
 
-	// we initialize our Users array
-	var ipAddresses IpAddresses
+    // we initialize our Users array
+    var ipAddresses IpAddresses
 
-	// we unmarshal our byteArray which contains our
-	// jsonFile's content into 'users' which we defined above
-	json.Unmarshal(byteValue, &ipAddresses)
+    // we unmarshal our byteArray which contains our
+    // jsonFile's content into 'users' which we defined above
+    json.Unmarshal(byteValue, &ipAddresses)
 
-	var PublicIP IpAddress
+    var PublicIP IpAddress
 
-	ipv6, err := GetCurrentIPV6()
-	if err != nil {
-		return nil, err
-	}
+    ipv6, err := GetCurrentIPV6()
+    if err != nil {
+        return nil, err
+    }
 
-	ip, err := CurrentPublicIP()
-	if err != nil {
-		return nil, err
-	}
-	PublicIP.Ipv4 = ip
-	PublicIP.Ipv6 = ipv6
-	PublicIP.ServerPort = config.ServerPort
-	PublicIP.Name = config.MachineName
-	PublicIP.NAT = config.BehindNAT
-	PublicIP.EscapeImplementation = "None"
+    ip, err := CurrentPublicIP()
+    if err != nil {
+        return nil, err
+    }
+    PublicIP.Ipv4 = ip
+    PublicIP.Ipv6 = ipv6
+    PublicIP.ServerPort = config.ServerPort
+    PublicIP.Name = config.MachineName
+    PublicIP.NAT = config.BehindNAT
+    PublicIP.EscapeImplementation = "None"
 
-	// Updates current machine IP address to the IP table
-	ipAddresses.IpAddress = append(ipAddresses.IpAddress, PublicIP)
+    // Updates current machine IP address to the IP table
+    ipAddresses.IpAddress = append(ipAddresses.IpAddress, PublicIP)
 
-	//before writing to iptable ensures the duplicates are removed
-	if err = ipAddresses.RemoveDuplicates(); err != nil {
-		return nil, err
-	}
+    //before writing to iptable ensures the duplicates are removed
+    if err = ipAddresses.RemoveDuplicates(); err != nil {
+        return nil, err
+    }
 
-	return &ipAddresses, nil
+    return &ipAddresses, nil
 }
 
 // WriteIpTable Write to IP table json file
 func (i *IpAddresses) WriteIpTable() error {
-	//before writing to iptable ensures the duplicates are removed
-	if err := i.RemoveDuplicates(); err != nil {
-		return err
-	}
+    //before writing to iptable ensures the duplicates are removed
+    if err := i.RemoveDuplicates(); err != nil {
+        return err
+    }
 
-	file, err := json.MarshalIndent(i, "", " ")
-	if err != nil {
-		return err
-	}
+    file, err := json.MarshalIndent(i, "", " ")
+    if err != nil {
+        return err
+    }
 
-	// Get Path from config
-	config, err := config.ConfigInit()
-	if err != nil {
-		return err
-	}
+    // Get Path from config
+    config, err := config.ConfigInit(nil, nil)
+    if err != nil {
+        return err
+    }
 
-	err = ioutil.WriteFile(config.IPTable, file, 0644)
-	if err != nil {
-		return err
-	}
+    err = ioutil.WriteFile(config.IPTable, file, 0644)
+    if err != nil {
+        return err
+    }
 
-	return nil
+    return nil
 }
 
 // PrintIpTable Print Ip table data for Cli
 func PrintIpTable() error {
-	table, err := ReadIpTable()
+    table, err := ReadIpTable()
 
-	if err != nil {
-		return err
-	}
+    if err != nil {
+        return err
+    }
 
-	for i := 0; i < len(table.IpAddress); i++ {
-		fmt.Printf("\nMachine Name: %s\nIP Address: %s\nIPV6: %s\nLatency: %s\nServerPort: %s\nbehindNAT: %s\nEscapeImplementation: %s\n-----------"+
-			"-----------------\n", table.IpAddress[i].Name, table.IpAddress[i].Ipv4, table.IpAddress[i].Ipv6,
-			table.IpAddress[i].Latency, table.IpAddress[i].ServerPort, table.IpAddress[i].NAT, table.IpAddress[i].EscapeImplementation)
-	}
-	//PrettyPrint(table)
+    for i := 0; i < len(table.IpAddress); i++ {
+        fmt.Printf("\nMachine Name: %s\nIP Address: %s\nIPV6: %s\nLatency: %s\nServerPort: %s\nbehindNAT: %s\nEscapeImplementation: %s\n-----------"+
+            "-----------------\n", table.IpAddress[i].Name, table.IpAddress[i].Ipv4, table.IpAddress[i].Ipv6,
+            table.IpAddress[i].Latency, table.IpAddress[i].ServerPort, table.IpAddress[i].NAT, table.IpAddress[i].EscapeImplementation)
+    }
+    //PrettyPrint(table)
 
-	return nil
+    return nil
 }
 
 // RemoveDuplicates This is a temporary fix current functions failing to remove
 // Duplicate IP addresses from local IP table
 func (table *IpAddresses) RemoveDuplicates() error {
 
-	var NoDuplicates IpAddresses
-	for i, _ := range table.IpAddress {
-		Exists := false
-		for k := range NoDuplicates.IpAddress {
-			// Statements checked for
-			// - duplicate IPV4 addresses [<IPV4>:<Port No>]
-			// - duplicate IPV6 addresses [<IPV6>]
-			// - Node is behind NAT and no escape implementation provided
-			if (NoDuplicates.IpAddress[k].Ipv4 != "" && NoDuplicates.IpAddress[k].Ipv4 == table.IpAddress[i].Ipv4 &&
-				NoDuplicates.IpAddress[k].ServerPort == table.IpAddress[i].ServerPort) ||
-				(NoDuplicates.IpAddress[k].Ipv6 != "" && NoDuplicates.IpAddress[k].Ipv6 == table.IpAddress[i].Ipv6) {
-				Exists = true
-				break
-			}
-		}
+    var NoDuplicates IpAddresses
+    for i, _ := range table.IpAddress {
+        Exists := false
+        for k := range NoDuplicates.IpAddress {
+            // Statements checked for
+            // - duplicate IPV4 addresses [<IPV4>:<Port No>]
+            // - duplicate IPV6 addresses [<IPV6>]
+            // - Node is behind NAT and no escape implementation provided
+            if (NoDuplicates.IpAddress[k].Ipv4 != "" && NoDuplicates.IpAddress[k].Ipv4 == table.IpAddress[i].Ipv4 &&
+                NoDuplicates.IpAddress[k].ServerPort == table.IpAddress[i].ServerPort) ||
+                (NoDuplicates.IpAddress[k].Ipv6 != "" && NoDuplicates.IpAddress[k].Ipv6 == table.IpAddress[i].Ipv6) {
+                Exists = true
+                break
+            }
+        }
 
-		if table.IpAddress[i].NAT == "True" && table.IpAddress[i].EscapeImplementation == "None" {
-			Exists = true
-		}
+        if table.IpAddress[i].NAT == "True" && table.IpAddress[i].EscapeImplementation == "None" {
+            Exists = true
+        }
 
-		if Exists {
-			continue
-		}
-		NoDuplicates.IpAddress = append(NoDuplicates.IpAddress, table.IpAddress[i])
-	}
+        if Exists {
+            continue
+        }
+        NoDuplicates.IpAddress = append(NoDuplicates.IpAddress, table.IpAddress[i])
+    }
 
-	table.IpAddress = NoDuplicates.IpAddress
+    table.IpAddress = NoDuplicates.IpAddress
 
-	return nil
+    return nil
 }
 
 // CurrentPublicIP Get Current Public IP address
 func CurrentPublicIP() (string, error) {
-	req, err := http.Get("http://ip-api.com/json/")
-	if err != nil {
-		return "", err
-	}
-	defer req.Body.Close()
+    req, err := http.Get("http://ip-api.com/json/")
+    if err != nil {
+        return "", err
+    }
+    defer req.Body.Close()
 
-	body, err := ioutil.ReadAll(req.Body)
-	if err != nil {
-		return "", err
-	}
+    body, err := ioutil.ReadAll(req.Body)
+    if err != nil {
+        return "", err
+    }
 
-	var ip IP
-	json.Unmarshal(body, &ip)
+    var ip IP
+    json.Unmarshal(body, &ip)
 
-	return ip.Query, nil
+    return ip.Query, nil
 }
 
 // GetCurrentIPV6 gets the current IPV6	address based on the interface
 // specified in the config file
 func GetCurrentIPV6() (string, error) {
-	Config, err := config.ConfigInit()
-	if err != nil {
-		return "", err
-	}
+    Config, err := config.ConfigInit(nil, nil)
+    if err != nil {
+        return "", err
+    }
 
-	// Fix in future release
-	//byNameInterface, err := net.InterfaceByName(Config.NetworkInterface)
-	//if err != nil {
-	//	return "",err
-	//}
-	//addresses, err := byNameInterface.Addrs()
-	//if err != nil {
-	//	return "",err
-	//}
-	//if addresses[1].String() == "" {
-	//	return "",errors.New("IPV6 address not detected")
-	//}
-	//IP,_,err := net.ParseCIDR(addresses[Config.NetworkInterfaceIPV6Index].String())
-	//if err != nil {
-	//	return "",err
-	//}
+    // Fix in future release
+    //byNameInterface, err := net.InterfaceByName(Config.NetworkInterface)
+    //if err != nil {
+    //	return "",err
+    //}
+    //addresses, err := byNameInterface.Addrs()
+    //if err != nil {
+    //	return "",err
+    //}
+    //if addresses[1].String() == "" {
+    //	return "",errors.New("IPV6 address not detected")
+    //}
+    //IP,_,err := net.ParseCIDR(addresses[Config.NetworkInterfaceIPV6Index].String())
+    //if err != nil {
+    //	return "",err
+    //}
 
-	return Config.IPV6Address, nil
+    return Config.IPV6Address, nil
 }
 
 // ViewNetworkInterface This function is created to view the network interfaces available
 func ViewNetworkInterface() error {
-	ifaces, err := net.Interfaces()
-	if err != nil {
-		return err
-	}
-	for _, i := range ifaces {
-		addrs, err := i.Addrs()
-		if err != nil {
-			return err
-		}
-		for index, a := range addrs {
-			switch v := a.(type) {
-			case *net.IPAddr:
-				fmt.Printf("(%v) %v : %s (%s)\n", index, i.Name, v, v.IP.DefaultMask())
+    ifaces, err := net.Interfaces()
+    if err != nil {
+        return err
+    }
+    for _, i := range ifaces {
+        addrs, err := i.Addrs()
+        if err != nil {
+            return err
+        }
+        for index, a := range addrs {
+            switch v := a.(type) {
+            case *net.IPAddr:
+                fmt.Printf("(%v) %v : %s (%s)\n", index, i.Name, v, v.IP.DefaultMask())
 
-			case *net.IPNet:
-				fmt.Printf("(%v) %v : %s \n", index, i.Name, v)
-			}
+            case *net.IPNet:
+                fmt.Printf("(%v) %v : %s \n", index, i.Name, v)
+            }
 
-		}
-	}
-	return nil
+        }
+    }
+    return nil
 }
 
 // Ip4or6 Helper function to check if the IP address is IPV4 or
 // IPV6 (https://socketloop.com/tutorials/golang-check-if-ip-address-is-version-4-or-6)
 func Ip4or6(s string) string {
-	for i := 0; i < len(s); i++ {
-		switch s[i] {
-		case '.':
-			return "version 4"
-		case ':':
-			return "version 6"
-		}
-	}
-	return "version 6"
+    for i := 0; i < len(s); i++ {
+        switch s[i] {
+        case '.':
+            return "version 4"
+        case ':':
+            return "version 6"
+        }
+    }
+    return "version 6"
 
 }
 

p2p/testingMetrics.go

@@ -1,16 +1,16 @@
 package p2p
 
 import (
-	"bytes"
-	"errors"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
-	"io"
-	"io/ioutil"
-	"log"
-	"mime/multipart"
-	"net/http"
-	"os"
-	"time"
+    "bytes"
+    "errors"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
+    "io"
+    "io/ioutil"
+    "log"
+    "mime/multipart"
+    "net/http"
+    "os"
+    "time"
 )
 
 // var dlSizes = [...]int{350, 500, 750, 1000, 1500, 2000, 2500, 3000, 3500, 4000}
@@ -80,100 +80,100 @@ var httpclient = http.Client{}
 
 // Download Speed
 func (s *IpAddress) DownloadSpeed() error {
-	start := time.Now()
-	resp, err := httpclient.Get("http://" + s.Ipv4 + ":8088/50")
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-	ioutil.ReadAll(resp.Body)
-	t := time.Since(start)
-	//fmt.Println(s.Seconds())
-	// size * time (seconds)
-	s.Download = (50 / t.Seconds()) * 8
-	return nil
+    start := time.Now()
+    resp, err := httpclient.Get("http://" + s.Ipv4 + ":8088/50")
+    if err != nil {
+        return err
+    }
+    defer resp.Body.Close()
+    ioutil.ReadAll(resp.Body)
+    t := time.Since(start)
+    //fmt.Println(s.Seconds())
+    // size * time (seconds)
+    s.Download = (50 / t.Seconds()) * 8
+    return nil
 }
 
 func (s *IpAddress) UploadSpeed() error {
-	start := time.Now()
+    start := time.Now()
 
-	// Get upload file path from config file
-	// Get Path from config
-	config, err := config.ConfigInit()
-	if err != nil {
-		return err
-	}
+    // Get upload file path from config file
+    // Get Path from config
+    config, err := config.ConfigInit(nil, nil)
+    if err != nil {
+        return err
+    }
 
-	b, w := createMultipartFormData("file", config.SpeedTestFile)
+    b, w := createMultipartFormData("file", config.SpeedTestFile)
 
-	req, err := http.NewRequest("GET", "http://"+s.Ipv4+":"+s.ServerPort+"/upload", &b)
-	if err != nil {
-		return err
-	}
-	// Don't forget to set the content type, this will contain the boundary.
-	req.Header.Set("Content-Type", w.FormDataContentType())
-	defer req.Body.Close()
-	ioutil.ReadAll(req.Body)
-	t := time.Since(start)
-	//fmt.Println(s.Seconds())
-	// size * time (seconds)
-	s.Upload = (50 / t.Seconds()) * 8
-	return nil
+    req, err := http.NewRequest("GET", "http://"+s.Ipv4+":"+s.ServerPort+"/upload", &b)
+    if err != nil {
+        return err
+    }
+    // Don't forget to set the content type, this will contain the boundary.
+    req.Header.Set("Content-Type", w.FormDataContentType())
+    defer req.Body.Close()
+    ioutil.ReadAll(req.Body)
+    t := time.Since(start)
+    //fmt.Println(s.Seconds())
+    // size * time (seconds)
+    s.Upload = (50 / t.Seconds()) * 8
+    return nil
 }
 
 // Upload helper function for uploading
 // (https://stackoverflow.com/questions/20205796/post-data-using-the-content-type-multipart-form-data
 func createMultipartFormData(fieldName, fileName string) (bytes.Buffer, *multipart.Writer) {
-	var b bytes.Buffer
-	var err error
-	w := multipart.NewWriter(&b)
-	var fw io.Writer
-	file := mustOpen(fileName)
-	if fw, err = w.CreateFormFile(fieldName, file.Name()); err != nil {
-		log.Fatalf("Error creating writer: %v", err)
-	}
-	if _, err = io.Copy(fw, file); err != nil {
-		log.Fatalf("Error with io.Copy: %v", err)
-		//t.Errorf("Error with io.Copy: %v", err)
-	}
-	w.Close()
-	return b, w
+    var b bytes.Buffer
+    var err error
+    w := multipart.NewWriter(&b)
+    var fw io.Writer
+    file := mustOpen(fileName)
+    if fw, err = w.CreateFormFile(fieldName, file.Name()); err != nil {
+        log.Fatalf("Error creating writer: %v", err)
+    }
+    if _, err = io.Copy(fw, file); err != nil {
+        log.Fatalf("Error with io.Copy: %v", err)
+        //t.Errorf("Error with io.Copy: %v", err)
+    }
+    w.Close()
+    return b, w
 }
 
 func mustOpen(f string) *os.File {
-	r, err := os.Open(f)
-	if err != nil {
-		log.Fatalf("Error with mustOpen: %v", err)
-	}
-	return r
+    r, err := os.Open(f)
+    if err != nil {
+        log.Fatalf("Error with mustOpen: %v", err)
+    }
+    return r
 }
 
 // PingTest executes test to measure latency
 func (s *IpAddress) PingTest() error {
-	//pingURL := strings.Split(s.URL, "/upload")[0] + "/latency.txt"
-	var pingURL string
-	if s.Ipv6 != "" {
-		pingURL = "http://[" + s.Ipv6 + "]:" + s.ServerPort + "/server_info"
-		s.Ipv4 = ""
-	} else {
-		pingURL = "http://" + s.Ipv4 + ":" + s.ServerPort + "/server_info"
-	}
+    //pingURL := strings.Split(s.URL, "/upload")[0] + "/latency.txt"
+    var pingURL string
+    if s.Ipv6 != "" {
+        pingURL = "http://[" + s.Ipv6 + "]:" + s.ServerPort + "/server_info"
+        s.Ipv4 = ""
+    } else {
+        pingURL = "http://" + s.Ipv4 + ":" + s.ServerPort + "/server_info"
+    }
 
-	l := time.Duration(100000000000) // 10sec
-	for i := 0; i < 3; i++ {
-		sTime := time.Now()
-		resp, err := http.Get(pingURL)
-		fTime := time.Now()
-		if err != nil || resp.StatusCode != 200 {
-			return errors.New("Node not found")
-		}
-		if fTime.Sub(sTime) < l {
-			l = fTime.Sub(sTime)
-		}
-		resp.Body.Close()
-	}
+    l := time.Duration(100000000000) // 10sec
+    for i := 0; i < 3; i++ {
+        sTime := time.Now()
+        resp, err := http.Get(pingURL)
+        fTime := time.Now()
+        if err != nil || resp.StatusCode != 200 {
+            return errors.New("Node not found")
+        }
+        if fTime.Sub(sTime) < l {
+            l = fTime.Sub(sTime)
+        }
+        resp.Body.Close()
+    }
 
-	s.Latency = time.Duration(int64(l.Nanoseconds() / 2))
+    s.Latency = time.Duration(int64(l.Nanoseconds() / 2))
 
-	return nil
+    return nil
 }

plugin/packageManager.go

@@ -1,65 +1,64 @@
 package plugin
 
 import (
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
-	"github.com/go-git/go-git/v5"
-	"net/url"
-	"os"
-	"strings"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
+    "github.com/go-git/go-git/v5"
+    "net/url"
+    "os"
+    "strings"
 )
 
 // DownloadPlugin This functions downloads package from
 // a git repo.
 func DownloadPlugin(pluginurl string) error {
-	// paring plugin url
-	u, err := url.Parse(pluginurl)
-	if err != nil {
-		return err
-	}
-	path := u.Path
-	// Trim first character of the string
-	path = path[1:]
-	// trim last element of the string
-	path = path[:len(path)-1]
-	// Replaces / with _
-	folder := strings.Replace(path, "/", "_", -1)
-	// Reads plugin path from the config path
-	config, err := config.ConfigInit()
-	if err != nil {
-		return err
-	}
-	// clones a repo and stores it at the plugin directory
-	_, err = git.PlainClone(config.PluginPath + "/" + folder, false, &git.CloneOptions{
-		URL:      pluginurl,
-		Progress: os.Stdout,
-	})
-	// returns error if raised
-	if err != nil {
-		return err
-	}
+    // paring plugin url
+    u, err := url.Parse(pluginurl)
+    if err != nil {
+        return err
+    }
+    path := u.Path
+    // Trim first character of the string
+    path = path[1:]
+    // trim last element of the string
+    path = path[:len(path)-1]
+    // Replaces / with _
+    folder := strings.Replace(path, "/", "_", -1)
+    // Reads plugin path from the config path
+    config, err := config.ConfigInit(nil, nil)
+    if err != nil {
+        return err
+    }
+    // clones a repo and stores it at the plugin directory
+    _, err = git.PlainClone(config.PluginPath+"/"+folder, false, &git.CloneOptions{
+        URL:      pluginurl,
+        Progress: os.Stdout,
+    })
+    // returns error if raised
+    if err != nil {
+        return err
+    }
 
-
-	return nil
+    return nil
 }
 
 // DeletePlugin The following function deletes a plugin based on
 // the plugin name provided.
 func DeletePlugin(pluginname string) error {
-	config, err := config.ConfigInit()
-	if err != nil {
-		return err
-	}
+    config, err := config.ConfigInit(nil, nil)
+    if err != nil {
+        return err
+    }
 
-	plugin, err := SearchPlugin(pluginname)
-	if err != nil {
-		return err
-	}
+    plugin, err := SearchPlugin(pluginname)
+    if err != nil {
+        return err
+    }
 
-	// Delete the directory holding the plugin
-	err = os.RemoveAll(config.PluginPath + "/" + plugin.FolderName)
-	if err != nil {
-		return err
-	}
-	
-	return nil
-}
+    // Delete the directory holding the plugin
+    err = os.RemoveAll(config.PluginPath + "/" + plugin.FolderName)
+    if err != nil {
+        return err
+    }
+
+    return nil
+}

plugin/plugin.go

@@ -5,8 +5,8 @@ import (
     "encoding/json"
     "errors"
     "fmt"
-    "git.sr.ht/~akilan1999/p2p-rendering-computation/client"
-    "git.sr.ht/~akilan1999/p2p-rendering-computation/config"
+    "github.com/Akilan1999/p2p-rendering-computation/client"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
     "github.com/google/uuid"
     "gopkg.in/yaml.v2"
     "io/ioutil"
@@ -67,7 +67,7 @@ type Host struct {
 
 // DetectPlugins Detects all the plugins available
 func DetectPlugins() (*Plugins, error) {
-    config, err := config.ConfigInit()
+    config, err := config.ConfigInit(nil, nil)
     if err != nil {
         return nil, err
     }
@@ -141,7 +141,7 @@ func RunPlugin(pluginName string, IPAddresses []*ExecuteIP) (*Plugin, error) {
             plugindetected = plugin
             plugindetected.Execute = IPAddresses
             // Get Execute plugin path from config file
-            config, err := config.ConfigInit()
+            config, err := config.ConfigInit(nil, nil)
             if err != nil {
                 return nil, err
             }

plugin/plugin_test.go

@@ -2,9 +2,9 @@ package plugin
 
 import (
     "fmt"
-    "git.sr.ht/~akilan1999/p2p-rendering-computation/client"
-    "git.sr.ht/~akilan1999/p2p-rendering-computation/config"
-    "git.sr.ht/~akilan1999/p2p-rendering-computation/server/docker"
+    "github.com/Akilan1999/p2p-rendering-computation/client"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
+    "github.com/Akilan1999/p2p-rendering-computation/server/docker"
     "net"
     "strconv"
     "testing"
@@ -74,7 +74,7 @@ func TestExecuteIP_ModifyHost(t *testing.T) {
     var testip ExecuteIP
 
     // Get plugin path from config file
-    Config, err := config.ConfigInit()
+    Config, err := config.ConfigInit(nil, nil)
     if err != nil {
         fmt.Println(err)
         t.Fail()

server/docker/containers/README

@@ -1,7 +0,0 @@
-Containers
-===========
-
-Structure
-   |_ Containers 
-          |_ <name> (To ensure the name is the same as the tag name)
-                |_ DockerFile 

server/docker/containers/cpuhorovod/Dockerfile

@@ -1,43 +0,0 @@
-from horovod/horovod-cpu
-# Switch to root user to install additional software
-USER 0
-
-
-# Make sure we don't get notifications we can't answer during building.
-env    DEBIAN_FRONTEND noninteractive
-
-run    apt-get -q -y update; apt-get -q -y upgrade
-run    apt install net-tools
-
-# Prepare scripts and configs
-add    ./scripts/start /start
-
-
-# Set root password
-run    echo 'root:password' >> /root/passwdfile
-
-
-# Create user and it's password
-run    useradd -m -G sudo master && \
-       echo 'master:password' >> /root/passwdfile
-
-
-# Apply root password
-run    chpasswd -c SHA512 < /root/passwdfile && \
-       rm /root/passwdfile
-
-
-# Port 22 is used for ssh
-expose 22
-
-
-# Assign /data as static volume.
-volume ["/data"]
-
-
-# Fix all permissions
-run    chmod +x /start
-
-
-# Starting sshd
-cmd    ["/start"]

server/docker/containers/cpuhorovod/description.txt

@@ -1 +0,0 @@
-Running official horovod dockerfile cpu version 

server/docker/containers/cpuhorovod/scripts/start

@@ -1,11 +0,0 @@
-#!/bin/bash
-# -----------------------------------------------------------------------------
-# docker-ubuntu-sshd /start script
-#
-# Authors: Art567
-# Updated: Sep 20th, 2015
-# -----------------------------------------------------------------------------
-
-
-# Run OpenSSH server in daemon mode
-/usr/sbin/sshd -D

server/docker/containers/docker-ubuntu-sshd-x11/Dockerfile

@@ -1,61 +0,0 @@
-# -----------------------------------------------------------------------------
-# This is base image of Ubuntu LTS with SSHD service.
-#
-# Authors: Art567
-# Updated: Sep 20th, 2015
-# Require: Docker (http://www.docker.io/)
-# -----------------------------------------------------------------------------
-
-
-# Base system is the latest LTS version of Ubuntu.
-# from   consol/ubuntu-xfce-vnc
-
-# due to dependency issues vnc is still work in progress
-from ubuntu:20.04
-
-# Switch to root user to install additional software
-USER 0
-
-
-# Make sure we don't get notifications we can't answer during building.
-env    DEBIAN_FRONTEND noninteractive
-
-
-# Prepare scripts and configs
-add    ./scripts/start /start
-
-
-# Download and install everything from the repos.
-run    apt-get -q -y update; apt-get -q -y upgrade && \
-       apt-get -q -y install sudo openssh-server && \
-       mkdir /var/run/sshd
-
-
-# Set root password
-run    echo 'root:password' >> /root/passwdfile
-
-
-# Create user and it's password
-run    useradd -m -G sudo master && \
-       echo 'master:password' >> /root/passwdfile
-
-
-# Apply root password
-run    chpasswd -c SHA512 < /root/passwdfile && \
-       rm /root/passwdfile
-
-
-# Port 22 is used for ssh
-expose 22
-
-
-# Assign /data as static volume.
-volume ["/data"]
-
-
-# Fix all permissions
-run    chmod +x /start
-
-
-# Starting sshd
-cmd    ["/start"]

server/docker/containers/docker-ubuntu-sshd-x11/README.md

@@ -1,72 +0,0 @@
-Ubuntu LTS with SSH (Docker)
-=========
-
-A Docker file to build a [docker.io] base container with Ubuntu LTS and a sshd service
-[docker.io]: http://docker.io
-Nice and easy way to get any server up and running using docker
-
-
-Instructions
------------
- - Install Docker first. 
-   Read [installation instructions] (http://docs.docker.io/en/latest/installation/).
- 
- 
- - Clone this repository:
- 
-   `$ git clone https://github.com/art567/docker-ubuntu-sshd.git`
- 
- 
- - Enter local directory:
- 
-   `$ cd docker-ubuntu-sshd`
- 
- - Change passwords in Dockerfile:
- 
-   `$ vi Dockerfile`
- 
- - Build the container:
- 
-   `$ sudo docker build -t art567/ubuntu .`
- 
- 
- - Run the container:
- 
-   `$ sudo docker run -d=true --name=ubuntu --restart=always -p=2222:22 -v=/opt/data:/data art567/ubuntu /start`
- 
- 
- - Your container will start and bind ssh to 2222 port.
- 
- 
- - Find your local IP Address:
- 
-   `$ ifconfig`
- 
- 
- - Connect to the SSH server:
- 
-   `$ ssh root@<ip-address> -p 2222`
- 
- 
- - If you don't want to deal with root:
- 
-   `$ ssh master@<ip-address> -p 2222`
- 
-
-**VERY IMPORTANT!!!**
------------
-
- **Don't forget to change passwords in Dockerfile before building image!**
-
-
-Versions
------------
-Some branches represents Ubuntu versions.
-
-Branch `master` is always represented by latest Ubuntu LTS
-
-   For example:
-   - 12.04 - Ubuntu 12.04 LTS
-   - 14.04 - Ubuntu 14.04 LTS
-   - 16.04 - Ubuntu 16.04 LTS
-

server/docker/containers/docker-ubuntu-sshd-x11/description.txt

@@ -1 +0,0 @@
-Simple Ubuntu 20.04 image

server/docker/containers/docker-ubuntu-sshd-x11/ports.json

@@ -1,16 +0,0 @@
-{
-  "Port": [
-    {
-      "PortName": "SSH",
-      "InternalPort": 22,
-      "Type": "tcp",
-      "Description": "SSH Port"
-    },
-    {
-      "PortName": "VNC",
-      "InternalPort": 5900,
-      "Type": "tcp",
-      "Description": "VNC port"
-    }
-  ]
-}

server/docker/containers/docker-ubuntu-sshd-x11/scripts/start

@@ -1,14 +0,0 @@
-#!/bin/bash
-# -----------------------------------------------------------------------------
-# docker-ubuntu-sshd /start script
-#
-# Authors: Art567
-# Updated: Sep 20th, 2015
-# -----------------------------------------------------------------------------
-
-
-# Run OpenSSH server in daemon mode
-/usr/sbin/sshd -D
-
-# Running x11 server with password
-

server/docker/containers/docker-ubuntu-sshd/Dockerfile

@@ -1,61 +0,0 @@
-# -----------------------------------------------------------------------------
-# This is base image of Ubuntu LTS with SSHD service.
-#
-# Authors: Art567
-# Updated: Sep 20th, 2015
-# Require: Docker (http://www.docker.io/)
-# -----------------------------------------------------------------------------
-
-
-# Base system is the latest LTS version of Ubuntu.
-# from   consol/ubuntu-xfce-vnc
-
-# due to dependency issues vnc is still work in progress
-from ubuntu:20.04
-
-# Switch to root user to install additional software
-USER 0
-
-
-# Make sure we don't get notifications we can't answer during building.
-env    DEBIAN_FRONTEND noninteractive
-
-
-# Prepare scripts and configs
-add    ./scripts/start /start
-
-
-# Download and install everything from the repos.
-run    apt-get -q -y update; apt-get -q -y upgrade && \
-       apt-get -q -y install sudo openssh-server && \
-       mkdir /var/run/sshd
-
-
-# Set root password
-run    echo 'root:password' >> /root/passwdfile
-
-
-# Create user and it's password
-run    useradd -m -G sudo master && \
-       echo 'master:password' >> /root/passwdfile
-
-
-# Apply root password
-run    chpasswd -c SHA512 < /root/passwdfile && \
-       rm /root/passwdfile
-
-
-# Port 22 is used for ssh
-expose 22
-
-
-# Assign /data as static volume.
-volume ["/data"]
-
-
-# Fix all permissions
-run    chmod +x /start
-
-
-# Starting sshd
-cmd    ["/start"]

server/docker/containers/docker-ubuntu-sshd/README.md

@@ -1,72 +0,0 @@
-Ubuntu LTS with SSH (Docker)
-=========
-
-A Docker file to build a [docker.io] base container with Ubuntu LTS and a sshd service
-[docker.io]: http://docker.io
-Nice and easy way to get any server up and running using docker
-
-
-Instructions
------------
- - Install Docker first. 
-   Read [installation instructions] (http://docs.docker.io/en/latest/installation/).
- 
- 
- - Clone this repository:
- 
-   `$ git clone https://github.com/art567/docker-ubuntu-sshd.git`
- 
- 
- - Enter local directory:
- 
-   `$ cd docker-ubuntu-sshd`
- 
- - Change passwords in Dockerfile:
- 
-   `$ vi Dockerfile`
- 
- - Build the container:
- 
-   `$ sudo docker build -t art567/ubuntu .`
- 
- 
- - Run the container:
- 
-   `$ sudo docker run -d=true --name=ubuntu --restart=always -p=2222:22 -v=/opt/data:/data art567/ubuntu /start`
- 
- 
- - Your container will start and bind ssh to 2222 port.
- 
- 
- - Find your local IP Address:
- 
-   `$ ifconfig`
- 
- 
- - Connect to the SSH server:
- 
-   `$ ssh root@<ip-address> -p 2222`
- 
- 
- - If you don't want to deal with root:
- 
-   `$ ssh master@<ip-address> -p 2222`
- 
-
-**VERY IMPORTANT!!!**
------------
-
- **Don't forget to change passwords in Dockerfile before building image!**
-
-
-Versions
------------
-Some branches represents Ubuntu versions.
-
-Branch `master` is always represented by latest Ubuntu LTS
-
-   For example:
-   - 12.04 - Ubuntu 12.04 LTS
-   - 14.04 - Ubuntu 14.04 LTS
-   - 16.04 - Ubuntu 16.04 LTS
-

server/docker/containers/docker-ubuntu-sshd/description.txt

@@ -1 +0,0 @@
-Simple Ubuntu 20.04 image

server/docker/containers/docker-ubuntu-sshd/ports.json

@@ -1,22 +0,0 @@
-{
-  "Port": [
-    {
-      "PortName": "SSH",
-      "InternalPort": 22,
-      "Type": "tcp",
-      "Description": "SSH Port"
-    },
-    {
-      "PortName": "NoVNC",
-      "InternalPort": 5901,
-      "Type": "tcp",
-      "Description": "NoVNC port"
-    },
-    {
-      "PortName": "NoVNC",
-      "InternalPort": 6081,
-      "Type": "tcp",
-      "Description": "NoVNC port"
-    }
-  ]
-}

server/docker/containers/docker-ubuntu-sshd/scripts/start

@@ -1,11 +0,0 @@
-#!/bin/bash
-# -----------------------------------------------------------------------------
-# docker-ubuntu-sshd /start script
-#
-# Authors: Art567
-# Updated: Sep 20th, 2015
-# -----------------------------------------------------------------------------
-
-
-# Run OpenSSH server in daemon mode
-/usr/sbin/sshd -D

server/docker/containers/gpuhorovod/Dockerfile

@@ -1,41 +0,0 @@
-from horovod/horovod
-# Switch to root user to install additional software
-USER 0
-
-
-# Make sure we don't get notifications we can't answer during building.
-env    DEBIAN_FRONTEND noninteractive
-
-
-# Prepare scripts and configs
-add    ./scripts/start /start
-
-
-# Set root password
-run    echo 'root:password' >> /root/passwdfile
-
-
-# Create user and it's password
-run    useradd -m -G sudo master && \
-       echo 'master:password' >> /root/passwdfile
-
-
-# Apply root password
-run    chpasswd -c SHA512 < /root/passwdfile && \
-       rm /root/passwdfile
-
-
-# Port 22 is used for ssh
-expose 22
-
-
-# Assign /data as static volume.
-volume ["/data"]
-
-
-# Fix all permissions
-run    chmod +x /start
-
-
-# Starting sshd
-cmd    ["/start"]

server/docker/containers/gpuhorovod/description.txt

@@ -1 +0,0 @@
-Running official horovod dockerfile cpu version 

server/docker/containers/gpuhorovod/scripts/start

@@ -1,11 +0,0 @@
-#!/bin/bash
-# -----------------------------------------------------------------------------
-# docker-ubuntu-sshd /start script
-#
-# Authors: Art567
-# Updated: Sep 20th, 2015
-# -----------------------------------------------------------------------------
-
-
-# Run OpenSSH server in daemon mode
-/usr/sbin/sshd -D

server/docker/containers/ubuntuvnc/Dockerfile

@@ -1,61 +0,0 @@
-# -----------------------------------------------------------------------------
-# This is base image of Ubuntu LTS with SSHD service.
-#
-# Authors: Art567
-# Updated: Sep 20th, 2015
-# Require: Docker (http://www.docker.io/)
-# -----------------------------------------------------------------------------
-
-
-# Base system is the latest LTS version of Ubuntu.
-# from   consol/ubuntu-xfce-vnc
-
-# due to dependency issues vnc is still work in progress
-from dorowu/ubuntu-desktop-lxde-vnc
-
-# Switch to root user to install additional software
-USER 0
-
-
-# Make sure we don't get notifications we can't answer during building.
-env    DEBIAN_FRONTEND noninteractive
-
-
-# Prepare scripts and configs
-add    ./scripts/start /start
-
-
-# Download and install everything from the repos.
-run    apt-get -q -y update; apt-get -q -y upgrade && \
-       apt-get -q -y install sudo openssh-server && \
-       mkdir /var/run/sshd
-
-
-# Set root password
-run    echo 'root:password' >> /root/passwdfile
-
-
-# Create user and it's password
-run    useradd -m -G sudo master && \
-       echo 'master:password' >> /root/passwdfile
-
-
-# Apply root password
-run    chpasswd -c SHA512 < /root/passwdfile && \
-       rm /root/passwdfile
-
-
-# Port 22 is used for ssh
-expose 22
-
-
-# Assign /data as static volume.
-volume ["/data"]
-
-
-# Fix all permissions
-run    chmod +x /start
-
-
-# Starting sshd
-cmd    ["/start"]

server/docker/containers/ubuntuvnc/README.md

@@ -1,72 +0,0 @@
-Ubuntu LTS with SSH (Docker)
-=========
-
-A Docker file to build a [docker.io] base container with Ubuntu LTS and a sshd service
-[docker.io]: http://docker.io
-Nice and easy way to get any server up and running using docker
-
-
-Instructions
------------
- - Install Docker first. 
-   Read [installation instructions] (http://docs.docker.io/en/latest/installation/).
- 
- 
- - Clone this repository:
- 
-   `$ git clone https://github.com/art567/docker-ubuntu-sshd.git`
- 
- 
- - Enter local directory:
- 
-   `$ cd docker-ubuntu-sshd`
- 
- - Change passwords in Dockerfile:
- 
-   `$ vi Dockerfile`
- 
- - Build the container:
- 
-   `$ sudo docker build -t art567/ubuntu .`
- 
- 
- - Run the container:
- 
-   `$ sudo docker run -d=true --name=ubuntu --restart=always -p=2222:22 -v=/opt/data:/data art567/ubuntu /start`
- 
- 
- - Your container will start and bind ssh to 2222 port.
- 
- 
- - Find your local IP Address:
- 
-   `$ ifconfig`
- 
- 
- - Connect to the SSH server:
- 
-   `$ ssh root@<ip-address> -p 2222`
- 
- 
- - If you don't want to deal with root:
- 
-   `$ ssh master@<ip-address> -p 2222`
- 
-
-**VERY IMPORTANT!!!**
------------
-
- **Don't forget to change passwords in Dockerfile before building image!**
-
-
-Versions
------------
-Some branches represents Ubuntu versions.
-
-Branch `master` is always represented by latest Ubuntu LTS
-
-   For example:
-   - 12.04 - Ubuntu 12.04 LTS
-   - 14.04 - Ubuntu 14.04 LTS
-   - 16.04 - Ubuntu 16.04 LTS
-

server/docker/containers/ubuntuvnc/description.txt

@@ -1 +0,0 @@
-Simple Ubuntu 20.04 image

server/docker/containers/ubuntuvnc/scripts/start

@@ -1,11 +0,0 @@
-#!/bin/bash
-# -----------------------------------------------------------------------------
-# docker-ubuntu-sshd /start script
-#
-# Authors: Art567
-# Updated: Sep 20th, 2015
-# -----------------------------------------------------------------------------
-
-
-# Run OpenSSH server in daemon mode
-/usr/sbin/sshd -D

server/docker/docker.go

@@ -1,406 +1,404 @@
 package docker
 
 import (
-	"bufio"
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/client"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/go-connections/nat"
-	"github.com/lithammer/shortuuid"
-	"github.com/phayes/freeport"
-	"io"
-	"io/ioutil"
-	"os/exec"
-	"time"
+    "bufio"
+    "bytes"
+    "context"
+    "encoding/json"
+    "errors"
+    "fmt"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
+    "github.com/docker/docker/api/types"
+    "github.com/docker/docker/api/types/container"
+    "github.com/docker/docker/client"
+    "github.com/docker/docker/pkg/archive"
+    "github.com/docker/go-connections/nat"
+    "github.com/lithammer/shortuuid"
+    "github.com/phayes/freeport"
+    "io"
+    "io/ioutil"
+    "os/exec"
+    "time"
 )
 
 type DockerVM struct {
-	 SSHUsername string `json:"SSHUsername"`
-	 SSHPassword string `json:"SSHPassword"`
-	 ID string `json:"ID"`
-	 TagName string `json:"TagName"`
-	 ImagePath string `json:"ImagePath"`
-	 Ports Ports `json:"Ports"`
-	 GPU string `json:"GPU"`
+    SSHUsername string `json:"SSHUsername"`
+    SSHPassword string `json:"SSHPassword"`
+    ID          string `json:"ID"`
+    TagName     string `json:"TagName"`
+    ImagePath   string `json:"ImagePath"`
+    Ports       Ports  `json:"Ports"`
+    GPU         string `json:"GPU"`
 }
 
 type DockerContainers struct {
-	 DockerContainer []DockerContainer `json:"DockerContainer"`
+    DockerContainer []DockerContainer `json:"DockerContainer"`
 }
 
 type DockerContainer struct {
-	ContainerName string `json:"DockerContainerName"`
-	ContainerDescription string `json:"ContainerDescription"`
+    ContainerName        string `json:"DockerContainerName"`
+    ContainerDescription string `json:"ContainerDescription"`
 }
 
 type Ports struct {
-	PortSet []Port `json:"Port"`
+    PortSet []Port `json:"Port"`
 }
 type Port struct {
-	PortName string `json:"PortName"`
-	InternalPort int `json:"InternalPort"`
-    Type string `json:"Type"`
-	ExternalPort int `json:"ExternalPort"`
-	IsUsed       bool `json:"IsUsed"`
-	Description  string `json:"Description"`
+    PortName     string `json:"PortName"`
+    InternalPort int    `json:"InternalPort"`
+    Type         string `json:"Type"`
+    ExternalPort int    `json:"ExternalPort"`
+    IsUsed       bool   `json:"IsUsed"`
+    Description  string `json:"Description"`
 }
 
 type ErrorLine struct {
-	Error       string      `json:"error"`
-	ErrorDetail ErrorDetail `json:"errorDetail"`
+    Error       string      `json:"error"`
+    ErrorDetail ErrorDetail `json:"errorDetail"`
 }
 
 type ErrorDetail struct {
-	Message string `json:"message"`
+    Message string `json:"message"`
 }
 
 var dockerRegistryUserID = ""
 
 // BuildRunContainer Function is incharge to invoke building and running contianer and also allocating external
 // ports
-func BuildRunContainer(NumPorts int, GPU string, ContainerName string) (*DockerVM,error) {
-	//Docker Struct Variable
-	var RespDocker *DockerVM = new(DockerVM)
+func BuildRunContainer(NumPorts int, GPU string, ContainerName string) (*DockerVM, error) {
+    //Docker Struct Variable
+    var RespDocker *DockerVM = new(DockerVM)
 
-	// Sets if GPU is selected or not
-	RespDocker.GPU = GPU
+    // Sets if GPU is selected or not
+    RespDocker.GPU = GPU
 
-	// Sets Free port to Struct
-	//RespDocker.SSHPort = Ports[0]
-	//RespDocker.VNCPort = Ports[1]
-	// Sets appropriate username and password to the
-	// variables in the struct
-	RespDocker.SSHUsername = "master"
-	RespDocker.SSHPassword = "password"
-	//RespDocker.VNCPassword = "vncpassword"
+    // Sets Free port to Struct
+    //RespDocker.SSHPort = Ports[0]
+    //RespDocker.VNCPort = Ports[1]
+    // Sets appropriate username and password to the
+    // variables in the struct
+    RespDocker.SSHUsername = "master"
+    RespDocker.SSHPassword = "password"
+    //RespDocker.VNCPassword = "vncpassword"
 
-	//Default parameters
-	RespDocker.TagName = "p2p-ubuntu"
-	// Get Path from config
-	config, err := config.ConfigInit()
-	if err != nil {
-		return nil,err
-	}
-	RespDocker.ImagePath = config.DefaultDockerFile
+    //Default parameters
+    RespDocker.TagName = "p2p-ubuntu"
+    // Get Path from config
+    config, err := config.ConfigInit(nil, nil)
+    if err != nil {
+        return nil, err
+    }
+    RespDocker.ImagePath = config.DefaultDockerFile
 
-	// We are checking if the container name is not nil and not equal to the default one used
-	// which is docker-ubuntu-sshd
-	if ContainerName != "" && ContainerName != "docker-ubuntu-sshd" {
-		Containers, err := ViewAllContainers()
-		if err != nil {
-			return nil,err
-		}
+    // We are checking if the container name is not nil and not equal to the default one used
+    // which is docker-ubuntu-sshd
+    if ContainerName != "" && ContainerName != "docker-ubuntu-sshd" {
+        Containers, err := ViewAllContainers()
+        if err != nil {
+            return nil, err
+        }
 
-		for _, dockerContainer := range Containers.DockerContainer {
-			if dockerContainer.ContainerName == ContainerName {
-				RespDocker.ImagePath = config.DockerContainers + ContainerName + "/"
-				RespDocker.TagName = ContainerName
-				break
-			}
-		}
-		if RespDocker.ImagePath == config.DefaultDockerFile {
-			return nil, errors.New("Container " + ContainerName  + " does not exist in the server")
-		}
-	}
+        for _, dockerContainer := range Containers.DockerContainer {
+            if dockerContainer.ContainerName == ContainerName {
+                RespDocker.ImagePath = config.DockerContainers + ContainerName + "/"
+                RespDocker.TagName = ContainerName
+                break
+            }
+        }
+        if RespDocker.ImagePath == config.DefaultDockerFile {
+            return nil, errors.New("Container " + ContainerName + " does not exist in the server")
+        }
+    }
 
-	PortsInformation, err := OpenPortsFile(RespDocker.ImagePath + "/ports.json")
-	if err != nil {
-		return nil, err
-	}
+    PortsInformation, err := OpenPortsFile(RespDocker.ImagePath + "/ports.json")
+    if err != nil {
+        return nil, err
+    }
 
-	// Number of perts we want to open + number of ports required inside the
-	// docker container
-	count := NumPorts + len(PortsInformation.PortSet)
-	// Creates number of ports
-	OpenPorts, err := freeport.GetFreePorts(count)
-	if err != nil {
-		return nil,err
-	}
-	// Allocate external ports to ports available in the ports.json file
-	for i := range PortsInformation.PortSet {
-		// Setting external ports
-		PortsInformation.PortSet[i].ExternalPort = OpenPorts[i]
-		PortsInformation.PortSet[i].IsUsed = true
-	}
-	//Length of Ports allocated from thr port file
-	portFileLength := len(PortsInformation.PortSet)
-	// Allocate New ports the user wants to generate
-	for i := 0; i < NumPorts; i++ {
-		var TempPort Port
-		TempPort.PortName = "AutoGen Port"
-		TempPort.Type = "tcp"
-		TempPort.InternalPort = OpenPorts[portFileLength + i]
-		TempPort.ExternalPort = OpenPorts[portFileLength + i]
-		TempPort.Description = "Auto generated TCP port"
-		TempPort.IsUsed = false
-		//Append temp port to port information
-		PortsInformation.PortSet = append(PortsInformation.PortSet, TempPort)
-	}
-	// Setting ports to the docker VM struct
-	RespDocker.Ports = *PortsInformation
+    // Number of perts we want to open + number of ports required inside the
+    // docker container
+    count := NumPorts + len(PortsInformation.PortSet)
+    // Creates number of ports
+    OpenPorts, err := freeport.GetFreePorts(count)
+    if err != nil {
+        return nil, err
+    }
+    // Allocate external ports to ports available in the ports.json file
+    for i := range PortsInformation.PortSet {
+        // Setting external ports
+        PortsInformation.PortSet[i].ExternalPort = OpenPorts[i]
+        PortsInformation.PortSet[i].IsUsed = true
+    }
+    //Length of Ports allocated from thr port file
+    portFileLength := len(PortsInformation.PortSet)
+    // Allocate New ports the user wants to generate
+    for i := 0; i < NumPorts; i++ {
+        var TempPort Port
+        TempPort.PortName = "AutoGen Port"
+        TempPort.Type = "tcp"
+        TempPort.InternalPort = OpenPorts[portFileLength+i]
+        TempPort.ExternalPort = OpenPorts[portFileLength+i]
+        TempPort.Description = "Auto generated TCP port"
+        TempPort.IsUsed = false
+        //Append temp port to port information
+        PortsInformation.PortSet = append(PortsInformation.PortSet, TempPort)
+    }
+    // Setting ports to the docker VM struct
+    RespDocker.Ports = *PortsInformation
 
-	// Gets docker information from env variables
-	cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
-	if err != nil {
-		return nil,err
-	}
+    // Gets docker information from env variables
+    cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
+    if err != nil {
+        return nil, err
+    }
 
-	// Builds docker image
-	err = RespDocker.imageBuild(cli)
-	if err != nil {
-		return nil,err
-	}
+    // Builds docker image
+    err = RespDocker.imageBuild(cli)
+    if err != nil {
+        return nil, err
+    }
 
-	// Runs docker contianer
-	err = RespDocker.runContainer(cli)
+    // Runs docker contianer
+    err = RespDocker.runContainer(cli)
 
-	if err != nil {
-		return nil,err
-	}
+    if err != nil {
+        return nil, err
+    }
 
-
-	return RespDocker,nil
+    return RespDocker, nil
 
 }
 
-//Builds docker image (TODO: relative path for Dockerfile deploy)
-func (d *DockerVM)imageBuild(dockerClient *client.Client) error {
-	ctx, _ := context.WithTimeout(context.Background(), time.Second*2000)
-	//defer cancel()
+// Builds docker image (TODO: relative path for Dockerfile deploy)
+func (d *DockerVM) imageBuild(dockerClient *client.Client) error {
+    ctx, _ := context.WithTimeout(context.Background(), time.Second*2000)
+    //defer cancel()
 
-	tar, err := archive.TarWithOptions(d.ImagePath, &archive.TarOptions{})
-	if err != nil {
-		return err
-	}
+    tar, err := archive.TarWithOptions(d.ImagePath, &archive.TarOptions{})
+    if err != nil {
+        return err
+    }
 
-	opts := types.ImageBuildOptions{
-		Dockerfile: "Dockerfile",
-		Tags:       []string{d.TagName},
-		Remove:     true,
-	}
-	res, err := dockerClient.ImageBuild(ctx, tar, opts)
-	if err != nil {
-		return err
-	}
+    opts := types.ImageBuildOptions{
+        Dockerfile: "Dockerfile",
+        Tags:       []string{d.TagName},
+        Remove:     true,
+    }
+    res, err := dockerClient.ImageBuild(ctx, tar, opts)
+    if err != nil {
+        return err
+    }
 
-	defer res.Body.Close()
+    defer res.Body.Close()
 
-	err = print(res.Body)
-	if err != nil {
-		return err
-	}
+    err = print(res.Body)
+    if err != nil {
+        return err
+    }
 
-	return nil
+    return nil
 }
 
 // Starts container and assigns port numbers
 // Sample Docker run Command
 // docker run -d=true --name=Test123 --restart=always --gpus all
-//-p 3443:6901 -p 3453:22 -p 3434:3434 -p 3245:3245 -v=/opt/data:/data
-//p2p-ubuntu /start > /dev/null
-func (d *DockerVM)runContainer(dockerClient *client.Client) error{
-	ctx, _ := context.WithTimeout(context.Background(), time.Second*2000)
+// -p 3443:6901 -p 3453:22 -p 3434:3434 -p 3245:3245 -v=/opt/data:/data
+// p2p-ubuntu /start > /dev/null
+func (d *DockerVM) runContainer(dockerClient *client.Client) error {
+    ctx, _ := context.WithTimeout(context.Background(), time.Second*2000)
 
-
-	// The first mode runs using the Docker Api. As the API supports using
-	// CPU and uses a shell script for GPU call because till this point of
-	// implementation docker api does not support the flag "--gpu all"
+    // The first mode runs using the Docker Api. As the API supports using
+    // CPU and uses a shell script for GPU call because till this point of
+    // implementation docker api does not support the flag "--gpu all"
     if d.GPU != "true" {
-		//Exposed ports for docker config file
-		var ExposedPort nat.PortSet
+        //Exposed ports for docker config file
+        var ExposedPort nat.PortSet
 
-		ExposedPort = nat.PortSet{
-			"22/tcp": struct{}{},
-			//"6901/tcp": struct{}{},
-		}
+        ExposedPort = nat.PortSet{
+            "22/tcp": struct{}{},
+            //"6901/tcp": struct{}{},
+        }
 
-		// Port forwarding for VNC and SSH ports
-		PortForwarding := nat.PortMap{
-			//"22/tcp": []nat.PortBinding{
-			//	{
-			//		HostIP: "0.0.0.0",
-			//		HostPort: fmt.Sprint(d.SSHPort),
-			//	},
-			//},
-			//"6901/tcp": []nat.PortBinding{
-			//	{
-			//		HostIP: "0.0.0.0",
-			//		HostPort: fmt.Sprint(d.VNCPort),
-			//	},
-			//},
-		}
+        // Port forwarding for VNC and SSH ports
+        PortForwarding := nat.PortMap{
+            //"22/tcp": []nat.PortBinding{
+            //	{
+            //		HostIP: "0.0.0.0",
+            //		HostPort: fmt.Sprint(d.SSHPort),
+            //	},
+            //},
+            //"6901/tcp": []nat.PortBinding{
+            //	{
+            //		HostIP: "0.0.0.0",
+            //		HostPort: fmt.Sprint(d.VNCPort),
+            //	},
+            //},
+        }
 
-		for i := range d.Ports.PortSet {
-			// Parameters "tcp or udp", external port
-			Port, err := nat.NewPort(d.Ports.PortSet[i].Type,fmt.Sprint(d.Ports.PortSet[i].InternalPort))
-			if err != nil {
-				return err
-			}
+        for i := range d.Ports.PortSet {
+            // Parameters "tcp or udp", external port
+            Port, err := nat.NewPort(d.Ports.PortSet[i].Type, fmt.Sprint(d.Ports.PortSet[i].InternalPort))
+            if err != nil {
+                return err
+            }
 
-			// Exposed Ports
-			ExposedPort[Port] = struct{}{}
+            // Exposed Ports
+            ExposedPort[Port] = struct{}{}
 
-			PortForwarding[Port] = []nat.PortBinding{
-				{
-					HostIP: "0.0.0.0",
-					HostPort: fmt.Sprint(d.Ports.PortSet[i].ExternalPort),
-				},
-			}
-		}
+            PortForwarding[Port] = []nat.PortBinding{
+                {
+                    HostIP:   "0.0.0.0",
+                    HostPort: fmt.Sprint(d.Ports.PortSet[i].ExternalPort),
+                },
+            }
+        }
 
-		config := &container.Config{
-			Image:        d.TagName,
-			Entrypoint:   []string{"/start"},
-			Volumes:      map[string]struct{}{"/opt/data:/data": {}},
-			ExposedPorts: ExposedPort,
-		}
-		hostConfig := &container.HostConfig{
-			PortBindings: PortForwarding,
-		}
+        config := &container.Config{
+            Image:        d.TagName,
+            Entrypoint:   []string{"/start"},
+            Volumes:      map[string]struct{}{"/opt/data:/data": {}},
+            ExposedPorts: ExposedPort,
+        }
+        hostConfig := &container.HostConfig{
+            PortBindings: PortForwarding,
+        }
 
-		res, err := dockerClient.ContainerCreate(ctx, config, hostConfig,
-			nil, nil, "")
+        res, err := dockerClient.ContainerCreate(ctx, config, hostConfig,
+            nil, nil, "")
 
-		// Set response ID
-		d.ID = res.ID
+        // Set response ID
+        d.ID = res.ID
 
-		if err != nil {
-			return err
-		}
+        if err != nil {
+            return err
+        }
 
-		err = dockerClient.ContainerStart(ctx, res.ID, types.ContainerStartOptions{})
+        err = dockerClient.ContainerStart(ctx, res.ID, types.ContainerStartOptions{})
 
-		if err != nil {
-			return err
-		}
-	} else {
-		// Generate Random ID
-		id := shortuuid.New()
-		d.ID = id
+        if err != nil {
+            return err
+        }
+    } else {
+        // Generate Random ID
+        id := shortuuid.New()
+        d.ID = id
 
-		var cmd bytes.Buffer
-		cmd.WriteString("docker run -d=true --name="+ id +" --restart=always --gpus all ")
-		for i := range d.Ports.PortSet {
-			cmd.WriteString("-p " + fmt.Sprint(d.Ports.PortSet[i].ExternalPort) + ":" + fmt.Sprint(d.Ports.PortSet[i].InternalPort) + " ")
-		}
-		cmd.WriteString("-v=/opt/data:/data "+ d.TagName +" /start > /dev/null")
-		//"-v=/opt/data:/data p2p-ubuntu /start > /dev/null"
-		cmdStr := cmd.String()
-		_, err := exec.Command("/bin/sh", "-c", cmdStr).Output()
-		if err != nil {
-			return err
-		}
-	}
-	return nil
+        var cmd bytes.Buffer
+        cmd.WriteString("docker run -d=true --name=" + id + " --restart=always --gpus all ")
+        for i := range d.Ports.PortSet {
+            cmd.WriteString("-p " + fmt.Sprint(d.Ports.PortSet[i].ExternalPort) + ":" + fmt.Sprint(d.Ports.PortSet[i].InternalPort) + " ")
+        }
+        cmd.WriteString("-v=/opt/data:/data " + d.TagName + " /start > /dev/null")
+        //"-v=/opt/data:/data p2p-ubuntu /start > /dev/null"
+        cmdStr := cmd.String()
+        _, err := exec.Command("/bin/sh", "-c", cmdStr).Output()
+        if err != nil {
+            return err
+        }
+    }
+    return nil
 }
 
-// StopAndRemoveContainer 
+// StopAndRemoveContainer
 // Stop and remove a container
 // Reference (https://gist.github.com/frikky/e2efcea6c733ea8d8d015b7fe8a91bf6)
 func StopAndRemoveContainer(containername string) error {
-	ctx := context.Background()
+    ctx := context.Background()
 
-	// Gets docker information from env variables
-	client, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
-	if err != nil {
-		return err
-	}
+    // Gets docker information from env variables
+    client, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
+    if err != nil {
+        return err
+    }
 
-	if err = client.ContainerStop(ctx, containername, nil); err != nil {
-		return err
-	}
+    if err = client.ContainerStop(ctx, containername, nil); err != nil {
+        return err
+    }
 
-	removeOptions := types.ContainerRemoveOptions{
-		RemoveVolumes: true,
-		Force:         true,
-	}
+    removeOptions := types.ContainerRemoveOptions{
+        RemoveVolumes: true,
+        Force:         true,
+    }
 
-	if err = client.ContainerRemove(ctx, containername, removeOptions); err != nil {
-		return err
-	}
+    if err = client.ContainerRemove(ctx, containername, removeOptions); err != nil {
+        return err
+    }
 
-	return nil
+    return nil
 }
 
 // ViewAllContainers returns all containers runnable and which can be built
-func ViewAllContainers() (*DockerContainers, error){
-	// Traverse the deploy path as per given in the config file
-	config, err := config.ConfigInit()
-	if err != nil {
-		return nil,err
-	}
+func ViewAllContainers() (*DockerContainers, error) {
+    // Traverse the deploy path as per given in the config file
+    config, err := config.ConfigInit(nil, nil)
+    if err != nil {
+        return nil, err
+    }
 
-	folders, err := ioutil.ReadDir(config.DockerContainers)
-	if err != nil {
-		return nil, err
-	}
+    folders, err := ioutil.ReadDir(config.DockerContainers)
+    if err != nil {
+        return nil, err
+    }
 
-	//Declare variable DockerContainers of type struct
-	var Containers *DockerContainers = new(DockerContainers)
+    //Declare variable DockerContainers of type struct
+    var Containers *DockerContainers = new(DockerContainers)
 
-	for _, f := range folders {
-		if f.IsDir() {
-			//Declare variable DockerContainer of type struct
+    for _, f := range folders {
+        if f.IsDir() {
+            //Declare variable DockerContainer of type struct
             var Container DockerContainer
 
             // Setting container name to deploy name
             Container.ContainerName = f.Name()
             // Getting Description from file description.txt
-			Description, err := ioutil.ReadFile(config.DockerContainers + "/" + Container.ContainerName + "/description.txt")
-			// if we os.Open returns an error then handle it
-			if err != nil {
-				return nil, err
-			}
+            Description, err := ioutil.ReadFile(config.DockerContainers + "/" + Container.ContainerName + "/description.txt")
+            // if we os.Open returns an error then handle it
+            if err != nil {
+                return nil, err
+            }
 
-			// Get Description from description.txt
-			Container.ContainerDescription = string(Description)
+            // Get Description from description.txt
+            Container.ContainerDescription = string(Description)
 
-			Containers.DockerContainer = append(Containers.DockerContainer, Container)
-		}
-	}
+            Containers.DockerContainer = append(Containers.DockerContainer, Container)
+        }
+    }
 
-	return Containers,nil
+    return Containers, nil
 }
 
 func print(rd io.Reader) error {
-	var lastLine string
+    var lastLine string
 
-	scanner := bufio.NewScanner(rd)
-	for scanner.Scan() {
-		lastLine = scanner.Text()
-	}
+    scanner := bufio.NewScanner(rd)
+    for scanner.Scan() {
+        lastLine = scanner.Text()
+    }
 
-	errLine := &ErrorLine{}
-	json.Unmarshal([]byte(lastLine), errLine)
-	if errLine.Error != "" {
-		return errors.New(errLine.Error)
-	}
+    errLine := &ErrorLine{}
+    json.Unmarshal([]byte(lastLine), errLine)
+    if errLine.Error != "" {
+        return errors.New(errLine.Error)
+    }
 
-	if err := scanner.Err(); err != nil {
-		return err
-	}
+    if err := scanner.Err(); err != nil {
+        return err
+    }
 
-	return nil
+    return nil
 }
 
 func OpenPortsFile(filename string) (*Ports, error) {
-	buf, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return nil, err
-	}
+    buf, err := ioutil.ReadFile(filename)
+    if err != nil {
+        return nil, err
+    }
 
-	c := &Ports{}
-	err = json.Unmarshal(buf, c)
-	if err != nil {
-		return nil, fmt.Errorf("in file %q: %v", filename, err)
-	}
+    c := &Ports{}
+    err = json.Unmarshal(buf, c)
+    if err != nil {
+        return nil, fmt.Errorf("in file %q: %v", filename, err)
+    }
 
-	return c, nil
-}
+    return c, nil
+}

server/gopsutil.go

@@ -1,50 +1,50 @@
 package server
 
 import (
-    "github.com/shirou/gopsutil/v3/cpu"
-    "github.com/shirou/gopsutil/v3/disk"
-    "github.com/shirou/gopsutil/v3/host"
-    "github.com/shirou/gopsutil/v3/mem"
+	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v3/host"
+	"github.com/shirou/gopsutil/v3/mem"
 )
 
 // SysInfo saves the basic system information
 type SysInfo struct {
-    Hostname string `bson:hostname`
-    Platform string `bson:platform`
-    CPU      string `bson:cpu`
-    RAM      uint64 `bson:ram`
-    Disk     uint64 `bson:disk`
-    GPU      *Query `xml: GpuInfo`
+	Hostname string `bson:hostname`
+	Platform string `bson:platform`
+	CPU      string `bson:cpu`
+	RAM      uint64 `bson:ram`
+	Disk     uint64 `bson:disk`
+	GPU      *Query `xml: GpuInfo`
 }
 
-func ServerInfo() interface{} {
-    hostStat, _ := host.Info()
-    cpuStat, _ := cpu.Info()
-    vmStat, _ := mem.VirtualMemory()
+func ServerInfo() *SysInfo {
+	hostStat, _ := host.Info()
+	cpuStat, _ := cpu.Info()
+	vmStat, _ := mem.VirtualMemory()
 
-    info := new(SysInfo)
+	info := new(SysInfo)
 
-    filesystem := "/"
+	filesystem := "/"
 
-    // If the server is running windows
-    if info.Hostname == "windows" {
-        filesystem = "\\"
-    }
+	// If the server is running windows
+	if info.Hostname == "windows" {
+		filesystem = "\\"
+	}
 
-    diskStat, _ := disk.Usage(filesystem) // If you're in Unix change this "\\" for "/"
+	diskStat, _ := disk.Usage(filesystem) // If you're in Unix change this "\\" for "/"
 
-    info.Hostname = hostStat.Hostname
-    info.Platform = hostStat.Platform
-    info.CPU = cpuStat[0].ModelName
-    info.RAM = vmStat.Total / 1024 / 1024
-    info.Disk = diskStat.Total / 1024 / 1024
+	info.Hostname = hostStat.Hostname
+	info.Platform = hostStat.Platform
+	info.CPU = cpuStat[0].ModelName
+	info.RAM = vmStat.Total / 1024 / 1024
+	info.Disk = diskStat.Total / 1024 / 1024
 
-    gpu, err := GPUInfo()
+	gpu, err := GPUInfo()
 
-    if err == nil {
-        info.GPU = gpu
-    }
+	if err == nil {
+		info.GPU = gpu
+	}
 
-    return info
+	return info
 
 }

server/rpc.go

@@ -2,7 +2,7 @@ package server
 
 import (
 	"fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/server/docker"
+	"github.com/Akilan1999/p2p-rendering-computation/server/docker"
 	"net"
 	"net/rpc"
 )
@@ -18,8 +18,8 @@ type Docker struct {
 }
 
 // Starts container using RPC calls
-func (l *Listener) StartContainer( reply *Docker) error {
-	vm, err := docker.BuildRunContainer(3,"false","")
+func (l *Listener) StartContainer(reply *Docker) error {
+	vm, err := docker.BuildRunContainer(3, "false", "")
 	if err != nil {
 		return err
 	}
@@ -28,8 +28,6 @@ func (l *Listener) StartContainer( reply *Docker) error {
 	return nil
 }
 
-
-
 func Rpc() {
 	rpcServer, err := net.ResolveTCPAddr("tcp", "0.0.0.0:"+port)
 	if err != nil {
@@ -43,4 +41,3 @@ func Rpc() {
 	rpc.Register(listener)
 	rpc.Accept(inbound)
 }
-

server/server.go

@@ -1,229 +1,226 @@
 package server
 
 import (
-	"encoding/json"
-	"fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/client/clientIPTable"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/p2p"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/p2p/frp"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/server/docker"
-	"github.com/gin-gonic/gin"
-	"io/ioutil"
-	"net/http"
-	"strconv"
-	"time"
+    "encoding/json"
+    "fmt"
+    "github.com/Akilan1999/p2p-rendering-computation/client/clientIPTable"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
+    "github.com/Akilan1999/p2p-rendering-computation/p2p"
+    "github.com/Akilan1999/p2p-rendering-computation/p2p/frp"
+    "github.com/Akilan1999/p2p-rendering-computation/server/docker"
+    "github.com/gin-gonic/gin"
+    "io/ioutil"
+    "net/http"
+    "strconv"
+    "time"
 )
 
-func Server() error {
-	r := gin.Default()
+func Server() (*gin.Engine, error) {
+    r := gin.Default()
 
-	//Get Server port based on the config file
-	config, err := config.ConfigInit()
-	if err != nil {
-		return err
-	}
+    //Get Server port based on the config file
+    config, err := config.ConfigInit(nil, nil)
+    if err != nil {
+        return nil, err
+    }
 
-	// update IPTable with new port and ip address and update ip table
-	var ProxyIpAddr p2p.IpAddress
-	var lowestLatencyIpAddress p2p.IpAddress
+    // update IPTable with new port and ip address and update ip table
+    var ProxyIpAddr p2p.IpAddress
+    var lowestLatencyIpAddress p2p.IpAddress
 
-	// Gets default information of the server
-	r.GET("/server_info", func(c *gin.Context) {
-		c.JSON(http.StatusOK, ServerInfo())
-	})
+    // Gets default information of the server
+    r.GET("/server_info", func(c *gin.Context) {
+        c.JSON(http.StatusOK, ServerInfo())
+    })
 
-	// Speed test with 50 mbps
-	r.GET("/50", func(c *gin.Context) {
-		// Get Path from config
-		c.File(config.SpeedTestFile)
-	})
+    // Speed test with 50 mbps
+    r.GET("/50", func(c *gin.Context) {
+        // Get Path from config
+        c.File(config.SpeedTestFile)
+    })
 
-	// Route build to do a speed test
-	r.GET("/upload", func(c *gin.Context) {
-		file, _ := c.FormFile("file")
+    // Route build to do a speed test
+    r.GET("/upload", func(c *gin.Context) {
+        file, _ := c.FormFile("file")
 
-		// Upload the file to specific dst.
-		// c.SaveUploadedFile(file, dst)
+        // Upload the file to specific dst.
+        // c.SaveUploadedFile(file, dst)
 
-		c.String(http.StatusOK, fmt.Sprintf("'%s' uploaded!", file.Filename))
-	})
+        c.String(http.StatusOK, fmt.Sprintf("'%s' uploaded!", file.Filename))
+    })
 
-	//Gets Ip Table from server node
-	r.POST("/IpTable", func(c *gin.Context) {
-		// Getting IPV4 address of client
-		var ClientHost p2p.IpAddress
+    //Gets Ip Table from server node
+    r.POST("/IpTable", func(c *gin.Context) {
+        // Getting IPV4 address of client
+        var ClientHost p2p.IpAddress
 
-		if p2p.Ip4or6(c.ClientIP()) == "version 6" {
-			ClientHost.Ipv6 = c.ClientIP()
-		} else {
-			ClientHost.Ipv4 = c.ClientIP()
-		}
+        if p2p.Ip4or6(c.ClientIP()) == "version 6" {
+            ClientHost.Ipv6 = c.ClientIP()
+        } else {
+            ClientHost.Ipv4 = c.ClientIP()
+        }
 
-		// Variable to store IP table information
-		var IPTable p2p.IpAddresses
+        // Variable to store IP table information
+        var IPTable p2p.IpAddresses
 
-		// Receive file from POST request
-		body, err := c.FormFile("json")
-		if err != nil {
-			c.String(http.StatusOK, fmt.Sprint(err))
-		}
+        // Receive file from POST request
+        body, err := c.FormFile("json")
+        if err != nil {
+            c.String(http.StatusOK, fmt.Sprint(err))
+        }
 
-		// Open file
-		open, err := body.Open()
-		if err != nil {
-			c.String(http.StatusOK, fmt.Sprint(err))
-		}
+        // Open file
+        open, err := body.Open()
+        if err != nil {
+            c.String(http.StatusOK, fmt.Sprint(err))
+        }
 
-		// Open received file
-		file, err := ioutil.ReadAll(open)
-		if err != nil {
-			c.String(http.StatusOK, fmt.Sprint(err))
-		}
+        // Open received file
+        file, err := ioutil.ReadAll(open)
+        if err != nil {
+            c.String(http.StatusOK, fmt.Sprint(err))
+        }
 
-		json.Unmarshal(file, &IPTable)
+        json.Unmarshal(file, &IPTable)
 
-		//Add Client IP address to IPTable struct
-		IPTable.IpAddress = append(IPTable.IpAddress, ClientHost)
+        //Add Client IP address to IPTable struct
+        IPTable.IpAddress = append(IPTable.IpAddress, ClientHost)
 
-		// Runs speed test to return only servers in the IP table pingable
-		err = IPTable.SpeedTestUpdatedIPTable()
-		if err != nil {
-			c.String(http.StatusOK, fmt.Sprint(err))
-		}
+        // Runs speed test to return only servers in the IP table pingable
+        err = IPTable.SpeedTestUpdatedIPTable()
+        if err != nil {
+            c.String(http.StatusOK, fmt.Sprint(err))
+        }
 
-		// Reads IP addresses from ip table
-		IpAddresses, err := p2p.ReadIpTable()
-		if err != nil {
-			c.String(http.StatusOK, fmt.Sprint(err))
-		}
+        // Reads IP addresses from ip table
+        IpAddresses, err := p2p.ReadIpTable()
+        if err != nil {
+            c.String(http.StatusOK, fmt.Sprint(err))
+        }
 
-		c.JSON(http.StatusOK, IpAddresses)
-	})
+        c.JSON(http.StatusOK, IpAddresses)
+    })
 
-	// Starts docker container in server
-	r.GET("/startcontainer", func(c *gin.Context) {
-		// Get Number of ports to open and whether to use GPU or not
-		Ports := c.DefaultQuery("ports", "0")
-		GPU := c.DefaultQuery("GPU", "false")
-		ContainerName := c.DefaultQuery("ContainerName", "")
-		var PortsInt int
+    // Starts docker container in server
+    r.GET("/startcontainer", func(c *gin.Context) {
+        // Get Number of ports to open and whether to use GPU or not
+        Ports := c.DefaultQuery("ports", "0")
+        GPU := c.DefaultQuery("GPU", "false")
+        ContainerName := c.DefaultQuery("ContainerName", "")
+        var PortsInt int
 
-		// Convert Get Request value to int
-		fmt.Sscanf(Ports, "%d", &PortsInt)
+        // Convert Get Request value to int
+        fmt.Sscanf(Ports, "%d", &PortsInt)
 
-		// Creates container and returns-back result to
-		// access container
-		resp, err := docker.BuildRunContainer(PortsInt, GPU, ContainerName)
+        // Creates container and returns-back result to
+        // access container
+        resp, err := docker.BuildRunContainer(PortsInt, GPU, ContainerName)
 
-		if err != nil {
-			c.String(http.StatusInternalServerError, fmt.Sprintf("error: %s", err))
-		}
+        if err != nil {
+            c.String(http.StatusInternalServerError, fmt.Sprintf("error: %s", err))
+        }
 
-		// Ensures that FRP is triggered only if a proxy address is provided
-		if ProxyIpAddr.Ipv4 != "" && c.Request.Host != "localhost:"+config.ServerPort && c.Request.Host != "0.0.0.0:"+config.ServerPort {
-			resp, err = frp.StartFRPCDockerContainer(ProxyIpAddr.Ipv4, lowestLatencyIpAddress.ServerPort, resp)
-			if err != nil {
-				c.String(http.StatusInternalServerError, fmt.Sprintf("error: %s", err))
-			}
-			fmt.Println(resp)
-		}
+        // Ensures that FRP is triggered only if a proxy address is provided
+        if ProxyIpAddr.Ipv4 != "" && c.Request.Host != "localhost:"+config.ServerPort && c.Request.Host != "0.0.0.0:"+config.ServerPort {
+            resp, err = frp.StartFRPCDockerContainer(ProxyIpAddr.Ipv4, lowestLatencyIpAddress.ServerPort, resp)
+            if err != nil {
+                c.String(http.StatusInternalServerError, fmt.Sprintf("error: %s", err))
+            }
+            fmt.Println(resp)
+        }
 
-		c.JSON(http.StatusOK, resp)
-	})
+        c.JSON(http.StatusOK, resp)
+    })
 
-	//Remove container
-	r.GET("/RemoveContainer", func(c *gin.Context) {
-		ID := c.DefaultQuery("id", "0")
-		if err := docker.StopAndRemoveContainer(ID); err != nil {
-			c.String(http.StatusInternalServerError, fmt.Sprintf("error: %s", err))
-		}
-		c.String(http.StatusOK, "success")
-	})
+    //Remove container
+    r.GET("/RemoveContainer", func(c *gin.Context) {
+        ID := c.DefaultQuery("id", "0")
+        if err := docker.StopAndRemoveContainer(ID); err != nil {
+            c.String(http.StatusInternalServerError, fmt.Sprintf("error: %s", err))
+        }
+        c.String(http.StatusOK, "success")
+    })
 
-	//Show images available
-	r.GET("/ShowImages", func(c *gin.Context) {
-		resp, err := docker.ViewAllContainers()
-		if err != nil {
-			c.String(http.StatusInternalServerError, fmt.Sprintf("error: %s", err))
-		}
-		c.JSON(http.StatusOK, resp)
-	})
+    //Show images available
+    r.GET("/ShowImages", func(c *gin.Context) {
+        resp, err := docker.ViewAllContainers()
+        if err != nil {
+            c.String(http.StatusInternalServerError, fmt.Sprintf("error: %s", err))
+        }
+        c.JSON(http.StatusOK, resp)
+    })
 
-	// Request for port no from Server with address
-	r.GET("/FRPPort", func(c *gin.Context) {
-		port, err := frp.StartFRPProxyFromRandom()
-		if err != nil {
-			c.String(http.StatusInternalServerError, fmt.Sprintf("error: %s", err))
-		}
+    // Request for port no from Server with address
+    r.GET("/FRPPort", func(c *gin.Context) {
+        port, err := frp.StartFRPProxyFromRandom()
+        if err != nil {
+            c.String(http.StatusInternalServerError, fmt.Sprintf("error: %s", err))
+        }
 
-		c.String(http.StatusOK, strconv.Itoa(port))
-	})
+        c.String(http.StatusOK, strconv.Itoa(port))
+    })
 
-	// If there is a proxy port specified
-	// then starts the FRP server
-	//if config.FRPServerPort != "0" {
-	//	go frp.StartFRPProxyFromRandom()
-	//}
+    // If there is a proxy port specified
+    // then starts the FRP server
+    //if config.FRPServerPort != "0" {
+    //	go frp.StartFRPProxyFromRandom()
+    //}
 
-	// TODO check if IPV6 or Proxy port is specified
-	// if not update current entry as proxy address
-	// with appropriate port on IP Table
-	if config.BehindNAT == "True" {
-		table, err := p2p.ReadIpTable()
-		if err != nil {
-			return err
-		}
+    // TODO check if IPV6 or Proxy port is specified
+    // if not update current entry as proxy address
+    // with appropriate port on IP Table
+    if config.BehindNAT == "True" {
+        table, err := p2p.ReadIpTable()
+        if err != nil {
+            return nil, err
+        }
 
-		var lowestLatency int64
-		// random large number
-		lowestLatency = 10000000
+        var lowestLatency int64
+        // random large number
+        lowestLatency = 10000000
 
-		for i, _ := range table.IpAddress {
-			// Checks if the ping is the lowest and if the following node is acting as a proxy
-			//if table.IpAddress[i].Latency.Milliseconds() < lowestLatency && table.IpAddress[i].ProxyPort != "" {
-			if table.IpAddress[i].Latency.Milliseconds() < lowestLatency {
-				lowestLatency = table.IpAddress[i].Latency.Milliseconds()
-				lowestLatencyIpAddress = table.IpAddress[i]
-			}
-		}
+        for i, _ := range table.IpAddress {
+            // Checks if the ping is the lowest and if the following node is acting as a proxy
+            //if table.IpAddress[i].Latency.Milliseconds() < lowestLatency && table.IpAddress[i].ProxyPort != "" {
+            if table.IpAddress[i].Latency.Milliseconds() < lowestLatency {
+                lowestLatency = table.IpAddress[i].Latency.Milliseconds()
+                lowestLatencyIpAddress = table.IpAddress[i]
+            }
+        }
 
-		// If there is an identified node
-		if lowestLatency != 10000000 {
-			serverPort, err := frp.GetFRPServerPort("http://" + lowestLatencyIpAddress.Ipv4 + ":" + lowestLatencyIpAddress.ServerPort)
-			if err != nil {
-				return err
-			}
-			// Create 3 second delay to allow FRP server to start
-			time.Sleep(1 * time.Second)
-			// Starts FRP as a client with
-			proxyPort, err := frp.StartFRPClientForServer(lowestLatencyIpAddress.Ipv4, serverPort, config.ServerPort)
-			if err != nil {
-				return err
-			}
+        // If there is an identified node
+        if lowestLatency != 10000000 {
+            serverPort, err := frp.GetFRPServerPort("http://" + lowestLatencyIpAddress.Ipv4 + ":" + lowestLatencyIpAddress.ServerPort)
+            if err != nil {
+                return nil, err
+            }
+            // Create 3 second delay to allow FRP server to start
+            time.Sleep(1 * time.Second)
+            // Starts FRP as a client with
+            proxyPort, err := frp.StartFRPClientForServer(lowestLatencyIpAddress.Ipv4, serverPort, config.ServerPort, "")
+            if err != nil {
+                return nil, err
+            }
 
-			// updating with the current proxy address
-			ProxyIpAddr.Ipv4 = lowestLatencyIpAddress.Ipv4
-			ProxyIpAddr.ServerPort = proxyPort
-			ProxyIpAddr.Name = config.MachineName
-			ProxyIpAddr.NAT = "False"
-			ProxyIpAddr.EscapeImplementation = "FRP"
+            // updating with the current proxy address
+            ProxyIpAddr.Ipv4 = lowestLatencyIpAddress.Ipv4
+            ProxyIpAddr.ServerPort = proxyPort
+            ProxyIpAddr.Name = config.MachineName
+            ProxyIpAddr.NAT = "False"
+            ProxyIpAddr.EscapeImplementation = "FRP"
 
-			// append the following to the ip table
-			table.IpAddress = append(table.IpAddress, ProxyIpAddr)
-			// write information back to the IP Table
-			table.WriteIpTable()
-			// update ip table
-			go clientIPTable.UpdateIpTableListClient()
-		}
+            // append the following to the ip table
+            table.IpAddress = append(table.IpAddress, ProxyIpAddr)
+            // write information back to the IP Table
+            table.WriteIpTable()
+            // update ip table
+            go clientIPTable.UpdateIpTableListClient()
+        }
 
-	}
+    }
 
-	// Run gin server on the specified port
-	err = r.Run(":" + config.ServerPort)
-	if err != nil {
-		return err
-	}
+    // Run gin server on the specified port
+    go r.Run(":" + config.ServerPort)
 
-	return nil
+    return r, nil
 }