Update index.js

index.js

@@ -1,6 +1,7 @@
 const express = require('express');
 const bodyParser = require('body-parser');
 const axios = require('axios');
+const cron = require('node-cron');
 const fs = require('fs');
 const path = require('path');
 const WebSocket = require('ws');
@@ -156,75 +157,12 @@ function updateLastSeen(category, items) {
     saveLastSeen(lastSeen);
 }
 
-async function sendWebSocketMessageToActiveSessions(stockData, weatherData) {
-    const favorites = loadFavorites();
-    for (const [senderId] of activeSessions.entries()) {
-        const userFavorites = favorites[senderId] || [];
-        let sections = [];
-        let matchCount = 0;
-
-        const checkAndAdd = (label, section, useEmoji) => {
-            const items = section.items || [];
-            const matchedItems = userFavorites.length > 0
-                ? items.filter(i => userFavorites.includes(cleanText(i.name)))
-                : items;
-            
-            if (userFavorites.length > 0 && matchedItems.length === 0) return false;
-            
-            matchCount += matchedItems.length;
-            const formattedItems = matchedItems.map(i => 
-                `- ${useEmoji ? addEmoji(i.name) : i.name}: ${formatValue(i.quantity)}`
-            ).join("\n");
-            
-            sections.push(`${label}:\n${formattedItems}\n⏳ Restock In: ${section.countdown}`);
-            return true;
-        };
-
-        checkAndAdd("🛠️ 𝗚𝗲𝗮𝗿", stockData.gear, true);
-        checkAndAdd("🌱 𝗦𝗲𝗲𝗱𝘀", stockData.seed, true);
-        checkAndAdd("🥚 𝗘𝗴𝗴𝘀", stockData.egg, true);
-        checkAndAdd("🎨 𝗖𝗼𝘀𝗺𝗲𝘁𝗶𝗰𝘀", stockData.cosmetics, false);
-        checkAndAdd("🎉 𝗘𝘃𝗲𝗻𝘁", stockData.honey, false);
-
-        if (userFavorites.length > 0 && matchCount === 0) continue;
-        if (sections.length === 0) continue;
-
-        const updatedAt = getPHTime().toLocaleString("en-PH", {
-            hour: "numeric", minute: "numeric", second: "numeric",
-            hour12: true, day: "2-digit", month: "short", year: "numeric"
-        });
-
-        const weatherInfo = weatherData
-            ? `🌤️ 𝗪𝗲𝗮𝘁𝗵𝗲𝗿: ${weatherData.icon} ${weatherData.weatherType}\n📋 ${weatherData.description}\n🎯 ${weatherData.cropBonuses}\n`
-            : "";
-
-        const title = userFavorites.length > 0
-            ? `♥️ ${matchCount} 𝗙𝗮𝘃𝗼𝗿𝗶𝘁𝗲 𝗶𝘁𝗲𝗺${matchCount > 1 ? "s" : ""} 𝗙𝗼𝘂𝗻𝗱!`
-            : "🌾 𝗚𝗿𝗼𝘄 𝗔 𝗚𝗔𝗥𝗗𝗘𝗡 — 𝗧𝗿𝗮𝗰𝗸𝗲𝗿";
-
-        const messageKey = JSON.stringify({ title, sections, weatherInfo, updatedAt });
-        const lastSent = lastSentCache.get(senderId);
-        if (lastSent === messageKey) continue;
-
-        lastSentCache.set(senderId, messageKey);
-
-        await sendMessage(senderId, 
-            `${title}\n\n${sections.join("\n\n")}\n\n${weatherInfo}📅 Updated at (PH): ${updatedAt}`
-        );
-    }
-}
-
 function ensureWebSocketConnection() {
     if (sharedWebSocket && sharedWebSocket.readyState === WebSocket.OPEN) return;
 
-    if (sharedWebSocket) {
-        sharedWebSocket.close();
-    }
-
     sharedWebSocket = new WebSocket("wss://gagstock.gleeze.com");
 
     sharedWebSocket.on("open", () => {
-        clearInterval(keepAliveInterval);
         keepAliveInterval = setInterval(() => {
             if (sharedWebSocket.readyState === WebSocket.OPEN) {
                 sharedWebSocket.send("ping");
@@ -243,38 +181,88 @@ function ensureWebSocketConnection() {
                 seed: stock.seed,
                 egg: stock.egg,
                 cosmetics: stock.cosmetics,
-                honey: stock.honey,
+                event: stock.honey,
             };
 
             updateLastSeen("gear", stockData.gear.items);
             updateLastSeen("seed", stockData.seed.items);
             updateLastSeen("egg", stockData.egg.items);
             updateLastSeen("cosmetics", stockData.cosmetics.items);
-            updateLastSeen("event", stockData.honey.items);
-
-            const weather = await axios.get("https://growagardenstock.com/api/stock/weather")
-                .then(res => res.data)
-                .catch(() => null);
-            
-            await sendWebSocketMessageToActiveSessions(stockData, weather);
-
+            updateLastSeen("event", stockData.event.items);
+
+            const favorites = loadFavorites();
+
+            for (const [senderId] of activeSessions.entries()) {
+                const userFavorites = favorites[senderId] || [];
+                let sections = [];
+                let matchCount = 0;
+
+                const checkAndAdd = (label, section, useEmoji) => {
+                    const items = section.items || [];
+                    const matchedItems = userFavorites.length > 0
+                        ? items.filter(i => userFavorites.includes(cleanText(i.name)))
+                        : items;
+                    
+                    if (userFavorites.length > 0 && matchedItems.length === 0) return false;
+                    
+                    matchCount += matchedItems.length;
+                    const formattedItems = matchedItems.map(i => 
+                        `- ${useEmoji ? addEmoji(i.name) : i.name}: ${formatValue(i.quantity)}`
+                    ).join("\n");
+                    
+                    sections.push(`${label}:\n${formattedItems}\n⏳ Restock In: ${section.countdown}`);
+                    return true;
+                };
+
+                checkAndAdd("🛠️ 𝗚𝗲𝗮𝗿", stockData.gear, true);
+                checkAndAdd("🌱 𝗦𝗲𝗲𝗱𝘀", stockData.seed, true);
+                checkAndAdd("🥚 𝗘𝗴𝗴𝘀", stockData.egg, true);
+                checkAndAdd("🎨 𝗖𝗼𝘀𝗺𝗲𝘁𝗶𝗰𝘀", stockData.cosmetics, false);
+                checkAndAdd("🎉 𝗘𝘃𝗲𝗻𝘁", stockData.event, false);
+
+                if (userFavorites.length > 0 && matchCount === 0) continue;
+                if (sections.length === 0) continue;
+
+                const updatedAt = getPHTime().toLocaleString("en-PH", {
+                    hour: "numeric", minute: "numeric", second: "numeric",
+                    hour12: true, day: "2-digit", month: "short", year: "numeric"
+                });
+
+                const weather = await axios.get("https://growagardenstock.com/api/stock/weather")
+                    .then(res => res.data)
+                    .catch(() => null);
+                
+                const weatherInfo = weather
+                    ? `🌤️ 𝗪𝗲𝗮𝘁𝗵𝗲𝗿: ${weather.icon} ${weather.weatherType}\n📋 ${weather.description}\n🎯 ${weather.cropBonuses}\n`
+                    : "";
+
+                const title = userFavorites.length > 0
+                    ? `♥️ ${matchCount} 𝗙𝗮𝘃𝗼𝗿𝗶𝘁𝗲 𝗶𝘁𝗲𝗺${matchCount > 1 ? "s" : ""} 𝗙𝗼𝘂𝗻𝗱!`
+                    : "🌾 𝗚𝗿𝗼𝘄 𝗔 𝗚𝗮𝗿𝗱𝗲𝗻 — 𝗧𝗿𝗮𝗰𝗸𝗲𝗿";
+
+                const messageKey = JSON.stringify({ title, sections, weatherInfo, updatedAt });
+                const lastSent = lastSentCache.get(senderId);
+                if (lastSent === messageKey) continue;
+
+                lastSentCache.set(senderId, messageKey);
+
+                await sendMessage(senderId, 
+                    `${title}\n\n${sections.join("\n\n")}\n\n${weatherInfo}📅 Updated at (PH): ${updatedAt}`
+                );
+            }
         } catch (error) {
             console.error('Error processing WebSocket message:', error);
         }
     });
 
-    sharedWebSocket.on("close", (code, reason) => {
-        console.log(`WebSocket closed: Code ${code}, Reason: ${reason}`);
+    sharedWebSocket.on("close", () => {
         clearInterval(keepAliveInterval);
         sharedWebSocket = null;
         setTimeout(ensureWebSocketConnection, 3000);
     });
 
-    sharedWebSocket.on("error", (error) => {
-        console.error('WebSocket error:', error.message);
-        if (sharedWebSocket) {
-            sharedWebSocket.close();
-        }
+    sharedWebSocket.on("error", () => {
+        sharedWebSocket?.close();
     });
 }
 
@@ -289,101 +277,91 @@ async function sendTyping(recipientId) {
     }
 }
 
-async function getStockDataViaWebSocket() {
-    return new Promise((resolve, reject) => {
-        if (sharedWebSocket && sharedWebSocket.readyState === WebSocket.OPEN) {
-            const messageHandler = (data) => {
-                try {
-                    const payload = JSON.parse(data);
-                    if (payload.status === "success" && payload.data) {
-                        sharedWebSocket.off('message', messageHandler);
-                        resolve(payload.data);
-                    }
-                } catch (e) {
-                    console.error('Error parsing WebSocket response:', e);
-                }
-            };
-            sharedWebSocket.on('message', messageHandler);
-            sharedWebSocket.send(JSON.stringify({ request: 'stock' }));
-            setTimeout(() => {
-                sharedWebSocket.off('message', messageHandler);
-                reject(new Error('WebSocket stock data request timed out'));
-            }, 5000);
-        } else {
-            reject(new Error('WebSocket not open for stock data.'));
-        }
-    }).catch(error => {
-        console.error('Failed to get stock data via WebSocket:', error.message);
+async function getStockData() {
+    try {
+        const [stockResponse, updateResponse] = await Promise.all([
+            axios.get('https://kenlie.top/api/gag/stocks/'),
+            axios.get('https://jonell01-reuploadotherhruhh.hf.space/grow')
+        ]);
+        return {
+            stockData: stockResponse.data,
+            lastUpdated: updateResponse.data.lastUpdated
+        };
+    } catch (error) {
+        console.error('Error fetching stock data:', error.message);
         return null;
-    });
+    }
 }
 
-async function getWeatherDataViaWebSocket() {
-    return new Promise((resolve, reject) => {
-        if (sharedWebSocket && sharedWebSocket.readyState === WebSocket.OPEN) {
-            const messageHandler = (data) => {
-                try {
-                    const payload = JSON.parse(data);
-                    if (payload.status === "success" && payload.data) {
-                        sharedWebSocket.off('message', messageHandler);
-                        resolve(payload.data);
-                    }
-                } catch (e) {
-                    console.error('Error parsing WebSocket response:', e);
-                }
-            };
-            sharedWebSocket.on('message', messageHandler);
-            sharedWebSocket.send(JSON.stringify({ request: 'weather' }));
-            setTimeout(() => {
-                sharedWebSocket.off('message', messageHandler);
-                reject(new Error('WebSocket weather data request timed out'));
-            }, 5000);
-        } else {
-            reject(new Error('WebSocket not open for weather data.'));
-        }
-    }).catch(error => {
-        console.error('Failed to get weather data via WebSocket:', error.message);
+async function getWeatherData() {
+    try {
+        const response = await axios.get('https://kenlie.top/api/gag/weather/');
+        return response.data;
+    } catch (error) {
+        console.error('Error fetching weather data:', error.message);
         return null;
-    });
+    }
 }
 
-function formatStockMessage(stockData) {
-    if (!stockData) return "⚠️ Could not fetch stock data";
+function formatStockMessage(data) {
+    if (!data || !data.stockData.status) return "⚠️ Could not fetch stock data";
     
     let message = `🛒 𝗖𝗨𝗥𝗥𝗘𝗡𝗧 𝗦𝗧𝗢𝗖𝗞 𝗨𝗣𝗗𝗔𝗧𝗘𝗦 🛒\n`;
-    message += `🕒 LAST UPDATED: ${getPHTime().toLocaleString("en-PH", {
-        hour: "numeric", minute: "numeric", second: "numeric",
-        hour12: true, day: "2-digit", month: "short", year: "numeric"
-    })}\n\n`;
+    message += `🕒 LAST UPDATED: ${new Date(data.lastUpdated).toLocaleString()}\n\n`;
     
+    const stockData = data.stockData.response;
     const categories = {
-        gear: '🛠️ 𝗚𝗘𝗔𝗥',
-        seed: '🌱 𝗦𝗘𝗘𝗗𝗦',
-        egg: '🥚 𝗘𝗚𝗚𝗦',
-        honey: '🍯 𝗛𝗢𝗡𝗘𝗬',
-        cosmetics: '💄 𝗖𝗢𝗦𝗠𝗘𝗧𝗜𝗖𝗦 '
+        gearStock: '🛠️ 𝗚𝗘𝗔𝗥',
+        eggStock: '🥚 𝗘𝗚𝗚𝗦',
+        seedsStock: '🌱 𝗦𝗘𝗘𝗗𝗦',
+        easterStock: '🐰 𝗘𝗔𝗦𝗧𝗘𝗥',
+        nightStock: '🌙 𝗡𝗜𝗚𝗛𝗧',
+        honeyStock: '🍯 𝗛𝗢𝗡𝗘𝗬',
+        cosmeticsStock: '💄 𝗖𝗢𝗦𝗠𝗘𝗧𝗜𝗖𝗦 '
     };
 
     for (const [categoryKey, categoryName] of Object.entries(categories)) {
-        if (stockData[categoryKey] && stockData[categoryKey].items && stockData[categoryKey].items.length > 0) {
+        if (stockData[categoryKey] && stockData[categoryKey].length > 0) {
             message += `${categoryName}:\n`;
-            stockData[categoryKey].items.forEach(item => {
-                message += `• ${addEmoji(item.name)}: ${formatValue(item.quantity)}\n`;
+            stockData[categoryKey].forEach(item => {
+                message += `• ${item.name}: ${item.value}\n`;
             });
-            message += `⏳ Restock In: ${stockData[categoryKey].countdown}\n\n`;
+            message += '\n';
         }
     }
     return message;
 }
 
 function formatWeatherMessage(weatherData) {
-    if (!weatherData) return "⚠️ Could not fetch weather data";
+    if (!weatherData || !weatherData.status) return "⚠️ Could not fetch weather data";
+    
+    const weatherEmojis = {
+        rain: '🌧️ 𝗥𝗔𝗜𝗡',
+        snow: '❄️ 𝗦𝗡𝗢𝗪',
+        thunderstorm: '⚡ 𝗧𝗛𝗨𝗡𝗗𝗘𝗥𝗦𝗧𝗢𝗥𝗠',
+        bloodnight: '🩸 𝗕𝗟𝗢𝗢𝗗𝗡𝗜𝗚𝗛𝗧',
+        meteorshower: '☄️ 𝗠𝗘𝗧𝗘𝗢𝗥 𝗦𝗛𝗢𝗪𝗘𝗥',
+        disco: '🪩 𝗗𝗜𝗦𝗖𝗢',
+        jandelstorm: '🕯️ 𝗝𝗔𝗡𝗗𝗘𝗟𝗦𝗧𝗢𝗥𝗠',
+        blackhole: '🕳️ 𝗕𝗟𝗔𝗖𝗞𝗛𝗢𝗟𝗘',
+        frost: '❄️ 𝗙𝗥𝗢𝗦𝗧 '
+    };
     
     let message = '⛅ 𝗖𝗨𝗥𝗥𝗘𝗡𝗧 𝗪𝗘𝗔𝗧𝗛𝗘𝗥 𝗖𝗢𝗡𝗗𝗜𝗧𝗜𝗢𝗡𝗦\n\n';
+    const activeEvents = [];
     
-    message += `🌤️ 𝗪𝗲𝗮𝘁𝗵𝗲𝗿: ${weatherData.icon} ${weatherData.weatherType}\n`;
-    message += `📋 ${weatherData.description}\n`;
-    message += `🎯 ${weatherData.cropBonuses}\n`;
+    for (const [event, data] of Object.entries(weatherData.response)) {
+        if (data.active) {
+            activeEvents.push(`${weatherEmojis[event] || '🌀'} ${event.toUpperCase()}`);
+        }
+    }
+    
+    if (activeEvents.length === 0) {
+        message += "☀️ NO ACTIVE WEATHER EVENTS\n";
+    } else {
+        message += "🟢 𝗔𝗖𝗧𝗜𝗩𝗘 𝗪𝗘𝗔𝗧𝗛𝗘𝗥 𝗘𝗩𝗘𝗡𝗧𝗦:\n";
+        message += activeEvents.join('\n');
+    }
     
     return message;
 }
@@ -418,13 +396,9 @@ function setupUserNotification(recipientId, intervalMinutes = 5) {
     }
 
     const intervalId = setInterval(async () => {
-        const stockData = await getStockDataViaWebSocket();
-        const weatherData = await getWeatherDataViaWebSocket();
-        if (stockData) {
-            await sendMessage(recipientId, formatStockMessage(stockData));
-        }
-        if (weatherData) {
-            await sendMessage(recipientId, formatWeatherMessage(weatherData));
+        const data = await getStockData();
+        if (data) {
+            await sendMessage(recipientId, formatStockMessage(data));
         }
     }, intervalMinutes * 60 * 1000);
 
@@ -566,13 +540,11 @@ async function handleMessage(senderId, messageText) {
         await sendMessage(senderId, helpMessage);
     }
     else if (command === '/stock') {
-        ensureWebSocketConnection();
-        const stockData = await getStockDataViaWebSocket();
-        await sendMessage(senderId, stockData ? formatStockMessage(stockData) : '⚠️ Could not fetch stock data');
+        const data = await getStockData();
+        await sendMessage(senderId, data ? formatStockMessage(data) : '⚠️ Could not fetch stock data');
     }
     else if (command === '/weather') {
-        ensureWebSocketConnection();
-        const weatherData = await getWeatherDataViaWebSocket();
+        const weatherData = await getWeatherData();
         await sendMessage(senderId, weatherData ? formatWeatherMessage(weatherData) : '⚠️ Could not fetch weather data');
     }
     else if (command.startsWith('/gagstock')) {
@@ -587,7 +559,6 @@ async function handleMessage(senderId, messageText) {
                 await sendMessage(senderId, '⚠️ Please provide valid minutes (e.g., /noti on 5)');
                 return;
             }
-            ensureWebSocketConnection();
             setupUserNotification(senderId, interval);
             await sendMessage(senderId, `🔔 Notifications enabled! Updates every ${interval} minutes.`);
         } 
@@ -605,7 +576,6 @@ async function handleMessage(senderId, messageText) {
 }
 
 loadUserPreferences();
-ensureWebSocketConnection();
 const PORT = process.env.PORT || 7860;
 app.listen(PORT, () => {
     console.log(`Bot running on port ${PORT}`);