@relaycast/engine 4.2.0 → 5.0.0
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/adapters/node/index.d.ts.map +1 -1
- package/dist/adapters/node/index.js +23 -1
- package/dist/adapters/node/index.js.map +1 -1
- package/dist/adapters/node/presence.d.ts +7 -3
- package/dist/adapters/node/presence.d.ts.map +1 -1
- package/dist/adapters/node/presence.js +10 -8
- package/dist/adapters/node/presence.js.map +1 -1
- package/dist/adapters/node/realtime.d.ts.map +1 -1
- package/dist/adapters/node/realtime.js +8 -3
- package/dist/adapters/node/realtime.js.map +1 -1
- package/dist/bin/serve.js +2 -4
- package/dist/bin/serve.js.map +1 -1
- package/dist/db/migrations/0021_node_delivery_contracts.sql +70 -0
- package/dist/db/migrations/0022_http_push_redrive.sql +13 -0
- package/dist/db/migrations/0023_direct_ws_nodes.sql +124 -0
- package/dist/db/migrations/0024_binding_workspace_constraints.sql +109 -0
- package/dist/db/schema.d.ts +339 -0
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +48 -1
- package/dist/db/schema.js.map +1 -1
- package/dist/engine/action.d.ts +0 -7
- package/dist/engine/action.d.ts.map +1 -1
- package/dist/engine/action.js +0 -7
- package/dist/engine/action.js.map +1 -1
- package/dist/engine/agent.d.ts.map +1 -1
- package/dist/engine/agent.js +7 -1
- package/dist/engine/agent.js.map +1 -1
- package/dist/engine/delivery.d.ts +24 -0
- package/dist/engine/delivery.d.ts.map +1 -1
- package/dist/engine/delivery.js +190 -74
- package/dist/engine/delivery.js.map +1 -1
- package/dist/engine/deliveryWrites.d.ts +5 -0
- package/dist/engine/deliveryWrites.d.ts.map +1 -1
- package/dist/engine/deliveryWrites.js +51 -11
- package/dist/engine/deliveryWrites.js.map +1 -1
- package/dist/engine/invocationCompletion.d.ts +1 -1
- package/dist/engine/invocationCompletion.d.ts.map +1 -1
- package/dist/engine/invocationCompletion.js +1 -16
- package/dist/engine/invocationCompletion.js.map +1 -1
- package/dist/engine/message.d.ts.map +1 -1
- package/dist/engine/message.js +1 -0
- package/dist/engine/message.js.map +1 -1
- package/dist/engine/node.d.ts +85 -0
- package/dist/engine/node.d.ts.map +1 -1
- package/dist/engine/node.js +473 -14
- package/dist/engine/node.js.map +1 -1
- package/dist/engine/nodeContext.d.ts +22 -0
- package/dist/engine/nodeContext.d.ts.map +1 -0
- package/dist/engine/nodeContext.js +104 -0
- package/dist/engine/nodeContext.js.map +1 -0
- package/dist/engine/thread.d.ts.map +1 -1
- package/dist/engine/thread.js +37 -17
- package/dist/engine/thread.js.map +1 -1
- package/dist/engine/wsAuth.d.ts +36 -0
- package/dist/engine/wsAuth.d.ts.map +1 -0
- package/dist/engine/wsAuth.js +57 -0
- package/dist/engine/wsAuth.js.map +1 -0
- package/dist/engine.d.ts.map +1 -1
- package/dist/engine.js +46 -74
- package/dist/engine.js.map +1 -1
- package/dist/entrypoints/node.d.ts.map +1 -1
- package/dist/entrypoints/node.js +27 -51
- package/dist/entrypoints/node.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -0
- package/dist/index.js.map +1 -1
- package/dist/lib/httpError.d.ts +5 -1
- package/dist/lib/httpError.d.ts.map +1 -1
- package/dist/lib/httpError.js +5 -2
- package/dist/lib/httpError.js.map +1 -1
- package/dist/lib/httpQuery.d.ts +28 -0
- package/dist/lib/httpQuery.d.ts.map +1 -0
- package/dist/lib/httpQuery.js +32 -0
- package/dist/lib/httpQuery.js.map +1 -0
- package/dist/lib/httpResponse.d.ts +15 -2
- package/dist/lib/httpResponse.d.ts.map +1 -1
- package/dist/lib/httpResponse.js +35 -7
- package/dist/lib/httpResponse.js.map +1 -1
- package/dist/middleware/auth.d.ts.map +1 -1
- package/dist/middleware/auth.js +3 -2
- package/dist/middleware/auth.js.map +1 -1
- package/dist/middleware/idempotency.d.ts +30 -0
- package/dist/middleware/idempotency.d.ts.map +1 -1
- package/dist/middleware/idempotency.js +14 -0
- package/dist/middleware/idempotency.js.map +1 -1
- package/dist/middleware/planLimits.d.ts.map +1 -1
- package/dist/middleware/planLimits.js +2 -7
- package/dist/middleware/planLimits.js.map +1 -1
- package/dist/middleware/rateLimit.d.ts.map +1 -1
- package/dist/middleware/rateLimit.js +2 -7
- package/dist/middleware/rateLimit.js.map +1 -1
- package/dist/ports/index.d.ts +0 -14
- package/dist/ports/index.d.ts.map +1 -1
- package/dist/routes/a2a.d.ts.map +1 -1
- package/dist/routes/a2a.js +41 -83
- package/dist/routes/a2a.js.map +1 -1
- package/dist/routes/action.d.ts.map +1 -1
- package/dist/routes/action.js +32 -37
- package/dist/routes/action.js.map +1 -1
- package/dist/routes/agent.d.ts.map +1 -1
- package/dist/routes/agent.js +69 -73
- package/dist/routes/agent.js.map +1 -1
- package/dist/routes/certify.d.ts.map +1 -1
- package/dist/routes/certify.js +21 -35
- package/dist/routes/certify.js.map +1 -1
- package/dist/routes/channel.d.ts.map +1 -1
- package/dist/routes/channel.js +33 -71
- package/dist/routes/channel.js.map +1 -1
- package/dist/routes/console.d.ts.map +1 -1
- package/dist/routes/console.js +22 -32
- package/dist/routes/console.js.map +1 -1
- package/dist/routes/delivery.d.ts.map +1 -1
- package/dist/routes/delivery.js +22 -54
- package/dist/routes/delivery.js.map +1 -1
- package/dist/routes/deliveryRouting.d.ts +6 -0
- package/dist/routes/deliveryRouting.d.ts.map +1 -1
- package/dist/routes/deliveryRouting.js +289 -35
- package/dist/routes/deliveryRouting.js.map +1 -1
- package/dist/routes/directory.d.ts.map +1 -1
- package/dist/routes/directory.js +47 -63
- package/dist/routes/directory.js.map +1 -1
- package/dist/routes/dm.d.ts.map +1 -1
- package/dist/routes/dm.js +21 -42
- package/dist/routes/dm.js.map +1 -1
- package/dist/routes/fanout.d.ts +2 -1
- package/dist/routes/fanout.d.ts.map +1 -1
- package/dist/routes/fanout.js +25 -15
- package/dist/routes/fanout.js.map +1 -1
- package/dist/routes/file.d.ts.map +1 -1
- package/dist/routes/file.js +34 -40
- package/dist/routes/file.js.map +1 -1
- package/dist/routes/groupDm.d.ts.map +1 -1
- package/dist/routes/groupDm.js +23 -48
- package/dist/routes/groupDm.js.map +1 -1
- package/dist/routes/inboundWebhook.d.ts.map +1 -1
- package/dist/routes/inboundWebhook.js +17 -35
- package/dist/routes/inboundWebhook.js.map +1 -1
- package/dist/routes/inbox.d.ts.map +1 -1
- package/dist/routes/inbox.js +2 -1
- package/dist/routes/inbox.js.map +1 -1
- package/dist/routes/message.d.ts.map +1 -1
- package/dist/routes/message.js +39 -50
- package/dist/routes/message.js.map +1 -1
- package/dist/routes/node.d.ts.map +1 -1
- package/dist/routes/node.js +118 -6
- package/dist/routes/node.js.map +1 -1
- package/dist/routes/presence.d.ts.map +1 -1
- package/dist/routes/presence.js +4 -3
- package/dist/routes/presence.js.map +1 -1
- package/dist/routes/reaction.d.ts.map +1 -1
- package/dist/routes/reaction.js +10 -21
- package/dist/routes/reaction.js.map +1 -1
- package/dist/routes/routing.d.ts.map +1 -1
- package/dist/routes/routing.js +38 -51
- package/dist/routes/routing.js.map +1 -1
- package/dist/routes/search.d.ts.map +1 -1
- package/dist/routes/search.js +15 -12
- package/dist/routes/search.js.map +1 -1
- package/dist/routes/thread.d.ts.map +1 -1
- package/dist/routes/thread.js +17 -35
- package/dist/routes/thread.js.map +1 -1
- package/dist/routes/workspace.d.ts.map +1 -1
- package/dist/routes/workspace.js +39 -220
- package/dist/routes/workspace.js.map +1 -1
- package/package.json +3 -3
- package/dist/lib/fleetNodes.d.ts +0 -9
- package/dist/lib/fleetNodes.d.ts.map +0 -1
- package/dist/lib/fleetNodes.js +0 -66
- package/dist/lib/fleetNodes.js.map +0 -1
- package/dist/lib/workspaceStream.d.ts +0 -9
- package/dist/lib/workspaceStream.d.ts.map +0 -1
- package/dist/lib/workspaceStream.js +0 -53
- package/dist/lib/workspaceStream.js.map +0 -1
- package/dist/middleware/fleetNodes.d.ts +0 -10
- package/dist/middleware/fleetNodes.d.ts.map +0 -1
- package/dist/middleware/fleetNodes.js +0 -18
- package/dist/middleware/fleetNodes.js.map +0 -1
package/dist/routes/routing.js
CHANGED
|
@@ -8,6 +8,8 @@ import { requireAuth, requireWorkspaceKey } from '../middleware/auth.js';
|
|
|
8
8
|
import { rateLimit } from '../middleware/rateLimit.js';
|
|
9
9
|
import { emitServerEvent } from '../lib/serverTelemetry.js';
|
|
10
10
|
import { errorResponse } from '../lib/httpError.js';
|
|
11
|
+
import { jsonNotFound, jsonOk, parseJsonBody, parseQueryParams, } from '../lib/httpResponse.js';
|
|
12
|
+
import { LimitQuerySchema } from '../lib/httpQuery.js';
|
|
11
13
|
export const routingRoutes = new Hono();
|
|
12
14
|
const skillSchema = z.object({
|
|
13
15
|
id: z.string().min(1).optional(),
|
|
@@ -42,17 +44,14 @@ const syncAgentSkillsSchema = z.object({
|
|
|
42
44
|
status: z.string().min(1).optional(),
|
|
43
45
|
skills: z.array(skillSchema).optional(),
|
|
44
46
|
});
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
}
|
|
47
|
+
const searchSkillsQuerySchema = LimitQuerySchema.extend({
|
|
48
|
+
q: z.string().optional(),
|
|
49
|
+
});
|
|
48
50
|
routingRoutes.post('/route', requireAuth, rateLimit, async (c) => {
|
|
49
51
|
try {
|
|
50
|
-
const parsed =
|
|
51
|
-
if (!parsed.
|
|
52
|
-
return
|
|
53
|
-
ok: false,
|
|
54
|
-
error: { code: 'invalid_request', message: 'skill is required' },
|
|
55
|
-
}, 400);
|
|
52
|
+
const parsed = await parseJsonBody(c, routeRequestSchema, 'skill is required');
|
|
53
|
+
if (!parsed.ok) {
|
|
54
|
+
return parsed.response;
|
|
56
55
|
}
|
|
57
56
|
const workspace = c.get('workspace');
|
|
58
57
|
const result = await routingEngine.routeBySkill(c.get('db'), workspace.id, parsed.data.skill, parsed.data.message || '');
|
|
@@ -62,27 +61,21 @@ routingRoutes.post('/route', requireAuth, rateLimit, async (c) => {
|
|
|
62
61
|
fallback: result.fallback,
|
|
63
62
|
score: result.score,
|
|
64
63
|
});
|
|
65
|
-
return c
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
score: result.score,
|
|
70
|
-
fallback: result.fallback,
|
|
71
|
-
},
|
|
64
|
+
return jsonOk(c, {
|
|
65
|
+
agent_name: result.agentName,
|
|
66
|
+
score: result.score,
|
|
67
|
+
fallback: result.fallback,
|
|
72
68
|
});
|
|
73
69
|
}
|
|
74
70
|
catch (err) {
|
|
75
|
-
return
|
|
71
|
+
return errorResponse(c, err);
|
|
76
72
|
}
|
|
77
73
|
});
|
|
78
74
|
routingRoutes.post('/route/feedback', requireAuth, rateLimit, async (c) => {
|
|
79
75
|
try {
|
|
80
|
-
const parsed =
|
|
81
|
-
if (!parsed.
|
|
82
|
-
return
|
|
83
|
-
ok: false,
|
|
84
|
-
error: { code: 'invalid_request', message: 'agent_name and success are required' },
|
|
85
|
-
}, 400);
|
|
76
|
+
const parsed = await parseJsonBody(c, routeFeedbackSchema, 'agent_name and success are required');
|
|
77
|
+
if (!parsed.ok) {
|
|
78
|
+
return parsed.response;
|
|
86
79
|
}
|
|
87
80
|
const workspace = c.get('workspace');
|
|
88
81
|
const result = parsed.data.success
|
|
@@ -92,32 +85,32 @@ routingRoutes.post('/route/feedback', requireAuth, rateLimit, async (c) => {
|
|
|
92
85
|
agent_name: parsed.data.agent_name,
|
|
93
86
|
success: parsed.data.success,
|
|
94
87
|
});
|
|
95
|
-
return c
|
|
88
|
+
return jsonOk(c, result);
|
|
96
89
|
}
|
|
97
90
|
catch (err) {
|
|
98
|
-
return
|
|
91
|
+
return errorResponse(c, err);
|
|
99
92
|
}
|
|
100
93
|
});
|
|
101
94
|
routingRoutes.get('/skills/search', requireAuth, rateLimit, async (c) => {
|
|
102
95
|
try {
|
|
103
96
|
const workspace = c.get('workspace');
|
|
104
|
-
const
|
|
105
|
-
|
|
97
|
+
const parsed = parseQueryParams(c, searchSkillsQuerySchema, 'Invalid skill search query');
|
|
98
|
+
if (!parsed.ok) {
|
|
99
|
+
return parsed.response;
|
|
100
|
+
}
|
|
101
|
+
const { q, limit } = parsed.data;
|
|
106
102
|
const result = await routingEngine.searchSkills(c.get('db'), workspace.id, { q, limit });
|
|
107
|
-
return c
|
|
103
|
+
return jsonOk(c, result);
|
|
108
104
|
}
|
|
109
105
|
catch (err) {
|
|
110
|
-
return
|
|
106
|
+
return errorResponse(c, err);
|
|
111
107
|
}
|
|
112
108
|
});
|
|
113
109
|
routingRoutes.post('/skills/sync', requireWorkspaceKey, rateLimit, async (c) => {
|
|
114
110
|
try {
|
|
115
|
-
const parsed =
|
|
116
|
-
if (!parsed.
|
|
117
|
-
return
|
|
118
|
-
ok: false,
|
|
119
|
-
error: { code: 'invalid_request', message: 'agent_name is required' },
|
|
120
|
-
}, 400);
|
|
111
|
+
const parsed = await parseJsonBody(c, syncAgentSkillsSchema, 'agent_name is required');
|
|
112
|
+
if (!parsed.ok) {
|
|
113
|
+
return parsed.response;
|
|
121
114
|
}
|
|
122
115
|
const workspace = c.get('workspace');
|
|
123
116
|
const db = c.get('db');
|
|
@@ -127,10 +120,7 @@ routingRoutes.post('/skills/sync', requireWorkspaceKey, rateLimit, async (c) =>
|
|
|
127
120
|
.where(and(eq(agents.workspaceId, workspace.id), eq(agents.name, parsed.data.agent_name)));
|
|
128
121
|
const row = agent[0];
|
|
129
122
|
if (!row) {
|
|
130
|
-
return c.
|
|
131
|
-
ok: false,
|
|
132
|
-
error: { code: 'agent_not_found', message: `Agent "${parsed.data.agent_name}" not found` },
|
|
133
|
-
}, 404);
|
|
123
|
+
return jsonNotFound(c, 'agent_not_found', `Agent "${parsed.data.agent_name}" not found`);
|
|
134
124
|
}
|
|
135
125
|
const metadata = {
|
|
136
126
|
...(row.metadata || {}),
|
|
@@ -143,30 +133,27 @@ routingRoutes.post('/skills/sync', requireWorkspaceKey, rateLimit, async (c) =>
|
|
|
143
133
|
status: parsed.data.status || row.status,
|
|
144
134
|
metadata,
|
|
145
135
|
});
|
|
146
|
-
return c
|
|
136
|
+
return jsonOk(c, result);
|
|
147
137
|
}
|
|
148
138
|
catch (err) {
|
|
149
|
-
return
|
|
139
|
+
return errorResponse(c, err);
|
|
150
140
|
}
|
|
151
141
|
});
|
|
152
142
|
routingRoutes.get('/routing/config', requireAuth, rateLimit, async (c) => {
|
|
153
143
|
try {
|
|
154
144
|
const workspace = c.get('workspace');
|
|
155
145
|
const result = await routingEngine.getRoutingConfig(c.get('db'), workspace.id);
|
|
156
|
-
return c
|
|
146
|
+
return jsonOk(c, result);
|
|
157
147
|
}
|
|
158
148
|
catch (err) {
|
|
159
|
-
return
|
|
149
|
+
return errorResponse(c, err);
|
|
160
150
|
}
|
|
161
151
|
});
|
|
162
152
|
routingRoutes.put('/routing/config', requireWorkspaceKey, rateLimit, async (c) => {
|
|
163
153
|
try {
|
|
164
|
-
const parsed =
|
|
165
|
-
if (!parsed.
|
|
166
|
-
return
|
|
167
|
-
ok: false,
|
|
168
|
-
error: { code: 'invalid_request', message: 'invalid routing config body' },
|
|
169
|
-
}, 400);
|
|
154
|
+
const parsed = await parseJsonBody(c, routingConfigSchema, 'invalid routing config body');
|
|
155
|
+
if (!parsed.ok) {
|
|
156
|
+
return parsed.response;
|
|
170
157
|
}
|
|
171
158
|
const workspace = c.get('workspace');
|
|
172
159
|
const result = await routingEngine.setRoutingConfig(c.get('db'), workspace.id, parsed.data);
|
|
@@ -174,10 +161,10 @@ routingRoutes.put('/routing/config', requireWorkspaceKey, rateLimit, async (c) =
|
|
|
174
161
|
circuit_breaker_threshold: result.circuit_breaker_threshold,
|
|
175
162
|
circuit_breaker_cooldown_seconds: result.circuit_breaker_cooldown_seconds,
|
|
176
163
|
});
|
|
177
|
-
return c
|
|
164
|
+
return jsonOk(c, result);
|
|
178
165
|
}
|
|
179
166
|
catch (err) {
|
|
180
|
-
return
|
|
167
|
+
return errorResponse(c, err);
|
|
181
168
|
}
|
|
182
169
|
});
|
|
183
170
|
//# sourceMappingURL=routing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../src/routes/routing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../src/routes/routing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../src/routes/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../src/routes/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AASxC,eAAO,MAAM,YAAY,qDAAqB,CAAC"}
|
package/dist/routes/search.js
CHANGED
|
@@ -1,27 +1,30 @@
|
|
|
1
1
|
import { Hono } from 'hono';
|
|
2
|
+
import { z } from 'zod';
|
|
2
3
|
import { requireAuth } from '../middleware/auth.js';
|
|
3
4
|
import { rateLimit } from '../middleware/rateLimit.js';
|
|
4
5
|
import * as searchEngine from '../engine/search.js';
|
|
5
6
|
import { emitServerEvent } from '../lib/serverTelemetry.js';
|
|
6
7
|
import { errorResponse } from '../lib/httpError.js';
|
|
8
|
+
import { jsonOk, parseQueryParams } from '../lib/httpResponse.js';
|
|
9
|
+
import { PaginationQuerySchema } from '../lib/httpQuery.js';
|
|
7
10
|
export const searchRoutes = new Hono();
|
|
11
|
+
const searchQuerySchema = PaginationQuerySchema.extend({
|
|
12
|
+
q: z.string().trim().min(1),
|
|
13
|
+
channel: z.string().optional(),
|
|
14
|
+
from: z.string().optional(),
|
|
15
|
+
});
|
|
8
16
|
// GET /v1/search?q=...&channel=...&from=...&limit=...&before=...&after=...
|
|
9
17
|
searchRoutes.get('/search', requireAuth, rateLimit, async (c) => {
|
|
10
18
|
try {
|
|
11
19
|
const db = c.get('db');
|
|
12
20
|
const workspace = c.get('workspace');
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
}, 400);
|
|
21
|
+
const parsed = parseQueryParams(c, searchQuerySchema, (failure) => failure.error.issues.some((issue) => issue.path[0] === 'q')
|
|
22
|
+
? 'q (search query) is required'
|
|
23
|
+
: 'Invalid search query');
|
|
24
|
+
if (!parsed.ok) {
|
|
25
|
+
return parsed.response;
|
|
19
26
|
}
|
|
20
|
-
const channel =
|
|
21
|
-
const from = c.req.query('from');
|
|
22
|
-
const limit = c.req.query('limit') ? parseInt(c.req.query('limit'), 10) : undefined;
|
|
23
|
-
const before = c.req.query('before');
|
|
24
|
-
const after = c.req.query('after');
|
|
27
|
+
const { q, channel, from, limit, before, after } = parsed.data;
|
|
25
28
|
const results = await searchEngine.searchMessages(db, workspace.id, {
|
|
26
29
|
q,
|
|
27
30
|
channel,
|
|
@@ -36,7 +39,7 @@ searchRoutes.get('/search', requireAuth, rateLimit, async (c) => {
|
|
|
36
39
|
has_channel_filter: Boolean(channel),
|
|
37
40
|
has_from_filter: Boolean(from),
|
|
38
41
|
});
|
|
39
|
-
return c
|
|
42
|
+
return jsonOk(c, results);
|
|
40
43
|
}
|
|
41
44
|
catch (err) {
|
|
42
45
|
return errorResponse(c, err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/routes/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/routes/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,YAAY,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,IAAI,EAAU,CAAC;AAE/C,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,MAAM,CAAC;IACrD,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC5B,CAAC,CAAC;AAEH,2EAA2E;AAC3E,YAAY,CAAC,GAAG,CACd,SAAS,EACT,WAAW,EACX,SAAS,EACT,KAAK,EAAE,CAAC,EAAE,EAAE;IACV,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvB,MAAM,SAAS,GAAG,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACrC,MAAM,MAAM,GAAG,gBAAgB,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,OAAO,EAAE,EAAE,CAChE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;YACzD,CAAC,CAAC,8BAA8B;YAChC,CAAC,CAAC,sBAAsB,CAC3B,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,OAAO,MAAM,CAAC,QAAQ,CAAC;QACzB,CAAC;QACD,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;QAE/D,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,cAAc,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE;YAClE,CAAC;YACD,OAAO;YACP,IAAI;YACJ,KAAK;YACL,MAAM;YACN,KAAK;SACN,CAAC,CAAC;QAEH,eAAe,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,kCAAkC,EAAE;YACnE,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM;YAC7B,YAAY,EAAE,OAAO,CAAC,MAAM;YAC5B,kBAAkB,EAAE,OAAO,CAAC,OAAO,CAAC;YACpC,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC;SAC/B,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAC5B,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,OAAO,aAAa,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC,CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thread.d.ts","sourceRoot":"","sources":["../../src/routes/thread.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"thread.d.ts","sourceRoot":"","sources":["../../src/routes/thread.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAgBxC,eAAO,MAAM,YAAY,qDAAqB,CAAC"}
|
package/dist/routes/thread.js
CHANGED
|
@@ -2,16 +2,18 @@ import { Hono } from 'hono';
|
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
import { requireAuth } from '../middleware/auth.js';
|
|
4
4
|
import { rateLimit } from '../middleware/rateLimit.js';
|
|
5
|
-
import { parseIdempotencyKey, runIdempotent } from '../middleware/idempotency.js';
|
|
5
|
+
import { jsonIdempotentOk, parseIdempotencyKey, runIdempotent } from '../middleware/idempotency.js';
|
|
6
6
|
import * as threadEngine from '../engine/thread.js';
|
|
7
7
|
import { resolveMailboxConfig } from '../engine/mailboxConfig.js';
|
|
8
|
-
import {
|
|
8
|
+
import { publishWorkspaceEvent } from './fanout.js';
|
|
9
9
|
import { notifyDeliveryRejections, routeDeliveryOutcomes } from './deliveryRouting.js';
|
|
10
10
|
import { buildThreadReplyEventData } from '../engine/deliveryWire.js';
|
|
11
11
|
import { runInBackground } from './background.js';
|
|
12
12
|
import { sendWebhookEvent } from './webhookOutbox.js';
|
|
13
13
|
import { emitServerEvent } from '../lib/serverTelemetry.js';
|
|
14
14
|
import { errorResponse } from '../lib/httpError.js';
|
|
15
|
+
import { jsonError, jsonOk, parseJsonBody } from '../lib/httpResponse.js';
|
|
16
|
+
import { parsePaginationQuery } from '../lib/httpQuery.js';
|
|
15
17
|
export const threadRoutes = new Hono();
|
|
16
18
|
const postReplySchema = z.object({
|
|
17
19
|
text: z.string().min(1),
|
|
@@ -24,27 +26,18 @@ threadRoutes.post('/messages/:id/replies', requireAuth, rateLimit, async (c) =>
|
|
|
24
26
|
const db = c.get('db');
|
|
25
27
|
const workspace = c.get('workspace');
|
|
26
28
|
const agent = c.get('agent');
|
|
27
|
-
const parsed =
|
|
28
|
-
if (!parsed.
|
|
29
|
-
return
|
|
30
|
-
ok: false,
|
|
31
|
-
error: { code: 'invalid_request', message: 'text is required' },
|
|
32
|
-
}, 400);
|
|
29
|
+
const parsed = await parseJsonBody(c, postReplySchema, 'invalid reply body');
|
|
30
|
+
if (!parsed.ok) {
|
|
31
|
+
return parsed.response;
|
|
33
32
|
}
|
|
34
33
|
const { text, blocks, data } = parsed.data;
|
|
35
34
|
const { key: idempotencyKey, error: idempotencyError } = parseIdempotencyKey(c.req.header('Idempotency-Key'));
|
|
36
35
|
if (idempotencyError) {
|
|
37
|
-
return c
|
|
38
|
-
ok: false,
|
|
39
|
-
error: { code: 'invalid_idempotency_key', message: idempotencyError },
|
|
40
|
-
}, 400);
|
|
36
|
+
return jsonError(c, 'invalid_idempotency_key', idempotencyError, 400);
|
|
41
37
|
}
|
|
42
38
|
const agentId = agent?.id;
|
|
43
39
|
if (!agentId) {
|
|
44
|
-
return c
|
|
45
|
-
ok: false,
|
|
46
|
-
error: { code: 'agent_token_required', message: 'Agent token required to post replies' },
|
|
47
|
-
}, 403);
|
|
40
|
+
return jsonError(c, 'agent_token_required', 'Agent token required to post replies', 403);
|
|
48
41
|
}
|
|
49
42
|
const parentId = c.req.param('id');
|
|
50
43
|
const mailbox = resolveMailboxConfig(c.get('engine').config, workspace.id);
|
|
@@ -69,23 +62,11 @@ threadRoutes.post('/messages/:id/replies', requireAuth, rateLimit, async (c) =>
|
|
|
69
62
|
});
|
|
70
63
|
},
|
|
71
64
|
});
|
|
72
|
-
if (idempotent.replayed) {
|
|
73
|
-
c.header('Idempotency-Replayed', 'true');
|
|
74
|
-
}
|
|
75
65
|
if (!idempotent.replayed) {
|
|
76
66
|
const { _deliveries, _delivery_rejections, ...publicReplyData } = idempotent.data;
|
|
77
67
|
const eventData = toThreadReplyEventData(idempotent.data);
|
|
78
68
|
if (publicReplyData.channel_id) {
|
|
79
|
-
|
|
80
|
-
runInBackground(c, (async () => {
|
|
81
|
-
const dmAgentIds = await getDmParticipantAgentIds(c, channelId);
|
|
82
|
-
if (dmAgentIds) {
|
|
83
|
-
await fanoutToAgents(c, dmAgentIds, 'thread.reply', eventData);
|
|
84
|
-
}
|
|
85
|
-
else {
|
|
86
|
-
await fanoutToChannel(c, channelId, 'thread.reply', eventData);
|
|
87
|
-
}
|
|
88
|
-
})(), 'fanout thread.reply');
|
|
69
|
+
runInBackground(c, publishWorkspaceEvent(c, 'thread.reply', eventData, publicReplyData.channel_id), 'publish thread.reply');
|
|
89
70
|
}
|
|
90
71
|
if (_deliveries && _deliveries.length > 0) {
|
|
91
72
|
runInBackground(c, routeDeliveryOutcomes(c, _deliveries, 'thread.reply', eventData), 'route thread deliveries');
|
|
@@ -99,8 +80,7 @@ threadRoutes.post('/messages/:id/replies', requireAuth, rateLimit, async (c) =>
|
|
|
99
80
|
channel_id: publicReplyData.channel_id ?? null,
|
|
100
81
|
});
|
|
101
82
|
}
|
|
102
|
-
|
|
103
|
-
return c.json({ ok: true, data: responseData }, idempotent.status);
|
|
83
|
+
return jsonIdempotentOk(c, idempotent);
|
|
104
84
|
}
|
|
105
85
|
catch (err) {
|
|
106
86
|
return errorResponse(c, err);
|
|
@@ -111,12 +91,14 @@ threadRoutes.get('/messages/:id/replies', requireAuth, rateLimit, async (c) => {
|
|
|
111
91
|
try {
|
|
112
92
|
const db = c.get('db');
|
|
113
93
|
const workspace = c.get('workspace');
|
|
114
|
-
const
|
|
115
|
-
|
|
116
|
-
|
|
94
|
+
const query = parsePaginationQuery(c);
|
|
95
|
+
if (!query.ok) {
|
|
96
|
+
return query.response;
|
|
97
|
+
}
|
|
98
|
+
const { limit, before, after } = query.data;
|
|
117
99
|
const parentId = c.req.param('id');
|
|
118
100
|
const result = await threadEngine.getThread(db, workspace.id, parentId, { limit, before, after });
|
|
119
|
-
return c
|
|
101
|
+
return jsonOk(c, result);
|
|
120
102
|
}
|
|
121
103
|
catch (err) {
|
|
122
104
|
return errorResponse(c, err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thread.js","sourceRoot":"","sources":["../../src/routes/thread.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"thread.js","sourceRoot":"","sources":["../../src/routes/thread.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/routes/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/routes/workspace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAoBxC,eAAO,MAAM,eAAe,qDAAqB,CAAC"}
|