@cereworker/gateway 26.403.2 → 26.404.2
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/dist/client.d.ts +14 -2
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +146 -32
- package/dist/client.js.map +1 -1
- package/dist/index.d.ts +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/proxy-tools.d.ts.map +1 -1
- package/dist/proxy-tools.js +10 -2
- package/dist/proxy-tools.js.map +1 -1
- package/dist/server.d.ts +17 -3
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +172 -48
- package/dist/server.js.map +1 -1
- package/dist/session-bus.d.ts +27 -0
- package/dist/session-bus.d.ts.map +1 -0
- package/dist/session-bus.js +127 -0
- package/dist/session-bus.js.map +1 -0
- package/dist/types.d.ts +78 -37
- package/dist/types.d.ts.map +1 -1
- package/package.json +2 -2
package/dist/client.d.ts
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
|
+
import { type ToolResult } from '@cereworker/core';
|
|
1
2
|
import type { GatewayClientConfig } from './types.js';
|
|
2
|
-
export
|
|
3
|
+
export interface RemoteToolExecutionContext {
|
|
4
|
+
conversationId?: string;
|
|
5
|
+
sessionId: string;
|
|
6
|
+
turnId?: string;
|
|
7
|
+
attempt?: number;
|
|
8
|
+
scopeKey?: string;
|
|
9
|
+
callId?: string;
|
|
10
|
+
}
|
|
11
|
+
export type ToolExecutor = (tool: string, args: Record<string, unknown>, context?: RemoteToolExecutionContext) => Promise<string | ToolResult>;
|
|
3
12
|
export declare class GatewayNodeClient {
|
|
4
13
|
private ws;
|
|
5
14
|
private config;
|
|
@@ -11,6 +20,7 @@ export declare class GatewayNodeClient {
|
|
|
11
20
|
private connected;
|
|
12
21
|
private stopped;
|
|
13
22
|
private startedAt;
|
|
23
|
+
private readonly bus;
|
|
14
24
|
constructor(config: GatewayClientConfig, executor: ToolExecutor);
|
|
15
25
|
setEmergencyStopHandler(handler: () => void): void;
|
|
16
26
|
connect(): Promise<void>;
|
|
@@ -19,8 +29,10 @@ export declare class GatewayNodeClient {
|
|
|
19
29
|
private doConnect;
|
|
20
30
|
private handleFrame;
|
|
21
31
|
private handleInvoke;
|
|
32
|
+
private normalizeResult;
|
|
22
33
|
private getStatus;
|
|
23
34
|
private scheduleReconnect;
|
|
24
|
-
private
|
|
35
|
+
private sendEnvelope;
|
|
36
|
+
private sendRaw;
|
|
25
37
|
}
|
|
26
38
|
//# sourceMappingURL=client.d.ts.map
|
package/dist/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,KAAK,EAEV,mBAAmB,EAGpB,MAAM,YAAY,CAAC;AAKpB,MAAM,WAAW,0BAA0B;IACzC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,YAAY,GAAG,CACzB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,0BAA0B,KACjC,OAAO,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC;AAElC,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,EAAE,CAA0B;IACpC,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,QAAQ,CAAe;IAC/B,OAAO,CAAC,eAAe,CAAC,CAAa;IACrC,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,oBAAoB,CAAM;IAClC,OAAO,CAAC,cAAc,CAA8C;IACpE,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,SAAS,CAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAkB;gBAE1B,MAAM,EAAE,mBAAmB,EAAE,QAAQ,EAAE,YAAY;IAY/D,uBAAuB,CAAC,OAAO,EAAE,MAAM,IAAI,GAAG,IAAI;IAI5C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAMxB,UAAU,CAAC,MAAM,SAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB3D,WAAW,IAAI,OAAO;IAItB,OAAO,CAAC,SAAS;IAgEjB,OAAO,CAAC,WAAW;YA4DL,YAAY;IAgE1B,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,SAAS;IASjB,OAAO,CAAC,iBAAiB;IAuBzB,OAAO,CAAC,YAAY;IAwBpB,OAAO,CAAC,OAAO;CAKhB"}
|
package/dist/client.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import WebSocket from 'ws';
|
|
2
2
|
import { createLogger } from '@cereworker/core';
|
|
3
|
+
import { SessionBusState, buildBusStatePath } from './session-bus.js';
|
|
3
4
|
const log = createLogger('gateway-client');
|
|
4
5
|
export class GatewayNodeClient {
|
|
5
6
|
ws = null;
|
|
@@ -12,9 +13,11 @@ export class GatewayNodeClient {
|
|
|
12
13
|
connected = false;
|
|
13
14
|
stopped = false;
|
|
14
15
|
startedAt = Date.now();
|
|
16
|
+
bus;
|
|
15
17
|
constructor(config, executor) {
|
|
16
18
|
this.config = config;
|
|
17
19
|
this.executor = executor;
|
|
20
|
+
this.bus = new SessionBusState(buildBusStatePath(config.stateDir, `node-${config.nodeId}`, `${config.gatewayUrl}-${config.nodeId}`));
|
|
18
21
|
}
|
|
19
22
|
setEmergencyStopHandler(handler) {
|
|
20
23
|
this.onEmergencyStop = handler;
|
|
@@ -31,7 +34,11 @@ export class GatewayNodeClient {
|
|
|
31
34
|
this.reconnectTimer = null;
|
|
32
35
|
}
|
|
33
36
|
if (this.ws) {
|
|
34
|
-
this.
|
|
37
|
+
this.sendEnvelope('transport.disconnect', {
|
|
38
|
+
sessionId: `node:${this.config.nodeId}`,
|
|
39
|
+
source: 'node',
|
|
40
|
+
payload: { reason },
|
|
41
|
+
});
|
|
35
42
|
this.ws.close();
|
|
36
43
|
this.ws = null;
|
|
37
44
|
}
|
|
@@ -46,11 +53,15 @@ export class GatewayNodeClient {
|
|
|
46
53
|
const ws = new WebSocket(this.config.gatewayUrl);
|
|
47
54
|
ws.on('open', () => {
|
|
48
55
|
this.ws = ws;
|
|
49
|
-
this.
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
56
|
+
this.sendEnvelope('transport.connect', {
|
|
57
|
+
sessionId: `node:${this.config.nodeId}`,
|
|
58
|
+
source: 'node',
|
|
59
|
+
payload: {
|
|
60
|
+
nodeId: this.config.nodeId,
|
|
61
|
+
token: this.config.token,
|
|
62
|
+
capabilities: this.config.capabilities,
|
|
63
|
+
},
|
|
64
|
+
resumeFromSequence: this.bus.getResumeSequence(),
|
|
54
65
|
});
|
|
55
66
|
});
|
|
56
67
|
ws.on('message', (data) => {
|
|
@@ -62,10 +73,24 @@ export class GatewayNodeClient {
|
|
|
62
73
|
log.warn('Received invalid JSON from gateway');
|
|
63
74
|
return;
|
|
64
75
|
}
|
|
76
|
+
const isConnectedFrame = frame.eventType === 'transport.connected';
|
|
77
|
+
if (isConnectedFrame) {
|
|
78
|
+
this.bus.markConnected(frame);
|
|
79
|
+
}
|
|
80
|
+
const shouldProcess = isConnectedFrame ? true : this.bus.markReceived(frame);
|
|
81
|
+
if (frame.eventType !== 'transport.ack') {
|
|
82
|
+
this.sendEnvelope('transport.ack', {
|
|
83
|
+
sessionId: frame.sessionId,
|
|
84
|
+
conversationId: frame.conversationId,
|
|
85
|
+
source: 'node',
|
|
86
|
+
payload: { message: 'ack' },
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
if (!shouldProcess)
|
|
90
|
+
return;
|
|
65
91
|
this.handleFrame(frame, resolve, reject);
|
|
66
92
|
});
|
|
67
93
|
ws.on('close', () => {
|
|
68
|
-
const wasConnected = this.connected;
|
|
69
94
|
this.connected = false;
|
|
70
95
|
this.ws = null;
|
|
71
96
|
if (!this.stopped) {
|
|
@@ -82,55 +107,130 @@ export class GatewayNodeClient {
|
|
|
82
107
|
});
|
|
83
108
|
}
|
|
84
109
|
handleFrame(frame, onConnect, onError) {
|
|
85
|
-
switch (frame.
|
|
86
|
-
case 'connected':
|
|
110
|
+
switch (frame.eventType) {
|
|
111
|
+
case 'transport.connected':
|
|
87
112
|
this.connected = true;
|
|
88
113
|
this.reconnectAttempt = 0;
|
|
89
|
-
|
|
114
|
+
for (const pending of this.bus.replayAfter(frame.resumeFromSequence ?? 0)) {
|
|
115
|
+
this.sendRaw(pending);
|
|
116
|
+
}
|
|
117
|
+
log.info('Connected to gateway', { gatewayId: frame.payload.gatewayId, nodeId: this.config.nodeId });
|
|
90
118
|
onConnect?.();
|
|
91
119
|
break;
|
|
92
|
-
case 'error':
|
|
93
|
-
log.error('Gateway error', { message: frame.message });
|
|
120
|
+
case 'transport.error':
|
|
121
|
+
log.error('Gateway error', { message: frame.payload.message });
|
|
94
122
|
if (!this.connected) {
|
|
95
|
-
onError?.(new Error(frame.message));
|
|
123
|
+
onError?.(new Error(frame.payload.message));
|
|
96
124
|
}
|
|
97
125
|
break;
|
|
98
|
-
case 'invoke':
|
|
99
|
-
this.handleInvoke(frame
|
|
126
|
+
case 'invoke.request':
|
|
127
|
+
void this.handleInvoke(frame);
|
|
100
128
|
break;
|
|
101
|
-
case 'ping':
|
|
102
|
-
this.
|
|
129
|
+
case 'transport.ping':
|
|
130
|
+
this.sendEnvelope('transport.pong', {
|
|
131
|
+
sessionId: frame.sessionId,
|
|
132
|
+
conversationId: frame.conversationId,
|
|
133
|
+
source: 'node',
|
|
134
|
+
payload: { sentAt: frame.payload.sentAt },
|
|
135
|
+
});
|
|
103
136
|
break;
|
|
104
|
-
case 'status
|
|
105
|
-
this.
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
137
|
+
case 'node.status.request':
|
|
138
|
+
this.sendEnvelope('node.status', {
|
|
139
|
+
sessionId: frame.sessionId,
|
|
140
|
+
conversationId: frame.conversationId,
|
|
141
|
+
source: 'node',
|
|
142
|
+
payload: {
|
|
143
|
+
requestId: frame.payload.requestId,
|
|
144
|
+
status: this.getStatus(),
|
|
145
|
+
},
|
|
109
146
|
});
|
|
110
147
|
break;
|
|
111
|
-
case 'emergency-stop':
|
|
148
|
+
case 'transport.emergency-stop':
|
|
112
149
|
log.warn('Emergency stop received from gateway');
|
|
113
150
|
this.onEmergencyStop?.();
|
|
114
151
|
break;
|
|
115
|
-
case 'disconnect':
|
|
116
|
-
log.info('Gateway requested disconnect', { reason: frame.reason });
|
|
152
|
+
case 'transport.disconnect':
|
|
153
|
+
log.info('Gateway requested disconnect', { reason: frame.payload.reason });
|
|
117
154
|
this.stopped = true;
|
|
118
155
|
this.ws?.close();
|
|
119
156
|
break;
|
|
120
157
|
default:
|
|
121
|
-
log.warn('Unexpected frame from gateway', {
|
|
158
|
+
log.warn('Unexpected frame from gateway', { eventType: frame.eventType });
|
|
122
159
|
}
|
|
123
160
|
}
|
|
124
|
-
async handleInvoke(
|
|
125
|
-
|
|
161
|
+
async handleInvoke(frame) {
|
|
162
|
+
const { invocationId, tool, args, context } = frame.payload;
|
|
163
|
+
log.info('Invoke received', { invocationId, tool });
|
|
164
|
+
this.sendEnvelope('tool.started', {
|
|
165
|
+
sessionId: frame.sessionId,
|
|
166
|
+
conversationId: frame.conversationId,
|
|
167
|
+
source: 'node',
|
|
168
|
+
payload: {
|
|
169
|
+
invocationId,
|
|
170
|
+
tool,
|
|
171
|
+
args,
|
|
172
|
+
context,
|
|
173
|
+
nodeId: this.config.nodeId,
|
|
174
|
+
},
|
|
175
|
+
});
|
|
176
|
+
let result;
|
|
126
177
|
try {
|
|
127
|
-
const
|
|
128
|
-
|
|
178
|
+
const rawResult = await this.executor(tool, args, {
|
|
179
|
+
conversationId: frame.conversationId,
|
|
180
|
+
sessionId: frame.sessionId,
|
|
181
|
+
turnId: context?.turnId ?? frame.sessionId,
|
|
182
|
+
attempt: context?.attempt,
|
|
183
|
+
scopeKey: context?.scopeKey,
|
|
184
|
+
callId: context?.callId ?? invocationId,
|
|
185
|
+
});
|
|
186
|
+
result = this.normalizeResult(rawResult, context?.callId ?? invocationId);
|
|
129
187
|
}
|
|
130
188
|
catch (err) {
|
|
131
189
|
const message = err instanceof Error ? err.message : String(err);
|
|
132
|
-
|
|
190
|
+
result = {
|
|
191
|
+
callId: context?.callId ?? invocationId,
|
|
192
|
+
output: message,
|
|
193
|
+
isError: true,
|
|
194
|
+
metadata: {
|
|
195
|
+
runtimeError: true,
|
|
196
|
+
},
|
|
197
|
+
};
|
|
133
198
|
}
|
|
199
|
+
this.sendEnvelope('tool.finished', {
|
|
200
|
+
sessionId: frame.sessionId,
|
|
201
|
+
conversationId: frame.conversationId,
|
|
202
|
+
source: 'node',
|
|
203
|
+
payload: {
|
|
204
|
+
invocationId,
|
|
205
|
+
tool,
|
|
206
|
+
args,
|
|
207
|
+
result,
|
|
208
|
+
context,
|
|
209
|
+
nodeId: this.config.nodeId,
|
|
210
|
+
},
|
|
211
|
+
});
|
|
212
|
+
this.sendEnvelope('invoke.result', {
|
|
213
|
+
sessionId: frame.sessionId,
|
|
214
|
+
conversationId: frame.conversationId,
|
|
215
|
+
source: 'node',
|
|
216
|
+
payload: {
|
|
217
|
+
invocationId,
|
|
218
|
+
result,
|
|
219
|
+
},
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
normalizeResult(raw, callId) {
|
|
223
|
+
if (typeof raw === 'string') {
|
|
224
|
+
return {
|
|
225
|
+
callId,
|
|
226
|
+
output: raw,
|
|
227
|
+
isError: false,
|
|
228
|
+
};
|
|
229
|
+
}
|
|
230
|
+
return {
|
|
231
|
+
...raw,
|
|
232
|
+
callId: raw.callId || callId,
|
|
233
|
+
};
|
|
134
234
|
}
|
|
135
235
|
getStatus() {
|
|
136
236
|
return {
|
|
@@ -159,7 +259,21 @@ export class GatewayNodeClient {
|
|
|
159
259
|
});
|
|
160
260
|
}, jitter);
|
|
161
261
|
}
|
|
162
|
-
|
|
262
|
+
sendEnvelope(eventType, options) {
|
|
263
|
+
const envelope = this.bus.createEnvelope({
|
|
264
|
+
eventType,
|
|
265
|
+
senderId: this.config.nodeId,
|
|
266
|
+
instanceId: this.config.instanceId,
|
|
267
|
+
sessionId: options.sessionId,
|
|
268
|
+
conversationId: options.conversationId,
|
|
269
|
+
source: options.source,
|
|
270
|
+
payload: options.payload,
|
|
271
|
+
resumeFromSequence: options.resumeFromSequence,
|
|
272
|
+
});
|
|
273
|
+
this.sendRaw(envelope);
|
|
274
|
+
return envelope;
|
|
275
|
+
}
|
|
276
|
+
sendRaw(frame) {
|
|
163
277
|
if (this.ws && this.ws.readyState === WebSocket.OPEN) {
|
|
164
278
|
this.ws.send(JSON.stringify(frame));
|
|
165
279
|
}
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
export type { GatewayFrame, NodeInfo, NodeStatus, GatewayServerConfig, GatewayClientConfig, } from './types.js';
|
|
1
|
+
export type { GatewayFrame, AnyGatewayFrame, NodeInfo, NodeStatus, GatewayServerConfig, GatewayClientConfig, SessionBusEventType, SessionBusEnvelopeMap, } from './types.js';
|
|
2
2
|
export { GatewayServer } from './server.js';
|
|
3
3
|
export { GatewayNodeClient } from './client.js';
|
|
4
|
-
export type { ToolExecutor } from './client.js';
|
|
4
|
+
export type { ToolExecutor, RemoteToolExecutionContext } from './client.js';
|
|
5
5
|
export { createProxyTools } from './proxy-tools.js';
|
|
6
|
+
export { TRANSPORT_PROTOCOL_VERSION } from './session-bus.js';
|
|
6
7
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,mBAAmB,EACnB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,UAAU,EACV,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,YAAY,EAAE,YAAY,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC"}
|
package/dist/index.js
CHANGED
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-tools.d.ts","sourceRoot":"","sources":["../src/proxy-tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"proxy-tools.d.ts","sourceRoot":"","sources":["../src/proxy-tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAwB,MAAM,kBAAkB,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EAAE,GACrB,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAuBhC"}
|
package/dist/proxy-tools.js
CHANGED
|
@@ -5,8 +5,16 @@ export function createProxyTools(server, nodeId, capabilities) {
|
|
|
5
5
|
tools[toolName] = {
|
|
6
6
|
description: `Execute "${cap}" on remote node "${nodeId}"`,
|
|
7
7
|
parameters: {},
|
|
8
|
-
execute: async (args) => {
|
|
9
|
-
return server.invoke(nodeId, cap, args
|
|
8
|
+
execute: async (args, context) => {
|
|
9
|
+
return server.invoke(nodeId, cap, args, {
|
|
10
|
+
conversationId: context?.conversationId,
|
|
11
|
+
sessionId: context?.sessionKey ?? context?.turnId,
|
|
12
|
+
turnId: context?.turnId,
|
|
13
|
+
attempt: context?.attempt,
|
|
14
|
+
callId: context?.callId,
|
|
15
|
+
requestedToolName: context?.toolName,
|
|
16
|
+
scopeKey: context?.scopeKey,
|
|
17
|
+
});
|
|
10
18
|
},
|
|
11
19
|
};
|
|
12
20
|
}
|
package/dist/proxy-tools.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-tools.js","sourceRoot":"","sources":["../src/proxy-tools.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,gBAAgB,CAC9B,MAAqB,EACrB,MAAc,EACd,YAAsB;IAEtB,MAAM,KAAK,GAAmC,EAAE,CAAC;IAEjD,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,GAAG,GAAG,IAAI,MAAM,EAAE,CAAC;QACpC,KAAK,CAAC,QAAQ,CAAC,GAAG;YAChB,WAAW,EAAE,YAAY,GAAG,qBAAqB,MAAM,GAAG;YAC1D,UAAU,EAAE,EAAE;YACd,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"proxy-tools.js","sourceRoot":"","sources":["../src/proxy-tools.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,gBAAgB,CAC9B,MAAqB,EACrB,MAAc,EACd,YAAsB;IAEtB,MAAM,KAAK,GAAmC,EAAE,CAAC;IAEjD,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,GAAG,GAAG,IAAI,MAAM,EAAE,CAAC;QACpC,KAAK,CAAC,QAAQ,CAAC,GAAG;YAChB,WAAW,EAAE,YAAY,GAAG,qBAAqB,MAAM,GAAG;YAC1D,UAAU,EAAE,EAAE;YACd,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAA8B,EAAE,EAAE;gBACtD,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE;oBACtC,cAAc,EAAE,OAAO,EAAE,cAAc;oBACvC,SAAS,EAAE,OAAO,EAAE,UAAU,IAAI,OAAO,EAAE,MAAM;oBACjD,MAAM,EAAE,OAAO,EAAE,MAAM;oBACvB,OAAO,EAAE,OAAO,EAAE,OAAO;oBACzB,MAAM,EAAE,OAAO,EAAE,MAAM;oBACvB,iBAAiB,EAAE,OAAO,EAAE,QAAQ;oBACpC,QAAQ,EAAE,OAAO,EAAE,QAAQ;iBAC5B,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/dist/server.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { type ToolResult } from '@cereworker/core';
|
|
2
|
+
import type { AnyGatewayFrame, GatewayServerConfig, NodeInfo } from './types.js';
|
|
2
3
|
export declare class GatewayServer {
|
|
3
4
|
private wss;
|
|
4
5
|
private httpServer;
|
|
@@ -9,20 +10,33 @@ export declare class GatewayServer {
|
|
|
9
10
|
private config;
|
|
10
11
|
private onNodeConnected?;
|
|
11
12
|
private onNodeDisconnected?;
|
|
13
|
+
private onEnvelope?;
|
|
12
14
|
constructor(config: GatewayServerConfig);
|
|
13
15
|
setNodeConnectedHandler(handler: (nodeId: string, capabilities: string[]) => void): void;
|
|
14
16
|
setNodeDisconnectedHandler(handler: (nodeId: string, reason: string, capabilities: string[]) => void): void;
|
|
17
|
+
setEnvelopeHandler(handler: (nodeId: string, frame: AnyGatewayFrame) => void): void;
|
|
15
18
|
start(): Promise<void>;
|
|
16
19
|
stop(): Promise<void>;
|
|
17
|
-
invoke(nodeId: string, tool: string, args: Record<string, unknown>,
|
|
20
|
+
invoke(nodeId: string, tool: string, args: Record<string, unknown>, options?: {
|
|
21
|
+
timeoutMs?: number;
|
|
22
|
+
conversationId?: string;
|
|
23
|
+
sessionId?: string;
|
|
24
|
+
turnId?: string;
|
|
25
|
+
attempt?: number;
|
|
26
|
+
callId?: string;
|
|
27
|
+
requestedToolName?: string;
|
|
28
|
+
scopeKey?: string;
|
|
29
|
+
}): Promise<ToolResult>;
|
|
18
30
|
emergencyStopAll(): void;
|
|
19
31
|
listNodes(): NodeInfo[];
|
|
20
32
|
getNode(nodeId: string): NodeInfo | undefined;
|
|
21
33
|
getGatewayId(): string;
|
|
22
34
|
getPort(): number;
|
|
35
|
+
private createServerEnvelope;
|
|
23
36
|
private handleFrame;
|
|
24
37
|
private handleNodeDisconnect;
|
|
25
38
|
private startPingLoop;
|
|
26
|
-
private
|
|
39
|
+
private sendEnvelope;
|
|
40
|
+
private sendRaw;
|
|
27
41
|
}
|
|
28
42
|
//# sourceMappingURL=server.d.ts.map
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,KAAK,EACV,eAAe,EAEf,mBAAmB,EACnB,QAAQ,EAIT,MAAM,YAAY,CAAC;AAmBpB,qBAAa,aAAa;IACxB,OAAO,CAAC,GAAG,CAAgC;IAC3C,OAAO,CAAC,UAAU,CAAgD;IAClE,OAAO,CAAC,KAAK,CAAoC;IACjD,OAAO,CAAC,kBAAkB,CAAwC;IAClE,OAAO,CAAC,SAAS,CAA+C;IAChE,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAsB;IAEpC,OAAO,CAAC,eAAe,CAAC,CAAmD;IAC3E,OAAO,CAAC,kBAAkB,CAAC,CAAmE;IAC9F,OAAO,CAAC,UAAU,CAAC,CAAmD;gBAE1D,MAAM,EAAE,mBAAmB;IAKvC,uBAAuB,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,IAAI,GAAG,IAAI;IAIxF,0BAA0B,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,IAAI,GAAG,IAAI;IAI3G,kBAAkB,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,KAAK,IAAI,GAAG,IAAI;IAI7E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAyItB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAuCrB,MAAM,CACV,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE;QACR,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GACA,OAAO,CAAC,UAAU,CAAC;IAkDtB,gBAAgB,IAAI,IAAI;IAWxB,SAAS,IAAI,QAAQ,EAAE;IAIvB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAI7C,YAAY,IAAI,MAAM;IAItB,OAAO,IAAI,MAAM;IAIjB,OAAO,CAAC,oBAAoB;IAuB5B,OAAO,CAAC,WAAW;IA4DnB,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,aAAa;IA4BrB,OAAO,CAAC,YAAY;IAyBpB,OAAO,CAAC,OAAO;CAKhB"}
|
package/dist/server.js
CHANGED
|
@@ -2,6 +2,7 @@ import { WebSocketServer, WebSocket } from 'ws';
|
|
|
2
2
|
import { createServer } from 'node:http';
|
|
3
3
|
import { nanoid } from 'nanoid';
|
|
4
4
|
import { createLogger } from '@cereworker/core';
|
|
5
|
+
import { SessionBusState, buildBusStatePath } from './session-bus.js';
|
|
5
6
|
const log = createLogger('gateway-server');
|
|
6
7
|
export class GatewayServer {
|
|
7
8
|
wss = null;
|
|
@@ -13,6 +14,7 @@ export class GatewayServer {
|
|
|
13
14
|
config;
|
|
14
15
|
onNodeConnected;
|
|
15
16
|
onNodeDisconnected;
|
|
17
|
+
onEnvelope;
|
|
16
18
|
constructor(config) {
|
|
17
19
|
this.config = config;
|
|
18
20
|
this.gatewayId = nanoid(12);
|
|
@@ -23,6 +25,9 @@ export class GatewayServer {
|
|
|
23
25
|
setNodeDisconnectedHandler(handler) {
|
|
24
26
|
this.onNodeDisconnected = handler;
|
|
25
27
|
}
|
|
28
|
+
setEnvelopeHandler(handler) {
|
|
29
|
+
this.onEnvelope = handler;
|
|
30
|
+
}
|
|
26
31
|
async start() {
|
|
27
32
|
this.httpServer = createServer((req, res) => {
|
|
28
33
|
if (req.url === '/status' && req.method === 'GET') {
|
|
@@ -38,9 +43,14 @@ export class GatewayServer {
|
|
|
38
43
|
this.wss.on('connection', (ws) => {
|
|
39
44
|
let authenticated = false;
|
|
40
45
|
let nodeId = null;
|
|
46
|
+
let nodeBus = null;
|
|
41
47
|
const authTimeout = setTimeout(() => {
|
|
42
48
|
if (!authenticated) {
|
|
43
|
-
this.
|
|
49
|
+
this.sendRaw(ws, this.createServerEnvelope('transport.error', {
|
|
50
|
+
sessionId: 'gateway',
|
|
51
|
+
source: 'gateway',
|
|
52
|
+
payload: { message: 'Authentication timeout' },
|
|
53
|
+
}));
|
|
44
54
|
ws.close();
|
|
45
55
|
}
|
|
46
56
|
}, 10_000);
|
|
@@ -50,39 +60,67 @@ export class GatewayServer {
|
|
|
50
60
|
frame = JSON.parse(data.toString());
|
|
51
61
|
}
|
|
52
62
|
catch {
|
|
53
|
-
this.
|
|
63
|
+
this.sendRaw(ws, this.createServerEnvelope('transport.error', {
|
|
64
|
+
sessionId: 'gateway',
|
|
65
|
+
source: 'gateway',
|
|
66
|
+
payload: { message: 'Invalid JSON' },
|
|
67
|
+
}));
|
|
54
68
|
return;
|
|
55
69
|
}
|
|
56
70
|
if (!authenticated) {
|
|
57
|
-
if (frame.
|
|
58
|
-
this.
|
|
71
|
+
if (frame.eventType !== 'transport.connect') {
|
|
72
|
+
this.sendRaw(ws, this.createServerEnvelope('transport.error', {
|
|
73
|
+
sessionId: 'gateway',
|
|
74
|
+
source: 'gateway',
|
|
75
|
+
payload: { message: 'Must authenticate first' },
|
|
76
|
+
}));
|
|
59
77
|
ws.close();
|
|
60
78
|
return;
|
|
61
79
|
}
|
|
62
80
|
clearTimeout(authTimeout);
|
|
63
|
-
|
|
64
|
-
|
|
81
|
+
const { nodeId: requestedNodeId, token, capabilities } = frame.payload;
|
|
82
|
+
if (this.config.token && token !== this.config.token) {
|
|
83
|
+
this.sendRaw(ws, this.createServerEnvelope('transport.error', {
|
|
84
|
+
sessionId: 'gateway',
|
|
85
|
+
source: 'gateway',
|
|
86
|
+
payload: { message: 'Invalid token' },
|
|
87
|
+
}));
|
|
65
88
|
ws.close();
|
|
66
89
|
return;
|
|
67
90
|
}
|
|
68
|
-
if (this.nodes.has(
|
|
69
|
-
this.
|
|
91
|
+
if (this.nodes.has(requestedNodeId)) {
|
|
92
|
+
this.sendRaw(ws, this.createServerEnvelope('transport.error', {
|
|
93
|
+
sessionId: 'gateway',
|
|
94
|
+
source: 'gateway',
|
|
95
|
+
payload: { message: `Node "${requestedNodeId}" already connected` },
|
|
96
|
+
}));
|
|
70
97
|
ws.close();
|
|
71
98
|
return;
|
|
72
99
|
}
|
|
73
|
-
nodeId =
|
|
100
|
+
nodeId = requestedNodeId;
|
|
101
|
+
nodeBus = new SessionBusState(buildBusStatePath(this.config.stateDir, `gateway-${requestedNodeId}`, requestedNodeId));
|
|
102
|
+
nodeBus.markReceived(frame);
|
|
74
103
|
authenticated = true;
|
|
75
104
|
const info = {
|
|
76
|
-
nodeId:
|
|
77
|
-
capabilities
|
|
105
|
+
nodeId: requestedNodeId,
|
|
106
|
+
capabilities,
|
|
78
107
|
connectedAt: Date.now(),
|
|
79
108
|
lastPingAt: Date.now(),
|
|
80
109
|
status: 'connected',
|
|
81
110
|
};
|
|
82
|
-
this.nodes.set(
|
|
83
|
-
this.
|
|
84
|
-
|
|
85
|
-
|
|
111
|
+
this.nodes.set(requestedNodeId, { ws, info, bus: nodeBus });
|
|
112
|
+
this.sendEnvelope(this.nodes.get(requestedNodeId), 'transport.connected', {
|
|
113
|
+
sessionId: 'gateway',
|
|
114
|
+
source: 'gateway',
|
|
115
|
+
payload: { gatewayId: this.gatewayId },
|
|
116
|
+
resumeFromSequence: nodeBus.getHighestReceivedSequence(),
|
|
117
|
+
});
|
|
118
|
+
const replayFrom = frame.resumeFromSequence ?? 0;
|
|
119
|
+
for (const pending of nodeBus.replayAfter(replayFrom)) {
|
|
120
|
+
this.sendRaw(ws, pending);
|
|
121
|
+
}
|
|
122
|
+
log.info('Node connected', { nodeId: requestedNodeId, capabilities, replayFrom });
|
|
123
|
+
this.onNodeConnected?.(requestedNodeId, capabilities);
|
|
86
124
|
return;
|
|
87
125
|
}
|
|
88
126
|
this.handleFrame(nodeId, frame);
|
|
@@ -113,19 +151,20 @@ export class GatewayServer {
|
|
|
113
151
|
clearInterval(this.pingTimer);
|
|
114
152
|
this.pingTimer = null;
|
|
115
153
|
}
|
|
116
|
-
// Reject all pending invocations
|
|
117
154
|
for (const [id, pending] of this.pendingInvocations) {
|
|
118
155
|
clearTimeout(pending.timer);
|
|
119
156
|
pending.reject(new Error('Gateway shutting down'));
|
|
157
|
+
this.pendingInvocations.delete(id);
|
|
120
158
|
}
|
|
121
|
-
this.
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
159
|
+
for (const [, node] of this.nodes) {
|
|
160
|
+
this.sendEnvelope(node, 'transport.disconnect', {
|
|
161
|
+
sessionId: 'gateway',
|
|
162
|
+
source: 'gateway',
|
|
163
|
+
payload: { reason: 'gateway shutting down' },
|
|
164
|
+
});
|
|
125
165
|
node.ws.close();
|
|
126
166
|
}
|
|
127
167
|
this.nodes.clear();
|
|
128
|
-
// Close servers
|
|
129
168
|
if (this.wss) {
|
|
130
169
|
this.wss.close();
|
|
131
170
|
this.wss = null;
|
|
@@ -141,26 +180,58 @@ export class GatewayServer {
|
|
|
141
180
|
});
|
|
142
181
|
log.info('Gateway server stopped');
|
|
143
182
|
}
|
|
144
|
-
async invoke(nodeId, tool, args,
|
|
183
|
+
async invoke(nodeId, tool, args, options) {
|
|
145
184
|
const node = this.nodes.get(nodeId);
|
|
146
185
|
if (!node || node.info.status !== 'connected') {
|
|
147
186
|
throw new Error(`Node "${nodeId}" is not connected`);
|
|
148
187
|
}
|
|
149
|
-
const
|
|
150
|
-
const timeout = timeoutMs ?? this.config.invokeTimeoutMs;
|
|
188
|
+
const invocationId = nanoid(12);
|
|
189
|
+
const timeout = options?.timeoutMs ?? this.config.invokeTimeoutMs;
|
|
190
|
+
const context = {
|
|
191
|
+
callId: options?.callId,
|
|
192
|
+
requestedToolName: options?.requestedToolName,
|
|
193
|
+
turnId: options?.turnId,
|
|
194
|
+
attempt: options?.attempt,
|
|
195
|
+
scopeKey: options?.scopeKey,
|
|
196
|
+
};
|
|
151
197
|
return new Promise((resolve, reject) => {
|
|
152
198
|
const timer = setTimeout(() => {
|
|
153
|
-
this.pendingInvocations.delete(
|
|
199
|
+
this.pendingInvocations.delete(invocationId);
|
|
154
200
|
reject(new Error(`Invoke timeout: ${tool}@${nodeId} after ${timeout}ms`));
|
|
155
201
|
}, timeout);
|
|
156
|
-
this.pendingInvocations.set(
|
|
157
|
-
|
|
158
|
-
|
|
202
|
+
this.pendingInvocations.set(invocationId, {
|
|
203
|
+
resolve,
|
|
204
|
+
reject,
|
|
205
|
+
timer,
|
|
206
|
+
nodeId,
|
|
207
|
+
tool,
|
|
208
|
+
});
|
|
209
|
+
this.sendEnvelope(node, 'invoke.request', {
|
|
210
|
+
sessionId: options?.sessionId ?? options?.turnId ?? `node:${nodeId}`,
|
|
211
|
+
conversationId: options?.conversationId,
|
|
212
|
+
source: 'gateway',
|
|
213
|
+
payload: {
|
|
214
|
+
invocationId,
|
|
215
|
+
tool,
|
|
216
|
+
args,
|
|
217
|
+
context,
|
|
218
|
+
},
|
|
219
|
+
});
|
|
220
|
+
log.info('Invoke sent', {
|
|
221
|
+
invocationId,
|
|
222
|
+
nodeId,
|
|
223
|
+
tool,
|
|
224
|
+
sessionId: options?.sessionId ?? options?.turnId ?? `node:${nodeId}`,
|
|
225
|
+
});
|
|
159
226
|
});
|
|
160
227
|
}
|
|
161
228
|
emergencyStopAll() {
|
|
162
229
|
for (const [nodeId, node] of this.nodes) {
|
|
163
|
-
this.
|
|
230
|
+
this.sendEnvelope(node, 'transport.emergency-stop', {
|
|
231
|
+
sessionId: 'gateway',
|
|
232
|
+
source: 'gateway',
|
|
233
|
+
payload: { reason: 'gateway emergency stop' },
|
|
234
|
+
});
|
|
164
235
|
log.warn('Emergency stop sent to node', { nodeId });
|
|
165
236
|
}
|
|
166
237
|
}
|
|
@@ -176,39 +247,73 @@ export class GatewayServer {
|
|
|
176
247
|
getPort() {
|
|
177
248
|
return this.config.port;
|
|
178
249
|
}
|
|
250
|
+
createServerEnvelope(eventType, options) {
|
|
251
|
+
const bus = new SessionBusState(null);
|
|
252
|
+
return bus.createEnvelope({
|
|
253
|
+
eventType,
|
|
254
|
+
senderId: this.gatewayId,
|
|
255
|
+
instanceId: this.config.instanceId,
|
|
256
|
+
sessionId: options.sessionId,
|
|
257
|
+
conversationId: options.conversationId,
|
|
258
|
+
source: options.source,
|
|
259
|
+
payload: options.payload,
|
|
260
|
+
resumeFromSequence: options.resumeFromSequence,
|
|
261
|
+
});
|
|
262
|
+
}
|
|
179
263
|
handleFrame(nodeId, frame) {
|
|
180
264
|
const node = this.nodes.get(nodeId);
|
|
181
265
|
if (!node)
|
|
182
266
|
return;
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
267
|
+
const shouldProcess = node.bus.markReceived(frame);
|
|
268
|
+
if (frame.eventType !== 'transport.ack') {
|
|
269
|
+
this.sendEnvelope(node, 'transport.ack', {
|
|
270
|
+
sessionId: frame.sessionId,
|
|
271
|
+
conversationId: frame.conversationId,
|
|
272
|
+
source: 'gateway',
|
|
273
|
+
payload: { message: 'ack' },
|
|
274
|
+
});
|
|
275
|
+
}
|
|
276
|
+
if (!shouldProcess)
|
|
277
|
+
return;
|
|
278
|
+
switch (frame.eventType) {
|
|
279
|
+
case 'invoke.result': {
|
|
280
|
+
const pending = this.pendingInvocations.get(frame.payload.invocationId);
|
|
186
281
|
if (pending) {
|
|
187
282
|
clearTimeout(pending.timer);
|
|
188
|
-
this.pendingInvocations.delete(frame.
|
|
189
|
-
if (frame.isError) {
|
|
190
|
-
pending.reject(new Error(frame.output));
|
|
283
|
+
this.pendingInvocations.delete(frame.payload.invocationId);
|
|
284
|
+
if (frame.payload.result.isError) {
|
|
285
|
+
pending.reject(new Error(frame.payload.result.output));
|
|
191
286
|
}
|
|
192
287
|
else {
|
|
193
|
-
pending.resolve(frame.
|
|
288
|
+
pending.resolve(frame.payload.result);
|
|
194
289
|
}
|
|
195
|
-
log.info('Invoke result received', {
|
|
290
|
+
log.info('Invoke result received', {
|
|
291
|
+
invocationId: frame.payload.invocationId,
|
|
292
|
+
nodeId,
|
|
293
|
+
isError: frame.payload.result.isError,
|
|
294
|
+
});
|
|
196
295
|
}
|
|
296
|
+
this.onEnvelope?.(nodeId, frame);
|
|
197
297
|
break;
|
|
198
298
|
}
|
|
199
|
-
case '
|
|
299
|
+
case 'tool.started':
|
|
300
|
+
case 'tool.finished':
|
|
301
|
+
case 'node.status':
|
|
302
|
+
if (frame.eventType === 'node.status') {
|
|
303
|
+
node.info.lastPingAt = Date.now();
|
|
304
|
+
node.info.status = 'connected';
|
|
305
|
+
}
|
|
306
|
+
this.onEnvelope?.(nodeId, frame);
|
|
307
|
+
break;
|
|
308
|
+
case 'transport.pong':
|
|
200
309
|
node.info.lastPingAt = Date.now();
|
|
201
310
|
node.info.status = 'connected';
|
|
202
311
|
break;
|
|
203
|
-
case '
|
|
204
|
-
|
|
205
|
-
log.info('Node status', { nodeId, status: frame.status });
|
|
206
|
-
break;
|
|
207
|
-
case 'disconnect':
|
|
208
|
-
this.handleNodeDisconnect(nodeId, frame.reason);
|
|
312
|
+
case 'transport.disconnect':
|
|
313
|
+
this.handleNodeDisconnect(nodeId, frame.payload.reason);
|
|
209
314
|
break;
|
|
210
315
|
default:
|
|
211
|
-
log.warn('Unexpected frame from node', { nodeId,
|
|
316
|
+
log.warn('Unexpected frame from node', { nodeId, eventType: frame.eventType });
|
|
212
317
|
}
|
|
213
318
|
}
|
|
214
319
|
handleNodeDisconnect(nodeId, reason) {
|
|
@@ -232,15 +337,34 @@ export class GatewayServer {
|
|
|
232
337
|
log.warn('Node timed out', { nodeId, elapsedMs: elapsed });
|
|
233
338
|
this.handleNodeDisconnect(nodeId, 'ping timeout');
|
|
234
339
|
node.ws.close();
|
|
340
|
+
continue;
|
|
235
341
|
}
|
|
236
|
-
|
|
342
|
+
if (elapsed > staleThreshold) {
|
|
237
343
|
node.info.status = 'stale';
|
|
238
344
|
}
|
|
239
|
-
this.
|
|
345
|
+
this.sendEnvelope(node, 'transport.ping', {
|
|
346
|
+
sessionId: 'gateway',
|
|
347
|
+
source: 'gateway',
|
|
348
|
+
payload: { sentAt: Date.now() },
|
|
349
|
+
});
|
|
240
350
|
}
|
|
241
351
|
}, this.config.pingIntervalMs);
|
|
242
352
|
}
|
|
243
|
-
|
|
353
|
+
sendEnvelope(node, eventType, options) {
|
|
354
|
+
const envelope = node.bus.createEnvelope({
|
|
355
|
+
eventType,
|
|
356
|
+
senderId: this.gatewayId,
|
|
357
|
+
instanceId: this.config.instanceId,
|
|
358
|
+
sessionId: options.sessionId,
|
|
359
|
+
conversationId: options.conversationId,
|
|
360
|
+
source: options.source,
|
|
361
|
+
payload: options.payload,
|
|
362
|
+
resumeFromSequence: options.resumeFromSequence,
|
|
363
|
+
});
|
|
364
|
+
this.sendRaw(node.ws, envelope);
|
|
365
|
+
return envelope;
|
|
366
|
+
}
|
|
367
|
+
sendRaw(ws, frame) {
|
|
244
368
|
if (ws.readyState === WebSocket.OPEN) {
|
|
245
369
|
ws.send(JSON.stringify(frame));
|
|
246
370
|
}
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAChD,OAAO,EAAE,YAAY,EAA6C,MAAM,WAAW,CAAC;AACpF,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,YAAY,EAAmB,MAAM,kBAAkB,CAAC;AAUjE,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAEtE,MAAM,GAAG,GAAG,YAAY,CAAC,gBAAgB,CAAC,CAAC;AAgB3C,MAAM,OAAO,aAAa;IAChB,GAAG,GAA2B,IAAI,CAAC;IACnC,UAAU,GAA2C,IAAI,CAAC;IAC1D,KAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;IACzC,kBAAkB,GAAG,IAAI,GAAG,EAA6B,CAAC;IAC1D,SAAS,GAA0C,IAAI,CAAC;IACxD,SAAS,CAAS;IAClB,MAAM,CAAsB;IAE5B,eAAe,CAAoD;IACnE,kBAAkB,CAAoE;IACtF,UAAU,CAAoD;IAEtE,YAAY,MAA2B;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,uBAAuB,CAAC,OAAyD;QAC/E,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC;IACjC,CAAC;IAED,0BAA0B,CAAC,OAAyE;QAClG,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC;IACpC,CAAC;IAED,kBAAkB,CAAC,OAAyD;QAC1E,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC,CAAC,GAAoB,EAAE,GAAmB,EAAE,EAAE;YAC3E,IAAI,GAAG,CAAC,GAAG,KAAK,SAAS,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;gBAClD,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC,CAAC;gBAC3D,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;YAClF,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnB,GAAG,CAAC,GAAG,EAAE,CAAC;YACZ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,GAAG,IAAI,eAAe,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAE5D,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAa,EAAE,EAAE;YAC1C,IAAI,aAAa,GAAG,KAAK,CAAC;YAC1B,IAAI,MAAM,GAAkB,IAAI,CAAC;YACjC,IAAI,OAAO,GAA2B,IAAI,CAAC;YAE3C,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;gBAClC,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE;wBAC5D,SAAS,EAAE,SAAS;wBACpB,MAAM,EAAE,SAAS;wBACjB,OAAO,EAAE,EAAE,OAAO,EAAE,wBAAwB,EAAE;qBAC/C,CAAC,CAAC,CAAC;oBACJ,EAAE,CAAC,KAAK,EAAE,CAAC;gBACb,CAAC;YACH,CAAC,EAAE,MAAM,CAAC,CAAC;YAEX,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAY,EAAE,EAAE;gBAChC,IAAI,KAAsB,CAAC;gBAC3B,IAAI,CAAC;oBACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAoB,CAAC;gBACzD,CAAC;gBAAC,MAAM,CAAC;oBACP,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE;wBAC5D,SAAS,EAAE,SAAS;wBACpB,MAAM,EAAE,SAAS;wBACjB,OAAO,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE;qBACrC,CAAC,CAAC,CAAC;oBACJ,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,IAAI,KAAK,CAAC,SAAS,KAAK,mBAAmB,EAAE,CAAC;wBAC5C,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE;4BAC5D,SAAS,EAAE,SAAS;4BACpB,MAAM,EAAE,SAAS;4BACjB,OAAO,EAAE,EAAE,OAAO,EAAE,yBAAyB,EAAE;yBAChD,CAAC,CAAC,CAAC;wBACJ,EAAE,CAAC,KAAK,EAAE,CAAC;wBACX,OAAO;oBACT,CAAC;oBAED,YAAY,CAAC,WAAW,CAAC,CAAC;oBAE1B,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC;oBACvE,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK,KAAK,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;wBACrD,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE;4BAC5D,SAAS,EAAE,SAAS;4BACpB,MAAM,EAAE,SAAS;4BACjB,OAAO,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE;yBACtC,CAAC,CAAC,CAAC;wBACJ,EAAE,CAAC,KAAK,EAAE,CAAC;wBACX,OAAO;oBACT,CAAC;oBAED,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC;wBACpC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE;4BAC5D,SAAS,EAAE,SAAS;4BACpB,MAAM,EAAE,SAAS;4BACjB,OAAO,EAAE,EAAE,OAAO,EAAE,SAAS,eAAe,qBAAqB,EAAE;yBACpE,CAAC,CAAC,CAAC;wBACJ,EAAE,CAAC,KAAK,EAAE,CAAC;wBACX,OAAO;oBACT,CAAC;oBAED,MAAM,GAAG,eAAe,CAAC;oBACzB,OAAO,GAAG,IAAI,eAAe,CAC3B,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,eAAe,EAAE,EAAE,eAAe,CAAC,CACvF,CAAC;oBACF,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;oBAC5B,aAAa,GAAG,IAAI,CAAC;oBAErB,MAAM,IAAI,GAAa;wBACrB,MAAM,EAAE,eAAe;wBACvB,YAAY;wBACZ,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE;wBACvB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;wBACtB,MAAM,EAAE,WAAW;qBACpB,CAAC;oBAEF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;oBAC5D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAE,EAAE,qBAAqB,EAAE;wBACzE,SAAS,EAAE,SAAS;wBACpB,MAAM,EAAE,SAAS;wBACjB,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE;wBACtC,kBAAkB,EAAE,OAAO,CAAC,0BAA0B,EAAE;qBACzD,CAAC,CAAC;oBAEH,MAAM,UAAU,GAAG,KAAK,CAAC,kBAAkB,IAAI,CAAC,CAAC;oBACjD,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;wBACtD,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;oBAC5B,CAAC;oBAED,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC;oBAClF,IAAI,CAAC,eAAe,EAAE,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;oBACtD,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,WAAW,CAAC,MAAO,EAAE,KAAK,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBAClB,YAAY,CAAC,WAAW,CAAC,CAAC;gBAC1B,IAAI,MAAM,EAAE,CAAC;oBACX,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;gBACzD,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;gBAC5B,GAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC7D,IAAI,MAAM,EAAE,CAAC;oBACX,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,IAAI,CAAC,UAAW,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;gBAC7C,GAAG,CAAC,IAAI,CAAC,wBAAwB,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;gBAC1F,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC9B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACxB,CAAC;QAED,KAAK,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACpD,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC;YACnD,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACrC,CAAC;QAED,KAAK,MAAM,CAAC,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAClC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,sBAAsB,EAAE;gBAC9C,SAAS,EAAE,SAAS;gBACpB,MAAM,EAAE,SAAS;gBACjB,OAAO,EAAE,EAAE,MAAM,EAAE,uBAAuB,EAAE;aAC7C,CAAC,CAAC;YACH,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAEnB,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YACjB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;QAClB,CAAC;QAED,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;gBACvC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,MAAM,CACV,MAAc,EACd,IAAY,EACZ,IAA6B,EAC7B,OASC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,SAAS,MAAM,oBAAoB,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,OAAO,GAAG,OAAO,EAAE,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;QAClE,MAAM,OAAO,GAAyB;YACpC,MAAM,EAAE,OAAO,EAAE,MAAM;YACvB,iBAAiB,EAAE,OAAO,EAAE,iBAAiB;YAC7C,MAAM,EAAE,OAAO,EAAE,MAAM;YACvB,OAAO,EAAE,OAAO,EAAE,OAAO;YACzB,QAAQ,EAAE,OAAO,EAAE,QAAQ;SAC5B,CAAC;QAEF,OAAO,IAAI,OAAO,CAAa,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACjD,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAC7C,MAAM,CAAC,IAAI,KAAK,CAAC,mBAAmB,IAAI,IAAI,MAAM,UAAU,OAAO,IAAI,CAAC,CAAC,CAAC;YAC5E,CAAC,EAAE,OAAO,CAAC,CAAC;YAEZ,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,YAAY,EAAE;gBACxC,OAAO;gBACP,MAAM;gBACN,KAAK;gBACL,MAAM;gBACN,IAAI;aACL,CAAC,CAAC;YAEH,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,gBAAgB,EAAE;gBACxC,SAAS,EAAE,OAAO,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,IAAI,QAAQ,MAAM,EAAE;gBACpE,cAAc,EAAE,OAAO,EAAE,cAAc;gBACvC,MAAM,EAAE,SAAS;gBACjB,OAAO,EAAE;oBACP,YAAY;oBACZ,IAAI;oBACJ,IAAI;oBACJ,OAAO;iBACR;aACF,CAAC,CAAC;YACH,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE;gBACtB,YAAY;gBACZ,MAAM;gBACN,IAAI;gBACJ,SAAS,EAAE,OAAO,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,IAAI,QAAQ,MAAM,EAAE;aACrE,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,gBAAgB;QACd,KAAK,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACxC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,0BAA0B,EAAE;gBAClD,SAAS,EAAE,SAAS;gBACpB,MAAM,EAAE,SAAS;gBACjB,OAAO,EAAE,EAAE,MAAM,EAAE,wBAAwB,EAAE;aAC9C,CAAC,CAAC;YACH,GAAG,CAAC,IAAI,CAAC,6BAA6B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAED,SAAS;QACP,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,OAAO,CAAC,MAAc;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC;IACtC,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAC1B,CAAC;IAEO,oBAAoB,CAC1B,SAAY,EACZ,OAMC;QAED,MAAM,GAAG,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QACtC,OAAO,GAAG,CAAC,cAAc,CAAC;YACxB,SAAS;YACT,QAAQ,EAAE,IAAI,CAAC,SAAS;YACxB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;YAClC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;SAC/C,CAAC,CAAC;IACL,CAAC;IAEO,WAAW,CAAC,MAAc,EAAE,KAAsB;QACxD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,KAAK,CAAC,SAAS,KAAK,eAAe,EAAE,CAAC;YACxC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,eAAe,EAAE;gBACvC,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,cAAc,EAAE,KAAK,CAAC,cAAc;gBACpC,MAAM,EAAE,SAAS;gBACjB,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;aAC5B,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,aAAa;YAAE,OAAO;QAE3B,QAAQ,KAAK,CAAC,SAAS,EAAE,CAAC;YACxB,KAAK,eAAe,CAAC,CAAC,CAAC;gBACrB,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBACxE,IAAI,OAAO,EAAE,CAAC;oBACZ,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;oBAC5B,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;oBAC3D,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;wBACjC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;oBACzD,CAAC;yBAAM,CAAC;wBACN,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;oBACxC,CAAC;oBACD,GAAG,CAAC,IAAI,CAAC,wBAAwB,EAAE;wBACjC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,YAAY;wBACxC,MAAM;wBACN,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO;qBACtC,CAAC,CAAC;gBACL,CAAC;gBACD,IAAI,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBACjC,MAAM;YACR,CAAC;YAED,KAAK,cAAc,CAAC;YACpB,KAAK,eAAe,CAAC;YACrB,KAAK,aAAa;gBAChB,IAAI,KAAK,CAAC,SAAS,KAAK,aAAa,EAAE,CAAC;oBACtC,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;oBAClC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC;gBACjC,CAAC;gBACD,IAAI,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBACjC,MAAM;YAER,KAAK,gBAAgB;gBACnB,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAClC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC;gBAC/B,MAAM;YAER,KAAK,sBAAsB;gBACzB,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBACxD,MAAM;YAER;gBACE,GAAG,CAAC,IAAI,CAAC,4BAA4B,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IAEO,oBAAoB,CAAC,MAAc,EAAE,MAAc;QACzD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC;QAClC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAE1B,GAAG,CAAC,IAAI,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAClD,IAAI,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAC1D,CAAC;IAEO,aAAa;QACnB,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;YAChC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,GAAG,CAAC,CAAC;YACtD,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,GAAG,CAAC,CAAC;YAE3D,KAAK,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACxC,MAAM,OAAO,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;gBAE3C,IAAI,OAAO,GAAG,mBAAmB,EAAE,CAAC;oBAClC,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;oBAC3D,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;oBAClD,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;oBAChB,SAAS;gBACX,CAAC;gBACD,IAAI,OAAO,GAAG,cAAc,EAAE,CAAC;oBAC7B,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;gBAC7B,CAAC;gBAED,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,gBAAgB,EAAE;oBACxC,SAAS,EAAE,SAAS;oBACpB,MAAM,EAAE,SAAS;oBACjB,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE;iBAChC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IACjC,CAAC;IAEO,YAAY,CAClB,IAAmB,EACnB,SAAY,EACZ,OAMC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC;YACvC,SAAS;YACT,QAAQ,EAAE,IAAI,CAAC,SAAS;YACxB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;YAClC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;SAC/C,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,QAA2B,CAAC,CAAC;QACnD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,OAAO,CAAC,EAAa,EAAE,KAAsB;QACnD,IAAI,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;YACrC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import type { AnyGatewayFrame, GatewayFrame, SessionBusEnvelopeMap, SessionBusEventType } from './types.js';
|
|
2
|
+
export declare const TRANSPORT_PROTOCOL_VERSION = 1;
|
|
3
|
+
export declare function buildBusStatePath(stateDir: string | undefined, prefix: string, id: string): string | null;
|
|
4
|
+
export declare class SessionBusState {
|
|
5
|
+
private state;
|
|
6
|
+
private readonly statePath;
|
|
7
|
+
private readonly seenEnvelopeIds;
|
|
8
|
+
constructor(statePath: string | null);
|
|
9
|
+
getHighestReceivedSequence(): number;
|
|
10
|
+
getResumeSequence(): number;
|
|
11
|
+
markConnected(frame: AnyGatewayFrame): void;
|
|
12
|
+
createEnvelope<K extends SessionBusEventType>(base: {
|
|
13
|
+
eventType: K;
|
|
14
|
+
senderId: string;
|
|
15
|
+
sessionId: string;
|
|
16
|
+
conversationId?: string;
|
|
17
|
+
source: GatewayFrame<K>['source'];
|
|
18
|
+
instanceId?: string;
|
|
19
|
+
payload: SessionBusEnvelopeMap[K];
|
|
20
|
+
resumeFromSequence?: number;
|
|
21
|
+
}): GatewayFrame<K>;
|
|
22
|
+
markReceived(frame: AnyGatewayFrame): boolean;
|
|
23
|
+
ackThrough(sequence: number): void;
|
|
24
|
+
replayAfter(sequence: number): AnyGatewayFrame[];
|
|
25
|
+
private persist;
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=session-bus.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-bus.d.ts","sourceRoot":"","sources":["../src/session-bus.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,0BAA0B,IAAI,CAAC;AAkC5C,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMzG;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,KAAK,CAA2C;IACxD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;IAC1C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;gBAEzC,SAAS,EAAE,MAAM,GAAG,IAAI;IAapC,0BAA0B,IAAI,MAAM;IAIpC,iBAAiB,IAAI,MAAM;IAI3B,aAAa,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAW3C,cAAc,CAAC,CAAC,SAAS,mBAAmB,EAAE,IAAI,EAAE;QAClD,SAAS,EAAE,CAAC,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAClC,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAClC,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B,GAAG,YAAY,CAAC,CAAC,CAAC;IA6BnB,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO;IAqB7C,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAMlC,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,eAAe,EAAE;IAIhD,OAAO,CAAC,OAAO;CAIhB"}
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
import { createHash, randomUUID } from 'node:crypto';
|
|
2
|
+
import { basename, join, resolve } from 'node:path';
|
|
3
|
+
import { homedir } from 'node:os';
|
|
4
|
+
import { ensureDir, readJsonFile, writeJsonFileAtomic, } from '@cereworker/core';
|
|
5
|
+
export const TRANSPORT_PROTOCOL_VERSION = 1;
|
|
6
|
+
const DEFAULT_STATE = {
|
|
7
|
+
nextSequence: 1,
|
|
8
|
+
highestReceivedSequence: 0,
|
|
9
|
+
outbound: [],
|
|
10
|
+
};
|
|
11
|
+
const MAX_OUTBOUND_ENVELOPES = 500;
|
|
12
|
+
function shouldPersistOutgoing(eventType) {
|
|
13
|
+
return ![
|
|
14
|
+
'transport.connect',
|
|
15
|
+
'transport.connected',
|
|
16
|
+
'transport.ack',
|
|
17
|
+
'transport.ping',
|
|
18
|
+
'transport.pong',
|
|
19
|
+
].includes(eventType);
|
|
20
|
+
}
|
|
21
|
+
function expandHome(path) {
|
|
22
|
+
return resolve(path.replace(/^~(?=\/|$)/, homedir()));
|
|
23
|
+
}
|
|
24
|
+
function sanitizeSegment(value) {
|
|
25
|
+
return value.replace(/[^a-zA-Z0-9._-]+/g, '-');
|
|
26
|
+
}
|
|
27
|
+
export function buildBusStatePath(stateDir, prefix, id) {
|
|
28
|
+
if (!stateDir)
|
|
29
|
+
return null;
|
|
30
|
+
const dir = expandHome(stateDir);
|
|
31
|
+
ensureDir(dir);
|
|
32
|
+
const digest = createHash('sha1').update(id).digest('hex').slice(0, 12);
|
|
33
|
+
return join(dir, `${sanitizeSegment(prefix)}-${sanitizeSegment(basename(id) || prefix)}-${digest}.json`);
|
|
34
|
+
}
|
|
35
|
+
export class SessionBusState {
|
|
36
|
+
state = { ...DEFAULT_STATE };
|
|
37
|
+
statePath;
|
|
38
|
+
seenEnvelopeIds = new Set();
|
|
39
|
+
constructor(statePath) {
|
|
40
|
+
this.statePath = statePath;
|
|
41
|
+
if (!statePath)
|
|
42
|
+
return;
|
|
43
|
+
const parsed = readJsonFile(statePath, null);
|
|
44
|
+
if (parsed) {
|
|
45
|
+
this.state = {
|
|
46
|
+
nextSequence: parsed.nextSequence || 1,
|
|
47
|
+
highestReceivedSequence: parsed.highestReceivedSequence || 0,
|
|
48
|
+
outbound: Array.isArray(parsed.outbound) ? parsed.outbound : [],
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
getHighestReceivedSequence() {
|
|
53
|
+
return this.state.highestReceivedSequence;
|
|
54
|
+
}
|
|
55
|
+
getResumeSequence() {
|
|
56
|
+
return this.state.highestReceivedSequence;
|
|
57
|
+
}
|
|
58
|
+
markConnected(frame) {
|
|
59
|
+
if (typeof frame.ackedThrough === 'number') {
|
|
60
|
+
this.ackThrough(frame.ackedThrough);
|
|
61
|
+
}
|
|
62
|
+
this.seenEnvelopeIds.clear();
|
|
63
|
+
if (typeof frame.sequence === 'number') {
|
|
64
|
+
this.state.highestReceivedSequence = frame.sequence;
|
|
65
|
+
}
|
|
66
|
+
this.persist();
|
|
67
|
+
}
|
|
68
|
+
createEnvelope(base) {
|
|
69
|
+
const envelope = {
|
|
70
|
+
envelopeId: randomUUID(),
|
|
71
|
+
protocolVersion: TRANSPORT_PROTOCOL_VERSION,
|
|
72
|
+
senderId: base.senderId,
|
|
73
|
+
instanceId: base.instanceId,
|
|
74
|
+
sessionId: base.sessionId,
|
|
75
|
+
conversationId: base.conversationId,
|
|
76
|
+
source: base.source,
|
|
77
|
+
eventType: base.eventType,
|
|
78
|
+
timestamp: Date.now(),
|
|
79
|
+
payload: base.payload,
|
|
80
|
+
sequence: this.state.nextSequence++,
|
|
81
|
+
ackedThrough: this.state.highestReceivedSequence,
|
|
82
|
+
...(base.resumeFromSequence !== undefined
|
|
83
|
+
? { resumeFromSequence: base.resumeFromSequence }
|
|
84
|
+
: {}),
|
|
85
|
+
};
|
|
86
|
+
if (shouldPersistOutgoing(base.eventType)) {
|
|
87
|
+
this.state.outbound.push(envelope);
|
|
88
|
+
if (this.state.outbound.length > MAX_OUTBOUND_ENVELOPES) {
|
|
89
|
+
this.state.outbound = this.state.outbound.slice(-MAX_OUTBOUND_ENVELOPES);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
this.persist();
|
|
93
|
+
return envelope;
|
|
94
|
+
}
|
|
95
|
+
markReceived(frame) {
|
|
96
|
+
if (typeof frame.ackedThrough === 'number') {
|
|
97
|
+
this.ackThrough(frame.ackedThrough);
|
|
98
|
+
}
|
|
99
|
+
if (typeof frame.sequence !== 'number') {
|
|
100
|
+
this.persist();
|
|
101
|
+
return true;
|
|
102
|
+
}
|
|
103
|
+
if (this.seenEnvelopeIds.has(frame.envelopeId) || frame.sequence <= this.state.highestReceivedSequence) {
|
|
104
|
+
this.persist();
|
|
105
|
+
return false;
|
|
106
|
+
}
|
|
107
|
+
this.seenEnvelopeIds.add(frame.envelopeId);
|
|
108
|
+
this.state.highestReceivedSequence = Math.max(this.state.highestReceivedSequence, frame.sequence);
|
|
109
|
+
this.persist();
|
|
110
|
+
return true;
|
|
111
|
+
}
|
|
112
|
+
ackThrough(sequence) {
|
|
113
|
+
if (sequence <= 0)
|
|
114
|
+
return;
|
|
115
|
+
this.state.outbound = this.state.outbound.filter((frame) => (frame.sequence ?? 0) > sequence);
|
|
116
|
+
this.persist();
|
|
117
|
+
}
|
|
118
|
+
replayAfter(sequence) {
|
|
119
|
+
return this.state.outbound.filter((frame) => (frame.sequence ?? 0) > sequence);
|
|
120
|
+
}
|
|
121
|
+
persist() {
|
|
122
|
+
if (!this.statePath)
|
|
123
|
+
return;
|
|
124
|
+
writeJsonFileAtomic(this.statePath, this.state);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
//# sourceMappingURL=session-bus.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-bus.js","sourceRoot":"","sources":["../src/session-bus.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -1,47 +1,84 @@
|
|
|
1
|
+
import type { ToolResult, TransportEnvelope } from '@cereworker/core';
|
|
1
2
|
export interface NodeStatus {
|
|
2
3
|
healthy: boolean;
|
|
3
4
|
uptime: number;
|
|
4
5
|
activeTools: number;
|
|
5
6
|
autoMode: boolean;
|
|
6
7
|
}
|
|
7
|
-
export
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
8
|
+
export interface SessionInvokeContext {
|
|
9
|
+
callId?: string;
|
|
10
|
+
requestedToolName?: string;
|
|
11
|
+
turnId?: string;
|
|
12
|
+
attempt?: number;
|
|
13
|
+
scopeKey?: string;
|
|
14
|
+
}
|
|
15
|
+
export interface SessionBusEnvelopeMap {
|
|
16
|
+
'transport.connect': {
|
|
17
|
+
nodeId: string;
|
|
18
|
+
token: string;
|
|
19
|
+
capabilities: string[];
|
|
20
|
+
};
|
|
21
|
+
'transport.connected': {
|
|
22
|
+
gatewayId: string;
|
|
23
|
+
};
|
|
24
|
+
'transport.error': {
|
|
25
|
+
message: string;
|
|
26
|
+
};
|
|
27
|
+
'transport.ack': {
|
|
28
|
+
message?: string;
|
|
29
|
+
};
|
|
30
|
+
'transport.ping': {
|
|
31
|
+
sentAt?: number;
|
|
32
|
+
};
|
|
33
|
+
'transport.pong': {
|
|
34
|
+
sentAt?: number;
|
|
35
|
+
};
|
|
36
|
+
'transport.disconnect': {
|
|
37
|
+
reason: string;
|
|
38
|
+
};
|
|
39
|
+
'transport.emergency-stop': {
|
|
40
|
+
reason?: string;
|
|
41
|
+
};
|
|
42
|
+
'node.status.request': {
|
|
43
|
+
requestId: string;
|
|
44
|
+
};
|
|
45
|
+
'node.status': {
|
|
46
|
+
requestId?: string;
|
|
47
|
+
status: NodeStatus;
|
|
48
|
+
};
|
|
49
|
+
'invoke.request': {
|
|
50
|
+
invocationId: string;
|
|
51
|
+
tool: string;
|
|
52
|
+
args: Record<string, unknown>;
|
|
53
|
+
context?: SessionInvokeContext;
|
|
54
|
+
};
|
|
55
|
+
'invoke.result': {
|
|
56
|
+
invocationId: string;
|
|
57
|
+
result: ToolResult;
|
|
58
|
+
};
|
|
59
|
+
'tool.started': {
|
|
60
|
+
invocationId: string;
|
|
61
|
+
tool: string;
|
|
62
|
+
args: Record<string, unknown>;
|
|
63
|
+
context?: SessionInvokeContext;
|
|
64
|
+
nodeId?: string;
|
|
65
|
+
};
|
|
66
|
+
'tool.finished': {
|
|
67
|
+
invocationId: string;
|
|
68
|
+
tool: string;
|
|
69
|
+
args: Record<string, unknown>;
|
|
70
|
+
result: ToolResult;
|
|
71
|
+
context?: SessionInvokeContext;
|
|
72
|
+
nodeId?: string;
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
export type SessionBusEventType = keyof SessionBusEnvelopeMap;
|
|
76
|
+
export type GatewayFrame<K extends SessionBusEventType = SessionBusEventType> = TransportEnvelope<SessionBusEnvelopeMap[K]> & {
|
|
77
|
+
eventType: K;
|
|
44
78
|
};
|
|
79
|
+
export type AnyGatewayFrame = {
|
|
80
|
+
[K in SessionBusEventType]: GatewayFrame<K>;
|
|
81
|
+
}[SessionBusEventType];
|
|
45
82
|
export interface NodeInfo {
|
|
46
83
|
nodeId: string;
|
|
47
84
|
capabilities: string[];
|
|
@@ -54,11 +91,15 @@ export interface GatewayServerConfig {
|
|
|
54
91
|
token?: string;
|
|
55
92
|
invokeTimeoutMs: number;
|
|
56
93
|
pingIntervalMs: number;
|
|
94
|
+
stateDir?: string;
|
|
95
|
+
instanceId?: string;
|
|
57
96
|
}
|
|
58
97
|
export interface GatewayClientConfig {
|
|
59
98
|
gatewayUrl: string;
|
|
60
99
|
nodeId: string;
|
|
61
100
|
token: string;
|
|
62
101
|
capabilities: string[];
|
|
102
|
+
stateDir?: string;
|
|
103
|
+
instanceId?: string;
|
|
63
104
|
}
|
|
64
105
|
//# sourceMappingURL=types.d.ts.map
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cereworker/gateway",
|
|
3
|
-
"version": "26.
|
|
3
|
+
"version": "26.404.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"nanoid": "^5.0.9",
|
|
20
20
|
"ws": "^8.18.0",
|
|
21
|
-
"@cereworker/core": "26.
|
|
21
|
+
"@cereworker/core": "26.404.2"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
24
|
"@types/ws": "^8.5.14",
|