diff --git a/CloudServer/public/index.html b/CloudServer/public/index.html index 2155812..ad6377e 100644 --- a/CloudServer/public/index.html +++ b/CloudServer/public/index.html @@ -929,13 +929,16 @@
- -
@@ -1688,20 +1704,54 @@ // Init refreshFiles(); - fetchVersion(); + fetchStationUpdate(); - async function fetchVersion() { + function renderStationUpdate(info) { + const el = document.getElementById('current-version'); + const localVersion = info?.localVersion || '未知'; + const targetVersion = info?.targetVersion || '未发布'; + const publishedAt = info?.publishedAt ? new Date(info.publishedAt).toLocaleString() : '未发布'; + el.innerHTML = ` +
服务器脚本：${localVersion}
+
已发布版本：${targetVersion}
+
发布时间：${publishedAt}
+ `; + } + + async function fetchStationUpdate() { try { - const res = await fetch('/api/version'); + const res = await fetch('/api/station-update'); const data = await res.json(); - if (data.version) { - document.getElementById('current-version').textContent = data.version; - } + currentStationUpdate = data; + renderStationUpdate(data); } catch (e) { document.getElementById('current-version').textContent = 'Error'; } } + async function publishStationUpdate() { + if (!confirm('发布后，所有在线主机会立即下载最新 startup 并自动重启；离线主机会在下次加载时立即更新。确定继续吗？')) return; + + const btn = document.getElementById('publish-update-btn'); + const originalText = btn.textContent; + btn.disabled = true; + btn.textContent = '发布中...'; + + try { + const res = await fetch('/api/station-updates/publish', { method: 'POST' }); + const data = await res.json(); + if (!data.success) throw new Error(data.message || 'Publish failed'); + currentStationUpdate = data; + renderStationUpdate(data); + showToast('更新已发布', `目标版本 ${data.targetVersion || data.localVersion}，已通知 ${data.notifiedStations || 0}/${data.onlineStations || 0} 台在线主机。`); + } catch (e) { + alert(`发布失败：${e.message || e}`); + } finally { + btn.disabled = false; + btn.textContent = originalText; + } + } + // --- Resizers --- const resizerV = document.getElementById('resizer-v'); const resizerH = document.getElementById('resizer-h'); diff --git a/CloudServer/server.js b/CloudServer/server.js index 11e6f23..4b0ef11 100644 --- a/CloudServer/server.js +++ b/CloudServer/server.js @@ -49,6 +49,8 @@ const audioGeneralLegacyDir = path.join(audioRootDir, 'general'); const audioStationDir = path.join(audioRootDir, 'station'); const listFilePath = path.join(appRootDir, 'list.txt'); const tempBroadcastDir = path.join(appRootDir, 'temp-broadcast'); +const stationScriptPath = path.join(appRootDir, 'station_broadcast.lua'); +const STATION_SCRIPT_DOWNLOAD_PATH = '/downloads/station_broadcast.lua'; const STREAMABLE_AUDIO_EXTENSIONS = ['.wav', '.mp3', '.ogg', '.flac', '.m4a', '.aac', '.opus']; const MUSIC_AUDIO_EXTENSIONS = [...STREAMABLE_AUDIO_EXTENSIONS, '.dfpwm']; @@ -190,6 +192,11 @@ let activeTrains = []; let stationLogs = []; let audioVersion = String(Date.now()); let versions = []; +let stationUpdate = { + version: '', + releaseId: '', + publishedAt: 0 +}; const DATA_FILE = path.join(__dirname, 'server-data.json'); @@ -199,6 +206,94 @@ function delay(ms) { return new Promise((resolve) => setTimeout(resolve, ms)); } +function getLocalStationScriptVersion() { + try { + if (!fs.existsSync(stationScriptPath)) return ''; + const content = fs.readFileSync(stationScriptPath, 'utf8'); + const match = content.match(/local\s+APP_VERSION_TEXT\s*=\s*["']([^"']+)["']/); + return match ? String(match[1]).trim() : ''; + } catch (e) { + log('ERROR', `Failed to read station script version: ${e.message}`); + return ''; + } +} + +function buildAbsoluteUrl(req, pathname) { + const proto = String(req?.headers?.['x-forwarded-proto'] || req?.protocol || 'http').split(',')[0].trim(); + const host = String(req?.headers?.['x-forwarded-host'] || req?.headers?.host || '').split(',')[0].trim(); + if (!host) return pathname; + return `${proto}://${host}${pathname}`; +} + +function getStationUpdateSummary(req) { + return { + localVersion: getLocalStationScriptVersion(), + targetVersion: stationUpdate.version || '', + releaseId: stationUpdate.releaseId || '', + publishedAt: Number(stationUpdate.publishedAt || 0), + downloadPath: STATION_SCRIPT_DOWNLOAD_PATH, + downloadUrl: buildAbsoluteUrl(req, STATION_SCRIPT_DOWNLOAD_PATH) + }; +} + +function maybeSendStationUpdate(ws, stationName, stationVersion) { + if (!ws || ws.readyState !== WebSocket.OPEN) return false; + if (!stationUpdate.releaseId || !stationUpdate.version) return false; + if (String(stationVersion || '').trim() === String(stationUpdate.version || '').trim()) return false; + + try { + ws.send(JSON.stringify({ + type: 'station_update', + version: stationUpdate.version, + releaseId: stationUpdate.releaseId, + publishedAt: Number(stationUpdate.publishedAt || 0), + downloadPath: STATION_SCRIPT_DOWNLOAD_PATH + })); + log('INFO', `Queued station update for "${stationName}" -> ${stationUpdate.version}`); + return true; + } catch (e) { + log('ERROR', `Failed to push station update to "${stationName}": ${e.message}`); + return false; + } +} + +function publishStationUpdate(req) { + const version = getLocalStationScriptVersion() || `build-${Date.now()}`; + const releaseId = String(Date.now()); + stationUpdate = { + version, + releaseId, + publishedAt: Date.now() + }; + saveData(); + + let onlineStations = 0; + let notifiedStations = 0; + for (const [name, station] of Object.entries(stations)) { + const ws = station?.ws; + if (!ws || ws.readyState !== WebSocket.OPEN) continue; + onlineStations++; + if (maybeSendStationUpdate(ws, name, station.version)) { + notifiedStations++; + } + } + + const summary = getStationUpdateSummary(req); + broadcastUpdate(); + broadcastToConsole({ + type: 'event', + title: '站点更新已发布', + message: `目标版本 ${summary.targetVersion || version}，已通知 ${notifiedStations}/${onlineStations} 台在线主机。` + }); + log('INFO', `Station update published: ${version} (${notifiedStations}/${onlineStations} online stations notified)`); + + return { + ...summary, + onlineStations, + notifiedStations + }; +} + function getInterruptModeForPriority(priority) { if (priority >= 2) return 'all'; if (priority >= 1) return 'ifLower'; @@ -281,6 +376,7 @@ function getStationGroups() { code, platform, lastSeen: st.lastSeen || 0, + version: st.version || '', source: 'cc', tags: ['CC'], memberNames: [st.name], @@ -295,6 +391,9 @@ function getStationGroups() { group.memberCount = group.memberNames.length; if ((st.lastSeen || 0) > (group.lastSeen || 0)) { group.lastSeen = st.lastSeen || 0; + group.version = st.version || group.version || ''; + } else if (!group.version && st.version) { + group.version = st.version; } } @@ -825,6 +924,13 @@ function loadData() { if (data.activeTrains) activeTrains = data.activeTrains; if (data.audioVersion) audioVersion = String(data.audioVersion); if (Array.isArray(data.versions)) versions = data.versions; + if (data.stationUpdate && typeof data.stationUpdate === 'object') { + stationUpdate = { + version: String(data.stationUpdate.version || ''), + releaseId: String(data.stationUpdate.releaseId || ''), + publishedAt: Number(data.stationUpdate.publishedAt || 0) + }; + } refreshStationIndex(); log('INFO', 'Data loaded from disk'); } catch (e) { @@ -846,7 +952,8 @@ function saveData() { stations: stationsToSave, activeTrains, audioVersion, - versions + versions, + stationUpdate }; fs.writeFileSync(DATA_FILE, JSON.stringify(data, null, 2)); } catch (e) { @@ -1672,9 +1779,10 @@ function handleMessage(ws, data) { // Send initial state ws.send(JSON.stringify({ type: 'init_state', - stations, + stations: getMergedStationList(), activeTrains, - logs: stationLogs + logs: stationLogs, + stationUpdate: getStationUpdateSummary() })); return; } @@ -1733,6 +1841,7 @@ function handleHeartbeat(ws, data) { }; normalizeStationRecord(stations[cleanName]); log('INFO', `Station auto-registered via heartbeat: "${cleanName}"${data.stationVersion ? ` ${data.stationVersion}` : ''}`); + maybeSendStationUpdate(ws, cleanName, data.stationVersion || stations[cleanName].version); broadcastUpdate(); } else { stations[cleanName].lastSeen = Date.now(); @@ -1745,6 +1854,7 @@ function handleHeartbeat(ws, data) { broadcastUpdate(); } normalizeStationRecord(stations[cleanName]); + maybeSendStationUpdate(ws, cleanName, data.stationVersion || stations[cleanName].version); } } } @@ -1771,6 +1881,7 @@ function handleStationRegister(ws, data) { stationName: cleanName })); + maybeSendStationUpdate(ws, cleanName, stationVersion); saveData(); broadcastUpdate(); } @@ -2066,11 +2177,19 @@ function broadcastUpdate() { const state = { type: 'state_update', stations: list, - activeTrains + activeTrains, + stationUpdate: getStationUpdateSummary() }; broadcastToConsole(state); } +app.get(STATION_SCRIPT_DOWNLOAD_PATH, (req, res) => { + if (!fs.existsSync(stationScriptPath)) { + return res.status(404).send('station_broadcast.lua not found'); + } + return res.sendFile(stationScriptPath); +}); + app.get('/api/streams', (req, res) => { const streams = []; const seen = new Set(); @@ -2193,6 +2312,21 @@ app.get('/api/version', (req, res) => { res.json({ version: audioVersion }); }); +app.get('/api/station-update', (req, res) => { + res.json({ + success: true, + ...getStationUpdateSummary(req) + }); +}); + +app.post('/api/station-updates/publish', (req, res) => { + const result = publishStationUpdate(req); + res.json({ + success: true, + ...result + }); +}); + app.post('/api/publish-version', (req, res) => { const version = normalizeVersionString(req.body?.version) || String(Date.now()); const snap = snapshotFiles(); diff --git a/install_station_broadcast.lua b/install_station_broadcast.lua index 922babb..c4d1faf 100644 --- a/install_station_broadcast.lua +++ b/install_station_broadcast.lua @@ -1,4 +1,4 @@ -local STATION_BROADCAST_URL = "https://gitea.fse-media.group/Henry_Du/CC-StationBroadcast/raw/branch/main/station_broadcast.lua" +local STATION_BROADCAST_URL = "http://stabadmin.fse-media.group/downloads/station_broadcast.lua" local function fetch(url) if not http then diff --git a/station_broadcast.lua b/station_broadcast.lua index eafeec5..6e2c6ab 100644 --- a/station_broadcast.lua +++ b/station_broadcast.lua @@ -2,11 +2,12 @@ -- ============================================================================ -- 1. Configuration & Constants -- ============================================================================ -local APP_VERSION_TEXT = "v1.0.44" +local APP_VERSION_TEXT = "v1.0.45" local CONFIG = { CLOUD_URL = "ws://stabadmin.fse-media.group", API_URL = "http://stabadmin.fse-media.group", + STARTUP_PATH = "/startup", SYNC_INTERVAL = 30, AUDIO_BASE = "Audio/", AUDIO_STATION = "Audio/Station/", @@ -55,7 +56,8 @@ local State = { currentPlaying = nil, currentPriority = -1, interruptSeq = 0, - tickRate = 20 + tickRate = 20, + updateInProgress = false } -- ============================================================================ @@ -1813,6 +1815,162 @@ function Utils.getStationAudio(code, langPrefix) return langPrefix .. code end +local AutoUpdate = {} + +function AutoUpdate.fetch(url) + if not http then + return nil, "HTTP API unavailable" + end + + if http.checkURL then + local ok, err = http.checkURL(url) + if not ok then + return nil, err or "URL blocked" + end + end + + local res, err = http.get(url) + if not res then + return nil, err or "request failed" + end + + local body = res.readAll() + res.close() + + if type(body) ~= "string" or #body == 0 then + return nil, "empty response" + end + + return body +end + +function AutoUpdate.writeFile(path, content) + local dir = fs.getDir(path) + if dir and dir ~= "" and not fs.exists(dir) then + fs.makeDir(dir) + end + + local handle = fs.open(path, "w") + if not handle then + return nil, "cannot open " .. path + end + + handle.write(content) + handle.close() + return true +end + +function AutoUpdate.getStartupPath() + if shell and shell.resolve then + return shell.resolve(CONFIG.STARTUP_PATH) + end + return CONFIG.STARTUP_PATH +end + +function AutoUpdate.getDownloadUrl(info) + if type(info) == "table" then + local direct = Utils.trim(info.downloadUrl) + if direct ~= "" then + return direct + end + + local path = Utils.trim(info.downloadPath) + if path ~= "" then + return CONFIG.API_URL .. path + end + end + + return CONFIG.API_URL .. "/downloads/station_broadcast.lua" +end + +function AutoUpdate.fetchInfo() + local body, err = AutoUpdate.fetch(CONFIG.API_URL .. "/api/station-update") + if not body then + return nil, err + end + + local ok, data = pcall(textutils.unserializeJSON, body) + if not ok or type(data) ~= "table" then + return nil, "invalid update response" + end + + return data +end + +function AutoUpdate.getTargetVersion(info) + if type(info) ~= "table" then + return "" + end + return Utils.trim(info.targetVersion or info.version) +end + +function AutoUpdate.needsUpdate(info) + local targetVersion = AutoUpdate.getTargetVersion(info) + return targetVersion ~= "" and targetVersion ~= APP_VERSION_TEXT +end + +function AutoUpdate.apply(info, reason) + if State.updateInProgress then + return false, "update already in progress" + end + + local targetVersion = AutoUpdate.getTargetVersion(info) + if targetVersion == "" then + return false, "missing target version" + end + + local downloadUrl = AutoUpdate.getDownloadUrl(info) + local startupPath = AutoUpdate.getStartupPath() + + State.updateInProgress = true + Utils.log("WARN", "Applying update " .. targetVersion .. " via " .. tostring(reason or "manual")) + + if Audio and Audio.stop then + pcall(Audio.stop, "all") + end + if State.ws then + pcall(State.ws.close) + State.ws = nil + end + + local body, err = AutoUpdate.fetch(downloadUrl) + if not body then + State.updateInProgress = false + return false, err + end + + local ok, writeErr = AutoUpdate.writeFile(startupPath, body) + if not ok then + State.updateInProgress = false + return false, writeErr + end + + Utils.log("SUCCESS", "Updated startup to " .. targetVersion) + Utils.log("WARN", "Rebooting to finish update") + os.sleep(1) + os.reboot() + return true +end + +function AutoUpdate.checkOnBoot() + local info, err = AutoUpdate.fetchInfo() + if not info then + Utils.log("WARN", "Update check skipped: " .. tostring(err)) + return false + end + + if not AutoUpdate.needsUpdate(info) then + return false + end + + Utils.log("INFO", "Found published update " .. AutoUpdate.getTargetVersion(info) .. " on boot") + local ok, applyErr = AutoUpdate.apply(info, "boot") + if not ok then + Utils.log("ERROR", "Boot update failed: " .. tostring(applyErr)) + end + return ok +end + -- ============================================================================ -- 6. Network System -- ============================================================================ @@ -1990,6 +2148,25 @@ function Network.messageLoop() local flushBelow = data.flushBelow Audio.stop(mode, flushBelow) end + elseif data.type == "station_update" then + local targetVersion = AutoUpdate.getTargetVersion(data) + if targetVersion == "" then + Utils.log("WARN", "Ignored station update without version") + elseif targetVersion == APP_VERSION_TEXT then + Utils.log("INFO", "Received update notice for current version " .. targetVersion) + else + Utils.log("WARN", "Received published update " .. targetVersion) + local okUpdate, updateErr = AutoUpdate.apply({ + targetVersion = targetVersion, + version = targetVersion, + releaseId = data.releaseId, + downloadPath = data.downloadPath, + downloadUrl = data.downloadUrl + }, "publish") + if not okUpdate then + Utils.log("ERROR", "Station update failed: " .. tostring(updateErr)) + end + end end else if State.audioRx then @@ -2842,6 +3019,7 @@ end -- ============================================================================ -- 9. Bootstrap -- ============================================================================ +AutoUpdate.checkOnBoot() Peripherals.init() Utils.ensureSlaveIdentityConfigured() Audio.loadStationList() diff --git a/update_station_broadcast.lua b/update_station_broadcast.lua index e3fa4a4..6be86a9 100644 --- a/update_station_broadcast.lua +++ b/update_station_broadcast.lua @@ -1,4 +1,4 @@ -local STATION_BROADCAST_URL = "https://gitea.fse-media.group/Henry_Du/CC-StationBroadcast/raw/branch/main/station_broadcast.lua" +local STATION_BROADCAST_URL = "http://stabadmin.fse-media.group/downloads/station_broadcast.lua" local function fetch(url) if not http then