feat(websockets): migrate WebSocket stack to data-access and react to site CRUD events

[fmontes]

TL;DR

Builds a new native WebSocket stack in @dotcms/data-access, wires it into the app to react to site CRUD events and toolbar navigation, then removes the entire legacy DotcmsEventsService / dotcms-js WebSocket layer — so only one connection to /api/ws/v1/system/events ever runs.

---

What changed

New WebSocket stack (libs/data-access + libs/global-store)

• DotEventsSocket — native WebSocket only (long-polling dropped; all modern browsers support WS), exponential backoff with jitter, typed on<T>(eventType) API, reactive status$() stream
• withWebSocket() NgRx signal store feature — manages connection lifecycle at app init via provideAppInitializer, exposes wsStatus signal and typed event observables: switchSiteEvent$, portletLayoutUpdated$, siteEvents$

Site CRUD reactions

• DotSiteComponent debounces list refresh on any site WebSocket event; auto-switches to default site when the selected site is archived, stopped, or deleted
• Java SystemEventType.UN_PUBLISH_SITE added — was missing, causing stop-site events to be silently swallowed
• Toolbar reacts to SWITCH_SITE event via DotSiteNavigationEffect (extracted from toolbar component)

Migration of all DotcmsEventsService consumers

Replaced subscribeTo() / subscribeToEvents() with DotEventsSocket.on<T>() or GlobalStore event streams in:

• DotMessageDisplayService
• DotToolbarNotificationsComponent (also fixed missing takeUntilDestroyed memory leak)
• DotLargeMessageDisplayComponent
• IframeComponent / IframePortletLegacyComponent
• LoginService — SESSION_DESTROYED / SESSION_LOGOUT
• RoutingService — UPDATE_PORTLET_LAYOUTS
• DotPluginsListStore — OSGI_FRAMEWORK_RESTART / OSGI_BUNDLES_LOADED / OSGI_BUNDLES_UPLOAD_FAILED
• SiteService — event subscriptions removed (data API and class kept; @deprecated)

Deleted — entire legacy WebSocket layer

• DotcmsEventsService and its subscribeTo() / subscribeToEvents() API
• DotEventsSocket (dotcms-js version), DotEventsSocketURL injection token, dotEventSocketURLFactory
• WebSocketProtocol, LongPollingProtocol, Protocol, DotWebSocketConfig
• DotcmsEventsServiceMock from @dotcms/utils-testing
• All associated spec files and barrel exports from @dotcms/dotcms-js
• ~60 spec files cleaned of dead provider mocks

---

Test plan

• WebSocket connects on app load; no status indicator shown when connected
• Stop/archive/delete the currently selected site — site selector switches to default site
• Publish/update a site — site list refreshes (debounced ~300ms)
• Navigate portlets — menu reloads on UPDATE_PORTLET_LAYOUTS event
• Kill and restart dotCMS server — UI reconnects automatically (reconnecting indicator visible)
• yarn nx test data-access passes
• yarn nx test global-store passes
• yarn nx test portlets-dot-plugins-portlet passes

🤖 Generated with Claude Code

[github-actions]

❌ Issue Linking Required

This PR could not be linked to an issue. All PRs must be linked to an issue for tracking purposes.

How to fix this:

Option 1: Add keyword to PR body (Recommended - auto-removes this comment)
Edit this PR description and add one of these lines:

• This PR fixes #123 or Fixes: #123

• This PR closes #123 or Closes: #123

• This PR resolves #123 or Resolves: #123

• Other supported keywords: fix, fixed, close, closed, resolve, resolved
  Option 2: Link via GitHub UI (Note: won't clear the failed check)

1. Go to the PR → Development section (right sidebar)

2. Click "Link issue" and select an existing issue

3. Push a new commit or re-run the workflow to clear the failed check
   Option 3: Use branch naming
   Create a new branch with one of these patterns:

• 123-feature-description (number at start)

• issue-123-feature-description (issue-number at start)

• feature-issue-123 (issue-number anywhere)

Why is this required?

Issue linking ensures proper tracking, documentation, and helps maintain project history. It connects your code changes to the problem they solve.---

This comment was automatically generated by the issue linking workflow

[claude]

Claude finished @fmontes's task in 2m 37s —— View job

---

PR Review

Large, well-structured migration. The core WebSocket architecture is sound. Issues below are ordered by severity.

---

🔴 switchCurrentSite swallows errors permanently

store.ts lines 149–158: switchCurrentSite chains with tap but has no catchError or tapResponse. If either switchSite() or the subsequent getCurrentSite() throws (network hiccup, 403, etc.), the rxMethod's inner observable completes with an error and is not retried — all future calls to switchCurrentSite() silently do nothing until the store is re-created.

Compare to loadCurrentSite on lines 125–141 which correctly wraps in tapResponse. Same fix needed here.

switchCurrentSite: rxMethod<string>(
    pipe(
        switchMap((identifier) =>
            siteService.switchSite(identifier).pipe(
                switchMap(() => siteService.getCurrentSite()),
                tapResponse({
                    next: (siteDetails) => patchState(store, { siteDetails }),
                    error: (err) => console.warn('Error switching site:', err)
                })
            )
        )
    )
)

Fix this →

---

🔴 syncSiteOnSwitchEvent can write undefined into the store

with-websocket.feature.ts line 92: switchSiteEvent$() calls eventsSocket.on<DotSite>('SWITCH_SITE'), which maps msg.payload?.data as DotSite. If a SWITCH_SITE event arrives without payload.data (malformed event, or a future backend change), the cast silently emits undefined. Then syncSiteOnSwitchEvent calls:

tap((site) => patchState(store, { siteDetails: site }))

This overwrites siteDetails with undefined, breaking the DotSite | null contract. Every downstream caller that does siteDetails()?.identifier survives, but code doing siteDetails()! or reading fields directly will throw.

Add a guard: either filter((site): site is DotSite => site != null) in switchSiteEvent$(), or a null-check before patchState in syncSiteOnSwitchEvent.

Fix this →

---

🟡 DotNavigationService — new portletLayoutUpdated$() subscription has no teardown

dot-navigation.service.ts lines 82–96 (new in this PR):

this.#globalStore
    .portletLayoutUpdated$()
    .pipe(switchMap(() => this.dotMenuService.reloadMenu().pipe(take(1))))
    .subscribe(...);

No takeUntilDestroyed() or DestroyRef cleanup. The other constructor subscriptions on lines 33, 48, and 98 are pre-existing patterns, but this one is new. In tests that reinstantiate DotNavigationService via TestBed, each run adds a lingering subscription to the menu reload stream.

Fix this →

---

🟡 providers.ts — DotSiteNavigationEffect registered twice

Lines 143–144:

DotSiteNavigationEffect,
provideAppInitializer(() => void inject(DotSiteNavigationEffect))

DotSiteNavigationEffect is providedIn: 'root', so it's a singleton. Listing it in the PROVIDERS array forces eager instantiation — the provideAppInitializer then does the same thing redundantly. The constructor runs once, the subscription is created once, so this isn't a bug. But the intent is unclear — either the plain listing or the provideAppInitializer is the real mechanism; having both makes it hard to reason about. Consider keeping only provideAppInitializer.

---

🟡 DotcmsEventsService.subscribeToEvents inner subscription leak (acknowledged, but worth tracking)

dotcms-events.service.ts lines 42–51: Each call to subscribeToEvents() creates N inner subscriptions via this.subscribeTo<T>(eventType).subscribe(...) that are never unsubscribed when the returned Observable is unsubscribed. The only active caller that matters here is LoginService which uses subscribeTo() (not subscribeToEvents()), so there's no live leak right now. But any code that still calls subscribeToEvents() will leak on every call. Confirmed this is deferred to a cleanup ticket — just flagging that the leak accumulates, not just persists.

---

ℹ️ Minor observations (no action needed)

• on<T>() type cast (dot-events-socket.service.ts line 70): msg.payload?.data as T where T is void or undefined-tolerant is fine for the existing usages. The guard issue above is the only dangerous case.
• withWebSocket spec doesn't mock messages() (with-websocket.feature.spec.ts): feedLegacyEventBus calls eventsSocket.messages() in onInit, but the mock only provides on. This means feedLegacyEventBus will throw mockEventsSocket.messages is not a function unless the mock also mocks messages. Either the spec is missing this, or feedLegacyEventBus fails silently in tests. Worth verifying yarn nx test global-store still passes.
• SWITCH_SITE feedback loop: switchCurrentSite() → calls siteService.switchSite() → server may fire a SWITCH_SITE WS event → syncSiteOnSwitchEvent sets siteDetails again to the same value. Redundant but not incorrect, assuming the backend sends the same site that was just switched to.

[Copilot]

Pull request overview

Migrates the admin UI’s system-events WebSocket integration from the legacy @dotcms/dotcms-js stack to a new native DotEventsSocket in @dotcms/data-access, then wires app behavior (site CRUD + navigation/menu refresh) off typed socket streams and GlobalStore helpers to ensure only one /api/ws/v1/system/events connection is active.

Changes:

• Added a new native WebSocket client (DotEventsSocket) in @dotcms/data-access with reconnection + typed on<T>() API.
• Introduced withWebSocket() GlobalStore feature to own socket lifecycle + expose common event streams (switchSiteEvent$, portletLayoutUpdated$, etc.).
• Removed legacy WebSocket/long-polling protocol layer and updated app/services/specs to use the new socket/global-store streams; added missing backend UN_PUBLISH_SITE enum.

Reviewed changes

Copilot reviewed 93 out of 93 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
dotCMS/src/main/java/com/dotcms/api/system/event/SystemEventType.java	Adds missing site stop/unpublish system event enum.
core-web/libs/utils-testing/src/lib/dotcms-events-service.mock.ts	Removes legacy events-service mock.
core-web/libs/utils-testing/src/index.ts	Stops exporting removed legacy events-service mock.
core-web/libs/ui/src/lib/components/dot-theme/dot-theme.component.spec.ts	Updates tests to mock DotEventsSocket instead of legacy events service.
core-web/libs/ui/src/lib/components/dot-site/dot-site.component.ts	Switches site selector refresh logic to DotEventsSocket and handles unavailable-site events.
core-web/libs/ui/src/lib/components/dot-site/dot-site.component.spec.ts	Adds coverage for site WebSocket event reactions using DotEventsSocket mocks.
core-web/libs/template-builder/src/lib/components/template-builder/template-builder.component.spec.ts	Removes legacy events service provider usage in tests.
core-web/libs/template-builder/src/lib/components/template-builder/components/template-builder-actions/template-builder-actions.component.spec.ts	Removes legacy events service provider usage in tests.
core-web/libs/portlets/edit-ema/portlet/src/lib/services/dot-ema-workflow-actions/dot-ema-workflow-actions.service.spec.ts	Removes legacy socket URL factory/provider from tests.
core-web/libs/portlets/edit-ema/portlet/src/lib/edit-ema-editor/edit-ema-editor.component.spec.ts	Removes legacy events service mock/provider from tests.
core-web/libs/portlets/edit-ema/portlet/src/lib/dot-ema-shell/dot-ema-shell.component.spec.ts	Removes legacy events service mock/provider from tests.
core-web/libs/portlets/edit-ema/portlet/src/lib/components/dot-ema-dialog/dot-ema-dialog.component.spec.ts	Removes legacy events service mock/provider from tests.
core-web/libs/portlets/dot-plugins/src/lib/dot-plugins-list/store/dot-plugins-list.store.ts	Migrates OSGi event subscriptions to DotEventsSocket.on().
core-web/libs/portlets/dot-plugins/src/lib/dot-plugins-list/store/dot-plugins-list.store.spec.ts	Updates store tests to mock DotEventsSocket.on().
core-web/libs/portlets/dot-plugins/src/lib/dot-plugins-list/dot-plugins-list.component.spec.ts	Updates component tests to mock DotEventsSocket.
core-web/libs/portlets/dot-experiments/portlet/src/lib/dot-experiments-list/dot-experiments-list.component.spec.ts	Removes legacy events service mock/provider from tests.
core-web/libs/global-store/src/lib/store.ts	Adds withWebSocket() feature and new switchCurrentSite() method; syncs site on SWITCH_SITE events.
core-web/libs/global-store/src/lib/store.spec.ts	Updates tests for new switchCurrentSite() and SWITCH_SITE socket syncing.
core-web/libs/global-store/src/lib/features/with-websocket/with-websocket.feature.ts	New feature to start/destroy socket and expose common event observables.
core-web/libs/global-store/src/lib/features/with-websocket/with-websocket.feature.spec.ts	Adds tests for withWebSocket() lifecycle + status signal updates.
core-web/libs/global-store/src/index.ts	Re-exports WebSocketStatus for consumers.
core-web/libs/edit-content/src/lib/components/dot-edit-content-form/dot-edit-content-form.component.spec.ts	Updates GlobalStore mock API to remove setCurrentSite.
core-web/libs/dotcms-js/src/public_api.ts	Removes exports for legacy websocket stack types.
core-web/libs/dotcms-js/src/lib/core/util/websockets-protocol.ts	Deletes legacy WebSocket protocol implementation.
core-web/libs/dotcms-js/src/lib/core/util/websockets-protocol.spec.ts	Deletes tests for legacy WebSocket protocol.
core-web/libs/dotcms-js/src/lib/core/util/models/dot-event-socket-url.ts	Deletes legacy socket URL model.
core-web/libs/dotcms-js/src/lib/core/util/long-polling-protocol.ts	Deletes legacy long-polling protocol.
core-web/libs/dotcms-js/src/lib/core/util/long-polling-protocol.spec.ts	Deletes tests for legacy long-polling protocol.
core-web/libs/dotcms-js/src/lib/core/util/dot-event-socket.ts	Deletes legacy event socket implementation.
core-web/libs/dotcms-js/src/lib/core/util/dot-event-socket.spec.ts	Deletes tests for legacy event socket.
core-web/libs/dotcms-js/src/lib/core/site.service.ts	Removes websocket-based site event wiring from legacy SiteService.
core-web/libs/dotcms-js/src/lib/core/login.service.ts	Keeps legacy event subscriptions but removes socket start side-effect.
core-web/libs/dotcms-js/src/lib/core/dotcms-events.service.ts	Refactors to a deprecated Subject-only bus fed externally (no socket logic).
core-web/libs/dot-rules/src/lib/rule-engine.module.ts	Removes legacy events service from module providers.
core-web/libs/data-access/src/lib/dot-workflow-event-handler/dot-workflow-event-handler.service.spec.ts	Removes legacy socket URL factory/provider from tests.
core-web/libs/data-access/src/lib/dot-websocket/dot-events-socket.service.ts	Adds new native WebSocket client with reconnect + status stream.
core-web/libs/data-access/src/lib/dot-websocket/dot-events-socket.service.spec.ts	Adds tests for DotEventsSocket connection, filtering, and reconnection behavior.
core-web/libs/data-access/src/lib/dot-websocket/dot-event-message.model.ts	Adds typed model for raw system-event messages.
core-web/libs/data-access/src/lib/dot-message-display/dot-message-display.service.ts	Migrates MESSAGE handling to DotEventsSocket.on().
core-web/libs/data-access/src/lib/dot-message-display/dot-message-display.service.spec.ts	Updates tests to emit messages through DotEventsSocket mock.
core-web/libs/data-access/src/index.ts	Exposes new websocket services/models from @dotcms/data-access.
core-web/apps/dotcms-ui/src/app/view/components/main-legacy/main-legacy.component.spec.ts	Removes legacy events socket/providers from tests.
core-web/apps/dotcms-ui/src/app/view/components/dot-workflow-task-detail/dot-workflow-task-detail.component.spec.ts	Removes legacy events socket/providers from tests.
core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/dot-toolbar.spec.ts	Updates toolbar tests for GlobalStore site switching and new navigation effect wiring.
core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/dot-toolbar.component.ts	Simplifies site switching to GlobalStore.switchCurrentSite() and removes legacy event wiring.
core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/dot-toolbar.component.html	Binds site selector value via $currentSite() signal.
core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-user/store/dot-toolbar-user.store.spec.ts	Removes legacy events socket/providers from tests.
core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-notifications/dot-toolbar-notifications.component.ts	Migrates NOTIFICATION subscription to DotEventsSocket.on() and bounds list size.
core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-notifications/components/dot-notification-item/dot-notification-item.component.spec.ts	Removes legacy events socket/providers from tests.
core-web/apps/dotcms-ui/src/app/view/components/dot-persona-selector/dot-persona-selector.component.spec.ts	Removes legacy events service provider usage in tests.
core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/services/dot-navigation.service.ts	Moves UPDATE_PORTLET_LAYOUTS handling to GlobalStore portletLayoutUpdated$().
core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/services/dot-navigation.service.spec.ts	Removes legacy events service mock and updates to new GlobalStore wiring.
core-web/apps/dotcms-ui/src/app/view/components/dot-navigation/components/dot-sub-nav/dot-sub-nav.component.spec.ts	Adjusts GlobalStore provisioning in tests.
core-web/apps/dotcms-ui/src/app/view/components/dot-large-message-display/dot-large-message-display.component.ts	Migrates LARGE_MESSAGE subscription to DotEventsSocket.on().
core-web/apps/dotcms-ui/src/app/view/components/dot-large-message-display/dot-large-message-display.component.spec.ts	Updates tests to drive LARGE_MESSAGE via DotEventsSocket mock.
core-web/apps/dotcms-ui/src/app/view/components/dot-iframe-dialog/dot-iframe-dialog.component.spec.ts	Removes legacy events socket/providers from tests.
core-web/apps/dotcms-ui/src/app/view/components/dot-contentlet-editor/components/dot-reorder-menu/dot-reorder-menu.component.spec.ts	Removes legacy events service provider usage in tests.
core-web/apps/dotcms-ui/src/app/view/components/dot-contentlet-editor/components/dot-create-contentlet/dot-create-contentlet.component.spec.ts	Removes legacy events service mock/provider from tests.
core-web/apps/dotcms-ui/src/app/view/components/dot-contentlet-editor/components/dot-contentlet-wrapper/dot-contentlet-wrapper.component.spec.ts	Removes legacy events socket/providers from tests.
core-web/apps/dotcms-ui/src/app/view/components/dot-contentlet-editor/components/dot-add-contentlet/dot-add-contentlet.component.spec.ts	Removes legacy events socket/providers from tests.
core-web/apps/dotcms-ui/src/app/view/components/dot-add-persona-dialog/dot-add-persona-dialog.component.spec.ts	Removes legacy events service provider usage in tests.
core-web/apps/dotcms-ui/src/app/view/components/_common/iframe/iframe-porlet-legacy/iframe-porlet-legacy.component.ts	Switches site-change reaction to GlobalStore and AI prompt to DotEventsSocket.
core-web/apps/dotcms-ui/src/app/view/components/_common/iframe/iframe-porlet-legacy/iframe-porlet-legacy.component.spec.ts	Updates tests to provide DotEventsSocket from data-access.
core-web/apps/dotcms-ui/src/app/view/components/_common/iframe/iframe-component/iframe.component.ts	Replaces legacy multi-event subscription with merged DotEventsSocket.on() streams.
core-web/apps/dotcms-ui/src/app/view/components/_common/iframe/iframe-component/iframe.component.spec.ts	Updates tests to drive iframe reload events via DotEventsSocket mock subjects.
core-web/apps/dotcms-ui/src/app/view/components/_common/dot-wizard/dot-wizard.component.spec.ts	Removes legacy events service provider usage in tests.
core-web/apps/dotcms-ui/src/app/test/dot-test-bed.ts	Removes legacy socket URL factory and legacy websocket providers from shared test bed.
core-web/apps/dotcms-ui/src/app/shared/shared.module.ts	Removes legacy websocket providers from shared module.
core-web/apps/dotcms-ui/src/app/providers.ts	Removes legacy websocket providers; eagerly provides DotSiteNavigationEffect.
core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-listing/components/dot-content-type-copy-dialog/dot-content-type-copy-dialog.component.spec.ts	Removes legacy events service provider usage in tests.
core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/layout/content-types-layout.component.spec.ts	Removes legacy events service provider usage in tests.
core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/form/content-types-form.component.spec.ts	Removes legacy events service provider usage in tests.
core-web/apps/dotcms-ui/src/app/portlets/shared/dot-content-types-edit/components/fields/content-type-fields-drop-zone/content-type-fields-drop-zone.component.spec.ts	Removes legacy DotEventsSocket (dotcms-js) from test providers.
core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-list/dot-template-list.component.ts	Switches site-change listener to GlobalStore switchSiteEvent$().
core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-list/dot-template-list.component.spec.ts	Updates tests to trigger site changes via GlobalStore stream.
core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-props/dot-template-props.component.spec.ts	Removes legacy events service provider usage in tests.
core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-create-edit.component.ts	Switches site-change listener to GlobalStore switchSiteEvent$().
core-web/apps/dotcms-ui/src/app/portlets/dot-templates/dot-template-create-edit/dot-template-create-edit.component.spec.ts	Updates tests to trigger site changes via GlobalStore stream.
core-web/apps/dotcms-ui/src/app/portlets/dot-porlet-detail/dot-workflow-task/dot-workflow-task.component.spec.ts	Removes legacy events socket/providers from tests.
core-web/apps/dotcms-ui/src/app/portlets/dot-porlet-detail/dot-portlet-detail.component.spec.ts	Removes legacy events socket/providers from tests.
core-web/apps/dotcms-ui/src/app/portlets/dot-porlet-detail/dot-contentlets/dot-contentlets.component.spec.ts	Removes legacy events socket/providers from tests.
core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages-table/dot-pages-table.component.spec.ts	Removes legacy events service provider usage in tests.
core-web/apps/dotcms-ui/src/app/portlets/dot-pages/dot-pages-store/dot-pages.store.spec.ts	Removes legacy events service mock/provider from tests.
core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-properties/dot-container-properties.component.spec.ts	Removes legacy events socket/providers from tests.
core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-create.component.spec.ts	Removes legacy events socket/providers from tests.
core-web/apps/dotcms-ui/src/app/portlets/dot-containers/dot-container-create/dot-container-code/dot-add-variable/dot-add-variable.component.spec.ts	Removes legacy events socket/providers from tests.
core-web/apps/dotcms-ui/src/app/portlets/dot-containers/container-list/container-list.component.ts	Switches site-change listener to GlobalStore switchSiteEvent$().
core-web/apps/dotcms-ui/src/app/portlets/dot-containers/container-list/container-list.component.spec.ts	Updates tests to trigger site changes via GlobalStore stream.
core-web/apps/dotcms-ui/src/app/api/services/dot-site-navigation/dot-site-navigation.effect.ts	Adds app-level effect to navigate away from edit page on SWITCH_SITE events.
core-web/apps/dotcms-ui/src/app/api/services/dot-site-navigation/dot-site-navigation.effect.spec.ts	Adds tests for edit-page navigation behavior on SWITCH_SITE.
core-web/apps/dotcms-ui/src/app/api/services/dot-custom-event-handler/dot-custom-event-handler.service.spec.ts	Removes legacy events socket/providers from tests.
core-web/apps/dotcdn/src/app/app.module.ts	Removes legacy websocket providers from dotcdn app module.

[fmontes]

Fixed in c62d7be on branch claude/review-pr-comments-4tBxM. openSocket() now early-returns when readyState is CONNECTING or OPEN, and connect() cancels any pending reconnect timer before re-opening. CLOSING still falls through and onclose → scheduleReconnect handles it.

---

Generated by Claude Code

[fmontes]

Not fixing. {...undefined} is a no-op spread in ES2018+ — it doesn't throw, it produces {}. The resulting object { event: 'SAVE_SITE' } is then handled safely downstream in refreshSelectedSite which already uses siteData?.identifier !== pinned.identifier (optional chaining) and early-returns on mismatch. So an unexpected payload shape just becomes a no-op, not a crash.

The underlying type concern (payload not always present) is addressed separately by making DotEventMessage.payload optional in c62d7be.

---

Generated by Claude Code

[fmontes]

Fixed in c62d7be. Converted the bare .subscribe() in GlobalStore.onInit into a syncSiteOnSwitchEvent rxMethod (same pattern as loadCurrentSite / trackStatus). Lifetime is now tied to the store — no manual teardown needed, and it's cleaned up between test module teardowns.

---

Generated by Claude Code

[fmontes]

Not fixing in this PR. DotcmsEventsService is already marked @deprecated in this PR, and its only remaining consumers (LoginService, SiteService) are root-scoped / app-lifetime — the inner subscriptions don't leak in practice. Fully migrating LoginService off the legacy bus is explicit follow-up work per the PR description. Leaving as-is; worth tracking as a separate cleanup ticket.

---

Generated by Claude Code

[fmontes]

Review feedback triage — Claude + Copilot

Reviewed all comments from both bots. Fixes pushed to branch claude/review-pr-comments-4tBxM (commit c62d7be) — @fmontes feel free to merge/cherry-pick into fix-websockets-v3.

✅ Fixed

#	Issue	File	Reviewer
1	openSocket() missed OPEN guard — could spawn a second WebSocket if connect() is called while one is already live; also now cancels any pending reconnect timer on manual connect()	dot-events-socket.service.ts	Copilot + Claude #4
2	On switchSite(null) / getSiteById failure, only pinnedOption was cleared — parent form had a stale identifier. Now routes through onSiteChange(null) so the CVA value fires null	dot-site.component.ts	Claude #1
3	DotEventMessage.payload is typed as required but on<T>() already handles it defensively — made payload? and payload.data? optional to match reality	dot-event-message.model.ts	Claude #7
4	GlobalStore.onInit had a bare .subscribe() on switchSiteEvent$() with no teardown. Converted to a lifecycle-tracked rxMethod (consistent with trackStatus / loadCurrentSite)	store.ts	Copilot + Claude #3
5	DotEventsSocket.messages() documented as @internal to discourage bypassing the typed on<T>() API (kept public since withWebSocket() in another package needs it for the legacy bus bridge)	dot-events-socket.service.ts	Claude #8

❌ Not fixing (out of scope / not a real issue)

• Copilot — tagEvent() unsafe spread of undefined data: {...undefined} returns {} in ES2018+ (no throw), and refreshSelectedSite already guards siteData?.identifier !== pinned.identifier via optional chaining. Not a real bug.
• Claude Test Branch and Commit #2 — filter changes dropped while load is in-flight: Pre-existing behavior in the lazy-load logic; not introduced by this PR. Better handled in a separate ticket if observed.
• Claude wezell's issue #5 / test rwqrwqrwqr wq #6 and Copilot — DotcmsEventsService subscription leaks (LoginService, subscribeToEvents): The service is @deprecated and the listed consumers are root-scoped (app-lifetime). Fully migrating LoginService off the legacy bus is explicit follow-up work per the PR description. Leaving as-is; file as cleanup ticket.
• Claude minor items (duplicated siteEvents$ merge logic, HARDCODED_TOTAL_ENTRIES = 501, DotNavigationService subscription): HARDCODED_TOTAL_ENTRIES already has a TODO awaiting API fix. The rest are stylistic refactors or pre-existing patterns — not blockers.

Verification

• yarn nx test data-access ✅ 661 passed
• yarn nx test global-store ✅ 174 passed
• yarn nx test ui ✅ 652 passed
• yarn nx lint data-access global-store ui ✅ clean (5 pre-existing warnings, 0 errors)

---

Generated by Claude Code

[fmontes]

Fixes from the triage above are now pushed directly to fix-websockets-v3 as commit f57a33c. The original branch reference (claude/review-pr-comments-4tBxM) is no longer needed — all 5 accepted review items are in the PR.

---

Generated by Claude Code