Reworked SDKs events (introduced sdk-state-change)eel_5.0.1eel/5.0.15.0.1

Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>

3 files changed, 65 insertions, 24 deletions

diff --git a/lib/agent/apiv1-sdks.go b/lib/agent/apiv1-sdks.go
index fd897fc..e48bb9a 100644
--- a/lib/agent/apiv1-sdks.go
+++ b/lib/agent/apiv1-sdks.go
@@ -44,44 +44,59 @@ func (s *APIService) sdksEventsForwardInit(svr *XdsServer) error {
 	}
 
 	// Forward SDK events from XDS-server to client
-	if _, err := svr.EventOn(xsapiv1.EVTSDKInstall, "", s._sdkEventInstallCB); err != nil {
-		s.Log.Errorf("XDS Server EventOn '%s' failed: %v", xsapiv1.EVTSDKInstall, err)
+	if _, err := svr.EventOn(xsapiv1.EVTSDKAdd, xaapiv1.EVTSDKAdd, s._sdkEventCB); err != nil {
+		s.Log.Errorf("XDS Server EventOn '%s' failed: %v", xsapiv1.EVTSDKAdd, err)
 		return err
 	}
-
-	if _, err := svr.EventOn(xsapiv1.EVTSDKRemove, "", s._sdkEventRemoveCB); err != nil {
+	if _, err := svr.EventOn(xsapiv1.EVTSDKRemove, xaapiv1.EVTSDKRemove, s._sdkEventCB); err != nil {
 		s.Log.Errorf("XDS Server EventOn '%s' failed: %v", xsapiv1.EVTSDKRemove, err)
 		return err
 	}
+	if _, err := svr.EventOn(xsapiv1.EVTSDKStateChange, xaapiv1.EVTSDKStateChange, s._sdkEventCB); err != nil {
+		s.Log.Errorf("XDS Server EventOn '%s' failed: %v", xsapiv1.EVTSDKStateChange, err)
+		return err
+	}
+
+	if _, err := svr.EventOn(xsapiv1.EVTSDKManagement, "", s._sdkEventManagementCB); err != nil {
+		s.Log.Errorf("XDS Server EventOn '%s' failed: %v", xsapiv1.EVTSDKManagement, err)
+		return err
+	}
 
 	return nil
 }
 
-func (s *APIService) _sdkEventInstallCB(privD interface{}, data interface{}) error {
-	// assume that xsapiv1.SDKManagementMsg == xaapiv1.SDKManagementMsg
-	evt := xaapiv1.SDKManagementMsg{}
-	evtName := xaapiv1.EVTSDKInstall
+func (s *APIService) _sdkEventCB(privD interface{}, data interface{}) error {
+	evt := xsapiv1.EventMsg{}
 	d, err := json.Marshal(data)
 	if err != nil {
-		s.Log.Errorf("Cannot marshal XDS Server %s: err=%v", evtName, err)
+		s.Log.Errorf("Cannot marshal XDS Server SDK event err=%v, data=%v", err, data)
 		return err
 	}
 	if err = json.Unmarshal(d, &evt); err != nil {
-		s.Log.Errorf("Cannot unmarshal XDS Server %s: err=%v", evtName, err)
+		s.Log.Errorf("Cannot unmarshal XDS Server SDK event err=%v, d=%v", err, string(d))
 		return err
 	}
 
-	if err := s.events.Emit(evtName, evt, ""); err != nil {
+	// assume that xsapiv1.SDK == xaapiv1.SDK
+	sdk, err := evt.DecodeSDKEvent()
+	if err != nil {
+		s.Log.Errorf("Cannot decode XDS Server SDK event: err=%v, data=%v", err, data)
+		return err
+	}
+
+	evtName := privD.(string)
+
+	if err := s.events.Emit(evtName, sdk, ""); err != nil {
 		s.Log.Warningf("Cannot notify %s (from server): %v", evtName, err)
 		return err
 	}
 	return nil
 }
 
-func (s *APIService) _sdkEventRemoveCB(privD interface{}, data interface{}) error {
+func (s *APIService) _sdkEventManagementCB(privD interface{}, data interface{}) error {
 	// assume that xsapiv1.SDKManagementMsg == xaapiv1.SDKManagementMsg
 	evt := xaapiv1.SDKManagementMsg{}
-	evtName := xaapiv1.EVTSDKRemove
+	evtName := xaapiv1.EVTSDKManagement
 	d, err := json.Marshal(data)
 	if err != nil {
 		s.Log.Errorf("Cannot marshal XDS Server %s: err=%v", evtName, err)
diff --git a/lib/xaapiv1/events.go b/lib/xaapiv1/events.go
index ab08d0f..6520057 100644
--- a/lib/xaapiv1/events.go
+++ b/lib/xaapiv1/events.go
@@ -40,13 +40,15 @@ const (
 	EventTypePrefix = "event:" // following by event type
 
 	// Supported Events type
-	EVTAll           = EventTypePrefix + "all"
-	EVTServerConfig  = EventTypePrefix + "server-config"        // type EventMsg with Data type xaapiv1.ServerCfg
-	EVTProjectAdd    = EventTypePrefix + "project-add"          // type EventMsg with Data type xaapiv1.ProjectConfig
-	EVTProjectDelete = EventTypePrefix + "project-delete"       // type EventMsg with Data type xaapiv1.ProjectConfig
-	EVTProjectChange = EventTypePrefix + "project-state-change" // type EventMsg with Data type xaapiv1.ProjectConfig
-	EVTSDKInstall    = EventTypePrefix + "sdk-install"          // type EventMsg with Data type xaapiv1.SDKManagementMsg
-	EVTSDKRemove     = EventTypePrefix + "sdk-remove"           // type EventMsg with Data type xaapiv1.SDKManagementMsg
+	EVTAll            = EventTypePrefix + "all"
+	EVTServerConfig   = EventTypePrefix + "server-config"        // type EventMsg with Data type xaapiv1.ServerCfg
+	EVTProjectAdd     = EventTypePrefix + "project-add"          // type EventMsg with Data type xaapiv1.ProjectConfig
+	EVTProjectDelete  = EventTypePrefix + "project-delete"       // type EventMsg with Data type xaapiv1.ProjectConfig
+	EVTProjectChange  = EventTypePrefix + "project-state-change" // type EventMsg with Data type xaapiv1.ProjectConfig
+	EVTSDKAdd         = EventTypePrefix + "sdk-add"              // type EventMsg with Data type xaapiv1.SDK
+	EVTSDKRemove      = EventTypePrefix + "sdk-remove"           // type EventMsg with Data type xaapiv1.SDK
+	EVTSDKManagement  = EventTypePrefix + "sdk-management"       // type EventMsg with Data type xaapiv1.SDKManagementMsg
+	EVTSDKStateChange = EventTypePrefix + "sdk-state-change"     // type EventMsg with Data type xaapiv1.SDK
 )
 
 // EVTAllList List of all supported events
@@ -55,8 +57,10 @@ var EVTAllList = []string{
 	EVTProjectAdd,
 	EVTProjectDelete,
 	EVTProjectChange,
-	EVTSDKInstall,
+	EVTSDKAdd,
 	EVTSDKRemove,
+	EVTSDKManagement,
+	EVTSDKStateChange,
 }
 
 // EventMsg Event message send over Websocket, data format depend to Type (see DecodeXXX function)
@@ -97,12 +101,27 @@ func (e *EventMsg) DecodeProjectConfig() (ProjectConfig, error) {
 	return p, err
 }
 
-// DecodeSDKMsg Helper to decode Data field type SDKManagementMsg
-func (e *EventMsg) DecodeSDKMsg() (SDKManagementMsg, error) {
+// DecodeSDKMgtMsg Helper to decode Data field type SDKManagementMsg
+func (e *EventMsg) DecodeSDKMgtMsg() (SDKManagementMsg, error) {
 	var err error
 	s := SDKManagementMsg{}
+	if e.Type != EVTSDKManagement {
+		return s, fmt.Errorf("Invalid type")
+	}
+	d := []byte{}
+	d, err = json.Marshal(e.Data)
+	if err == nil {
+		err = json.Unmarshal(d, &s)
+	}
+	return s, err
+}
+
+// DecodeSDKEvent Helper to decode Data field type SDK
+func (e *EventMsg) DecodeSDKEvent() (SDK, error) {
+	var err error
+	s := SDK{}
 	switch e.Type {
-	case EVTSDKInstall, EVTSDKRemove:
+	case EVTSDKAdd, EVTSDKRemove, EVTSDKStateChange:
 		d := []byte{}
 		d, err = json.Marshal(e.Data)
 		if err == nil {
diff --git a/lib/xaapiv1/sdks.go b/lib/xaapiv1/sdks.go
index 7f2ab02..97db9a8 100644
--- a/lib/xaapiv1/sdks.go
+++ b/lib/xaapiv1/sdks.go
@@ -53,10 +53,17 @@ type SDKInstallArgs struct {
 	InstallArgs []string `json:"installArgs"` // args directly passed to add/install script
 }
 
+// SDK SDKManagementMsg Actions
+const (
+	SdkMgtActionInstall = "installing"
+	SdkMgtActionRemove  = "removing"
+)
+
 // SDKManagementMsg Message send during SDK installation or when installation is complete
 type SDKManagementMsg struct {
 	CmdID     string `json:"cmdID"`
 	Timestamp string `json:"timestamp"`
+	Action    string `json:"action"`
 	Sdk       SDK    `json:"sdk"`
 	Stdout    string `json:"stdout"`
 	Stderr    string `json:"stderr"`