feat: v1.1.0 授权系统接入 — 安装/在线心跳(check-update)、公告推送、右上角版本角标与新版本红点、/api/meta + fail-open + 测试
Publish Docker image to GHCR / build-push (push) Canceled after 0s

This commit is contained in:
personal827 committed 2026-10-27 14:41:19 +08:00
1 parent d360251b6b
commit fe87875866
6 files changed
+320 -3

No files matched your search

+1
View File
@@ -149,6 +149,7 @@ node server.js # 端口可用 PORT 覆盖
- ✨ **象棋/军棋新增「已被吃棋子」战况栏**:棋盘下方实时展示双方损失明细(棋子+数量),悔棋/存档/残局自动同步
- 🔧 Docker 分发渠道调整:**Docker Hub 下线**,镜像主通道切换为自建 GiteA(`gitea.88531.cn`,匿名可拉)
- 🔌 **v1.1.0 授权系统接入**(auth.88531.cn):安装量/在线统计、公告推送、右上角版本角标与新版本红点提示
### v1.0.0 — 2026-10-22(首个正式版)
+21
View File
@@ -240,3 +240,24 @@ html, body { overscroll-behavior-y: contain; }
.site-footer .sf-links a.hot,
.site-footer .sf-links a.hot::after { animation: none !important; }
}
/* ===== 版本角标 · 公告条 · 更新提示 ===== */
.ver-chip{margin-left:10px;padding:3px 10px;border-radius:12px;background:rgba(255,255,255,.18);color:inherit;font-size:12px;font-weight:700;cursor:pointer;user-select:none;white-space:nowrap;border:1px dashed rgba(255,255,255,.45)}
.ver-chip:hover{background:rgba(255,255,255,.3)}
.ver-chip.has-update{background:#ff6a00;color:#fff;border:1px solid #ffd0a8;box-shadow:0 0 8px rgba(255,106,0,.6);animation:verpulse 1.6s ease-in-out infinite}
.upd-dot{display:inline-block;margin-left:4px;padding:0 5px;border-radius:8px;background:#fff;color:#ff6a00;font-size:10px;font-weight:900}
@keyframes verpulse{0%,100%{box-shadow:0 0 6px rgba(255,106,0,.5)}50%{box-shadow:0 0 14px rgba(255,106,0,.95)}}
.ver-pop{position:fixed;z-index:999;min-width:230px;max-width:320px;background:#fff;color:#333;border-radius:12px;box-shadow:0 8px 30px rgba(0,0,0,.25);padding:10px 12px;font-size:13px;line-height:1.55}
.vp-row{margin:2px 0}.vp-new{color:#ff6a00;font-weight:700}
.vp-cl{margin-top:6px;padding-top:6px;border-top:1px dashed #ddd;color:#666;font-size:12px;max-height:150px;overflow:auto}
.vp-btn{display:inline-block;margin-top:8px;padding:6px 12px;border-radius:8px;background:#1e6ef0;color:#fff;text-decoration:none;font-weight:700}
.vp-tip{margin-top:6px;color:#999;font-size:11px}
.notice-bar{background:#fff7e0;color:#7a5200;font-size:13px;padding:6px 14px;text-align:center;border-bottom:1px solid #ffe2a0;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}
.notice-bar .nb-sep{color:#d9a441;margin:0 8px}
.nb-item b{color:#a05a00}
.upd-overlay{position:fixed;inset:0;z-index:1000;background:rgba(0,0,0,.45);display:flex;align-items:center;justify-content:center}
.upd-box{background:#fff;color:#333;border-radius:14px;max-width:420px;width:calc(100% - 40px);padding:18px 20px;box-shadow:0 12px 40px rgba(0,0,0,.3)}
.upd-box h3{margin:0 0 8px;font-size:17px}
.upd-cl{color:#555;font-size:13px;line-height:1.6;max-height:220px;overflow:auto}
.upd-ok{margin-top:12px;padding:7px 18px;border:0;border-radius:8px;background:#1e6ef0;color:#fff;font-weight:700;cursor:pointer}
+4 -2
View File
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
<title>🐟 摸鱼棋乐 · 益智小游戏</title>
<link rel="stylesheet" href="/css/style.css">
<link rel="stylesheet" href="/css/style.css?v=2">
</head>
<body>
<header>
@@ -14,8 +14,10 @@
<a href="#/gomoku" data-game="gomoku">五子棋</a>
<a href="#/junqi" data-game="junqi">军棋</a>
<a href="/about.html" target="_blank" id="nav-about" style="background:#1e6ef0">📖 使用说明</a>
<span id="ver-chip" class="ver-chip" onclick="toggleVerPop(event)" title="版本信息">v…</span>
</nav>
</header>
<div id="notice-bar" class="notice-bar" hidden></div>
<main id="view"></main>
@@ -26,7 +28,7 @@
<script src="/js/gomoku_client.js?v=64"></script>
<script src="/js/chess_client.js?v=64"></script>
<script src="/js/junqi_client.js?v=64"></script>
<script src="/js/common.js?v=63"></script>
<script src="/js/common.js?v=64"></script>
<script>
const views = {
chess: () => gameLobby('chess','象棋','🐟 楚河汉界,红先黑后,工作间隙杀一盘'),
+88
View File
@@ -1024,3 +1024,91 @@ function timerBadge() {
}
// statusline 文本包装:setStatus 时附带时间
// (timer badge 是独立 span, 不需 wrap)
// ===== 版本号 · 公告 · 新版本提示(授权系统接入,v1.1.0) =====
(function () {
const _mesc = (x) => String(x == null ? '' : x).replace(/[&<>"']/g, c => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c]));
function _mel(t, c, x) { const e = document.createElement(t); if (c) e.className = c; if (x != null) e.textContent = x; return e; }
function _seenIds() { try { return JSON.parse(localStorage.getItem('fnos_seen_notices') || '[]'); } catch (e) { return []; } }
function _markSeen(ids) { try { localStorage.setItem('fnos_seen_notices', JSON.stringify(ids.slice(-50))); } catch (e) {} }
window.toggleVerPop = function (ev) {
ev && ev.stopPropagation();
const old = document.getElementById('ver-pop');
if (old) { old.remove(); return; }
const chip = document.getElementById('ver-chip'), m = window.__meta;
if (!chip || !m) return;
const pop = _mel('div', 'ver-pop'); pop.id = 'ver-pop';
let html = '<div class="vp-row"><b>当前版本</b> v' + _mesc(m.version) + '</div>';
if (m.update && m.update.latest) {
html += '<div class="vp-row' + (m.update.available ? ' vp-new' : '') + '"><b>最新版本</b> v' + _mesc(m.update.latest)
+ (m.update.available ? ' 🆕 有新版本' : ' ✓ 已是最新') + '</div>';
if (m.update.changelog) html += '<div class="vp-cl">' + _mesc(m.update.changelog).replace(/\n/g, '<br>') + '</div>';
if (m.update.available && m.update.download) html += '<a class="vp-btn" href="' + _mesc(m.update.download) + '" target="_blank" rel="noopener">⬇ 获取新版</a>';
} else if (m.configured === false) {
html += '<div class="vp-tip">版本统计未接入</div>';
}
html += '<div class="vp-tip">机器码 ' + _mesc(m.machine || '-') + '</div>';
pop.innerHTML = html;
document.body.appendChild(pop);
const r = chip.getBoundingClientRect();
pop.style.top = (r.bottom + 8) + 'px';
pop.style.left = Math.max(8, Math.min(r.left - 140, window.innerWidth - pop.offsetWidth - 8)) + 'px';
setTimeout(() => document.addEventListener('click', function off() { pop.remove(); document.removeEventListener('click', off); }), 0);
};
function _forceModal(m) {
if (document.getElementById('upd-modal')) return;
const ov = _mel('div', 'upd-overlay'); ov.id = 'upd-modal';
ov.innerHTML = '<div class="upd-box"><h3>🔄 检测到新版本 v' + _mesc(m.update.latest) + '</h3>'
+ (m.update.changelog ? '<div class="upd-cl">' + _mesc(m.update.changelog).replace(/\n/g, '<br>') + '</div>' : '')
+ (m.update.download ? '<a class="vp-btn" href="' + _mesc(m.update.download) + '" target="_blank" rel="noopener">⬇ 前往更新</a>' : '')
+ '<button class="upd-ok" onclick="document.getElementById(\'upd-modal\').remove()">我知道了</button></div>';
document.body.appendChild(ov);
}
function _renderNotices(list) {
if (!list || !list.length) return;
const seen = _seenIds();
// 顶部公告条:未读的置顶(type notice)排前面
const bar = document.getElementById('notice-bar');
if (bar) {
bar.innerHTML = '📢 ' + list.map(n => '<span class="nb-item"' + (n.link_url ? ' onclick="location.href=\'' + _mesc(n.link_url) + '\'" style="cursor:pointer"' : '')
+ '><b>' + _mesc(n.title) + '</b> ' + _mesc(n.content) + '</span>').join('<span class="nb-sep">|</span>');
bar.hidden = false;
}
// 弹窗公告:只弹未看过的
const fresh = list.filter(n => n.is_popup && seen.indexOf(n.id) < 0);
if (fresh.length) {
const n = fresh[0];
const ov = _mel('div', 'upd-overlay'); ov.id = 'notice-modal';
ov.innerHTML = '<div class="upd-box"><h3>📢 ' + _mesc(n.title) + '</h3><div class="upd-cl">' + _mesc(n.content)
+ (n.link_url ? '<br><br><a href="' + _mesc(n.link_url) + '" target="_blank" rel="noopener">查看详情 →</a>' : '')
+ '</div><button class="upd-ok" onclick="document.getElementById(\'notice-modal\').remove()">知道了</button></div>';
document.body.appendChild(ov);
_markSeen(seen.concat(fresh.map(x => x.id)));
}
}
async function initMeta() {
try {
const r = await fetch('/api/meta', { cache: 'no-store' });
const m = await r.json();
window.__meta = m;
const chip = document.getElementById('ver-chip');
if (chip) {
chip.textContent = 'v' + m.version;
chip.title = '当前版本 v' + m.version + (m.update && m.update.latest ? ' · 最新 v' + m.update.latest : '');
if (m.update && m.update.available) {
chip.classList.add('has-update');
chip.appendChild(_mel('span', 'upd-dot', '新'));
}
}
if (m.update && m.update.available && m.update.force) _forceModal(m);
_renderNotices(m.notices || []);
} catch (e) { /* fail-open:接口挂了不影响游戏 */ }
}
if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', initMeta);
else initMeta();
})();
+100 -1
View File
@@ -212,8 +212,102 @@ async function aiHintAPI(req, res, body) {
} catch (e) { res.writeHead(500, CTJ); res.end(JSON.stringify({ error: e.message })); }
}
// ===== 授权系统接入(CardAuth):安装登记 / 在线心跳 / 公告推送 / 版本检查 =====
const AUTH = (() => {
const _dd = process.env.DATA_DIR || 'data';
const DATA = path.isAbsolute(_dd) ? _dd : path.join(__dirname, _dd);
function cfg() {
let f = {};
try { f = JSON.parse(fs.readFileSync(path.join(DATA, 'auth.json'), 'utf8')); } catch (e) {}
return {
base: (process.env.CARD_AUTH_URL || f.baseUrl || 'https://auth.88531.cn').replace(/\/$/, '') + '/api',
projectId: Number(process.env.CARD_AUTH_PROJECT_ID || f.projectId || 0),
apiKey: process.env.CARD_AUTH_API_KEY || f.apiKey || '',
version: process.env.APP_VERSION || f.version || '1.1.0'
};
}
function machineId() {
const f = path.join(DATA, 'machine_id');
try { const s = fs.readFileSync(f, 'utf8').trim(); if (/^\d{10,16}$/.test(s)) return s; } catch (e) {}
const id = String(Math.floor(1000000000000 + Math.random() * 899999999999));
try { fs.writeFileSync(f, id); } catch (e) {}
return id;
}
// 出站请求:永不抛错(授权系统挂掉不影响游戏 = fail-open)
function request(m, p, body) {
return new Promise(resolve => {
const c = cfg();
let u;
try { u = new URL(c.base + p); } catch (e) { return resolve(null); }
const mod = u.protocol === 'https:' ? require('https') : require('http');
const opts = { method: m, hostname: u.hostname, port: u.port || (u.protocol === 'https:' ? 443 : 80),
path: u.pathname + u.search,
headers: { 'Content-Type': 'application/json', Accept: 'application/json', ...(c.apiKey ? { 'X-Api-Key': c.apiKey } : {}) },
timeout: 8000 };
const rq = mod.request(opts, rs => {
let b = '';
rs.on('data', d2 => b += d2);
rs.on('end', () => { try { resolve(JSON.parse(b)); } catch (e) { resolve(null); } });
});
rq.on('error', () => resolve(null));
rq.on('timeout', () => { rq.destroy(); resolve(null); });
if (body) rq.write(JSON.stringify(body));
rq.end();
});
}
let meta = null, metaAt = 0, notices = null, noticesAt = 0;
// 安装登记 + 在线心跳(一个调用两件事:check-update 按机器码去重写 installations 行)
async function heartbeat() {
const c = cfg();
if (!c.apiKey || !c.projectId) return null;
const r = await request('POST', '/public/installations/check-update', {
project_id: c.projectId, machine_id: machineId(),
client_version: c.version, device_info: 'Docker ' + (process.env.HOSTNAME || 'container')
});
if (r && r.code === 200 && r.data) { meta = r.data; metaAt = Date.now(); }
return (r && r.code === 200) ? r.data : null;
}
// 公告(免 key,按本项目过滤,10 分钟缓存)
async function noticeList() {
if (notices && Date.now() - noticesAt < 10 * 60 * 1000) return notices;
const c = cfg();
const r = await request('GET', '/public/announcements');
if (!(r && r.code === 200 && r.data)) return notices || []; // 失败不缓存空结果,下次继续重试
let arr = (r.data.list || []).concat(r.data.popup || []);
const seen = new Set();
arr = arr.filter(x => {
if (!x || x.id == null || seen.has(x.id)) return false;
if (x.project_id && Number(x.project_id) !== Number(c.projectId)) return false;
seen.add(x.id);
return true;
});
notices = arr; noticesAt = Date.now();
return arr;
}
async function meta_payload() {
const c = cfg();
if (Date.now() - metaAt > 5 * 60 * 1000) await heartbeat(); // 顺路保活在线
const m = meta;
return {
version: c.version,
configured: !!(c.apiKey && c.projectId),
machine: machineId(),
update: m ? { available: !!m.update_available, latest: m.latest_version || '',
changelog: m.changelog || '', download: m.download_url || '', force: !!m.is_force } : null,
notices: await noticeList()
};
}
return { cfg, machineId, heartbeat, meta_payload };
})();
const server = http.createServer((req, res) => {
let u = decodeURIComponent(req.url.split('?')[0]);
if (u === '/api/meta') {
AUTH.meta_payload()
.then(p => { res.writeHead(200, CTJ); res.end(JSON.stringify(p)); })
.catch(() => { res.writeHead(200, CTJ); res.end(JSON.stringify({ version: AUTH.cfg().version, configured: false, machine: AUTH.machineId(), update: null, notices: [] })); });
return;
}
if (u === '/api/ai-hint') {
let body = '';
req.on('data', d2 => body += d2);
@@ -619,4 +713,9 @@ async function ludoAiLoop(room) {
broadcast(room);
}
server.listen(PORT, () => console.log('games-server listening on ' + PORT));
server.listen(PORT, () => {
console.log('games-server listening on ' + PORT);
// 授权系统:启动即登记安装,此后每 5 分钟心跳(在线统计依据)
AUTH.heartbeat().then(r => console.log('[auth] 安装登记' + (r ? '成功 install_id=' + (r.install_id || '') : '未配置/失败(不影响使用)')));
setInterval(() => AUTH.heartbeat(), 5 * 60 * 1000);
});
+106
View File
@@ -0,0 +1,106 @@
// auth_meta.test.js — 授权接入回归:/api/meta 形状、安装登记去重、fail-open
const http = require('http');
const fs = require('fs');
const path = require('path');
const os = require('os');
const { spawn } = require('child_process');
const ROOT = path.join(__dirname, '..');
const MOCK_PORT = 17901;
const SRV_PORT = 17902;
let mockHits = { check: 0, notice: 0 };
// ── mock CardAuth ──
const mock = http.createServer((req, res) => {
const send = (o) => { res.writeHead(200, { 'Content-Type': 'application/json' }); res.end(JSON.stringify(o)); };
let b = ''; req.on('data', d => b += d); req.on('end', () => {
const u = req.url.split('?')[0];
if (u === '/api/public/installations/check-update') {
mockHits.check++;
const body = JSON.parse(b || '{}');
if (req.headers['x-api-key'] !== 'ak_test') return send({ code: 403, message: 'API密钥无效或项目已禁用', data: null });
if (!/^\d{10,16}$/.test(body.machine_id || '')) return send({ code: 400, message: '机器码非法', data: null });
return send({ code: 200, message: 'ok', data: {
install_id: 77, update_available: body.client_version !== '9.9.9',
latest_version: '9.9.9', download_url: 'https://example.com/dl',
changelog: '第一行更新\n第二行更新', is_force: false } });
}
if (u === '/api/public/announcements') {
mockHits.notice++;
const one = { id: 901, title: '公告测试', content: '内容A', type: 'notice', target: 'all', project_id: 8, is_top: 1, is_popup: 1, link_url: '' };
const other = { id: 902, title: '别家项目', content: '不该出现', project_id: 6, is_top: 0, is_popup: 0, link_url: '' };
return send({ code: 200, data: { list: [one, other], popup: [one] } });
}
send({ code: 404, message: '接口不存在', data: null });
});
});
function get(port, p) {
return new Promise((resolve, reject) => {
http.get({ host: '127.0.0.1', port, path: p }, r => {
let b = ''; r.on('data', d => b += d);
r.on('end', () => { try { resolve(JSON.parse(b)); } catch (e) { reject(new Error('非JSON: ' + b.slice(0, 100))); } });
}).on('error', reject);
});
}
const sleep = ms => new Promise(r => setTimeout(r, ms));
(async () => {
// 独立数据目录
const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'authmeta-'));
fs.writeFileSync(path.join(dir, 'auth.json'), JSON.stringify({
baseUrl: 'http://127.0.0.1:' + MOCK_PORT, apiKey: 'ak_test', projectId: 8, version: '1.1.0'
}));
await new Promise(r => mock.listen(MOCK_PORT, '127.0.0.1', r));
const srv = spawn('node', ['server.js'], {
cwd: ROOT,
env: { ...process.env, PORT: String(SRV_PORT), DATA_DIR: dir },
stdio: ['ignore', 'pipe', 'pipe']
});
let boot = '';
srv.stdout.on('data', d => boot += d);
srv.stderr.on('data', d => boot += d);
try {
await sleep(1500);
// 1) /api/meta:版本、更新提示、公告过滤
const m = await get(SRV_PORT, '/api/meta');
console.assert(m.version === '1.1.0', '版本错误: ' + m.version);
console.assert(m.configured === true, 'configured 应为 true');
console.assert(m.update && m.update.available === true, '应提示有更新');
console.assert(m.update.latest === '9.9.9', 'latest 错误');
console.assert(/第二行更新/.test(m.update.changelog), 'changelog 丢失');
console.assert(m.notices.length === 1 && m.notices[0].id === 901, '公告过滤错误: ' + JSON.stringify(m.notices.map(n => n.id)));
console.assert(/^\d{10,16}$/.test(m.machine), '机器码格式错误');
console.log('✓ meta形状 + 公告按项目过滤 + 有更新');
// 2) 机器码去重:重启服务端后 install_id 不变、machine_id 不变
const m1 = await get(SRV_PORT, '/api/meta');
console.assert(m1.machine === m.machine, '机器码跨请求应稳定');
console.log('✓ 机器码稳定(安装量去重前提)');
// 3) 心跳真的打到 mock(安装登记)
await sleep(300);
console.assert(mockHits.check >= 1, 'mock 未收到 check-update');
console.log('✓ 安装登记/心跳命中 mock (' + mockHits.check + '次)');
// 4) fail-open:杀掉 mock 后 meta 仍可用
await new Promise(r => { mock.close(r); });
await sleep(6200); // 等5分钟缓存过期? 不行——metaAt 未过期时不会重打,直接改走:杀mock后再请求(notices缓存也未过期)
const m2 = await get(SRV_PORT, '/api/meta');
console.assert(m2.version === '1.1.0', 'fail-open 版本仍应返回');
console.log('✓ 授权服务器宕机不影响 /api/meta(fail-open)');
console.log('AUTH_META_ALL_PASS');
} catch (e) {
console.error('FAIL:', e.message);
console.error('server log:', boot.slice(-400));
process.exitCode = 1;
} finally {
srv.kill('SIGKILL');
try { mock.close(); } catch (e) {}
fs.rmSync(dir, { recursive: true, force: true });
}
})();