This adds mStatus, mReason and mContent to ResponderBase and fills those in instead of passing it to member functions. The added danger here is that now code can accidently try to access these variables while they didn't already get a correct value. Affected members of ResponderBase (that now have less arguments): decode_llsd_body, decode_raw_body, completedHeaders, completed -> httpCompleted, result -> httpSuccess, errorWithContent and error -> httpFailure. New API: ResponderBase::setResult ResponderBase::getStatus() ResponderBase::getReason() ResponderBase::getContent() ResponderBase::getResponseHeaders() (returns AIHTTPReceivedHeaders though, not LLSD) ResponderBase::dumpResponse() ResponderWithCompleted::completeResult ResponderWithResult::failureResult (previously pubErrorWithContent) ResponderWithResult::successResult (previously pubResult) Not implemented: getHTTPMethod() - use getName() instead which returns the class name of the responder. completedHeaders() is still called as usual, although you can ignore it (not implement in a derived responder) and call getResponseHeaders() instead, provided you implement needsHeaders() and have it return true. However, classes derived from ResponderHeadersOnly do not have completedHeaders(), so they still must implement completedHeaders(), and then call getResponseHeaders() or just access mReceivedHeaders directly, as usual.
238 lines
6.9 KiB
C++
238 lines
6.9 KiB
C++
/**
|
|
* @file llfloaterregiondebugconsole.h
|
|
* @author Brad Kittenbrink <brad@lindenlab.com>
|
|
* @brief Quick and dirty console for region debug settings
|
|
*
|
|
* $LicenseInfo:firstyear=2010&license=viewerlgpl$
|
|
* Second Life Viewer Source Code
|
|
* Copyright (C) 2010, Linden Research, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation;
|
|
* version 2.1 of the License only.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*
|
|
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
|
* $/LicenseInfo$
|
|
*/
|
|
|
|
#include "llviewerprecompiledheaders.h"
|
|
|
|
#include "llfloaterregiondebugconsole.h"
|
|
|
|
#include "llagent.h"
|
|
#include "llhttpclient.h"
|
|
#include "llhttpnode.h"
|
|
#include "lllineeditor.h"
|
|
#include "lltexteditor.h"
|
|
#include "llviewerregion.h"
|
|
#include "lluictrlfactory.h"
|
|
|
|
class AIHTTPTimeoutPolicy;
|
|
extern AIHTTPTimeoutPolicy asyncConsoleResponder_timeout;
|
|
extern AIHTTPTimeoutPolicy consoleResponder_timeout;
|
|
|
|
// Two versions of the sim console API are supported.
|
|
//
|
|
// SimConsole capability (deprecated):
|
|
// This is the initial implementation that is supported by some versions of the
|
|
// simulator. It is simple and straight forward, just POST a command and the
|
|
// body of the response has the result. This API is deprecated because it
|
|
// doesn't allow the sim to use any asynchronous API.
|
|
//
|
|
// SimConsoleAsync capability:
|
|
// This capability replaces the original SimConsole capability. It is similar
|
|
// in that the command is POSTed to the SimConsoleAsync cap, but the response
|
|
// comes in through the event poll, which gives the simulator more flexibility
|
|
// and allows it to perform complex operations without blocking any frames.
|
|
//
|
|
// We will assume the SimConsoleAsync capability is available, and fall back to
|
|
// the SimConsole cap if it is not. The simulator will only support one or the
|
|
// other.
|
|
|
|
namespace
|
|
{
|
|
// Signal used to notify the floater of responses from the asynchronous
|
|
// API.
|
|
console_reply_signal_t sConsoleReplySignal;
|
|
|
|
const std::string PROMPT("\n\n> ");
|
|
const std::string UNABLE_TO_SEND_COMMAND(
|
|
"ERROR: The last command was not received by the server.");
|
|
const std::string CONSOLE_UNAVAILABLE(
|
|
"ERROR: No console available for this region/simulator.");
|
|
const std::string CONSOLE_NOT_SUPPORTED(
|
|
"This region does not support the simulator console.");
|
|
|
|
// This responder handles the initial response. Unless httpFailure() is called
|
|
// we assume that the simulator has received our request. Error will be
|
|
// called if this request times out.
|
|
//
|
|
class AsyncConsoleResponder : public LLHTTPClient::ResponderIgnoreBody
|
|
{
|
|
public:
|
|
/*virtual*/ void httpFailure(void) { sConsoleReplySignal(UNABLE_TO_SEND_COMMAND); }
|
|
/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return asyncConsoleResponder_timeout; }
|
|
/*virtual*/ char const* getName(void) const { return "AsyncConsoleResponder"; }
|
|
};
|
|
|
|
class ConsoleResponder : public LLHTTPClient::ResponderWithResult
|
|
{
|
|
public:
|
|
ConsoleResponder(LLTextEditor *output) : mOutput(output)
|
|
{
|
|
}
|
|
|
|
/*virtual*/ void httpFailure(void)
|
|
{
|
|
if (mOutput)
|
|
{
|
|
mOutput->appendText(
|
|
UNABLE_TO_SEND_COMMAND + PROMPT,
|
|
false, false);
|
|
}
|
|
}
|
|
|
|
/*virtual*/ void httpSuccess(void)
|
|
{
|
|
if (mOutput)
|
|
{
|
|
mOutput->appendText(
|
|
mContent.asString() + PROMPT, false, false);
|
|
}
|
|
}
|
|
|
|
/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return consoleResponder_timeout; }
|
|
/*virtual*/ char const* getName(void) const { return "ConsoleResponder"; }
|
|
|
|
LLTextEditor * mOutput;
|
|
};
|
|
|
|
// This handles responses for console commands sent via the asynchronous
|
|
// API.
|
|
|
|
class ConsoleResponseNode : public LLHTTPNode
|
|
{
|
|
public:
|
|
/* virtual */
|
|
void post(
|
|
LLHTTPNode::ResponsePtr reponse,
|
|
const LLSD& context,
|
|
const LLSD& input) const
|
|
{
|
|
llinfos << "Received response from the debug console: "
|
|
<< input << llendl;
|
|
sConsoleReplySignal(input["body"].asString());
|
|
}
|
|
};
|
|
}
|
|
|
|
boost::signals2::connection LLFloaterRegionDebugConsole::setConsoleReplyCallback(const console_reply_signal_t::slot_type& cb)
|
|
{
|
|
return sConsoleReplySignal.connect(cb);
|
|
}
|
|
|
|
LLFloaterRegionDebugConsole::LLFloaterRegionDebugConsole()
|
|
: LLFloater(), mOutput(NULL)
|
|
{
|
|
mReplySignalConnection = sConsoleReplySignal.connect(
|
|
boost::bind(
|
|
&LLFloaterRegionDebugConsole::onReplyReceived,
|
|
this,
|
|
_1));
|
|
|
|
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_region_debug_console.xml");
|
|
}
|
|
|
|
LLFloaterRegionDebugConsole::~LLFloaterRegionDebugConsole()
|
|
{
|
|
mReplySignalConnection.disconnect();
|
|
}
|
|
|
|
BOOL LLFloaterRegionDebugConsole::postBuild()
|
|
{
|
|
LLLineEditor* input = getChild<LLLineEditor>("region_debug_console_input");
|
|
input->setEnableLineHistory(true);
|
|
input->setCommitCallback(boost::bind(&LLFloaterRegionDebugConsole::onInput, this, _1, _2));
|
|
input->setFocus(true);
|
|
input->setCommitOnFocusLost(false);
|
|
|
|
mOutput = getChild<LLTextEditor>("region_debug_console_output");
|
|
|
|
std::string url = gAgent.getRegion()->getCapability("SimConsoleAsync");
|
|
if (url.empty())
|
|
{
|
|
// Fall back to see if the old API is supported.
|
|
url = gAgent.getRegion()->getCapability("SimConsole");
|
|
if (url.empty())
|
|
{
|
|
mOutput->appendText(
|
|
CONSOLE_NOT_SUPPORTED + PROMPT,
|
|
false, false);
|
|
return TRUE;
|
|
}
|
|
}
|
|
|
|
mOutput->appendText("> ", false, false);
|
|
return TRUE;
|
|
}
|
|
|
|
void LLFloaterRegionDebugConsole::onClose(bool app_quitting)
|
|
{
|
|
LLFloater::onClose(app_quitting);
|
|
}
|
|
|
|
void LLFloaterRegionDebugConsole::onInput(LLUICtrl* ctrl, const LLSD& param)
|
|
{
|
|
LLLineEditor* input = static_cast<LLLineEditor*>(ctrl);
|
|
std::string text = input->getText() + "\n";
|
|
|
|
std::string url = gAgent.getRegion()->getCapability("SimConsoleAsync");
|
|
if (url.empty())
|
|
{
|
|
// Fall back to the old API
|
|
url = gAgent.getRegion()->getCapability("SimConsole");
|
|
if (url.empty())
|
|
{
|
|
text += CONSOLE_UNAVAILABLE + PROMPT;
|
|
}
|
|
else
|
|
{
|
|
// Using SimConsole (deprecated)
|
|
LLHTTPClient::post(
|
|
url,
|
|
LLSD(input->getText()),
|
|
new ConsoleResponder(mOutput));
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// Using SimConsoleAsync
|
|
LLHTTPClient::post(
|
|
url,
|
|
LLSD(input->getText()),
|
|
new AsyncConsoleResponder);
|
|
}
|
|
|
|
mOutput->appendText(text, false, false);
|
|
input->clear();
|
|
}
|
|
|
|
void LLFloaterRegionDebugConsole::onReplyReceived(const std::string& output)
|
|
{
|
|
mOutput->appendText(output + PROMPT, false, false);
|
|
}
|
|
|
|
LLHTTPRegistration<ConsoleResponseNode>
|
|
gHTTPRegistrationMessageDebugConsoleResponse(
|
|
"/message/SimConsoleResponse");
|