-
-
Notifications
You must be signed in to change notification settings - Fork 507
feat: migrate push to SSE with WebSocket rollout compatibility #2265
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.
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
Draft
niemyjski
wants to merge
21
commits into
main
Choose a base branch
from
niemyjski/websocket-to-sse-migration
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
569826e
feat: Replace WebSocket push with Server-Sent Events (SSE)
niemyjski da83047
fix: harden SSE rollout compatibility
niemyjski 86dcf1d
fix: finalize SSE rollout safety — async disposal, graceful drain, te…
niemyjski 7398308
fix: keep Angular websocket-first during rollout
niemyjski b9f0e4e
fix: address push rollout review feedback
niemyjski 33c2c3f
fix: harden SSE keepalive backpressure
niemyjski 0675ae8
fix: stop retrying when push is disabled
niemyjski 6b45f26
Merge remote-tracking branch 'origin/main' into niemyjski/websocket-t…
niemyjski 856a13a
feat: Replace WebSocket push with Server-Sent Events (SSE)
niemyjski 315e1f3
fix: harden SSE rollout compatibility
niemyjski 6b1439a
fix: finalize SSE rollout safety — async disposal, graceful drain, te…
niemyjski f7bbcf3
fix: keep Angular websocket-first during rollout
niemyjski 7230717
fix: address push rollout review feedback
niemyjski e4231d1
fix: harden SSE keepalive backpressure
niemyjski 7e0a434
fix: stop retrying when push is disabled
niemyjski b56a1bd
fix: revoke push access across organization mappings
niemyjski aa00584
Merge remote-tracking branch 'origin/main' into niemyjski/websocket-t…
niemyjski e9b8f8a
fix: harden push connection limits and backpressure
niemyjski 81aceee
Merge remote-tracking branch 'origin/niemyjski/websocket-to-sse-migra…
niemyjski 14b4afb
fix: harden push delivery across replicas
niemyjski 0d87e48
fix: make SSE clients recover safely
niemyjski File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| namespace Exceptionless.Core.Utility; | ||
|
|
||
| public interface IConnectionLeaseStore | ||
| { | ||
| Task<bool> TryAcquireAsync(string userId, string connectionId, int maxConnections, TimeSpan leaseDuration); | ||
| Task<bool> RenewAsync(string userId, string connectionId, TimeSpan leaseDuration); | ||
| Task ReleaseAsync(string userId, string connectionId); | ||
| } | ||
|
|
||
| public sealed class ConnectionLeaseStore(TimeProvider timeProvider) : IConnectionLeaseStore | ||
| { | ||
| private readonly Dictionary<string, Dictionary<string, DateTimeOffset>> _leases = []; | ||
| private readonly object _lock = new(); | ||
|
|
||
| public Task<bool> TryAcquireAsync(string userId, string connectionId, int maxConnections, TimeSpan leaseDuration) | ||
| { | ||
| if (maxConnections <= 0) | ||
| return Task.FromResult(false); | ||
|
|
||
| lock (_lock) | ||
| { | ||
| var now = timeProvider.GetUtcNow(); | ||
| if (!_leases.TryGetValue(userId, out var userLeases)) | ||
| { | ||
| userLeases = []; | ||
| _leases[userId] = userLeases; | ||
| } | ||
|
|
||
| RemoveExpired(userLeases, now); | ||
| if (!userLeases.ContainsKey(connectionId) && userLeases.Count >= maxConnections) | ||
| return Task.FromResult(false); | ||
|
|
||
| userLeases[connectionId] = now + leaseDuration; | ||
| return Task.FromResult(true); | ||
| } | ||
| } | ||
|
|
||
| public Task<bool> RenewAsync(string userId, string connectionId, TimeSpan leaseDuration) | ||
| { | ||
| lock (_lock) | ||
| { | ||
| var now = timeProvider.GetUtcNow(); | ||
| if (!_leases.TryGetValue(userId, out var userLeases)) | ||
| return Task.FromResult(false); | ||
|
|
||
| RemoveExpired(userLeases, now); | ||
| if (!userLeases.ContainsKey(connectionId)) | ||
| return Task.FromResult(false); | ||
|
|
||
| userLeases[connectionId] = now + leaseDuration; | ||
| return Task.FromResult(true); | ||
| } | ||
| } | ||
|
|
||
| public Task ReleaseAsync(string userId, string connectionId) | ||
| { | ||
| lock (_lock) | ||
| { | ||
| if (_leases.TryGetValue(userId, out var userLeases)) | ||
| { | ||
| userLeases.Remove(connectionId); | ||
| if (userLeases.Count is 0) | ||
| _leases.Remove(userId); | ||
| } | ||
| } | ||
|
|
||
| return Task.CompletedTask; | ||
| } | ||
|
|
||
| private static void RemoveExpired(Dictionary<string, DateTimeOffset> leases, DateTimeOffset now) | ||
| { | ||
| foreach (string connectionId in leases.Where(pair => pair.Value <= now).Select(pair => pair.Key).ToArray()) | ||
| leases.Remove(connectionId); | ||
| } | ||
| } | ||
|
|
||
| public sealed class ConnectionLeaseStoreException(string message, Exception innerException) : Exception(message, innerException); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
src/Exceptionless.Insulation/Redis/RedisConnectionLeaseStore.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| using Exceptionless.Core; | ||
| using Exceptionless.Core.Utility; | ||
| using StackExchange.Redis; | ||
|
|
||
| namespace Exceptionless.Insulation.Redis; | ||
|
|
||
| public sealed class RedisConnectionLeaseStore : IConnectionLeaseStore | ||
| { | ||
| private const string AcquireScript = """ | ||
| local now = redis.call('TIME') | ||
| local now_ms = (now[1] * 1000) + math.floor(now[2] / 1000) | ||
| redis.call('ZREMRANGEBYSCORE', KEYS[1], '-inf', now_ms) | ||
| if redis.call('ZSCORE', KEYS[1], ARGV[1]) then | ||
| redis.call('ZADD', KEYS[1], now_ms + ARGV[3], ARGV[1]) | ||
| redis.call('PEXPIRE', KEYS[1], ARGV[3] * 2) | ||
| return 1 | ||
| end | ||
| if redis.call('ZCARD', KEYS[1]) >= tonumber(ARGV[2]) then return 0 end | ||
| redis.call('ZADD', KEYS[1], now_ms + ARGV[3], ARGV[1]) | ||
| redis.call('PEXPIRE', KEYS[1], ARGV[3] * 2) | ||
| return 1 | ||
| """; | ||
| private const string RenewScript = """ | ||
| local now = redis.call('TIME') | ||
| local now_ms = (now[1] * 1000) + math.floor(now[2] / 1000) | ||
| local expires = redis.call('ZSCORE', KEYS[1], ARGV[1]) | ||
| if not expires or tonumber(expires) <= now_ms then | ||
| redis.call('ZREM', KEYS[1], ARGV[1]) | ||
| return 0 | ||
| end | ||
| redis.call('ZADD', KEYS[1], now_ms + ARGV[2], ARGV[1]) | ||
| redis.call('PEXPIRE', KEYS[1], ARGV[2] * 2) | ||
| return 1 | ||
| """; | ||
| private readonly IConnectionMultiplexer _multiplexer; | ||
| private readonly string _keyPrefix; | ||
|
|
||
| public RedisConnectionLeaseStore(IConnectionMultiplexer multiplexer, AppOptions options) | ||
| { | ||
| _multiplexer = multiplexer; | ||
| _keyPrefix = $"PushLease:{options.AppScope}:"; | ||
| } | ||
|
|
||
| public async Task<bool> TryAcquireAsync(string userId, string connectionId, int maxConnections, TimeSpan leaseDuration) | ||
| { | ||
| try | ||
| { | ||
| var result = await Database.ScriptEvaluateAsync(AcquireScript, [GetKey(userId)], [connectionId, maxConnections, (long)leaseDuration.TotalMilliseconds]); | ||
| return (long)result == 1; | ||
| } | ||
| catch (RedisException ex) | ||
| { | ||
| throw new ConnectionLeaseStoreException("Unable to acquire a push connection lease.", ex); | ||
| } | ||
| } | ||
|
|
||
| public async Task<bool> RenewAsync(string userId, string connectionId, TimeSpan leaseDuration) | ||
| { | ||
| try | ||
| { | ||
| var result = await Database.ScriptEvaluateAsync(RenewScript, [GetKey(userId)], [connectionId, (long)leaseDuration.TotalMilliseconds]); | ||
| return (long)result == 1; | ||
| } | ||
| catch (RedisException ex) | ||
| { | ||
| throw new ConnectionLeaseStoreException("Unable to renew a push connection lease.", ex); | ||
| } | ||
| } | ||
|
|
||
| public async Task ReleaseAsync(string userId, string connectionId) | ||
| { | ||
| try | ||
| { | ||
| await Database.SortedSetRemoveAsync(GetKey(userId), connectionId); | ||
| } | ||
| catch (RedisException ex) | ||
| { | ||
| throw new ConnectionLeaseStoreException("Unable to release a push connection lease.", ex); | ||
| } | ||
| } | ||
|
|
||
| private IDatabase Database => _multiplexer.GetDatabase(); | ||
| private RedisKey GetKey(string userId) => _keyPrefix + userId; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
src/Exceptionless.Web/ClientApp.angular/components/websocket/websocket-service.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.