@discordjs/voice 0.11.0-dev.1654819794-2791c86 → 0.11.0-dev.1654949069-96053ba

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { TypedEmitter } from 'tiny-typed-emitter';
+import EventEmitter, { EventEmitter as EventEmitter$1 } from 'node:events';
 import { Readable, ReadableOptions } from 'node:stream';
 import prism from 'prism-media';
 import WebSocket, { MessageEvent } from 'ws';
@@ -209,29 +209,6 @@ declare class AudioPlayerError extends Error {
     constructor(error: Error, resource: AudioResource);
 }
 
-/**
- * Represents a subscription of a voice connection to an audio player, allowing
- * the audio player to play audio on the voice connection.
- */
-declare class PlayerSubscription {
-    /**
-     * The voice connection of this subscription.
-     */
-    readonly connection: VoiceConnection;
-    /**
-     * The audio player of this subscription.
-     */
-    readonly player: AudioPlayer;
-    constructor(connection: VoiceConnection, player: AudioPlayer);
-    /**
-     * Unsubscribes the connection from the audio player, meaning that the
-     * audio player cannot stream audio to it until a new subscription is made.
-     */
-    unsubscribe(): void;
-}
-
-declare type Awaited<T> = T | Promise<T>;
-
 /**
  * Describes the behavior of the player when an audio packet is played but there are no available
  * voice connections to play to.
@@ -349,17 +326,14 @@ interface AudioPlayerPausedState {
  * The various states that the player can be in.
  */
 declare type AudioPlayerState = AudioPlayerIdleState | AudioPlayerBufferingState | AudioPlayerPlayingState | AudioPlayerPausedState;
-declare type AudioPlayerEvents = {
-    error: (error: AudioPlayerError) => Awaited<void>;
-    debug: (message: string) => Awaited<void>;
-    stateChange: (oldState: AudioPlayerState, newState: AudioPlayerState) => Awaited<void>;
-    subscribe: (subscription: PlayerSubscription) => Awaited<void>;
-    unsubscribe: (subscription: PlayerSubscription) => Awaited<void>;
-} & {
-    [status in AudioPlayerStatus]: (oldState: AudioPlayerState, newState: AudioPlayerState & {
-        status: status;
-    }) => Awaited<void>;
-};
+interface AudioPlayer extends EventEmitter {
+    /**
+     * Emitted when there is an error emitted from the audio resource played by the audio player
+     *
+     * @event
+     */
+    on: (event: 'error', listener: (error: AudioPlayerError) => void) => this;
+}
 /**
  * Used to play audio resources (i.e. tracks, streams) to voice connections.
  *
@@ -370,7 +344,7 @@ declare type AudioPlayerEvents = {
  * The AudioPlayer drives the timing of playback, and therefore is unaffected by voice connections
  * becoming unavailable. Its behavior in these scenarios can be configured.
  */
-declare class AudioPlayer extends TypedEmitter<AudioPlayerEvents> {
+declare class AudioPlayer extends EventEmitter {
     /**
      * The state that the AudioPlayer is in.
      */
@@ -502,6 +476,27 @@ declare class AudioPlayer extends TypedEmitter<AudioPlayerEvents> {
  */
 declare function createAudioPlayer(options?: CreateAudioPlayerOptions): AudioPlayer;
 
+/**
+ * Represents a subscription of a voice connection to an audio player, allowing
+ * the audio player to play audio on the voice connection.
+ */
+declare class PlayerSubscription {
+    /**
+     * The voice connection of this subscription.
+     */
+    readonly connection: VoiceConnection;
+    /**
+     * The audio player of this subscription.
+     */
+    readonly player: AudioPlayer;
+    constructor(connection: VoiceConnection, player: AudioPlayer);
+    /**
+     * Unsubscribes the connection from the audio player, meaning that the
+     * audio player cannot stream audio to it until a new subscription is made.
+     */
+    unsubscribe(): void;
+}
+
 interface JoinConfig {
     guildId: string;
     channelId: string | null;
@@ -550,16 +545,10 @@ interface SocketConfig {
     ip: string;
     port: number;
 }
-interface VoiceUDPSocketEvents {
-    error: (error: Error) => Awaited<void>;
-    close: () => Awaited<void>;
-    debug: (message: string) => Awaited<void>;
-    message: (message: Buffer) => Awaited<void>;
-}
 /**
  * Manages the UDP networking for a voice connection.
  */
-declare class VoiceUDPSocket extends TypedEmitter<VoiceUDPSocketEvents> {
+declare class VoiceUDPSocket extends EventEmitter$1 {
     /**
      * The underlying network Socket for the VoiceUDPSocket.
      */
@@ -626,24 +615,28 @@ declare class VoiceUDPSocket extends TypedEmitter<VoiceUDPSocketEvents> {
     performIPDiscovery(ssrc: number): Promise<SocketConfig>;
 }
 
-/**
- * Debug event for VoiceWebSocket.
- *
- * @event VoiceWebSocket#debug
- * @type {string}
- */
-interface VoiceWebSocketEvents {
-    error: (error: Error) => Awaited<void>;
-    open: (event: WebSocket.Event) => Awaited<void>;
-    close: (event: WebSocket.CloseEvent) => Awaited<void>;
-    debug: (message: string) => Awaited<void>;
-    packet: (packet: any) => Awaited<void>;
+interface VoiceWebSocket extends EventEmitter$1 {
+    on(event: 'error', listener: (error: Error) => void): this;
+    on(event: 'open', listener: (event: WebSocket.Event) => void): this;
+    on(event: 'close', listener: (event: WebSocket.CloseEvent) => void): this;
+    /**
+     * Debug event for VoiceWebSocket.
+     *
+     * @event
+     */
+    on(event: 'debug', listener: (message: string) => void): this;
+    /**
+     * Packet event.
+     *
+     * @event
+     */
+    on(event: 'packet', listener: (packet: any) => void): this;
 }
 /**
  * An extension of the WebSocket class to provide helper functionality when interacting
  * with the Discord Voice gateway.
  */
-declare class VoiceWebSocket extends TypedEmitter<VoiceWebSocketEvents> {
+declare class VoiceWebSocket extends EventEmitter$1 {
     /**
      * The current heartbeat interval, if any.
      */
@@ -823,16 +816,21 @@ interface ConnectionData {
     nonceBuffer: Buffer;
     speaking: boolean;
 }
-interface NetworkingEvents {
-    debug: (message: string) => Awaited<void>;
-    error: (error: Error) => Awaited<void>;
-    stateChange: (oldState: NetworkingState, newState: NetworkingState) => Awaited<void>;
-    close: (code: number) => Awaited<void>;
+interface Networking extends EventEmitter$1 {
+    /**
+     * Debug event for Networking.
+     *
+     * @event
+     */
+    on(event: 'debug', listener: (message: string) => void): this;
+    on(event: 'error', listener: (error: Error) => void): this;
+    on(event: 'stateChange', listener: (oldState: NetworkingState, newState: NetworkingState) => void): this;
+    on(event: 'close', listener: (code: number) => void): this;
 }
 /**
  * Manages the networking required to maintain a voice connection and dispatch audio packets
  */
-declare class Networking extends TypedEmitter<NetworkingEvents> {
+declare class Networking extends EventEmitter$1 {
     private _state;
     /**
      * The debug logger function, if debugging is enabled.
@@ -1011,18 +1009,10 @@ interface VoiceUserData {
      */
     userId: string;
 }
-/**
- * The events that an SSRCMap may emit.
- */
-interface SSRCMapEvents {
-    create: (newData: VoiceUserData) => Awaited<void>;
-    update: (oldData: VoiceUserData | undefined, newData: VoiceUserData) => Awaited<void>;
-    delete: (deletedData: VoiceUserData) => Awaited<void>;
-}
 /**
  * Maps audio SSRCs to data of users in voice connections.
  */
-declare class SSRCMap extends TypedEmitter<SSRCMapEvents> {
+declare class SSRCMap extends EventEmitter$1 {
     /**
      * The underlying map.
      */
@@ -1050,23 +1040,10 @@ declare class SSRCMap extends TypedEmitter<SSRCMapEvents> {
     delete(target: number | string): VoiceUserData | undefined;
 }
 
-/**
- * The events that a SpeakingMap can emit.
- */
-interface SpeakingMapEvents {
-    /**
-     * Emitted when a user starts speaking.
-     */
-    start: (userId: string) => Awaited<void>;
-    /**
-     * Emitted when a user stops speaking.
-     */
-    end: (userId: string) => Awaited<void>;
-}
 /**
  * Tracks the speaking states of users in a voice channel.
  */
-declare class SpeakingMap extends TypedEmitter<SpeakingMapEvents> {
+declare class SpeakingMap extends EventEmitter$1 {
     /**
      * The delay after a packet is received from a user until they're marked as not speaking anymore.
      */
@@ -1150,7 +1127,7 @@ declare class VoiceReceiver {
 }
 
 /**
- * Methods that are provided by the @discordjs/voice library to implementations of
+ * Methods that are provided by the \@discordjs/voice library to implementations of
  * Discord gateway DiscordGatewayAdapters.
  */
 interface DiscordGatewayAdapterLibraryMethods {
@@ -1184,7 +1161,7 @@ interface DiscordGatewayAdapterImplementerMethods {
      */
     sendPayload: (payload: any) => boolean;
     /**
-     * This will be called by @discordjs/voice when the adapter can safely be destroyed as it will no
+     * This will be called by \@discordjs/voice when the adapter can safely be destroyed as it will no
      * longer be used.
      */
     destroy: () => void;
@@ -1316,19 +1293,10 @@ interface VoiceConnectionDestroyedState {
  * The various states that a voice connection can be in.
  */
 declare type VoiceConnectionState = VoiceConnectionSignallingState | VoiceConnectionDisconnectedState | VoiceConnectionConnectingState | VoiceConnectionReadyState | VoiceConnectionDestroyedState;
-declare type VoiceConnectionEvents = {
-    error: (error: Error) => Awaited<void>;
-    debug: (message: string) => Awaited<void>;
-    stateChange: (oldState: VoiceConnectionState, newState: VoiceConnectionState) => Awaited<void>;
-} & {
-    [status in VoiceConnectionStatus]: (oldState: VoiceConnectionState, newState: VoiceConnectionState & {
-        status: status;
-    }) => Awaited<void>;
-};
 /**
  * A connection to the voice server of a Guild, can be used to play audio in voice channels.
  */
-declare class VoiceConnection extends TypedEmitter<VoiceConnectionEvents> {
+declare class VoiceConnection extends EventEmitter$1 {
     /**
      * The number of consecutive rejoin attempts. Initially 0, and increments for each rejoin.
      * When a connection is successfully established, it resets to 0.
@@ -1614,4 +1582,4 @@ interface ProbeInfo {
  */
 declare function demuxProbe(stream: Readable, probeSize?: number, validator?: typeof validateDiscordOpusHead): Promise<ProbeInfo>;
 
-export { AudioPlayer, AudioPlayerBufferingState, AudioPlayerError, AudioPlayerEvents, AudioPlayerIdleState, AudioPlayerPausedState, AudioPlayerPlayingState, AudioPlayerState, AudioPlayerStatus, AudioReceiveStream, AudioReceiveStreamOptions, AudioResource, CreateAudioPlayerOptions, CreateAudioResourceOptions, CreateVoiceConnectionOptions, DiscordGatewayAdapterCreator, DiscordGatewayAdapterImplementerMethods, DiscordGatewayAdapterLibraryMethods, EndBehavior, EndBehaviorType, JoinConfig, JoinVoiceChannelOptions, NoSubscriberBehavior, PlayerSubscription, ProbeInfo, SSRCMap, SSRCMapEvents, SpeakingMap, SpeakingMapEvents, StreamType, VoiceConnection, VoiceConnectionConnectingState, VoiceConnectionDestroyedState, VoiceConnectionDisconnectReason, VoiceConnectionDisconnectedBaseState, VoiceConnectionDisconnectedOtherState, VoiceConnectionDisconnectedState, VoiceConnectionDisconnectedWebSocketState, VoiceConnectionEvents, VoiceConnectionReadyState, VoiceConnectionSignallingState, VoiceConnectionState, VoiceConnectionStatus, VoiceReceiver, VoiceUserData, createAudioPlayer, createAudioResource, createDefaultAudioReceiveStreamOptions, demuxProbe, entersState, generateDependencyReport, getGroups, getVoiceConnection, getVoiceConnections, joinVoiceChannel, validateDiscordOpusHead };
+export { AudioPlayer, AudioPlayerBufferingState, AudioPlayerError, AudioPlayerIdleState, AudioPlayerPausedState, AudioPlayerPlayingState, AudioPlayerState, AudioPlayerStatus, AudioReceiveStream, AudioReceiveStreamOptions, AudioResource, CreateAudioPlayerOptions, CreateAudioResourceOptions, CreateVoiceConnectionOptions, DiscordGatewayAdapterCreator, DiscordGatewayAdapterImplementerMethods, DiscordGatewayAdapterLibraryMethods, EndBehavior, EndBehaviorType, JoinConfig, JoinVoiceChannelOptions, NoSubscriberBehavior, PlayerSubscription, ProbeInfo, SSRCMap, SpeakingMap, StreamType, VoiceConnection, VoiceConnectionConnectingState, VoiceConnectionDestroyedState, VoiceConnectionDisconnectReason, VoiceConnectionDisconnectedBaseState, VoiceConnectionDisconnectedOtherState, VoiceConnectionDisconnectedState, VoiceConnectionDisconnectedWebSocketState, VoiceConnectionReadyState, VoiceConnectionSignallingState, VoiceConnectionState, VoiceConnectionStatus, VoiceReceiver, VoiceUserData, createAudioPlayer, createAudioResource, createDefaultAudioReceiveStreamOptions, demuxProbe, entersState, generateDependencyReport, getGroups, getVoiceConnection, getVoiceConnections, joinVoiceChannel, validateDiscordOpusHead };

package/dist/index.js

@@ -86,11 +86,10 @@ var require_package = __commonJS({
       homepage: "https://discord.js.org",
       dependencies: {
         "@types/ws": "^8.5.3",
-        "discord-api-types": "^0.33.4",
+        "discord-api-types": "^0.33.5",
         "prism-media": "^1.3.2",
-        "tiny-typed-emitter": "^2.1.0",
         tslib: "^2.4.0",
-        ws: "^8.7.0"
+        ws: "^8.8.0"
       },
       devDependencies: {
         "@babel/core": "^7.18.2",
@@ -100,7 +99,7 @@ var require_package = __commonJS({
         "@discordjs/scripts": "workspace:^",
         "@favware/cliff-jumper": "^1.8.3",
         "@types/jest": "^28.1.1",
-        "@types/node": "^16.11.38",
+        "@types/node": "^16.11.39",
         "@typescript-eslint/eslint-plugin": "^5.27.1",
         "@typescript-eslint/parser": "^5.27.1",
         eslint: "^8.17.0",
@@ -108,9 +107,9 @@ var require_package = __commonJS({
         "eslint-config-prettier": "^8.5.0",
         "eslint-import-resolver-typescript": "^2.7.1",
         "eslint-plugin-import": "^2.26.0",
-        jest: "^28.1.0",
+        jest: "^28.1.1",
         "jest-websocket-mock": "^2.3.0",
-        "mock-socket": "^9.1.4",
+        "mock-socket": "^9.1.5",
         prettier: "^2.6.2",
         tsup: "^6.1.0",
         tweetnacl: "^1.0.3",
@@ -159,7 +158,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/VoiceConnection.ts
-var import_tiny_typed_emitter7 = require("tiny-typed-emitter");
+var import_node_events7 = require("events");
 
 // src/DataStore.ts
 var import_v10 = require("discord-api-types/v10");
@@ -260,13 +259,13 @@ function deleteAudioPlayer(player) {
 __name(deleteAudioPlayer, "deleteAudioPlayer");
 
 // src/networking/Networking.ts
+var import_node_events3 = require("events");
 var import_v42 = require("discord-api-types/voice/v4");
-var import_tiny_typed_emitter3 = require("tiny-typed-emitter");
 
 // src/networking/VoiceUDPSocket.ts
 var import_node_dgram = require("dgram");
+var import_node_events = require("events");
 var import_node_net = require("net");
-var import_tiny_typed_emitter = require("tiny-typed-emitter");
 function parseLocalPacket(message) {
   const packet = Buffer.from(message);
   const ip = packet.slice(8, packet.indexOf(0, 8)).toString("utf-8");
@@ -280,7 +279,7 @@ __name(parseLocalPacket, "parseLocalPacket");
 var KEEP_ALIVE_INTERVAL = 5e3;
 var KEEP_ALIVE_LIMIT = 12;
 var MAX_COUNTER_VALUE = 2 ** 32 - 1;
-var VoiceUDPSocket = class extends import_tiny_typed_emitter.TypedEmitter {
+var VoiceUDPSocket = class extends import_node_events.EventEmitter {
   constructor(remote, debug = false) {
     super();
     __publicField(this, "socket");
@@ -365,10 +364,10 @@ var VoiceUDPSocket = class extends import_tiny_typed_emitter.TypedEmitter {
 __name(VoiceUDPSocket, "VoiceUDPSocket");
 
 // src/networking/VoiceWebSocket.ts
+var import_node_events2 = require("events");
 var import_v4 = require("discord-api-types/voice/v4");
-var import_tiny_typed_emitter2 = require("tiny-typed-emitter");
 var import_ws = __toESM(require("ws"));
-var VoiceWebSocket = class extends import_tiny_typed_emitter2.TypedEmitter {
+var VoiceWebSocket = class extends import_node_events2.EventEmitter {
   constructor(address, debug) {
     super();
     __publicField(this, "heartbeatInterval");
@@ -545,7 +544,7 @@ function randomNBit(n) {
   return Math.floor(Math.random() * 2 ** n);
 }
 __name(randomNBit, "randomNBit");
-var Networking = class extends import_tiny_typed_emitter3.TypedEmitter {
+var Networking = class extends import_node_events3.EventEmitter {
   constructor(options, debug) {
     super();
     __publicField(this, "_state");
@@ -816,7 +815,7 @@ var import_v43 = require("discord-api-types/voice/v4");
 var import_node_stream = require("stream");
 
 // src/audio/AudioPlayer.ts
-var import_tiny_typed_emitter4 = require("tiny-typed-emitter");
+var import_node_events4 = __toESM(require("events"));
 
 // src/audio/AudioPlayerError.ts
 var AudioPlayerError = class extends Error {
@@ -869,7 +868,7 @@ function stringifyState2(state) {
   });
 }
 __name(stringifyState2, "stringifyState");
-var AudioPlayer = class extends import_tiny_typed_emitter4.TypedEmitter {
+var AudioPlayer = class extends import_node_events4.default {
   constructor(options = {}) {
     super();
     __publicField(this, "_state");
@@ -1162,8 +1161,8 @@ var AudioReceiveStream = class extends import_node_stream.Readable {
 __name(AudioReceiveStream, "AudioReceiveStream");
 
 // src/receive/SSRCMap.ts
-var import_tiny_typed_emitter5 = require("tiny-typed-emitter");
-var SSRCMap = class extends import_tiny_typed_emitter5.TypedEmitter {
+var import_node_events5 = require("events");
+var SSRCMap = class extends import_node_events5.EventEmitter {
   constructor() {
     super();
     __publicField(this, "map");
@@ -1213,8 +1212,8 @@ var SSRCMap = class extends import_tiny_typed_emitter5.TypedEmitter {
 __name(SSRCMap, "SSRCMap");
 
 // src/receive/SpeakingMap.ts
-var import_tiny_typed_emitter6 = require("tiny-typed-emitter");
-var _SpeakingMap = class extends import_tiny_typed_emitter6.TypedEmitter {
+var import_node_events6 = require("events");
+var _SpeakingMap = class extends import_node_events6.EventEmitter {
   constructor() {
     super();
     __publicField(this, "users");
@@ -1361,7 +1360,7 @@ var VoiceConnectionDisconnectReason = /* @__PURE__ */ ((VoiceConnectionDisconnec
   VoiceConnectionDisconnectReason2[VoiceConnectionDisconnectReason2["Manual"] = 3] = "Manual";
   return VoiceConnectionDisconnectReason2;
 })(VoiceConnectionDisconnectReason || {});
-var VoiceConnection2 = class extends import_tiny_typed_emitter7.TypedEmitter {
+var VoiceConnection2 = class extends import_node_events7.EventEmitter {
   constructor(joinConfig, { debug, adapterCreator }) {
     super();
     __publicField(this, "rejoinAttempts");
@@ -1999,7 +1998,7 @@ function generateDependencyReport() {
 __name(generateDependencyReport, "generateDependencyReport");
 
 // src/util/entersState.ts
-var import_node_events = require("events");
+var import_node_events8 = require("events");
 
 // src/util/abortAfter.ts
 function abortAfter(delay) {
@@ -2015,7 +2014,7 @@ async function entersState(target, status, timeoutOrSignal) {
   if (target.state.status !== status) {
     const [ac, signal] = typeof timeoutOrSignal === "number" ? abortAfter(timeoutOrSignal) : [void 0, timeoutOrSignal];
     try {
-      await (0, import_node_events.once)(target, status, { signal });
+      await (0, import_node_events8.once)(target, status, { signal });
     } finally {
       ac?.abort();
     }