termdock 1.4.330 → 1.4.332

package/dist/client/sw.js

@@ -1 +1 @@
-if(!self.define){let e,s={};const n=(n,i)=>(n=new URL(n+".js",i).href,s[n]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=n,e.onload=s,document.head.appendChild(e)}else e=n,importScripts(n),s()}).then(()=>{let e=s[n];if(!e)throw new Error(`Module ${n} didn’t register its module`);return e}));self.define=(i,a)=>{const o=e||("document"in self?document.currentScript.src:"")||location.href;if(s[o])return;let r={};const c=e=>n(e,o),d={module:{uri:o},exports:r,require:c};s[o]=Promise.all(i.map(e=>d[e]||c(e))).then(e=>(a(...e),r))}}define(["./workbox-9845bf53"],function(e){"use strict";importScripts("sw-encrypted-background.js","sw-notifications.js","sw-secure-api.js","sw-downloads.js"),self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"index.html",revision:"5f059a61fad372907e561196e64b3a15"},{url:"assets/app-aNkllBsm.js",revision:null},{url:"assets/react-XDCjal2T.js",revision:null},{url:"assets/dnd-BCFAPC0L.js",revision:null},{url:"assets/terminal-C7X98Amf.js",revision:null},{url:"assets/index-e1PkqIqN.css",revision:null},{url:"icons/agents/opencode.svg",revision:"851c2931d95821ba2b39b68587b48976"},{url:"icons/agents/kimi.svg",revision:"5366c710f4f763022fe159a69cf17409"},{url:"icons/agents/grok.svg",revision:"cd745b0b964545bc7a6b4f36021c3298"},{url:"icons/agents/goose.svg",revision:"c79b927278983c19098d77b4b0c11ab3"},{url:"icons/agents/gemini.svg",revision:"7a64f6d6f80a908255e9c0256903882e"},{url:"icons/agents/droid.svg",revision:"f28723b8c5c115e0908ba3c72613e256"},{url:"icons/agents/cursor.svg",revision:"a1528f3d3cda497f75a5db28defb19de"},{url:"icons/agents/copilot.svg",revision:"dd52e96c1eac0b6ec4bedcd0ddd3b52d"},{url:"icons/agents/codex.svg",revision:"608e55babb0b217e1f2da287342b46d3"},{url:"icons/agents/claude.svg",revision:"08af0225b7acdd8e8f573f3247e5e1c3"},{url:"icons/agents/amp.svg",revision:"af12f8b33faa81e4d46ea7b93c7e43f3"},{url:"apple-touch-icon-180x180.png",revision:"628c2e2f28a9b545aa57be1352025643"},{url:"boot-logo.png",revision:"2e3a25efd9b0b8ca1eab53b5f2284556"},{url:"favicon.ico",revision:"2994debfa6f59a0898e24eb0c54d64b5"},{url:"ipad-status-bar.js",revision:"3a8080edb8a5cc658a7908f6ad69537f"},{url:"maskable-icon-512x512.png",revision:"4d489331fd81f0713c400b26426442b9"},{url:"pwa-192x192.png",revision:"4d6f899888cfb8ccd7a1fd3c9e583ad2"},{url:"pwa-512x512.png",revision:"0885dd7ec8932e7f878b013d51a380a4"},{url:"robots.txt",revision:"d9339907142917dee4aac78494ac9cfe"},{url:"sw-downloads.js",revision:"48dab2e78bd93b4eee27fca487eccfde"},{url:"sw-notifications.js",revision:"fde578590ea8b0540d488ef448b48f45"},{url:"sw-secure-api.js",revision:"cf2bdbd03d41d66d60344c0b5a1075de"},{url:"manifest.webmanifest",revision:"83f9a43b74c236012adafb077fb6d774"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("index.html"),{denylist:[/^\/api\//,/^\/__termdock-download\//,/^\/health$/]})),e.registerRoute(/\/assets\/.*\.(?:js|css)$/,new e.CacheFirst({cacheName:"termdock-lazy-assets-v1",plugins:[new e.CacheableResponsePlugin({statuses:[0,200]}),new e.ExpirationPlugin({maxEntries:96,maxAgeSeconds:2592e3})]}),"GET"),e.registerRoute(/\/fonts\/terminal\/[^/]+-[a-f0-9]{12}\.woff2$/,new e.CacheFirst({cacheName:"termdock-fonts-v2",plugins:[new e.CacheableResponsePlugin({statuses:[0,200]}),new e.ExpirationPlugin({maxEntries:384,maxAgeSeconds:2592e3})]}),"GET"),e.registerRoute(/\/fonts\/.*\.(?:woff2|ttf)$/,new e.StaleWhileRevalidate({cacheName:"termdock-fonts-v1",plugins:[new e.ExpirationPlugin({maxEntries:24,maxAgeSeconds:2592e3})]}),"GET")});
+if(!self.define){let e,s={};const n=(n,i)=>(n=new URL(n+".js",i).href,s[n]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=n,e.onload=s,document.head.appendChild(e)}else e=n,importScripts(n),s()}).then(()=>{let e=s[n];if(!e)throw new Error(`Module ${n} didn’t register its module`);return e}));self.define=(i,a)=>{const o=e||("document"in self?document.currentScript.src:"")||location.href;if(s[o])return;let c={};const r=e=>n(e,o),d={module:{uri:o},exports:c,require:r};s[o]=Promise.all(i.map(e=>d[e]||r(e))).then(e=>(a(...e),c))}}define(["./workbox-9845bf53"],function(e){"use strict";importScripts("sw-encrypted-background.js","sw-notifications.js","sw-secure-api.js","sw-downloads.js"),self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"index.html",revision:"e861e4f0fa06e0ad9bb72cc43ebf650e"},{url:"assets/app-D-AilvVY.js",revision:null},{url:"assets/react-XDCjal2T.js",revision:null},{url:"assets/dnd-BCFAPC0L.js",revision:null},{url:"assets/terminal-C7X98Amf.js",revision:null},{url:"assets/index-CRxcDATF.css",revision:null},{url:"icons/agents/opencode.svg",revision:"851c2931d95821ba2b39b68587b48976"},{url:"icons/agents/kimi.svg",revision:"5366c710f4f763022fe159a69cf17409"},{url:"icons/agents/grok.svg",revision:"cd745b0b964545bc7a6b4f36021c3298"},{url:"icons/agents/goose.svg",revision:"c79b927278983c19098d77b4b0c11ab3"},{url:"icons/agents/gemini.svg",revision:"7a64f6d6f80a908255e9c0256903882e"},{url:"icons/agents/droid.svg",revision:"f28723b8c5c115e0908ba3c72613e256"},{url:"icons/agents/cursor.svg",revision:"a1528f3d3cda497f75a5db28defb19de"},{url:"icons/agents/copilot.svg",revision:"dd52e96c1eac0b6ec4bedcd0ddd3b52d"},{url:"icons/agents/codex.svg",revision:"608e55babb0b217e1f2da287342b46d3"},{url:"icons/agents/claude.svg",revision:"08af0225b7acdd8e8f573f3247e5e1c3"},{url:"icons/agents/amp.svg",revision:"af12f8b33faa81e4d46ea7b93c7e43f3"},{url:"apple-touch-icon-180x180.png",revision:"628c2e2f28a9b545aa57be1352025643"},{url:"boot-logo.png",revision:"2e3a25efd9b0b8ca1eab53b5f2284556"},{url:"favicon.ico",revision:"2994debfa6f59a0898e24eb0c54d64b5"},{url:"ipad-status-bar.js",revision:"3a8080edb8a5cc658a7908f6ad69537f"},{url:"maskable-icon-512x512.png",revision:"4d489331fd81f0713c400b26426442b9"},{url:"pwa-192x192.png",revision:"4d6f899888cfb8ccd7a1fd3c9e583ad2"},{url:"pwa-512x512.png",revision:"0885dd7ec8932e7f878b013d51a380a4"},{url:"robots.txt",revision:"d9339907142917dee4aac78494ac9cfe"},{url:"sw-downloads.js",revision:"48dab2e78bd93b4eee27fca487eccfde"},{url:"sw-notifications.js",revision:"fde578590ea8b0540d488ef448b48f45"},{url:"sw-secure-api.js",revision:"cf2bdbd03d41d66d60344c0b5a1075de"},{url:"manifest.webmanifest",revision:"83f9a43b74c236012adafb077fb6d774"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("index.html"),{denylist:[/^\/api\//,/^\/__termdock-download\//,/^\/health$/]})),e.registerRoute(/\/assets\/.*\.(?:js|css)$/,new e.CacheFirst({cacheName:"termdock-lazy-assets-v1",plugins:[new e.CacheableResponsePlugin({statuses:[0,200]}),new e.ExpirationPlugin({maxEntries:96,maxAgeSeconds:2592e3})]}),"GET"),e.registerRoute(/\/fonts\/terminal\/[^/]+-[a-f0-9]{12}\.woff2$/,new e.CacheFirst({cacheName:"termdock-fonts-v2",plugins:[new e.CacheableResponsePlugin({statuses:[0,200]}),new e.ExpirationPlugin({maxEntries:384,maxAgeSeconds:2592e3})]}),"GET"),e.registerRoute(/\/fonts\/.*\.(?:woff2|ttf)$/,new e.StaleWhileRevalidate({cacheName:"termdock-fonts-v1",plugins:[new e.ExpirationPlugin({maxEntries:24,maxAgeSeconds:2592e3})]}),"GET")});

package/dist/server/agent/collaborationPeerTransport.js

@@ -1,3 +1,4 @@
+import { RELAY_CLIENT_CONNECT_TIMEOUT_MS } from '../federation/streamLimits.js';
 import { encryptedRequestSubject } from '../federation/requestContext.js';
 import { randomUUID } from 'node:crypto';
 import { readFileSync, writeFileSync, renameSync, mkdirSync } from 'node:fs';
@@ -122,9 +123,9 @@ export class CollaborationRpc {
         this.pending.clear();
     }
 }
-export async function connectCollaborationRpc(identity, peer, endpoint, receive) {
+export async function connectCollaborationRpc(identity, peer, endpoint, receive, configuredCa) {
     validateCollaborationNode(peer);
-    const ca = peer.caFingerprint256 ? await readPinnedCertificateAuthority(peer.origin, peer.caFingerprint256) : undefined;
+    const ca = peer.caFingerprint256 ? await readPinnedCertificateAuthority(peer.origin, peer.caFingerprint256) : configuredCa;
     const url = endpoint ?? `${peer.origin.replace(/^https:/, 'wss:')}/api/federation/secure`;
     const socket = new WebSocket(url, { ca, rejectUnauthorized: true, followRedirects: false, handshakeTimeout: 3000, maxPayload: 1024 * 1024 });
     const relay = endpoint ? relayDuplex(socket, peer.serviceId) : undefined;
@@ -164,7 +165,7 @@ function relayDuplex(socket, target) {
     let readyResolve, readyReject;
     const ready = new Promise((resolve, reject) => { readyResolve = resolve; readyReject = reject; });
     void ready.catch(() => { });
-    const timer = setTimeout(() => fail(new Error('ROUTE_TIMEOUT')), 5000);
+    const timer = setTimeout(() => fail(new Error('ROUTE_TIMEOUT')), RELAY_CLIENT_CONNECT_TIMEOUT_MS);
     const fail = (error) => { clearTimeout(timer); readyReject(error); queue.end(error); socket.close(); };
     const send = (frame) => {
         if (socket.readyState !== 1 || socket.bufferedAmount > 1024 * 1024)

package/dist/server/entry.js

@@ -677,7 +677,8 @@ export function startServer(options = {}) {
         const localHostname = ['0.0.0.0', '::'].includes(host) ? 'localhost' : host;
         const localAuthority = localHostname.includes(':') && !localHostname.startsWith('[') ? `[${localHostname}]` : localHostname;
         const selfRelay = new DesktopSelfRelay({
-            desktopFile: path.join(homedir(), '.termdock', 'desktop.json'), identity: runtime.identity, serviceId: runtime.serviceId,
+            desktopFile: path.join(homedir(), '.termdock', 'desktop.json'),
+            targets: () => routeAccess.configuredDirectTargets(), baseDir: path.join(homedir(), '.termdock', 'federation'), identity: runtime.identity, serviceId: runtime.serviceId,
             localOrigin: `${scheme}://${localAuthority}:${port}`, ...(localCa ? { localCa } : {}),
         });
         selfRelay.start();

package/dist/server/federation/relay.js

@@ -1,7 +1,8 @@
+import { RELAY_PROVIDER_CONNECT_TIMEOUT_MS, RELAY_ROUTE_OPEN_TIMEOUT_MS } from './streamLimits.js';
 import { randomUUID } from 'node:crypto';
 import { EventEmitter } from 'node:events';
 const defaults = { maxFrameBytes: 256 * 1024, maxBufferedBytes: 1024 * 1024,
-    maxStreams: 128, heartbeatMs: 30_000, maxRouteTtlMs: 90_000, connectTimeoutMs: 10_000 };
+    maxStreams: 128, heartbeatMs: 30_000, maxRouteTtlMs: 90_000, connectTimeoutMs: RELAY_PROVIDER_CONNECT_TIMEOUT_MS, routeTimeoutMs: RELAY_ROUTE_OPEN_TIMEOUT_MS };
 const identifier = (v) => typeof v === 'string' && /^[a-zA-Z0-9_.:-]{1,160}$/.test(v);
 function parse(raw, limits) {
     if (Buffer.byteLength(raw instanceof Array ? Buffer.concat(raw) : raw) > limits.maxFrameBytes)
@@ -90,9 +91,11 @@ export class RelayRouter {
         this.options = options;
         this.limits = { ...defaults, ...options };
         this.sweep = setInterval(() => {
-            for (const [id, route] of this.routes)
-                if (route.expires <= Date.now() || !this.canRegister(route.peer, id))
-                    this.withdraw(id, route.peer);
+            for (const [id, routes] of this.routes)
+                for (const [peer, route] of routes) {
+                    if (route.expires <= Date.now() || peer.ws.readyState !== 1 || !this.canRegister(peer, id))
+                        this.withdraw(id, peer);
+                }
             for (const peer of this.peers)
                 for (const stream of [...peer.streams.values()]) {
                     if (stream.owner === peer && !this.canRoute(peer, stream.serviceId))
@@ -107,16 +110,22 @@ export class RelayRouter {
     canRoute(peer, serviceId) {
         return !this.directPeers.has(peer) && this.options.allowRoute(peer.principal, serviceId);
     }
+    providers(serviceId) {
+        return [...(this.routes.get(serviceId) || [])]
+            .filter(([peer, route]) => route.expires > Date.now() && peer.ws.readyState === 1 && this.canRegister(peer, serviceId))
+            // Recent target failures lower priority but never make the only route disappear.
+            .sort((a, b) => Math.max(0, a[1].retryAfter - Date.now()) - Math.max(0, b[1].retryAfter - Date.now()))
+            .map(([peer]) => peer);
+    }
     hasRoute(serviceId) {
-        const route = this.routes.get(serviceId);
-        return !this.stopped && !!route && route.expires > Date.now() && route.peer.ws.readyState === 1 && this.canRegister(route.peer, serviceId);
+        return !this.stopped && this.providers(serviceId).length > 0;
     }
     activeRouteIds() {
         return [...this.routes.keys()].filter(serviceId => this.hasRoute(serviceId));
     }
     /** Trusted local configuration only. Clients never supply a target URL or factory. */
     registerDirect(serviceId, connect) {
-        if (this.stopped || !identifier(serviceId) || typeof connect !== 'function' || this.hasRoute(serviceId))
+        if (this.stopped || !identifier(serviceId) || typeof connect !== 'function' || [...this.peers].some(peer => this.directPeers.get(peer) === serviceId))
             throw new Error('Invalid or already registered direct target');
         const [routerWire, clientWire] = memoryPair();
         // The private WeakMap marks this peer; its placeholder principal is never
@@ -139,6 +148,10 @@ export class RelayRouter {
     }
     /** Caller awaits attach before completing its application-level ready handshake. */
     async attach(ws, context) {
+        if (this.stopped) {
+            ws.close(1001, 'Router stopped');
+            return false;
+        }
         // Reject early application frames rather than buffering untrusted traffic while authenticating.
         let early = false;
         const rejectEarly = () => { early = true; ws.close(1008, 'Authentication pending'); };
@@ -151,7 +164,7 @@ export class RelayRouter {
             principal = null;
         }
         ws.off('message', rejectEarly);
-        if (principal === null || early || ws.readyState !== 1) {
+        if (this.stopped || principal === null || early || ws.readyState !== 1) {
             ws.close(1008, 'Relay authentication required');
             return false;
         }
@@ -169,72 +182,131 @@ export class RelayRouter {
         return true;
     }
     withdraw(serviceId, peer) {
-        if (this.routes.get(serviceId)?.peer === peer)
+        const routes = this.routes.get(serviceId);
+        routes?.delete(peer);
+        if (!routes?.size)
             this.routes.delete(serviceId);
         for (const stream of [...peer.streams.values()])
             if (stream.serviceId === serviceId && stream.provider === peer)
-                this.closeStream(stream, 'Route unavailable');
+                this.providerFailed(stream, 'Route unavailable');
     }
     remove(peer) {
         this.peers.delete(peer);
-        for (const [id, route] of this.routes)
-            if (route.peer === peer)
+        // Consumers cannot fail over after disconnecting; remove them first.
+        for (const stream of [...peer.streams.values()])
+            if (stream.owner === peer)
+                this.closeStream(stream, 'Relay disconnected');
+        for (const [id, routes] of this.routes)
+            if (routes.has(peer))
                 this.withdraw(id, peer);
         for (const stream of [...peer.streams.values()])
-            this.closeStream(stream, 'Relay disconnected');
+            this.providerFailed(stream, 'Relay disconnected');
     }
     closeStream(s, reason) {
+        if (s.owner.streams.get(s.ownerId) !== s)
+            return;
+        clearTimeout(s.deadline);
         s.owner.streams.delete(s.ownerId);
-        s.provider.streams.delete(s.providerId);
+        if (s.provider.streams.get(s.providerId) === s) {
+            s.provider.streams.delete(s.providerId);
+            send(s.provider.ws, { type: 'close', streamId: s.providerId, reason }, this.limits);
+        }
         send(s.owner.ws, { type: 'close', streamId: s.ownerId, reason }, this.limits);
+    }
+    providerFailed(s, reason) {
+        if (s.owner.streams.get(s.ownerId) !== s)
+            return;
+        clearTimeout(s.deadline);
+        s.provider.streams.delete(s.providerId);
         send(s.provider.ws, { type: 'close', streamId: s.providerId, reason }, this.limits);
+        const route = this.routes.get(s.serviceId)?.get(s.provider);
+        if (route)
+            route.retryAfter = Date.now() + 5000;
+        // Never replay ciphertext (or terminal input) onto a replacement transport.
+        if (s.opened || !this.openProvider(s))
+            this.closeStream(s, reason);
+    }
+    openProvider(s) {
+        if (this.stopped || Date.now() >= s.expires || s.owner.ws.readyState !== 1 || !this.canRoute(s.owner, s.serviceId))
+            return false;
+        for (const provider of this.providers(s.serviceId)) {
+            if (provider === s.owner || s.attempted.has(provider) || provider.streams.size >= this.limits.maxStreams)
+                continue;
+            s.attempted.add(provider);
+            s.provider = provider;
+            s.providerId = randomUUID();
+            provider.streams.set(s.providerId, s);
+            if (!send(provider.ws, { type: 'open', streamId: s.providerId, serviceId: s.serviceId }, this.limits)) {
+                provider.streams.delete(s.providerId);
+                continue;
+            }
+            s.deadline = setTimeout(() => this.providerFailed(s, 'Target timeout'), Math.min(this.limits.connectTimeoutMs, s.expires - Date.now()));
+            s.deadline.unref?.();
+            return true;
+        }
+        return false;
     }
     receive(peer, f) {
         if (f.type === 'register') {
             if (!f.serviceIds.every(id => this.canRegister(peer, id)))
                 throw new Error('Registration denied');
+            for (const [id, routes] of this.routes)
+                if (routes.has(peer) && !f.serviceIds.includes(id))
+                    this.withdraw(id, peer);
             for (const id of f.serviceIds) {
-                const old = this.routes.get(id);
-                if (old && old.peer !== peer && old.expires > Date.now())
-                    throw new Error('Route already registered');
+                let routes = this.routes.get(id);
+                if (!routes) {
+                    routes = new Map();
+                    this.routes.set(id, routes);
+                }
+                routes.set(peer, { expires: Date.now() + Math.min(f.ttlMs, this.limits.maxRouteTtlMs), retryAfter: routes.get(peer)?.retryAfter ?? 0 });
             }
-            for (const [id, r] of this.routes)
-                if (r.peer === peer && !f.serviceIds.includes(id))
-                    this.withdraw(id, peer);
-            for (const id of f.serviceIds)
-                this.routes.set(id, { peer, expires: Date.now() + Math.min(f.ttlMs, this.limits.maxRouteTtlMs) });
             return;
         }
         if (f.type === 'open') {
-            const route = this.routes.get(f.serviceId);
             if (peer.streams.has(f.streamId))
                 throw new Error('Duplicate stream');
-            if (!this.canRoute(peer, f.serviceId) || !route || route.expires <= Date.now() || route.peer === peer) {
+            if (!this.canRoute(peer, f.serviceId) || !this.hasRoute(f.serviceId)) {
                 send(peer.ws, { type: 'close', streamId: f.streamId, reason: 'Route unavailable or denied' }, this.limits);
                 return;
             }
-            if (peer.streams.size >= this.limits.maxStreams || route.peer.streams.size >= this.limits.maxStreams)
+            if (peer.streams.size >= this.limits.maxStreams)
                 throw new Error('Stream budget exceeded');
-            const s = { owner: peer, ownerId: f.streamId, provider: route.peer, providerId: randomUUID(), serviceId: f.serviceId };
+            const s = { owner: peer, ownerId: f.streamId, provider: peer, providerId: '', serviceId: f.serviceId, opened: false, expires: Date.now() + this.limits.routeTimeoutMs, attempted: new Set() };
             peer.streams.set(s.ownerId, s);
-            route.peer.streams.set(s.providerId, s);
-            if (!send(route.peer.ws, { ...f, streamId: s.providerId }, this.limits))
-                this.closeStream(s, 'Relay disconnected');
+            if (!this.openProvider(s))
+                this.closeStream(s, 'Route unavailable or congested');
             return;
         }
         const s = peer.streams.get(f.streamId);
         if (!s)
             return;
-        if (!this.canRoute(s.owner, s.serviceId) || !this.canRegister(s.provider, s.serviceId)) {
+        if (!this.canRoute(s.owner, s.serviceId)) {
             this.closeStream(s, 'Authorization revoked');
             return;
         }
+        const registration = this.routes.get(s.serviceId)?.get(s.provider);
+        if (!registration || registration.expires <= Date.now() || !this.canRegister(s.provider, s.serviceId)) {
+            this.withdraw(s.serviceId, s.provider);
+            return;
+        }
         if (f.type === 'close') {
-            this.closeStream(s, 'Channel closed');
+            if (peer === s.provider)
+                this.providerFailed(s, 'Channel closed');
+            else
+                this.closeStream(s, 'Channel closed');
             return;
         }
         if (f.type === 'opened' && peer !== s.provider)
             throw new Error('Invalid channel direction');
+        if (f.type === 'opened') {
+            if (s.opened)
+                throw new Error('Channel already opened');
+            clearTimeout(s.deadline);
+            s.opened = true;
+        }
+        else if (!s.opened)
+            throw new Error('Channel not ready');
         const target = peer === s.owner ? s.provider : s.owner;
         if (!send(target.ws, { ...f, streamId: peer === s.owner ? s.providerId : s.ownerId }, this.limits))
             this.closeStream(s, 'Relay congestion');
@@ -251,6 +323,7 @@ export class RelayClient {
     limits;
     streams = new Map();
     renewal;
+    pending = new Map();
     stopped = false;
     constructor(upstream, options) {
         this.upstream = upstream;
@@ -265,6 +338,8 @@ export class RelayClient {
         upstream.on('message', raw => { void this.receive(raw).catch(() => upstream.close(1008, 'Invalid relay frame')); });
     }
     drop(id, reason) {
+        clearTimeout(this.pending.get(id));
+        this.pending.delete(id);
         const target = this.streams.get(id);
         this.streams.delete(id);
         target?.close();
@@ -276,26 +351,35 @@ export class RelayClient {
             throw new Error('Unexpected registration');
         if (f.type === 'open') {
             const connect = this.options.targets.get(f.serviceId);
-            if (!connect || this.streams.has(f.streamId) || this.streams.size >= this.limits.maxStreams) {
+            if (this.streams.has(f.streamId))
+                throw new Error('Duplicate stream');
+            if (!connect || this.streams.size >= this.limits.maxStreams) {
                 this.drop(f.streamId, 'Target unavailable');
                 return;
             }
             this.streams.set(f.streamId, null);
-            let timedOut = false;
-            const timer = setTimeout(() => { timedOut = true; this.drop(f.streamId, 'Target timeout'); }, this.limits.connectTimeoutMs);
+            const timer = setTimeout(() => { this.drop(f.streamId, 'Target timeout'); }, this.limits.connectTimeoutMs);
             timer.unref?.();
+            this.pending.set(f.streamId, timer);
             let target;
             try {
                 target = await connect();
             }
             catch {
-                clearTimeout(timer);
-                this.drop(f.streamId, 'Target unavailable');
+                if (this.pending.get(f.streamId) === timer)
+                    this.drop(f.streamId, 'Target unavailable');
+                return;
+            }
+            // A canceled attempt may complete after the same ID has been reused.
+            if (this.pending.get(f.streamId) !== timer || this.stopped) {
+                target.close();
                 return;
             }
             clearTimeout(timer);
-            if (timedOut || this.stopped || !this.streams.has(f.streamId)) {
+            this.pending.delete(f.streamId);
+            if (target.readyState !== 1) {
                 target.close();
+                this.drop(f.streamId, 'Target not ready');
                 return;
             }
             this.streams.set(f.streamId, target);

package/dist/server/federation/selfRelay.js

@@ -1,4 +1,6 @@
 import WebSocket from 'ws';
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
 import { desktopDirectTargets } from './desktopTargets.js';
 import { RelayClient } from './relay.js';
 import { readPinnedCertificateAuthority } from './trustedCa.js';
@@ -57,8 +59,8 @@ function waitForReady(socket) {
 }
 /**
  * A local Termdock service may publish only its own stable identity to other
- * services pinned by the same Desktop installation. Desktop supplies addresses
- * and CA pins only; the service proves itself with its own Noise identity and
+ * administrator-configured peers or services pinned by the same Desktop
+ * installation. Configuration supplies addresses and TLS trust only; the service proves itself with its own Noise identity and
  * no browser/device authorization is copied into this process.
  */
 export class DesktopSelfRelay {
@@ -89,11 +91,12 @@ export class DesktopSelfRelay {
     refresh() {
         if (this.stopped)
             return;
-        const desired = new Map(desktopDirectTargets(this.options.desktopFile, this.options.serviceId)
-            .map(target => [target.serviceId, target]));
+        const desired = new Map([...desktopDirectTargets(this.options.desktopFile, this.options.serviceId), ...(this.options.targets?.() || [])]
+            .filter(target => target.serviceId !== this.options.serviceId)
+            .map(target => [target.serviceId, { ...target, url: new URL(target.url.replace(/^wss:/, 'https:')).origin }]));
         for (const [serviceId, state] of this.states) {
             const target = desired.get(serviceId);
-            const signature = target && JSON.stringify([target.url, target.caFingerprint256]);
+            const signature = target && JSON.stringify([target.url, target.caFingerprint256, target.caPath]);
             if (!target || signature !== state.signature) {
                 this.stopState(state);
                 this.states.delete(serviceId);
@@ -101,7 +104,7 @@ export class DesktopSelfRelay {
         }
         for (const [serviceId, target] of desired)
             if (!this.states.has(serviceId)) {
-                const state = { signature: JSON.stringify([target.url, target.caFingerprint256]), stopped: false };
+                const state = { signature: JSON.stringify([target.url, target.caFingerprint256, target.caPath]), stopped: false };
                 this.states.set(serviceId, state);
                 void this.run(state, target);
             }
@@ -137,7 +140,8 @@ export class DesktopSelfRelay {
     }
     async connect(state, target) {
         const peer = { serviceId: target.serviceId, origin: target.url, ...(target.caFingerprint256 ? { caFingerprint256: target.caFingerprint256 } : {}) };
-        const rpc = await connectCollaborationRpc(this.options.identity, peer);
+        const configuredCa = target.caPath ? readFileSync(resolve(this.options.baseDir || process.cwd(), target.caPath)) : undefined;
+        const rpc = await connectCollaborationRpc(this.options.identity, peer, undefined, undefined, configuredCa);
         let selfRelayToken;
         try {
             const result = await rpc.request({ type: 'self-relay-ticket' });
@@ -151,7 +155,7 @@ export class DesktopSelfRelay {
         }
         if (this.stopped || state.stopped)
             return;
-        const ca = target.caFingerprint256 ? await readPinnedCertificateAuthority(target.url, target.caFingerprint256) : undefined;
+        const ca = target.caFingerprint256 ? await readPinnedCertificateAuthority(target.url, target.caFingerprint256) : configuredCa;
         const upstream = await openSocket(relayEndpoint(target.url, selfRelayToken), ca);
         state.upstream = upstream;
         try {

package/dist/server/federation/streamLimits.js

@@ -3,3 +3,8 @@
 export const MAX_ACTIVE_HTTP_REQUESTS = 8;
 export const MAX_SERVER_HTTP_REQUESTS = 32;
 export const MAX_OPEN_SECURE_SOCKETS = 128;
+// Relay selection must finish before foreground/background clients abandon the
+// transport, leaving time for the final pinned Noise handshake.
+export const RELAY_PROVIDER_CONNECT_TIMEOUT_MS = 10_000;
+export const RELAY_ROUTE_OPEN_TIMEOUT_MS = 15_000;
+export const RELAY_CLIENT_CONNECT_TIMEOUT_MS = 20_000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.4.330",
+  "version": "1.4.332",
   "description": "A complete web-based terminal application with modern UI",
   "type": "module",
   "main": ".desktop-dist/main.js",

package/runtime-manifest.json

@@ -1,13 +1,13 @@
 {
   "schemaVersion": 1,
   "packageName": "termdock",
-  "version": "1.4.330",
+  "version": "1.4.332",
   "runtimeProtocolVersion": 1,
   "minimumDesktopVersion": "1.4.46",
   "nodeMajor": 22,
   "dependencyHash": "sha256-oaGYi/P5ob8sd6VnNBOwshKozjhdV+hYiCmLAsn5x00=",
-  "serverBundleHash": "sha256-R3DBIQv0z+SBN+LCWHRsFbWHqQ92u8mBkCkfn1MJdok=",
-  "clientBundleHash": "sha256-MLNBIgsbEuR7PI6Npn9Zt4OyvUR6y5f88Gic0erRCvE=",
+  "serverBundleHash": "sha256-lmN7Or7gUKZy9ehDwSJ+vAJQSDcbNpEVqSGxxotR2c4=",
+  "clientBundleHash": "sha256-tvY+AzsMFBHQkZySF87ojAlWXBRrkv6IZIUGHJyllaI=",
   "entrypoint": "dist/server/cli.js",
   "clientEntrypoint": "dist/client/index.html"
 }

package/scripts/generate-font-subsets.py

@@ -7,6 +7,7 @@ Keep cmap coverage and advance widths exactly equal to the source faces.
 """
 from __future__ import annotations
 
+import argparse
 import hashlib
 import io
 import json
@@ -18,6 +19,12 @@ from fontTools.ttLib import TTFont
 ROOT = Path(__file__).resolve().parents[1]
 FONTS = ROOT / "public/fonts"
 OUTPUT = FONTS / "terminal"
+FAMILY_SOURCES = [
+    ("Termdock Prompt Icons", [f"JetBrainsMonoNLNerdFontMono-{w}" for w in ["Regular", "Bold"]]),
+    ("Termdock Maple", [f"MapleMono-{w}" for w in ["Regular", "Bold", "Italic", "BoldItalic"]]),
+    ("Termdock Mono", [f"JetBrainsMonoNLNerdFontMono-{w}" for w in ["Regular", "Bold", "Italic", "BoldItalic"]]),
+    ("Noto Sans Mono CJK SC", ["NotoSansMonoCJKsc-Subset", "NotoSansMonoCJKsc-Bold-Subset"]),
+]
 
 
 def ranges(points: list[int]) -> str:
@@ -30,22 +37,44 @@ def ranges(points: list[int]) -> str:
     return ",".join(f"U+{a:X}" if a == b else f"U+{a:X}-{b:X}" for a, b in spans)
 
 
-def main() -> None:
+def main(families: list[str] | None = None) -> None:
     OUTPUT.mkdir(exist_ok=True)
     css: list[str] = ["/* Generated by scripts/generate-font-subsets.py; do not edit. */"]
     manifest: dict[str, object] = {"schemaVersion": 1, "faces": []}
     expected: set[str] = set()
-    for family, stems in [
-        ("Termdock Mono", [f"JetBrainsMonoNLNerdFontMono-{w}" for w in ["Regular", "Bold", "Italic", "BoldItalic"]]),
-        ("Noto Sans Mono CJK SC", ["NotoSansMonoCJKsc-Subset", "NotoSansMonoCJKsc-Bold-Subset"]),
-    ]:
+    if families:
+        previous = json.loads((OUTPUT / "manifest.json").read_text())
+        def stored_family(face: dict) -> str:
+            return face.get("family") or ("Termdock Maple" if face["source"].startswith("MapleMono-")
+                                          else "Termdock Mono" if face["source"].startswith("JetBrainsMono")
+                                          else "Noto Sans Mono CJK SC")
+        manifest["faces"] = [face for face in previous["faces"] if stored_family(face) not in families]
+        expected.update(shard["file"] for face in manifest["faces"] for shard in face["shards"])
+        replaced_families = set(families)
+        if "Termdock Maple" in replaced_families:
+            replaced_families.add("Maple Mono")
+        css.extend(line for line in (ROOT / "src/lib/terminal/fontFaces.css").read_text().splitlines()
+                   if line.startswith("@font-face") and not any(f'font-family:"{family}";' in line for family in replaced_families))
+    for family, stems in FAMILY_SOURCES:
+        if families and family not in families:
+            continue
         for stem in stems:
             source = FONTS / f"{stem}.woff2"
             original = TTFont(source)
             cmap = original.getBestCmap()
+            if family == "Termdock Prompt Icons":
+                spec = json.loads((ROOT / "tools/font/terminal-prompt-icons.json").read_text())
+                selected = {int(point, 16) for point in spec["codepoints"]}
+                for start, end in spec["ranges"]:
+                    selected.update(range(int(start, 16), int(end, 16) + 1))
+                cmap = {cp: glyph for cp, glyph in cmap.items() if cp in selected}
             groups: dict[str, list[int]] = {}
             for cp in sorted(cmap):
-                if family == "Termdock Mono":
+                if family == "Termdock Prompt Icons":
+                    key = "icons"
+                elif family == "Termdock Maple":
+                    key = "ascii" if cp == 0xD or 0x20 <= cp <= 0x7E else "text"
+                elif family == "Termdock Mono":
                     key = f"icons-{cp // 1024:x}" if 0xE000 <= cp <= 0xF8FF or 0xF0000 <= cp <= 0x10FFFF else "text"
                 else:
                     key = f"cjk-{cp // 256:x}" if 0x3400 <= cp <= 0x9FFF else "punctuation"
@@ -58,10 +87,30 @@ def main() -> None:
                 subsetter = subset.Subsetter(options=options)
                 subsetter.populate(unicodes=points)
                 subsetter.subset(font)
+                if family == "Termdock Maple":
+                    # Maple Mono is an OFL reserved name. Our web subsets keep
+                    # its glyphs/metrics but carry their own derivative name.
+                    for record in font["name"].names:
+                        if record.nameID not in (1, 3, 4, 6, 16):
+                            continue
+                        value = record.toUnicode()
+                        renamed = value.replace("Maple Mono", "Termdock Maple").replace("MapleMono", "TermdockMaple")
+                        if renamed != value:
+                            record.string = renamed.encode(record.getEncoding())
+                if family == "Termdock Prompt Icons":
+                    suffix = "Bold" if "Bold" in stem else "Regular"
+                    names = {1: family, 16: family, 3: f"TermdockPromptIcons-{suffix}",
+                             4: f"{family} {suffix}", 6: f"TermdockPromptIcons-{suffix}"}
+                    for record in font["name"].names:
+                        if record.nameID in names:
+                            record.string = names[record.nameID].encode(record.getEncoding())
                 buffer = io.BytesIO()
                 font.save(buffer)
                 body = buffer.getvalue()
-                name = f"{stem}-{key}-{hashlib.sha256(body).hexdigest()[:12]}.woff2"
+                output_stem = stem.replace("MapleMono", "TermdockMaple")
+                if family == "Termdock Prompt Icons":
+                    output_stem = stem.replace("JetBrainsMonoNLNerdFontMono", "TermdockPromptIcons")
+                name = f"{output_stem}-{key}-{hashlib.sha256(body).hexdigest()[:12]}.woff2"
                 (OUTPUT / name).write_bytes(body)
                 expected.add(name)
                 # Verify both coverage and metrics rather than trusting the subsetter.
@@ -74,7 +123,10 @@ def main() -> None:
                 style = "italic" if "Italic" in stem else "normal"
                 css.append(f'@font-face{{font-family:"{family}";src:url("/fonts/terminal/{name}") format("woff2");font-weight:{weight};font-style:{style};font-display:swap;unicode-range:{ranges(points)};}}')
                 records.append({"file": name, "bytes": len(body), "codepoints": len(points), "group": key})
-            manifest["faces"].append({"source": source.name, "sourceSha256": hashlib.sha256(source.read_bytes()).hexdigest(), "shards": records})
+            record = {"source": source.name, "sourceSha256": hashlib.sha256(source.read_bytes()).hexdigest(), "shards": records}
+            if family == "Termdock Prompt Icons":
+                record["family"] = family
+            manifest["faces"].append(record)
     # Delete only generated font shards; the full source font pack is untouched.
     for old in OUTPUT.glob("*.woff2"):
         if old.name not in expected:
@@ -85,4 +137,7 @@ def main() -> None:
 
 
 if __name__ == "__main__":
-    main()
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--family", action="append", choices=[family for family, _ in FAMILY_SOURCES],
+                        help="Regenerate only this family, retaining other existing shards and manifest entries.")
+    main(parser.parse_args().family)