linkdave 0.1.6-dev.974add6 → 0.1.6-dev.ade6ce7

package/dist/client.js

@@ -133,9 +133,8 @@ export class LinkDaveClient extends EventEmitter {
         node.on(EventName.TrackEnd, (data) => this.#handleTrackEnd(node, data));
         node.on(EventName.TrackError, (data) => this.#forwardPlayerEvent(node, data.guild_id, EventName.TrackError, data));
         node.on(EventName.QueueError, (data) => this.#forwardPlayerEvent(node, data.guild_id, EventName.QueueError, data));
-        node.on(EventName.VoiceConnect, (data) => this.#forwardPlayerEvent(node, data.guild_id, EventName.VoiceConnect, data));
+        node.on(EventName.VoiceConnect, (data) => this.#handleVoiceConnect(node, data));
         node.on(EventName.VoiceDisconnect, (data) => this.#handleVoiceDisconnect(node, data));
-        node.on(EventName.Pong, () => this.emit(EventName.Pong, undefined));
         node.on(EventName.Stats, (data) => this.emit(EventName.Stats, data));
         node.on(EventName.NodeDraining, (data) => this.#handleNodeDraining(node, data));
         node.on(EventName.MigrateReady, (data) => this.#handleMigrateReady(node, data));
@@ -152,7 +151,7 @@ export class LinkDaveClient extends EventEmitter {
         const player = this.#players.get(data.guild_id);
         if (player?.node !== node)
             return;
-        player._updateState(data);
+        player._onPlayerUpdate(data);
         this.emit(EventName.PlayerUpdate, data);
     }
     #handleTrackStart(node, data) {
@@ -169,6 +168,13 @@ export class LinkDaveClient extends EventEmitter {
         player._onTrackEnd(data);
         this.emit(EventName.TrackEnd, data);
     }
+    #handleVoiceConnect(node, data) {
+        const player = this.#players.get(data.guild_id);
+        if (player?.node !== node)
+            return;
+        player._onVoiceConnect();
+        this.emit(EventName.VoiceConnect, data);
+    }
     #handleVoiceDisconnect(node, data) {
         const player = this.#players.get(data.guild_id);
         if (player?.node !== node)

package/dist/node.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from "node:events";
 import { RESTClient } from "./rest.js";
-import type { Events, PlayPayload, SeekPayload, VoiceUpdatePayload, VolumePayload } from "./types.js";
+import type { Events, PlayPayload, SeekPayload, VoiceUpdatePayload } from "./types.js";
 export interface NodeOptions {
     name: string;
     url: string;
@@ -23,7 +23,6 @@ export interface Node {
 }
 export declare class Node extends EventEmitter {
     #private;
-    private static readonly NODE_PING_INTERVAL;
     readonly name: string;
     readonly url: string;
     readonly rest: RESTClient;
@@ -44,6 +43,5 @@ export declare class Node extends EventEmitter {
     sendResume(guildId: string): Promise<void>;
     sendStop(guildId: string): Promise<void>;
     sendSeek(guildId: string, data: SeekPayload): Promise<void>;
-    sendVolume(guildId: string, data: VolumePayload): Promise<void>;
     sendDisconnect(guildId: string): Promise<void>;
 }

package/dist/node.js

@@ -11,7 +11,6 @@ export var NodeState;
 })(NodeState || (NodeState = {}));
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export class Node extends EventEmitter {
-    static NODE_PING_INTERVAL = 30_000;
     name;
     url;
     rest;
@@ -20,7 +19,6 @@ export class Node extends EventEmitter {
     #sessionId = null;
     #reconnectAttempts = 0;
     #reconnectTimeout = null;
-    #pingInterval = null;
     #state = NodeState.Disconnected;
     #playerCount = 0;
     constructor(options) {
@@ -53,7 +51,6 @@ export class Node extends EventEmitter {
             const onOpen = () => {
                 this.#state = NodeState.Connected;
                 this.#reconnectAttempts = 0;
-                this.#startPingInterval();
                 resolve(null);
             };
             const onError = (event) => {
@@ -70,7 +67,6 @@ export class Node extends EventEmitter {
     }
     disconnect() {
         this.#state = NodeState.Disconnected;
-        this.#stopPingInterval();
         this.#stopReconnect();
         if (this.#ws) {
             this.#ws.close(1_000, "Client disconnect");
@@ -134,9 +130,6 @@ export class Node extends EventEmitter {
             case ServerOpCodes.VoiceDisconnect:
                 this.emit(EventName.VoiceDisconnect, message.d);
                 break;
-            case ServerOpCodes.Pong:
-                this.emit(EventName.Pong, undefined);
-                break;
             case ServerOpCodes.Stats:
                 this.#playerCount = message.d.players;
                 this.#state = message.d.draining ? NodeState.Draining : NodeState.Connected;
@@ -153,7 +146,6 @@ export class Node extends EventEmitter {
     }
     #onClose(event) {
         this.#state = NodeState.Disconnected;
-        this.#stopPingInterval();
         this.emit(EventName.Close, { code: event.code, reason: event.reason });
         if (event.code !== 1_000 && this.#options.autoReconnect && !this.draining && this.#reconnectAttempts < this.#options.maxReconnectAttempts) {
             this.#scheduleReconnect();
@@ -176,15 +168,6 @@ export class Node extends EventEmitter {
         }
         this.#reconnectAttempts = 0;
     }
-    #startPingInterval() {
-        this.#pingInterval = setInterval(() => this.#send(ClientOpCodes.Ping, undefined), Node.NODE_PING_INTERVAL);
-    }
-    #stopPingInterval() {
-        if (!this.#pingInterval)
-            return;
-        clearInterval(this.#pingInterval);
-        this.#pingInterval = null;
-    }
     sendVoiceUpdate(data) {
         this.#send(ClientOpCodes.VoiceUpdate, data);
     }
@@ -206,9 +189,6 @@ export class Node extends EventEmitter {
     async sendSeek(guildId, data) {
         await this.rest.post(Routes.seek(this.#requireSession(), guildId), data);
     }
-    async sendVolume(guildId, data) {
-        await this.rest.patch(Routes.volume(this.#requireSession(), guildId), data);
-    }
     async sendDisconnect(guildId) {
         await this.rest.delete(Routes.disconnect(this.#requireSession(), guildId));
     }

package/dist/player.d.ts

@@ -7,7 +7,6 @@ import type { FiltersPayload, MigrateReadyPayload, PlayerUpdatePayload, TrackEnd
 import { PlayerState } from "./types.js";
 export interface PlayOptions {
     startTime?: number;
-    volume?: number;
     requesterId?: string;
     filters?: FiltersPayload;
 }
@@ -25,8 +24,6 @@ export declare class Player {
     get guildId(): string;
     get voiceChannelId(): string | null;
     get state(): PlayerState;
-    get position(): number;
-    get volume(): number;
     get current(): TrackInfo | null;
     get node(): Node;
     get queue(): Queue;
@@ -43,12 +40,12 @@ export declare class Player {
     resume(): Promise<void>;
     stop(): Promise<void>;
     seek(position: number): Promise<void>;
-    setVolume(volume: number): Promise<void>;
     destroy(): Promise<void>;
     moveNode(targetNode: Node): Promise<unknown>;
-    _updateState(data: PlayerUpdatePayload): void;
+    _onPlayerUpdate(data: PlayerUpdatePayload): void;
     _onTrackStart(data: TrackStartPayload): void;
     _onTrackEnd(data: TrackEndPayload): void;
+    _onVoiceConnect(): void;
     _onVoiceDisconnect(): void;
     _onMigrateReady(data: MigrateReadyPayload): void;
 }

package/dist/player.js

@@ -14,8 +14,6 @@ export class Player {
     #selfMute;
     #selfDeaf;
     #state = PlayerState.Idle;
-    #position = 0;
-    #volume = 100;
     #current = null;
     #voiceState = null;
     #pendingVoice = null;
@@ -39,12 +37,6 @@ export class Player {
     get state() {
         return this.#state;
     }
-    get position() {
-        return this.#position;
-    }
-    get volume() {
-        return this.#volume;
-    }
     get current() {
         return this.#current;
     }
@@ -193,7 +185,6 @@ export class Player {
         await this.#node.sendPlay(this.#guildId, {
             url,
             ...(options.startTime !== undefined && { start_time: options.startTime }),
-            ...(options.volume !== undefined && { volume: options.volume }),
             ...(options.requesterId !== undefined && { requester_id: options.requesterId }),
             ...(filters !== undefined && { filters })
         });
@@ -207,17 +198,12 @@ export class Player {
     async stop() {
         this.#queue._deactivate();
         await this.#node.sendStop(this.#guildId);
-        this.#current = null;
         this.#state = PlayerState.Idle;
-        this.#position = 0;
+        this.#current = null;
     }
     async seek(position) {
         await this.#node.sendSeek(this.#guildId, { position });
     }
-    async setVolume(volume) {
-        this.#volume = Math.max(0, Math.min(1_000, volume));
-        await this.#node.sendVolume(this.#guildId, { volume: this.#volume });
-    }
     async destroy() {
         this.disconnect();
         if (!this.#node.connected) {
@@ -260,13 +246,12 @@ export class Player {
             this.#migrationResolve = resolve;
         });
     }
-    _updateState(data) {
+    _onPlayerUpdate(data) {
         this.#state = data.state;
-        this.#position = data.position;
-        this.#volume = data.volume;
     }
     _onTrackStart(data) {
         this.#current = data.track;
+        this.#state = PlayerState.Playing;
     }
     _onTrackEnd(data) {
         if (!this.#queue.active || this.#queue.size === 0) {
@@ -275,6 +260,11 @@ export class Player {
         }
         this.#queue._onTrackEnd(data.reason !== TrackEndReason.Stopped && data.reason !== TrackEndReason.Replaced);
     }
+    _onVoiceConnect() {
+        if (this.#state !== PlayerState.Connecting)
+            return;
+        this.#state = PlayerState.Idle;
+    }
     #cleanup() {
         this.#voiceChannelId = null;
         this.#queue._deactivate();
@@ -282,7 +272,6 @@ export class Player {
         this.#pendingVoice = null;
         this.#state = PlayerState.Idle;
         this.#current = null;
-        this.#position = 0;
     }
     _onVoiceDisconnect() {
         this.#cleanup();
@@ -313,7 +302,6 @@ export class Player {
                 void this.#node.sendPlay(this.#guildId, {
                     url: data.url,
                     start_time: data.position,
-                    volume: data.volume,
                     ...(data.requester_id !== undefined && { requester_id: data.requester_id }),
                     ...(data.filters !== undefined && { filters: data.filters })
                 });

package/dist/types.d.ts

@@ -1,21 +1,19 @@
 import type { Node } from "./node.js";
 export declare enum ClientOpCodes {
-    Ping = 0,
-    VoiceUpdate = 1,
-    PlayerMigrate = 2
+    VoiceUpdate = 0,
+    PlayerMigrate = 1
 }
 export declare enum ServerOpCodes {
-    Pong = 0,
-    Ready = 1,
-    VoiceConnect = 2,
-    VoiceDisconnect = 3,
-    PlayerUpdate = 4,
-    TrackStart = 5,
-    TrackEnd = 6,
-    TrackError = 7,
-    Stats = 8,
-    NodeDraining = 9,
-    MigrateReady = 10
+    Ready = 0,
+    VoiceConnect = 1,
+    VoiceDisconnect = 2,
+    PlayerUpdate = 3,
+    TrackStart = 4,
+    TrackEnd = 5,
+    TrackError = 6,
+    Stats = 7,
+    NodeDraining = 8,
+    MigrateReady = 9
 }
 export declare enum TrackEndReason {
     Finished = "finished",
@@ -69,9 +67,6 @@ export type ServerMessage = {
 } | {
     op: ServerOpCodes.VoiceDisconnect;
     d: VoiceDisconnectPayload;
-} | {
-    op: ServerOpCodes.Pong;
-    d?: undefined;
 } | {
     op: ServerOpCodes.Stats;
     d: StatsPayload;
@@ -85,9 +80,6 @@ export type ServerMessage = {
 export type ClientMessage = {
     op: ClientOpCodes.VoiceUpdate;
     d: VoiceUpdatePayload;
-} | {
-    op: ClientOpCodes.Ping;
-    d?: undefined;
 } | {
     op: ClientOpCodes.PlayerMigrate;
     d: PlayerMigratePayload;
@@ -107,7 +99,6 @@ export interface VoiceUpdatePayload {
 export interface PlayPayload {
     url: string;
     start_time?: number;
-    volume?: number;
     requester_id?: string;
     filters?: FiltersPayload;
 }
@@ -117,9 +108,6 @@ export interface GuildPayload {
 export interface SeekPayload {
     position: number;
 }
-export interface VolumePayload {
-    volume: number;
-}
 export interface ReadyPayload {
     session_id: string;
     resumed: boolean;
@@ -127,8 +115,6 @@ export interface ReadyPayload {
 export interface PlayerUpdatePayload {
     guild_id: string;
     state: PlayerState;
-    position: number;
-    volume: number;
 }
 export interface TrackInfo {
     url: string;
@@ -186,7 +172,6 @@ export interface MigrateReadyPayload {
     guild_id: string;
     url: string;
     position: number;
-    volume: number;
     state: PlayerState;
     requester_id?: string;
     filters?: FiltersPayload;
@@ -204,7 +189,6 @@ export declare enum EventName {
     QueueError = "queueError",
     VoiceConnect = "voiceConnect",
     VoiceDisconnect = "voiceDisconnect",
-    Pong = "pong",
     Stats = "stats",
     NodeDraining = "nodeDraining",
     MigrateReady = "migrateReady",
@@ -220,7 +204,6 @@ export interface Events {
     [EventName.QueueError]: QueueErrorPayload;
     [EventName.VoiceConnect]: VoiceConnectPayload;
     [EventName.VoiceDisconnect]: VoiceDisconnectPayload;
-    [EventName.Pong]: undefined;
     [EventName.Stats]: StatsPayload;
     [EventName.NodeDraining]: NodeDrainingPayload;
     [EventName.MigrateReady]: MigrateReadyPayload;
@@ -254,6 +237,5 @@ export declare const Routes: {
     readonly resume: (sessionId: string, guildId: string) => `/sessions/${string}/players/${string}/resume`;
     readonly stop: (sessionId: string, guildId: string) => `/sessions/${string}/players/${string}/stop`;
     readonly seek: (sessionId: string, guildId: string) => `/sessions/${string}/players/${string}/seek`;
-    readonly volume: (sessionId: string, guildId: string) => `/sessions/${string}/players/${string}/volume`;
     readonly disconnect: (sessionId: string, guildId: string) => `/sessions/${string}/players/${string}`;
 };

package/dist/types.js

@@ -1,22 +1,20 @@
 export var ClientOpCodes;
 (function (ClientOpCodes) {
-    ClientOpCodes[ClientOpCodes["Ping"] = 0] = "Ping";
-    ClientOpCodes[ClientOpCodes["VoiceUpdate"] = 1] = "VoiceUpdate";
-    ClientOpCodes[ClientOpCodes["PlayerMigrate"] = 2] = "PlayerMigrate";
+    ClientOpCodes[ClientOpCodes["VoiceUpdate"] = 0] = "VoiceUpdate";
+    ClientOpCodes[ClientOpCodes["PlayerMigrate"] = 1] = "PlayerMigrate";
 })(ClientOpCodes || (ClientOpCodes = {}));
 export var ServerOpCodes;
 (function (ServerOpCodes) {
-    ServerOpCodes[ServerOpCodes["Pong"] = 0] = "Pong";
-    ServerOpCodes[ServerOpCodes["Ready"] = 1] = "Ready";
-    ServerOpCodes[ServerOpCodes["VoiceConnect"] = 2] = "VoiceConnect";
-    ServerOpCodes[ServerOpCodes["VoiceDisconnect"] = 3] = "VoiceDisconnect";
-    ServerOpCodes[ServerOpCodes["PlayerUpdate"] = 4] = "PlayerUpdate";
-    ServerOpCodes[ServerOpCodes["TrackStart"] = 5] = "TrackStart";
-    ServerOpCodes[ServerOpCodes["TrackEnd"] = 6] = "TrackEnd";
-    ServerOpCodes[ServerOpCodes["TrackError"] = 7] = "TrackError";
-    ServerOpCodes[ServerOpCodes["Stats"] = 8] = "Stats";
-    ServerOpCodes[ServerOpCodes["NodeDraining"] = 9] = "NodeDraining";
-    ServerOpCodes[ServerOpCodes["MigrateReady"] = 10] = "MigrateReady";
+    ServerOpCodes[ServerOpCodes["Ready"] = 0] = "Ready";
+    ServerOpCodes[ServerOpCodes["VoiceConnect"] = 1] = "VoiceConnect";
+    ServerOpCodes[ServerOpCodes["VoiceDisconnect"] = 2] = "VoiceDisconnect";
+    ServerOpCodes[ServerOpCodes["PlayerUpdate"] = 3] = "PlayerUpdate";
+    ServerOpCodes[ServerOpCodes["TrackStart"] = 4] = "TrackStart";
+    ServerOpCodes[ServerOpCodes["TrackEnd"] = 5] = "TrackEnd";
+    ServerOpCodes[ServerOpCodes["TrackError"] = 6] = "TrackError";
+    ServerOpCodes[ServerOpCodes["Stats"] = 7] = "Stats";
+    ServerOpCodes[ServerOpCodes["NodeDraining"] = 8] = "NodeDraining";
+    ServerOpCodes[ServerOpCodes["MigrateReady"] = 9] = "MigrateReady";
 })(ServerOpCodes || (ServerOpCodes = {}));
 export var TrackEndReason;
 (function (TrackEndReason) {
@@ -63,7 +61,6 @@ export var EventName;
     EventName["QueueError"] = "queueError";
     EventName["VoiceConnect"] = "voiceConnect";
     EventName["VoiceDisconnect"] = "voiceDisconnect";
-    EventName["Pong"] = "pong";
     EventName["Stats"] = "stats";
     EventName["NodeDraining"] = "nodeDraining";
     EventName["MigrateReady"] = "migrateReady";
@@ -82,6 +79,5 @@ export const Routes = {
     resume: (sessionId, guildId) => `/sessions/${sessionId}/players/${guildId}/resume`,
     stop: (sessionId, guildId) => `/sessions/${sessionId}/players/${guildId}/stop`,
     seek: (sessionId, guildId) => `/sessions/${sessionId}/players/${guildId}/seek`,
-    volume: (sessionId, guildId) => `/sessions/${sessionId}/players/${guildId}/volume`,
     disconnect: (sessionId, guildId) => `/sessions/${sessionId}/players/${guildId}`
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "linkdave",
-    "version": "0.1.6-dev.974add6",
+    "version": "0.1.6-dev.ade6ce7",
     "author": "Luna Seemann <luna@wamellow.com> (http://shi.gg)",
     "description": "TypeScript client library for linkdave Discord audio streaming server",
     "repository": {