IDataHolder: Rewrote to support sandboxing. Cleaned up and added handy dictionary-like functions.

NodeDataStorage: New storage location per node for custom data, resolver types, and, eventually, object types.

Transport: More progress

Author: maverickliberty

Source/Data/IDataHolder.cs

@@ -4,10 +4,8 @@
 /// Author: Maverick Liberty
 ///////////////////////////////////////////////////////
 
-using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
+using EppNet.Node;
 
 namespace EppNet.Data
 {
@@ -17,161 +15,51 @@ namespace EppNet.Data
     /// specific instance
     /// </summary>
 
-    public interface IDataHolder : IDisposable
+    public interface IDataHolder : INodeDescendant
     {
-        /// <summary>
-        /// Global data dictionary. I considered using something with weak references but those
-        /// just hide poor memory management.
-        /// <br></br>Just make sure you call dispose!
-        /// </summary>
-        internal static readonly ConditionalWeakTable<IDataHolder, Dictionary<string, object>> _globalDataDict = new();
-
-        /// <summary>
-        /// Tries to get all data associated with a particular <see cref="IDataHolder"/><br></br>
-        /// </summary>
-        /// <param name="dataHolder"></param>
-        /// <returns>Whether or not an internal dictionary was cleared<br>
-        /// </br><b>NOTE:</b> Returns false if no custom data was set.</returns>
-
-        public static bool DeleteAllData([NotNull] IDataHolder dataHolder)
-        {
-            if (dataHolder == null)
-                return false;
 
-            return _globalDataDict.Remove(dataHolder);
-        }
+        public bool Set<T>([NotNull] string key, T value) =>
+            Node.DataStorage.AddOrUpdateCustomDataEntry(this, key, value);
 
-        /// <summary>
-        /// Tries to associate a value with a key<br/>
-        /// Key mustn't be null or empty.<br></br>
-        /// <b>NOTE:</b> Uses <see cref="GetOrCreateData"/>, so will only fail for invalid keys
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <returns>Whether or not the key was set to the value</returns>
-        /// <exception cref="ArgumentException">Key cannot be empty or null</exception>
-
-        public bool Set(string key, object value)
+        public bool SetIfAbsent<T>([NotNull] string key, T value)
         {
-            var data = GetOrCreateData();
-
-            if (string.IsNullOrEmpty(key))
-                throw new ArgumentException("Key cannot be empty or null!");
+            if (!Has(key))
+                return Set(key, value);
 
-            if (TryGetValue(key, out object existing) && existing == value)
-                // Data is already set
-                return false;
-
-            data[key] = value;
-            return true;
+            return false;
         }
 
-        /// <summary>
-        /// Fetches a value by the key without any checks<br/>
-        /// Can result in an error if the key doesn't exist.
-        /// </summary>
-        /// <param name="key"></param>
-        /// <exception cref="KeyNotFoundException">The specified key could not be found</exception>
-        /// <returns></returns>
-
-        public object Get(string key) => GetOrCreateData()[key];
-
-        /// <summary>
-        /// Tries to remove the specified key from the internal data dictionary
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns>Whether or not it was deleted</returns>
-
-        public bool Remove(string key) => GetOrCreateData().Remove(key);
-
-        /// <summary>
-        /// Tries to get an object by key
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <returns>Whether or not the key was valid</returns>
-
-        public bool TryGetValue(string key, out object value)
-        {
-            value = null;
-
-            var data = GetOrCreateData();
+        public T Get<T>([NotNull] string key) =>
+            (T)Node.DataStorage.GetCustomDataEntry(this, key);
 
-            if (data == null)
-                return false;
+        public object Get([NotNull] string key) =>
+            Node.DataStorage.GetCustomDataEntry(this, key);
 
-            return data.TryGetValue(key, out value);
-        }
+        public T GetOrDefault<T>([NotNull] string key, T fallback) =>
+            TryGet(key, out T result) ? result : fallback;
 
-        /// <summary>
-        /// Gets or creates an internal dictionary for data holding
-        /// </summary>
-        /// <returns>A dictionary</returns>
-
-        public Dictionary<string, object> GetOrCreateData()
+        public bool TryGet<T>([NotNull] string key, out T value)
         {
+            bool fetched = Node.DataStorage.TryGetCustomDataEntry(this, key, out object obj);
+            value = default;
 
-            Dictionary<string, object> data;
-
-            if (!_globalDataDict.TryGetValue(this, out data))
+            if (fetched && obj is T casted)
             {
-                data = new(StringComparer.Ordinal);
-                _globalDataDict.Add(this, data);
+                value = casted;
+                return true;
             }
 
-            return data;
+            return false;
         }
 
-    }
-
-    public static class IDataHolderExtensions
-    {
+        public bool TryGet([NotNull] string key, out object value) =>
+            Node.DataStorage.TryGetCustomDataEntry(this, key, out value);
 
-        /// <summary>
-        /// Tries to associate a value with a key<br/>
-        /// Key mustn't be null or empty.<br></br>
-        /// <b>NOTE:</b> Uses <see cref="GetOrCreateData"/>, so will only fail for invalid keys
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <returns>Whether or not the key was set to the value</returns>
-        /// <exception cref="ArgumentException">Key cannot be empty or null</exception>
-        public static bool Set<T>(this T holder, string key, object value) where T : IDataHolder => holder.Set(key, value);
-
-        /// <summary>
-        /// Fetches a value by the key without any checks<br/>
-        /// Can result in an error if the key doesn't exist.
-        /// </summary>
-        /// <param name="key"></param>
-        /// <exception cref="KeyNotFoundException">The specified key could not be found</exception>
-        /// <returns></returns>
-        public static object Get<T>(this T holder, string key) where T : IDataHolder => holder.Get(key);
-
-        /// <summary>
-        /// Tries to remove the specified key from the internal data dictionary
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns>Whether or not it was deleted</returns>
-
-        public static bool Remove<T>(this T holder, string key) where T : IDataHolder => holder.Remove(key);
-
-        /// <summary>
-        /// Tries to get an object by key
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        /// <returns>Whether or not the key was valid</returns>
-
-        public static bool TryGetValue<T>(this T holder, string key, out object value) where T : IDataHolder => holder.TryGetValue(key, out value);
-
-        /// <summary>
-        /// Gets or creates an internal dictionary for data holding
-        /// </summary>
-        /// <returns>A dictionary</returns>
-
-        public static Dictionary<string, object> GetOrCreateData<T>(this T holder) where T : IDataHolder => holder.GetOrCreateData();
+        public bool Remove([NotNull] string key, out object value) =>
+            Node.DataStorage.RemoveCustomDataEntry(this, key, out value);
 
+        public bool Has([NotNull] string key) =>
+            Node.DataStorage.TryGetCustomDataEntry(this, key, out _);
 
     }
-
 }

Source/Node/NetworkNode.cs

@@ -111,6 +111,8 @@ public Timestamp Timestamp
 
         public Configuration Configuration { get; }
 
+        public NodeDataStorage DataStorage { get; }
+
         internal ServiceManager _serviceMgr;
         internal BaseSocket _socket;