#include "superptr.hpp"
#define __SMALLFILE__ std::string(__FILE__).substr(std::string(__FILE__).rfind("/")+1)
-libwebsocket_context *context = NULL;
+lws_context *context = NULL;
WebSocketSource *source;
AbstractRoutingEngine *m_re;
public:
bool hasProperty(std::string name, std::string source, Zone::Type zone)
{
- for(auto i : properties)
+ for(auto i : mProperties)
{
if(i->name == name &&
i->sourceUuid == source &&
return false;
}
- std::shared_ptr<AbstractPropertyType> append(std::string name, std::string source, Zone::Type zone)
+ std::shared_ptr<AbstractPropertyType> append(std::string name, std::string source, Zone::Type zone, std::string type)
{
- for(auto i : properties)
+ for(auto i : mProperties)
{
if(i->name == name &&
i->sourceUuid == source &&
if(!t)
{
- throw std::runtime_error(name + "name is not a known type");
+ VehicleProperty::registerProperty(name, [name, type]() -> AbstractPropertyType* {
+ if(type == amb::BasicTypes::UInt16Str)
+ {
+ return new BasicPropertyType<uint16_t>(name, 0);
+ }
+ else if(type == amb::BasicTypes::Int16Str)
+ {
+ return new BasicPropertyType<int16_t>(name, 0);
+ }
+ else if(type == amb::BasicTypes::UInt32Str)
+ {
+ return new BasicPropertyType<uint32_t>(name, 0);
+ }
+ else if(type == amb::BasicTypes::Int32Str)
+ {
+ return new BasicPropertyType<int32_t>(name, 0);
+ }
+ else if(type == amb::BasicTypes::StringStr)
+ {
+ return new StringPropertyType(name);
+ }
+ else if(type == amb::BasicTypes::DoubleStr)
+ {
+ return new BasicPropertyType<double>(name, 0);
+ }
+ else if(type == amb::BasicTypes::BooleanStr)
+ {
+ return new BasicPropertyType<bool>(name, false);
+ }
+ DebugOut(DebugOut::Warning) << "Unknown or unsupported type: " << type << endl;
+ return nullptr;
+ });
+ t = VehicleProperty::getPropertyTypeForPropertyNameValue(name);
}
- t->sourceUuid = source;
- t->zone = zone;
+ if(t)/// check again to see if registration succeeded
+ {
+ t->sourceUuid = source;
+ t->zone = zone;
- properties.emplace_back(t);
+ mProperties.emplace_back(t);
+ }
- return property(name, source, zone);
+ return property(name, source, zone); /// will return nullptr if t didn't register
}
std::shared_ptr<AbstractPropertyType> property(std::string name, std::string source, Zone::Type zone)
{
- for(auto i : properties)
+ for(auto i : mProperties)
{
if(i->name == name &&
i->sourceUuid == source &&
return nullptr;
}
+ std::vector<std::shared_ptr<AbstractPropertyType>> properties() { return mProperties; }
+
private:
- std::vector<std::shared_ptr<AbstractPropertyType>> properties;
+ std::vector<std::shared_ptr<AbstractPropertyType>> mProperties;
};
UniquePropertyCache properties;
-static int callback_http_only(libwebsocket_context *context,struct libwebsocket *wsi,enum libwebsocket_callback_reasons reason,void *user, void *in, size_t len);
-static struct libwebsocket_protocols protocols[] = {
+static int callback_http_only(struct lws *wsi,enum lws_callback_reasons reason,void *user, void *in, size_t len);
+static struct lws_protocols protocols[] = {
{
"http-only",
callback_http_only,
0,
128,
+ 0,
+ NULL,
},
- { /* end of list */
+ {
NULL,
NULL,
0,
- 0
+ 0,
+ 0,
+ NULL,
}
};
reply["type"] = "method";
reply["name"] = "subscribe";
- reply["data"] = prop.c_str();
+ reply["property"] = prop.c_str();
reply["transactionid"] = "d293f670-f0b3-11e1-aff1-0800200c9a66";
- QByteArray replystr;
-
- if(doBinary)
- replystr = QJsonDocument::fromVariant(reply).toBinaryData();
- else
- {
- replystr = QJsonDocument::fromVariant(reply).toJson();
- cleanJson(replystr);
- }
-
- lwsWrite(clientsocket, replystr, replystr.length());
+ lwsWriteVariant(clientsocket, reply);
}
}
void WebSocketSource::setConfiguration(map<string, string> config)
sslval = 2;
}
- clientsocket = libwebsocket_client_connect(context, ip.c_str(), port, sslval,"/", "localhost", "websocket",protocols[0].name, -1);
-
-
+ clientsocket = lws_client_connect(context, ip.c_str(), port, sslval,"/", "localhost", "websocket", protocols[0].name, -1);
}
-PropertyInfo WebSocketSource::getPropertyInfo(VehicleProperty::Property property)
+PropertyInfo WebSocketSource::getPropertyInfo(const VehicleProperty::Property &property)
{
- return PropertyInfo::invalid();
+ Zone::ZoneList zones;
+ for(auto i : properties.properties())
+ {
+ if(i->name == property)
+ {
+ zones.push_back(i->zone);
+ }
+ }
+
+ return PropertyInfo(0, zones);
}
bool gioPollingFunc(GIOChannel *source, GIOCondition condition, gpointer data)
pollstruct.fd = newfd;
pollstruct.events = condition;
pollstruct.revents = condition;
- libwebsocket_service_fd(context,&pollstruct);
+ lws_service_fd(context,&pollstruct);
if (condition & G_IO_HUP)
{
//Hang up. Returning false closes out the GIOChannel.
return 0;
}
-static int callback_http_only(libwebsocket_context *context, struct libwebsocket *wsi,enum libwebsocket_callback_reasons reason, void *user, void *in, size_t len)
+static int callback_http_only(struct lws *wsi,enum lws_callback_reasons reason, void *user, void *in, size_t len)
{
unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + 4096 + LWS_SEND_BUFFER_POST_PADDING];
DebugOut() << __SMALLFILE__ << ":" << __LINE__ << reason << "callback_http_only" << endl;
//printf("Connection closed!\n");
break;
- //case LWS_CALLBACK_PROTOCOL_INIT:
+ //case LWS_CALLBACK_PROTOCOL_INIT:
case LWS_CALLBACK_CLIENT_ESTABLISHED:
{
//This happens when a client initally connects. We need to request the support event types.
QVariantMap toSend;
toSend["type"] = "method";
- toSend["name"] = "getSupportedEventTypes";
+ toSend["name"] = "getSupported";
toSend["transactionid"] = amb::createUuid().c_str();
- QByteArray replystr;
-
- if(doBinary)
- replystr = QJsonDocument::fromVariant(toSend).toBinaryData();
- else
- {
- replystr = QJsonDocument::fromVariant(toSend).toJson();
- cleanJson(replystr);
- }
-
- lwsWrite(wsi, replystr, replystr.length());
+ lwsWriteVariant(wsi, toSend);
break;
}
case LWS_CALLBACK_CLIENT_RECEIVE:
{
- QByteArray d((char*)in,len);
+ QByteArray d((char*)in, len);
WebSocketSource * manager = source;
manager->expectedMessageFrames = 0;
}
- QJsonDocument doc;
+ DebugOut(7) << "data received: " << d.data() << endl;
- if(doBinary)
- doc = QJsonDocument::fromBinaryData(d);
- else
+ int start = d.indexOf("{");
+
+ if(manager->incompleteMessage.isEmpty() && start > 0)
+ {
+ DebugOut(7)<< "We have an incomplete message at the beginning. Toss it away." << endl;
+ d = d.right(start-1);
+ }
+
+
+ int end = d.lastIndexOf("}");
+
+ if(end == -1)
{
- doc = QJsonDocument::fromJson(d);
- DebugOut(7)<<d.data()<<endl;
+ manager->incompleteMessage += d;
+ break;
}
+ QByteArray tryMessage = manager->incompleteMessage + d.left(end+1);
+
+ DebugOut(6) << "Trying to parse message: " << tryMessage.data() << endl;
+
+ QJsonDocument doc;
+
+ QJsonParseError parseError;
+
+ doc = QJsonDocument::fromJson(tryMessage, &parseError);
+
if(doc.isNull())
{
- DebugOut(DebugOut::Error)<<"Invalid message"<<endl;
+ DebugOut(7) << "Invalid or incomplete message" << endl;
+ DebugOut(7) << parseError.errorString().toStdString() << ": " << parseError.offset << endl;
+ manager->incompleteMessage += d;
break;
}
+ manager->incompleteMessage = end == d.length()-1 ? "" : d.right(end);
+
QVariantMap call = doc.toVariant().toMap();
string type = call["type"].toString().toStdString();
string name = call["name"].toString().toStdString();
string id = call["transactionid"].toString().toStdString();
- list<pair<string,string> > pairdata;
-
if(type == "multiframe")
{
manager->expectedMessageFrames = call["frames"].toInt();
double timestamp = data["timestamp"].toDouble();
int sequence = data["sequence"].toInt();
Zone::Type zone = data["zone"].toInt();
+ string type = data["type"].toString().toStdString();
DebugOut() << __SMALLFILE__ <<":"<< __LINE__ << "Value changed:" << name << value << endl;
try
{
- auto type = properties.append(name, source->uuid(), zone);
+ auto property = properties.append(name, source->uuid(), zone, type);
- type->timestamp = timestamp;
- type->sequence = sequence;
- type->fromString(value);
+ if(!property)
+ {
+ DebugOut(DebugOut::Warning) << "We either don't have this or don't support it ("
+ << name << "," << zone << "," << type << ")" << endl;
+ }
+
+ property->timestamp = timestamp;
+ property->sequence = sequence;
+ property->fromString(value);
+
+ m_re->updateProperty(property.get(), source->uuid());
- m_re->updateProperty(type.get(), source->uuid());
double currenttime = amb::currentTime();
/** This is now the latency between when something is available to read on the socket, until
* JSON parsing in this section.
*/
- DebugOut(2)<<"websocket network + parse latency: "<<(currenttime - type->timestamp)*1000<<"ms"<<endl;
+ DebugOut()<<"websocket network + parse latency: "<<(currenttime - property->timestamp)*1000<<"ms"<<endl;
totalTime += (currenttime - oldTimestamp)*1000;
numUpdates ++;
averageLatency = totalTime / numUpdates;
- DebugOut(
2)<<"Average parse latency: "<<averageLatency<<endl;
+ DebugOut()<<"Average parse latency: "<<averageLatency<<endl;
}
catch (exception ex)
{
}
else if (type == "methodReply")
{
- if (name == "getSupportedEventTypes")
+ if (name == "getSupported" || name == "supportedChanged")
{
QVariant data = call["data"];
- QStringList supported = data.toStringList();
+ QVariantList supported = data.toList();
+
+ DebugOut() << __SMALLFILE__ <<":"<< __LINE__ << "Got getSupported request"<<endl;
+
+ double serverTime = call["systemTime"].toDouble();
- DebugOut() << __SMALLFILE__ <<":"<< __LINE__ << "Got getSupportedEventTypes request"<<endl;
- PropertyList props;
+ DebugOut() << "Server time is: " << serverTime << endl;
- Q_FOREACH(QString p, supported)
+ if(serverTime)
+ source->serverTimeOffset = amb::Timestamp::instance()->epochTime() - serverTime;
+
+ Q_FOREACH(QVariant p, supported)
{
- props.push_back(p.toStdString());
+ QVariantMap d = p.toMap();
+ Zone::Type zone = d["zone"].toInt();
+ std::string name = d["property"].toString().toStdString();
+ std::string proptype = d["type"].toString().toStdString();
+ std::string source = d["source"].toString().toStdString();
+
+ properties.append(name, source, zone, proptype);
}
- source->setSupported(props);
- //m_re->updateSupported(m_supportedProperties,PropertyList());
+ source->updateSupported();
+
}
else if (name == "getRanged")
{
{
QVariantMap obj = d.toMap();
- std::string name = obj["name"].toString().toStdString();
+ std::string name = obj["property"].toString().toStdString();
std::string value = obj["value"].toString().toStdString();
- double timestamp = obj["timestamp"].toDouble();
+ double timestamp = obj["timestamp"].toDouble() + source->serverTimeOffset;
int sequence = obj["sequence"].toInt();
- AbstractPropertyType* type = VehicleProperty::getPropertyTypeForPropertyNameValue(name,value);
+ AbstractPropertyType* type = VehicleProperty::getPropertyTypeForPropertyNameValue(name, value);
+ if(!type)
+ {
+ DebugOut() << "TODO: support custom types here: " << endl;
+ continue;
+ }
type->timestamp = timestamp;
type->sequence = sequence;
else if (name == "get")
{
- DebugOut() << __SMALLFILE__ << ":" << __LINE__ << "Got \"GET\" event:" << pairdata.size()<<endl;
+ DebugOut() << __SMALLFILE__ << ":" << __LINE__ << "Got \"GET\" reply" << endl;
if (source->uuidReplyMap.find(id) != source->uuidReplyMap.end())
{
QVariantMap obj = call["data"].toMap();
int sequence = obj["sequence"].toInt();
Zone::Type zone = obj["zone"].toInt();
- AbstractPropertyType* v = VehicleProperty::getPropertyTypeForPropertyNameValue(property, value);
+ auto v = amb::make_unique(VehicleProperty::getPropertyTypeForPropertyNameValue(property, value));
+
v->timestamp = timestamp;
v->sequence = sequence;
v->zone = zone;
if (source->uuidReplyMap.find(id) != source->uuidReplyMap.end() && source->uuidReplyMap[id]->error != AsyncPropertyReply::Timeout)
{
- source->uuidReplyMap[id]->value = v;
+ source->uuidReplyMap[id]->value = v.get();
source->uuidReplyMap[id]->success = true;
source->uuidReplyMap[id]->completed(source->uuidReplyMap[id]);
source->uuidReplyMap.erase(id);
{
DebugOut() << "get methodReply has been recieved, without a request being in!. This is likely due to a request coming in after the timeout has elapsed.\n";
}
-
- delete v;
}
else
{
DebugOut() << __SMALLFILE__ << ":" << __LINE__ << "GET Method Reply INVALID! Multiple properties detected, only single are supported!!!" << "\n";
}
- //data will contain a property/value map.
+
+ }
+ else if (name == "set")
+ {
+ DebugOut() << __SMALLFILE__ << ":" << __LINE__ << "Got \"SET\" event" << endl;
+ std::string id = call["transactionid"].toString().toStdString();
+
+ if(source->setReplyMap.find(id) != source->setReplyMap.end() && source->setReplyMap[id]->error != AsyncPropertyReply::Timeout)
+ {
+ AsyncPropertyReply* reply = source->setReplyMap[id];
+
+ reply->success = call["success"].toBool();
+ reply->error = AsyncPropertyReply::strToError(call["error"].toString().toStdString());
+
+ QVariantMap obj = call["data"].toMap();
+
+ std::string property = obj["property"].toString().toStdString();
+ std::string value = obj["value"].toString().toStdString();
+
+ double timestamp = obj["timestamp"].toDouble();
+ int sequence = obj["sequence"].toInt();
+ Zone::Type zone = obj["zone"].toInt();
+
+ auto v = amb::make_unique(VehicleProperty::getPropertyTypeForPropertyNameValue(property, value));
+
+ if(v)
+ {
+ v->timestamp = timestamp;
+ v->sequence = sequence;
+ v->zone = zone;
+ }
+ else
+ {
+ throw std::runtime_error("property may not be registered.");
+ }
+
+ reply->value = v.get();
+ reply->completed(reply);
+ source->setReplyMap.erase(id);
+ }
+ }
+ else
+ {
+ DebugOut(DebugOut::Warning) << "Unhandled methodReply: " << name << endl;
}
}
{
DebugOut(5) << __SMALLFILE__ << ":" << __LINE__ << "Adding poll for websocket IO channel" << endl;
//Add a FD to the poll list.
- GIOChannel *chan = g_io_channel_unix_new(libwebsocket_get_socket_fd(wsi));
+ GIOChannel *chan = g_io_channel_unix_new(lws_get_socket_fd(wsi));
/// TODO: I changed this to be more consistent with the websocket sink end. it may not be correct. TEST
break;
}
- return 0;
+ return 0;
}
}
-void WebSocketSource::setSupported(PropertyList list)
+void WebSocketSource::updateSupported()
{
- DebugOut() <<__SMALLFILE__ << ":" << __LINE__ <<" "<< __FUNCTION__ <<endl;
- m_supportedProperties = list;
- m_re->updateSupported(list,PropertyList(),this);
+ PropertyList list;
+ for(auto i : properties.properties())
+ {
+ if(!contains(list, i->name))
+ list.push_back(i->name);
+ }
+
+ m_re->updateSupported(list, PropertyList(), this);
}
-WebSocketSource::WebSocketSource(AbstractRoutingEngine *re, map<string, string> config) : AbstractSource(re, config), partialMessageIndex(0),expectedMessageFrames(0)
+WebSocketSource::WebSocketSource(AbstractRoutingEngine *re, map<string, string> config) : AbstractSource(re, config), partialMessageIndex(0),expectedMessageFrames(0),
+ serverTimeOffset(0)
{
m_sslEnabled = false;
clientConnected = false;
if(config.find("useExtensions") != config.end() && config["useExtensions"] == "true")
{
- info.extensions = libwebsocket_get_internal_extensions();
+ info.extensions = lws_get_internal_extensions();
}
info.gid = -1;
info.port = CONTEXT_PORT_NO_LISTEN;
info.user = this;
- context = libwebsocket_create_context(&info);
+ context = lws_create_context(&info);
setConfiguration(config);
}
PropertyList WebSocketSource::supported()
{
- return m_supportedProperties;
+ PropertyList list;
+ for(auto i : properties.properties())
+ {
+ list.push_back(i->name);
+ }
+ return list;
}
int WebSocketSource::supportedOperations()
replyvar["data"] = data;
replyvar["transactionid"] = uuid.c_str();
- QByteArray replystr;
-
- if(doBinary)
- replystr = QJsonDocument::fromVariant(replyvar).toBinaryData();
- else
- {
- replystr = QJsonDocument::fromVariant(replyvar).toJson();
- cleanJson(replystr);
- }
-
- lwsWrite(clientsocket, replystr, replystr.length());
+ lwsWriteVariant(clientsocket, replyvar);
}
void WebSocketSource::getRangePropertyAsync(AsyncRangePropertyReply *reply)
replyvar["type"] = "method";
replyvar["name"] = "getRanged";
replyvar["transactionid"] = uuid.c_str();
- replyvar["timeBegin"] = reply->timeBegin;
- replyvar["timeEnd"] = reply->timeEnd;
+ replyvar["timeBegin"] = reply->timeBegin - serverTimeOffset;
+ replyvar["timeEnd"] = reply->timeEnd - serverTimeOffset;
replyvar["sequenceBegin"] = reply->sequenceBegin;
replyvar["sequenceEnd"] = reply->sequenceEnd;
-
QStringList properties;
for (auto itr = reply->properties.begin(); itr != reply->properties.end(); itr++)
replyvar["data"] = properties;
- QByteArray replystr;
-
- if(doBinary)
- replystr = QJsonDocument::fromVariant(replyvar).toBinaryData();
- else
- {
- replystr = QJsonDocument::fromVariant(replyvar).toJson();
- cleanJson(replystr);
- }
-
- lwsWrite(clientsocket, replystr, replystr.length());
+ lwsWriteVariant(clientsocket, replyvar);
}
AsyncPropertyReply * WebSocketSource::setProperty( AsyncSetPropertyRequest request )
{
AsyncPropertyReply* reply = new AsyncPropertyReply(request);
+ std::string uuid = amb::createUuid();
+
QVariantMap data;
data["property"] = request.property.c_str();
data["value"] = request.value->toString().c_str();
data["zone"] = request.zoneFilter;
-
QVariantMap replyvar;
replyvar["type"] = "method";
replyvar["name"] = "set";
replyvar["data"] = data;
- replyvar["transactionid"] = amb::createUuid().c_str();
-
- QByteArray replystr;
+ replyvar["transactionid"] = uuid.c_str();
- if(doBinary)
- replystr = QJsonDocument::fromVariant(replyvar).toBinaryData();
- else
- {
- replystr = QJsonDocument::fromVariant(replyvar).toJson();
- cleanJson(replystr);
- }
+ lwsWriteVariant(clientsocket, replyvar);
- lwsWrite(clientsocket, replystr, replystr.length());
+ setReplyMap[uuid] = reply;
- ///TODO: we should actually wait for a response before we simply complete the call
- reply->success = true;
- reply->completed(reply);
return reply;
}
projects / profile / ivi / automotive-message-broker.git / blobdiff