@meowpanel/api 0.15.0 → 0.16.0

package/script/src/http.js

@@ -151,6 +151,18 @@ class HttpClient {
             headers: { ...this.defaultHeaders, ...init.headers },
         }, params);
     }
+    /**
+     * Send a request to a URL outside the API, such as a node daemon, through the configured
+     * `fetch` with the current bearer token. Non-2xx responses are returned, not thrown.
+     *
+     * @internal
+     */
+    fetchUrl(url, init = {}) {
+        const headers = new Headers(init.headers);
+        if (this.token)
+            headers.set('Authorization', `Bearer ${this.token}`);
+        return this.fetchImpl(url, { ...init, headers });
+    }
     /**
      * GET and deserialize a JSON response body.
      *
@@ -162,7 +174,8 @@ class HttpClient {
         return res.json();
     }
     /**
-     * POST with an optional JSON body. Returns `undefined` for `204 No Content`.
+     * POST with an optional JSON body. Returns `undefined` for a response without a body, such as
+     * `204 No Content` or a bare `202 Accepted`.
      *
      * @param path Path relative to the API base URL.
      * @param body Request body, serialized as JSON.
@@ -170,12 +183,10 @@ class HttpClient {
      */
     async post(path, body, opts = {}) {
         const res = await this.fetch(path, { method: 'POST', body: body !== undefined ? JSON.stringify(body) : undefined, signal: opts.signal }, opts.params);
-        if (res.status === 204)
-            return undefined;
-        return res.json();
+        return readBody(res);
     }
     /**
-     * PATCH with an optional JSON body. Returns `undefined` for `204 No Content`.
+     * PATCH with an optional JSON body. Returns `undefined` for a response without a body.
      *
      * @param path Path relative to the API base URL.
      * @param body Partial update body, serialized as JSON.
@@ -183,21 +194,17 @@ class HttpClient {
      */
     async patch(path, body, opts = {}) {
         const res = await this.fetch(path, { method: 'PATCH', body: body !== undefined ? JSON.stringify(body) : undefined, signal: opts.signal }, opts.params);
-        if (res.status === 204)
-            return undefined;
-        return res.json();
+        return readBody(res);
     }
     /**
-     * DELETE a resource. Returns `undefined` for `204 No Content`, otherwise the parsed body.
+     * DELETE a resource. Returns `undefined` for a response without a body, otherwise the parsed body.
      *
      * @param path Path relative to the API base URL.
      * @param opts Additional request options.
      */
     async delete(path, opts = {}) {
         const res = await this.fetch(path, { method: 'DELETE', signal: opts.signal }, opts.params);
-        if (res.status === 204)
-            return undefined;
-        return res.json();
+        return readBody(res);
     }
     /**
      * PUT raw body content (e.g. for binary or multipart uploads).
@@ -217,9 +224,7 @@ class HttpClient {
             headers,
             signal: opts.signal,
         }, opts.params);
-        if (res.status === 204)
-            return undefined;
-        return res.json();
+        return readBody(res);
     }
     /**
      * GET a paginated list, parsing the `Content-Range` header for metadata when available.
@@ -255,3 +260,8 @@ class HttpClient {
     }
 }
 exports.HttpClient = HttpClient;
+/** The JSON body of a response, or `undefined` when it has none. */
+async function readBody(res) {
+    const text = await res.text();
+    return (text === '' ? undefined : JSON.parse(text));
+}

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

@@ -34,7 +34,7 @@ export declare class ActivityJob extends ReactiveResource {
     /** The operation the job performs, e.g. `"server.install"`. */
     readonly kind: string;
     /** Current job status. */
-    status: 'in_progress' | 'completed' | 'failed';
+    status: 'in_progress' | 'completed' | 'failed' | 'canceled';
     /** Completion percentage (0-100), or `null` if the job reports none. */
     progress: number | null;
     /** Latest status line, or `null` if the job reports none. */
@@ -67,6 +67,12 @@ export declare class ActivityJob extends ReactiveResource {
 export declare class ActivityLog extends ReactiveResource {
     /** The activity log entry's unique NanoID. */
     readonly id: NanoID;
+    /**
+     * The id the node daemon gave an entry it reported, which a console entry points at as its
+     * `activityId`. `null` for an entry the API recorded, and `undefined` unless the request asked
+     * for the `node_entry_id` include.
+     */
+    readonly nodeEntryId: string | null | undefined;
     /** The event type identifier, e.g. `"server.power.start"`. */
     event: string;
     /** NanoID of the server this activity is associated with, if any. */
@@ -124,7 +130,16 @@ export interface ActivityFeedOptions {
     nodeId?: NanoID;
     /** Filter by host. */
     hostId?: NanoID;
+    /** Only the entries the node daemon reported with these ids. */
+    nodeEntryIds?: readonly string[];
+    /** Related records to embed in each entry. */
+    include?: readonly ActivityInclude[];
 }
+/**
+ * Extra data an activity entry can carry: `issuer` and `subject` fill those users, `job` the job,
+ * and `node_entry_id` the id the node daemon gave the entry.
+ */
+export type ActivityInclude = 'issuer' | 'subject' | 'job' | 'node_entry_id';
 /** Query options for a single server's activity feed. */
 export interface ServerActivityFeedOptions extends ActivityFeedOptions {
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"activity.d.ts","sourceRoot":"","sources":["../../../../src/src/resources/servers/activity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAErE,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAEjH;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,wBAAwB,CAAC;AAE5D;;GAEG;AACH,qBAAa,cAAc;IAC1B,8DAA8D;IAC9D,SAAgB,KAAK,EAAE,MAAM,CAAC;IAC9B,gDAAgD;IAChD,SAAgB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClD,uCAAuC;IACvC,SAAgB,SAAS,EAAE,IAAI,CAAC;IAEhC,gBAAgB;gBACG,IAAI,EAAE,kBAAkB;CAK3C;AAED;;;;;GAKG;AACH,qBAAa,WAAY,SAAQ,gBAAgB;IAChD,+BAA+B;IAC/B,SAAgB,EAAE,EAAE,MAAM,CAAC;IAC3B,+DAA+D;IAC/D,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,0BAA0B;IACnB,MAAM,EAAE,aAAa,GAAG,WAAW,GAAG,QAAQ,CAAC;IACtD,wEAAwE;IACjE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,6DAA6D;IACtD,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,uDAAuD;IAChD,SAAS,EAAE,oBAAoB,CAAC;IACvC,iGAAiG;IAC1F,IAAI,EAAE,cAAc,EAAE,CAAC;IAC9B,0EAA0E;IACnE,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IAChC,iCAAiC;IAC1B,SAAS,EAAE,IAAI,CAAC;IACvB,sCAAsC;IAC/B,SAAS,EAAE,IAAI,CAAC;IAEvB,gBAAgB;gBACG,IAAI,EAAE,eAAe;IAcxC,0CAA0C;IAC1C,IAAW,YAAY,IAAI,OAAO,CAEjC;IAED,+CAA+C;IAC/C,IAAW,WAAW,IAAI,OAAO,CAEhC;IAED,8CAA8C;IAC9C,IAAW,QAAQ,IAAI,OAAO,CAE7B;CACD;AAED;;;;;GAKG;AACH,qBAAa,WAAY,SAAQ,gBAAgB;IAChD,8CAA8C;IAC9C,SAAgB,EAAE,EAAE,MAAM,CAAC;IAC3B,8DAA8D;IACvD,KAAK,EAAE,MAAM,CAAC;IACrB,qEAAqE;IAC9D,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,mEAAmE;IAC5D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,2EAA2E;IACpE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,mEAAmE;IAC5D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,oFAAoF;IAC7E,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,yEAAyE;IAClE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,8CAA8C;IACvC,MAAM,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC;IACvC,sFAAsF;IAC/E,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,qCAAqC;IAC9B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,gDAAgD;IACzC,OAAO,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,kEAAkE;IAC3D,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACrC,mFAAmF;IAC5E,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,6DAA6D;IACtD,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,gCAAgC;IACzB,GAAG,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC;IAC3C,mCAAmC;IAC5B,SAAS,EAAE,IAAI,CAAC;IAEvB,gBAAgB;gBACG,IAAI,EAAE,eAAe;CAsBxC;AAED,8CAA8C;AAC9C,MAAM,WAAW,mBAAmB;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,IAAI,CAAC,EAAE,gBAAgB,GAAG,iBAAiB,CAAC;IAC5C,yDAAyD;IACzD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,2BAA2B;IAC3B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,2CAA2C;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,wBAAwB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8BAA8B;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,yDAAyD;AACzD,MAAM,WAAW,yBAA0B,SAAQ,mBAAmB;IACrE;;;;OAIG;IACH,KAAK,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CAC3B;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CACnC,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,mBAAwB,EAC9B,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAM,GAC5C,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAejC;AAED;;;;;;;;;;GAUG;AACH,qBAAa,qBAAqB;IAGhC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAHtB,gBAAgB;gBAEE,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,UAAU;IAGlC;;;;;OAKG;IACI,IAAI,CAAC,IAAI,GAAE,yBAA8B,GAAG,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IASlF;;;;OAIG;IACU,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAK1D;;;;OAIG;IACU,QAAQ,CAAC,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAK9E;;;;OAIG;IACU,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;CAIxD"}
+{"version":3,"file":"activity.d.ts","sourceRoot":"","sources":["../../../../src/src/resources/servers/activity.ts"],"names":[],"mappings":"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"}

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

@@ -87,6 +87,12 @@ exports.ActivityJob = ActivityJob;
 class ActivityLog extends reactive_js_1.ReactiveResource {
     /** The activity log entry's unique NanoID. */
     id;
+    /**
+     * The id the node daemon gave an entry it reported, which a console entry points at as its
+     * `activityId`. `null` for an entry the API recorded, and `undefined` unless the request asked
+     * for the `node_entry_id` include.
+     */
+    nodeEntryId;
     /** The event type identifier, e.g. `"server.power.start"`. */
     event;
     /** NanoID of the server this activity is associated with, if any. */
@@ -123,6 +129,7 @@ class ActivityLog extends reactive_js_1.ReactiveResource {
     constructor(data) {
         super();
         this.id = (0, types_js_1.toNanoID)(data.id);
+        this.nodeEntryId = data.node_entry_id;
         this.event = data.event;
         this.serverId = data.server_id ? (0, types_js_1.toNanoID)(data.server_id) : null;
         this.nodeId = data.node_id ? (0, types_js_1.toNanoID)(data.node_id) : null;
@@ -161,6 +168,8 @@ async function listActivities(http, path, opts = {}, extra = {}) {
         group_id: opts.groupId,
         node_id: opts.nodeId,
         host_id: opts.hostId,
+        node_entry_id: opts.nodeEntryIds?.length ? opts.nodeEntryIds.join(',') : undefined,
+        include: (0, types_js_1.joinIncludes)(opts),
         ...extra,
     };
     const result = await http.list(path, { page: opts.page, perPage: opts.perPage }, params);

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

@@ -1,7 +1,47 @@
+import type { HttpClient } from '../../http.js';
 import { ReactiveResource } from '../../reactive.js';
 import { type SseState } from '../../sse.js';
-import type { NanoID, PowerState } from '../../types.js';
+import type { NanoID, PowerAction, PowerState } from '../../types.js';
 import type { JobStatus } from './jobs.js';
+/** What a {@link ConsoleEntry} records. */
+export type ConsoleEntryKind = 'output' | 'command' | 'power' | 'state' | 'daemon' | 'crash';
+declare const transferStatuses: readonly ["pending", "processing", "canceling", "canceled", "failed", "completed"];
+/** Where a server transfer stands. `canceled`, `failed` and `completed` are final. */
+export type TransferStatus = (typeof transferStatuses)[number];
+/**
+ * One entry of a server's console timeline: a line of output, a command someone sent, a power
+ * action, a state change, a message from the daemon, or a crash.
+ */
+export interface ConsoleEntry {
+    /** Orders the server's entries. Each entry's is higher than the one before it. */
+    seq: number;
+    time: Date;
+    kind: ConsoleEntryKind;
+    /** The line of output, the command sent, or the daemon's message. */
+    text?: string;
+    /** The state a `state` entry moved to. */
+    state?: PowerState;
+    /**
+     * The action of a `power` entry. A power action is recorded twice: as it starts, with the
+     * `running` status, and as it ends.
+     */
+    action?: PowerAction;
+    status?: JobStatus;
+    /** Why a `failed` power action failed. */
+    error?: string;
+    /** The power action's job, on its `power` entries and on the `daemon` messages it printed. */
+    jobId?: string;
+    /**
+     * The auth issuer id of whoever sent a command or power action, as in {@link ServerConnection.viewerIssuerId}.
+     * Missing when the daemon acted on its own.
+     */
+    issuerId?: string;
+    /** The `nodeEntryId` of the activity entry a command or power action produced. */
+    activityId?: string;
+    /** How a crashed process ended. */
+    exitCode?: number;
+    outOfMemory?: boolean;
+}
 /** Real-time resource utilization reported by the node. */
 export interface ServerUtilization {
     /** CPU usage as an absolute percentage (0–100+). */
@@ -47,8 +87,8 @@ export interface BackupCompletedEvent {
 }
 /** Typed events emitted by {@link ServerConnection}. */
 export interface ServerConnectionEvents {
-    /** A line of console output from the server process. */
-    console_output: string;
+    /** A new entry in the server's console timeline. */
+    console_entry: ConsoleEntry;
     /** The server's power state changed. */
     status: PowerState;
     /** New resource utilization stats are available. */
@@ -66,19 +106,14 @@ export interface ServerConnectionEvents {
     install_started: '';
     /** Installation finished. */
     install_completed: '';
-    /**
-     * A line of installation output.
-     * Gated on `server.install.log`, so it never arrives for a viewer who lacks it.
-     */
-    install_output: string;
     /** An out-of-band status message from the daemon. */
     daemon_message: string;
     /** A backup finished; the payload's `id` identifies which one. */
     backup_completed: BackupCompletedEvent;
     /** A backup restore finished. */
     backup_restore_completed: '';
-    /** The transfer status changed. A loose string: the daemon may emit values outside its own enum. */
-    transfer_status: string;
+    /** The transfer status changed. */
+    transfer_status: TransferStatus;
     /**
      * A line of transfer output.
      * Gated on `server.transfer.log`, so it never arrives for a viewer who lacks it.
@@ -90,13 +125,14 @@ export interface ServerConnectionEvents {
 /**
  * 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 open}.
+ * Emits typed events for the console timeline, power state changes, and resource utilization.
+ * Also keeps the console timeline in {@link entries}, starting with the history the node holds,
+ * fetched 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`.
+ * through {@link state} or the `connection_state` event. After a reconnect, or when the daemon
+ * dropped entries for a viewer that fell behind, the missing entries are fetched and appended to
+ * {@link entries} in order, and emitted as `console_entry`.
  *
  * Obtain a connection via `Server.createConnection`.
  *
@@ -109,8 +145,8 @@ export interface ServerConnectionEvents {
  *
  * await conn.open();
  *
- * // Reactive: $conn.output is the full rolling buffer of console lines
- * // Live lines are appended automatically as they arrive over SSE
+ * // Reactive: $conn.entries is the console timeline
+ * // Live entries are appended automatically as they arrive over SSE
  *
  * // Later...
  * conn.close();
@@ -119,11 +155,9 @@ export interface ServerConnectionEvents {
 export declare class ServerConnection extends ReactiveResource {
     private readonly serverId;
     private readonly nodeUrl;
-    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;
+    private readonly http;
+    /** How many entries {@link ServerConnection.entries} keeps, the size of the daemon's timeline. */
+    private static readonly maxEntries;
     /**
      * Whisker sends a keepalive every 20 seconds, so a stream silent for this long is dead even
      * if the socket never closed.
@@ -131,28 +165,32 @@ export declare class ServerConnection extends ReactiveResource {
     private static readonly idleTimeoutMs;
     private readonly listeners;
     private sse?;
-    /** Live console lines held back while the post-reconnect history is merged in. */
-    private pendingOutput?;
+    /** Live entries held back while the post-reconnect history is merged in. */
+    private pendingEntries?;
     /**
-     * Rolling buffer of console output lines, capped at {@link ServerConnection.maxOutputLines}.
+     * The console timeline, oldest first, capped at the daemon's timeline size.
      *
-     * Pre-populated with recent history from the node when {@link open} is called,
-     * then appended to live as `console_output` SSE events arrive.
+     * Starts with the history the node holds when {@link open} is called, then grows as
+     * `console_entry` events arrive.
      *
-     * Use as a reactive store: `$conn.output`.
+     * Use as a reactive store: `$conn.entries`.
      */
-    output: string[];
+    entries: ConsoleEntry[];
     /** @internal */
-    constructor(serverId: NanoID, nodeUrl: string, getToken: () => string);
+    constructor(serverId: NanoID, nodeUrl: string, http: HttpClient);
     /** State of the stream to the daemon. */
     get state(): SseState;
     /** `true` if the SSE connection is currently open. */
     get isConnected(): boolean;
     /**
-     * Fetch console history and open the SSE stream.
+     * The auth issuer id the connection's token belongs to, which is how {@link ConsoleEntry.issuerId}
+     * names the viewer. `undefined` if the token does not say.
+     */
+    get viewerIssuerId(): string | undefined;
+    /**
+     * Fetch the console history and open the SSE stream.
      *
-     * Populates {@link output} with recent history from the node, then begins streaming
-     * live events.
+     * Fills {@link entries} with the history the node holds, then begins streaming live events.
      *
      * Only one stream is maintained at a time.
      *
@@ -179,15 +217,19 @@ export declare class ServerConnection extends ReactiveResource {
     removeAllListeners(): void;
     private fetchHistory;
     /**
-     * Fill in the console lines printed while the stream was down.
+     * Fill in the entries missed while the stream was down, or that the daemon dropped, from the
+     * history. `first` is a live entry that came after the gap.
      *
-     * 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.
+     * Live entries are held back until the history arrives, so the gap comes before them. A
+     * daemon whose newest entry is older than the last one seen has lost its timeline, and its
+     * history is taken as new.
      */
-    private resyncOutput;
-    private appendOutput;
+    private resyncEntries;
+    private get lastSeq();
+    private appendEntry;
     private emit;
     /** Parse and dispatch a raw SSE event to registered handlers. */
     private dispatch;
 }
+export {};
 //# sourceMappingURL=connection.d.ts.map

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":"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"}