fix(directline): add new changes from master

Author: harshithkashyap

.babelrc.js

@@ -37,4 +37,4 @@ module.exports = {
     '@babel/preset-typescript'
   ],
   sourceMaps: 'inline'
-};
+};

CHANGELOG.md

@@ -15,6 +15,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+
+- Reverting PR [#171](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/171) and PR [#172](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/172), which caused infinite loop of reconnections, by [@compulim](https://github.com/compulim) in PR [#240](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/240)
+
+## [0.11.5] - 2019-09-30
+
 ### Changed
 - Update DirectLine to rxjs v6 pipeable operators, PR [#102](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/102/files)
 
@@ -64,15 +70,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
    - [`webpack@4.39.3`](https://npmjs.com/package/webpack)
    - [`webpack-cli@3.3.8`](https://npmjs.com/package/webpack-cli)
 
-<<<<<<< HEAD
+
 ### Added
 - Fix [#235](https://github.com/Microsoft/BotFramework-DirectLineJS/issues/235). Added metadata when uploading attachments, including `thumbnailUrl`, by [@compulim](https://github.com/compulim), in PR [#236](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/236)
 
 ### Fixed
 - Avoid posting an error on intentional end, by [@orgads](https://github.com/orgads) in PR [#172](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/172)
 - Surface Web Socket errors, by [@orgads](https://github.com/orgads) in PR [#171](https://github.com/Microsoft/BotFramework-DirectLineJS/pull/171)
-=======
->>>>>>> fix(directline): add new changes from master
 
 ## [0.11.4] - 2019-03-04
 ### Changed

__tests__/happy.uploadAttachments.js

@@ -113,4 +113,4 @@ describe('Happy path', () => {
       ]);
     });
   });
-});
+});

src/directLine.mock.ts

@@ -1,7 +1,9 @@
-import * as DirectLineExport from "./directLine";
-import { TestScheduler, Observable } from "rxjs";
-import { AjaxCreationMethod, AjaxRequest, AjaxResponse } from "rxjs/observable/dom/AjaxObservable";
+import * as DirectLineExport from './directLine';
+import { Observable } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
 import { URL, URLSearchParams } from 'url';
+import { AjaxRequest, AjaxResponse } from 'rxjs/ajax';
+import { AjaxCreationMethod } from 'rxjs/internal/observable/dom/AjaxObservable';
 
 // MOCK helpers
 
@@ -148,8 +150,7 @@ export const mockAjax = (server: Server, customAjax?: ajaxType): AjaxCreationMet
       }
 
       return response as AjaxResponse;
-    }
-    else if (parts.length === 5) {
+    } else if (parts.length === 5) {
       const responseToken = tokenResponse(server, urlOrRequest);
       if (responseToken !== null) {
         return responseToken;
@@ -179,8 +180,7 @@ export const mockAjax = (server: Server, customAjax?: ajaxType): AjaxCreationMet
       try {
         subscriber.next(jax(urlOrRequest));
         subscriber.complete();
-      }
-      catch (error) {
+      } catch (error) {
         subscriber.error(error);
       }
     });
@@ -210,6 +210,11 @@ type EventHandler<E extends Event> = (this: WebSocket, ev: E) => any;
 
 export const mockWebSocket = (server: Server): WebSocketConstructor =>
   class MockWebSocket implements WebSocket, ActivitySocket {
+    static CLOSED = WebSocket.CLOSED;
+    static CLOSING = WebSocket.CLOSING;
+    static CONNECTING = WebSocket.CONNECTING;
+    static OPEN = WebSocket.OPEN;
+
     constructor(url: string, protocols?: string | string[]) {
 
       server.scheduler.schedule(() => {
@@ -226,21 +231,6 @@ export const mockWebSocket = (server: Server): WebSocketConstructor =>
       });
     }
 
-    play(start: number, after: number) {
-
-      const { conversation: { history } } = server;
-      const activities = history.slice(start, after);
-      const watermark = history.length.toString();
-      const activityGroup: DirectLineExport.ActivityGroup = {
-        activities,
-        watermark,
-      }
-
-      const message = new MessageEvent('type', { data: JSON.stringify(activityGroup) });
-
-      this.onmessage(message);
-    }
-
     binaryType: BinaryType = 'arraybuffer';
     readonly bufferedAmount: number = 0;
     readonly extensions: string = '';
@@ -257,6 +247,21 @@ export const mockWebSocket = (server: Server): WebSocketConstructor =>
     onmessage: EventHandler<MessageEvent>;
     onopen: EventHandler<Event>;
 
+    play(start: number, after: number) {
+
+      const { conversation: { history } } = server;
+      const activities = history.slice(start, after);
+      const watermark = history.length.toString();
+      const activityGroup: DirectLineExport.ActivityGroup = {
+        activities,
+        watermark,
+      }
+
+      const message = new MessageEvent('type', { data: JSON.stringify(activityGroup) });
+
+      this.onmessage(message);
+    }
+
     close(code?: number, reason?: string): void {
       this.readyState = WebSocket.CLOSING;
       this.onclose(new CloseEvent('close'))
@@ -270,11 +275,6 @@ export const mockWebSocket = (server: Server): WebSocketConstructor =>
     addEventListener() { throw new Error(); }
     removeEventListener() { throw new Error(); }
     dispatchEvent(): boolean { throw new Error(); }
-
-    static CLOSED = WebSocket.CLOSED;
-    static CLOSING = WebSocket.CLOSING;
-    static CONNECTING = WebSocket.CONNECTING;
-    static OPEN = WebSocket.OPEN;
   };
 
 // MOCK services (top-level aggregation of all mocks)

src/directLine.test.ts

@@ -1,8 +1,11 @@
 import * as DirectLineExport from "./directLine";
 import * as DirectLineMock from './directLine.mock';
-import { TestScheduler, Observable, Subscription, AjaxResponse } from "rxjs";
 // @ts-ignore
-import { version } from "../package.json";
+import { version as packageVersion } from "../package.json";
+import { Observable, Subscription, timer, empty, scheduled } from "rxjs";
+import { TestScheduler } from "rxjs/testing";
+import { AjaxResponse } from "rxjs/ajax";
+import { catchError, observeOn } from "rxjs/operators";
 
 declare var process: {
     arch: string;
@@ -33,7 +36,7 @@ test("#setConnectionStatusFallback", () => {
 });
 
 describe("#commonHeaders", () => {
-    const botAgent = `DirectLine/3.0 (directlinejs; custom-bot-agent ${version})`;
+    const botAgent = `DirectLine/3.0 (directlinejs; custom-bot-agent ${packageVersion})`;
     let botConnection;
 
     beforeEach(() => {
@@ -78,16 +81,14 @@ describe('MockSuite', () => {
                     const result = iterator.next();
                     if (result.done === true) {
                         subscriber.complete();
-                    }
-                    else {
+                    } else {
                         inner = result.value.subscribe(
                             value => subscriber.next(value),
                             error => subscriber.error(error),
                             pump
                         );
                     }
-                }
-                catch (error) {
+                } catch (error) {
                     subscriber.error(error);
                 }
             };
@@ -108,7 +109,7 @@ describe('MockSuite', () => {
     let directline: DirectLineExport.DirectLine;
 
     beforeEach(() => {
-        scheduler = new TestScheduler((actual, expected) => expect(expected).toBe(actual));
+        scheduler = new TestScheduler((actual, expectedValue) => expect(expectedValue).toBe(actual));
         scheduler.maxFrames = 60 * 1000;
         server = DirectLineMock.mockServer(scheduler);
         services = DirectLineMock.mockServices(server, scheduler);
@@ -132,14 +133,14 @@ describe('MockSuite', () => {
         // arrange
 
         const scenario = function* (): IterableIterator<Observable<unknown>> {
-            yield Observable.timer(200, scheduler);
+            yield timer(200, scheduler);
             yield directline.postActivity(expected.x);
-            yield Observable.timer(200, scheduler);
+            yield timer(200, scheduler);
             yield directline.postActivity(expected.y);
-            yield Observable.timer(200, scheduler);
+            yield timer(200, scheduler);
         };
 
-        subscriptions.push(lazyConcat(scenario()).observeOn(scheduler).subscribe());
+        subscriptions.push(lazyConcat(scenario()).pipe(observeOn(scheduler)).subscribe());
 
         const actual: Array<DirectLineExport.Activity> = [];
         subscriptions.push(directline.activity$.subscribe(a => actual.push(a)));
@@ -157,15 +158,15 @@ describe('MockSuite', () => {
         // arrange
 
         const scenario = function* (): IterableIterator<Observable<unknown>> {
-            yield Observable.timer(200, scheduler);
+            yield timer(200, scheduler);
             yield directline.postActivity(expected.x);
             DirectLineMock.injectClose(server);
-            yield Observable.timer(200, scheduler);
+            yield timer(200, scheduler);
             yield directline.postActivity(expected.y);
-            yield Observable.timer(200, scheduler);
+            yield timer(200, scheduler);
         };
 
-        subscriptions.push(lazyConcat(scenario()).observeOn(scheduler).subscribe());
+        subscriptions.push(lazyConcat(scenario()).pipe(observeOn(scheduler)).subscribe());
 
         const actual: Array<DirectLineExport.Activity> = [];
         subscriptions.push(directline.activity$.subscribe(a => actual.push(a)));
@@ -180,31 +181,30 @@ describe('MockSuite', () => {
     });
 
     test('BotAgentWithMocks', () => {
-        const expected: string = `DirectLine/3.0 (directlinejs ${version})`;
+        const expectedValue: string = `DirectLine/3.0 (directlinejs ${packageVersion})`;
 
-        //@ts-ignore
+        // @ts-ignore
         const actual: string = directline.commonHeaders()["x-ms-bot-agent"];
-        expect(actual).toStrictEqual(expected)
+        expect(actual).toStrictEqual(expectedValue)
     });
 
     test('RetryAfterHeader', () => {
         services.ajax = DirectLineMock.mockAjax(server, (urlOrRequest) => {
 
-            if(typeof urlOrRequest === 'string'){
+            if (typeof urlOrRequest === 'string') {
                 throw new Error();
             }
 
-            if(urlOrRequest.url && urlOrRequest.url.indexOf(server.conversation.conversationId)>0){
+            if (urlOrRequest.url && urlOrRequest.url.indexOf(server.conversation.conversationId) > 0) {
                  const response: Partial<AjaxResponse> = {
                     status: 429,
-                    xhr:{
+                    xhr: {
                         getResponseHeader: (name) => "10"
                     } as XMLHttpRequest
                 };
                 const error = new Error('Ajax Error');
                 throw Object.assign(error, response);
-            }
-            else if(urlOrRequest.url && urlOrRequest.url.indexOf('/conversations') > 0){
+            } else if (urlOrRequest.url && urlOrRequest.url.indexOf('/conversations') > 0) {
                 // start conversation
                 const response: Partial<AjaxResponse> = {
                     response: server.conversation,
@@ -222,17 +222,16 @@ describe('MockSuite', () => {
         let startTime: number;
         let endTime: number;
         const scenario = function* (): IterableIterator<Observable<unknown>> {
-            yield Observable.timer(200, scheduler);
+            yield timer(200, scheduler);
             startTime = scheduler.now();
             yield directline.postActivity(expected.x);
         };
 
         let actualError: Error;
-        try{
-        subscriptions.push(lazyConcat(scenario()).observeOn(scheduler).subscribe());
-        scheduler.flush();
-        }
-        catch(error){
+        try {
+            subscriptions.push(lazyConcat(scenario()).pipe(observeOn(scheduler)).subscribe());
+            scheduler.flush();
+        } catch (error) {
             actualError = error;
             endTime = scheduler.now();
         }
@@ -243,22 +242,21 @@ describe('MockSuite', () => {
     });
 
     test('SendDebugHeader', () => {
-        let expectedBotId:string;
+        let expectedBotId: string;
         const actual = 'botid';
         services.ajax = DirectLineMock.mockAjax(server, (urlOrRequest) => {
-            if(typeof urlOrRequest === 'string'){
+            if (typeof urlOrRequest === 'string') {
                 throw new Error();
             }
 
-            if(urlOrRequest.url && urlOrRequest.url.indexOf(server.conversation.conversationId)>0){
+            if (urlOrRequest.url && urlOrRequest.url.indexOf(server.conversation.conversationId) > 0) {
                  const response: Partial<AjaxResponse> = {
-                    response: {id:'blah'},
+                    response: {id: 'blah'},
                     status: 200
                 };
                 expectedBotId = urlOrRequest.headers['x-ms-botid'];
                 return response as AjaxResponse;
-            }
-            else if(urlOrRequest.url && urlOrRequest.url.indexOf('/conversations') > 0){
+            } else if (urlOrRequest.url && urlOrRequest.url.indexOf('/conversations') > 0) {
                 // start conversation
                 const response: Partial<AjaxResponse> = {
                     response: server.conversation,
@@ -273,14 +271,14 @@ describe('MockSuite', () => {
         });
         directline = new DirectLineExport.DirectLine(services);
         const scenario = function* (): IterableIterator<Observable<unknown>> {
-            yield Observable.timer(200, scheduler);
-            yield directline.postActivity(expected.x).catch(() => Observable.empty(scheduler));
+            yield timer(200, scheduler);
+            yield directline.postActivity(expected.x).pipe(catchError(() => scheduled([], scheduler)));
         };
 
         // lack of subscribe arguments means that the empty subscriber is used
         // the empty subscriber will propagate observable errors on the JS call stack
         // within the scheduler notification action handling loop because of the observeOn
-        subscriptions.push(lazyConcat(scenario()).observeOn(scheduler).subscribe());
+        subscriptions.push(lazyConcat(scenario()).pipe(observeOn(scheduler)).subscribe());
         scheduler.flush();
 
         expect(expectedBotId).toBe(actual);