nodebb-plugin-niki-loyalty 1.0.16 → 1.0.17

package/library.js

@@ -7,21 +7,53 @@ const routeHelpers = require.main.require('./src/controllers/helpers');
 const Plugin = {};
 
 const SETTINGS = {
-    pointsPerHeartbeat: 5,
-    dailyCap: 250,
-    coffeeCost: 250
+    pointsPerHeartbeat: 50000000,
+    dailyCap: 250000000000,
+    coffeeCost: 1
 };
 
+// =========================
+// JSON SAFE HELPERS
+// =========================
+function safeParseMaybeJson(x) {
+    if (x == null) return null;
+
+    // bazı DB’lerde object dönebilir
+    if (typeof x === 'object') return x;
+
+    if (typeof x === 'string') {
+        try {
+            return JSON.parse(x);
+        } catch (e) {
+            // "[object Object]" gibi bozuk kayıtlar
+            return null;
+        }
+    }
+    return null;
+}
+
+function safeStringify(obj) {
+    try {
+        return JSON.stringify(obj);
+    } catch (e) {
+        return null;
+    }
+}
+
 // --- LOG FONKSİYONLARI ---
 async function addUserLog(uid, type, amount, desc) {
     const logEntry = {
         ts: Date.now(),
         type: type,   // 'earn' veya 'spend'
         amt: amount,
-        txt: desc
+        txt: desc     // "Kahve Keyfi ☕" gibi metin
     };
-    // Öğrenci geçmişine ekle
-    await db.listAppend(`niki:activity:${uid}`, logEntry);
+
+    const payload = safeStringify(logEntry);
+    if (!payload) return;
+
+    // Öğrenci geçmişine ekle (Son 50 işlem)
+    await db.listAppend(`niki:activity:${uid}`, payload);
     await db.listTrim(`niki:activity:${uid}`, -50, -1);
 }
 
@@ -33,8 +65,12 @@ async function addKasaLog(staffUid, customerName, customerUid) {
         cuid: customerUid,
         amt: SETTINGS.coffeeCost
     };
-    // Kasa defterine ekle
-    await db.listAppend('niki:kasa:history', logEntry);
+
+    const payload = safeStringify(logEntry);
+    if (!payload) return;
+
+    // Kasa defterine ekle (Son 100 işlem)
+    await db.listAppend('niki:kasa:history', payload);
     await db.listTrim('niki:kasa:history', -100, -1);
 }
 
@@ -44,112 +80,152 @@ Plugin.init = async function (params) {
 
     // 1. HEARTBEAT (Puan Kazanma)
     router.post('/api/niki-loyalty/heartbeat', middleware.ensureLoggedIn, async (req, res) => {
-        const uid = req.uid;
-        const today = new Date().toISOString().slice(0, 10).replace(/-/g, '');
-        const dailyKey = `niki:daily:${uid}:${today}`;
-        
-        const currentDailyScore = await db.getObjectField(dailyKey, 'score') || 0;
-
-        if (parseInt(currentDailyScore) >= SETTINGS.dailyCap) {
-            return res.json({ earned: false, reason: 'daily_cap' });
-        }
+        try {
+            const uid = req.uid;
+            const today = new Date().toISOString().slice(0, 10).replace(/-/g, '');
+            const dailyKey = `niki:daily:${uid}:${today}`;
 
-        await user.incrementUserFieldBy(uid, 'niki_points', SETTINGS.pointsPerHeartbeat);
-        await db.incrObjectFieldBy(dailyKey, 'score', SETTINGS.pointsPerHeartbeat);
+            const currentDailyScore = await db.getObjectField(dailyKey, 'score') || 0;
 
-        const newBalance = await user.getUserField(uid, 'niki_points');
-        return res.json({ earned: true, points: SETTINGS.pointsPerHeartbeat, total: newBalance });
+            if (parseInt(currentDailyScore) >= SETTINGS.dailyCap) {
+                return res.json({ earned: false, reason: 'daily_cap' });
+            }
+
+            await user.incrementUserFieldBy(uid, 'niki_points', SETTINGS.pointsPerHeartbeat);
+            await db.incrObjectFieldBy(dailyKey, 'score', SETTINGS.pointsPerHeartbeat);
+
+            const newBalance = await user.getUserField(uid, 'niki_points');
+            return res.json({ earned: true, points: SETTINGS.pointsPerHeartbeat, total: newBalance });
+        } catch (err) {
+            return res.status(500).json({ earned: false, reason: 'server_error' });
+        }
     });
 
     // 2. WALLET DATA (Cüzdan + Geçmiş)
     router.get('/api/niki-loyalty/wallet-data', middleware.ensureLoggedIn, async (req, res) => {
-        const uid = req.uid;
-        const today = new Date().toISOString().slice(0, 10).replace(/-/g, '');
-        
-        const [userData, dailyData, history] = await Promise.all([
-            user.getUserFields(uid, ['niki_points']),
-            db.getObject(`niki:daily:${uid}:${today}`),
-            db.getListRange(`niki:activity:${uid}`, 0, -1)
-        ]);
-
-        const currentPoints = parseInt(userData.niki_points) || 0;
-        const dailyScore = parseInt(dailyData ? dailyData.score : 0) || 0;
-        let dailyPercent = (dailyScore / SETTINGS.dailyCap) * 100;
-        if (dailyPercent > 100) dailyPercent = 100;
-
-        res.json({
-            points: currentPoints,
-            dailyScore: dailyScore,
-            dailyCap: SETTINGS.dailyCap,
-            dailyPercent: dailyPercent,
-            history: (history || []).reverse()
-        });
+        try {
+            const uid = req.uid;
+            const today = new Date().toISOString().slice(0, 10).replace(/-/g, '');
+
+            const [userData, dailyData, historyRaw] = await Promise.all([
+                user.getUserFields(uid, ['niki_points']),
+                db.getObject(`niki:daily:${uid}:${today}`),
+                db.getListRange(`niki:activity:${uid}`, 0, -1)
+            ]);
+
+            const currentPoints = parseInt(userData.niki_points) || 0;
+            const dailyScore = parseInt(dailyData ? dailyData.score : 0) || 0;
+            let dailyPercent = (dailyScore / SETTINGS.dailyCap) * 100;
+            if (dailyPercent > 100) dailyPercent = 100;
+
+            // ✅ history parse
+            const history = (historyRaw || [])
+                .map(safeParseMaybeJson)
+                .filter(Boolean)
+                .reverse(); // En yeni en üstte
+
+            res.json({
+                points: currentPoints,
+                dailyScore: dailyScore,
+                dailyCap: SETTINGS.dailyCap,
+                dailyPercent: dailyPercent,
+                history
+            });
+        } catch (err) {
+            return res.status(500).json({
+                points: 0,
+                dailyScore: 0,
+                dailyCap: SETTINGS.dailyCap,
+                dailyPercent: 0,
+                history: []
+            });
+        }
     });
 
-    // --- İŞTE EKSİK OLAN KISIM BURASIYDI ---
-    // 3. KASA GEÇMİŞİ (Personel Ekranı İçin)
+    // 3. KASA GEÇMİŞİ
     router.get('/api/niki-loyalty/kasa-history', middleware.ensureLoggedIn, async (req, res) => {
-        const isAdmin = await user.isAdministrator(req.uid);
-        const isMod = await user.isGlobalModerator(req.uid);
-        
-        if (!isAdmin && !isMod) return res.status(403).json([]);
-
-        // Veritabanından listeyi çek
-        const history = await db.getListRange('niki:kasa:history', 0, -1);
-        
-        // Kullanıcı resimlerini de ekleyerek zenginleştir
-        const enrichedHistory = await Promise.all((history || []).reverse().map(async (item) => {
-            const uData = await user.getUserFields(item.cuid, ['picture']);
-            item.picture = uData.picture;
-            return item;
-        }));
-
-        res.json(enrichedHistory);
+        try {
+            const isAdmin = await user.isAdministrator(req.uid);
+            const isMod = await user.isGlobalModerator(req.uid);
+
+            if (!isAdmin && !isMod) return res.status(403).json([]);
+
+            const historyRaw = await db.getListRange('niki:kasa:history', 0, -1);
+
+            const rows = (historyRaw || [])
+                .map(safeParseMaybeJson)
+                .filter(Boolean)
+                .reverse();
+
+            // Kullanıcı resimlerini de ekleyerek gönder (tek kayıt bozulsa bile endpoint patlamasın)
+            const enrichedHistory = await Promise.all(rows.map(async (item) => {
+                if (!item || !item.cuid) return item;
+
+                try {
+                    const uData = await user.getUserFields(item.cuid, ['picture']);
+                    return { ...item, picture: uData?.picture };
+                } catch (e) {
+                    return item;
+                }
+            }));
+
+            res.json(enrichedHistory);
+        } catch (err) {
+            // ✅ asla crash yok
+            return res.status(500).json([]);
+        }
     });
-    // ---------------------------------------
 
     // 4. QR OLUŞTUR
     router.post('/api/niki-loyalty/generate-qr', middleware.ensureLoggedIn, async (req, res) => {
-        const uid = req.uid;
-        const points = parseInt(await user.getUserField(uid, 'niki_points')) || 0;
-        
-        if (points < SETTINGS.coffeeCost) return res.json({ success: false, message: 'Yetersiz Puan' });
+        try {
+            const uid = req.uid;
+            const points = parseInt(await user.getUserField(uid, 'niki_points')) || 0;
+
+            if (points < SETTINGS.coffeeCost) return res.json({ success: false, message: 'Yetersiz Puan' });
 
-        const token = Math.random().toString(36).substring(2) + Date.now().toString(36);
-        await db.set(`niki:qr:${token}`, uid);
-        await db.expire(`niki:qr:${token}`, 120);
+            const token = Math.random().toString(36).substring(2) + Date.now().toString(36);
+            await db.set(`niki:qr:${token}`, uid);
+            await db.expire(`niki:qr:${token}`, 120);
 
-        return res.json({ success: true, token: token });
+            return res.json({ success: true, token: token });
+        } catch (err) {
+            return res.status(500).json({ success: false, message: 'Sunucu hatası' });
+        }
     });
 
-    // 5. QR OKUT (Ödeme Alma)
+    // 5. QR OKUT (Ödeme Alma + LOGLAMA)
     router.post('/api/niki-loyalty/scan-qr', middleware.ensureLoggedIn, async (req, res) => {
-        const { token } = req.body;
-        
-        const isAdmin = await user.isAdministrator(req.uid);
-        const isMod = await user.isGlobalModerator(req.uid);
-        if (!isAdmin && !isMod) return res.status(403).json({ success: false, message: 'Yetkisiz' });
+        try {
+            const { token } = req.body;
+
+            const isAdmin = await user.isAdministrator(req.uid);
+            const isMod = await user.isGlobalModerator(req.uid);
+            if (!isAdmin && !isMod) return res.status(403).json({ success: false, message: 'Yetkisiz' });
 
-        const customerUid = await db.get(`niki:qr:${token}`);
-        if (!customerUid) return res.json({ success: false, message: 'Geçersiz Kod' });
+            const customerUid = await db.get(`niki:qr:${token}`);
+            if (!customerUid) return res.json({ success: false, message: 'Geçersiz Kod' });
 
-        const pts = parseInt(await user.getUserField(customerUid, 'niki_points')) || 0;
-        if (pts < SETTINGS.coffeeCost) return res.json({ success: false, message: 'Yetersiz Bakiye' });
+            const pts = parseInt(await user.getUserField(customerUid, 'niki_points')) || 0;
+            if (pts < SETTINGS.coffeeCost) return res.json({ success: false, message: 'Yetersiz Bakiye' });
 
-        // İŞLEM
-        await user.decrementUserFieldBy(customerUid, 'niki_points', SETTINGS.coffeeCost);
-        await db.delete(`niki:qr:${token}`);
+            // İŞLEM
+            await user.decrementUserFieldBy(customerUid, 'niki_points', SETTINGS.coffeeCost);
+            await db.delete(`niki:qr:${token}`);
 
-        // LOGLARI KAYDET
-        const customerData = await user.getUserFields(customerUid, ['username', 'picture']);
-        
-        // Cüzdan için: "Kahve Keyfi"
-        await addUserLog(customerUid, 'spend', SETTINGS.coffeeCost, 'Kahve Keyfi ☕');
-        
-        // Kasa için: Kayıt
-        await addKasaLog(req.uid, customerData.username, customerUid);
+            // DETAYLI LOG KAYDI
+            const customerData = await user.getUserFields(customerUid, ['username', 'picture']);
 
-        return res.json({ success: true, customer: customerData, message: 'Onaylandı!' });
+            // Cüzdan için açıklama
+            await addUserLog(customerUid, 'spend', SETTINGS.coffeeCost, 'Kahve Keyfi ☕');
+
+            // Kasa için kayıt
+            await addKasaLog(req.uid, customerData.username, customerUid);
+
+            return res.json({ success: true, customer: customerData, message: 'Onaylandı!' });
+        } catch (err) {
+            return res.status(500).json({ success: false, message: 'Sunucu hatası' });
+        }
     });
 
     // SAYFA ROTASI
@@ -171,4 +247,4 @@ Plugin.addNavigation = async function (nav) {
     return nav;
 };
 
-module.exports = Plugin;
+module.exports = Plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-niki-loyalty",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "Niki The Cat Coffee Loyalty System - Earn points while studying on IEU Forum.",
   "main": "library.js",
   "nbbpm": {