[Streaming] Pull out streaming bits from botbuilder and move to botframework-streaming

libraries/botbuilder/package.json

@@ -20,11 +20,9 @@
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
   "dependencies": {
-    "@azure/ms-rest-js": "1.2.6",
     "@types/node": "^10.12.18",
     "botbuilder-core": "4.1.6",
     "botframework-connector": "4.1.6",
-    "botframework-streaming": "4.1.6",
     "filenamify": "^4.1.0",
     "fs-extra": "^7.0.1"
   },

libraries/botframework-streaming/package.json

@@ -1,12 +1,34 @@
 {
   "name": "botframework-streaming",
+  "author": "Microsoft Corp.",
+  "description": "Streaming library for the Microsoft Bot Framework",
   "version": "4.1.6",
-  "description": "",
+  "license": "MIT",
+  "keywords": [
+    "botbuilder",
+    "botframework",
+    "bots",
+    "chatbots",
+    "websockets",
+    "streaming"
+  ],
+  "bugs": {
+    "url": "https://github.com/microsoft/botbuilder-js/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/botbuilder-js.git"
+  },
   "main": "lib/index.js",
   "typings": "lib/index.d.js",
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
+  "dependencies": {
+    "@azure/ms-rest-js": "1.2.6",
+    "botbuilder": "4.1.6",
+    "botbuilder-core": "4.1.6",
+    "uuid": "^3.3.2",
+    "watershed": "^0.4.0",
+    "ws": "^7.1.2"
+  },
   "devDependencies": {
     "@types/chai": "^4.1.7",
     "@types/node": "^10.12.18",
@@ -20,12 +42,6 @@
     "tslint-microsoft-contrib": "^5.2.1",
     "typescript": "3.1.1"
   },
-  "dependencies": {
-    "promise.prototype.finally": "^3.1.0",
-    "uuid": "^3.3.2",
-    "watershed": "^0.4.0",
-    "ws": "^7.1.2"
-  },
   "engines": {
     "node": ">10.14"
   },

libraries/botframework-streaming/src/adapters/index.ts

@@ -0,0 +1,11 @@
+/**
+ * @module botframework-streaming
+ */
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+export * from './streamingAdapter';
+export * from './streamingHttpClient';
+export * from './tokenResolver';

libraries/botbuilder/src/streamingHttpClient.ts → libraries/botframework-streaming/src/adapters/streamingHttpClient.ts

@@ -1,50 +1,55 @@
-/**
- * @module botbuilder
- */
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
-
-import { IStreamingTransportServer, StreamingRequest } from 'botframework-streaming';
-import { WebResource, HttpOperationResponse, HttpClient } from '@azure/ms-rest-js';
-
-export class StreamingHttpClient implements HttpClient {
-    private readonly server: IStreamingTransportServer;
-    /**
-     * Creates a new streaming Http client.
-     *
-     * @param server Transport server implementation to be used.
-     */
-    public constructor(server: IStreamingTransportServer) {
-        if (!server) {
-            throw new Error(`StreamingHttpClient: Expected server.`);
-        }
-        this.server = server;
-    }
-    /**
-     * This function hides the default sendRequest of the HttpClient, replacing it
-     * with a version that takes the WebResource created by the BotFrameworkAdapter
-     * and converting it to a form that can be sent over a streaming transport.
-     *
-     * @param httpRequest The outgoing request created by the BotframeworkAdapter.
-     * @return The streaming transport compatible response to send back to the client.
-     */
-    public async sendRequest(httpRequest: WebResource): Promise<HttpOperationResponse> {
-        if (!httpRequest) {
-            throw new Error('SendRequest invalid parameter: httpRequest should be provided');
-        }
-        const request = this.mapHttpRequestToProtocolRequest(httpRequest);
-        request.path = request.path.substring(request.path.indexOf('/v3'));
-        const res = await this.server.send(request);
-        return {
-            request: httpRequest,
-            status: res.statusCode,
-            headers: httpRequest.headers,
-            readableStreamBody: res.streams.length > 0 ? res.streams[0].getStream() : undefined
-        };
-    }
-    private mapHttpRequestToProtocolRequest(httpRequest: WebResource): StreamingRequest {
-        return StreamingRequest.create(httpRequest.method, httpRequest.url, httpRequest.body);
-    }
-}
+/**
+ * @module botframework-streaming
+ */
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { WebResource, HttpOperationResponse, HttpClient } from '@azure/ms-rest-js';
+
+import { IStreamingTransportServer } from '../interfaces';
+import { StreamingRequest } from '../streamingRequest';
+
+export class StreamingHttpClient implements HttpClient {
+    private readonly server: IStreamingTransportServer;
+
+    /**
+     * Creates a new streaming Http client.
+     *
+     * @param server Transport server implementation to be used.
+     */
+    public constructor(server: IStreamingTransportServer) {
+        if (!server) {
+            throw new Error(`StreamingHttpClient: Expected server.`);
+        }
+        this.server = server;
+    }
+
+    /**
+     * This function hides the default sendRequest of the HttpClient, replacing it
+     * with a version that takes the WebResource created by the BotFrameworkAdapter
+     * and converting it to a form that can be sent over a streaming transport.
+     *
+     * @param httpRequest The outgoing request created by the BotframeworkAdapter.
+     * @return The streaming transport compatible response to send back to the client.
+     */
+    public async sendRequest(httpRequest: WebResource): Promise<HttpOperationResponse> {
+        if (!httpRequest) {
+            throw new Error('SendRequest invalid parameter: httpRequest should be provided');
+        }
+        const request = this.mapHttpRequestToProtocolRequest(httpRequest);
+        request.path = request.path.substring(request.path.indexOf('/v3'));
+        const res = await this.server.send(request);
+        return {
+            request: httpRequest,
+            status: res.statusCode,
+            headers: httpRequest.headers,
+            readableStreamBody: res.streams.length > 0 ? res.streams[0].getStream() : undefined
+        };
+    }
+
+    private mapHttpRequestToProtocolRequest(httpRequest: WebResource): StreamingRequest {
+        return StreamingRequest.create(httpRequest.method, httpRequest.url, httpRequest.body);
+    }
+}