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

@@ -3,7 +3,7 @@ package client
 import (
     "encoding/json"
     "errors"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
     "github.com/google/uuid"
     "io/ioutil"
     "os"
@@ -206,7 +206,7 @@ func (grp *Group) AddGroupToFile() error {
 // result to Groups
 func ReadGroup() (*Groups, error) {
     // Get Path from config
-	config, err := config.ConfigInit()
+    config, err := config.ConfigInit(nil, nil)
     if err != nil {
         return nil, err
     }
@@ -227,7 +227,6 @@ func ReadGroup() (*Groups,error) {
     return &groups, nil
 }
 
-
 // WriteGroup Function to write type Groups to the grouptrackcontainers.json file
 func (grp *Groups) WriteGroup() error {
     file, err := json.MarshalIndent(grp, "", " ")
@@ -235,7 +234,7 @@ func (grp *Groups)WriteGroup() error {
         return err
     }
     // Get Path from config
-	config, err := config.ConfigInit()
+    config, err := config.ConfigInit(nil, nil)
     if err != nil {
         return err
     }

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"
 )
 

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

@@ -4,8 +4,8 @@ import (
     "encoding/json"
     "errors"
     "fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/server/docker"
+    "github.com/Akilan1999/p2p-rendering-computation/server/docker"
     "io/ioutil"
     "os"
 )
@@ -29,7 +29,7 @@ func AddTrackContainer(d *docker.DockerVM,ipAddress string) error {
         return errors.New("d is nil")
     }
     //Get config information to derive paths for track containers json file
-	config,err := config.ConfigInit()
+    config, err := config.ConfigInit(nil, nil)
     if err != nil {
         return err
     }
@@ -81,7 +81,7 @@ func AddTrackContainer(d *docker.DockerVM,ipAddress string) error {
 // 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()
+    config, err := config.ConfigInit(nil, nil)
     if err != nil {
         return err
     }
@@ -118,7 +118,7 @@ func RemoveTrackedContainer(id string) error {
 
 // ViewTrackedContainers View Containers currently tracked
 func ViewTrackedContainers() (error, *TrackContainers) {
-	config,err := config.ConfigInit()
+    config, err := config.ConfigInit(nil, nil)
     if err != nil {
         return err, nil
     }
@@ -194,7 +194,7 @@ func (TC *TrackContainer)ModifyContainerInformation() error {
 // WriteContainers Write information back to the config file
 func (TC *TrackContainers) WriteContainers() error {
     // Initialize config file
-	config,err := config.ConfigInit()
+    config, err := config.ConfigInit(nil, nil)
     // write modified information to the tracked json file
     data, err := json.MarshalIndent(TC, "", "\t")
     if err != nil {

client/TrackContianers_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"
 )
 

client/clientIPTable/Iptable.go

@@ -3,8 +3,8 @@ package clientIPTable
 import (
     "encoding/json"
     "fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/p2p"
+    "github.com/Akilan1999/p2p-rendering-computation/p2p"
     "io"
     "io/ioutil"
     "mime/multipart"
@@ -18,7 +18,7 @@ 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()
+    config, err := config.ConfigInit(nil, nil)
     if err != nil {
         return err
     }
@@ -78,7 +78,7 @@ func UpdateIpTable(IpAddress string, serverPort string, wg *sync.WaitGroup) erro
 // on the ip tables
 func UpdateIpTableListClient() error {
     // Get config information
-	Config, err := config.ConfigInit()
+    Config, err := config.ConfigInit(nil, nil)
     if err != nil {
         return err
     }

client/container.go

@@ -3,8 +3,8 @@ package client
 import (
 	"encoding/json"
 	"fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/p2p"
+	"github.com/Akilan1999/p2p-rendering-computation/p2p"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/server/docker"
+	"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

@@ -2,23 +2,25 @@ package cmd
 
 import (
     "fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/client"
+    "github.com/Akilan1999/p2p-rendering-computation/client"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/client/clientIPTable"
+    "github.com/Akilan1999/p2p-rendering-computation/client/clientIPTable"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
+    "github.com/Akilan1999/p2p-rendering-computation/config/generate"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/generate"
+    "github.com/Akilan1999/p2p-rendering-computation/p2p"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/p2p"
+    "github.com/Akilan1999/p2p-rendering-computation/plugin"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/plugin"
+    "github.com/Akilan1999/p2p-rendering-computation/server"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/server"
     "github.com/urfave/cli/v2"
 )
 
 var CliAction = func(ctx *cli.Context) error {
     if Server {
-		err := server.Server()
+        _, err := server.Server()
         if err != nil {
             fmt.Print(err)
         }
         //server.Rpc()
+        for {
+
+        }
     }
 
     //Listing servers and also updates IP tables (Default 3 hops)
@@ -93,12 +95,16 @@ var CliAction = func(ctx *cli.Context) error {
     }
 
     // Function called to stop and remove server from Docker
-	if RemoveVM != "" && ID != "" {
+    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)
             }
         }
+    }
 
     //Call function to create Docker container
     if CreateVM != "" {
@@ -132,7 +138,7 @@ var CliAction = func(ctx *cli.Context) error {
 
     //Sets default paths to the config file
     if SetDefaultConfig {
-		err := config.SetDefaults()
+        _, err := generate.SetDefaults("P2PRC", false, nil, false)
         if err != nil {
             fmt.Print(err)
         }
@@ -179,7 +185,7 @@ var CliAction = func(ctx *cli.Context) error {
                 fmt.Println("Success")
             }
         } else {
-			fmt.Println("provide container ID")
+            fmt.Println("provide container ID via --ID or --id")
         }
 
     }
@@ -247,39 +253,6 @@ var CliAction = func(ctx *cli.Context) error {
         }
     }
 
-	// 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)
-	//    }
-	//}
-
-	// -- 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 != "" {

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,13 +1,13 @@
 package config
 
 import (
-	"github.com/spf13/viper"
+    "encoding/json"
-	"io"
+    "io/ioutil"
     "os"
 )
 
 var (
-	defaultPath    string
+    //defaultPath    string
     defaults       = map[string]interface{}{}
     configName     = "config"
     configType     = "json"
@@ -29,46 +29,23 @@ type Config struct {
     GroupTrackContainersPath string
     FRPServerPort            string
     BehindNAT                string
+    CustomConfig             interface{}
     //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()
-}
-
 // GetPathP2PRC Getting P2PRC Directory from environment variable
-func GetPathP2PRC() (string, error) {
+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
 }
 
@@ -82,115 +59,98 @@ func SetEnvName(EnvName string) error {
     return nil
 }
 
-// GetCurrentPath Getting P2PRC Directory from environment variable
+func GetEnvName() string {
-func GetCurrentPath() (string, error) {
+    return defaultEnvName
-	curDir := os.Getenv("PWD")
-	return curDir + "/", nil
 }
 
-// SetDefaults This function to be called only during a
+// ConfigInit Pass environment name as an optional parameter
-// make install
+func ConfigInit(defaultsParameter map[string]interface{}, CustomConfig interface{}, envNameOptional ...string) (*Config, error) {
-func SetDefaults() error {
+    if len(envNameOptional) > 0 {
-	//Setting current directory to default path
+        defaultEnvName = envNameOptional[0]
-	defaultPath, err := GetPathP2PRC()
-	if err != nil {
-		return err
     }
+    //
+    ////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
+    defaultPath, err := GetPathP2PRC(defaultEnvName)
-	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
-	}
-
-	//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
-	}
-
-	defaults["MachineName"] = hostname
-	//defaults["NetworkInterface"] = "wlp0s20f3"
-	//defaults["NetworkInterfaceIPV6Index"] = "2"
-
-	//Paths to search for config file
-	configPaths = append(configPaths, defaultPath)
-
-	if fileExists(defaultPath + "config.json") {
-		err := os.Remove(defaultPath + "config.json")
-		if err != nil {
-			return err
-		}
-	}
-
-	//Calling configuration file
-	_, err = ConfigInit()
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func ConfigInit() (*Config, error) {
-
-	//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)
 
-	//Add all possible configurations paths
+    // Open our jsonFile
-	for _, v := range configPaths {
+    jsonFile, err := os.Open(defaultPath + configFile)
-		viper.AddConfigPath(v)
+    // if we os.Open returns an error then handle it
-	}
+    if err != nil {
-
-	//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
+    // defer the closing of our jsonFile so that we can parse it later on
+    defer jsonFile.Close()
+
+    byteValue, _ := ioutil.ReadAll(jsonFile)
+
     var config Config
-	if err := viper.Unmarshal(&config); err != nil {
+    json.Unmarshal(byteValue, &config)
+
+    if CustomConfig != nil {
+        // Convert Custom Config to byte
+        customConfigByte, err := json.Marshal(config.CustomConfig)
+        if err != nil {
             return nil, err
         }
 
+        // Again map the byte to the CustomConfig interface
+        json.Unmarshal(customConfigByte, &CustomConfig)
+    }
+
     return &config, nil
 }
+
+func (c *Config) WriteConfig() error {
+    //Getting Current Directory from environment variable
+    //curDir := os.Getenv("REMOTEGAMING")
+
+    defaultPath, err := GetPathP2PRC(defaultEnvName)
+    if err != nil {
+        return err
+    }
+
+    file, _ := json.MarshalIndent(c, "", " ")
+
+    _ = 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

p2p/frp/client.go

@@ -1,14 +1,13 @@
 package frp
 
 import (
-	"fmt"
+    "github.com/Akilan1999/p2p-rendering-computation/server/docker"
-	"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/phayes/freeport"
 )
 
 // Client This struct stores
@@ -30,7 +29,10 @@ type ClientMapping struct {
 
 // StartFRPClientForServer Starts Server using FRP server
 // returns back a port
-func StartFRPClientForServer(ipaddress string, port string, localport string) (string, error) {
+// 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
@@ -52,12 +54,24 @@ func StartFRPClientForServer(ipaddress string, port string, localport string) (s
         return "", err
     }
 
-	//random port
+    var OpenPorts []int
-	//randPort := rangeIn(10000, 99999)
+    // if the remote port is
-	OpenPorts, err := freeport.GetFreePorts(1)
+    // 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",
@@ -97,7 +111,6 @@ func StartFRPCDockerContainer(ipaddress string, port string, Docker *docker.Dock
 
     // set client mapping
     //var clientMappings []ClientMapping
-	fmt.Println(len(Docker.Ports.PortSet))
     for i, _ := range Docker.Ports.PortSet {
         portMap := Docker.Ports.PortSet[i].ExternalPort
 
@@ -109,7 +122,7 @@ func StartFRPCDockerContainer(ipaddress string, port string, Docker *docker.Dock
         //delay to allow the FRP server to start
         time.Sleep(1 * time.Second)
 
-		proxyPort, err := StartFRPClientForServer(ipaddress, serverPort, strconv.Itoa(portMap))
+        proxyPort, err := StartFRPClientForServer(ipaddress, serverPort, strconv.Itoa(portMap), "")
         if err != nil {
             return nil, err
         }

p2p/iptable.go

@@ -3,7 +3,7 @@ package p2p
 import (
     "encoding/json"
     "fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
     "io/ioutil"
     "net"
     "net/http"
@@ -27,6 +27,7 @@ type IpAddress struct {
     ServerPort           string        `json:"ServerPort"`
     NAT                  string        `json:"NAT"`
     EscapeImplementation string        `json:"EscapeImplementation"`
+    CustomInformation    []byte
 }
 
 type IP struct {
@@ -36,7 +37,7 @@ type IP struct {
 // ReadIpTable Read data from Ip tables from json file
 func ReadIpTable() (*IpAddresses, error) {
     // Get Path from config
-	config, err := config.ConfigInit()
+    config, err := config.ConfigInit(nil, nil)
     if err != nil {
         return nil, err
     }
@@ -101,7 +102,7 @@ func (i *IpAddresses) WriteIpTable() error {
     }
 
     // Get Path from config
-	config, err := config.ConfigInit()
+    config, err := config.ConfigInit(nil, nil)
     if err != nil {
         return err
     }
@@ -189,7 +190,7 @@ func CurrentPublicIP() (string, error) {
 // GetCurrentIPV6 gets the current IPV6	address based on the interface
 // specified in the config file
 func GetCurrentIPV6() (string, error) {
-	Config, err := config.ConfigInit()
+    Config, err := config.ConfigInit(nil, nil)
     if err != nil {
         return "", err
     }

p2p/testingMetrics.go

@@ -3,7 +3,7 @@ package p2p
 import (
     "bytes"
     "errors"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
     "io"
     "io/ioutil"
     "log"
@@ -99,7 +99,7 @@ func (s *IpAddress) UploadSpeed() error {
 
     // Get upload file path from config file
     // Get Path from config
-	config, err := config.ConfigInit()
+    config, err := config.ConfigInit(nil, nil)
     if err != nil {
         return err
     }

plugin/packageManager.go

@@ -1,7 +1,7 @@
 package plugin
 
 import (
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
     "github.com/go-git/go-git/v5"
     "net/url"
     "os"
@@ -24,7 +24,7 @@ func DownloadPlugin(pluginurl string) error {
     // Replaces / with _
     folder := strings.Replace(path, "/", "_", -1)
     // Reads plugin path from the config path
-	config, err := config.ConfigInit()
+    config, err := config.ConfigInit(nil, nil)
     if err != nil {
         return err
     }
@@ -38,14 +38,13 @@ func DownloadPlugin(pluginurl string) error {
         return err
     }
 
-
     return nil
 }
 
 // DeletePlugin The following function deletes a plugin based on
 // the plugin name provided.
 func DeletePlugin(pluginname string) error {
-	config, err := config.ConfigInit()
+    config, err := config.ConfigInit(nil, nil)
     if err != nil {
         return err
     }

plugin/plugin.go

@@ -5,8 +5,8 @@ import (
     "encoding/json"
     "errors"
     "fmt"
-    "git.sr.ht/~akilan1999/p2p-rendering-computation/client"
+    "github.com/Akilan1999/p2p-rendering-computation/client"
-    "git.sr.ht/~akilan1999/p2p-rendering-computation/config"
+    "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"
+    "github.com/Akilan1999/p2p-rendering-computation/client"
-    "git.sr.ht/~akilan1999/p2p-rendering-computation/config"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
-    "git.sr.ht/~akilan1999/p2p-rendering-computation/server/docker"
+    "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

@@ -7,7 +7,7 @@ import (
     "encoding/json"
     "errors"
     "fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
+    "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"
@@ -84,7 +84,7 @@ func BuildRunContainer(NumPorts int, GPU string, ContainerName string) (*DockerV
     //Default parameters
     RespDocker.TagName = "p2p-ubuntu"
     // Get Path from config
-	config, err := config.ConfigInit()
+    config, err := config.ConfigInit(nil, nil)
     if err != nil {
         return nil, err
     }
@@ -165,7 +165,6 @@ func BuildRunContainer(NumPorts int, GPU string, ContainerName string) (*DockerV
         return nil, err
     }
 
-
     return RespDocker, nil
 
 }
@@ -208,7 +207,6 @@ func (d *DockerVM)imageBuild(dockerClient *client.Client) error {
 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"
@@ -332,7 +330,7 @@ func StopAndRemoveContainer(containername string) error {
 // 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()
+    config, err := config.ConfigInit(nil, nil)
     if err != nil {
         return nil, err
     }

server/gopsutil.go

@@ -17,7 +17,7 @@ type SysInfo struct {
 	GPU      *Query `xml: GpuInfo`
 }
 
-func ServerInfo() interface{} {
+func ServerInfo() *SysInfo {
 	hostStat, _ := host.Info()
 	cpuStat, _ := cpu.Info()
 	vmStat, _ := mem.VirtualMemory()

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"
 )
@@ -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

@@ -3,11 +3,11 @@ package server
 import (
     "encoding/json"
     "fmt"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/client/clientIPTable"
+    "github.com/Akilan1999/p2p-rendering-computation/client/clientIPTable"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
+    "github.com/Akilan1999/p2p-rendering-computation/config"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/p2p"
+    "github.com/Akilan1999/p2p-rendering-computation/p2p"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/p2p/frp"
+    "github.com/Akilan1999/p2p-rendering-computation/p2p/frp"
-	"git.sr.ht/~akilan1999/p2p-rendering-computation/server/docker"
+    "github.com/Akilan1999/p2p-rendering-computation/server/docker"
     "github.com/gin-gonic/gin"
     "io/ioutil"
     "net/http"
@@ -15,13 +15,13 @@ import (
     "time"
 )
 
-func Server() error {
+func Server() (*gin.Engine, error) {
     r := gin.Default()
 
     //Get Server port based on the config file
-	config, err := config.ConfigInit()
+    config, err := config.ConfigInit(nil, nil)
     if err != nil {
-		return err
+        return nil, err
     }
 
     // update IPTable with new port and ip address and update ip table
@@ -172,7 +172,7 @@ func Server() error {
     if config.BehindNAT == "True" {
         table, err := p2p.ReadIpTable()
         if err != nil {
-			return err
+            return nil, err
         }
 
         var lowestLatency int64
@@ -192,14 +192,14 @@ func Server() error {
         if lowestLatency != 10000000 {
             serverPort, err := frp.GetFRPServerPort("http://" + lowestLatencyIpAddress.Ipv4 + ":" + lowestLatencyIpAddress.ServerPort)
             if err != nil {
-				return err
+                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)
+            proxyPort, err := frp.StartFRPClientForServer(lowestLatencyIpAddress.Ipv4, serverPort, config.ServerPort, "")
             if err != nil {
-				return err
+                return nil, err
             }
 
             // updating with the current proxy address
@@ -220,10 +220,7 @@ func Server() error {
     }
 
     // Run gin server on the specified port
-	err = r.Run(":" + config.ServerPort)
+    go r.Run(":" + config.ServerPort)
-	if err != nil {
-		return err
-	}
 
-	return nil
+    return r, nil
 }