WIP: structuralise config

.vscode/launch.json

@@ -67,6 +67,20 @@
                 "GOLOG_OUTPUT": "file"
             }
         },
+        {
+            "name": "Launch relay",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/cmd/relay/",
+            "console": "integratedTerminal",
+            "env": {
+                "GOLOG_FILE": "/tmp/debug.log",
+                "GOLOG_LOG_LEVEL": "debug",
+                "GOLOG_STDOUT": "false",
+                "GOLOG_OUTPUT": "file"
+            }
+        },
         {
             "name": "go-ma-actor generate",
             "type": "go",

README.md

@@ -15,9 +15,7 @@ It provides The ability to browse IPFS properly, and to pin files and directorie
 
 ### Cros-compiling
 
-Cross-cmpiling for Windows requires gcc-mingw-w64 and gcc-multilib tools to be installed.
-
-CGO is required for sqlite to work on Windows™.
+Cross-compiling for Windows requires gcc-mingw-w64 and gcc-multilib tools to be installed.
 
 ## TL;DR
 

cmd/actor/main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 
-	"github.com/bahner/go-ma-actor/config"
 	"github.com/bahner/go-ma-actor/entity/actor"
 	"github.com/bahner/go-ma-actor/p2p"
 	"github.com/bahner/go-ma-actor/ui"
@@ -12,14 +11,16 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+const name = "actor"
+
 func main() {
 
-	var (
-		err error
-	)
+	var err error
+
+	actor.Config(name)
 
 	fmt.Println("Initialising actor configuation...")
-	actor.InitConfig(config.Profile())
+	// actor.InitConfig(config.Profile())
 
 	// P2P
 	fmt.Println("Setting default p2p options...")

cmd/node/config.go

@@ -3,15 +3,18 @@ package main
 import (
 	"time"
 
+	"github.com/bahner/go-ma-actor/config"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
+	"gopkg.in/yaml.v2"
 )
 
 const (
 	defautSpaceNodeName      = "space@localhost"
 	defaultNodeCookie        = "spacecookie"
 	defaultNodeName          = "pubsub@localhost"
 	defaultNodeDebugInterval = time.Second * 60
+	name                     = "node"
 )
 
 func init() {
@@ -34,3 +37,83 @@ func init() {
 	viper.SetDefault("node.debug_interval", defaultNodeDebugInterval)
 
 }
+
+type NodeStruct struct {
+	Cookie        string        `yaml:"cookie"`
+	Name          string        `yaml:"name"`
+	Space         string        `yaml:"space"`
+	DebugInterval time.Duration `yaml:"debug-interval"`
+}
+
+type NodeConfigStruct struct {
+	Node NodeStruct `yaml:"node"`
+}
+
+type NodeConfig struct {
+	Actor config.ActorConfigStruct `yaml:"actor"`
+	API   config.APIConfigStruct   `yaml:"api"`
+	DB    config.DBConfigStruct    `yaml:"db"`
+	HTTP  config.HTTPConfigStruct  `yaml:"http"`
+	Node  NodeConfigStruct         `yaml:"node"`
+	Log   config.LogConfigStruct   `yaml:"log"`
+	P2P   config.P2PConfigStruct   `yaml:"p2p"`
+}
+
+func Config(name string) NodeConfig {
+
+	config.ActorFlags()
+	pflag.Parse()
+
+	config.SetProfile(name)
+
+	c := NodeConfig{
+		Actor: config.ActorConfig(),
+		API:   config.APIConfig(),
+		DB:    config.DBConfig(),
+		HTTP:  config.HTTPConfig(),
+		Node: NodeConfigStruct{
+			Node: NodeStruct{
+				Cookie:        NodeCookie(),
+				Name:          NodeName(),
+				Space:         NodeSpace(),
+				DebugInterval: NodeDebugInterval(),
+			},
+		},
+		Log: config.LogConfig(),
+		P2P: config.P2PConfig(),
+	}
+
+	if config.GenerateFlag() {
+		config.Save(&c)
+	}
+
+	return c
+}
+
+func (c *NodeConfig) MarshalToYAML() ([]byte, error) {
+	return yaml.Marshal(c)
+}
+
+func (c *NodeConfig) Print() {
+	config.Print(c)
+}
+
+func (c *NodeConfig) Save() error {
+	return config.Save(c)
+}
+
+func NodeSpace() string {
+	return viper.GetString("node.space")
+}
+
+func NodeCookie() string {
+	return viper.GetString("node.cookie")
+}
+
+func NodeName() string {
+	return viper.GetString("node.name")
+}
+
+func NodeDebugInterval() time.Duration {
+	return viper.GetDuration("node.debug_interval")
+}

cmd/node/main.go

@@ -3,22 +3,20 @@ package main
 import (
 	"context"
 
-	"github.com/bahner/go-ma-actor/config"
 	"github.com/bahner/go-ma-actor/entity/actor"
 	"github.com/bahner/go-ma-actor/p2p"
 	"github.com/bahner/go-ma-actor/ui/web"
 	log "github.com/sirupsen/logrus"
 )
 
-const name = "node"
-
 func main() {
 
 	ctx := context.Background()
 
+	Config(name)
+
 	// Init config and logger
-	config.SetProfile(name)
-	actor.InitConfig(config.Profile())
+	// actor.InitConfig(config.Profile())
 
 	p, err := p2p.Init(p2p.DefaultOptions())
 	if err != nil {