refactor cloud auth

Doxoh · Doxoh · commit 521e92750c85 · 2023-10-07T18:05:30.000+02:00
diff --git a/api/AltV.Net.Async/Elements/Entities/AsyncConnectionInfo.cs b/api/AltV.Net.Async/Elements/Entities/AsyncConnectionInfo.cs
@@ -212,12 +212,15 @@ public void Decline(string reason)
         }
     }
 
-    public Task<string> RequestCloudId()
+    public string CloudId
     {
-        lock (ConnectionInfo)
+        get
         {
-            if (!AsyncContext.CheckIfExistsNullable(ConnectionInfo)) return Task.FromResult<string>(default);
-            return ConnectionInfo.RequestCloudId();
+            lock (ConnectionInfo)
+            {
+                if (!AsyncContext.CheckIfExistsOrCachedNullable(ConnectionInfo)) return default;
+                return ConnectionInfo.CloudId;
+            }
         }
     }
 
diff --git a/api/AltV.Net.Async/Elements/Entities/AsyncPlayer.cs b/api/AltV.Net.Async/Elements/Entities/AsyncPlayer.cs
@@ -1452,12 +1452,15 @@ public void PlayScenario(string name)
             }
         }
 
-        public Task<string> RequestCloudId()
+        public string CloudId
         {
-            lock (Player)
+            get
             {
-                if (!AsyncContext.CheckIfExistsNullable(Player)) return Task.FromResult<string>(default);
-                return Player.RequestCloudId();
+                lock (Player)
+                {
+                    if (!AsyncContext.CheckIfExistsOrCachedNullable(Player)) return default;
+                    return Player.CloudId;
+                }
             }
         }
 
diff --git a/api/AltV.Net.CApi/Libraries/ClientLibrary.cs b/api/AltV.Net.CApi/Libraries/ClientLibrary.cs
@@ -3512,7 +3512,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
         public ClientLibrary(Dictionary<ulong, IntPtr> funcTable)
         {
             if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
-            else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 3415677601440942791UL) Outdated = true;
+            else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 557522308693843528UL) Outdated = true;
             Audio_AddOutput = (delegate* unmanaged[Cdecl]<nint, nint, void>) GetUnmanagedPtr<Audio_AddOutputDelegate>(funcTable, 9914412815391408844UL, Audio_AddOutputFallback);
             Audio_GetBaseObject = (delegate* unmanaged[Cdecl]<nint, nint>) GetUnmanagedPtr<Audio_GetBaseObjectDelegate>(funcTable, 6330360502401226894UL, Audio_GetBaseObjectFallback);
             Audio_GetCurrentTime = (delegate* unmanaged[Cdecl]<nint, double>) GetUnmanagedPtr<Audio_GetCurrentTimeDelegate>(funcTable, 2944324482134975819UL, Audio_GetCurrentTimeFallback);
diff --git a/api/AltV.Net.CApi/Libraries/ServerLibrary.cs b/api/AltV.Net.CApi/Libraries/ServerLibrary.cs
diff --git a/api/AltV.Net.CApi/Libraries/SharedLibrary.cs b/api/AltV.Net.CApi/Libraries/SharedLibrary.cs
@@ -1608,7 +1608,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha
         public SharedLibrary(Dictionary<ulong, IntPtr> funcTable)
         {
             if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;
-            else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 3415677601440942791UL) Outdated = true;
+            else if (capiHash == IntPtr.Zero || *(ulong*)capiHash != 557522308693843528UL) Outdated = true;
             Audio_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<Audio_GetIDDelegate>(funcTable, 4464042055475980737UL, Audio_GetIDFallback);
             AudioAttachedOutput_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<AudioAttachedOutput_GetIDDelegate>(funcTable, 17725794901805112189UL, AudioAttachedOutput_GetIDFallback);
             AudioFilter_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<AudioFilter_GetIDDelegate>(funcTable, 8824535635529306325UL, AudioFilter_GetIDFallback);
diff --git a/api/AltV.Net.Mock/MockConnectionInfo.cs b/api/AltV.Net.Mock/MockConnectionInfo.cs
@@ -40,9 +40,6 @@ public void Decline(string reason)
             throw new NotImplementedException();
         }
 
-        public Task<string> RequestCloudId()
-        {
-            throw new NotImplementedException();
-        }
+        public string CloudId { get; }
     }
 }
diff --git a/api/AltV.Net/Elements/Entities/ConnectionInfo.cs b/api/AltV.Net/Elements/Entities/ConnectionInfo.cs
@@ -242,36 +242,16 @@ public void Decline(string reason)
         }
     }
 
-    public async Task<string> RequestCloudId()
+    public string CloudId
     {
-        GCHandle handle;
-        bool success = false;
-        string data = null;
-        var semaphore = new SemaphoreSlim(0, 1);
-
-        unsafe
+        get
         {
-            void ResolveTask(byte ok, IntPtr resultPtr)
+            unsafe
             {
-                success = ok == 1;
-                data = Marshal.PtrToStringUTF8(resultPtr);
-                semaphore.Release();
+                var size = 0;
+                return Core.PtrToStringUtf8AndFree(
+                    Core.Library.Server.ConnectionInfo_GetCloudID(ConnectionInfoNativePointer, &size), size);
             }
-
-            RequestAuthCallbackDelegate resolveTask = ResolveTask;
-            handle = GCHandle.Alloc(resolveTask);
-            Core.Library.Server.ConnectionInfo_RequestCloudID(ConnectionInfoNativePointer, resolveTask);
-        }
-
-        await semaphore.WaitAsync();
-        handle.Free();
-        semaphore.Dispose();
-
-        if (!success)
-        {
-            throw new CloudIDRequestException(data);
         }
-
-        return data;
     }
 }
diff --git a/api/AltV.Net/Elements/Entities/IConnectionInfo.cs b/api/AltV.Net/Elements/Entities/IConnectionInfo.cs
@@ -27,5 +27,5 @@ public interface IConnectionInfo : IBaseObject
 
     void Accept(bool sendNames = true);
     void Decline(string reason);
-    Task<string> RequestCloudId();
+    string CloudId { get; }
 }
diff --git a/api/AltV.Net/Elements/Entities/IPlayer.cs b/api/AltV.Net/Elements/Entities/IPlayer.cs
@@ -458,7 +458,7 @@ void PlayAnimation(string animDict, string animName, float blendInSpeed, float b
         void ClearDecorations();
         Decoration[] GetDecorations();
         void PlayScenario(string name);
-        Task<string> RequestCloudId();
+        string CloudId { get; }
     }
 
     public static class PlayerExtensions
diff --git a/api/AltV.Net/Elements/Entities/Player.cs b/api/AltV.Net/Elements/Entities/Player.cs
@@ -192,7 +192,7 @@ public string SocialClubName
                 }
             }
         }
-        
+
         public void SetAmmo(uint ammoHash, ushort ammo)
         {
             unsafe
@@ -386,37 +386,18 @@ public void PlayScenario(string name)
             }
         }
 
-        public async Task<string> RequestCloudId()
+        public string CloudId
         {
-            GCHandle handle;
-            bool success = false;
-            string data = null;
-            var semaphore = new SemaphoreSlim(0, 1);
-
-            unsafe
+            get
             {
-                void ResolveTask(byte ok, IntPtr resultPtr)
+                unsafe
                 {
-                    success = ok == 1;
-                    data = Marshal.PtrToStringUTF8(resultPtr);
-                    semaphore.Release();
+                    CheckIfEntityExistsOrCached();
+                    var size = 0;
+                    return Core.PtrToStringUtf8AndFree(
+                        Core.Library.Server.Player_GetCloudID(PlayerNativePointer, &size), size);
                 }
-
-                RequestAuthCallbackDelegate resolveTask = ResolveTask;
-                handle = GCHandle.Alloc(resolveTask);
-                Core.Library.Server.Player_RequestCloudID(PlayerNativePointer, resolveTask);
             }
-
-            await semaphore.WaitAsync();
-            handle.Free();
-            semaphore.Dispose();
-
-            if (!success)
-            {
-                throw new CloudIDRequestException(data);
-            }
-
-            return data;
         }
 
         public bool IsConnected
diff --git a/runtime b/runtime
@@ -1 +1 @@
-Subproject commit 91b9fb20d5606503c09b5f6e5f1bfb893a831c4b
+Subproject commit 9f1a28f6eaaf3c34407c9bfcf75f568bcfd0e91e

Original file line number	Diff line number	Diff line change
`@@ -212,12 +212,15 @@ public void Decline(string reason)`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`
`215`		`- public Task<string> RequestCloudId()`
	`215`	`+ public string CloudId`
`216`	`216`	`{`
`217`		`- lock (ConnectionInfo)`
	`217`	`+ get`
`218`	`218`	`{`
`219`		`- if (!AsyncContext.CheckIfExistsNullable(ConnectionInfo)) return Task.FromResult<string>(default);`
`220`		`- return ConnectionInfo.RequestCloudId();`
	`219`	`+ lock (ConnectionInfo)`
	`220`	`+ {`
	`221`	`+ if (!AsyncContext.CheckIfExistsOrCachedNullable(ConnectionInfo)) return default;`
	`222`	`+ return ConnectionInfo.CloudId;`
	`223`	`+ }`
`221`	`224`	`}`
`222`	`225`	`}`
`223`	`226`
Original file line number	Diff line number	Diff line change
`@@ -1452,12 +1452,15 @@ public void PlayScenario(string name)`
`1452`	`1452`	`}`
`1453`	`1453`	`}`
`1454`	`1454`
`1455`		`- public Task<string> RequestCloudId()`
	`1455`	`+ public string CloudId`
`1456`	`1456`	`{`
`1457`		`- lock (Player)`
	`1457`	`+ get`
`1458`	`1458`	`{`
`1459`		`- if (!AsyncContext.CheckIfExistsNullable(Player)) return Task.FromResult<string>(default);`
`1460`		`- return Player.RequestCloudId();`
	`1459`	`+ lock (Player)`
	`1460`	`+ {`
	`1461`	`+ if (!AsyncContext.CheckIfExistsOrCachedNullable(Player)) return default;`
	`1462`	`+ return Player.CloudId;`
	`1463`	`+ }`
`1461`	`1464`	`}`
`1462`	`1465`	`}`
`1463`	`1466`
Original file line number	Diff line number	Diff line change
`@@ -3512,7 +3512,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha`
`3512`	`3512`	`public ClientLibrary(Dictionary<ulong, IntPtr> funcTable)`
`3513`	`3513`	`{`
`3514`	`3514`	`if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;`
`3515`		`- else if (capiHash == IntPtr.Zero \|\| (ulong)capiHash != 3415677601440942791UL) Outdated = true;`
	`3515`	`+ else if (capiHash == IntPtr.Zero \|\| (ulong)capiHash != 557522308693843528UL) Outdated = true;`
`3516`	`3516`	`Audio_AddOutput = (delegate* unmanaged[Cdecl]<nint, nint, void>) GetUnmanagedPtr<Audio_AddOutputDelegate>(funcTable, 9914412815391408844UL, Audio_AddOutputFallback);`
`3517`	`3517`	`Audio_GetBaseObject = (delegate* unmanaged[Cdecl]<nint, nint>) GetUnmanagedPtr<Audio_GetBaseObjectDelegate>(funcTable, 6330360502401226894UL, Audio_GetBaseObjectFallback);`
`3518`	`3518`	`Audio_GetCurrentTime = (delegate* unmanaged[Cdecl]<nint, double>) GetUnmanagedPtr<Audio_GetCurrentTimeDelegate>(funcTable, 2944324482134975819UL, Audio_GetCurrentTimeFallback);`
Original file line number	Diff line number	Diff line change
`@@ -1608,7 +1608,7 @@ private IntPtr GetUnmanagedPtr<T>(IDictionary<ulong, IntPtr> funcTable, ulong ha`
`1608`	`1608`	`public SharedLibrary(Dictionary<ulong, IntPtr> funcTable)`
`1609`	`1609`	`{`
`1610`	`1610`	`if (!funcTable.TryGetValue(0, out var capiHash)) Outdated = true;`
`1611`		`- else if (capiHash == IntPtr.Zero \|\| (ulong)capiHash != 3415677601440942791UL) Outdated = true;`
	`1611`	`+ else if (capiHash == IntPtr.Zero \|\| (ulong)capiHash != 557522308693843528UL) Outdated = true;`
`1612`	`1612`	`Audio_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<Audio_GetIDDelegate>(funcTable, 4464042055475980737UL, Audio_GetIDFallback);`
`1613`	`1613`	`AudioAttachedOutput_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<AudioAttachedOutput_GetIDDelegate>(funcTable, 17725794901805112189UL, AudioAttachedOutput_GetIDFallback);`
`1614`	`1614`	`AudioFilter_GetID = (delegate* unmanaged[Cdecl]<nint, uint>) GetUnmanagedPtr<AudioFilter_GetIDDelegate>(funcTable, 8824535635529306325UL, AudioFilter_GetIDFallback);`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,6 @@ public void Decline(string reason)`
`40`	`40`	`throw new NotImplementedException();`
`41`	`41`	`}`
`42`	`42`
`43`		`- public Task<string> RequestCloudId()`
`44`		`- {`
`45`		`- throw new NotImplementedException();`
`46`		`- }`
	`43`	`+ public string CloudId { get; }`
`47`	`44`	`}`
`48`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -242,36 +242,16 @@ public void Decline(string reason)`
`242`	`242`	`}`
`243`	`243`	`}`
`244`	`244`
`245`		`- public async Task<string> RequestCloudId()`
	`245`	`+ public string CloudId`
`246`	`246`	`{`
`247`		`- GCHandle handle;`
`248`		`- bool success = false;`
`249`		`- string data = null;`
`250`		`- var semaphore = new SemaphoreSlim(0, 1);`
`251`		`-`
`252`		`- unsafe`
	`247`	`+ get`
`253`	`248`	`{`
`254`		`- void ResolveTask(byte ok, IntPtr resultPtr)`
	`249`	`+ unsafe`
`255`	`250`	`{`
`256`		`- success = ok == 1;`
`257`		`- data = Marshal.PtrToStringUTF8(resultPtr);`
`258`		`- semaphore.Release();`
	`251`	`+ var size = 0;`
	`252`	`+ return Core.PtrToStringUtf8AndFree(`
	`253`	`+ Core.Library.Server.ConnectionInfo_GetCloudID(ConnectionInfoNativePointer, &size), size);`
`259`	`254`	`}`
`260`		`-`
`261`		`- RequestAuthCallbackDelegate resolveTask = ResolveTask;`
`262`		`- handle = GCHandle.Alloc(resolveTask);`
`263`		`- Core.Library.Server.ConnectionInfo_RequestCloudID(ConnectionInfoNativePointer, resolveTask);`
`264`		`- }`
`265`		`-`
`266`		`- await semaphore.WaitAsync();`
`267`		`- handle.Free();`
`268`		`- semaphore.Dispose();`
`269`		`-`
`270`		`- if (!success)`
`271`		`- {`
`272`		`- throw new CloudIDRequestException(data);`
`273`	`255`	`}`
`274`		`-`
`275`		`- return data;`
`276`	`256`	`}`
`277`	`257`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,5 @@ public interface IConnectionInfo : IBaseObject`
`27`	`27`
`28`	`28`	`void Accept(bool sendNames = true);`
`29`	`29`	`void Decline(string reason);`
`30`		`- Task<string> RequestCloudId();`
	`30`	`+ string CloudId { get; }`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ void PlayAnimation(string animDict, string animName, float blendInSpeed, float b`
`458`	`458`	`void ClearDecorations();`
`459`	`459`	`Decoration[] GetDecorations();`
`460`	`460`	`void PlayScenario(string name);`
`461`		`- Task<string> RequestCloudId();`
	`461`	`+ string CloudId { get; }`
`462`	`462`	`}`
`463`	`463`
`464`	`464`	`public static class PlayerExtensions`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ public string SocialClubName`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`	`}`
`195`		`-`
	`195`	`+`
`196`	`196`	`public void SetAmmo(uint ammoHash, ushort ammo)`
`197`	`197`	`{`
`198`	`198`	`unsafe`
`@@ -386,37 +386,18 @@ public void PlayScenario(string name)`
`386`	`386`	`}`
`387`	`387`	`}`
`388`	`388`
`389`		`- public async Task<string> RequestCloudId()`
	`389`	`+ public string CloudId`
`390`	`390`	`{`
`391`		`- GCHandle handle;`
`392`		`- bool success = false;`
`393`		`- string data = null;`
`394`		`- var semaphore = new SemaphoreSlim(0, 1);`
`395`		`-`
`396`		`- unsafe`
	`391`	`+ get`
`397`	`392`	`{`
`398`		`- void ResolveTask(byte ok, IntPtr resultPtr)`
	`393`	`+ unsafe`
`399`	`394`	`{`
`400`		`- success = ok == 1;`
`401`		`- data = Marshal.PtrToStringUTF8(resultPtr);`
`402`		`- semaphore.Release();`
	`395`	`+ CheckIfEntityExistsOrCached();`
	`396`	`+ var size = 0;`
	`397`	`+ return Core.PtrToStringUtf8AndFree(`
	`398`	`+ Core.Library.Server.Player_GetCloudID(PlayerNativePointer, &size), size);`
`403`	`399`	`}`
`404`		`-`
`405`		`- RequestAuthCallbackDelegate resolveTask = ResolveTask;`
`406`		`- handle = GCHandle.Alloc(resolveTask);`
`407`		`- Core.Library.Server.Player_RequestCloudID(PlayerNativePointer, resolveTask);`
`408`	`400`	`}`
`409`		`-`
`410`		`- await semaphore.WaitAsync();`
`411`		`- handle.Free();`
`412`		`- semaphore.Dispose();`
`413`		`-`
`414`		`- if (!success)`
`415`		`- {`
`416`		`- throw new CloudIDRequestException(data);`
`417`		`- }`
`418`		`-`
`419`		`- return data;`
`420`	`401`	`}`
`421`	`402`
`422`	`403`	`public bool IsConnected`