Alex/Capy64
1
0
Fork 0
mirror of https://github.com/Ale32bit/Capy64.git synced 2025-01-18 18:46:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added BinaryReadHandle.

Browse source 
Added IHandle interface.
Adapted HTTP requests to return BinaryReadHandle on binary mode.
This commit is contained in:
Alessandro Proto 2023-01-14 15:39:54 +01:00
parent ecad4df4ad
commit b5f044223a
6 changed files with 439 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

494
Capy64/LuaRuntime/Handlers/BinaryReadHandle.cs
View file

@ -8,121 +8,443 @@ using System.Threading.Tasks;
namespace Capy64.LuaRuntime.Handlers; namespace Capy64.LuaRuntime.Handlers;
[Obsolete("Work in progress")] public class BinaryReadHandle : IHandle
public class BinaryReadHandle
{ {
private readonly BinaryReader _stream; private readonly BinaryReader Stream;
private bool isClosed = false; private bool IsClosed = false;
private bool ended => _stream.BaseStream.Position == _stream.BaseStream.Length; private bool EndOfStream => Stream.BaseStream.Position == Stream.BaseStream.Length;
public BinaryReadHandle(Stream stream) public BinaryReadHandle(Stream stream)
{ {
_stream = new BinaryReader(stream); Stream = new BinaryReader(stream, Encoding.ASCII);
} }
public BinaryReadHandle(BinaryReader stream) public BinaryReadHandle(BinaryReader stream)
{ {
_stream = stream; Stream = stream;
} }
/*public void Push(Lua L) public void Push(Lua L, bool newTable = true)
{ {
L.NewTable(); if (newTable)
L.NewTable();
L.PushString("readAll"); L.PushString("nextByte");
L.PushCFunction(L_ReadAll); L.PushCFunction(L_NextByte);
L.SetTable(-3); L.SetTable(-3);
L.PushString("readLine"); L.PushString("nextShort");
L.PushCFunction(L_ReadLine); L.PushCFunction(L_NextShort);
L.SetTable(-3); L.SetTable(-3);
L.PushString("read"); L.PushString("nextInt");
L.PushCFunction(L_Read); L.PushCFunction(L_NextInt);
L.SetTable(-3);
L.PushString("nextLong");
L.PushCFunction(L_NextLong);
L.SetTable(-3);
L.PushString("nextSByte");
L.PushCFunction(L_NextSByte);
L.SetTable(-3);
L.PushString("nextUShort");
L.PushCFunction(L_NextUShort);
L.SetTable(-3);
L.PushString("nextUInt");
L.PushCFunction(L_NextUInt);
L.SetTable(-3);
L.PushString("nextULong");
L.PushCFunction(L_NextULong);
L.SetTable(-3);
L.PushString("nextHalf");
L.PushCFunction(L_NextHalf);
L.SetTable(-3);
L.PushString("nextFloat");
L.PushCFunction(L_NextFloat);
L.SetTable(-3);
L.PushString("nextDouble");
L.PushCFunction(L_NextDouble);
L.SetTable(-3);
L.PushString("nextChar");
L.PushCFunction(L_NextChar);
L.SetTable(-3);
L.PushString("nextString");
L.PushCFunction(L_NextString);
L.SetTable(-3);
L.PushString("nextBoolean");
L.PushCFunction(L_NextBoolean);
L.SetTable(-3); L.SetTable(-3);
L.PushString("close"); L.PushString("close");
L.PushCFunction(L_Close); L.PushCFunction(L_Close);
L.SetTable(-3); L.SetTable(-3);
L.PushString("_handle");
L.PushObject(this);
L.SetTable(-3);
} }
private int L_ReadAll(IntPtr state) private static int L_NextByte(IntPtr state)
{ {
var L = Lua.FromIntPtr(state); var L = Lua.FromIntPtr(state);
if (isClosed) L.CheckType(1, LuaType.Table);
var count = (int)L.OptNumber(2, 1);
L.ArgumentCheck(count >= 1, 2, "count must be a positive integer");
L.PushString("_handle");
L.GetTable(1);
var h = L.ToObject<BinaryReadHandle>(-1, false);
if (h is null || h.IsClosed)
L.Error("handle is closed"); L.Error("handle is closed");
if (ended) if (h.EndOfStream)
{
L.PushNil();
return 1;
}
//var content = _stream.read;
L.PushString(content);
return 1;
}
private int L_ReadLine(IntPtr state)
{
var L = Lua.FromIntPtr(state);
if (isClosed)
L.Error("handle is closed");
if (ended)
{
L.PushNil();
return 1;
}
var line = _stream.ReadLine();
if (line is null)
L.PushNil();
else
L.PushString(line);
return 1;
}
private int L_Read(IntPtr state)
{
var L = Lua.FromIntPtr(state);
var count = (int)L.OptNumber(1, 1);
L.ArgumentCheck(count < 1, 1, "count must be a positive integer");
if (ended)
L.Error("handle is closed");
if (_stream.EndOfStream)
{
L.PushNil();
return 1;
}
var chunk = new char[count];
_stream.Read(chunk, 0, count);
L.PushString(new string(chunk));
return 1;
}
private int L_Close(IntPtr state)
{
var L = Lua.FromIntPtr(state);
if (isClosed)
return 0; return 0;
_stream.Close(); if (count == 1)
{
var b = h.Stream.ReadByte();
L.PushInteger(b);
return 1;
isClosed = true; }
else
{
var bs = h.Stream.ReadBytes(count);
foreach (var b in bs)
{
L.PushInteger(b);
}
return bs.Length;
}
}
private static int L_NextShort(IntPtr state)
{
var L = Lua.FromIntPtr(state);
L.CheckType(1, LuaType.Table);
L.PushString("_handle");
L.GetTable(1);
var h = L.ToObject<BinaryReadHandle>(-1, false);
if (h is null || h.IsClosed)
L.Error("handle is closed");
if (h.EndOfStream)
return 0;
var b = h.Stream.ReadInt16();
L.PushInteger(b);
return 1;
}
private static int L_NextInt(IntPtr state)
{
var L = Lua.FromIntPtr(state);
L.CheckType(1, LuaType.Table);
L.PushString("_handle");
L.GetTable(1);
var h = L.ToObject<BinaryReadHandle>(-1, false);
if (h is null || h.IsClosed)
L.Error("handle is closed");
if (h.EndOfStream)
return 0;
var b = h.Stream.ReadInt32();
L.PushInteger(b);
return 1;
}
private static int L_NextLong(IntPtr state)
{
var L = Lua.FromIntPtr(state);
L.CheckType(1, LuaType.Table);
L.PushString("_handle");
L.GetTable(1);
var h = L.ToObject<BinaryReadHandle>(-1, false);
if (h is null || h.IsClosed)
L.Error("handle is closed");
if (h.EndOfStream)
return 0;
var b = h.Stream.ReadInt64();
L.PushInteger(b);
return 1;
}
private static int L_NextSByte(IntPtr state)
{
var L = Lua.FromIntPtr(state);
L.CheckType(1, LuaType.Table);
L.PushString("_handle");
L.GetTable(1);
var h = L.ToObject<BinaryReadHandle>(-1, false);
if (h is null || h.IsClosed)
L.Error("handle is closed");
if (h.EndOfStream)
return 0;
var b = h.Stream.ReadSByte();
L.PushInteger(b);
return 1;
}
private static int L_NextUShort(IntPtr state)
{
var L = Lua.FromIntPtr(state);
L.CheckType(1, LuaType.Table);
L.PushString("_handle");
L.GetTable(1);
var h = L.ToObject<BinaryReadHandle>(-1, false);
if (h is null || h.IsClosed)
L.Error("handle is closed");
if (h.EndOfStream)
return 0;
var b = h.Stream.ReadUInt16();
L.PushInteger(b);
return 1;
}
private static int L_NextUInt(IntPtr state)
{
var L = Lua.FromIntPtr(state);
L.CheckType(1, LuaType.Table);
L.PushString("_handle");
L.GetTable(1);
var h = L.ToObject<BinaryReadHandle>(-1, false);
if (h is null || h.IsClosed)
L.Error("handle is closed");
if (h.EndOfStream)
return 0;
var b = h.Stream.ReadUInt32();
L.PushInteger(b);
return 1;
}
private static int L_NextULong(IntPtr state)
{
var L = Lua.FromIntPtr(state);
L.CheckType(1, LuaType.Table);
L.PushString("_handle");
L.GetTable(1);
var h = L.ToObject<BinaryReadHandle>(-1, false);
if (h is null || h.IsClosed)
L.Error("handle is closed");
if (h.EndOfStream)
return 0;
var b = h.Stream.ReadUInt64();
L.PushInteger((long)b);
return 1;
}
private static int L_NextHalf(IntPtr state)
{
var L = Lua.FromIntPtr(state);
L.CheckType(1, LuaType.Table);
L.PushString("_handle");
L.GetTable(1);
var h = L.ToObject<BinaryReadHandle>(-1, false);
if (h is null || h.IsClosed)
L.Error("handle is closed");
if (h.EndOfStream)
return 0;
var b = h.Stream.ReadHalf();
L.PushNumber((double)b);
return 1;
}
private static int L_NextFloat(IntPtr state)
{
var L = Lua.FromIntPtr(state);
L.CheckType(1, LuaType.Table);
L.PushString("_handle");
L.GetTable(1);
var h = L.ToObject<BinaryReadHandle>(-1, false);
if (h is null || h.IsClosed)
L.Error("handle is closed");
if (h.EndOfStream)
return 0;
var b = h.Stream.ReadSingle();
L.PushNumber((double)b);
return 1;
}
private static int L_NextDouble(IntPtr state)
{
var L = Lua.FromIntPtr(state);
L.CheckType(1, LuaType.Table);
L.PushString("_handle");
L.GetTable(1);
var h = L.ToObject<BinaryReadHandle>(-1, false);
if (h is null || h.IsClosed)
L.Error("handle is closed");
if (h.EndOfStream)
return 0;
var b = h.Stream.ReadDouble();
L.PushNumber((double)b);
return 1;
}
private static int L_NextChar(IntPtr state)
{
var L = Lua.FromIntPtr(state);
L.CheckType(1, LuaType.Table);
var count = (int)L.OptNumber(2, 1);
L.ArgumentCheck(count >= 1, 2, "count must be a positive integer");
L.PushString("_handle");
L.GetTable(1);
var h = L.ToObject<BinaryReadHandle>(-1, false);
if (h is null || h.IsClosed)
L.Error("handle is closed");
if (h.EndOfStream)
return 0;
if (count == 1)
{
var b = h.Stream.ReadChar();
L.PushString(b.ToString());
return 1;
}
else
{
var bs = h.Stream.ReadChars(count);
foreach (var b in bs)
{
L.PushString(b.ToString());
}
return bs.Length;
}
}
private static int L_NextString(IntPtr state)
{
var L = Lua.FromIntPtr(state);
L.CheckType(1, LuaType.Table);
var count = (int)L.OptNumber(2, 1);
L.ArgumentCheck(count >= 1, 2, "count must be a positive integer");
L.PushString("_handle");
L.GetTable(1);
var h = L.ToObject<BinaryReadHandle>(-1, false);
if (h is null || h.IsClosed)
L.Error("handle is closed");
if (h.EndOfStream)
return 0;
if (count == 1)
{
var b = h.Stream.ReadChar();
L.PushString(b.ToString());
return 1;
}
else
{
var bs = h.Stream.ReadBytes(count);
L.PushBuffer(bs);
return 1;
}
}
private static int L_NextBoolean(IntPtr state)
{
var L = Lua.FromIntPtr(state);
L.CheckType(1, LuaType.Table);
L.PushString("_handle");
L.GetTable(1);
var h = L.ToObject<BinaryReadHandle>(-1, false);
if (h is null || h.IsClosed)
L.Error("handle is closed");
if (h.EndOfStream)
return 0;
var b = h.Stream.ReadBoolean();
L.PushBoolean(b);
return 1;
}
private static int L_Close(IntPtr state)
{
var L = Lua.FromIntPtr(state);
L.CheckType(1, LuaType.Table);
L.PushString("_handle");
L.GetTable(1);
var h = L.ToObject<BinaryReadHandle>(-1, true);
if (h is null || h.IsClosed)
return 0;
h.Stream.Close();
h.IsClosed = true;
return 0; return 0;
}*/ }
} }

7
Capy64/LuaRuntime/Handlers/BinaryWriteHandle.cs
View file

@ -9,7 +9,7 @@ using System.Threading.Tasks;
namespace Capy64.LuaRuntime.Handlers; namespace Capy64.LuaRuntime.Handlers;
[Obsolete("Work in progress")] [Obsolete("Work in progress")]
public class BinaryWriteHandle public class BinaryWriteHandle : IHandle
{ {
private readonly BinaryWriter _stream; private readonly BinaryWriter _stream;
private bool isClosed = false; private bool isClosed = false;
@ -23,6 +23,11 @@ public class BinaryWriteHandle
_stream = stream; _stream = stream;
} }
public void Push(Lua L, bool newTable = true)
{
throw new NotImplementedException();
}
/*public void Push(Lua L) /*public void Push(Lua L)
{ {
L.NewTable(); L.NewTable();

13
Capy64/LuaRuntime/Handlers/IHandle.cs Normal file
View file

@ -0,0 +1,13 @@
using KeraLua;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Capy64.LuaRuntime.Handlers;
public interface IHandle
{
public void Push(Lua L, bool newTable = true);
}

6
Capy64/LuaRuntime/Handlers/ReadHandle.cs
View file

@ -9,10 +9,10 @@ using System.Threading.Tasks;
namespace Capy64.LuaRuntime.Handlers; namespace Capy64.LuaRuntime.Handlers;
public class ReadHandle public class ReadHandle : IHandle
{ {
public readonly StreamReader Stream; private readonly StreamReader Stream;
public bool IsClosed = false; private bool IsClosed = false;
public ReadHandle(Stream stream) public ReadHandle(Stream stream)
{ {
Stream = new StreamReader(stream); Stream = new StreamReader(stream);

6
Capy64/LuaRuntime/Handlers/WriteHandle.cs
View file

@ -8,10 +8,10 @@ using System.Threading.Tasks;
namespace Capy64.LuaRuntime.Handlers; namespace Capy64.LuaRuntime.Handlers;
public class WriteHandle public class WriteHandle : IHandle
{ {
public readonly StreamWriter Stream; private readonly StreamWriter Stream;
public bool IsClosed = false; private bool IsClosed = false;
public WriteHandle(Stream stream) public WriteHandle(Stream stream)
{ {
Stream = new StreamWriter(stream); Stream = new StreamWriter(stream);

12
Capy64/LuaRuntime/Libraries/HTTP.cs
View file

@ -162,14 +162,14 @@ public class HTTP : IPlugin
} }
var response = await task; var response = await task;
/*object content;
if ((bool)options["binary"])
content = await response.Content.ReadAsByteArrayAsync();
else
content = await response.Content.ReadAsStringAsync();*/
var stream = await response.Content.ReadAsStreamAsync(); var stream = await response.Content.ReadAsStreamAsync();
var handler = new ReadHandle(stream);
IHandle handler;
if ((bool)options["binary"])
handler = new BinaryReadHandle(stream);
else
handler = new ReadHandle(stream);
_game.LuaRuntime.PushEvent("http_response", L => _game.LuaRuntime.PushEvent("http_response", L =>
{ {