Update console.html

console.html

@@ -43,20 +43,53 @@
                     url: env.target,
                     type: 'POST',
                     contentType: 'application/json',
-                    dataType: 'json',
+                    dataType: 'text',
                     data: JSON.stringify(requestData),
                     beforeSend: function(xhr) {
                         xhr.setRequestHeader("X-User-Agent", "php-httpproxy/0.1.5 (Client; WebConsole; abuse@catswords.net)");
                     },
                     success: function(response) {
+                        var responseData = {
+                            "error": {
+                                "message": "Unknown error"
+                            }
+                        };
+                        var process_corrupted_json = function(s) {
+                            // for dirty response (e.g., magic header, advertise logo)
+                            try {
+                                var start = s.indexOf('{');
+                                var end = s.lastIndexOf('}');
+                                if (start > -1 && end > -1 && end > start) {
+                                    responseData = JSON.parse(s.substring(start, end));
+                                } else {
+                                    throw new Error("It does not seem like a JSON format.");
+                                }
+                            } catch (e) {
+                                responseData.error.message = e.message
+                                    + "\r\nRaw response data:"
+                                    + "\r\n" + response;
+                            }
+                        };
+
+                        try {
+                            if (response.trim() == "") {
+                                responseData.error.message = "Received an empty response data";
+                            } else {
+                                responseData = JSON.parse(response);
+                            }
+                        } catch (e) {
+                            responseData.error.message = e.message;
+                            process_corrupted_json(response);
+                        }
+
                         var text = "";
-                        if ("error" in response) {
+                        if ("error" in responseData) {
-                            text = response.error.message;
+                            text = responseData.error.message;
                         } else {
-                            if (typeof response.result.data === "object") {
+                            if (typeof responseData.result.data === "object") {
-                                text = pretty_jsonify(response.result.data);
+                                text = pretty_jsonify(responseData.result.data);
                             } else {
-                                text = response.result.data;
+                                text = responseData.result.data;
                             }
                         }
                         term.echo(text);