From 181053e87621ea004e74c05dfb1678ea27bf4f82 Mon Sep 17 00:00:00 2001
From: moozzyk <pawelka@microsoft.com>
Date: Fri, 28 Oct 2016 15:47:46 -0700
Subject: [PATCH] Adding longpolling

---
 samples/SocketsSample/wwwroot/hubs.html                   | 2 +-
 src/Microsoft.AspNetCore.SignalR.Client.TS/HttpClient.ts  | 7 ++++++-
 .../LongPollingTransport.ts                               | 8 +++++++-
 .../RpcConnection.ts                                      | 6 +++---
 .../HttpConnectionDispatcher.cs                           | 3 +++
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/samples/SocketsSample/wwwroot/hubs.html b/samples/SocketsSample/wwwroot/hubs.html
index 486aeb8a41..42f099306d 100644
--- a/samples/SocketsSample/wwwroot/hubs.html
+++ b/samples/SocketsSample/wwwroot/hubs.html
@@ -7,7 +7,7 @@
     <script>
         document.addEventListener('DOMContentLoaded', () => {
             let connectButton = document.getElementById('connect');
-            let connection = new RpcConnection(`http://${document.location.host}/hubs`);
+            let connection = new RpcConnection(`http://${document.location.host}/hubs`, 'formatType=json&format=text');
             connection.on('Send',(msg) => { addLine(msg); });
             let isConnected = false;
 
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/HttpClient.ts b/src/Microsoft.AspNetCore.SignalR.Client.TS/HttpClient.ts
index cf7ab4883d..e8fba57c02 100644
--- a/src/Microsoft.AspNetCore.SignalR.Client.TS/HttpClient.ts
+++ b/src/Microsoft.AspNetCore.SignalR.Client.TS/HttpClient.ts
@@ -4,13 +4,18 @@ class HttpClient {
     }
 
     post(url: string, content: string): Promise<string> {
-        return this.xhr("POST", url);
+        return this.xhr("POST", url, content);
     }
 
     private xhr(method: string, url: string, content?: string): Promise<string> {
         return new Promise((resolve, reject) => {
             let xhr = new XMLHttpRequest();
             xhr.open(method, url, true);
+
+            if (method === "POST" && content != null) {
+                xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+            }
+
             xhr.send(content);
             xhr.onload = () => {
                 if (xhr.status >= 200 && xhr.status < 300) {
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/LongPollingTransport.ts b/src/Microsoft.AspNetCore.SignalR.Client.TS/LongPollingTransport.ts
index 75e020b152..76d5eed09b 100644
--- a/src/Microsoft.AspNetCore.SignalR.Client.TS/LongPollingTransport.ts
+++ b/src/Microsoft.AspNetCore.SignalR.Client.TS/LongPollingTransport.ts
@@ -13,10 +13,16 @@ class LongPollingTransport implements ITransport {
     }
 
     connect(url: string, queryString: string): Promise<void> {
+        this.queryString = queryString || "";
+        this.url = url || "";
+
+        // TODO: resolve promise on open sending? + reject on error
+        this.poll(url + "/poll?" + this.queryString)
         return Promise.resolve();
     }
 
     private poll(url: string): void {
+        //TODO: timeout
         this.pollXhr.open("GET", url, true);
         this.pollXhr.send();
         this.pollXhr.onload = () => {
@@ -46,7 +52,7 @@ class LongPollingTransport implements ITransport {
     }
 
     send(data: string): Promise<void> {
-        return new HttpClient().post(this.url + "/poll/send?" + this.queryString, data);
+        return new HttpClient().post(this.url + "/send?" + this.queryString, data);
     }
 
     stop(): void {
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/RpcConnection.ts b/src/Microsoft.AspNetCore.SignalR.Client.TS/RpcConnection.ts
index 29ff6aaedb..467f0737e3 100644
--- a/src/Microsoft.AspNetCore.SignalR.Client.TS/RpcConnection.ts
+++ b/src/Microsoft.AspNetCore.SignalR.Client.TS/RpcConnection.ts
@@ -52,9 +52,9 @@ class RpcConnection {
         return new Promise((resolve, reject) => {
             new HttpClient().get(this.url + "/getid?" + this.queryString)
             .then(id => {
-                this.transport = new WebSocketTransport(data => this.messageReceived(data));
-                //this.transport = new LongPollingTransport(data => this.messageReceived(data));
-                return this.transport.connect(this.url, `id=${id}`);
+                // this.transport = new WebSocketTransport(data => this.messageReceived(data));
+                this.transport = new LongPollingTransport(data => this.messageReceived(data));
+                return this.transport.connect(this.url, `id=${id}&${this.queryString}`);
             })
             .then(() => {
                 resolve();
diff --git a/src/Microsoft.AspNetCore.Sockets/HttpConnectionDispatcher.cs b/src/Microsoft.AspNetCore.Sockets/HttpConnectionDispatcher.cs
index 12d57c73fc..86fff147a5 100644
--- a/src/Microsoft.AspNetCore.Sockets/HttpConnectionDispatcher.cs
+++ b/src/Microsoft.AspNetCore.Sockets/HttpConnectionDispatcher.cs
@@ -75,6 +75,9 @@ namespace Microsoft.AspNetCore.Sockets
                 {
                     bool isNewConnection;
                     var state = GetOrCreateConnection(context, out isNewConnection);
+                    // TODO: this is wrong. + how does the user add their own metadata based on HttpContext
+                    var formatType = (string)context.Request.Query["formatType"];
+                    state.Connection.Metadata["formatType"] = string.IsNullOrEmpty(formatType) ? "json" : formatType;
 
                     // Mark the connection as active
                     state.Active = true;