"fmt"
"time"
- "github.com/iotbzh/xds-agent/lib/apiv1"
+ "github.com/iotbzh/xds-agent/lib/xaapiv1"
)
-var _EVTAllList = []string{
- apiv1.EVTServerConfig,
- apiv1.EVTProjectAdd,
- apiv1.EVTProjectDelete,
- apiv1.EVTProjectChange,
-}
-
// EventDef Definition on one event
type EventDef struct {
sids map[string]int
// NewEvents creates an instance of Events
func NewEvents(ctx *Context) *Events {
evMap := make(map[string]*EventDef)
- for _, ev := range _EVTAllList {
+ for _, ev := range xaapiv1.EVTAllList {
evMap[ev] = &EventDef{
sids: make(map[string]int),
}
// GetList returns the list of all supported events
func (e *Events) GetList() []string {
- return _EVTAllList
+ return xaapiv1.EVTAllList
}
// Register Used by a client/session to register to a specific (or all) event(s)
func (e *Events) Register(evName, sessionID string) error {
- evs := _EVTAllList
- if evName != apiv1.EVTAll {
+ evs := xaapiv1.EVTAllList
+ if evName != xaapiv1.EVTAll {
if _, ok := e.eventsMap[evName]; !ok {
return fmt.Errorf("Unsupported event type name")
}
// UnRegister Used by a client/session to unregister event(s)
func (e *Events) UnRegister(evName, sessionID string) error {
- evs := _EVTAllList
- if evName != apiv1.EVTAll {
+ evs := xaapiv1.EVTAllList
+ if evName != xaapiv1.EVTAll {
if _, ok := e.eventsMap[evName]; !ok {
return fmt.Errorf("Unsupported event type name")
}
}
// Emit Used to manually emit an event
-func (e *Events) Emit(evName string, data interface{}) error {
+func (e *Events) Emit(evName string, data interface{},fromSid string) error {
var firstErr error
if _, ok := e.eventsMap[evName]; !ok {
so := e.webServer.sessions.IOSocketGet(sid)
if so == nil {
if firstErr == nil {
- firstErr = fmt.Errorf("IOSocketGet return nil")
+ firstErr = fmt.Errorf("IOSocketGet return nil (SID=%v)", sid)
}
continue
}
- msg := apiv1.EventMsg{
- Time: time.Now().String(),
- Type: evName,
- Data: data,
+ msg := xaapiv1.EventMsg{
+ Time: time.Now().String(),
+ FromSessionID: fromSid,
+ Type: evName,
+ Data: data,
}
- if err := (*so).Emit(apiv1.EventTypePrefix+evName, msg); err != nil {
- e.Log.Errorf("WS Emit %v error : %v", apiv1.EventTypePrefix+evName, err)
+ e.Log.Debugf("Emit Event %s: %v", evName, sid)
+ if err := (*so).Emit(evName, msg); err != nil {
+ e.Log.Errorf("WS Emit %v error : %v", evName, err)
if firstErr == nil {
firstErr = err
}