diff --git a/src/lib/api/public/ClientChannel.h b/src/lib/api/public/ClientChannel.h index 3918f3f05..25cbd019f 100644 --- a/src/lib/api/public/ClientChannel.h +++ b/src/lib/api/public/ClientChannel.h @@ -5,6 +5,8 @@ #include "ApiException.h" #include "RawUpdate.h" #include "ServiceContext.h" +#include "lib/logging/logging.h" + #include #include #include @@ -12,6 +14,17 @@ namespace bts { namespace api { +template +std::shared_ptr deserialize(const char* buffer, size_t length) { + google::protobuf::io::ArrayInputStream stream(buffer, length); + auto item = std::make_shared(); + if (item->ParseFromZeroCopyStream(&stream)) { + return item; + } + LOG(Api,Error,"Failed to deserialize proto from api stream. This is likely fatal."); + return nullptr; +} + class ClientChannel { int _id; @@ -80,29 +93,29 @@ public: } else { bool first_update = true; - auto cb = [observer, first_update](EventType event_type, const StreamUpdate* changes, int change_count) mutable { + auto cb = [observer, first_update, method, qualifier](EventType event_type, const StreamUpdate* changes, int change_count) mutable { if (event_type == EventType::TABLE_UPDATED) { - std::vector> added_items; + std::vector> added_items, changed_items; std::vector added_keys, - removed_keys; + changed_keys, + removed_keys; for (size_t x = 0; x < change_count; ++x) { const StreamUpdate& change = changes[x]; - if (change.type != StreamUpdate::REMOVE) { - added_keys.reserve(change_count); - added_items.reserve(change_count); - added_keys.push_back(change.key); - google::protobuf::io::ArrayInputStream stream(change.buffer, change.buffer_len); - auto item = std::make_shared(); - if (item->ParseFromZeroCopyStream(&stream)) { - added_items.push_back(move(item)); - } - } - if (change.type != StreamUpdate::CREATE) { - removed_keys.reserve(change_count); - removed_keys.push_back(change.key); + switch(change.type) { + case StreamUpdate::REMOVE: + removed_keys.push_back(change.key); + break; + case StreamUpdate::REPLACE: + changed_items.push_back(deserialize(change.buffer, change.buffer_len)); + changed_keys.push_back(change.key); + break; + case StreamUpdate::CREATE: + added_items.push_back(deserialize(change.buffer, change.buffer_len)); + added_keys.push_back(change.key); + break; } } - observer.on_next(RawUpdate>(added_items, added_keys, removed_keys)); + observer.on_next(RawUpdate>(added_items, added_keys, changed_items, changed_keys, removed_keys)); } else if (event_type == EventType::TABLE_CREATED) { if (!first_update) { diff --git a/src/lib/api/public/RawUpdate.h b/src/lib/api/public/RawUpdate.h index be79fa432..93e7cabe3 100644 --- a/src/lib/api/public/RawUpdate.h +++ b/src/lib/api/public/RawUpdate.h @@ -6,10 +6,16 @@ namespace api { template struct RawUpdate { - RawUpdate(std::vector& added_items, std::vector& added_keys, std::vector& removed_keys) : + RawUpdate(std::vector& added_items, + std::vector& added_keys, + std::vector& changed_items, + std::vector& changed_keys, + std::vector& removed_keys) : is_reset(false), added_items(std::move(added_items)), added_keys(std::move(added_keys)), + changed_items(std::move(changed_items)), + changed_keys(std::move(changed_keys)), removed_keys(std::move(removed_keys)) {} @@ -20,12 +26,16 @@ namespace api { bool is_reset; std::vector added_items; std::vector added_keys; + + std::vector changed_items; + std::vector changed_keys; + std::vector removed_keys; private: RawUpdate() : is_reset(true), - added_items(), added_keys(), removed_keys() + added_items(), added_keys(), changed_items(), changed_keys(), removed_keys() {} }; diff --git a/src/lib/api/public/Update.h b/src/lib/api/public/Update.h index d37345679..4901bded1 100644 --- a/src/lib/api/public/Update.h +++ b/src/lib/api/public/Update.h @@ -9,12 +9,21 @@ namespace bts { namespace api { + template + class Change { + T _old, _new; + public: + Change(const T& old_value, const T& new_value) : _old(old_value), _new(new_value) { } + const T& old() { return _old; } + const T& current() { return _new; } + }; template struct Update { - Update(std::vector& all, std::vector& added, std::vector& removed) : + Update(std::vector& all, std::vector& added, std::vector> changed, std::vector& removed) : _all_items(std::move(all)), _added_items(std::move(added)), + _changed_items(std::move(changed)), _removed_items(std::move(removed)) {} @@ -22,17 +31,20 @@ namespace api { Update(Update&& other) : _all_items(std::move(other._all_items)), _added_items(std::move(other._added_items)), + _changed_items(std::move(other._changed_items)), _removed_items(std::move(other._removed_items)) {} TKey key(const T& t) const { return ServiceType::key(t); } const std::vector& all() const { return _all_items; } const std::vector& added() const { return _added_items; } + const std::vector>& changed() const { return _changed_items; } const std::vector& removed() const { return _removed_items; } private: std::vector _all_items; std::vector _added_items; + std::vector> _changed_items; std::vector _removed_items; }; @@ -49,9 +61,12 @@ namespace api { } state->clear(); std::vector all, added; - return Update(all, added, removed); + std::vector> changed; + return Update(all, added, changed, removed); } else { + // + // Remove std::vector removed; removed.reserve(raw.removed_keys.size()); for (int key : raw.removed_keys) { @@ -61,6 +76,8 @@ namespace api { state->erase(iter); } } + // + // Add for (size_t x = 0; x < raw.added_keys.size(); ++x) { (*state)[raw.added_keys[x]] = raw.added_items[x]; } @@ -69,7 +86,16 @@ namespace api { for (const auto& item : *state) { all.push_back(item.second); } - return Update(all, raw.added_items, removed); + // + // Change + std::vector> changed; + changed.reserve(raw.changed_keys.size()); + for (size_t x = 0; x < raw.changed_keys.size(); ++x) { + changed.push_back(Change{(*state)[raw.changed_keys[x]], raw.changed_items[x]}); + (*state)[raw.changed_keys[x]] = raw.changed_items[x]; + } + + return Update(all, raw.added_items, changed, removed); } }); }; diff --git a/src/lib/md/MBOServiceServer.cpp b/src/lib/md/MBOServiceServer.cpp index 0603d3951..0c4c2ce49 100644 --- a/src/lib/md/MBOServiceServer.cpp +++ b/src/lib/md/MBOServiceServer.cpp @@ -86,14 +86,23 @@ MBOServiceServer::MBOServiceServer( md::MDClient& c ) : MBOServiceBase(ctx), - _me(new MBOServiceImpl(ctx,d,c)) + _me(new MBOServiceImpl(ctx,d,c,make_piq_publisher())) { - // subscribe to mdclient - // make publishers - // subscribe to orders - - // _me = utils::make_unique(); + // subscribe to mdclient ✔ + // make publishers ✔ + // subscribe to orders => stash active orders dict + _me->orders_sub = + _me->orders.subscribe_orders().subscribe([=](const auto& update) { + const auto& added = update.added(); + const auto& removed = update.removed(); + // api thread + _me->dispatcher.post([this,added,removed]() { + // dispatcher thread + // handle add/remove/change + }); + }); } + MBOServiceServer::~MBOServiceServer() { }