add basic usersocket

Update deps

EIV_Game.csproj

@@ -46,9 +46,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="EIV_Common" Version="0.0.1.8" />
+    <PackageReference Include="EIV_Common" Version="0.0.2" />
     <PackageReference Include="EIV_DataPack" Version="1.0.3.1" />
-    <PackageReference Include="EIV_JsonLib" Version="2.0.4.1" />
+    <PackageReference Include="EIV_JsonLib" Version="2.0.5.2" />
     <PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
     <PackageReference Include="ModAPI" Version="0.0.2.1" />
     <PackageReference Include="SemanticVersioning" Version="2.0.2" />

csharp/Client/ChatWebSocket.cs

@@ -0,0 +1,8 @@
+#if CLIENT || GAME
+
+namespace ExtractIntoVoid.Client;
+
+public class ChatWebSocket
+{
+}
+#endif

csharp/Client/UserWebSocket.cs

@@ -0,0 +1,71 @@
+#if CLIENT || GAME
+using EIV_JsonLib.Lobby;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Net.WebSockets;
+using System.Text;
+using System.Text.Json;
+using System.Threading;
+
+namespace ExtractIntoVoid.Client;
+
+public class UserWebSocket
+{
+    ClientWebSocket webSocket = new();
+    private static UserWebSocket instance;
+    public static UserWebSocket Instance
+    {
+        get
+        {
+            if (instance == null)
+                instance = new();
+            return instance;
+        }
+    }
+
+    public Queue<ClientSocketMessage> MessageQueue = new();
+
+    public void Connect(string ip_port, string guid, string ticket)
+    {
+        webSocket.Options.SetRequestHeader("authorization", ticket);
+        webSocket.ConnectAsync(new($"ws://{ip_port}/Socket/Client/{guid}"), CancellationToken.None);
+    }
+
+    public void Send(ClientSocketMessage clientSocketMessage)
+    {
+        if (webSocket.State != WebSocketState.Open)
+            return;
+        webSocket.SendAsync(Encoding.UTF8.GetBytes(JsonSerializer.Serialize(clientSocketMessage)), WebSocketMessageType.Binary, false, CancellationToken.None);
+    }
+
+    public ClientSocketMessage SendAndReceive(ClientSocketMessage clientSocketMessage)
+    {
+        Send(clientSocketMessage);
+        byte[] bytes = ArrayPool<byte>.Shared.Rent(2048);
+        var res = webSocket.ReceiveAsync(bytes, CancellationToken.None).Result;
+        if (res.MessageType == WebSocketMessageType.Close)
+            return null;
+        ClientSocketMessage resp = JsonSerializer.Deserialize<ClientSocketMessage>(Encoding.UTF8.GetString(bytes, 0, res.Count));
+        ArrayPool<byte>.Shared.Return(bytes);
+        return resp;
+    }
+
+
+    public void Receive()
+    {
+        byte[] bytes = ArrayPool<byte>.Shared.Rent(2048);
+        var res = webSocket.ReceiveAsync(bytes, CancellationToken.None).Result;
+        if (res.MessageType == WebSocketMessageType.Close)
+            return;
+        MessageQueue.Enqueue(JsonSerializer.Deserialize<ClientSocketMessage>(Encoding.UTF8.GetString(bytes, 0, res.Count)));
+        ArrayPool<byte>.Shared.Return(bytes);
+    }
+
+    public void Quit()
+    {
+        MessageQueue.Clear();
+        webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, null, CancellationToken.None);
+        webSocket.Dispose();
+    }
+}
+#endif

csharp/Effects/EffectBase.cs

@@ -8,7 +8,7 @@ namespace ExtractIntoVoid.Effects;
 
 public abstract partial class EffectBase : Node
 {
-    Coroutine? TimeCoroutine;
+    CoroutineHandle? TimeCoroutine;
     public Effect CoreEffect { get; internal set; }
     public Node ParentNode { get; internal set; }
 

csharp/Items/GunBase.cs

@@ -1,10 +1,9 @@
 using EIV_Common.Extensions;
-using EIV_Common.JsonStuff;
 using EIV_JsonLib;
+using EIV_JsonLib.Extension;
 using ExtractIntoVoid.Physics;
 using Godot;
 using MemoryPack;
-using System.Collections.Generic;
 using System.Linq;
 
 namespace ExtractIntoVoid.Items;

csharp/Items/HealingBase.cs

@@ -1,5 +1,4 @@
-using EIV_Common.JsonStuff;
-using EIV_JsonLib;
+using EIV_JsonLib;
 using EIV_JsonLib.Extension;
 using ExtractIntoVoid.Modules;
 

csharp/Menus/LobbyScene.cs

@@ -1,5 +1,12 @@
 #if CLIENT || GAME
+using EIV_Common.Coroutines;
+using EIV_JsonLib.Lobby;
+using ExtractIntoVoid.Client;
+using ExtractIntoVoid.Managers;
+using ExtractIntoVoid.Worlds;
 using Godot;
+using System;
+using System.Text.Json;
 
 namespace ExtractIntoVoid.Menus;
 
@@ -8,8 +15,8 @@ public partial class LobbyScene : Control
     [Export]
     public Label ServerText;
     public string LobbyAddress;
-
-    public string UserToken;
+    public string SelectedMap;
+    public ConnectResponse ConnectResponse;
 
     public System.Net.Http.HttpClient Client;
 
@@ -26,25 +33,48 @@ public void Connect()
         if (!connectasync.IsCompletedSuccessfully)
             Quit();
 
-        UserToken = connectasync.Result.Content.ReadAsStringAsync().Result;
+        ConnectResponse = JsonSerializer.Deserialize<ConnectResponse>(connectasync.Result.Content.ReadAsStringAsync().Result);
+        UserWebSocket.Instance.Connect(LobbyAddress, ConnectResponse.Id.ToString(), ConnectResponse.Ticket);
+        // start chat.
     }
 
 
     public void StartPlay()
     {
-        // Use the Socket. Sadly we now have to!
-        // All those should be inside CLIENT!
+        // Show maps that can be played.
+        // If selected set SelectedMap. And run SendMapToQueue.
+
+    }
+
+    public void SendMapToQueue()
+    {
+        UserWebSocket.Instance.Send(new ClientSocketMessage()
+        { 
+            Enum = ClientSocketEnum.MatchmakeCheck,
+            JsonMessage = JsonSerializer.Serialize(new MatchmakeCheck() { Map  = SelectedMap })
+        });
+        // Lock button, etc.
+        CoroutineWorkerNode.CallPeriodically(TimeSpan.FromSeconds(1), CheckMap, CoroutineType.Process, "CheckMap");
+    }
 
-        /*
-        // Map Join
+
+    public void CheckMap()
+    {
+        if (!UserWebSocket.Instance.MessageQueue.TryPeek(out var msg))
+            return;
+        if (msg.Enum != ClientSocketEnum.GameStart)
+            return;
+        GameStart gamestart = JsonSerializer.Deserialize<GameStart>(msg.JsonMessage);
         var mainWorld = SceneManager.GetPackedScene("MainWorld").Instantiate<MainWorld>();
         this.CallDeferred("add_sibling", mainWorld);
-        mainWorld.CallDeferred("StartClient", ServerAddress, ServerPort, ServerMap);
-        */
+        mainWorld.CallDeferred("StartClient", gamestart.Address, gamestart.Port, SelectedMap);
+        CoroutineWorkerNode.KillCoroutineTagInstance("CheckMap");
     }
 
     public void Quit()
     {
+        UserWebSocket.Instance.Quit();
+        CoroutineWorkerNode.KillCoroutineTagInstance("CheckMap");
         Client.Dispose();
         if (GetParent() is ConnectionScreen connectionScreen)
         {

csharp/Modules/InventoryModule.cs

@@ -2,6 +2,7 @@
 using EIV_JsonLib;
 using EIV_JsonLib.Base;
 using EIV_JsonLib.Extension;
+using EIV_JsonLib.Profile;
 using ExtractIntoVoid.Items;
 using ExtractIntoVoid.Managers;
 using ExtractIntoVoid.Physics;
@@ -35,9 +36,9 @@ public InventoryModule()
 
     public void Select(int index)
     {
-        if (index > Inventory.Items.Count)
+        if (index > Inventory.ToolBelt.Count)
             return;
-        Inventory.Hand = Inventory.Items[index];
+        Inventory.Hand = Inventory.ToolBelt[index];
         Select(Inventory.Hand);
     }
 

csharp/Properties/BuildDate.txt

@@ -1,3 +1,3 @@
 update-deps
-2024-12-16T16:25:44
-8746db9
+2024-12-25T22:36:42
+cf994be