X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxsapiv1%2Fevents.go;h=aa171871dfca6a53ca07d94db55161216998840e;hb=2a7a112bbffcd41a3436c086f1910ea7a9c94744;hp=e19eb82068f0b20e9b1d4d0722616329c5dd7c61;hpb=9fb41a3693eeaac9adea71112232abaafea54c8f;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/xsapiv1/events.go b/lib/xsapiv1/events.go
index e19eb82..aa17187 100644
--- a/lib/xsapiv1/events.go
+++ b/lib/xsapiv1/events.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,10 +17,15 @@
 
 package xsapiv1
 
+import (
+	"encoding/json"
+	"fmt"
+)
+
 // EventRegisterArgs Parameters (json format) of /events/register command
 type EventRegisterArgs struct {
-	Name      string `json:"name"`
-	ProjectID string `json:"filterProjectID"`
+	Name   string `json:"name"`
+	Filter string `json:"filter"`
 }
 
 // EventUnRegisterArgs Parameters of /events/unregister command
@@ -31,9 +36,10 @@ type EventUnRegisterArgs struct {
 
 // EventMsg Message send
 type EventMsg struct {
-	Time   string       `json:"time"`
-	Type   string       `json:"type"`
-	Folder FolderConfig `json:"folder"`
+	Time          string      `json:"time"`
+	FromSessionID string      `json:"sessionID"` // Session ID of client who produce this event
+	Type          string      `json:"type"`
+	Data          interface{} `json:"data"` // Data
 }
 
 // EventEvent Event send in WS when an internal event (eg. Syncthing event is received)
@@ -43,6 +49,35 @@ const (
 
 	// Supported Events type
 	EVTAll               = EventTypePrefix + "all"
-	EVTFolderChange      = EventTypePrefix + "folder-change"       // type EventMsg with Data type xsapiv1.???
-	EVTFolderStateChange = EventTypePrefix + "folder-state-change" // type EventMsg with Data type xsapiv1.???
+	EVTFolderChange      = EventTypePrefix + "folder-change"       // type EventMsg with Data type xsapiv1.FolderConfig
+	EVTFolderStateChange = EventTypePrefix + "folder-state-change" // type EventMsg with Data type xsapiv1.FolderConfig
+	EVTSDKInstall        = EventTypePrefix + "sdk-install"         // type EventMsg with Data type xsapiv1.SDKManagementMsg
+	EVTSDKRemove         = EventTypePrefix + "sdk-remove"          // type EventMsg with Data type xsapiv1.SDKManagementMsg
+	EVTSDKStateChange    = EventTypePrefix + "sdk-state-change"    // type EventMsg with Data type xsapiv1.SDK
 )
+
+// EVTAllList List of all supported events
+var EVTAllList = []string{
+	EVTFolderChange,
+	EVTFolderStateChange,
+	EVTSDKInstall,
+	EVTSDKRemove,
+	EVTSDKStateChange,
+}
+
+// DecodeFolderConfig Helper to decode Data field type FolderConfig
+func (e *EventMsg) DecodeFolderConfig() (FolderConfig, error) {
+	var err error
+	f := FolderConfig{}
+	switch e.Type {
+	case EVTFolderChange, EVTFolderStateChange:
+		d := []byte{}
+		d, err = json.Marshal(e.Data)
+		if err == nil {
+			err = json.Unmarshal(d, &f)
+		}
+	default:
+		err = fmt.Errorf("Invalid type")
+	}
+	return f, err
+}