poru 4.0.0 → 4.1.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/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +1 -0
- package/dist/src/Node.js +5 -5
- package/dist/src/Node.js.map +1 -1
- package/dist/src/Player.d.ts +5 -2
- package/dist/src/Player.js +14 -1
- package/dist/src/Player.js.map +1 -1
- package/dist/src/Poru.d.ts +65 -4
- package/dist/src/Poru.js.map +1 -1
- package/dist/src/Rest.js.map +1 -1
- package/dist/src/guild/Track.js +1 -1
- package/dist/src/guild/Track.js.map +1 -1
- package/index.ts +1 -0
- package/package.json +1 -1
- package/src/Node.ts +5 -14
- package/src/Player.ts +23 -5
- package/src/Poru.ts +81 -8
- package/src/Rest.ts +1 -4
- package/src/guild/Track.ts +2 -3
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -21,4 +21,5 @@ __exportStar(require("./src/Player"), exports);
|
|
|
21
21
|
__exportStar(require("./src/Node"), exports);
|
|
22
22
|
__exportStar(require("./src/Rest"), exports);
|
|
23
23
|
__exportStar(require("./src/Filters"), exports);
|
|
24
|
+
__exportStar(require("./src/guild/Track"), exports);
|
|
24
25
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,+CAA4B;AAC5B,mDAAgC;AAChC,+CAA4B;AAC5B,6CAA0B;AAC1B,6CAA2B;AAC3B,gDAA8B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,+CAA4B;AAC5B,mDAAgC;AAChC,+CAA4B;AAC5B,6CAA0B;AAC1B,6CAA2B;AAC3B,gDAA8B;AAC9B,oDAAiC"}
|
package/dist/index.mjs
CHANGED
package/dist/src/Node.js
CHANGED
|
@@ -151,12 +151,12 @@ class Node {
|
|
|
151
151
|
const player = this.poru.players.get(packet.guildId);
|
|
152
152
|
if (packet.guildId && player)
|
|
153
153
|
player.emit(packet.op, packet);
|
|
154
|
-
this.poru.emit("debug",
|
|
154
|
+
this.poru.emit("debug", `[Web Socket] Lavalink Node Update : ${packet.op} `);
|
|
155
155
|
}
|
|
156
156
|
close(event) {
|
|
157
157
|
this.disconnect();
|
|
158
158
|
this.poru.emit("nodeDisconnect", this, event);
|
|
159
|
-
this.poru.emit("debug",
|
|
159
|
+
this.poru.emit("debug", `[Web Socket] Connection with Lavalink Node (${this.name}) closed with Error code : ${event || "Unknown code"}`);
|
|
160
160
|
if (event !== 1000)
|
|
161
161
|
this.reconnect();
|
|
162
162
|
}
|
|
@@ -164,13 +164,13 @@ class Node {
|
|
|
164
164
|
if (!event)
|
|
165
165
|
return;
|
|
166
166
|
this.poru.emit("nodeError", this, event);
|
|
167
|
-
this.poru.emit("debug",
|
|
167
|
+
this.poru.emit("debug", `[Web Socket] Connection for Lavalink Node (${this.name}) has error code: ${event.code || event}`);
|
|
168
168
|
}
|
|
169
169
|
async getRoutePlannerStatus() {
|
|
170
|
-
return this.rest.get(
|
|
170
|
+
return await this.rest.get(`/v3/routeplanner/status`);
|
|
171
171
|
}
|
|
172
172
|
async unmarkFailedAddress(address) {
|
|
173
|
-
return this.rest.post(
|
|
173
|
+
return this.rest.post(`/v3/routeplanner/free/address`, { address });
|
|
174
174
|
}
|
|
175
175
|
}
|
|
176
176
|
exports.Node = Node;
|
package/dist/src/Node.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Node.js","sourceRoot":"","sources":["../../src/Node.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Node.js","sourceRoot":"","sources":["../../src/Node.ts"],"names":[],"mappings":"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"}
|
package/dist/src/Player.d.ts
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { Poru } from "./Poru";
|
|
2
|
+
import { Poru, ResolveOptions } from "./Poru";
|
|
3
3
|
import { Node } from "./Node";
|
|
4
4
|
import { Track } from "./guild/Track";
|
|
5
5
|
import { Connection } from "./Connection";
|
|
6
6
|
import Queue from "./guild/Queue";
|
|
7
7
|
import { EventEmitter } from "events";
|
|
8
8
|
import { Filters } from "./Filters";
|
|
9
|
+
import { Response } from "./guild/Response";
|
|
10
|
+
import { ConnectionOptions } from "./Poru";
|
|
9
11
|
declare type Loop = "NONE" | "TRACK" | "QUEUE";
|
|
10
12
|
export declare class Player extends EventEmitter {
|
|
11
13
|
poru: Poru;
|
|
@@ -30,7 +32,7 @@ export declare class Player extends EventEmitter {
|
|
|
30
32
|
volume: number;
|
|
31
33
|
constructor(poru: Poru, node: Node, options: any);
|
|
32
34
|
play(): Promise<void>;
|
|
33
|
-
connect(options?:
|
|
35
|
+
connect(options?: ConnectionOptions): void;
|
|
34
36
|
stop(): this;
|
|
35
37
|
pause(toggle?: boolean): this;
|
|
36
38
|
seekTo(position: number): void;
|
|
@@ -43,6 +45,7 @@ export declare class Player extends EventEmitter {
|
|
|
43
45
|
restart(): void;
|
|
44
46
|
move(): void;
|
|
45
47
|
eventHandler(data: any): boolean | Promise<void>;
|
|
48
|
+
resolve({ query, source, requester }: ResolveOptions): Promise<Response>;
|
|
46
49
|
send(data: any): void;
|
|
47
50
|
}
|
|
48
51
|
export {};
|
package/dist/src/Player.js
CHANGED
|
@@ -8,6 +8,7 @@ const Connection_1 = require("./Connection");
|
|
|
8
8
|
const Queue_1 = __importDefault(require("./guild/Queue"));
|
|
9
9
|
const events_1 = require("events");
|
|
10
10
|
const Filters_1 = require("./Filters");
|
|
11
|
+
const Response_1 = require("./guild/Response");
|
|
11
12
|
class Player extends events_1.EventEmitter {
|
|
12
13
|
poru;
|
|
13
14
|
node;
|
|
@@ -171,7 +172,7 @@ class Player extends events_1.EventEmitter {
|
|
|
171
172
|
switch (data.type) {
|
|
172
173
|
case "TrackStartEvent": {
|
|
173
174
|
this.isPlaying = true;
|
|
174
|
-
this.poru.emit("playerStart", this, this.currentTrack
|
|
175
|
+
this.poru.emit("playerStart", this, this.currentTrack);
|
|
175
176
|
break;
|
|
176
177
|
}
|
|
177
178
|
case "TrackEndEvent": {
|
|
@@ -226,6 +227,18 @@ class Player extends events_1.EventEmitter {
|
|
|
226
227
|
}
|
|
227
228
|
}
|
|
228
229
|
}
|
|
230
|
+
async resolve({ query, source, requester }) {
|
|
231
|
+
const regex = /^https?:\/\//;
|
|
232
|
+
if (regex.test(query)) {
|
|
233
|
+
let response = await this.node.rest.get(`/v3/loadtracks?identifier=${encodeURIComponent(query)}`);
|
|
234
|
+
return new Response_1.Response(response, requester);
|
|
235
|
+
}
|
|
236
|
+
else {
|
|
237
|
+
let track = `${source || "ytsearch"}:${query}`;
|
|
238
|
+
let response = await this.node.rest.get(`/v3/loadtracks?identifier=${encodeURIComponent(track)}`);
|
|
239
|
+
return new Response_1.Response(response, requester);
|
|
240
|
+
}
|
|
241
|
+
}
|
|
229
242
|
send(data) {
|
|
230
243
|
this.poru.send({ op: 4, d: data });
|
|
231
244
|
}
|
package/dist/src/Player.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Player.js","sourceRoot":"","sources":["../../src/Player.ts"],"names":[],"mappings":";;;;;;AAGA,6CAA0C;AAC1C,0DAAkC;AAClC,mCAAsC;AACtC,uCAAoC;
|
|
1
|
+
{"version":3,"file":"Player.js","sourceRoot":"","sources":["../../src/Player.ts"],"names":[],"mappings":"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"}
|
package/dist/src/Poru.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { Player } from "./Player";
|
|
|
4
4
|
import { EventEmitter } from "events";
|
|
5
5
|
import { Response } from "./guild/Response";
|
|
6
6
|
import { Plugin } from "./Plugin";
|
|
7
|
+
import { Track } from "./guild/Track";
|
|
7
8
|
export interface NodeGroup {
|
|
8
9
|
name: string;
|
|
9
10
|
host: string;
|
|
@@ -27,6 +28,66 @@ export interface PoruOptions {
|
|
|
27
28
|
reconnectTimeout?: number | null;
|
|
28
29
|
reconnectTries?: number | null;
|
|
29
30
|
}
|
|
31
|
+
export interface ConnectionOptions {
|
|
32
|
+
guildId: string;
|
|
33
|
+
voiceChannel: string;
|
|
34
|
+
textChannel: string;
|
|
35
|
+
deaf: boolean;
|
|
36
|
+
mute: boolean;
|
|
37
|
+
region?: string;
|
|
38
|
+
}
|
|
39
|
+
export declare interface Poru {
|
|
40
|
+
/**
|
|
41
|
+
* Emitted when data useful for debugging is produced
|
|
42
|
+
* @eventProperty
|
|
43
|
+
*/
|
|
44
|
+
on(event: 'debug', listener: (info: string) => void): this;
|
|
45
|
+
/**
|
|
46
|
+
* Emitted when lavalink node is connected with poru
|
|
47
|
+
* @eventProperty
|
|
48
|
+
*/
|
|
49
|
+
on(event: 'nodeConnect', listener: (node: Node) => void): this;
|
|
50
|
+
/**
|
|
51
|
+
* Emitted when data useful for debugging is produced
|
|
52
|
+
* @eventProperty
|
|
53
|
+
*/
|
|
54
|
+
on(event: 'nodeDisconnect', listener: (node: Node) => void): this;
|
|
55
|
+
/**
|
|
56
|
+
* Emitted when poru try to reconnect with lavalink node while disconnected
|
|
57
|
+
* @eventProperty
|
|
58
|
+
*/
|
|
59
|
+
on(event: 'nodeReconnect', listener: (node: Node) => void): this;
|
|
60
|
+
/**
|
|
61
|
+
* Emitted when lavalink nodes get an error
|
|
62
|
+
* @eventProperty
|
|
63
|
+
*/
|
|
64
|
+
on(event: 'nodeError', listener: (node: Node, event: any) => void): this;
|
|
65
|
+
/**
|
|
66
|
+
* Emitted whenever player start playing new track
|
|
67
|
+
* @eventProperty
|
|
68
|
+
*/
|
|
69
|
+
on(event: 'playerStart', listener: (player: Player, track: Track) => void): this;
|
|
70
|
+
/**
|
|
71
|
+
* Emitted whenever track ends
|
|
72
|
+
* @eventProperty
|
|
73
|
+
*/
|
|
74
|
+
on(event: 'playerEnd', listener: (player: Player, track: Track) => void): this;
|
|
75
|
+
/**
|
|
76
|
+
* Emitted when player compelete queue and going to disconnect
|
|
77
|
+
* @eventProperty
|
|
78
|
+
*/
|
|
79
|
+
on(event: 'playerDisconnect', listener: (player: Player) => void): this;
|
|
80
|
+
/**
|
|
81
|
+
* Emitted when a track gets stuck while playing
|
|
82
|
+
* @eventProperty
|
|
83
|
+
*/
|
|
84
|
+
on(event: 'playerError', listener: (player: Player, track: Track, data: any) => void): this;
|
|
85
|
+
/**
|
|
86
|
+
* Emitted when the websocket connection to Discord voice servers is closed
|
|
87
|
+
* @eventProperty
|
|
88
|
+
*/
|
|
89
|
+
on(event: 'playerClose', listener: (player: Player, track: Track, data: any) => void): this;
|
|
90
|
+
}
|
|
30
91
|
export declare class Poru extends EventEmitter {
|
|
31
92
|
readonly client: any;
|
|
32
93
|
readonly _nodes: NodeGroup[];
|
|
@@ -42,16 +103,16 @@ export declare class Poru extends EventEmitter {
|
|
|
42
103
|
private packetUpdate;
|
|
43
104
|
addNode(options: NodeGroup): Node;
|
|
44
105
|
removeNode(identifier: string): void;
|
|
45
|
-
getNodeByRegion(region:
|
|
106
|
+
getNodeByRegion(region: string): Node[];
|
|
46
107
|
getNode(identifier?: string): Node | Node[];
|
|
47
|
-
createConnection(options:
|
|
108
|
+
createConnection(options: ConnectionOptions): Player;
|
|
48
109
|
private createPlayer;
|
|
49
|
-
removeConnection(guildId:
|
|
110
|
+
removeConnection(guildId: string): void;
|
|
50
111
|
get leastUsedNodes(): Node[];
|
|
51
112
|
resolve({ query, source, requester }: ResolveOptions, node?: Node): Promise<Response>;
|
|
52
113
|
decodeTrack(track: string, node: Node): Promise<unknown>;
|
|
53
114
|
decodeTracks(tracks: string[], node: Node): Promise<unknown>;
|
|
54
115
|
getLavalinkInfo(name: string): Promise<unknown>;
|
|
55
116
|
getLavalinkStatus(name: string): Promise<unknown>;
|
|
56
|
-
get(guildId:
|
|
117
|
+
get(guildId: string): Player;
|
|
57
118
|
}
|
package/dist/src/Poru.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Poru.js","sourceRoot":"","sources":["../../src/Poru.ts"],"names":[],"mappings":";;;AAAA,iCAA8B;AAC9B,qCAAkC;AAClC,mCAAsC;AACtC,qCAA4C;AAC5C,+CAA4C;AAC5C,qCAAkC;
|
|
1
|
+
{"version":3,"file":"Poru.js","sourceRoot":"","sources":["../../src/Poru.ts"],"names":[],"mappings":"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"}
|
package/dist/src/Rest.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Rest.js","sourceRoot":"","sources":["../../src/Rest.ts"],"names":[],"mappings":";;;AACA,mCAA+B;
|
|
1
|
+
{"version":3,"file":"Rest.js","sourceRoot":"","sources":["../../src/Rest.ts"],"names":[],"mappings":"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"}
|
package/dist/src/guild/Track.js
CHANGED
|
@@ -24,7 +24,7 @@ class Track {
|
|
|
24
24
|
const query = [this.info.author, this.info.title]
|
|
25
25
|
.filter((x) => !!x)
|
|
26
26
|
.join(" - ");
|
|
27
|
-
const result = await poru.resolve({ query, source: poru.options.defaultPlatform || "ytsearch" });
|
|
27
|
+
const result = await poru.resolve({ query, source: poru.options.defaultPlatform || "ytsearch", requester: this.info.requester });
|
|
28
28
|
if (!result || !result.tracks.length)
|
|
29
29
|
return;
|
|
30
30
|
if (this.info.author) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Track.js","sourceRoot":"","sources":["../../../src/guild/Track.ts"],"names":[],"mappings":";;;AAEA,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AAuBzE,MAAa,KAAK;IACP,KAAK,CAAU;IACf,IAAI,CAAa;IAE1B,YAAY,IAAc,EAAC,SAAU;QACnC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG;YACV,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;YAChC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;YAChC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;YACxB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;YACxB,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;YAChC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;YACtB,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG;YAClB,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,0BAA0B,IAAI,CAAC,IAAI,CAAC,UAAU,oBAAoB,IAAI,IAAI;YACpG,SAAS;SACV,CAAC;IACJ,CAAC;IAGK,KAAK,CAAC,OAAO,CAAC,IAAS;QAC3B,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;aAC9C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;aAClB,IAAI,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Track.js","sourceRoot":"","sources":["../../../src/guild/Track.ts"],"names":[],"mappings":";;;AAEA,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AAuBzE,MAAa,KAAK;IACP,KAAK,CAAU;IACf,IAAI,CAAa;IAE1B,YAAY,IAAc,EAAC,SAAU;QACnC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG;YACV,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;YAChC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;YAChC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;YACxB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;YACxB,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;YAChC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;YACtB,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG;YAClB,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,0BAA0B,IAAI,CAAC,IAAI,CAAC,UAAU,oBAAoB,IAAI,IAAI;YACpG,SAAS;SACV,CAAC;IACJ,CAAC;IAGK,KAAK,CAAC,OAAO,CAAC,IAAS;QAC3B,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;aAC9C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;aAClB,IAAI,CAAC,KAAK,CAAC,CAAC;QACf,MAAM,MAAM,GAAO,MAAM,IAAI,CAAC,OAAO,CAAC,EAAC,KAAK,EAAC,MAAM,EAAC,IAAI,CAAC,OAAO,CAAC,eAAe,IAAI,UAAU,EAAC,SAAS,EAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAC,CAAC,CAAC;QAC/H,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM;YAAE,OAAO;QAE7C,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACpB,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,UAAU,CAAC,CAAC;YACjE,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CACtC,CAAC,KAAK,EAAE,EAAE,CACR,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACnB,IAAI,MAAM,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CACnE;gBACD,IAAI,MAAM,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CACxD,KAAK,CAAC,IAAI,CAAC,KAAK,CACjB,CACJ,CAAC;YACF,IAAI,aAAa,EAAE;gBACjB,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC;gBACrD,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,0BAA0B,IAAI,CAAC,IAAI,CAAC,UAAU,oBAAoB,CAAC;gBACrF,IAAI,CAAC,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;gBACjC,OAAO,IAAI,CAAC;aACb;SACF;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACpB,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CACrC,CAAC,KAAe,EAAE,EAAE,CAClB,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;gBACrE,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CACxE,CAAC;YACF,IAAI,YAAY,EAAE;gBAChB,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC;gBACpD,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,0BAA0B,IAAI,CAAC,IAAI,CAAC,UAAU,oBAAoB,CAAC;gBACrF,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC;gBAChC,OAAO,IAAI,CAAC;aACb;SACF;QACD,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;QACxD,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,0BAA0B,IAAI,CAAC,IAAI,CAAC,UAAU,oBAAoB,CAAC;QACrF,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QACpC,OAAO,IAAI,CAAC;IACd,CAAC;CAGF;AAlED,sBAkEC"}
|
package/index.ts
CHANGED
package/package.json
CHANGED
package/src/Node.ts
CHANGED
|
@@ -182,20 +182,13 @@ export class Node {
|
|
|
182
182
|
const player = this.poru.players.get(packet.guildId);
|
|
183
183
|
if (packet.guildId && player) player.emit(packet.op, packet);
|
|
184
184
|
|
|
185
|
-
this.poru.emit("debug"
|
|
186
|
-
this.name,
|
|
187
|
-
`[Web Socket] Lavalink Node Update : ${packet.op} `
|
|
188
|
-
);
|
|
185
|
+
this.poru.emit("debug",`[Web Socket] Lavalink Node Update : ${packet.op} `);
|
|
189
186
|
}
|
|
190
187
|
|
|
191
188
|
private close(event: any): void {
|
|
192
189
|
this.disconnect();
|
|
193
190
|
this.poru.emit("nodeDisconnect", this, event);
|
|
194
|
-
this.poru.emit(
|
|
195
|
-
"debug",
|
|
196
|
-
this.name,
|
|
197
|
-
`[Web Socket] Connection with Lavalink closed with Error code : ${
|
|
198
|
-
event || "Unknown code"
|
|
191
|
+
this.poru.emit("debug",`[Web Socket] Connection with Lavalink Node (${this.name}) closed with Error code : ${event || "Unknown code"
|
|
199
192
|
}`
|
|
200
193
|
);
|
|
201
194
|
if (event !== 1000) this.reconnect();
|
|
@@ -205,20 +198,18 @@ export class Node {
|
|
|
205
198
|
if (!event) return;
|
|
206
199
|
this.poru.emit("nodeError", this, event);
|
|
207
200
|
this.poru.emit(
|
|
208
|
-
"debug"
|
|
209
|
-
this.name,
|
|
210
|
-
`[Web Socket] Connection for Lavalink node has error code: ${
|
|
201
|
+
"debug",`[Web Socket] Connection for Lavalink Node (${this.name}) has error code: ${
|
|
211
202
|
event.code || event
|
|
212
203
|
}`
|
|
213
204
|
);
|
|
214
205
|
}
|
|
215
206
|
|
|
216
207
|
public async getRoutePlannerStatus(): Promise<any> {
|
|
217
|
-
return this.rest.get(
|
|
208
|
+
return await this.rest.get(`/v3/routeplanner/status`)
|
|
218
209
|
}
|
|
219
210
|
|
|
220
211
|
public async unmarkFailedAddress(address: string): Promise<any> {
|
|
221
|
-
return this.rest.post(
|
|
212
|
+
return this.rest.post(`/v3/routeplanner/free/address`,{address})
|
|
222
213
|
|
|
223
214
|
}
|
|
224
215
|
|
package/src/Player.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { Poru } from "./Poru";
|
|
1
|
+
import { Poru, ResolveOptions } from "./Poru";
|
|
2
2
|
import { Node } from "./Node";
|
|
3
3
|
import { Track, trackData } from "./guild/Track";
|
|
4
4
|
import { Connection } from "./Connection";
|
|
5
5
|
import Queue from "./guild/Queue";
|
|
6
6
|
import { EventEmitter } from "events";
|
|
7
7
|
import { Filters } from "./Filters";
|
|
8
|
-
import {
|
|
9
|
-
|
|
8
|
+
import { Response } from "./guild/Response";
|
|
9
|
+
import { ConnectionOptions } from "./Poru";
|
|
10
10
|
type Loop = "NONE" | "TRACK" | "QUEUE";
|
|
11
11
|
|
|
12
12
|
export class Player extends EventEmitter {
|
|
@@ -85,7 +85,7 @@ export class Player extends EventEmitter {
|
|
|
85
85
|
});
|
|
86
86
|
}
|
|
87
87
|
|
|
88
|
-
public connect(options:
|
|
88
|
+
public connect(options: ConnectionOptions = this) {
|
|
89
89
|
let { guildId, voiceChannel, deaf, mute } = options;
|
|
90
90
|
this.send({
|
|
91
91
|
guild_id: guildId,
|
|
@@ -214,7 +214,7 @@ export class Player extends EventEmitter {
|
|
|
214
214
|
switch (data.type) {
|
|
215
215
|
case "TrackStartEvent": {
|
|
216
216
|
this.isPlaying = true;
|
|
217
|
-
this.poru.emit("playerStart", this, this.currentTrack
|
|
217
|
+
this.poru.emit("playerStart", this, this.currentTrack);
|
|
218
218
|
break;
|
|
219
219
|
}
|
|
220
220
|
case "TrackEndEvent": {
|
|
@@ -272,6 +272,24 @@ export class Player extends EventEmitter {
|
|
|
272
272
|
}
|
|
273
273
|
}
|
|
274
274
|
|
|
275
|
+
|
|
276
|
+
async resolve({ query, source, requester }: ResolveOptions) {
|
|
277
|
+
const regex = /^https?:\/\//;
|
|
278
|
+
|
|
279
|
+
if (regex.test(query)) {
|
|
280
|
+
let response = await this.node.rest.get(
|
|
281
|
+
`/v3/loadtracks?identifier=${encodeURIComponent(query)}`
|
|
282
|
+
);
|
|
283
|
+
return new Response(response, requester);
|
|
284
|
+
} else {
|
|
285
|
+
let track = `${source || "ytsearch"}:${query}`;
|
|
286
|
+
let response = await this.node.rest.get(
|
|
287
|
+
`/v3/loadtracks?identifier=${encodeURIComponent(track)}`
|
|
288
|
+
);
|
|
289
|
+
return new Response(response,requester);
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
|
|
275
293
|
public send(data) {
|
|
276
294
|
this.poru.send({ op: 4, d: data });
|
|
277
295
|
}
|
package/src/Poru.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { EventEmitter } from "events";
|
|
|
4
4
|
import { Config as config } from "./config";
|
|
5
5
|
import { Response } from "./guild/Response";
|
|
6
6
|
import { Plugin } from "./Plugin";
|
|
7
|
+
import { Track } from "./guild/Track";
|
|
7
8
|
|
|
8
9
|
export interface NodeGroup {
|
|
9
10
|
name: string;
|
|
@@ -31,6 +32,80 @@ export interface PoruOptions {
|
|
|
31
32
|
reconnectTries?: number | null;
|
|
32
33
|
}
|
|
33
34
|
|
|
35
|
+
export interface ConnectionOptions {
|
|
36
|
+
guildId:string;
|
|
37
|
+
voiceChannel:string;
|
|
38
|
+
textChannel:string;
|
|
39
|
+
deaf:boolean;
|
|
40
|
+
mute:boolean;
|
|
41
|
+
region?:string;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
export declare interface Poru {
|
|
45
|
+
|
|
46
|
+
/**
|
|
47
|
+
* Emitted when data useful for debugging is produced
|
|
48
|
+
* @eventProperty
|
|
49
|
+
*/
|
|
50
|
+
on(event: 'debug', listener: (info: string) => void): this;
|
|
51
|
+
|
|
52
|
+
/**
|
|
53
|
+
* Emitted when lavalink node is connected with poru
|
|
54
|
+
* @eventProperty
|
|
55
|
+
*/
|
|
56
|
+
on(event: 'nodeConnect', listener: (node: Node) => void): this;
|
|
57
|
+
|
|
58
|
+
/**
|
|
59
|
+
* Emitted when data useful for debugging is produced
|
|
60
|
+
* @eventProperty
|
|
61
|
+
*/
|
|
62
|
+
on(event: 'nodeDisconnect', listener: (node:Node) => void): this;
|
|
63
|
+
|
|
64
|
+
/**
|
|
65
|
+
* Emitted when poru try to reconnect with lavalink node while disconnected
|
|
66
|
+
* @eventProperty
|
|
67
|
+
*/
|
|
68
|
+
on(event: 'nodeReconnect', listener: (node:Node) => void): this;
|
|
69
|
+
|
|
70
|
+
/**
|
|
71
|
+
* Emitted when lavalink nodes get an error
|
|
72
|
+
* @eventProperty
|
|
73
|
+
*/
|
|
74
|
+
on(event: 'nodeError', listener: (node: Node, event:any) => void): this;
|
|
75
|
+
|
|
76
|
+
/**
|
|
77
|
+
* Emitted whenever player start playing new track
|
|
78
|
+
* @eventProperty
|
|
79
|
+
*/
|
|
80
|
+
on(event: 'playerStart', listener: (player: Player, track: Track) => void): this;
|
|
81
|
+
|
|
82
|
+
/**
|
|
83
|
+
* Emitted whenever track ends
|
|
84
|
+
* @eventProperty
|
|
85
|
+
*/
|
|
86
|
+
on(event: 'playerEnd', listener: (player: Player, track:Track) => void): this;
|
|
87
|
+
|
|
88
|
+
/**
|
|
89
|
+
* Emitted when player compelete queue and going to disconnect
|
|
90
|
+
* @eventProperty
|
|
91
|
+
*/
|
|
92
|
+
on(event: 'playerDisconnect', listener: (player: Player) => void): this;
|
|
93
|
+
|
|
94
|
+
/**
|
|
95
|
+
* Emitted when a track gets stuck while playing
|
|
96
|
+
* @eventProperty
|
|
97
|
+
*/
|
|
98
|
+
on(event: 'playerError', listener: (player:Player, track: Track,data:any) => void): this;
|
|
99
|
+
|
|
100
|
+
|
|
101
|
+
/**
|
|
102
|
+
* Emitted when the websocket connection to Discord voice servers is closed
|
|
103
|
+
* @eventProperty
|
|
104
|
+
*/
|
|
105
|
+
on(event: 'playerClose', listener: (player:Player, track: Track,data:any) => void): this;
|
|
106
|
+
|
|
107
|
+
}
|
|
108
|
+
|
|
34
109
|
|
|
35
110
|
export class Poru extends EventEmitter {
|
|
36
111
|
public readonly client: any;
|
|
@@ -139,7 +214,7 @@ export class Poru extends EventEmitter {
|
|
|
139
214
|
this.nodes.delete(identifier);
|
|
140
215
|
}
|
|
141
216
|
|
|
142
|
-
public getNodeByRegion(region) {
|
|
217
|
+
public getNodeByRegion(region:string) {
|
|
143
218
|
return [...this.nodes.values()]
|
|
144
219
|
.filter(
|
|
145
220
|
(node) =>
|
|
@@ -167,7 +242,7 @@ export class Poru extends EventEmitter {
|
|
|
167
242
|
return node;
|
|
168
243
|
}
|
|
169
244
|
|
|
170
|
-
public createConnection(options) {
|
|
245
|
+
public createConnection(options:ConnectionOptions):Player {
|
|
171
246
|
const player = this.players.get(options.guildId);
|
|
172
247
|
if (player) return player;
|
|
173
248
|
|
|
@@ -185,14 +260,14 @@ export class Poru extends EventEmitter {
|
|
|
185
260
|
return this.createPlayer(node, options);
|
|
186
261
|
}
|
|
187
262
|
|
|
188
|
-
private createPlayer(node, options) {
|
|
263
|
+
private createPlayer(node:Node, options:ConnectionOptions) {
|
|
189
264
|
const player = new Player(this, node, options);
|
|
190
265
|
this.players.set(options.guildId, player);
|
|
191
266
|
player.connect(options);
|
|
192
267
|
return player;
|
|
193
268
|
}
|
|
194
269
|
|
|
195
|
-
public removeConnection(guildId) {
|
|
270
|
+
public removeConnection(guildId:string) {
|
|
196
271
|
this.players.get(guildId)?.destroy();
|
|
197
272
|
}
|
|
198
273
|
|
|
@@ -208,9 +283,7 @@ export class Poru extends EventEmitter {
|
|
|
208
283
|
const regex = /^https?:\/\//;
|
|
209
284
|
|
|
210
285
|
if (regex.test(query)) {
|
|
211
|
-
let response = await node.rest.get(
|
|
212
|
-
`/v3/loadtracks?identifier=${encodeURIComponent(query)}`
|
|
213
|
-
);
|
|
286
|
+
let response = await node.rest.get(`/v3/loadtracks?identifier=${encodeURIComponent(query)}`);
|
|
214
287
|
return new Response(response, requester);
|
|
215
288
|
} else {
|
|
216
289
|
let track = `${source || "ytsearch"}:${query}`;
|
|
@@ -250,7 +323,7 @@ async getLavalinkVersion(name:string){
|
|
|
250
323
|
}
|
|
251
324
|
*/
|
|
252
325
|
|
|
253
|
-
get(guildId) {
|
|
326
|
+
get(guildId:string) {
|
|
254
327
|
return this.players.get(guildId);
|
|
255
328
|
}
|
|
256
329
|
}
|
package/src/Rest.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Node } from "./Node";
|
|
2
2
|
import { fetch } from "undici";
|
|
3
3
|
import { Poru } from "./Poru";
|
|
4
|
-
import { IVoiceServer } from "./Connection";
|
|
5
4
|
|
|
6
5
|
export interface playOptions {
|
|
7
6
|
guildId: string;
|
|
@@ -26,9 +25,7 @@ export class Rest {
|
|
|
26
25
|
|
|
27
26
|
constructor(poru: Poru, node: Node) {
|
|
28
27
|
this.poru = poru;
|
|
29
|
-
this.url = `http${node.secure ? "s" : ""}://${node.options.host}:${
|
|
30
|
-
node.options.port
|
|
31
|
-
}`;
|
|
28
|
+
this.url = `http${node.secure ? "s" : ""}://${node.options.host}:${node.options.port}`;
|
|
32
29
|
this.sessionId = node.sessionId;
|
|
33
30
|
this.password = node.password;
|
|
34
31
|
}
|
package/src/guild/Track.ts
CHANGED
|
@@ -48,8 +48,7 @@ export class Track {
|
|
|
48
48
|
const query = [this.info.author, this.info.title]
|
|
49
49
|
.filter((x) => !!x)
|
|
50
50
|
.join(" - ");
|
|
51
|
-
|
|
52
|
-
const result:any = await poru.resolve({query,source:poru.options.defaultPlatform || "ytsearch"});
|
|
51
|
+
const result:any = await poru.resolve({query,source:poru.options.defaultPlatform || "ytsearch",requester:this.info.requester});
|
|
53
52
|
if (!result || !result.tracks.length) return;
|
|
54
53
|
|
|
55
54
|
if (this.info.author) {
|
|
@@ -72,7 +71,7 @@ export class Track {
|
|
|
72
71
|
}
|
|
73
72
|
if (this.info.length) {
|
|
74
73
|
const sameDuration = result.tracks.find(
|
|
75
|
-
(track) =>
|
|
74
|
+
(track:trackData) =>
|
|
76
75
|
track.info.length >= (this.info.length ? this.info.length : 0) - 2000 &&
|
|
77
76
|
track.info.length <= (this.info.length ? this.info.length : 0) + 2000
|
|
78
77
|
);
|