DEV-269 Use isomorphic-ws instead of ws

lib/graphql/client.ts

@@ -1,4 +1,4 @@
-import * as ws from "ws";
+import { WebSocket } from "isomorphic-ws";
 
 import { Client, createClient } from "graphql-ws";
 import { GraphQLError, UserUnauthorizedError } from "../errors";
@@ -131,12 +131,11 @@ export class GraphQLClient {
  private createSubscriptionClient = (): Client => {
  const auth = this.getAuthHeader();
  const connectionParams = auth ? { [auth[0]]: auth[1] } : {};
- const webSocketImpl = typeof window === "undefined" ? ws : window.WebSocket;
 
  return this.createClient({
  url: this.subscriptionEndpoint,
  connectionParams,
- webSocketImpl,
+ webSocketImpl: WebSocket,
  })
  }
 

package.json

@@ -23,9 +23,10 @@
  "graphql": "^16.3.0",
  "graphql-request": "^4.0.0",
  "graphql-ws": "^5.5.5",
+ "isomorphic-ws": "^5.0.0",
  "js-sha256": "^0.9.0",
  "querystring-es3": "^0.2.1",
- "ws": "^8.4.2"
+ "ws": "^8.16.0"
  },
  "overrides": {
  "tough-cookie": "4.1.3"

tests/graphql/client.spec.ts

@@ -1,5 +1,5 @@
 import * as sinon from "sinon";
-import * as ws from "ws";
+import { WebSocket } from "isomorphic-ws";
 
 import { GraphQLError, UserUnauthorizedError } from "../../lib/errors";
 
@@ -540,39 +540,16 @@ describe("createSubscriptionClient", () => {
  it("should create a new SubscriptionClient and return it", () => {
  const subscriptionClient = client.graphQL.createSubscriptionClient();
  expect(createClientStub.callCount).to.equal(1);
- const {url, connectionParams} = createClientStub.getCall(
- 0,
- ).args[0];
+ const { url, connectionParams, webSocketImpl } =
+ createClientStub.getCall(0).args[0];
 
- expect(url).to.equal(
- `${KONTIST_SUBSCRIPTION_API_BASE_URL}/api/graphql`,
- );
+ expect(url).to.equal(`${KONTIST_SUBSCRIPTION_API_BASE_URL}/api/graphql`);
  expect(connectionParams).to.deep.equal({
  Authorization: "Bearer dummy-token",
  });
+ expect(webSocketImpl).to.equal(WebSocket);
  expect(subscriptionClient).to.equal(fakeGraphqlWsClient);
  });
-
- describe("when executing in a browser environment", () => {
- before(() => {
- (global as any).window = {
- WebSocket: {...ws, fake: true},
- };
- });
-
- after(() => {
- (global as any).window = undefined;
- });
-
- it("should use the native browser WebSocket implementation", () => {
- createClientStub.resetHistory();
-
- client.graphQL.createSubscriptionClient();
-
- expect(createClientStub.callCount).to.equal(1);
- expect(createClientStub.getCall(0).args[0].webSocketImpl.fake).to.equal(true);
- });
- });
  });
 });