aqualink 1.7.0-beta6 → 1.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +47 -55
- package/build/handlers/fetchImage.js +6 -9
- package/build/structures/Aqua.js +74 -96
- package/build/structures/Connection.js +58 -84
- package/build/structures/Node.js +78 -95
- package/build/structures/Player.js +90 -93
- package/build/structures/Track.js +13 -22
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -11,14 +11,14 @@ This code is based in riffy, but its an 100% Rewrite made from scratch...
|
|
|
11
11
|
- Lowest CPU Usage
|
|
12
12
|
- Very fast (mine take less than 1 second to load an song!)
|
|
13
13
|
- 1 Player created = ~1 - 0,5 mb per player
|
|
14
|
-
- Auto clean Up memory when song finishes / bot leave the vc
|
|
14
|
+
- Auto clean Up memory when song finishes / bot leave the vc (Now Options supported!)
|
|
15
15
|
- Plugin system
|
|
16
16
|
- Lavalink v4 support (din't test v3)
|
|
17
|
-
- Youtube and Spotify support
|
|
17
|
+
- Youtube and Spotify support (Soundcloud, deezer, vimeo, etc also works...)
|
|
18
18
|
- Minimal Requests to the lavalink server (helps the lavalink recourses!)
|
|
19
|
-
- Easy player, node, aqua
|
|
19
|
+
- Easy player, node, aqua manager
|
|
20
20
|
- Fast responses from rest and node
|
|
21
|
-
- Playlist support (My mix playlists, youtube playlists, spotify playlists)
|
|
21
|
+
- Playlist support (My mix playlists, youtube playlists, spotify playlists, etc)
|
|
22
22
|
- Lyrics Support by Lavalink
|
|
23
23
|
- https://github.com/topi314/LavaLyrics (RECOMMENDED)
|
|
24
24
|
- https://github.com/DRSchlaubi/lyrics.kt (?)
|
|
@@ -29,50 +29,45 @@ This code is based in riffy, but its an 100% Rewrite made from scratch...
|
|
|
29
29
|
|
|
30
30
|
- Example bot: https://github.com/ToddyTheNoobDud/Thorium-Music
|
|
31
31
|
|
|
32
|
-
#
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
-
|
|
38
|
-
-
|
|
39
|
-
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
-
|
|
43
|
-
-
|
|
44
|
-
-
|
|
45
|
-
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
-
|
|
50
|
-
-
|
|
51
|
-
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
-
|
|
55
|
-
-
|
|
56
|
-
|
|
57
|
-
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
- Document + fix destroyPlayer
|
|
72
|
-
|
|
73
|
-
- Remade some stuff in `FetchImage`
|
|
74
|
-
- Use promise.race since only first sucess is required. (will be tested, may revert to promise.any)
|
|
75
|
-
- Use map cuz its faster and more efficient than Objects.
|
|
32
|
+
# Brick by brick, 1.8.0 Update (yay)
|
|
33
|
+
|
|
34
|
+
- Misc changes on FetchImage (improves the overall checking and speed)
|
|
35
|
+
|
|
36
|
+
- Rewrite `AQUA` module
|
|
37
|
+
- Remade the resolve logic (improves the speed by a lot)
|
|
38
|
+
- Fixes many memory usages related to nodes
|
|
39
|
+
- send is no longer required to be Applied (Applied by default now.)
|
|
40
|
+
- Remade some stuff with discord VoiceGateway
|
|
41
|
+
|
|
42
|
+
- Remade `CONNECTION` module
|
|
43
|
+
- Way faster connections (Joining, reconnecting, connected, disconnect)
|
|
44
|
+
- Reduced memory overload by removing useless code
|
|
45
|
+
- Improved early Returns
|
|
46
|
+
|
|
47
|
+
- Remade `NODE` module
|
|
48
|
+
- MANY fixes for the connection logic (fixes reconnection, etc)
|
|
49
|
+
- Fixed memory leaks in heartbeat system (hopefully, reduced memory by a lot.)
|
|
50
|
+
- Faster connection speed and checkings
|
|
51
|
+
- Remade the Options system, improve JSON parsing
|
|
52
|
+
|
|
53
|
+
- Rewrite `PLAYER` module
|
|
54
|
+
- Many memory related fixes
|
|
55
|
+
- Improved the overall code speed by a lot
|
|
56
|
+
- Rewrote setLoop, play, shuffle, replay methods (fixes + performance)
|
|
57
|
+
- Added 2 new options:
|
|
58
|
+
|
|
59
|
+
leaveOnEnd: false, // Optional
|
|
60
|
+
|
|
61
|
+
shouldDeleteMessage: true // Optional
|
|
62
|
+
|
|
63
|
+
- Uses array for better performance and less memory allocation
|
|
64
|
+
- Rewrite the Events handling (speed and recourses fixes)
|
|
65
|
+
|
|
66
|
+
- Updated `TRACK` module
|
|
67
|
+
- Better object handling for internal code.
|
|
68
|
+
- Removed an useless method
|
|
69
|
+
|
|
70
|
+
Thats all for now, im lazy, help me fix code and improve this on github... i can't test properly 😭😭😭
|
|
76
71
|
|
|
77
72
|
# How to install
|
|
78
73
|
|
|
@@ -115,15 +110,12 @@ const nodes = [
|
|
|
115
110
|
];
|
|
116
111
|
|
|
117
112
|
const aqua = new Aqua(client, nodes, {
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
defaultSearchPlatform: "ytsearch",
|
|
123
|
-
restVersion: "v4"
|
|
113
|
+
defaultSearchPlatform: "ytsearch",
|
|
114
|
+
restVersion: "v4",
|
|
115
|
+
autoResume: false,
|
|
116
|
+
infiniteReconnects: true,
|
|
124
117
|
});
|
|
125
118
|
|
|
126
|
-
|
|
127
119
|
client.aqua = aqua;
|
|
128
120
|
|
|
129
121
|
|
|
@@ -1,19 +1,15 @@
|
|
|
1
1
|
const { request } = require("undici");
|
|
2
|
-
|
|
3
2
|
const sourceHandlers = new Map([
|
|
4
3
|
['spotify', uri => fetchThumbnail(`https://open.spotify.com/oembed?url=${uri}`)],
|
|
5
4
|
['youtube', identifier => fetchYouTubeThumbnail(identifier)]
|
|
6
5
|
]);
|
|
7
|
-
|
|
8
6
|
const YOUTUBE_URL_TEMPLATE = quality => id => `https://img.youtube.com/vi/${id}/${quality}.jpg`;
|
|
9
7
|
const YOUTUBE_QUALITIES = ['maxresdefault', 'hqdefault', 'mqdefault', 'default'].map(YOUTUBE_URL_TEMPLATE);
|
|
10
8
|
|
|
11
9
|
async function getImageUrl(info) {
|
|
12
10
|
if (!info?.sourceName || !info?.uri) return null;
|
|
13
|
-
|
|
14
11
|
const handler = sourceHandlers.get(info.sourceName.toLowerCase());
|
|
15
12
|
if (!handler) return null;
|
|
16
|
-
|
|
17
13
|
try {
|
|
18
14
|
return await handler(info.uri);
|
|
19
15
|
} catch (error) {
|
|
@@ -31,18 +27,19 @@ async function fetchThumbnail(url) {
|
|
|
31
27
|
const json = await body.json();
|
|
32
28
|
return json.thumbnail_url || null;
|
|
33
29
|
} catch (error) {
|
|
34
|
-
console.error(
|
|
30
|
+
console.error(`Error fetching thumbnail from ${url}:`, error);
|
|
35
31
|
return null;
|
|
36
32
|
}
|
|
37
33
|
}
|
|
38
34
|
|
|
39
35
|
async function fetchYouTubeThumbnail(identifier) {
|
|
40
|
-
const fetchPromises = YOUTUBE_QUALITIES.map(urlFunc => fetchThumbnail(urlFunc(identifier)));
|
|
41
|
-
|
|
42
36
|
try {
|
|
43
|
-
|
|
37
|
+
const thumbnail = await Promise.race(
|
|
38
|
+
YOUTUBE_QUALITIES.map(urlFunc => fetchThumbnail(urlFunc(identifier)))
|
|
39
|
+
);
|
|
40
|
+
return thumbnail || null;
|
|
44
41
|
} catch (error) {
|
|
45
|
-
console.error('
|
|
42
|
+
console.error('No valid YouTube thumbnail found:', error);
|
|
46
43
|
return null;
|
|
47
44
|
}
|
|
48
45
|
}
|
package/build/structures/Aqua.js
CHANGED
|
@@ -7,25 +7,16 @@ const URL_REGEX = /^https?:\/\//;
|
|
|
7
7
|
|
|
8
8
|
class Aqua extends EventEmitter {
|
|
9
9
|
/**
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
* - "deezer": "dzsearch"
|
|
21
|
-
* - "tidal": "tdsearch"
|
|
22
|
-
* - "applemusic": "amsearch"
|
|
23
|
-
* - "bandcamp": "bcsearch"
|
|
24
|
-
* @param {string} [options.restVersion="v4"] - Version of the REST API.
|
|
25
|
-
* @param {Array<Object>} [options.plugins=[]] - Plugins to load.
|
|
26
|
-
* @param {boolean} [options.autoResume=false] - Automatically resume tracks on reconnect.
|
|
27
|
-
* @param {boolean} [options.infiniteReconnects=false] - Reconnect infinitely (default: false).
|
|
28
|
-
*/
|
|
10
|
+
* @param {Object} client - The client instance.
|
|
11
|
+
* @param {Array<Object>} nodes - An array of node configurations.
|
|
12
|
+
* @param {Object} options - Configuration options for Aqua.
|
|
13
|
+
* @param {Function} options.send - Function to send data.
|
|
14
|
+
* @param {string} [options.defaultSearchPlatform="ytsearch"] - Default search platform.
|
|
15
|
+
* @param {string} [options.restVersion="v4"] - Version of the REST API.
|
|
16
|
+
* @param {Array<Object>} [options.plugins=[]] - Plugins to load.
|
|
17
|
+
* @param {boolean} [options.autoResume=false] - Automatically resume tracks on reconnect.
|
|
18
|
+
* @param {boolean} [options.infiniteReconnects=false] - Reconnect infinitely.
|
|
19
|
+
*/
|
|
29
20
|
constructor(client, nodes, options = {}) {
|
|
30
21
|
super();
|
|
31
22
|
this.validateInputs(client, nodes, options);
|
|
@@ -36,22 +27,21 @@ class Aqua extends EventEmitter {
|
|
|
36
27
|
this.clientId = null;
|
|
37
28
|
this.initiated = false;
|
|
38
29
|
this.options = options;
|
|
39
|
-
|
|
40
30
|
this.shouldDeleteMessage = this.getOption(options, 'shouldDeleteMessage', false);
|
|
41
31
|
this.defaultSearchPlatform = this.getOption(options, 'defaultSearchPlatform', 'ytsearch');
|
|
42
|
-
this.leaveOnEnd =
|
|
32
|
+
this.leaveOnEnd = this.getOption(options, 'leaveOnEnd', true);
|
|
43
33
|
this.restVersion = this.getOption(options, 'restVersion', 'v4');
|
|
44
34
|
this.plugins = this.getOption(options, 'plugins', []);
|
|
45
35
|
this.version = pkgVersion;
|
|
46
36
|
this.send = options.send || this.defaultSendFunction;
|
|
47
37
|
this.autoResume = this.getOption(options, 'autoResume', false);
|
|
48
38
|
this.infiniteReconnects = this.getOption(options, 'infiniteReconnects', false);
|
|
49
|
-
|
|
50
39
|
this.setMaxListeners(0);
|
|
40
|
+
this._leastUsedCache = { nodes: [], timestamp: 0 };
|
|
51
41
|
}
|
|
52
42
|
|
|
53
43
|
getOption(options, key, defaultValue) {
|
|
54
|
-
return
|
|
44
|
+
return Object.prototype.hasOwnProperty.call(options, key) ? options[key] : defaultValue;
|
|
55
45
|
}
|
|
56
46
|
|
|
57
47
|
defaultSendFunction(payload) {
|
|
@@ -59,13 +49,23 @@ class Aqua extends EventEmitter {
|
|
|
59
49
|
if (guild) guild.shard.send(payload);
|
|
60
50
|
}
|
|
61
51
|
|
|
62
|
-
validateInputs(client, nodes
|
|
52
|
+
validateInputs(client, nodes) {
|
|
63
53
|
if (!client) throw new Error("Client is required to initialize Aqua");
|
|
64
|
-
if (!Array.isArray(nodes) || !nodes.length)
|
|
54
|
+
if (!Array.isArray(nodes) || !nodes.length) {
|
|
55
|
+
throw new Error(`Nodes must be a non-empty Array (Received ${typeof nodes})`);
|
|
56
|
+
}
|
|
65
57
|
}
|
|
66
58
|
|
|
67
59
|
get leastUsedNodes() {
|
|
68
|
-
|
|
60
|
+
const now = Date.now();
|
|
61
|
+
if (now - this._leastUsedCache.timestamp < 50) return this._leastUsedCache.nodes;
|
|
62
|
+
const nodes = [];
|
|
63
|
+
for (const node of this.nodeMap.values()) {
|
|
64
|
+
if (node.connected) nodes.push(node);
|
|
65
|
+
}
|
|
66
|
+
nodes.sort((a, b) => a.rest.calls - b.rest.calls);
|
|
67
|
+
this._leastUsedCache = { nodes, timestamp: now };
|
|
68
|
+
return nodes;
|
|
69
69
|
}
|
|
70
70
|
|
|
71
71
|
init(clientId) {
|
|
@@ -84,45 +84,55 @@ class Aqua extends EventEmitter {
|
|
|
84
84
|
|
|
85
85
|
createNode(options) {
|
|
86
86
|
const nodeId = options.name || options.host;
|
|
87
|
-
this.destroyNode(nodeId);
|
|
87
|
+
this.destroyNode(nodeId);
|
|
88
88
|
const node = new Node(this, options, this.options);
|
|
89
89
|
this.nodeMap.set(nodeId, node);
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
.
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
90
|
+
this._leastUsedCache.timestamp = 0;
|
|
91
|
+
node.connect().then(() => {
|
|
92
|
+
this.emit("nodeCreate", node);
|
|
93
|
+
}).catch(error => {
|
|
94
|
+
this.nodeMap.delete(nodeId);
|
|
95
|
+
throw error;
|
|
96
|
+
});
|
|
96
97
|
return node;
|
|
97
98
|
}
|
|
98
99
|
|
|
99
100
|
destroyNode(identifier) {
|
|
100
101
|
const node = this.nodeMap.get(identifier);
|
|
101
102
|
if (!node) return;
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
.
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
})
|
|
109
|
-
.catch(error => console.error(`Error destroying node ${identifier}:`, error));
|
|
103
|
+
node.disconnect().then(() => {
|
|
104
|
+
node.removeAllListeners();
|
|
105
|
+
this.nodeMap.delete(identifier);
|
|
106
|
+
this._leastUsedCache.timestamp = 0;
|
|
107
|
+
this.emit("nodeDestroy", node);
|
|
108
|
+
}).catch(error => console.error(`Error destroying node ${identifier}:`, error));
|
|
110
109
|
}
|
|
111
110
|
|
|
112
111
|
updateVoiceState({ d, t }) {
|
|
113
112
|
const player = this.players.get(d.guild_id);
|
|
114
|
-
if (player
|
|
115
|
-
|
|
116
|
-
|
|
113
|
+
if (!player) return;
|
|
114
|
+
if (t === "VOICE_SERVER_UPDATE" || (t === "VOICE_STATE_UPDATE" && d.user_id === this.clientId)) {
|
|
115
|
+
const updateMethod = t === "VOICE_SERVER_UPDATE" ? "setServerUpdate" : "setStateUpdate";
|
|
116
|
+
if (player.connection && typeof player.connection[updateMethod] === "function") {
|
|
117
|
+
player.connection[updateMethod](d);
|
|
118
|
+
}
|
|
119
|
+
if (d.status === "disconnected") {
|
|
120
|
+
this.cleanupPlayer(player);
|
|
121
|
+
}
|
|
117
122
|
}
|
|
118
123
|
}
|
|
119
124
|
|
|
120
125
|
fetchRegion(region) {
|
|
121
126
|
if (!region) return this.leastUsedNodes;
|
|
122
127
|
const lowerRegion = region.toLowerCase();
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
128
|
+
const regionNodes = [];
|
|
129
|
+
for (const node of this.nodeMap.values()) {
|
|
130
|
+
if (node.connected && node.regions?.includes(lowerRegion)) {
|
|
131
|
+
regionNodes.push(node);
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
regionNodes.sort((a, b) => this.calculateLoad(a) - this.calculateLoad(b));
|
|
135
|
+
return regionNodes;
|
|
126
136
|
}
|
|
127
137
|
|
|
128
138
|
calculateLoad(node) {
|
|
@@ -133,10 +143,10 @@ class Aqua extends EventEmitter {
|
|
|
133
143
|
|
|
134
144
|
createConnection(options) {
|
|
135
145
|
this.ensureInitialized();
|
|
136
|
-
const
|
|
137
|
-
if (
|
|
138
|
-
|
|
139
|
-
const node =
|
|
146
|
+
const existingPlayer = this.players.get(options.guildId);
|
|
147
|
+
if (existingPlayer && existingPlayer.voiceChannel) return existingPlayer;
|
|
148
|
+
const availableNodes = options.region ? this.fetchRegion(options.region) : this.leastUsedNodes;
|
|
149
|
+
const node = availableNodes[0];
|
|
140
150
|
if (!node) throw new Error("No nodes are available");
|
|
141
151
|
return this.createPlayer(node, options);
|
|
142
152
|
}
|
|
@@ -154,9 +164,8 @@ class Aqua extends EventEmitter {
|
|
|
154
164
|
async destroyPlayer(guildId) {
|
|
155
165
|
const player = this.players.get(guildId);
|
|
156
166
|
if (!player) return;
|
|
157
|
-
|
|
158
167
|
try {
|
|
159
|
-
await player.clearData();
|
|
168
|
+
await player.clearData();
|
|
160
169
|
player.removeAllListeners();
|
|
161
170
|
this.players.delete(guildId);
|
|
162
171
|
this.emit("playerDestroy", player);
|
|
@@ -169,6 +178,7 @@ class Aqua extends EventEmitter {
|
|
|
169
178
|
this.ensureInitialized();
|
|
170
179
|
const requestNode = this.getRequestNode(nodes);
|
|
171
180
|
const formattedQuery = this.formatQuery(query, source);
|
|
181
|
+
|
|
172
182
|
try {
|
|
173
183
|
const response = await requestNode.rest.makeRequest("GET", `/v4/loadtracks?identifier=${encodeURIComponent(formattedQuery)}`);
|
|
174
184
|
if (["empty", "NO_MATCHES"].includes(response.loadType)) {
|
|
@@ -176,7 +186,7 @@ class Aqua extends EventEmitter {
|
|
|
176
186
|
}
|
|
177
187
|
return this.constructorResponse(response, requester, requestNode);
|
|
178
188
|
} catch (error) {
|
|
179
|
-
if (error.name ===
|
|
189
|
+
if (error.name === "AbortError") {
|
|
180
190
|
throw new Error("Request timed out");
|
|
181
191
|
}
|
|
182
192
|
throw new Error(`Failed to resolve track: ${error.message}`);
|
|
@@ -187,7 +197,7 @@ class Aqua extends EventEmitter {
|
|
|
187
197
|
if (nodes && !(typeof nodes === "string" || nodes instanceof Node)) {
|
|
188
198
|
throw new TypeError(`'nodes' must be a string or Node instance, received: ${typeof nodes}`);
|
|
189
199
|
}
|
|
190
|
-
return (typeof nodes ===
|
|
200
|
+
return (typeof nodes === "string" ? this.nodeMap.get(nodes) : nodes) ?? this.leastUsedNodes[0];
|
|
191
201
|
}
|
|
192
202
|
|
|
193
203
|
ensureInitialized() {
|
|
@@ -200,9 +210,11 @@ class Aqua extends EventEmitter {
|
|
|
200
210
|
|
|
201
211
|
async handleNoMatches(rest, query) {
|
|
202
212
|
try {
|
|
203
|
-
const
|
|
213
|
+
const ytIdentifier = `/v4/loadtracks?identifier=https://www.youtube.com/watch?v=${query}`;
|
|
214
|
+
const youtubeResponse = await rest.makeRequest("GET", ytIdentifier);
|
|
204
215
|
if (["empty", "NO_MATCHES"].includes(youtubeResponse.loadType)) {
|
|
205
|
-
|
|
216
|
+
const spotifyIdentifier = `/v4/loadtracks?identifier=https://open.spotify.com/track/${query}`;
|
|
217
|
+
return await rest.makeRequest("GET", spotifyIdentifier);
|
|
206
218
|
}
|
|
207
219
|
return youtubeResponse;
|
|
208
220
|
} catch (error) {
|
|
@@ -216,7 +228,7 @@ class Aqua extends EventEmitter {
|
|
|
216
228
|
exception: null,
|
|
217
229
|
playlistInfo: null,
|
|
218
230
|
pluginInfo: response.pluginInfo ?? {},
|
|
219
|
-
tracks: []
|
|
231
|
+
tracks: []
|
|
220
232
|
};
|
|
221
233
|
|
|
222
234
|
if (response.loadType === "error" || response.loadType === "LOAD_FAILED") {
|
|
@@ -224,7 +236,8 @@ class Aqua extends EventEmitter {
|
|
|
224
236
|
return baseResponse;
|
|
225
237
|
}
|
|
226
238
|
|
|
227
|
-
const trackFactory =
|
|
239
|
+
const trackFactory = trackData => new Track(trackData, requester, requestNode);
|
|
240
|
+
|
|
228
241
|
switch (response.loadType) {
|
|
229
242
|
case "track":
|
|
230
243
|
if (response.data) {
|
|
@@ -235,7 +248,7 @@ class Aqua extends EventEmitter {
|
|
|
235
248
|
if (response.data?.info) {
|
|
236
249
|
baseResponse.playlistInfo = {
|
|
237
250
|
name: response.data.info.name ?? response.data.info.title,
|
|
238
|
-
...response.data.info
|
|
251
|
+
...response.data.info
|
|
239
252
|
};
|
|
240
253
|
}
|
|
241
254
|
baseResponse.tracks = (response.data?.tracks ?? []).map(trackFactory);
|
|
@@ -253,45 +266,10 @@ class Aqua extends EventEmitter {
|
|
|
253
266
|
return player;
|
|
254
267
|
}
|
|
255
268
|
|
|
256
|
-
cleanupIdle() {
|
|
257
|
-
const now = Date.now();
|
|
258
|
-
for (const [guildId, player] of this.players) {
|
|
259
|
-
if (!player.playing && !player.paused && player.queue.isEmpty() && (now - player.lastActivity) > this.options.idleTimeout) {
|
|
260
|
-
this.cleanupPlayer(player);
|
|
261
|
-
}
|
|
262
|
-
}
|
|
263
|
-
}
|
|
264
|
-
|
|
265
269
|
cleanupPlayer(player) {
|
|
266
|
-
if (
|
|
267
|
-
try {
|
|
268
|
-
player.clearData();
|
|
269
|
-
player.removeAllListeners();
|
|
270
|
-
player.destroy();
|
|
270
|
+
if (player && this.players.has(player.guildId)) {
|
|
271
271
|
this.players.delete(player.guildId);
|
|
272
|
-
this.emit("playerDestroy", player);
|
|
273
|
-
} catch (error) {
|
|
274
|
-
console.error(`Error during player cleanup: ${error.message}`);
|
|
275
|
-
}
|
|
276
|
-
}
|
|
277
|
-
|
|
278
|
-
cleanup() {
|
|
279
|
-
for (const player of this.players.values()) {
|
|
280
|
-
this.cleanupPlayer(player);
|
|
281
|
-
}
|
|
282
|
-
for (const node of this.nodeMap.values()) {
|
|
283
|
-
this.destroyNode(node.name || node.host);
|
|
284
272
|
}
|
|
285
|
-
this.nodeMap.clear();
|
|
286
|
-
this.players.clear();
|
|
287
|
-
this.client = null;
|
|
288
|
-
this.nodes = null;
|
|
289
|
-
this.plugins?.forEach(plugin => plugin.unload?.(this));
|
|
290
|
-
this.plugins = null;
|
|
291
|
-
this.options = null;
|
|
292
|
-
this.send = null;
|
|
293
|
-
this.version = null;
|
|
294
|
-
this.removeAllListeners();
|
|
295
273
|
}
|
|
296
274
|
}
|
|
297
275
|
|
|
@@ -1,100 +1,74 @@
|
|
|
1
1
|
class Connection {
|
|
2
2
|
constructor(player) {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
3
|
+
this.playerRef = new WeakRef(player);
|
|
4
|
+
const { voiceChannel, guildId, aqua, nodes } = player;
|
|
5
|
+
this.voice = {
|
|
6
|
+
sessionId: null,
|
|
7
|
+
endpoint: null,
|
|
8
|
+
token: null
|
|
9
|
+
};
|
|
10
|
+
this.region = null;
|
|
11
|
+
this.selfDeaf = false;
|
|
12
|
+
this.selfMute = false;
|
|
13
|
+
this.voiceChannel = voiceChannel;
|
|
14
|
+
this.guildId = guildId;
|
|
15
|
+
this.aqua = aqua;
|
|
16
|
+
this.nodes = nodes;
|
|
16
17
|
}
|
|
17
18
|
|
|
18
19
|
setServerUpdate(data) {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
const { endpoint, token } = data || {};
|
|
21
|
+
if (!endpoint) {
|
|
22
|
+
throw new Error("Missing 'endpoint' property");
|
|
23
|
+
}
|
|
24
|
+
const regionMatch = endpoint.match(/^([a-zA-Z]+)/);
|
|
25
|
+
if (!regionMatch) return;
|
|
26
|
+
const newRegion = regionMatch[1];
|
|
22
27
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
prevRegion
|
|
39
|
-
? `Changed Voice Region from ${prevRegion} to ${newRegion}`
|
|
40
|
-
: `Voice Server: ${newRegion}`
|
|
41
|
-
}`
|
|
42
|
-
);
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
this._updatePlayerVoiceData();
|
|
28
|
+
if (this.region !== newRegion) {
|
|
29
|
+
this.voice.endpoint = endpoint;
|
|
30
|
+
this.voice.token = token;
|
|
31
|
+
const prevRegion = this.region;
|
|
32
|
+
this.region = newRegion;
|
|
33
|
+
this.aqua.emit(
|
|
34
|
+
"debug",
|
|
35
|
+
`[Player ${this.guildId} - CONNECTION] ${
|
|
36
|
+
prevRegion
|
|
37
|
+
? `Changed Voice Region from ${prevRegion} to ${newRegion}`
|
|
38
|
+
: `Voice Server: ${newRegion}`
|
|
39
|
+
}`
|
|
40
|
+
);
|
|
41
|
+
}
|
|
42
|
+
this._updatePlayerVoiceData();
|
|
46
43
|
}
|
|
47
44
|
|
|
48
45
|
setStateUpdate(data) {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
if (!channelId || !sessionId) {
|
|
52
|
-
this._cleanup();
|
|
53
|
-
return;
|
|
54
|
-
}
|
|
46
|
+
const { channel_id: channelId, session_id: sessionId, self_deaf: selfDeaf, self_mute: selfMute } = data || {};
|
|
47
|
+
if (!channelId || !sessionId) return;
|
|
55
48
|
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
this.voice.sessionId = sessionId;
|
|
49
|
+
if (this.voiceChannel !== channelId) {
|
|
50
|
+
this.aqua.emit("playerMove", this.voiceChannel, channelId);
|
|
51
|
+
this.voiceChannel = channelId;
|
|
52
|
+
}
|
|
53
|
+
this.selfDeaf = selfDeaf;
|
|
54
|
+
this.selfMute = selfMute;
|
|
55
|
+
this.voice.sessionId = sessionId;
|
|
64
56
|
}
|
|
65
57
|
|
|
66
58
|
async _updatePlayerVoiceData() {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
_cleanup() {
|
|
81
|
-
const { aqua, player, voiceChannel } = this;
|
|
82
|
-
|
|
83
|
-
aqua.emit("playerLeave", voiceChannel);
|
|
84
|
-
|
|
85
|
-
player.voiceChannel = null;
|
|
86
|
-
this.voiceChannel = null;
|
|
87
|
-
player.destroy();
|
|
88
|
-
|
|
89
|
-
aqua.emit("playerDestroy", player);
|
|
90
|
-
this.player = null;
|
|
91
|
-
this.voice = null;
|
|
92
|
-
this.region = null;
|
|
93
|
-
this.selfDeaf = null;
|
|
94
|
-
this.selfMute = null;
|
|
95
|
-
this.guildId = null;
|
|
96
|
-
this.aqua = null;
|
|
97
|
-
this.nodes = null;
|
|
59
|
+
const player = this.playerRef.deref();
|
|
60
|
+
if (!player) return;
|
|
61
|
+
try {
|
|
62
|
+
await this.nodes.rest.updatePlayer({
|
|
63
|
+
guildId: this.guildId,
|
|
64
|
+
data: {
|
|
65
|
+
voice: this.voice,
|
|
66
|
+
volume: player.volume
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
} catch (err) {
|
|
70
|
+
this.aqua.emit("apiError", "updatePlayer", err);
|
|
71
|
+
}
|
|
98
72
|
}
|
|
99
73
|
}
|
|
100
74
|
|