Changeset 402 for binary-improvements2/WebServer/src/WebAPI/APIs/Animal.cs

Timestamp:

Jan 27, 2023, 7:28:00 PM (22 months ago)

Author:

alloc

Message:

• Major refactoring
• Using Utf8Json for (de)serialization
• Moving APIs to REST
• Removing dependencies from WebServer and MapRenderer to ServerFixes

Location:

binary-improvements2/WebServer/src/WebAPI/APIs

Files:

• . (added)
• Animal.cs (moved) (moved from binary-improvements2/WebServer/src/WebAPI/GetAnimalsLocation.cs ) (1 diff)

binary-improvements2/WebServer/src/WebAPI/APIs/Animal.cs

@@ -1 +1 @@
 using System.Collections.Generic;
-using AllocsFixes.JSON;
-using AllocsFixes.LiveData;
 using JetBrains.Annotations;
+using Utf8Json;
+using Webserver.LiveData;
 
-namespace Webserver.WebAPI {
+namespace Webserver.WebAPI.APIs {
         [UsedImplicitly]
-        internal class GetAnimalsLocation : AbsWebAPI {
-                private readonly List<EntityAnimal> animals = new List<EntityAnimal> ();
+        internal class Animal : AbsRestApi {
+                private readonly List<EntityAnimal> entities = new List<EntityAnimal> ();
 
-                public override void HandleRequest (RequestContext _context) {
-                        JsonArray animalsJsResult = new JsonArray ();
+                private static readonly byte[] jsonKeyId = JsonWriter.GetEncodedPropertyNameWithBeginObject ("id");
+                private static readonly byte[] jsonKeyName = JsonWriter.GetEncodedPropertyNameWithBeginObject ("name");
+                private static readonly byte[] jsonKeyPosition = JsonWriter.GetEncodedPropertyNameWithBeginObject ("position");
 
-                        Animals.Instance.Get (animals);
-                        for (int i = 0; i < animals.Count; i++) {
-                                EntityAnimal entity = animals [i];
-                                Vector3i position = new Vector3i (entity.GetPosition ());
+                protected override void HandleRestGet (RequestContext _context) {
+                        PrepareEnvelopedResult (out JsonWriter writer);
+                        writer.WriteBeginArray ();
+                        
+                        lock (entities) {
+                                Animals.Instance.Get (entities);
+                                
+                                for (int i = 0; i < entities.Count; i++) {
+                                        if (i > 0) {
+                                                writer.WriteValueSeparator ();
+                                        }
+                                        
+                                        EntityAlive entity = entities [i];
+                                        Vector3i position = new Vector3i (entity.GetPosition ());
+                                        
+                                        writer.WriteRaw (jsonKeyId);
+                                        writer.WriteInt32 (entity.entityId);
+                                        
+                                        writer.WriteRaw (jsonKeyName);
+                                        writer.WriteString (!string.IsNullOrEmpty (entity.EntityName) ? entity.EntityName : $"animal class #{entity.entityClass}");
+                                        
+                                        writer.WriteRaw (jsonKeyPosition);
+                                        JsonCommons.WritePositionObject (writer, position);
 
-                                JsonObject jsonPOS = new JsonObject ();
-                                jsonPOS.Add ("x", new JsonNumber (position.x));
-                                jsonPOS.Add ("y", new JsonNumber (position.y));
-                                jsonPOS.Add ("z", new JsonNumber (position.z));
-
-                                JsonObject pJson = new JsonObject ();
-                                pJson.Add ("id", new JsonNumber (entity.entityId));
-
-                                if (!string.IsNullOrEmpty (entity.EntityName)) {
-                                        pJson.Add ("name", new JsonString (entity.EntityName));
-                                } else {
-                                        pJson.Add ("name", new JsonString ("animal class #" + entity.entityClass));
+                                        writer.WriteEndObject ();
                                 }
-
-                                pJson.Add ("position", jsonPOS);
-
-                                animalsJsResult.Add (pJson);
                         }
-
-                        WebUtils.WriteJson (_context.Response, animalsJsResult);
+                        
+                        writer.WriteEndArray ();
+                        SendEnvelopedResult (_context, ref writer);
                 }
         }