@azure/web-pubsub 1.0.1-alpha.20220401.1 → 1.1.0-alpha.20220407.2

package/dist-esm/src/generated/generatedClientContext.js

@@ -24,7 +24,7 @@ export class GeneratedClientContext extends coreClient.ServiceClient {
         const defaults = {
             requestContentType: "application/json; charset=utf-8"
         };
-        const packageDetails = `azsdk-js-web-pubsub/1.0.1`;
+        const packageDetails = `azsdk-js-web-pubsub/1.1.0`;
         const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix
             ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
             : `${packageDetails}`;

package/dist-esm/src/generated/generatedClientContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"generatedClientContext.js","sourceRoot":"","sources":["../../../src/generated/generatedClientContext.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAGjD,gBAAgB;AAChB,MAAM,OAAO,sBAAuB,SAAQ,UAAU,CAAC,aAAa;IAIlE;;;;OAIG;IACH,YAAY,QAAgB,EAAE,OAAuC;QACnE,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QAED,0CAA0C;QAC1C,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,GAAG,EAAE,CAAC;SACd;QACD,MAAM,QAAQ,GAAkC;YAC9C,kBAAkB,EAAE,iCAAiC;SACtD,CAAC;QAEF,MAAM,cAAc,GAAG,2BAA2B,CAAC;QACnD,MAAM,eAAe,GACnB,OAAO,CAAC,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC,eAAe;YAClE,CAAC,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,eAAe,IAAI,cAAc,EAAE;YACjE,CAAC,CAAC,GAAG,cAAc,EAAE,CAAC;QAE1B,MAAM,mBAAmB,iDACpB,QAAQ,GACR,OAAO,KACV,gBAAgB,EAAE;gBAChB,eAAe;aAChB,EACD,OAAO,EAAE,OAAO,CAAC,QAAQ,IAAI,YAAY,GAC1C,CAAC;QACF,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAC3B,wBAAwB;QACxB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,0CAA0C;QAC1C,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,YAAY,CAAC;IACvD,CAAC;CACF","sourcesContent":["/*\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n *\n * Code generated by Microsoft (R) AutoRest Code Generator.\n * Changes may cause incorrect behavior and will be lost if the code is regenerated.\n */\n\nimport * as coreClient from \"@azure/core-client\";\nimport { GeneratedClientOptionalParams } from \"./models\";\n\n/** @internal */\nexport class GeneratedClientContext extends coreClient.ServiceClient {\n  endpoint: string;\n  apiVersion: string;\n\n  /**\n   * Initializes a new instance of the GeneratedClientContext class.\n   * @param endpoint HTTP or HTTPS endpoint for the Web PubSub service instance.\n   * @param options The parameter options\n   */\n  constructor(endpoint: string, options?: GeneratedClientOptionalParams) {\n    if (endpoint === undefined) {\n      throw new Error(\"'endpoint' cannot be null\");\n    }\n\n    // Initializing default values for options\n    if (!options) {\n      options = {};\n    }\n    const defaults: GeneratedClientOptionalParams = {\n      requestContentType: \"application/json; charset=utf-8\"\n    };\n\n    const packageDetails = `azsdk-js-web-pubsub/1.0.1`;\n    const userAgentPrefix =\n      options.userAgentOptions && options.userAgentOptions.userAgentPrefix\n        ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`\n        : `${packageDetails}`;\n\n    const optionsWithDefaults = {\n      ...defaults,\n      ...options,\n      userAgentOptions: {\n        userAgentPrefix\n      },\n      baseUri: options.endpoint || \"{Endpoint}\"\n    };\n    super(optionsWithDefaults);\n    // Parameter assignments\n    this.endpoint = endpoint;\n\n    // Assigning values to Constant parameters\n    this.apiVersion = options.apiVersion || \"2021-10-01\";\n  }\n}\n"]}
+{"version":3,"file":"generatedClientContext.js","sourceRoot":"","sources":["../../../src/generated/generatedClientContext.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAGjD,gBAAgB;AAChB,MAAM,OAAO,sBAAuB,SAAQ,UAAU,CAAC,aAAa;IAIlE;;;;OAIG;IACH,YAAY,QAAgB,EAAE,OAAuC;QACnE,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QAED,0CAA0C;QAC1C,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,GAAG,EAAE,CAAC;SACd;QACD,MAAM,QAAQ,GAAkC;YAC9C,kBAAkB,EAAE,iCAAiC;SACtD,CAAC;QAEF,MAAM,cAAc,GAAG,2BAA2B,CAAC;QACnD,MAAM,eAAe,GACnB,OAAO,CAAC,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC,eAAe;YAClE,CAAC,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,eAAe,IAAI,cAAc,EAAE;YACjE,CAAC,CAAC,GAAG,cAAc,EAAE,CAAC;QAE1B,MAAM,mBAAmB,iDACpB,QAAQ,GACR,OAAO,KACV,gBAAgB,EAAE;gBAChB,eAAe;aAChB,EACD,OAAO,EAAE,OAAO,CAAC,QAAQ,IAAI,YAAY,GAC1C,CAAC;QACF,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAC3B,wBAAwB;QACxB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,0CAA0C;QAC1C,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,YAAY,CAAC;IACvD,CAAC;CACF","sourcesContent":["/*\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n *\n * Code generated by Microsoft (R) AutoRest Code Generator.\n * Changes may cause incorrect behavior and will be lost if the code is regenerated.\n */\n\nimport * as coreClient from \"@azure/core-client\";\nimport { GeneratedClientOptionalParams } from \"./models\";\n\n/** @internal */\nexport class GeneratedClientContext extends coreClient.ServiceClient {\n  endpoint: string;\n  apiVersion: string;\n\n  /**\n   * Initializes a new instance of the GeneratedClientContext class.\n   * @param endpoint HTTP or HTTPS endpoint for the Web PubSub service instance.\n   * @param options The parameter options\n   */\n  constructor(endpoint: string, options?: GeneratedClientOptionalParams) {\n    if (endpoint === undefined) {\n      throw new Error(\"'endpoint' cannot be null\");\n    }\n\n    // Initializing default values for options\n    if (!options) {\n      options = {};\n    }\n    const defaults: GeneratedClientOptionalParams = {\n      requestContentType: \"application/json; charset=utf-8\"\n    };\n\n    const packageDetails = `azsdk-js-web-pubsub/1.1.0`;\n    const userAgentPrefix =\n      options.userAgentOptions && options.userAgentOptions.userAgentPrefix\n        ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`\n        : `${packageDetails}`;\n\n    const optionsWithDefaults = {\n      ...defaults,\n      ...options,\n      userAgentOptions: {\n        userAgentPrefix\n      },\n      baseUri: options.endpoint || \"{Endpoint}\"\n    };\n    super(optionsWithDefaults);\n    // Parameter assignments\n    this.endpoint = endpoint;\n\n    // Assigning values to Constant parameters\n    this.apiVersion = options.apiVersion || \"2021-10-01\";\n  }\n}\n"]}

package/dist-esm/src/groupClient.js

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 import { RestError } from "@azure/core-rest-pipeline";
-import { createSpan } from "./tracing";
+import { tracingClient } from "./tracing";
 import { getPayloadForMessage } from "./utils";
 /**
  * @hidden
@@ -26,15 +26,14 @@ export class WebPubSubGroupImpl {
      * @param options - Additional options
      */
     async addConnection(connectionId, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-group-addConnection", options);
         let response;
         function onResponse(rawResponse, flatResponse) {
             response = rawResponse;
-            if (updatedOptions.onResponse) {
-                updatedOptions.onResponse(rawResponse, flatResponse);
+            if (options.onResponse) {
+                options.onResponse(rawResponse, flatResponse);
             }
         }
-        try {
+        return tracingClient.withSpan("WebPubSubGroupClient.addConnection", options, async (updatedOptions) => {
             await this.client.webPubSub.addConnectionToGroup(this.hubName, this.groupName, connectionId, Object.assign(Object.assign({}, updatedOptions), { onResponse }));
             if (response.status === 404) {
                 throw new RestError(`Connection id '${connectionId}' doesn't exist`, {
@@ -43,10 +42,7 @@ export class WebPubSubGroupImpl {
                     response: response,
                 });
             }
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Remove a specific connection from this group
@@ -55,13 +51,9 @@ export class WebPubSubGroupImpl {
      * @param options - Additional options
      */
     async removeConnection(connectionId, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-group-removeConnection", options);
-        try {
-            await this.client.webPubSub.removeConnectionFromGroup(this.hubName, this.groupName, connectionId, updatedOptions);
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("WebPubSubGroupClient.removeConnection", options, (updatedOptions) => {
+            return this.client.webPubSub.removeConnectionFromGroup(this.hubName, this.groupName, connectionId, updatedOptions);
+        });
     }
     /**
      * Close all connections to this group
@@ -69,13 +61,9 @@ export class WebPubSubGroupImpl {
      * @param options - Additional options
      */
     async closeAllConnections(options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-group-closeAllConnections", options);
-        try {
-            return await this.client.webPubSub.closeGroupConnections(this.hubName, this.groupName, updatedOptions);
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("WebPubSubGroupClient.closeAllConnections", options, (updatedOptions) => {
+            return this.client.webPubSub.closeGroupConnections(this.hubName, this.groupName, updatedOptions);
+        });
     }
     /**
      * Add a user to this group
@@ -84,13 +72,9 @@ export class WebPubSubGroupImpl {
      * @param options - Additional options
      */
     async addUser(username, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-group-addUser", options);
-        try {
-            await this.client.webPubSub.addUserToGroup(this.hubName, this.groupName, username, updatedOptions);
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("WebPubSubGroupClient.addUser", options, (updatedOptions) => {
+            return this.client.webPubSub.addUserToGroup(this.hubName, this.groupName, username, updatedOptions);
+        });
     }
     /**
      * Remove a user from this group
@@ -99,23 +83,15 @@ export class WebPubSubGroupImpl {
      * @param options - Additional options
      */
     async removeUser(username, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-group-removeUser", options);
-        try {
-            await this.client.webPubSub.removeUserFromGroup(this.hubName, this.groupName, username, updatedOptions);
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("WebPubSubGroupClient.removeUser", options, (updatedOptions) => {
+            return this.client.webPubSub.removeUserFromGroup(this.hubName, this.groupName, username, updatedOptions);
+        });
     }
     async sendToAll(message, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-group-sendToAll", options);
-        const { contentType, payload } = getPayloadForMessage(message, updatedOptions);
-        try {
-            await this.client.webPubSub.sendToGroup(this.hubName, this.groupName, contentType, payload, updatedOptions);
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("WebPubSubGroupClient.sendToAll", options, (updatedOptions) => {
+            const { contentType, payload } = getPayloadForMessage(message, updatedOptions);
+            return this.client.webPubSub.sendToGroup(this.hubName, this.groupName, contentType, payload, updatedOptions);
+        });
     }
 }
 //# sourceMappingURL=groupClient.js.map

package/dist-esm/src/groupClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"groupClient.js","sourceRoot":"","sources":["../../src/groupClient.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT license.\n\nimport { CommonClientOptions, FullOperationResponse, OperationOptions } from \"@azure/core-client\";\nimport { RestError, RequestBodyType } from \"@azure/core-rest-pipeline\";\nimport { GeneratedClient } from \"./generated/generatedClient\";\nimport { createSpan } from \"./tracing\";\nimport { getPayloadForMessage } from \"./utils\";\nimport { JSONTypes } from \"./hubClient\";\n\n/**\n * Options for constructing a GroupAdmin client.\n */\nexport interface GroupAdminClientOptions extends CommonClientOptions {}\n\n/**\n * Options for adding a connection to a group.\n */\nexport interface GroupAddConnectionOptions extends OperationOptions {}\n\n/**\n * Options for adding a user to a group.\n */\nexport interface GroupAddUserOptions extends OperationOptions {}\n\n/**\n * Options for checking if a user is in a group\n */\nexport interface GroupHasUserOptions extends OperationOptions {}\n\n/**\n * Options for removing a user from a group\n */\nexport interface GroupRemoveUserOptions extends OperationOptions {}\n\n/**\n * Options for removing a connection from a group\n */\nexport interface GroupRemoveConnectionOptions extends OperationOptions {}\n\n/**\n * Options for sending messages to a group.\n */\nexport interface GroupSendToAllOptions extends OperationOptions {\n  /**\n   * Connection ids to exclude from receiving this message.\n   */\n  excludedConnections?: string[];\n}\n\n/**\n * Options for sending text messages to a group..\n */\nexport interface GroupSendTextToAllOptions extends OperationOptions {\n  /**\n   * Connection ids to exclude from receiving this message.\n   */\n  excludedConnections?: string[];\n  contentType: \"text/plain\";\n}\n\n/**\n * Options for closing all connections to a group.\n */\nexport interface GroupCloseAllConnectionsOptions extends OperationOptions {\n  /**\n   * Reason the connection is being closed.\n   */\n  reason?: string;\n}\n\nexport interface WebPubSubGroup {\n  /**\n   * The name of this group\n   */\n  readonly groupName: string;\n\n  /**\n   * The name of the hub this group belongs to\n   */\n  readonly hubName: string;\n\n  /**\n   * The Web PubSub API version being used by this client\n   */\n  readonly apiVersion: string;\n\n  /**\n   * The Web PubSub endpoint this client is connected to\n   */\n  readonly endpoint: string;\n\n  /**\n   * Add a specific connection to this group\n   *\n   * @param connectionId - The connection id to add to this group\n   * @param options - Additional options\n   */\n  addConnection(connectionId: string, options?: GroupAddConnectionOptions): Promise<void>;\n\n  /**\n   * Remove a specific connection from this group\n   *\n   * @param connectionId - The connection id to remove from this group\n   * @param options - Additional options\n   */\n  removeConnection(connectionId: string, options?: GroupRemoveConnectionOptions): Promise<void>;\n\n  /**\n   * Close all connections to the group\n   *\n   * @param options - Additional options\n   */\n  closeAllConnections(options?: GroupCloseAllConnectionsOptions): Promise<void>;\n\n  /**\n   * Add a user to this group\n   *\n   * @param username - The user name to add\n   * @param options - Additional options\n   */\n  addUser(username: string, options?: GroupAddUserOptions): Promise<void>;\n\n  /**\n   * Remove a user from this group\n   *\n   * @param username - The user name to remove\n   * @param options - Additional options\n   */\n  removeUser(username: string, options?: GroupRemoveUserOptions): Promise<void>;\n\n  /**\n   * Send a text message to every connection in this group\n   *\n   * @param message - The message to send\n   * @param options - Additional options\n   */\n  sendToAll(message: string, options: GroupSendTextToAllOptions): Promise<void>;\n  /**\n   * Send a json message to every connection in this group\n   *\n   * @param message - The message to send\n   * @param options - Additional options\n   */\n  sendToAll(message: JSONTypes, options?: GroupSendToAllOptions): Promise<void>;\n  /**\n   * Send a binary message to every connection in this group\n   *\n   * @param message - The binary message to send\n   * @param options - Additional options\n   */\n  sendToAll(message: RequestBodyType, options?: GroupSendToAllOptions): Promise<void>;\n}\n\n/**\n * @hidden\n */\nexport class WebPubSubGroupImpl implements WebPubSubGroup {\n  private client!: GeneratedClient;\n\n  /**\n   * The name of this group\n   */\n  public readonly groupName: string;\n\n  /**\n   * The name of the hub this group belongs to\n   */\n  public readonly hubName: string;\n\n  /**\n   * The Web PubSub API version being used by this client\n   */\n  public readonly apiVersion: string = \"2020-10-01\";\n\n  /**\n   * The Web PubSub endpoint this client is connected to\n   */\n  public endpoint!: string;\n\n  /**\n   * @internal\n   */\n  constructor(client: GeneratedClient, hubName: string, groupName: string) {\n    this.client = client;\n    this.groupName = groupName;\n    this.hubName = hubName;\n  }\n  /**\n   * Add a specific connection to this group\n   *\n   * @param connectionId - The connection id to add to this group\n   * @param options - Additional options\n   */\n  public async addConnection(\n    connectionId: string,\n    options: GroupAddConnectionOptions = {}\n  ): Promise<void> {\n    const { span, updatedOptions } = createSpan(\n      \"WebPubSubServiceClient-group-addConnection\",\n      options\n    );\n\n    let response: FullOperationResponse | undefined;\n    function onResponse(rawResponse: FullOperationResponse, flatResponse: unknown): void {\n      response = rawResponse;\n      if (updatedOptions.onResponse) {\n        updatedOptions.onResponse(rawResponse, flatResponse);\n      }\n    }\n\n    try {\n      await this.client.webPubSub.addConnectionToGroup(this.hubName, this.groupName, connectionId, {\n        ...updatedOptions,\n        onResponse,\n      });\n\n      if (response!.status === 404) {\n        throw new RestError(`Connection id '${connectionId}' doesn't exist`, {\n          statusCode: response?.status,\n          request: response?.request,\n          response: response,\n        });\n      }\n    } finally {\n      span.end();\n    }\n  }\n\n  /**\n   * Remove a specific connection from this group\n   *\n   * @param connectionId - The connection id to remove from this group\n   * @param options - Additional options\n   */\n  public async removeConnection(\n    connectionId: string,\n    options: GroupRemoveConnectionOptions = {}\n  ): Promise<void> {\n    const { span, updatedOptions } = createSpan(\n      \"WebPubSubServiceClient-group-removeConnection\",\n      options\n    );\n\n    try {\n      await this.client.webPubSub.removeConnectionFromGroup(\n        this.hubName,\n        this.groupName,\n        connectionId,\n        updatedOptions\n      );\n    } finally {\n      span.end();\n    }\n  }\n\n  /**\n   * Close all connections to this group\n   *\n   * @param options - Additional options\n   */\n  public async closeAllConnections(options: GroupCloseAllConnectionsOptions = {}): Promise<void> {\n    const { span, updatedOptions } = createSpan(\n      \"WebPubSubServiceClient-group-closeAllConnections\",\n      options\n    );\n\n    try {\n      return await this.client.webPubSub.closeGroupConnections(\n        this.hubName,\n        this.groupName,\n        updatedOptions\n      );\n    } finally {\n      span.end();\n    }\n  }\n  /**\n   * Add a user to this group\n   *\n   * @param username - The user name to add\n   * @param options - Additional options\n   */\n  public async addUser(username: string, options: GroupAddUserOptions = {}): Promise<void> {\n    const { span, updatedOptions } = createSpan(\"WebPubSubServiceClient-group-addUser\", options);\n\n    try {\n      await this.client.webPubSub.addUserToGroup(\n        this.hubName,\n        this.groupName,\n        username,\n        updatedOptions\n      );\n    } finally {\n      span.end();\n    }\n  }\n\n  /**\n   * Remove a user from this group\n   *\n   * @param username - The user name to remove\n   * @param options - Additional options\n   */\n  public async removeUser(username: string, options: GroupRemoveUserOptions = {}): Promise<void> {\n    const { span, updatedOptions } = createSpan(\"WebPubSubServiceClient-group-removeUser\", options);\n\n    try {\n      await this.client.webPubSub.removeUserFromGroup(\n        this.hubName,\n        this.groupName,\n        username,\n        updatedOptions\n      );\n    } finally {\n      span.end();\n    }\n  }\n\n  /**\n   * Send a text message to every connection in this group\n   *\n   * @param message - The message to send\n   * @param options - Additional options\n   */\n  public async sendToAll(message: string, options: GroupSendTextToAllOptions): Promise<void>;\n  /**\n   * Send a json message to every connection in this group\n   *\n   * @param message - The message to send\n   * @param options - Additional options\n   */\n  public async sendToAll(message: JSONTypes, options?: GroupSendToAllOptions): Promise<void>;\n  /**\n   * Send a binary message to every connection in this group\n   *\n   * @param message - The binary message to send\n   * @param options - Additional options\n   */\n  public async sendToAll(message: RequestBodyType, options?: GroupSendToAllOptions): Promise<void>;\n\n  public async sendToAll(\n    message: JSONTypes | RequestBodyType,\n    options: GroupSendToAllOptions | GroupSendTextToAllOptions = {}\n  ): Promise<void> {\n    const { span, updatedOptions } = createSpan(\"WebPubSubServiceClient-group-sendToAll\", options);\n\n    const { contentType, payload } = getPayloadForMessage(message, updatedOptions);\n\n    try {\n      await this.client.webPubSub.sendToGroup(\n        this.hubName,\n        this.groupName,\n        contentType,\n        payload as any,\n        updatedOptions\n      );\n    } finally {\n      span.end();\n    }\n  }\n}\n"]}
+{"version":3,"file":"groupClient.js","sourceRoot":"","sources":["../../src/groupClient.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT license.\n\nimport { CommonClientOptions, FullOperationResponse, OperationOptions } from \"@azure/core-client\";\nimport { RestError, RequestBodyType } from \"@azure/core-rest-pipeline\";\nimport { GeneratedClient } from \"./generated/generatedClient\";\nimport { tracingClient } from \"./tracing\";\nimport { getPayloadForMessage } from \"./utils\";\nimport { JSONTypes } from \"./hubClient\";\n\n/**\n * Options for constructing a GroupAdmin client.\n */\nexport interface GroupAdminClientOptions extends CommonClientOptions {}\n\n/**\n * Options for adding a connection to a group.\n */\nexport interface GroupAddConnectionOptions extends OperationOptions {}\n\n/**\n * Options for adding a user to a group.\n */\nexport interface GroupAddUserOptions extends OperationOptions {}\n\n/**\n * Options for checking if a user is in a group\n */\nexport interface GroupHasUserOptions extends OperationOptions {}\n\n/**\n * Options for removing a user from a group\n */\nexport interface GroupRemoveUserOptions extends OperationOptions {}\n\n/**\n * Options for removing a connection from a group\n */\nexport interface GroupRemoveConnectionOptions extends OperationOptions {}\n\n/**\n * Options for sending messages to a group.\n */\nexport interface GroupSendToAllOptions extends OperationOptions {\n  /**\n   * Connection ids to exclude from receiving this message.\n   */\n  excludedConnections?: string[];\n}\n\n/**\n * Options for sending text messages to a group..\n */\nexport interface GroupSendTextToAllOptions extends OperationOptions {\n  /**\n   * Connection ids to exclude from receiving this message.\n   */\n  excludedConnections?: string[];\n  contentType: \"text/plain\";\n}\n\n/**\n * Options for closing all connections to a group.\n */\nexport interface GroupCloseAllConnectionsOptions extends OperationOptions {\n  /**\n   * Reason the connection is being closed.\n   */\n  reason?: string;\n}\n\nexport interface WebPubSubGroup {\n  /**\n   * The name of this group\n   */\n  readonly groupName: string;\n\n  /**\n   * The name of the hub this group belongs to\n   */\n  readonly hubName: string;\n\n  /**\n   * The Web PubSub API version being used by this client\n   */\n  readonly apiVersion: string;\n\n  /**\n   * The Web PubSub endpoint this client is connected to\n   */\n  readonly endpoint: string;\n\n  /**\n   * Add a specific connection to this group\n   *\n   * @param connectionId - The connection id to add to this group\n   * @param options - Additional options\n   */\n  addConnection(connectionId: string, options?: GroupAddConnectionOptions): Promise<void>;\n\n  /**\n   * Remove a specific connection from this group\n   *\n   * @param connectionId - The connection id to remove from this group\n   * @param options - Additional options\n   */\n  removeConnection(connectionId: string, options?: GroupRemoveConnectionOptions): Promise<void>;\n\n  /**\n   * Close all connections to the group\n   *\n   * @param options - Additional options\n   */\n  closeAllConnections(options?: GroupCloseAllConnectionsOptions): Promise<void>;\n\n  /**\n   * Add a user to this group\n   *\n   * @param username - The user name to add\n   * @param options - Additional options\n   */\n  addUser(username: string, options?: GroupAddUserOptions): Promise<void>;\n\n  /**\n   * Remove a user from this group\n   *\n   * @param username - The user name to remove\n   * @param options - Additional options\n   */\n  removeUser(username: string, options?: GroupRemoveUserOptions): Promise<void>;\n\n  /**\n   * Send a text message to every connection in this group\n   *\n   * @param message - The message to send\n   * @param options - Additional options\n   */\n  sendToAll(message: string, options: GroupSendTextToAllOptions): Promise<void>;\n  /**\n   * Send a json message to every connection in this group\n   *\n   * @param message - The message to send\n   * @param options - Additional options\n   */\n  sendToAll(message: JSONTypes, options?: GroupSendToAllOptions): Promise<void>;\n  /**\n   * Send a binary message to every connection in this group\n   *\n   * @param message - The binary message to send\n   * @param options - Additional options\n   */\n  sendToAll(message: RequestBodyType, options?: GroupSendToAllOptions): Promise<void>;\n}\n\n/**\n * @hidden\n */\nexport class WebPubSubGroupImpl implements WebPubSubGroup {\n  private client!: GeneratedClient;\n\n  /**\n   * The name of this group\n   */\n  public readonly groupName: string;\n\n  /**\n   * The name of the hub this group belongs to\n   */\n  public readonly hubName: string;\n\n  /**\n   * The Web PubSub API version being used by this client\n   */\n  public readonly apiVersion: string = \"2020-10-01\";\n\n  /**\n   * The Web PubSub endpoint this client is connected to\n   */\n  public endpoint!: string;\n\n  /**\n   * @internal\n   */\n  constructor(client: GeneratedClient, hubName: string, groupName: string) {\n    this.client = client;\n    this.groupName = groupName;\n    this.hubName = hubName;\n  }\n  /**\n   * Add a specific connection to this group\n   *\n   * @param connectionId - The connection id to add to this group\n   * @param options - Additional options\n   */\n  public async addConnection(\n    connectionId: string,\n    options: GroupAddConnectionOptions = {}\n  ): Promise<void> {\n    let response: FullOperationResponse | undefined;\n    function onResponse(rawResponse: FullOperationResponse, flatResponse: unknown): void {\n      response = rawResponse;\n      if (options.onResponse) {\n        options.onResponse(rawResponse, flatResponse);\n      }\n    }\n\n    return tracingClient.withSpan(\n      \"WebPubSubGroupClient.addConnection\",\n      options,\n      async (updatedOptions) => {\n        await this.client.webPubSub.addConnectionToGroup(\n          this.hubName,\n          this.groupName,\n          connectionId,\n          {\n            ...updatedOptions,\n            onResponse,\n          }\n        );\n\n        if (response!.status === 404) {\n          throw new RestError(`Connection id '${connectionId}' doesn't exist`, {\n            statusCode: response?.status,\n            request: response?.request,\n            response: response,\n          });\n        }\n      }\n    );\n  }\n\n  /**\n   * Remove a specific connection from this group\n   *\n   * @param connectionId - The connection id to remove from this group\n   * @param options - Additional options\n   */\n  public async removeConnection(\n    connectionId: string,\n    options: GroupRemoveConnectionOptions = {}\n  ): Promise<void> {\n    return tracingClient.withSpan(\n      \"WebPubSubGroupClient.removeConnection\",\n      options,\n      (updatedOptions) => {\n        return this.client.webPubSub.removeConnectionFromGroup(\n          this.hubName,\n          this.groupName,\n          connectionId,\n          updatedOptions\n        );\n      }\n    );\n  }\n\n  /**\n   * Close all connections to this group\n   *\n   * @param options - Additional options\n   */\n  public async closeAllConnections(options: GroupCloseAllConnectionsOptions = {}): Promise<void> {\n    return tracingClient.withSpan(\n      \"WebPubSubGroupClient.closeAllConnections\",\n      options,\n      (updatedOptions) => {\n        return this.client.webPubSub.closeGroupConnections(\n          this.hubName,\n          this.groupName,\n          updatedOptions\n        );\n      }\n    );\n  }\n  /**\n   * Add a user to this group\n   *\n   * @param username - The user name to add\n   * @param options - Additional options\n   */\n  public async addUser(username: string, options: GroupAddUserOptions = {}): Promise<void> {\n    return tracingClient.withSpan(\"WebPubSubGroupClient.addUser\", options, (updatedOptions) => {\n      return this.client.webPubSub.addUserToGroup(\n        this.hubName,\n        this.groupName,\n        username,\n        updatedOptions\n      );\n    });\n  }\n\n  /**\n   * Remove a user from this group\n   *\n   * @param username - The user name to remove\n   * @param options - Additional options\n   */\n  public async removeUser(username: string, options: GroupRemoveUserOptions = {}): Promise<void> {\n    return tracingClient.withSpan(\"WebPubSubGroupClient.removeUser\", options, (updatedOptions) => {\n      return this.client.webPubSub.removeUserFromGroup(\n        this.hubName,\n        this.groupName,\n        username,\n        updatedOptions\n      );\n    });\n  }\n\n  /**\n   * Send a text message to every connection in this group\n   *\n   * @param message - The message to send\n   * @param options - Additional options\n   */\n  public async sendToAll(message: string, options: GroupSendTextToAllOptions): Promise<void>;\n  /**\n   * Send a json message to every connection in this group\n   *\n   * @param message - The message to send\n   * @param options - Additional options\n   */\n  public async sendToAll(message: JSONTypes, options?: GroupSendToAllOptions): Promise<void>;\n  /**\n   * Send a binary message to every connection in this group\n   *\n   * @param message - The binary message to send\n   * @param options - Additional options\n   */\n  public async sendToAll(message: RequestBodyType, options?: GroupSendToAllOptions): Promise<void>;\n\n  public async sendToAll(\n    message: JSONTypes | RequestBodyType,\n    options: GroupSendToAllOptions | GroupSendTextToAllOptions = {}\n  ): Promise<void> {\n    return tracingClient.withSpan(\"WebPubSubGroupClient.sendToAll\", options, (updatedOptions) => {\n      const { contentType, payload } = getPayloadForMessage(message, updatedOptions);\n      return this.client.webPubSub.sendToGroup(\n        this.hubName,\n        this.groupName,\n        contentType,\n        payload as any,\n        updatedOptions\n      );\n    });\n  }\n}\n"]}

package/dist-esm/src/hubClient.js

@@ -5,7 +5,7 @@ import { GeneratedClient } from "./generated/generatedClient";
 import { WebPubSubGroupImpl } from "./groupClient";
 import { isTokenCredential } from "@azure/core-auth";
 import { webPubSubKeyCredentialPolicy } from "./webPubSubCredentialPolicy";
-import { createSpan } from "./tracing";
+import { tracingClient } from "./tracing";
 import { logger } from "./logger";
 import { parseConnectionString } from "./parseConnectionString";
 import jwt from "jsonwebtoken";
@@ -62,34 +62,22 @@ export class WebPubSubServiceClient {
         return new WebPubSubGroupImpl(this.client, this.hubName, groupName);
     }
     async sendToAll(message, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-hub-sendToAll", options);
-        const { contentType, payload } = getPayloadForMessage(message, updatedOptions);
-        try {
-            return await this.client.webPubSub.sendToAll(this.hubName, contentType, payload, updatedOptions);
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("WebPubSubServiceClient.sendToAll", options, (updatedOptions) => {
+            const { contentType, payload } = getPayloadForMessage(message, updatedOptions);
+            return this.client.webPubSub.sendToAll(this.hubName, contentType, payload, updatedOptions);
+        });
     }
     async sendToUser(username, message, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-hub-sendToUser", options);
-        const { contentType, payload } = getPayloadForMessage(message, updatedOptions);
-        try {
-            return await this.client.webPubSub.sendToUser(this.hubName, username, contentType, payload, updatedOptions);
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("WebPubSubServiceClient.sendToUser", options, (updatedOptions) => {
+            const { contentType, payload } = getPayloadForMessage(message, updatedOptions);
+            return this.client.webPubSub.sendToUser(this.hubName, username, contentType, payload, updatedOptions);
+        });
     }
     async sendToConnection(connectionId, message, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-hub-sendToConnection", options);
-        const { contentType, payload } = getPayloadForMessage(message, updatedOptions);
-        try {
-            return await this.client.webPubSub.sendToConnection(this.hubName, connectionId, contentType, payload, updatedOptions);
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("WebPubSubServiceClient.sendToConnection", options, (updatedOptions) => {
+            const { contentType, payload } = getPayloadForMessage(message, updatedOptions);
+            return this.client.webPubSub.sendToConnection(this.hubName, connectionId, contentType, payload, updatedOptions);
+        });
     }
     /**
      * Check if a specific connection is connected to this hub
@@ -98,15 +86,14 @@ export class WebPubSubServiceClient {
      * @param options - Additional options
      */
     async connectionExists(connectionId, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-hub-hasConnection", options);
         let response;
         function onResponse(rawResponse, flatResponse) {
             response = rawResponse;
-            if (updatedOptions.onResponse) {
-                updatedOptions.onResponse(rawResponse, flatResponse);
+            if (options.onResponse) {
+                options.onResponse(rawResponse, flatResponse);
             }
         }
-        try {
+        return tracingClient.withSpan("WebPubSubServiceClient.connectionExists", options, async (updatedOptions) => {
             await this.client.webPubSub.connectionExists(this.hubName, connectionId, Object.assign(Object.assign({}, updatedOptions), { onResponse }));
             if (response.status === 200) {
                 return true;
@@ -122,10 +109,7 @@ export class WebPubSubServiceClient {
                     response: response,
                 });
             }
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Close a specific connection to this hub
@@ -134,13 +118,9 @@ export class WebPubSubServiceClient {
      * @param options - Additional options
      */
     async closeConnection(connectionId, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-hub-closeConnection", options);
-        try {
-            return await this.client.webPubSub.closeConnection(this.hubName, connectionId, updatedOptions);
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("WebPubSubServiceClient.closeConnection", options, (updatedOptions) => {
+            return this.client.webPubSub.closeConnection(this.hubName, connectionId, updatedOptions);
+        });
     }
     /**
      * Close all connections to this hub
@@ -148,13 +128,9 @@ export class WebPubSubServiceClient {
      * @param options - Additional options
      */
     async closeAllConnections(options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-hub-closeAllConnections", options);
-        try {
-            return await this.client.webPubSub.closeAllConnections(this.hubName, updatedOptions);
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("WebPubSubServiceClient.closeAllConnections", options, (updatedOptions) => {
+            return this.client.webPubSub.closeAllConnections(this.hubName, updatedOptions);
+        });
     }
     /**
      * Close all connections with the given user id
@@ -163,13 +139,9 @@ export class WebPubSubServiceClient {
      * @param options - Additional options
      */
     async closeUserConnections(userId, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-hub-closeUserConnections", options);
-        try {
-            return await this.client.webPubSub.closeUserConnections(this.hubName, userId, updatedOptions);
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("WebPubSubServiceClient.closeUserConnections", options, (updatedOptions) => {
+            return this.client.webPubSub.closeUserConnections(this.hubName, userId, updatedOptions);
+        });
     }
     /**
      * Remove a specific user from all groups they are joined to
@@ -177,13 +149,9 @@ export class WebPubSubServiceClient {
      * @param options - Additional options
      */
     async removeUserFromAllGroups(userId, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-hub-removeUserFromAllGroups", options);
-        try {
-            await this.client.webPubSub.removeUserFromAllGroups(this.hubName, userId, updatedOptions);
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("WebPubSubServiceClient.removeUserFromAllGroups", options, (updatedOptions) => {
+            return this.client.webPubSub.removeUserFromAllGroups(this.hubName, userId, updatedOptions);
+        });
     }
     /**
      * Check if a particular group exists (i.e. has active connections).
@@ -192,15 +160,14 @@ export class WebPubSubServiceClient {
      * @param options - Additional options
      */
     async groupExists(groupName, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-hub-hasGroup", options);
         let response;
         function onResponse(rawResponse, flatResponse) {
             response = rawResponse;
-            if (updatedOptions.onResponse) {
-                updatedOptions.onResponse(rawResponse, flatResponse);
+            if (options.onResponse) {
+                options.onResponse(rawResponse, flatResponse);
             }
         }
-        try {
+        return tracingClient.withSpan("WebPubSubServiceClient.groupExists", options, async (updatedOptions) => {
             await this.client.webPubSub.groupExists(this.hubName, groupName, Object.assign(Object.assign({}, updatedOptions), { onResponse }));
             if (response.status === 200) {
                 return true;
@@ -215,10 +182,7 @@ export class WebPubSubServiceClient {
                     response: response,
                 });
             }
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Check if a particular user is connected to this hub.
@@ -227,15 +191,14 @@ export class WebPubSubServiceClient {
      * @param options - Additional options
      */
     async userExists(username, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-hub-hasUser", options);
         let response;
         function onResponse(rawResponse, flatResponse) {
             response = rawResponse;
-            if (updatedOptions.onResponse) {
-                updatedOptions.onResponse(rawResponse, flatResponse);
+            if (options.onResponse) {
+                options.onResponse(rawResponse, flatResponse);
             }
         }
-        try {
+        return tracingClient.withSpan("WebPubSubServiceClient.userExists", options, async (updatedOptions) => {
             await this.client.webPubSub.userExists(this.hubName, username, Object.assign(Object.assign({}, updatedOptions), { onResponse }));
             if (response.status === 200) {
                 return true;
@@ -251,10 +214,7 @@ export class WebPubSubServiceClient {
                     response: response,
                 });
             }
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Grant permissions to a connection
@@ -264,13 +224,9 @@ export class WebPubSubServiceClient {
      * @param options - Additional options
      */
     async grantPermission(connectionId, permission, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-hub-grantPermission", options);
-        try {
-            return await this.client.webPubSub.grantPermission(this.hubName, permission, connectionId, updatedOptions);
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("WebPubSubServiceClient.grantPermission", options, (updatedOptions) => {
+            return this.client.webPubSub.grantPermission(this.hubName, permission, connectionId, updatedOptions);
+        });
     }
     /**
      * Revoke permissions from a connection
@@ -280,13 +236,9 @@ export class WebPubSubServiceClient {
      * @param options - Additional options
      */
     async revokePermission(connectionId, permission, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-hub-revokePermission", options);
-        try {
-            return await this.client.webPubSub.revokePermission(this.hubName, permission, connectionId, updatedOptions);
-        }
-        finally {
-            span.end();
-        }
+        return tracingClient.withSpan("WebPubSubServiceClient.revokePermission", options, (updatedOptions) => {
+            return this.client.webPubSub.revokePermission(this.hubName, permission, connectionId, updatedOptions);
+        });
     }
     /**
      * Check if the connection has the specified permission
@@ -296,15 +248,14 @@ export class WebPubSubServiceClient {
      * @param options - Additional options
      */
     async hasPermission(connectionId, permission, options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-hub-hasPermission", options);
         let response;
         function onResponse(rawResponse, flatResponse) {
             response = rawResponse;
-            if (updatedOptions.onResponse) {
-                updatedOptions.onResponse(rawResponse, flatResponse);
+            if (options.onResponse) {
+                options.onResponse(rawResponse, flatResponse);
             }
         }
-        try {
+        return tracingClient.withSpan("WebPubSubServiceClient.hasPermission", options, async (updatedOptions) => {
             await this.client.webPubSub.checkPermission(this.hubName, permission, connectionId, Object.assign(Object.assign({}, updatedOptions), { onResponse }));
             if (response.status === 200) {
                 return true;
@@ -320,10 +271,7 @@ export class WebPubSubServiceClient {
                     response: response,
                 });
             }
-        }
-        finally {
-            span.end();
-        }
+        });
     }
     /**
      * Generate a token for a client to connect to the Azure Web PubSub service.
@@ -331,8 +279,7 @@ export class WebPubSubServiceClient {
      * @param options - Additional options
      */
     async getClientAccessToken(options = {}) {
-        const { span, updatedOptions } = createSpan("WebPubSubServiceClient-hub-generateClientToken", options);
-        try {
+        return tracingClient.withSpan("WebPubSubServiceClient.getClientAccessToken", options, async (updatedOptions) => {
             const endpoint = this.endpoint.endsWith("/") ? this.endpoint : this.endpoint + "/";
             const clientEndpoint = endpoint.replace(/(http)(s?:\/\/)/gi, "ws$2");
             const baseUrl = `${clientEndpoint}client/hubs/${this.hubName}`;
@@ -362,10 +309,7 @@ export class WebPubSubServiceClient {
                 baseUrl,
                 url: `${baseUrl}?access_token=${token}`,
             };
-        }
-        finally {
-            span.end();
-        }
+        });
     }
 }
 //# sourceMappingURL=hubClient.js.map