mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-07-16 05:43:54 +03:00
[PR #3315] [MERGED] Add MessageId to websocket message, fix ws exception #9444
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/jellyfin/jellyfin/pull/3315
Author: @crobibero
Created: 6/11/2020
Status: ✅ Merged
Merged: 6/15/2020
Merged by: @dkanada
Base:
master← Head:dashboard-update📝 Commits (3)
30609c8Add MessageId to websocket message, add JsonNonStringKeyDictionaryConverter4c0dd10Update MediaBrowser.Common/Json/Converters/JsonNonStringKeyDictionaryConverter.cs5b6e8fbRemove whitespace📊 Changes
5 files changed (+149 additions, -4 deletions)
View changed files
📝
Emby.Server.Implementations/HttpServer/WebSocketConnection.cs(+6 -4)➕
MediaBrowser.Common/Json/Converters/JsonNonStringKeyDictionaryConverter.cs(+82 -0)➕
MediaBrowser.Common/Json/Converters/JsonNonStringKeyDictionaryConverterFactory.cs(+59 -0)📝
MediaBrowser.Common/Json/JsonDefaults.cs(+1 -0)📝
MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs(+1 -0)📄 Description
Changes
Add MessageId to all WebSocket senders.
Add JsonNonStringKeyDictionaryConverter + Factory to handle WS exceptions. Copied from api-migration branch.
Issues
Fixes #3251
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.