Skip to content

[0.76] Refactor WebSocket resource class #14401

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

Merged
JunielKatarn merged 4 commits into from
Mar 10, 2025
Merged

[0.76] Refactor WebSocket resource class #14401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58fbcc1
Refactor WebSocket resource class (#14377)
JunielKatarn Mar 6, 2025
95594cf
Change files
JunielKatarn Mar 7, 2025
f9b5e8f
Prevent race condition in ConnectSucceeds WS unit test (#14405)
JunielKatarn Mar 7, 2025
ef0e580
Remove change file
JunielKatarn Mar 7, 2025
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
20 changes: 18 additions & 2 deletions .ado/jobs/desktop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,34 @@ jobs:
#12714 - Disable for first deployment of test website.
# RNTesterIntegrationTests::WebSocket
# RNTesterIntegrationTests::WebSocketBlob
##13897 - Reneable RNTesterIntegrationTests
# RNTesterIntegrationTests::WebSocketMultipleSend
#14217 - Reenable RNTesterIntegrationTests
# RNTesterIntegrationTests::Dummy
# RNTesterIntegrationTests::Fetch
# RNTesterIntegrationTests::XHRSample
# RNTesterIntegrationTests::Blob
# RNTesterIntegrationTests::Logging
# - CI agents show the following server-side errors (local runs succeed):
# - [0x801901f4] Internal server error (500).
# - [0x800710dd] The operation identifier is not valid.
# WebSocketIntegrationTest::ConnectClose)&
# WebSocketIntegrationTest::ConnectNoClose)&
# WebSocketIntegrationTest::SendReceiveClose)&
# WebSocketIntegrationTest::SendConsecutive)&
# WebSocketIntegrationTest::SendReceiveLargeMessage)&
# WebSocketIntegrationTest::SendReceiveSsl)&
- name: Desktop.IntegrationTests.Filter
value: >
(FullyQualifiedName!=RNTesterIntegrationTests::IntegrationTestHarness)&
(FullyQualifiedName!=RNTesterIntegrationTests::WebSocket)&
(FullyQualifiedName!=RNTesterIntegrationTests::WebSocketBlob)&
(FullyQualifiedName!=WebSocketIntegrationTest::SendReceiveSsl)&
(FullyQualifiedName!=RNTesterIntegrationTests::WebSocketMultipleSend)&
(FullyQualifiedName!=Microsoft::React::Test::WebSocketIntegrationTest::ConnectClose)&
(FullyQualifiedName!=Microsoft::React::Test::WebSocketIntegrationTest::ConnectNoClose)&
(FullyQualifiedName!=Microsoft::React::Test::WebSocketIntegrationTest::SendReceiveClose)&
(FullyQualifiedName!=Microsoft::React::Test::WebSocketIntegrationTest::SendConsecutive)&
(FullyQualifiedName!=Microsoft::React::Test::WebSocketIntegrationTest::SendReceiveLargeMessage)&
(FullyQualifiedName!=Microsoft::React::Test::WebSocketIntegrationTest::SendReceiveSsl)&
(FullyQualifiedName!=Microsoft::React::Test::HttpOriginPolicyIntegrationTest)&
(FullyQualifiedName!=RNTesterIntegrationTests::Dummy)&
(FullyQualifiedName!=RNTesterIntegrationTests::Fetch)&
Expand Down
7 changes: 7 additions & 0 deletions change/@office-iss-react-native-win32-078eec51-449b-430a-ae08-f0e34b8e418d.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Refactor WebSocket resource class (#14377)",
"packageName": "@office-iss/react-native-win32",
"email": "julio.rocha@microsoft.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/react-native-windows-f6e35b31-cc4b-4e12-a1e6-1ea862eb94ff.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Refactor WebSocket resource class (#14377)",
"packageName": "react-native-windows",
"email": "julio.rocha@microsoft.com",
"dependentChangeType": "patch"
}
2 changes: 1 addition & 1 deletion packages/@office-iss/react-native-win32/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@
"engines": {
"node": ">= 18"
}
}
}
2 changes: 1 addition & 1 deletion vnext/Desktop.ABITests/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,4 +192,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion vnext/Desktop.DLL/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,4 @@
}
}
}
}
}
12 changes: 12 additions & 0 deletions vnext/Desktop.IntegrationTests/RNTesterIntegrationTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ TEST_MODULE_INITIALIZE(InitModule) {
using Microsoft::React::SetRuntimeOptionBool;

SetRuntimeOptionBool("WebSocket.AcceptSelfSigned", true);
SetRuntimeOptionBool("WebSocket.ResourceV2", true); // Use WinRTWebSocketResource2

// WebSocketJSExecutor can't register native log hooks.
SetRuntimeOptionBool("RNTester.UseWebDebugger", false);
Expand Down Expand Up @@ -215,6 +216,17 @@ TEST_CLASS (RNTesterIntegrationTests) {
Assert::AreEqual(TestStatus::Passed, result.Status, result.Message.c_str());
}

///
// This test currently fails (skipped in CI).
// Sending multiple messages in sequence and immediately closing does not comply with the behavior described in
// https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close
BEGIN_TEST_METHOD_ATTRIBUTE(WebSocketMultipleSend)
END_TEST_METHOD_ATTRIBUTE()
TEST_METHOD(WebSocketMultipleSend) {
auto result = m_runner.RunTest("IntegrationTests/WebSocketMultipleSendTest", "WebSocketMultipleSendTest");
Assert::AreEqual(TestStatus::Passed, result.Status, result.Message.c_str());
}

BEGIN_TEST_METHOD_ATTRIBUTE(Blob)
END_TEST_METHOD_ATTRIBUTE()
TEST_METHOD(Blob) {
Expand Down
Loading