[Service Bus] Merge feature/service-bus-track-2 into master

common/config/rush/common-versions.json

@@ -49,9 +49,6 @@
     // "typescript": [
     //   "~2.4.0"
     // ]
-    // Following is required to allow for backward compatibility with Service Bus Track 1
-    // TODO: Remove this once Service Bus is updated to use current depenedencies as part of Track 2
-    "rhea-promise": ["^0.1.15"],
     // Following is required to allow for backward compatibility with Event Processor Host Track 1
     "@azure/event-hubs": ["^2.1.4"]
   }

sdk/servicebus/service-bus/README.md

@@ -211,13 +211,13 @@ export DEBUG=azure*,rhea*
 - If you are **not interested in viewing the message transformation** (which consumes lot of console/disk space) then you can set the `DEBUG` environment variable as follows:
 
 ```bash
-export DEBUG=azure*,rhea*,-rhea:raw,-rhea:message,-azure:amqp-common:datatransformer
+export DEBUG=azure*,rhea*,-rhea:raw,-rhea:message,-azure:core-amqp:datatransformer
 ```
 
 - If you are interested only in **errors**, then you can set the `DEBUG` environment variable as follows:
 
 ```bash
-export DEBUG=azure:service-bus:error,azure-amqp-common:error,rhea-promise:error,rhea:events,rhea:frames,rhea:io,rhea:flow
+export DEBUG=azure:service-bus:error,azure-core-amqp:error,rhea-promise:error,rhea:events,rhea:frames,rhea:io,rhea:flow
 ```
 
 ### Logging to a file

sdk/servicebus/service-bus/karma.conf.js

@@ -49,9 +49,10 @@ module.exports = function(config) {
     // https://www.npmjs.com/package/karma-env-preprocessor
     envPreprocessor: [
       "SERVICEBUS_CONNECTION_STRING",
-      "AAD_CLIENT_ID",
-      "AAD_CLIENT_SECRET",
-      "AAD_TENANT_ID"
+      "SERVICEBUS_CONNECTION_STRING_BROWSER",
+      "AZURE_CLIENT_ID",
+      "AZURE_CLIENT_SECRET",
+      "AZURE_TENANT_ID"
     ],
 
     // test results reporter to use

sdk/servicebus/service-bus/package.json

@@ -2,7 +2,7 @@
   "name": "@azure/service-bus",
   "sdk-type": "client",
   "author": "Microsoft Corporation",
-  "version": "1.1.2",
+  "version": "2.0.0-preview.1",
   "license": "MIT",
   "description": "Azure Service Bus SDK for Node.js",
   "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/servicebus/service-bus",
@@ -20,7 +20,6 @@
   "module": "dist-esm/src/index.js",
   "browser": {
     "./dist/index.js": "./browser/service-bus.js",
-    "./dist-esm/test/utils/aadUtils.js": "./dist-esm/test/utils/aadUtils.browser.js",
     "./dist-esm/src/util/crypto.js": "./dist-esm/src/util/crypto.browser.js",
     "./dist-esm/src/util/parseUrl.js": "./dist-esm/src/util/parseUrl.browser.js",
     "buffer": "buffer",
@@ -78,9 +77,9 @@
     ]
   },
   "dependencies": {
-    "@azure/amqp-common": "1.0.0-preview.9",
+    "@azure/core-amqp": "^1.0.1",
     "@azure/core-http": "^1.0.0",
-    "@azure/ms-rest-nodeauth": "^0.9.2",
+    "@azure/identity": "^1.0.0",
     "@opentelemetry/types": "^0.2.0",
     "@types/is-buffer": "^2.0.0",
     "@types/long": "^4.0.0",
@@ -90,7 +89,7 @@
     "long": "^4.0.0",
     "process": "^0.11.10",
     "rhea": "^1.0.18",
-    "rhea-promise": "^0.1.15",
+    "rhea-promise": "^1.0.0",
     "tslib": "^1.10.0"
   },
   "devDependencies": {

sdk/servicebus/service-bus/review/service-bus.api.md

@@ -4,23 +4,19 @@
 
 ```ts
 
-import { AmqpMessage } from '@azure/amqp-common';
-import { ApplicationTokenCredentials } from '@azure/ms-rest-nodeauth';
-import { DataTransformer } from '@azure/amqp-common';
-import { DefaultDataTransformer } from '@azure/amqp-common';
-import { delay } from '@azure/amqp-common';
+import { AmqpMessage } from '@azure/core-amqp';
+import { DataTransformer } from '@azure/core-amqp';
+import { DefaultDataTransformer } from '@azure/core-amqp';
+import { delay } from '@azure/core-amqp';
 import { Delivery } from 'rhea-promise';
-import { DeviceTokenCredentials } from '@azure/ms-rest-nodeauth';
 import { HttpOperationResponse } from '@azure/core-http';
 import Long from 'long';
-import { MessagingError } from '@azure/amqp-common';
-import { MSITokenCredentials } from '@azure/ms-rest-nodeauth';
+import { MessagingError } from '@azure/core-amqp';
 import { ProxySettings } from '@azure/core-http';
+import { RetryOptions } from '@azure/core-amqp';
 import { ServiceClient } from '@azure/core-http';
-import { TokenInfo } from '@azure/amqp-common';
-import { TokenProvider } from '@azure/amqp-common';
-import { TokenType } from '@azure/amqp-common';
-import { UserTokenCredentials } from '@azure/ms-rest-nodeauth';
+import { TokenCredential } from '@azure/core-amqp';
+import { TokenType } from '@azure/core-amqp';
 import { WebSocketImpl } from 'rhea-promise';
 
 // @public
@@ -285,6 +281,8 @@ export class Receiver {
     renewMessageLock(lockTokenOrMessage: string | ServiceBusMessage): Promise<Date>;
     }
 
+export { RetryOptions }
+
 // @public
 export interface RuleDescription {
     action?: string;
@@ -377,10 +375,9 @@ export interface ServiceBusAtomManagementClientOptions {
 
 // @public
 export class ServiceBusClient {
+    constructor(connectionString: string, options?: ServiceBusClientOptions);
+    constructor(host: string, credential: TokenCredential, options?: ServiceBusClientOptions);
     close(): Promise<any>;
-    static createFromAadTokenCredentials(host: string, credentials: ApplicationTokenCredentials | UserTokenCredentials | DeviceTokenCredentials | MSITokenCredentials, options?: ServiceBusClientOptions): ServiceBusClient;
-    static createFromConnectionString(connectionString: string, options?: ServiceBusClientOptions): ServiceBusClient;
-    static createFromTokenProvider(host: string, tokenProvider: TokenProvider, options?: ServiceBusClientOptions): ServiceBusClient;
     createQueueClient(queueName: string): QueueClient;
     createSubscriptionClient(topicName: string, subscriptionName: string): SubscriptionClient;
     createTopicClient(topicName: string): TopicClient;
@@ -552,9 +549,7 @@ export interface SubscriptionResponse extends SubscriptionDetails {
     _response: HttpOperationResponse;
 }
 
-export { TokenInfo }
-
-export { TokenProvider }
+export { TokenCredential }
 
 export { TokenType }
 

sdk/servicebus/service-bus/src/clientEntityContext.ts

@@ -13,11 +13,12 @@ import { ConcurrentExpiringMap } from "./util/concurrentExpiringMap";
 import { MessageReceiver } from "./core/messageReceiver";
 import { MessageSession } from "./session/messageSession";
 import { SessionManager } from "./session/sessionManager";
+import { MessagingError } from "@azure/core-amqp";
 
 /**
  * @interface ClientEntityContext
  * Provides contextual information like the underlying amqp connection, cbs session,
- * management session, tokenProvider, senders, receivers, etc. about the ServiceBus client.
+ * management session, tokenCredential, senders, receivers, etc. about the ServiceBus client.
  * @internal
  */
 export interface ClientEntityContextBase {
@@ -148,10 +149,11 @@ export namespace ClientEntityContext {
 
     (entityContext as ClientEntityContext).getReceiver = (name: string, sessionId?: string) => {
       if (sessionId != undefined && entityContext.expiredMessageSessions[sessionId]) {
-        const error = new Error(
+        const error = new MessagingError(
           `The session lock has expired on the session with id ${sessionId}.`
         );
-        error.name = "SessionLockLostError";
+        error.code = "SessionLockLostError";
+        error.retryable = false;
         log.error(
           "[%s] Failed to find receiver '%s' as the session with id '%s' is expired",
           entityContext.namespace.connectionId,

sdk/servicebus/service-bus/src/connectionContext.ts

@@ -11,8 +11,9 @@ import {
   CreateConnectionContextBaseParameters,
   Dictionary,
   delay,
-  TokenProvider
-} from "@azure/amqp-common";
+  TokenCredential,
+  SharedKeyCredential
+} from "@azure/core-amqp";
 import { ServiceBusClientOptions } from "./serviceBusClient";
 import { ClientEntityContext } from "./clientEntityContext";
 import { OnAmqpEvent, EventContext, ConnectionEvents } from "rhea-promise";
@@ -21,7 +22,7 @@ import { OnAmqpEvent, EventContext, ConnectionEvents } from "rhea-promise";
  * @internal
  * @interface ConnectionContext
  * Provides contextual information like the underlying amqp connection, cbs session, management session,
- * tokenProvider, senders, receivers, etc. about the ServiceBus client.
+ * tokenCredential, senders, receivers, etc. about the ServiceBus client.
  */
 export interface ConnectionContext extends ConnectionContextBase {
   /**
@@ -45,13 +46,13 @@ export namespace ConnectionContext {
 
   export function create(
     config: ConnectionConfig,
-    tokenProvider: TokenProvider,
+    tokenCredential: SharedKeyCredential | TokenCredential,
     options?: ServiceBusClientOptions
   ): ConnectionContext {
     if (!options) options = {};
     const parameters: CreateConnectionContextBaseParameters = {
       config: config,
-      tokenProvider: tokenProvider,
+      tokenCredential: tokenCredential,
       dataTransformer: options.dataTransformer,
       isEntityPathRequired: false,
       connectionProperties: {

sdk/servicebus/service-bus/src/core/batchingReceiver.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import * as log from "../log";
-import { Constants, translate, MessagingError } from "@azure/amqp-common";
+import { Constants, translate, MessagingError } from "@azure/core-amqp";
 import { ReceiverEvents, EventContext, OnAmqpEvent, SessionEvents, AmqpError } from "rhea-promise";
 import { ServiceBusMessage, ReceiveMode } from "../serviceBusMessage";
 import {
@@ -77,7 +77,7 @@ export class BatchingReceiver extends MessageReceiver {
     throwErrorIfConnectionClosed(this._context.namespace);
 
     if (maxWaitTimeInSeconds == null) {
-      maxWaitTimeInSeconds = Constants.defaultOperationTimeoutInSeconds;
+      maxWaitTimeInSeconds = Constants.defaultOperationTimeoutInMs / 1000;
     }
 
     const brokeredMessages: ServiceBusMessage[] = [];
@@ -95,7 +95,7 @@ export class BatchingReceiver extends MessageReceiver {
         receiver.session.removeListener(SessionEvents.sessionError, onSessionError);
 
         const sessionError = context.session && context.session.error;
-        let error = new MessagingError("An error occurred while receiving messages.");
+        let error: Error | MessagingError;
         if (sessionError) {
           error = translate(sessionError);
           log.error(
@@ -104,6 +104,8 @@ export class BatchingReceiver extends MessageReceiver {
             this.name,
             error
           );
+        } else {
+          error = new MessagingError("An error occurred while receiving messages.");
         }
         if (totalWaitTimer) {
           clearTimeout(totalWaitTimer);
@@ -276,7 +278,7 @@ export class BatchingReceiver extends MessageReceiver {
         receiver.session.removeListener(SessionEvents.sessionError, onSessionError);
 
         const receiverError = context.receiver && context.receiver.error;
-        let error = new MessagingError("An error occurred while receiving messages.");
+        let error: Error | MessagingError;
         if (receiverError) {
           error = translate(receiverError);
           log.error(
@@ -285,6 +287,8 @@ export class BatchingReceiver extends MessageReceiver {
             this.name,
             error
           );
+        } else {
+          error = new MessagingError("An error occurred while receiving messages.");
         }
         if (totalWaitTimer) {
           clearTimeout(totalWaitTimer);