Skip to content

DownloadHandlerSseBase: Switch to Unity main thread before processing #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xavier-ateo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

DownloadHandlerSseBase: Switch to Unity main thread before processing #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 36 additions & 2 deletions Assets/pocketbase-unity/Runtime/Sse/DownloadHandlerSseBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/

using System.Text;
using System.Threading;
using UnityEngine.Networking;

namespace PocketBaseSdk
Expand All @@ -12,6 +13,13 @@ public abstract class DownloadHandlerSseBase : DownloadHandlerScript
{
private readonly StringBuilder _currentLine = new();
private readonly Decoder _utf8Decoder = Encoding.UTF8.GetDecoder();
private static readonly SynchronizationContext UnitySyncContext;

static DownloadHandlerSseBase()
{
// Capture Unity's main thread SynchronizationContext on class initialization
UnitySyncContext = SynchronizationContext.Current;
}

protected DownloadHandlerSseBase(byte[] buffer) : base(buffer)
{
Expand All @@ -34,11 +42,24 @@ protected override bool ReceiveData(byte[] newData, int dataLength)

if (c == '\n')
{
OnNewLineReceived(_currentLine.ToString());
string line = _currentLine.ToString();
_currentLine.Clear();

// Marshal to Unity main thread before processing
if (UnitySyncContext != null)
{
string lineToProcess = line; // Capture for closure
UnitySyncContext.Post(_ => OnNewLineReceived(lineToProcess), null);
}
else
{
OnNewLineReceived(line);
}
}
else
{
_currentLine.Append(c);
}
}

return true;
Expand All @@ -47,7 +68,20 @@ protected override bool ReceiveData(byte[] newData, int dataLength)
protected override void CompleteContent()
{
if (_currentLine.Length > 0)
OnNewLineReceived(_currentLine.ToString());
{
string line = _currentLine.ToString();

// Marshal to Unity main thread before processing
if (UnitySyncContext != null)
{
string lineToProcess = line; // Capture for closure
UnitySyncContext.Post(_ => OnNewLineReceived(lineToProcess), null);
}
else
{
OnNewLineReceived(line);
}
}
}
}
}