Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/riffy-team/riffy
Browse files Browse the repository at this point in the history
  • Loading branch information
@Elitex07
Elitex07 committed Jul 1, 2024
2 parents 2d30d5f + 1ab51c9 commit d9e6e51
Show file tree
Hide file tree
Showing 14 changed files with 1,485 additions and 818 deletions.
77 changes: 40 additions & 37 deletions build/index.d.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { EventEmitter } from "events";
import { Collection } from "@discordjs/collection";

export declare class Track {
constructor(data: any, requester: any, node: Node);
Expand Down Expand Up @@ -63,12 +62,12 @@ export declare class Rest extends EventEmitter {
public parseResponse(req: any): Promise<RestResponse | null>;
}

export declare class Queue<T> extends Array<T>{
export declare class Queue extends Array<Track>{
get size(): Number;
get first(): T | null;
get first(): Track | null;

add(track: T): this;
remove(index: Number): T;
add(track: Track): this;
remove(index: Number): Track;
clear(): void;
shuffle(): void;
}
Expand Down Expand Up @@ -107,7 +106,7 @@ export declare class Player extends EventEmitter {
public loop: String;
public filters: Filters;
public data: {};
public queue: Queue<Track>;
public queue: Queue;
public position: Number;
public current: Track;
public previous: Track | null;
Expand Down Expand Up @@ -153,8 +152,14 @@ export declare class Player extends EventEmitter {
private send(data: any): void;
}

export type SearchPlatform = "ytsearch" | "ytmsearch" | "scsearch" | "spsearch" | "amsearch" | "dzsearch" | "ymsearch";
export type SearchPlatform = "ytsearch" | "ytmsearch" | "scsearch" | "spsearch" | "amsearch" | "dzsearch" | "ymsearch" | string;
export type Version = "v3" | "v4";

export type LavalinkTrackLoadException = {
message: string | null,
severity: "common" | "suspicious" | "fault",
cause: string
}
export type nodeResponse = {
/**
* Array of Loaded Tracks
Expand All @@ -175,6 +180,8 @@ export type nodeResponse = {
* Plugin Info
*/
pluginInfo?: any;

exception: LavalinkTrackLoadException | null
}

export type RiffyOptions = {
Expand All @@ -190,31 +197,25 @@ export type RiffyOptions = {
defaultSearchPlatform?: SearchPlatform;
restVersion?: Version;
plugins?: Array<Plugin>;
}
} & Exclude<NodeOptions, "sessionId">

type k = String;
type v = any;

export declare class Riffy extends EventEmitter {
constructor(client: any, nodes: {
name?: String;
host: String;
port: Number;
password: String;
secure: Boolean;
}, options: RiffyOptions);
constructor(client: any, nodes: LavalinkNode[], options: RiffyOptions);
public client: any;
public nodes: Array<LavalinkNode>;
public nodeMap: Collection<k, Node>;
public players: Collection<k, Player>;
public nodeMap: Map<k, Node>;
public players: Map<k, Player>;
public options: RiffyOptions;
public clientId: String;
public initiated: Boolean;
public send: RiffyOptions["send"];
public defaultSearchPlatform: String;
public restVersion: NodeOptions["restVersion"];
public restVersion: RiffyOptions["restVersion"];

public readonly leastUsedNodes: Array<LavalinkNode>;
public readonly leastUsedNodes: Array<Node>;

public init(clientId: String): this;

Expand All @@ -231,6 +232,11 @@ export declare class Riffy extends EventEmitter {
voiceChannel: String;
textChannel: String;
deaf?: Boolean;
mute?: boolean;
/**
* @description voice region (rtc Region) used for filtering node based onit
* */
region: string;
}): Player;

public createPlayer(node: Node, options: PlayerOptions): Player;
Expand All @@ -241,6 +247,7 @@ export declare class Riffy extends EventEmitter {
query: String;
source?: String;
requester: any;
node: string | Node
}): Promise<nodeResponse>;


Expand Down Expand Up @@ -288,29 +295,26 @@ export type LavalinkNode = {
password: String;
/**
* Is node connection secured by SSL ?
* @default false
*/
secure: Boolean;
}
secure?: Boolean;

/**
* Voice Regions for the Node
*/
regions?: string[];

} & Partial<NodeOptions>

export type NodeOptions = {
/**
* The rest version of the node
*/
restVersion: "v3" | "v4";
/**
* The send function of the node
*/
send: (payload: {
op: Number;
d: {
guild_id: String;
channel_id: String;
self_deaf: Boolean;
self_mute: Boolean;
}
}) => void;
restVersion: Version;

/**
* The resume key of the node
* The resume key of the node
* Ignored if node `restVersion` is not `v3`
*/
resumeKey?: String;
/**
Expand Down Expand Up @@ -351,10 +355,9 @@ export declare class Node {
public restUrl: String;
private ws: null;

public send: NodeOptions["send"];
public resumeKey: NodeOptions["resumeKey"];
public sessionId: NodeOptions["sessionId"];
public region: String | null;
public regions: string[] | null;
public resumeTimeout: NodeOptions["resumeTimeout"];
public autoResume: NodeOptions["autoResume"];
public reconnectTimeout: NodeOptions["reconnectTimeout"];
Expand Down
11 changes: 8 additions & 3 deletions build/structures/Connection.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@ class Connection {
setServerUpdate(data) {
const { endpoint, token } = data;
if (!endpoint) throw new Error("Session not found");
const previousVoiceRegion = this.region;

this.voice.endpoint = endpoint;
this.voice.token = token;
this.region = endpoint.split(".").shift()?.replace(/[0-9]/g, "") || null;

this.player.riffy.emit("debug", `[Player ${this.player.guildId} - CONNECTION] Received voice server, ${previousVoiceRegion !== null ? `Changed Voice Region from(oldRegion) ${previousVoiceRegion} to(newRegion) ${this.region}` : `Voice Server: ${this.region}`}, Updating Node's Voice Data.`)

if (this.player.paused) {
this.player.riffy.emit(
"debug",
Expand All @@ -39,14 +42,16 @@ class Connection {
setStateUpdate(data) {
const { session_id, channel_id, self_deaf, self_mute } = data;

this.player.riffy.emit("debug", `[Player ${this.player.guildId} - CONNECTION] Received Voice State Update Informing the player ${channel_id !== null ? `Connected to ${this.voiceChannel}` : `Disconnected from ${this.voiceChannel}`}`)

// If player is manually disconnected from VC
if(channel_id == null) {
this.player.destroy();
this.player.emit("playerDestroy", this.player);
this.player.riffy.emit("playerDestroy", this.player);
}

if (this.player.voiceChannel && channel_id && this.player.voiceChannel !== channel_id) {
this.player.emit("playerMove", this.player.voiceChannel, channel_id)
this.player.riffy.emit("playerMove", this.player.voiceChannel, channel_id)
this.player.voiceChannel = channel_id;
this.voiceChannel = channel_id
}
Expand All @@ -65,4 +70,4 @@ class Connection {
}
}

module.exports = { Connection };
module.exports = { Connection };
Loading

0 comments on commit d9e6e51

Please sign in to comment.