feat: botframework http adapter (#3375)

* fix: stdlib delay, various small clean ups

- Add ActivityTypes.Delay

consolidate sinon versions in root package

* fix: Partial<Activity> conversation API fixes

* feat: BotFrameworkHttpAdapter interface

* fix: remove Delay activity type

* fix: typo

Author: joshgummersall

libraries/adaptive-expressions/package.json

@@ -43,7 +43,6 @@
   "devDependencies": {
     "@types/jspath": "^0.4.0",
     "antlr4ts-cli": "0.5.0-alpha.3",
-    "sinon": "^7.5.0",
     "typescript": "3.5.3"
   },
   "scripts": {

libraries/botbuilder-ai-orchestrator/package.json

@@ -35,9 +35,6 @@
     "orchestrator-core": "4.12.0-preview",
     "uuid": "^8.3.2"
   },
-  "devDependencies": {
-    "sinon": "^9.2.1"
-  },
   "scripts": {
     "build": "tsc -b",
     "build-docs": "typedoc --theme markdown --entryPoint botbuilder-ai-orchestrator --excludePrivate --includeDeclarations --ignoreCompilerErrors --module amd --out ..\\..\\doc\\botbuilder-ai-orchestrator .\\lib\\index.d.ts --hideGenerator --name \"Bot Builder SDK - Orchestrator\" --readme none",

libraries/botbuilder-applicationinsights/package.json

@@ -34,8 +34,7 @@
   },
   "devDependencies": {
     "assert": "^1.4.1",
-    "chatdown": "^1.0.2",
-    "sinon": "^7.5.0"
+    "chatdown": "^1.0.2"
   },
   "scripts": {
     "build": "tsc -b",

libraries/botbuilder-azure-blobs/package.json

@@ -34,9 +34,6 @@
     "get-stream": "^6.0.0",
     "p-map": "^4.0.0"
   },
-  "devDependencies": {
-    "sinon": "^9.2.0"
-  },
   "scripts": {
     "build": "tsc -b",
     "build-docs": "typedoc --theme markdown --entryPoint botbuilder-azure-blobs --excludePrivate --includeDeclarations --ignoreCompilerErrors --module amd --out ..\\..\\doc\\botbuilder-azure-blobs .\\lib\\index.d.ts --hideGenerator --name \"Bot Builder SDK - Azure Blobs\" --readme none",

libraries/botbuilder-azure-queues/package.json

@@ -32,7 +32,6 @@
     "botbuilder-core": "4.1.6"
   },
   "devDependencies": {
-    "sinon": "^9.2.0",
     "ts-essentials": "^7.0.1"
   },
   "scripts": {

libraries/botbuilder-core/package.json

@@ -34,7 +34,6 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "sinon": "^9.2.4",
     "unzipper": "^0.10.9"
   },
   "scripts": {

libraries/botbuilder-repo-utils/package.json

@@ -21,8 +21,6 @@
   },
   "devDependencies": {
     "@types/minimist": "^1.2.1",
-    "@types/sinon": "^9.0.8",
-    "sinon": "^9.2.1",
     "ts-node": "^9.0.0",
     "typescript": "^4.0.5"
   },

libraries/botbuilder-stdlib/src/delay.ts

@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+/**
+ * Delay resolution of `promise`
+ *
+ * @template T type that promise will yield, defaults to `void`
+ * @param {Promise<T>} promise an optional promise to delay
+ * @param {number} milliseconds how long to delay
+ * @returns {Promise<T>} a promise that will resolve to the result of `promise`, delayed by `milliseconds`.
+ */
+export function delay<T>(promise: Promise<T>, milliseconds: number): Promise<T>;
+
+/**
+ * Return a promise that resolves after `milliseconds`.
+ *
+ * @param {number} milliseconds how long to delay
+ * @returns {Promise<void>} a promise that will resolve to the result of `promise`, delayed by `milliseconds`.
+ */
+export function delay(milliseconds: number): Promise<void>;
+
+/**
+ * @internal
+ */
+export function delay<T>(promiseOrmilliseconds: Promise<T> | number, maybeMilliseconds?: number): Promise<T> {
+    if (typeof promiseOrmilliseconds === 'number') {
+        return new Promise<T>((resolve) => setTimeout(resolve, promiseOrmilliseconds));
+    }
+
+    return new Promise<T>((resolve) => setTimeout(() => resolve(promiseOrmilliseconds), maybeMilliseconds));
+}

libraries/botbuilder-stdlib/src/index.ts

@@ -3,4 +3,5 @@
 
 export * as assertExt from './assertExt';
 export * from './types';
+export { delay } from './delay';
 export { maybeCast } from './maybeCast';

libraries/botbuilder-stdlib/tests/delay.test.js

@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+const assert = require('assert');
+const sinon = require('sinon');
+const { delay } = require('../');
+
+describe('delay', () => {
+    let sandbox;
+    beforeEach(() => {
+        sandbox = sinon.createSandbox({ useFakeTimers: true });
+    });
+
+    afterEach(() => {
+        sandbox.restore();
+    });
+
+    it('works with a promise arg', async () => {
+        const promise = Promise.resolve(10);
+
+        let result = delay(promise, 250);
+        sandbox.clock.tick(251);
+
+        result = await result;
+        assert.strictEqual(result, 10);
+    });
+
+    it('works without a promise arg', async () => {
+        const promise = delay(250);
+        sandbox.clock.tick(251);
+
+        const result = await promise;
+        assert.strictEqual(result, undefined);
+    });
+});