commit 2021-12-16]17:46:11

cli.go

@@ -2,8 +2,8 @@ package manager
 
 import (
 	"context"
-	"errors"
 	"log"
+	"sync"
 
 	"git.godopu.net/lab/etri-smartfarm-poc-controller-serial/puserial"
 	"github.com/rjeczalik/notify"
@@ -13,8 +13,8 @@ var ctx context.Context
 var cancel context.CancelFunc
 var ch_discover chan notify.EventInfo
 var _managerObj *_manager
-var registerHandleFunc func(uuid string)
-var removeHandleFunc func(uuid string)
+var registerHandleFunc func(e Event)
+var removeHandleFunc func(e Event)
 
 func init() {
 	ctx, cancel = context.WithCancel(context.Background())
@@ -27,7 +27,7 @@ func init() {
 		devicesWithUUID:  devWithUUID,
 		devicesWithIface: devWithIface,
 		chanForSync:      chanForSync,
-		SyncListener:     &SyncHandler{devices: devWithUUID, chanForSync: chanForSync},
+		SyncListener:     &SyncHandler{devices: devWithUUID, chanForSync: chanForSync, mutex: &sync.Mutex{}, states: map[string]map[string]interface{}{}},
 		RecvListener:     &RecvHandler{devices: devWithIface, chanForSync: chanForSync},
 	}
 
@@ -35,11 +35,11 @@ func init() {
 	removeHandleFunc = nil
 }
 
-func AddRegisterHandleFunc(h func(uuid string)) {
+func AddRegisterHandleFunc(h func(e Event)) {
 	registerHandleFunc = h
 }
 
-func AddRemoveHandleFunc(h func(uuid string)) {
+func AddRemoveHandleFunc(h func(e Event)) {
 	removeHandleFunc = h
 }
 
@@ -55,24 +55,23 @@ func AddRecvListener(h EventHandler) {
 	_managerObj.addRecvListener(h)
 }
 
-func SetDevicePropsToSync(uuid string, propsToSync []string) error {
-	device, ok := _managerObj.devicesWithUUID[uuid]
-	if !ok {
-		return errors.New("device not found")
-	}
-	device.propsToSync = propsToSync
-	return nil
-}
+// func SetDevicePropsToSync(uuid string, propsToSync []string) error {
+// 	device, ok := _managerObj.devicesWithUUID[uuid]
+// 	if !ok {
+// 		return errors.New("device not found")
+// 	}
+// 	device.propsToSync = propsToSync
+// 	return nil
+// }
 
 func Run() error {
-	iface, err := puserial.InitDevice()
+	ifaces, err := puserial.InitDevice()
 	if err != nil {
-		if err.Error() != "USB Not found" {
-			return err
-		}
-	} else {
-		// _managerObj.onAdd(iface)
-		_managerObj.onAdded(iface)
+		return err
+	}
+
+	for _, e := range ifaces {
+		go _managerObj.onAdded(e)
 	}
 
 	go puserial.WatchNewDevice(ctx, ch_discover)
@@ -85,7 +84,7 @@ func Run() error {
 		}
 		switch e.Event() {
 		case notify.Create:
-			_managerObj.onAdded(e.Path())
+			go _managerObj.onAdded(e.Path())
 			// case notify.Remove:
 			// 	log.Println("USB Disconnected!!")
 			// 	_managerObj.onAdded(e.Path())

examples/main.go

@@ -15,15 +15,20 @@ func main() {
 		fmt.Println("RECV: ", e.Params())
 	}))
 
-	manager.AddRegisterHandleFunc(func(dname string) {
-		fmt.Println(dname, " is registered!!")
+	manager.AddRegisterHandleFunc(func(e manager.Event) {
+		param := e.Params()
+		fmt.Println(param["uuid"].(string), " is registered!! ] ", param["sname"])
 	})
 
-	manager.AddRemoveHandleFunc(func(dname string) {
-		fmt.Println(dname, " is removed!!")
+	manager.AddRemoveHandleFunc(func(e manager.Event) {
+		param := e.Params()
+		fmt.Println(param["uuid"].(string), " is removed!!")
 	})
+
 	go manager.Run()
 	defer manager.Close()
+
+	param := map[string]interface{}{}
 	for {
 		fmt.Print("> ")
 		reader := bufio.NewReader(os.Stdin)
@@ -32,9 +37,6 @@ func main() {
 		fmt.Println("cmd: ", cmd)
 		if cmd == "exit" {
 			return
-		} else if cmd == "setup" {
-			manager.SetDevicePropsToSync("DEVICE-A-UUID", []string{"fan", "servo"})
-			continue
 		}
 
 		tkns := strings.Split(cmd, " ")
@@ -43,9 +45,7 @@ func main() {
 		if err != nil {
 			continue
 		}
-		param := map[string]interface{}{
-			tkns[1]: value,
-		}
+		param[tkns[1]] = value
 		manager.Sync(key, param)
 	}
 }

listener.go

@@ -4,34 +4,52 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"reflect"
+	"sync"
 )
 
 type SyncHandler struct {
 	devices     map[string]*_device
+	mutex       *sync.Mutex
 	chanForSync map[string]chan map[string]interface{}
+	states      map[string]map[string]interface{}
 }
 
-func compareMap(src map[string]interface{}, dst map[string]interface{}, props []string) bool {
-	for _, prop := range props {
-		srcV, ok := src[prop].(int)
-		if !ok {
-			srcV = int(src[prop].(float64))
+func compareMap(src map[string]interface{}, dst map[string]interface{}) bool {
+
+	for key, value := range src {
+		if key == "code" {
+			continue
 		}
 
-		dstV, ok := dst[prop].(int)
-		if !ok {
-			dstV = int(dst[prop].(float64))
+		if reflect.TypeOf(value).String() == "string" {
+			dstV, ok := dst[key].(string)
+			if !ok || value != dstV {
+				return false
+			}
+			continue
 		}
+
+		srcV, ok := value.(float64)
+		if !ok {
+			srcV = float64(value.(int))
+		}
+
+		dstV, ok := dst[key].(float64)
+		if !ok {
+			dstV = float64(dst[key].(int))
+		}
+
 		if srcV != dstV {
-			fmt.Println("diff ", prop, "] ", srcV, " vs ", dstV)
+			fmt.Println("diff ", key, "] ", srcV, " vs ", dstV)
 			return false
 		}
 	}
+
 	return true
 }
 
 func (sh *SyncHandler) Handle(e Event) {
-
 	device, ok := sh.devices[e.Key().(string)]
 	// fmt.Println("sync] ", device.IfaceName)
 	// fmt.Println(sh.devices)
@@ -48,37 +66,47 @@ func (sh *SyncHandler) Handle(e Event) {
 		encoder := json.NewEncoder(device.Iface)
 		origin := map[string]interface{}{}
 		origin["code"] = 200
-		props := device.propsToSync
-		// props := []string{"fan", "light", "servo"}
-		for _, pname := range props {
-			prop, ok := params[pname]
-			if !ok {
-				origin[pname] = device.states[pname]
-			} else {
-				origin[pname] = prop
-			}
+		for key, value := range params {
+			origin[key] = value
 		}
 
+		sh.states[device.UUID] = origin
+		// props := []string{"fan", "light", "servo"}
+
 		err := encoder.Encode(origin)
 		if err != nil {
 			return
 		}
 
-		sh.chanForSync[device.IfaceName] = make(chan map[string]interface{})
-		for state := range sh.chanForSync[device.IfaceName] {
-			if compareMap(origin, state, props) {
-				log.Println("Same!!")
+		_, ok := sh.chanForSync[device.IfaceName]
+		if ok {
+			sh.mutex.Lock()
+			close(sh.chanForSync[device.IfaceName])
+			delete(sh.chanForSync, device.IfaceName)
+			sh.mutex.Unlock()
+		}
+
+		chanForSync := make(chan map[string]interface{})
+		sh.mutex.Lock()
+		sh.chanForSync[device.IfaceName] = chanForSync
+		sh.mutex.Unlock()
+
+		for state := range chanForSync {
+			if compareMap(sh.states[device.UUID], state) {
+				sh.mutex.Lock()
 				close(sh.chanForSync[device.IfaceName])
 				delete(sh.chanForSync, device.IfaceName)
+				sh.mutex.Unlock()
 				return
 			}
 			log.Println("wrong: ", state)
-			log.Println("resend: ", origin)
-			err := encoder.Encode(origin)
+			log.Println("resend: ", sh.states[device.UUID])
+			err := encoder.Encode(sh.states[device.UUID])
 			if err != nil {
 				return
 			}
 		}
+
 	}()
 }
 
@@ -89,6 +117,11 @@ type RecvHandler struct {
 }
 
 func (rh *RecvHandler) Handle(e Event) {
+	defer func() {
+		if r := recover(); r != nil {
+			fmt.Println("panic recover - ", r)
+		}
+	}()
 	device, ok := rh.devices[e.Key()]
 	if !ok {
 		return

manager.go

@@ -24,7 +24,11 @@ func (m *_manager) onRegistered(dev *_device) {
 	// 	m.RegisterListener.Handle(&EventStruct{key: })
 	// }
 	if registerHandleFunc != nil {
-		registerHandleFunc(dev.UUID)
+		param := map[string]interface{}{}
+		param["uuid"] = dev.UUID
+		param["sname"] = dev.Sname
+
+		registerHandleFunc(&EventStruct{key: dev.UUID, params: param})
 	}
 	go recv(dev.Iface, m)
 }
@@ -40,7 +44,10 @@ func (m *_manager) onRemoved(port io.Reader) {
 	}
 
 	if removeHandleFunc != nil {
-		removeHandleFunc(dev.UUID)
+		param := map[string]interface{}{}
+		param["uuid"] = dev.UUID
+
+		removeHandleFunc(&EventStruct{key: dev.UUID, params: param})
 	}
 	// log.Println(m.devicesWithUUID)
 	// log.Println(m.devicesWithIface)
@@ -90,6 +97,7 @@ func (m *_manager) onAdded(iface string) {
 					UUID:      rcvMsg["uuid"].(string),
 					IfaceName: iface,
 					Iface:     port,
+					Sname:     rcvMsg["sname"].(string),
 					states:    map[string]interface{}{},
 				}
 				m.devicesWithUUID[rcvMsg["uuid"].(string)] = newDevice

model.go

@@ -3,15 +3,13 @@ package manager
 import "io"
 
 type _device struct {
-	UUID        string
-	IfaceName   string
-	Iface       io.ReadWriter
-	states      map[string]interface{}
-	propsToSync []string
+	UUID      string
+	IfaceName string
+	Sname     string
+	Iface     io.ReadWriter
+	states    map[string]interface{}
 }
 
-
-
 type RecvEvent struct {
 	Params map[string]interface{}
 }

puserial/serial.go

@@ -2,7 +2,6 @@ package puserial
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"path/filepath"
@@ -11,20 +10,22 @@ import (
 	"github.com/rjeczalik/notify"
 )
 
-func InitDevice() (string, error) {
+func InitDevice() ([]string, error) {
 	fs, err := ioutil.ReadDir("/dev")
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 
+	var result []string = nil
 	for _, f := range fs {
 		if strings.Contains(f.Name(), "ttyACM") {
-			return filepath.Join("/dev", f.Name()), nil
+			result = append(result, filepath.Join("/dev", f.Name()))
 		}
 	}
 
-	return "", errors.New("USB Not found")
+	return result, nil
 }
+
 func WatchNewDevice(ctx context.Context, ch_discover chan<- notify.EventInfo) error {
 	defer close(ch_discover)