Added support for the SubscriptionHandlerFactory object.

This commit is contained in:
Brad Arant committed 2023-06-10 16:01:56 -07:00
1 parent 0ef782a11c
commit b40cb9f5a4
114 files changed
+497 -480

No files matched your search

+23 -55
View File
@@ -3,11 +3,13 @@
#include "Subscription.h"
#include "TCPServer.h"
#include <algorithm>
#include "SubscriptionHandlerFactory.h"
namespace core
{
namespace core {
SubscriptionManager::SubscriptionManager() {}
SubscriptionManager::SubscriptionManager() {
factory = new SubscriptionHandlerFactory();
}
int SubscriptionManager::add(Subscription &subscription) {
lock.lock();
@@ -16,16 +18,7 @@ namespace core
return 1;
}
int SubscriptionManager::addHandler(std::string name, SubscriptionHandler *handler) {
lock.lock();
handlers.insert(std::make_pair(name, handler));
coreutils::Log(coreutils::LOG_DEBUG_1) << "Adding handler to SubscriptionManager for '" << name << "' (" << handler;
lock.unlock();
return 1;
}
int SubscriptionManager::removeSessionSubscriptions(TCPSession &session)
{
int SubscriptionManager::removeSessionSubscriptions(TCPSession &session) {
int countSubscribed = 0;
int countPublished = 0;
@@ -57,29 +50,20 @@ namespace core
return countSubscribed;
}
int SubscriptionManager::processCommand(coreutils::ZString &request, TCPSession &session)
{
if (request[0].equals("publish"))
{
SubscriptionHandler *handler = handlers[request[3].str()];
int SubscriptionManager::processCommand(coreutils::ZString &request, TCPSession &session) {
if (request[0].equals("publish")) {
SubscriptionHandler *handler = factory->getSubscriptionHandler(request[3].str());
newSubscription = new Subscription(request[1].str(), session, request[2].str(), handler);
subscriptions.insert(std::make_pair(request[1].str(), newSubscription));
return 1;
}
else if (request[0].equals("catalog"))
{
} else if (request[0].equals("catalog")) {
session.out << ":catalog:";
for (auto const &[key, subscription] : subscriptions)
{
for (auto const &[key, subscription] : subscriptions) {
session.out << subscription->id << ";";
}
session.out << std::endl;
return 1;
}
else if (request[0].equals("invite"))
{
} else if (request[0].equals("invite")) {
std::stringstream out;
coreutils::Log(coreutils::LOG_DEBUG_1) << request[2];
std::string invitee = request[2].str();
@@ -89,47 +73,31 @@ namespace core
tempSession->write(temp.str());
return 1;
}
auto subscription = subscriptions[request[1].str()];
if (request[1].equals(subscription->id))
{
if (request[0].equals("unpublish"))
{
if (request[1].equals(subscription->id)) {
if (request[0].equals("unpublish")) {
subscriptions.erase(request[1].str());
}
else if (request[0].equals("subscribe"))
{
} else if (request[0].equals("subscribe")) {
subscription->subscribe(session);
return 1;
}
else if (request[0].equals("unsubscribe"))
{
} else if (request[0].equals("unsubscribe")) {
subscription->unsubscribe(session);
return 1;
}
else if (request[0].equals("event"))
{
} else if (request[0].equals("event")) {
std::stringstream out;
subscription->process(request, out, session);
if (subscription->mode == "*ANYONE")
{
if (subscription->mode == "*ANYONE") {
subscription->event(out);
return 1;
}
else if (subscription->mode == "*SUBSCRIBERS")
{
if (subscription->ifSubscriber(session))
{
} else if (subscription->mode == "*SUBSCRIBERS") {
if (subscription->ifSubscriber(session)) {
subscription->event(out);
return 1;
}
}
else if (subscription->mode == "*AUTHOR")
{
if (subscription->owner == &session)
{
} else if (subscription->mode == "*AUTHOR") {
if (subscription->owner == &session) {
subscription->event(out);
return 1;
}