refactor(directline): update rxjs to v6, use rxjs pipeable operators, update webpack to v4

chore(npm): update dependencies, add tslint

fix(directline): add missing commits post rebase

docs(changelog): add message to change log, bump npm version

fix(directline.interface): fix tslint errors

fix(directline): add new changes from master

refactor(app): remove dist directory

chore(npm): update dependencies

refactor(directline): remove unused imports

chore(npm): update dependencies

fix(directline): add new changes from master

fix(changelog): remove duplicate entries

fix(directline): add new changes from master

test(directline): update failing tests to use rxjs v6

chore(npm): update dependencies

fix(directline): remove unused files

chore(npm): update dependencies

fix(directline): add new changes from master

chore(npm): update dependencies

refactor(directline): update deprecated rxjs functions with new equivalent, fix failing tests

fix(readme): correct typo

fix(.gitignore): add missing newline at EOF

fix(directline-mock): correct function, variables order

fix(directline-streaming): import explicit named import from bfse

refactor(directline): disable directline streaming export until Node.js packages are removed from botframework-streaming package

chore(npm): update dependencies

fix(webpack): replace deprecated webpack Visualizer plugin with BundleAnalyzerPlugin

docs(directline): update streaming package comment

fix(package): correct version, name

chore(npm): update dependencies

fix(tests): add directline streaming package back to fix failing tests

chore(jsdom): update package

feat(Activity): add adaptive card InvokeActivity type

refactor(directline): add new changes from master

Author: harshithkashyap

.babelrc.js

@@ -0,0 +1,15 @@
+# Lines starting with '#' are comments.
+# Each line is a file pattern followed by one or more owners.
+
+# More details are here: https://help.github.com/articles/about-codeowners/
+
+# The '*' pattern is global owners.
+
+# Order is important. The last matching pattern has the most precedence.
+# The folders are ordered as follows:
+
+# In each subsection folders are ordered first by depth, then alphabetically.
+# This should make it easy to add new rules without breaking existing ones.
+
+# Global rule:
+* @microsoft/botframework-sdk

.github/CODEOWNERS

@@ -16,6 +16,59 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- Update DirectLine to rxjs v6 pipeable operators, PR [#102](https://github.com/microsoft/BotFramework-DirectLineJS/pull/102/files)
+## [0.15.1] - 2022-02-09
+### Changed
+
+- Bumped dependencies, by [@compulim](https://github.com/compulim), in PR [#351](https://github.com/microsoft/BotFramework-DirectLineJS/pull/351) and PR [#366](https://github.com/microsoft/BotFramework-DirectLineJS/pull/366)
+   - Production dependencies
+      - [`cross-fetch@3.1.5`](https://npmjs.com/package/cross-fetch)
+   - Development dependencies
+      - [`node-fetch@2.6.7`](https://npmjs.com/package/node-fetch)
+
+## [0.15.0] - 2021-07-29
+
+### Changed
+
+- Bumped dependencies, by [@compulim](https://github.com/compulim), in PR [#351](https://github.com/microsoft/BotFramework-DirectLineJS/pull/351)
+   - Production dependencies
+      - [`@babel/runtime@7.14.8`](https://npmjs.com/package/@babel/runtime)
+      - [`botframework-streaming@4.14.1`](https://npmjs.com/package/botframework-streaming)
+      - [`buffer@6.0.3`](https://npmjs.com/package/buffer)
+      - [`core-js@3.15.2`](https://npmjs.com/package/core-js)
+      - [`cross-fetch@3.1.4`](https://npmjs.com/package/cross-fetch)
+      - [`rxjs@5.5.12`](https://npmjs.com/package/rxjs)
+      - [`url-search-params-polyfill@8.1.1`](https://npmjs.com/package/url-search-params-polyfill)
+   - Development dependencies
+      - [`@babel/cli@7.14.8`](https://npmjs.com/package/@babel/cli)
+      - [`@babel/core@7.14.8`](https://npmjs.com/package/@babel/core)
+      - [`@babel/plugin-transform-runtime@7.14.5`](https://npmjs.com/package/@babel/plugin-transform-runtime)
+      - [`@babel/preset-env@7.14.8`](https://npmjs.com/package/@babel/preset-env)
+      - [`@babel/preset-typescript@7.14.5`](https://npmjs.com/package/@babel/preset-typescript)
+      - [`@types/jest@26.0.24`](https://npmjs.com/package/@types/jest)
+      - [`@types/jsonwebtoken@8.5.4`](https://npmjs.com/package/@types/jsonwebtoken)
+      - [`@types/node@16.4.0`](https://npmjs.com/package/@types/node)
+      - [`babel-loader@8.2.2`](https://npmjs.com/package/babel-loader)
+      - [`babel-jest@27.0.6`](https://npmjs.com/package/babel-jest)
+      - [`babel-plugin-istanbul@6.0.0`](https://npmjs.com/package/babel-plugin-istanbul)
+      - [`concurrently@6.2.0`](https://npmjs.com/package/concurrently)
+      - [`dotenv@10.0.0`](https://npmjs.com/package/dotenv)
+      - [`event-target-shim@6.0.2`](https://npmjs.com/package/event-target-shim)
+      - [`get-port@5.1.1`](https://npmjs.com/package/get-port)
+      - [`global-agent@2.2.0`](https://npmjs.com/package/global-agent)
+      - [`jest@27.0.6`](https://npmjs.com/package/jest)
+      - [`jest-environment-jsdom@27.0.6`](https://npmjs.com/package/jest-environment-jsdom)
+      - [`jsdom@16.6.0`](https://npmjs.com/package/jsdom)
+      - [`nock@13.1.1`](https://npmjs.com/package/nock)
+      - [`node-fetch@2.6.1`](https://npmjs.com/package/node-fetch)
+      - [`restify@8.5.1`](https://npmjs.com/package/restify)
+      - [`rimraf@3.0.2`](https://npmjs.com/package/rimraf)
+      - [`simple-update-in@2.2.0`](https://npmjs.com/package/simple-update-in)
+      - [`typescript@4.3.5`](https://npmjs.com/package/typescript)
+      - [`webpack@5.45.1`](https://npmjs.com/package/webpack)
+      - [`webpack-cli@4.7.2`](https://npmjs.com/package/webpack-cli)
+      - [`webpack-stats-plugin@1.0.3`](https://npmjs.com/package/webpack-stats-plugin)
+
 ## [0.14.1] - 2021-02-10
 
 ### Changed
@@ -180,4 +233,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - OAuthCard and `getSessionId` in PR #67
    - Add OAuthCard ([`c7b8af7`](https://github.com/microsoft/BotFramework-DirectLineJS/commit/c7b8af7be35685c220f2d777daa96f52d757f53f))
-   - Add `getSessionId` ([`9c87aa3`](https://github.com/microsoft/BotFramework-DirectLineJS/commit/9c87aa3f54947ea2fee836b41eec8ec45297a57a), [`9a2b2d8`](https://github.com/microsoft/BotFramework-DirectLineJS/commit/9a2b2d889af48e558f563758aa01d498b2b2cf49), [`df84d00`](df84d0054f784ae5eb36784ef07a2aa38ca6c95b), [`92cc331`](92cc33138dfbdd533b4d14f6be275d1c86ef8db4))
+   - Add `getSessionId` ([`9c87aa3`](https://github.com/microsoft/BotFramework-DirectLineJS/commit/9c87aa3f54947ea2fee836b41eec8ec45297a57a), [`9a2b2d8`](https://github.com/microsoft/BotFramework-DirectLineJS/commit/9a2b2d889af48e558f563758aa01d498b2b2cf49), [`df84d00`](df84d0054f784ae5eb36784ef07a2aa38ca6c95b), [`92cc331`](92cc33138dfbdd533b4d14f6be275d1c86ef8db4))

CHANGELOG.md

@@ -9,6 +9,8 @@ import postActivity from './setup/postActivity';
 import waitForBotToEcho from './setup/waitForBotToEcho';
 import waitForConnected from './setup/waitForConnected';
 
+jest.setTimeout(10000);
+
 describe('Happy path', () => {
   let unsubscribes;
 
@@ -34,10 +36,10 @@ describe('Happy path', () => {
         // DirectLine.postActivityWithAttachments support "contentUrl" only but not "content"
         attachments: [{
           contentType: 'image/jpg',
-          contentUrl: 'http://dljstestbot.azurewebsites.net/177KB.jpg'
+          contentUrl: 'https://dljstestbot.azurewebsites.net/177KB.jpg'
         }, {
           contentType: 'image/jpg',
-          contentUrl: 'http://dljstestbot.azurewebsites.net/100KB.jpg'
+          contentUrl: 'https://dljstestbot.azurewebsites.net/100KB.jpg'
         }],
         text: 'Hello, World!',
         type: 'message',
@@ -74,4 +76,4 @@ describe('Happy path', () => {
       ]);
     });
   });
-});
+});

__tests__/happy.uploadAttachmentStreams.js

@@ -9,6 +9,8 @@ import postActivity from './setup/postActivity';
 import waitForBotToEcho from './setup/waitForBotToEcho';
 import waitForConnected from './setup/waitForConnected';
 
+jest.setTimeout(10000);
+
 describe('Happy path', () => {
   let unsubscribes;
 
@@ -53,11 +55,11 @@ describe('Happy path', () => {
         // DirectLine.postActivityWithAttachments support "contentUrl" only but not "content"
         attachments: [{
           contentType: 'image/jpg',
-          contentUrl: 'http://dljstestbot.azurewebsites.net/177KB.jpg',
+          contentUrl: 'https://dljstestbot.azurewebsites.net/177KB.jpg',
           thumbnailUrl: 'data:image/png;base64,===177KB.jpg'
         }, {
           contentType: 'image/png',
-          contentUrl: 'http://dljstestbot.azurewebsites.net/100KB.jpg',
+          contentUrl: 'https://dljstestbot.azurewebsites.net/100KB.jpg',
           thumbnailUrl: 'data:image/png;base64,===100KB.jpb'
         }],
         text: 'Hello, World!',
@@ -108,4 +110,4 @@ describe('Happy path', () => {
       ]);
     });
   });
-});
+});

__tests__/happy.uploadAttachments.js

@@ -21,3 +21,7 @@ test('createServer setup correctly', async () => {
     dispose();
   }
 });
+
+test('test environment has Web Cryptography API', () => {
+  expect(typeof global.crypto.getRandomValues).toBe('function');
+});

__tests__/setup.ts

@@ -2,7 +2,11 @@ import { createProxyServer } from 'http-proxy';
 import { createServer } from 'http';
 import { promisify } from 'util';
 
-export default async function createDirectLineForwarder(port, handler, target = 'https://directline.botframework.com/') {
+export default async function createDirectLineForwarder(
+  port,
+  handler,
+  target = 'https://directline.botframework.com/'
+) {
   // We need a reverse proxy (a.k.a. forwarder) to control the network traffic.
   // This is because we need to modify the HTTP header by changing its host header (directline.botframework.com do not like "Host: localhost").
 
@@ -12,14 +16,20 @@ export default async function createDirectLineForwarder(port, handler, target =
     target
   });
 
+  proxy.on('proxyReq', (proxyRes, req, res, options) => {
+    // JSDOM requires all HTTP response, including those already pre-flighted, to have "Access-Control-Allow-Origin".
+    // https://github.com/jsdom/jsdom/issues/2024
+    res.setHeader('Access-Control-Allow-Origin', req.headers.origin || '*');
+  });
+
   const proxyServer = createServer((req, res) => {
     handler(req, res, () => proxy.web(req, res));
   });
 
   await promisify(proxyServer.listen.bind(proxyServer))(port);
 
   return {
-    domain: `http://localhost:${ port }/v3/directline`,
+    domain: `http://localhost:${port}/v3/directline`,
     unsubscribe: promisify(proxyServer.close.bind(proxyServer))
   };
-}
+}

__tests__/setup/createDirectLineForwarder.js

@@ -41,10 +41,12 @@ export default async function (options: CreateServerOptions): Promise<CreateServ
         deferred: createDeferred()
       }));
     } else {
-      return [{
-        ...unorderedPlaybacks,
-        deferred: createDeferred()
-      }];
+      return [
+        {
+          ...unorderedPlaybacks,
+          deferred: createDeferred()
+        }
+      ];
     }
   });
 
@@ -58,11 +60,7 @@ export default async function (options: CreateServerOptions): Promise<CreateServ
     const unorderedPlaybacks = Array.isArray(firstPlayback) ? firstPlayback : [firstPlayback];
     let handled;
 
-    unorderedPlaybacks.forEach(({
-      deferred,
-      req: preq = {},
-      res: pres = {}
-    }, index) => {
+    unorderedPlaybacks.forEach(({ deferred, req: preq = {}, res: pres = {} }, index) => {
       if (req.url === (preq.url || '/')) {
         if (req.method === 'OPTIONS') {
           res.send(200, '', {
@@ -80,14 +78,13 @@ export default async function (options: CreateServerOptions): Promise<CreateServ
             headers['Content-Type'] = 'text/plain';
           }
 
-          res.send(
-            pres.code || 200,
-            pres.body,
-            {
-              ...headers,
-              ...pres.headers
-            }
-          );
+          res.send(pres.code || 200, pres.body, {
+            // JSDOM requires all HTTP response, including those already pre-flighted, to have "Access-Control-Allow-Origin".
+            // https://github.com/jsdom/jsdom/issues/2024
+            'Access-Control-Allow-Origin': req.header('Origin') || '*',
+            ...headers,
+            ...pres.headers
+          });
 
           handled = true;
           deferred.resolve();
@@ -114,12 +111,12 @@ export default async function (options: CreateServerOptions): Promise<CreateServ
       return new Promise(resolve => server.close(resolve));
     },
     port,
-    promises: options.playbacks.map((unorderedPlayback: (Playback | Playback[]), index) => {
+    promises: options.playbacks.map((unorderedPlayback: Playback | Playback[], index) => {
       if (Array.isArray(unorderedPlayback)) {
         return (orderedPlaybacks[index] as PlaybackWithDeferred[]).map(({ deferred: { promise } }) => promise);
       } else {
-        return (orderedPlaybacks[index][0]).deferred.promise;
+        return orderedPlaybacks[index][0].deferred.promise;
       }
     })
   };
-}
+}

__tests__/setup/createServer.ts

@@ -2,7 +2,7 @@ require('global-agent/bootstrap');
 
 // To use proxy, SET GLOBAL_AGENT_HTTP_PROXY=http://localhost:8888
 
-const JSDOMEnvironment = require('jest-environment-jsdom-fourteen');
+const JSDOMEnvironment = require('jest-environment-jsdom');
 
 class JSDOMEnvironmentWithProxy extends JSDOMEnvironment {
   setup() {
@@ -14,10 +14,10 @@ class JSDOMEnvironmentWithProxy extends JSDOMEnvironment {
       //       This is because the ResourceLoader instance constructor is of "slightly" different type when on runtime (probably Jest magic).
       //       Thus, when we set it thru testEnvironmentOptions.resources, it will fail on "--watch" but succeed when running without watch.
       this.global._resourceLoader = resources;
-
-      return super.setup();
     }
+
+    return super.setup();
   }
 }
 
-module.exports = JSDOMEnvironmentWithProxy;
+module.exports = JSDOMEnvironmentWithProxy;

__tests__/setup/jsdomEnvironmentWithProxy.js

@@ -0,0 +1,25 @@
+const crypto = require('crypto');
+
+global.crypto = {
+  // uuid.v4() required Web Cryptography.
+  // https://www.w3.org/TR/WebCryptoAPI/#Crypto-method-getRandomValues
+  getRandomValues(array) {
+    if (
+      !(
+        array instanceof Int8Array ||
+        array instanceof Uint8Array ||
+        array instanceof Int16Array ||
+        array instanceof Uint16Array ||
+        array instanceof In32Array ||
+        array instanceof Uint32Array ||
+        array instanceof Uint8ClampedArray
+      )
+    ) {
+      throw new Error('TypeMismatchError');
+    } else if (array.length > 65536) {
+      throw new Error('QuotaExceededError');
+    }
+
+    return crypto.randomFillSync(array);
+  }
+};