@azure/service-bus 7.10.0-beta.2 → 7.10.0-beta.3

package/dist/browser/core/managementClient.js

@@ -49,6 +49,18 @@ function isCorrelationRuleFilter(obj) {
  * to the $management endpoint over AMQP connection.
  */
 export class ManagementClient extends LinkEntity {
+    /**
+     * The reply to Guid for the management client.
+     */
+    replyTo = generate_uuid();
+    /**
+     * Provides the sequence number of the last peeked message.
+     */
+    _lastPeekedSequenceNumber = Long.ZERO;
+    /**
+     * lock token for init operation
+     */
+    _initLock = `initMgmtLink-${generate_uuid()}`;
     /**
      * Instantiates the management client.
      * @param context - The connection context
@@ -64,18 +76,6 @@ export class ManagementClient extends LinkEntity {
                 ? options.audience
                 : `${context.config.endpoint}${entityPath}/$management`,
         });
-        /**
-         * The reply to Guid for the management client.
-         */
-        this.replyTo = generate_uuid();
-        /**
-         * Provides the sequence number of the last peeked message.
-         */
-        this._lastPeekedSequenceNumber = Long.ZERO;
-        /**
-         * lock token for init operation
-         */
-        this._initLock = `initMgmtLink-${generate_uuid()}`;
         this._context = context;
     }
     /**
@@ -84,8 +84,7 @@ export class ManagementClient extends LinkEntity {
      * @returns updated options bag that has adjusted `timeoutInMs` to account for init time
      */
     async initWithUniqueReplyTo(options = {}) {
-        var _a;
-        const retryTimeoutInMs = (_a = options.timeoutInMs) !== null && _a !== void 0 ? _a : Constants.defaultOperationTimeoutInMs;
+        const retryTimeoutInMs = options.timeoutInMs ?? Constants.defaultOperationTimeoutInMs;
         const initOperationStartTime = Date.now();
         return defaultCancellableLock.acquire(this._initLock, async () => {
             managementClientLogger.verbose(`${this.logPrefix} lock acquired for initializing replyTo address and link`);
@@ -98,7 +97,7 @@ export class ManagementClient extends LinkEntity {
             const abortListener = () => {
                 aborter.abort();
             };
-            abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.addEventListener("abort", abortListener);
+            abortSignal?.addEventListener("abort", abortListener);
             if (!this.isOpen()) {
                 await Promise.race([
                     this._init(aborter.signal),
@@ -112,14 +111,16 @@ export class ManagementClient extends LinkEntity {
                     }),
                 ]).finally(() => {
                     aborter.abort();
-                    abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.removeEventListener("abort", abortListener);
+                    abortSignal?.removeEventListener("abort", abortListener);
                 });
             }
             // time taken by the init operation
             const timeTakenByInit = Date.now() - initOperationStartTime;
-            return Object.assign(Object.assign({}, options), { 
+            return {
+                ...options,
                 // Left over time
-                timeoutInMs: retryTimeoutInMs - timeTakenByInit });
+                timeoutInMs: retryTimeoutInMs - timeTakenByInit,
+            };
         }, {
             abortSignal: options.abortSignal,
             timeoutInMs: retryTimeoutInMs,
@@ -192,13 +193,12 @@ export class ManagementClient extends LinkEntity {
         return result;
     }
     async _makeManagementRequest(request, internalLogger, sendRequestOptions = {}) {
-        var _a, _b, _c, _d;
         if (request.message_id === undefined) {
             request.message_id = generate_uuid();
         }
         try {
             const { timeoutInMs } = sendRequestOptions;
-            await waitForSendable(internalLogger, this.logPrefix, this.name, timeoutInMs !== null && timeoutInMs !== void 0 ? timeoutInMs : Constants.defaultOperationTimeoutInMs, (_a = this.link) === null || _a === void 0 ? void 0 : _a.sender, (_d = (_c = (_b = this.link) === null || _b === void 0 ? void 0 : _b.session) === null || _c === void 0 ? void 0 : _c.outgoing) === null || _d === void 0 ? void 0 : _d.available());
+            await waitForSendable(internalLogger, this.logPrefix, this.name, timeoutInMs ?? Constants.defaultOperationTimeoutInMs, this.link?.sender, this.link?.session?.outgoing?.available());
             return await this.link.sendRequest(request, sendRequestOptions);
         }
         catch (err) {
@@ -268,7 +268,6 @@ export class ManagementClient extends LinkEntity {
      * @param omitMessageBody - Whether to omit message body when peeking. Default value `false`.
      */
     async peekBySequenceNumber(fromSequenceNumber, maxMessageCount, sessionId, omitMessageBody, options) {
-        var _a, _b;
         throwErrorIfConnectionClosed(this._context);
         const connId = this._context.connectionId;
         // Checks for fromSequenceNumber
@@ -300,9 +299,9 @@ export class ManagementClient extends LinkEntity {
                     operation: Constants.operations.peekMessage,
                 },
             };
-            if (updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.associatedLinkName) {
+            if (updatedOptions?.associatedLinkName) {
                 request.application_properties[Constants.associatedLinkName] =
-                    updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.associatedLinkName;
+                    updatedOptions?.associatedLinkName;
             }
             request.application_properties[Constants.trackingId] = generate_uuid();
             // TODO: it'd be nice to attribute this peek request to the actual receiver that made it. So have them pass in a
@@ -314,8 +313,8 @@ export class ManagementClient extends LinkEntity {
                 for (const msg of messages) {
                     const decodedMessage = RheaMessageUtil.decode(msg.message);
                     const message = fromRheaMessage(decodedMessage, {
-                        skipParsingBodyAsJson: (_a = updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.skipParsingBodyAsJson) !== null && _a !== void 0 ? _a : false,
-                        skipConvertingDate: (_b = updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.skipConvertingDate) !== null && _b !== void 0 ? _b : false,
+                        skipParsingBodyAsJson: updatedOptions?.skipParsingBodyAsJson ?? false,
+                        skipConvertingDate: updatedOptions?.skipConvertingDate ?? false,
                     });
                     messageList.push(message);
                     this._lastPeekedSequenceNumber = message.sequenceNumber;
@@ -371,7 +370,7 @@ export class ManagementClient extends LinkEntity {
             }
             receiverLogger.verbose("[%s] Renew message Lock request: %O.", this._context.connectionId, request);
             const result = await this._makeManagementRequest(request, receiverLogger, {
-                abortSignal: updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.abortSignal,
+                abortSignal: updatedOptions?.abortSignal,
                 requestName: "renewLock",
             });
             const lockedUntilUtc = new Date(result.body.expirations[0]);
@@ -391,7 +390,6 @@ export class ManagementClient extends LinkEntity {
      * @returns The sequence numbers of messages that were scheduled.
      */
     async scheduleMessages(scheduledEnqueueTimeUtc, messages, options) {
-        var _a;
         throwErrorIfConnectionClosed(this._context);
         if (!messages.length) {
             return [];
@@ -410,7 +408,7 @@ export class ManagementClient extends LinkEntity {
                 if (rheaMessage.group_id) {
                     entry[Constants.sessionIdMapKey] = rheaMessage.group_id;
                 }
-                if ((_a = rheaMessage.message_annotations) === null || _a === void 0 ? void 0 : _a[Constants.partitionKey]) {
+                if (rheaMessage.message_annotations?.[Constants.partitionKey]) {
                     entry["partition-key"] = rheaMessage.message_annotations[Constants.partitionKey];
                 }
                 // Will be required later for implementing Transactions
@@ -435,9 +433,9 @@ export class ManagementClient extends LinkEntity {
                     operation: Constants.operations.scheduleMessage,
                 },
             };
-            if (updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.associatedLinkName) {
+            if (updatedOptions?.associatedLinkName) {
                 request.application_properties[Constants.associatedLinkName] =
-                    updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.associatedLinkName;
+                    updatedOptions?.associatedLinkName;
             }
             request.application_properties[Constants.trackingId] = generate_uuid();
             senderLogger.verbose("%s Schedule messages request body: %O.", this.logPrefix, request.body);
@@ -492,9 +490,9 @@ export class ManagementClient extends LinkEntity {
                     operation: Constants.operations.cancelScheduledMessage,
                 },
             };
-            if (updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.associatedLinkName) {
+            if (updatedOptions?.associatedLinkName) {
                 request.application_properties[Constants.associatedLinkName] =
-                    updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.associatedLinkName;
+                    updatedOptions?.associatedLinkName;
             }
             request.application_properties[Constants.trackingId] = generate_uuid();
             senderLogger.verbose("%s Cancel scheduled messages request body: %O.", this.logPrefix, request.body);
@@ -516,7 +514,6 @@ export class ManagementClient extends LinkEntity {
      * - Throws an error if the messages have not been deferred.
      */
     async receiveDeferredMessages(sequenceNumbers, receiveMode, sessionId, options) {
-        var _a;
         throwErrorIfConnectionClosed(this._context);
         if (!sequenceNumbers.length) {
             return [];
@@ -550,9 +547,9 @@ export class ManagementClient extends LinkEntity {
                     operation: Constants.operations.receiveBySequenceNumber,
                 },
             };
-            if (updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.associatedLinkName) {
+            if (updatedOptions?.associatedLinkName) {
                 request.application_properties[Constants.associatedLinkName] =
-                    updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.associatedLinkName;
+                    updatedOptions?.associatedLinkName;
             }
             request.application_properties[Constants.trackingId] = generate_uuid();
             receiverLogger.verbose("%s Receive deferred messages request body: %O.", this.logPrefix, request.body);
@@ -560,7 +557,7 @@ export class ManagementClient extends LinkEntity {
             const messages = result.body.messages;
             for (const msg of messages) {
                 const decodedMessage = RheaMessageUtil.decode(msg.message);
-                const message = new ServiceBusMessageImpl(decodedMessage, { tag: msg["lock-token"] }, false, receiveMode, (_a = updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.skipParsingBodyAsJson) !== null && _a !== void 0 ? _a : false, false);
+                const message = new ServiceBusMessageImpl(decodedMessage, { tag: msg["lock-token"] }, false, receiveMode, updatedOptions?.skipParsingBodyAsJson ?? false, false);
                 messageList.push(message);
             }
             return messageList;
@@ -587,9 +584,9 @@ export class ManagementClient extends LinkEntity {
                     operation: Constants.operations.deleteMessages,
                 },
             };
-            if (updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.associatedLinkName) {
+            if (updatedOptions?.associatedLinkName) {
                 request.application_properties[Constants.associatedLinkName] =
-                    updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.associatedLinkName;
+                    updatedOptions?.associatedLinkName;
             }
             request.application_properties[Constants.trackingId] = generate_uuid();
             receiverLogger.verbose("%s delete messages request body: %O.", this.logPrefix, request.body);
@@ -624,7 +621,7 @@ export class ManagementClient extends LinkEntity {
         if (isNaN(messageCount) || messageCount < 1) {
             throw new TypeError("'messageCount' must be a number greater than 0.");
         }
-        enqueueTimeUtcOlderThan !== null && enqueueTimeUtcOlderThan !== void 0 ? enqueueTimeUtcOlderThan : (enqueueTimeUtcOlderThan = new Date());
+        enqueueTimeUtcOlderThan ??= new Date();
         return this._deleteMessages(messageCount, enqueueTimeUtcOlderThan, sessionId, options);
     }
     /**
@@ -712,9 +709,9 @@ export class ManagementClient extends LinkEntity {
                 },
             };
             request.application_properties[Constants.trackingId] = generate_uuid();
-            if (updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.associatedLinkName) {
+            if (updatedOptions?.associatedLinkName) {
                 request.application_properties[Constants.associatedLinkName] =
-                    updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.associatedLinkName;
+                    updatedOptions?.associatedLinkName;
             }
             receiverLogger.verbose("%s Renew Session Lock request body: %O.", this.logPrefix, request.body);
             const result = await this._makeManagementRequest(request, receiverLogger, updatedOptions);
@@ -748,9 +745,9 @@ export class ManagementClient extends LinkEntity {
                     operation: Constants.operations.setSessionState,
                 },
             };
-            if (updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.associatedLinkName) {
+            if (updatedOptions?.associatedLinkName) {
                 request.application_properties[Constants.associatedLinkName] =
-                    updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.associatedLinkName;
+                    updatedOptions?.associatedLinkName;
             }
             request.application_properties[Constants.trackingId] = generate_uuid();
             receiverLogger.verbose("%s Set Session state request body: %O.", this.logPrefix, request.body);
@@ -781,9 +778,9 @@ export class ManagementClient extends LinkEntity {
                     operation: Constants.operations.getSessionState,
                 },
             };
-            if (updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.associatedLinkName) {
+            if (updatedOptions?.associatedLinkName) {
                 request.application_properties[Constants.associatedLinkName] =
-                    updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.associatedLinkName;
+                    updatedOptions?.associatedLinkName;
             }
             request.application_properties[Constants.trackingId] = generate_uuid();
             receiverLogger.verbose("%s Get session state request body: %O.", this.logPrefix, request.body);
@@ -854,10 +851,10 @@ export class ManagementClient extends LinkEntity {
             const updatedOptions = (await this.initWithUniqueReplyTo(options));
             const request = {
                 body: {
-                    top: (updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.maxCount)
+                    top: updatedOptions?.maxCount
                         ? types.wrap_int(updatedOptions.maxCount)
                         : types.wrap_int(max32BitNumber),
-                    skip: (updatedOptions === null || updatedOptions === void 0 ? void 0 : updatedOptions.skip) ? types.wrap_int(updatedOptions.skip) : types.wrap_int(0),
+                    skip: updatedOptions?.skip ? types.wrap_int(updatedOptions.skip) : types.wrap_int(0),
                 },
                 reply_to: this.replyTo,
                 application_properties: {
@@ -1059,7 +1056,10 @@ export function toScheduleableMessage(item, scheduledEnqueueTimeUtc) {
         message: RheaMessageUtil.encode(rheaMessage),
         "message-id": rheaMessage.message_id,
     };
-    rheaMessage.message_annotations = Object.assign(Object.assign({}, rheaMessage.message_annotations), { [Constants.scheduledEnqueueTime]: scheduledEnqueueTimeUtc });
+    rheaMessage.message_annotations = {
+        ...rheaMessage.message_annotations,
+        [Constants.scheduledEnqueueTime]: scheduledEnqueueTimeUtc,
+    };
     if (rheaMessage.group_id) {
         entry[Constants.sessionIdMapKey] = rheaMessage.group_id;
     }