gg.easy.airship 0.1.1998 → 0.1.2000

package/Runtime/Code/Health/AirshipProfileExporter.cs

@@ -2,26 +2,32 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 using Airship.DevConsole;
+using Code.Http.Internal;
+using Code.Platform.Shared;
 using JetBrains.Annotations;
+using MiniJSON;
 using Mirror;
+using UnityEditor.PackageManager;
 using UnityEngine;
 using UnityEngine.Networking;
 using UnityEngine.Profiling;
 
-struct FileIOCreateRequest {
-    public string file;
-    public int maxDownloads;
-    public bool autoDelete;
+struct SignedUrlRequest {
+    public string type;
+    public string name;
+    public string contentType;
+    public long contentLength;
 }
 
 
-struct FileIOCreateResponse {
-    public bool success;
-    public int status;
+struct SignedUrlResponse
+{
+    public string id;
+    public string url;
+}
 
-    public string key;
-    public string name;
-    public string link;
+struct ArtifactDownloadResponse {
+    public string url;
 }
 
 struct ServerProfileRequest {
@@ -30,21 +36,32 @@ struct ServerProfileRequest {
 
 namespace Code.Health
 {
-    public enum AirshipProfileContext {
-        Server,
-        Client,
+    public struct ClientProfileUploadRequest : NetworkMessage
+    {
+        public string logLocation;
+        public float duration;
+        public long contentSize;
+    }
+    
+    public struct ClientProfileUploadResponse : NetworkMessage
+    {
+        public string logLocation;
+        public string id;
+        public string url;
+        public float duration;
     }
     
-    public struct StartProfilingMessage : NetworkMessage {
+    public struct StartServerProfileMessage : NetworkMessage {
         public int DurationSecs;
     }
 
-    public struct ProfileCompleteMessage : NetworkMessage {
-        public string link;
+    public struct ServerProfileCompleteMessage : NetworkMessage
+    {
+        public string gameId;
+        public string artifactId;
     } 
     
     public class AirshipProfileExporter : MonoBehaviour {
-        public static string fileIOKey = "LGF5JOI.F0YF0ET-N6PMPS6-NWGVZEW-9984TYP"; // TODO throw out this key (it lives in git).
         private static AirshipProfileExporter _instance;
         public static AirshipProfileExporter Instance => _instance;
         private bool lastProfilerEnabled = false;
@@ -60,13 +77,15 @@ namespace Code.Health
 
         private void Start() {
             if (RunCore.IsServer()) {
-                NetworkServer.RegisterHandler<StartProfilingMessage>(OnStartProfilingMessage, false);
+                NetworkServer.RegisterHandler<StartServerProfileMessage>(OnStartProfilingMessage, false);
+                NetworkServer.RegisterHandler<ClientProfileUploadRequest>(OnClientUploadRequest, false);
             }
             if (RunCore.IsClient()) {
-                NetworkClient.RegisterHandler<ProfileCompleteMessage>(OnProfileCompleteMessage);
+                NetworkClient.RegisterHandler<ServerProfileCompleteMessage>(OnServerProfileCompleteMessage);
+                NetworkClient.RegisterHandler<ClientProfileUploadResponse>(OnClientUploadResponse);
             }
 
-            DevConsole.AddCommand(Command.Create<AirshipProfileContext, int>(
+            DevConsole.AddCommand(Command.Create<string, int>(
                 "profile", 
                 "",
                 "Starts and uploads a profile. Once complete the download link will be printed.", 
@@ -78,11 +97,11 @@ namespace Code.Health
                         return;
                     }
 
-                    if (context == AirshipProfileContext.Client) {
+                    if (context.ToLower() == "client") {
                         StartProfiling(d, null);
-                    } else {
+                    } else if (context.ToLower() == "server") {
                         Debug.Log("Starting a server profile, view server console to monitor progress.");
-                        NetworkClient.Send(new StartProfilingMessage { DurationSecs = d });
+                        NetworkClient.Send(new StartServerProfileMessage { DurationSecs = d });
                     }
                 }));
         }
@@ -94,14 +113,47 @@ namespace Code.Health
             }
         }
 
-        public void OnStartProfilingMessage(NetworkConnectionToClient sender, StartProfilingMessage msg) {
+        public async void OnClientUploadRequest(NetworkConnectionToClient sender, ClientProfileUploadRequest msg)
+        {
+            var urlData = await this.GetSignedUrl(msg.duration, msg.contentSize);
+            sender.Send(new ClientProfileUploadResponse
+            {
+                logLocation = msg.logLocation,
+                duration = msg.duration,
+                url = urlData.url,
+                id = urlData.id
+            });
+        }
+
+        public async void OnClientUploadResponse(ClientProfileUploadResponse msg)
+        {
+            this.Upload(new SignedUrlResponse()
+            {
+                id = msg.id,
+                url = msg.url
+            }, msg.logLocation, msg.duration, null);
+        }
+
+        public void OnStartProfilingMessage(NetworkConnectionToClient sender, StartServerProfileMessage msg) {
             // TODO Validate sender is dev
             StartProfiling(msg.DurationSecs, sender);
         }
 
-        public void OnProfileCompleteMessage(ProfileCompleteMessage msg) {
-            Debug.Log($"Profile uploaded: <a href=\"{msg.link}\">{msg.link}</a> (copied to your clipboard)");
-            GUIUtility.systemCopyBuffer = msg.link;
+        public async void OnServerProfileCompleteMessage(ServerProfileCompleteMessage msg)
+        {
+            var downloadUrl =
+                await InternalHttpManager.GetAsync(
+                    $"{AirshipPlatformUrl.contentService}/artifacts/artifact-id/{msg.artifactId}");
+            if (!downloadUrl.success)
+            {
+                Debug.Log($"Profile Uploaded: <a href=\"https://create.airship.gg/dashboard/organization/game/artifacts?activeGame={msg.gameId}\">View it on the Create site.</a> (copied to your clipboard)");
+                return;
+            }
+
+            var data = JsonUtility.FromJson<ArtifactDownloadResponse>(downloadUrl.data);
+            
+            Debug.Log($"Profile uploaded: <a href=\"{data.url}\">Download here.</a> (copied to your clipboard)");
+            GUIUtility.systemCopyBuffer = data.url;
         }
 
         public void StartProfiling(int durationSecs, [CanBeNull] NetworkConnectionToClient profileInitiator) {
@@ -126,33 +178,59 @@ namespace Code.Health
         private async void StopProfilingAfterDelay(string logPath, float durationSecs, [CanBeNull] NetworkConnectionToClient profileInitiator) {
             await Task.Delay((int)(durationSecs * 1000));
             Profiler.enabled = false;
-            Debug.Log($"Profiling completed. Uploading file...");
-            Upload(logPath, durationSecs, profileInitiator);
+            var info = new FileInfo(logPath);
+            
+            Debug.Log($"Profiling completed. Retrieving upload URL...");
+            if (RunCore.IsClient())
+            {
+                NetworkClient.Send(new ClientProfileUploadRequest
+                {
+                    contentSize = info.Length,
+                    logLocation = logPath
+                });
+            }
+            else
+            {
+                var urlData = await this.GetSignedUrl(durationSecs, info.Length);
+                Upload(urlData, logPath, durationSecs, profileInitiator);
+            }
         }
 
-        private async void Upload(string logPath, float durationSecs, [CanBeNull] NetworkConnectionToClient profileInitiator) {
-            var uploadFilePath = logPath;
+        private async Task<SignedUrlResponse> GetSignedUrl(float duration, long length)
+        {
+            var body = new SignedUrlRequest()
+            {
+                type = "MICRO_PROFILE",
+                name = RunCore.IsClient() ? $"Client Profile ({duration}s)" : $"Server Profile ({duration}s)",
+                contentType = "application/octet-stream",
+                contentLength = length
+            };
+            var response = await InternalHttpManager.PostAsync($"{AirshipPlatformUrl.contentService}/artifacts/signed-url", JsonUtility.ToJson(body));
+            if (!response.success)
+            {
+                throw new Exception("Unable to get upload URL for profile.");
+            }
             
-            var form = new WWWForm();
-            form.AddField("title", $"Server Profile ({durationSecs}s)");
-            form.AddField("description", "Learn more: https://docs.airship.gg/optimization/server-profiler");
-            form.AddField("autoDelete", "false");
-            form.AddField("maxDownloads", "100");
-            form.AddField("expires", "1w");
+           return JsonUtility.FromJson<SignedUrlResponse>(response.data);
+        }
+
+        private async void Upload(SignedUrlResponse urlData, string logPath, float durationSecs, [CanBeNull] NetworkConnectionToClient profileInitiator)
+        {
+            Debug.Log("Uploading profile to backend...");
+            var uploadFilePath = logPath;
             var fileData = await File.ReadAllBytesAsync(uploadFilePath);
             File.Delete(uploadFilePath);
             
+            var form = new WWWForm();
             form.AddBinaryData("file",  fileData, Path.GetFileName(uploadFilePath));
-            using var www = UnityWebRequest.Post("https://file.io/?expires=1w", form);
-            www.SetRequestHeader("Authorization", "Bearer " + fileIOKey);
+            using var www = UnityWebRequest.Post(urlData.url, form);
             MonitorUploadProgress(www);
             await UnityWebRequestProxyHelper.ApplyProxySettings(www).SendWebRequest();
             
-            var resp = JsonUtility.FromJson<FileIOCreateResponse>(www.downloadHandler.text);
             if (profileInitiator != null && profileInitiator.isReady) {
-                profileInitiator.Send(new ProfileCompleteMessage { link = resp.link });
+                profileInitiator.Send(new ServerProfileCompleteMessage { artifactId = urlData.id });
             }
-            Debug.Log($"Profile uploaded: <a href=\"{resp.link}\">{resp.link}</a> (copied to your clipboard)");
+            Debug.Log($"Profile uploaded.");
         }
 
         private async void MonitorUploadProgress(UnityWebRequest req) {

package/Runtime/Code/VoxelWorld/ChunkSerializer.cs

@@ -12,15 +12,24 @@ public static class ChunkSerializer {
 
         writer.WriteVector3Int(key);
 
+        var voxelDataLengthBytes = value.readWriteVoxel.Length * sizeof(short);
+        var colDataLengthBytes = value.color.Length * sizeof(uint);
+        
+        writer.WriteInt(voxelDataLengthBytes);
+        writer.WriteInt(colDataLengthBytes);
+        
         // Input byte array
-        byte[] byteArray = new byte[value.readWriteVoxel.Length * sizeof(short)];
+        byte[] byteArray = new byte[voxelDataLengthBytes];
         Buffer.BlockCopy(value.readWriteVoxel, 0, byteArray, 0, byteArray.Length);
+        byte[] colArray = new byte[colDataLengthBytes];
+        Buffer.BlockCopy(value.color, 0, colArray, 0, colArray.Length);
 
         // Compress the byte array
         byte[] compressedBytes;
         using (MemoryStream ms = new MemoryStream()) {
             using (DeflateStream deflateStream = new DeflateStream(ms, CompressionMode.Compress)) {
                 deflateStream.Write(byteArray, 0, byteArray.Length);
+                deflateStream.Write(colArray, 0, colArray.Length);
             }
             compressedBytes = ms.ToArray();
         }
@@ -31,6 +40,9 @@ public static class ChunkSerializer {
         //create it from the reader
         Vector3Int key = reader.ReadVector3Int();
 
+        var voxelDataLength = reader.ReadInt();
+        var colorDataLength = reader.ReadInt();
+
         Chunk chunk = VoxelWorld.CreateChunk(key);
 
         // byte[] byteArray = new byte[16 * 16 * 16 * 2]; // 2 because they are shorts
@@ -41,7 +53,8 @@ public static class ChunkSerializer {
                     deflateStream.CopyTo(outputStream);
                     // chunk.readWriteVoxel = outputStream.ToArray();
                     var output = outputStream.ToArray();
-                    Buffer.BlockCopy(output, 0, chunk.readWriteVoxel, 0, output.Length);
+                    Buffer.BlockCopy(output, 0, chunk.readWriteVoxel, 0, voxelDataLength);
+                    Buffer.BlockCopy(output, voxelDataLength, chunk.color, 0, colorDataLength);
                 }
             }
         }

package/Runtime/Code/VoxelWorld/Editor/VoxelWorldEditor.cs

@@ -744,9 +744,11 @@ public class VoxelWorldEditor : UnityEditor.Editor {
                     var oldColor = world.GetVoxelColorAt(voxelPos);
                     Color newCol;
                     if (e.shift) {
-                        newCol = new Color32((byte) (Math.Max(oldColor.r + -10, 0)), oldColor.g, oldColor.b, oldColor.a);
+                        newCol = new Color32((byte) (Math.Max(oldColor.r + -5, 0)), oldColor.g, oldColor.b, oldColor.a);
                     } else {
-                        newCol = new Color32((byte) (Math.Min(oldColor.r + 10, 255)), oldColor.g, oldColor.b, oldColor.a);
+                        var colIncr = 5;
+                        if (oldColor.r == 0) colIncr = 1; // If just being lightly painted to mark as receiving color
+                        newCol = new Color32((byte) (Math.Min(oldColor.r + colIncr, 255)), oldColor.g, oldColor.b, oldColor.a);
                     }
                     VoxelEditManager.Instance.ColorVoxel(world, voxelPos, newCol);
                 }