updated server.js
Updated server.js for prod build
This commit is contained in:
parent
1fa7d96b23
commit
997f7c34e2
162
server.js
162
server.js
@ -16,15 +16,15 @@ const shiftCounters = {};
|
||||
// Helpers
|
||||
const pad2 = n => n.toString().padStart(2,'0');
|
||||
|
||||
function shortEST(d) {
|
||||
const est = new Date(d.toLocaleString('en-US', { timeZone: 'America/New_York' }));
|
||||
function shortEST(date) {
|
||||
const est = new Date(date.toLocaleString('en-US', { timeZone: 'America/New_York' }));
|
||||
const M = est.getMonth()+1, D = est.getDate(), YY = String(est.getFullYear()).slice(-2);
|
||||
const hh = pad2(est.getHours()), mm = pad2(est.getMinutes());
|
||||
return `${M}/${D}/${YY} @${hh}:${mm}`;
|
||||
}
|
||||
|
||||
function formatDateEST(d) {
|
||||
const est = new Date(d.toLocaleString('en-US', { timeZone: 'America/New_York' }));
|
||||
function formatDateEST(date) {
|
||||
const est = new Date(date.toLocaleString('en-US', { timeZone: 'America/New_York' }));
|
||||
const y = est.getFullYear(), M = pad2(est.getMonth()+1), D = pad2(est.getDate());
|
||||
const hh = pad2(est.getHours()), mm = pad2(est.getMinutes()), ss = pad2(est.getSeconds());
|
||||
return `${y}-${M}-${D} ${hh}:${mm}:${ss}`;
|
||||
@ -47,9 +47,11 @@ function getShiftInfo(now) {
|
||||
|
||||
if (h > 7 || (h === 7 && m >= 0)) {
|
||||
if (h < 17 || (h === 17 && m < 30)) {
|
||||
shift = 'Day'; start.setHours(7,0,0,0);
|
||||
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';
|
||||
@ -62,24 +64,24 @@ function getShiftInfo(now) {
|
||||
}
|
||||
|
||||
async function fetchCurrentWeather() {
|
||||
const key = process.env.WEATHER_API_KEY, zip = process.env.ZIP_CODE;
|
||||
const key = process.env.WEATHER_API_KEY;
|
||||
const 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;
|
||||
return `${desc}. Hi of ${hi}, Humidity ${hum}%`;
|
||||
} catch (e) {
|
||||
console.error('Weather API error:', e.message);
|
||||
} catch (err) {
|
||||
console.error('Weather API error:', err.message);
|
||||
return 'Unavailable';
|
||||
}
|
||||
}
|
||||
|
||||
// MariaDB pool
|
||||
// MariaDB connection pool
|
||||
const pool = mysql.createPool({
|
||||
host: process.env.DB_HOST,
|
||||
port: parseInt(process.env.DB_PORT,10) || 3306,
|
||||
@ -92,9 +94,9 @@ const pool = mysql.createPool({
|
||||
connectTimeout: 10000
|
||||
});
|
||||
|
||||
// Ensure table exists
|
||||
// Ensure readings table exists
|
||||
(async () => {
|
||||
const sql=`
|
||||
const createSQL = `
|
||||
CREATE TABLE IF NOT EXISTS readings (
|
||||
id INT AUTO_INCREMENT PRIMARY KEY,
|
||||
location VARCHAR(20) NOT NULL,
|
||||
@ -103,11 +105,12 @@ const pool = mysql.createPool({
|
||||
temperature DOUBLE,
|
||||
humidity DOUBLE,
|
||||
heatIndex DOUBLE
|
||||
);`;
|
||||
await pool.execute(sql);
|
||||
);
|
||||
`;
|
||||
await pool.execute(createSQL);
|
||||
})();
|
||||
|
||||
// Middleware & static (serve heatmap.html as index)
|
||||
// Middleware & static files (serve heatmap.html at '/')
|
||||
app.use(bodyParser.json());
|
||||
const publicDir = path.join(__dirname, 'public');
|
||||
app.use(express.static(publicDir, { index: 'heatmap.html' }));
|
||||
@ -122,21 +125,22 @@ 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 endpoint ----
|
||||
// Dual dock‐door readings 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);
|
||||
@ -144,33 +148,50 @@ app.post('/api/readings', async (req,res)=>{
|
||||
const { shift, key, estNow } = getShiftInfo(now);
|
||||
shiftCounters[key] = (shiftCounters[key] || 0) + 1;
|
||||
const period = shiftCounters[key];
|
||||
|
||||
const sqlTs = formatDateEST(estNow);
|
||||
const shortTs = shortEST(estNow);
|
||||
|
||||
// insert
|
||||
const ins = `
|
||||
// Insert readings
|
||||
const insertSQL = `
|
||||
INSERT INTO readings(location,stationDockDoor,timestamp,temperature,humidity,heatIndex)
|
||||
VALUES(?,?,?,?,?,?)`;
|
||||
await pool.execute(ins,['Inbound',String(inD),sqlTs,inT,inH,hiIn]);
|
||||
await pool.execute(ins,['Outbound',String(outD),sqlTs,outT,outH,hiOut]);
|
||||
VALUES(?,?,?,?,?,?)
|
||||
`;
|
||||
await pool.execute(insertSQL, ['Inbound', String(inD), sqlTs, inT, inH, hiIn]);
|
||||
await pool.execute(insertSQL, ['Outbound', String(outD), sqlTs, outT, outH, hiOut]);
|
||||
|
||||
// SSE
|
||||
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 });
|
||||
// Broadcast SSE
|
||||
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
|
||||
});
|
||||
|
||||
// CSV
|
||||
// Upload CSV of today’s readings
|
||||
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`
|
||||
);
|
||||
let csvUrl = null;
|
||||
try{ csvUrl=await uploadTrendsCsv(dateKey,rows) }catch(e){console.error(e)}
|
||||
try { csvUrl = await uploadTrendsCsv(dateKey, rows); }
|
||||
catch (e) { console.error('CSV upload error:', e); }
|
||||
|
||||
// weather
|
||||
// Fetch weather
|
||||
const weather = await fetchCurrentWeather();
|
||||
|
||||
// build text
|
||||
// Build Slack message text
|
||||
const text =
|
||||
`*_${shift} shift Period ${period} dock/ trailer temperature checks for ${shortTs}_*\n` +
|
||||
`*_Current Weather Forecast for Baltimore: ${weather}_*\n\n` +
|
||||
@ -183,13 +204,12 @@ app.post('/api/readings', async (req,res)=>{
|
||||
`*_Humidity:_* ${outH} % 💦\n` +
|
||||
`*_Heat Index:_* ${hiOut} °F 🥵`;
|
||||
|
||||
const payload = { text };
|
||||
|
||||
// send as url-encoded string
|
||||
const body = `payload=${encodeURIComponent(JSON.stringify(payload))}`;
|
||||
await axios.post(process.env.SLACK_WEBHOOK_URL, body, {
|
||||
headers:{ 'Content-Type':'application/x-www-form-urlencoded' }
|
||||
});
|
||||
// Trigger Slack workflow via Inputs map
|
||||
await axios.post(
|
||||
process.env.SLACK_WEBHOOK_URL,
|
||||
{ inputs: { message: text } },
|
||||
{ headers: { 'Content-Type': 'application/json' } }
|
||||
);
|
||||
|
||||
res.json({ success: true, shift, period, csvUrl });
|
||||
} catch (err) {
|
||||
@ -198,41 +218,52 @@ app.post('/api/readings', async (req,res)=>{
|
||||
}
|
||||
});
|
||||
|
||||
// ---- Area/Mod endpoint ----
|
||||
// Area/Mod station readings 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 hi = computeHeatIndex(T, H);
|
||||
const now = new Date();
|
||||
const { shift, estNow } = getShiftInfo(now);
|
||||
|
||||
const sqlTs = formatDateEST(estNow);
|
||||
const shortTs = shortEST(estNow);
|
||||
|
||||
// insert
|
||||
const ins = `
|
||||
// Insert reading
|
||||
const insertSQL = `
|
||||
INSERT INTO readings(location,stationDockDoor,timestamp,temperature,humidity,heatIndex)
|
||||
VALUES(?,?,?,?,?,?)`;
|
||||
await pool.execute(ins,[area,stationCode,sqlTs,T,H,hi]);
|
||||
VALUES(?,?,?,?,?,?)
|
||||
`;
|
||||
await pool.execute(insertSQL, [area, stationCode, sqlTs, T, H, hi]);
|
||||
|
||||
// SSE
|
||||
broadcast('new-area-reading',{ location:area,stationDockDoor:stationCode,timestamp:shortTs,temperature:T,humidity:H,heatIndex:hi });
|
||||
// Broadcast SSE
|
||||
broadcast('new-area-reading', {
|
||||
location: area,
|
||||
stationDockDoor: stationCode,
|
||||
timestamp: shortTs,
|
||||
temperature: T,
|
||||
humidity: H,
|
||||
heatIndex: hi
|
||||
});
|
||||
|
||||
// CSV
|
||||
// Upload 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`
|
||||
);
|
||||
let csvUrl = null;
|
||||
try{ csvUrl=await uploadTrendsCsv(dateKey,rows) }catch(e){console.error(e)}
|
||||
try { csvUrl = await uploadTrendsCsv(dateKey, rows); }
|
||||
catch (e) { console.error('CSV upload error:', e); }
|
||||
|
||||
// weather
|
||||
// Fetch weather
|
||||
const weather = await fetchCurrentWeather();
|
||||
|
||||
// build text
|
||||
// Build Slack message text
|
||||
const text =
|
||||
`*_${shift} shift ${area} temp check for ${shortTs}_*\n` +
|
||||
`*_Current Weather Forecast for Baltimore: ${weather}_*\n\n` +
|
||||
@ -241,11 +272,12 @@ app.post('/api/area-readings', async (req,res)=>{
|
||||
`*_Humidity:_* ${H} % 💦\n` +
|
||||
`*_Heat Index:_* ${hi} °F 🥵`;
|
||||
|
||||
const payload = { text };
|
||||
const body = `payload=${encodeURIComponent(JSON.stringify(payload))}`;
|
||||
await axios.post(process.env.SLACK_WEBHOOK_URL, body, {
|
||||
headers:{ 'Content-Type':'application/x-www-form-urlencoded' }
|
||||
});
|
||||
// Trigger Slack workflow via Inputs map
|
||||
await axios.post(
|
||||
process.env.SLACK_WEBHOOK_URL,
|
||||
{ inputs: { message: text } },
|
||||
{ headers: { 'Content-Type': 'application/json' } }
|
||||
);
|
||||
|
||||
res.json({ success: true, csvUrl });
|
||||
} catch (err) {
|
||||
@ -254,7 +286,7 @@ app.post('/api/area-readings', async (req,res)=>{
|
||||
}
|
||||
});
|
||||
|
||||
// ---- GET all readings ----
|
||||
// GET all readings
|
||||
app.get('/api/readings', async (req, res) => {
|
||||
try {
|
||||
const [rows] = await pool.execute(`SELECT * FROM readings ORDER BY timestamp`);
|
||||
@ -265,7 +297,7 @@ app.get('/api/readings', async (req,res)=>{
|
||||
}
|
||||
});
|
||||
|
||||
// ---- CSV export ----
|
||||
// Export CSV
|
||||
app.get('/api/export', async (req, res) => {
|
||||
try {
|
||||
const [rows] = await pool.execute(`SELECT * FROM readings ORDER BY timestamp`);
|
||||
@ -273,7 +305,7 @@ app.get('/api/export', async (req,res)=>{
|
||||
res.set('Content-Type', 'text/csv');
|
||||
res.write('id,location,stationDockDoor,timestamp,temperature,humidity,heatIndex\n');
|
||||
rows.forEach(r => {
|
||||
const ts = r.timestamp instanceof Date ? formatDateEST(r.timestamp) : r.timestamp;
|
||||
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.end();
|
||||
@ -284,4 +316,6 @@ app.get('/api/export', async (req,res)=>{
|
||||
});
|
||||
|
||||
// Start server
|
||||
app.listen(PORT, ()=>console.log(`Server running on http://localhost:${PORT}`));
|
||||
app.listen(PORT, () => {
|
||||
console.log(`Server running on http://localhost:${PORT}`);
|
||||
});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user