refactor: rename AdbDaemonConnection to AdbDaemonDevice

larygwil · May 25, 2023 · 1006571 · 1006571
1 parent e42e1a7
commit 1006571
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/packages/adb-daemon-direct-sockets/src/index.ts b/packages/adb-daemon-direct-sockets/src/index.ts
@@ -1,4 +1,4 @@
-import type { AdbDaemonConnection } from "@yume-chan/adb";
+import type { AdbDaemonDevice } from "@yume-chan/adb";
 import { AdbPacket, AdbPacketSerializeStream } from "@yume-chan/adb";
 import type { ReadableStream, WritableStream } from "@yume-chan/stream-extra";
 import {
@@ -20,13 +20,7 @@ declare global {
         localPort: number;
     }
 
-    class TCPSocket {
-        constructor(
-            remoteAddress: string,
-            remotePort: number,
-            options?: TCPSocketOptions
-        );
-
+    interface TCPSocket {
         opened: Promise<TCPSocketOpenInfo>;
         closed: Promise<void>;
 
@@ -41,16 +35,19 @@ declare global {
         keepAliveDelay?: number;
     }
 
-    interface Window {
-        TCPSocket: typeof TCPSocket;
-    }
+    // eslint-disable-next-line no-var
+    var TCPSocket: {
+        new (
+            remoteAddress: string,
+            remotePort: number,
+            options?: TCPSocketOptions
+        ): TCPSocket;
+    };
 }
 
-export default class AdbDaemonDirectSocketsConnection
-    implements AdbDaemonConnection
-{
+export default class AdbDaemonDirectSocketsDevice implements AdbDaemonDevice {
     public static isSupported(): boolean {
-        return typeof window !== "undefined" && !!window.TCPSocket;
+        return typeof globalThis.TCPSocket !== "undefined";
     }
 
     public readonly serial: string;
@@ -69,7 +66,9 @@ export default class AdbDaemonDirectSocketsConnection
     }
 
     public async connect() {
-        const socket = new TCPSocket(this.host, this.port, { noDelay: true });
+        const socket = new globalThis.TCPSocket(this.host, this.port, {
+            noDelay: true,
+        });
         const { readable, writable } = await socket.opened;
 
         return {

diff --git a/packages/adb-daemon-ws/src/index.ts b/packages/adb-daemon-ws/src/index.ts
@@ -1,4 +1,4 @@
-import type { AdbDaemonConnection } from "@yume-chan/adb";
+import type { AdbDaemonDevice } from "@yume-chan/adb";
 import {
     AdbPacket,
     AdbPacketSerializeStream,
@@ -13,9 +13,7 @@ import {
     pipeFrom,
 } from "@yume-chan/stream-extra";
 
-export default class AdbDaemonWebSocketConnection
-    implements AdbDaemonConnection
-{
+export default class AdbDaemonWebSocketDevice implements AdbDaemonDevice {
     public readonly serial: string;
 
     public name: string | undefined;