mirror of
https://github.com/mainflux/mainflux.git
synced 2025-04-27 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>
51 lines
1016 B
Go
51 lines
1016 B
Go
//
|
|
// Copyright (c) 2018
|
|
// Mainflux
|
|
//
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
//
|
|
|
|
package mocks
|
|
|
|
import (
|
|
"sync"
|
|
|
|
"github.com/mainflux/mainflux"
|
|
"github.com/mainflux/mainflux/ws"
|
|
)
|
|
|
|
var _ ws.Service = (*mockService)(nil)
|
|
|
|
type mockService struct {
|
|
subscriptions map[string]*ws.Channel
|
|
pubError error
|
|
mutex sync.Mutex
|
|
}
|
|
|
|
// NewService returns mock message publisher.
|
|
func NewService(subs map[string]*ws.Channel, pubError error) ws.Service {
|
|
return &mockService{subs, pubError, sync.Mutex{}}
|
|
}
|
|
|
|
func (svc *mockService) Publish(msg mainflux.RawMessage) error {
|
|
if len(msg.Payload) == 0 {
|
|
return svc.pubError
|
|
}
|
|
svc.mutex.Lock()
|
|
defer svc.mutex.Unlock()
|
|
svc.subscriptions[msg.Channel].Messages <- msg
|
|
return nil
|
|
}
|
|
|
|
func (svc *mockService) Subscribe(chanID, subtopic string, channel *ws.Channel) error {
|
|
svc.mutex.Lock()
|
|
defer svc.mutex.Unlock()
|
|
|
|
if _, ok := svc.subscriptions[chanID+subtopic]; !ok {
|
|
return ws.ErrFailedSubscription
|
|
}
|
|
svc.subscriptions[chanID] = channel
|
|
|
|
return nil
|
|
}
|