@azure/web-pubsub 1.1.0-alpha.20221014.1 → 1.1.0-alpha.20221121.1

package/dist-esm/test/integration.spec.js

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 /* eslint-disable no-invalid-this */
-import { WebPubSubServiceClient } from "../src/index";
+import { WebPubSubServiceClient, odata } from "../src/index";
 import { isLiveMode, assertEnvironmentVariable } from "@azure-tools/test-recorder";
 import { assert } from "chai";
 import ws from "ws";
@@ -26,12 +26,13 @@ class SimpleWebSocketFrame {
             this.dataAsString = data.toString();
         }
     }
-    isEndSignal() {
+    isEndSignal(id = undefined) {
         return (this.isBinary &&
             this.data instanceof Buffer &&
             this.data[0] === 5 &&
             this.data[1] === 1 &&
-            this.data[2] === 1);
+            this.data[2] === 1 &&
+            (id === undefined || this.data[3] === id));
     }
     toString() {
         if (this.isEndSignal()) {
@@ -61,17 +62,19 @@ class PubSubWebSocketFrame {
         return this.dataAsString;
     }
 }
-function getEndSignal() {
+function getEndSignal(id = undefined) {
     // magic number 511
-    const payload = new Uint8Array(3);
+    const payload = new Uint8Array(id === undefined ? 3 : 4);
     payload[0] = 5;
     payload[1] = 1;
     payload[2] = 1;
+    if (id !== undefined) {
+        payload[3] = id;
+    }
     return payload;
 }
 describe("ServiceClient to manage the connected WebSocket connections", function () {
-    // Issue - https://github.com/Azure/azure-sdk-for-js/issues/20571 waiting for service fix
-    it.skip("Simple clients can receive expected messages with different content types", async function () {
+    it("Simple clients can receive expected messages with different content types", async function () {
         if (!isLiveMode())
             this.skip();
         const hub = "SimpleClientCanReceiveMessage";
@@ -107,6 +110,53 @@ describe("ServiceClient to manage the connected WebSocket connections", function
         assert.equal(messages[0].dataAsString, '{"message":"Hello world!"}');
         assert.equal(messages[1].dataAsString, "Hi there!");
     });
+    it("Simple clients can can join group and receive group messages", async function () {
+        if (!isLiveMode())
+            this.skip();
+        const hub = "SimpleClientCanReceiveGroupMessage";
+        const messages = [];
+        // Get token
+        const serviceClient = new WebPubSubServiceClient(assertEnvironmentVariable("WPS_CONNECTION_STRING"), hub);
+        const token = await serviceClient.getClientAccessToken({
+            groups: ["group1", "group2"],
+        });
+        const end1Signal = defer();
+        const end2Signal = defer();
+        // Start simple WebSocket connections
+        const client = new ws.WebSocket(token.url);
+        client.on("message", (data, isBinary) => {
+            const frame = new SimpleWebSocketFrame(data, isBinary);
+            console.log(frame.toString());
+            if (frame.isEndSignal(1)) {
+                end1Signal.resolve();
+            }
+            else if (frame.isEndSignal(2)) {
+                end2Signal.resolve();
+            }
+            else {
+                messages.push(frame);
+            }
+        });
+        client.on("open", async () => {
+            const group1Client = serviceClient.group("group1");
+            const group2Client = serviceClient.group("group2");
+            // send to all
+            // Send a JSON message
+            await group1Client.sendToAll({ message: "Hello world from group1!" });
+            await group2Client.sendToAll(getEndSignal(1));
+            // Send a plain text message
+            await group2Client.sendToAll("Hi there from group2!", { contentType: "text/plain" });
+            // Send the binary end signal message
+            await group2Client.sendToAll(getEndSignal(2));
+        });
+        await end1Signal.promise;
+        await end2Signal.promise;
+        client.close();
+        assert.equal(messages.length, 2);
+        // order from different groups is not guaranteed
+        assert.isTrue(messages.findIndex((s) => s.dataAsString === '{"message":"Hello world from group1!"}') > -1);
+        assert.isTrue(messages.findIndex((s) => s.dataAsString === "Hi there from group2!") > -1);
+    });
     it("Subprotocol clients can receive expected messages with different content types", async function () {
         if (!isLiveMode())
             this.skip();
@@ -149,5 +199,47 @@ describe("ServiceClient to manage the connected WebSocket connections", function
         assert.equal(messages[1].dataAsString, '{"type":"message","from":"server","dataType":"json","data":{"message":"Hello world!"}}');
         assert.equal(messages[2].dataAsString, '{"type":"message","from":"server","dataType":"text","data":"Hi there!"}');
     });
+    it("Clients can receive messages with filters", async function () {
+        if (!isLiveMode())
+            this.skip();
+        const hub = "ClientCanReceiveMessageWithFilters";
+        const messages = [];
+        // Get token
+        const serviceClient = new WebPubSubServiceClient(assertEnvironmentVariable("WPS_CONNECTION_STRING"), hub);
+        const token = await serviceClient.getClientAccessToken({ groups: ["groupA"] });
+        const endSignal = defer();
+        // Start simple WebSocket connections
+        const client = new ws.WebSocket(token.url);
+        client.on("message", (data, isBinary) => {
+            const frame = new SimpleWebSocketFrame(data, isBinary);
+            console.log(frame.toString());
+            if (frame.isEndSignal()) {
+                endSignal.resolve();
+                client.close();
+            }
+            else {
+                messages.push(frame);
+            }
+        });
+        client.on("open", async () => {
+            // Send a JSON message to anonymous connections
+            await serviceClient.sendToAll({ message: "Hello world!" }, { filter: "userId eq null" });
+            // Send a text message to connections in groupA but not in groupB
+            const groupA = "groupA";
+            const groupB = "groupB";
+            await serviceClient.sendToAll("Hello world!", {
+                contentType: "text/plain",
+                // use plain text "'groupA' in groups and not('groupB' in groups)"
+                // or use the odata helper method
+                filter: odata `${groupA} in groups and not(${groupB} in groups)`,
+            });
+            // Send the binary end signal message
+            await serviceClient.sendToAll(getEndSignal());
+        });
+        await endSignal.promise;
+        assert.equal(messages.length, 2);
+        assert.equal(messages[0].dataAsString, '{"message":"Hello world!"}');
+        assert.equal(messages[1].dataAsString, "Hello world!");
+    });
 });
 //# sourceMappingURL=integration.spec.js.map

package/dist-esm/test/integration.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"integration.spec.js","sourceRoot":"","sources":["../../test/integration.spec.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT license.\n/* eslint-disable no-invalid-this */\nimport { WebPubSubServiceClient } from \"../src/index\";\nimport { isLiveMode, assertEnvironmentVariable } from \"@azure-tools/test-recorder\";\nimport { Context } from \"mocha\";\nimport { assert } from \"chai\";\nimport ws from \"ws\";\n\nfunction defer<T>(): {\n  promise: Promise<T>;\n  resolve: (t: T) => void;\n  reject: (err: Error) => void;\n} {\n  let actualResolve: (t: T) => void;\n  let actualReject: (err: Error) => void;\n\n  const promise = new Promise<T>((resolve, reject) => {\n    actualResolve = resolve;\n    actualReject = reject;\n  });\n\n  return {\n    promise,\n    resolve: actualResolve!,\n    reject: actualReject!,\n  };\n}\n\nclass SimpleWebSocketFrame {\n  public dataAsString: string | undefined;\n  constructor(public data: Buffer | ArrayBuffer | Buffer[], public isBinary: boolean) {\n    if (!isBinary) {\n      this.dataAsString = data.toString();\n    }\n  }\n\n  isEndSignal(): boolean {\n    return (\n      this.isBinary &&\n      this.data instanceof Buffer &&\n      this.data[0] === 5 &&\n      this.data[1] === 1 &&\n      this.data[2] === 1\n    );\n  }\n\n  toString(): string | undefined {\n    if (this.isEndSignal()) {\n      return \"|EndSignal|\";\n    }\n    if (!this.isBinary) {\n      return this.dataAsString;\n    } else {\n      return this.data.toString();\n    }\n  }\n}\n\nclass PubSubWebSocketFrame {\n  public message: any;\n  public dataAsString: string;\n  constructor(data: Buffer | ArrayBuffer | Buffer[], isBinary: boolean) {\n    assert.isFalse(isBinary);\n    this.dataAsString = data.toString();\n    this.message = JSON.parse(this.dataAsString);\n  }\n\n  isEndSignal(): boolean {\n    return this.message.dataType === \"binary\" && this.message.data === \"BQEB\";\n  }\n\n  toString(): string | undefined {\n    if (this.isEndSignal()) {\n      return \"|EndSignal|\";\n    }\n\n    return this.dataAsString;\n  }\n}\n\nfunction getEndSignal(): Uint8Array {\n  // magic number 511\n  const payload = new Uint8Array(3);\n  payload[0] = 5;\n  payload[1] = 1;\n  payload[2] = 1;\n  return payload;\n}\n\ndescribe(\"ServiceClient to manage the connected WebSocket connections\", function () {\n  // Issue - https://github.com/Azure/azure-sdk-for-js/issues/20571 waiting for service fix\n  it.skip(\"Simple clients can receive expected messages with different content types\", async function (this: Context) {\n    if (!isLiveMode()) this.skip();\n    const hub = \"SimpleClientCanReceiveMessage\";\n\n    const messages: SimpleWebSocketFrame[] = [];\n\n    // Get token\n    const serviceClient = new WebPubSubServiceClient(\n      assertEnvironmentVariable(\"WPS_CONNECTION_STRING\"),\n      hub\n    );\n    const token = await serviceClient.getClientAccessToken();\n    const endSignal = defer<void>();\n    // Start simple WebSocket connections\n    const client = new ws.WebSocket(token.url);\n    client.on(\"message\", (data, isBinary) => {\n      const frame = new SimpleWebSocketFrame(data, isBinary);\n      console.log(frame.toString());\n      if (frame.isEndSignal()) {\n        endSignal.resolve();\n        client.close();\n      } else {\n        messages.push(frame);\n      }\n    });\n    client.on(\"open\", async () => {\n      // send to all\n      // Send a JSON message\n      await serviceClient.sendToAll({ message: \"Hello world!\" });\n\n      // Send a plain text message\n      await serviceClient.sendToAll(\"Hi there!\", { contentType: \"text/plain\" });\n\n      // Send the binary end signal message\n      await serviceClient.sendToAll(getEndSignal());\n    });\n\n    await endSignal.promise;\n\n    assert.equal(messages.length, 2);\n    assert.equal(messages[0].dataAsString, '{\"message\":\"Hello world!\"}');\n    assert.equal(messages[1].dataAsString, \"Hi there!\");\n  });\n\n  it(\"Subprotocol clients can receive expected messages with different content types\", async function (this: Context) {\n    if (!isLiveMode()) this.skip();\n    const hub = \"PubSubClientCanReceiveMessage\";\n    const messages: PubSubWebSocketFrame[] = [];\n\n    // Get token\n    const serviceClient = new WebPubSubServiceClient(\n      assertEnvironmentVariable(\"WPS_CONNECTION_STRING\"),\n      hub\n    );\n    const token = await serviceClient.getClientAccessToken();\n    const endSignal = defer<void>();\n    const connectedSignal = defer<void>();\n    // Start simple WebSocket connections\n    const client = new ws.WebSocket(token.url, \"json.webpubsub.azure.v1\");\n    client.on(\"message\", (data, isBinary) => {\n      const frame = new PubSubWebSocketFrame(data, isBinary);\n      console.log(frame.toString());\n      if (frame.message.event === \"connected\") {\n        connectedSignal.resolve();\n      }\n      if (frame.isEndSignal()) {\n        endSignal.resolve();\n        client.close();\n      } else {\n        messages.push(frame);\n      }\n    });\n    client.on(\"open\", async () => {\n      await connectedSignal.promise;\n\n      // send to all\n      // Send a JSON message\n      await serviceClient.sendToAll({ message: \"Hello world!\" });\n\n      // Send a plain text message\n      await serviceClient.sendToAll(\"Hi there!\", { contentType: \"text/plain\" });\n\n      // Send the binary end signal message\n      await serviceClient.sendToAll(getEndSignal());\n    });\n\n    await endSignal.promise;\n\n    assert.equal(messages.length, 3);\n    assert.equal(messages[0].message.event, \"connected\");\n    assert.equal(\n      messages[1].dataAsString,\n      '{\"type\":\"message\",\"from\":\"server\",\"dataType\":\"json\",\"data\":{\"message\":\"Hello world!\"}}'\n    );\n    assert.equal(\n      messages[2].dataAsString,\n      '{\"type\":\"message\",\"from\":\"server\",\"dataType\":\"text\",\"data\":\"Hi there!\"}'\n    );\n  });\n});\n"]}
+{"version":3,"file":"integration.spec.js","sourceRoot":"","sources":["../../test/integration.spec.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT license.\n/* eslint-disable no-invalid-this */\nimport { WebPubSubServiceClient, odata } from \"../src/index\";\nimport { isLiveMode, assertEnvironmentVariable } from \"@azure-tools/test-recorder\";\nimport { Context } from \"mocha\";\nimport { assert } from \"chai\";\nimport ws from \"ws\";\n\nfunction defer<T>(): {\n  promise: Promise<T>;\n  resolve: (t: T) => void;\n  reject: (err: Error) => void;\n} {\n  let actualResolve: (t: T) => void;\n  let actualReject: (err: Error) => void;\n\n  const promise = new Promise<T>((resolve, reject) => {\n    actualResolve = resolve;\n    actualReject = reject;\n  });\n\n  return {\n    promise,\n    resolve: actualResolve!,\n    reject: actualReject!,\n  };\n}\n\nclass SimpleWebSocketFrame {\n  public dataAsString: string | undefined;\n  constructor(public data: Buffer | ArrayBuffer | Buffer[], public isBinary: boolean) {\n    if (!isBinary) {\n      this.dataAsString = data.toString();\n    }\n  }\n\n  isEndSignal(id: number | undefined = undefined): boolean {\n    return (\n      this.isBinary &&\n      this.data instanceof Buffer &&\n      this.data[0] === 5 &&\n      this.data[1] === 1 &&\n      this.data[2] === 1 &&\n      (id === undefined || this.data[3] === id)\n    );\n  }\n\n  toString(): string | undefined {\n    if (this.isEndSignal()) {\n      return \"|EndSignal|\";\n    }\n    if (!this.isBinary) {\n      return this.dataAsString;\n    } else {\n      return this.data.toString();\n    }\n  }\n}\n\nclass PubSubWebSocketFrame {\n  public message: any;\n  public dataAsString: string;\n  constructor(data: Buffer | ArrayBuffer | Buffer[], isBinary: boolean) {\n    assert.isFalse(isBinary);\n    this.dataAsString = data.toString();\n    this.message = JSON.parse(this.dataAsString);\n  }\n\n  isEndSignal(): boolean {\n    return this.message.dataType === \"binary\" && this.message.data === \"BQEB\";\n  }\n\n  toString(): string | undefined {\n    if (this.isEndSignal()) {\n      return \"|EndSignal|\";\n    }\n\n    return this.dataAsString;\n  }\n}\n\nfunction getEndSignal(id: number | undefined = undefined): Uint8Array {\n  // magic number 511\n  const payload = new Uint8Array(id === undefined ? 3 : 4);\n  payload[0] = 5;\n  payload[1] = 1;\n  payload[2] = 1;\n  if (id !== undefined) {\n    payload[3] = id;\n  }\n  return payload;\n}\n\ndescribe(\"ServiceClient to manage the connected WebSocket connections\", function () {\n  it(\"Simple clients can receive expected messages with different content types\", async function (this: Context) {\n    if (!isLiveMode()) this.skip();\n    const hub = \"SimpleClientCanReceiveMessage\";\n\n    const messages: SimpleWebSocketFrame[] = [];\n\n    // Get token\n    const serviceClient = new WebPubSubServiceClient(\n      assertEnvironmentVariable(\"WPS_CONNECTION_STRING\"),\n      hub\n    );\n    const token = await serviceClient.getClientAccessToken();\n    const endSignal = defer<void>();\n    // Start simple WebSocket connections\n    const client = new ws.WebSocket(token.url);\n    client.on(\"message\", (data, isBinary) => {\n      const frame = new SimpleWebSocketFrame(data, isBinary);\n      console.log(frame.toString());\n      if (frame.isEndSignal()) {\n        endSignal.resolve();\n        client.close();\n      } else {\n        messages.push(frame);\n      }\n    });\n    client.on(\"open\", async () => {\n      // send to all\n      // Send a JSON message\n      await serviceClient.sendToAll({ message: \"Hello world!\" });\n\n      // Send a plain text message\n      await serviceClient.sendToAll(\"Hi there!\", { contentType: \"text/plain\" });\n\n      // Send the binary end signal message\n      await serviceClient.sendToAll(getEndSignal());\n    });\n\n    await endSignal.promise;\n\n    assert.equal(messages.length, 2);\n    assert.equal(messages[0].dataAsString, '{\"message\":\"Hello world!\"}');\n    assert.equal(messages[1].dataAsString, \"Hi there!\");\n  });\n\n  it(\"Simple clients can can join group and receive group messages\", async function (this: Context) {\n    if (!isLiveMode()) this.skip();\n    const hub = \"SimpleClientCanReceiveGroupMessage\";\n\n    const messages: SimpleWebSocketFrame[] = [];\n\n    // Get token\n    const serviceClient = new WebPubSubServiceClient(\n      assertEnvironmentVariable(\"WPS_CONNECTION_STRING\"),\n      hub\n    );\n    const token = await serviceClient.getClientAccessToken({\n      groups: [\"group1\", \"group2\"],\n    });\n    const end1Signal = defer<void>();\n    const end2Signal = defer<void>();\n    // Start simple WebSocket connections\n    const client = new ws.WebSocket(token.url);\n    client.on(\"message\", (data, isBinary) => {\n      const frame = new SimpleWebSocketFrame(data, isBinary);\n      console.log(frame.toString());\n      if (frame.isEndSignal(1)) {\n        end1Signal.resolve();\n      } else if (frame.isEndSignal(2)) {\n        end2Signal.resolve();\n      } else {\n        messages.push(frame);\n      }\n    });\n    client.on(\"open\", async () => {\n      const group1Client = serviceClient.group(\"group1\");\n      const group2Client = serviceClient.group(\"group2\");\n      // send to all\n      // Send a JSON message\n      await group1Client.sendToAll({ message: \"Hello world from group1!\" });\n      await group2Client.sendToAll(getEndSignal(1));\n      // Send a plain text message\n      await group2Client.sendToAll(\"Hi there from group2!\", { contentType: \"text/plain\" });\n\n      // Send the binary end signal message\n      await group2Client.sendToAll(getEndSignal(2));\n    });\n\n    await end1Signal.promise;\n    await end2Signal.promise;\n    client.close();\n    assert.equal(messages.length, 2);\n\n    // order from different groups is not guaranteed\n    assert.isTrue(\n      messages.findIndex((s) => s.dataAsString === '{\"message\":\"Hello world from group1!\"}') > -1\n    );\n    assert.isTrue(messages.findIndex((s) => s.dataAsString === \"Hi there from group2!\") > -1);\n  });\n\n  it(\"Subprotocol clients can receive expected messages with different content types\", async function (this: Context) {\n    if (!isLiveMode()) this.skip();\n    const hub = \"PubSubClientCanReceiveMessage\";\n    const messages: PubSubWebSocketFrame[] = [];\n\n    // Get token\n    const serviceClient = new WebPubSubServiceClient(\n      assertEnvironmentVariable(\"WPS_CONNECTION_STRING\"),\n      hub\n    );\n    const token = await serviceClient.getClientAccessToken();\n    const endSignal = defer<void>();\n    const connectedSignal = defer<void>();\n    // Start simple WebSocket connections\n    const client = new ws.WebSocket(token.url, \"json.webpubsub.azure.v1\");\n    client.on(\"message\", (data, isBinary) => {\n      const frame = new PubSubWebSocketFrame(data, isBinary);\n      console.log(frame.toString());\n      if (frame.message.event === \"connected\") {\n        connectedSignal.resolve();\n      }\n      if (frame.isEndSignal()) {\n        endSignal.resolve();\n        client.close();\n      } else {\n        messages.push(frame);\n      }\n    });\n    client.on(\"open\", async () => {\n      await connectedSignal.promise;\n\n      // send to all\n      // Send a JSON message\n      await serviceClient.sendToAll({ message: \"Hello world!\" });\n\n      // Send a plain text message\n      await serviceClient.sendToAll(\"Hi there!\", { contentType: \"text/plain\" });\n\n      // Send the binary end signal message\n      await serviceClient.sendToAll(getEndSignal());\n    });\n\n    await endSignal.promise;\n\n    assert.equal(messages.length, 3);\n    assert.equal(messages[0].message.event, \"connected\");\n    assert.equal(\n      messages[1].dataAsString,\n      '{\"type\":\"message\",\"from\":\"server\",\"dataType\":\"json\",\"data\":{\"message\":\"Hello world!\"}}'\n    );\n    assert.equal(\n      messages[2].dataAsString,\n      '{\"type\":\"message\",\"from\":\"server\",\"dataType\":\"text\",\"data\":\"Hi there!\"}'\n    );\n  });\n\n  it(\"Clients can receive messages with filters\", async function (this: Context) {\n    if (!isLiveMode()) this.skip();\n    const hub = \"ClientCanReceiveMessageWithFilters\";\n\n    const messages: SimpleWebSocketFrame[] = [];\n\n    // Get token\n    const serviceClient = new WebPubSubServiceClient(\n      assertEnvironmentVariable(\"WPS_CONNECTION_STRING\"),\n      hub\n    );\n    const token = await serviceClient.getClientAccessToken({ groups: [\"groupA\"] });\n    const endSignal = defer<void>();\n    // Start simple WebSocket connections\n    const client = new ws.WebSocket(token.url);\n    client.on(\"message\", (data, isBinary) => {\n      const frame = new SimpleWebSocketFrame(data, isBinary);\n      console.log(frame.toString());\n      if (frame.isEndSignal()) {\n        endSignal.resolve();\n        client.close();\n      } else {\n        messages.push(frame);\n      }\n    });\n    client.on(\"open\", async () => {\n      // Send a JSON message to anonymous connections\n      await serviceClient.sendToAll({ message: \"Hello world!\" }, { filter: \"userId eq null\" });\n      // Send a text message to connections in groupA but not in groupB\n      const groupA = \"groupA\";\n      const groupB = \"groupB\";\n      await serviceClient.sendToAll(\"Hello world!\", {\n        contentType: \"text/plain\",\n        // use plain text \"'groupA' in groups and not('groupB' in groups)\"\n        // or use the odata helper method\n        filter: odata`${groupA} in groups and not(${groupB} in groups)`,\n      });\n      // Send the binary end signal message\n      await serviceClient.sendToAll(getEndSignal());\n    });\n\n    await endSignal.promise;\n\n    assert.equal(messages.length, 2);\n    assert.equal(messages[0].dataAsString, '{\"message\":\"Hello world!\"}');\n    assert.equal(messages[1].dataAsString, \"Hello world!\");\n  });\n});\n"]}

package/dist-esm/test/odata.spec.js

@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+/* eslint-disable no-invalid-this */
+import { odata } from "../src/utils";
+import { assert } from "chai";
+describe("Can parse odata to string", function () {
+    it("can wrap different types as expected", async () => {
+        const userId = "vic's";
+        const anonymous = null;
+        const length = 3;
+        const filter = odata `userId eq ${anonymous} or userId eq ${userId} or length(userId) gt ${length}`;
+        assert.equal("userId eq null or userId eq 'vic''s' or length(userId) gt 3", filter);
+    });
+});
+//# sourceMappingURL=odata.spec.js.map

package/dist-esm/test/odata.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"odata.spec.js","sourceRoot":"","sources":["../../test/odata.spec.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,oCAAoC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,QAAQ,CAAC,2BAA2B,EAAE;IACpC,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;QACpD,MAAM,MAAM,GAAG,OAAO,CAAC;QACvB,MAAM,SAAS,GAAG,IAAI,CAAC;QACvB,MAAM,MAAM,GAAG,CAAC,CAAC;QACjB,MAAM,MAAM,GAAG,KAAK,CAAA,aAAa,SAAS,iBAAiB,MAAM,yBAAyB,MAAM,EAAE,CAAC;QACnG,MAAM,CAAC,KAAK,CAAC,6DAA6D,EAAE,MAAM,CAAC,CAAC;IACtF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT license.\n/* eslint-disable no-invalid-this */\nimport { odata } from \"../src/utils\";\nimport { assert } from \"chai\";\n\ndescribe(\"Can parse odata to string\", function () {\n  it(\"can wrap different types as expected\", async () => {\n    const userId = \"vic's\";\n    const anonymous = null;\n    const length = 3;\n    const filter = odata`userId eq ${anonymous} or userId eq ${userId} or length(userId) gt ${length}`;\n    assert.equal(\"userId eq null or userId eq 'vic''s' or length(userId) gt 3\", filter);\n  });\n});\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure/web-pubsub",
-  "version": "1.1.0-alpha.20221014.1",
+  "version": "1.1.0-alpha.20221121.1",
   "description": "Azure client library for Azure Web PubSub",
   "sdk-type": "client",
   "main": "dist/index.js",
@@ -30,7 +30,8 @@
     "test": "npm run build:test && npm run unit-test && npm run integration-test",
     "unit-test:browser": "echo \"Browser is not supported.\" && exit 0",
     "unit-test:node": "dev-tool run test:node-ts-input -- --timeout 1200000 --exclude 'test/**/browser/*.spec.ts' 'test/**/*.spec.ts'",
-    "unit-test": "npm run unit-test:node && npm run unit-test:browser"
+    "unit-test": "npm run unit-test:node && npm run unit-test:browser",
+    "generate:client": "autorest --typescript ./swagger/README.md"
   },
   "files": [
     "dist/",
@@ -113,7 +114,7 @@
     "rimraf": "^3.0.0",
     "sinon": "^9.0.2",
     "source-map-support": "^0.5.9",
-    "typescript": "~4.6.0",
+    "typescript": "~4.8.0",
     "ws": "^8.2.0"
   },
   "//sampleConfiguration": {

package/types/web-pubsub.d.ts

@@ -47,6 +47,10 @@ export declare interface GenerateClientTokenOptions extends OperationOptions {
      * Minutes until the token expires.
      */
     expirationTimeInMinutes?: number;
+    /**
+     * The groups to join when the client connects
+     */
+    groups?: string[];
 }
 
 /**
@@ -98,11 +102,10 @@ export declare interface GroupRemoveUserOptions extends OperationOptions {
 /**
  * Options for sending text messages to a group..
  */
-export declare interface GroupSendTextToAllOptions extends OperationOptions {
+export declare interface GroupSendTextToAllOptions extends GroupSendToAllOptions {
     /**
-     * Connection ids to exclude from receiving this message.
+     * The content will be sent to the clients in plain text.
      */
-    excludedConnections?: string[];
     contentType: "text/plain";
 }
 
@@ -114,6 +117,14 @@ export declare interface GroupSendToAllOptions extends OperationOptions {
      * Connection ids to exclude from receiving this message.
      */
     excludedConnections?: string[];
+    /**
+     * The filter syntax to filter out the connections to send the messages to following OData filter syntax.
+     * Examples:
+     *  * Exclude connections from `user1` and `user2`: `userId ne 'user1' and userId ne 'user2'`
+     *  * Exclude connections in `group1`: `not('group1' in groups)`
+     * Details about `filter` syntax please see [OData filter syntax for Azure Web PubSub](https://aka.ms/awps/filter-syntax).
+     */
+    filter?: string;
 }
 
 /**
@@ -207,6 +218,9 @@ export declare interface HubRevokePermissionOptions extends OperationOptions {
  * Options for sending text messages to hubs.
  */
 export declare interface HubSendTextToAllOptions extends HubSendToAllOptions {
+    /**
+     * The content will be sent to the clients in plain text.
+     */
     contentType: "text/plain";
 }
 
@@ -221,6 +235,9 @@ export declare interface HubSendTextToConnectionOptions extends HubSendToConnect
  * Options for sending a text message to a user.
  */
 export declare interface HubSendTextToUserOptions extends HubSendToUserOptions {
+    /**
+     * The content will be sent to the clients in plain text.
+     */
     contentType: "text/plain";
 }
 
@@ -232,6 +249,14 @@ export declare interface HubSendToAllOptions extends OperationOptions {
      * Connection ids to exclude from receiving this message.
      */
     excludedConnections?: string[];
+    /**
+     * The filter syntax to filter out the connections to send the messages to following OData filter syntax.
+     * Examples:
+     *  * Exclude connections from `user1` and `user2`: `userId ne 'user1' and userId ne 'user2'`
+     *  * Exclude connections in `group1`: `not('group1' in groups)`
+     * Details about `filter` syntax please see [OData filter syntax for Azure Web PubSub](https://aka.ms/awps/filter-syntax).
+     */
+    filter?: string;
 }
 
 /**
@@ -244,6 +269,14 @@ export declare interface HubSendToConnectionOptions extends OperationOptions {
  * Options for sending a message to a user.
  */
 export declare interface HubSendToUserOptions extends OperationOptions {
+    /**
+     * The filter syntax to filter out the connections to send the messages to following OData filter syntax.
+     * Examples:
+     *  * Exclude connections in `group1`: `not('group1' in groups)`
+     *  * Send to connections in `group1` or `group2`: `'group1' in groups or `group2` in groups`
+     * Details about `filter` syntax please see [OData filter syntax for Azure Web PubSub](https://aka.ms/awps/filter-syntax).
+     */
+    filter?: string;
 }
 
 /**
@@ -251,6 +284,20 @@ export declare interface HubSendToUserOptions extends OperationOptions {
  */
 export declare type JSONTypes = string | number | boolean | object;
 
+/**
+ * Escapes an odata filter expression to avoid errors with quoting string literals.
+ * Example usage:
+ * ```ts
+ * const userId = "vic's";
+ * const anonymous = null;
+ * const length = 3
+ * const filter = odata`userId eq ${anonymous} or userId eq ${userId} or length(userId) > ${length}`;
+ * ```
+ * @param strings - Array of strings for the expression
+ * @param values - Array of values for the expression
+ */
+export declare function odata(strings: TemplateStringsArray, ...values: unknown[]): string;
+
 export declare type Permission = "joinLeaveGroup" | "sendToGroup";
 
 export declare interface WebPubSubGroup {
@@ -485,6 +532,12 @@ export declare class WebPubSubServiceClient {
      * @param options - Additional options
      */
     removeUserFromAllGroups(userId: string, options?: HubCloseConnectionOptions): Promise<void>;
+    /**
+     * Remove a specific connection from all groups they are joined to
+     * @param connectionId - The connection id to remove from all groups
+     * @param options - Additional options
+     */
+    removeConnectionFromAllGroups(connectionId: string, options?: HubCloseConnectionOptions): Promise<void>;
     /**
      * Check if a particular group exists (i.e. has active connections).
      *