mirror of
https://github.com/mainflux/mainflux.git
synced 2025-04-27 13:48:49 +08:00
61b2d6b87b
* 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>
45 lines
924 B
Protocol Buffer
45 lines
924 B
Protocol Buffer
//
|
|
// Copyright (c) 2018
|
|
// Mainflux
|
|
//
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
//
|
|
|
|
syntax = "proto3";
|
|
package mainflux;
|
|
|
|
// RawMessage represents a message emitted by the Mainflux adapters layer.
|
|
message RawMessage {
|
|
string channel = 1;
|
|
string subtopic = 2;
|
|
string publisher = 3;
|
|
string protocol = 4;
|
|
string contentType = 5;
|
|
bytes payload = 6;
|
|
}
|
|
|
|
// Message represents a resolved (normalized) raw message.
|
|
message Message {
|
|
string channel = 1;
|
|
string subtopic = 2;
|
|
string publisher = 3;
|
|
string protocol = 4;
|
|
string name = 5;
|
|
string unit = 6;
|
|
oneof value {
|
|
double floatValue = 7;
|
|
string stringValue = 8;
|
|
bool boolValue = 9;
|
|
string dataValue = 10;
|
|
}
|
|
SumValue valueSum = 11;
|
|
double time = 12;
|
|
double updateTime = 13;
|
|
string link = 14;
|
|
}
|
|
|
|
// SumValue is a simple wrapper around the double value.
|
|
message SumValue {
|
|
double value = 1;
|
|
}
|