@av-pi-studio/server 0.0.10 → 0.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +61 -17
- package/dist/.tsbuildinfo +1 -1
- package/dist/agent/agent-service.d.ts +3 -0
- package/dist/agent/agent-service.d.ts.map +1 -1
- package/dist/agent/agent-service.js +13 -1
- package/dist/agent/agent-service.js.map +1 -1
- package/dist/agent/provider-registry.d.ts.map +1 -1
- package/dist/agent/provider-registry.js +2 -0
- package/dist/agent/provider-registry.js.map +1 -1
- package/dist/agent/providers/pi/agent.d.ts +2 -0
- package/dist/agent/providers/pi/agent.d.ts.map +1 -1
- package/dist/agent/providers/pi/agent.js +3 -0
- package/dist/agent/providers/pi/agent.js.map +1 -1
- package/dist/agent/providers/pi/rpc-transport.d.ts +2 -0
- package/dist/agent/providers/pi/rpc-transport.d.ts.map +1 -1
- package/dist/agent/providers/pi/rpc-transport.js +10 -2
- package/dist/agent/providers/pi/rpc-transport.js.map +1 -1
- package/dist/config/daemon-config.d.ts.map +1 -1
- package/dist/config/daemon-config.js +5 -0
- package/dist/config/daemon-config.js.map +1 -1
- package/dist/daemon/bootstrap.d.ts +8 -0
- package/dist/daemon/bootstrap.d.ts.map +1 -1
- package/dist/daemon/bootstrap.js +55 -13
- package/dist/daemon/bootstrap.js.map +1 -1
- package/dist/daemon/dev-bootstrap.d.ts +4 -0
- package/dist/daemon/dev-bootstrap.d.ts.map +1 -1
- package/dist/daemon/dev-bootstrap.js +8 -3
- package/dist/daemon/dev-bootstrap.js.map +1 -1
- package/dist/daemon/dev-main.js +3 -6
- package/dist/daemon/dev-main.js.map +1 -1
- package/dist/daemon/main.js +8 -7
- package/dist/daemon/main.js.map +1 -1
- package/dist/daemon/relay-transport.d.ts +26 -5
- package/dist/daemon/relay-transport.d.ts.map +1 -1
- package/dist/daemon/relay-transport.js +21 -9
- package/dist/daemon/relay-transport.js.map +1 -1
- package/dist/logging/logger.d.ts +10 -4
- package/dist/logging/logger.d.ts.map +1 -1
- package/dist/logging/logger.js +23 -18
- package/dist/logging/logger.js.map +1 -1
- package/dist/terminal/terminal-manager.d.ts +4 -0
- package/dist/terminal/terminal-manager.d.ts.map +1 -1
- package/dist/terminal/terminal-manager.js +20 -8
- package/dist/terminal/terminal-manager.js.map +1 -1
- package/dist/ws/router.d.ts +8 -0
- package/dist/ws/router.d.ts.map +1 -1
- package/dist/ws/router.js +19 -0
- package/dist/ws/router.js.map +1 -1
- package/dist/ws/ws-server.d.ts +3 -0
- package/dist/ws/ws-server.d.ts.map +1 -1
- package/dist/ws/ws-server.js +15 -2
- package/dist/ws/ws-server.js.map +1 -1
- package/package.json +4 -4
|
@@ -7,11 +7,13 @@ export class TerminalManager {
|
|
|
7
7
|
snapshotBytes;
|
|
8
8
|
defaultShell;
|
|
9
9
|
terminals = new Map();
|
|
10
|
+
logger;
|
|
10
11
|
nextSlot = 1;
|
|
11
12
|
constructor(options = {}) {
|
|
12
13
|
this.backend = options.backend ?? createDefaultPtyBackend();
|
|
13
14
|
this.coalesceMs = options.coalesceMs ?? 4;
|
|
14
15
|
this.snapshotBytes = options.snapshotBytes ?? 64 * 1024;
|
|
16
|
+
this.logger = options.logger;
|
|
15
17
|
this.defaultShell = resolveExecutable(options.defaultShell ?? process.env.SHELL ?? "/bin/sh");
|
|
16
18
|
}
|
|
17
19
|
/** All live terminal runtime entries. */
|
|
@@ -27,14 +29,22 @@ export class TerminalManager {
|
|
|
27
29
|
const cols = options.cols ?? 80;
|
|
28
30
|
const rows = options.rows ?? 24;
|
|
29
31
|
const shell = options.shell ?? this.defaultShell;
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
32
|
+
let pty;
|
|
33
|
+
try {
|
|
34
|
+
pty = this.backend.spawn({
|
|
35
|
+
shell,
|
|
36
|
+
args: options.args,
|
|
37
|
+
cwd: options.cwd,
|
|
38
|
+
env: options.env,
|
|
39
|
+
cols,
|
|
40
|
+
rows,
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
catch (error) {
|
|
44
|
+
this.logger?.error({ slot, workspaceId: options.workspaceId, shell, cwd: options.cwd, err: error?.message ?? String(error) }, "terminal spawn failed");
|
|
45
|
+
throw error;
|
|
46
|
+
}
|
|
47
|
+
this.logger?.info({ slot, workspaceId: options.workspaceId, shell, cwd: options.cwd, cols, rows, service: options.service === true ? true : undefined }, "terminal opened");
|
|
38
48
|
const entry = {
|
|
39
49
|
slot,
|
|
40
50
|
workspaceId: options.workspaceId,
|
|
@@ -116,6 +126,7 @@ export class TerminalManager {
|
|
|
116
126
|
const managed = this.terminals.get(slot);
|
|
117
127
|
if (!managed)
|
|
118
128
|
return false;
|
|
129
|
+
this.logger?.info({ slot, workspaceId: managed.entry.workspaceId }, "terminal kill requested");
|
|
119
130
|
managed.pty.kill();
|
|
120
131
|
this.onExit(managed);
|
|
121
132
|
return true;
|
|
@@ -150,6 +161,7 @@ export class TerminalManager {
|
|
|
150
161
|
this.flush(managed);
|
|
151
162
|
}
|
|
152
163
|
managed.entry.closed = true;
|
|
164
|
+
this.logger?.info({ slot: managed.entry.slot, workspaceId: managed.entry.workspaceId }, "terminal exited");
|
|
153
165
|
managed.screenModel.dispose();
|
|
154
166
|
this.terminals.delete(managed.entry.slot);
|
|
155
167
|
// Notify subscribers the terminal closed (empty Output then drop). Clients treat an exited
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-manager.js","sourceRoot":"","sources":["../../src/terminal/terminal-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal-manager.js","sourceRoot":"","sources":["../../src/terminal/terminal-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/ws/router.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Logger } from "../logging/logger.js";
|
|
1
2
|
import type { Session } from "./session.js";
|
|
2
3
|
/**
|
|
3
4
|
* Frame router + handler registry (architecture/websocket-protocol.md § Behavior, § Error Handling,
|
|
@@ -19,8 +20,15 @@ export type RpcHandler = (ctx: RpcHandlerContext) => unknown | Promise<unknown>;
|
|
|
19
20
|
export type BinaryHandler = (session: Session, bytes: Uint8Array) => void;
|
|
20
21
|
/** Registry of RPC handlers keyed by message type, with legacy flat-name aliases. */
|
|
21
22
|
export declare class HandlerRegistry {
|
|
23
|
+
readonly logger?: Logger | undefined;
|
|
22
24
|
private readonly handlers;
|
|
23
25
|
private readonly aliases;
|
|
26
|
+
/**
|
|
27
|
+
* @param logger Optional operational logger. When present, every dispatched RPC is logged at
|
|
28
|
+
* `debug` (type, requestId, clientId, durationMs) and handler failures at `warn` — one
|
|
29
|
+
* instrumentation point covering the entire RPC surface instead of per-handler logging.
|
|
30
|
+
*/
|
|
31
|
+
constructor(logger?: Logger | undefined);
|
|
24
32
|
/** Register a handler for a canonical (dotted) message type. */
|
|
25
33
|
register(type: string, handler: RpcHandler): this;
|
|
26
34
|
/** Map a legacy flat name to a canonical type so both names resolve to the same handler. */
|
package/dist/ws/router.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/ws/router.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C;;;;;;;;;GASG;AAEH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,gGAAgG;AAChG,MAAM,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE,iBAAiB,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAEhF,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;AAE1E,qFAAqF;AACrF,qBAAa,eAAe;
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/ws/router.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C;;;;;;;;;GASG;AAEH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,gGAAgG;AAChG,MAAM,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE,iBAAiB,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAEhF,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;AAE1E,qFAAqF;AACrF,qBAAa,eAAe;IASd,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM;IARpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiC;IAC1D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6B;IAErD;;;;OAIG;gBACkB,MAAM,CAAC,EAAE,MAAM,YAAA;IAEpC,gEAAgE;IAChE,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI;IAKjD,4FAA4F;IAC5F,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAKrD,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;CAG1C;AA2DD,uDAAuD;AACvD,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,eAAe,GACxB,OAAO,CAAC,IAAI,CAAC,CAmCf;AAED,uGAAuG;AACvG,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,UAAU,EACjB,aAAa,CAAC,EAAE,aAAa,GAC5B,IAAI,CAEN"}
|
package/dist/ws/router.js
CHANGED
|
@@ -1,8 +1,17 @@
|
|
|
1
1
|
import { pongSchema } from "@av-pi-studio/protocol";
|
|
2
2
|
/** Registry of RPC handlers keyed by message type, with legacy flat-name aliases. */
|
|
3
3
|
export class HandlerRegistry {
|
|
4
|
+
logger;
|
|
4
5
|
handlers = new Map();
|
|
5
6
|
aliases = new Map();
|
|
7
|
+
/**
|
|
8
|
+
* @param logger Optional operational logger. When present, every dispatched RPC is logged at
|
|
9
|
+
* `debug` (type, requestId, clientId, durationMs) and handler failures at `warn` — one
|
|
10
|
+
* instrumentation point covering the entire RPC surface instead of per-handler logging.
|
|
11
|
+
*/
|
|
12
|
+
constructor(logger) {
|
|
13
|
+
this.logger = logger;
|
|
14
|
+
}
|
|
6
15
|
/** Register a handler for a canonical (dotted) message type. */
|
|
7
16
|
register(type, handler) {
|
|
8
17
|
this.handlers.set(type, handler);
|
|
@@ -30,10 +39,13 @@ async function dispatchSessionMessage(session, message, registry) {
|
|
|
30
39
|
// Unknown type → rpc_error if it expected a reply, otherwise ignore (handler policy).
|
|
31
40
|
if (requestId)
|
|
32
41
|
sendRpcError(session, requestId, "unknown_message_type", `no handler for ${type}`);
|
|
42
|
+
registry.logger?.debug({ type, requestId, clientId: session.clientId }, "rpc: no handler");
|
|
33
43
|
return;
|
|
34
44
|
}
|
|
45
|
+
const startedAt = Date.now();
|
|
35
46
|
try {
|
|
36
47
|
const result = await handler({ session, message, requestId });
|
|
48
|
+
registry.logger?.debug({ type, requestId, clientId: session.clientId, durationMs: Date.now() - startedAt }, "rpc ok");
|
|
37
49
|
if (result !== undefined) {
|
|
38
50
|
const response = requestId &&
|
|
39
51
|
typeof result === "object" &&
|
|
@@ -46,6 +58,13 @@ async function dispatchSessionMessage(session, message, registry) {
|
|
|
46
58
|
}
|
|
47
59
|
catch (error) {
|
|
48
60
|
// A handler failure (including a timeout) is an operation error, never a dead socket.
|
|
61
|
+
registry.logger?.warn({
|
|
62
|
+
type,
|
|
63
|
+
requestId,
|
|
64
|
+
clientId: session.clientId,
|
|
65
|
+
durationMs: Date.now() - startedAt,
|
|
66
|
+
err: error?.message ?? String(error),
|
|
67
|
+
}, "rpc handler error");
|
|
49
68
|
if (requestId) {
|
|
50
69
|
sendRpcError(session, requestId, "handler_error", error?.message ?? String(error));
|
|
51
70
|
}
|
package/dist/ws/router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/ws/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/ws/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA2BpD,qFAAqF;AACrF,MAAM,OAAO,eAAe;IASL;IARJ,QAAQ,GAAG,IAAI,GAAG,EAAsB,CAAC;IACzC,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;IAErD;;;;OAIG;IACH,YAAqB,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;IAExC,gEAAgE;IAChE,QAAQ,CAAC,IAAY,EAAE,OAAmB;QACxC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,4FAA4F;IAC5F,aAAa,CAAC,KAAa,EAAE,SAAiB;QAC5C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,GAAG,CAAC,IAAY;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACpF,CAAC;CACF;AAED,SAAS,YAAY,CAAC,OAAgB,EAAE,SAAiB,EAAE,IAAY,EAAE,OAAe;IACtF,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;AAC9F,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,OAAgB,EAChB,OAAgC,EAChC,QAAyB;IAEzB,MAAM,IAAI,GAAG,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACzE,MAAM,SAAS,GAAG,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IACxF,IAAI,CAAC,IAAI;QAAE,OAAO;IAElB,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,sFAAsF;QACtF,IAAI,SAAS;YACX,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,kBAAkB,IAAI,EAAE,CAAC,CAAC;QACrF,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,iBAAiB,CAAC,CAAC;QAC3F,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;QAC9D,QAAQ,CAAC,MAAM,EAAE,KAAK,CACpB,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,EAAE,EACnF,QAAQ,CACT,CAAC;QACF,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,QAAQ,GACZ,SAAS;gBACT,OAAO,MAAM,KAAK,QAAQ;gBAC1B,MAAM,KAAK,IAAI;gBACd,MAAkC,CAAC,SAAS,KAAK,SAAS;gBACzD,CAAC,CAAC,EAAE,GAAI,MAAkC,EAAE,SAAS,EAAE;gBACvD,CAAC,CAAC,MAAM,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,sFAAsF;QACtF,QAAQ,CAAC,MAAM,EAAE,IAAI,CACnB;YACE,IAAI;YACJ,SAAS;YACT,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;YAClC,GAAG,EAAG,KAAe,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;SAChD,EACD,mBAAmB,CACpB,CAAC;QACF,IAAI,SAAS,EAAE,CAAC;YACd,YAAY,CAAC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAG,KAAe,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAChG,CAAC;IACH,CAAC;AACH,CAAC;AAED,uDAAuD;AACvD,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAgB,EAChB,IAAY,EACZ,QAAyB;IAEzB,IAAI,QAAiB,CAAC;IACtB,IAAI,CAAC;QACH,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,kBAAkB;IAC5B,CAAC;IACD,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ;QAAE,OAAO;IACtD,MAAM,GAAG,GAAG,QAAmC,CAAC;IAEhD,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,UAAU,CAAC,SAAS,CAAC;gBAChC,IAAI,EAAE,MAAM;gBACZ,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,YAAY,EAAE,GAAG,CAAC,YAAY;gBAC9B,gBAAgB,EAAE,GAAG;gBACrB,YAAY,EAAE,IAAI,CAAC,GAAG,EAAE;aACzB,CAAC,CAAC;YACH,IAAI,IAAI,CAAC,OAAO;gBAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1C,OAAO;QACT,CAAC;QACD,KAAK,MAAM;YACT,OAAO,CAAC,2CAA2C;QACrD,KAAK,SAAS,CAAC,CAAC,CAAC;YACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;YAC5B,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAC3C,MAAM,sBAAsB,CAAC,OAAO,EAAE,OAAkC,EAAE,QAAQ,CAAC,CAAC;YACtF,CAAC;YACD,OAAO;QACT,CAAC;QACD;YACE,OAAO,CAAC,kCAAkC;IAC9C,CAAC;AACH,CAAC;AAED,uGAAuG;AACvG,MAAM,UAAU,gBAAgB,CAC9B,OAAgB,EAChB,KAAiB,EACjB,aAA6B;IAE7B,aAAa,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAClC,CAAC"}
|
package/dist/ws/ws-server.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import type { Server as HttpServer } from "node:http";
|
|
|
2
2
|
import { WebSocketServer } from "ws";
|
|
3
3
|
import type { PasswordAuth } from "../auth/password-auth.js";
|
|
4
4
|
import { type CapabilityStore } from "./capability-store.js";
|
|
5
|
+
import type { Logger } from "../logging/logger.js";
|
|
5
6
|
import { Session } from "./session.js";
|
|
6
7
|
/**
|
|
7
8
|
* WebSocket server (architecture/websocket-protocol.md § Connection & handshake, § Behavior).
|
|
@@ -31,6 +32,8 @@ export interface WebSocketServerDeps {
|
|
|
31
32
|
onSession?: (session: Session) => void;
|
|
32
33
|
/** Called for every post-handshake frame. */
|
|
33
34
|
onMessage?: (session: Session, frame: SessionFrame) => void;
|
|
35
|
+
/** Operational logger: upgrade rejections (warn), handshake failures (warn), session close (info). */
|
|
36
|
+
logger?: Logger;
|
|
34
37
|
}
|
|
35
38
|
export interface WebSocketServerHandle {
|
|
36
39
|
readonly wss: WebSocketServer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-server.d.ts","sourceRoot":"","sources":["../../src/ws/ws-server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAmB,MAAM,IAAI,UAAU,EAAE,MAAM,WAAW,CAAC;AAQvE,OAAO,EAAE,eAAe,EAAkB,MAAM,IAAI,CAAC;AAErD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,EAAE,KAAK,eAAe,EAAiC,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC;;;;;;GAMG;AAEH,sEAAsE;AACtE,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC;AAErE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uEAAuE;IACvE,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7C,oGAAoG;IACpG,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,KAAK,OAAO,CAAC;IACxD,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,qDAAqD;IACrD,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC,6CAA6C;IAC7C,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"ws-server.d.ts","sourceRoot":"","sources":["../../src/ws/ws-server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAmB,MAAM,IAAI,UAAU,EAAE,MAAM,WAAW,CAAC;AAQvE,OAAO,EAAE,eAAe,EAAkB,MAAM,IAAI,CAAC;AAErD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,EAAE,KAAK,eAAe,EAAiC,MAAM,uBAAuB,CAAC;AAC5F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC;;;;;;GAMG;AAEH,sEAAsE;AACtE,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC;AAErE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uEAAuE;IACvE,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7C,oGAAoG;IACpG,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,KAAK,OAAO,CAAC;IACxD,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,qDAAqD;IACrD,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC,6CAA6C;IAC7C,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;IAC5D,sGAAsG;IACtG,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,GAAG,EAAE,eAAe,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAChC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAMD,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,mBAAmB,GACxB,qBAAqB,CAwHvB"}
|
package/dist/ws/ws-server.js
CHANGED
|
@@ -23,11 +23,13 @@ export function createWebSocketServer(httpServer, deps) {
|
|
|
23
23
|
});
|
|
24
24
|
httpServer.on("upgrade", (req, socket, head) => {
|
|
25
25
|
if (deps.hostCheck && !deps.hostCheck(req.headers.host)) {
|
|
26
|
+
deps.logger?.warn({ host: req.headers.host, remoteAddress: req.socket.remoteAddress }, "ws upgrade rejected: host not allowed");
|
|
26
27
|
socket.write("HTTP/1.1 403 Host not allowed\r\n\r\n");
|
|
27
28
|
socket.destroy();
|
|
28
29
|
return;
|
|
29
30
|
}
|
|
30
31
|
if (deps.auth && !deps.auth.authenticateUpgrade(req)) {
|
|
32
|
+
deps.logger?.warn({ host: req.headers.host, remoteAddress: req.socket.remoteAddress }, "ws upgrade rejected: unauthorized");
|
|
31
33
|
socket.write("HTTP/1.1 401 Unauthorized\r\n\r\n");
|
|
32
34
|
socket.destroy();
|
|
33
35
|
return;
|
|
@@ -36,10 +38,12 @@ export function createWebSocketServer(httpServer, deps) {
|
|
|
36
38
|
});
|
|
37
39
|
wss.on("connection", (ws, _req) => {
|
|
38
40
|
let session = null;
|
|
41
|
+
const connectedAt = Date.now();
|
|
39
42
|
ws.on("message", (data, isBinary) => {
|
|
40
43
|
if (session === null) {
|
|
41
44
|
// First frame must be a valid JSON `hello`.
|
|
42
45
|
if (isBinary) {
|
|
46
|
+
deps.logger?.warn({ remoteAddress: _req.socket.remoteAddress }, "ws handshake failed: binary first frame (expected hello)");
|
|
43
47
|
ws.close(1008, "expected hello");
|
|
44
48
|
return;
|
|
45
49
|
}
|
|
@@ -48,11 +52,13 @@ export function createWebSocketServer(httpServer, deps) {
|
|
|
48
52
|
parsed = JSON.parse(data.toString("utf8"));
|
|
49
53
|
}
|
|
50
54
|
catch {
|
|
55
|
+
deps.logger?.warn({ remoteAddress: _req.socket.remoteAddress }, "ws handshake failed: invalid hello JSON");
|
|
51
56
|
ws.close(1008, "invalid hello");
|
|
52
57
|
return;
|
|
53
58
|
}
|
|
54
59
|
const hello = helloSchema.safeParse(parsed);
|
|
55
60
|
if (!hello.success) {
|
|
61
|
+
deps.logger?.warn({ remoteAddress: _req.socket.remoteAddress }, "ws handshake failed: first frame not a valid hello");
|
|
56
62
|
ws.close(1008, "first frame must be hello");
|
|
57
63
|
return;
|
|
58
64
|
}
|
|
@@ -86,9 +92,16 @@ export function createWebSocketServer(httpServer, deps) {
|
|
|
86
92
|
else
|
|
87
93
|
deps.onMessage?.(session, { text: data.toString("utf8") });
|
|
88
94
|
});
|
|
89
|
-
ws.on("close", () => {
|
|
90
|
-
if (session)
|
|
95
|
+
ws.on("close", (code) => {
|
|
96
|
+
if (session) {
|
|
91
97
|
sessions.delete(session);
|
|
98
|
+
deps.logger?.info({
|
|
99
|
+
clientId: session.clientId,
|
|
100
|
+
clientType: session.clientType,
|
|
101
|
+
code,
|
|
102
|
+
durationMs: Date.now() - connectedAt,
|
|
103
|
+
}, "ws client disconnected");
|
|
104
|
+
}
|
|
92
105
|
});
|
|
93
106
|
});
|
|
94
107
|
return {
|
package/dist/ws/ws-server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-server.js","sourceRoot":"","sources":["../../src/ws/ws-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EACL,WAAW,EACX,eAAe,EACf,uBAAuB,EACvB,YAAY,GACb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,eAAe,EAAkB,MAAM,IAAI,CAAC;AAGrD,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAwB,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"ws-server.js","sourceRoot":"","sources":["../../src/ws/ws-server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@av-pi-studio/server",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.12",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -22,9 +22,9 @@
|
|
|
22
22
|
"clean": "rm -rf dist *.tsbuildinfo"
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@av-pi-studio/highlight": "^0.0.
|
|
26
|
-
"@av-pi-studio/protocol": "^0.0.
|
|
27
|
-
"@av-pi-studio/relay": "^0.0.
|
|
25
|
+
"@av-pi-studio/highlight": "^0.0.12",
|
|
26
|
+
"@av-pi-studio/protocol": "^0.0.12",
|
|
27
|
+
"@av-pi-studio/relay": "^0.0.12",
|
|
28
28
|
"@earendil-works/pi-coding-agent": "^0.79.4",
|
|
29
29
|
"@xterm/headless": "^6.0.0",
|
|
30
30
|
"bcryptjs": "^3.0.3",
|