19728530216

Committed 27 Nov 2025 07:29AM UTC coverage: 81.242% (-0.1%) from 81.39%

Build # 19728530216

Build Type

push

github

Committed by

web-flow

Commit Message

properly wait for peer disconnect before destroying enet client (#154)

* npm audit fix

* don't destroy enet client until the peer is disconnected

* DolphinConnect emit DISCONNECTED after peer disconnect

Run Details

688 of 918 branches covered (74.95%)

Branch coverage included in aggregate %.

0 of 9 new or added lines in 1 file covered. (0.0%)

20 existing lines in 2 files now uncovered.

1902 of 2270 relevant lines covered (83.79%)

120478.32 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

10.17

/src/console/dolphinConnection.ts

import type { Host, Packet, Peer } from "enet";
import { EventEmitter } from "events";

import { loadEnetModule } from "./loadEnetModule";
import type { Connection, ConnectionDetails, ConnectionSettings } from "./types";
import { ConnectionEvent, ConnectionStatus, Ports } from "./types";

const MAX_PEERS = 32;

export enum DolphinMessageType {
  CONNECT_REPLY = "connect_reply",
  GAME_EVENT = "game_event",
  START_GAME = "start_game",
  END_GAME = "end_game",
}

export class DolphinConnection extends EventEmitter implements Connection {
  private ipAddress: string;
  private port: number;
  private connectionStatus = ConnectionStatus.DISCONNECTED;
  private gameCursor = 0;
  private nickname = "unknown";
  private version = "";
  private peer: Peer | null = null;
  private client: Host | null = null;

  public constructor() {
    super();
    this.ipAddress = "0.0.0.0";
    this.port = Ports.DEFAULT;
  }

  /**
   * @returns The current connection status.
   */
  public getStatus(): ConnectionStatus {
    return this.connectionStatus;
  }

  /**
   * @returns The IP address and port of the current connection.
   */
  public getSettings(): ConnectionSettings {
    return {
      ipAddress: this.ipAddress,
      port: this.port,
    };
  }

  public getDetails(): ConnectionDetails {
    return {
      consoleNick: this.nickname,
      gameDataCursor: this.gameCursor,
      version: this.version,
    };
  }

  public async connect(ip: string, port: number): Promise<void> {
    console.log(`Connecting to: ${ip}:${port}`);
    this.ipAddress = ip;
    this.port = port;

    const enet = await loadEnetModule();
    // Create the enet client
    let client: Host | null = this.client;
    if (!client) {
      client = enet.createClient({ peers: MAX_PEERS, channels: 3, down: 0, up: 0 }, (err) => {
        if (err) {
          console.error(err);
          return;
        }
      });
      this.client = client;
    }

    const peer = client.connect(
      {
        address: this.ipAddress,
        port: this.port,
      },
      3,
      1337, // Data to send, not sure what this is or what this represents
      (err, newPeer) => {
        if (err) {
          console.error(err);
          return;
        }

        newPeer.ping();
        this.emit(ConnectionEvent.CONNECT);
        this._setStatus(ConnectionStatus.CONNECTED);
      },
    );

    peer.on("connect", () => {
      // Reset the game cursor to the beginning of the game. Do we need to do this or
      // should it just continue from where it left off?
      this.gameCursor = 0;

      const request = {
        type: "connect_request",
        cursor: this.gameCursor,
      };
      const packet = new enet.Packet(JSON.stringify(request), enet.PACKET_FLAG.RELIABLE);
      peer.send(0, packet);
    });

    peer.on("message", (packet: Packet) => {
      const data = packet.data();
      if (data.length === 0) {
        return;
      }

      const dataString = data.toString("ascii");
      const message = JSON.parse(dataString);
      const { dolphin_closed } = message;
      if (dolphin_closed) {
        // We got a disconnection request
        this.disconnect();
        return;
      }
      this.emit(ConnectionEvent.MESSAGE, message);
      switch (message.type) {
        case DolphinMessageType.CONNECT_REPLY:
          this.connectionStatus = ConnectionStatus.CONNECTED;
          this.gameCursor = message.cursor;
          this.nickname = message.nick;
          this.version = message.version;
          this.emit(ConnectionEvent.HANDSHAKE, this.getDetails());
          break;
        case DolphinMessageType.GAME_EVENT: {
          const { payload } = message;
          //TODO: remove after game start and end messages have been in stable Ishii for a bit
          if (!payload) {
            // We got a disconnection request
            this.disconnect();
            return;
          }

          this._updateCursor(message, dataString);

          const gameData = Buffer.from(payload, "base64");
          this._handleReplayData(gameData);
          break;
        }
        case DolphinMessageType.START_GAME: {
          this._updateCursor(message, dataString);
          break;
        }
        case DolphinMessageType.END_GAME: {
          this._updateCursor(message, dataString);
          break;
        }
      }
    });

    peer.on("disconnect", () => {
      this.onPeerDisconnected();
    });

    this.peer = peer;

    this._setStatus(ConnectionStatus.CONNECTING);
  }

  private destroyClient(): void {
    if (this.client) {
      this.client.destroy();
      this.client = null;
    }
  }

  private onPeerDisconnected(): void {
    this._setStatus(ConnectionStatus.DISCONNECTED);
    if (this.peer) {
      this.peer = null;
    }
    this.destroyClient();
  }

  public disconnect(): void {
    if (this.peer) {
      this.peer.disconnectLater();
    } else {
      this._setStatus(ConnectionStatus.DISCONNECTED);
      this.destroyClient();
    }
  }

  private _handleReplayData(data: Uint8Array): void {
    this.emit(ConnectionEvent.DATA, data);
  }

  private _setStatus(status: ConnectionStatus): void {
    // Don't fire the event if the status hasn't actually changed
    if (this.connectionStatus !== status) {
      this.connectionStatus = status;
      this.emit(ConnectionEvent.STATUS_CHANGE, this.connectionStatus);
    }
  }

  private _updateCursor(message: { cursor: number; next_cursor: number }, dataString: string): void {
    const { cursor, next_cursor } = message;

    if (this.gameCursor !== cursor) {
      const err = new Error(
        `Unexpected game data cursor. Expected: ${this.gameCursor} but got: ${cursor}. Payload: ${dataString}`,
      );
      console.warn(err);
      this.emit(ConnectionEvent.ERROR, err);
    }

    this.gameCursor = next_cursor;
  }
}

1	import type { Host, Packet, Peer } from "enet";
2	import { EventEmitter } from "events";	12✔
3
4	import { loadEnetModule } from "./loadEnetModule";	12✔
5	import type { Connection, ConnectionDetails, ConnectionSettings } from "./types";
6	import { ConnectionEvent, ConnectionStatus, Ports } from "./types";	12✔
7
8	const MAX_PEERS = 32;	12✔
9
10	export enum DolphinMessageType {	12✔
11	CONNECT_REPLY = "connect_reply",	12✔
12	GAME_EVENT = "game_event",	12✔
13	START_GAME = "start_game",	12✔
14	END_GAME = "end_game",	12✔
15	}
16
17	export class DolphinConnection extends EventEmitter implements Connection {	12✔
18	private ipAddress: string;
19	private port: number;
20	private connectionStatus = ConnectionStatus.DISCONNECTED;	×
21	private gameCursor = 0;	×
22	private nickname = "unknown";	×
23	private version = "";	×
24	private peer: Peer \| null = null;	×
25	private client: Host \| null = null;	×
26
27	public constructor() {
28	super();	×
29	this.ipAddress = "0.0.0.0";	×
30	this.port = Ports.DEFAULT;	×
31	}
32
33	/**
34	* @returns The current connection status.
35	*/
36	public getStatus(): ConnectionStatus {
37	return this.connectionStatus;	×
38	}
39
40	/**
41	* @returns The IP address and port of the current connection.
42	*/
43	public getSettings(): ConnectionSettings {
44	return {	×
45	ipAddress: this.ipAddress,
46	port: this.port,
47	};
48	}
49
50	public getDetails(): ConnectionDetails {
51	return {	×
52	consoleNick: this.nickname,
53	gameDataCursor: this.gameCursor,
54	version: this.version,
55	};
56	}
57
58	public async connect(ip: string, port: number): Promise<void> {
59	console.log(`Connecting to: ${ip}:${port}`);	×
60	this.ipAddress = ip;	×
61	this.port = port;	×
62
63	const enet = await loadEnetModule();	×
64	// Create the enet client
65	let client: Host \| null = this.client;	×
66	if (!client) {	×
67	client = enet.createClient({ peers: MAX_PEERS, channels: 3, down: 0, up: 0 }, (err) => {	×
68	if (err) {	×
69	console.error(err);	×
70	return;	×
71	}
72	});
73	this.client = client;	×
74	}
75
76	const peer = client.connect(	×
77	{
78	address: this.ipAddress,
79	port: this.port,
80	},
81	3,
82	1337, // Data to send, not sure what this is or what this represents
83	(err, newPeer) => {
84	if (err) {	×
85	console.error(err);	×
86	return;	×
87	}
88
89	newPeer.ping();	×
90	this.emit(ConnectionEvent.CONNECT);	×
91	this._setStatus(ConnectionStatus.CONNECTED);	×
92	},
93	);
94
95	peer.on("connect", () => {	×
96	// Reset the game cursor to the beginning of the game. Do we need to do this or
97	// should it just continue from where it left off?
98	this.gameCursor = 0;	×
99
100	const request = {	×
101	type: "connect_request",
102	cursor: this.gameCursor,
103	};
104	const packet = new enet.Packet(JSON.stringify(request), enet.PACKET_FLAG.RELIABLE);	×
105	peer.send(0, packet);	×
106	});
107
NEW 108	peer.on("message", (packet: Packet) => {	×
109	const data = packet.data();	×
110	if (data.length === 0) {	×
111	return;	×
112	}
113
114	const dataString = data.toString("ascii");	×
115	const message = JSON.parse(dataString);	×
116	const { dolphin_closed } = message;	×
117	if (dolphin_closed) {	×
118	// We got a disconnection request
119	this.disconnect();	×
120	return;	×
121	}
122	this.emit(ConnectionEvent.MESSAGE, message);	×
123	switch (message.type) {	×
124	case DolphinMessageType.CONNECT_REPLY:
125	this.connectionStatus = ConnectionStatus.CONNECTED;	×
126	this.gameCursor = message.cursor;	×
127	this.nickname = message.nick;	×
128	this.version = message.version;	×
129	this.emit(ConnectionEvent.HANDSHAKE, this.getDetails());	×
130	break;	×
131	case DolphinMessageType.GAME_EVENT: {
132	const { payload } = message;	×
133	//TODO: remove after game start and end messages have been in stable Ishii for a bit
134	if (!payload) {	×
135	// We got a disconnection request
136	this.disconnect();	×
137	return;	×
138	}
139
140	this._updateCursor(message, dataString);	×
141
142	const gameData = Buffer.from(payload, "base64");	×
143	this._handleReplayData(gameData);	×
144	break;	×
145	}
146	case DolphinMessageType.START_GAME: {
147	this._updateCursor(message, dataString);	×
148	break;	×
149	}
150	case DolphinMessageType.END_GAME: {
151	this._updateCursor(message, dataString);	×
152	break;	×
153	}
154	}
155	});
156
157	peer.on("disconnect", () => {	×
NEW 158	this.onPeerDisconnected();	×
159	});
160
161	this.peer = peer;	×
162
163	this._setStatus(ConnectionStatus.CONNECTING);	×
164	}
165
166	private destroyClient(): void {
167	if (this.client) {	×
168	this.client.destroy();	×
169	this.client = null;	×
170	}
171	}
172
173	private onPeerDisconnected(): void {
UNCOV 174	this._setStatus(ConnectionStatus.DISCONNECTED);	×
NEW 175	if (this.peer) {	×
NEW 176	this.peer = null;	×
177	}
NEW 178	this.destroyClient();	×
179	}
180
181	public disconnect(): void {
NEW 182	if (this.peer) {	×
NEW 183	this.peer.disconnectLater();	×
184	} else {
NEW 185	this._setStatus(ConnectionStatus.DISCONNECTED);	×
NEW 186	this.destroyClient();	×
187	}
188	}
189
190	private _handleReplayData(data: Uint8Array): void {
191	this.emit(ConnectionEvent.DATA, data);	×
192	}
193
194	private _setStatus(status: ConnectionStatus): void {
195	// Don't fire the event if the status hasn't actually changed
196	if (this.connectionStatus !== status) {	×
197	this.connectionStatus = status;	×
198	this.emit(ConnectionEvent.STATUS_CHANGE, this.connectionStatus);	×
199	}
200	}
201
202	private _updateCursor(message: { cursor: number; next_cursor: number }, dataString: string): void {
203	const { cursor, next_cursor } = message;	×
204
205	if (this.gameCursor !== cursor) {	×
206	const err = new Error(	×
207	`Unexpected game data cursor. Expected: ${this.gameCursor} but got: ${cursor}. Payload: ${dataString}`,
208	);
209	console.warn(err);	×
210	this.emit(ConnectionEvent.ERROR, err);	×
211	}
212
213	this.gameCursor = next_cursor;	×
214	}
215	}

project-slippi / slippi-js / 19728530216

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous