Use Get/Post functions of common.http lib.

[src/xds/xds-agent.git] / lib / agent / xdsserver.go

diff --git a/lib/agent/xdsserver.go b/lib/agent/xdsserver.go
index 73a5bd9..e2c38c1 100644 (file)
--- a/lib/agent/xdsserver.go
+++ b/lib/agent/xdsserver.go
@@ -64,9 +64,12 @@ type XdsBuilderConfig struct {
 type XdsFolderType string
 
 const (
-       XdsTypePathMap   = "PathMap"
+       // XdsTypePathMap Path Mapping folder type
+       XdsTypePathMap = "PathMap"
+       // XdsTypeCloudSync Cloud synchronization (AKA syncthing) folder type
        XdsTypeCloudSync = "CloudSync"
-       XdsTypeCifsSmb   = "CIFS"
+       // XdsTypeCifsSmb CIFS (AKA samba) folder type
+       XdsTypeCifsSmb = "CIFS"
 )
 
 // XdsFolderConfig XdsServer folder config
@@ -78,6 +81,8 @@ type XdsFolderConfig struct {
        Status     string        `json:"status"`
        IsInSync   bool          `json:"isInSync"`
        DefaultSdk string        `json:"defaultSdk"`
+       ClientData string        `json:"clientData"` // free form field that can used by client
+
        // Specific data depending on which Type is used
        DataPathMap   XdsPathMapConfig   `json:"dataPathMap,omitempty"`
        DataCloudSync XdsCloudSyncConfig `json:"dataCloudSync,omitempty"`
@@ -112,7 +117,7 @@ type XdsEventFolderChange struct {
        Folder XdsFolderConfig `json:"folder"`
 }
 
-// Event emitter callback
+// EventCB Event emitter callback
 type EventCB func(privData interface{}, evtData interface{}) error
 
 // caller Used to chain event listeners
@@ -208,26 +213,20 @@ func (xs *XdsServer) SendCommand(cmd string, body []byte) (*http.Response, error
 
 // GetVersion Send Get request to retrieve XDS Server version
 func (xs *XdsServer) GetVersion(res interface{}) error {
-       return xs._HTTPGet("/version", &res)
+       return xs.client.Get("/version", &res)
 }
 
 // GetFolders Send GET request to get current folder configuration
 func (xs *XdsServer) GetFolders(folders *[]XdsFolderConfig) error {
-       return xs._HTTPGet("/folders", folders)
+       return xs.client.Get("/folders", folders)
 }
 
 // FolderAdd Send POST request to add a folder
 func (xs *XdsServer) FolderAdd(fld *XdsFolderConfig, res interface{}) error {
-       response, err := xs._HTTPPost("/folders", fld)
+       err := xs.client.Post("/folders", fld, res)
        if err != nil {
-               return err
+               return fmt.Errorf("FolderAdd error: %s", err.Error())
        }
-       if response.StatusCode != 200 {
-               return fmt.Errorf("FolderAdd error status=%s", response.Status)
-       }
-       // Result is a XdsFolderConfig that is equivalent to ProjectConfig
-       err = json.Unmarshal(xs.client.ResponseToBArray(response), res)
-
        return err
 }
 
@@ -241,6 +240,11 @@ func (xs *XdsServer) FolderSync(id string) error {
        return xs.client.HTTPPost("/folders/sync/"+id, "")
 }
 
+// FolderUpdate Send PUT request to update a folder
+func (xs *XdsServer) FolderUpdate(fld *XdsFolderConfig, resFld *XdsFolderConfig) error {
+       return xs.client.Put("/folders/"+fld.ID, fld, resFld)
+}
+
 // SetAPIRouterGroup .
 func (xs *XdsServer) SetAPIRouterGroup(r *gin.RouterGroup) {
        xs.apiRouter = r
@@ -261,7 +265,7 @@ func (xs *XdsServer) PassthroughGet(url string) {
                        nURL = strings.TrimPrefix(c.Request.URL.Path, xs.APIURL)
                }
                // Send Get request
-               if err := xs._HTTPGet(nURL, &data); err != nil {
+               if err := xs.client.Get(nURL, &data); err != nil {
                        if strings.Contains(err.Error(), "connection refused") {
                                xs.Connected = false
                                xs._NotifyState()
@@ -294,12 +298,20 @@ func (xs *XdsServer) PassthroughPost(url string) {
                if strings.Contains(url, ":") {
                        nURL = strings.TrimPrefix(c.Request.URL.Path, xs.APIURL)
                }
+
                // Send Post request
-               response, err := xs._HTTPPost(nURL, bodyReq[:n])
+               body, err := json.Marshal(bodyReq[:n])
                if err != nil {
                        common.APIError(c, err.Error())
                        return
                }
+
+               response, err := xs.client.HTTPPostWithRes(nURL, string(body))
+               if err != nil {
+                       common.APIError(c, err.Error())
+                       return
+               }
+
                bodyRes, err := ioutil.ReadAll(response.Body)
                if err != nil {
                        common.APIError(c, "Cannot read response body")
@@ -311,12 +323,13 @@ func (xs *XdsServer) PassthroughPost(url string) {
 
 // EventRegister Post a request to register to an XdsServer event
 func (xs *XdsServer) EventRegister(evName string, id string) error {
-       var err error
-       _, err = xs._HTTPPost("/events/register", XdsEventRegisterArgs{
-               Name:      evName,
-               ProjectID: id,
-       })
-       return err
+       return xs.client.Post(
+               "/events/register",
+               XdsEventRegisterArgs{
+                       Name:      evName,
+                       ProjectID: id,
+               },
+               nil)
 }
 
 // EventOn Register a callback on events reception
@@ -334,7 +347,7 @@ func (xs *XdsServer) EventOn(evName string, privData interface{}, f EventCB) (uu
 
                // FIXME: use generic type: data interface{} instead of data XdsEventFolderChange
                var err error
-               if evName == "event:FolderStateChanged" {
+               if evName == "event:folder-state-change" {
                        err = xs.ioSock.On(evn, func(data XdsEventFolderChange) error {
                                xs.sockEventsLock.Lock()
                                sEvts := make([]*caller, len(xs.sockEvents[evn]))
@@ -400,6 +413,7 @@ func (xs *XdsServer) ProjectToFolder(pPrj apiv1.ProjectConfig) *XdsFolderConfig
        if pPrj.Type == XdsTypeCloudSync {
                stID, _ = xs.SThg.IDGet()
        }
+       // TODO: limit ClientData size and gzip it (see https://golang.org/pkg/compress/gzip/)
        fPrj := XdsFolderConfig{
                ID:         pPrj.ID,
                Label:      pPrj.Label,
@@ -408,6 +422,7 @@ func (xs *XdsServer) ProjectToFolder(pPrj apiv1.ProjectConfig) *XdsFolderConfig
                Status:     pPrj.Status,
                IsInSync:   pPrj.IsInSync,
                DefaultSdk: pPrj.DefaultSdk,
+               ClientData: pPrj.ClientData,
                DataPathMap: XdsPathMapConfig{
                        ServerPath: pPrj.ServerPath,
                },
@@ -457,6 +472,7 @@ func (xs *XdsServer) FolderToProject(fPrj XdsFolderConfig) apiv1.ProjectConfig {
                Status:     sts,
                IsInSync:   inSync,
                DefaultSdk: fPrj.DefaultSdk,
+               ClientData: fPrj.ClientData,
        }
        return pPrj
 }
@@ -494,24 +510,6 @@ func (xs *XdsServer) _CreateConnectHTTP() error {
        return nil
 }
 
-// _HTTPGet .
-func (xs *XdsServer) _HTTPGet(url string, data interface{}) error {
-       var dd []byte
-       if err := xs.client.HTTPGet(url, &dd); err != nil {
-               return err
-       }
-       return json.Unmarshal(dd, &data)
-}
-
-// _HTTPPost .
-func (xs *XdsServer) _HTTPPost(url string, data interface{}) (*http.Response, error) {
-       body, err := json.Marshal(data)
-       if err != nil {
-               return nil, err
-       }
-       return xs.client.HTTPPostWithRes(url, string(body))
-}
-
 //  Re-established connection
 func (xs *XdsServer) _reconnect() error {
        err := xs._connect(true)
@@ -526,7 +524,7 @@ func (xs *XdsServer) _reconnect() error {
 func (xs *XdsServer) _connect(reConn bool) error {
 
        xdsCfg := XdsServerConfig{}
-       if err := xs._HTTPGet("/config", &xdsCfg); err != nil {
+       if err := xs.client.Get("/config", &xdsCfg); err != nil {
                xs.Connected = false
                if !reConn {
                        xs._NotifyState()
@@ -628,7 +626,7 @@ func (xs *XdsServer) _NotifyState() {
                ConnRetry:  xs.ConnRetry,
                Connected:  xs.Connected,
        }
-       if err := xs.events.Emit(apiv1.EVTServerConfig, evSts); err != nil {
+       if err := xs.events.Emit(apiv1.EVTServerConfig, evSts, ""); err != nil {
                xs.Log.Warningf("Cannot notify XdsServer state change: %v", err)
        }
 }