Clean package, separated main and plugin system

Author: diogok

Dockerfile

@@ -1,4 +1,4 @@
-FROM scratch
+FROM debian:jessie
 
 ADD esc-amd64 /esc
 

Dockerfile.arm

@@ -1,4 +1,4 @@
-FROM scratch
+FROM resin/rpi-raspbian
 
 ADD esc-arm /esc
 

Makefile

@@ -4,10 +4,10 @@ all: clean build
 build: esc-amd64 esc-arm
 
 esc-amd64: 
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -tags netgo -ldflags '-w' -o esc-amd64
+	CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -a -tags netgo -ldflags '-w' -o esc-amd64 cmd/esc/main.go
 
 esc-arm: 
-	CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=6 go build -a -tags netgo -ldflags '-w' -o esc-arm
+	CGO_ENABLED=1 GOOS=linux GOARCH=arm GOARM=6 go build -a -tags netgo -ldflags '-w' -o esc-arm cmd/esc/main.go
 
 docker: esc-amd64
 	docker build -t diogok/esc .
@@ -24,10 +24,14 @@ deps:
 	go get github.com/diogok/gorpc
 	go get github.com/patrickmn/go-cache
 	go get github.com/yuin/gopher-lua
-	#go get github.com/layeh/gopher-json
 	go get layeh.com/gopher-json
 	go get github.com/cjoudrey/gluahttp
 
 push:
 	docker push diogok/esc
 
+run:
+	go run -race cmd/esc/main.go
+
+install:
+	go install cmd/esc/main.go

builtin.go

@@ -0,0 +1,10 @@
+package main
+
+import "esc"
+
+func main() {
+	esc.Start()
+
+	end := make(chan bool, 1)
+	<-end
+}

cmd/esc/main.go

@@ -1,4 +1,4 @@
-package main
+package esc
 
 import (
 	"flag"
@@ -9,40 +9,32 @@ import (
 	"os"
 )
 
-type Config struct {
-	Host      string
-	Node      string `json:"node"`
-	Join      string `json:"join"`
-	IFace     string `json:"iface"`
-	Discovery int    `json:"discovery"`
-	Port      int    `json:"port"`
-	Scripts   string `json:"scripts"`
-	Net       *net.Interface
-	IPs       []net.IP
-	Extras    map[string]string `json:"extras"`
-}
+var config *EscConfig
 
-func defaultConfig() Config {
+func defaultConfig() EscConfig {
 	host, err := os.Hostname()
 	if err != nil {
 		panic(err)
 	}
 
-	config := Config{
+	config := EscConfig{
 		Node:      host,
 		Host:      host,
 		Port:      8901,
 		Discovery: 8902,
 		IFace:     "eth0",
-		Scripts:   "scripts",
+		Directory: "files",
 		Extras:    make(map[string]string),
 	}
 
 	return config
 }
 
-func LoadConfig() *Config {
-	config := Config{}
+func Config() *EscConfig {
+	if config != nil {
+		return config
+	}
+	config = &EscConfig{}
 
 	defaultConfig := defaultConfig()
 
@@ -52,7 +44,7 @@ func LoadConfig() *Config {
 	}
 
 	_, err := os.Stat(configFile)
-	var fileConfig Config
+	var fileConfig EscConfig
 	if err == nil {
 		content, err0 := ioutil.ReadFile(configFile)
 		if err0 != nil {
@@ -79,8 +71,8 @@ func LoadConfig() *Config {
 		if fileConfig.Port != 0 {
 			defaultConfig.Port = fileConfig.Port
 		}
-		if fileConfig.Scripts != "" {
-			defaultConfig.Scripts = fileConfig.Scripts
+		if fileConfig.Directory != "" {
+			defaultConfig.Directory = fileConfig.Directory
 		}
 		if fileConfig.Extras != nil {
 			config.Extras = fileConfig.Extras
@@ -92,7 +84,7 @@ func LoadConfig() *Config {
 	flag.StringVar(&config.Node, "node", defaultConfig.Node, "Name of this node")
 	flag.StringVar(&config.Join, "join", defaultConfig.Join, "Address of node to join")
 	flag.StringVar(&config.IFace, "iface", defaultConfig.IFace, "Network Interface to bind to")
-	flag.StringVar(&config.Scripts, "scripts", defaultConfig.Scripts, "Scripts directory")
+	flag.StringVar(&config.Directory, "dir", defaultConfig.Directory, "Plugin/Directory directory")
 	flag.IntVar(&config.Discovery, "discovery", defaultConfig.Discovery, "Port for network discovery")
 	flag.IntVar(&config.Port, "port", defaultConfig.Port, "Port for cluster conns")
 	flag.Parse()
@@ -119,5 +111,5 @@ func LoadConfig() *Config {
 	}
 
 	log.Printf("%v\n", config)
-	return &config
+	return config
 }

config.go

@@ -1,7 +1,6 @@
 node: "localhost"
 port: 8901
 discovery: 8902
-scripts: "scripts"
 iface: "wlan0"
 extras:
   foo: "bar"

config.yml

@@ -1,4 +1,4 @@
-package main
+package esc
 
 import (
 	"fmt"
@@ -9,21 +9,9 @@ import (
 	"time"
 )
 
-var serviceName string
-
-func Self() string {
-	return fmt.Sprintf("%s.%s.local.", config.Node, serviceName)
-}
-
-func NameOf(node string) string {
-	return fmt.Sprintf("%s.%s.local.", node, serviceName)
-}
-
-func startDiscovery() chan *mdns.ServiceEntry {
-	nodeIn := make(chan *mdns.ServiceEntry)
-
-	serviceName = "_esc._tcp"
-	service, err0 := mdns.NewMDNSService(config.Node, serviceName, "", config.Host, config.Discovery, config.IPs, []string{"esc"})
+func startDiscovery() chan *Service {
+	nodeIn := make(chan *Service)
+	service, err0 := mdns.NewMDNSService(Config().Node, ServiceName(), "", Config().Host, config.Discovery, config.IPs, []string{"esc"})
 	if err0 != nil {
 		panic(err0)
 	}
@@ -37,10 +25,14 @@ func startDiscovery() chan *mdns.ServiceEntry {
 	entries := make(chan *mdns.ServiceEntry, 4)
 	go func() {
 		for entry := range entries {
-			if strings.HasSuffix(entry.Name, fmt.Sprintf("%s.local.", serviceName)) {
+			if strings.HasSuffix(entry.Name, fmt.Sprintf("%s.local.", ServiceName())) {
 				if _, ok := found.Get(entry.Name); !ok {
 					log.Printf("Found node %s\n", entry.Name)
-					nodeIn <- entry
+					nodeIn <- &Service{
+						Name:   entry.Name,
+						Port:   Config().Port,
+						AddrV4: &entry.AddrV4,
+					}
 				}
 				found.Set(entry.Name, entry.Name, cache.DefaultExpiration)
 			}
@@ -50,11 +42,9 @@ func startDiscovery() chan *mdns.ServiceEntry {
 	ticker := time.NewTicker(8 * time.Second)
 	go func() {
 		for {
-			mdns.Lookup(serviceName, entries)
+			mdns.Lookup(ServiceName(), entries)
 			<-ticker.C
 		}
 	}()
-
 	return nodeIn
-
 }

discovery.go

@@ -1,8 +1,4 @@
 
-set("foo","bar")
-
-foo = get("foo")
-
 log(foo)
 
 log("CFG "..config("foo"))

scripts/demo.lua files/scripts/demo.lua

@@ -1,4 +1,4 @@
-package main
+package esc
 
 import (
 	"crypto/sha256"
@@ -17,13 +17,6 @@ var fileOut chan *File
 var fileRm chan string
 var newNode chan string
 
-type File struct {
-	Name    string
-	Hash    string
-	Time    time.Time
-	Content []byte
-}
-
 func startDirSync() {
 	newNode = make(chan string, 4)
 	fileIn = make(chan *File, 4)
@@ -34,28 +27,28 @@ func startDirSync() {
 	OnEvent("*", "fileRemoved", onFileRemoved)
 	OnEvent("*", "connected", onNewNode)
 
-	if config.Scripts != "" {
-		DirSync(config.Scripts)
+	if config.Directory != "" {
+		DirSync(config.Directory)
 	}
 }
 
 func onNewNode(message *Message) {
-	if string(message.Payload) == Self() {
+	if message.Payload == Self() {
 		return
 	}
-	log.Println("Sending files cause of new node", string(message.Payload))
-	newNode <- string(message.Payload)
+	log.Println("Sending files cause of new node", message.Payload)
+	newNode <- message.Payload
 }
 
 func onFileRemoved(message *Message) {
 	if message.From == Self() {
 		return
 	}
-	fileRm <- string(message.Payload)
+	fileRm <- message.Payload
 }
 
 func onFileChanged(message *Message) {
-	parts := strings.SplitN(string(message.Payload), ",", 3)
+	parts := strings.SplitN(message.Payload, ",", 3)
 
 	fileName := parts[0]
 
@@ -109,10 +102,14 @@ func ScanDir(registeredFiles map[string]*File, got map[string]bool, dirName stri
 
 			if _, ok := registeredFiles[fileName]; !ok {
 				log.Println("Sending new file", fileName)
-				fileOut <- &file
+				go func() {
+					fileOut <- &file
+				}()
 			} else if registeredFiles[fileName].Hash != hash {
 				log.Println("Sending changed file", fileName)
-				fileOut <- &file
+				go func() {
+					fileOut <- &file
+				}()
 			}
 
 			registeredFiles[fileName] = &file
@@ -122,7 +119,7 @@ func ScanDir(registeredFiles map[string]*File, got map[string]bool, dirName stri
 	for name, _ := range registeredFiles {
 		if _, ok := got[name]; !ok {
 			log.Println("Removed file", name)
-			SendEvent("fileRemoved", []byte(name))
+			SendEvent("fileRemoved", name)
 			fileRm <- name
 		}
 	}
@@ -145,19 +142,21 @@ func DirSync(dirName string) {
 			case <-newNode:
 				log.Println("new node, sending files")
 				for _, file := range registeredFiles {
-					fileOut <- file
+					go func() {
+						fileOut <- file
+					}()
 				}
 			case file := <-fileIn:
 				log.Println("Got file", file.Name)
 				if _, ok := registeredFiles[file.Name]; !ok {
 					log.Println("New file", file.Name)
-					ioutil.WriteFile(file.Name, []byte(file.Content), 0755)
+					ioutil.WriteFile(file.Name, file.Content, 0755)
 					registeredFiles[file.Name] = file
 				} else if registeredFiles[file.Name].Hash != file.Hash {
 					log.Println("Changed file", file.Name)
 					if registeredFiles[file.Name].Time.Before(file.Time) {
 						log.Println("Their file is newer", file.Name)
-						ioutil.WriteFile(file.Name, []byte(file.Content), 0755)
+						ioutil.WriteFile(file.Name, file.Content, 0755)
 						registeredFiles[file.Name] = file
 					} else {
 						log.Println("Our", file.Name, "is older")
@@ -171,7 +170,7 @@ func DirSync(dirName string) {
 			case file := <-fileOut:
 				log.Println("Sending out file", file.Name)
 				time, _ := file.Time.MarshalText()
-				SendEventC("fileSync", []byte(fmt.Sprintf("%s,%s,%s", file.Name, time, base64.StdEncoding.EncodeToString(file.Content))), true)
+				SendEventC("fileSync", fmt.Sprintf("%s,%s,%s", file.Name, time, base64.StdEncoding.EncodeToString(file.Content)), true)
 			case <-ticker.C:
 				got := make(map[string]bool)
 				ScanDir(registeredFiles, got, dirName)