Update server.js
This commit is contained in:
parent
6461fc8e85
commit
ca7fd0c033
225
server.js
225
server.js
@ -1,3 +1,4 @@
|
||||
// server.js
|
||||
require('dotenv').config();
|
||||
const express = require('express');
|
||||
const mysql = require('mysql2/promise');
|
||||
@ -13,52 +14,42 @@ const PORT = process.env.PORT || 3000;
|
||||
const shiftCounters = {};
|
||||
|
||||
// ─── Helpers ──────────────────────────────────────────────────────────────────
|
||||
// zero-pad
|
||||
const pad2 = n => n.toString().padStart(2,'0');
|
||||
// pad to two digits
|
||||
function pad2(n) {
|
||||
return n.toString().padStart(2, '0');
|
||||
}
|
||||
|
||||
// Format Date in EST as “M/D/YY @HH:mm” using Intl (no round-trip through string)
|
||||
function shortEST(date) {
|
||||
const dateFmt = new Intl.DateTimeFormat('en-US', {
|
||||
// Format epoch_ms → "M/D/YY @HH:mm" (24-hour) in America/New_York
|
||||
function formatForSlack(epoch) {
|
||||
return new Date(epoch).toLocaleString('en-US', {
|
||||
timeZone: 'America/New_York',
|
||||
month: 'numeric',
|
||||
day: 'numeric',
|
||||
year: '2-digit'
|
||||
});
|
||||
const timeFmt = new Intl.DateTimeFormat('en-US', {
|
||||
timeZone: 'America/New_York',
|
||||
year: '2-digit',
|
||||
hour12: false,
|
||||
hour: '2-digit',
|
||||
minute: '2-digit'
|
||||
});
|
||||
return `${dateFmt.format(date)} @${timeFmt.format(date)}`;
|
||||
}
|
||||
|
||||
// Format Date in EST as SQL DATETIME “YYYY-MM-DD HH:mm:ss”
|
||||
function formatDateEST(date) {
|
||||
const est = new Date(date.toLocaleString('en-US', { timeZone: 'America/New_York' }));
|
||||
const Y = est.getFullYear();
|
||||
const M = pad2(est.getMonth() + 1);
|
||||
const D = pad2(est.getDate());
|
||||
const h = pad2(est.getHours());
|
||||
const m = pad2(est.getMinutes());
|
||||
const s = pad2(est.getSeconds());
|
||||
return `${Y}-${M}-${D} ${h}:${m}:${s}`;
|
||||
}).replace(',', ' @');
|
||||
}
|
||||
|
||||
// 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];
|
||||
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;
|
||||
}
|
||||
|
||||
// Determine Day/Night shift and period key
|
||||
function getShiftInfo(now) {
|
||||
const est = new Date(now.toLocaleString('en-US', { timeZone:'America/New_York' }));
|
||||
// Determine Day/Night shift & period key from epoch_ms
|
||||
function getShiftInfo(epoch) {
|
||||
// Convert to EST by string-round-trip
|
||||
const estString = new Date(epoch)
|
||||
.toLocaleString('en-US', { timeZone: 'America/New_York' });
|
||||
const est = new Date(estString);
|
||||
const h = est.getHours(), m = est.getMinutes();
|
||||
let shift, start = new Date(est);
|
||||
|
||||
@ -75,18 +66,18 @@ function getShiftInfo(now) {
|
||||
}
|
||||
|
||||
const key = `${shift}-${start.toISOString().slice(0,10)}-${start.getHours()}${start.getMinutes()}`;
|
||||
return { shift, start, key, estNow: est };
|
||||
return { shift, key, estNow: est };
|
||||
}
|
||||
|
||||
// Fetch current weather from OpenWeatherMap
|
||||
// Fetch current Baltimore weather
|
||||
async function fetchCurrentWeather() {
|
||||
const key = process.env.WEATHER_API_KEY;
|
||||
const zip = process.env.ZIP_CODE;
|
||||
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 { 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;
|
||||
@ -111,23 +102,25 @@ const pool = mysql.createPool({
|
||||
});
|
||||
|
||||
(async () => {
|
||||
const sql = `
|
||||
// Create table with epoch_ms only
|
||||
await pool.execute(`
|
||||
CREATE TABLE IF NOT EXISTS readings (
|
||||
id INT AUTO_INCREMENT PRIMARY KEY,
|
||||
id INT NOT NULL 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
|
||||
);`;
|
||||
await pool.execute(sql);
|
||||
heatIndex DOUBLE,
|
||||
INDEX idx_time (epoch_ms),
|
||||
INDEX idx_loc (location)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
|
||||
`);
|
||||
})();
|
||||
|
||||
// ─── Middleware & Static (default to heatmap.html) ───────────────────────────
|
||||
// ─── Middleware & Static ─────────────────────────────────────────────────────
|
||||
app.use(bodyParser.json());
|
||||
const publicDir = path.join(__dirname,'public');
|
||||
app.use(express.static(publicDir, { index: 'heatmap.html' }));
|
||||
app.use(express.static(path.join(__dirname,'public'), { index:'heatmap.html' }));
|
||||
|
||||
// ─── SSE Setup ────────────────────────────────────────────────────────────────
|
||||
let clients = [];
|
||||
@ -139,63 +132,73 @@ app.get('/api/stream',(req,res)=>{
|
||||
});
|
||||
res.flushHeaders();
|
||||
clients.push(res);
|
||||
req.on('close',()=>clients = clients.filter(c=>c!==res));
|
||||
req.on('close',()=>{ clients = clients.filter(c=>c!==res); });
|
||||
});
|
||||
function broadcast(evt,data){
|
||||
const msg = `event: ${evt}\ndata: ${JSON.stringify(data)}\n\n`;
|
||||
function broadcast(event,data){
|
||||
const msg = `event: ${event}\ndata: ${JSON.stringify(data)}\n\n`;
|
||||
clients.forEach(c=>c.write(msg));
|
||||
}
|
||||
|
||||
// ─── Dual Dock-Door Readings 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 epoch = Date.now();
|
||||
const hiIn = computeHeatIndex(inT, inH);
|
||||
const hiOut = computeHeatIndex(outT, outH);
|
||||
const now = new Date();
|
||||
const { shift, key, estNow } = getShiftInfo(now);
|
||||
const { shift, key, estNow } = getShiftInfo(epoch);
|
||||
shiftCounters[key] = (shiftCounters[key]||0) + 1;
|
||||
const period = shiftCounters[key];
|
||||
const slackTs = formatForSlack(epoch);
|
||||
|
||||
const sqlTs = formatDateEST(estNow);
|
||||
const shortTs = shortEST(estNow);
|
||||
|
||||
const insertSQL = `
|
||||
INSERT INTO readings(location,stationDockDoor,timestamp,temperature,humidity,heatIndex)
|
||||
VALUES(?,?,?,?,?,?)`;
|
||||
await pool.execute(insertSQL, ['Inbound', String(inD), sqlTs, inT, inH, hiIn]);
|
||||
await pool.execute(insertSQL, ['Outbound', String(outD), sqlTs, outT, outH, hiOut]);
|
||||
// Insert inbound + outbound
|
||||
const sql = `
|
||||
INSERT INTO readings(location,stationDockDoor,epoch_ms,temperature,humidity,heatIndex)
|
||||
VALUES(?,?,?,?,?,?)
|
||||
`;
|
||||
await pool.execute(sql, ['Inbound', String(inD), epoch, inT, inH, hiIn]);
|
||||
await pool.execute(sql, ['Outbound', String(outD), epoch, outT, outH, hiOut]);
|
||||
|
||||
// SSE broadcast
|
||||
broadcast('new-reading', {
|
||||
location: 'Inbound', stationDockDoor:String(inD),
|
||||
timestamp: shortTs, temperature:inT,
|
||||
humidity: inH, heatIndex: hiIn
|
||||
location: 'Inbound',
|
||||
stationDockDoor: String(inD),
|
||||
timestamp: slackTs,
|
||||
temperature: inT,
|
||||
humidity: inH,
|
||||
heatIndex: hiIn
|
||||
});
|
||||
broadcast('new-reading', {
|
||||
location:'Outbound', stationDockDoor:String(outD),
|
||||
timestamp: shortTs, temperature:outT,
|
||||
humidity: outH, heatIndex: hiOut
|
||||
location: 'Outbound',
|
||||
stationDockDoor: String(outD),
|
||||
timestamp: slackTs,
|
||||
temperature: outT,
|
||||
humidity: outH,
|
||||
heatIndex: hiOut
|
||||
});
|
||||
|
||||
// CSV Upload
|
||||
// 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`
|
||||
);
|
||||
const [rows] = await pool.execute(`
|
||||
SELECT * FROM readings
|
||||
WHERE DATE(FROM_UNIXTIME(epoch_ms/1000))=CURDATE()
|
||||
ORDER BY epoch_ms
|
||||
`);
|
||||
let csvUrl=null;
|
||||
try { csvUrl = await uploadTrendsCsv(dateKey, rows); }
|
||||
catch(e){ console.error('CSV upload error',e); }
|
||||
catch(e){ console.error('CSV upload error:', e); }
|
||||
|
||||
// Slack message
|
||||
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`+
|
||||
@ -206,12 +209,9 @@ app.post('/api/readings', async (req,res) => {
|
||||
`*_Humidity:_* ${outH} % 💦\n`+
|
||||
`*_Heat Index:_* ${hiOut} °F 🥵`;
|
||||
|
||||
// Send to Slack workflow trigger
|
||||
await axios.post(
|
||||
process.env.SLACK_WEBHOOK_URL,
|
||||
{ text },
|
||||
{ headers: {'Content-Type':'application/json'} }
|
||||
);
|
||||
await axios.post(process.env.SLACK_WEBHOOK_URL, { text }, {
|
||||
headers:{ 'Content-Type':'application/json' }
|
||||
});
|
||||
|
||||
res.json({ success:true, shift, period, csvUrl });
|
||||
} catch (err) {
|
||||
@ -220,55 +220,56 @@ app.post('/api/readings', async (req,res) => {
|
||||
}
|
||||
});
|
||||
|
||||
// ─── Area/Mod Station Readings Endpoint ─────────────────────────────────────
|
||||
// ─── Area/Mod Endpoint ───────────────────────────────────────────────────────
|
||||
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 epoch = Date.now();
|
||||
const hi = computeHeatIndex(T, H);
|
||||
const now = new Date();
|
||||
const { shift, estNow } = getShiftInfo(now);
|
||||
const { shift, key, estNow } = getShiftInfo(epoch);
|
||||
const slackTs = formatForSlack(epoch);
|
||||
|
||||
const sqlTs = formatDateEST(estNow);
|
||||
const shortTs = shortEST(estNow);
|
||||
|
||||
const insertSQL = `
|
||||
INSERT INTO readings(location,stationDockDoor,timestamp,temperature,humidity,heatIndex)
|
||||
VALUES(?,?,?,?,?,?)`;
|
||||
await pool.execute(insertSQL, [area, stationCode, sqlTs, T, H, hi]);
|
||||
await pool.execute(`
|
||||
INSERT INTO readings(location,stationDockDoor,epoch_ms,temperature,humidity,heatIndex)
|
||||
VALUES(?,?,?,?,?,?)
|
||||
`, [area, stationCode, epoch, T, H, hi]);
|
||||
|
||||
broadcast('new-area-reading', {
|
||||
location:area, stationDockDoor:stationCode,
|
||||
timestamp:shortTs, temperature:T,
|
||||
humidity:H, heatIndex:hi
|
||||
location: area,
|
||||
stationDockDoor: stationCode,
|
||||
timestamp: slackTs,
|
||||
temperature: T,
|
||||
humidity: H,
|
||||
heatIndex: hi
|
||||
});
|
||||
|
||||
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`
|
||||
);
|
||||
const [rows] = await pool.execute(`
|
||||
SELECT * FROM readings
|
||||
WHERE DATE(FROM_UNIXTIME(epoch_ms/1000))=CURDATE()
|
||||
ORDER BY epoch_ms
|
||||
`);
|
||||
let csvUrl=null;
|
||||
try { csvUrl = await uploadTrendsCsv(dateKey, rows); }
|
||||
catch(e){ console.error('CSV upload error',e); }
|
||||
catch(e){ console.error('CSV upload 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`+
|
||||
`*_Humidity:_* ${H} % 💦\n`+
|
||||
`*_Heat Index:_* ${hi} °F 🥵`;
|
||||
|
||||
await axios.post(
|
||||
process.env.SLACK_WEBHOOK_URL,
|
||||
{ text },
|
||||
{ headers: {'Content-Type':'application/json'} }
|
||||
);
|
||||
await axios.post(process.env.SLACK_WEBHOOK_URL, { text }, {
|
||||
headers:{ 'Content-Type':'application/json' }
|
||||
});
|
||||
|
||||
res.json({ success:true, csvUrl });
|
||||
} catch (err) {
|
||||
@ -277,10 +278,10 @@ app.post('/api/area-readings', async (req,res) => {
|
||||
}
|
||||
});
|
||||
|
||||
// ─── GET all readings & CSV export ───────────────────────────────────────────
|
||||
// ─── Fetch & Export ─────────────────────────────────────────────────────────
|
||||
app.get('/api/readings', async (req,res) => {
|
||||
try {
|
||||
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);
|
||||
} catch (err) {
|
||||
console.error('GET /api/readings error:', err);
|
||||
@ -289,13 +290,15 @@ app.get('/api/readings', async (req,res) => {
|
||||
});
|
||||
app.get('/api/export', async (req,res) => {
|
||||
try {
|
||||
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');
|
||||
res.write('id,location,stationDockDoor,epoch_ms,temperature,humidity,heatIndex\n');
|
||||
rows.forEach(r => {
|
||||
const ts = (r.timestamp instanceof Date) ? formatDateEST(r.timestamp) : r.timestamp;
|
||||
res.write(`${r.id},${r.location},${r.stationDockDoor},${ts},${r.temperature},${r.humidity},${r.heatIndex}\n`);
|
||||
res.write(
|
||||
`${r.id},${r.location},${r.stationDockDoor},${r.epoch_ms},` +
|
||||
`${r.temperature},${r.humidity},${r.heatIndex}\n`
|
||||
);
|
||||
});
|
||||
res.end();
|
||||
} catch (err) {
|
||||
@ -304,7 +307,7 @@ app.get('/api/export', async (req,res) => {
|
||||
}
|
||||
});
|
||||
|
||||
// ─── Start Server ───────────────────────────────────────────────────────────
|
||||
// ─── Start Server ────────────────────────────────────────────────────────────
|
||||
app.listen(PORT, () => {
|
||||
console.log(`Server running on http://localhost:${PORT}`);
|
||||
});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user