@azure/notification-hubs 1.0.0-beta.5 → 1.0.0-beta.7

package/dist/index.cjs

@@ -6,12 +6,15 @@ var coreRestPipeline = require('@azure/core-rest-pipeline');
 var crypto = require('crypto');
 var coreXml = require('@azure/core-xml');
 var coreClient = require('@azure/core-client');
+var abortController = require('@azure/abort-controller');
 var coreTracing = require('@azure/core-tracing');
 var tslib = require('tslib');
+var coreUtil = require('@azure/core-util');
+var uuid = require('uuid');
 
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-const SDK_VERSION = "1.0.0-beta.5";
+const SDK_VERSION = "1.0.0-beta.7";
 const JSON_CONTENT_TYPE = "application/json;charset=utf-8";
 const XML_CONTENT_TYPE = "application/xml";
 const STREAM_CONTENT_TYPE = "application/octet-stream";
@@ -154,48 +157,6 @@ function parseNotificationHubsConnectionString(connectionString) {
     return output;
 }
 
-// Copyright (c) Microsoft Corporation.
-const API_VERSION = "2020-06";
-/**
- * Creates a NotificationHubClient from the Access Policy connection string and hub name.
- * @param connectionString - The Access Policy connection string for the notification hub.
- * @param hubName - The notification hub name.
- * @returns A NotificationHubsClientContext initialized from the connection string and hub name.
- */
-function createClientContext(connectionString, hubName, options = {}) {
-    return new NotificationHubsServiceClient$1(connectionString, hubName, options);
-}
-class NotificationHubsServiceClient$1 extends coreClient.ServiceClient {
-    constructor(connectionString, hubName, options = {}) {
-        super(Object.assign({ deserializationOptions: {
-                parseXML: coreXml.parseXML,
-            }, serializationOptions: {
-                stringifyXML: coreXml.stringifyXML,
-            }, userAgentOptions: {
-                userAgentPrefix: `azsdk-js-messaging-notificationhubs/${SDK_VERSION}`,
-            } }, options));
-        this.hubName = hubName;
-        const parsedConnection = parseNotificationHubsConnectionString(connectionString);
-        this.baseUrl = parsedConnection.endpoint;
-        this.sasTokenProvider = createTokenProviderFromConnection(parsedConnection.sharedAccessKey, parsedConnection.sharedAccessKeyName);
-    }
-    async createHeaders(operationName) {
-        const authorization = await this.sasTokenProvider.getToken(this.baseUrl);
-        const headers = coreRestPipeline.createHttpHeaders();
-        headers.set("Authorization", authorization.token);
-        headers.set("x-ms-version", API_VERSION);
-        headers.set("x-ms-azsdk-telemetry", `class=NotificationHubsServiceClient;method=${operationName}`);
-        return headers;
-    }
-    requestUrl() {
-        // Node doesn't allow change in protocol but browsers do, so doing a string replace
-        const url = new URL(this.baseUrl.replace("sb://", "https://"));
-        url.pathname = this.hubName;
-        url.searchParams.set("api-version", API_VERSION);
-        return url;
-    }
-}
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 /**
@@ -206,14 +167,6 @@ class NotificationHubsServiceClient$1 extends coreClient.ServiceClient {
 function isDefined(thing) {
     return typeof thing !== "undefined" && thing !== null;
 }
-/**
- * Helper TypeGuard that checks if something is a string or not.
- * @param thing - Anything
- * @internal
- */
-function isString(thing) {
-    return typeof thing === "string" || thing instanceof String;
-}
 /**
  * @internal
  * Helper utility to retrieve `string` value from given string,
@@ -308,8 +261,8 @@ async function parseNotificationOutcome(bodyText) {
     const xml = await coreXml.parseXML(bodyText, { includeRoot: true });
     const outcome = xml.NotificationOutcome;
     return {
-        success: getInteger(outcome.Success, "Success"),
-        failure: getInteger(outcome.Failure, "Failure"),
+        successCount: getInteger(outcome.Success, "Success"),
+        failureCount: getInteger(outcome.Failure, "Failure"),
         results: parseRegistrationResults(outcome.Results.RegistrationResult),
         state: "DetailedStateAvailable",
     };
@@ -469,7 +422,7 @@ async function parseNotificationSendResponse(response) {
     }
 }
 function createDefaultResponse(response, notificationId) {
-    return Object.assign(Object.assign({}, response), { notificationId, success: 0, failure: 0, results: [], state: "Enqueued" });
+    return Object.assign(Object.assign({}, response), { notificationId, successCount: 0, failureCount: 0, results: [], state: "Enqueued" });
 }
 /**
  * Sends a request through the client context.
@@ -509,6 +462,82 @@ async function sendRequest(context, request, successStatusCode) {
     return response;
 }
 
+// Copyright (c) Microsoft Corporation.
+/**
+ * @internal
+ * Serializes a NotificationHubJob into an Atom XML entry.
+ * @param entry - The NotificationHubJob to turn into an Atom XML entry.
+ * @returns An Atom XML entry containing the notification hub job.
+ */
+function serializeNotificationHubJobEntry(entry) {
+    const job = {
+        Type: entry.type,
+        OutputContainerUri: { __cdata: entry.outputContainerUrl },
+        ImportFileUri: isDefined(entry.importFileUrl) ? { __cdata: entry.importFileUrl } : undefined,
+    };
+    const requestObject = serializeToAtomXmlRequest("NotificationHubJob", job);
+    return coreXml.stringifyXML(requestObject, { rootName: "entry", cdataPropName: "__cdata" });
+}
+/**
+ * Parses an Atom XML of an notification hub job entry.
+ * @param bodyText - The incoming Atom XML entry to parse into a notification hub job.
+ * @returns A parsed NotificationHubJob.
+ */
+async function parseNotificationHubJobEntry(bodyText) {
+    const xml = await coreXml.parseXML(bodyText, { includeRoot: true });
+    const content = xml.entry.content.NotificationHubJob;
+    return createNotificationHubJob(content);
+}
+/**
+ * Parses an Atom XML feed of notification hub jobs.
+ * @param bodyText - The incoming Atom XML feed to parse into notification hub jobs.
+ * @returns A list of notification hub jobs.
+ */
+async function parseNotificationHubJobFeed(bodyText) {
+    const xml = await coreXml.parseXML(bodyText, { includeRoot: true });
+    const results = [];
+    if (!isDefined(xml.feed.entry)) {
+        return results;
+    }
+    const entries = Array.isArray(xml.feed.entry) ? xml.feed.entry : [xml.feed.entry];
+    for (const item of entries) {
+        results.push(createNotificationHubJob(item.content.NotificationHubJob));
+    }
+    return results;
+}
+function createInputOutputProperties(content) {
+    const props = {};
+    const keyValues = content["d3p1:KeyValueOfstringstring"];
+    const keyValueArray = Array.isArray(keyValues) ? keyValues : [keyValues];
+    for (const item of keyValueArray) {
+        props[item["d3p1:Key"]] = item["d3p1:Value"];
+    }
+    return props;
+}
+function createNotificationHubJob(content) {
+    let outputProperties;
+    if (isDefined(content["OutputProperties"])) {
+        outputProperties = createInputOutputProperties(content["OutputProperties"]);
+    }
+    let inputProperties;
+    if (isDefined(content["InputProperties"])) {
+        inputProperties = createInputOutputProperties(content["InputProperties"]);
+    }
+    return {
+        jobId: getStringOrUndefined(content["JobId"]),
+        type: getString(content["Type"], "type"),
+        status: getStringOrUndefined(content["Status"]),
+        progress: getFloatOrUndefined(content["Progress"]),
+        outputContainerUrl: getString(content["OutputContainerUri"], "outputContainerUrl"),
+        importFileUrl: getStringOrUndefined(content["ImportFileUri"]),
+        failure: getStringOrUndefined(content["Failure"]),
+        createdAt: getDateOrUndefined(content["CreatedAt"]),
+        updatedAt: getDateOrUndefined(content["UpdatedAt"]),
+        inputProperties,
+        outputProperties,
+    };
+}
+
 // Copyright (c) Microsoft Corporation.
 /**
  * A tracing client to handle spans.
@@ -521,7 +550,178 @@ const tracingClient = coreTracing.createTracingClient({
 });
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$i = "cancelScheduledNotification";
+const OPERATION_NAME$g = "getNotificationHubJob";
+/**
+ * Gets a Notification Hub Job by the ID.
+ * @param context - The Notification Hubs client.
+ * @param jobId - The Notification Hub Job ID.
+ * @param options - The operation options.
+ * @returns The Notification Hub Job with the matching ID.
+ */
+function getNotificationHubJob(context, jobId, options = {}) {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$g}`, options, async (updatedOptions) => {
+        const endpoint = context.requestUrl();
+        endpoint.pathname += `/jobs/${jobId}`;
+        const headers = await context.createHeaders(OPERATION_NAME$g);
+        headers.set("Content-Type", "application/atom+xml;type=entry;charset=utf-8");
+        const request = createRequest(endpoint, "GET", headers, updatedOptions);
+        const response = await sendRequest(context, request, 200);
+        return parseNotificationHubJobEntry(response.bodyAsText);
+    });
+}
+
+// Copyright (c) Microsoft Corporation.
+const OPERATION_NAME$f = "submitNotificationHubJob";
+/**
+ * Submits a Notification Hub Job.
+ * Note: this is available to Standard SKU namespace and above.
+ * @param context - The Notification Hubs client.
+ * @param job - The notification hub job to submit.
+ * @param options - The operation options.
+ * @returns The notification hub job details including job ID and status.
+ */
+function submitNotificationHubJob(context, job, options = {}) {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$f}`, options, async (updatedOptions) => {
+        const endpoint = context.requestUrl();
+        endpoint.pathname += "/jobs";
+        const headers = await context.createHeaders(OPERATION_NAME$f);
+        headers.set("Content-Type", "application/atom+xml;type=entry;charset=utf-8");
+        const request = createRequest(endpoint, "POST", headers, updatedOptions);
+        request.body = serializeNotificationHubJobEntry(job);
+        const response = await sendRequest(context, request, 201);
+        return parseNotificationHubJobEntry(response.bodyAsText);
+    });
+}
+
+// Copyright (c) Microsoft Corporation.
+/**
+ * Submits a Notification Hub job and creates a poller to poll for results.
+ * @param context - The Notification Hubs client.
+ * @param notificationHubJob - The Notification Hub import/export job to start.
+ * @param options - The operation options.
+ * @returns A poller which can be called to poll until completion of the job.
+ */
+async function beginSubmitNotificationHubJob(context, notificationHubJob, polledOperationOptions = {}) {
+    var _a;
+    let submittedJob = await submitNotificationHubJob(context, notificationHubJob, polledOperationOptions);
+    const state = {
+        status: "notStarted",
+    };
+    const progressCallbacks = new Map();
+    const processProgressCallbacks = async () => progressCallbacks.forEach((h) => h(state));
+    let resultPromise;
+    let cancelJob;
+    const abortController$1 = new abortController.AbortController();
+    const currentPollIntervalInMs = (_a = polledOperationOptions.updateIntervalInMs) !== null && _a !== void 0 ? _a : 2000;
+    const poller = {
+        async poll(options) {
+            submittedJob = await getNotificationHubJob(context, submittedJob.jobId, options);
+            if (submittedJob.status === "Running" || submittedJob.status === "Started") {
+                state.status = "running";
+            }
+            if (submittedJob.status === "Completed") {
+                state.status = "succeeded";
+                state.result = submittedJob;
+            }
+            if (submittedJob.status === "Failed") {
+                state.status = "failed";
+                state.error = new Error(submittedJob.failure);
+            }
+            await processProgressCallbacks();
+            if (state.status === "canceled") {
+                throw new Error("Operation was canceled");
+            }
+            if (state.status === "failed") {
+                throw state.error;
+            }
+        },
+        pollUntilDone(pollOptions) {
+            return (resultPromise !== null && resultPromise !== void 0 ? resultPromise : (resultPromise = (async () => {
+                const { abortSignal: inputAbortSignal } = pollOptions || {};
+                const { signal: abortSignal } = inputAbortSignal
+                    ? new abortController.AbortController([inputAbortSignal, abortController$1.signal])
+                    : abortController$1;
+                if (!poller.isDone()) {
+                    await poller.poll({ abortSignal });
+                    while (!poller.isDone()) {
+                        const delay = sleep(currentPollIntervalInMs, abortSignal);
+                        cancelJob = () => abortController$1.abort();
+                        await delay;
+                        await poller.poll({ abortSignal });
+                    }
+                }
+                switch (state.status) {
+                    case "succeeded": {
+                        return poller.getResult();
+                    }
+                    case "canceled": {
+                        throw new Error("Operation was canceled");
+                    }
+                    case "failed": {
+                        throw state.error;
+                    }
+                    case "notStarted":
+                    case "running": {
+                        // Unreachable
+                        throw new Error(`polling completed without succeeding or failing`);
+                    }
+                }
+            })().finally(() => {
+                resultPromise = undefined;
+            })));
+        },
+        onProgress(callback) {
+            const s = Symbol();
+            progressCallbacks.set(s, callback);
+            return () => progressCallbacks.delete(s);
+        },
+        isDone() {
+            return ["succeeded", "failed", "canceled"].includes(state.status);
+        },
+        stopPolling() {
+            abortController$1.abort();
+            cancelJob === null || cancelJob === void 0 ? void 0 : cancelJob();
+        },
+        isStopped() {
+            return resultPromise === undefined;
+        },
+        getOperationState() {
+            return state;
+        },
+        getResult() {
+            return state.result;
+        },
+        toString() {
+            return JSON.stringify({ state });
+        },
+    };
+    return poller;
+}
+const REJECTED_ERR = new Error("The operation has been aborted");
+function sleep(ms, signal) {
+    return new Promise((resolve, reject) => {
+        if (signal.aborted) {
+            reject(REJECTED_ERR);
+            return;
+        }
+        const id = setTimeout(() => {
+            signal.removeEventListener("abort", onAbort);
+            if (signal.aborted) {
+                reject(REJECTED_ERR);
+                return;
+            }
+            resolve();
+        }, ms);
+        signal.addEventListener("abort", onAbort, { once: true });
+        function onAbort() {
+            clearTimeout(id);
+            reject(REJECTED_ERR);
+        }
+    });
+}
+
+// Copyright (c) Microsoft Corporation.
+const OPERATION_NAME$e = "cancelScheduledNotification";
 /**
  * Cancels the scheduled notification with the given notification ID.
  * NOTE: This is only available in Standard SKU Azure Notification Hubs.
@@ -531,10 +731,10 @@ const OPERATION_NAME$i = "cancelScheduledNotification";
  * @returns A notification hub response with correlation ID and tracking ID.
  */
 function cancelScheduledNotification(context, notificationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$i}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$e}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/schedulednotifications/${notificationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$i);
+        const headers = await context.createHeaders(OPERATION_NAME$e);
         const request = createRequest(endpoint, "DELETE", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
         return parseNotificationSendResponse(response);
@@ -542,7 +742,7 @@ function cancelScheduledNotification(context, notificationId, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$h = "createOrUpdateInstallation";
+const OPERATION_NAME$d = "createOrUpdateInstallation";
 /**
  * Creates or overwrites an installation to a Notification Hub.
  * @param context - The Notification Hubs client.
@@ -551,10 +751,10 @@ const OPERATION_NAME$h = "createOrUpdateInstallation";
  * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
  */
 function createOrUpdateInstallation(context, installation, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$h}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$d}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/installations/${installation.installationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$h);
+        const headers = await context.createHeaders(OPERATION_NAME$d);
         headers.set("Content-Type", "application/json");
         const request = createRequest(endpoint, "PUT", headers, updatedOptions);
         request.body = JSON.stringify(installation);
@@ -609,21 +809,21 @@ const registrationDescriptionParser = {
      * Creates an ADM registration description from incoming XML property bag.
      */
     createAdmRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign({ admRegistrationId: getString(rawRegistrationDescription["AdmRegistrationId"], "admRegistrationId") }, createRegistrationDescription(rawRegistrationDescription)), { type: "Adm" });
+        return Object.assign(Object.assign({ admRegistrationId: getString(rawRegistrationDescription["AdmRegistrationId"], "admRegistrationId") }, createRegistrationDescription(rawRegistrationDescription)), { kind: "Adm" });
     },
     /**
      * @internal
      * Creates an ADM template registration description from incoming XML property bag.
      */
     createAdmTemplateRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign(Object.assign({}, this.createAdmRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { type: "AdmTemplate" });
+        return Object.assign(Object.assign(Object.assign({}, this.createAdmRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { kind: "AdmTemplate" });
     },
     /**
      * @internal
      * Creates an Apple registration description from incoming XML property bag.
      */
     createAppleRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign({ deviceToken: getString(rawRegistrationDescription["DeviceToken"], "deviceToken") }, createRegistrationDescription(rawRegistrationDescription)), { type: "Apple" });
+        return Object.assign(Object.assign({ deviceToken: getString(rawRegistrationDescription["DeviceToken"], "deviceToken") }, createRegistrationDescription(rawRegistrationDescription)), { kind: "Apple" });
     },
     /**
      * @internal
@@ -631,56 +831,56 @@ const registrationDescriptionParser = {
      */
     createAppleTemplateRegistrationDescription(rawRegistrationDescription) {
         var _a;
-        return Object.assign(Object.assign(Object.assign({ priority: getStringOrUndefined(rawRegistrationDescription["Priority"]), apnsHeaders: getHeadersOrUndefined((_a = rawRegistrationDescription["ApnsHeaders"]) === null || _a === void 0 ? void 0 : _a["ApnsHeader"]) }, this.createAppleRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { type: "AppleTemplate" });
+        return Object.assign(Object.assign(Object.assign({ priority: getStringOrUndefined(rawRegistrationDescription["Priority"]), apnsHeaders: getHeadersOrUndefined((_a = rawRegistrationDescription["ApnsHeaders"]) === null || _a === void 0 ? void 0 : _a["ApnsHeader"]) }, this.createAppleRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { kind: "AppleTemplate" });
     },
     /**
      * @internal
      * Creates a Baidu registration description from incoming XML property bag.
      */
     createBaiduRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign({ baiduChannelId: getString(rawRegistrationDescription["BaiduChannelId"], "baiduChannelId"), baiduUserId: getString(rawRegistrationDescription["BaiduUserId"], "baiduUserId") }, createRegistrationDescription(rawRegistrationDescription)), { type: "Baidu" });
+        return Object.assign(Object.assign({ baiduChannelId: getString(rawRegistrationDescription["BaiduChannelId"], "baiduChannelId"), baiduUserId: getString(rawRegistrationDescription["BaiduUserId"], "baiduUserId") }, createRegistrationDescription(rawRegistrationDescription)), { kind: "Baidu" });
     },
     /**
      * @internal
      * Creates a Baidu template registration description from incoming XML property bag.
      */
     createBaiduTemplateRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign(Object.assign({}, this.createBaiduRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { type: "BaiduTemplate" });
+        return Object.assign(Object.assign(Object.assign({}, this.createBaiduRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { kind: "BaiduTemplate" });
     },
     /**
      * @internal
      * Creates a Browser registration description from incoming XML property bag.
      */
     createBrowserRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign({ endpoint: getString(rawRegistrationDescription["Endpoint"], "endpoint"), p256dh: getString(rawRegistrationDescription["P256DH"], "p256dh"), auth: getString(rawRegistrationDescription["Auth"], "auth") }, createRegistrationDescription(rawRegistrationDescription)), { type: "Browser" });
+        return Object.assign(Object.assign({ endpoint: getString(rawRegistrationDescription["Endpoint"], "endpoint"), p256dh: getString(rawRegistrationDescription["P256DH"], "p256dh"), auth: getString(rawRegistrationDescription["Auth"], "auth") }, createRegistrationDescription(rawRegistrationDescription)), { kind: "Browser" });
     },
     /**
      * @internal
      * Creates a Browser template registration description from incoming XML property bag.
      */
     createBrowserTemplateRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign(Object.assign({}, this.createBrowserRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { type: "BrowserTemplate" });
+        return Object.assign(Object.assign(Object.assign({}, this.createBrowserRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { kind: "BrowserTemplate" });
     },
     /**
      * @internal
      * Creates an GCM registration description from incoming XML property bag.
      */
     createGcmRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign({ gcmRegistrationId: getString(rawRegistrationDescription["GcmRegistrationId"], "gcmRegistrationId") }, createRegistrationDescription(rawRegistrationDescription)), { type: "Gcm" });
+        return Object.assign(Object.assign({ gcmRegistrationId: getString(rawRegistrationDescription["GcmRegistrationId"], "gcmRegistrationId") }, createRegistrationDescription(rawRegistrationDescription)), { kind: "Gcm" });
     },
     /**
      * @internal
      * Creates an FCM template registration description from incoming XML property bag.
      */
     createGcmTemplateRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign(Object.assign({}, this.createGcmRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { type: "GcmTemplate" });
+        return Object.assign(Object.assign(Object.assign({}, this.createGcmRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { kind: "GcmTemplate" });
     },
     /**
      * @internal
      * Creates a Windows Phone registration description from incoming XML property bag.
      */
     createMpnsRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign({ channelUri: getString(rawRegistrationDescription["ChannelUri"], "channelUri") }, createRegistrationDescription(rawRegistrationDescription)), { type: "Mpns" });
+        return Object.assign(Object.assign({ channelUri: getString(rawRegistrationDescription["ChannelUri"], "channelUri") }, createRegistrationDescription(rawRegistrationDescription)), { kind: "Mpns" });
     },
     /**
      * @internal
@@ -688,14 +888,14 @@ const registrationDescriptionParser = {
      */
     createMpnsTemplateRegistrationDescription(rawRegistrationDescription) {
         var _a;
-        return Object.assign(Object.assign(Object.assign({ mpnsHeaders: getHeadersOrUndefined((_a = rawRegistrationDescription["MpnsHeaders"]) === null || _a === void 0 ? void 0 : _a["MpnsHeader"]) }, this.createWindowsRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { type: "MpnsTemplate" });
+        return Object.assign(Object.assign(Object.assign({ mpnsHeaders: getHeadersOrUndefined((_a = rawRegistrationDescription["MpnsHeaders"]) === null || _a === void 0 ? void 0 : _a["MpnsHeader"]) }, this.createWindowsRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { kind: "MpnsTemplate" });
     },
     /**
      * @internal
      * Creates a Windows registration description from incoming XML property bag.
      */
     createWindowsRegistrationDescription(rawRegistrationDescription) {
-        return Object.assign(Object.assign({ channelUri: getString(rawRegistrationDescription["ChannelUri"], "channelUri") }, createRegistrationDescription(rawRegistrationDescription)), { type: "Windows" });
+        return Object.assign(Object.assign({ channelUri: getString(rawRegistrationDescription["ChannelUri"], "channelUri") }, createRegistrationDescription(rawRegistrationDescription)), { kind: "Windows" });
     },
     /**
      * @internal
@@ -703,7 +903,7 @@ const registrationDescriptionParser = {
      */
     createWindowsTemplateRegistrationDescription(rawRegistrationDescription) {
         var _a;
-        return Object.assign(Object.assign(Object.assign({ wnsHeaders: getHeadersOrUndefined((_a = rawRegistrationDescription["WnsHeaders"]) === null || _a === void 0 ? void 0 : _a["WnsHeader"]) }, this.createWindowsRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { type: "WindowsTemplate" });
+        return Object.assign(Object.assign(Object.assign({ wnsHeaders: getHeadersOrUndefined((_a = rawRegistrationDescription["WnsHeaders"]) === null || _a === void 0 ? void 0 : _a["WnsHeader"]) }, this.createWindowsRegistrationDescription(rawRegistrationDescription)), createTemplateRegistrationDescription(rawRegistrationDescription)), { kind: "WindowsTemplate" });
     },
 };
 function getHeadersOrUndefined(value) {
@@ -738,11 +938,11 @@ function createTemplateRegistrationDescription(rawRegistrationDescription) {
  */
 const registrationDescriptionSerializer = {
     serializeRegistrationDescription(description) {
-        const rootName = `${description.type}RegistrationDescription`;
+        const rootName = `${description.kind}RegistrationDescription`;
         const methodName = `serialize${rootName}`;
         const method = this[methodName].bind(this);
         if (!isDefined(method)) {
-            throw new coreRestPipeline.RestError(`Undefined platform ${description.type}`, { statusCode: 400 });
+            throw new coreRestPipeline.RestError(`Undefined platform ${description.kind}`, { statusCode: 400 });
         }
         const registration = method(description);
         const requestObject = serializeToAtomXmlRequest(rootName, registration);
@@ -937,7 +1137,7 @@ async function createOrUpdateRegistrationDescription(context, registration, oper
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$g = "createOrUpdateRegistration";
+const OPERATION_NAME$c = "createOrUpdateRegistration";
 /**
  * Creates or updates a registration.
  * @param context - The Notification Hubs client.
@@ -946,13 +1146,34 @@ const OPERATION_NAME$g = "createOrUpdateRegistration";
  * @returns The created or updated registration description.
  */
 function createOrUpdateRegistration(context, registration, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$g}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$c}`, options, async (updatedOptions) => {
         return createOrUpdateRegistrationDescription(context, registration, "createOrUpdate", updatedOptions);
     });
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$f = "createRegistrationId";
+const OPERATION_NAME$b = "createRegistration";
+/**
+ * Creates a new registration. This method generates a registration ID,
+ * which you can subsequently use to retrieve, update, and delete this registration.
+ * @param context - The Notification Hubs client.
+ * @param registration - The registration to create.
+ * @param options - Options for creating a new registration.
+ * @returns The newly created registration description.
+ */
+function createRegistration(context, registration, options = {}) {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$b}`, options, async (updatedOptions) => {
+        if (registration.registrationId) {
+            throw new coreRestPipeline.RestError("registrationId must not be set during a create operation", {
+                statusCode: 400,
+            });
+        }
+        return createOrUpdateRegistrationDescription(context, registration, "create", updatedOptions);
+    });
+}
+
+// Copyright (c) Microsoft Corporation.
+const OPERATION_NAME$a = "createRegistrationId";
 /**
  * Creates a new registration ID.
  * @param context - The Notification Hubs client.
@@ -960,10 +1181,10 @@ const OPERATION_NAME$f = "createRegistrationId";
  * @returns The newly created registration ID.
  */
 function createRegistrationId(context, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$f}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$a}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += "/registrationIDs";
-        const headers = await context.createHeaders(OPERATION_NAME$f);
+        const headers = await context.createHeaders(OPERATION_NAME$a);
         headers.set("Content-Type", "application/xml;type=entry;charset=utf-8");
         const request = createRequest(endpoint, "POST", headers, updatedOptions);
         const response = await sendRequest(context, request, 201);
@@ -976,28 +1197,7 @@ function createRegistrationId(context, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$e = "createRegistration";
-/**
- * Creates a new registration. This method generates a registration ID,
- * which you can subsequently use to retrieve, update, and delete this registration.
- * @param context - The Notification Hubs client.
- * @param registration - The registration to create.
- * @param options - Options for creating a new registration.
- * @returns The newly created registration description.
- */
-function createRegistration(context, registration, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$e}`, options, async (updatedOptions) => {
-        if (registration.registrationId) {
-            throw new coreRestPipeline.RestError("registrationId must not be set during a create operation", {
-                statusCode: 400,
-            });
-        }
-        return createOrUpdateRegistrationDescription(context, registration, "create", updatedOptions);
-    });
-}
-
-// Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$d = "deleteInstallation";
+const OPERATION_NAME$9 = "deleteInstallation";
 /**
  * Deletes an installation from a Notification Hub.
  * @param context - The Notification Hubs client.
@@ -1006,10 +1206,10 @@ const OPERATION_NAME$d = "deleteInstallation";
  * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
  */
 function deleteInstallation(context, installationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$d}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$9}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/installations/${installationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$d);
+        const headers = await context.createHeaders(OPERATION_NAME$9);
         const request = createRequest(endpoint, "DELETE", headers, updatedOptions);
         const response = await sendRequest(context, request, 204);
         return parseNotificationResponse(response);
@@ -1017,7 +1217,7 @@ function deleteInstallation(context, installationId, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$c = "deleteRegistration";
+const OPERATION_NAME$8 = "deleteRegistration";
 /**
  * Deletes a registration with the given registration ID.
  * @param context - The Notification Hubs client.
@@ -1026,10 +1226,10 @@ const OPERATION_NAME$c = "deleteRegistration";
  * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
  */
 function deleteRegistration(context, registrationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$c}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$8}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/registrations/${registrationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$c);
+        const headers = await context.createHeaders(OPERATION_NAME$8);
         headers.set("Content-Type", "application/atom+xml;type=entry;charset=utf-8");
         headers.set("If-Match", isDefined(options.etag) ? `"${options.etag}"` : "*");
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
@@ -1039,7 +1239,7 @@ function deleteRegistration(context, registrationId, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$b = "getFeedbackContainerUrl";
+const OPERATION_NAME$7 = "getFeedbackContainerUrl";
 /**
  * Retrieves an Azure Storage container URL. The container has feedback data for the notification hub.
  * The caller can then use the Azure Storage Services SDK to retrieve the contents of the container.
@@ -1048,10 +1248,10 @@ const OPERATION_NAME$b = "getFeedbackContainerUrl";
  * @returns The URL of the Azure Storage Container containing the feedback data.
  */
 function getFeedbackContainerUrl(context, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$b}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$7}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += "/feedbackcontainer";
-        const headers = await context.createHeaders(OPERATION_NAME$b);
+        const headers = await context.createHeaders(OPERATION_NAME$7);
         headers.set("Content-Type", "application/xml;type=entry;charset=utf-8");
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
@@ -1060,7 +1260,7 @@ function getFeedbackContainerUrl(context, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$a = "getInstallation";
+const OPERATION_NAME$6 = "getInstallation";
 /**
  * Gets an Azure Notification Hub installation by the installation ID.
  * @param context - The Notification Hubs client.
@@ -1069,10 +1269,10 @@ const OPERATION_NAME$a = "getInstallation";
  * @returns The installation that matches the installation ID.
  */
 function getInstallation(context, installationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$a}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$6}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/installations/${installationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$a);
+        const headers = await context.createHeaders(OPERATION_NAME$6);
         headers.set("Content-Type", "application/json");
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
@@ -1083,102 +1283,7 @@ function getInstallation(context, installationId, options = {}) {
 // Copyright (c) Microsoft Corporation.
 /**
  * @internal
- * Serializes a NotificationHubJob into an Atom XML entry.
- * @param entry - The NotificationHubJob to turn into an Atom XML entry.
- * @returns An Atom XML entry containing the notification hub job.
- */
-function serializeNotificationHubJobEntry(entry) {
-    const job = {
-        Type: entry.type,
-        OutputContainerUri: { __cdata: entry.outputContainerUrl },
-        ImportFileUri: isDefined(entry.importFileUrl) ? { __cdata: entry.importFileUrl } : undefined,
-    };
-    const requestObject = serializeToAtomXmlRequest("NotificationHubJob", job);
-    return coreXml.stringifyXML(requestObject, { rootName: "entry", cdataPropName: "__cdata" });
-}
-/**
- * Parses an Atom XML of an notification hub job entry.
- * @param bodyText - The incoming Atom XML entry to parse into a notification hub job.
- * @returns A parsed NotificationHubJob.
- */
-async function parseNotificationHubJobEntry(bodyText) {
-    const xml = await coreXml.parseXML(bodyText, { includeRoot: true });
-    const content = xml.entry.content.NotificationHubJob;
-    return createNotificationHubJob(content);
-}
-/**
- * Parses an Atom XML feed of notification hub jobs.
- * @param bodyText - The incoming Atom XML feed to parse into notification hub jobs.
- * @returns A list of notification hub jobs.
- */
-async function parseNotificationHubJobFeed(bodyText) {
-    const xml = await coreXml.parseXML(bodyText, { includeRoot: true });
-    const results = [];
-    if (!isDefined(xml.feed.entry)) {
-        return results;
-    }
-    const entries = Array.isArray(xml.feed.entry) ? xml.feed.entry : [xml.feed.entry];
-    for (const item of entries) {
-        results.push(createNotificationHubJob(item.content.NotificationHubJob));
-    }
-    return results;
-}
-function createInputOutputProperties(content) {
-    const props = {};
-    for (const item of content["d3p1:KeyValueOfstringstring"]) {
-        props[item["d3p1:Key"]] = item["d3p1:Value"];
-    }
-    return props;
-}
-function createNotificationHubJob(content) {
-    let outputProperties;
-    if (isDefined(content["OutputProperties"])) {
-        outputProperties = createInputOutputProperties(content["OutputProperties"]);
-    }
-    let inputProperties;
-    if (isDefined(content["InputProperties"])) {
-        inputProperties = createInputOutputProperties(content["InputProperties"]);
-    }
-    return {
-        jobId: getStringOrUndefined(content["JobId"]),
-        type: getString(content["Type"], "type"),
-        status: getStringOrUndefined(content["Status"]),
-        progress: getFloatOrUndefined(content["Progress"]),
-        outputContainerUrl: getString(content["OutputContainerUri"], "outputContainerUrl"),
-        importFileUrl: getStringOrUndefined(content["ImportFileUri"]),
-        failure: getStringOrUndefined(content["Failure"]),
-        createdAt: getDateOrUndefined(content["CreatedAt"]),
-        updatedAt: getDateOrUndefined(content["UpdatedAt"]),
-        inputProperties,
-        outputProperties,
-    };
-}
-
-// Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$9 = "getNotificationHubJob";
-/**
- * Gets a Notification Hub Job by the ID.
- * @param context - The Notification Hubs client.
- * @param jobId - The Notification Hub Job ID.
- * @param options - The operation options.
- * @returns The Notification Hub Job with the matching ID.
- */
-function getNotificationHubJob(context, jobId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$9}`, options, async (updatedOptions) => {
-        const endpoint = context.requestUrl();
-        endpoint.pathname += `/jobs/${jobId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$9);
-        headers.set("Content-Type", "application/atom+xml;type=entry;charset=utf-8");
-        const request = createRequest(endpoint, "GET", headers, updatedOptions);
-        const response = await sendRequest(context, request, 200);
-        return parseNotificationHubJobEntry(response.bodyAsText);
-    });
-}
-
-// Copyright (c) Microsoft Corporation.
-/**
- * @internal
- * Parses a NotificationDetails from incoming XML.
+ * Parses a NotificationDetails from incoming XML.
  */
 async function parseNotificationDetails(bodyText) {
     const xml = await coreXml.parseXML(bodyText, {
@@ -1223,15 +1328,16 @@ async function parseNotificationDetails(bodyText) {
     };
 }
 function parseOutcomeCounts(counts) {
+    const items = Array.isArray(counts) ? counts : [counts];
     const results = [];
-    for (const item of counts) {
+    for (const item of items) {
         results.push({ state: item["Name"], count: getInteger(item["Count"], "Count") });
     }
     return results;
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$8 = "getNotificationOutcomeDetails";
+const OPERATION_NAME$5 = "getNotificationOutcomeDetails";
 /**
  * Retrieves the results of a send operation. This can retrieve intermediate results if the send is being processed
  * or final results if the Send* has completed. This API can only be called for Standard SKU and above.
@@ -1241,10 +1347,10 @@ const OPERATION_NAME$8 = "getNotificationOutcomeDetails";
  * @returns The results of the send operation.
  */
 function getNotificationOutcomeDetails(context, notificationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$8}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$5}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/messages/${notificationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$8);
+        const headers = await context.createHeaders(OPERATION_NAME$5);
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
         return parseNotificationDetails(response.bodyAsText);
@@ -1252,7 +1358,7 @@ function getNotificationOutcomeDetails(context, notificationId, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$7 = "getRegistration";
+const OPERATION_NAME$4 = "getRegistration";
 /**
  * Gets a registration by the given registration ID.
  * @param context - The Notification Hubs client.
@@ -1261,10 +1367,10 @@ const OPERATION_NAME$7 = "getRegistration";
  * @returns A RegistrationDescription that has the given registration ID.
  */
 function getRegistration(context, registrationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$7}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$4}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/registrations/${registrationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$7);
+        const headers = await context.createHeaders(OPERATION_NAME$4);
         headers.set("Content-Type", "application/xml;type=entry;charset=utf-8");
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
@@ -1273,7 +1379,7 @@ function getRegistration(context, registrationId, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$6 = "listNotificationHubJobs";
+const OPERATION_NAME$3 = "listNotificationHubJobs";
 /**
  * Gets all Notification Hub Jobs for this Notification Hub.
  * @param context - The Notification Hubs client.xs
@@ -1281,10 +1387,10 @@ const OPERATION_NAME$6 = "listNotificationHubJobs";
  * @returns An array of all Notification Hub Jobs for this Notification Hub.
  */
 function listNotificationHubJobs(context, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$6}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$3}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += "/jobs";
-        const headers = await context.createHeaders(OPERATION_NAME$6);
+        const headers = await context.createHeaders(OPERATION_NAME$3);
         headers.set("Content-Type", "application/atom+xml;type=entry;charset=utf-8");
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
@@ -1293,43 +1399,11 @@ function listNotificationHubJobs(context, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$5 = "listRegistrationsByTag";
-/**
- * Lists all registrations with the matching tag.
- * @param context - The Notification Hubs client.
- * @param tag - The tag to query for matching registrations.
- * @param options - The query options such as $top.
- * @returns A paged async iterable containing the matching registrations for the notification hub.
- */
-function listRegistrationsByTag(context, tag, options = {}) {
-    const { span, updatedOptions } = tracingClient.startSpan(`NotificationHubsClientContext-${OPERATION_NAME$5}`, options);
-    try {
-        const iter = listRegistrationsByTagAll(context, tag, updatedOptions);
-        return {
-            next() {
-                return iter.next();
-            },
-            [Symbol.asyncIterator]() {
-                return this;
-            },
-            byPage: () => {
-                return listRegistrationsByTagPagingPage(context, tag, options);
-            },
-        };
-    }
-    catch (e) {
-        span.setStatus({ status: "error", error: e });
-        throw e;
-    }
-    finally {
-        span.end();
-    }
-}
-function listRegistrationsByTagAll(context, tag, options) {
-    return tslib.__asyncGenerator(this, arguments, function* listRegistrationsByTagAll_1() {
+function listRegistrationsAll(context, options) {
+    return tslib.__asyncGenerator(this, arguments, function* listRegistrationsAll_1() {
         var e_1, _a;
         try {
-            for (var _b = tslib.__asyncValues(listRegistrationsByTagPagingPage(context, tag, options)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
+            for (var _b = tslib.__asyncValues(listRegistrationPagingPage(context, options)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
                 const page = _c.value;
                 yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(page)));
             }
@@ -1343,28 +1417,31 @@ function listRegistrationsByTagAll(context, tag, options) {
         }
     });
 }
-function listRegistrationsByTagPagingPage(context, tag, options) {
-    return tslib.__asyncGenerator(this, arguments, function* listRegistrationsByTagPagingPage_1() {
-        let result = yield tslib.__await(_listRegistrationsByTag(context, tag, options));
+function listRegistrationPagingPage(context, options) {
+    return tslib.__asyncGenerator(this, arguments, function* listRegistrationPagingPage_1() {
+        let result = yield tslib.__await(_listRegistrations(context, options));
         yield yield tslib.__await(result.registrations || []);
         let continuationToken = result.continuationToken;
         while (continuationToken) {
-            result = yield tslib.__await(_listRegistrationsByTag(context, tag, options, continuationToken));
+            result = yield tslib.__await(_listRegistrations(context, options, continuationToken));
             continuationToken = result.continuationToken;
             yield yield tslib.__await(result.registrations || []);
         }
     });
 }
-async function _listRegistrationsByTag(context, tag, options, continuationToken) {
+async function _listRegistrations(context, options, continuationToken) {
     const endpoint = context.requestUrl();
-    endpoint.pathname += `/tags/${tag}/registrations`;
+    endpoint.pathname += "/registrations";
     if (options.top !== undefined) {
         endpoint.searchParams.set("$top", `${options.top}`);
     }
+    if (options.filter !== undefined) {
+        endpoint.searchParams.set("$filter", options.filter);
+    }
     if (continuationToken !== undefined) {
         endpoint.searchParams.set("continuationtoken", continuationToken);
     }
-    const headers = await context.createHeaders(OPERATION_NAME$5);
+    const headers = await context.createHeaders("listRegistrations");
     const request = createRequest(endpoint, "GET", headers, options);
     const response = await sendRequest(context, request, 200);
     const registrations = await registrationDescriptionParser.parseRegistrationFeed(response.bodyAsText);
@@ -1376,15 +1453,14 @@ async function _listRegistrationsByTag(context, tag, options, continuationToken)
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$4 = "listRegistrations";
 /**
  * Gets all registrations for the notification hub with the given query options.
  * @param context - The Notification Hubs client.
- * @param options - The options for querying the registrations such as $top and $filter.
+ * @param options - The options for querying the registrations such as $top.
  * @returns A paged async iterable containing all of the registrations for the notification hub.
  */
 function listRegistrations(context, options = {}) {
-    const { span, updatedOptions } = tracingClient.startSpan(`NotificationHubsClientContext-${OPERATION_NAME$4}`, options);
+    const { span, updatedOptions } = tracingClient.startSpan("NotificationHubsClientContext.listRegistrations", options);
     try {
         const iter = listRegistrationsAll(context, updatedOptions);
         return {
@@ -1395,7 +1471,7 @@ function listRegistrations(context, options = {}) {
                 return this;
             },
             byPage: () => {
-                return listRegistrationPagingPage(context, options);
+                return listRegistrationPagingPage(context, updatedOptions);
             },
         };
     }
@@ -1407,11 +1483,99 @@ function listRegistrations(context, options = {}) {
         span.end();
     }
 }
-function listRegistrationsAll(context, options) {
-    return tslib.__asyncGenerator(this, arguments, function* listRegistrationsAll_1() {
+
+// Copyright (c) Microsoft Corporation.
+/**
+ * Gets all registrations for the notification hub with the given device information and options.
+ * @param context - The Notification Hubs client.
+ * @param channel - The Registration channel information to query per PNS type.
+ * @param options - The options for querying the registrations such as $top.
+ * @returns A paged async iterable containing all of the registrations for the notification hub.
+ */
+function listRegistrationsByChannel(context, channel, options = {}) {
+    const newOptions = Object.assign(Object.assign({}, options), { filter: getFilterByChannel(channel) });
+    const { span, updatedOptions } = tracingClient.startSpan("NotificationHubsClientContext.listRegistrationsByDevice", newOptions);
+    try {
+        const iter = listRegistrationsAll(context, updatedOptions);
+        return {
+            next() {
+                return iter.next();
+            },
+            [Symbol.asyncIterator]() {
+                return this;
+            },
+            byPage: () => {
+                return listRegistrationPagingPage(context, updatedOptions);
+            },
+        };
+    }
+    catch (e) {
+        span.setStatus({ status: "error", error: e });
+        throw e;
+    }
+    finally {
+        span.end();
+    }
+}
+function getFilterByChannel(device) {
+    switch (device.kind) {
+        case "adm":
+            return `AdmRegistrationId eq '${device.admRegistrationId}'`;
+        case "apple":
+            return `DeviceToken eq '${device.deviceToken.toLocaleUpperCase()}'`;
+        case "baidu":
+            return `BaiduChannelId eq ${device.baiduChannelId}' and BaiduUserId eq '${device.baiduUserId}'`;
+        case "browser":
+            return `Endpoint eq '${encodeURIComponent(device.endpoint)}' and P256DH eq '${device.p256dh}' and Auth eq '${device.auth}'`;
+        case "gcm":
+            return `GcmRegistrationId eq '${device.gcmRegistrationId}'`;
+        case "windows":
+            return `ChannelUri eq '${encodeURIComponent(device.channelUri)}'`;
+        default:
+            throw new coreRestPipeline.RestError(`Device type is unsupported`, {
+                statusCode: 400,
+            });
+    }
+}
+
+// Copyright (c) Microsoft Corporation.
+const OPERATION_NAME$2 = "listRegistrationsByTag";
+/**
+ * Lists all registrations with the matching tag.
+ * @param context - The Notification Hubs client.
+ * @param tag - The tag to query for matching registrations.
+ * @param options - The query options such as $top.
+ * @returns A paged async iterable containing the matching registrations for the notification hub.
+ */
+function listRegistrationsByTag(context, tag, options = {}) {
+    const { span, updatedOptions } = tracingClient.startSpan(`NotificationHubsClientContext.${OPERATION_NAME$2}`, options);
+    try {
+        const iter = listRegistrationsByTagAll(context, tag, updatedOptions);
+        return {
+            next() {
+                return iter.next();
+            },
+            [Symbol.asyncIterator]() {
+                return this;
+            },
+            byPage: () => {
+                return listRegistrationsByTagPagingPage(context, tag, options);
+            },
+        };
+    }
+    catch (e) {
+        span.setStatus({ status: "error", error: e });
+        throw e;
+    }
+    finally {
+        span.end();
+    }
+}
+function listRegistrationsByTagAll(context, tag, options) {
+    return tslib.__asyncGenerator(this, arguments, function* listRegistrationsByTagAll_1() {
         var e_1, _a;
         try {
-            for (var _b = tslib.__asyncValues(listRegistrationPagingPage(context, options)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
+            for (var _b = tslib.__asyncValues(listRegistrationsByTagPagingPage(context, tag, options)), _c; _c = yield tslib.__await(_b.next()), !_c.done;) {
                 const page = _c.value;
                 yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(page)));
             }
@@ -1425,31 +1589,28 @@ function listRegistrationsAll(context, options) {
         }
     });
 }
-function listRegistrationPagingPage(context, options) {
-    return tslib.__asyncGenerator(this, arguments, function* listRegistrationPagingPage_1() {
-        let result = yield tslib.__await(_listRegistrations(context, options));
+function listRegistrationsByTagPagingPage(context, tag, options) {
+    return tslib.__asyncGenerator(this, arguments, function* listRegistrationsByTagPagingPage_1() {
+        let result = yield tslib.__await(_listRegistrationsByTag(context, tag, options));
         yield yield tslib.__await(result.registrations || []);
         let continuationToken = result.continuationToken;
         while (continuationToken) {
-            result = yield tslib.__await(_listRegistrations(context, options, continuationToken));
+            result = yield tslib.__await(_listRegistrationsByTag(context, tag, options, continuationToken));
             continuationToken = result.continuationToken;
             yield yield tslib.__await(result.registrations || []);
         }
     });
 }
-async function _listRegistrations(context, options, continuationToken) {
+async function _listRegistrationsByTag(context, tag, options, continuationToken) {
     const endpoint = context.requestUrl();
-    endpoint.pathname += "/registrations";
+    endpoint.pathname += `/tags/${tag}/registrations`;
     if (options.top !== undefined) {
         endpoint.searchParams.set("$top", `${options.top}`);
     }
-    if (options.filter !== undefined) {
-        endpoint.searchParams.set("$filter", options.filter);
-    }
     if (continuationToken !== undefined) {
         endpoint.searchParams.set("continuationtoken", continuationToken);
     }
-    const headers = await context.createHeaders(OPERATION_NAME$4);
+    const headers = await context.createHeaders(OPERATION_NAME$2);
     const request = createRequest(endpoint, "GET", headers, options);
     const response = await sendRequest(context, request, 200);
     const registrations = await registrationDescriptionParser.parseRegistrationFeed(response.bodyAsText);
@@ -1461,32 +1622,25 @@ async function _listRegistrations(context, options, continuationToken) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$3 = "scheduleNotificationPayload";
 /**
- * @internal
+ * Schedules a push notification to devices that match the given tags or tag expression at the specified time.
+ * NOTE: This is only available in Standard SKU Azure Notification Hubs.
+ * @param context - The Notification Hubs client.
+ * @param scheduledTime - The Date to send the push notification.
+ * @param notification - The notification to send to the matching devices.
+ * @param options - Options which include tags used to target the device for push notifications in either an array or tag expression.
+ * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
  */
-function scheduleNotificationPayload(context, scheduledTime, tags, notification, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$3}`, options, async (updatedOptions) => {
+function scheduleNotification(context, scheduledTime, notification, options = {}) {
+    return tracingClient.withSpan(`NotificationHubsClientContext.scheduleNotification`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += "/schedulednotifications/";
-        const headers = await context.createHeaders(OPERATION_NAME$3);
-        if (notification.headers) {
-            for (const headerName of Object.keys(notification.headers)) {
-                headers.set(headerName, notification.headers[headerName]);
-            }
-        }
+        const headers = await context.createHeaders("scheduleNotification", notification.headers);
         headers.set("ServiceBusNotification-ScheduleTime", scheduledTime.toISOString());
         headers.set("Content-Type", notification.contentType);
         headers.set("ServiceBusNotification-Format", notification.platform);
-        if (tags) {
-            let tagExpression = null;
-            if (Array.isArray(tags)) {
-                tagExpression = tags.join("||");
-            }
-            else {
-                tagExpression = tags;
-            }
-            headers.set("ServiceBusNotification-Tags", tagExpression);
+        if (options.tagExpression) {
+            headers.set("ServiceBusNotification-Tags", options.tagExpression);
         }
         const request = createRequest(endpoint, "POST", headers, updatedOptions);
         request.body = notification.body;
@@ -1497,146 +1651,98 @@ function scheduleNotificationPayload(context, scheduledTime, tags, notification,
 
 // Copyright (c) Microsoft Corporation.
 /**
- * Schedules a push notification to all devices registered on the Notification Hub.
- * NOTE: This is only available in Standard SKU Azure Notification Hubs.
- * @param context - The Notification Hubs client.
- * @param scheduledTime - The Date to send the push notification.
- * @param notification - The notification to send to the matching devices.
- * @param options - Configuration options for the direct send operation which can contain custom headers
- * which may include APNs specific such as apns-topic or for WNS, X-WNS-TYPE.
- * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
+ * Determines whether the options are of type SendNotificationOptions.
+ * @param options - The options to test if SendNotificationOptions.
+ * @returns true if SendNotificationOptions otherwise false.
+ */
+function isSendNotificationOptions(options) {
+    return coreUtil.objectHasProperty(options, "tags") || coreUtil.objectHasProperty(options, "enableTestSend");
+}
+/**
+ * Determines whether the options are of type DirectSendNotificationOptions.
+ * @param options - The options to test if DirectSendNotificationOptions.
+ * @returns true if DirectSendNotificationOptions otherwise false.
  */
-function scheduleBroadcastNotification(context, scheduledTime, notification, options = {}) {
-    return scheduleNotificationPayload(context, scheduledTime, undefined, notification, options);
+function isDirectSendNotificationOptions(options) {
+    return coreUtil.objectHasProperty(options, "deviceHandle");
 }
 
 // Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
 /**
- * Schedules a push notification to devices that match the given tags or tag expression at the specified time.
- * NOTE: This is only available in Standard SKU Azure Notification Hubs.
- * @param context - The Notification Hubs client.
- * @param scheduledTime - The Date to send the push notification.
- * @param tags - The tags used to target the device for push notifications in either an array or tag expression.
- * @param notification - The notification to send to the matching devices.
- * @param options - Configuration options for the direct send operation which can contain custom headers
- * which may include APNs specific such as apns-topic or for WNS, X-WNS-TYPE.
- * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
+ * @internal
  */
-function scheduleNotification(context, scheduledTime, tags, notification, options = {}) {
-    return scheduleNotificationPayload(context, scheduledTime, tags, notification, options);
+function createMultipartDirectNotification(boundaryName, notification, deviceHandles) {
+    return (`--${boundaryName}\r\n` +
+        `Content-type: ${notification.contentType}\r\n` +
+        "Content-Disposition: inline; name=notification\r\n\r\n" +
+        notification.body +
+        "\r\n" +
+        `--${boundaryName}\r\n` +
+        "Content-type: application/json\r\n" +
+        "Content-Disposition: inline; name=devices\r\n\r\n" +
+        JSON.stringify(deviceHandles) +
+        "\r\n" +
+        `--${boundaryName}--`);
 }
 
 // Copyright (c) Microsoft Corporation.
 /**
- * @internal
+ * Sends push notifications to devices that match the given tags or tag expression.
+ * @param context - The Notification Hubs client.
+ * @param notification - The notification to send to the matching devices.
+ * @param options - Options for the notification including tags, device handles and whether to enable test send.
+ * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
  */
-function sendNotificationPayload(context, notification, method, pushHandle, tags, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${method}`, options, async (updatedOptions) => {
+function sendNotification(context, notification, options = { enableTestSend: false }) {
+    return tracingClient.withSpan(`NotificationHubsClientContext.sendNotification`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += "/messages/";
-        if (options.enableTestSend) {
+        // Check if batch direct send
+        if (isDirectSendNotificationOptions(options) && Array.isArray(options.deviceHandle)) {
+            endpoint.pathname += "$batch";
+        }
+        // Check for test send
+        if (isSendNotificationOptions(options) && options.enableTestSend) {
             endpoint.searchParams.append("test", "true");
         }
-        const headers = await context.createHeaders(method);
-        if (notification.headers) {
-            for (const headerName of Object.keys(notification.headers)) {
-                headers.set(headerName, notification.headers[headerName]);
-            }
+        const headers = await context.createHeaders("sendNotification", notification.headers);
+        headers.set("ServiceBusNotification-Format", notification.platform);
+        let body = notification.body;
+        let contentType = notification.contentType;
+        // Check for direct batch send
+        if (isDirectSendNotificationOptions(options) && Array.isArray(options.deviceHandle)) {
+            endpoint.searchParams.append("direct", "true");
+            const boundary = `nh-boundary-${uuid.v4()}`;
+            contentType = `multipart/mixed; boundary = "${boundary}"`;
+            body = createMultipartDirectNotification(boundary, notification, options.deviceHandle);
         }
-        if (pushHandle) {
+        else if (isDirectSendNotificationOptions(options)) {
             endpoint.searchParams.append("direct", "true");
             if (notification.platform === "browser") {
-                const browserHandle = pushHandle;
+                const browserHandle = options.deviceHandle;
                 headers.set("ServiceBusNotification-DeviceHandle", browserHandle.endpoint);
                 headers.set("Auth", browserHandle.auth);
                 headers.set("P256DH", browserHandle.p256dh);
             }
             else {
-                headers.set("ServiceBusNotification-DeviceHandle", pushHandle);
+                headers.set("ServiceBusNotification-DeviceHandle", options.deviceHandle);
             }
         }
-        headers.set("Content-Type", notification.contentType);
-        headers.set("ServiceBusNotification-Format", notification.platform);
-        if (tags) {
-            let tagExpression = null;
-            if (Array.isArray(tags)) {
-                tagExpression = tags.join("||");
-            }
-            else {
-                tagExpression = tags;
+        else if (isSendNotificationOptions(options)) {
+            if (options.tagExpression) {
+                headers.set("ServiceBusNotification-Tags", options.tagExpression);
             }
-            headers.set("ServiceBusNotification-Tags", tagExpression);
         }
+        headers.set("Content-Type", contentType);
+        headers.set("ServiceBusNotification-Format", notification.platform);
         const request = createRequest(endpoint, "POST", headers, updatedOptions);
-        request.body = notification.body;
+        request.body = body;
         const response = await sendRequest(context, request, 201);
         return parseNotificationSendResponse(response);
     });
 }
 
-// Copyright (c) Microsoft Corporation.
-/**
- * Sends push notifications to all devices on the Notification Hub.
- * @param context - The Notification Hubs client.
- * @param notification - The notification to send to all devices.
- * @param options - Configuration options for the direct send operation which can contain custom headers
- * which may include APNs specific such as apns-topic or for WNS, X-WNS-TYPE.
- * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
- */
-function sendBroadcastNotification(context, notification, options = {}) {
-    return sendNotificationPayload(context, notification, "sendNotification", undefined, undefined, options);
-}
-
-// Copyright (c) Microsoft Corporation.
-/**
- * Sends a direct push notification to a device with the given push handle.
- * @param context - The Notification Hubs client.
- * @param pushHandle - The push handle which is the unique identifier for the device.
- * @param notification - The notification to send to the device.
- * @param options - The options for sending a direct notification.
- * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
- */
-function sendDirectNotification(context, pushHandle, notification, options = {}) {
-    return sendNotificationPayload(context, notification, "sendDirectNotification", pushHandle, undefined, options);
-}
-
-// Copyright (c) Microsoft Corporation.
-/**
- * Sends push notifications to devices that match the given tags or tag expression.
- * @param context - The Notification Hubs client.
- * @param tags - The tags used to target the device for push notifications in either an array or tag expression.
- * @param notification - The notification to send to the matching devices.
- * @param options - Configuration options for the direct send operation which can contain custom headers
- * which may include APNs specific such as apns-topic or for WNS, X-WNS-TYPE.
- * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
- */
-function sendNotification(context, tags, notification, options = {}) {
-    return sendNotificationPayload(context, notification, "sendNotification", undefined, tags, options);
-}
-
-// Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$2 = "submitNotificationHubJob";
-/**
- * Submits a Notification Hub Job.
- * Note: this is available to Standard SKU namespace and above.
- * @param context - The Notification Hubs client.
- * @param job - The notification hub job to submit.
- * @param options - The operation options.
- * @returns The notification hub job details including job ID and status.
- */
-function submitNotificationHubJob(context, job, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$2}`, options, async (updatedOptions) => {
-        const endpoint = context.requestUrl();
-        endpoint.pathname += "/jobs";
-        const headers = await context.createHeaders(OPERATION_NAME$2);
-        headers.set("Content-Type", "application/atom+xml;type=entry;charset=utf-8");
-        const request = createRequest(endpoint, "POST", headers, updatedOptions);
-        request.body = serializeNotificationHubJobEntry(job);
-        const response = await sendRequest(context, request, 201);
-        return parseNotificationHubJobEntry(response.bodyAsText);
-    });
-}
-
 // Copyright (c) Microsoft Corporation.
 const OPERATION_NAME$1 = "updateInstallation";
 /**
@@ -1648,7 +1754,7 @@ const OPERATION_NAME$1 = "updateInstallation";
  * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
  */
 function updateInstallation(context, installationId, installationPatches, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$1}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$1}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/installations/${installationId}`;
         const headers = await context.createHeaders(OPERATION_NAME$1);
@@ -1670,7 +1776,7 @@ const OPERATION_NAME = "updateRegistration";
  * @returns The updated registration description.
  */
 function updateRegistration(context, registration, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME}`, options, async (updatedOptions) => {
         if (!registration.etag) {
             throw new coreRestPipeline.RestError("ETag is required for registration update", { statusCode: 400 });
         }
@@ -1678,12 +1784,54 @@ function updateRegistration(context, registration, options = {}) {
     });
 }
 
+// Copyright (c) Microsoft Corporation.
+const API_VERSION = "2020-06";
+/**
+ * Creates a NotificationHubClient from the Access Policy connection string and hub name.
+ * @param connectionString - The Access Policy connection string for the notification hub.
+ * @param hubName - The notification hub name.
+ * @returns A NotificationHubsClientContext initialized from the connection string and hub name.
+ */
+function createClientContext(connectionString, hubName, options = {}) {
+    return new NotificationHubsServiceClient(connectionString, hubName, options);
+}
+class NotificationHubsServiceClient extends coreClient.ServiceClient {
+    constructor(connectionString, hubName, options = {}) {
+        super(Object.assign({ deserializationOptions: {
+                parseXML: coreXml.parseXML,
+            }, serializationOptions: {
+                stringifyXML: coreXml.stringifyXML,
+            }, userAgentOptions: {
+                userAgentPrefix: `azsdk-js-messaging-notificationhubs/${SDK_VERSION}`,
+            } }, options));
+        this.hubName = hubName;
+        const parsedConnection = parseNotificationHubsConnectionString(connectionString);
+        this.baseUrl = parsedConnection.endpoint;
+        this.sasTokenProvider = createTokenProviderFromConnection(parsedConnection.sharedAccessKey, parsedConnection.sharedAccessKeyName);
+    }
+    async createHeaders(operationName, rawHeaders) {
+        const authorization = await this.sasTokenProvider.getToken(this.baseUrl);
+        const headers = coreRestPipeline.createHttpHeaders(rawHeaders);
+        headers.set("Authorization", authorization.token);
+        headers.set("x-ms-version", API_VERSION);
+        headers.set("x-ms-azsdk-telemetry", `class=NotificationHubsServiceClient;method=${operationName}`);
+        return headers;
+    }
+    requestUrl() {
+        // Node doesn't allow change in protocol but browsers do, so doing a string replace
+        const url = new URL(this.baseUrl.replace("sb://", "https://"));
+        url.pathname = this.hubName;
+        url.searchParams.set("api-version", API_VERSION);
+        return url;
+    }
+}
+
 // Copyright (c) Microsoft Corporation.
 /**
  * This represents a client for Azure Notification Hubs to manage installations and send
  * messages to devices.
  */
-class NotificationHubsServiceClient {
+class NotificationHubsClient {
     /**
      * Creates a new instance of the NotificationClient with a connection string, hub name and options.
      * @param connectionString - The Notification Hub Access Policy connection string.
@@ -1787,12 +1935,21 @@ class NotificationHubsServiceClient {
     }
     /**
      * Gets all registrations for the notification hub with the given query options.
-     * @param options - The options for querying the registrations such as $top and $filter.
+     * @param options - The options for querying the registrations such as $top.
      * @returns A paged async iterable containing all of the registrations for the notification hub.
      */
     listRegistrations(options = {}) {
         return listRegistrations(this._client, options);
     }
+    /**
+     * Gets all registrations for the notification hub with the given device information and options.
+     * @param channel - The registration channel information to query per PNS type.
+     * @param options - The options for querying the registrations such as $top.
+     * @returns A paged async iterable containing all of the registrations for the notification hub.
+     */
+    listRegistrationsByChannel(channel, options = {}) {
+        return listRegistrationsByChannel(this._client, channel, options);
+    }
     /**
      * Lists all registrations with the matching tag.
      * @param tag - The tag to query for matching registrations.
@@ -1802,61 +1959,25 @@ class NotificationHubsServiceClient {
     listRegistrationsByTag(tag, options = {}) {
         return listRegistrationsByTag(this._client, tag, options);
     }
-    /**
-     * Sends a direct push notification to a device with the given push handle.
-     * @param pushHandle - The push handle which is the unique identifier for the device.
-     * @param notification - The notification to send to the device.
-     * @param options - The options for sending a direct notification.
-     * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
-     */
-    sendDirectNotification(pushHandle, notification, options = {}) {
-        return sendDirectNotification(this._client, pushHandle, notification, options);
-    }
     /**
      * Sends push notifications to devices that match the given tags or tag expression.
-     * @param tags - The tags used to target the device for push notifications in either an array or tag expression.
      * @param notification - The notification to send to the matching devices.
-     * @param options - Configuration options for the direct send operation which can contain custom headers
-     * which may include APNs specific such as apns-topic or for WNS, X-WNS-TYPE.
-     * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
-     */
-    sendNotification(tags, notification, options = {}) {
-        return sendNotification(this._client, tags, notification, options);
-    }
-    /**
-     * Sends push notifications to all devices on the Notification Hub.
-     * @param notification - The notification to send to all devices.
-     * @param options - Configuration options for the direct send operation which can contain custom headers
-     * which may include APNs specific such as apns-topic or for WNS, X-WNS-TYPE.
+     * @param options - Options for the notification including tags, device handles and whether to enable test send.
      * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
      */
-    sendBroadcastNotification(notification, options = {}) {
-        return sendBroadcastNotification(this._client, notification, options);
+    sendNotification(notification, options = { enableTestSend: false }) {
+        return sendNotification(this._client, notification, options);
     }
     /**
      * Schedules a push notification to devices that match the given tags or tag expression at the specified time.
      * NOTE: This is only available in Standard SKU Azure Notification Hubs.
      * @param scheduledTime - The Date to send the push notification.
-     * @param tags - The tags used to target the device for push notifications in either an array or tag expression.
      * @param notification - The notification to send to the matching devices.
-     * @param options - Configuration options for the direct send operation which can contain custom headers
-     * which may include APNs specific such as apns-topic or for WNS, X-WNS-TYPE.
+     * @param options - Options which include tags used to target the device for push notifications in either an array or tag expression.
      * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
      */
-    scheduleNotification(scheduledTime, tags, notification, options = {}) {
-        return scheduleNotification(this._client, scheduledTime, tags, notification, options);
-    }
-    /**
-     * Schedules a push notification to all devices registered on the Notification Hub.
-     * NOTE: This is only available in Standard SKU Azure Notification Hubs.
-     * @param scheduledTime - The Date to send the push notification.
-     * @param notification - The notification to send to the matching devices.
-     * @param options - Configuration options for the direct send operation which can contain custom headers
-     * which may include APNs specific such as apns-topic or for WNS, X-WNS-TYPE.
-     * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
-     */
-    scheduleBroadcastNotification(scheduledTime, notification, options = {}) {
-        return scheduleBroadcastNotification(this._client, scheduledTime, notification, options);
+    scheduleNotification(scheduledTime, notification, options = {}) {
+        return scheduleNotification(this._client, scheduledTime, notification, options);
     }
     /**
      * Cancels the scheduled notification with the given notification ID.
@@ -1895,6 +2016,15 @@ class NotificationHubsServiceClient {
     getNotificationHubJob(jobId, options = {}) {
         return getNotificationHubJob(this._client, jobId, options);
     }
+    /**
+     * Submits a Notification Hub job and creates a poller to poll for results.
+     * @param notificationHubJob - The Notification Hub import/export job to start.
+     * @param options - The operation options.
+     * @returns A poller which can be called to poll until completion of the job.
+     */
+    beginSubmitNotificationHubJob(notificationHubJob, options = {}) {
+        return beginSubmitNotificationHubJob(this._client, notificationHubJob, options);
+    }
     /**
      * Submits a Notification Hub Job.  Note this is available to Standard SKU namespace and above.
      * @param job - The notification hub job to submit.
@@ -2068,168 +2198,49 @@ function createWindowsRawNotification(notification) {
 }
 
 // Copyright (c) Microsoft Corporation.
-function createAppleNativeAlert(nativeAlert) {
-    if (!isDefined(nativeAlert)) {
-        return undefined;
-    }
-    if (isString(nativeAlert)) {
-        return nativeAlert;
-    }
-    const alert = {
-        title: nativeAlert.title,
-        subtitle: nativeAlert.subtitle,
-        body: nativeAlert.body,
-        "launch-image": nativeAlert.launchImage,
-        "title-loc-key": nativeAlert.titleLocKey,
-        "title-loc-args": nativeAlert.titleLocArgs,
-        "subtitle-loc-key": nativeAlert.subtitleLocKey,
-        "subtitle-loc-args": nativeAlert.subtitleLocArgs,
-        "loc-key": nativeAlert.locKey,
-        "loc-args": nativeAlert.locArgs,
-    };
-    return alert;
-}
 /**
  * Creates an APNs native message to send to Notification Hubs.
  * @param nativeMessage - The Apple native message properties to set.
  * @param additionalProperties - Additional properties for Apple messages.
  * @returns An AppleNotification to send to Notification Hubs.
  */
-function buildAppleNativeMessage(nativeMessage, additionalProperties) {
-    const headers = {};
-    const message = Object.assign({ aps: {
-            alert: createAppleNativeAlert(nativeMessage.alert),
-            sound: nativeMessage.sound,
-            badge: nativeMessage.badge,
-            "thread-id": nativeMessage.threadId,
-            category: nativeMessage.category,
-            "content-available": nativeMessage.contentAvailable,
-            "mutable-content": nativeMessage.mutableContent,
-            "target-content-id": nativeMessage.targetContentId,
-            "interruption-level": nativeMessage.interruptionLevel,
-            "relevance-score": nativeMessage.relevanceScore,
-            "filter-criteria": nativeMessage.filterCriteria,
-        } }, additionalProperties);
-    const apnsPriority = (nativeMessage === null || nativeMessage === void 0 ? void 0 : nativeMessage.contentAvailable) === 1 ? "5" : "10";
-    headers["apns-priority"] = apnsPriority;
-    return createAppleNotification({
-        body: JSON.stringify(message),
-        headers: headers,
-    });
-}
-function buildFcmLegacyNativePayload(nativeNotification) {
-    if (!isDefined(nativeNotification)) {
-        return undefined;
-    }
-    const androidMessage = nativeNotification;
-    const appleMessage = nativeNotification;
-    const notification = {
-        title: nativeNotification.title,
-        body: nativeNotification.body,
-        click_action: nativeNotification.clickAction,
-        // Apple/Android fields
-        sound: appleMessage.sound,
-        badge: appleMessage.badge,
-        subtitle: appleMessage.subtitle,
-        body_loc_key: appleMessage.bodyLocKey,
-        body_loc_args: appleMessage.bodyLocArgs,
-        title_loc_key: appleMessage.bodyLocKey,
-        title_loc_args: appleMessage.bodyLocArgs,
-        // Android/Web fields
-        android_channel_id: androidMessage.androidChannelId,
-        icon: androidMessage.icon,
-        tag: androidMessage.tag,
-        color: androidMessage.color,
-    };
-    return notification;
+function createAppleNotificationBody(nativeMessage) {
+    return JSON.stringify(nativeMessage);
 }
 /**
  * Creates a FcmLegacyNotification from a native Firebase payload.
  * @param nativeMessage - The native message payload to send to Notification Hubs.
- * @returns The FcmLegacyNotification to send to Notification Hubs.
- */
-function buildFirebaseLegacyNativeMessage(nativeMessage) {
-    const jsonMessage = {
-        to: nativeMessage.to,
-        registration_ids: nativeMessage.registrationIds,
-        condition: nativeMessage.condition,
-        collapse_key: nativeMessage.collapseKey,
-        priority: nativeMessage.priority,
-        content_available: nativeMessage.contentAvailable,
-        mutable_content: nativeMessage.mutableContent,
-        time_to_live: nativeMessage.timeToLive,
-        restricted_package_name: nativeMessage.restrictedPackageName,
-        dry_run: nativeMessage.dryRun,
-        data: nativeMessage.data,
-        notification: buildFcmLegacyNativePayload(nativeMessage.notification),
-    };
-    return createFcmLegacyNotification({
-        body: JSON.stringify(jsonMessage),
-    });
-}
-function buildAdmNativeNotification(nativeNotification) {
-    if (!isDefined(nativeNotification)) {
-        return undefined;
-    }
-    return {
-        title: nativeNotification.title,
-        body: nativeNotification.body,
-        icon: nativeNotification.icon,
-        color: nativeNotification.color,
-        sound: nativeNotification.sound,
-        tag: nativeNotification.tag,
-        click_action: nativeNotification.clickAction,
-        body_loc_key: nativeNotification.bodyLocKey,
-        body_loc_args: nativeNotification.bodyLocArgs,
-        title_loc_key: nativeNotification.titleLocKey,
-        title_loc_args: nativeNotification.titleLocArgs,
-        channel_id: nativeNotification.channelId,
-        ticker: nativeNotification.ticker,
-        sticky: nativeNotification.sticky,
-        event_time: nativeNotification.eventTime,
-        local_only: nativeNotification.localOnly,
-        notification_priority: nativeNotification.notificationPriority,
-        default_sound: nativeNotification.defaultSound,
-        visibility: nativeNotification.visibility,
-        notification_count: nativeNotification.notificationCount,
-        image: nativeNotification.image,
-    };
+ * @returns The JSON body to send to Notification Hubs.
+ */
+function createFirebaseLegacyNotificationBody(nativeMessage) {
+    return JSON.stringify(nativeMessage);
 }
 /**
  * Creates a AdmNotification from a native ADM payload.
  * @param nativeMessage - The native message payload to send to Notification Hubs.
  * @returns The AdmNotification to send to Notification Hubs.
  */
-function buildAdmNativeMessage(nativeMessage) {
-    const jsonObj = Object.assign({ notification: buildAdmNativeNotification(nativeMessage.notification), data: nativeMessage.data || {} }, nativeMessage);
-    return createAdmNotification({
-        body: JSON.stringify(jsonObj),
-    });
+function createAdmNotificationBody(nativeMessage) {
+    return JSON.stringify(nativeMessage);
 }
 /**
  * Creates a BaiduNotification from a native Baidu payload.
  * @param nativeMessage - The native message payload to send to Notification Hubs.
- * @param additionalProperties - Additional properties for Apple Baidu messages.
- * @returns The BaiduNotification to send to Notification Hubs.
+ * @returns The JSON body to send to Notification Hubs.
  */
-function buildBaiduNativeMessage(nativeMessage, additionalProperties) {
-    const jsonObj = Object.assign({ title: nativeMessage.title, description: nativeMessage.description, notification_builder_id: nativeMessage.notificationBuilderId, notification_basic_style: nativeMessage.notificationBasicStyle, open_type: nativeMessage.openType, net_support: nativeMessage.netSupport, user_confirm: nativeMessage.userConfirm, url: nativeMessage.url, pkg_content: nativeMessage.pkgContent, pkg_version: nativeMessage.pkgVersion, custom_content: nativeMessage.customContent, aps: nativeMessage.aps }, additionalProperties);
-    return createBaiduNotification({
-        body: JSON.stringify(jsonObj),
-    });
+function createBaiduNotificationBody(nativeMessage) {
+    return JSON.stringify(nativeMessage);
 }
 /**
  * Builds a WindowsNotification from a Windows Badge.
  * @param nativeMessage - The Windows Badge Message to build.
- * @returns A WindowsNotification created with the badge information.
+ * @returns The WNS XML created with the badge information.
  */
-function buildWindowsBadgeNativeMessage(nativeMessage) {
+function createWindowsBadgeNotificationBody(nativeMessage) {
     const badge = {
         $: { value: nativeMessage.value },
     };
-    return createWindowsBadgeNotification({
-        body: coreXml.stringifyXML(badge, { rootName: "badge" }),
-    });
+    return coreXml.stringifyXML(badge, { rootName: "badge" });
 }
 
 // Copyright (c) Microsoft Corporation.
@@ -2240,7 +2251,7 @@ function buildWindowsBadgeNativeMessage(nativeMessage) {
  * @returns A created ADM registration description.
  */
 function createAdmRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "Adm" });
+    return Object.assign(Object.assign({}, description), { kind: "Adm" });
 }
 /**
  * Creates an ADM template registration description.
@@ -2248,7 +2259,7 @@ function createAdmRegistrationDescription(description) {
  * @returns A created ADM template registration description.
  */
 function createAdmTemplateRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "AdmTemplate" });
+    return Object.assign(Object.assign({}, description), { kind: "AdmTemplate" });
 }
 /**
  * Creates an Apple registration description.
@@ -2256,7 +2267,7 @@ function createAdmTemplateRegistrationDescription(description) {
  * @returns A created Apple registration description.
  */
 function createAppleRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "Apple" });
+    return Object.assign(Object.assign({}, description), { kind: "Apple" });
 }
 /**
  * Creates an Apple template registration description.
@@ -2264,7 +2275,7 @@ function createAppleRegistrationDescription(description) {
  * @returns A created Apple template registration description.
  */
 function createAppleTemplateRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "AppleTemplate" });
+    return Object.assign(Object.assign({}, description), { kind: "AppleTemplate" });
 }
 /**
  * Creates a Baidu registration description.
@@ -2272,7 +2283,7 @@ function createAppleTemplateRegistrationDescription(description) {
  * @returns A created Baidu registration description.
  */
 function createBaiduRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "Baidu" });
+    return Object.assign(Object.assign({}, description), { kind: "Baidu" });
 }
 /**
  * Creates a Baidu template registration description.
@@ -2280,7 +2291,7 @@ function createBaiduRegistrationDescription(description) {
  * @returns A created Baidu template registration description.
  */
 function createBaiduTemplateRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "BaiduTemplate" });
+    return Object.assign(Object.assign({}, description), { kind: "BaiduTemplate" });
 }
 /**
  * Creates a Web Push registration description.
@@ -2288,7 +2299,7 @@ function createBaiduTemplateRegistrationDescription(description) {
  * @returns A created Web Push registration description.
  */
 function createBrowserRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "Browser" });
+    return Object.assign(Object.assign({}, description), { kind: "Browser" });
 }
 /**
  * Creates a Web Push registration description.
@@ -2296,7 +2307,7 @@ function createBrowserRegistrationDescription(description) {
  * @returns A created Web Push template registration description.
  */
 function createBrowserTemplateRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "BrowserTemplate" });
+    return Object.assign(Object.assign({}, description), { kind: "BrowserTemplate" });
 }
 /**
  * Creates a Firebase Legacy registration description.
@@ -2304,7 +2315,7 @@ function createBrowserTemplateRegistrationDescription(description) {
  * @returns A created GCM registration description.
  */
 function createFcmLegacyRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "Gcm" });
+    return Object.assign(Object.assign({}, description), { kind: "Gcm" });
 }
 /**
  * Creates a GCM template registration description.
@@ -2312,7 +2323,7 @@ function createFcmLegacyRegistrationDescription(description) {
  * @returns A created GCM template registration description.
  */
 function createFcmLegacyTemplateRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "GcmTemplate" });
+    return Object.assign(Object.assign({}, description), { kind: "GcmTemplate" });
 }
 /**
  * Creates a Windows registration description.
@@ -2320,7 +2331,7 @@ function createFcmLegacyTemplateRegistrationDescription(description) {
  * @returns A created Windows registration description.
  */
 function createWindowsRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "Windows" });
+    return Object.assign(Object.assign({}, description), { kind: "Windows" });
 }
 /**
  * Creates a Windows template registration description.
@@ -2328,25 +2339,34 @@ function createWindowsRegistrationDescription(description) {
  * @returns A created Windows template registration description.
  */
 function createWindowsTemplateRegistrationDescription(description) {
-    return Object.assign(Object.assign({}, description), { type: "WindowsTemplate" });
+    return Object.assign(Object.assign({}, description), { kind: "WindowsTemplate" });
+}
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+/**
+ * Creates a tag expression from a list of tags as a || expression.
+ * @param tags - The tags to create the || expression
+ * @returns The tag expression made from the array of strings into an || expression.
+ */
+function createTagExpression(tags) {
+    return tags.join("||");
 }
 
-exports.NotificationHubsServiceClient = NotificationHubsServiceClient;
-exports.buildAdmNativeMessage = buildAdmNativeMessage;
-exports.buildAppleNativeMessage = buildAppleNativeMessage;
-exports.buildBaiduNativeMessage = buildBaiduNativeMessage;
-exports.buildFirebaseLegacyNativeMessage = buildFirebaseLegacyNativeMessage;
-exports.buildWindowsBadgeNativeMessage = buildWindowsBadgeNativeMessage;
+exports.NotificationHubsClient = NotificationHubsClient;
 exports.createAdmInstallation = createAdmInstallation;
 exports.createAdmNotification = createAdmNotification;
+exports.createAdmNotificationBody = createAdmNotificationBody;
 exports.createAdmRegistrationDescription = createAdmRegistrationDescription;
 exports.createAdmTemplateRegistrationDescription = createAdmTemplateRegistrationDescription;
 exports.createAppleInstallation = createAppleInstallation;
 exports.createAppleNotification = createAppleNotification;
+exports.createAppleNotificationBody = createAppleNotificationBody;
 exports.createAppleRegistrationDescription = createAppleRegistrationDescription;
 exports.createAppleTemplateRegistrationDescription = createAppleTemplateRegistrationDescription;
 exports.createBaiduInstallation = createBaiduInstallation;
 exports.createBaiduNotification = createBaiduNotification;
+exports.createBaiduNotificationBody = createBaiduNotificationBody;
 exports.createBaiduRegistrationDescription = createBaiduRegistrationDescription;
 exports.createBaiduTemplateRegistrationDescription = createBaiduTemplateRegistrationDescription;
 exports.createBrowserInstallation = createBrowserInstallation;
@@ -2357,8 +2377,11 @@ exports.createFcmLegacyInstallation = createFcmLegacyInstallation;
 exports.createFcmLegacyNotification = createFcmLegacyNotification;
 exports.createFcmLegacyRegistrationDescription = createFcmLegacyRegistrationDescription;
 exports.createFcmLegacyTemplateRegistrationDescription = createFcmLegacyTemplateRegistrationDescription;
+exports.createFirebaseLegacyNotificationBody = createFirebaseLegacyNotificationBody;
+exports.createTagExpression = createTagExpression;
 exports.createTemplateNotification = createTemplateNotification;
 exports.createWindowsBadgeNotification = createWindowsBadgeNotification;
+exports.createWindowsBadgeNotificationBody = createWindowsBadgeNotificationBody;
 exports.createWindowsInstallation = createWindowsInstallation;
 exports.createWindowsRawNotification = createWindowsRawNotification;
 exports.createWindowsRegistrationDescription = createWindowsRegistrationDescription;