Merge remote-tracking branch 'origin/master'

Author: Bill Barnes

README.md

@@ -56,6 +56,7 @@ var directLine = new DirectLine({
     token: /* or put your Direct Line token here (supply secret OR token, not both) */,
     domain: /* optional: if you are not using the default Direct Line endpoint, e.g. if you are using a region-specific endpoint, put its full URL here */
     webSocket: /* optional: false if you want to use polling GET to receive messages. Defaults to true (use WebSocket). */,
+    pollingInterval: /* optional: set polling interval in milliseconds. Default to 1000 */,
 });
 ```
 

directLine.d.ts

@@ -209,6 +209,7 @@ export interface DirectLineOptions {
     token?: string;
     domain?: string;
     webSocket?: boolean;
+    pollingInterval?: number;
 }
 export declare class DirectLine implements IBotConnection {
     constructor(options: DirectLineOptions);

src/directLine.ts

@@ -222,7 +222,8 @@ export interface DirectLineOptions {
     secret?: string,
     token?: string
     domain?: string,
-    webSocket?: boolean
+    webSocket?: boolean,
+    pollingInterval?: number
 }
 
 const lifetimeRefreshToken = 30 * 60 * 1000;
@@ -262,6 +263,8 @@ export class DirectLine implements IBotConnection {
     private watermark = '';
     private streamUrl: string;
 
+    private pollingInterval: number = 1000;
+
     private tokenRefreshSubscription: Subscription;
 
     constructor(options: DirectLineOptions) {
@@ -272,6 +275,9 @@ export class DirectLine implements IBotConnection {
         if (options.webSocket !== undefined)
             this.webSocket = options.webSocket;
 
+        if (options.pollingInterval !== undefined)
+            this.pollingInterval = options.pollingInterval;
+
         this.activity$ = this.webSocket && typeof WebSocket !== 'undefined' && WebSocket
             ? this.webSocketActivity$()
             : this.pollingGetActivity$();
@@ -487,7 +493,7 @@ export class DirectLine implements IBotConnection {
     }
 
     private pollingGetActivity$() {
-        return Observable.interval(1000)
+        return Observable.interval(this.pollingInterval)
         .combineLatest(this.checkConnection())
         .flatMap(_ =>
             Observable.ajax({