From 1894f5acd9972a681865f5a1b6422bd24529039c Mon Sep 17 00:00:00 2001 From: Tyler Yankee Date: Thu, 20 Nov 2025 09:16:07 -0500 Subject: [PATCH] [workspace] Upgrade usockets_internal and uwebsockets_internal Remove the version pin due to upstream regression to enable future upgrades, and remove a patch which has been released upstream. --- tools/workspace/new_release.py | 2 -- .../usockets_internal/repository.bzl | 8 ++--- .../patches/upstream/pr1828.patch | 30 ------------------- .../uwebsockets_internal/repository.bzl | 11 +++---- 4 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 tools/workspace/uwebsockets_internal/patches/upstream/pr1828.patch diff --git a/tools/workspace/new_release.py b/tools/workspace/new_release.py index f82a7fc27d95..a368c7e23b83 100644 --- a/tools/workspace/new_release.py +++ b/tools/workspace/new_release.py @@ -67,8 +67,6 @@ "clang_cindex_python3_internal", # Uses a non-default branch. "mosek", # Requires special, non-automated care during upgrades. "pybind11", # Uses a non-default branch. - "usockets_internal", # Pinned due to upstream regression. - "uwebsockets_internal", # Pinned due to upstream regression. ] # These repositories cannot be auto-upgraded. When checking for new releases, diff --git a/tools/workspace/usockets_internal/repository.bzl b/tools/workspace/usockets_internal/repository.bzl index fbfd406710f2..f0a30d0335db 100644 --- a/tools/workspace/usockets_internal/repository.bzl +++ b/tools/workspace/usockets_internal/repository.bzl @@ -10,11 +10,11 @@ def usockets_internal_repository( # of this cohort should be updated at the same time. repository = "uNetworking/uSockets", upgrade_advice = """ - NOTE: Do not upgrade without testing the tutorials on Deepnote. See - Drake #18289. v0.8.5 was tested and showed the same symptoms. + NOTE: Do not upgrade without testing the tutorials on Deepnote. See + #18289. """, - commit = "v0.8.1", - sha256 = "3b33b5924a92577854e2326b3e2d393849ec00beb865a1271bf24c0f210cc1d6", # noqa + commit = "v0.8.8", + sha256 = "d14d2efe1df767dbebfb8d6f5b52aa952faf66b30c822fbe464debaa0c5c0b17", # noqa build_file = ":package.BUILD.bazel", mirrors = mirrors, ) diff --git a/tools/workspace/uwebsockets_internal/patches/upstream/pr1828.patch b/tools/workspace/uwebsockets_internal/patches/upstream/pr1828.patch deleted file mode 100644 index dcbf4db18e37..000000000000 --- a/tools/workspace/uwebsockets_internal/patches/upstream/pr1828.patch +++ /dev/null @@ -1,30 +0,0 @@ -[uwebsockets] Cherry-pick of https://github.com/uNetworking/uWebSockets/pull/1828 - -We can drop this patch once we upgrade to a release that contains it. - -From: Jeremy Nimmer -Date: Tue, 31 Dec 2024 06:46:22 -0800 -Subject: [PATCH] Switch error message strings to constexpr - -This changes their linkage so that files which include this header -will avoid having unnecessary static global constructors. - ---- src/WebSocketProtocol.h -+++ src/WebSocketProtocol.h -@@ -28,11 +28,11 @@ - namespace uWS { - - /* We should not overcomplicate these */ --const std::string_view ERR_TOO_BIG_MESSAGE("Received too big message"); --const std::string_view ERR_WEBSOCKET_TIMEOUT("WebSocket timed out from inactivity"); --const std::string_view ERR_INVALID_TEXT("Received invalid UTF-8"); --const std::string_view ERR_TOO_BIG_MESSAGE_INFLATION("Received too big message, or other inflation error"); --const std::string_view ERR_INVALID_CLOSE_PAYLOAD("Received invalid close payload"); -+constexpr std::string_view ERR_TOO_BIG_MESSAGE("Received too big message"); -+constexpr std::string_view ERR_WEBSOCKET_TIMEOUT("WebSocket timed out from inactivity"); -+constexpr std::string_view ERR_INVALID_TEXT("Received invalid UTF-8"); -+constexpr std::string_view ERR_TOO_BIG_MESSAGE_INFLATION("Received too big message, or other inflation error"); -+constexpr std::string_view ERR_INVALID_CLOSE_PAYLOAD("Received invalid close payload"); - - enum OpCode : unsigned char { - CONTINUATION = 0, diff --git a/tools/workspace/uwebsockets_internal/repository.bzl b/tools/workspace/uwebsockets_internal/repository.bzl index 8c07691904e2..7bae74f09b2c 100644 --- a/tools/workspace/uwebsockets_internal/repository.bzl +++ b/tools/workspace/uwebsockets_internal/repository.bzl @@ -10,14 +10,11 @@ def uwebsockets_internal_repository( # of this cohort should be updated at the same time. repository = "uNetworking/uWebSockets", upgrade_advice = """ - NOTE: Do not upgrade without testing the tutorials on Deepnote. See - Drake #18289. v20.35.0 was tested and showed the same symptoms. + NOTE: Do not upgrade without testing the tutorials on Deepnote. See + #18289. """, - commit = "v20.14.0", - sha256 = "15cf995844a930c9a36747e8d714b94ff886b6814b5d4e3b3ee176f05681cccc", # noqa + commit = "v20.74.0", + sha256 = "e1d9c99b8e87e78a9aaa89ca3ebaa450ef0ba22304d24978bb108777db73676c", # noqa build_file = ":package.BUILD.bazel", - patches = [ - ":patches/upstream/pr1828.patch", - ], mirrors = mirrors, )