[TS] Change websocket library in Node (#2989)

clients/ts/FunctionalTests/package.json

@@ -32,7 +32,7 @@
     "karma-summary-reporter": "^1.5.0",
     "ts-node": "^4.1.0",
     "typescript": "^3.0.1",
-    "websocket": " ^1.0.26"
+    "ws": " ^6.0.0"
   },
   "scripts": {
     "clean": "node ../common/node_modules/rimraf/bin.js ./wwwroot/dist ./obj/js",

clients/ts/FunctionalTests/ts/WebSocketTests.ts

@@ -20,10 +20,9 @@ describe("WebSockets", () => {
                 return;
             }
         } else {
-            const websocketModule = require("websocket");
-            const hasWebsocket = websocketModule && websocketModule.w3cwebsocket;
-            if (hasWebsocket) {
-                webSocket = new websocketModule.w3cwebsocket(ECHOENDPOINT_URL.replace(/^http/, "ws"));
+            const websocketModule = require("ws");
+            if (websocketModule) {
+                webSocket = new websocketModule(ECHOENDPOINT_URL.replace(/^http/, "ws"));
             } else {
                 // No WebSockets implementations in current environment, skip test
                 done();

clients/ts/signalr-protocol-msgpack/src/MessagePackHubProtocol.ts

@@ -7,6 +7,7 @@ import * as msgpack5 from "msgpack5";
 import { CompletionMessage, HubMessage, IHubProtocol, ILogger, InvocationMessage, LogLevel, MessageHeaders, MessageType, NullLogger, StreamInvocationMessage, StreamItemMessage, TransferFormat } from "@aspnet/signalr";
 
 import { BinaryMessageFormat } from "./BinaryMessageFormat";
+import { isArrayBuffer } from "./Utils";
 
 // TypeDoc's @inheritDoc and @link don't work across modules :(
 
@@ -31,7 +32,7 @@ export class MessagePackHubProtocol implements IHubProtocol {
      */
     public parseMessages(input: ArrayBuffer | Buffer, logger: ILogger): HubMessage[] {
         // The interface does allow "string" to be passed in, but this implementation does not. So let's throw a useful error.
-        if (!(input instanceof ArrayBuffer) && !(input instanceof Buffer)) {
+        if (!(input instanceof Buffer) && !(isArrayBuffer(input))) {
             throw new Error("Invalid input for MessagePack hub protocol. Expected an ArrayBuffer or Buffer.");
         }
 

clients/ts/signalr-protocol-msgpack/src/Utils.ts

@@ -0,0 +1,11 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+// Copied from signalr/Utils.ts
+/** @private */
+export function isArrayBuffer(val: any): val is ArrayBuffer {
+    return val && typeof ArrayBuffer !== "undefined" &&
+        (val instanceof ArrayBuffer ||
+        // Sometimes we get an ArrayBuffer that doesn't satisfy instanceof
+        (val.constructor && val.constructor.name === "ArrayBuffer"));
+}