linkdave 0.1.5 → 0.1.6
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/dist/client.d.ts +2 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +37 -6
- package/dist/client.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/node.js +1 -3
- package/dist/node.js.map +1 -1
- package/dist/player.d.ts +8 -3
- package/dist/player.d.ts.map +1 -1
- package/dist/player.js +96 -19
- package/dist/player.js.map +1 -1
- package/dist/queue.d.ts +16 -0
- package/dist/queue.d.ts.map +1 -0
- package/dist/queue.js +77 -0
- package/dist/queue.js.map +1 -0
- package/dist/types.d.ts +8 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +1 -1
- package/dist/types.js.map +1 -1
- package/package.json +5 -5
package/dist/client.d.ts
CHANGED
|
@@ -28,8 +28,9 @@ export declare class LinkDaveClient extends EventEmitter {
|
|
|
28
28
|
removePlayer(guildId: string): boolean;
|
|
29
29
|
get players(): ReadonlyMap<string, Player>;
|
|
30
30
|
get clientId(): string;
|
|
31
|
-
handleRaw({ t: event, d: data }: GatewayDispatchPayload):
|
|
31
|
+
handleRaw({ t: event, d: data }: GatewayDispatchPayload): void;
|
|
32
32
|
_sendToShard(guildId: string, payload: GatewayVoiceStateUpdate): void;
|
|
33
|
+
_onPlayerDestroy(guildId: string): void;
|
|
33
34
|
_updatePlayerNode(guildId: string, oldNode: Node, newNode: Node): void;
|
|
34
35
|
}
|
|
35
36
|
//# sourceMappingURL=client.d.ts.map
|
package/dist/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAE7F,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,IAAI,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAGR,aAAa,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAE7F,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,IAAI,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAGR,aAAa,EAOhB,MAAM,YAAY,CAAC;AAQpB,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,KAAK,IAAI,CAAC;AAExF,MAAM,WAAW,qBAAqB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC;IACtB,WAAW,EAAE,aAAa,CAAC;CAC9B;AAGD,MAAM,WAAW,cAAc;IAC3B,EAAE,EAAE,CAAC,CAAC,SAAS,MAAM,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,IAAI,KAAK,IAAI,CAAC;IAClG,IAAI,EAAE,CAAC,CAAC,SAAS,MAAM,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,IAAI,KAAK,IAAI,CAAC;IACpG,GAAG,EAAE,CAAC,CAAC,SAAS,MAAM,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,IAAI,KAAK,IAAI,CAAC;IACnG,IAAI,EAAE,CAAC,CAAC,SAAS,MAAM,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC;CACtF;AAGD,qBAAa,cAAe,SAAQ,YAAY;;gBAMhC,OAAO,EAAE,qBAAqB;IAmB1C,OAAO,CAAC,OAAO,EAAE,WAAW;IAa5B,UAAU,CAAC,IAAI,EAAE,MAAM;IAYvB,IAAI,KAAK,IAAI,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAErC;IAEK,UAAU;IAKhB,aAAa;IAMb,WAAW;IAkBX,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC;IAiBnE,YAAY,CAAC,OAAO,EAAE,MAAM;IAgB5B,IAAI,OAAO,IAAI,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAEzC;IAED,IAAI,QAAQ,WAEX;IAED,SAAS,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,sBAAsB;IAyBvD,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB;IAuE9D,gBAAgB,CAAC,OAAO,EAAE,MAAM;IA8ChC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI;CAOlE"}
|
package/dist/client.js
CHANGED
|
@@ -101,7 +101,7 @@ export class LinkDaveClient extends EventEmitter {
|
|
|
101
101
|
get clientId() {
|
|
102
102
|
return this.#clientId;
|
|
103
103
|
}
|
|
104
|
-
|
|
104
|
+
handleRaw({ t: event, d: data }) {
|
|
105
105
|
switch (event) {
|
|
106
106
|
case GatewayDispatchEvents.VoiceStateUpdate: {
|
|
107
107
|
// https://discord.com/developers/docs/resources/voice#voice-state-object
|
|
@@ -110,7 +110,7 @@ export class LinkDaveClient extends EventEmitter {
|
|
|
110
110
|
if (data.user_id !== this.#clientId)
|
|
111
111
|
return;
|
|
112
112
|
const player = this.#players.get(data.guild_id);
|
|
113
|
-
|
|
113
|
+
void player?.handleVoiceStateUpdate({
|
|
114
114
|
user_id: data.user_id,
|
|
115
115
|
channel_id: data.channel_id,
|
|
116
116
|
session_id: data.session_id
|
|
@@ -119,7 +119,7 @@ export class LinkDaveClient extends EventEmitter {
|
|
|
119
119
|
}
|
|
120
120
|
case GatewayDispatchEvents.VoiceServerUpdate: {
|
|
121
121
|
const player = this.#players.get(data.guild_id);
|
|
122
|
-
|
|
122
|
+
void player?.handleVoiceServerUpdate(data);
|
|
123
123
|
break;
|
|
124
124
|
}
|
|
125
125
|
}
|
|
@@ -130,11 +130,12 @@ export class LinkDaveClient extends EventEmitter {
|
|
|
130
130
|
#setupNodeListeners(node) {
|
|
131
131
|
node.on(EventName.Ready, (data) => this.emit(EventName.Ready, data));
|
|
132
132
|
node.on(EventName.PlayerUpdate, (data) => this.#handlePlayerUpdate(node, data));
|
|
133
|
-
node.on(EventName.TrackStart, (data) => this.#
|
|
134
|
-
node.on(EventName.TrackEnd, (data) => this.#
|
|
133
|
+
node.on(EventName.TrackStart, (data) => this.#handleTrackStart(node, data));
|
|
134
|
+
node.on(EventName.TrackEnd, (data) => this.#handleTrackEnd(node, data));
|
|
135
135
|
node.on(EventName.TrackError, (data) => this.#forwardPlayerEvent(node, data.guild_id, EventName.TrackError, data));
|
|
136
|
+
node.on(EventName.QueueError, (data) => this.#forwardPlayerEvent(node, data.guild_id, EventName.QueueError, data));
|
|
136
137
|
node.on(EventName.VoiceConnect, (data) => this.#forwardPlayerEvent(node, data.guild_id, EventName.VoiceConnect, data));
|
|
137
|
-
node.on(EventName.VoiceDisconnect, (data) => this.#
|
|
138
|
+
node.on(EventName.VoiceDisconnect, (data) => this.#handleVoiceDisconnect(node, data));
|
|
138
139
|
node.on(EventName.Pong, () => this.emit(EventName.Pong, undefined));
|
|
139
140
|
node.on(EventName.Stats, (data) => this.emit(EventName.Stats, data));
|
|
140
141
|
node.on(EventName.NodeDraining, (data) => this.#handleNodeDraining(node, data));
|
|
@@ -155,6 +156,36 @@ export class LinkDaveClient extends EventEmitter {
|
|
|
155
156
|
player._updateState(data);
|
|
156
157
|
this.emit(EventName.PlayerUpdate, data);
|
|
157
158
|
}
|
|
159
|
+
#handleTrackStart(node, data) {
|
|
160
|
+
const player = this.#players.get(data.guild_id);
|
|
161
|
+
if (player?.node !== node)
|
|
162
|
+
return;
|
|
163
|
+
player._onTrackStart(data);
|
|
164
|
+
this.emit(EventName.TrackStart, data);
|
|
165
|
+
}
|
|
166
|
+
#handleTrackEnd(node, data) {
|
|
167
|
+
const player = this.#players.get(data.guild_id);
|
|
168
|
+
if (player?.node !== node)
|
|
169
|
+
return;
|
|
170
|
+
player._onTrackEnd(data);
|
|
171
|
+
this.emit(EventName.TrackEnd, data);
|
|
172
|
+
}
|
|
173
|
+
#handleVoiceDisconnect(node, data) {
|
|
174
|
+
const player = this.#players.get(data.guild_id);
|
|
175
|
+
if (player?.node !== node)
|
|
176
|
+
return;
|
|
177
|
+
player._onVoiceDisconnect();
|
|
178
|
+
this.emit(EventName.VoiceDisconnect, data);
|
|
179
|
+
player.node.decrementPlayerCount();
|
|
180
|
+
this.#players.delete(data.guild_id);
|
|
181
|
+
}
|
|
182
|
+
_onPlayerDestroy(guildId) {
|
|
183
|
+
const player = this.#players.get(guildId);
|
|
184
|
+
if (!player)
|
|
185
|
+
return;
|
|
186
|
+
player.node.decrementPlayerCount();
|
|
187
|
+
this.#players.delete(guildId);
|
|
188
|
+
}
|
|
158
189
|
async #handleNodeDraining(node, data) {
|
|
159
190
|
this.emit(EventName.NodeDraining, data);
|
|
160
191
|
const promises = [];
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,IAAI,EAAoB,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,MAAM,EAAsB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,IAAI,EAAoB,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,MAAM,EAAsB,MAAM,aAAa,CAAC;AAYzD,OAAO,EACH,SAAS,EACT,gBAAgB,EACnB,MAAM,YAAY,CAAC;AAEpB,MAAM,eAAe,GAAG,aAAa,CAAC;AAkBtC,4EAA4E;AAC5E,MAAM,OAAO,cAAe,SAAQ,YAAY;IACnC,SAAS,CAAS;IAClB,YAAY,CAAgB;IAC5B,MAAM,GAAG,IAAI,GAAG,EAAgB,CAAC;IACjC,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE9C,YAAY,OAA8B;QACtC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;QAExC,IAAI,CAAC,SAAS,GAAG,MAAM;aAClB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAE,EAAE,QAAQ,CAAC;aAC5C,QAAQ,EAAE,CAAC;QAEhB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;QAC3F,CAAC;QAED,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAChB,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBACnC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC3B,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO,CAAC,OAAoB;QACxB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,SAAS,OAAO,CAAC,IAAI,kBAAkB,CAAC,CAAC;QAC7D,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QAE9C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,IAAY;QACnB,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QAExB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,CAAC,UAAU,EAAE,CAAC;QAElB,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QAEjD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,UAAU;QACZ,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5E,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED,aAAa;QACT,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YACtC,IAAI,CAAC,UAAU,EAAE,CAAC;QACtB,CAAC;IACL,CAAC;IAED,WAAW;QACP,IAAI,QAA0B,CAAC;QAC/B,IAAI,WAAW,GAAG,QAAQ,CAAC;QAE3B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YACtC,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnC,SAAS;YACb,CAAC;YAED,IAAI,IAAI,CAAC,WAAW,GAAG,WAAW,EAAE,CAAC;gBACjC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;gBAC/B,QAAQ,GAAG,IAAI,CAAC;YACpB,CAAC;QACL,CAAC;QAED,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,SAAS,CAAC,OAAe,EAAE,OAAwC;QAC/D,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;QAE1B,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAChC,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAElD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAE5B,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,YAAY,CAAC,OAAe;QACxB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,mCAAmC,OAAO,+BAA+B,CAAC,CAAC;QAC/F,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE9B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,SAAS,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAA0B;QACnD,QAAQ,KAAK,EAAE,CAAC;YACZ,KAAK,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,CAAC;gBAC1C,yEAAyE;gBACzE,IAAI,CAAC,IAAI,CAAC,QAAQ;oBAAE,OAAO;gBAC3B,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,SAAS;oBAAE,OAAO;gBAE5C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAChD,KAAK,MAAM,EAAE,sBAAsB,CAAC;oBAChC,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;iBAC9B,CAAC,CAAC;gBAEH,MAAM;YACV,CAAC;YACD,KAAK,qBAAqB,CAAC,iBAAiB,CAAC,CAAC,CAAC;gBAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAChD,KAAK,MAAM,EAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC;gBAE3C,MAAM;YACV,CAAC;QACL,CAAC;IACL,CAAC;IAED,YAAY,CAAC,OAAe,EAAE,OAAgC;QAC1D,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,mBAAmB,CAAC,IAAU;QAC1B,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAEhF,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;QACnH,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;QACnH,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;QACvH,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAEtF,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QACpE,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QAErE,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAChF,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAEhF,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,mBAAmB,CACf,IAAU,EACV,OAAe,EACf,KAAQ,EACR,IAAe;QAEf,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,IAAI,KAAK,IAAI;YAAE,OAAO;QAElC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAwB,CAAC,CAAC;IAC/C,CAAC;IAED,mBAAmB,CAAC,IAAU,EAAE,IAAyB;QACrD,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,MAAM,EAAE,IAAI,KAAK,IAAI;YAAE,OAAO;QAElC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,iBAAiB,CAAC,IAAU,EAAE,IAAuB;QACjD,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,MAAM,EAAE,IAAI,KAAK,IAAI;YAAE,OAAO;QAElC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,eAAe,CAAC,IAAU,EAAE,IAAqB;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,MAAM,EAAE,IAAI,KAAK,IAAI;YAAE,OAAO;QAElC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,sBAAsB,CAAC,IAAU,EAAE,IAA4B;QAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,MAAM,EAAE,IAAI,KAAK,IAAI;YAAE,OAAO;QAElC,MAAM,CAAC,kBAAkB,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAED,gBAAgB,CAAC,OAAe;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,MAAM;YAAE,OAAO;QAEpB,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,IAAU,EAAE,IAAyB;QAC3D,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QAExC,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YAC1C,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI;gBAAE,SAAS;YAEnC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YACtC,IAAI,CAAC,UAAU,EAAE,CAAC;gBACd,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;gBAChC,SAAS;YACb,CAAC;YAED,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;QAC/C,CAAC;QACD,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED,mBAAmB,CAAC,KAAW,EAAE,IAAyB;QACtD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QAExC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM;YAAE,OAAO;QAEpB,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAU,EAAE,IAAkB;QAC7C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAEjC,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YAC1C,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI;gBAAE,SAAS;YACnC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QACpC,CAAC;QACD,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED,iBAAiB,CAAC,OAAe,EAAE,OAAa,EAAE,OAAa;QAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,IAAI,KAAK,OAAO;YAAE,OAAO;QAErC,OAAO,CAAC,oBAAoB,EAAE,CAAC;QAC/B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IACnC,CAAC;CACJ"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}
|
package/dist/index.js
CHANGED
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}
|
package/dist/node.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
var _a;
|
|
2
1
|
import { EventEmitter } from "node:events";
|
|
3
2
|
import { RESTClient } from "./rest.js";
|
|
4
3
|
import { ClientOpCodes, EventName, Routes, ServerOpCodes } from "./types.js";
|
|
@@ -178,7 +177,7 @@ export class Node extends EventEmitter {
|
|
|
178
177
|
this.#reconnectAttempts = 0;
|
|
179
178
|
}
|
|
180
179
|
#startPingInterval() {
|
|
181
|
-
this.#pingInterval = setInterval(() => this.#send(ClientOpCodes.Ping, undefined),
|
|
180
|
+
this.#pingInterval = setInterval(() => this.#send(ClientOpCodes.Ping, undefined), Node.NODE_PING_INTERVAL);
|
|
182
181
|
}
|
|
183
182
|
#stopPingInterval() {
|
|
184
183
|
if (!this.#pingInterval)
|
|
@@ -227,5 +226,4 @@ export class Node extends EventEmitter {
|
|
|
227
226
|
this.#ws.send(JSON.stringify(message));
|
|
228
227
|
}
|
|
229
228
|
}
|
|
230
|
-
_a = Node;
|
|
231
229
|
//# sourceMappingURL=node.js.map
|
package/dist/node.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.js","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":"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"}
|
package/dist/player.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { type GatewayVoiceServerUpdateDispatchData, type GatewayVoiceStateUpdateDispatchData } from "discord-api-types/v10";
|
|
2
2
|
import type { LinkDaveClient } from "./client.js";
|
|
3
3
|
import type { Node } from "./node.js";
|
|
4
|
-
import
|
|
4
|
+
import { Queue } from "./queue.js";
|
|
5
|
+
import type { MigrateReadyPayload, PlayerUpdatePayload, TrackEndPayload, TrackInfo, TrackStartPayload, VoiceConnectPayload } from "./types.js";
|
|
5
6
|
import { PlayerState } from "./types.js";
|
|
6
7
|
export interface PlayOptions {
|
|
7
8
|
startTime?: number;
|
|
@@ -23,8 +24,9 @@ export declare class Player {
|
|
|
23
24
|
get state(): PlayerState;
|
|
24
25
|
get position(): number;
|
|
25
26
|
get volume(): number;
|
|
26
|
-
get
|
|
27
|
+
get current(): TrackInfo | null;
|
|
27
28
|
get node(): Node;
|
|
29
|
+
get queue(): Queue;
|
|
28
30
|
get playing(): boolean;
|
|
29
31
|
get paused(): boolean;
|
|
30
32
|
get connected(): boolean;
|
|
@@ -32,7 +34,7 @@ export declare class Player {
|
|
|
32
34
|
disconnect(): void;
|
|
33
35
|
handleVoiceStateUpdate(data: RawVoiceStateUpdate): Promise<void>;
|
|
34
36
|
handleVoiceServerUpdate(data: RawVoiceServerUpdate): Promise<void>;
|
|
35
|
-
play(url: string, options?: PlayOptions): Promise<void>;
|
|
37
|
+
play(url: string, options?: PlayOptions, isFromQueue?: boolean): Promise<void>;
|
|
36
38
|
pause(): Promise<void>;
|
|
37
39
|
resume(): Promise<void>;
|
|
38
40
|
stop(): Promise<void>;
|
|
@@ -41,6 +43,9 @@ export declare class Player {
|
|
|
41
43
|
destroy(): Promise<void>;
|
|
42
44
|
moveNode(targetNode: Node): Promise<unknown>;
|
|
43
45
|
_updateState(data: PlayerUpdatePayload): void;
|
|
46
|
+
_onTrackStart(data: TrackStartPayload): void;
|
|
47
|
+
_onTrackEnd(data: TrackEndPayload): void;
|
|
48
|
+
_onVoiceDisconnect(): void;
|
|
44
49
|
_onMigrateReady(data: MigrateReadyPayload): void;
|
|
45
50
|
}
|
|
46
51
|
//# sourceMappingURL=player.d.ts.map
|
package/dist/player.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"player.d.ts","sourceRoot":"","sources":["../src/player.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,oCAAoC,EAAE,KAAK,mCAAmC,EAAE,MAAM,uBAAuB,CAAC;AAE5I,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,EACR,mBAAmB,EACnB,mBAAmB,EACnB,SAAS,EACT,mBAAmB,
|
|
1
|
+
{"version":3,"file":"player.d.ts","sourceRoot":"","sources":["../src/player.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,oCAAoC,EAAE,KAAK,mCAAmC,EAAE,MAAM,uBAAuB,CAAC;AAE5I,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,EACR,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf,SAAS,EACT,iBAAiB,EACjB,mBAAmB,EAGtB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAa,WAAW,EAAkB,MAAM,YAAY,CAAC;AAGpE,MAAM,WAAW,WAAW;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,mCAAmC,EAAE,SAAS,GAAG,YAAY,GAAG,YAAY,CAAC,CAAC;AACrH,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,oCAAoC,EAAE,OAAO,GAAG,UAAU,GAAG,UAAU,CAAC,CAAC;AAcjH,qBAAa,MAAM;;IACf,gBAAuB,eAAe,SAAU;gBAoBpC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,aAAa;IAUxF,IAAI,OAAO,WAEV;IAED,IAAI,cAAc,kBAEjB;IAED,IAAI,KAAK,gBAER;IAED,IAAI,QAAQ,WAEX;IAED,IAAI,MAAM,WAET;IAED,IAAI,OAAO,qBAEV;IAED,IAAI,IAAI,SAEP;IAED,IAAI,KAAK,UAER;IAED,IAAI,OAAO,YAEV;IAED,IAAI,MAAM,YAET;IAED,IAAI,SAAS,YAEZ;IAED,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,SAAyB;IAoD9D,UAAU;IAsBJ,sBAAsB,CAAC,IAAI,EAAE,mBAAmB;IA0BhD,uBAAuB,CAAC,IAAI,EAAE,oBAAoB;IAyDlD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,WAAgB,EAAE,WAAW,UAAQ;IAahE,KAAK;IAIL,MAAM;IAIN,IAAI;IAQJ,IAAI,CAAC,QAAQ,EAAE,MAAM;IAIrB,SAAS,CAAC,MAAM,EAAE,MAAM;IAKxB,OAAO;IAsCP,QAAQ,CAAC,UAAU,EAAE,IAAI;IAe/B,YAAY,CAAC,IAAI,EAAE,mBAAmB;IAMtC,aAAa,CAAC,IAAI,EAAE,iBAAiB;IAIrC,WAAW,CAAC,IAAI,EAAE,eAAe;IAQjC,kBAAkB;IAQlB,eAAe,CAAC,IAAI,EAAE,mBAAmB;CA4C5C"}
|
package/dist/player.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { GatewayOpcodes } from "discord-api-types/v10";
|
|
2
|
-
import {
|
|
2
|
+
import { Queue } from "./queue.js";
|
|
3
|
+
import { EventName, PlayerState, TrackEndReason } from "./types.js";
|
|
3
4
|
import { unwrap } from "./utils.js";
|
|
4
5
|
export class Player {
|
|
5
6
|
static CONNECT_TIMEOUT = 10_000;
|
|
6
7
|
#client;
|
|
7
8
|
#guildId;
|
|
9
|
+
#queue;
|
|
8
10
|
#node;
|
|
9
11
|
#voiceChannelId = null;
|
|
10
12
|
#selfMute;
|
|
@@ -12,15 +14,17 @@ export class Player {
|
|
|
12
14
|
#state = PlayerState.Idle;
|
|
13
15
|
#position = 0;
|
|
14
16
|
#volume = 100;
|
|
15
|
-
#
|
|
17
|
+
#current = null;
|
|
16
18
|
#voiceState = null;
|
|
17
19
|
#pendingVoice = null;
|
|
20
|
+
#lastServerEvent = null;
|
|
18
21
|
#migrationTarget = null;
|
|
19
22
|
#migrationResolve = null;
|
|
20
23
|
constructor(client, guildId, node, options) {
|
|
21
24
|
this.#client = client;
|
|
22
25
|
this.#guildId = guildId;
|
|
23
26
|
this.#node = node;
|
|
27
|
+
this.#queue = new Queue(this);
|
|
24
28
|
this.#voiceChannelId = options?.voiceChannelId ?? null;
|
|
25
29
|
this.#selfMute = options?.selfMute ?? false;
|
|
26
30
|
this.#selfDeaf = options?.selfDeaf ?? true;
|
|
@@ -40,12 +44,15 @@ export class Player {
|
|
|
40
44
|
get volume() {
|
|
41
45
|
return this.#volume;
|
|
42
46
|
}
|
|
43
|
-
get
|
|
44
|
-
return this.#
|
|
47
|
+
get current() {
|
|
48
|
+
return this.#current;
|
|
45
49
|
}
|
|
46
50
|
get node() {
|
|
47
51
|
return this.#node;
|
|
48
52
|
}
|
|
53
|
+
get queue() {
|
|
54
|
+
return this.#queue;
|
|
55
|
+
}
|
|
49
56
|
get playing() {
|
|
50
57
|
return this.#state === PlayerState.Playing;
|
|
51
58
|
}
|
|
@@ -71,21 +78,35 @@ export class Player {
|
|
|
71
78
|
}
|
|
72
79
|
});
|
|
73
80
|
return new Promise((resolve, reject) => {
|
|
74
|
-
const
|
|
81
|
+
const cleanup = () => {
|
|
75
82
|
this.#node.off(EventName.VoiceConnect, onConnect);
|
|
83
|
+
this.#node.off(EventName.VoiceDisconnect, onDisconnect);
|
|
84
|
+
clearTimeout(timer);
|
|
85
|
+
};
|
|
86
|
+
const timer = setTimeout(() => {
|
|
87
|
+
cleanup();
|
|
88
|
+
this.#pendingVoice = null;
|
|
89
|
+
this.#lastServerEvent = null;
|
|
76
90
|
reject(new Error(`Voice connection timed out for guild "${this.#guildId}"`));
|
|
77
91
|
}, timeoutMs);
|
|
78
92
|
const onConnect = (event) => {
|
|
79
93
|
if (event.guild_id !== this.#guildId)
|
|
80
94
|
return;
|
|
81
|
-
|
|
82
|
-
clearTimeout(timer);
|
|
95
|
+
cleanup();
|
|
83
96
|
resolve(event);
|
|
84
97
|
};
|
|
98
|
+
const onDisconnect = (event) => {
|
|
99
|
+
if (event.guild_id !== this.#guildId)
|
|
100
|
+
return;
|
|
101
|
+
cleanup();
|
|
102
|
+
reject(new Error(`Voice connection failed for guild "${this.#guildId}": ${event.reason ?? "unknown"}`));
|
|
103
|
+
};
|
|
85
104
|
this.#node.on(EventName.VoiceConnect, onConnect);
|
|
105
|
+
this.#node.on(EventName.VoiceDisconnect, onDisconnect);
|
|
86
106
|
});
|
|
87
107
|
}
|
|
88
108
|
disconnect() {
|
|
109
|
+
this.#queue._deactivate();
|
|
89
110
|
this.#client._sendToShard(this.#guildId, {
|
|
90
111
|
op: GatewayOpcodes.VoiceStateUpdate,
|
|
91
112
|
d: {
|
|
@@ -97,37 +118,45 @@ export class Player {
|
|
|
97
118
|
});
|
|
98
119
|
this.#voiceChannelId = null;
|
|
99
120
|
this.#state = PlayerState.Idle;
|
|
100
|
-
this.#
|
|
121
|
+
this.#current = null;
|
|
101
122
|
this.#position = 0;
|
|
102
123
|
this.#voiceState = null;
|
|
103
124
|
this.#pendingVoice = null;
|
|
125
|
+
this.#lastServerEvent = null;
|
|
104
126
|
}
|
|
105
127
|
async handleVoiceStateUpdate(data) {
|
|
106
128
|
if (!data.channel_id) {
|
|
107
129
|
this.#voiceChannelId = null;
|
|
108
130
|
this.#voiceState = null;
|
|
109
131
|
this.#pendingVoice = null;
|
|
132
|
+
this.#lastServerEvent = null;
|
|
110
133
|
if (this.#node.connected) {
|
|
111
|
-
await unwrap(this.#node.sendDisconnect(this.#guildId));
|
|
134
|
+
const [, err] = await unwrap(this.#node.sendDisconnect(this.#guildId));
|
|
135
|
+
if (err)
|
|
136
|
+
this.#node.emit(EventName.Error, err);
|
|
112
137
|
}
|
|
113
138
|
return;
|
|
114
139
|
}
|
|
115
140
|
this.#pendingVoice ??= {};
|
|
116
141
|
this.#pendingVoice.channelId = data.channel_id;
|
|
117
142
|
this.#pendingVoice.sessionId = data.session_id;
|
|
143
|
+
if (!this.#pendingVoice.serverEvent && this.#lastServerEvent && this.#voiceState?.channelId === data.channel_id) {
|
|
144
|
+
this.#pendingVoice.serverEvent = this.#lastServerEvent;
|
|
145
|
+
}
|
|
118
146
|
this.#tryConnectLinkDave();
|
|
119
147
|
}
|
|
120
|
-
// A null endpoint means that the voice server allocated has gone away and is trying to be reallocated.
|
|
121
|
-
// You should attempt to disconnect from the currently connected voice server,
|
|
122
|
-
// and not attempt to reconnect until a new voice server is allocated.
|
|
123
148
|
async handleVoiceServerUpdate(data) {
|
|
124
149
|
if (!data.endpoint) {
|
|
150
|
+
const hadVoiceState = this.#voiceState !== null;
|
|
125
151
|
this.#voiceState = null;
|
|
126
152
|
if (this.#pendingVoice) {
|
|
127
153
|
delete this.#pendingVoice.serverEvent;
|
|
128
154
|
}
|
|
129
|
-
if
|
|
130
|
-
|
|
155
|
+
// Only send disconnect if we had an active voice state to tear down.
|
|
156
|
+
if (hadVoiceState && this.#node.connected) {
|
|
157
|
+
const [, err] = await unwrap(this.#node.sendDisconnect(this.#guildId));
|
|
158
|
+
if (err)
|
|
159
|
+
this.#node.emit(EventName.Error, err);
|
|
131
160
|
}
|
|
132
161
|
return;
|
|
133
162
|
}
|
|
@@ -154,6 +183,7 @@ export class Player {
|
|
|
154
183
|
#connectToLinkDave(channelId, sessionId, event) {
|
|
155
184
|
this.#voiceChannelId = channelId;
|
|
156
185
|
this.#voiceState = { channelId, sessionId, event };
|
|
186
|
+
this.#lastServerEvent = event;
|
|
157
187
|
this.#node.sendVoiceUpdate({
|
|
158
188
|
client_id: this.#client.clientId,
|
|
159
189
|
guild_id: this.#guildId,
|
|
@@ -162,7 +192,12 @@ export class Player {
|
|
|
162
192
|
event
|
|
163
193
|
});
|
|
164
194
|
}
|
|
165
|
-
async play(url, options = {}) {
|
|
195
|
+
async play(url, options = {}, isFromQueue = false) {
|
|
196
|
+
if (!isFromQueue)
|
|
197
|
+
this.#queue._deactivate();
|
|
198
|
+
await this.#sendPlay(url, options);
|
|
199
|
+
}
|
|
200
|
+
async #sendPlay(url, options = {}) {
|
|
166
201
|
await this.#node.sendPlay(this.#guildId, {
|
|
167
202
|
url,
|
|
168
203
|
...(options.startTime !== undefined && { start_time: options.startTime }),
|
|
@@ -176,8 +211,9 @@ export class Player {
|
|
|
176
211
|
await this.#node.sendResume(this.#guildId);
|
|
177
212
|
}
|
|
178
213
|
async stop() {
|
|
214
|
+
this.#queue._deactivate();
|
|
179
215
|
await this.#node.sendStop(this.#guildId);
|
|
180
|
-
this.#
|
|
216
|
+
this.#current = null;
|
|
181
217
|
this.#state = PlayerState.Idle;
|
|
182
218
|
this.#position = 0;
|
|
183
219
|
}
|
|
@@ -190,10 +226,34 @@ export class Player {
|
|
|
190
226
|
}
|
|
191
227
|
async destroy() {
|
|
192
228
|
this.disconnect();
|
|
193
|
-
if (this.#node.connected) {
|
|
194
|
-
|
|
229
|
+
if (!this.#node.connected) {
|
|
230
|
+
this.#client._onPlayerDestroy(this.#guildId);
|
|
231
|
+
return;
|
|
232
|
+
}
|
|
233
|
+
const waitForVoiceDisconnect = this.#waitForNodeVoiceDisconnect(Player.CONNECT_TIMEOUT);
|
|
234
|
+
await unwrap(this.#node.sendDisconnect(this.#guildId));
|
|
235
|
+
if (!(await waitForVoiceDisconnect)) {
|
|
236
|
+
this.#client._onPlayerDestroy(this.#guildId);
|
|
195
237
|
}
|
|
196
|
-
|
|
238
|
+
}
|
|
239
|
+
#waitForNodeVoiceDisconnect(timeoutMs) {
|
|
240
|
+
return new Promise((resolve) => {
|
|
241
|
+
const cleanup = () => {
|
|
242
|
+
this.#node.off(EventName.VoiceDisconnect, onDisconnect);
|
|
243
|
+
clearTimeout(timeout);
|
|
244
|
+
};
|
|
245
|
+
const onDisconnect = (data) => {
|
|
246
|
+
if (data.guild_id !== this.#guildId)
|
|
247
|
+
return;
|
|
248
|
+
cleanup();
|
|
249
|
+
resolve(true);
|
|
250
|
+
};
|
|
251
|
+
const timeout = setTimeout(() => {
|
|
252
|
+
cleanup();
|
|
253
|
+
resolve(false);
|
|
254
|
+
}, timeoutMs);
|
|
255
|
+
this.#node.on(EventName.VoiceDisconnect, onDisconnect);
|
|
256
|
+
});
|
|
197
257
|
}
|
|
198
258
|
async moveNode(targetNode) {
|
|
199
259
|
if (targetNode === this.#node)
|
|
@@ -212,6 +272,23 @@ export class Player {
|
|
|
212
272
|
this.#position = data.position;
|
|
213
273
|
this.#volume = data.volume;
|
|
214
274
|
}
|
|
275
|
+
_onTrackStart(data) {
|
|
276
|
+
this.#current = data.track;
|
|
277
|
+
}
|
|
278
|
+
_onTrackEnd(data) {
|
|
279
|
+
if (!this.#queue.active || this.#queue.size === 0) {
|
|
280
|
+
this.#current = null;
|
|
281
|
+
this.#state = PlayerState.Idle;
|
|
282
|
+
}
|
|
283
|
+
this.#queue._onTrackEnd(data.reason !== TrackEndReason.Stopped);
|
|
284
|
+
}
|
|
285
|
+
_onVoiceDisconnect() {
|
|
286
|
+
this.#voiceState = null;
|
|
287
|
+
this.#pendingVoice = null;
|
|
288
|
+
this.#state = PlayerState.Idle;
|
|
289
|
+
this.#current = null;
|
|
290
|
+
this.#position = 0;
|
|
291
|
+
}
|
|
215
292
|
_onMigrateReady(data) {
|
|
216
293
|
if (!this.#migrationTarget || data.guild_id !== this.#guildId) {
|
|
217
294
|
return;
|
package/dist/player.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"player.js","sourceRoot":"","sources":["../src/player.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"player.js","sourceRoot":"","sources":["../src/player.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAuF,MAAM,uBAAuB,CAAC;AAI5I,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAWnC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AA4BpC,MAAM,OAAO,MAAM;IACR,MAAM,CAAU,eAAe,GAAG,MAAM,CAAC;IAEvC,OAAO,CAAiB;IACxB,QAAQ,CAAS;IACjB,MAAM,CAAQ;IACvB,KAAK,CAAO;IAEZ,eAAe,GAAkB,IAAI,CAAC;IACtC,SAAS,CAAU;IACnB,SAAS,CAAU;IACnB,MAAM,GAAgB,WAAW,CAAC,IAAI,CAAC;IACvC,SAAS,GAAG,CAAC,CAAC;IACd,OAAO,GAAG,GAAG,CAAC;IACd,QAAQ,GAAqB,IAAI,CAAC;IAClC,WAAW,GAAsB,IAAI,CAAC;IACtC,aAAa,GAA6B,IAAI,CAAC;IAC/C,gBAAgB,GAA4B,IAAI,CAAC;IACjD,gBAAgB,GAAgB,IAAI,CAAC;IACrC,iBAAiB,GAAsC,IAAI,CAAC;IAE5D,YAAY,MAAsB,EAAE,OAAe,EAAE,IAAU,EAAE,OAAuB;QACpF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,eAAe,GAAG,OAAO,EAAE,cAAc,IAAI,IAAI,CAAC;QACvD,IAAI,CAAC,SAAS,GAAG,OAAO,EAAE,QAAQ,IAAI,KAAK,CAAC;QAC5C,IAAI,CAAC,SAAS,GAAG,OAAO,EAAE,QAAQ,IAAI,IAAI,CAAC;IAC/C,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,IAAI,cAAc;QACd,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC,OAAO,CAAC;IAC/C,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,CAAC;IAC9C,CAAC;IAED,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC;IACrC,CAAC;IAED,OAAO,CAAC,SAAkB,EAAE,SAAS,GAAG,MAAM,CAAC,eAAe;QAC1D,MAAM,aAAa,GAAG,SAAS,IAAI,IAAI,CAAC,eAAe,CAAC;QACxD,IAAI,CAAC,aAAa,EAAE,CAAC;YACjB,MAAM,IAAI,UAAU,CAAC,8BAA8B,CAAC,CAAC;QACzD,CAAC;QAED,IAAI,CAAC,eAAe,GAAG,aAAa,CAAC;QAErC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE;YACrC,EAAE,EAAE,cAAc,CAAC,gBAAgB;YACnC,CAAC,EAAE;gBACC,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,UAAU,EAAE,aAAa;gBACzB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,SAAS,EAAE,IAAI,CAAC,SAAS;aAC5B;SACJ,CAAC,CAAC;QAEH,OAAO,IAAI,OAAO,CAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACxD,MAAM,OAAO,GAAG,GAAG,EAAE;gBACjB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;gBAClD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;gBACxD,YAAY,CAAC,KAAK,CAAC,CAAC;YACxB,CAAC,CAAC;YAEF,MAAM,KAAK,GAAG,UAAU,CACpB,GAAG,EAAE;gBACD,OAAO,EAAE,CAAC;gBACV,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;gBAC1B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;gBAC7B,MAAM,CAAC,IAAI,KAAK,CAAC,yCAAyC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;YACjF,CAAC,EACD,SAAS,CACZ,CAAC;YAEF,MAAM,SAAS,GAAG,CAAC,KAA0B,EAAE,EAAE;gBAC7C,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ;oBAAE,OAAO;gBAC7C,OAAO,EAAE,CAAC;gBACV,OAAO,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC,CAAC;YAEF,MAAM,YAAY,GAAG,CAAC,KAA6B,EAAE,EAAE;gBACnD,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ;oBAAE,OAAO;gBAC7C,OAAO,EAAE,CAAC;gBACV,MAAM,CAAC,IAAI,KAAK,CAAC,sCAAsC,IAAI,CAAC,QAAQ,MAAM,KAAK,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC;YAC5G,CAAC,CAAC;YAEF,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;YACjD,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACP,CAAC;IAED,UAAU;QACN,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAE1B,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE;YACrC,EAAE,EAAE,cAAc,CAAC,gBAAgB;YACnC,CAAC,EAAE;gBACC,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,UAAU,EAAE,IAAI;gBAChB,SAAS,EAAE,KAAK;gBAChB,SAAS,EAAE,KAAK;aACnB;SACJ,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAAyB;QAClD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;YAC5B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC1B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAE7B,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;gBACvB,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACvE,IAAI,GAAG;oBAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,GAAY,CAAC,CAAC;YAC5D,CAAC;YAED,OAAO;QACX,CAAC;QAED,IAAI,CAAC,aAAa,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,aAAa,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAC/C,IAAI,CAAC,aAAa,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAE/C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,IAAI,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,WAAW,EAAE,SAAS,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;YAC9G,IAAI,CAAC,aAAa,CAAC,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC3D,CAAC;QAED,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,IAA0B;QACpD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC;YAChD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YAExB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACrB,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;YAC1C,CAAC;YAED,qEAAqE;YACrE,IAAI,aAAa,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;gBACxC,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACvE,IAAI,GAAG;oBAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,GAAY,CAAC,CAAC;YAC5D,CAAC;YAED,OAAO;QACX,CAAC;QAED,IAAI,CAAC,aAAa,KAAK,EAAE,CAAC;QAE1B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,QAAQ,CAAC;QAC3E,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC,CAAC,OAAO;QAExE,IAAI,CAAC,aAAa,CAAC,WAAW,GAAG;YAC7B,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ;SACX,CAAC;QAEF,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC/B,CAAC;IAED,mBAAmB;QACf,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC;QACnC,IAAI,CAAC,OAAO,EAAE,SAAS,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YACpE,OAAO;QACX,CAAC;QAED,4CAA4C;QAC5C,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACnF,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;IAC9B,CAAC;IAED,kBAAkB,CAAC,SAAiB,EAAE,SAAiB,EAAE,KAAuB;QAC5E,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;QACnD,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;QAE9B,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC;YACvB,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAChC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,SAAS;YACrB,UAAU,EAAE,SAAS;YACrB,KAAK;SACR,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAW,EAAE,UAAuB,EAAE,EAAE,WAAW,GAAG,KAAK;QAClE,IAAI,CAAC,WAAW;YAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAC5C,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAW,EAAE,UAAuB,EAAE;QAClD,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE;YACrC,GAAG;YACH,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;YACzE,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;SAClE,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,KAAK;QACP,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,IAAI;QACN,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAC1B,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,QAAgB;QACvB,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,MAAc;QAC1B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;QACpD,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,OAAO;QACT,IAAI,CAAC,UAAU,EAAE,CAAC;QAElB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7C,OAAO;QACX,CAAC;QAED,MAAM,sBAAsB,GAAG,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QACxF,MAAM,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEvD,IAAI,CAAC,CAAC,MAAM,sBAAsB,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjD,CAAC;IACL,CAAC;IAED,2BAA2B,CAAC,SAAiB;QACzC,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,EAAE;YACpC,MAAM,OAAO,GAAG,GAAG,EAAE;gBACjB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;gBACxD,YAAY,CAAC,OAAO,CAAC,CAAC;YAC1B,CAAC,CAAC;YAEF,MAAM,YAAY,GAAG,CAAC,IAA4B,EAAE,EAAE;gBAClD,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ;oBAAE,OAAO;gBAC5C,OAAO,EAAE,CAAC;gBACV,OAAO,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC,CAAC;YAEF,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,OAAO,EAAE,CAAC;gBACV,OAAO,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC,EAAE,SAAS,CAAC,CAAC;YAEd,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAgB;QAC3B,IAAI,UAAU,KAAK,IAAI,CAAC,KAAK;YAAE,OAAO;QAEtC,IAAI,CAAC,UAAU,CAAC,SAAS,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC/C,MAAM,IAAI,KAAK,CAAC,gBAAgB,UAAU,CAAC,IAAI,oBAAoB,CAAC,CAAC;QACzE,CAAC;QAED,IAAI,CAAC,gBAAgB,GAAG,UAAU,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE5C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC;QACrC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,YAAY,CAAC,IAAyB;QAClC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,aAAa,CAAC,IAAuB;QACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;IAC/B,CAAC;IAED,WAAW,CAAC,IAAqB;QAC7B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAChD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC;QACnC,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,KAAK,cAAc,CAAC,OAAO,CAAC,CAAC;IACpE,CAAC;IAED,kBAAkB;QACd,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,eAAe,CAAC,IAAyB;QACrC,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5D,OAAO;QACX,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC;QAE3B,sDAAsD;QACtD,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;QACnE,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC;QAExB,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC;gBACvB,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;gBAChC,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,SAAS;gBACtC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,SAAS;gBACtC,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK;aAChC,CAAC,CAAC;QACP,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,KAAK,WAAW,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACjD,MAAM,QAAQ,GAAG;gBACb,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,UAAU,EAAE,IAAI,CAAC,QAAQ;gBACzB,MAAM,EAAE,IAAI,CAAC,MAAM;aACtB,CAAC;YAEF,2DAA2D;YAC3D,MAAM,cAAc,GAAG,CAAC,KAA0B,EAAE,EAAE;gBAClD,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ;oBAAE,OAAO;gBAC7C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;gBACvD,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACtD,CAAC,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QAC1D,CAAC;QAED,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,IAAI,CAAC,IAAI,CAAC,iBAAiB;YAAE,OAAO;QAEpC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAClC,CAAC"}
|
package/dist/queue.d.ts
ADDED
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { Player } from "./player.js";
|
|
2
|
+
export declare class Queue {
|
|
3
|
+
#private;
|
|
4
|
+
constructor(player: Player);
|
|
5
|
+
add(uri: string): this;
|
|
6
|
+
start(): Promise<void>;
|
|
7
|
+
skip(): Promise<void>;
|
|
8
|
+
remove(index: number): string | undefined;
|
|
9
|
+
clear(): void;
|
|
10
|
+
get tracks(): readonly string[];
|
|
11
|
+
get size(): number;
|
|
12
|
+
get active(): boolean;
|
|
13
|
+
_onTrackEnd(finished: boolean): void;
|
|
14
|
+
_deactivate(): void;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=queue.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../src/queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAG1C,qBAAa,KAAK;;gBAKF,MAAM,EAAE,MAAM;IAI1B,GAAG,CAAC,GAAG,EAAE,MAAM;IAKT,KAAK;IAML,IAAI;IAYV,MAAM,CAAC,KAAK,EAAE,MAAM;IAMpB,KAAK;IAKL,IAAI,MAAM,IAAI,SAAS,MAAM,EAAE,CAE9B;IAED,IAAI,IAAI,WAEP;IAED,IAAI,MAAM,YAET;IAED,WAAW,CAAC,QAAQ,EAAE,OAAO;IAwB7B,WAAW;CAUd"}
|
package/dist/queue.js
ADDED
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import { EventName } from "./types.js";
|
|
2
|
+
export class Queue {
|
|
3
|
+
#player;
|
|
4
|
+
#tracks = [];
|
|
5
|
+
#active = false;
|
|
6
|
+
constructor(player) {
|
|
7
|
+
this.#player = player;
|
|
8
|
+
}
|
|
9
|
+
add(uri) {
|
|
10
|
+
this.#tracks.push(uri);
|
|
11
|
+
return this;
|
|
12
|
+
}
|
|
13
|
+
async start() {
|
|
14
|
+
if (this.#tracks.length === 0)
|
|
15
|
+
return;
|
|
16
|
+
this.#active = true;
|
|
17
|
+
await this.#playCurrentTrack();
|
|
18
|
+
}
|
|
19
|
+
async skip() {
|
|
20
|
+
if (!this.#active)
|
|
21
|
+
return;
|
|
22
|
+
if (this.#tracks.length === 0) {
|
|
23
|
+
this.#active = false;
|
|
24
|
+
await this.#player.stop();
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
await this.#playCurrentTrack();
|
|
28
|
+
}
|
|
29
|
+
remove(index) {
|
|
30
|
+
if (index < 0 || index >= this.#tracks.length)
|
|
31
|
+
return undefined;
|
|
32
|
+
const [removed] = this.#tracks.splice(index, 1);
|
|
33
|
+
return removed;
|
|
34
|
+
}
|
|
35
|
+
clear() {
|
|
36
|
+
this.#tracks.length = 0;
|
|
37
|
+
this.#active = false;
|
|
38
|
+
}
|
|
39
|
+
get tracks() {
|
|
40
|
+
return this.#tracks;
|
|
41
|
+
}
|
|
42
|
+
get size() {
|
|
43
|
+
return this.#tracks.length;
|
|
44
|
+
}
|
|
45
|
+
get active() {
|
|
46
|
+
return this.#active;
|
|
47
|
+
}
|
|
48
|
+
_onTrackEnd(finished) {
|
|
49
|
+
if (!this.#active || !finished)
|
|
50
|
+
return;
|
|
51
|
+
if (this.#tracks.length === 0) {
|
|
52
|
+
this.#active = false;
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
const item = this.#tracks.shift();
|
|
56
|
+
if (!item)
|
|
57
|
+
return;
|
|
58
|
+
this.#player
|
|
59
|
+
.play(item, undefined, true)
|
|
60
|
+
.then(() => null, (error_) => {
|
|
61
|
+
const error = error_ instanceof Error ? error_ : new Error(String(error_));
|
|
62
|
+
const payload = { guild_id: this.#player.guildId, url: item, error };
|
|
63
|
+
this.#player.node.emit(EventName.QueueError, payload);
|
|
64
|
+
this._onTrackEnd(true);
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
_deactivate() {
|
|
68
|
+
this.#active = false;
|
|
69
|
+
}
|
|
70
|
+
async #playCurrentTrack() {
|
|
71
|
+
const item = this.#tracks.shift();
|
|
72
|
+
if (!item)
|
|
73
|
+
return;
|
|
74
|
+
await this.#player.play(item, undefined, true);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
//# sourceMappingURL=queue.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../src/queue.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -21,8 +21,7 @@ export declare enum TrackEndReason {
|
|
|
21
21
|
Finished = "finished",
|
|
22
22
|
Stopped = "stopped",
|
|
23
23
|
Replaced = "replaced",
|
|
24
|
-
Error = "error"
|
|
25
|
-
Cleanup = "cleanup"
|
|
24
|
+
Error = "error"
|
|
26
25
|
}
|
|
27
26
|
export declare enum PlayerState {
|
|
28
27
|
Idle = "idle",
|
|
@@ -128,6 +127,11 @@ export interface TrackErrorPayload {
|
|
|
128
127
|
track: TrackInfo;
|
|
129
128
|
error: string;
|
|
130
129
|
}
|
|
130
|
+
export interface QueueErrorPayload {
|
|
131
|
+
guild_id: string;
|
|
132
|
+
url: string;
|
|
133
|
+
error: Error;
|
|
134
|
+
}
|
|
131
135
|
export interface VoiceConnectPayload {
|
|
132
136
|
guild_id: string;
|
|
133
137
|
channel_id: string;
|
|
@@ -167,6 +171,7 @@ export declare enum EventName {
|
|
|
167
171
|
TrackStart = "trackStart",
|
|
168
172
|
TrackEnd = "trackEnd",
|
|
169
173
|
TrackError = "trackError",
|
|
174
|
+
QueueError = "queueError",
|
|
170
175
|
VoiceConnect = "voiceConnect",
|
|
171
176
|
VoiceDisconnect = "voiceDisconnect",
|
|
172
177
|
Pong = "pong",
|
|
@@ -182,6 +187,7 @@ export interface Events {
|
|
|
182
187
|
[EventName.TrackStart]: TrackStartPayload;
|
|
183
188
|
[EventName.TrackEnd]: TrackEndPayload;
|
|
184
189
|
[EventName.TrackError]: TrackErrorPayload;
|
|
190
|
+
[EventName.QueueError]: QueueErrorPayload;
|
|
185
191
|
[EventName.VoiceConnect]: VoiceConnectPayload;
|
|
186
192
|
[EventName.VoiceDisconnect]: VoiceDisconnectPayload;
|
|
187
193
|
[EventName.Pong]: undefined;
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEtC,oBAAY,aAAa;IACrB,IAAI,IAAI;IACR,WAAW,IAAI;IACf,aAAa,IAAI;CACpB;AAED,oBAAY,aAAa;IACrB,IAAI,IAAI;IACR,KAAK,IAAI;IACT,YAAY,IAAI;IAChB,eAAe,IAAI;IACnB,YAAY,IAAI;IAChB,UAAU,IAAI;IACd,QAAQ,IAAI;IACZ,UAAU,IAAI;IACd,KAAK,IAAI;IACT,YAAY,IAAI;IAChB,YAAY,KAAK;CACpB;AAED,oBAAY,cAAc;IACtB,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,KAAK,UAAU;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/dist/types.js
CHANGED
|
@@ -24,7 +24,6 @@ export var TrackEndReason;
|
|
|
24
24
|
TrackEndReason["Stopped"] = "stopped";
|
|
25
25
|
TrackEndReason["Replaced"] = "replaced";
|
|
26
26
|
TrackEndReason["Error"] = "error";
|
|
27
|
-
TrackEndReason["Cleanup"] = "cleanup";
|
|
28
27
|
})(TrackEndReason || (TrackEndReason = {}));
|
|
29
28
|
export var PlayerState;
|
|
30
29
|
(function (PlayerState) {
|
|
@@ -39,6 +38,7 @@ export var EventName;
|
|
|
39
38
|
EventName["TrackStart"] = "trackStart";
|
|
40
39
|
EventName["TrackEnd"] = "trackEnd";
|
|
41
40
|
EventName["TrackError"] = "trackError";
|
|
41
|
+
EventName["QueueError"] = "queueError";
|
|
42
42
|
EventName["VoiceConnect"] = "voiceConnect";
|
|
43
43
|
EventName["VoiceDisconnect"] = "voiceDisconnect";
|
|
44
44
|
EventName["Pong"] = "pong";
|
package/dist/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAEA,MAAM,CAAN,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,iDAAQ,CAAA;IACR,+DAAe,CAAA;IACf,mEAAiB,CAAA;AACrB,CAAC,EAJW,aAAa,KAAb,aAAa,QAIxB;AAED,MAAM,CAAN,IAAY,aAYX;AAZD,WAAY,aAAa;IACrB,iDAAQ,CAAA;IACR,mDAAS,CAAA;IACT,iEAAgB,CAAA;IAChB,uEAAmB,CAAA;IACnB,iEAAgB,CAAA;IAChB,6DAAc,CAAA;IACd,yDAAY,CAAA;IACZ,6DAAc,CAAA;IACd,mDAAS,CAAA;IACT,iEAAgB,CAAA;IAChB,kEAAiB,CAAA;AACrB,CAAC,EAZW,aAAa,KAAb,aAAa,QAYxB;AAED,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAEA,MAAM,CAAN,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,iDAAQ,CAAA;IACR,+DAAe,CAAA;IACf,mEAAiB,CAAA;AACrB,CAAC,EAJW,aAAa,KAAb,aAAa,QAIxB;AAED,MAAM,CAAN,IAAY,aAYX;AAZD,WAAY,aAAa;IACrB,iDAAQ,CAAA;IACR,mDAAS,CAAA;IACT,iEAAgB,CAAA;IAChB,uEAAmB,CAAA;IACnB,iEAAgB,CAAA;IAChB,6DAAc,CAAA;IACd,yDAAY,CAAA;IACZ,6DAAc,CAAA;IACd,mDAAS,CAAA;IACT,iEAAgB,CAAA;IAChB,kEAAiB,CAAA;AACrB,CAAC,EAZW,aAAa,KAAb,aAAa,QAYxB;AAED,MAAM,CAAN,IAAY,cAKX;AALD,WAAY,cAAc;IACtB,uCAAqB,CAAA;IACrB,qCAAmB,CAAA;IACnB,uCAAqB,CAAA;IACrB,iCAAe,CAAA;AACnB,CAAC,EALW,cAAc,KAAd,cAAc,QAKzB;AAED,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACnB,4BAAa,CAAA;IACb,kCAAmB,CAAA;IACnB,gCAAiB,CAAA;AACrB,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB;AAqID,MAAM,CAAN,IAAY,SAkBX;AAlBD,WAAY,SAAS;IACjB,4BAAe,CAAA;IACf,0CAA6B,CAAA;IAC7B,sCAAyB,CAAA;IACzB,kCAAqB,CAAA;IACrB,sCAAyB,CAAA;IACzB,sCAAyB,CAAA;IACzB,0CAA6B,CAAA;IAC7B,gDAAmC,CAAA;IAEnC,0BAAa,CAAA;IACb,4BAAe,CAAA;IAEf,0CAA6B,CAAA;IAC7B,0CAA6B,CAAA;IAE7B,4BAAe,CAAA;IACf,4BAAe,CAAA;AACnB,CAAC,EAlBW,SAAS,KAAT,SAAS,QAkBpB;AAmBD,MAAM,CAAN,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IACxB,uCAAmB,CAAA;IACnB,6CAAyB,CAAA;IACzB,iEAA6C,CAAA;AACjD,CAAC,EAJW,gBAAgB,KAAhB,gBAAgB,QAI3B;AAcD,MAAM,CAAC,MAAM,MAAM,GAAG;IAClB,IAAI,EAAE,CAAC,SAAiB,EAAE,OAAe,EAAE,EAAE,CAAC,aAAa,SAAS,YAAY,OAAO,OAAgB;IACvG,KAAK,EAAE,CAAC,SAAiB,EAAE,OAAe,EAAE,EAAE,CAAC,aAAa,SAAS,YAAY,OAAO,QAAiB;IACzG,MAAM,EAAE,CAAC,SAAiB,EAAE,OAAe,EAAE,EAAE,CAAC,aAAa,SAAS,YAAY,OAAO,SAAkB;IAC3G,IAAI,EAAE,CAAC,SAAiB,EAAE,OAAe,EAAE,EAAE,CAAC,aAAa,SAAS,YAAY,OAAO,OAAgB;IACvG,IAAI,EAAE,CAAC,SAAiB,EAAE,OAAe,EAAE,EAAE,CAAC,aAAa,SAAS,YAAY,OAAO,OAAgB;IACvG,MAAM,EAAE,CAAC,SAAiB,EAAE,OAAe,EAAE,EAAE,CAAC,aAAa,SAAS,YAAY,OAAO,SAAkB;IAC3G,UAAU,EAAE,CAAC,SAAiB,EAAE,OAAe,EAAE,EAAE,CAAC,aAAa,SAAS,YAAY,OAAO,EAAW;CAClG,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "linkdave",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.6",
|
|
4
4
|
"author": "Luna Seemann <luna@wamellow.com> (http://shi.gg)",
|
|
5
5
|
"description": "TypeScript client library for linkdave Discord audio streaming server",
|
|
6
6
|
"repository": {
|
|
@@ -31,9 +31,9 @@
|
|
|
31
31
|
"packageManager": "bun@1.3.10",
|
|
32
32
|
"devDependencies": {
|
|
33
33
|
"@mwlica/eslint": "^1.2.0",
|
|
34
|
-
"@types/node": "^25.
|
|
35
|
-
"typescript": "^
|
|
36
|
-
"typescript-eslint": "^8.
|
|
34
|
+
"@types/node": "^25.6.0",
|
|
35
|
+
"typescript": "^6.0.3",
|
|
36
|
+
"typescript-eslint": "^8.59.0"
|
|
37
37
|
},
|
|
38
38
|
"keywords": [
|
|
39
39
|
"discord",
|
|
@@ -44,6 +44,6 @@
|
|
|
44
44
|
],
|
|
45
45
|
"license": "AGPL-3.0-only",
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"discord-api-types": "^0.38.
|
|
47
|
+
"discord-api-types": "^0.38.47"
|
|
48
48
|
}
|
|
49
49
|
}
|