estados-hs · prueba
-
POST /api/homeserve/change-status
+
Servidor:
+
+
+
+
+
-
+
@@ -418,7 +331,7 @@ app.get('/test', (req, res) => {
-
+
Listo.
@@ -427,7 +340,29 @@ app.get('/test', (req, res) => {
const $ = (id)=>document.getElementById(id);
const log = (x)=>{ $('log').textContent = (typeof x==='string'?x:JSON.stringify(x,null,2)); };
- $('btn').addEventListener('click', async () => {
+ // Base correcta SIEMPRE al mismo dominio donde estás (evita el lío de marsalva.es)
+ const BASE = window.location.origin;
+ $('base').textContent = BASE;
+
+ $('btnHealth').addEventListener('click', async () => {
+ try{
+ log('Consultando /health...');
+ const r = await fetch(BASE + '/health');
+ const j = await r.json().catch(()=>({}));
+ log({ http: r.status, base: BASE, response: j });
+ }catch(e){ log(String(e)); }
+ });
+
+ $('btnRoot').addEventListener('click', async () => {
+ try{
+ log('Consultando / ...');
+ const r = await fetch(BASE + '/');
+ const t = await r.text();
+ log({ http: r.status, base: BASE, responseText: t });
+ }catch(e){ log(String(e)); }
+ });
+
+ $('btnSend').addEventListener('click', async () => {
try{
log('Enviando...');
const body = {
@@ -436,61 +371,96 @@ app.get('/test', (req, res) => {
dateString: $('dateString').value.trim(),
observation: $('observation').value.trim()
};
- const r = await fetch('/api/homeserve/change-status', {
+
+ const r = await fetch(BASE + '/api/homeserve/change-status', {
method:'POST',
headers:{'Content-Type':'application/json'},
body: JSON.stringify(body)
});
const j = await r.json().catch(()=>({}));
- log({ http: r.status, ...j });
- }catch(e){
- log(String(e));
- }
+ log({ http: r.status, base: BASE, request: body, response: j });
+ }catch(e){ log(String(e)); }
});
`);
});
-// -----------------------------
-// CAPROVER PORT FIX (80 + PORT)
-// -----------------------------
-const port80 = 80;
-const envPort = parsePort(process.env.PORT, null);
-const caproverPort = parsePort(process.env.CAPROVER_PORT, null);
+// Endpoint principal: cambio directo
+app.post('/api/homeserve/change-status', async (req, res) => {
+ try {
+ if (CONFIG.REQUIRE_AUTH) {
+ const auth = req.headers.authorization || '';
+ const token = auth.startsWith('Bearer ') ? auth.slice(7) : '';
+ if (!CONFIG.AUTH_TOKEN || token !== CONFIG.AUTH_TOKEN) {
+ return res.status(401).json({ ok: false, error: { message: 'Unauthorized' } });
+ }
+ }
-const extraPorts = new Set([envPort, caproverPort].filter(Boolean));
-extraPorts.delete(port80);
+ const serviceNumber = String(req.body?.serviceNumber || '').trim();
+ const newStatusValue = String(req.body?.newStatusValue || '').trim(); // código
+ const dateString = String(req.body?.dateString || '').trim();
+ const observation = String(req.body?.observation || '').trim();
-const servers = [];
+ if (!serviceNumber) return res.status(400).json({ ok: false, error: { message: 'Missing serviceNumber' } });
+ if (!newStatusValue) return res.status(400).json({ ok: false, error: { message: 'Missing newStatusValue' } });
-function startListen(port) {
- const server = app.listen(port, '0.0.0.0', () => {
- console.log(`[estados-hs] listening on :${port}`);
- });
- servers.push(server);
-}
+ const startedAtISO = nowISO();
+ const creds = await getHomeServeCreds();
-console.log(`[estados-hs] HS_CRED_DOC_PATH=${CONFIG.HS_CRED_DOC_PATH}`);
-console.log(`[estados-hs] REQUIRE_AUTH=${CONFIG.REQUIRE_AUTH ? '1' : '0'}`);
-console.log(`[estados-hs] ENV PORT=${process.env.PORT || '(unset)'} CAPROVER_PORT=${process.env.CAPROVER_PORT || '(unset)'}`);
+ console.log(`[${CONFIG.SERVICE_NAME}] change-status service=${serviceNumber} status=${newStatusValue} credsSource=${creds.source}`);
-// 1) Puerto “seguro” para CapRover/NGINX
-startListen(port80);
+ await withBrowser(async (page) => {
+ await login(page, creds);
+ await openParte(page, serviceNumber);
+ await setEstado(page, newStatusValue, dateString || null, observation || null);
+ });
-// 2) Puertos extra (por ejemplo 3000) si existen
-for (const p of extraPorts) startListen(p);
+ const finishedAtISO = nowISO();
-// cierre limpio (evita que npm lo pinte como “error”)
-async function shutdown(signal) {
- console.log(`[estados-hs] received ${signal} -> shutting down gracefully...`);
- for (const s of servers) {
- try {
- await new Promise((resolve) => s.close(() => resolve()));
- } catch (_) {}
+ res.json({
+ ok: true,
+ serviceNumber,
+ newStatusValue,
+ startedAtISO,
+ finishedAtISO,
+ });
+
+ } catch (err) {
+ const finishedAtISO = nowISO();
+ res.status(500).json({
+ ok: false,
+ finishedAtISO,
+ error: {
+ message: String(err?.message || err),
+ stack: String(err?.stack || ''),
+ },
+ });
}
- process.exit(0);
+});
+
+// Helpers
+function escapeHtml(s) {
+ return String(s || '')
+ .replaceAll('&', '&')
+ .replaceAll('<', '<')
+ .replaceAll('>', '>')
+ .replaceAll('"', '"')
+ .replaceAll("'", ''');
}
-process.on('SIGTERM', () => shutdown('SIGTERM'));
-process.on('SIGINT', () => shutdown('SIGINT'));
\ No newline at end of file
+// ===== Listen (compatible CapRover) =====
+const portA = parseInt(process.env.CAPROVER_PORT || process.env.PORT || '3000', 10);
+const portB = 80; // por si CapRover está esperando 80 y no configuraste el "Container HTTP Port"
+
+console.log(`[${CONFIG.SERVICE_NAME}] HS_CRED_DOC_PATH=${CONFIG.HS_CRED_DOC_PATH}`);
+console.log(`[${CONFIG.SERVICE_NAME}] HS_CRED_DOC_FALLBACK=${CONFIG.HS_CRED_DOC_FALLBACK}`);
+console.log(`[${CONFIG.SERVICE_NAME}] REQUIRE_AUTH=${CONFIG.REQUIRE_AUTH ? 1 : 0}`);
+console.log(`[${CONFIG.SERVICE_NAME}] ENV PORT=${process.env.PORT || '(unset)'} CAPROVER_PORT=${process.env.CAPROVER_PORT || '(unset)'}`);
+
+app.listen(portA, () => console.log(`[${CONFIG.SERVICE_NAME}] listening on :${portA}`));
+
+// Si el puerto principal no es 80, abrimos 80 también para evitar 502 (si CapRover está esperando 80)
+if (portA !== portB) {
+ app.listen(portB, () => console.log(`[${CONFIG.SERVICE_NAME}] listening on :${portB}`));
+}
\ No newline at end of file