Add networkInformation object to DLASE (#412)

* WIP: Add watchdog

* Add warning if REST API returned too soon

* Add integration test

* Add NetworkInformation watchdog

* Add network information watchdog

* Prolong test time

* Support NetworkInformation-like

* Add AbortSignal function story

* Add abort watchdog test

* Add entry

* Update comments

* Add FAQ related to network change

* Rename watchdog to (network) probe

* Add NetworkInformationObserver

* Update test names

* Add WebSocketClient implementation

* Add tests

* Add test for change network type

* Move to NetworkInformation

* Fix flaky

* Clean up

* Explain NetworkInformation requirement

* Allow unset networkInformation option

* Clean up

* Clean up

* Remove NetworkInformation polyfill

* Update SSE

* Update entry

* Add clarifications

* Update to Node.js 18

* Add NetworkInformation.d.ts

* Update README.md

Co-authored-by: TJ Durnford <tjdford@gmail.com>

* Typo

---------

Co-authored-by: TJ Durnford <tjdford@gmail.com>

Author: compulim

.github/workflows/continuous-deployment.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
 
     steps:
       - uses: actions/checkout@v3
@@ -48,7 +48,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           registry-url: https://registry.npmjs.org/
       - name: Download tarball artifact
         uses: actions/download-artifact@v3.0.1

.github/workflows/publish-release.yml

@@ -10,10 +10,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'npm'
       - id: get-version
         name: Get version
@@ -49,7 +49,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           registry-url: https://registry.npmjs.org/
       - name: Download tarball artifact
         uses: actions/download-artifact@v3.0.1

.github/workflows/pull-request-validation.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
 
     steps:
       - uses: actions/checkout@v3

CHANGELOG.md

@@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+
+- Direct Line Streaming: Added `networkInformation` option to assist detection of connection issues, by [@compulim](https://github.com/compulim), in PR [#412](https://github.com/microsoft/BotFramework-DirectLineJS/pull/412)
+
 ## [0.15.4] - 2023-06-05
 
 ### Changed

README.md

@@ -6,23 +6,23 @@
 
 [![Build Status](https://travis-ci.org/Microsoft/BotFramework-DirectLineJS.svg?branch=master)](https://travis-ci.org/Microsoft/BotFramework-DirectLineJS)
 
-Client library for the [Microsoft Bot Framework](http://www.botframework.com) *[Direct Line](https://docs.botframework.com/en-us/restapi/directline3/)* protocol.
+Client library for the [Microsoft Bot Framework](http://www.botframework.com) _[Direct Line](https://docs.botframework.com/en-us/restapi/directline3/)_ protocol.
 
 Used by [WebChat](https://github.com/Microsoft/BotFramework-WebChat) and thus (by extension) [Emulator](https://github.com/Microsoft/BotFramework-Emulator), WebChat channel, and [Azure Bot Service](https://azure.microsoft.com/en-us/services/bot-service/).
 
 ## FAQ
 
-### *Who is this for?*
+### _Who is this for?_
 
 Anyone who is building a Bot Framework JavaScript client who does not want to use [WebChat](https://github.com/Microsoft/BotFramework-WebChat).
 
 If you're currently using WebChat, you don't need to make any changes as it includes this package.
 
-### *What is that funny `subscribe()` method in the samples below?*
+### _What is that funny `subscribe()` method in the samples below?_
 
 Instead of callbacks or Promises, this library handles async operations using Observables. Try it, you'll like it! For more information, check out [RxJS](https://github.com/reactivex/rxjs/).
 
-### *Can I use [TypeScript](http://www.typescriptlang.com)?*
+### _Can I use [TypeScript](http://www.typescriptlang.com)?_
 
 You bet.
 
@@ -32,6 +32,22 @@ This is an official Microsoft-supported library, and is considered largely compl
 
 That said, the public API is still subject to change.
 
+### Why the library did not detect Web Socket disconnections?
+
+On iOS/iPadOS, when network change from Wi-Fi to cellular, the `WebSocket` object will be stalled without any errors. This is not detectable nor workaroundable without any additional assistance. The issue is related to an experimental feature named "NSURLSession WebSocket". The feature is enabled by default on iOS/iPadOS 15 and up.
+
+An option named `networkInformation` can be used to assist the library to detect any connection issues. The option is based on [W3C Network Information API](https://developer.mozilla.org/en-US/docs/Web/API/Network_Information_API) and it should implement at least 2 members:
+
+- [A `type` property](https://developer.mozilla.org/en-US/docs/Web/API/NetworkInformation/type) to indicate the current network type
+  - When the `type` is `"offline"`, network is not available and no connection will be made
+- [A `change` event](https://developer.mozilla.org/en-US/docs/Web/API/NetworkInformation/change_event) should dispatch when the `type` property change
+
+However, Safari on iOS/iPadOS [does not support W3C Network Information API](https://bugs.webkit.org/show_bug.cgi?id=185697). It is up to web developers to implement the `NetworkInformation` polyfill.
+
+One effective way to detect network type change is to subscribe to a [Server-Sent Events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events) source. The service would send a message every 30 seconds. If network type changed and current network type is no longer available, the connection will be closed prematurely and an `error` event will be dispatched to the [`EventSource`](https://developer.mozilla.org/en-US/docs/Web/API/EventSource) instance. Upon receiving the `error` event, the `NetworkInformation.type` should then change to `"offline"`. The browser would automatically retry the Server-Sent Events connection. Upon receiving an `open` event, the polyfill should change the `type` back to `"unknown"`.
+
+If the library is being used in a native iOS/iPadOS app, a less resource-intensive solution would be partially implementing the [Network Information API](https://developer.mozilla.org/en-US/docs/Web/API/Network_Information_API) using [`NWPathMonitor`](https://developer.apple.com/documentation/network/nwpathmonitor). When network change happens, the `NetworkInformation` instance should update the [`type` property](https://developer.mozilla.org/en-US/docs/Web/API/NetworkInformation/type) based on network type and dispatch a [`change` event](https://developer.mozilla.org/en-US/docs/Web/API/NetworkInformation/change_event).
+
 ## How to build from source
 
 0. Clone this repo
@@ -88,65 +104,58 @@ var directLine = new DirectLine({
 ### Post activities to the bot:
 
 ```typescript
-directLine.postActivity({
+directLine
+  .postActivity({
     from: { id: 'myUserId', name: 'myUserName' }, // required (from.name is optional)
     type: 'message',
     text: 'a message for you, Rudy'
-}).subscribe(
-    id => console.log("Posted activity, assigned ID ", id),
-    error => console.log("Error posting activity", error)
-);
+  })
+  .subscribe(
+    id => console.log('Posted activity, assigned ID ', id),
+    error => console.log('Error posting activity', error)
+  );
 ```
 
 You can also post messages with attachments, and non-message activities such as events, by supplying the appropriate fields in the activity.
 
 ### Listen to activities sent from the bot:
 
 ```typescript
-directLine.activity$
-.subscribe(
-    activity => console.log("received activity ", activity)
-);
+directLine.activity$.subscribe(activity => console.log('received activity ', activity));
 ```
 
 You can use RxJS operators on incoming activities. To see only message activities:
 
 ```typescript
 directLine.activity$
-.filter(activity => activity.type === 'message')
-.subscribe(
-    message => console.log("received message ", message)
-);
+  .filter(activity => activity.type === 'message')
+  .subscribe(message => console.log('received message ', message));
 ```
 
 Direct Line will helpfully send your client a copy of every sent activity, so a common pattern is to filter incoming messages on `from`:
 
 ```typescript
 directLine.activity$
-.filter(activity => activity.type === 'message' && activity.from.id === 'yourBotHandle')
-.subscribe(
-    message => console.log("received message ", message)
-);
+  .filter(activity => activity.type === 'message' && activity.from.id === 'yourBotHandle')
+  .subscribe(message => console.log('received message ', message));
 ```
 
 ### Monitor connection status
 
 Subscribing to either `postActivity` or `activity$` will start the process of connecting to the bot. Your app can listen to the connection status and react appropriately :
 
 ```typescript
-
 import { ConnectionStatus } from 'botframework-directlinejs';
 
-directLine.connectionStatus$
-.subscribe(connectionStatus => {
-    switch(connectionStatus) {
-        case ConnectionStatus.Uninitialized:    // the status when the DirectLine object is first created/constructed
-        case ConnectionStatus.Connecting:       // currently trying to connect to the conversation
-        case ConnectionStatus.Online:           // successfully connected to the converstaion. Connection is healthy so far as we know.
-        case ConnectionStatus.ExpiredToken:     // last operation errored out with an expired token. Your app should supply a new one.
-        case ConnectionStatus.FailedToConnect:  // the initial attempt to connect to the conversation failed. No recovery possible.
-        case ConnectionStatus.Ended:            // the bot ended the conversation
-    }
+directLine.connectionStatus$.subscribe(connectionStatus => {
+  switch (connectionStatus) {
+    case ConnectionStatus.Uninitialized: // the status when the DirectLine object is first created/constructed
+    case ConnectionStatus.Connecting: // currently trying to connect to the conversation
+    case ConnectionStatus.Online: // successfully connected to the converstaion. Connection is healthy so far as we know.
+    case ConnectionStatus.ExpiredToken: // last operation errored out with an expired token. Your app should supply a new one.
+    case ConnectionStatus.FailedToConnect: // the initial attempt to connect to the conversation failed. No recovery possible.
+    case ConnectionStatus.Ended: // the bot ended the conversation
+  }
 });
 ```
 
@@ -168,7 +177,8 @@ directLine.reconnect(conversation);
 When using DirectLine with WebChat, closing the current tab or refreshing the page will create a new conversation in most cases. You can resume an existing conversation to keep the user in the same context.
 
 **When using a secret** you can resume a conversation by:
-- Storing the conversationid (in a *permanent* place, like local storage)
+
+- Storing the conversationid (in a _permanent_ place, like local storage)
 - Giving this value back while creating the DirectLine object along with the secret
 
 ```typescript
@@ -181,7 +191,8 @@ const dl = new DirectLine({
 ```
 
 **When using a token** you can resume a conversation by:
-- Storing the conversationid and your token (in a *permanent* place, like local storage)
+
+- Storing the conversationid and your token (in a _permanent_ place, like local storage)
 - Calling the DirectLine reconnect API yourself to get a refreshed token and a streamurl
 - Creating the DirectLine object using the ConversationId, Token, and StreamUrl
 
@@ -196,7 +207,7 @@ const dl = new DirectLine({
 ```
 
 **Getting any history that Direct Line has cached** : you can retrieve history using watermarks:
-You can see the watermark as an *activity 'bookmark'*. The resuming scenario will replay all the conversation activities from the watermark you specify.
+You can see the watermark as an _activity 'bookmark'_. The resuming scenario will replay all the conversation activities from the watermark you specify.
 
 ```typescript
 import { DirectLine } from 'botframework-directlinejs';
@@ -212,7 +223,7 @@ const dl = new DirectLine({
 
 ## Contributing
 
-This project welcomes contributions and suggestions.  Most contributions require you to agree to a
+This project welcomes contributions and suggestions. Most contributions require you to agree to a
 Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
 the rights to use your contribution. For details, visit https://cla.microsoft.com.
 
@@ -228,6 +239,7 @@ For more information see the [Code of Conduct FAQ](https://opensource.microsoft.
 contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
 
 ## Reporting Security Issues
+
 Security issues and bugs should be reported privately, via email, to the Microsoft Security Response Center (MSRC) at [secure@microsoft.com](mailto:secure@microsoft.com). You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Further information, including the [MSRC PGP](https://technet.microsoft.com/en-us/security/dn606155) key, can be found in the [Security TechCenter](https://technet.microsoft.com/en-us/security/default).
 
 Copyright (c) Microsoft Corporation. All rights reserved.

__tests__/directLineStreaming/__setup__/createBotProxy.ts

@@ -143,6 +143,7 @@ export default function createBotProxy(init?: CreateBotProxyInit): Promise<Creat
               webSocketProxy.emit('connection', ws, proxySocket, req)
             )
           );
+          proxySocket.addEventListener('error', () => {});
 
           socket.once('close', () => proxySocket.close());
         })

__tests__/directLineStreaming/__setup__/expect/activityContaining.d.ts

@@ -0,0 +1,9 @@
+import '@jest/types';
+
+declare global {
+  namespace jest {
+    interface Expect {
+      activityContaining(messageText: string, mergeActivity?: { id?: string; type?: string }): any;
+    }
+  }
+}

__tests__/directLineStreaming/__setup__/mockObserver.ts

@@ -12,19 +12,24 @@ type Observation<T> =
  * Mocks an observer and records all observations.
  */
 export default function mockObserver<T>(): Readonly<
-  Required<Observer<T>> & { observations: ReadonlyArray<Observation<T>> }
+  Required<Observer<T>> & {
+    observations: ReadonlyArray<Observation<T>>;
+    observe: (observation: Observation<T>) => void;
+  }
 > {
+  const observe: (observation: Observation<T>) => void = jest.fn(observation => observations.push(observation));
   const observations: Array<Observation<T>> = [];
 
-  const complete = jest.fn(() => observations.push([Date.now(), 'complete']));
-  const error = jest.fn(reason => observations.push([Date.now(), 'error', reason]));
-  const next = jest.fn(value => observations.push([Date.now(), 'next', value]));
-  const start = jest.fn(subscription => observations.push([Date.now(), 'start', subscription]));
+  const complete = jest.fn(() => observe([Date.now(), 'complete']));
+  const error = jest.fn(reason => observe([Date.now(), 'error', reason]));
+  const next = jest.fn(value => observe([Date.now(), 'next', value]));
+  const start = jest.fn(subscription => observe([Date.now(), 'start', subscription]));
 
   return Object.freeze({
     complete,
     error,
     next,
+    observe,
     start,
 
     get observations() {

__tests__/directLineStreaming/connect.fail.story.js

@@ -43,7 +43,7 @@ test('connect fail should signal properly', async () => {
   directLine.activity$.subscribe(activityObserver);
 
   // THEN: Should try to connect 3 times.
-  await waitFor(() => expect(onUpgrade).toBeCalledTimes(3));
+  await waitFor(() => expect(onUpgrade).toBeCalledTimes(3), { timeout: 5_000 });
 
   // THEN: Should not wait before connecting the first time.
   expect(onUpgrade.mock.results[0].value - connectTime).toBeLessThan(3000);