@walkhi/code-relax 0.1.0-beta.3 → 0.1.0-beta.31

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

@@ -2,19 +2,23 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { randomUUID } from 'node:crypto';
 
-export function relayAdminState(file, initialMaxRelaySessions) {
-  let value = { version: 1, maxRelaySessions: initialMaxRelaySessions, announcement: null };
+// 80 title + 2000 body UTF-16 units fit even when every unit uses a six-byte JSON escape.
+export const MAX_ADMIN_REQUEST_BYTES = 16 * 1024;
+
+export function relayAdminState(file, initialMaxRelaySessions, { initial, persist } = {}) {
+  let value = initial ? validate(initial) : { version: 3, maxRelaySessions: initialMaxRelaySessions, announcement: null, announcements: [] };
   if (file && fs.existsSync(file)) value = validate(JSON.parse(fs.readFileSync(file, 'utf8')));
 
-  function save(next) {
-    value = validate(next);
-    if (!file) return value;
+  async function save(next) {
+    const validated = validate(next);
+    if (persist) await persist(validated);
+    if (!file) { value = validated; return value; }
     fs.mkdirSync(path.dirname(file), { recursive: true, mode: 0o700 });
     const temporary = `${file}.${randomUUID()}.tmp`;
     let descriptor;
     try {
       descriptor = fs.openSync(temporary, 'wx', 0o600);
-      fs.writeFileSync(descriptor, JSON.stringify(value));
+      fs.writeFileSync(descriptor, JSON.stringify(validated));
       fs.fsyncSync(descriptor); fs.closeSync(descriptor); descriptor = undefined;
       fs.renameSync(temporary, file);
       if (process.platform !== 'win32') {
@@ -25,32 +29,94 @@ export function relayAdminState(file, initialMaxRelaySessions) {
       if (descriptor !== undefined) fs.closeSync(descriptor);
       fs.rmSync(temporary, { force: true });
     }
+    value = validated;
     return value;
   }
 
   return {
     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() } });
+    createAnnouncement(title, message, publish = false) {
+      const now = new Date().toISOString();
+      const record = { id: randomUUID(), title: clean(title, 80), message: clean(message, 2000),
+        createdAt: now, updatedAt: now, publishedAt: publish ? now : null, status: publish ? 'active' : 'draft' };
+      const announcements = value.announcements.map(item => publish && item.status === 'active'
+        ? { ...item, status: 'withdrawn', updatedAt: now } : item);
+      return save({ ...value, announcement: publish ? publicAnnouncement(record) : value.announcement,
+        announcements: [record, ...announcements] });
+    },
+    updateDraft(id, title, message) {
+      const existing = value.announcements.find(item => item.id === id);
+      if (!existing || existing.status !== 'draft') throw new Error('Only drafts can be edited');
+      return save({ ...value, announcements: value.announcements.map(item => item.id === id
+        ? { ...item, title: clean(title, 80), message: clean(message, 2000), updatedAt: new Date().toISOString() } : item) });
+    },
+    publishDraft(id, title, message) {
+      const existing = value.announcements.find(item => item.id === id);
+      if (!existing || existing.status !== 'draft') throw new Error('Only drafts can be published');
+      const now = new Date().toISOString();
+      const published = { ...existing, title: title === undefined ? existing.title : clean(title, 80),
+        message: message === undefined ? existing.message : clean(message, 2000),
+        publishedAt: now, updatedAt: now, status: 'active' };
+      return save({ ...value, announcement: publicAnnouncement(published),
+        announcements: value.announcements.map(item => item.id === id ? published : item.status === 'active'
+          ? { ...item, status: 'withdrawn', updatedAt: now } : item) });
+    },
+    withdraw(id) {
+      if (!value.announcement || value.announcement.id !== id) throw new Error('Announcement is no longer active');
+      const now = new Date().toISOString();
+      return save({ ...value, announcement: null, announcements: value.announcements.map(item => item.status === 'active'
+        ? { ...item, status: 'withdrawn', updatedAt: now } : item) });
+    },
+    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) });
     },
-    withdraw() { return save({ ...value, announcement: null }); },
   };
 }
 
 function validate(source) {
-  if (!source || source.version !== 1 || !Number.isSafeInteger(source.maxRelaySessions) ||
+  if (!source || ![1, 2, 3].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 = source.version === 3 ? announcements.map(validateRecord) : announcements.map(item => {
+    const old = validateAnnouncement(item);
+    return { ...old, createdAt: old.publishedAt, updatedAt: old.publishedAt,
+      status: old.id === announcement?.id ? 'active' : 'withdrawn' };
+  });
+  const active = validated.filter(item => item.status === 'active');
+  if (new Set(validated.map(item => item.id)).size !== validated.length || active.length > 1 ||
+      (active.length === 0) !== (announcement === null) ||
+      (announcement && !active.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: 3, 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 validateRecord(item) {
+  if (!item || !/^[\w-]{16,128}$/.test(item.id) || !['draft', 'active', 'withdrawn'].includes(item.status) ||
+      typeof item.createdAt !== 'string' || !Number.isFinite(Date.parse(item.createdAt)) ||
+      typeof item.updatedAt !== 'string' || !Number.isFinite(Date.parse(item.updatedAt)) ||
+      (item.status === 'draft' ? item.publishedAt !== null :
+        typeof item.publishedAt !== 'string' || !Number.isFinite(Date.parse(item.publishedAt)))) {
+    throw new Error('Invalid relay announcement record');
+  }
+  return { id: item.id, title: clean(item.title, 80), message: clean(item.message, 2000),
+    createdAt: item.createdAt, updatedAt: item.updatedAt, publishedAt: item.publishedAt, status: item.status };
+}
+
+function publicAnnouncement(record) {
+  return { id: record.id, title: record.title, message: record.message, publishedAt: record.publishedAt };
 }
 
 function clean(value, limit) {

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

@@ -0,0 +1,14 @@
+// Shared semantic resources for the standalone relay management pages.
+export const adminUiTokens = `:root{
+  --admin-page:#f5f7fa;--admin-text:#26332b;--admin-muted:#607168;
+  --admin-surface:#ffffffee;--admin-row:#f8faf8;
+  --admin-border:#d5ddd8;--admin-row-border:#dce5df;
+  --admin-accent:#286e43;--admin-accent-surface:#e0f0e5;
+  --admin-error:#a5443b;--admin-card-radius:16px;--admin-control-radius:9px;
+  --admin-card-padding:22px;
+  --admin-footer-caption:12px;--admin-footer-opacity:0.75;--admin-footer-space:24px;
+}`;
+
+export const adminFooterStyles = `body{display:flex;flex-direction:column}
+body>main{width:100%;flex:1;margin:0 auto}
+.admin-footer{flex-shrink:0;padding:0 var(--admin-footer-space) var(--admin-footer-space);text-align:center;color:var(--admin-muted);font-size:var(--admin-footer-caption);opacity:var(--admin-footer-opacity)}`;

package/dist/src/self-relay/android-releases.mjs

@@ -0,0 +1,61 @@
+import fs from 'node:fs';
+
+const prefix = '/code-relax/android/';
+const webOrigin = 'https://www.coderelax.cn';
+
+export function readAndroidCatalog(file) {
+  const data = JSON.parse(fs.readFileSync(file, 'utf8'));
+  if (!Array.isArray(data.releases) || !data.releases.length) throw new Error('No Android releases');
+  const versions = new Set();
+  for (const item of data.releases) {
+    if (!Number.isSafeInteger(item.versionCode) || item.versionCode < 1 || item.versionCode > 2100000000
+      || versions.has(item.versionCode) || typeof item.versionName !== 'string' || !/^\d+\.\d+\.\d+\.\d+$/.test(item.versionName)
+      || !item.versionName.endsWith('.' + item.versionCode)
+      || !Number.isSafeInteger(item.size) || item.size <= 0 || !/^[a-f0-9]{64}$/.test(item.sha256)
+      || typeof item.objectKey !== 'string' || !/^code-relax\/android\/\d+\/[A-Za-z0-9._-]+\.apk$/.test(item.objectKey)
+      || typeof item.notes !== 'string' || item.notes.length > 10000) throw new Error('Invalid Android release catalog');
+    versions.add(item.versionCode);
+  }
+  if (!versions.has(data.latestVersionCode)) throw new Error('Latest Android release is missing');
+  return data;
+}
+
+export function createAndroidReleaseHandler({ catalogFile, signDownload, log = () => {} }) {
+  return async function handle(request, response, target) {
+    if (!target.pathname.startsWith(prefix)) return false;
+    const headers = { 'Cache-Control': 'no-store', 'Content-Type': 'application/json; charset=utf-8',
+      'X-Content-Type-Options': 'nosniff', 'Referrer-Policy': 'no-referrer',
+      'Access-Control-Allow-Origin': webOrigin, Vary: 'Origin' };
+    const reply = (code, data) => { response.writeHead(code, headers); response.end(JSON.stringify(data)); };
+    if (request.method !== 'GET') { reply(405, { error: 'Method not allowed' }); return true; }
+    if (![prefix + 'latest.json', prefix + 'download'].includes(target.pathname)) {
+      reply(404, { error: 'Not found' }); return true;
+    }
+    try {
+      if (!catalogFile || !signDownload) { reply(503, { error: 'Android release is not available' }); return true; }
+      const catalog = readAndroidCatalog(catalogFile);
+      const requested = target.searchParams.get('versionCode');
+      if (requested !== null && !/^[1-9]\d{0,9}$/.test(requested)) { reply(400, { error: 'Invalid version' }); return true; }
+      const code = target.pathname.endsWith('/latest.json') || requested === null ? catalog.latestVersionCode : Number(requested);
+      const release = catalog.releases.find(item => item.versionCode === code);
+      if (!release) { reply(404, { error: 'Release unavailable; check for updates again' }); return true; }
+      const { versionCode, versionName, size, sha256, notes } = release;
+      if (target.pathname.endsWith('/latest.json')) {
+        reply(200, { versionCode, versionName, size, sha256, notes }); return true;
+      }
+      // Sign only an explicitly published object, never a caller-supplied key or URL.
+      const ticket = await signDownload(release);
+      if (!ticket || new URL(ticket.url).protocol !== 'https:' || !Number.isSafeInteger(ticket.expiresAt) || ticket.expiresAt <= Date.now()) {
+        throw new Error('Invalid download ticket');
+      }
+      if (target.searchParams.get('redirect') === '1') {
+        response.writeHead(302, { ...headers, Location: ticket.url }); response.end();
+      } else reply(200, { versionCode, url: ticket.url, expiresAt: ticket.expiresAt });
+    } catch (error) {
+      // Provider errors may contain signed URLs or credentials. Never return or log them.
+      log({ event: 'android-release-error', type: error?.code === 'ENOENT' ? 'not-published' : 'configuration-or-storage' });
+      reply(503, { error: 'Android release is temporarily unavailable' });
+    }
+    return true;
+  };
+}

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

@@ -1,26 +1,26 @@
-import { EventEmitter } from 'node:events';
-import WebSocket from 'ws';
-import { decode, relayAddress, send } from './wire.mjs';
-
-// Headless mobile-side adapter for the local validation. No OpenAI credentials.
-export function connectRelayClient({ relayUrl, room, code, credential, clientId, observe = false }) {
-  relayAddress(relayUrl);
-  const events = new EventEmitter(), pending = new Map();
+import { EventEmitter } from 'node:events';
+import WebSocket from 'ws';
+import { decode, relayAddress, send } from './wire.mjs';
+
+// Headless mobile-side adapter for the local validation. No OpenAI credentials.
+export function connectRelayClient({ relayUrl, room, code, credential, clientId, accountToken, observe = false }) {
+  relayAddress(relayUrl);
+  const events = new EventEmitter(), pending = new Map();
   const socket = new WebSocket(relayUrl, { maxPayload: 64 * 1024 * 1024, perMessageDeflate: true });
   let serial = 0, connected = false, pairedCredential = credential, pairedClientId = clientId;
-  const ready = new Promise((resolve, reject) => {
-    const timer = setTimeout(() => { reject(new Error('Relay connection timeout')); socket.terminate(); }, 7000);
-    socket.on('open', () => send(socket, observe ? { type: 'observe', room, credential, clientId }
-      : code ? { type: 'pair', room, code, credential, clientId } : { type: 'resume', room, credential, clientId }));
-    socket.on('error', error => { reject(error); events.emit('diagnostic', error.message); });
-    socket.on('close', () => {
-      clearTimeout(timer); connected = false; reject(new Error('Relay connection closed'));
-      for (const request of pending.values()) { clearTimeout(request.timer); request.reject(new Error('连接断开，操作结果未确认，不自动重发')); }
-      pending.clear(); events.emit('disconnected');
-    });
-    socket.on('message', (bytes, binary) => {
-      try {
-        const message = decode(bytes, binary);
+  const ready = new Promise((resolve, reject) => {
+    const timer = setTimeout(() => { reject(new Error('Relay connection timeout')); socket.terminate(); }, 7000);
+    socket.on('open', () => send(socket, observe ? { type: 'observe', room, credential, clientId, accountToken }
+      : code ? { type: 'pair', room, code, credential, clientId, accountToken } : { type: 'resume', room, credential, clientId, accountToken }));
+    socket.on('error', error => { reject(error); events.emit('diagnostic', error.message); });
+    socket.on('close', () => {
+      clearTimeout(timer); connected = false; reject(new Error('Relay connection closed'));
+      for (const request of pending.values()) { clearTimeout(request.timer); request.reject(new Error('连接断开，操作结果未确认，不自动重发')); }
+      pending.clear(); events.emit('disconnected');
+    });
+    socket.on('message', (bytes, binary) => {
+      try {
+        const message = decode(bytes, binary);
         if (message.type === 'paired') { if (message.credential) pairedCredential = message.credential; if (message.clientId) pairedClientId = message.clientId; }
         else if (message.type === 'observing') { clearTimeout(timer); connected = true; events.emit('observing', message); resolve({ room, credential: pairedCredential, clientId: pairedClientId }); }
         else if (message.type === 'computer-info') events.emit('computer-info', { hostName: message.hostName });
@@ -29,33 +29,33 @@ export function connectRelayClient({ relayUrl, room, code, credential, clientId,
         else if (message.type === 'official-computer-saved') events.emit('official-computer-saved', message.computer);
         else if (message.type === 'announcement') events.emit('announcement', message.announcement);
         else if (message.type === 'ready') { clearTimeout(timer); connected = true; resolve({ room, credential: pairedCredential, clientId: pairedClientId }); }
-        else if (message.type === 'data') {
-          const body = decode(message.payload, false), request = pending.get(body.id);
-          if (body.type === 'response' && request) { clearTimeout(request.timer); pending.delete(body.id); request.resolve(body); }
-          else events.emit('message', body);
-        } else throw new Error('Invalid relay message');
-      } catch (error) { reject(error); events.emit('diagnostic', error.message); socket.close(1008, 'Invalid response'); }
-    });
-  });
-  return {
-    ready, events,
-    request(path, { method = 'GET', body, timeoutMs = 5000 } = {}) {
-      if (!connected) return Promise.reject(new Error('Relay not ready'));
-      const id = ++serial;
-      return new Promise((resolve, reject) => {
-        const timer = setTimeout(() => { pending.delete(id); reject(new Error('请求超时，结果未确认，不自动重发')); }, timeoutMs);
-        pending.set(id, { resolve, reject, timer });
-        if (!send(socket, { type: 'data', payload: JSON.stringify({ type: 'request', id, path, method, ...(body ? { body } : {}) }) })) {
-          clearTimeout(timer); pending.delete(id); reject(new Error('Relay not connected'));
-        }
-      });
-    },
+        else if (message.type === 'data') {
+          const body = decode(message.payload, false), request = pending.get(body.id);
+          if (body.type === 'response' && request) { clearTimeout(request.timer); pending.delete(body.id); request.resolve(body); }
+          else events.emit('message', body);
+        } else throw new Error('Invalid relay message');
+      } catch (error) { reject(error); events.emit('diagnostic', error.message); socket.close(1008, 'Invalid response'); }
+    });
+  });
+  return {
+    ready, events,
+    request(path, { method = 'GET', body, timeoutMs = 5000 } = {}) {
+      if (!connected) return Promise.reject(new Error('Relay not ready'));
+      const id = ++serial;
+      return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => { pending.delete(id); reject(new Error('请求超时，结果未确认，不自动重发')); }, timeoutMs);
+        pending.set(id, { resolve, reject, timer });
+        if (!send(socket, { type: 'data', payload: JSON.stringify({ type: 'request', id, path, method, ...(body ? { body } : {}) }) })) {
+          clearTimeout(timer); pending.delete(id); reject(new Error('Relay not connected'));
+        }
+      });
+    },
     send(message) { if (!connected) throw new Error('Relay not ready'); return send(socket, { type: 'data', payload: JSON.stringify(message) }); },
     routeDirect() { if (!connected) throw new Error('Relay not ready'); return send(socket, { type: 'p2p-route', direct: 1 }); },
     recordOfficialComputer(computer) {
       if (!connected || !observe) throw new Error('Metadata channel not ready');
       return send(socket, { type: 'official-computer', ...computer });
     },
-    close() { socket.terminate(); },
-  };
-}
+    close() { socket.terminate(); },
+  };
+}