Merge pull request #50 from RainyXeon/dev

Prefinal beta version for production running

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rainlink",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "Another lavalink wrapper but focus on stability and rich features",
   "repository": {
     "type": "git",

src/Manager/RainlinkPlayerManager.ts

@@ -2,7 +2,6 @@ import { RainlinkEvents, RainlinkPlayerState, VoiceState } from '../Interface/Co
 import { VoiceChannelOptions } from '../Interface/Player';
 import { RainlinkPlayer } from '../Player/RainlinkPlayer';
 import { Rainlink } from '../Rainlink';
-import { RainlinkPlugin } from '../Plugin/VoiceReceiver/Plugin';
 import { RainlinkDatabase } from '../Utilities/RainlinkDatabase';
 
 export class RainlinkPlayerManager extends RainlinkDatabase<RainlinkPlayer> {
@@ -50,8 +49,6 @@ export class RainlinkPlayerManager extends RainlinkDatabase<RainlinkPlayer> {
 		player.state = RainlinkPlayerState.CONNECTED;
 		this.debug('Player created at ' + options.guildId);
 		this.manager.emit(RainlinkEvents.PlayerCreate, player);
-		const voiceReceiver = this.manager.plugins.get('rainlink-voiceReceiver') as RainlinkPlugin;
-		if (voiceReceiver && node.driver.id.includes('nodelink')) voiceReceiver.open(node, options);
 		return player;
 	}
 

src/Player/RainlinkPlayer.ts

@@ -12,7 +12,6 @@ import {
 import { RainlinkTrack } from './RainlinkTrack.js';
 import { UpdatePlayerInfo, UpdatePlayerOptions } from '../Interface/Rest.js';
 import { RainlinkSearchOptions, RainlinkSearchResult } from '../Interface/Manager.js';
-import { RainlinkPlugin } from '../Plugin/VoiceReceiver/Plugin.js';
 import { ServerUpdate, StateUpdatePartial } from '../Interface/Connection.js';
 import { EventEmitter } from 'node:events';
 import { RainlinkDatabase } from '../Utilities/RainlinkDatabase.js';
@@ -199,8 +198,6 @@ export class RainlinkPlayer extends EventEmitter {
 		this.sudoDestroy = true;
 		this.clear(false);
 		this.disconnect();
-		const voiceReceiver = this.manager.plugins.get('rainlink-voiceReceiver') as RainlinkPlugin;
-		if (voiceReceiver && this.node.driver.id.includes('nodelink')) voiceReceiver.close(this.guildId);
 		this.node.rest.updatePlayer({
 			guildId: this.guildId,
 			playerOptions: {

src/Plugin/RainlinkPlugin.ts

@@ -3,6 +3,7 @@ import { Rainlink } from '../Rainlink';
 
 /** The interface class for another rainlink plugin, extend it to use */
 export class RainlinkPlugin {
+	public readonly isRainlinkPlugin: boolean = true;
 	/** Name function for getting plugin name */
 	public name(): string {
 		throw new Error('Plugin must implement name() and return a plguin name string');

src/Plugin/VoiceReceiver/Plugin.ts

@@ -8,9 +8,7 @@ import { RainlinkWebsocket } from '../../Utilities/RainlinkWebsocket';
 import { RainlinkDatabase } from '../../Utilities/RainlinkDatabase';
 
 export class RainlinkPlugin extends Plugin {
-	protected manager?: Rainlink;
-	/** Whenever the plugin is enabled or not */
-	public enabled: boolean = false;
+	protected manager: Rainlink | null = null;
 	protected runningWs: RainlinkDatabase<RainlinkWebsocket> = new RainlinkDatabase<RainlinkWebsocket>();
 
 	constructor() {
@@ -29,9 +27,7 @@ export class RainlinkPlugin extends Plugin {
 
 	/** Open the ws voice reciver client */
 	public open(node: RainlinkNode, voiceOptions: VoiceChannelOptions): void {
-		if (!this.enabled) throw new Error('This plugin is unloaded!');
-		if (!node.driver.id.includes('nodelink'))
-			throw new Error('This node not support voice receiver, please use Nodelink2 to use this feature!');
+		if (!this.manager) throw new Error('This plugin is unloaded!');
 		const wsUrl = `${node.options.secure ? 'wss' : 'ws'}://${node.options.host}:${node.options.port}`;
 		const ws = new RainlinkWebsocket(wsUrl + '/connection/data', {
 			headers: {
@@ -61,6 +57,7 @@ export class RainlinkPlugin extends Plugin {
 
 	/** Open the ws voice reciver client */
 	public close(guildId: string): void {
+		if (!this.manager) throw new Error('This plugin is unloaded!');
 		const targetWs = this.runningWs.get(guildId);
 		if (!targetWs) return;
 		targetWs.close(1006, 'Self closed');
@@ -70,6 +67,7 @@ export class RainlinkPlugin extends Plugin {
 	}
 
 	protected wsMessageEvent(node: RainlinkNode, data: string) {
+		if (!this.manager) throw new Error('This plugin is unloaded!');
 		const wsData = JSON.parse(data.toString());
 		this.debug(String(data));
 		switch (wsData.type) {
@@ -88,19 +86,31 @@ export class RainlinkPlugin extends Plugin {
 			break;
 		}
 		}
-		// this.node.wsMessageEvent(wsData);
 	}
 
 	/** Load function for make the plugin working */
 	public load(manager: Rainlink): void {
 		this.manager = manager;
-		this.enabled = true;
+		this.manager.on('playerCreate', player => {
+			if (!player.node.driver.id.includes('nodelink')) return;
+			this.open(player.node, {
+				guildId: player.guildId,
+				shardId: player.shardId,
+				voiceId: player.voiceId || '',
+				textId: player.textId,
+			});
+		});
+		this.manager.on('playerDestroy', player => {
+			if (!player.node.driver.id.includes('nodelink')) return;
+			this.close(player.guildId);
+		});
 	}
 
 	/** unload function for make the plugin stop working */
-	public unload(manager: Rainlink): void {
-		this.manager = manager;
-		this.enabled = false;
+	public unload(): void {
+		this.manager?.removeListener('playerCreate', () => {});
+		this.manager?.removeListener('playerDestroy', () => {});
+		this.manager = null;
 	}
 
 	protected debug(logs: string) {

src/Plugin/index.ts

@@ -1,4 +1,3 @@
-import { RainlinkPlugin as PlayerMoved } from './PlayerMoved/Plugin.js';
 import { RainlinkPlugin as VoiceReceiver } from './VoiceReceiver/Plugin.js';
 
 /**
@@ -13,8 +12,7 @@ import { RainlinkPlugin as VoiceReceiver } from './VoiceReceiver/Plugin.js';
  *     nodes: Nodes,
  *     library: new Library.DiscordJS(client),
  *     plugins: [
- *       new Plugin.PlayerMoved(client),
- *  *    // About voice receiver plugin:
+ *       // About voice receiver plugin:
  *       // This plugin only works with node use Nodelink2 driver.
  *       new Plugin.VoiceReceiver()
  *     ],
@@ -24,6 +22,5 @@ import { RainlinkPlugin as VoiceReceiver } from './VoiceReceiver/Plugin.js';
  */
 
 export default {
-	PlayerMoved,
 	VoiceReceiver,
 };

src/Rainlink.ts

@@ -79,14 +79,6 @@ export declare interface Rainlink {
    * @event Rainlink#playerUpdate
    */
   on(event: 'playerUpdate', listener: (player: RainlinkPlayer, data: Record<string, any>) => void): this;
-  /**
-   * Emitted when a playuer is moved into another channel. [Require plugin]
-   * @event Rainlink#playerMoved
-   */
-  on(
-    event: 'playerMoved',
-    listener: (player: RainlinkPlayer, oldChannelId: string, newChannelId: string) => void,
-  ): this;
   /**
    * Emitted when a track paused.
    * @event Rainlink#playerPause
@@ -226,11 +218,6 @@ export declare interface Rainlink {
   /** @ignore */
   once(event: 'playerUpdate', listener: (player: RainlinkPlayer, data: Record<string, any>) => void): this;
   /** @ignore */
-  once(
-    event: 'playerMoved',
-    listener: (player: RainlinkPlayer, oldChannelId: string, newChannelId: string) => void,
-  ): this;
-  /** @ignore */
   once(event: 'playerPause', listener: (player: RainlinkPlayer, track: RainlinkTrack) => void): this;
   /** @ignore */
   once(event: 'playerResume', listener: (player: RainlinkPlayer, data: RainlinkTrack) => void): this;
@@ -318,11 +305,6 @@ export declare interface Rainlink {
   /** @ignore */
   off(event: 'playerUpdate', listener: (player: RainlinkPlayer, data: Record<string, any>) => void): this;
   /** @ignore */
-  off(
-    event: 'playerMoved',
-    listener: (player: RainlinkPlayer, oldChannelId: string, newChannelId: string) => void,
-  ): this;
-  /** @ignore */
   off(event: 'playerPause', listener: (player: RainlinkPlayer, track: RainlinkTrack) => void): this;
   /** @ignore */
   off(event: 'playerResume', listener: (player: RainlinkPlayer, data: RainlinkTrack) => void): this;
@@ -464,7 +446,7 @@ export class Rainlink extends EventEmitter {
 
 		if (this.rainlinkOptions.plugins) {
 			for (const [, plugin] of this.rainlinkOptions.plugins.entries()) {
-				if (plugin.constructor.name !== 'RainlinkPlugin')
+				if (!plugin.isRainlinkPlugin)
 					throw new Error('Plugin must be an instance of RainlinkPlugin or SourceRainlinkPlugin');
 				plugin.load(this);
 

test/fq.js

@@ -41,24 +41,26 @@ async function run() {
   await tester.testCase('Search tracks (title)', async () => {
     const data = await client.rainlink.search("Primary/yuiko - in the Garden")
     tester.debug(`<DATA> | Title: ${data.tracks[0].title}, Author: ${data.tracks[0].author}, URI: ${data.tracks[0].uri}`)
-    return data.tracks[0].raw.info.identifier
-  }, "5Cof9rP7TEQ")
+    return data.tracks.length !== 0 ? "localPass" : false
+  })
 
   await tester.testCase('Decode track (server side)', async () => {
     const data = await client.rainlink.search("Primary/yuiko - in the Garden")
     const encoded = data.tracks[0].raw.encoded
+    const testingId = data.tracks[0].identifier
     const res = await client.rainlink.nodes.full.at(0)[1].rest.decodeTrack(encoded)
     tester.debug(`<DATA> | Title: ${res.info.title}, Author: ${res.info.author}, URI: ${res.info.uri}`)
-    return res.info.identifier
-  }, "5Cof9rP7TEQ")
+    return res.info.identifier === testingId ? "localPass" : false
+  })
 
   await tester.testCase('Decode track (client side)', async () => {
     const data = await client.rainlink.search("Primary/yuiko - in the Garden")
     const encoded = data.tracks[0].raw.encoded
+    const testingId = data.tracks[0].identifier
     const res = await client.rainlink.nodes.full.at(0)[1].driver.functions.get("decode")(encoded)
     tester.debug(`<DATA> | Title: ${res.info.title}, Author: ${res.info.author}, URI: ${res.info.uri}`)
-    return res.info.identifier
-  }, "5Cof9rP7TEQ")
+    return res.info.identifier === testingId ? "localPass" : false
+  })
 
   tester.printSummary()
   process.exit(0)

test/lavalink4.js

@@ -40,12 +40,12 @@ async function run() {
 
   await tester.testCase('GET /info', async () => {
     const data = await client.rainlink.nodes.full.at(0)[1].rest.getInfo()
-    return "localPass" ?? true
+    return data ? "localPass" : true
   })
 
   await tester.testCase('GET /status', async () => {
     const data = await client.rainlink.nodes.full.at(0)[1].rest.getStatus()
-    return "localPass" ?? true
+    return data ? "localPass" : true
   })
 
   await tester.testCase('GET /sessions/{id}/players', async () => {

test/tester.js

@@ -30,15 +30,15 @@ module.exports = class Tester {
         return true
       }
       if (data !== expected) {
-        this.debug(`<FAIL> | #${this.count}. ${title} | Expected: ${expected} | Actural: ${data}`)
+        this.debug(`!FAIL! | #${this.count}. ${title} | Expected: ${expected} | Actural: ${data}`)
         this.failed = this.failed + 1
         return false
       }
       this.debug(`PASS   | #${this.count}. ${title}`)
       this.pass = this.pass + 1
       return true
     } catch (err) {
-      this.debug(`<FAIL> | #${this.count}. ${title} | error logs:`)
+      this.debug(`!FAIL! | #${this.count}. ${title} | error logs:`)
       this.failed = this.failed + 1
       console.error(err)
       process.exit()