fix(directline): add missing commits post rebase

Author: harshithkashyap

src/directLine.ts

@@ -130,10 +130,10 @@ export class DirectLine implements IBotConnection {
                             return throwError(errorFailedToConnect);
 
                         case ConnectionStatus.ExpiredToken:
-                            return throwError(errorExpiredToken);
+                            return of(connectionStatus);
 
                         default:
-                            return of(null);
+                            return of(connectionStatus);
                     }
                 })
             )
@@ -212,7 +212,10 @@ export class DirectLine implements IBotConnection {
                                         // if the token is expired there's no reason to keep trying
                                         this.expiredToken();
                                         return throwError(error);
+                                    } else if (error.status === 404) {
+                                        throwError(error);
                                     }
+
                                     return of(error);
                                 }),
                                 delay(timeout),
@@ -370,37 +373,60 @@ export class DirectLine implements IBotConnection {
     }
 
     private pollingGetActivity$() {
-        return interval(this.pollingInterval)
-            .pipe(
-                combineLatest(this.checkConnection()),
-                mergeMap(_ =>
+        const poller$: Observable<AjaxResponse> = Observable.create((subscriber: Subscriber<any>) => {
+            // A BehaviorSubject to trigger polling. Since it is a BehaviorSubject
+            // the first event is produced immediately.
+            const trigger$ = new BehaviorSubject<any>({});
+
+            trigger$.subscribe(() => {
+                if (this.connectionStatus$.getValue() === ConnectionStatus.Online) {
+                    const startTimestamp = Date.now();
+
                     ajax({
-                        method: "GET",
-                        url: `${this.domain}/conversations/${this.conversationId}/activities?watermark=${this.watermark}`,
-                        timeout,
                         headers: {
-                            "Accept": "application/json",
-                            "Authorization": `Bearer ${this.token}`
-                        }
-                    })
-                    .pipe(
-                        catchError(error => {
-                            if (error.status === 403) {
-                                // This is slightly ugly. We want to update this.connectionStatus$ to ExpiredToken so that subsequent
-                                // calls to checkConnection will throw an error. But when we do so, it causes this.checkConnection()
-                                // to immediately throw an error, which is caught by the catch() below and transformed into an empty
-                                // object. Then next() returns, and we emit an empty object. Which means one 403 is causing
-                                // two empty objects to be emitted. Which is harmless but, again, slightly ugly.
-                                this.expiredToken();
+                            Accept: 'application/json',
+                            Authorization: `Bearer ${ this.token }`
+                        },
+                        method: 'GET',
+                        url: `${ this.domain }/conversations/${ this.conversationId }/activities?watermark=${ this.watermark }`,
+                        timeout
+                    }).subscribe(
+                        (result: AjaxResponse) => {
+                            subscriber.next(result);
+                            setTimeout(() => trigger$.next(null), Math.max(0, this.pollingInterval - Date.now() + startTimestamp));
+                        },
+                        (error: any) => {
+                            switch (error.status) {
+                                case 403:
+                                    this.connectionStatus$.next(ConnectionStatus.ExpiredToken);
+                                    setTimeout(() => trigger$.next(null), this.pollingInterval);
+                                    break;
+
+                                case 404:
+                                    this.connectionStatus$.next(ConnectionStatus.Ended);
+                                    break;
+
+                                default:
+                                    // propagate the error
+                                    subscriber.error(error);
+                                    break;
                             }
-                            return empty();
-                        }),
-            //          .do(ajaxResponse => konsole.log("getActivityGroup ajaxResponse", ajaxResponse))
-                        map(ajaxResponse => ajaxResponse.response as ActivityGroup),
-                        mergeMap(activityGroup => this.observableFromActivityGroup(activityGroup))
-                    )
-                ),
-                catchError(error => empty())
+                        }
+                    );
+                }
+            });
+        });
+
+        return this.checkConnection()
+            .pipe(
+                mergeMap(_ =>
+                    poller$
+                        .pipe(
+                            catchError(() => empty()),
+                            map(ajaxResponse => ajaxResponse.response as ActivityGroup),
+                            mergeMap(activityGroup => this.observableFromActivityGroup(activityGroup))
+                        )
+                )
             );
     }
 
@@ -420,6 +446,7 @@ export class DirectLine implements IBotConnection {
                     // but it's simpler just to always fetch a new one.
                     .pipe(
                         retryWhen(error$ => error$.pipe(
+                            delay(3000),
                             mergeMap(error => this.reconnectToConversation()
                         )))
                     )
@@ -491,7 +518,10 @@ export class DirectLine implements IBotConnection {
                                         // token has expired. We can't recover from this here, but the embedding
                                         // website might eventually call reconnect() with a new token and streamUrl.
                                         this.expiredToken();
+                                    } else if (error.status === 404) {
+                                        throwError(errorConversationEnded);
                                     }
+
                                     return of(error);
                                 }),
                                 delay(timeout),

src/directline.interface.ts

@@ -169,10 +169,13 @@ export interface AnimationCard {
 export type KnownMedia = Media | HeroCard | Thumbnail | Signin | OAuth | Receipt | AudioCard | VideoCard | AnimationCard | FlexCard | AdaptiveCard;
 export type Attachment = KnownMedia | UnknownMedia;
 
+export type UserRole = "bot" | "channel" | "user";
+
 export interface User {
     id: string,
     name?: string,
-    iconUrl?: string
+    iconUrl?: string,
+    role?: UserRole
 }
 
 export interface IActivity {