gg.easy.airship 0.1.2143 → 0.1.2144

package/Runtime/Code/AirshipConst.cs

@@ -1,11 +1,11 @@
 // ReSharper disable InconsistentNaming
 namespace Code {
     public static class AirshipConst {
-        public const int playerVersion = 8;
+        public const int playerVersion = 9;
 
         /// <summary>
         /// The server will kick clients that have a playerVersion lower than this value.
         /// </summary>
-        public const int minAcceptedPlayerVersionOnServer = 8;
+        public const int minAcceptedPlayerVersionOnServer = 9;
     }
 }

package/Runtime/Code/Authentication/EasyAuthenticator.cs

@@ -205,14 +205,14 @@ namespace Code.Authentication {
                 }
 
             })).Then((res) => {
-                // print($"[Transfer Packet] userIdToken: {userIdToken}, packet response: " + res.Text);
+                // print($"[Transfer Packet] {res.Text}");
                 string fullTransferPacket = res.Text;
                 TransferData transferData = JsonUtility.FromJson<TransferData>(fullTransferPacket);
                 tcs.SetResult(new UserData() {
                     uid = transferData.user.uid,
                     username = transferData.user.username,
                     profileImageId = transferData.user.profileImageId,
-                    orgRoleName = transferData.user.orgRoleName,
+                    orgRoleName = transferData.orgRoleName,
                     fullTransferPacket = fullTransferPacket
                 });
             }).Catch((err) => {

package/Runtime/Code/Authentication/TransferData.cs

@@ -12,11 +12,11 @@ public class User {
     public string usernameLower;
     public string lastUsernameChangeTime;
     public string profileImageId;
-    public string orgRoleName;
 }
 
 
 [Serializable]
 public class TransferData {
     public User user;
+    public string orgRoleName;
 }

package/Runtime/Code/Bootstrap/LuauScriptsDtoSerializer.cs

@@ -1,14 +1,36 @@
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using Mirror;
 using UnityEngine;
+using UnityEngine.Profiling;
 
 namespace Code.Bootstrap {
+
+    class CachedCompressedFile {
+        public byte[] compressedBytes;
+        public int compressedLength;
+
+        public CachedCompressedFile(byte[] compressedBytes, int compressedLength) {
+            this.compressedBytes = compressedBytes;
+            this.compressedLength = compressedLength;
+        }
+    }
+    
     public static class LuauScriptsDtoSerializer {
+        private static Zstd.Zstd zstd = new(1024 * 4);
+        private static readonly Dictionary<string, CachedCompressedFile> compressedFileCache = new();
+
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void OnReload() {
+            compressedFileCache.Clear();
+        }
+        
         public static void WriteLuauScriptsDto(this NetworkWriter writer, LuauScriptsDto scripts) {
-            writer.WriteInt(scripts.files.Count);;
+            Profiler.BeginSample("WriteLuauScriptsDto");
+            writer.WriteInt(scripts.files.Count);
             foreach (var pair in scripts.files) {
                 string packageId = pair.Key;
                 writer.WriteString(packageId);
@@ -16,22 +38,30 @@ namespace Code.Bootstrap {
                 foreach (var file in pair.Value) {
                     writer.WriteString(file.path);
 
-                    // Compress the byte array
-                    byte[] compressedBytes;
-                    using (MemoryStream ms = new MemoryStream()) {
-                        using (DeflateStream deflateStream = new DeflateStream(ms, CompressionMode.Compress)) {
-                            deflateStream.Write(file.bytes, 0, file.bytes.Length);
-                        }
-                        compressedBytes = ms.ToArray();
+                    string cacheId = $"{packageId}:{file.path}";
+                    if (compressedFileCache.TryGetValue(cacheId, out var cache)) {
+                        writer.WriteInt(cache.compressedLength);
+                        writer.WriteBytes(cache.compressedBytes, 0, cache.compressedLength);
+                    } else {
+                        // Compress the byte array
+                        Profiler.BeginSample("Luau Compress");
+                        var maxCompressionSize = Zstd.Zstd.GetCompressionBound(file.bytes);
+                        byte[] compressedBytes = new byte[maxCompressionSize];
+                        var compressedSize = zstd.Compress(file.bytes, compressedBytes);
+                        writer.WriteInt(compressedSize);
+                        writer.WriteBytes(compressedBytes, 0, compressedSize);
+                        
+                        compressedFileCache.Add(cacheId, new CachedCompressedFile(compressedBytes, compressedSize));
                     }
-                    writer.WriteArray(compressedBytes);
+                    
                     writer.WriteBool(file.airshipBehaviour);
+                    Profiler.EndSample();
                 }
             }
+            Profiler.EndSample();
         }
 
         public static LuauScriptsDto ReadLuauScriptsDto(this NetworkReader reader) {
-            var totalBytes = reader.Remaining;
             LuauScriptsDto dto = new LuauScriptsDto();
             int packagesLength = reader.ReadInt();
             for (int pkgI = 0; pkgI < packagesLength; pkgI++) {
@@ -44,15 +74,14 @@ namespace Code.Bootstrap {
                     LuauFileDto script = new LuauFileDto();
                     script.path = reader.ReadString();
 
-                    var byteArray = reader.ReadArray<byte>();
-                    using (MemoryStream compressedStream = new MemoryStream(byteArray)) {
-                        using (DeflateStream deflateStream = new DeflateStream(compressedStream, CompressionMode.Decompress)) {
-                            using (MemoryStream outputStream = new MemoryStream()) {
-                                deflateStream.CopyTo(outputStream);
-                                script.bytes = outputStream.ToArray();
-                            }
-                        }
-                    }
+                    // Read the compressed bytes
+                    var compressedBytesLen = reader.ReadInt();
+                    byte[] compressedBytes = ArrayPool<byte>.Shared.Rent(compressedBytesLen);
+                    reader.ReadBytes(compressedBytes, compressedBytesLen);
+
+                    // Decompress the bytes
+                    script.bytes = new byte[Zstd.Zstd.GetDecompressionBound(compressedBytes)];
+                    zstd.Decompress(new ReadOnlySpan<byte>(compressedBytes, 0, compressedBytesLen), script.bytes);
 
                     script.airshipBehaviour = reader.ReadBool();
 

package/Runtime/Code/Easy.Airship.asmdef

@@ -52,7 +52,8 @@
         "GUID:325984b52e4128546bc7558552f8b1d2",
         "GUID:3b5390adca4e2bb4791cb930316d6f3e",
         "GUID:725ee7191c021de4dbf9269590ded755",
-        "GUID:2a0340569ab0e1245a38e0d6c7b2529b"
+        "GUID:2a0340569ab0e1245a38e0d6c7b2529b",
+        "GUID:befe48b9a36afc04ea625c93daad910e"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

package/Runtime/Code/Health/AirshipProfileExporter.cs

@@ -1,11 +1,10 @@
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using Airship.DevConsole;
 using Code.Http.Internal;
 using Code.Platform.Shared;
-using Code.UI;
+using Code.Player;
 using JetBrains.Annotations;
 using Mirror;
 using UnityEngine;
@@ -56,6 +55,7 @@ namespace Code.Health
     
     public struct StartServerProfileMessage : NetworkMessage {
         public int DurationSecs;
+        public bool CallstacksEnabled;
     }
 
     public struct ServerProfileCompleteMessage : NetworkMessage
@@ -88,13 +88,14 @@ namespace Code.Health
                 NetworkClient.RegisterHandler<ClientProfileUploadResponse>(OnClientUploadResponse);
             }
 
-            DevConsole.AddCommand(Command.Create<string, int>(
+            DevConsole.AddCommand(Command.Create<string, int, bool>(
                 "profile", 
                 "",
                 "Starts and uploads a profile. Once complete the download link will be printed.", 
                     Parameter.Create("Context", "Options: Server | Client"),
                 Parameter.Create("Duration", "Duration of profile in seconds (max 5s)"),
-                (context, d) => {
+                Parameter.Create("Callstacks", "Enable callstacks for profile (this is laggy)"), 
+                (context, d, callstacks) => {
                     if (d is < 0 or > 5) {
                         Debug.LogError("You can only profile for a max of 5s.");
                         return;
@@ -106,10 +107,10 @@ namespace Code.Health
                                 "Unable to capture profile log because debug mode is not enabled. Use the development build branch on Steam to enable debug mode.");
                             return;
                         }
-                        StartProfiling(d, null);
+                        StartProfiling(d, null, callstacks);
                     } else if (context.Equals("server", StringComparison.OrdinalIgnoreCase)) {
                         Debug.Log("Starting a server profile, view server console to monitor progress.");
-                        NetworkClient.Send(new StartServerProfileMessage { DurationSecs = d });
+                        NetworkClient.Send(new StartServerProfileMessage { DurationSecs = d, CallstacksEnabled = callstacks });
                     }
                 }));
         }
@@ -142,8 +143,10 @@ namespace Code.Health
         }
 
         public void OnStartProfilingMessage(NetworkConnectionToClient sender, StartServerProfileMessage msg) {
-            // TODO Validate sender is dev
-            StartProfiling(msg.DurationSecs, sender);
+            var player = PlayerManagerBridge.Instance.GetPlayerInfoByConnectionId(sender.connectionId);
+            if (player.IsInGameOrg()) {
+                StartProfiling(msg.DurationSecs, sender, msg.CallstacksEnabled);
+            }
         }
 
         public async void OnServerProfileCompleteMessage(ServerProfileCompleteMessage msg)
@@ -163,7 +166,7 @@ namespace Code.Health
             GUIUtility.systemCopyBuffer = data.url;
         }
 
-        public void StartProfiling(int durationSecs, [CanBeNull] NetworkConnectionToClient profileInitiator) {
+        public void StartProfiling(int durationSecs, [CanBeNull] NetworkConnectionToClient profileInitiator, bool enableCallstacks) {
             // TODO check that sender is game dev
             // if (Profiler.enabled) {
             //     Debug.LogWarning("Profiler is already running.");
@@ -183,12 +186,14 @@ namespace Code.Health
             
             Debug.Log($"Starting profiler for {durationSecs} seconds.");
             Profiler.enabled = true;
+            Profiler.enableAllocationCallstacks = enableCallstacks;
             StopProfilingAfterDelay(logPath, fileName, durationSecs, profileInitiator);
         }
 
         private async void StopProfilingAfterDelay(string logPath, string fileName, float durationSecs, [CanBeNull] NetworkConnectionToClient profileInitiator) {
             await Task.Delay((int)(durationSecs * 1000));
             Profiler.enabled = false;
+            Profiler.enableAllocationCallstacks = false;
             var info = new FileInfo(logPath);
 
             Debug.Log($"Profiling completed. Retrieving upload URL...");

package/Runtime/Code/Luau/LuauCore.cs

@@ -173,8 +173,8 @@ public partial class LuauCore : MonoBehaviour {
                 requirePathCallback = requirePathCallback_holder,
                 constructorCallback = constructorCallback_holder,
                 toStringCallback = toStringCallback_holder,
-                toggleProfilerCallback = toggleProfilerCallback_holder,
                 isObjectDestroyedCallback = isObjectDestroyedCallback_holder,
+                getUnityObjectNameCallback = getUnityObjectNameCallback_holder,
                 staticList = stringAddresses.AddrOfPinnedObject(),
                 staticCount = stringCount,
                 isServer = RunCore.IsServer() ? 1 : 0,

package/Runtime/Code/Luau/LuauCoreCallbacks.cs

@@ -41,8 +41,8 @@ public partial class LuauCore : MonoBehaviour {
     private LuauPlugin.ConstructorCallback constructorCallback_holder;
     private LuauPlugin.RequirePathCallback requirePathCallback_holder;
     private LuauPlugin.ToStringCallback toStringCallback_holder;
-    private LuauPlugin.ToggleProfilerCallback toggleProfilerCallback_holder;
     private LuauPlugin.IsObjectDestroyedCallback isObjectDestroyedCallback_holder;
+    private LuauPlugin.GetUnityObjectName getUnityObjectNameCallback_holder;
     
 
     private struct AwaitingTask {
@@ -116,8 +116,8 @@ public partial class LuauCore : MonoBehaviour {
         requirePathCallback_holder = RequirePathCallback;
         toStringCallback_holder = ToStringCallback;
         componentSetEnabledCallback_holder = SetComponentEnabledCallback;
-        toggleProfilerCallback_holder = ToggleProfilerCallback;
         isObjectDestroyedCallback_holder = IsObjectDestroyedCallback;
+        getUnityObjectNameCallback_holder = GetUnityObjectNameCallback;
     }
 
     private static int LuauError(IntPtr thread, string err) {
@@ -190,41 +190,27 @@ public partial class LuauCore : MonoBehaviour {
 
         Marshal.Copy(bytes, 0, str, len);
     }
-    
-    [AOT.MonoPInvokeCallback(typeof(LuauPlugin.ToggleProfilerCallback))]
-    static void ToggleProfilerCallback(int componentId, IntPtr strPtr, int strLen) {
-        // Disable
-        if (componentId == -1) {
-            Profiler.EndSample();
-            return;
-        }
-        // Not tagged to component
-        if (componentId < -1) {
-            if (strLen > 0) {
-                // No need to free strPtr -- it is stack allocated
-                var str = PtrToStringUTF8(strPtr, strLen);
-                Profiler.BeginSample($"{str}");
-                return;
-            }
-        }
-        
-
-        if (AirshipComponent.ComponentIdToScriptName.TryGetValue(componentId, out var componentName)) {
-            if (strLen > 0) {
-                var str = PtrToStringUTF8(strPtr, strLen);
-                Profiler.BeginSample($"{componentName}{str}");
-            }
-            else {
-                Profiler.BeginSample($"{componentName}");
-            }
-        }
-    }
 
     [AOT.MonoPInvokeCallback(typeof(LuauPlugin.IsObjectDestroyedCallback))]
     static int IsObjectDestroyedCallback(int instanceId) {
         return ThreadDataManager.IsUnityObjectReferenceDestroyed(instanceId) ? 1 : 0;
     }
 
+    [AOT.MonoPInvokeCallback(typeof(LuauPlugin.GetUnityObjectName))]
+    static void GetUnityObjectNameCallback(IntPtr thread, int instanceId, IntPtr str, int maxLen, out int len) {
+        var obj = ThreadDataManager.GetObjectReference(thread, instanceId, true, true);
+        if (obj is UnityEngine.Object unityObj) {
+            var n = unityObj.name;
+            var bytes = Encoding.UTF8.GetBytes(n);
+            len = bytes.Length > maxLen ? maxLen : bytes.Length;
+            Marshal.Copy(bytes, 0, str, len);
+            
+            return;
+        }
+
+        len = 0;
+    }
+
     //when a lua thread gc releases an object, make sure our GC knows too
     [AOT.MonoPInvokeCallback(typeof(LuauPlugin.ObjectGCCallback))]
     static unsafe int ObjectGcCallback(int instanceId, IntPtr objectDebugPointer) {
@@ -713,16 +699,22 @@ public partial class LuauCore : MonoBehaviour {
     private static int GetPropertySafeCallback(LuauContext context, IntPtr thread, int instanceId, IntPtr classNamePtr, int classNameSize, IntPtr propertyName, int propertyNameLength) {
         var ret = 0;
         try {
-            ret = GetProperty(context, thread, instanceId, classNamePtr, classNameSize, propertyName, propertyNameLength);
-        } catch (Exception e) {
+            Profiler.BeginSample("GetProperty");
+            ret = GetProperty(context, thread, instanceId, classNamePtr, classNameSize, propertyName,
+                propertyNameLength);
+        }
+        catch (Exception e) {
             ret = LuauError(thread, e.Message);
+        } finally {
+            Profiler.EndSample();
         }
 
         return ret;
     }
 
+    // private static readonly ProfilerMarker<string> getPropertyMarker = new ProfilerMarker<string>("LuauCore.GetProperty", "asd");
+
     private static int GetProperty(LuauContext context, IntPtr thread, int instanceId, IntPtr classNamePtr, int classNameSize, IntPtr propertyName, int propertyNameLength) {
-        Profiler.BeginSample("LuauCore.GetProperty");
         CurrentContext = context;
 
         string propName = LuauCore.PtrToStringUTF8(propertyName, propertyNameLength, out ulong propNameHash);
@@ -756,14 +748,12 @@ public partial class LuauCore : MonoBehaviour {
                 // Type t = propertyInfo.PropertyType;
                 System.Object value = cacheData.Value.propertyInfo.GetValue(null);
                 WritePropertyToThread(thread, value, cacheData.Value.t);
-                Profiler.EndSample();
                 return 1;
             }
 
             // Get C# event:
             var eventInfo = objectType.GetRuntimeEvent(propName);
             if (eventInfo != null) {
-                Profiler.EndSample();
                 return LuauSignalWrapper.HandleCsEvent(context, thread, staticClassApi, instanceId, propNameHash,
                     eventInfo, true);
             }
@@ -774,11 +764,9 @@ public partial class LuauCore : MonoBehaviour {
                 Type t = fieldInfo.FieldType;
                 System.Object value = fieldInfo.GetValue(null);
                 WritePropertyToThread(thread, value, t);
-                Profiler.EndSample();
                 return 1;
             }
 
-            Profiler.EndSample();
             return LuauError(thread, "ERROR - " + propName + " get property not found on class " + staticClassName);
         }
         else {
@@ -788,7 +776,6 @@ public partial class LuauCore : MonoBehaviour {
             System.Object objectReference = ThreadDataManager.GetObjectReference(thread, instanceId);
             // Profiler.EndSample();
             if (objectReference == null) {
-                Profiler.EndSample();
                 return LuauError(thread,
                     "Error: InstanceId not currently available:" + instanceId + ". propName=" + propName);
             }
@@ -801,7 +788,6 @@ public partial class LuauCore : MonoBehaviour {
                 if (objectReference is GameObject targetGo) {
                     // var target = (GameObject)objectReference;
                     if (IsAccessBlocked(context, targetGo)) {
-                        Profiler.EndSample();
                         return LuauError(thread,
                             "[Airship] Access denied when trying to read " + targetGo.name + ".");
                     }
@@ -809,7 +795,6 @@ public partial class LuauCore : MonoBehaviour {
                 else if (sourceType.IsAssignableFrom(typeof(Component))) {
                     var target = (Component)objectReference;
                     if (target && IsAccessBlocked(context, target.gameObject)) {
-                        Profiler.EndSample();
                         return LuauError(thread,
                             "[Airship] Access denied when trying to read " + target.name + ".");
                     }
@@ -821,7 +806,6 @@ public partial class LuauCore : MonoBehaviour {
             if (valueTypeAPI != null) {
                 var retValue = valueTypeAPI.OverrideMemberGetter(context, thread, objectReference, propName);
                 if (retValue >= 0) {
-                    Profiler.EndSample();
                     return retValue;
                 }
             }
@@ -841,7 +825,6 @@ public partial class LuauCore : MonoBehaviour {
                 try {
                     // Try a fast write on value type (Vector3, int, etc. Not objects)
                     if (FastGetAndWriteValueProperty(thread, objectReference, cacheData.Value)) {
-                        Profiler.EndSample();
                         return 1;
                     }
 
@@ -876,16 +859,11 @@ public partial class LuauCore : MonoBehaviour {
                             }
                         }
 
-                        // Profiler.BeginSample("WriteToThread");
                         WritePropertyToThread(thread, value, t);
-                        // Profiler.EndSample();
-                        Profiler.EndSample();
                         return 1;
                     }
                     else {
-                        // Debug.Log("Value was null in dictionary. propName=" + propName + ", object=" + sourceType.Name);
                         WritePropertyToThread(thread, null, null);
-                        Profiler.EndSample();
                         return 1;
                     }
                 }
@@ -902,11 +880,8 @@ public partial class LuauCore : MonoBehaviour {
                     // If we failed to get a reference to a non-primitive, just assume a null value (write nil to the stack):
                     if (!cacheData.Value.propertyInfo.PropertyType.IsPrimitive) {
                         WritePropertyToThread(thread, null, null);
-                        Profiler.EndSample();
                         return 1;
                     }
-
-                    Profiler.EndSample();
                     return LuauError(thread, "Failed to get property in dictionary. propName=" + propName +
                                              ", object=" +
                                              sourceType.Name + ", msg=" + e.Message);
@@ -936,7 +911,6 @@ public partial class LuauCore : MonoBehaviour {
                     // print("key: " + propName + " " + keyInt);
                     // Debug.Log("[Luau]: Dictionary had key but value was null. propName=" + propName + ", sourceType=" + sourceType.Name + ", obj=" + objectReference);
                     WritePropertyToThread(thread, null, null);
-                    Profiler.EndSample();
                     return 1;
                 }
 
@@ -944,14 +918,12 @@ public partial class LuauCore : MonoBehaviour {
                     object value = dict[propName];
                     Type t = value.GetType();
                     WritePropertyToThread(thread, value, t);
-                    Profiler.EndSample();
                     return 1;
                 }
                 else {
                     // Debug.Log("[Luau]: Dictionary was found but key was not found. propName=" + propName +
                     //           ", sourceType=" + sourceType.Name);
                     WritePropertyToThread(thread, null, null);
-                    Profiler.EndSample();
                     return 1;
                 }
             }
@@ -959,7 +931,6 @@ public partial class LuauCore : MonoBehaviour {
             // Get C# event:
             var eventInfo = sourceType.GetRuntimeEvent(propName);
             if (eventInfo != null) {
-                Profiler.EndSample();
                 return LuauSignalWrapper.HandleCsEvent(context, thread, objectReference, instanceId, propNameHash,
                     eventInfo, false);
             }
@@ -970,11 +941,9 @@ public partial class LuauCore : MonoBehaviour {
                 Type t = field.FieldType;
                 System.Object value = field.GetValue(objectReference);
                 WritePropertyToThread(thread, value, t);
-                Profiler.EndSample();
                 return 1;
             }
 
-            Profiler.EndSample();
             return LuauError(thread, $"ERROR - ({sourceType.Name}).{propName} property/field not found");
         }
     }

package/Runtime/Code/Luau/LuauPlugin.cs

@@ -22,8 +22,8 @@ public static class LuauPlugin {
 	public delegate void RequirePathCallback(LuauContext context, IntPtr thread, IntPtr scriptName, int scriptNameLen, IntPtr fileName, int fileNameLen);
 	public delegate void ToStringCallback(IntPtr thread, int instanceId, IntPtr str, int maxLen, out int len);
 	public delegate void ComponentSetEnabledCallback(IntPtr thread, int instanceId, int componentId, int enabled);
-	public delegate void ToggleProfilerCallback(int componentId, IntPtr str, int strLen);
 	public delegate int IsObjectDestroyedCallback(int instanceId);
+	public delegate void GetUnityObjectName(IntPtr thread, int instanceId, IntPtr str, int maxLen, out int len); 
 
 	public static int unityMainThreadId = -1;
 	public static bool s_currentlyExecuting = false;
@@ -62,8 +62,8 @@ public static class LuauPlugin {
 		public RequirePathCallback requirePathCallback;
 		public ConstructorCallback constructorCallback;
 		public ToStringCallback toStringCallback;
-		public ToggleProfilerCallback toggleProfilerCallback;
 		public IsObjectDestroyedCallback isObjectDestroyedCallback;
+		public GetUnityObjectName getUnityObjectNameCallback;
 		
 		public IntPtr staticList;
 		public int staticCount;

package/Runtime/Code/Network/ServerConsole.cs

@@ -35,7 +35,9 @@ namespace Code.RemoteConsole {
         private Task writeTask;
 
         private void Awake() {
-            writeTask = Task.Run(ProcessQueue);
+            if (RunCore.IsClient() && !RunCore.IsServer()) {
+                writeTask = Task.Run(ProcessQueue);
+            }
         }
 
         private async Task ProcessQueue() {
@@ -74,8 +76,11 @@ namespace Code.RemoteConsole {
                 Application.logMessageReceived += LogCallback;
             }
             NetworkServer.RegisterHandler<RequestServerConsoleStartupLogs>((conn, data) => {
-                foreach (var startupMessage in startupMessages) {
-                    conn.Send(startupMessage);
+                var player = PlayerManagerBridge.Instance.GetPlayerInfoByConnectionId(conn.connectionId);
+                if (player.IsInGameOrg()) {
+                    foreach (var startupMessage in startupMessages) {
+                        conn.Send(startupMessage);
+                    }   
                 }
             }, false);
         }
@@ -127,7 +132,10 @@ namespace Code.RemoteConsole {
         }
 
         private void SendServerLogMessage(string message, LogType logType = LogType.Log, string stackTrace = "") {
-            if (RunCore.IsServer() && !RunCore.IsEditor()) {
+            if (RunCore.IsEditor()) {
+                return;
+            }
+            if (RunCore.IsServer()) {
                 var time = DateTime.Now.ToString("HH:mm:ss");
                 if (this.startupMessages.Count < maxStartupMessages) {
                     this.startupMessages.Add(new ServerConsoleBroadcast() {
@@ -147,10 +155,9 @@ namespace Code.RemoteConsole {
                         stackTrace = stackTrace,
                         time = time,
                     };
-                    // bool sendToReadyOnly = Application.isEditor;
                     foreach (var player in PlayerManagerBridge.Instance.players) {
-                        if (!string.IsNullOrEmpty(player.orgRoleName)) {
-                            player.connectionToClient.Send(packet, Channels.Reliable);
+                        if (player.IsInGameOrg()) {
+                            player.connectionToClient.Send(packet);
                         }
                     }
                 }

package/Runtime/Code/Player/Character/MovementSystems/Character/CharacterMovement.cs

@@ -412,12 +412,13 @@ namespace Code.Player.Character.MovementSystems.Character {
             // If we have transitioned to airborne
             if (!grounded && currentMoveSnapshot.isGrounded) {
                 // Set canJump to the number of ticks of coyote time we have
-                currentMoveSnapshot.canJump = (byte) Math.Min(Math.Floor(movementSettings.jumpCoyoteTime / Time.fixedDeltaTime), 255);
+                currentMoveSnapshot.canJump
+                    = (byte)Math.Min(Math.Floor(movementSettings.jumpCoyoteTime / Time.fixedDeltaTime), 255);
             }
 
             if (!grounded && !currentMoveSnapshot.isGrounded) {
                 // If we've now ticked once in the air, remove a tick of canJump time.
-                currentMoveSnapshot.canJump = (byte) Math.Max(currentMoveSnapshot.canJump - 1, 0);
+                currentMoveSnapshot.canJump = (byte)Math.Max(currentMoveSnapshot.canJump - 1, 0);
             }
 
             var groundSlopeDir = detectedGround
@@ -474,7 +475,7 @@ namespace Code.Player.Character.MovementSystems.Character {
                         // currentMoveSnapshot.timeSinceWasGrounded <= movementSettings.jumpCoyoteTime &&
                         // currentMoveSnapshot.timeSinceJump > movementSettings.jumpCoyoteTime
                         currentMoveSnapshot.canJump > 0
-                        ) {
+                       ) {
                         canJump = true;
                     }
                     //the first jump requires grounded, so if in the air bump the currentMoveState.jumpCount up
@@ -575,7 +576,7 @@ namespace Code.Player.Character.MovementSystems.Character {
                 currentMoveSnapshot.isSprinting = false;
             }
 
-            #region CROUCH
+#region CROUCH
 
             // Prevent falling off blocks while crouching
             currentMoveSnapshot.isCrouching = groundedState == CharacterState.Crouching;
@@ -610,7 +611,7 @@ namespace Code.Player.Character.MovementSystems.Character {
                 }
             }
 
-            #endregion
+#endregion
 
             // Modify colliders size based on movement state
             var offsetExtent = movementSettings.colliderGroundOffset / 2;
@@ -826,8 +827,7 @@ namespace Code.Player.Character.MovementSystems.Character {
                             Debug.DrawLine(checkPoint, rayTestHit.point, Color.magenta);
                             GizmoUtils.DrawSphere(rayTestHit.point, .15f, Color.magenta);
                         }
-                    }
-                    else if (drawDebugGizmos_WALLCLIPPING) {
+                    } else if (drawDebugGizmos_WALLCLIPPING) {
                         GizmoUtils.DrawSphere(checkPoint, .05f, Color.white);
                         Debug.DrawLine(checkPoint, checkPoint + (forwardHit.point - checkPoint), Color.white);
                     }
@@ -978,7 +978,9 @@ namespace Code.Player.Character.MovementSystems.Character {
             var didStepUp = false;
             if (movementSettings.detectStepUps && //Want to check step ups
                 (!command.crouch || !movementSettings.preventStepUpWhileCrouching) && //Not blocked by crouch
-                (movementSettings.assistedLedgeJump || currentMoveSnapshot.canJump > 0) && //Grounded // Used to be currentMoveSnapshot.timeSinceBecameGrounded > .05
+                (movementSettings.assistedLedgeJump ||
+                 currentMoveSnapshot.canJump >
+                 0) && //Grounded // Used to be currentMoveSnapshot.timeSinceBecameGrounded > .05
                 Mathf.Abs(newVelocity.x) + Mathf.Abs(newVelocity.z) > .05f) {
                 //Moveing
                 var (hitStepUp, onRamp, pointOnRamp, stepUpVel) = physics.StepUp(rootPosition,
@@ -1015,12 +1017,13 @@ namespace Code.Player.Character.MovementSystems.Character {
             // Prevent falling off blocks while crouching
             if (movementSettings.preventFallingWhileCrouching && !currentMoveSnapshot.prevStepUp &&
                 currentMoveSnapshot.isCrouching && !didJump && grounded) {
-                var distanceCheck = movementSettings.characterRadius * 4 + newVelocity.magnitude * deltaTime;
+                var distanceCheck = movementSettings.characterRadius * 3 + newVelocity.magnitude * deltaTime;
                 var normalizedVel = newVelocity.normalized;
                 var projectedPosition = rootPosition + normalizedVel * distanceCheck;
                 if (drawDebugGizmos_CROUCH) {
                     GizmoUtils.DrawSphere(projectedPosition, .1f, Color.blue, 4, .1f);
                 }
+
                 var (groundedInMoveDirection, _, _) =
                     physics.CheckIfGrounded(projectedPosition, newVelocity, normalizedVel);
                 var foundGroundedDir = false;
@@ -1035,7 +1038,6 @@ namespace Code.Player.Character.MovementSystems.Character {
                     if (Physics.Raycast(projectedPosition + new Vector3(0, -.25f, 0), -normalizedVel,
                             out var cliffHit, distanceCheck,
                             movementSettings.groundCollisionLayerMask, QueryTriggerInteraction.Ignore)) {
-
                         if (drawDebugGizmos_CROUCH) {
                             GizmoUtils.DrawSphere(cliffHit.point, .1f, Color.red, 4, .1f);
                         }
@@ -1052,21 +1054,34 @@ namespace Code.Player.Character.MovementSystems.Character {
                         var flatPoint = new Vector3(cliffHit.point.x, transform.position.y, cliffHit.point.z);
                         //If we are too close to the edge or if there is an obstruction in the way
                         if (Vector3.Distance(flatPoint, transform.position) < bumpSize - forwardMargin
-                            || Physics.Raycast(transform.position + new Vector3(0,.25f, 0), newVelocity, distanceCheck, movementSettings.groundCollisionLayerMask)) {
+                            || Physics.Raycast(transform.position + new Vector3(0, .25f, 0), newVelocity, distanceCheck,
+                                movementSettings.groundCollisionLayerMask)) {
                             //Snap back to the bump distance so you never inch your way to the edge 
                             //newVelocity = new Vector3(0, newVelocity.y, 0);
                             //var newPos = cliffHit.point - normalizedVel * (bumpSize-forwardMargin);
                             //transform.position = new Vector3(newPos.x, transform.position.y, newPos.z);
-                        
-                            newVelocity = -normalizedVel;
+
+                            newVelocity = -cliffHit.normal;
                         } else {
                             //limit movement dir based on how straight you are walking into the edge
-                            characterMoveVelocity = Vector3.ProjectOnPlane(characterMoveVelocity, -cliffHit.normal);
-                            characterMoveVelocity.y = 0;
-                            characterMoveVelocity *= colliderDot;
-                            normalizedMoveDir = characterMoveVelocity.normalized;
+                            // characterMoveVelocity = Vector3.ProjectOnPlane(characterMoveVelocity, -cliffHit.normal);
+                            // characterMoveVelocity.y = 0;
+                            // characterMoveVelocity *= colliderDot;
+                            // normalizedMoveDir = characterMoveVelocity.normalized;
 
                             newVelocity -= colliderDot * -cliffHit.normal;
+                            //newVelocity *= Mathf.Max(0, -colliderDot);
+                            if (newVelocity.sqrMagnitude < 2f) {
+                                newVelocity = Vector3.zero;
+                            }
+
+                            //With this new velocity are we going to fall off a different ledge? 
+                            if (!Physics.Raycast(
+                                    new Vector3(0, 1.25f, 0) + transform.position +
+                                    newVelocity.normalized * distanceCheck, Vector3.down, 1.5f)) {
+                                //Nothing in the direction of the new velocity
+                                newVelocity = Vector3.zero;
+                            }
                             //newVelocity *= colliderDot;
                         }
                     }
@@ -1076,23 +1091,25 @@ namespace Code.Player.Character.MovementSystems.Character {
 #endregion
 
 #region APPLY FORCES
+
             //Stop character from moveing into colliders (Helps prevent axis aligned box colliders from colliding when they shouldn't like jumping in a voxel world)
             if (movementSettings.preventWallClipping && !currentMoveSnapshot.prevStepUp) {
                 var velY = newVelocity.y;
                 flatVelocity = new Vector3(newVelocity.x, 0, newVelocity.z);
-                var minDistance = (characterRadius + forwardMargin);
+                var minDistance = characterRadius + forwardMargin;
                 var forwardDistance = Mathf.Max(flatVelocity.magnitude * deltaTime, minDistance);
                 var forwardVector = flatVelocity.normalized * Mathf.Max(forwardDistance, bumpSize);
                 //print("Forward vec: " + forwardVector);
 
                 //Do raycasting after we have claculated our move direction
                 var forwardHits =
-                    physics.CheckAllForwardHits(rootPosition - flatVelocity.normalized * -forwardMargin, forwardVector, true,
+                    physics.CheckAllForwardHits(rootPosition - flatVelocity.normalized * -forwardMargin, forwardVector,
+                        true,
                         true);
 
                 float i = 0;
-                string label = "ForwardHitCounts: " + forwardHits.Length + "\n";
-                int forcedCount = 0;
+                var label = "ForwardHitCounts: " + forwardHits.Length + "\n";
+                var forcedCount = 0;
                 foreach (var forwardHitResult in forwardHits) {
                     label += "Hit " + i + " Point: " + forwardHitResult.point + " Normal: " + forwardHitResult.normal;
                     //Check if this is a valid wall and not something behind a surface
@@ -1112,7 +1129,8 @@ namespace Code.Player.Character.MovementSystems.Character {
                     }
 
                     var checkDir = (forwardHit.point - checkPoint).normalized;
-                    var checkDistance = forwardMargin + Mathf.Max(forwardHit.distance, movementSettings.characterRadius * 2);
+                    var checkDistance = forwardMargin +
+                                        Mathf.Max(forwardHit.distance, movementSettings.characterRadius * 2);
                     if (Physics.Raycast(checkPoint, checkDir,
                             out var rayTestHit, checkDistance,
                             movementSettings.groundCollisionLayerMask, QueryTriggerInteraction.Ignore)) {
@@ -1150,24 +1168,24 @@ namespace Code.Player.Character.MovementSystems.Character {
                             //|| forwardHit.distance < bumpSize) {
                             colliderDot = 0;
                         }
-                        
+
                         // flatVelocity = Vector3.ClampMagnitude(newVelocity,
                         //     forwardHit.distance - characterRadius - forwardMargin);
                         // //print("FLAT VEL: " + flatVelocity);
                         // newVelocity.x -= flatVelocity.x;
                         // newVelocity.z -= flatVelocity.z;
-                        
+
                         var flatPoint = new Vector3(forwardHit.point.x, transform.position.y, forwardHit.point.z);
                         if (Vector3.Distance(flatPoint, transform.position) < minDistance) {
                             //Snap back to the bump distance so you never inch your way to the edge 
-                            var newPos = forwardHit.point + forwardHit.normal * (bumpSize+forwardMargin);
+                            var newPos = forwardHit.point + forwardHit.normal * (bumpSize + forwardMargin);
                             if (forcedCount == 0) {
                                 transform.position = new Vector3(newPos.x, transform.position.y, newPos.z);
                             } else {
                                 transform.position = new Vector3(
-                                    (transform.position.x + newPos.x) /2f, 
-                                    transform.position.y, 
-                                    (transform.position.z + newPos.z) /2f);
+                                    (transform.position.x + newPos.x) / 2f,
+                                    transform.position.y,
+                                    (transform.position.z + newPos.z) / 2f);
                             }
 
                             forcedCount++;
@@ -1175,10 +1193,9 @@ namespace Code.Player.Character.MovementSystems.Character {
 
                             // var normalVel = forwardHit.normal * (Math.Abs(newVelocity.x) + Math.Abs(newVelocity.z)); 
                             // newVelocity = new Vector3(normalVel.x, velY , normalVel.z);
-                        } else {
-                        }
-                        
-                        newVelocity = Vector3.ProjectOnPlane( flatVelocity, forwardHit.normal);
+                        } else { }
+
+                        newVelocity = Vector3.ProjectOnPlane(flatVelocity, forwardHit.normal);
                         //newVelocity.y = 0;
                         newVelocity *= colliderDot * .9f;
                         newVelocity.y = velY;
@@ -1565,7 +1582,7 @@ namespace Code.Player.Character.MovementSystems.Character {
 
             // TS listens to this to update the local camera.
             // Position will update from reconcile, but we handle look direction manually.
-            if (mode == NetworkedStateSystemMode.Authority && isServer && !this.manager.serverGeneratesCommands) {
+            if (mode == NetworkedStateSystemMode.Authority && isServer && !manager.serverGeneratesCommands) {
                 RpcSetLookVector(lookVector);
             }
 
@@ -1782,4 +1799,4 @@ namespace Code.Player.Character.MovementSystems.Character {
 
 #endregion
     }
-}
+}

package/Runtime/Code/Player/PlayerInfo.cs

@@ -59,6 +59,10 @@ public class PlayerInfo : NetworkBehaviour {
 		}
 	}
 
+	public bool IsInGameOrg() {
+		return !string.IsNullOrEmpty(this.orgRoleName);
+	}
+
 	public override void OnStopServer() {
 		PlayerManagerBridge.Instance.HandlePlayerLeave(this);
 		base.OnStopServer();

package/Runtime/Code/Player/PlayerManagerBridge.cs

@@ -115,7 +115,7 @@ namespace Code.Player {
 				Debug.Log($"Players ({this.players.Count}):");
 				int i = 1;
 				foreach (var player in this.players) {
-					Debug.Log($"  {i}. {player.username} - connectionId: {player.connectionId}, userId: {player.userId}");
+					Debug.Log($"  {i}. {player.username} - connectionId: {player.connectionId}, userId: {player.userId}, orgRole: {player.orgRoleName}");
 					i++;
 				}
 			}));
@@ -167,6 +167,7 @@ namespace Code.Player {
         
 		private void OnDestroy() {
 			NetworkServer.OnConnectedEvent -= NetworkServer_OnConnected;
+			DevConsole.RemoveCommand("players");
 		}
 
 		public void AddBotPlayer(string username, string userId, string profilePictureId) {

package/Runtime/Code/VoxelWorld/ChunkSerializer.cs

@@ -1,13 +1,16 @@
 using System;
-using System.IO;
-using System.IO.Compression;
+using System.Buffers;
+using Code.Zstd;
 using Mirror;
 using UnityEngine;
+using UnityEngine.Profiling;
 using VoxelWorldStuff;
 
 public static class ChunkSerializer {
+    private static Zstd zstd = new Zstd(1024 * 4);
 
     public static void WriteChunk(this NetworkWriter writer, Chunk value) {
+        Profiler.BeginSample("WriteChunk");
         Vector3Int key = value.GetKey();
 
         writer.WriteVector3Int(key);
@@ -15,25 +18,29 @@ public static class ChunkSerializer {
         var voxelDataLengthBytes = value.readWriteVoxel.Length * sizeof(short);
         var colDataLengthBytes = value.color.Length * sizeof(uint);
         
+        // Keep track of uncompressed byte size of voxels and colors:
         writer.WriteInt(voxelDataLengthBytes);
         writer.WriteInt(colDataLengthBytes);
         
         // Input byte array
-        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);
-
+        byte[] voxelByteAndColorArray = ArrayPool<byte>.Shared.Rent(voxelDataLengthBytes + colDataLengthBytes);
+        Buffer.BlockCopy(value.readWriteVoxel, 0, voxelByteAndColorArray, 0, voxelDataLengthBytes);
+        Buffer.BlockCopy(value.color, 0, voxelByteAndColorArray, voxelDataLengthBytes, colDataLengthBytes);
+        
         // 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();
-        }
-        writer.WriteArray(compressedBytes);
+        Profiler.BeginSample("WriteChunk.Compress");
+
+        var maxCompressionSize = Zstd.GetCompressionBound(voxelByteAndColorArray);
+        var compressionBuffer = ArrayPool<byte>.Shared.Rent(maxCompressionSize);
+        var voxelDataCompressedSize = zstd.Compress(voxelByteAndColorArray, compressionBuffer);
+        writer.WriteInt(voxelDataCompressedSize);
+        writer.WriteBytes(compressionBuffer, 0, voxelDataCompressedSize);
+        
+        ArrayPool<byte>.Shared.Return(voxelByteAndColorArray);
+        ArrayPool<byte>.Shared.Return(compressionBuffer);
+        
+        Profiler.EndSample();
+        Profiler.EndSample();
     }
 
     public static Chunk ReadChunk(this NetworkReader reader) {
@@ -42,23 +49,23 @@ public static class ChunkSerializer {
 
         var voxelDataLength = reader.ReadInt();
         var colorDataLength = reader.ReadInt();
+        var compressedBytesLen = reader.ReadInt();
 
         Chunk chunk = VoxelWorld.CreateChunk(key);
 
-        // byte[] byteArray = new byte[16 * 16 * 16 * 2]; // 2 because they are shorts
-        byte[] byteArray = reader.ReadArray<byte>();
-        using (MemoryStream compressedStream = new MemoryStream(byteArray)) {
-            using (DeflateStream deflateStream = new DeflateStream(compressedStream, CompressionMode.Decompress)) {
-                using (MemoryStream outputStream = new MemoryStream()) {
-                    deflateStream.CopyTo(outputStream);
-                    // chunk.readWriteVoxel = outputStream.ToArray();
-                    var output = outputStream.ToArray();
-                    Buffer.BlockCopy(output, 0, chunk.readWriteVoxel, 0, voxelDataLength);
-                    Buffer.BlockCopy(output, voxelDataLength, chunk.color, 0, colorDataLength);
-                }
-            }
-        }
+        byte[] voxelByteAndColorArray = ArrayPool<byte>.Shared.Rent(compressedBytesLen);
+        
+        reader.ReadBytes(voxelByteAndColorArray, compressedBytesLen);
+        var decompressedData = ArrayPool<byte>.Shared.Rent(Zstd.GetDecompressionBound(voxelByteAndColorArray));
+        zstd.Decompress(new ReadOnlySpan<byte>(voxelByteAndColorArray, 0, compressedBytesLen), decompressedData);
+        
+        Buffer.BlockCopy(decompressedData, 0, chunk.readWriteVoxel, 0, voxelDataLength);
+        Buffer.BlockCopy(decompressedData, voxelDataLength, chunk.color, 0, colorDataLength);
+        
+        ArrayPool<byte>.Shared.Return(voxelByteAndColorArray);
+        ArrayPool<byte>.Shared.Return(decompressedData);
+        
         chunk.MarkKeysWithVoxelsDirty();
         return chunk;
     }
-}
+}

package/Runtime/Code/Zstd/Zstd.cs

@@ -27,14 +27,6 @@ namespace Code.Zstd {
 			_ctx = new ZstdContext(scratchBufferSize);
 		}
 		
-		/// <summary>
-		/// Compress the data. The compression level can be between <c>Zstd.MinCompressionLevel</c>
-		/// and <c>Zstd.MaxCompressionLevel</c>. Most use-cases should use <c>Zstd.DefaultCompressionLevel</c>.
-		/// </summary>
-		public byte[] Compress(byte[] data, int compressionLevel) {
-			return Compress(new ReadOnlySpan<byte>(data), compressionLevel);
-		}
-		
 		/// <summary>
 		/// Compress the data. The compression level can be between <c>Zstd.MinCompressionLevel</c>
 		/// and <c>Zstd.MaxCompressionLevel</c>. Most use-cases should use <c>Zstd.DefaultCompressionLevel</c>.
@@ -43,13 +35,6 @@ namespace Code.Zstd {
 			return Compress(new ReadOnlySpan<byte>(data, start, length), compressionLevel);
 		}
 		
-		/// <summary>
-		/// Compress the data using the default compression level.
-		/// </summary>
-		public byte[] Compress(byte[] data) {
-			return Compress(new ReadOnlySpan<byte>(data));
-		}
-		
 		/// <summary>
 		/// Compress the data using the default compression level.
 		/// </summary>
@@ -71,12 +56,24 @@ namespace Code.Zstd {
 		public byte[] Compress(ReadOnlySpan<byte> data, int compressionLevel) {
 			return CompressData(data, compressionLevel, _ctx);
 		}
-		
+
 		/// <summary>
-		/// Decompress the data.
+		/// Compress the data with a destination buffer. This buffer must be the correct size. Use the
+		/// <c>Zstd.GetCompressionBound</c> method to ensure the buffer is large enough. The returned
+		/// span is a slice of the input destination buffer.
+		/// </summary>
+		/// <returns>The number of bytes written to the buffer.</returns>
+		public int Compress(ReadOnlySpan<byte> data, byte[] dstBuffer, int compressionLevel) {
+			return CompressWithBuffer(data, dstBuffer, compressionLevel, _ctx);
+		}
+
+		/// <summary>
+		/// Compress the data into the given destination buffer. This buffer must be the correct size.
+		/// Use the <c>Zstd.GetCompressionBound</c> method to ensure the buffer is large enough.
 		/// </summary>
-		public byte[] Decompress(byte[] data) {
-			return Decompress(new ReadOnlySpan<byte>(data));
+		/// <returns>The number of bytes written to the buffer.</returns>
+		public int Compress(ReadOnlySpan<byte> data, byte[] dstBuffer) {
+			return Compress(data, dstBuffer, DefaultCompressionLevel);
 		}
 		
 		/// <summary>
@@ -92,6 +89,15 @@ namespace Code.Zstd {
 		public byte[] Decompress(ReadOnlySpan<byte> data) {
 			return DecompressData(data, _ctx);
 		}
+		
+		/// <summary>
+		/// Decompress the data into the given destination buffer.
+		/// Use the <c>Zstd.GetDecompressionBound</c> method to ensure the buffer is large enough.
+		/// </summary>
+		/// <returns>The number of bytes written to the buffer.</returns>
+		public int Decompress(ReadOnlySpan<byte> data, byte[] dstBuffer) {
+			return DecompressWithBuffer(data, dstBuffer, _ctx);
+		}
 
 		public void Dispose() {
 			Dispose(true);
@@ -106,6 +112,31 @@ namespace Code.Zstd {
 			Dispose(false);
 		}
 
+		/// <summary>
+		/// Get the maximum buffer size needed for compression.
+		/// </summary>
+		public static int GetCompressionBound(ReadOnlySpan<byte> uncompressedData) {
+			var bound = ZSTD_compressBound((ulong)uncompressedData.Length);
+			if (ZSTD_isError(bound)) {
+				throw new ZstdException(bound);
+			}
+			return (int)bound;
+		}
+
+		/// <summary>
+		/// Get the maximum buffer size needed for decompression.
+		/// </summary>
+		public static unsafe int GetDecompressionBound(ReadOnlySpan<byte> compressedData) {
+			ulong rSize;
+			fixed (byte* src = compressedData) {
+				rSize = ZSTD_getFrameContentSize(new IntPtr(src), (ulong)compressedData.Length);
+			}
+			if (ZSTD_isError(rSize)) {
+				throw new ZstdException(rSize);
+			}
+			return (int)rSize;
+		}
+
 		/// <summary>
 		/// Compress the bytes. The compression level can be between <c>Zstd.MinCompressionLevel</c>
 		/// and <c>Zstd.MaxCompressionLevel</c>. Most use-cases should use <c>Zstd.DefaultCompressionLevel</c>.
@@ -181,6 +212,23 @@ namespace Code.Zstd {
 			return decompressedData;
 		}
 
+		private static unsafe int DecompressWithBuffer(ReadOnlySpan<byte> data, byte[] dstBuffer, ZstdContext ctx) {
+			ulong decompressedSize;
+			fixed (byte* src = data) {
+				fixed (byte* dst = dstBuffer) {
+					if (ctx != null) {
+						decompressedSize = ZSTD_decompressDCtx(ctx.Dctx, new IntPtr(dst), (ulong)dstBuffer.Length, new IntPtr(src), (ulong)data.Length);
+					} else {
+						decompressedSize = ZSTD_decompress(new IntPtr(dst), (ulong)dstBuffer.Length, new IntPtr(src), (ulong)data.Length);
+					}
+				}
+			}
+			if (ZSTD_isError(decompressedSize)) {
+				throw new ZstdException(decompressedSize);
+			}
+			return (int)decompressedSize;
+		}
+
 		private static unsafe byte[] CompressWithStack(ReadOnlySpan<byte> data, ulong bound, int compressionLevel, ZstdContext ctx) {
 			var dst = stackalloc byte[(int)bound];
 			ulong compressedSize;
@@ -221,6 +269,24 @@ namespace Code.Zstd {
 			Array.Resize(ref dstBuf, (int)compressedSize);
 			return dstBuf;
 		}
+	
+		private static unsafe int CompressWithBuffer(ReadOnlySpan<byte> data, byte[] dstBuffer, int compressionLevel, ZstdContext ctx) {
+			ulong compressedSize;
+			fixed (byte* src = data) {
+				fixed (byte* dst = dstBuffer) {
+					if (ctx != null) {
+						compressedSize = ZSTD_compressCCtx(ctx.Cctx, new IntPtr(dst), (ulong)dstBuffer.Length, new IntPtr(src), (ulong)data.Length, compressionLevel);
+					}
+					else {
+						compressedSize = ZSTD_compress(new IntPtr(dst), (ulong)dstBuffer.Length, new IntPtr(src), (ulong)data.Length, compressionLevel);
+					}
+				}
+			}
+			if (ZSTD_isError(compressedSize)) {
+				throw new ZstdException(compressedSize);
+			}
+			return (int)compressedSize;
+		}
 	}
 
 	public sealed class ZstdContext : IDisposable {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gg.easy.airship",
-  "version": "0.1.2143",
+  "version": "0.1.2144",
   "displayName": "Airship",
   "unity": "2021.3",
   "unityRelease": "12f1",