Converting transport type from string to enum

client-ts/Microsoft.AspNetCore.SignalR.Client.TS.Tests/HubConnection.spec.ts

@@ -1,11 +1,12 @@
 import { IConnection } from "../Microsoft.AspNetCore.SignalR.Client.TS/IConnection"
 import { HubConnection } from "../Microsoft.AspNetCore.SignalR.Client.TS/HubConnection"
 import { DataReceived, ConnectionClosed } from "../Microsoft.AspNetCore.SignalR.Client.TS/Common"
+import { TransportType } from "../Microsoft.AspNetCore.SignalR.Client.TS/Transports"
 
 describe("HubConnection", () => {
     it("completes pending invocations when stopped", async (done) => {
         let connection: IConnection = {
-            start(transportName: string): Promise<void> {
+            start(transportType: TransportType): Promise<void> {
                 return Promise.resolve();
             },
 
@@ -39,7 +40,7 @@ describe("HubConnection", () => {
 
     it("completes pending invocations when connection is lost", async (done) => {
         let connection: IConnection = {
-            start(transportName: string): Promise<void> {
+            start(transportType: TransportType): Promise<void> {
                 return Promise.resolve();
             },
 

client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Connection.ts

@@ -1,6 +1,6 @@
 import { DataReceived, ConnectionClosed } from "./Common"
 import { IConnection } from "./IConnection"
-import { ITransport, WebSocketTransport, ServerSentEventsTransport, LongPollingTransport } from "./Transports"
+import { ITransport, TransportType, WebSocketTransport, ServerSentEventsTransport, LongPollingTransport } from "./Transports"
 import { IHttpClient, HttpClient } from "./HttpClient"
 import { ISignalROptions } from "./ISignalROptions"
 
@@ -26,14 +26,14 @@ export class Connection implements IConnection {
         this.connectionState = ConnectionState.Initial;
     }
 
-    async start(transportName: string = "webSockets"): Promise<void> {
+    async start(transportType: TransportType = TransportType.WebSockets): Promise<void> {
         if (this.connectionState != ConnectionState.Initial) {
             throw new Error("Cannot start a connection that is not in the 'Initial' state.");
         }
 
         this.connectionState = ConnectionState.Connecting;
 
-        this.transport = this.createTransport(transportName);
+        this.transport = this.createTransport(transportType);
         this.transport.onDataReceived = this.onDataReceived;
         this.transport.onClosed = e => this.stopConnection(e);
 
@@ -44,21 +44,21 @@ export class Connection implements IConnection {
             this.connectionState = ConnectionState.Connected;
         }
         catch(e) {
-            console.log("Failed to start the connection.")
+            console.log("Failed to start the connection. " + e)
             this.connectionState = ConnectionState.Disconnected;
             this.transport = null;
             throw e;
         };
     }
 
-    private createTransport(transportName: string): ITransport {
+    private createTransport(transportType: TransportType): ITransport {
-        if (transportName === "webSockets") {
+        if (transportType === TransportType.WebSockets) {
             return new WebSocketTransport();
         }
-        if (transportName === "serverSentEvents") {
+        if (transportType === TransportType.ServerSentEvents) {
             return new ServerSentEventsTransport(this.httpClient);
         }
-        if (transportName === "longPolling") {
+        if (transportType === TransportType.LongPolling) {
             return new LongPollingTransport(this.httpClient);
         }
 

client-ts/Microsoft.AspNetCore.SignalR.Client.TS/HubConnection.ts

@@ -1,6 +1,7 @@
 import { ConnectionClosed } from "./Common"
 import { IConnection } from "./IConnection"
 import { Connection } from "./Connection"
+import { TransportType } from "./Transports"
 
 interface InvocationDescriptor {
     readonly Id: string;
@@ -15,6 +16,7 @@ interface InvocationResultDescriptor {
 }
 
 export { Connection } from "./Connection"
+export { TransportType } from "./Transports"
 
 export class HubConnection {
     private connection: IConnection;
@@ -85,8 +87,8 @@ export class HubConnection {
         }
     }
 
-    start(transportName? :string): Promise<void> {
+    start(transportType?: TransportType): Promise<void> {
-        return this.connection.start(transportName);
+        return this.connection.start(transportType);
     }
 
     stop(): void {

client-ts/Microsoft.AspNetCore.SignalR.Client.TS/IConnection.ts

@@ -1,7 +1,8 @@
 import { DataReceived, ConnectionClosed } from "./Common"
+import { TransportType } from  "./Transports"
 
 export interface IConnection {
-    start(transportName: string): Promise<void>;
+    start(transportType: TransportType): Promise<void>;
     send(data: any): Promise<void>;
     stop(): void;
 

client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Transports.ts

@@ -2,6 +2,12 @@ import { DataReceived, TransportClosed } from "./Common"
 import { IHttpClient } from "./HttpClient"
 import * as Formatters from "./Formatters";
 
+export enum TransportType {
+    WebSockets,
+    ServerSentEvents,
+    LongPolling
+}
+
 export interface ITransport {
     connect(url: string, queryString: string): Promise<void>;
     send(data: any): Promise<void>;

client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/common.js

@@ -1,6 +1,9 @@
 const ECHOENDPOINT_URL = `http://${document.location.host}/echo`;
 
 function eachTransport(action) {
-   let transportNames = ["webSockets", "serverSentEvents", "longPolling"];
+    let transportTypes = [
-   transportNames.forEach(t => action(t));
+        signalR.TransportType.WebSockets,
+        signalR.TransportType.ServerSentEvents,
+        signalR.TransportType.LongPolling ];
+   transportTypes.forEach(t => action(t));
 }

client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/connectionTests.js

@@ -1,6 +1,6 @@
 describe('connection', () => {
-    eachTransport(transportName => {
+    eachTransport(transportType => {
-        it(`over ${transportName} can send and receive messages`, done => {
+        it(`over ${signalR.TransportType[transportType]} can send and receive messages`, done => {
             const message = "Hello World!";
             let connection = new signalR.Connection(ECHOENDPOINT_URL);
 
@@ -17,7 +17,7 @@ describe('connection', () => {
                 done();
             }
 
-            connection.start(transportName)
+            connection.start(transportType)
                 .then(() => {
                     connection.send(message);
                 })

client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/hubConnectionTests.js

@@ -1,8 +1,8 @@
 const TESTHUBENDPOINT_URL = `http://${document.location.host}/testhub`;
 
 describe('hubConnection', () => {
-    eachTransport(transportName => {
+    eachTransport(transportType => {
-        it(`over ${transportName} can invoke server method and receive result`, done => {
+        it(`over ${signalR.TransportType[transportType]} can invoke server method and receive result`, done => {
             const message = "Hi";
             let hubConnection = new signalR.HubConnection(TESTHUBENDPOINT_URL, 'formatType=json&format=text');
             hubConnection.onClosed = error => {
@@ -10,7 +10,7 @@ describe('hubConnection', () => {
                 done();
             }
 
-            hubConnection.start(transportName)
+            hubConnection.start(transportType)
                 .then(() => {
                     hubConnection.invoke('Echo', message)
                     .then(result => {
@@ -29,11 +29,11 @@ describe('hubConnection', () => {
                 });
         });
 
-        it(`over ${transportName} rethrows an exception from the server`, done => {
+        it(`over ${signalR.TransportType[transportType]} rethrows an exception from the server`, done => {
             const errorMessage = "An error occurred.";
             let hubConnection = new signalR.HubConnection(TESTHUBENDPOINT_URL, 'formatType=json&format=text');
 
-            hubConnection.start(transportName)
+            hubConnection.start(transportType)
                 .then(() => {
                     hubConnection.invoke('ThrowException', errorMessage)
                         .then(() => {
@@ -54,7 +54,7 @@ describe('hubConnection', () => {
                 });
         });
 
-        it(`over ${transportName} can receive server calls`, done => {
+        it(`over ${signalR.TransportType[transportType]} can receive server calls`, done => {
             let client = new signalR.HubConnection(TESTHUBENDPOINT_URL, 'formatType=json&format=text');
             const message = "Hello SignalR";
 
@@ -65,7 +65,7 @@ describe('hubConnection', () => {
                 });
             });
 
-            client.start(transportName)
+            client.start(transportType)
                 .then(() => {
                     return Promise.all([client.invoke('InvokeWithString', message), callbackPromise]);
                 })

samples/SocketsSample/wwwroot/hubs.html

@@ -93,9 +93,9 @@ function addLine(line, color) {
     document.getElementById('messages').appendChild(child);
 }
 
-let transport = getParameterByName('transport') || 'webSockets';
+let transportType = signalR.TransportType[getParameterByName('transport')] || signalR.TransportType.WebSockets;
 
-document.getElementById('head1').innerHTML = transport;
+document.getElementById('head1').innerHTML = signalR.TransportType[transportType];
 
 let connection = new signalR.HubConnection(`http://${document.location.host}/hubs`, 'formatType=json&format=text');
 connection.on('Send', msg => {
@@ -112,7 +112,7 @@ connection.onClosed = e => {
 }
 
 click('connect', event => {
-    connection.start(transport)
+    connection.start(transportType)
         .then(() => {
             isConnected = true;
             addLine('Connected successfully', 'green');

samples/SocketsSample/wwwroot/index.html

@@ -7,16 +7,16 @@
 <body>
     <h1>ASP.NET Sockets</h1>
     <ul>
-        <li><a href="sockets.html?transport=longPolling">Long polling</a></li>
+        <li><a href="sockets.html?transport=LongPolling">Long polling</a></li>
-        <li><a href="sockets.html?transport=serverSentEvents">Server Sent Events</a></li>
+        <li><a href="sockets.html?transport=ServerSentEvents">Server Sent Events</a></li>
-        <li><a href="sockets.html?transport=webSockets">Web Sockets</a></li>
+        <li><a href="sockets.html?transport=WebSockets">Web Sockets</a></li>
         <li><a href="ws.html">Web Sockets (using only Browser APIs)</a></li>
     </ul>
     <h1>ASP.NET SignalR (Hubs)</h1>
     <ul>
-        <li><a href="hubs.html?transport=longPolling">Long polling</a></li>
+        <li><a href="hubs.html?transport=LongPolling">Long polling</a></li>
-        <li><a href="hubs.html?transport=serverSentEvents">Server Sent Events</a></li>
+        <li><a href="hubs.html?transport=ServerSentEvents">Server Sent Events</a></li>
-        <li><a href="hubs.html?transport=webSockets">Web Sockets</a></li>
+        <li><a href="hubs.html?transport=WebSockets">Web Sockets</a></li>
     </ul>
 </body>
 </html>

samples/SocketsSample/wwwroot/sockets.html

@@ -17,9 +17,9 @@
     <script src="utils.js"></script>
     <script>
         document.addEventListener('DOMContentLoaded', () => {
-            let transport = getParameterByName('transport') || 'webSockets';
+            let transportType = signalR.TransportType[getParameterByName('transport')] || signalR.TransportType.WebSockets;
 
-            document.getElementById('transportName').innerHTML = transport;
+            document.getElementById('transportName').innerHTML = signalR.TransportType[transportType];
 
             let url = `http://${document.location.host}/chat`
             let connection = new signalR.Connection(url);
@@ -36,7 +36,7 @@
                 event.preventDefault();
             });
 
-            connection.start(transport).then(() => {
+            connection.start(transportType).then(() => {
                 console.log("Opened");
             }, () => {
                 console.log("Error opening connection");