[Streaming-Preview] Move StreamingAdapter back into 4.6-preview-streaming

.gitignore

@@ -309,4 +309,3 @@ package-lock.json
 
 *.tsbuildinfo
 *.map
-*.js

libraries/botbuilder/package.json

@@ -23,6 +23,7 @@
     "@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/botbuilder/src/index.ts

@@ -9,6 +9,7 @@
 export * from './botFrameworkAdapter';
 export * from './fileTranscriptStore';
 export * from './inspectionMiddleware';
+export { StreamingAdapter, StreamingHttpClient, TokenResolver } from './streaming';
 export * from './teamsActivityHandler';
 export * from './teamsActivityHelpers';
 export * from './teamsInfo';

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

@@ -1,5 +1,5 @@
 /**
- * @module botframework-streaming
+ * @module botbuilder
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

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

@@ -1,5 +1,5 @@
 /**
- * @module botframework-streaming
+ * @module botbuilder
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -14,21 +14,27 @@ import {
     StatusCodes,
     WebRequest,
     WebResponse
-} from 'botbuilder';
+} from '../botFrameworkAdapter';
 import {
     Activity, ActivityTypes, BotCallbackHandlerKey,
     IUserTokenProvider, ResourceResponse, TurnContext } from 'botbuilder-core';
-import { AuthenticationConstants, ChannelValidation, ConnectorClient, GovernmentConstants, GovernmentChannelValidation, JwtTokenValidation, MicrosoftAppCredentials, SimpleCredentialProvider } from 'botbuilder/node_modules/botframework-connector';
+import {
+    AuthenticationConstants,
+    ChannelValidation,
+    ConnectorClient,
+    GovernmentConstants,
+    GovernmentChannelValidation,
+    JwtTokenValidation,
+    MicrosoftAppCredentials,
+    SimpleCredentialProvider
+} from 'botframework-connector';
 import { IncomingMessage } from 'http';
 import * as os from 'os';
 
 import { StreamingHttpClient } from './streamingHttpClient';
 import { TokenResolver } from './tokenResolver';
 
-import { IReceiveRequest, ISocket, IStreamingTransportServer } from '../interfaces';
-import { NamedPipeServer } from '../namedPipe';
-import { StreamingResponse } from '../streamingResponse';
-import { NodeWebSocketFactory, NodeWebSocketFactoryBase, WebSocketServer } from '../webSocket';
+import { IReceiveRequest, ISocket, IStreamingTransportServer, NamedPipeServer, NodeWebSocketFactory, NodeWebSocketFactoryBase, StreamingResponse, WebSocketServer } from 'botframework-streaming';
 
 // Retrieve additional information, i.e., host operating system, host OS release, architecture, Node.js version
 const ARCHITECTURE: any = os.arch();

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

@@ -1,15 +1,13 @@
 /**
- * @module botframework-streaming
+ * @module botbuilder
  */
 /**
  * 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';
+import { WebResource, HttpOperationResponse, HttpClient } from 'botframework-connector/node_modules/@azure/ms-rest-js';
+import { IStreamingTransportServer, StreamingRequest } from 'botframework-streaming';
 
 export class StreamingHttpClient implements HttpClient {
     private readonly server: IStreamingTransportServer;

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

@@ -1,12 +1,12 @@
 /**
- * @module botframework-streaming
+ * @module botbuilder
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
 
-import { BotFrameworkAdapter } from 'botbuilder';
+import { BotFrameworkAdapter } from '../botFrameworkAdapter';
 import {
     Activity,
     ActivityTypes,

libraries/botframework-streaming/tests/streamingAdatper.test.js → libraries/botbuilder/tests/streamingAdatper.test.js

@@ -1,8 +1,7 @@
-const { StreamingAdapter } = require('../');
-const { StatusCodes } = require('botbuilder');
+const { StatusCodes, StreamingAdapter } = require('../');
 const { ActivityHandler } = require('botbuilder-core');
 const chai = require('chai');
-var expect = chai.expect;
+const expect = chai.expect;
 
 class FauxSock {
     constructor(contentString) {

libraries/botframework-streaming/package.json

@@ -22,9 +22,6 @@
   "main": "lib/index.js",
   "typings": "lib/index.d.js",
   "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"

libraries/botframework-streaming/src/index.ts

@@ -6,7 +6,6 @@
  * Licensed under the MIT License.
  */
 
-export { StreamingAdapter, StreamingHttpClient, TokenResolver } from './adapters';
 export { ContentStream } from './contentStream';
 export { HttpContent } from './httpContentStream';
 export {