aqualink 2.9.0 → 2.9.2

package/README.md

@@ -87,67 +87,63 @@
 
 ## 💻 Quick Start
 
-```javascript
-npm install aqualink
-
-// If you're using Module, use this:
-// import { createRequire } from 'module';
-// const require = createRequire(import.meta.url);
-
-//const { Aqua } = require('aqualink');
-
-
+```bash
+npm install aqualink discord.js
+```
 
+```javascript
 const { Aqua } = require("aqualink");
-const { Client, Collection, GatewayDispatchEvents } = require("discord.js");
+const { Client, GatewayIntentBits, Events } = require("discord.js");
 
 const client = new Client({
     intents: [
-        "Guilds",
-        "GuildMembers",
-        "GuildMessages",
-        "MessageContent",
-        "GuildVoiceStates"
+        GatewayIntentBits.Guilds,
+        GatewayIntentBits.GuildMembers,
+        GatewayIntentBits.GuildMessages,
+        GatewayIntentBits.MessageContent,
+        GatewayIntentBits.GuildVoiceStates
     ]
 });
 
 const nodes = [
     {
         host: "127.0.0.1",
-        password: "yourpass",
-        port: 233,
+        password: "your_password",
+        port: 2333,
         secure: false,
-        name: "localhost"
+        name: "main-node"
     }
 ];
 
-const aqua = Aqua(client, nodes, {
-  defaultSearchPlatform: "ytsearch",
-  restVersion: "v4",
-  autoResume: false,
-  infiniteReconnects: true,
+const aqua = new Aqua(client, nodes, {
+    defaultSearchPlatform: "ytsearch",
+    restVersion: "v4",
+    autoResume: true,
+    infiniteReconnects: true
 });
 
 client.aqua = aqua;
 
-
-client.once("ready", () => {
+client.once(Events.Ready, () => {
     client.aqua.init(client.user.id);
-    console.log("Ready!");
+    console.log(`Logged in as ${client.user.tag}`);
 });
 
-
-client.on("raw", (d) => {
-    if (![GatewayDispatchEvents.VoiceStateUpdate, GatewayDispatchEvents.VoiceServerUpdate,].includes(d.t)) return;
+client.on(Events.Raw, (d) => {
+    if (![Events.VoiceStateUpdate, Events.VoiceServerUpdate].includes(d.t)) return;
     client.aqua.updateVoiceState(d);
 });
 
-client.on("messageCreate", async (message) => {
-    if (message.author.bot) return;
+client.on(Events.MessageCreate, async (message) => {
+    if (message.author.bot || !message.content.startsWith("!play")) return;
 
-    if (!message.content.startsWith("!play")) return;
+    const query = message.content.slice(6).trim();
+    if (!query) return message.channel.send("Please provide a song to play.");
 
-    const query = message.content.slice(6);
+    // Check if user is in a voice channel
+    if (!message.member.voice.channel) {
+        return message.channel.send("You need to be in a voice channel to play music!");
+    }
 
     const player = client.aqua.createConnection({
         guildId: message.guild.id,
@@ -156,38 +152,76 @@ client.on("messageCreate", async (message) => {
         deaf: true,
     });
 
-    const resolve = await client.aqua.resolve({ query, requester: message.member });
-
-    if (resolve.loadType === 'playlist') {
-        await message.channel.send(`Added ${resolve.tracks.length} songs from ${resolve.playlistInfo.name} playlist.`);
-        for (const track of resolve.tracks) {
-            player.queue.add(track)
+    try {
+        const resolve = await client.aqua.resolve({ query, requester: message.member });
+        const { loadType, tracks, playlistInfo } = resolve;
+
+        if (loadType === 'playlist') {
+            for (const track of tracks) {
+                player.queue.add(track);
+            }
+            message.channel.send(`Added ${tracks.length} songs from ${playlistInfo.name}.`);
+        } else if (loadType === 'search' || loadType === 'track') {
+            const track = tracks[0];
+            player.queue.add(track);
+            message.channel.send(`Added **${track.title}** to the queue.`);
+        } else {
+            return message.channel.send("No results found.");
         }
-        if (!player.playing && !player.paused) return player.play();
-
-    } else if (resolve.loadType === 'search' || resolve.loadType === 'track') {
-        const track = resolve.tracks.shift();
-        track.info.requester = message.member;
-
-        player.queue.add(track);
 
-        await message.channel.send(`Added **${track.info.title}** to the queue.`);
-
-        if (!player.playing && !player.paused) return player.play();
-
-    } else {
-        return message.channel.send(`There were no results found for your query.`);
+        if (!player.playing && !player.paused) {
+            player.play();
+        }
+    } catch (error) {
+        console.error("Playback error:", error);
+        message.channel.send("An error occurred while trying to play the song.");
     }
 });
 
 client.aqua.on("nodeConnect", (node) => {
     console.log(`Node connected: ${node.name}`);
 });
+
 client.aqua.on("nodeError", (node, error) => {
     console.log(`Node "${node.name}" encountered an error: ${error.message}.`);
 });
 
-client.login("Yourtokenhere");
+client.aqua.on('trackStart', (player, track) => {
+    const channel = client.channels.cache.get(player.textChannel);
+    if (channel) channel.send(`Now playing: **${track.title}**`);
+});
+
+client.aqua.on('queueEnd', (player) => {
+    const channel = client.channels.cache.get(player.textChannel);
+    if (channel) channel.send('The queue has ended.');
+    player.destroy();
+});
+
+client.login("YOUR_DISCORD_BOT_TOKEN");
+```
+
+### Additional Commands You Can Add:
+
+```javascript
+client.on(Events.MessageCreate, async (message) => {
+    if (message.content === "!skip") {
+        const player = client.aqua.players.get(message.guild.id);
+        if (player) {
+            player.skip();
+            message.channel.send("⏭️ Skipped current track!");
+        }
+    }
+});
+
+client.on(Events.MessageCreate, async (message) => {
+    if (message.content === "!stop") {
+        const player = client.aqua.players.get(message.guild.id);
+        if (player) {
+            player.destroy();
+            message.channel.send("⏹️ Stopped playback and cleared queue!");
+        }
+    }
+});
 ```
 
 ## 🌟 Featured Projects
@@ -223,7 +257,7 @@ client.login("Yourtokenhere");
 
 For detailed usage, API references, and examples, check out our official documentation:
 
-[![Docs](https://img.shields.io/badge/Documentation-0099FF?style=for-the-badge&logo=readthedocs&logoColor=white)](https://toddythenoobdud.github.io/aqualink.github.io)
+[![Docs](https://img.shields.io/badge/Documentation-0099FF?style=for-the-badge&logo=readthedocs&logoColor=white)](https://roddynnn.github.io/)
 
 📌 **Get Started Quickly**
 - Installation guide
@@ -231,7 +265,7 @@ For detailed usage, API references, and examples, check out our official documen
 - Advanced features
 - Troubleshooting
 
-🔗 Visit: **[Aqualink Docs](https://toddythenoobdud.github.io/aqualink.github.io)**
+🔗 Visit: **[Aqualink Docs](https://roddynnn.github.io/)**
 
 ## 👑 Premium Bots Using Aqualink
 
@@ -313,7 +347,7 @@ For detailed usage, API references, and examples, check out our official documen
           <sub><b>SoulDevs</b></sub>
         </a>
         <br />
-        <a href="#code-SoulDevs title="Code">💻</a>
+        <a href="#code-SoulDevs" title="Code">💻</a>
       </td>
     </tr>
   </tbody>
@@ -356,4 +390,4 @@ Join our thriving community of developers and bot creators!
 
 <sub>Built with 💙 by the Aqualink Team</sub>
 
-</div>
+</div>

package/build/handlers/autoplay.js

@@ -9,7 +9,6 @@ const agent = new https.Agent({
     freeSocketTimeout: 4000
 });
 
-const TOTP_SECRET = Buffer.from("5507145853487499592248630329347", 'utf8');
 
 const SOUNDCLOUD_REGEX = /<a\s+itemprop="url"\s+href="(\/[^"]+)"/g;
 
@@ -48,7 +47,7 @@ const fastFetch = (url, options = {}) => {
 const soundAutoPlay = async (baseUrl) => {
     try {
         const html = await fastFetch(`${baseUrl}/recommended`);
-        
+
         const links = [];
         let match;
         while ((match = SOUNDCLOUD_REGEX.exec(html)) && links.length < 50) {
@@ -64,51 +63,47 @@ const soundAutoPlay = async (baseUrl) => {
     }
 };
 
-const generateToken = () => {
-    const timeStep = (Date.now() / 30000) | 0;
-    const counter = Buffer.allocUnsafe(8);
-    counter.writeBigUInt64BE(BigInt(timeStep), 0);
-
-    const hash = crypto.createHmac('sha1', TOTP_SECRET).update(counter).digest();
-    const offset = hash[19] & 0x0f;
-    
-    const binCode = (
-        (hash[offset] & 0x7f) << 24 |
-        hash[offset + 1] << 16 |
-        hash[offset + 2] << 8 |
-        hash[offset + 3]
-    );
-
-    return [
-        (binCode % 1000000).toString().padStart(6, '0'),
-        timeStep * 30000
-    ];
-};
+const spotifyAutoPlay = async (seed, player, requester, excludedIdentifiers = []) => {
+  try {
+    const { trackId, artistIds } = seed
+    if (!trackId) return null
+
+    const prevIdentifier = player.current?.identifier
+    let seedQuery = `seed_tracks=${trackId}`
+    if (artistIds) seedQuery += `&seed_artists=${artistIds}`
+    console.log('Seed query:', seedQuery)
+
+    const response = await player.aqua.resolve({
+      query: seedQuery,
+      source: 'spsearch',
+      requester
+    })
+    const candidates = response?.tracks || []
+
+    const seenIds = new Set(excludedIdentifiers)
+    if (prevIdentifier) seenIds.add(prevIdentifier)
+
+    const result = []
+    for (const track of candidates) {
+      const { identifier } = track
+      if (seenIds.has(identifier)) continue
+      seenIds.add(identifier)
+      track.pluginInfo = {
+        ...(track.pluginInfo || {}),
+        clientData: { fromAutoplay: true }
+      }
+      result.push(track)
+      if (result.length === 5) break
+    }
 
-const spotifyAutoPlay = async (seedTrackId) => {
-    const [totp, ts] = generateToken();
-    
-    try {
-        const tokenUrl = `https://open.spotify.com/api/token?reason=init&productType=embed&totp=${totp}&totpVer=5&ts=${ts}`;
-        const tokenResponse = await fastFetch(tokenUrl);
-        const { accessToken } = JSON.parse(tokenResponse);
-        
-        if (!accessToken) throw new Error("No access token");
-
-        const recUrl = `https://api.spotify.com/v1/recommendations?limit=10&seed_tracks=${seedTrackId}`;
-        const recResponse = await fastFetch(recUrl, {
-            headers: { Authorization: `Bearer ${accessToken}` }
-        });
+    return result
 
-        const { tracks } = JSON.parse(recResponse);
-        if (!tracks?.length) throw new Error("No tracks");
+  } catch (err) {
+    console.error('Spotify autoplay error:', err)
+    return null
+  }
+}
 
-        return tracks[Math.random() * tracks.length | 0].id;
-    } catch (err) {
-        console.error("Spotify error:", err.message);
-        throw err;
-    }
-};
 
 module.exports = {
     scAutoPlay: soundAutoPlay,