merged with upstream/master

libresapi/src/api/ApiPluginHandler.cpp

@@ -0,0 +1,41 @@
+#include "ApiPluginHandler.h"
+
+namespace resource_api
+{
+
+ApiPluginHandler::ApiPluginHandler(StateTokenServer* statetokenserver, const RsPlugInInterfaces& ifaces)
+{
+    for(int i = 0; i < ifaces.mPluginHandler->nbPlugins(); i++)
+    {
+        RsPlugin* plugin = ifaces.mPluginHandler->plugin(i);
+        // if plugin is not loaded, pointer is null
+        if(plugin == 0)
+            continue;
+        std::string entrypoint;
+        ResourceRouter* child = plugin->new_resource_api_handler(ifaces, statetokenserver, entrypoint);
+        if(child != 0)
+        {
+            mChildren.push_back(child);
+            if(isNameUsed(entrypoint))
+            {
+                std::cerr << "Cannot add plugin api entry point with name=" << entrypoint << ", becaus ethis name is already in use!" << std::endl;
+            }
+            else
+            {
+                std::cerr << "Added libresapi plugin with entrypoint " << entrypoint << std::endl;
+                addResourceHandler(entrypoint, child, &ResourceRouter::handleRequest);
+            }
+        }
+    }
+}
+
+ApiPluginHandler::~ApiPluginHandler()
+{
+    for(std::vector<ResourceRouter*>::iterator vit = mChildren.begin(); vit != mChildren.end(); ++vit)
+    {
+        delete *vit;
+    }
+    mChildren.clear();
+}
+
+} // namespace resource_api

libresapi/src/api/ApiPluginHandler.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include "ResourceRouter.h"
+#include <retroshare/rsplugin.h>
+
+namespace resource_api
+{
+
+// forwards all incoming requests to retroshare plugins
+class ApiPluginHandler: public ResourceRouter
+{
+public:
+    ApiPluginHandler(StateTokenServer* statetokenserver, const RsPlugInInterfaces& ifaces);
+    virtual ~ApiPluginHandler();
+
+private:
+    std::vector<ResourceRouter*> mChildren;
+};
+
+} // namespace resource_api

libresapi/src/api/ApiServer.cpp

@@ -13,6 +13,8 @@
 #include "JsonStream.h"
 #include "StateTokenServer.h" // for the state token serialisers
 
+#include "ApiPluginHandler.h"
+
 /*
 data types in json       http://json.org/
 string (utf-8 unicode)
@@ -226,10 +228,11 @@ public:
         mPeersHandler(sts, ifaces.mNotify, ifaces.mPeers, ifaces.mMsgs),
         mIdentityHandler(ifaces.mIdentity),
         mForumHandler(ifaces.mGxsForums),
-        mServiceControlHandler(rsServiceControl), // TODO: don't use global variable here
+        mServiceControlHandler(ifaces.mServiceControl),
         mFileSearchHandler(sts, ifaces.mNotify, ifaces.mTurtle, ifaces.mFiles),
         mTransfersHandler(sts, ifaces.mFiles),
-        mChatHandler(sts, ifaces.mNotify, ifaces.mMsgs, ifaces.mPeers, ifaces.mIdentity, &mPeersHandler)
+        mChatHandler(sts, ifaces.mNotify, ifaces.mMsgs, ifaces.mPeers, ifaces.mIdentity, &mPeersHandler),
+        mApiPluginHandler(sts, ifaces)
     {
         // the dynamic cast is to not confuse the addResourceHandler template like this:
         // addResourceHandler(derived class, parent class)
@@ -249,6 +252,8 @@ public:
                                    &TransfersHandler::handleRequest);
         router.addResourceHandler("chat", dynamic_cast<ResourceRouter*>(&mChatHandler),
                                   &ChatHandler::handleRequest);
+        router.addResourceHandler("apiplugin", dynamic_cast<ResourceRouter*>(&mApiPluginHandler),
+                                  &ChatHandler::handleRequest);
     }
 
     PeersHandler mPeersHandler;
@@ -258,6 +263,7 @@ public:
     FileSearchHandler mFileSearchHandler;
     TransfersHandler mTransfersHandler;
     ChatHandler mChatHandler;
+    ApiPluginHandler mApiPluginHandler;
 };
 
 ApiServer::ApiServer():

libresapi/src/api/ChatHandler.cpp

@@ -91,7 +91,7 @@ StreamBase& operator << (StreamBase& left, ChatHandler::ChatInfo& info)
     left << makeKeyValueReference("remote_author_id", info.remote_author_id)
          << makeKeyValueReference("remote_author_name", info.remote_author_name)
          << makeKeyValueReference("is_broadcast", info.is_broadcast)
-         << makeKeyValueReference("is_gxs_id", info.is_gxs_id)
+         << makeKeyValueReference("is_distant_chat_id", info.is_distant_chat_id)
          << makeKeyValueReference("is_lobby", info.is_lobby)
          << makeKeyValueReference("is_peer", info.is_peer);
     return left;
@@ -173,17 +173,14 @@ void ChatHandler::tick()
         }
     }
 
-    ChatId id = ChatId::makeBroadcastId();
     {
         Lobby l;
-        l.id = id.toLobbyId();
         l.name = "BroadCast";
         l.topic = "Retroshare broadcast chat: messages are sent to all connected friends.";
         l.subscribed = true;
         l.auto_subscribe = false;
         l.is_private = false;
         l.is_broadcast = true;
-        l.gxs_id = id.toGxsId();
         lobbies.push_back(l);
     }
 
@@ -225,12 +222,20 @@ void ChatHandler::tick()
             author_id = msg.broadcast_peer_id.toStdString();
             author_name = mRsPeers->getPeerName(msg.broadcast_peer_id);
         }
-        else if(msg.chat_id.isGxsId())
+        else if(msg.chat_id.isDistantChatId())
         {
-            author_id = msg.chat_id.toGxsId().toStdString();
-            RsIdentityDetails details;
-            if(!gxs_id_failed && mRsIdentity->getIdDetails(msg.chat_id.toGxsId(), details))
+            DistantChatPeerInfo dcpinfo ;
+            
+            if(!rsMsgs->getDistantChatStatus(msg.chat_id.toDistantChatId(),dcpinfo))
             {
+                std::cerr << "(EE) cannot get info for distant chat peer " << msg.chat_id.toDistantChatId() << std::endl;
+                continue ;
+            }
+
+            RsIdentityDetails details;
+            if(!gxs_id_failed && mRsIdentity->getIdDetails(msg.incoming? dcpinfo.to_id: dcpinfo.own_id, details))
+            {
+                author_id = details.mId.toStdString();
                 author_name = details.mNickname;
             }
             else
@@ -278,7 +283,7 @@ void ChatHandler::tick()
         {
             ChatInfo info;
             info.is_broadcast = msg.chat_id.isBroadcast();
-            info.is_gxs_id = msg.chat_id.isGxsId();
+            info.is_distant_chat_id = msg.chat_id.isDistantChatId();
             info.is_lobby = msg.chat_id.isLobbyId();
             info.is_peer = msg.chat_id.isPeerId();
             if(msg.chat_id.isLobbyId())
@@ -289,12 +294,15 @@ void ChatHandler::tick()
                         info.remote_author_name = vit->name;
                 }
             }
-            else if(msg.chat_id.isGxsId())
+            else if(msg.chat_id.isDistantChatId())
             {
                 RsIdentityDetails details;
-                if(!gxs_id_failed && mRsIdentity->getIdDetails(msg.chat_id.toGxsId(), details))
+                DistantChatPeerInfo dcpinfo ;
+                
+                if(!gxs_id_failed && rsMsgs->getDistantChatStatus(msg.chat_id.toDistantChatId(),dcpinfo)
+                                  && mRsIdentity->getIdDetails(msg.incoming? dcpinfo.to_id: dcpinfo.own_id, details))
                 {
-                    info.remote_author_id = msg.chat_id.toGxsId().toStdString();
+                    info.remote_author_id = details.mId.toStdString();
                     info.remote_author_name = details.mNickname;
                 }
                 else

libresapi/src/api/ChatHandler.h

@@ -84,7 +84,7 @@ public:
     class ChatInfo{
     public:
         bool is_broadcast;
-        bool is_gxs_id;
+        bool is_distant_chat_id;
         bool is_lobby;
         bool is_peer;
         std::string remote_author_id;

libresapi/src/api/GetPluginInterfaces.cpp

@@ -7,6 +7,7 @@
 #include <retroshare/rsdisc.h>
 #include <retroshare/rsdht.h>
 #include <retroshare/rsnotify.h>
+#include <retroshare/rsservicecontrol.h>
 
 #include <retroshare/rsidentity.h>
 #include <retroshare/rsgxscircles.h>
@@ -28,6 +29,8 @@ bool getPluginInterfaces(RsPlugInInterfaces& interfaces)
     interfaces.mDisc   = rsDisc;
     interfaces.mDht    = rsDht;
     interfaces.mNotify = rsNotify;
+    interfaces.mServiceControl = rsServiceControl;
+    interfaces.mPluginHandler  = rsPlugins;
 
     // gxs
     interfaces.mGxsDir          = "";

libresapi/src/api/ResourceRouter.cpp

@@ -55,4 +55,17 @@ ResponseTask* ResourceRouter::handleRequest(Request& req, Response& resp)
     return 0;
 }
 
+bool ResourceRouter::isNameUsed(std::string name)
+{
+    std::vector<std::pair<std::string, HandlerBase*> >::iterator vit;
+    for(vit = mHandlers.begin(); vit != mHandlers.end(); vit++)
+    {
+        if(vit->first == name)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
 } // namespace resource_api

libresapi/src/api/ResourceRouter.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ApiTypes.h"
+#include <iostream>
 
 namespace resource_api
 {
@@ -20,6 +21,8 @@ public:
     void addResourceHandler(std::string name, T* instance, ResponseTask* (T::*callback)(Request& req, Response& resp));
     template <class T>
     void addResourceHandler(std::string name, T* instance, void (T::*callback)(Request& req, Response& resp));
+
+    bool isNameUsed(std::string name);
 private:
     class HandlerBase
     {
@@ -61,6 +64,10 @@ private:
 template <class T>
 void ResourceRouter::addResourceHandler(std::string name, T* instance, ResponseTask* (T::*callback)(Request& req, Response& resp))
 {
+    if(isNameUsed(name))
+    {
+        std::cerr << "ResourceRouter::addResourceHandler ERROR: name=" << name << " alerady in use. Not adding new Handler!" << std::endl;
+    }
     Handler<T>* handler = new Handler<T>();
     handler->instance = instance;
     handler->method = callback;
@@ -69,6 +76,10 @@ void ResourceRouter::addResourceHandler(std::string name, T* instance, ResponseT
 template <class T>
 void ResourceRouter::addResourceHandler(std::string name, T* instance, void (T::*callback)(Request& req, Response& resp))
 {
+    if(isNameUsed(name))
+    {
+        std::cerr << "ResourceRouter::addResourceHandler ERROR: name=" << name << " alerady in use. Not adding new Handler!" << std::endl;
+    }
     InstantResponseHandler<T>* handler = new InstantResponseHandler<T>();
     handler->instance = instance;
     handler->method = callback;