Version 1.9.2,

Author: Thanatix

Runtime/API/UGC/KinetixUGC.cs

@@ -30,6 +30,7 @@ public void GetUgcUrl(Action<string> _UrlFetchedCallback)
             KinetixUGCBehaviour.GetUgcUrl(_UrlFetchedCallback);
         }
 
+        [Obsolete("RetakeEmoteProcess now returns the full url. This method will be deleted")]
         public void GetRetakeUgcUrl(string _RetakeToken, Action<string> _UrlFetchedCallback)
         {
             KinetixUGCBehaviour.GetRetakeUgcUrl(_RetakeToken, _UrlFetchedCallback);

Runtime/Retarget/CompilationLog.txt renamed to Runtime/Clip/CompilationLog.txt

@@ -1,4 +1,4 @@
-# Starting compiling Kinetix.Retarget.dll
-D:\UnityInstall\2020.3.33f1\Editor\Data\Tools\RoslynScripts\unity_csc.bat /noconfig @Temp/UnityTempFile-11c7cc3f5ec7f534695b43269a793491
-# Starting IL post processing on Kinetix.Retarget.dll
-D:/UnityInstall/2020.3.33f1/Editor/Data/MonoBleedingEdge/bin/mono.exe D:/UnityInstall/2020.3.33f1/Editor/Data/Tools/ILPostProcessorRunner/ILPostProcessorRunner.exe @D:/Kinetix/kinetix-emote-wheel/Temp/UnityTempFile-495fa8d13cdfcfb40af0fed8dd6be891
+# Starting compiling Kinetix.Clip.dll
+D:\UnityInstall\2020.3.33f1\Editor\Data\Tools\RoslynScripts\unity_csc.bat /noconfig @Temp/UnityTempFile-9cb02fd81e620e84aacdcf7466598e45
+# Starting IL post processing on Kinetix.Clip.dll
+D:/UnityInstall/2020.3.33f1/Editor/Data/MonoBleedingEdge/bin/mono.exe D:/UnityInstall/2020.3.33f1/Editor/Data/Tools/ILPostProcessorRunner/ILPostProcessorRunner.exe @D:/Kinetix/kinetix-emote-wheel/Temp/UnityTempFile-720b05da632498e418886589e176f1ab

Runtime/Retarget/CompilationLog.txt.meta renamed to Runtime/Clip/CompilationLog.txt.meta

@@ -8,7 +8,7 @@ namespace Kinetix.Internal
 {
     public static class KinetixConstants
     {
-        public const  string version                = "1.9.1";
+        public const  string version                = "1.9.2";
         public static bool   C_ShouldUGCBeAvailable = true;
 
 #if STAGING_KINETIX

Runtime/Clip/Kinetix.Clip.dll

@@ -81,9 +81,9 @@ public string GetAnimationURLOrNull(string _AvatarId = null)
 		public string GetAnimationURLOrNull(string _Extension, string _AvatarId)
 		{
 			if (_AvatarId == null)
-				return Metadata.UrlByFormat[_Extension];
+				return Metadata.UrlByFormat.ValueOrDefault(_Extension);
 
-			return GetAvatarMetadata(_AvatarId)?.UrlByFormat[_Extension];
+			return GetAvatarMetadata(_AvatarId)?.UrlByFormat.ValueOrDefault(_Extension);
 		}
 	}
 }

Runtime/Const/KinetixConstants.cs

@@ -222,9 +222,9 @@ public async void RetakeEmoteProcess(string _ProcessId, Action<string> _OnSucces
         {
             try
             {
-                SdkApiProcess process = await KinetixCoreBehaviour.ServiceLocator.Get<ProviderService>().RetakeEmote(_ProcessId);
+                SdkTokenValidityResult process = await KinetixCoreBehaviour.ServiceLocator.Get<ProviderService>().RetakeEmote(_ProcessId);
 
-                _OnSuccess?.Invoke(process.Uuid.ToString());
+                _OnSuccess?.Invoke(process.url.ToString());
             }
             catch (Exception e)
             {

Runtime/Emote/KinetixEmote.cs

@@ -17,6 +17,6 @@ public interface IProviderWrapper
     public Task<AnimationMetadata> GetAnimationMetadataOfAvatar(AnimationIds _AnimationIds, string _AvatarId, AnimationMetadata _Metadata = null);
     public Task<SdkApiProcess[]> GetAnimationProcessesOfOwner(string _AccountId);
     public Task<SdkApiProcess> ValidateEmote(string _EmoteId);
-    public Task<SdkApiProcess> RetakeEmote(string _EmoteId);
+    public Task<SdkTokenValidityResult> RetakeEmote(string _EmoteId);
 }
 

Runtime/Managers/AccountManager.cs

@@ -1,7 +1,8 @@
 namespace Kinetix.Internal
 {
-    internal class SdkTokenValidityResult
+    public class SdkTokenValidityResult
     {
+        public string url;
         public int expireIn;
         public System.DateTime expire;
     }

Runtime/Providers/Providers/IProviderWrapper.cs

@@ -241,9 +241,9 @@ public async Task<SdkApiProcess> ValidateEmote(string _ProcessId)
 			return await tcs.Task;
 		}
 
-		public async Task<SdkApiProcess> RetakeEmote(string _ProcessId)
+		public async Task<SdkTokenValidityResult> RetakeEmote(string _ProcessId)
 		{
-			TaskCompletionSource<SdkApiProcess> tcs = new TaskCompletionSource<SdkApiProcess>();
+			TaskCompletionSource<SdkTokenValidityResult> tcs = new TaskCompletionSource<SdkTokenValidityResult>();
 
 			string url = KinetixConstants.c_SDK_API_URL + "/v1/process/" + _ProcessId + "/retake";
 
@@ -264,7 +264,7 @@ public async Task<SdkApiProcess> RetakeEmote(string _ProcessId)
                 if (!response.IsSuccess)
                     throw new Exception(response.Error);
 
-				tcs.SetResult(JsonConvert.DeserializeObject<SdkApiProcess>(response.Content));
+				tcs.SetResult(JsonConvert.DeserializeObject<SdkTokenValidityResult>(response.Content));
             }
             catch (Exception e)
             {

Runtime/Providers/Providers/SdkApi/ApiClasses/SdkTokenValidityResult.cs

@@ -1,12 +1,13 @@
 using Kinetix.Internal.Retargeting.AnimationData;
 using Kinetix.Utils;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace Kinetix.Internal
 {
-	public abstract class AAnimLoader
+	public abstract class AAnimLoader : IDisposable
 	{
 		public abstract string Extension { get; }
 		protected readonly ServiceLocator serviceLocator;
@@ -51,5 +52,7 @@ public string EnsureDirectoryExists(string filepath)
 
 			return filepath;
 		}
-	}
+
+        public virtual void Dispose() {}
+    }
 }

Runtime/Providers/Providers/SdkApi/SdkApiProviderWrapper.cs

@@ -14,13 +14,22 @@ namespace Kinetix.Internal
 {
 	internal class KinanimLoader : AAnimLoader
 	{
+		List<KinanimLoader> instance = new List<KinanimLoader>();
+
 		const long HEADER_DOWNLOAD_SIZE = 1000 * 5;
 
 		private readonly Dictionary<string, KinanimServiceData> kinanimIndexerByFilepath = new Dictionary<string, KinanimServiceData>();
 		protected readonly EmoteDownloadSpeedService downloadSpeedService;
 
 		public KinanimLoader(ServiceLocator _ServiceLocator) : base(_ServiceLocator)
 		{
+			if (instance.Count != 0)
+			{
+				Debug.LogWarning(nameof(KinanimLoader) + "'s already has an instance. This could lead to " + nameof(IOException) + "s");
+			}
+
+			instance.Add(this);
+
 			downloadSpeedService = _ServiceLocator.Get<EmoteDownloadSpeedService>();
 		}
 
@@ -32,7 +41,8 @@ public override async Task<RuntimeRetargetFrameIndexer> Load(KinetixEmote emote,
 
 			if (kinanimIndexerByFilepath.TryGetValue(filepath, out KinanimServiceData data))
 			{
-				data.exporter?.Dispose();
+				if (data.exporter != null)
+					DisposeExporter(data);
 				data.exporter = new KinanimExporter(new FileStream(filepath, FileMode.OpenOrCreate, FileAccess.Write));
 			}
 			else
@@ -48,7 +58,7 @@ public override async Task<RuntimeRetargetFrameIndexer> Load(KinetixEmote emote,
 				await
 					AsyncDownloadRemainingFrames(data, url, null, true)
 					.Catch((e) => KinetixDebug.LogException(e))
-					.Then(() => { data.exporter.Dispose(); });
+					.Then(() => DisposeExporter(data));
 			}
 
 			return await Task.FromResult<RuntimeRetargetFrameIndexer>(data.indexer);
@@ -85,7 +95,7 @@ public override async Task<RuntimeRetargetFrameIndexer> Download(KinetixEmote em
 			//Download remaining frames
 			_ = AsyncDownloadRemainingFrames(kinanim, url, null, false)
 				.Catch(KinetixDebug.LogException)
-				.Then(kinanim.exporter.Dispose);
+				.Then(() => DisposeExporter(kinanim));
 
 			return kinanim.indexer;
 		}
@@ -150,19 +160,22 @@ private KinanimServiceData GetStartDataFromEmote(string filepath, Stream readStr
 			BinaryReader byteReader = new BinaryReader(readStream);
 			importer.ReadHeader(byteReader);
 			importer.ReadFrames(byteReader);
-			byteReader.Dispose();
-			readStream.Dispose();
+			readStream.Close();
 
 			//Set local dictionary with : KinanimDataIndexer
 			KinanimDataIndexer indexer = new KinanimDataIndexer(importer, !string.IsNullOrEmpty(avatarId));
 			indexer.Init();
-			indexer.UpdateIndexCount();
 			data = new KinanimServiceData(indexer, new KinanimExporter(new FileStream(filepath, FileMode.OpenOrCreate, FileAccess.Write)));
 
 			if (!(readStream is FileStream))
 				data.exporter.OverrideHeader(data.indexer.dataSource.UncompressedHeader); //Frame size changed so we need to rewrite the header
 
+			kinanimIndexerByFilepath.ValueOrDefault(filepath)?.exporter.Dispose();
 			kinanimIndexerByFilepath[filepath] = data;
+
+			//Update the indexer at the end only
+			indexer.UpdateIndexCount();
+
 			return data;
 		}
 
@@ -183,6 +196,7 @@ private async Task GetServerHeader(KinanimDataIndexer indexer, string url, Cance
 			indexer.dataSource.MoveHeaderToUncompressedHeader();
 			indexer.dataSource.ReadHeader(stream);
 			indexer.UpdateIndexCount();
+			stream.Close();
 		}
 
 		private async Task<(int frameMin, int frameMax)> LoadBatchFrameKinanim(KinanimDataIndexer indexer, string url, CancellationTokenSource cancellationToken)
@@ -202,11 +216,30 @@ private async Task GetServerHeader(KinanimDataIndexer indexer, string url, Cance
 			MemoryStream stream = new MemoryStream(response.bytes);
 			indexer.dataSource.ReadFrames(stream);
 			indexer.UpdateIndexCount();
-
+			stream.Close();
 #if DEV_KINETIX
 			KinetixLogger.LogDebug("Kinanim,Download", $"downloaded frames {minFrame}-{maxFrame} (byte={byteMin}-{byteMax})", true);
 #endif
 			return (minFrame, maxFrame);
 		}
+
+		private void DisposeExporter(KinanimServiceData data)
+		{
+			data.exporter.Dispose();
+		}
+
+		public override void Dispose()
+		{
+			base.Dispose();
+			try
+			{
+				instance.Remove(this);
+			}
+			catch (Exception) {}
+			foreach (var item in kinanimIndexerByFilepath)
+			{
+				item.Value.exporter?.Dispose();
+			}
+		}
 	}
 }

Runtime/Retarget/Kinetix.Retarget.dll

@@ -8,7 +8,7 @@
 
 namespace Kinetix.Internal
 {
-	public class LoadAnimService : IKinetixService
+	public class LoadAnimService : IKinetixService, IDisposable
 	{
 		private const string NO_METADATA_FOUND_FOR_EMOTE = "No metadata found for emote : ";
 
@@ -215,5 +215,13 @@ bool First(AAnimLoader loader)
 				throw new Exception($"Couldn't find file extension '{extension}'", e);
 			}
 		}
-	}
+
+        public void Dispose()
+        {
+            for (int i = loaders.Length - 1; i >= 0; i--)
+            {
+				loaders[i].Dispose();
+            }
+        }
+    }
 }

Runtime/Retarget/Webgl/CompilationLog.txt

@@ -107,7 +107,7 @@ public async Task<SdkApiProcess> ValidateEmote(string _EmoteId)
         }
 
         /// <summary>
-        public async Task<SdkApiProcess> RetakeEmote(string _EmoteId)
+        public async Task<SdkTokenValidityResult> RetakeEmote(string _EmoteId)
         {
             try
             {