mirror of
https://github.com/mainflux/mainflux.git
synced 2025-04-28 13:48:49 +08:00

* Commit for mainflux-596 Modified and tested: - cli - http - mqtt - normalizer - all readers - sdk messages - all writers - ws Missing: - coap - lora Signed-off-by: ale <ale@metaverso.org> * - fix subtopic name in, when starting with dot, http/ws/mqtt - add some test on readers Signed-off-by: ale <ale@metaverso.org> * - fix string concatenation - update http/transport regexp to match subtopic names with only \w- - update ws/transport regexp like http ones with also the wildcard * and > Signed-off-by: ale <ale@metaverso.org> * added subtopic support to coap adapter Signed-off-by: ale <ale@metaverso.org> * - update replace functions with replaceall when needed - renamed getDestChannel to fmtSubject - update api/transport and ws/transport route to be more readable - fix mqtt syntax - renamed func andQuery to query as suggested by @anovakovic01 - have a nice we :) Signed-off-by: ale <ale@metaverso.org> * - fix error declaration on ws/nat/publisher - fix regexp added missing allowed chars - and _ on coap/api/transport - fix subtopic clean suffix / if present on coap/api/transport - improve regexp on http and ws /api/transport, now does not accept url that do not strictly match - add some ws subtopic tests Signed-off-by: ale <ale@metaverso.org> * - enabled wildcard chars on coap/api/transport - allow use special chars on http and ws api/transport Signed-off-by: ale <ale@metaverso.org> * - use strings.Replace() insted ReplaceAll() Signed-off-by: ale <ale@metaverso.org> * - allow every chars on subtopics - fix replace error on mqtt Signed-off-by: ale <ale@metaverso.org> * fix cassandra test Signed-off-by: ale <ale@metaverso.org> * fix ws test with invalid subtopic Signed-off-by: ale <ale@metaverso.org> * fix invalid GOCACHE in go1.12, replaced by -count 1, see https://golang.org/doc/go1.10#test Signed-off-by: ale <ale@metaverso.org> * - improve regexp on http/ws api/transport - minor changes Signed-off-by: ale <ale@metaverso.org> * - add generic function parseSubtopic on ws/http adapters Signed-off-by: ale <ale@metaverso.org> * - add generic function fmtSubtopic on coap adapter Signed-off-by: ale <ale@metaverso.org>
110 lines
2.3 KiB
Go
110 lines
2.3 KiB
Go
//
|
|
// Copyright (c) 2018
|
|
// Mainflux
|
|
//
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
//
|
|
|
|
package sdk
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/mainflux/mainflux"
|
|
)
|
|
|
|
func (sdk mfSDK) SendMessage(chanName, msg, token string) error {
|
|
|
|
chanNameParts := strings.SplitN(chanName, ".", 2)
|
|
chanID := chanNameParts[0]
|
|
subtopicPart := ""
|
|
if len(chanNameParts) == 2 {
|
|
subtopicPart = fmt.Sprintf("/%s", strings.Replace(chanNameParts[1], ".", "/", -1))
|
|
}
|
|
|
|
endpoint := fmt.Sprintf("channels/%s/messages%s", chanID, subtopicPart)
|
|
url := createURL(sdk.baseURL, sdk.httpAdapterPrefix, endpoint)
|
|
|
|
req, err := http.NewRequest(http.MethodPost, url, strings.NewReader(msg))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
resp, err := sdk.sendRequest(req, token, string(sdk.msgContentType))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if resp.StatusCode != http.StatusAccepted {
|
|
switch resp.StatusCode {
|
|
case http.StatusBadRequest:
|
|
return ErrInvalidArgs
|
|
case http.StatusForbidden:
|
|
return ErrUnauthorized
|
|
default:
|
|
return ErrFailedPublish
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (sdk mfSDK) ReadMessages(chanName, token string) ([]mainflux.Message, error) {
|
|
chanNameParts := strings.SplitN(chanName, ".", 2)
|
|
chanID := chanNameParts[0]
|
|
subtopicPart := ""
|
|
if len(chanNameParts) == 2 {
|
|
subtopicPart = fmt.Sprintf("?subtopic=%s", strings.Replace(chanNameParts[1], ".", "/", -1))
|
|
}
|
|
|
|
endpoint := fmt.Sprintf("channels/%s/messages%s", chanID, subtopicPart)
|
|
url := createURL(sdk.readerURL, "", endpoint)
|
|
|
|
req, err := http.NewRequest(http.MethodGet, url, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
resp, err := sdk.sendRequest(req, token, string(sdk.msgContentType))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
body, err := ioutil.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if resp.StatusCode != http.StatusOK {
|
|
switch resp.StatusCode {
|
|
case http.StatusBadRequest:
|
|
return nil, ErrInvalidArgs
|
|
case http.StatusForbidden:
|
|
return nil, ErrUnauthorized
|
|
default:
|
|
return nil, ErrFailedRead
|
|
}
|
|
}
|
|
|
|
var l listMessagesRes
|
|
if err := json.Unmarshal(body, &l); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return l.Messages, nil
|
|
}
|
|
|
|
func (sdk *mfSDK) SetContentType(ct ContentType) error {
|
|
if ct != CTJSON && ct != CTJSONSenML && ct != CTBinary {
|
|
return ErrInvalidContentType
|
|
}
|
|
|
|
sdk.msgContentType = ct
|
|
|
|
return nil
|
|
}
|