feat(apps): add multi-geo Socket Mode supervisor and transport by teddyam · Pull Request #685 · microsoft/teams.net

teddy arida-moody (teddyam) · 2026-09-24T05:39:45Z

Layer 3 of the Socket Mode stack, on top of #683 (SignalR connection) and #682 (protocol). Everything added here is internal: no public API, no App integration, no samples and no docs yet.

Changes

`GeoSocket` — one supervisor per geo

Startup: startup succeeds once one connection reports SocketReady. Failures retry within the startup budget, using the server's Retry-After when it sends one and backoff otherwise. A startup timeout of zero allows exactly one attempt.
Fresh connection per attempt: every attempt and every replacement creates a new connection through ISocketConnectionFactory. Each one carries a generation number, and only the current ready connection or one that is being retired can dispatch activities.
Token rotation (make-before-break): a replacement is scheduled at token lifetime minus a refresh margin, with a 1-second minimum. The old connection keeps dispatching until the replacement is ready. It is then retired after a handoff window (5 seconds). No rotation is scheduled when the token has no lifetime.
Reconnects: an unexpected close emits disconnected, then reconnected. A planned local stop or a rotation does not emit either.
Stop: StopAsync interrupts startup, retry, rotation and retirement work that is still pending. Every connection is stopped and disposed exactly once, and calling it again is safe.

`SocketModeTransport` — top level

Geo resolution: endpoints are {base}/{geo}/v3/websockets/connect. The default geos are amer, emea and apac. An empty geo means the base URL with no geo segment.
Start and stop: every geo starts at once. If any geo fails its initial start, the others are cancelled, everything is stopped and the first error is thrown. Stop tears down all geos.
Status: a combined status (Idle, Connecting, Ready, Disconnected, Stopped) and a per-geo status are tracked internally.
Dispatch:
- Invoke activities get an invoke reply; other activities get an acknowledgement carrying the handler's status.
- If the handler throws, the reply is 500 and an optional error hook is called.
- An envelope with an unsupported protocol version gets a 400.

Tests

The SocketMode filter passes 118/118 on both net8.0 and net10.0. All tests use hand-written fakes, and timing tests use an injected TimeProvider instead of sleeping.

GeoSocketTests cover: startup, retry and Retry-After, reconnect, rotation handoff, rejection of stale generations, stop races, and exactly-once cleanup.
SocketModeTransportTests cover: geo resolution, fail-fast startup, status, and dispatch with its 400 and 500 cases.
SocketModeEndToEndTests run the transport together with the real negotiator from feat(apps): add Socket Mode protocol transport #682 and the real SignalR connection factory from feat(apps): add SignalR Socket Mode connection #683. Only the HTTP responses and the SignalR client are faked.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

azure-pipelines · 2026-09-24T05:39:55Z

Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run.

Copilot

Copilot review overview

🟡 Changes recommended

Four moderate issues remain in token refresh timing, startup failure handling, protocol rejection replies, and stopped geo status reporting.

Get a fresh assessment by requesting another Copilot review.

Review effort: Lite
Findings: 4

Open (4)

Schedule token refresh using the remaining token lifetime · New
Preserve the original startup failure when cleanup throws · New
Mark all geo statuses stopped during lifecycle shutdown · New
Match version-rejection replies to the envelope activity type · New

What changed in this PR

Adds the internal multi-geo Socket Mode supervisor and transport layer.

Changes:

Adds per-geo startup, retries, reconnects, token rotation, and cleanup.
Adds multi-geo routing, lifecycle status, and activity dispatch.
Adds unit and end-to-end test coverage.

File	Summary
`test/Microsoft.Teams.Apps.UnitTests/SocketMode/SocketModeTransportTests.cs`	Tests transport routing, status, startup failures, and dispatch behavior.
`test/Microsoft.Teams.Apps.UnitTests/SocketMode/SocketModeEndToEndTests.cs`	Tests integrated transport, negotiation, and SignalR behavior.
`test/Microsoft.Teams.Apps.UnitTests/SocketMode/GeoSocketTests.cs`	Tests supervision, retries, reconnects, rotation, stale generations, and cleanup.
`src/Microsoft.Teams.Apps/SocketMode/SocketModeTransport.cs`	Implements multi-geo orchestration and dispatch; moderate issues remain with cleanup error propagation, version-rejection reply shape, and stopped per-geo statuses.
`src/Microsoft.Teams.Apps/SocketMode/GeoSocket.cs`	Implements per-geo connection supervision and token rotation; token refresh timing may be incorrect after lengthy startup.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Refactor OnActivity to await readiness before handling activity. Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Adds an internal GeoSocket that keeps one geo connected: initial startup within a monotonic budget, Retry-After/backoff retries, reconnect after unexpected closure, and make-before-break token rotation with a retiring handoff window. Dispatch is fenced to the active or retiring generation, and every connection is stopped and disposed exactly once. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Resolve per-geo negotiate endpoints, start every geo with fail-fast startup, stop all geos, aggregate status internally, and dispatch envelopes with invoke/ack replies and 500 on handler failure. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Adds an internal GeoSocket that keeps one geo connected: initial startup within a monotonic budget, Retry-After/backoff retries, reconnect after unexpected closure, and make-before-break token rotation with a retiring handoff window. Dispatch is fenced to the active or retiring generation, and every connection is stopped and disposed exactly once. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Resolve per-geo negotiate endpoints, start every geo with fail-fast startup, stop all geos, aggregate status internally, and dispatch envelopes with invoke/ack replies and 500 on handler failure. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

…om/microsoft/teams.net into teddyam-socket-mode-geo-supervisor

Log connection stop/dispose failures instead of throwing so they cannot mask the original startup failure or end a geo's supervisor, and mark every geo as Stopped when the transport stops. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

A faulted supervisor is already logged; rethrowing it from stop could mask the original startup failure in the transport. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

…om/microsoft/teams.net into teddyam-socket-mode-geo-supervisor

Teddy Arida-Moody and others added 11 commits September 22, 2026 17:15

feat(apps): add Socket Mode protocol models

820cf7c

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

feat(apps): parse Socket Mode envelopes and replies

f641476

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

feat(apps): add Socket Mode negotiation

bd665ea

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

feat(apps): define Socket Mode connection abstraction

059705c

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

docs(apps): document Socket Mode transport

3c0e902

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

fix(apps): allow Socket Mode websocket URLs

ab6f062

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

fix(apps): require HTTP SignalR negotiate URLs

9eea9be

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

fix(apps): include region in Socket Mode endpoint

b994c3f

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

fix(apps): time out Socket Mode token acquisition

ac2a031

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

test(apps): cover Socket Mode token timeout

dd68942

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

fix(apps): tighten Socket Mode validation

2ebe3cf

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

teddy arida-moody (teddyam) added this pull request to stack #684 September 24, 2026 05:39

teddy arida-moody (teddyam) requested a lite review from Copilot September 24, 2026 16:26

Copilot started reviewing on behalf of teddy arida-moody (teddyam) September 24, 2026 16:27 View session

Copilot AI reviewed Sep 24, 2026

View reviewed changes

Comment thread src/Microsoft.Teams.Apps/SocketMode/GeoSocket.cs

Comment thread src/Microsoft.Teams.Apps/SocketMode/SocketModeTransport.cs

Comment thread src/Microsoft.Teams.Apps/SocketMode/SocketModeTransport.cs Outdated

Comment thread src/Microsoft.Teams.Apps/SocketMode/SocketModeTransport.cs

Teddy Arida-Moody and others added 9 commits September 24, 2026 11:03

feat(apps): define default Socket Mode geographies

6802ad6

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

feat(apps): add SignalR Socket Mode connection

99e8c6f

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

refactor(apps): clarify SignalR connection factory

66c82d5

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

fix(apps): dispose late Socket Mode connection

55717e0

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Update OnActivity to await readiness

8b43826

Refactor OnActivity to await readiness before handling activity. Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

fix(apps): identify planned Socket Mode closure

99b4454

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

fix(apps): dispose failed Socket Mode startup

fc99cb5

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

fix(apps): detach SignalR close handlers

d9f5233

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

fix(apps): isolate Socket Mode stop cancellation

a629457

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Teddy Arida-Moody and others added 2 commits September 24, 2026 11:06

teddy arida-moody (teddyam) force-pushed the teddyam-socket-mode-geo-supervisor branch from 0181348 to 5e4c28f Compare September 24, 2026 18:07

Base automatically changed from teddyam-socket-mode-signalr-connection to main September 24, 2026 18:39

Teddy Arida-Moody and others added 2 commits September 24, 2026 11:39

teddy arida-moody (teddyam) force-pushed the teddyam-socket-mode-geo-supervisor branch from 5e4c28f to 8953d5e Compare September 24, 2026 18:39

Teddy Arida-Moody added 2 commits September 24, 2026 13:21

Merge branch 'teddyam-socket-mode-geo-supervisor' of https://github.c…

7d2e7b1

…om/microsoft/teams.net into teddyam-socket-mode-geo-supervisor

marked each geoStatus as stopped in StopAsync

e5a0b3f

Lily Du (lilyydu) reviewed Sep 24, 2026

View reviewed changes

Comment thread src/Microsoft.Teams.Apps/SocketMode/GeoSocket.cs

Lily Du (lilyydu) reviewed Sep 24, 2026

View reviewed changes

Comment thread src/Microsoft.Teams.Apps/SocketMode/SocketModeTransport.cs

Comment thread src/Microsoft.Teams.Apps/SocketMode/GeoSocket.cs Outdated

teddy arida-moody (teddyam) force-pushed the teddyam-socket-mode-geo-supervisor branch from cd40b2d to ab2a6ae Compare September 24, 2026 22:12

Teddy Arida-Moody and others added 3 commits September 24, 2026 15:33

fix(apps): keep Socket Mode stop from rethrowing supervisor faults

f760306

A faulted supervisor is already logged; rethrowing it from stop could mask the original startup failure in the transport. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Merge branch 'teddyam-socket-mode-geo-supervisor' of https://github.c…

959f98b

…om/microsoft/teams.net into teddyam-socket-mode-geo-supervisor

test

28ad9e2

teddy arida-moody (teddyam) mentioned this pull request Sep 28, 2026

feat(apps): add Socket Mode to TeamsBotApplication #686

Merged

Lily Du (lilyydu) reviewed Sep 29, 2026

View reviewed changes

Comment thread src/Microsoft.Teams.Apps/SocketMode/GeoSocket.cs Outdated

Lily Du (lilyydu) reviewed Sep 29, 2026

View reviewed changes

Comment thread src/Microsoft.Teams.Apps/SocketMode/GeoSocket.cs

Teddy Arida-Moody added 3 commits October 1, 2026 10:24

fix(apps): stop retrying Socket Mode on negotiate 401/403

1f20c53

removed delayFirstAttempt

7e8f5fe

lily comments

97e8248

Lily Du (lilyydu) approved these changes Oct 1, 2026

View reviewed changes

teddy arida-moody (teddyam) added this pull request to the merge queue Oct 1, 2026

Merged via the queue into main with commit 33591e4 Oct 1, 2026
8 checks passed

teddy arida-moody (teddyam) deleted the teddyam-socket-mode-geo-supervisor branch October 1, 2026 18:34

Navigation Menu

Repository navigation

feat(apps): add multi-geo Socket Mode supervisor and transport - #685

feat(apps): add multi-geo Socket Mode supervisor and transport#685
teddy arida-moody (teddyam) merged 33 commits into
mainfrom
teddyam-socket-mode-geo-supervisor

teddy arida-moody (teddyam) commented Sep 24, 2026 •

edited

Loading

Uh oh!

azure-pipelines Bot commented Sep 24, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

teddy arida-moody (teddyam) commented Sep 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

GeoSocket — one supervisor per geo

SocketModeTransport — top level

Tests

Uh oh!

azure-pipelines Bot commented Sep 24, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Copilot review overview

🟡 Changes recommended

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

teddy arida-moody (teddyam) commented Sep 24, 2026 •

edited

Loading

`GeoSocket` — one supervisor per geo

`SocketModeTransport` — top level