Upload 59 files

api.js

@@ -2,6 +2,7 @@ const express = require('express');
 const crypto = require('crypto');
 const path = require('path');
 const User = require('./models/User');
+const { editMsg } = require('./utils/editMsg');
 
 const app = express();
 app.use(express.json());
@@ -141,6 +142,15 @@ app.get('/me', auth, async (req, res) => {
     } catch (err) { res.status(500).json({ error: 'Error' }); }
 });
 
+async function editGameChatResult(game, text) {
+    if (!global._tgClient || !game?.chatId || !game?.chatMsgId) return;
+    try {
+        await editMsg(global._tgClient, game.chatId, game.chatMsgId, text, null);
+    } catch (e) {
+        console.error('[API] editGameChatResult:', e.message);
+    }
+}
+
 // ── Carrom API ──
 app.post('/carrom/mode', auth, (req, res) => {
     try {
@@ -223,11 +233,7 @@ app.post('/carrom/shoot', auth, async (req, res) => {
                 await leveling.addXP(w.userId, 200);
                 await u.save();
             }
-            if (global._tgClient && game.chatId) {
-                try {
-                    await global._tgClient.sendMessage(game.chatId, { message: `🏆 <b>CARROM OVER!</b> ${winners.map(w => w.name).join(' & ')} win <b>$${pot}</b>!` });
-                } catch {}
-            }
+            await editGameChatResult(game, `🏆 <b>CARROM OVER!</b>\n${winners.map(w => w.name).join(' & ')} win <b>$${pot}</b>!`);
             setTimeout(() => sessions.delete(req.body.gameId), 5000);
         }
         res.json({ ok: true, state: game.getState(req.tgUser.id.toString()) });
@@ -259,11 +265,7 @@ app.post('/carrom/forfeit', auth, async (req, res) => {
                 await leveling.addXP(w.userId, 100);
                 await u.save();
             }
-            if (global._tgClient && game.chatId) {
-                try {
-                    await global._tgClient.sendMessage(game.chatId, { message: `🏳️ <b>${quitter}</b> gave up! ${winners.map(w => w.name).join(' & ')} win <b>$${pot}</b>!` });
-                } catch {}
-            }
+            await editGameChatResult(game, `🏳️ <b>${quitter}</b> gave up!\n${winners.map(w => w.name).join(' & ')} win <b>$${pot}</b>!`);
         }
         setTimeout(() => sessions.delete(gameId), 5000);
         res.json({ ok: true, state: game.getState(userId) });
@@ -310,7 +312,7 @@ app.post('/wcards/play', auth, async (req, res) => {
             const pot = game.bet * game.players.length;
             const share = Math.floor(pot / winners.length);
             for (const w of winners) { let u = await User.findOne({userId:w.userId})||await User.create({userId:w.userId}); u.wallet+=share; await leveling.addXP(w.userId,150); await u.save(); }
-            if (global._tgClient && game.chatId) try { await global._tgClient.sendMessage(game.chatId, { message: `🃏 <b>CARDS OVER!</b> ${winners.map(w=>w.name).join(' & ')} win <b>$${pot}</b>!` }); } catch {}
+            await editGameChatResult(game, `🃏 <b>CARDS OVER!</b>\n${winners.map(w=>w.name).join(' & ')} win <b>$${pot}</b>!`);
             setTimeout(() => sessions.delete(req.body.gameId), 5000);
         }
         res.json({ ok: true, state: game.getState(req.tgUser.id.toString()) });
@@ -343,7 +345,7 @@ app.post('/wcards/forfeit', auth, async (req, res) => {
             const pot = game.bet * game.players.length;
             const share = winners.length ? Math.floor(pot / winners.length) : 0;
             for (const w of winners) { let u = await User.findOne({userId:w.userId})||await User.create({userId:w.userId}); u.wallet+=share; await leveling.addXP(w.userId,75); await u.save(); }
-            if (global._tgClient && game.chatId) try { await global._tgClient.sendMessage(game.chatId, { message: `🏳️ <b>${quitter}</b> gave up! ${winners.map(w=>w.name).join(' & ')} win <b>$${pot}</b>!` }); } catch {}
+            await editGameChatResult(game, `🏳️ <b>${quitter}</b> gave up!\n${winners.map(w=>w.name).join(' & ')} win <b>$${pot}</b>!`);
         }
         setTimeout(() => sessions.delete(req.body.gameId), 4000);
         res.json({ ok: true, state: game.getState(userId) });
@@ -398,7 +400,7 @@ app.post('/omi/play', auth, async (req, res) => {
             const pot = game.bet * game.players.length;
             const share = Math.floor(pot / winners.length);
             for (const w of winners) { let u = await User.findOne({userId:w.userId})||await User.create({userId:w.userId}); u.wallet+=share; await leveling.addXP(w.userId,150); await u.save(); }
-            if (global._tgClient && game.chatId) try { await global._tgClient.sendMessage(game.chatId, { message: `🃏 <b>OMI OVER!</b> ${winners.map(w=>w.name).join(' & ')} win <b>$${pot}</b>!` }); } catch {}
+            await editGameChatResult(game, `🃏 <b>OMI OVER!</b>\n${winners.map(w=>w.name).join(' & ')} win <b>$${pot}</b>!`);
             setTimeout(() => sessions.delete(req.body.gameId), 5000);
         }
         res.json({ ok: true, state: game.getState(req.tgUser.id.toString()) });
@@ -421,7 +423,7 @@ app.post('/omi/forfeit', auth, async (req, res) => {
             const pot = game.bet * game.players.length;
             const share = winners.length ? Math.floor(pot / winners.length) : 0;
             for (const w of winners) { let u = await User.findOne({userId:w.userId})||await User.create({userId:w.userId}); u.wallet+=share; await leveling.addXP(w.userId,75); await u.save(); }
-            if (global._tgClient && game.chatId) try { await global._tgClient.sendMessage(game.chatId, { message: `🏳️ <b>${quitter}</b> gave up! ${winners.map(w=>w.name).join(' & ')} win <b>$${pot}</b>!` }); } catch {}
+            await editGameChatResult(game, `🏳️ <b>${quitter}</b> gave up!\n${winners.map(w=>w.name).join(' & ')} win <b>$${pot}</b>!`);
         }
         setTimeout(() => sessions.delete(req.body.gameId), 4000);
         res.json({ ok: true, state: game.getState(userId) });

handlers/carrom.js

@@ -105,15 +105,16 @@ const startCarrom = async (client, event) => {
 
   const gameId = `crm:${event.chatId}:${crypto.randomBytes(4).toString('hex')}`;
   const name = await getName(client, userId);
-  const game = new CarromGame(bet, 4);
-  game.addPlayer(userId, name);
-  game.chatId = event.chatId.toString();
-  sessions.set(gameId, game);
-
-  await client.sendMessage(event.chatId, {
-    message: lobbyMsg(game),
-    buttons: lobbyButtons(game, gameId),
-  });
+    const game = new CarromGame(bet, 4);
+    game.addPlayer(userId, name);
+    game.chatId = event.chatId.toString();
+    sessions.set(gameId, game);
+
+    const sent = await client.sendMessage(event.chatId, {
+        message: lobbyMsg(game),
+        buttons: lobbyButtons(game, gameId),
+    });
+    game.chatMsgId = sent.id;
 
   game._timer = setTimeout(async () => {
     const g = sessions.get(gameId);

handlers/omi.js

@@ -23,7 +23,7 @@ const startOmi = async (client, event) => {
     game.chatId = event.chatId.toString();
     sessions.set(gameId, game);
 
-    await client.sendMessage(event.chatId, {
+    const sent = await client.sendMessage(event.chatId, {
         message: `🃏 <b>OMI</b>\nBet: $${bet} each | 2-4 players\n\n👤 ${name} (host)\n⏳ Waiting...`,
         buttons: new Api.ReplyInlineMarkup({ rows: [
             new Api.KeyboardButtonRow({ buttons: [
@@ -34,6 +34,7 @@ const startOmi = async (client, event) => {
             ] })
         ] })
     });
+    game.chatMsgId = sent.id;
 
     game._timer = setTimeout(async () => {
         const g = sessions.get(gameId);

handlers/webCards.js

@@ -23,7 +23,7 @@ const startWebCards = async (client, event) => {
     game.chatId = event.chatId.toString();
     sessions.set(gameId, game);
 
-    await client.sendMessage(event.chatId, {
+    const sent = await client.sendMessage(event.chatId, {
         message: `🃏 <b>CARD GAME</b>\nBet: $${bet} each\n\n👤 ${name} (host)\n⏳ Waiting for players (2-6)...\n\n<i>Open the Mini App to see your cards!</i>`,
         buttons: new Api.ReplyInlineMarkup({ rows: [
             new Api.KeyboardButtonRow({ buttons: [
@@ -34,6 +34,7 @@ const startWebCards = async (client, event) => {
             ] })
         ] })
     });
+    game.chatMsgId = sent.id;
 
     game._timer = setTimeout(async () => {
         const g = sessions.get(gameId);

webapp/cards.html

@@ -27,14 +27,14 @@ body{background:#0a1628;color:#fff;font-family:-apple-system,sans-serif;min-heig
 .tcard{width:65px;height:95px;border-radius:8px;display:flex;flex-direction:column;align-items:center;justify-content:center;font-weight:700;position:relative;transition:transform .3s,box-shadow .3s;}
 .tcard.facedown{background:linear-gradient(135deg,#1e40af,#1e3a8a);border:2px solid #3b82f6;box-shadow:0 4px 12px rgba(59,130,246,.2);}
 .tcard.facedown::after{content:'🂠';font-size:32px;}
-.tcard.faceup{background:#fff;color:#1a1a1a;border:2px solid #ddd;box-shadow:0 4px 15px rgba(0,0,0,.3);animation:flipIn .4s ease;}
+.tcard.faceup{background:#fff;color:#1a1a1a;border:2px solid #ddd;box-shadow:0 4px 15px rgba(0,0,0,.3);}
 .tcard.faceup .tsuit{font-size:24px;}
 .tcard.faceup .tlabel{font-size:18px;font-weight:800;}
 .tcard.faceup.red{color:#dc2626;}
 .tcard.faceup.winner{border-color:#f59e0b;box-shadow:0 0 20px rgba(245,158,11,.4);}
 .tcard-name{font-size:9px;color:#888;text-align:center;margin-top:2px;max-width:65px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
 /* CardMeister card wrappers (table) */
-.tcard-wrap{display:inline-block;border-radius:8px;box-shadow:0 4px 15px rgba(0,0,0,.3);transition:transform .3s,box-shadow .3s;animation:flipIn .4s ease;line-height:0;overflow:hidden;}
+.tcard-wrap{display:inline-block;border-radius:8px;box-shadow:0 4px 15px rgba(0,0,0,.3);transition:transform .3s,box-shadow .3s;line-height:0;overflow:hidden;}
 .tcard-wrap svg,.tcard-wrap playing-card,.tcard-wrap playing-card img{display:block;border-radius:8px;}
 .tcard-wrap playing-card img{width:100%;height:100%;}
 .tcard-wrap.winner{box-shadow:0 0 20px rgba(245,158,11,.5);}
@@ -71,6 +71,11 @@ body{background:#0a1628;color:#fff;font-family:-apple-system,sans-serif;min-heig
 .lplayers{margin:16px 0;font-size:14px;line-height:1.8;}
 .lstbtn{padding:12px 36px;border:none;border-radius:12px;font-size:15px;font-weight:700;cursor:pointer;color:#fff;background:linear-gradient(135deg,#22c55e,#16a34a);margin:6px;}
 .lstbtn:disabled{opacity:.3;cursor:not-allowed;}
+#endModal{position:fixed;inset:0;background:rgba(0,0,0,.72);display:none;align-items:center;justify-content:center;padding:20px;z-index:50;}
+#endModal.show{display:flex;}
+#endCard{background:#111827;border:1px solid rgba(255,255,255,.08);border-radius:16px;padding:22px;max-width:360px;width:100%;text-align:center;}
+#endCard h2{margin-bottom:10px;color:#f59e0b;}
+#endBody{font-size:14px;line-height:1.5;margin-bottom:12px;}
 </style>
 </head>
 <body>
@@ -84,6 +89,7 @@ body{background:#0a1628;color:#fff;font-family:-apple-system,sans-serif;min-heig
 <div id="actions"></div>
 <div id="hand-area"><div id="hand-label">Your Cards</div><div id="hand"></div></div>
 </div>
+<div id="endModal"><div id="endCard"><h2 id="endTitle">Game Over</h2><div id="endBody"></div><button class="abtn green" id="endOkBtn">OK</button></div></div>
 <script>
 const tg=window.Telegram?.WebApp;if(tg){tg.expand();tg.ready();}
 if(!tg?.initData||!tg.initDataUnsafe?.user?.id){document.getElementById('blocked').style.display='flex';throw new Error('no auth');}
@@ -93,7 +99,9 @@ const sp=new URLSearchParams(location.search).get('tgWebAppStartParam')||tg.init
 const GID=sp.replace('wcards_','').replace(/_0_/g,':');
 async function rpc(m,p,b){try{const o={method:m,headers:{'X-Init-Data':tg.initData,'Content-Type':'application/json'}};if(b)o.body=JSON.stringify(b);const r=await fetch(API+p,o);return JSON.parse(await r.text());}catch{return{ok:false,error:'Network error'};}}
 
-let S=null,selectedCard=null,pollId=null;
+let S=null,selectedCard=null,pollId=null,endShown=false;
+function closeMiniApp(){try{tg.close();}catch(e){try{window.close();}catch(_){}}}
+document.getElementById('endOkBtn').onclick=closeMiniApp;
 
 // Give Up: confirm popup then forfeit
 GiveUp.bind({
@@ -225,10 +233,20 @@ async function hostStart(){
     else{document.getElementById('lwait').textContent=r.error;document.getElementById('lstbtn').disabled=false;}
 }
 
+function showEndModal(){
+    if(!S||S.status!=='ended')return;
+    const gu=S.forfeitedBy?`<b>${S.forfeitedBy}</b> gave up.<br><br>`:'';
+    document.getElementById('endTitle').textContent='🏆 Winners';
+    document.getElementById('endBody').innerHTML=`${gu}<b>${(S.winner||[]).join(' & ')}</b> win!`;
+    document.getElementById('endModal').classList.add('show');
+}
+
 function render(){
     if(!S)return;
     if(S.status==='lobby')renderLobby();
     else renderGame();
+    if(S.status==='ended'&&!endShown){endShown=true;showEndModal();}
+    if(S.status!=='ended')endShown=false;
 }
 
 let pollFails=0;

webapp/carrom.html

@@ -253,6 +253,7 @@
   'use strict';
   const tg = window.Telegram?.WebApp;
   if (tg) { try { tg.expand(); tg.ready(); } catch {} }
+  function closeMiniApp(){ try{ tg?.close(); } catch(e){ try{ window.close(); } catch(_){} } }
 
   const startParam = new URLSearchParams(location.search).get('tgWebAppStartParam') || tg?.initDataUnsafe?.start_param || '';
   const GAME_ID = startParam.replace('carrom_', '').replace(/_0_/g, ':');
@@ -674,7 +675,7 @@
   $('rulesBtnTop').onclick = () => rulesModal.classList.add('show');
   $('closeRules').onclick = () => rulesModal.classList.remove('show');
   $('closeBoard').onclick = () => boardModal.classList.remove('show');
-  $('closeMatch').onclick = () => matchModal.classList.remove('show');
+  $('closeMatch').onclick = () => closeMiniApp();
 
   document.querySelectorAll('#modeModal button[data-mode]').forEach(btn => {
     btn.onclick = async () => {

webapp/omi.html

@@ -45,6 +45,11 @@ body{background:#0d1b2a;color:#fff;font-family:-apple-system,sans-serif;min-heig
 #lobby{display:none;flex:1;flex-direction:column;align-items:center;justify-content:center;text-align:center;padding:30px;}
 .lbtn{padding:12px 30px;border:none;border-radius:10px;font-size:14px;font-weight:700;cursor:pointer;color:#fff;background:linear-gradient(135deg,#22c55e,#16a34a);margin:6px;}
 .lbtn:disabled{opacity:.3;}
+#endModal{position:fixed;inset:0;background:rgba(0,0,0,.72);display:none;align-items:center;justify-content:center;padding:20px;z-index:50;}
+#endModal.show{display:flex;}
+#endCard{background:#111827;border:1px solid rgba(255,255,255,.08);border-radius:16px;padding:22px;max-width:360px;width:100%;text-align:center;}
+#endCard h2{margin-bottom:10px;color:#f59e0b;}
+#endBody{font-size:14px;line-height:1.5;margin-bottom:12px;}
 </style>
 </head>
 <body>
@@ -59,6 +64,7 @@ body{background:#0d1b2a;color:#fff;font-family:-apple-system,sans-serif;min-heig
 <div id="actions"></div>
 <div id="hand-area"><div id="hand-label">Your Cards</div><div id="hand"></div></div>
 </div>
+<div id="endModal"><div id="endCard"><h2 id="endTitle">Game Over</h2><div id="endBody"></div><button class="abtn g" id="endOkBtn">OK</button></div></div>
 <script>
 const tg=window.Telegram?.WebApp;if(tg){tg.expand();tg.ready();}
 if(!tg?.initData||!tg.initDataUnsafe?.user?.id){document.getElementById('blocked').style.display='flex';throw new Error('no auth');}
@@ -68,7 +74,9 @@ const sp=new URLSearchParams(location.search).get('tgWebAppStartParam')||tg.init
 const GID=sp.replace('omi_','').replace(/_0_/g,':');
 async function rpc(m,p,b){try{const o={method:m,headers:{'X-Init-Data':tg.initData,'Content-Type':'application/json'}};if(b)o.body=JSON.stringify(b);const r=await fetch(API+p,o);return JSON.parse(await r.text());}catch{return{ok:false,error:'Network'};}}
 
-let S=null,sel=null,pollId=null;
+let S=null,sel=null,pollId=null,endShown=false;
+function closeMiniApp(){try{tg.close();}catch(e){try{window.close();}catch(_){}}}
+document.getElementById('endOkBtn').onclick=closeMiniApp;
 
 // Give Up: confirm popup then forfeit
 GiveUp.bind({
@@ -203,11 +211,21 @@ async function hostStart(){
     else{document.getElementById('lwait').textContent=r.error;document.getElementById('lbtn').disabled=false;}
 }
 
+function showEndModal(){
+    if(!S||S.status!=='ended')return;
+    const gu=S.forfeitedBy?`<b>${S.forfeitedBy}</b> gave up.<br><br>`:'';
+    document.getElementById('endTitle').textContent='🏆 Winners';
+    document.getElementById('endBody').innerHTML=`${gu}<b>${(S.winner||[]).join(' & ')}</b> win!`;
+    document.getElementById('endModal').classList.add('show');
+}
+
 function render(){
     if(!S)return;
     if(S.status==='lobby')renderLobby();
     else if(S.status==='chooseTrump')renderTrumpChoice();
     else renderGame();
+    if(S.status==='ended'&&!endShown){endShown=true;showEndModal();}
+    if(S.status!=='ended')endShown=false;
 }
 
 let pollFails=0;