@itphx/synth-backend 0.7.3 → 0.8.3
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/app.d.ts +1 -2
- package/dist/app.js +241 -85
- package/dist/auth/middleware.d.ts +0 -1
- package/dist/auth/middleware.js +0 -1
- package/dist/auth/oidc.d.ts +0 -1
- package/dist/auth/oidc.js +0 -1
- package/dist/events/hub.d.ts +0 -1
- package/dist/events/hub.js +0 -1
- package/dist/lib/app-config.d.ts +0 -1
- package/dist/lib/app-config.js +0 -1
- package/dist/lib/defaults-store.d.ts +0 -1
- package/dist/lib/defaults-store.js +0 -1
- package/dist/lib/i18n-config.d.ts +0 -1
- package/dist/lib/i18n-config.js +0 -1
- package/dist/lib/i18n.d.ts +0 -1
- package/dist/lib/i18n.js +2 -1
- package/dist/lib/recalc-can-summarize.d.ts +15 -0
- package/dist/lib/recalc-can-summarize.js +47 -0
- package/dist/main.d.ts +0 -1
- package/dist/main.js +0 -1
- package/dist/middleware/rate-limiter.d.ts +0 -1
- package/dist/middleware/rate-limiter.js +0 -1
- package/dist/routes/agents.d.ts +8 -4
- package/dist/routes/agents.js +18 -155
- package/dist/routes/audit.d.ts +0 -1
- package/dist/routes/audit.js +0 -1
- package/dist/routes/auth.d.ts +0 -1
- package/dist/routes/auth.js +0 -1
- package/dist/routes/context.d.ts +0 -1
- package/dist/routes/context.js +0 -1
- package/dist/routes/debug.d.ts +0 -1
- package/dist/routes/debug.js +0 -1
- package/dist/routes/gateway-patterns.d.ts +0 -1
- package/dist/routes/gateway-patterns.js +0 -1
- package/dist/routes/llm.d.ts +0 -1
- package/dist/routes/llm.js +0 -1
- package/dist/routes/logs.d.ts +0 -1
- package/dist/routes/logs.js +0 -1
- package/dist/routes/mcp-registry.d.ts +16 -0
- package/dist/routes/mcp-registry.js +359 -0
- package/dist/routes/mcp.d.ts +9 -14
- package/dist/routes/mcp.js +10 -383
- package/dist/routes/messages.d.ts +5 -1
- package/dist/routes/messages.js +15 -154
- package/dist/routes/models.d.ts +3 -3
- package/dist/routes/models.js +7 -169
- package/dist/routes/projects.d.ts +24 -4
- package/dist/routes/projects.js +53 -217
- package/dist/routes/providers.d.ts +1 -2
- package/dist/routes/providers.js +0 -1
- package/dist/routes/queue.d.ts +4 -1
- package/dist/routes/queue.js +11 -139
- package/dist/routes/sessions.d.ts +1 -2
- package/dist/routes/sessions.js +4 -2
- package/dist/routes/users.d.ts +0 -1
- package/dist/routes/users.js +0 -1
- package/package.json +4 -5
- package/dist/app.d.ts.map +0 -1
- package/dist/app.js.map +0 -1
- package/dist/auth/middleware.d.ts.map +0 -1
- package/dist/auth/middleware.js.map +0 -1
- package/dist/auth/oidc.d.ts.map +0 -1
- package/dist/auth/oidc.js.map +0 -1
- package/dist/auth/oidc.test.d.ts +0 -2
- package/dist/auth/oidc.test.d.ts.map +0 -1
- package/dist/auth/oidc.test.js +0 -39
- package/dist/auth/oidc.test.js.map +0 -1
- package/dist/events/hub.d.ts.map +0 -1
- package/dist/events/hub.js.map +0 -1
- package/dist/events/hub.test.d.ts +0 -2
- package/dist/events/hub.test.d.ts.map +0 -1
- package/dist/events/hub.test.js +0 -74
- package/dist/events/hub.test.js.map +0 -1
- package/dist/integration/hybrid.integration.test.d.ts +0 -2
- package/dist/integration/hybrid.integration.test.d.ts.map +0 -1
- package/dist/integration/hybrid.integration.test.js +0 -289
- package/dist/integration/hybrid.integration.test.js.map +0 -1
- package/dist/lib/app-config.d.ts.map +0 -1
- package/dist/lib/app-config.js.map +0 -1
- package/dist/lib/defaults-store.d.ts.map +0 -1
- package/dist/lib/defaults-store.js.map +0 -1
- package/dist/lib/defaults-store.test.d.ts +0 -2
- package/dist/lib/defaults-store.test.d.ts.map +0 -1
- package/dist/lib/defaults-store.test.js +0 -168
- package/dist/lib/defaults-store.test.js.map +0 -1
- package/dist/lib/git-service.d.ts +0 -15
- package/dist/lib/git-service.d.ts.map +0 -1
- package/dist/lib/git-service.js +0 -215
- package/dist/lib/git-service.js.map +0 -1
- package/dist/lib/i18n-config.d.ts.map +0 -1
- package/dist/lib/i18n-config.js.map +0 -1
- package/dist/lib/i18n.d.ts.map +0 -1
- package/dist/lib/i18n.js.map +0 -1
- package/dist/lib/orchestrator-workspace.test.d.ts +0 -2
- package/dist/lib/orchestrator-workspace.test.d.ts.map +0 -1
- package/dist/lib/orchestrator-workspace.test.js +0 -85
- package/dist/lib/orchestrator-workspace.test.js.map +0 -1
- package/dist/lib/workspace-resolver.d.ts +0 -26
- package/dist/lib/workspace-resolver.d.ts.map +0 -1
- package/dist/lib/workspace-resolver.js +0 -249
- package/dist/lib/workspace-resolver.js.map +0 -1
- package/dist/main.d.ts.map +0 -1
- package/dist/main.js.map +0 -1
- package/dist/middleware/rate-limiter.d.ts.map +0 -1
- package/dist/middleware/rate-limiter.js.map +0 -1
- package/dist/routes/agents.d.ts.map +0 -1
- package/dist/routes/agents.js.map +0 -1
- package/dist/routes/agents.test.d.ts +0 -2
- package/dist/routes/agents.test.d.ts.map +0 -1
- package/dist/routes/agents.test.js +0 -211
- package/dist/routes/agents.test.js.map +0 -1
- package/dist/routes/audit.d.ts.map +0 -1
- package/dist/routes/audit.js.map +0 -1
- package/dist/routes/audit.test.d.ts +0 -2
- package/dist/routes/audit.test.d.ts.map +0 -1
- package/dist/routes/audit.test.js +0 -285
- package/dist/routes/audit.test.js.map +0 -1
- package/dist/routes/auth.d.ts.map +0 -1
- package/dist/routes/auth.js.map +0 -1
- package/dist/routes/auth.test.d.ts +0 -2
- package/dist/routes/auth.test.d.ts.map +0 -1
- package/dist/routes/auth.test.js +0 -63
- package/dist/routes/auth.test.js.map +0 -1
- package/dist/routes/context.d.ts.map +0 -1
- package/dist/routes/context.js.map +0 -1
- package/dist/routes/debug.d.ts.map +0 -1
- package/dist/routes/debug.js.map +0 -1
- package/dist/routes/debug.test.d.ts +0 -2
- package/dist/routes/debug.test.d.ts.map +0 -1
- package/dist/routes/debug.test.js +0 -102
- package/dist/routes/debug.test.js.map +0 -1
- package/dist/routes/fs.d.ts +0 -5
- package/dist/routes/fs.d.ts.map +0 -1
- package/dist/routes/fs.js +0 -391
- package/dist/routes/fs.js.map +0 -1
- package/dist/routes/gateway-patterns.d.ts.map +0 -1
- package/dist/routes/gateway-patterns.js.map +0 -1
- package/dist/routes/gateway-patterns.test.d.ts +0 -2
- package/dist/routes/gateway-patterns.test.d.ts.map +0 -1
- package/dist/routes/gateway-patterns.test.js +0 -176
- package/dist/routes/gateway-patterns.test.js.map +0 -1
- package/dist/routes/git.d.ts +0 -5
- package/dist/routes/git.d.ts.map +0 -1
- package/dist/routes/git.js +0 -105
- package/dist/routes/git.js.map +0 -1
- package/dist/routes/llm.d.ts.map +0 -1
- package/dist/routes/llm.js.map +0 -1
- package/dist/routes/llm.test.d.ts +0 -2
- package/dist/routes/llm.test.d.ts.map +0 -1
- package/dist/routes/llm.test.js +0 -629
- package/dist/routes/llm.test.js.map +0 -1
- package/dist/routes/logs.d.ts.map +0 -1
- package/dist/routes/logs.js.map +0 -1
- package/dist/routes/logs.test.d.ts +0 -2
- package/dist/routes/logs.test.d.ts.map +0 -1
- package/dist/routes/logs.test.js +0 -269
- package/dist/routes/logs.test.js.map +0 -1
- package/dist/routes/mcp-network-policy.integration.test.d.ts +0 -2
- package/dist/routes/mcp-network-policy.integration.test.d.ts.map +0 -1
- package/dist/routes/mcp-network-policy.integration.test.js +0 -44
- package/dist/routes/mcp-network-policy.integration.test.js.map +0 -1
- package/dist/routes/mcp-registry.test.d.ts +0 -2
- package/dist/routes/mcp-registry.test.d.ts.map +0 -1
- package/dist/routes/mcp-registry.test.js +0 -247
- package/dist/routes/mcp-registry.test.js.map +0 -1
- package/dist/routes/mcp.d.ts.map +0 -1
- package/dist/routes/mcp.js.map +0 -1
- package/dist/routes/mcp.test.d.ts +0 -2
- package/dist/routes/mcp.test.d.ts.map +0 -1
- package/dist/routes/mcp.test.js +0 -388
- package/dist/routes/mcp.test.js.map +0 -1
- package/dist/routes/messages.d.ts.map +0 -1
- package/dist/routes/messages.js.map +0 -1
- package/dist/routes/models.d.ts.map +0 -1
- package/dist/routes/models.js.map +0 -1
- package/dist/routes/models.test.d.ts +0 -2
- package/dist/routes/models.test.d.ts.map +0 -1
- package/dist/routes/models.test.js +0 -449
- package/dist/routes/models.test.js.map +0 -1
- package/dist/routes/projects-mcp.test.d.ts +0 -6
- package/dist/routes/projects-mcp.test.d.ts.map +0 -1
- package/dist/routes/projects-mcp.test.js +0 -160
- package/dist/routes/projects-mcp.test.js.map +0 -1
- package/dist/routes/projects.d.ts.map +0 -1
- package/dist/routes/projects.js.map +0 -1
- package/dist/routes/projects.test.d.ts +0 -2
- package/dist/routes/projects.test.d.ts.map +0 -1
- package/dist/routes/projects.test.js +0 -250
- package/dist/routes/projects.test.js.map +0 -1
- package/dist/routes/providers.d.ts.map +0 -1
- package/dist/routes/providers.js.map +0 -1
- package/dist/routes/providers.test.d.ts +0 -2
- package/dist/routes/providers.test.d.ts.map +0 -1
- package/dist/routes/providers.test.js +0 -211
- package/dist/routes/providers.test.js.map +0 -1
- package/dist/routes/queue.d.ts.map +0 -1
- package/dist/routes/queue.js.map +0 -1
- package/dist/routes/queue.test.d.ts +0 -2
- package/dist/routes/queue.test.d.ts.map +0 -1
- package/dist/routes/queue.test.js +0 -224
- package/dist/routes/queue.test.js.map +0 -1
- package/dist/routes/sessions-mcp.test.d.ts +0 -6
- package/dist/routes/sessions-mcp.test.d.ts.map +0 -1
- package/dist/routes/sessions-mcp.test.js +0 -182
- package/dist/routes/sessions-mcp.test.js.map +0 -1
- package/dist/routes/sessions.d.ts.map +0 -1
- package/dist/routes/sessions.js.map +0 -1
- package/dist/routes/sessions.test.d.ts +0 -2
- package/dist/routes/sessions.test.d.ts.map +0 -1
- package/dist/routes/sessions.test.js +0 -602
- package/dist/routes/sessions.test.js.map +0 -1
- package/dist/routes/settings.test.d.ts +0 -2
- package/dist/routes/settings.test.d.ts.map +0 -1
- package/dist/routes/settings.test.js +0 -184
- package/dist/routes/settings.test.js.map +0 -1
- package/dist/routes/users.d.ts.map +0 -1
- package/dist/routes/users.js.map +0 -1
- package/dist/storage/json-store.d.ts +0 -20
- package/dist/storage/json-store.d.ts.map +0 -1
- package/dist/storage/json-store.js +0 -100
- package/dist/storage/json-store.js.map +0 -1
- package/dist/storage/json-store.test.d.ts +0 -2
- package/dist/storage/json-store.test.d.ts.map +0 -1
- package/dist/storage/json-store.test.js +0 -59
- package/dist/storage/json-store.test.js.map +0 -1
- package/dist/storage/project-store.d.ts +0 -30
- package/dist/storage/project-store.d.ts.map +0 -1
- package/dist/storage/project-store.js +0 -109
- package/dist/storage/project-store.js.map +0 -1
package/dist/routes/queue.js
CHANGED
|
@@ -1,145 +1,17 @@
|
|
|
1
1
|
import { Hono } from 'hono';
|
|
2
|
-
import {
|
|
2
|
+
import { createQueueRoutes as createCoreQueueRoutes } from '@itphx/synth-core';
|
|
3
3
|
import { t } from '../lib/i18n.js';
|
|
4
|
+
/**
|
|
5
|
+
* Backend-обёртка над core-фабрикой очереди: добавляет только i18n-сообщения.
|
|
6
|
+
* Логика роутов (clear/return/resume/retry-now/cancel-retry) — в core-фабрике.
|
|
7
|
+
*/
|
|
4
8
|
export function createQueueRoutes(kit, sessionManager, queueManager, eventBus, processMessage) {
|
|
5
9
|
const app = new Hono();
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
queueManager.stop(sessionId);
|
|
13
|
-
return c.json({ cleared: true });
|
|
14
|
-
});
|
|
15
|
-
// POST /api/v2/queue/:sessionId/return — вернуть очередь (тексты сообщений)
|
|
16
|
-
// ?index=N — вернуть только одно сообщение
|
|
17
|
-
app.post('/:sessionId/return', kit.requireAuth, async (c) => {
|
|
18
|
-
const sessionId = c.req.param('sessionId');
|
|
19
|
-
const indexStr = c.req.query('index');
|
|
20
|
-
const index = indexStr !== undefined ? parseInt(indexStr, 10) : undefined;
|
|
21
|
-
const session = await sessionManager.getSession(sessionId);
|
|
22
|
-
if (!session) {
|
|
23
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
24
|
-
}
|
|
25
|
-
if (index !== undefined && !isNaN(index) && !session.pendingMessages[index]) {
|
|
26
|
-
return c.json({ error: { code: 'NOT_FOUND', message: 'Message not found at index' } }, 404);
|
|
27
|
-
}
|
|
28
|
-
// Активный стрим (не отменённый) продолжает обрабатываться — его user-сообщение
|
|
29
|
-
// из истории удалять нельзя. При зависшей сессии (cancelled=true) — можно.
|
|
30
|
-
const activeStreamId = session.currentStream && !session.currentStream.cancelled
|
|
31
|
-
? session.currentStream.streamId
|
|
32
|
-
: undefined;
|
|
33
|
-
let texts = [];
|
|
34
|
-
let remainingCount = 0;
|
|
35
|
-
await sessionManager.safeUpdate(sessionId, async (s) => {
|
|
36
|
-
let removedStreamIds = [];
|
|
37
|
-
if (index !== undefined && !isNaN(index)) {
|
|
38
|
-
const msg = s.pendingMessages[index];
|
|
39
|
-
if (!msg)
|
|
40
|
-
return;
|
|
41
|
-
texts = [msg.content];
|
|
42
|
-
const sid = msg.metadata?.stream_id;
|
|
43
|
-
removedStreamIds = sid ? [sid] : [];
|
|
44
|
-
s.pendingMessages = s.pendingMessages.filter((_, i) => i !== index);
|
|
45
|
-
}
|
|
46
|
-
else {
|
|
47
|
-
texts = s.pendingMessages.map((m) => m.content);
|
|
48
|
-
removedStreamIds = s.pendingMessages
|
|
49
|
-
.map((m) => m.metadata?.stream_id)
|
|
50
|
-
.filter((id) => !!id);
|
|
51
|
-
s.pendingMessages = [];
|
|
52
|
-
}
|
|
53
|
-
remainingCount = s.pendingMessages.length;
|
|
54
|
-
// Удаляем возвращённые user-сообщения из истории по stream_id, чтобы при
|
|
55
|
-
// повторной отправке из поля ввода не было дубля. Активный стрим не трогаем.
|
|
56
|
-
if (removedStreamIds.length > 0) {
|
|
57
|
-
s.messages = s.messages.filter((m) => {
|
|
58
|
-
if (m.role !== MessageRole.USER)
|
|
59
|
-
return true;
|
|
60
|
-
const sid = m.metadata?.stream_id;
|
|
61
|
-
if (!sid)
|
|
62
|
-
return true;
|
|
63
|
-
if (sid === activeStreamId)
|
|
64
|
-
return true;
|
|
65
|
-
return !removedStreamIds.includes(sid);
|
|
66
|
-
});
|
|
67
|
-
}
|
|
68
|
-
// Разблокируем сессию: снимаем blocked и currentStream (иначе return
|
|
69
|
-
// оставит сессию в «зависшем» состоянии с pending=0, но blocked).
|
|
70
|
-
if (remainingCount === 0) {
|
|
71
|
-
s.status.blocked = undefined;
|
|
72
|
-
s.status.blockedAt = undefined;
|
|
73
|
-
s.currentStream = undefined;
|
|
74
|
-
}
|
|
75
|
-
});
|
|
76
|
-
if (remainingCount === 0 && !activeStreamId) {
|
|
77
|
-
queueManager.stop(sessionId);
|
|
78
|
-
}
|
|
79
|
-
return c.json({ texts });
|
|
80
|
-
});
|
|
81
|
-
// POST /api/v2/queue/:sessionId/resume — возобновить обработку
|
|
82
|
-
app.post('/:sessionId/resume', kit.requireAuth, async (c) => {
|
|
83
|
-
const sessionId = c.req.param('sessionId');
|
|
84
|
-
const session = await sessionManager.getSession(sessionId);
|
|
85
|
-
if (!session) {
|
|
86
|
-
return c.json({ error: { code: 'NOT_FOUND', message: t('errors.notFound.session', undefined, c) } }, 404);
|
|
87
|
-
}
|
|
88
|
-
if (session.pendingMessages.length === 0) {
|
|
89
|
-
return c.json({ resumed: true, pending_count: 0 });
|
|
90
|
-
}
|
|
91
|
-
// Разблокировать и запустить процессор заново
|
|
92
|
-
await sessionManager.forceReleaseLock(sessionId);
|
|
93
|
-
// Используем существующий stream_id первого pending-сообщения, НЕ генерируем
|
|
94
|
-
// новый — иначе Phase 1 нового процессора повторно запушит сообщение в историю.
|
|
95
|
-
// Если stream_id отсутствует — генерируем один раз и сохраняем.
|
|
96
|
-
// Публикуем message.queued только если сообщение ещё НЕ в истории.
|
|
97
|
-
const firstMsg = session.pendingMessages[0];
|
|
98
|
-
let streamId;
|
|
99
|
-
let alreadyInHistory = false;
|
|
100
|
-
if (firstMsg) {
|
|
101
|
-
await sessionManager.safeUpdate(sessionId, async (s) => {
|
|
102
|
-
const p = s.pendingMessages[0];
|
|
103
|
-
if (!p)
|
|
104
|
-
return;
|
|
105
|
-
if (!p.metadata)
|
|
106
|
-
p.metadata = {};
|
|
107
|
-
if (!p.metadata.stream_id)
|
|
108
|
-
p.metadata.stream_id = generateStreamId();
|
|
109
|
-
streamId = p.metadata.stream_id;
|
|
110
|
-
alreadyInHistory = s.messages.some((m) => m.role === MessageRole.USER && m.metadata?.stream_id === streamId);
|
|
111
|
-
});
|
|
112
|
-
if (streamId && !alreadyInHistory) {
|
|
113
|
-
eventBus.publish(sessionId, 'message.queued', {
|
|
114
|
-
stream_id: streamId,
|
|
115
|
-
pending_count: session.pendingMessages.length,
|
|
116
|
-
message: firstMsg.content,
|
|
117
|
-
agent_role: firstMsg.agentRole,
|
|
118
|
-
author: firstMsg.author,
|
|
119
|
-
});
|
|
120
|
-
}
|
|
121
|
-
}
|
|
122
|
-
queueManager.createProcessor(sessionId, sessionManager, eventBus, processMessage);
|
|
123
|
-
return c.json({ resumed: true, pending_count: session.pendingMessages.length });
|
|
124
|
-
});
|
|
125
|
-
// POST /api/v2/queue/:sessionId/retry-now — немедленный повтор при backoff
|
|
126
|
-
app.post('/:sessionId/retry-now', kit.requireAuth, async (c) => {
|
|
127
|
-
const sessionId = c.req.param('sessionId');
|
|
128
|
-
const retried = queueManager.retryNow(sessionId);
|
|
129
|
-
if (!retried) {
|
|
130
|
-
return c.json({ error: { code: 'CONFLICT', message: 'Процессор не находится в состоянии повтора' } }, 409);
|
|
131
|
-
}
|
|
132
|
-
return c.json({ retried: true });
|
|
133
|
-
});
|
|
134
|
-
// POST /api/v2/queue/:sessionId/cancel-retry — отменить повторные попытки
|
|
135
|
-
app.post('/:sessionId/cancel-retry', kit.requireAuth, async (c) => {
|
|
136
|
-
const sessionId = c.req.param('sessionId');
|
|
137
|
-
const cancelled = await queueManager.cancelRetry(sessionId);
|
|
138
|
-
if (!cancelled) {
|
|
139
|
-
return c.json({ error: { code: 'CONFLICT', message: 'Процессор не найден' } }, 409);
|
|
140
|
-
}
|
|
141
|
-
return c.json({ cancelled: true });
|
|
142
|
-
});
|
|
10
|
+
app.route('/', createCoreQueueRoutes({ requireAuth: kit.requireAuth }, sessionManager, queueManager, eventBus, processMessage, undefined, {
|
|
11
|
+
messages: {
|
|
12
|
+
sessionNotFound: (c) => t('errors.notFound.session', undefined, c),
|
|
13
|
+
messageNotFoundIndex: (c) => t('errors.notFound.messageIndex', undefined, c),
|
|
14
|
+
},
|
|
15
|
+
}));
|
|
143
16
|
return app;
|
|
144
17
|
}
|
|
145
|
-
//# sourceMappingURL=queue.js.map
|
|
@@ -7,7 +7,7 @@ import type { ChatOrchestrator } from '@itphx/synth-core';
|
|
|
7
7
|
import type { ContextOptimizer } from '@itphx/synth-core';
|
|
8
8
|
import type { ProfileStore } from '@itphx/synth-shared';
|
|
9
9
|
import type { EventHub } from '../events/hub.js';
|
|
10
|
-
import type { ProjectStore } from '
|
|
10
|
+
import type { ProjectStore } from '@itphx/synth-core';
|
|
11
11
|
/**
|
|
12
12
|
* Backend-обёртка над core-фабрикой сессий (ТД-1, фаза B2). Здесь остаются только
|
|
13
13
|
* backend-специфичные роуты (MCP-скоуп сессии, секреты, export/import, отладка,
|
|
@@ -24,4 +24,3 @@ export declare function createSessionRoutes(kit: AuthKit, sessionManager: Sessio
|
|
|
24
24
|
profilesStore?: ProfileStore,
|
|
25
25
|
/** Агент по умолчанию для новых сессий без `settings.agentRole` (runtime-настройка). */
|
|
26
26
|
resolveDefaultAgent?: () => string | Promise<string>): Hono;
|
|
27
|
-
//# sourceMappingURL=sessions.d.ts.map
|
package/dist/routes/sessions.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Hono } from 'hono';
|
|
2
|
-
import { MessageRole, generateStreamId, nowISO, sessionMcpUpdateSchema, } from '@itphx/synth-shared';
|
|
2
|
+
import { MessageRole, generateStreamId, nowISO, sessionMcpUpdateSchema, normalizeIconKey, normalizeColorKey, } from '@itphx/synth-shared';
|
|
3
3
|
import { createRateLimiter } from '../middleware/rate-limiter.js';
|
|
4
4
|
import { enqueueUserMessage, serializeSession, createSessionRoutes as createCoreSessionRoutes, } from '@itphx/synth-core';
|
|
5
5
|
import { t } from '../lib/i18n.js';
|
|
@@ -166,6 +166,9 @@ resolveDefaultAgent) {
|
|
|
166
166
|
session.mode = (body.mode ?? undefined);
|
|
167
167
|
session.planApproved = body.plan_approved ?? body.planApproved ?? false;
|
|
168
168
|
session.branchPoint = body.branch_point ?? body.branchPoint;
|
|
169
|
+
// Метаданные сессии (иконка/цвет) — нормализуем legacy при импорте.
|
|
170
|
+
session.icon = normalizeIconKey(body.icon);
|
|
171
|
+
session.color = normalizeColorKey(body.color);
|
|
169
172
|
session.obfuscationMap = (body.obfuscation_map ?? body.obfuscationMap);
|
|
170
173
|
session.createdAt = typeof (body.created_at ?? body.createdAt) === 'string'
|
|
171
174
|
? (body.created_at ?? body.createdAt)
|
|
@@ -394,4 +397,3 @@ resolveDefaultAgent) {
|
|
|
394
397
|
}));
|
|
395
398
|
return app;
|
|
396
399
|
}
|
|
397
|
-
//# sourceMappingURL=sessions.js.map
|
package/dist/routes/users.d.ts
CHANGED
package/dist/routes/users.js
CHANGED
package/package.json
CHANGED
|
@@ -1,19 +1,18 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@itphx/synth-backend",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.8.3",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"files": [
|
|
6
6
|
"dist"
|
|
7
7
|
],
|
|
8
8
|
"dependencies": {
|
|
9
9
|
"@hono/node-server": "^1.18.0",
|
|
10
|
-
"@itphx/synth-core": "0.
|
|
11
|
-
"@itphx/synth-shared": "0.
|
|
10
|
+
"@itphx/synth-core": "0.8.3",
|
|
11
|
+
"@itphx/synth-shared": "0.8.3",
|
|
12
12
|
"hono": "^4.9.0",
|
|
13
13
|
"hono-rate-limiter": "^0.5.3",
|
|
14
14
|
"jose": "^6.2.3",
|
|
15
15
|
"js-yaml": "^4.1.1",
|
|
16
|
-
"simple-git": "^3.36.0",
|
|
17
16
|
"ws": "^8.20.1",
|
|
18
17
|
"zod": "^3.24.0"
|
|
19
18
|
},
|
|
@@ -27,7 +26,7 @@
|
|
|
27
26
|
"scripts": {
|
|
28
27
|
"dev": "tsx src/main.ts",
|
|
29
28
|
"start": "node dist/main.js",
|
|
30
|
-
"build": "tsc && mkdir -p dist/agents && cp -r src/agents/definitions dist/agents/definitions",
|
|
29
|
+
"build": "rm -rf dist && tsc -p tsconfig.build.json && mkdir -p dist/agents && cp -r src/agents/definitions dist/agents/definitions",
|
|
31
30
|
"typecheck": "tsc --noEmit",
|
|
32
31
|
"lint": "eslint src/",
|
|
33
32
|
"test": "vitest run",
|
package/dist/app.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAmB,MAAM,WAAW,CAAC;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAErC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,EACM,cAAc,EAAE,QAAQ,EAAE,qBAAqB,EACT,gBAAgB,EAGjE,oBAAoB,EAMrB,MAAM,mBAAmB,CAAC;AAM3B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAsBpD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAG3C,MAAM,WAAW,uBAAuB;IACtC,0EAA0E;IAC1E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yFAAyF;IACzF,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kEAAkE;IAClE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mEAAmE;IACnE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iFAAiF;IACjF,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,IAAI,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,aAAa,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,gBAAgB,CAAC;IAC/B,YAAY,EAAE,qBAAqB,CAAC;IACpC,aAAa,EAAE,oBAAoB,CAAC;IACpC;;;OAGG;IACH,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;QAChD,MAAM,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;QACxC,GAAG,EAAE,eAAe,CAAC;QACrB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC,CAAC;CACJ;AA2CD,wBAAsB,gBAAgB,CAAC,IAAI,GAAE,uBAA4B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAmyBpG"}
|
package/dist/app.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/auth/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EAAa,SAAS,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAyBjE,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU;wBAKpB;QAAE,GAAG,EAAE;YAAE,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;SAAE,CAAA;KAAE,KAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;;;;;;;;;;;;;;kCA0HxE,MAAM,EAAE;;;;;;iBAHzB;QAAE,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,KAAG,OAAO;iBAVvC;QAAE,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,YAAY,MAAM,EAAE,KAAG,OAAO;0BAsBlD,IAAI,KAAG,MAAM;0BAgBb,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,aAAa,MAAM,KAAG,IAAI;6BANtD,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,aAAa,MAAM,KAAG,IAAI;EA4B7F;AAED,MAAM,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/auth/middleware.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/oidc.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../../src/auth/oidc.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAEhD;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,uDAAuD;AACvD,MAAM,WAAW,aAAa;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,qDAAqD;AACrD,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;CACtB;AAKD;;GAEG;AACH,qBAAa,UAAU;IAGT,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,OAAO,CAAC,UAAU,CAA8B;gBAEnB,MAAM,EAAE,UAAU;IAE/C;;;OAGG;IACG,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC;IAe5C;;OAEG;IACG,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAYlD;;OAEG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IA0B1D;;;OAGG;IACG,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IA0BpF;;;OAGG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAOnD;;;OAGG;IACG,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;CAO5E;AAED,wDAAwD;AACxD,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AA4BD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAgBzF;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,QAAQ,CAAC,EAAE,MAAM,GAChB,QAAQ,CAMV;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,QAAQ,GAAG,IAAI,CAYhD;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,CAAC,EAAE,UAAU,GAAG,MAAM,UAAU,GAAG,IAAI,CAY/E"}
|
package/dist/auth/oidc.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../src/auth/oidc.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/oidc.test.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.test.d.ts","sourceRoot":"","sources":["../../src/auth/oidc.test.ts"],"names":[],"mappings":""}
|
package/dist/auth/oidc.test.js
DELETED
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
import { describe, it, expect } from 'vitest';
|
|
2
|
-
import { extractUser, extractUserFromTokens } from './oidc.js';
|
|
3
|
-
describe('oidc extractUser', () => {
|
|
4
|
-
it('берёт роли из realm_access id_token (ADMIN)', () => {
|
|
5
|
-
const user = extractUser({ realm_access: { roles: ['admin'] } });
|
|
6
|
-
expect(user.roles).toEqual(['ADMIN']);
|
|
7
|
-
});
|
|
8
|
-
it('нормализует регистр и отбрасывает неизвестные роли', () => {
|
|
9
|
-
const user = extractUser({ realm_access: { roles: ['Admin', 'superadmin', 'user'] } });
|
|
10
|
-
expect(user.roles).toEqual(['ADMIN', 'USER']);
|
|
11
|
-
});
|
|
12
|
-
it('учитывает client roles из resource_access.<clientId>.roles', () => {
|
|
13
|
-
const user = extractUser({ resource_access: { synth: { roles: ['lead'] } } }, 'synth');
|
|
14
|
-
expect(user.roles).toEqual(['LEAD']);
|
|
15
|
-
});
|
|
16
|
-
it('объединяет realm и client роли без дубликатов', () => {
|
|
17
|
-
const user = extractUser({ realm_access: { roles: ['admin'] }, resource_access: { synth: { roles: ['admin', 'user'] } } }, 'synth');
|
|
18
|
-
expect(user.roles).toEqual(['ADMIN', 'USER']);
|
|
19
|
-
});
|
|
20
|
-
it('возвращает дефолт USER при отсутствии известных ролей', () => {
|
|
21
|
-
const user = extractUser({ sub: 'x', preferred_username: 'ivan' });
|
|
22
|
-
expect(user.roles).toEqual(['USER']);
|
|
23
|
-
});
|
|
24
|
-
});
|
|
25
|
-
describe('oidc extractUserFromTokens', () => {
|
|
26
|
-
it('берёт роли из access_token, если в id_token их нет', () => {
|
|
27
|
-
const user = extractUserFromTokens({ sub: 'x', preferred_username: 'ivan' }, { realm_access: { roles: ['admin'] } });
|
|
28
|
-
expect(user.roles).toEqual(['ADMIN']);
|
|
29
|
-
});
|
|
30
|
-
it('приоритет отдаёт ролям из id_token', () => {
|
|
31
|
-
const user = extractUserFromTokens({ realm_access: { roles: ['user'] } }, { realm_access: { roles: ['admin'] } });
|
|
32
|
-
expect(user.roles).toEqual(['USER']);
|
|
33
|
-
});
|
|
34
|
-
it('возвращает дефолт USER, когда ролей нет ни в одном токене', () => {
|
|
35
|
-
const user = extractUserFromTokens({}, {});
|
|
36
|
-
expect(user.roles).toEqual(['USER']);
|
|
37
|
-
});
|
|
38
|
-
});
|
|
39
|
-
//# sourceMappingURL=oidc.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.test.js","sourceRoot":"","sources":["../../src/auth/oidc.test.ts"],"names":[],"mappings":"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"}
|
package/dist/events/hub.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"hub.d.ts","sourceRoot":"","sources":["../../src/events/hub.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAA;CAC5B;AAuDD;;;;GAIG;AACH,qBAAa,QAAQ;IAKjB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,cAAc;IALxB,OAAO,CAAC,OAAO,CAAoC;IACnD,OAAO,CAAC,UAAU,CAAuD;gBAG/D,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,cAAc;IAGlC,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAcxD,gBAAgB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;IAY3C,QAAQ,IAAI,IAAI;IAWV,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa1E,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAgB/D,OAAO,CAAC,yBAAyB;IA2BjC,OAAO,CAAC,yBAAyB;CASlC"}
|
package/dist/events/hub.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"hub.js","sourceRoot":"","sources":["../../src/events/hub.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"hub.test.d.ts","sourceRoot":"","sources":["../../src/events/hub.test.ts"],"names":[],"mappings":""}
|
package/dist/events/hub.test.js
DELETED
|
@@ -1,74 +0,0 @@
|
|
|
1
|
-
import { describe, it, expect } from 'vitest';
|
|
2
|
-
import { EventBus } from '@itphx/synth-core';
|
|
3
|
-
import { EventHub } from './hub.js';
|
|
4
|
-
function makeHub(existingSessions = []) {
|
|
5
|
-
const eventBus = new EventBus();
|
|
6
|
-
const sessionManager = {
|
|
7
|
-
listSessions: async () => existingSessions.map((id) => ({ id })),
|
|
8
|
-
};
|
|
9
|
-
const hub = new EventHub(eventBus, sessionManager);
|
|
10
|
-
return { eventBus, hub };
|
|
11
|
-
}
|
|
12
|
-
function makeClient() {
|
|
13
|
-
const received = [];
|
|
14
|
-
const client = {
|
|
15
|
-
userId: 'u1',
|
|
16
|
-
username: 'u1',
|
|
17
|
-
send: (event) => received.push(event),
|
|
18
|
-
};
|
|
19
|
-
return { client, received };
|
|
20
|
-
}
|
|
21
|
-
describe('EventHub — автоподписка на дочерние сессии', () => {
|
|
22
|
-
it('подписывает клиента на child из session.created родителя и доставляет его stream.usage', async () => {
|
|
23
|
-
const { eventBus, hub } = makeHub(['parent']);
|
|
24
|
-
const { client, received } = makeClient();
|
|
25
|
-
await hub.registerClient(client);
|
|
26
|
-
eventBus.publish('parent', 'session.created', { id: 'child-1', parentId: 'parent' });
|
|
27
|
-
eventBus.publish('child-1', 'stream.usage', { session_id: 'child-1', outputTokens: 42 });
|
|
28
|
-
const usage = received.find((e) => e.type === 'stream.usage');
|
|
29
|
-
expect(usage).toBeDefined();
|
|
30
|
-
expect(usage.sessionId).toBe('child-1');
|
|
31
|
-
expect(usage.data.session_id).toBe('child-1');
|
|
32
|
-
});
|
|
33
|
-
it('подписывает клиента на child из child.session.updated родителя', async () => {
|
|
34
|
-
const { eventBus, hub } = makeHub(['parent']);
|
|
35
|
-
const { client, received } = makeClient();
|
|
36
|
-
await hub.registerClient(client);
|
|
37
|
-
eventBus.publish('parent', 'child.session.updated', { session: { id: 'child-2' } });
|
|
38
|
-
eventBus.publish('child-2', 'stream.usage', { session_id: 'child-2', outputTokens: 7 });
|
|
39
|
-
expect(received.some((e) => e.type === 'stream.usage' && e.sessionId === 'child-2')).toBe(true);
|
|
40
|
-
});
|
|
41
|
-
it('подписывает клиента на child из child.message.added (child_session_id)', async () => {
|
|
42
|
-
const { eventBus, hub } = makeHub(['parent']);
|
|
43
|
-
const { client, received } = makeClient();
|
|
44
|
-
await hub.registerClient(client);
|
|
45
|
-
eventBus.publish('parent', 'child.message.added', { child_session_id: 'child-3' });
|
|
46
|
-
eventBus.publish('child-3', 'stream.usage', { session_id: 'child-3' });
|
|
47
|
-
expect(received.some((e) => e.type === 'stream.usage' && e.sessionId === 'child-3')).toBe(true);
|
|
48
|
-
});
|
|
49
|
-
it('подписывает клиента на child из subagent.resume.started', async () => {
|
|
50
|
-
const { eventBus, hub } = makeHub(['parent']);
|
|
51
|
-
const { client, received } = makeClient();
|
|
52
|
-
await hub.registerClient(client);
|
|
53
|
-
eventBus.publish('parent', 'subagent.resume.started', { child_session_id: 'child-4' });
|
|
54
|
-
eventBus.publish('child-4', 'stream.usage', { session_id: 'child-4' });
|
|
55
|
-
expect(received.some((e) => e.type === 'stream.usage' && e.sessionId === 'child-4')).toBe(true);
|
|
56
|
-
});
|
|
57
|
-
it('не подписывает клиента на чужую/необъявленную сессию', async () => {
|
|
58
|
-
const { eventBus, hub } = makeHub(['parent']);
|
|
59
|
-
const { client, received } = makeClient();
|
|
60
|
-
await hub.registerClient(client);
|
|
61
|
-
eventBus.publish('foreign', 'stream.usage', { session_id: 'foreign' });
|
|
62
|
-
expect(received.some((e) => e.type === 'stream.usage' && e.sessionId === 'foreign')).toBe(false);
|
|
63
|
-
});
|
|
64
|
-
it('не подписывает на сессию, если клиент отписан (unregister)', async () => {
|
|
65
|
-
const { eventBus, hub } = makeHub(['parent']);
|
|
66
|
-
const { client, received } = makeClient();
|
|
67
|
-
await hub.registerClient(client);
|
|
68
|
-
hub.unregisterClient(client);
|
|
69
|
-
eventBus.publish('parent', 'session.created', { id: 'child-5' });
|
|
70
|
-
eventBus.publish('child-5', 'stream.usage', { session_id: 'child-5' });
|
|
71
|
-
expect(received.some((e) => e.type === 'stream.usage')).toBe(false);
|
|
72
|
-
});
|
|
73
|
-
});
|
|
74
|
-
//# sourceMappingURL=hub.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"hub.test.js","sourceRoot":"","sources":["../../src/events/hub.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"hybrid.integration.test.d.ts","sourceRoot":"","sources":["../../src/integration/hybrid.integration.test.ts"],"names":[],"mappings":""}
|