Move in TopicTree from uTT

This commit is contained in:
Alex Hultman
2019-02-08 23:23:25 +01:00
parent e59ae7fd72
commit aaf1f05dcd
3 changed files with 174 additions and 3 deletions
+150
View File
@@ -0,0 +1,150 @@
/*
* Authored by Alex Hultman, 2018-2019.
* Intellectual property of third-party.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* Every Loop holds one TopicTree */
#ifndef TOPICTREE_H
#define TOPICTREE_H
#include <map>
#include <string>
#include <vector>
#include <set>
class TopicTree {
private:
struct Node : std::map<std::string, Node *> {
Node *get(std::string path) {
std::pair<std::map<std::string, Node *>::iterator, bool> p = insert({path, nullptr});
if (p.second) {
return p.first->second = new Node;
} else {
return p.first->second;
}
}
std::vector<std::pair<void *, bool *>> subscribers;
std::string sharedMessage;
};
Node *root = new Node;
std::set<Node *> pubNodes;
public:
TopicTree() {
std::cout << "Constructing TopicTree" << std::endl;
}
/* WebSocket.subscribe will lookup the Loop and subscribe in its tree */
void subscribe(std::string topic, void *connection, bool *valid) {
Node *curr = root;
for (int i = 0; i < topic.length(); i++) {
int start = i;
while (topic[i] != '/' && i < topic.length()) {
i++;
}
curr = curr->get(topic.substr(start, i - start));
}
curr->subscribers.push_back({connection, valid});
std::cout << "Subscribed to topicTree" << std::endl;
}
/* WebSocket.publish looks up its tree and publishes to it */
void publish(std::string topic, char *data, size_t length) {
Node *curr = root;
for (int i = 0; i < topic.length(); i++) {
int start = i;
while (topic[i] != '/' && i < topic.length()) {
i++;
}
std::string path(topic.data() + start, i - start);
// end wildcard consumes traversal
auto it = curr->find("#");
if (it != curr->end()) {
curr = it->second;
//matches.push_back(curr);
curr->sharedMessage.append(data, length);
if (curr->subscribers.size()) {
pubNodes.insert(curr);
}
break;
} else {
it = curr->find(path);
if (it == curr->end()) {
it = curr->find("+");
if (it != curr->end()) {
goto skip;
}
break;
} else {
skip:
curr = it->second;
if (i == topic.length()) {
//matches.push_back(curr);
curr->sharedMessage.append(data, length);
if (curr->subscribers.size()) {
pubNodes.insert(curr);
}
break;
}
}
}
}
std::cout << "Published to topicTree" << std::endl;
}
void reset() {
root = new Node;
}
/* I forgot what this does but probably needs lots of changes anyways */
void drain(void (*prepareCb)(void *user, char *, size_t), void (*sendCb)(void *, void *), void (*refCb)(void *), void *user) {
if (pubNodes.size()) {
//if(pubNodes.size() > 1) {
for (Node *topicNode : pubNodes) {
for (std::pair<void *, bool *> p : topicNode->subscribers) {
if (*p.second) {
refCb(p.first);
}
}
}
//}
for (Node *topicNode : pubNodes) {
prepareCb(user, (char *) topicNode->sharedMessage.data(), topicNode->sharedMessage.length());
for (auto it = topicNode->subscribers.begin(); it != topicNode->subscribers.end(); ) {
if (!*it->second) {
it = topicNode->subscribers.erase(it);
} else {
sendCb(user, it->first);
it++;
}
}
topicNode->sharedMessage.clear();
}
pubNodes.clear();
}
}
};
#endif // TOPICTREE_H
+19
View File
@@ -125,6 +125,25 @@ public:
webSocketContextData->closeHandler(this, code, message);
}
}
/* Subscribe to a topic according to MQTT rules and syntax */
void subscribe(std::string_view topic) {
WebSocketContextData<SSL> *webSocketContextData = (WebSocketContextData<SSL> *) us_new_socket_context_ext(SSL,
(us_new_socket_context_t *) us_new_socket_context(SSL, (us_new_socket_t *) this)
);
/* Fix this up */
webSocketContextData->topicTree.subscribe(topic, this, nullptr);
}
/* Publish a message to a topic according to MQTT rules and syntax */
void publish(std::string_view topic, std::string_view message) {
WebSocketContextData<SSL> *webSocketContextData = (WebSocketContextData<SSL> *) us_new_socket_context_ext(SSL,
(us_new_socket_context_t *) us_new_socket_context(SSL, (us_new_socket_t *) this)
);
webSocketContextData->topicTree.publish(topic, message.data(), message.length());
}
};
}
+5 -3
View File
@@ -18,12 +18,11 @@
#ifndef WEBSOCKETCONTEXTDATA_H
#define WEBSOCKETCONTEXTDATA_H
#include <functional>
#include "f2/function2.hpp"
#include <string_view>
#include "WebSocketProtocol.h"
#include "f2/function2.hpp"
#include "TopicTree.h"
namespace uWS {
@@ -41,6 +40,9 @@ struct WebSocketContextData {
/* Settings for this context */
size_t maxPayloadLength = 0;
int idleTimeout = 0;
/* Each websocket context has a topic tree for pub/sub */
TopicTree topicTree;
};
}