pastilhasandClaude Opus 5
b91d4df21d
x11vnc against display :0 — the session the owner is actually logged into, not a second one Officer installs. sidecar/, api/, web/ and the host setup script, moved out of src/ whole. Dormant when it moved: the websocket was commented out in server.tsx and the router in hono.ts since 2026-08-13, and no officer-vnc process was running on any machine. Nothing regressed and nothing was restored — this took switched-off code out of the platform. The point of the move is what the platform stopped knowing. Its sidecar/protocol.ts carried a VNC section — vnc:start, vnc:ensure-password, vnc:stop, four reply variants, VncStartParams, VncSessionInfo — and sidecar-registry.ts carried startVnc, ensureVncPassword, stopVnc and isVncConnected. That is the platform speaking a plugin's vocabulary, which CLAUDE.md names as a rule and this was the clearest breach of. All of it is in sidecar/protocol.ts here now. The permission made a round trip worth recording. It was kind: 'execution' — "runs as the server owner and cannot be shared" — and a plugin permission has no kind, deliberately, because a permission nobody can delegate is a contradiction. So the property is expressed as ownerOnly: ['/'] instead: every path under this plugin refused to anyone but the owner. Same answer, reached from the paths rather than from a kind, and the first real use of a mechanism that landed the same day. The property is real — there is one physical screen and it is the owner's. Not finished, and BLOCKERS.md says so rather than the commit implying otherwise: the websocket is dormant because a plugin cannot claim a WebSocket provider, host setup needs a reboot and no manifest can express that, and there is no artwork. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
74 lines
2.1 KiB
TypeScript
74 lines
2.1 KiB
TypeScript
import type { DesktopCommand, DesktopEvent } from './protocol';
|
|
import { DESKTOP_SIDECAR_KIND } from './protocol';
|
|
import * as vncManager from './vnc-manager';
|
|
import { createSidecarConnector } from '@@/sidecar/connect';
|
|
import { getOwnerHomeDir } from '@@/data-path';
|
|
import { API_URL } from '@@/officer-url.mjs';
|
|
|
|
// ── Command handlers ──
|
|
|
|
type ReplyFn = (msg: DesktopEvent) => void;
|
|
|
|
async function handleCommand(cmd: DesktopCommand, reply: ReplyFn) {
|
|
switch (cmd.type) {
|
|
case 'ping':
|
|
reply({ type: 'pong', id: cmd.id });
|
|
break;
|
|
|
|
case 'vnc:start': {
|
|
try {
|
|
const { port, display } = await vncManager.startSession(cmd.params);
|
|
reply({ type: 'vnc:started', id: cmd.id, port, display });
|
|
} catch (err) {
|
|
reply({ type: 'vnc:error', id: cmd.id, error: err instanceof Error ? err.message : String(err) });
|
|
}
|
|
break;
|
|
}
|
|
|
|
case 'vnc:ensure-password': {
|
|
try {
|
|
const { password } = await vncManager.ensureVncPassword(getOwnerHomeDir(cmd.email));
|
|
reply({ type: 'vnc:password', id: cmd.id, password });
|
|
} catch (err) {
|
|
reply({ type: 'vnc:error', id: cmd.id, error: err instanceof Error ? err.message : String(err) });
|
|
}
|
|
break;
|
|
}
|
|
|
|
case 'vnc:stop':
|
|
vncManager.stopSession(cmd.email);
|
|
reply({ type: 'vnc:stopped', id: cmd.id });
|
|
break;
|
|
|
|
default:
|
|
reply({
|
|
type: 'error',
|
|
id: (cmd as DesktopCommand).id,
|
|
error: `Unknown command type: ${(cmd as Record<string, unknown>).type}`,
|
|
});
|
|
}
|
|
}
|
|
|
|
// ── Connect to API server ──
|
|
|
|
const connection = createSidecarConnector({
|
|
apiUrl: `${API_URL}/api/sidecar/register`,
|
|
name: 'vnc',
|
|
handles: [DESKTOP_SIDECAR_KIND],
|
|
onCommand(cmd, reply) {
|
|
handleCommand(cmd as DesktopCommand, reply as ReplyFn);
|
|
},
|
|
});
|
|
|
|
// ── Graceful shutdown ──
|
|
|
|
function shutdown(signal: string) {
|
|
console.log(`[vnc] ${signal} received, stopping all sessions...`);
|
|
vncManager.stopAll();
|
|
connection.destroy();
|
|
process.exit(0);
|
|
}
|
|
|
|
process.on('SIGTERM', () => shutdown('SIGTERM'));
|
|
process.on('SIGINT', () => shutdown('SIGINT'));
|