Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enet connect fix #134

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enet connect fix #134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions src/console/dolphinConnection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,34 @@ export enum DolphinMessageType {

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

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

private async initClient() {
if (this.enet) {
return;
}
this.enet = await import("enet");
this.client = this.enet.createClient({ peers: MAX_PEERS, channels: 3, down: 0, up: 0 }, (err: any) => {
if (err) {
console.error(err);
return;
}
});
}

/**
* @returns The current connection status.
*/
Expand All @@ -53,20 +68,12 @@ export class DolphinConnection extends EventEmitter implements Connection {
}

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

const enet = await import("enet");
// Create the enet client
const client = enet.createClient({ peers: MAX_PEERS, channels: 3, down: 0, up: 0 }, (err) => {
if (err) {
console.error(err);
return;
}
});

this.peer = client.connect(
this.peer = this.client?.connect(
{
address: this.ipAddress,
port: this.port,
Expand Down Expand Up @@ -94,7 +101,7 @@ export class DolphinConnection extends EventEmitter implements Connection {
type: "connect_request",
cursor: this.gameCursor,
};
const packet = new enet.Packet(JSON.stringify(request), enet.PACKET_FLAG.RELIABLE);
const packet = new this.enet.Packet(JSON.stringify(request), this.enet.PACKET_FLAG.RELIABLE);
this.peer.send(0, packet);
});

Expand Down