Fix the issue where the 'Shutdown' method fails to properly exit. (#255)

uppercaveman · CHENBING1 · web-flow · commit 64290191e845 · 2025-05-10T18:08:28.000+03:00
* Fix the issue where the 'Shutdown' method fails to properly exit.

* Fix the issue where the 'Shutdown' method fails to properly exit.

---------

Co-authored-by: CHENBING1 &lt;chenbing1@kingsoft.com&gt;
diff --git a/server/sse.go b/server/sse.go
@@ -225,8 +225,6 @@ func NewTestServer(server *MCPServer, opts ...SSEOption) *httptest.Server {
 // It sets up HTTP handlers for SSE and message endpoints.
 func (s *SSEServer) Start(addr string) error {
 	s.mu.Lock()
-	defer s.mu.Unlock()
-
 	if s.srv == nil {
 		s.srv = &http.Server{
 			Addr:    addr,
@@ -239,8 +237,10 @@ func (s *SSEServer) Start(addr string) error {
 			return fmt.Errorf("conflicting listen address: WithHTTPServer(%q) vs Start(%q)", s.srv.Addr, addr)
 		}
 	}
+	srv := s.srv
+	s.mu.Unlock()
 
-	return s.srv.ListenAndServe()
+	return srv.ListenAndServe()
 }
 
 // Shutdown gracefully stops the SSE server, closing all active sessions

Original file line number	Diff line number	Diff line change
`@@ -225,8 +225,6 @@ func NewTestServer(server MCPServer, opts ...SSEOption) httptest.Server {`
`225`	`225`	`// It sets up HTTP handlers for SSE and message endpoints.`
`226`	`226`	`func (s *SSEServer) Start(addr string) error {`
`227`	`227`	`s.mu.Lock()`
`228`		`- defer s.mu.Unlock()`
`229`		`-`
`230`	`228`	`if s.srv == nil {`
`231`	`229`	`s.srv = &http.Server{`
`232`	`230`	`Addr: addr,`
`@@ -239,8 +237,10 @@ func (s *SSEServer) Start(addr string) error {`
`239`	`237`	`return fmt.Errorf("conflicting listen address: WithHTTPServer(%q) vs Start(%q)", s.srv.Addr, addr)`
`240`	`238`	`}`
`241`	`239`	`}`
	`240`	`+ srv := s.srv`
	`241`	`+ s.mu.Unlock()`
`242`	`242`
`243`		`- return s.srv.ListenAndServe()`
	`243`	`+ return srv.ListenAndServe()`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`// Shutdown gracefully stops the SSE server, closing all active sessions`