From cef16bec6dabc90fdccf82f755d24683d834208b Mon Sep 17 00:00:00 2001 From: Melanie Date: Mon, 17 Aug 2009 08:45:20 +0100 Subject: Add the OpenSim.ConsoleClient app. Usage: OpenSim.ConsoleClient -h -p -u -P host defaults to localhost, port defaults to 8003. --- OpenSim/ConsoleClient/ConsoleClient.cs | 185 +++++++++++++++++++++++++++++++++ OpenSim/ConsoleClient/Requester.cs | 86 +++++++++++++++ 2 files changed, 271 insertions(+) create mode 100644 OpenSim/ConsoleClient/ConsoleClient.cs create mode 100644 OpenSim/ConsoleClient/Requester.cs (limited to 'OpenSim/ConsoleClient') diff --git a/OpenSim/ConsoleClient/ConsoleClient.cs b/OpenSim/ConsoleClient/ConsoleClient.cs new file mode 100644 index 0000000..0d4f3cf --- /dev/null +++ b/OpenSim/ConsoleClient/ConsoleClient.cs @@ -0,0 +1,185 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using Nini.Config; +using log4net; +using System.Reflection; +using System; +using System.Xml; +using System.Collections.Generic; +using OpenSim.Server.Base; +using OpenSim.Framework.Console; +using OpenMetaverse; + +namespace OpenSim.ConsoleClient +{ + public class OpenSimConsoleClient + { + private static readonly ILog m_log = + LogManager.GetLogger( + MethodBase.GetCurrentMethod().DeclaringType); + + protected static ServicesServerBase m_Server = null; + private static string m_Host; + private static int m_Port; + private static string m_User; + private static string m_Pass; + private static UUID m_SessionID; + + static int Main(string[] args) + { + m_Server = new ServicesServerBase("Client", args); + + IConfig serverConfig = m_Server.Config.Configs["Startup"]; + if (serverConfig == null) + { + System.Console.WriteLine("Startup config section missing in .ini file"); + throw new Exception("Configuration error"); + } + + ArgvConfigSource argvConfig = new ArgvConfigSource(args); + + argvConfig.AddSwitch("Startup", "host", "h"); + argvConfig.AddSwitch("Startup", "port", "p"); + argvConfig.AddSwitch("Startup", "user", "u"); + argvConfig.AddSwitch("Startup", "pass", "P"); + + m_Server.Config.Merge(argvConfig); + + m_User = serverConfig.GetString("user", "Test"); + m_Host = serverConfig.GetString("host", "localhost"); + m_Port = serverConfig.GetInt("port", 8003); + m_Pass = serverConfig.GetString("pass", "secret"); + + Requester.MakeRequest("http://"+m_Host+":"+m_Port.ToString()+"/StartSession/", String.Format("USER={0}&PASS={1}", m_User, m_Pass), LoginReply); + + int res = m_Server.Run(); + + Environment.Exit(res); + + return 0; + } + + private static void SendCommand(string module, string[] cmd) + { + string sendCmd = String.Join(" ", cmd); + + Requester.MakeRequest("http://"+m_Host+":"+m_Port.ToString()+"/SessionCommand/", String.Format("ID={0}&COMMAND={1}", m_SessionID, sendCmd), CommandReply); + } + + public static void LoginReply(string requestUrl, string requestData, string replyData) + { + XmlDocument doc = new XmlDocument(); + + doc.LoadXml(replyData); + + XmlNodeList rootL = doc.GetElementsByTagName("ConsoleSession"); + if (rootL.Count != 1) + { + MainConsole.Instance.Output("Connection data info was not valid"); + Environment.Exit(1); + } + XmlElement rootNode = (XmlElement)rootL[0]; + + if (rootNode == null) + { + MainConsole.Instance.Output("Connection data info was not valid"); + Environment.Exit(1); + } + + XmlNodeList helpNodeL = rootNode.GetElementsByTagName("HelpTree"); + if (helpNodeL.Count != 1) + { + MainConsole.Instance.Output("Connection data info was not valid"); + Environment.Exit(1); + } + + XmlElement helpNode = (XmlElement)helpNodeL[0]; + if (helpNode == null) + { + MainConsole.Instance.Output("Connection data info was not valid"); + Environment.Exit(1); + } + + XmlNodeList sessionL = rootNode.GetElementsByTagName("SessionID"); + if (sessionL.Count != 1) + { + MainConsole.Instance.Output("Connection data info was not valid"); + Environment.Exit(1); + } + + XmlElement sessionNode = (XmlElement)sessionL[0]; + if (sessionNode == null) + { + MainConsole.Instance.Output("Connection data info was not valid"); + Environment.Exit(1); + } + + if (!UUID.TryParse(sessionNode.InnerText, out m_SessionID)) + { + MainConsole.Instance.Output("Connection data info was not valid"); + Environment.Exit(1); + } + + MainConsole.Instance.Commands.FromXml(helpNode, SendCommand); + + Requester.MakeRequest("http://"+m_Host+":"+m_Port.ToString()+"/ReadResponses/"+m_SessionID.ToString()+"/", String.Empty, ReadResponses); + } + + public static void ReadResponses(string requestUrl, string requestData, string replyData) + { + XmlDocument doc = new XmlDocument(); + + doc.LoadXml(replyData); + + XmlNodeList rootNodeL = doc.GetElementsByTagName("ConsoleSession"); + if (rootNodeL.Count != 1 || rootNodeL[0] == null) + { + Requester.MakeRequest(requestUrl, requestData, ReadResponses); + return; + } + + foreach (XmlNode part in rootNodeL[0].ChildNodes) + { + if (part.Name != "Line") + continue; + + string[] parts = part.InnerText.Split(new char[] {':'}, 3); + if (parts.Length != 3) + continue; + + MainConsole.Instance.Output(parts[2], parts[1]); + } + + Requester.MakeRequest(requestUrl, requestData, ReadResponses); + } + + public static void CommandReply(string requestUrl, string requestData, string replyData) + { + } + } +} diff --git a/OpenSim/ConsoleClient/Requester.cs b/OpenSim/ConsoleClient/Requester.cs new file mode 100644 index 0000000..af7860d --- /dev/null +++ b/OpenSim/ConsoleClient/Requester.cs @@ -0,0 +1,86 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using System.IO; +using System.Net; +using System.Reflection; +using System.Text; +using System.Xml; +using System.Xml.Serialization; +using log4net; + +namespace OpenSim.ConsoleClient +{ + public delegate void ReplyDelegate(string requestUrl, string requestData, string replyData); + + public class Requester + { + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + + public static void MakeRequest(string requestUrl, string data, + ReplyDelegate action) + { + WebRequest request = WebRequest.Create(requestUrl); + WebResponse response = null; + + request.Method = "POST"; + + request.ContentType = "application/x-www-form-urlencoded"; + + byte[] buffer = new System.Text.ASCIIEncoding().GetBytes(data); + int length = (int) buffer.Length; + request.ContentLength = length; + + request.BeginGetRequestStream(delegate(IAsyncResult res) + { + Stream requestStream = request.EndGetRequestStream(res); + + requestStream.Write(buffer, 0, length); + + request.BeginGetResponse(delegate(IAsyncResult ar) + { + string reply = String.Empty; + + response = request.EndGetResponse(ar); + + try + { + StreamReader r = new StreamReader(response.GetResponseStream()); + reply = r.ReadToEnd(); + + } + catch (System.InvalidOperationException) + { + } + + action(requestUrl, data, reply); + }, null); + }, null); + } + } +} -- cgit v1.1 From dc0f0f5da87d6f7d310b1a3985186ca0af954e3f Mon Sep 17 00:00:00 2001 From: Melanie Date: Mon, 17 Aug 2009 08:56:40 +0100 Subject: Limit the scrollback buffer output of the command line client to 100 lines (4 screens worth) so things don't scroll endlessly on connect --- OpenSim/ConsoleClient/ConsoleClient.cs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'OpenSim/ConsoleClient') diff --git a/OpenSim/ConsoleClient/ConsoleClient.cs b/OpenSim/ConsoleClient/ConsoleClient.cs index 0d4f3cf..1e5f0b7 100644 --- a/OpenSim/ConsoleClient/ConsoleClient.cs +++ b/OpenSim/ConsoleClient/ConsoleClient.cs @@ -163,12 +163,25 @@ namespace OpenSim.ConsoleClient return; } + List lines = new List(); + foreach (XmlNode part in rootNodeL[0].ChildNodes) { if (part.Name != "Line") continue; - string[] parts = part.InnerText.Split(new char[] {':'}, 3); + lines.Add(part.InnerText); + } + + // Cut down scrollback to 100 lines (4 screens) + // for the command line client + // + while (lines.Count > 100) + lines.RemoveAt(0); + + foreach (string l in lines) + { + string[] parts = l.Split(new char[] {':'}, 3); if (parts.Length != 3) continue; -- cgit v1.1 From 3d7bb7567c7452d4a1216db5656d0b02957cf950 Mon Sep 17 00:00:00 2001 From: Melanie Date: Mon, 17 Aug 2009 09:21:39 +0100 Subject: Add the ability to use -console=rest to the region server. User and pass are specified the same way as for the ROBUST server --- OpenSim/ConsoleClient/ConsoleClient.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/ConsoleClient') diff --git a/OpenSim/ConsoleClient/ConsoleClient.cs b/OpenSim/ConsoleClient/ConsoleClient.cs index 1e5f0b7..319584f 100644 --- a/OpenSim/ConsoleClient/ConsoleClient.cs +++ b/OpenSim/ConsoleClient/ConsoleClient.cs @@ -185,7 +185,7 @@ namespace OpenSim.ConsoleClient if (parts.Length != 3) continue; - MainConsole.Instance.Output(parts[2], parts[1]); + MainConsole.Instance.Output(parts[2].Trim(), parts[1]); } Requester.MakeRequest(requestUrl, requestData, ReadResponses); -- cgit v1.1