Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-07 14:12:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

changed layout of restbed/json/webui so that JsonApi is the only server (with thread functionality in a separate class) and webui is a resource provider

Browse source
This commit is contained in:
csoler 2019-11-23 00:17:17 +01:00
parent 997501a24d
commit 009ed54ce2
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
8 changed files with 156 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

38
libretroshare/src/jsonapi/jsonapi.h
View file

@ -24,6 +24,7 @@
#include <restbed>
#include <cstdint>
#include <map>
#include <set>
#include "util/rsthreads.h"
#include "pqi/p3cfgmgr.h"
@ -35,6 +36,16 @@
namespace rb = restbed;
class JsonApiResourceProvider
{
public:
JsonApiResourceProvider() {}
virtual ~JsonApiResourceProvider() = default;
virtual std::string getName() const =0;
virtual std::vector<std::shared_ptr<rb::Resource> > getResources() const =0;
};
/**
* Simple usage
* \code{.cpp}
@ -50,13 +61,18 @@ public:
JsonApiServer() ;
virtual ~JsonApiServer() = default;
// public API
// implements RestbedService
virtual bool restart() override { return RestbedService::restart();}
virtual bool stop() override { return RestbedService::stop();}
virtual void setListeningPort(uint16_t port) override { RestbedService::setListeningPort(port) ;}
virtual void setBindingAddress(const std::string& address) override { RestbedService::setBindAddress(address); }
virtual int status() const override;
virtual std::vector<std::shared_ptr<rb::Resource> > getResources() const override ;
// RsJsonAPI public API
bool restart() override { return RestbedService::restart(); }
bool stop() override { return RestbedService::stop();}
int status() const override;
void setListeningPort(uint16_t port) override { return RestbedService::setListeningPort(port); }
void setBindingAddress(const std::string& bind_address) override { return RestbedService::setBindAddress(bind_address); }
virtual void connectToConfigManager(p3ConfigMgr *cfgmgr);
@ -66,6 +82,10 @@ public:
bool isAuthTokenValid(const std::string& token) override;
bool requestNewTokenAutorization(const std::string& user) override;
void registerResourceProvider(const JsonApiResourceProvider *);
void unregisterResourceProvider(const JsonApiResourceProvider *);
bool hasResourceProvider(const JsonApiResourceProvider *);
// private API. These methods may be moved to RsJsonAPI so as to be visible in http mode, if needed.
/**
@ -123,7 +143,6 @@ public:
protected:
/// @see RsSingleJobThread
virtual void run();
virtual std::vector<std::shared_ptr<rb::Resource> > getResources() const;
private:
@ -141,7 +160,6 @@ private:
uint16_t mPort;
std::string mBindAddress;
rb::Service mService;
/// Called when new JSON API auth token is requested to be authorized
/// The callback supplies the password to be used to make the token
@ -167,10 +185,10 @@ private:
RsGenericSerializer::SerializeContext& ctx,
const std::shared_ptr<rb::Session> session )
{
return checkRsServicePtrReady(
serviceInstance.get(), serviceName, ctx, session );
return checkRsServicePtrReady( serviceInstance.get(), serviceName, ctx, session );
}
std::vector<std::shared_ptr<rb::Resource> > _resources;
std::set<JsonApiResourceProvider *> _resource_providers;
};