@meowpanel/api 0.13.0 → 0.14.0

package/esm/src/sse.js

@@ -1,3 +1,4 @@
+import { TypedEmitter } from './emitter.js';
 /**
  * A generic, `fetch`-based Server-Sent Events client.
  *
@@ -5,9 +6,13 @@
  * header, making it compatible with bearer token auth in all environments
  * (browser, Deno, Node.js).
  *
+ * Like `EventSource`, it reconnects with exponential backoff whenever the stream ends without
+ * {@link disconnect} being called, including a clean close by the server.
+ *
  * @example
  * ```ts ignore
  * const sse = new SseConnection('https://panel.example.com/v1/sse', token);
+ * sse.on('state', (state) => console.log('SSE is', state));
  * sse.connect(
  *   (event, data) => console.log(event, data),
  *   (err) => console.error('SSE error:', err),
@@ -16,18 +21,32 @@
  * sse.disconnect();
  * ```
  */
-export class SseConnection {
+export class SseConnection extends TypedEmitter {
     url;
     token;
     abortController;
+    reconnectTimer;
     _state = 'disconnected';
+    attempt = 0;
+    options;
     /**
-     * @param url   The full URL to connect to.
-     * @param token Bearer token used in the `Authorization` header.
+     * @param url     The full URL to connect to.
+     * @param token   Bearer token used in the `Authorization` header, or a function returning the
+     *                current one. A function is read on every attempt, so reconnects pick up a
+     *                refreshed token.
+     * @param options Reconnect and idle-timeout behavior.
      */
-    constructor(url, token) {
+    constructor(url, token, options = {}) {
+        super();
         this.url = url;
         this.token = token;
+        this.options = {
+            reconnect: true,
+            minReconnectDelayMs: 1_000,
+            maxReconnectDelayMs: 30_000,
+            idleTimeoutMs: 0,
+            ...options,
+        };
     }
     /** Update the bearer token for subsequent reconnections. */
     updateToken(token) {
@@ -44,60 +63,121 @@ export class SseConnection {
     /**
      * Open the SSE connection and begin streaming events.
      *
-     * This method is **non-blocking**: it starts the connection and returns immediately
-     * after the HTTP response headers are received. Events are delivered asynchronously
-     * via the `onEvent` callback.
+     * This method is **non-blocking**: it starts the connection and returns immediately.
+     * Events are delivered asynchronously via the `onEvent` callback, and state changes via the
+     * `state` event.
      *
      * @param onEvent Callback invoked for each received SSE event, with the event name and raw data string.
-     * @param onError Optional callback invoked if the connection fails or is lost (not called on intentional disconnect).
+     * @param onError Optional callback invoked each time a connection attempt fails or an open stream
+     *                is lost (not called on intentional disconnect). Reconnecting continues unless
+     *                {@link state} is `error`.
      */
     connect(onEvent, onError) {
         this.disconnect();
-        this._state = 'connecting';
+        this.attempt = 0;
+        this.open(onEvent, onError);
+    }
+    /** Close the SSE connection, cancel any pending reconnect, and stop receiving events. */
+    disconnect() {
+        clearTimeout(this.reconnectTimer);
+        this.reconnectTimer = undefined;
+        this.abortController?.abort();
+        this.abortController = undefined;
+        this.setState('disconnected');
+    }
+    open(onEvent, onError) {
+        this.setState(this.attempt === 0 ? 'connecting' : 'reconnecting');
         const controller = new AbortController();
         this.abortController = controller;
         (async () => {
+            const { idleTimeoutMs } = this.options;
+            let idleTimer;
+            let idledOut = false;
+            const resetIdleTimer = () => {
+                if (!idleTimeoutMs)
+                    return;
+                clearTimeout(idleTimer);
+                idleTimer = setTimeout(() => {
+                    idledOut = true;
+                    controller.abort();
+                }, idleTimeoutMs);
+            };
+            let retry = true;
+            let error;
             try {
+                resetIdleTimer();
+                const token = typeof this.token === 'function' ? this.token() : this.token;
                 const response = await globalThis.fetch(this.url, {
                     headers: {
-                        'Authorization': `Bearer ${this.token}`,
+                        'Authorization': `Bearer ${token}`,
                         'Accept': 'text/event-stream',
                         'Cache-Control': 'no-cache',
                     },
                     signal: controller.signal,
                 });
-                // Guard against a concurrent connect() that replaced our controller.
-                if (this.abortController !== controller)
-                    return;
                 if (!response.ok || !response.body) {
+                    await response.body?.cancel();
+                    retry = response.ok || SseConnection.isRetryableStatus(response.status);
                     throw new Error(`SSE connection failed: HTTP ${response.status}`);
                 }
-                this._state = 'connected';
-                await this.readStream(response.body, onEvent);
+                this.attempt = 0;
+                this.setState('connected');
+                await this.readStream(response.body, onEvent, resetIdleTimer);
+                error = new Error('SSE stream closed by the server');
             }
             catch (err) {
-                if (err.name !== 'AbortError') {
-                    // Only update state if this is still the active connection.
-                    if (this.abortController !== controller)
-                        return;
-                    this._state = 'error';
-                    onError?.(err instanceof Error ? err : new Error(String(err)));
-                    return;
-                }
+                error = idledOut
+                    ? new Error(`SSE stream received nothing for ${idleTimeoutMs}ms`)
+                    : err instanceof Error
+                        ? err
+                        : new Error(String(err));
             }
-            if (this.abortController === controller) {
-                this._state = 'disconnected';
+            finally {
+                clearTimeout(idleTimer);
             }
+            // disconnect() or a newer connect() replaced this attempt, so it ends silently.
+            if (this.abortController !== controller)
+                return;
+            onError?.(error);
+            if (this.abortController !== controller)
+                return;
+            if (!retry || !this.options.reconnect) {
+                this.abortController = undefined;
+                this.setState('error');
+                return;
+            }
+            this.setState('reconnecting');
+            this.reconnectTimer = setTimeout(() => {
+                this.reconnectTimer = undefined;
+                this.open(onEvent, onError);
+            }, this.nextReconnectDelay());
         })();
     }
-    /** Close the SSE connection and stop receiving events. */
-    disconnect() {
-        this.abortController?.abort();
-        this.abortController = undefined;
-        this._state = 'disconnected';
+    /**
+     * Exponential backoff with jitter, so clients that lost the same server do not all retry at
+     * the same instant when it comes back.
+     */
+    nextReconnectDelay() {
+        const { minReconnectDelayMs, maxReconnectDelayMs } = this.options;
+        const base = Math.min(maxReconnectDelayMs, minReconnectDelayMs * 2 ** this.attempt);
+        this.attempt++;
+        return base / 2 + Math.random() * (base / 2);
+    }
+    /**
+     * 401 is retryable because the token is re-read on every attempt and may have been refreshed
+     * in the meantime. Other client errors (403, 404, ...) will not change on their own.
+     */
+    static isRetryableStatus(status) {
+        return status >= 500 || status === 401 || status === 408 || status === 429;
+    }
+    setState(state) {
+        if (this._state === state)
+            return;
+        this._state = state;
+        this.emit('state', state);
     }
     /** Parse the raw `ReadableStream` body into SSE frames, calling `onEvent` for each complete frame. */
-    async readStream(body, onEvent) {
+    async readStream(body, onEvent, onChunk) {
         const reader = body.getReader();
         const decoder = new TextDecoder();
         let buffer = '';
@@ -108,6 +188,7 @@ export class SseConnection {
                 const { done, value } = await reader.read();
                 if (done)
                     break;
+                onChunk();
                 buffer += decoder.decode(value, { stream: true });
                 const lines = buffer.split('\n');
                 buffer = lines.pop() ?? '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meowpanel/api",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "MeowPanel API client library",
   "license": "MIT",
   "main": "./script/mod.js",

package/script/mod.d.ts

@@ -54,7 +54,7 @@ export type { HttpClientOptions, HttpLogCode, HttpLogEvent, HttpLogger, HttpRequ
 export { TypedEmitter } from './src/emitter.js';
 export type { EventHandler } from './src/emitter.js';
 export { SseConnection } from './src/sse.js';
-export type { SseState } from './src/sse.js';
+export type { SseConnectionEvents, SseOptions, SseState } from './src/sse.js';
 export { joinIncludes, parseIssuerRef, toNanoID } from './src/types.js';
 export type { DeletedListOptions, DeletedVisibility, IncludeOptions, ISODate, IssuerRef, ListOptions, NanoID, Paginated, ParsedIssuer, PowerAction, PowerState, ResourceColor, ResourceWith, ServerRestrictedState, SftpPermission, UnionToIntersection, } from './src/types.js';
 export { Account, AccountResource, AccountSshKeysManager, ApiKeyAccount, SshKey, UserAccount, } from './src/resources/account.js';

package/script/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"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"}

package/script/src/resources/servers/connection.d.ts

@@ -1,4 +1,5 @@
 import { ReactiveResource } from '../../reactive.js';
+import { type SseState } from '../../sse.js';
 import type { NanoID, PowerState } from '../../types.js';
 import type { JobStatus } from './jobs.js';
 /** Real-time resource utilization reported by the node. */
@@ -83,13 +84,19 @@ export interface ServerConnectionEvents {
      * Gated on `server.transfer.log`, so it never arrives for a viewer who lacks it.
      */
     transfer_logs: string;
+    /** The stream to the daemon changed state. Emitted locally by the client, not by the daemon. */
+    connection_state: SseState;
 }
 /**
  * A real-time SSE connection to a specific server on its Whisker node daemon.
  *
  * Emits typed events for console output, power state changes, and resource utilization.
  * Also maintains a rolling buffer of console output lines in {@link output}, pre-populated
- * with recent history fetched from the node on {@link connect}.
+ * with recent history fetched from the node on {@link open}.
+ *
+ * The stream reconnects on its own after the daemon restarts or the network drops. Track it
+ * through {@link state} or the `connection_state` event. After a reconnect, console lines the
+ * daemon still holds from the gap are appended to {@link output} and emitted as `console_output`.
  *
  * Obtain a connection via `Server.createConnection`.
  *
@@ -112,12 +119,20 @@ export interface ServerConnectionEvents {
 export declare class ServerConnection extends ReactiveResource {
     private readonly serverId;
     private readonly nodeUrl;
-    private readonly token;
+    private readonly getToken;
     /** Maximum number of console output lines retained in {@link ServerConnection.output}. */
     private static readonly maxOutputLines;
+    /** Console history lines fetched from the node on open and after each reconnect. */
+    private static readonly historyLines;
+    /**
+     * Whisker sends a keepalive every 20 seconds, so a stream silent for this long is dead even
+     * if the socket never closed.
+     */
+    private static readonly idleTimeoutMs;
     private readonly listeners;
     private sse?;
-    private connected;
+    /** Live console lines held back while the post-reconnect history is merged in. */
+    private pendingOutput?;
     /**
      * Rolling buffer of console output lines, capped at {@link ServerConnection.maxOutputLines}.
      *
@@ -128,7 +143,9 @@ export declare class ServerConnection extends ReactiveResource {
      */
     output: string[];
     /** @internal */
-    constructor(serverId: NanoID, nodeUrl: string, token: string);
+    constructor(serverId: NanoID, nodeUrl: string, getToken: () => string);
+    /** State of the stream to the daemon. */
+    get state(): SseState;
     /** `true` if the SSE connection is currently open. */
     get isConnected(): boolean;
     /**
@@ -139,7 +156,7 @@ export declare class ServerConnection extends ReactiveResource {
      *
      * Only one stream is maintained at a time.
      *
-     * @param onError Optional callback invoked if the connection drops unexpectedly.
+     * @param onError Optional callback invoked each time the stream drops or a connection attempt fails.
      */
     open(onError?: (error: Error) => void): Promise<void>;
     /** Close the SSE stream and stop receiving events. */
@@ -160,6 +177,16 @@ export declare class ServerConnection extends ReactiveResource {
     off<K extends keyof ServerConnectionEvents>(event: K, handler: (payload: ServerConnectionEvents[K]) => void): void;
     /** Remove all event handlers for all event types. */
     removeAllListeners(): void;
+    private fetchHistory;
+    /**
+     * Fill in the console lines printed while the stream was down.
+     *
+     * Live lines are held back until the history arrives, because the history snapshot may
+     * already contain them. Lines that fell out of the daemon's history window are lost.
+     */
+    private resyncOutput;
+    private appendOutput;
+    private emit;
     /** Parse and dispatch a raw SSE event to registered handlers. */
     private dispatch;
 }

package/script/src/resources/servers/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../src/src/resources/servers/connection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../src/src/resources/servers/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAiB,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,2DAA2D;AAC3D,MAAM,WAAW,iBAAiB;IACjC,oDAAoD;IACpD,WAAW,EAAE,MAAM,CAAC;IACpB,0BAA0B;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,0BAA0B;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,8BAA8B;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,0DAA0D;IAC1D,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sDAAsD;IACtD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,uBAAuB,EAAE,MAAM,CAAC;IAChC,uBAAuB,EAAE,MAAM,CAAC;IAChC,qCAAqC;IACrC,QAAQ,EAAE,MAAM,CAAC;CACjB;AAED,qFAAqF;AACrF,MAAM,WAAW,gBAAgB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,iDAAiD;AACjD,MAAM,WAAW,WAAW;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,gDAAgD;AAChD,MAAM,WAAW,oBAAoB;IACpC,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CACjB;AAED,wDAAwD;AACxD,MAAM,WAAW,sBAAsB;IACtC,wDAAwD;IACxD,cAAc,EAAE,MAAM,CAAC;IACvB,wCAAwC;IACxC,MAAM,EAAE,UAAU,CAAC;IACnB,oDAAoD;IACpD,KAAK,EAAE,iBAAiB,CAAC;IACzB,oEAAoE;IACpE,YAAY,EAAE,gBAAgB,CAAC;IAC/B;;;OAGG;IACH,OAAO,EAAE,WAAW,CAAC;IACrB,oGAAoG;IACpG,OAAO,EAAE,IAAI,CAAC;IACd,4BAA4B;IAC5B,eAAe,EAAE,EAAE,CAAC;IACpB,6BAA6B;IAC7B,iBAAiB,EAAE,EAAE,CAAC;IACtB;;;OAGG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,qDAAqD;IACrD,cAAc,EAAE,MAAM,CAAC;IACvB,oEAAoE;IACpE,gBAAgB,EAAE,oBAAoB,CAAC;IACvC,iCAAiC;IACjC,wBAAwB,EAAE,EAAE,CAAC;IAC7B,oGAAoG;IACpG,eAAe,EAAE,MAAM,CAAC;IACxB;;;OAGG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB,gGAAgG;IAChG,gBAAgB,EAAE,QAAQ,CAAC;CAC3B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,qBAAa,gBAAiB,SAAQ,gBAAgB;IAmCpD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IApC1B,0FAA0F;IAC1F,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAQ;IAE9C,oFAAoF;IACpF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAO;IAE3C;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAU;IAE/C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAGtB;IAEJ,OAAO,CAAC,GAAG,CAAC,CAAgB;IAE5B,kFAAkF;IAClF,OAAO,CAAC,aAAa,CAAC,CAAW;IAEjC;;;;;;;OAOG;IACI,MAAM,EAAE,MAAM,EAAE,CAAM;IAE7B,gBAAgB;gBAEE,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,MAAM;IAKxC,yCAAyC;IACzC,IAAW,KAAK,IAAI,QAAQ,CAE3B;IAED,sDAAsD;IACtD,IAAW,WAAW,IAAI,OAAO,CAEhC;IAED;;;;;;;;;OASG;IACU,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBlE,sDAAsD;IAC/C,KAAK,IAAI,IAAI;IAQpB;;;;;OAKG;IACI,EAAE,CAAC,CAAC,SAAS,MAAM,sBAAsB,EAC/C,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC,KAAK,IAAI,GACnD,IAAI;IAWP;;;;;OAKG;IACI,GAAG,CAAC,CAAC,SAAS,MAAM,sBAAsB,EAChD,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC,KAAK,IAAI,GACnD,IAAI;IAUP,qDAAqD;IAC9C,kBAAkB,IAAI,IAAI;YAInB,YAAY;IAc1B;;;;;OAKG;YACW,YAAY;IAY1B,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,IAAI;IAIZ,iEAAiE;IACjE,OAAO,CAAC,QAAQ;CA0GhB"}

package/script/src/resources/servers/connection.js

@@ -8,7 +8,11 @@ const sse_js_1 = require("../../sse.js");
  *
  * Emits typed events for console output, power state changes, and resource utilization.
  * Also maintains a rolling buffer of console output lines in {@link output}, pre-populated
- * with recent history fetched from the node on {@link connect}.
+ * with recent history fetched from the node on {@link open}.
+ *
+ * The stream reconnects on its own after the daemon restarts or the network drops. Track it
+ * through {@link state} or the `connection_state` event. After a reconnect, console lines the
+ * daemon still holds from the gap are appended to {@link output} and emitted as `console_output`.
  *
  * Obtain a connection via `Server.createConnection`.
  *
@@ -31,12 +35,20 @@ const sse_js_1 = require("../../sse.js");
 class ServerConnection extends reactive_js_1.ReactiveResource {
     serverId;
     nodeUrl;
-    token;
+    getToken;
     /** Maximum number of console output lines retained in {@link ServerConnection.output}. */
     static maxOutputLines = 1024;
+    /** Console history lines fetched from the node on open and after each reconnect. */
+    static historyLines = 100;
+    /**
+     * Whisker sends a keepalive every 20 seconds, so a stream silent for this long is dead even
+     * if the socket never closed.
+     */
+    static idleTimeoutMs = 45_000;
     listeners = new Map();
     sse;
-    connected = false;
+    /** Live console lines held back while the post-reconnect history is merged in. */
+    pendingOutput;
     /**
      * Rolling buffer of console output lines, capped at {@link ServerConnection.maxOutputLines}.
      *
@@ -47,15 +59,19 @@ class ServerConnection extends reactive_js_1.ReactiveResource {
      */
     output = [];
     /** @internal */
-    constructor(serverId, nodeUrl, token) {
+    constructor(serverId, nodeUrl, getToken) {
         super();
         this.serverId = serverId;
         this.nodeUrl = nodeUrl;
-        this.token = token;
+        this.getToken = getToken;
+    }
+    /** State of the stream to the daemon. */
+    get state() {
+        return this.sse?.state ?? 'disconnected';
     }
     /** `true` if the SSE connection is currently open. */
     get isConnected() {
-        return this.connected;
+        return this.state === 'connected';
     }
     /**
      * Fetch console history and open the SSE stream.
@@ -65,36 +81,35 @@ class ServerConnection extends reactive_js_1.ReactiveResource {
      *
      * Only one stream is maintained at a time.
      *
-     * @param onError Optional callback invoked if the connection drops unexpectedly.
+     * @param onError Optional callback invoked each time the stream drops or a connection attempt fails.
      */
     async open(onError) {
-        this.sse?.disconnect(); // close any existing stream
-        try {
-            const res = await fetch(`${this.nodeUrl}/api/servers/${this.serverId}/logs?size=100`, { headers: { Authorization: `Bearer ${this.token}` } });
-            if (res.ok) {
-                const json = (await res.json());
-                this.output = json.data ?? [];
-                this.notify();
-            }
-        }
-        catch {
-            // History is best-effort - don't block the SSE connection
+        this.close();
+        const history = await this.fetchHistory();
+        if (history) {
+            this.output = history;
+            this.notify();
         }
         const url = `${this.nodeUrl}/api/servers/${this.serverId}/sse`;
-        this.sse = new sse_js_1.SseConnection(url, this.token);
-        this.connected = true;
-        this.sse.connect((event, data) => {
-            this.dispatch(event, data);
-        }, (err) => {
-            this.connected = false;
+        const sse = new sse_js_1.SseConnection(url, this.getToken, { idleTimeoutMs: ServerConnection.idleTimeoutMs });
+        this.sse = sse;
+        let previous = sse.state;
+        sse.on('state', (state) => {
+            if (state === 'connected' && previous === 'reconnecting')
+                this.resyncOutput(sse);
+            previous = state;
             this.notify();
-            onError?.(err);
+            this.emit('connection_state', state);
         });
+        sse.connect((event, data) => this.dispatch(event, data), onError);
     }
     /** Close the SSE stream and stop receiving events. */
     close() {
-        this.sse?.disconnect();
-        this.connected = false;
+        const sse = this.sse;
+        this.sse = undefined;
+        this.pendingOutput = undefined;
+        sse?.disconnect();
+        sse?.removeAllListeners();
     }
     /**
      * Register a handler for a typed server event.
@@ -124,6 +139,47 @@ class ServerConnection extends reactive_js_1.ReactiveResource {
     removeAllListeners() {
         this.listeners.clear();
     }
+    async fetchHistory() {
+        try {
+            const res = await fetch(`${this.nodeUrl}/api/servers/${this.serverId}/logs?size=${ServerConnection.historyLines}`, { headers: { Authorization: `Bearer ${this.getToken()}` } });
+            if (!res.ok)
+                return undefined;
+            const json = (await res.json());
+            return json.data ?? [];
+        }
+        catch {
+            return undefined;
+        }
+    }
+    /**
+     * Fill in the console lines printed while the stream was down.
+     *
+     * Live lines are held back until the history arrives, because the history snapshot may
+     * already contain them. Lines that fell out of the daemon's history window are lost.
+     */
+    async resyncOutput(sse) {
+        const pending = [];
+        this.pendingOutput = pending;
+        const history = await this.fetchHistory();
+        if (this.sse !== sse || this.pendingOutput !== pending)
+            return;
+        this.pendingOutput = undefined;
+        const missed = history ? history.slice(overlapLength(this.output, history)) : [];
+        const live = history ? pending.slice(overlapLength(history, pending)) : pending;
+        for (const line of [...missed, ...live])
+            this.appendOutput(line);
+    }
+    appendOutput(line) {
+        this.output.push(line);
+        if (this.output.length > ServerConnection.maxOutputLines) {
+            this.output.shift();
+        }
+        this.notify();
+        this.emit('console_output', line);
+    }
+    emit(event, payload) {
+        this.listeners.get(event)?.forEach((h) => h(payload));
+    }
     /** Parse and dispatch a raw SSE event to registered handlers. */
     dispatch(rawEvent, rawData) {
         // backup_completed is emitted per backup as `backup_completed:<id>`; the id is also in
@@ -139,11 +195,6 @@ class ServerConnection extends reactive_js_1.ReactiveResource {
                     if (typeof parsed !== 'string')
                         return;
                     payload = parsed;
-                    this.output.push(payload);
-                    if (this.output.length > ServerConnection.maxOutputLines) {
-                        this.output.shift();
-                    }
-                    this.notify();
                     break;
                 }
                 case 'status': {
@@ -231,8 +282,30 @@ class ServerConnection extends reactive_js_1.ReactiveResource {
         catch {
             return;
         }
-        const handlers = this.listeners.get(event);
-        handlers?.forEach((h) => h(payload));
+        if (event === 'console_output') {
+            const line = payload;
+            if (this.pendingOutput)
+                this.pendingOutput.push(line);
+            else
+                this.appendOutput(line);
+            return;
+        }
+        this.emit(event, payload);
     }
 }
 exports.ServerConnection = ServerConnection;
+/** Length of the longest suffix of `head` that is also a prefix of `tail`. */
+function overlapLength(head, tail) {
+    for (let k = Math.min(head.length, tail.length); k > 0; k--) {
+        let match = true;
+        for (let i = 0; i < k; i++) {
+            if (head[head.length - k + i] !== tail[i]) {
+                match = false;
+                break;
+            }
+        }
+        if (match)
+            return k;
+    }
+    return 0;
+}

package/script/src/resources/servers/server.js

@@ -175,7 +175,7 @@ class Server extends reactive_js_1.ReactiveResource {
      */
     async createConnection() {
         const nodeUrl = await this.resolveNodeUrl();
-        return new connection_js_1.ServerConnection(this.id, nodeUrl, this.http.getToken());
+        return new connection_js_1.ServerConnection(this.id, nodeUrl, () => this.http.getToken());
     }
 }
 exports.Server = Server;