Update index.js

index.js

@@ -6,6 +6,7 @@ const bytes = require('bytes')
 const sharp = require('sharp')
 const morgan = require('morgan')
 const express = require('express')
+const { Buffer } = require('buffer');
 const cp = require('child_process')
 const PDFDocument = require('pdfkit')
 const playwright = require('playwright-extra')
@@ -49,6 +50,14 @@ function getFrontendUri(req) {
   return `https://${req.get('host')}`;
 }
 
+async function getUserData(accessToken) {
+  const response = await axios.get('https://api.spotify.com/v1/me', {
+    headers: { 'Authorization': `Bearer ${accessToken}` }
+  });
+  return response.data;
+}
+
+
 app.use('/file', express.static(tmpFolder))
 
 app.all('/', (req, res) => {
@@ -102,7 +111,13 @@ app.get('/spotify', (req, res) => {
   const FRONTEND_URI = getFrontendUri(req);
   const REDIRECT_URI = `${FRONTEND_URI}/callback`;
   
-  const scopes = ['user-read-recently-played'];
+  const scopes = [
+    'user-read-recently-played',
+    'user-read-playback-state',
+    'user-read-private',
+    'user-read-email'
+  ];
+  
   const queryParams = querystring.stringify({
     response_type: 'code',
     client_id: CLIENT_ID,
@@ -127,7 +142,7 @@ app.get('/callback', async (req, res) => {
   }
 
   try {
-    // Dapatkan tokens
+    // Get tokens
     const authResponse = await axios.post('https://accounts.spotify.com/api/token', 
       querystring.stringify({
         grant_type: 'authorization_code',
@@ -142,7 +157,10 @@ app.get('/callback', async (req, res) => {
 
     const { access_token, refresh_token, expires_in } = authResponse.data;
     
-    // Simpan tokens di cookie
+    // Get user data to store in session
+    const userData = await getUserData(access_token);
+    
+    // Store tokens and user data in cookies
     res.cookie('spotify_access', access_token, {
       httpOnly: true,
       secure: process.env.NODE_ENV === 'production',
@@ -153,29 +171,44 @@ app.get('/callback', async (req, res) => {
       httpOnly: true,
       secure: process.env.NODE_ENV === 'production'
     });
+    
+    res.cookie('spotify_user', JSON.stringify({
+      id: userData.id,
+      country: userData.country,
+      display_name: userData.display_name
+    }), {
+      secure: process.env.NODE_ENV === 'production'
+    });
 
-    // Redirect ke endpoint JSON
-    res.redirect(`${FRONTEND_URI}/api/recently-played/json`);
+    // Redirect to recently played with user ID
+    res.redirect(`${FRONTEND_URI}/api/recently-played/json?user=${userData.id}`);
   } catch (err) {
     console.error('Callback Error:', err);
     res.redirect(`${FRONTEND_URI}/error?message=${encodeURIComponent('Authentication failed')}`);
   }
 });
 
-// 3. Recently Played JSON endpoint
+// 3. Recently Played JSON endpoint with market from user country
 app.get('/api/recently-played/json', async (req, res) => {
   const FRONTEND_URI = getFrontendUri(req);
   const accessToken = req.cookies.spotify_access;
+  const userData = req.cookies.spotify_user ? JSON.parse(req.cookies.spotify_user) : null;
 
-  if (!accessToken) {
+  if (!accessToken || !userData) {
     return res.redirect('/');
   }
 
   try {
-    // Get recently played tracks
     const limit = parseInt(req.query.limit) || 20;
+    const params = { limit };
+    
+    // Add market parameter from user's country if available
+    if (userData.country) {
+      params.market = userData.country;
+    }
+
     const response = await axios.get('https://api.spotify.com/v1/me/player/recently-played', {
-      params: { limit },
+      params,
       headers: { 'Authorization': `Bearer ${accessToken}` },
     });
 
@@ -198,16 +231,18 @@ app.get('/api/recently-played/json', async (req, res) => {
 
     res.json({
       status: 'success',
+      user: {
+        id: userData.id,
+        display_name: userData.display_name,
+        country: userData.country
+      },
       data: tracks,
       count: tracks.length
     });
   } catch (error) {
     if (error.response?.status === 401) {
-      // Token expired, redirect ke login
       return res.redirect('/');
     }
-    
-    console.error('Recently Played Error:', error);
     res.status(500).json({ 
       error: 'Failed to fetch recently played tracks',
       details: error.response?.data || error.message
@@ -215,6 +250,107 @@ app.get('/api/recently-played/json', async (req, res) => {
   }
 });
 
+// 4. Current Playback State endpoint
+app.get('/api/current-playback', async (req, res) => {
+  const accessToken = req.cookies.spotify_access;
+  const userData = req.cookies.spotify_user ? JSON.parse(req.cookies.spotify_user) : null;
+
+  if (!accessToken || !userData) {
+    return res.status(401).json({ error: 'Not authenticated' });
+  }
+
+  try {
+    const params = {};
+    if (userData.country) {
+      params.market = userData.country;
+    }
+
+    const response = await axios.get('https://api.spotify.com/v1/me/player', {
+      params,
+      headers: { 'Authorization': `Bearer ${accessToken}` },
+    });
+
+    if (response.status === 204) {
+      return res.json({ status: 'success', data: null, message: 'No active playback' });
+    }
+
+    const playbackData = {
+      device: response.data.device,
+      item: {
+        id: response.data.item.id,
+        name: response.data.item.name,
+        artists: response.data.item.artists.map(a => ({ id: a.id, name: a.name })),
+        album: {
+          id: response.data.item.album.id,
+          name: response.data.item.album.name,
+          images: response.data.item.album.images
+        },
+        duration_ms: response.data.item.duration_ms,
+        progress_ms: response.data.progress_ms
+      },
+      is_playing: response.data.is_playing,
+      shuffle_state: response.data.shuffle_state,
+      repeat_state: response.data.repeat_state
+    };
+
+    res.json({
+      status: 'success',
+      user: {
+        id: userData.id,
+        display_name: userData.display_name
+      },
+      data: playbackData
+    });
+  } catch (error) {
+    if (error.response?.status === 401) {
+      return res.status(401).json({ error: 'Session expired' });
+    }
+    res.status(500).json({ 
+      error: 'Failed to fetch playback state',
+      details: error.response?.data || error.message
+    });
+  }
+});
+
+// 5. User Profile endpoint
+app.get('/api/user-profile', async (req, res) => {
+  const accessToken = req.cookies.spotify_access;
+  const userData = req.cookies.spotify_user ? JSON.parse(req.cookies.spotify_user) : null;
+
+  if (!accessToken || !userData) {
+    return res.status(401).json({ error: 'Not authenticated' });
+  }
+
+  try {
+    const response = await axios.get('https://api.spotify.com/v1/me', {
+      headers: { 'Authorization': `Bearer ${accessToken}` },
+    });
+
+    const profileData = {
+      id: response.data.id,
+      display_name: response.data.display_name,
+      email: response.data.email,
+      country: response.data.country,
+      followers: response.data.followers.total,
+      product: response.data.product,
+      images: response.data.images
+    };
+
+    res.json({
+      status: 'success',
+      data: profileData
+    });
+  } catch (error) {
+    if (error.response?.status === 401) {
+      return res.status(401).json({ error: 'Session expired' });
+    }
+    res.status(500).json({ 
+      error: 'Failed to fetch user profile',
+      details: error.response?.data || error.message
+    });
+  }
+});
+
 // Error handler
 app.use((err, req, res, next) => {
   console.error('Server Error:', err);