Add HTTP handler registration to the HTTP server

samples/chat/chat_server_lib.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #library("chat_server");
 #import("dart:io");
 #import("dart:isolate");
 #import("dart:json");
 
-typedef void RequestHandler(HttpRequest request, HttpResponse response);
-
 class ChatServer extends IsolatedServer {
-  ChatServer() : super() {
-    addHandler("/",
-               (HttpRequest request, HttpResponse response) =>
-                   redirectPageHandler(
-                       request, response, "dart_client/index.html"));
-    addHandler("/js_client/index.html",
-               (HttpRequest request, HttpResponse response) =>
-                   fileHandler(request, response));
-    addHandler("/js_client/code.js",
-               (HttpRequest request, HttpResponse response) =>
-                   fileHandler(request, response));
-    addHandler("/dart_client/index.html",
-               (HttpRequest request, HttpResponse response) =>
-                   fileHandler(request, response));
-    addHandler("/out/dart_client/chat.dart.app.js",
-               (HttpRequest request, HttpResponse response) =>
-                   fileHandler(request, response));
-    addHandler("/favicon.ico",
-               (HttpRequest request, HttpResponse response) =>
-                   fileHandler(request, response, "static/favicon.ico"));
-
-    addHandler("/join", _joinHandler);
-    addHandler("/leave", _leaveHandler);
-    addHandler("/message", _messageHandler);
-    addHandler("/receive", _receiveHandler);
-  }
 }
 
 class ServerMain {
   ServerMain.start(IsolatedServer server,
                    String hostAddress,
                    int tcpPort,
                    [int listenBacklog = 5])
       : _statusPort = new ReceivePort(),
         _serverPort = null {
     server.spawn().then((SendPort port) {
@@ skipping 279 matching lines @@
 <h1>Not Found</h1>
 <p>The requested URL was not found on this server.</p>
 </body></html>""";
 
   void _sendJSONResponse(HttpResponse response, Map responseData) {
     response.headers.set("Content-Type", "application/json; charset=UTF-8");
     response.outputStream.writeString(JSON.stringify(responseData));
     response.outputStream.close();
   }
 
-  IsolatedServer() : super() {
-    _requestHandlers = new Map();
-  }
-
   void redirectPageHandler(HttpRequest request,
                            HttpResponse response,
                            String redirectPath) {
     if (_redirectPage == null) {
       _redirectPage = redirectPageHtml.charCodes();
     }
     response.statusCode = HttpStatus.FOUND;
     response.headers.set(
         "Location", "http://$_host:$_port/${redirectPath}");
     response.contentLength = _redirectPage.length;
@@ skipping 193 matching lines @@
 
         } else {
           _protocolError(request, response);
         }
       } else {
         _protocolError(request, response);
       }
     };
   }
 
-  void addHandler(String path,
-                  void handler(HttpRequest request, HttpResponse response)) {
-    _requestHandlers[path] = handler;
-  }
-
   void main() {
     _logRequests = false;
     _topic = new Topic();
     _serverStart = new Date.now();
     _messageCount = 0;
     _messageRate = new Rate();
 
     // Start a timer for cleanup events.
     _cleanupTimer =
         new Timer.repeating(10000, (timer) => _topic._handleTimer(timer));
 
     // Start timer for periodic logging.
     void _handleLogging(Timer timer) {
       if (_logging) {
         print((_messageRate.rate).toString() +
                        " messages/s (total " +
                        _messageCount +
                        " messages)");
       }
     }
 
     this.port.receive((var message, SendPort replyTo) {
       if (message.isStart) {
         _host = message.host;
         _port = message.port;
         _logging = message.logging;
         replyTo.send(new ChatServerStatus.starting(), null);
         _server = new HttpServer();
+        _server.defaultRequestHandler = _notFoundHandler;
+        _server.addRequestHandler(
+            new RegExp("^/\$"),
+            (HttpRequest request, HttpResponse response) =>
+                redirectPageHandler(
+                    request, response, "dart_client/index.html"));
+        _server.addRequestHandler(
+            new RegExp("^/js_client/index.html\$"),
+            (HttpRequest request, HttpResponse response) =>
+                fileHandler(request, response));
+        _server.addRequestHandler(
+            new RegExp("^/js_client/code.js\$"),
+            (HttpRequest request, HttpResponse response) =>
+                fileHandler(request, response));
+        _server.addRequestHandler(
+            new RegExp("^/dart_client/index.html\$"),
+            (HttpRequest request, HttpResponse response) =>
+                fileHandler(request, response));
+        _server.addRequestHandler(
+            new RegExp("^/out/dart_client/chat.dart.app.js\$"),
+            (HttpRequest request, HttpResponse response) =>
+                fileHandler(request, response));
+        _server.addRequestHandler(
+            new RegExp("^/favicon.ico\$"),
+            (HttpRequest request, HttpResponse response) =>
+                fileHandler(request, response, "static/favicon.ico"));
+
+        _server.addRequestHandler(new RegExp("^/join\$"), _joinHandler);
+        _server.addRequestHandler(new RegExp("^/leave\$"), _leaveHandler);
+        _server.addRequestHandler(new RegExp("^/message\$"), _messageHandler);
+        _server.addRequestHandler(new RegExp("^/receive\$"), _receiveHandler);
         try {
           _server.listen(_host, _port, backlog: message.backlog);
-          _server.onRequest = (HttpRequest req, HttpResponse rsp) =>
-              _requestReceivedHandler(req, rsp);
           replyTo.send(new ChatServerStatus.started(_server.port), null);
           _loggingTimer = new Timer.repeating(1000, _handleLogging);
         } catch (var e) {
           replyTo.send(new ChatServerStatus.error(e.toString()), null);
         }
       } else if (message.isStop) {
         replyTo.send(new ChatServerStatus.stopping(), null);
         stop();
         replyTo.send(new ChatServerStatus.stopped(), null);
       }
     });
   }
 
   stop() {
     _server.close();
     _cleanupTimer.cancel();
     this.port.close();
   }
 
-  void _requestReceivedHandler(HttpRequest request, HttpResponse response) {
-    if (_logRequests) {
-      String method = request.method;
-      String uri = request.uri;
-      print("Request: $method $uri");
-      print("Request headers:");
-      request.headers.forEach(
-          (String name, String value) => print("$name: $value"));
-      print("Request parameters:");
-      request.queryParameters.forEach(
-          (String name, String value) => print("$name = $value"));
-      print("");
-    }
-
-    var requestHandler =_requestHandlers[request.path];
-    if (requestHandler != null) {
-      requestHandler(request, response);
-    } else {
-      print('No request handler found for ${request.path}');
-      _notFoundHandler(request, response);
-    }
-  }
-
   String _host;
   int _port;
   HttpServer _server;  // HTTP server instance.
-  Map _requestHandlers;
   bool _logRequests;
 
   Topic _topic;
   Timer _cleanupTimer;
   Timer _loggingTimer;
   Date _serverStart;
 
   bool _logging;
   int _messageCount;
   Rate _messageRate;
@@ skipping 61 matching lines @@
     }
   }
 
   int _timeRange;
   List<int> _buckets;
   int _currentBucket;
   int _currentBucketTime;
   num _bucketTimeRange;
   int _sum;
 }