themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Now instead outputs json serialized objects.

Browse source
This commit is contained in:
high 2011-09-04 23:50:35 -04:00
parent 59a2fcd62e
commit e9c3363313
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/Rest.cs
View file

@ -5,6 +5,7 @@ using System.Net;
using System.Text; using System.Text;
using HttpServer; using HttpServer;
using HttpServer.Headers; using HttpServer.Headers;
using Newtonsoft.Json;
using HttpListener = HttpServer.HttpListener; using HttpListener = HttpServer.HttpListener;
namespace TShockAPI namespace TShockAPI
@ -14,8 +15,8 @@ namespace TShockAPI
/// </summary> /// </summary>
/// <param name="parameters">Parameters in the url</param> /// <param name="parameters">Parameters in the url</param>
/// <param name="request">Http request</param> /// <param name="request">Http request</param>
/// <returns>Response body or null to not handle request</returns> /// <returns>Response object or null to not handle request</returns>
public delegate string RestCommandD(IParameterCollection parameters, RequestEventArgs request); public delegate object RestCommandD(IParameterCollection parameters, RequestEventArgs request);
public class Rest : IDisposable public class Rest : IDisposable
{ {
List<RestCommand> commands = new List<RestCommand>(); List<RestCommand> commands = new List<RestCommand>();
@ -51,9 +52,10 @@ namespace TShockAPI
var coms = commands.Where(r => r.Path.ToLower().Equals(e.Request.Uri.AbsolutePath.ToLower())); var coms = commands.Where(r => r.Path.ToLower().Equals(e.Request.Uri.AbsolutePath.ToLower()));
foreach (var com in coms) foreach (var com in coms)
{ {
var str = com.Callback(e.Request.Parameters, e); var obj = com.Callback(e.Request.Parameters, e);
if (str != null) if (obj != null)
{ {
var str = JsonConvert.SerializeObject(this, Formatting.Indented);
e.Response.Connection.Type = ConnectionType.Close; e.Response.Connection.Type = ConnectionType.Close;
e.Response.Body.Write(Encoding.ASCII.GetBytes(str), 0, str.Length); e.Response.Body.Write(Encoding.ASCII.GetBytes(str), 0, str.Length);
e.Response.Status = HttpStatusCode.OK; e.Response.Status = HttpStatusCode.OK;

11
TShockAPI/TShock.cs
View file

@ -236,14 +236,19 @@ namespace TShockAPI
} }
//http://127.0.0.1:8080/users?type=status //http://127.0.0.1:8080/users?type=status
string usertest(IParameterCollection parameters, RequestEventArgs request) object usertest(IParameterCollection parameters, RequestEventArgs request)
{ {
var ret = new Dictionary<string, string>();
var type = parameters["type"]; var type = parameters["type"];
if (type == null) if (type == null)
return "Invalid Type"; {
ret.Add("Error", "Invalid Type");
return ret;
}
if (type == "status") if (type == "status")
{ {
return "Users online here"; ret.Add("Users", "Info here");
return ret;
} }
return null; return null;
} }