@walkhi/code-relax 0.1.0-beta.7 → 0.1.0-beta.9

package/dist/src/self-relay/admin-state.mjs

@@ -3,7 +3,7 @@ import path from 'node:path';
 import { randomUUID } from 'node:crypto';
 
 export function relayAdminState(file, initialMaxRelaySessions) {
-  let value = { version: 1, maxRelaySessions: initialMaxRelaySessions, announcement: null };
+  let value = { version: 2, maxRelaySessions: initialMaxRelaySessions, announcement: null, announcements: [] };
   if (file && fs.existsSync(file)) value = validate(JSON.parse(fs.readFileSync(file, 'utf8')));
 
   function save(next) {
@@ -32,25 +32,38 @@ export function relayAdminState(file, initialMaxRelaySessions) {
     read: () => structuredClone(value),
     setMaxRelaySessions(maxRelaySessions) { return save({ ...value, maxRelaySessions }); },
     publish(title, message) {
-      return save({ ...value, announcement: { id: randomUUID(), title: clean(title, 80), message: clean(message, 2000),
-        publishedAt: new Date().toISOString() } });
+      const announcement = { id: randomUUID(), title: clean(title, 80), message: clean(message, 2000),
+        publishedAt: new Date().toISOString() };
+      return save({ ...value, announcement, announcements: [announcement, ...value.announcements] });
     },
     withdraw() { return save({ ...value, announcement: null }); },
+    deleteAnnouncement(id) {
+      if (typeof id !== 'string' || !value.announcements.some(item => item.id === id)) throw new Error('Announcement not found');
+      if (value.announcement?.id === id) throw new Error('Withdraw the current announcement before deleting it');
+      return save({ ...value, announcements: value.announcements.filter(item => item.id !== id) });
+    },
   };
 }
 
 function validate(source) {
-  if (!source || source.version !== 1 || !Number.isSafeInteger(source.maxRelaySessions) ||
+  if (!source || ![1, 2].includes(source.version) || !Number.isSafeInteger(source.maxRelaySessions) ||
       source.maxRelaySessions < 1 || source.maxRelaySessions > 256) throw new Error('Invalid relay admin state');
-  let announcement = null;
-  if (source.announcement !== null && source.announcement !== undefined) {
-    const item = source.announcement;
-    if (!item || !/^[\w-]{16,128}$/.test(item.id) || !Number.isFinite(Date.parse(item.publishedAt))) {
-      throw new Error('Invalid relay announcement');
-    }
-    announcement = { id: item.id, title: clean(item.title, 80), message: clean(item.message, 2000), publishedAt: item.publishedAt };
+  const announcement = source.announcement == null ? null : validateAnnouncement(source.announcement);
+  const announcements = source.version === 1 ? (announcement ? [announcement] : []) : source.announcements;
+  if (!Array.isArray(announcements)) throw new Error('Invalid relay announcement history');
+  const validated = announcements.map(validateAnnouncement);
+  if (new Set(validated.map(item => item.id)).size !== validated.length ||
+      (announcement && !validated.some(item => item.id === announcement.id &&
+        item.title === announcement.title && item.message === announcement.message && item.publishedAt === announcement.publishedAt))) {
+    throw new Error('Invalid relay announcement history');
   }
-  return { version: 1, maxRelaySessions: source.maxRelaySessions, announcement };
+  return { version: 2, maxRelaySessions: source.maxRelaySessions, announcement, announcements: validated };
+}
+
+function validateAnnouncement(item) {
+  if (!item || !/^[\w-]{16,128}$/.test(item.id) || typeof item.publishedAt !== 'string' ||
+      !Number.isFinite(Date.parse(item.publishedAt))) throw new Error('Invalid relay announcement');
+  return { id: item.id, title: clean(item.title, 80), message: clean(item.message, 2000), publishedAt: item.publishedAt };
 }
 
 function clean(value, limit) {

package/dist/src/self-relay/demo.mjs

@@ -7,7 +7,7 @@ import { connectRelayClient } from './client.mjs';
 import { secret } from './wire.mjs';
 
 export async function startRelayDemo({ mode = 'lan-shared', pairingTtlMs, dispatch, remoteRelay, hostName = 'TEST-PC', lanCandidates = [], relayOptions = {} } = {}) {
-  if (!['lan-legacy', 'lan-shared'].includes(mode)) throw new Error('Invalid demo mode');
+  if (mode !== 'lan-shared') throw new Error('Invalid demo mode');
   const token = secret(), calls = [];
   const bridge = http.createServer((_request, response) => { response.writeHead(404); response.end(); });
   const lan = attachLanSocket(bridge, { token, dispatch: async (request, reply) => {
@@ -17,8 +17,7 @@ export async function startRelayDemo({ mode = 'lan-shared', pairingTtlMs, dispat
     if (request.url.split('?')[0] === '/api/threads/demo/events') {
       reply.startEvents(); reply.event('update', { thread: { id: 'demo' }, simulated: true }); return;
     }
-    if (request.url === '/api/demo/stop') return reply.json(mode === 'lan-shared' ? 200 : 409,
-      mode === 'lan-shared' ? { stopped: true, simulated: true } : { error: '基础控制不支持停止任务' });
+    if (request.url === '/api/demo/stop') return reply.json(200, { stopped: true, simulated: true });
     reply.json(404, { error: '模拟 Bridge 不执行真实任务' });
   } });
   await new Promise(resolve => bridge.listen(0, '127.0.0.1', resolve));

package/dist/src/self-relay/lifecycle.mjs

@@ -79,7 +79,7 @@ export async function selfRelay(command, stateRoot, requiredMode = '') {
   if (current) {
     if (requiredMode) {
       const bridge = await serviceHealth(readRecord(path.join(stateRoot, 'bridge-session.json')));
-      if (bridge?.transportMode !== requiredMode) throw new Error('当前 Bridge 未启用完整控制；请先执行 shared-start。');
+      if (bridge?.transportMode !== requiredMode) throw new Error('Codex 内核未就绪；请先执行 shared-start。');
     }
     if (command === 'relay-revoke') return controlRequest(previous, 'POST', 'revoke');
     if (command === 'relay-pair' || (current.relayConnected && !current.paired && !current.qrPath)) return controlRequest(previous, 'POST', 'pair');
@@ -115,7 +115,7 @@ async function worker(stateRoot, instanceId, refresh = false, requiredMode = '')
   const session = () => readRecord(path.join(stateRoot, 'bridge-session.json'));
   let health = await serviceHealth(session());
   if (health?.status !== 'ok') throw new Error('Bridge 尚未运行，请先执行 relax start --json。');
-  if (requiredMode && health.transportMode !== requiredMode) throw new Error('完整控制的 Code Relax 中继需要完整控制 Bridge，请先执行 relax shared-start --json。');
+  if (requiredMode && health.transportMode !== requiredMode) throw new Error('Codex 内核未就绪，请先执行 relax shared-start --json。');
   const legacyPath = path.join(stateRoot, 'self-relay-device.json');
   const legacy = readRecord(legacyPath);
   const stored = await credentialStore('load');
@@ -145,8 +145,8 @@ async function worker(stateRoot, instanceId, refresh = false, requiredMode = '')
   const hostKey = identity.registered ? undefined : await registrationKey(config);
   let bridgeError = '';
   async function refreshHealth() {
-    try { health = await serviceHealth(session()) || { transportMode: health.transportMode, status: 'offline', desktopConnected: false }; bridgeError = ''; }
-    catch (error) { bridgeError = error.message; health = { transportMode: health.transportMode, status: 'offline', desktopConnected: false }; }
+    try { health = await serviceHealth(session()) || { transportMode: health.transportMode, status: 'offline' }; bridgeError = ''; }
+    catch (error) { bridgeError = error.message; health = { transportMode: health.transportMode, status: 'offline' }; }
   }
   const secret = randomBytes(32).toString('base64url');
   let connector, control, qrPath, expiresAt = 0, paired = false, clientCount = 0, attachedCount = 0;
@@ -168,10 +168,10 @@ async function worker(stateRoot, instanceId, refresh = false, requiredMode = '')
           : '尚未完成设备授权；调用 relax pair --json 生成配对二维码。';
     return { running: !closing, relayConnected: online, mode: 'self-relay', transportMode: health.transportMode,
       relayUrl: config.url, deviceId: identity.id, paired, clientCount, authorization: online ? (paired ? 'authorized' : 'unpaired') : 'unverified', phoneConnected: attachedCount > 0,
-      bridgeReady: health.status === 'ok' && Boolean(health.sharedAppServerConnected || health.desktopConnected), bridgeError,
+      bridgeReady: health.status === 'ok' && health.execution?.ready === true && health.sharedAppServerConnected === true, bridgeError,
       expiresAt: expiresAt ? new Date(expiresAt).toISOString() : null,
       ...(available ? { qrPath } : {}), mobileAccess: 'unverified', lastError,
-      displayText: `Code Relax 中继 · ${health.transportMode === 'lan-shared' ? '完整控制' : '基础控制'}\n${next}\n停止连接器保留授权：relax relay-stop --json。撤销全部移动设备：relax relay-revoke --json。` };
+      displayText: `Code Relax 中继 · ${health.transportMode === 'lan-shared' ? 'Codex 内核已就绪' : 'Codex 内核未就绪'}\n${next}\n停止连接器保留授权：relax relay-stop --json。撤销全部移动设备：relax relay-revoke --json。` };
   };
   async function shutdown() {
     if (closing) return;

package/dist/src/self-relay/server.mjs

@@ -6,6 +6,7 @@ import { secret, digest, matches, validSecret, send, decode } from './wire.mjs';
 import { readDebugAllowlist, debugAllowed } from './debug-allowlist.mjs';
 import { validProbeSignal } from './p2p-probe.mjs';
 import { relayAdminState } from './admin-state.mjs';
+import { adminPage } from './admin-page.mjs';
 
 // Always loopback; a TLS reverse proxy supplies the private-trial Internet endpoint.
 export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlMs = 120000,
@@ -91,7 +92,8 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
       adminReply(response, 200, { maxRelaySessions: state.maxRelaySessions, activeRelaySessions,
         activeExemptRelaySessions: [...rooms.values()].reduce((sum, room) => sum + [...room.connections.values()].filter(connection => connection.relayExempt).length, 0),
         websocketConnections: wss.clients.size, onlineComputers: [...rooms.values()].filter(room => room.host).length,
-        activePhones: [...rooms.values()].reduce((sum, room) => sum + room.connections.size, 0), announcement: state.announcement }); return;
+        activePhones: [...rooms.values()].reduce((sum, room) => sum + room.connections.size, 0),
+        announcement: state.announcement, announcements: state.announcements }); return;
     }
     if (!['PUT', 'DELETE'].includes(request.method || '') || request.headers['content-type'] !== 'application/json' ||
         request.headers['x-code-relax-admin'] !== '1') { adminReply(response, 405, { error: 'Unsupported admin request' }); return; }
@@ -106,6 +108,10 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
       } else if (target.pathname === '/admin/api/announcement' && request.method === 'DELETE') {
         const state = adminState.withdraw(); broadcastAnnouncement(state.announcement);
         log({ event: 'admin-announcement-withdrawn' });
+      } else if (target.pathname.startsWith('/admin/api/announcements/') && request.method === 'DELETE') {
+        const id = target.pathname.slice('/admin/api/announcements/'.length);
+        adminState.deleteAnnouncement(id);
+        log({ event: 'admin-announcement-deleted', announcementId: id });
       } else { adminReply(response, 404, { error: 'Admin route not found' }); return; }
       adminReply(response, 200, { ok: true });
     } catch (error) { adminReply(response, 400, { error: error.message }); }
@@ -456,13 +462,3 @@ function readBody(request, limit) {
     request.on('end', () => resolve(value)); request.on('error', reject);
   });
 }
-
-function adminPage() {
-  return `<!doctype html><html lang="zh-CN"><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Code Relax 管理</title><style>
-body{margin:0;background:#0d1210;color:#eef4f0;font:15px system-ui,sans-serif}main{max-width:760px;margin:40px auto;padding:0 20px}section{background:#151d19;border:1px solid #2a3931;border-radius:14px;padding:18px;margin:16px 0}h1{font-size:24px}h2{font-size:17px}label{display:block;margin:12px 0 6px;color:#aab7af}input,textarea{box-sizing:border-box;width:100%;padding:11px;border:1px solid #43564b;border-radius:9px;background:#0d1210;color:#eef4f0}textarea{min-height:120px;resize:vertical}button{margin:12px 8px 0 0;padding:10px 16px;border:0;border-radius:9px;background:#2c7653;color:white}button.secondary{background:#39443e}pre{white-space:pre-wrap;color:#b9c8bf}.row{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:10px}.metric{padding:12px;background:#0d1210;border-radius:9px}.metric b{display:block;font-size:22px}</style><main><h1>Code Relax 管理</h1><section><h2>运行状态</h2><div id="metrics" class="row"></div><button onclick="load()">刷新</button></section><section><h2>服务器转发容量</h2><label>最大并发 WSS 转发会话</label><input id="limit" type="number" min="1" max="256"><button onclick="saveLimit()">保存</button></section><section><h2>系统公告</h2><label>标题</label><input id="title" maxlength="80"><label>正文</label><textarea id="message" maxlength="2000"></textarea><button onclick="publish()">发布</button><button class="secondary" onclick="withdraw()">撤下</button><pre id="current"></pre></section><pre id="result"></pre><script>
-const request=async(path,options={})=>{const response=await fetch(path,options);const body=await response.json();if(!response.ok)throw new Error(body.error||('HTTP '+response.status));return body};
-async function load(){try{const s=await request('/admin/api/status');limit.value=s.maxRelaySessions;metrics.innerHTML='<div class="metric"><b>'+s.activeRelaySessions+'</b>受限转发 / '+s.maxRelaySessions+'</div><div class="metric"><b>'+s.activeExemptRelaySessions+'</b>白名单转发</div><div class="metric"><b>'+s.websocketConnections+'</b>WebSocket</div><div class="metric"><b>'+s.onlineComputers+'</b>在线工作站</div><div class="metric"><b>'+s.activePhones+'</b>活动手机</div>';current.textContent=s.announcement?s.announcement.title+'\\n'+s.announcement.message+'\\n'+s.announcement.publishedAt:'当前无公告';}catch(e){result.textContent=e.message}}
-const write=(method,path,body)=>request(path,{method,headers:{'Content-Type':'application/json','X-Code-Relax-Admin':'1'},body:JSON.stringify(body)}).then(()=>{result.textContent='已保存';return load()}).catch(e=>result.textContent=e.message);
-function saveLimit(){return write('PUT','/admin/api/settings',{maxRelaySessions:Number(limit.value)})}function publish(){return write('PUT','/admin/api/announcement',{title:title.value,message:message.value})}function withdraw(){return write('DELETE','/admin/api/announcement',{})}load();
-</script></main></html>`;
-}