oxpoe/open-isp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix(gowa): status device array, auto-save device id, QR hide saat terhubung
All checks were successful
CI / test (push) Successful in 1m53s
Details

Browse Source 
- status route normalisasi results array + auto isi gowa_device_id
- UI poll status 3s, sembunyikan QR saat open
- resolveDeviceId utamakan device connected
- versi 0.5.17
This commit is contained in:
oxpoe
2026-11-06 03:38:00 +07:00
parent 8a312485a7
commit fadbf0084b
7 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
routes/adminPortal.js
View File

@@ -7388,11 +7388,27 @@ router.get('/api/whatsapp/status', requireAdmin, async (req, res) => {
} else if (gatewayType === 'gowa') {
let st = null;
try { st = await require('../services/gowaWhatsappService').gowaStatus(); } catch (e) { st = { ok: false, error: e.message }; }
const rr = (st && st.data && st.data.results) || {};
const loggedIn = !!(rr.is_logged_in || rr.isConnected || rr.connected);
const isConn = !!(rr.is_connected || rr.connected);
// /devices mengembalikan array (banyak device); /devices/:id/status mengembalikan objek.
const raw = st && st.data && st.data.results;
const list = Array.isArray(raw) ? raw : ((raw && typeof raw === 'object') ? [raw] : []);
const pick = list.find(function (d) {
return d && (d.is_connected || d.is_logged_in || d.connected ||
d.state === 'connected' || d.state === 'logged_in');
}) || list[0] || {};
const loggedIn = !!(pick.is_logged_in || pick.is_connected || pick.connected ||
pick.state === 'connected' || pick.state === 'logged_in');
const isConn = !!(pick.is_connected || pick.connected || pick.state === 'connected');
const conn = isConn ? 'open' : (loggedIn ? 'connecting' : 'close');
res.json({ connection: conn, gateway: 'gowa', loggedIn: loggedIn, user: { id: 'gowa_gateway', name: loggedIn ? 'GOWA (WhatsApp)' : 'GOWA Gateway' }, lastUpdate: new Date().toISOString() });
const deviceId = String(pick.device_id || pick.id || '').trim();
// Simpan otomatis device id agar status berikutnya memakai /devices/:id/status.
if (deviceId && !String(getSetting('gowa_device_id', '') || '').trim()) {
try { saveSettings({ gowa_device_id: deviceId }); } catch (e) {}
}
res.json({
connection: conn, gateway: 'gowa', loggedIn: loggedIn, deviceId: deviceId,
user: { id: deviceId || 'gowa_gateway', name: loggedIn ? 'GOWA (WhatsApp)' : 'GOWA Gateway' },
lastUpdate: new Date().toISOString()
});
} else if (gatewayType === 'baileys') {
const { whatsappStatus, startWhatsAppBot, isBotRunning } = await import('../services/whatsappBot.mjs');
if (getSetting('whatsapp_enabled', true) && !isBotRunning() && whatsappStatus.connection !== 'open' && whatsappStatus.connection !== 'qr') {