SL-18629 AISv3 draft calls

2 files changed, 194 insertions, 2 deletions

diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 8e20132ede..afc307278c 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -369,6 +369,153 @@ void AISAPI::UpdateItem(const LLUUID &itemId, const LLSD &updates, completion_t
 }
 
 /*static*/
+void AISAPI::FetchItem(const LLUUID &itemId, ITEM_TYPE type, completion_t callback)
+{
+
+	std::string cap;
+
+	cap = (type == INVENTORY) ? getInvCap() : getLibCap();
+	if (cap.empty())
+	{
+		LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+		return;
+	}
+	std::string url = cap + std::string("/item/") + itemId.asString();
+
+	invokationFn_t patchFn = boost::bind(
+		// Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
+		static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
+		//----
+		// _1 -> httpAdapter
+		// _2 -> httpRequest
+		// _3 -> url
+		// _4 -> body 
+		// _5 -> httpOptions
+		// _6 -> httpHeaders
+		(&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend), _1, _2, _3, _5, _6);
+
+	LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
+		_1, patchFn, url, itemId, LLSD(), callback, FETCHITEM));
+
+	EnqueueAISCommand("FetchItem", proc);
+}
+
+/*static*/
+void AISAPI::FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type, bool recursive, completion_t callback, S32 depth)
+{
+    std::string cap;
+
+    cap = (type == INVENTORY) ? getInvCap() : getLibCap();
+    if (cap.empty())
+    {
+        LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        return;
+    }
+    std::string url = cap + std::string("/category/") + catId.asString() + "/children";
+
+    if (recursive)
+    {
+        url += "?depth=*";
+    }
+    else
+    {
+        url += "?depth=" + std::to_string(depth);
+    }
+
+    invokationFn_t patchFn = boost::bind(
+        // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
+        static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
+        //----
+        // _1 -> httpAdapter
+        // _2 -> httpRequest
+        // _3 -> url
+        // _4 -> body 
+        // _5 -> httpOptions
+        // _6 -> httpHeaders
+        (&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend), _1, _2, _3, _5, _6);
+
+    LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
+        _1, patchFn, url, catId, LLSD(), callback, FETCHCATEGORYCHILDREN));
+
+    EnqueueAISCommand("FetchCategoryChildren", proc);
+}
+
+/*static*/
+void AISAPI::FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type, bool recursive, completion_t callback, S32 depth)
+{
+    std::string cap;
+
+    cap = (type == INVENTORY) ? getInvCap() : getLibCap();
+    if (cap.empty())
+    {
+        LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        return;
+    }
+    std::string url = cap + std::string("/category/") + catId.asString() + "/categories";
+
+    if (recursive)
+    {
+        url += "?depth=*";
+    }
+    else
+    {
+        url += "?depth=" + std::to_string(depth);
+    }
+
+    invokationFn_t patchFn = boost::bind(
+        // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
+        static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
+        //----
+        // _1 -> httpAdapter
+        // _2 -> httpRequest
+        // _3 -> url
+        // _4 -> body 
+        // _5 -> httpOptions
+        // _6 -> httpHeaders
+        (&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend), _1, _2, _3, _5, _6);
+
+    LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
+        _1, patchFn, url, catId, LLSD(), callback, FETCHCATEGORYCATEGORIES));
+
+    EnqueueAISCommand("FetchCategoryCategories", proc);
+}
+
+/*static*/
+void AISAPI::FetchCOF(completion_t callback)
+{
+    std::string cap;
+    cap = getInvCap();
+    if (cap.empty())
+    {
+        LL_WARNS("Inventory") << "Inventory cap not found!" << LL_ENDL;
+        return;
+    }
+    LLUUID cof_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+
+    std::string url = cap + std::string("/category/") + cof_id.asString() +  "/links";
+    
+    //LLUUID root_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_ROOT_INVENTORY);
+    //std::string url = cap + std::string("/category/") + root_id.asString() +  "/children?depth=*";
+
+    invokationFn_t patchFn = boost::bind(
+        // Humans ignore next line.  It is just a cast to specify which LLCoreHttpUtil::HttpCoroutineAdapter routine overload.
+        static_cast<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::*)(LLCore::HttpRequest::ptr_t, const std::string &, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t)>
+        //----
+        // _1 -> httpAdapter
+        // _2 -> httpRequest
+        // _3 -> url
+        // _4 -> body 
+        // _5 -> httpOptions
+        // _6 -> httpHeaders
+        (&LLCoreHttpUtil::HttpCoroutineAdapter::getAndSuspend), _1, _2, _3, _5, _6);
+
+    LLCoprocedureManager::CoProcedure_t proc(boost::bind(&AISAPI::InvokeAISCommandCoro,
+        _1, patchFn, url, cof_id, LLSD(), callback, FETCHCOF));
+
+    EnqueueAISCommand("FetchCOF", proc);
+}
+
+/*static*/
 void AISAPI::EnqueueAISCommand(const std::string &procName, LLCoprocedureManager::CoProcedure_t proc)
 {
     LLCoprocedureManager &inst = LLCoprocedureManager::instance();
@@ -427,7 +574,12 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
     LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest());
     LLCore::HttpHeaders::ptr_t httpHeaders;
 
-    httpOptions->setTimeout(LLCoreHttpUtil::HTTP_REQUEST_EXPIRY_SECS);
+    /*if (type == FETCHCATEGORYCHILDREN && (url.find("?depth=*") != std::string::npos))
+    {
+        LL_WARNS() << "testy test start"<< LL_ENDL;
+    }*/
+
+    httpOptions->setTimeout(180);
 
     LL_DEBUGS("Inventory") << "url: " << url << LL_ENDL;
 
@@ -475,9 +627,36 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
                 }
             }
         }
+        /*else if (status.getType() == 403)
+        {
+            if (type == FETCHCATEGORYCHILDREN)
+            {
+                if (url.find("?depth=*") != std::string::npos)
+                {
+                    LL_WARNS() << "too much" << LL_ENDL;
+                    AISAPI::FetchCategoryChildren(gInventory.getRootFolderID(), AISAPI::ITEM_TYPE::INVENTORY, false, boost::bind(&LLInventoryModel::fetchDescendentsDepthOne, &gInventory, targetId));
+
+                    if (result["oversize_inventory"].asBoolean() == true)
+                    {
+                        LL_WARNS("Inventory") << "Can't fetch the oversized inventory folder" << LL_ENDL;
+                    }
+                }
+                else
+                {
+                    if (result["oversize_inventory"].asBoolean() == true)
+                    {
+                        LL_WARNS("Inventory") << "Can't fetch the oversized inventory folder" << LL_ENDL;
+                    }
+                }
+            }
+        }*/
         LL_WARNS("Inventory") << "Inventory error: " << status.toString() << LL_ENDL;
         LL_WARNS("Inventory") << ll_pretty_print_sd(result) << LL_ENDL;
     }
+    else if (type == FETCHCOF)
+    {
+        //LL_WARNS("Inventory") << ll_pretty_print_sd(result) << LL_ENDL;      
+    }
 
 	LL_DEBUGS("Inventory") << result << LL_ENDL;
     gInventory.onAISUpdateReceived("AISCommand", result);
diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h
index 6e9cc19baa..b21edb9f33 100644
--- a/indra/newview/llaisapi.h
+++ b/indra/newview/llaisapi.h
@@ -38,6 +38,11 @@
 class AISAPI
 {
 public:
+    typedef enum {
+        INVENTORY,
+        LIBRARY
+    } ITEM_TYPE;
+
     typedef boost::function<void(const LLUUID &invItem)>    completion_t;
 
     static bool isAvailable();
@@ -50,6 +55,10 @@ public:
     static void PurgeDescendents(const LLUUID &categoryId, completion_t callback = completion_t());
     static void UpdateCategory(const LLUUID &categoryId, const LLSD &updates, completion_t callback = completion_t());
     static void UpdateItem(const LLUUID &itemId, const LLSD &updates, completion_t callback = completion_t());
+    static void FetchItem(const LLUUID &itemId, ITEM_TYPE type, completion_t callback = completion_t());
+    static void FetchCategoryChildren(const LLUUID &catId, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
+    static void FetchCategoryCategories(const LLUUID &catId, ITEM_TYPE type = AISAPI::ITEM_TYPE::INVENTORY, bool recursive = false, completion_t callback = completion_t(), S32 depth = 0);
+    static void FetchCOF(completion_t callback = completion_t());
     static void CopyLibraryCategory(const LLUUID& sourceId, const LLUUID& destId, bool copySubfolders, completion_t callback = completion_t());
 
 private:
@@ -62,7 +71,11 @@ private:
         UPDATECATEGORY,
         UPDATEITEM,
         COPYLIBRARYCATEGORY,
-        CREATEINVENTORY
+        CREATEINVENTORY,
+        FETCHITEM,
+        FETCHCATEGORYCHILDREN,
+        FETCHCATEGORYCATEGORIES,
+        FETCHCOF,
     } COMMAND_TYPE;
 
     static const std::string INVENTORY_CAP_NAME;