fix: Eliminate direct imports from ws

neet · neet · commit 37049df7c1a7 · 2024-05-03T13:54:18.000+09:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -49,6 +49,17 @@
         "@typescript-eslint/consistent-type-imports": [
           "error",
           { "prefer": "type-imports", "fixStyle": "inline-type-imports" }
+        ],
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              {
+                "name": "ws",
+                "message": "Use `isomophic-ws` instead."
+              }
+            ]
+          }
         ]
       }
     },
diff --git a/src/adapters/ws/async-iterable.spec.ts b/src/adapters/ws/async-iterable.spec.ts
@@ -1,5 +1,5 @@
 import getPort from "get-port";
-import { WebSocket, WebSocketServer } from "ws";
+import { WebSocket, WebSocketServer } from "isomorphic-ws";
 
 import { toAsyncIterable } from "./async-iterable";
 import { waitForOpen } from "./wait-for-events";
diff --git a/src/adapters/ws/wait-for-events.spec.ts b/src/adapters/ws/wait-for-events.spec.ts
@@ -1,5 +1,5 @@
 import getPort from "get-port";
-import WebSocket, { WebSocketServer } from "ws";
+import WebSocket, { WebSocketServer } from "isomorphic-ws";
 
 import { waitForClose, waitForOpen } from "./wait-for-events";
 
diff --git a/src/adapters/ws/wait-for-events.ts b/src/adapters/ws/wait-for-events.ts
@@ -1,4 +1,4 @@
-import WebSocket from "ws";
+import WebSocket from "isomorphic-ws";
 
 export function waitForOpen(ws: WebSocket): Promise<void> {
   if (ws.readyState === WebSocket.OPEN) {
diff --git a/src/adapters/ws/web-socket-connector.spec.ts b/src/adapters/ws/web-socket-connector.spec.ts
@@ -1,5 +1,5 @@
 import getPort from "get-port";
-import { WebSocketServer } from "ws";
+import { WebSocketServer } from "isomorphic-ws";
 
 import { MastoWebSocketError } from "../errors";
 import { WebSocketConnectorImpl } from "./web-socket-connector";
diff --git a/src/adapters/ws/web-socket-connector.ts b/src/adapters/ws/web-socket-connector.ts
@@ -1,4 +1,4 @@
-import WebSocket from "ws";
+import WebSocket from "isomorphic-ws";
 
 import { type Logger, type WebSocketConnector } from "../../interfaces";
 import {
diff --git a/src/adapters/ws/web-socket-subscription.spec.ts b/src/adapters/ws/web-socket-subscription.spec.ts
@@ -1,5 +1,5 @@
 import getPort from "get-port";
-import { WebSocketServer } from "ws";
+import { WebSocketServer } from "isomorphic-ws";
 
 import { createLogger } from "../logger";
 import { SerializerNativeImpl } from "../serializers";
diff --git a/src/adapters/ws/web-socket-subscription.ts b/src/adapters/ws/web-socket-subscription.ts
@@ -1,4 +1,4 @@
-import type WebSocket from "ws";
+import type WebSocket from "isomorphic-ws";
 
 import {
   type Logger,
diff --git a/src/interfaces/ws.ts b/src/interfaces/ws.ts
@@ -1,4 +1,4 @@
-import { type WebSocket } from "ws";
+import { type WebSocket } from "isomorphic-ws";
 
 export interface WebSocketConnector {
   acquire(): Promise<WebSocket>;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import WebSocket from "ws";`
	`1`	`+import WebSocket from "isomorphic-ws";`
`2`	`2`
`3`	`3`	`export function waitForOpen(ws: WebSocket): Promise<void> {`
`4`	`4`	`if (ws.readyState === WebSocket.OPEN) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type WebSocket from "ws";`
	`1`	`+import type WebSocket from "isomorphic-ws";`
`2`	`2`
`3`	`3`	`import {`
`4`	`4`	`type Logger,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { type WebSocket } from "ws";`
	`1`	`+import { type WebSocket } from "isomorphic-ws";`
`2`	`2`
`3`	`3`	`export interface WebSocketConnector {`
`4`	`4`	`acquire(): Promise<WebSocket>;`