From 04100e8d5f3ac804fb5294c572160a5673e1df5f Mon Sep 17 00:00:00 2001 From: JoshBaneyCS Date: Wed, 30 Apr 2025 02:37:58 +0000 Subject: [PATCH] Update server.js --- server.js | 239 +++++++++++++++++++++++------------------------------- 1 file changed, 101 insertions(+), 138 deletions(-) diff --git a/server.js b/server.js index 8f04d8e..c1c3e2c 100644 --- a/server.js +++ b/server.js @@ -10,109 +10,70 @@ const { uploadTrendsCsv } = require('./s3'); const app = express(); const PORT = process.env.PORT || 3000; -// ─── Helpers ──────────────────────────────────────────────────────────────── -// Fetch current New York time (with DST) via worldtimeapi.org -async function getNYTime() { - try { - const res = await axios.get('http://worldtimeapi.org/api/timezone/America/New_York'); - return new Date(res.data.datetime); // ISO string with offset - } catch (e) { - console.error('Time API error:', e.message); - return new Date(); // fallback to local clock - } -} +// In‐memory shift counters +const shiftCounters = {}; -// Format a JS Date into "YYYY-MM-DD HH:mm:ss" in NY time for SQL DATETIME -function localDatetimeSQL(date) { - // datePart = "YYYY-MM-DD" - const datePart = new Intl.DateTimeFormat('en-CA', { - timeZone: 'America/New_York', - year: 'numeric', - month: '2-digit', - day: '2-digit' - }).format(date); - // timePart = "HH:MM:SS" - const timePart = new Intl.DateTimeFormat('en-GB', { - timeZone: 'America/New_York', - hour12: false, - hour: '2-digit', - minute: '2-digit', - second: '2-digit' - }).format(date); - return `${datePart} ${timePart}`; +// ─── Helpers ───────────────────────────────────────────────────────────────── +// Format a millisecond timestamp into "M/D/YY @HH:mm" 24-hr in New York +function formatForSlack(epoch) { + return new Date(epoch).toLocaleString('en-US', { + timeZone: 'America/New_York', + month: 'numeric', + day: 'numeric', + year: '2-digit', + hour12: false, + hour: '2-digit', + minute: '2-digit' + }).replace(',', ' @'); } - -// Format a JS Date into "M/D/YY @HH:mm" (24-hour) for Slack -function shortEST(date) { - const dateFmt = new Intl.DateTimeFormat('en-US', { - timeZone: 'America/New_York', - month: 'numeric', - day: 'numeric', - year: '2-digit' - }); - const timeFmt = new Intl.DateTimeFormat('en-US', { - timeZone: 'America/New_York', - hour12: false, - hour: '2-digit', - minute: '2-digit' - }); - return `${dateFmt.format(date)} @${timeFmt.format(date)}`; -} - // NOAA heat-index formula -function computeHeatIndex(T, R) { - const [c1,c2,c3,c4,c5,c6,c7,c8,c9] = [ - -42.379, 2.04901523, 10.14333127, -0.22475541, - -0.00683783, -0.05481717, 0.00122874, 0.00085282, -0.00000199 - ]; +function computeHeatIndex(T, R){ + const [c1,c2,c3,c4,c5,c6,c7,c8,c9] = + [-42.379,2.04901523,10.14333127,-0.22475541, + -0.00683783,-0.05481717,0.00122874,0.00085282,-0.00000199]; const HI = c1 + c2*T + c3*R + c4*T*R + c5*T*T + c6*R*R + c7*T*T*R + c8*T*R*R + c9*T*T*R*R; - return Math.round(HI * 100) / 100; + return Math.round(HI*100)/100; } - -// Determine Day/Night shift and rolling period -function getShiftInfo(now) { - const est = new Date(now.toLocaleString('en-US',{timeZone:'America/New_York'})); - const h = est.getHours(), m = est.getMinutes(); - let shift, start = new Date(est); - - if (h > 7 || (h === 7 && m >= 0)) { - if (h < 17 || (h === 17 && m < 30)) { - shift = 'Day'; start.setHours(7,0,0,0); +// Determine Day/Night shift & period +function getShiftInfo(epoch) { + const estNow = new Date(epoch).toLocaleString('en-US',{timeZone:'America/New_York'}); + const d = new Date(estNow); + const h = d.getHours(), m = d.getMinutes(); + let shift, start = new Date(d); + if (h > 7 || (h===7 && m>=0)){ + if (h<17 || (h===17 && m<30)){ + shift='Day'; start.setHours(7,0,0,0); } else { - shift = 'Night'; start.setHours(17,30,0,0); + shift='Night'; start.setHours(17,30,0,0); } } else { - shift = 'Night'; - start.setDate(start.getDate() - 1); + shift='Night'; + start.setDate(start.getDate()-1); start.setHours(17,30,0,0); } - const key = `${shift}-${start.toISOString().slice(0,10)}-${start.getHours()}${start.getMinutes()}`; - return { shift, key, estNow: est }; + return { shift, key, estNow:d }; } - -// Fetch current weather for Baltimore -async function fetchCurrentWeather() { - const key = process.env.WEATHER_API_KEY, zip = process.env.ZIP_CODE; - if (!key || !zip) return 'Unavailable'; +// Fetch weather +async function fetchCurrentWeather(){ + const key=process.env.WEATHER_API_KEY, zip=process.env.ZIP_CODE; + if(!key||!zip) return 'Unavailable'; try { const { data } = await axios.get( 'https://api.openweathermap.org/data/2.5/weather', { params:{ zip:`${zip},us`, appid:key, units:'imperial' } } ); const desc = data.weather[0].description.replace(/^\w/,c=>c.toUpperCase()); - const hi = Math.round(data.main.temp_max); - const hum = data.main.humidity; - return `${desc}. Hi of ${hi}, Humidity ${hum}%`; - } catch (e) { - console.error('Weather API error:', e.message); + return `${desc}. Hi of ${Math.round(data.main.temp_max)}, Humidity ${data.main.humidity}%`; + } catch(e){ + console.error('Weather API error',e.message); return 'Unavailable'; } } -// ─── MariaDB Pool & Table Setup ─────────────────────────────────────────────── +// ─── MariaDB Pool ───────────────────────────────────────────────────────────── const pool = mysql.createPool({ host: process.env.DB_HOST, port: +process.env.DB_PORT||3306, @@ -122,19 +83,19 @@ const pool = mysql.createPool({ waitForConnections:true, connectionLimit: 10, queueLimit: 0, - connectTimeout: 10000, - dateStrings: ['DATETIME'] + connectTimeout: 10000 }); -;(async()=>{ +// Ensure table exists (no-op if already ran above) +(async()=>{ await pool.execute(` CREATE TABLE IF NOT EXISTS readings ( id INT AUTO_INCREMENT PRIMARY KEY, location VARCHAR(20) NOT NULL, stationDockDoor VARCHAR(10) NOT NULL, - timestamp DATETIME NOT NULL, + epoch_ms BIGINT NOT NULL, temperature DOUBLE, humidity DOUBLE, heatIndex DOUBLE - ) CHARSET=utf8mb4; + ); `); })(); @@ -145,60 +106,62 @@ app.use(express.static(path.join(__dirname,'public'), { index:'heatmap.html' })) // ─── SSE Setup ──────────────────────────────────────────────────────────────── let clients = []; app.get('/api/stream',(req,res)=>{ - res.set({ 'Content-Type':'text/event-stream', 'Cache-Control':'no-cache', Connection:'keep-alive' }); - res.flushHeaders(); clients.push(res); - req.on('close',()=> clients=clients.filter(c=>c!==res)); + res.set({ + 'Content-Type':'text/event-stream', + 'Cache-Control':'no-cache', + Connection:'keep-alive' + }); + res.flushHeaders(); + clients.push(res); + req.on('close',()=>{ clients = clients.filter(c=>c!==res); }); }); function broadcast(evt,data){ const msg = `event: ${evt}\ndata: ${JSON.stringify(data)}\n\n`; clients.forEach(c=>c.write(msg)); } -// ─── Dual Dock-Door Endpoint ───────────────────────────────────────────────── +// ─── Dual Dock‐Door Endpoint ───────────────────────────────────────────────── app.post('/api/readings', async (req,res)=>{ try { const { inbound={}, outbound={} } = req.body; const { dockDoor: inD, temperature: inT, humidity: inH } = inbound; const { dockDoor: outD, temperature: outT, humidity: outH } = outbound; - if ([inD,inT,inH,outD,outT,outH].some(v=>v==null)) + if([inD,inT,inH,outD,outT,outH].some(v=>v==null)) return res.status(400).json({ error:'Missing fields' }); - const hiIn = computeHeatIndex(inT,inH); - const hiOut = computeHeatIndex(outT,outH); - const now = await getNYTime(); - const { shift, key, estNow } = getShiftInfo(now); - shiftCounters[key] = (shiftCounters[key]||0) +1; + const epoch = Date.now(); + const hiIn = computeHeatIndex(inT,inH); + const hiOut = computeHeatIndex(outT,outH); + const { shift, key, estNow } = getShiftInfo(epoch); + shiftCounters[key] = (shiftCounters[key]||0)+1; const period = shiftCounters[key]; - const sqlTs = localDatetimeSQL(estNow); - const shortTs = shortEST(estNow); + // insert both readings + const ins = ` + INSERT INTO readings(location,stationDockDoor,epoch_ms,temperature,humidity,heatIndex) + VALUES(?,?,?,?,?,?)`; + await pool.execute(ins,['Inbound', String(inD), epoch, inT, inH, hiIn]); + await pool.execute(ins,['Outbound',String(outD), epoch,outT,outH,hiOut]); - await pool.execute( - `INSERT INTO readings(location,stationDockDoor,timestamp,temperature,humidity,heatIndex) - VALUES(?,?,?,?,?,?)`, - ['Inbound',String(inD),sqlTs,inT,inH,hiIn] - ); - await pool.execute( - `INSERT INTO readings(location,stationDockDoor,timestamp,temperature,humidity,heatIndex) - VALUES(?,?,?,?,?,?)`, - ['Outbound',String(outD),sqlTs,outT,outH,hiOut] - ); + // broadcast SSE + const slackTs = formatForSlack(epoch); + broadcast('new-reading',{location:'Inbound',stationDockDoor:String(inD),timestamp:slackTs,temperature:inT,humidity:inH,heatIndex:hiIn}); + broadcast('new-reading',{location:'Outbound',stationDockDoor:String(outD),timestamp:slackTs,temperature:outT,humidity:outH,heatIndex:hiOut}); - broadcast('new-reading',{location:'Inbound',stationDockDoor:String(inD),timestamp:shortTs,temperature:inT,humidity:inH,heatIndex:hiIn}); - broadcast('new-reading',{location:'Outbound',stationDockDoor:String(outD),timestamp:shortTs,temperature:outT,humidity:outH,heatIndex:hiOut}); - - // upload CSV + // CSV upload + const y=estNow.getFullYear(), m=pad2(estNow.getMonth()+1), d=pad2(estNow.getDate()); + const dateKey = `${y}${m}${d}`; const [rows] = await pool.execute( - `SELECT * FROM readings WHERE DATE(timestamp)=CURDATE() ORDER BY timestamp` + `SELECT * FROM readings WHERE DATE(FROM_UNIXTIME(epoch_ms/1000))=CURDATE() ORDER BY epoch_ms` ); let csvUrl=null; - try{ csvUrl = await uploadTrendsCsv( - shortTs.slice(6,8)+shortTs.slice(0,2)+shortTs.slice(3,5), rows - ); }catch(_){} + try { csvUrl = await uploadTrendsCsv(dateKey, rows); } + catch(e){ console.error(e); } + // Slack const weather = await fetchCurrentWeather(); const text = - `*_${shift} shift Period ${period} dock/trailer temperature checks for ${shortTs}_*\n`+ + `*_${shift} shift Period ${period} dock/trailer temperature checks for ${slackTs}_*\n`+ `*_Current Weather Forecast for Baltimore: ${weather}_*\n\n`+ `*_⬇️ Inbound Dock Door 🚛 :_* ${inD}\n`+ `*_Temp:_* ${inT} °F 🌡️\n`+ @@ -216,7 +179,7 @@ app.post('/api/readings', async (req,res)=>{ ); res.json({ success:true, shift, period, csvUrl }); - } catch (err) { + } catch(err){ console.error(err); res.status(500).json({ error: err.message }); } @@ -226,35 +189,35 @@ app.post('/api/readings', async (req,res)=>{ app.post('/api/area-readings', async (req,res)=>{ try { const { area, stationCode, temperature:T, humidity:H } = req.body; - if (!area||!stationCode||T==null||H==null) + if(!area||!stationCode||T==null||H==null) return res.status(400).json({ error:'Missing fields' }); - const hi = computeHeatIndex(T,H); - const now = await getNYTime(); - const { shift, estNow } = getShiftInfo(now); - - const sqlTs = localDatetimeSQL(estNow); - const shortTs = shortEST(estNow); + const epoch = Date.now(); + const hi = computeHeatIndex(T,H); + const { shift, estNow } = getShiftInfo(epoch); await pool.execute( - `INSERT INTO readings(location,stationDockDoor,timestamp,temperature,humidity,heatIndex) + `INSERT INTO readings(location,stationDockDoor,epoch_ms,temperature,humidity,heatIndex) VALUES(?,?,?,?,?,?)`, - [area,stationCode,sqlTs,T,H,hi] + [area, stationCode, epoch, T, H, hi] ); - broadcast('new-area-reading',{location:area,stationDockDoor:stationCode,timestamp:shortTs,temperature:T,humidity:H,heatIndex:hi}); + const slackTs = formatForSlack(epoch); + broadcast('new-area-reading',{location:area,stationDockDoor:stationCode,timestamp:slackTs,temperature:T,humidity:H,heatIndex:hi}); + // CSV + const y=estNow.getFullYear(), m=pad2(estNow.getMonth()+1), d=pad2(estNow.getDate()); + const dateKey = `${y}${m}${d}`; const [rows] = await pool.execute( - `SELECT * FROM readings WHERE DATE(timestamp)=CURDATE() ORDER BY timestamp` + `SELECT * FROM readings WHERE DATE(FROM_UNIXTIME(epoch_ms/1000))=CURDATE() ORDER BY epoch_ms` ); let csvUrl=null; - try{ csvUrl = await uploadTrendsCsv( - shortTs.slice(6,8)+shortTs.slice(0,2)+shortTs.slice(3,5), rows - ); }catch(_){} + try { csvUrl = await uploadTrendsCsv(dateKey, rows); } + catch(e){ console.error(e); } const weather = await fetchCurrentWeather(); const text = - `*_${shift} shift ${area} temp check for ${shortTs}_*\n`+ + `*_${shift} shift ${area} temp check for ${slackTs}_*\n`+ `*_Current Weather Forecast for Baltimore: ${weather}_*\n\n`+ `*_${area.toUpperCase()} station:_* ${stationCode}\n`+ `*_Temp:_* ${T} °F 🌡️\n`+ @@ -268,7 +231,7 @@ app.post('/api/area-readings', async (req,res)=>{ ); res.json({ success:true, csvUrl }); - } catch(err) { + } catch(err){ console.error(err); res.status(500).json({ error: err.message }); } @@ -276,19 +239,19 @@ app.post('/api/area-readings', async (req,res)=>{ // ─── Fetch & Export ───────────────────────────────────────────────────────── app.get('/api/readings', async (req,res)=>{ - const [rows] = await pool.execute(`SELECT * FROM readings ORDER BY timestamp`); + const [rows] = await pool.execute(`SELECT * FROM readings ORDER BY epoch_ms`); res.json(rows); }); app.get('/api/export', async (req,res)=>{ - const [rows] = await pool.execute(`SELECT * FROM readings ORDER BY timestamp`); + const [rows] = await pool.execute(`SELECT * FROM readings ORDER BY epoch_ms`); res.setHeader('Content-disposition','attachment; filename=readings.csv'); res.set('Content-Type','text/csv'); - res.write('id,location,stationDockDoor,timestamp,temperature,humidity,heatIndex\n'); - rows.forEach(r => { - res.write(`${r.id},${r.location},${r.stationDockDoor},${r.timestamp},${r.temperature},${r.humidity},${r.heatIndex}\n`); + res.write('id,location,stationDockDoor,epoch_ms,temperature,humidity,heatIndex\n'); + rows.forEach(r=>{ + res.write(`${r.id},${r.location},${r.stationDockDoor},${r.epoch_ms},${r.temperature},${r.humidity},${r.heatIndex}\n`); }); res.end(); }); // ─── Start ─────────────────────────────────────────────────────────────────── -app.listen(PORT, ()=>console.log(`Server running http://localhost:${PORT}`)); +app.listen(PORT, ()=>console.log(`Server running on http://localhost:${PORT}`));