comparison json/VampJson.h @ 72:16acd7d24b1a

Ensure id is passed through in adapter (still pending for server/converter)

 
     static void
     markRPC(json11::Json::object &jo) {
         jo["jsonrpc"] = "2.0";
     }
+
+    static void
+    addId(json11::Json::object &jo, const json11::Json &id) {
+        if (!id.is_null()) {
+            jo["id"] = id;
+        }
+    }
     
 public:
 
     static json11::Json
     fromRpcRequest_List() {

         jo["method"] = "list";
         return json11::Json(jo);
     }
 
     static json11::Json
-    fromRpcResponse_List(const Vamp::HostExt::ListResponse &resp) {
+    fromRpcResponse_List(const Vamp::HostExt::ListResponse &resp,
+                         const json11::Json &id) {
 
         json11::Json::object jo;
         markRPC(jo);
 
         json11::Json::array arr;

         json11::Json::object po;
         po["available"] = arr;
 
         jo["method"] = "list";
         jo["result"] = po;
+        addId(jo, id);
         return json11::Json(jo);
     }
     
     static json11::Json
     fromRpcRequest_Load(const Vamp::HostExt::LoadRequest &req) {

         return json11::Json(jo);
     }    
 
     static json11::Json
     fromRpcResponse_Load(const Vamp::HostExt::LoadResponse &resp,
-                          const PluginHandleMapper &pmapper) {
+                         const PluginHandleMapper &pmapper,
+                         const json11::Json &id) {
 
         if (resp.plugin) {
 
             json11::Json::object jo;
             markRPC(jo);
 
             jo["method"] = "load";
             jo["result"] = fromLoadResponse(resp, pmapper);
+            addId(jo, id);
             return json11::Json(jo);
             
         } else {
-            return fromError("Failed to load plugin", RRType::Load);
+            return fromError("Failed to load plugin", RRType::Load, id);
         }
     }
 
     static json11::Json
     fromRpcRequest_Configure(const Vamp::HostExt::ConfigurationRequest &req,

         return json11::Json(jo);
     }    
 
     static json11::Json
     fromRpcResponse_Configure(const Vamp::HostExt::ConfigurationResponse &resp,
-                               const PluginHandleMapper &pmapper) {
+                              const PluginHandleMapper &pmapper,
+                              const json11::Json &id) {
 
         if (!resp.outputs.empty()) {
         
             json11::Json::object jo;
             markRPC(jo);
 
             jo["method"] = "configure";
             jo["result"] = fromConfigurationResponse(resp, pmapper);
+            addId(jo, id);
             return json11::Json(jo);
 
         } else {
-            return fromError("Failed to configure plugin", RRType::Configure);
+            return fromError("Failed to configure plugin", RRType::Configure, id);
         }
     }
     
     static json11::Json
     fromRpcRequest_Process(const Vamp::HostExt::ProcessRequest &req,
-                            const PluginHandleMapper &pmapper,
-                            BufferSerialisation serialisation) {
+                           const PluginHandleMapper &pmapper,
+                           BufferSerialisation serialisation) {
 
         json11::Json::object jo;
         markRPC(jo);
 
         jo["method"] = "process";

         return json11::Json(jo);
     }    
 
     static json11::Json
     fromRpcResponse_Process(const Vamp::HostExt::ProcessResponse &resp,
-                             const PluginHandleMapper &pmapper,
-                             BufferSerialisation serialisation) {
+                            const PluginHandleMapper &pmapper,
+                            BufferSerialisation serialisation,
+                            const json11::Json &id) {
         
         json11::Json::object jo;
         markRPC(jo);
 
         json11::Json::object po;

         po["features"] = fromFeatureSet(resp.features,
                                         *pmapper.pluginToOutputIdMapper(resp.plugin),
                                         serialisation);
         jo["method"] = "process";
         jo["result"] = po;
+        addId(jo, id);
         return json11::Json(jo);
     }
     
     static json11::Json
     fromRpcRequest_Finish(const Vamp::HostExt::FinishRequest &req,

         return json11::Json(jo);
     }    
     
     static json11::Json
     fromRpcResponse_Finish(const Vamp::HostExt::ProcessResponse &resp,
-                            const PluginHandleMapper &pmapper,
-                            BufferSerialisation serialisation) {
+                           const PluginHandleMapper &pmapper,
+                           BufferSerialisation serialisation,
+                           const json11::Json &id) {
 
         json11::Json::object jo;
         markRPC(jo);
 
         json11::Json::object po;

         po["features"] = fromFeatureSet(resp.features,
                                         *pmapper.pluginToOutputIdMapper(resp.plugin),
                                         serialisation);
         jo["method"] = "finish";
         jo["result"] = po;
-        return json11::Json(jo);
-    }
-
-    static json11::Json
-    fromError(std::string errorText, RRType responseType) {
+        addId(jo, id);
+        return json11::Json(jo);
+    }
+
+    static json11::Json
+    fromError(std::string errorText,
+              RRType responseType,
+              const json11::Json &id) {
 
         json11::Json::object jo;
         markRPC(jo);
 
         std::string type;

         eo["message"] = 
             std::string("error in ") + type + " request: " + errorText;
 
         jo["method"] = type;
         jo["error"] = eo;
-        
+        addId(jo, id);
         return json11::Json(jo);
     }
 
     static RRType
     getRequestResponseType(json11::Json j, std::string &err) {