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

Adapt WS to use Task

Browse source
This commit is contained in:
Alessandro Proto 2023-03-17 21:00:20 +01:00
parent 9fadf6d064
commit 4a9d2bad34
2 changed files with 16 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Capy64/Runtime/Libraries/HTTP.cs
View file

@ -315,19 +315,14 @@ public class HTTP : IComponent
L.Pop(1); L.Pop(1);
} }
var clientTask = TaskMeta.Push(L, WebSocketClient.ObjectType);
var connectTask = wsClient.ConnectAsync(uri, CancellationToken.None); var connectTask = wsClient.ConnectAsync(uri, CancellationToken.None);
connectTask.ContinueWith(async task => connectTask.ContinueWith(async task =>
{ {
if (task.IsFaulted || task.IsCanceled) if (task.IsFaulted || task.IsCanceled)
{ {
_game.LuaRuntime.QueueEvent("websocket_failure", LK => clientTask.Reject(task.Exception?.Message);
{
LK.PushInteger(requestId);
LK.PushString(task.Exception?.Message);
return 2;
});
return; return;
} }
@ -336,14 +331,10 @@ public class HTTP : IComponent
var handle = new WebSocketClient.Client(wsClient, requestId); var handle = new WebSocketClient.Client(wsClient, requestId);
WebSocketConnections.Add(handle); WebSocketConnections.Add(handle);
_game.LuaRuntime.QueueEvent("websocket_connect", LK => clientTask.Fulfill(LK =>
{ {
LK.PushInteger(requestId);
ObjectManager.PushObject(LK, handle); ObjectManager.PushObject(LK, handle);
LK.SetMetaTable(WebSocketClient.ObjectType); LK.SetMetaTable(WebSocketClient.ObjectType);
return 2;
}); });
var buffer = new byte[4096]; var buffer = new byte[4096];

33
Capy64/Runtime/Objects/WebSocketClient.cs
View file

@ -29,21 +29,6 @@ public class WebSocketClient : IComponent
public record Client(ClientWebSocket Socket, long RequestId); public record Client(ClientWebSocket Socket, long RequestId);
public void LuaInit(Lua L)
{
CreateMeta(L);
}
public static void CreateMeta(Lua L)
{
L.NewMetaTable(ObjectType);
L.SetFuncs(MetaMethods, 0);
L.NewLibTable(Methods);
L.SetFuncs(Methods, 0);
L.SetField(-2, "__index");
L.Pop(1);
}
internal static LuaRegister[] Methods = new LuaRegister[] internal static LuaRegister[] Methods = new LuaRegister[]
{ {
new() new()
@ -89,12 +74,20 @@ public class WebSocketClient : IComponent
new(), new(),
}; };
private static readonly Dictionary<string, LuaFunction> functions = new() public void LuaInit(Lua L)
{ {
["getRequestID"] = L_GetRequestId, CreateMeta(L);
["send"] = L_Send, }
["closeAsync"] = L_CloseAsync,
}; public static void CreateMeta(Lua L)
{
L.NewMetaTable(ObjectType);
L.SetFuncs(MetaMethods, 0);
L.NewLibTable(Methods);
L.SetFuncs(Methods, 0);
L.SetField(-2, "__index");
L.Pop(1);
}
public static Client ToObject(Lua L, bool gc = false) public static Client ToObject(Lua L, bool gc = false)
{ {