Add sendNotification in extra

Author: leehack

example/server_simple_streamable_https.dart

@@ -57,19 +57,13 @@ class InMemoryEventStore implements EventStore {
   }
 }
 
-// Global server instance to be used by tool callbacks
-Server? globalServer;
-
 // Create an MCP server with implementation details
 McpServer getServer() {
   // Create the McpServer with the implementation details and options
   final server = McpServer(
     Implementation(name: 'simple-streamable-http-server', version: '1.0.0'),
   );
 
-  // Save reference to underlying server for logging access
-  globalServer = server.server;
-
   // Register a simple tool that returns a greeting
   server.tool(
     'greet',
@@ -107,32 +101,29 @@ McpServer getServer() {
       Future<void> sleep(int ms) => Future.delayed(Duration(milliseconds: ms));
 
       // Send debug notification
-      if (globalServer != null) {
-        await globalServer!.sendLoggingMessage(LoggingMessageNotificationParams(
-          level: LoggingLevel.debug,
-          data: 'Starting multi-greet for $name',
-        ));
-      }
+      await extra?.sendNotification(JsonRpcLoggingMessageNotification(
+          logParams: LoggingMessageNotificationParams(
+        level: LoggingLevel.debug,
+        data: 'Starting multi-greet for $name',
+      )));
 
       await sleep(1000); // Wait 1 second before first greeting
 
       // Send first info notification
-      if (globalServer != null) {
-        await globalServer!.sendLoggingMessage(LoggingMessageNotificationParams(
-          level: LoggingLevel.info,
-          data: 'Sending first greeting to $name',
-        ));
-      }
+      await extra?.sendNotification(JsonRpcLoggingMessageNotification(
+          logParams: LoggingMessageNotificationParams(
+        level: LoggingLevel.info,
+        data: 'Sending first greeting to $name',
+      )));
 
       await sleep(1000); // Wait another second before second greeting
 
       // Send second info notification
-      if (globalServer != null) {
-        await globalServer!.sendLoggingMessage(LoggingMessageNotificationParams(
-          level: LoggingLevel.info,
-          data: 'Sending second greeting to $name',
-        ));
-      }
+      await extra?.sendNotification(JsonRpcLoggingMessageNotification(
+          logParams: LoggingMessageNotificationParams(
+        level: LoggingLevel.info,
+        data: 'Sending second greeting to $name',
+      )));
 
       return CallToolResult(
         content: [
@@ -196,14 +187,12 @@ McpServer getServer() {
       while (count == 0 || counter < count) {
         counter++;
         try {
-          if (globalServer != null) {
-            await globalServer!
-                .sendLoggingMessage(LoggingMessageNotificationParams(
-              level: LoggingLevel.info,
-              data:
-                  'Periodic notification #$counter at ${DateTime.now().toIso8601String()}',
-            ));
-          }
+          await extra?.sendNotification(JsonRpcLoggingMessageNotification(
+              logParams: LoggingMessageNotificationParams(
+            level: LoggingLevel.info,
+            data:
+                'Periodic notification #$counter at ${DateTime.now().toIso8601String()}',
+          )));
         } catch (error) {
           print('Error sending notification: $error');
         }

lib/src/shared/protocol.dart

@@ -55,8 +55,23 @@ class RequestHandlerExtra {
   /// The session ID from the transport, if available.
   final String? sessionId;
 
+  final RequestId requestId;
+
+  final Future<void> Function(JsonRpcNotification notification)
+      sendNotification;
+
+  final Future<T> Function<T extends BaseResultData>(
+      JsonRpcRequest request,
+      T Function(Map<String, dynamic> resultJson) resultFactory,
+      RequestOptions options) sendRequest;
+
   /// Creates extra data for request handlers.
-  const RequestHandlerExtra({required this.signal, this.sessionId});
+  const RequestHandlerExtra(
+      {required this.signal,
+      this.sessionId,
+      required this.requestId,
+      required this.sendNotification,
+      required this.sendRequest});
 }
 
 /// Internal class holding timeout state for a request.
@@ -394,9 +409,14 @@ abstract class Protocol {
     _requestHandlerAbortControllers[request.id] = abortController;
 
     final extra = RequestHandlerExtra(
-      signal: abortController.signal,
-      sessionId: _transport?.sessionId,
-    );
+        signal: abortController.signal,
+        sessionId: _transport?.sessionId,
+        requestId: request.id,
+        sendNotification: (notification) => this.notification(notification),
+        sendRequest: <T extends BaseResultData>(JsonRpcRequest request,
+                T Function(Map<String, dynamic>) resultFactory,
+                RequestOptions options) =>
+            this.request<T>(request, resultFactory, options));
 
     Future.microtask(() => handler(request, extra)).then(
       (result) async {
@@ -753,13 +773,7 @@ abstract class Protocol {
       assertNotificationCapability(notificationData.method);
     }
 
-    final jsonrpcNotification = JsonRpcNotification(
-      method: notificationData.method,
-      params: notificationData.params,
-      meta: notificationData.meta,
-    );
-
-    await _transport!.send(jsonrpcNotification);
+    await _transport!.send(notificationData);
   }
 
   /// Registers a handler for requests with the given method.