Prepare the HTTP library for inclusion in the standalone VM (step 2)

samples/chat/chat_stress_client.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_stress_client.dart");
+#import("dart:io");
 #import("dart:json");
 #import("http.dart");
 
 
 class ChatStressClient {
   ChatStressClient() : verbose = false, messagesToSend = 100;
 
   void run() {
     HTTPClient httpClient;  // HTTP client connection factory.
     String sessionId;  // Session id when connected.
@@ skipping 23 matching lines @@
       }
       var responseData = JSON.parse(data);
       if (responseData["response"] != expected ) {
         printProtocolError();
         return null;
       }
       return responseData;
     }
 
     void leave() {
-      HTTPClientResponse response;
-
-      void leaveResponseHandler(String data) {
+      void leaveResponseHandler(HTTPClientResponse response, String data) {
         httpClient.shutdown();
       }
 
       Map leaveRequest = new Map();
       leaveRequest["request"] = "leave";
       leaveRequest["sessionId"] = sessionId;
       HTTPClientConnection conn = httpClient.post("127.0.0.1", port, "/leave");
       conn.requestHandler = (HTTPClientRequest request) {
         request.writeString(JSON.stringify(leaveRequest));
         request.outputStream.close();
       };
-      conn.responseHandler = (HTTPClientResponse r) {
-        response = r;
-        response.dataEnd = leaveResponseHandler;
+      conn.responseHandler = (HTTPClientResponse response) {
+        StringInputStream stream = new StringInputStream(response.inputStream);

[Anders Johnsen, 2012/02/28 12:23:40]

I agree that this operation is getting quite bloated. I'll say if I come up with
any suggestions!

+        StringBuffer body = new StringBuffer();
+        stream.dataHandler = () => body.add(stream.read());
+        stream.closeHandler = () => leaveResponseHandler(response,

[Mads Ager (google), 2012/02/28 12:27:40]

Maybe either move the whole body to the next line or even use {}?

Ditto for all occurrences below.

[Søren Gjesse, 2012/02/28 13:03:42]

Done (using {} that is).

+                                                         body.toString());
       };
     }
 
     var sendMessage;
     void receive() {
-      HTTPClientResponse response;
-
-      void receiveResponseHandler(String data) {
+      void receiveResponseHandler(HTTPClientResponse response, String data) {
         var responseData = parseResponse(response, data, "receive");
         if (responseData == null) return;
         if (responseData["disconnect"] == true) return;
 
         sendMessage();
       }
 
       Map messageRequest = new Map();
       messageRequest["request"] = "receive";
       messageRequest["sessionId"] = sessionId;
       messageRequest["nextMessage"] = receiveMessageCount;
       messageRequest["maxMessages"] = 100;
       HTTPClientConnection conn = httpClient.post("127.0.0.1", port, "/receive");
       conn.requestHandler = (HTTPClientRequest request) {
         request.writeString(JSON.stringify(messageRequest));
         request.outputStream.close();
       };
-      conn.responseHandler = (HTTPClientResponse r) {
-        response = r;
-        response.dataEnd = receiveResponseHandler;
+      conn.responseHandler = (HTTPClientResponse response) {
+        StringInputStream stream = new StringInputStream(response.inputStream);
+        StringBuffer body = new StringBuffer();
+        stream.dataHandler = () => body.add(stream.read());
+        stream.closeHandler = () => receiveResponseHandler(response,
+                                                           body.toString());
       };
     }
 
     sendMessage = () {
-      HTTPClientRequest request;
-      HTTPClientResponse response;
-
-      void sendResponseHandler(String data) {
+      void sendResponseHandler(HTTPClientResponse response, String data) {
         var responseData = parseResponse(response, data, "message");
         if (responseData == null) return;
 
         sendMessageCount++;
         if (verbose) {
           if (sendMessageCount % 10 == 0) {
             print("$sendMessageCount messages");
           }
         }
         if (sendMessageCount < messagesToSend) {
           receive();
         } else {
           leave();
         }
       }
 
       Map messageRequest = new Map();
       messageRequest["request"] = "message";
       messageRequest["sessionId"] = sessionId;
       messageRequest["message"] = "message " + sendMessageCount;
       HTTPClientConnection conn = httpClient.post("127.0.0.1", port, "/message");
       conn.requestHandler = (HTTPClientRequest request) {
-        print(JSON.stringify(messageRequest));
         request.writeString(JSON.stringify(messageRequest));
         request.outputStream.close();
       };
-      conn.responseHandler = (HTTPClientResponse r) {
-        response = r;
-        response.dataEnd = sendResponseHandler;
+      conn.responseHandler = (HTTPClientResponse response) {
+        StringInputStream stream = new StringInputStream(response.inputStream);
+        StringBuffer body = new StringBuffer();
+        stream.dataHandler = () => body.add(stream.read());
+        stream.closeHandler = () => sendResponseHandler(response,
+                                                        body.toString());
       };
     };
 
     void join() {
-      HTTPClientResponse response;
-
-      void joinResponseHandler(String data) {
+      void joinResponseHandler(HTTPClientResponse response, String data) {
         var responseData = parseResponse(response, data, "join");
         if (responseData == null) return;
         sessionId = responseData["sessionId"];
 
         messageCount = 0;
         sendMessageCount = 0;
         receiveMessageCount = 0;
         sendMessage();
       }
 
       Map joinRequest = new Map();
       joinRequest["request"] = "join";
       joinRequest["handle"] = "test1";
       HTTPClientConnection conn = httpClient.post("127.0.0.1", port, "/join");
       conn.requestHandler = (HTTPClientRequest request) {
         request.writeString(JSON.stringify(joinRequest));
         request.outputStream.close();
       };
-      conn.responseHandler = (HTTPClientResponse r) {
-        response = r;
-        response.dataEnd = joinResponseHandler;
+      conn.responseHandler = (HTTPClientResponse response) {
+        StringInputStream stream = new StringInputStream(response.inputStream);
+        StringBuffer body = new StringBuffer();
+        stream.dataHandler = () => body.add(stream.read());
+        stream.closeHandler = () => joinResponseHandler(response,
+                                                        body.toString());
       };
     }
 
     // Create a HTTP client factory.
     httpClient = new HTTPClient();
     port = 8123;
 
     // Start the client by joining the chat topic.
     join();
   }
 
   int messagesToSend;
   bool verbose;
 }
 
 
 void main () {
   ChatStressClient stresser = new ChatStressClient();
   stresser.run();
 }