@relaycast/engine 4.2.0 → 5.0.1
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 +9 -1
- package/dist/adapters/node/realtime.d.ts.map +1 -1
- package/dist/adapters/node/realtime.js +72 -10
- package/dist/adapters/node/realtime.js.map +1 -1
- package/dist/auth/index.d.ts.map +1 -1
- package/dist/auth/index.js +31 -9
- package/dist/auth/index.js.map +1 -1
- package/dist/auth/tokenKind.d.ts +40 -0
- package/dist/auth/tokenKind.d.ts.map +1 -0
- package/dist/auth/tokenKind.js +89 -0
- package/dist/auth/tokenKind.js.map +1 -0
- 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/migrations/0025_node_kind_role_adapter.sql +45 -0
- package/dist/db/migrations/0026_observer_tokens.sql +32 -0
- package/dist/db/schema.d.ts +727 -59
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +78 -2
- package/dist/db/schema.js.map +1 -1
- package/dist/engine/action.d.ts +2 -9
- package/dist/engine/action.d.ts.map +1 -1
- package/dist/engine/action.js +182 -14
- package/dist/engine/action.js.map +1 -1
- package/dist/engine/activity.d.ts +6 -0
- package/dist/engine/activity.d.ts.map +1 -1
- package/dist/engine/activity.js +9 -2
- package/dist/engine/activity.js.map +1 -1
- package/dist/engine/agent.d.ts +0 -33
- package/dist/engine/agent.d.ts.map +1 -1
- package/dist/engine/agent.js +4 -153
- package/dist/engine/agent.js.map +1 -1
- package/dist/engine/attachments.d.ts +6 -0
- package/dist/engine/attachments.d.ts.map +1 -1
- package/dist/engine/attachments.js +37 -0
- package/dist/engine/attachments.js.map +1 -1
- package/dist/engine/console.d.ts +78 -1
- package/dist/engine/console.d.ts.map +1 -1
- package/dist/engine/console.js +175 -19
- package/dist/engine/console.js.map +1 -1
- package/dist/engine/delivery.d.ts +26 -0
- package/dist/engine/delivery.d.ts.map +1 -1
- package/dist/engine/delivery.js +194 -74
- package/dist/engine/delivery.js.map +1 -1
- package/dist/engine/deliveryWire.d.ts +4 -0
- package/dist/engine/deliveryWire.d.ts.map +1 -1
- package/dist/engine/deliveryWire.js +2 -0
- package/dist/engine/deliveryWire.js.map +1 -1
- package/dist/engine/deliveryWrites.d.ts +6 -0
- package/dist/engine/deliveryWrites.d.ts.map +1 -1
- package/dist/engine/deliveryWrites.js +58 -13
- package/dist/engine/deliveryWrites.js.map +1 -1
- package/dist/engine/dm.d.ts.map +1 -1
- package/dist/engine/dm.js +11 -33
- package/dist/engine/dm.js.map +1 -1
- package/dist/engine/dmAll.d.ts.map +1 -1
- package/dist/engine/dmAll.js +2 -0
- package/dist/engine/dmAll.js.map +1 -1
- package/dist/engine/groupDm.d.ts +2 -3
- package/dist/engine/groupDm.d.ts.map +1 -1
- package/dist/engine/groupDm.js +8 -26
- package/dist/engine/groupDm.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 +10 -18
- package/dist/engine/invocationCompletion.js.map +1 -1
- package/dist/engine/message.d.ts.map +1 -1
- package/dist/engine/message.js +16 -44
- package/dist/engine/message.js.map +1 -1
- package/dist/engine/node.d.ts +97 -0
- package/dist/engine/node.d.ts.map +1 -1
- package/dist/engine/node.js +555 -27
- 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 +80 -0
- package/dist/engine/nodeContext.js.map +1 -0
- package/dist/engine/nodeDeliver.d.ts +23 -0
- package/dist/engine/nodeDeliver.d.ts.map +1 -0
- package/dist/engine/nodeDeliver.js +81 -0
- package/dist/engine/nodeDeliver.js.map +1 -0
- package/dist/engine/observerToken.d.ts +110 -0
- package/dist/engine/observerToken.d.ts.map +1 -0
- package/dist/engine/observerToken.js +528 -0
- package/dist/engine/observerToken.js.map +1 -0
- package/dist/engine/search.d.ts +4 -0
- package/dist/engine/search.d.ts.map +1 -1
- package/dist/engine/search.js +6 -1
- package/dist/engine/search.js.map +1 -1
- package/dist/engine/thread.d.ts +4 -3
- package/dist/engine/thread.d.ts.map +1 -1
- package/dist/engine/thread.js +45 -17
- package/dist/engine/thread.js.map +1 -1
- package/dist/engine/wsAuth.d.ts +32 -0
- package/dist/engine/wsAuth.d.ts.map +1 -0
- package/dist/engine/wsAuth.js +65 -0
- package/dist/engine/wsAuth.js.map +1 -0
- package/dist/engine/wsTransform.d.ts.map +1 -1
- package/dist/engine/wsTransform.js +52 -36
- package/dist/engine/wsTransform.js.map +1 -1
- package/dist/engine.d.ts.map +1 -1
- package/dist/engine.js +37 -86
- package/dist/engine.js.map +1 -1
- package/dist/entrypoints/node.d.ts.map +1 -1
- package/dist/entrypoints/node.js +20 -57
- package/dist/entrypoints/node.js.map +1 -1
- package/dist/env.d.ts +3 -1
- package/dist/env.d.ts.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 +8 -0
- package/dist/middleware/auth.d.ts.map +1 -1
- package/dist/middleware/auth.js +65 -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/logger.d.ts.map +1 -1
- package/dist/middleware/logger.js +4 -4
- package/dist/middleware/logger.js.map +1 -1
- package/dist/middleware/planLimits.d.ts.map +1 -1
- package/dist/middleware/planLimits.js +11 -9
- package/dist/middleware/planLimits.js.map +1 -1
- package/dist/middleware/rateLimit.d.ts.map +1 -1
- package/dist/middleware/rateLimit.js +15 -8
- package/dist/middleware/rateLimit.js.map +1 -1
- package/dist/middleware/usageTracker.d.ts.map +1 -1
- package/dist/middleware/usageTracker.js +2 -1
- package/dist/middleware/usageTracker.js.map +1 -1
- package/dist/ports/auth.d.ts +6 -2
- package/dist/ports/auth.d.ts.map +1 -1
- package/dist/ports/entitlements.d.ts +3 -1
- package/dist/ports/entitlements.d.ts.map +1 -1
- package/dist/ports/index.d.ts +0 -14
- package/dist/ports/index.d.ts.map +1 -1
- package/dist/ports/realtime.d.ts +4 -1
- package/dist/ports/realtime.d.ts.map +1 -1
- package/dist/providers/static-entitlements.js +4 -4
- package/dist/providers/static-entitlements.js.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 +45 -42
- package/dist/routes/action.js.map +1 -1
- package/dist/routes/agent.d.ts.map +1 -1
- package/dist/routes/agent.js +172 -120
- 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 +69 -81
- package/dist/routes/channel.js.map +1 -1
- package/dist/routes/console.d.ts.map +1 -1
- package/dist/routes/console.js +60 -40
- 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 +297 -34
- 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 +38 -20
- package/dist/routes/fanout.js.map +1 -1
- package/dist/routes/file.d.ts.map +1 -1
- package/dist/routes/file.js +48 -44
- 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 +60 -53
- package/dist/routes/message.js.map +1 -1
- package/dist/routes/node.d.ts.map +1 -1
- package/dist/routes/node.js +173 -10
- package/dist/routes/node.js.map +1 -1
- package/dist/routes/observerToken.d.ts +4 -0
- package/dist/routes/observerToken.d.ts.map +1 -0
- package/dist/routes/observerToken.js +105 -0
- package/dist/routes/observerToken.js.map +1 -0
- package/dist/routes/presence.d.ts.map +1 -1
- package/dist/routes/presence.js +10 -6
- package/dist/routes/presence.js.map +1 -1
- package/dist/routes/reaction.d.ts.map +1 -1
- package/dist/routes/reaction.js +69 -28
- package/dist/routes/reaction.js.map +1 -1
- package/dist/routes/receipt.d.ts.map +1 -1
- package/dist/routes/receipt.js +20 -3
- package/dist/routes/receipt.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 +21 -15
- package/dist/routes/search.js.map +1 -1
- package/dist/routes/thread.d.ts.map +1 -1
- package/dist/routes/thread.js +36 -37
- package/dist/routes/thread.js.map +1 -1
- package/dist/routes/workspace.d.ts.map +1 -1
- package/dist/routes/workspace.js +57 -225
- 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/groupDm.js
CHANGED
|
@@ -3,17 +3,16 @@ import { z } from 'zod';
|
|
|
3
3
|
import { errorResponse } from '../lib/httpError.js';
|
|
4
4
|
import { requireAgentToken } from '../middleware/auth.js';
|
|
5
5
|
import { rateLimit } from '../middleware/rateLimit.js';
|
|
6
|
-
import { parseIdempotencyKey, runIdempotent } from '../middleware/idempotency.js';
|
|
6
|
+
import { jsonIdempotentOk, parseIdempotencyKey, runIdempotent } from '../middleware/idempotency.js';
|
|
7
7
|
import * as groupDmEngine from '../engine/groupDm.js';
|
|
8
8
|
import { resolveMailboxConfig } from '../engine/mailboxConfig.js';
|
|
9
|
-
import {
|
|
10
|
-
import { dmParticipants } from '../db/schema.js';
|
|
11
|
-
import { fanoutToAgents } from './fanout.js';
|
|
9
|
+
import { publishWorkspaceEvent } from './fanout.js';
|
|
12
10
|
import { notifyDeliveryRejections, routeDeliveryOutcomes } from './deliveryRouting.js';
|
|
13
11
|
import { buildGroupDmReceivedEventData } from '../engine/deliveryWire.js';
|
|
14
12
|
import { runInBackground } from './background.js';
|
|
15
13
|
import { sendWebhookEvent } from './webhookOutbox.js';
|
|
16
14
|
import { emitServerEvent } from '../lib/serverTelemetry.js';
|
|
15
|
+
import { jsonCreated, jsonError, jsonNoContent, jsonOk, parseJsonBody, } from '../lib/httpResponse.js';
|
|
17
16
|
export const groupDmRoutes = new Hono();
|
|
18
17
|
const createGroupDmSchema = z.object({
|
|
19
18
|
participants: z.array(z.string()).min(1),
|
|
@@ -33,12 +32,9 @@ groupDmRoutes.post('/dm/group', requireAgentToken, rateLimit, async (c) => {
|
|
|
33
32
|
const db = c.get('db');
|
|
34
33
|
const workspace = c.get('workspace');
|
|
35
34
|
const agent = c.get('agent');
|
|
36
|
-
const parsed =
|
|
37
|
-
if (!parsed.
|
|
38
|
-
return
|
|
39
|
-
ok: false,
|
|
40
|
-
error: { code: 'invalid_request', message: 'participants array is required with at least 1 member' },
|
|
41
|
-
}, 400);
|
|
35
|
+
const parsed = await parseJsonBody(c, createGroupDmSchema, 'participants array is required with at least 1 member');
|
|
36
|
+
if (!parsed.ok) {
|
|
37
|
+
return parsed.response;
|
|
42
38
|
}
|
|
43
39
|
const { participants, name } = parsed.data;
|
|
44
40
|
const result = await groupDmEngine.createGroupDm(db, workspace.id, agent.id, { participants, name });
|
|
@@ -46,7 +42,7 @@ groupDmRoutes.post('/dm/group', requireAgentToken, rateLimit, async (c) => {
|
|
|
46
42
|
conversation_id: result.id,
|
|
47
43
|
participant_count: result.participants.length,
|
|
48
44
|
});
|
|
49
|
-
return c
|
|
45
|
+
return jsonCreated(c, result);
|
|
50
46
|
}
|
|
51
47
|
catch (err) {
|
|
52
48
|
return errorResponse(c, err);
|
|
@@ -58,31 +54,26 @@ groupDmRoutes.post('/dm/:conversation_id/messages', requireAgentToken, rateLimit
|
|
|
58
54
|
const db = c.get('db');
|
|
59
55
|
const workspace = c.get('workspace');
|
|
60
56
|
const agent = c.get('agent');
|
|
61
|
-
const parsed =
|
|
62
|
-
|
|
63
|
-
const
|
|
64
|
-
const
|
|
65
|
-
|
|
66
|
-
const message = hasTextIssue
|
|
57
|
+
const parsed = await parseJsonBody(c, postGroupDmMessageSchema, (failure) => {
|
|
58
|
+
const hasTextIssue = failure.error.issues.some((issue) => issue.path[0] === 'text');
|
|
59
|
+
const hasModeIssue = failure.error.issues.some((issue) => issue.path[0] === 'mode');
|
|
60
|
+
const hasAttachmentsIssue = failure.error.issues.some((issue) => issue.path[0] === 'attachments');
|
|
61
|
+
return hasTextIssue
|
|
67
62
|
? 'text is required'
|
|
68
63
|
: hasModeIssue
|
|
69
64
|
? 'mode must be one of: wait, steer'
|
|
70
65
|
: hasAttachmentsIssue
|
|
71
66
|
? 'attachments must be an array of file ids'
|
|
72
67
|
: 'invalid group dm body';
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
}, 400);
|
|
68
|
+
});
|
|
69
|
+
if (!parsed.ok) {
|
|
70
|
+
return parsed.response;
|
|
77
71
|
}
|
|
78
72
|
const { text, attachments, mode } = parsed.data;
|
|
79
73
|
const normalizedAttachments = attachments && attachments.length > 0 ? attachments : undefined;
|
|
80
74
|
const { key: idempotencyKey, error: idempotencyError } = parseIdempotencyKey(c.req.header('Idempotency-Key'));
|
|
81
75
|
if (idempotencyError) {
|
|
82
|
-
return c
|
|
83
|
-
ok: false,
|
|
84
|
-
error: { code: 'invalid_idempotency_key', message: idempotencyError },
|
|
85
|
-
}, 400);
|
|
76
|
+
return jsonError(c, 'invalid_idempotency_key', idempotencyError, 400);
|
|
86
77
|
}
|
|
87
78
|
const conversationId = c.req.param('conversation_id');
|
|
88
79
|
const mailbox = resolveMailboxConfig(c.get('engine').config, workspace.id);
|
|
@@ -112,22 +103,10 @@ groupDmRoutes.post('/dm/:conversation_id/messages', requireAgentToken, rateLimit
|
|
|
112
103
|
});
|
|
113
104
|
},
|
|
114
105
|
});
|
|
115
|
-
if (idempotent.replayed) {
|
|
116
|
-
c.header('Idempotency-Replayed', 'true');
|
|
117
|
-
}
|
|
118
106
|
if (!idempotent.replayed) {
|
|
119
107
|
const { _deliveries, _delivery_rejections, ...publicGroupData } = idempotent.data;
|
|
120
108
|
const eventData = toGroupDmReceivedEventData(idempotent.data);
|
|
121
|
-
|
|
122
|
-
const rows = await db
|
|
123
|
-
.select({ agentId: dmParticipants.agentId })
|
|
124
|
-
.from(dmParticipants)
|
|
125
|
-
.where(and(eq(dmParticipants.conversationId, conversationId), isNull(dmParticipants.leftAt)));
|
|
126
|
-
runInBackground(c, fanoutToAgents(c, rows.map((r) => r.agentId), 'group_dm.received', eventData), 'fanout group_dm.received');
|
|
127
|
-
}
|
|
128
|
-
catch {
|
|
129
|
-
// Ignore fanout failures
|
|
130
|
-
}
|
|
109
|
+
runInBackground(c, publishWorkspaceEvent(c, 'group_dm.received', eventData), 'publish group_dm.received');
|
|
131
110
|
if (_deliveries && _deliveries.length > 0) {
|
|
132
111
|
runInBackground(c, routeDeliveryOutcomes(c, _deliveries, 'group_dm.received', eventData), 'route group dm deliveries');
|
|
133
112
|
}
|
|
@@ -140,8 +119,7 @@ groupDmRoutes.post('/dm/:conversation_id/messages', requireAgentToken, rateLimit
|
|
|
140
119
|
from_agent_id: agent.id,
|
|
141
120
|
});
|
|
142
121
|
}
|
|
143
|
-
|
|
144
|
-
return c.json({ ok: true, data: responseData }, idempotent.status);
|
|
122
|
+
return jsonIdempotentOk(c, idempotent);
|
|
145
123
|
}
|
|
146
124
|
catch (err) {
|
|
147
125
|
return errorResponse(c, err);
|
|
@@ -153,12 +131,9 @@ groupDmRoutes.post('/dm/:conversation_id/participants', requireAgentToken, rateL
|
|
|
153
131
|
const db = c.get('db');
|
|
154
132
|
const workspace = c.get('workspace');
|
|
155
133
|
const agentCtx = c.get('agent');
|
|
156
|
-
const parsed =
|
|
157
|
-
if (!parsed.
|
|
158
|
-
return
|
|
159
|
-
ok: false,
|
|
160
|
-
error: { code: 'invalid_request', message: 'agent_name is required' },
|
|
161
|
-
}, 400);
|
|
134
|
+
const parsed = await parseJsonBody(c, addGroupDmParticipantSchema, 'agent_name is required');
|
|
135
|
+
if (!parsed.ok) {
|
|
136
|
+
return parsed.response;
|
|
162
137
|
}
|
|
163
138
|
const { agent_name: agentName } = parsed.data;
|
|
164
139
|
const conversationId = c.req.param('conversation_id');
|
|
@@ -168,7 +143,7 @@ groupDmRoutes.post('/dm/:conversation_id/participants', requireAgentToken, rateL
|
|
|
168
143
|
agent_name: agentName,
|
|
169
144
|
invited_by_agent_id: agentCtx.id,
|
|
170
145
|
});
|
|
171
|
-
return c
|
|
146
|
+
return jsonOk(c, result);
|
|
172
147
|
}
|
|
173
148
|
catch (err) {
|
|
174
149
|
return errorResponse(c, err);
|
|
@@ -186,7 +161,7 @@ groupDmRoutes.delete('/dm/:conversation_id/participants/:agent_name', requireAge
|
|
|
186
161
|
conversation_id: conversationId,
|
|
187
162
|
agent_id: agent.id,
|
|
188
163
|
});
|
|
189
|
-
return c
|
|
164
|
+
return jsonNoContent(c);
|
|
190
165
|
}
|
|
191
166
|
catch (err) {
|
|
192
167
|
return errorResponse(c, err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"groupDm.js","sourceRoot":"","sources":["../../src/routes/groupDm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"groupDm.js","sourceRoot":"","sources":["../../src/routes/groupDm.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inboundWebhook.d.ts","sourceRoot":"","sources":["../../src/routes/inboundWebhook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"inboundWebhook.d.ts","sourceRoot":"","sources":["../../src/routes/inboundWebhook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAkBxC,eAAO,MAAM,oBAAoB,qDAAqB,CAAC"}
|
|
@@ -9,6 +9,7 @@ import { fanoutToChannel } from './fanout.js';
|
|
|
9
9
|
import { runInBackground } from './background.js';
|
|
10
10
|
import { sendWebhookEvent } from './webhookOutbox.js';
|
|
11
11
|
import { emitServerEvent } from '../lib/serverTelemetry.js';
|
|
12
|
+
import { jsonCreated, jsonNoContent, jsonNotFound, jsonOk, parseJsonBody, } from '../lib/httpResponse.js';
|
|
12
13
|
export const inboundWebhookRoutes = new Hono();
|
|
13
14
|
const createInboundWebhookSchema = z.object({
|
|
14
15
|
name: z.string().min(1).optional(),
|
|
@@ -34,32 +35,25 @@ inboundWebhookRoutes.post('/webhooks', requireWorkspaceKey, rateLimit, async (c)
|
|
|
34
35
|
try {
|
|
35
36
|
const db = c.get('db');
|
|
36
37
|
const workspace = c.get('workspace');
|
|
37
|
-
const parsed =
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
return c.json({
|
|
44
|
-
ok: false,
|
|
45
|
-
error: { code: 'invalid_request', message },
|
|
46
|
-
}, 400);
|
|
38
|
+
const parsed = await parseJsonBody(c, createInboundWebhookSchema, (failure) => {
|
|
39
|
+
const hasChannelIssue = failure.error.issues.some((issue) => issue.path[0] === 'channel');
|
|
40
|
+
return hasChannelIssue ? 'channel is required' : 'invalid webhook body';
|
|
41
|
+
});
|
|
42
|
+
if (!parsed.ok) {
|
|
43
|
+
return parsed.response;
|
|
47
44
|
}
|
|
48
45
|
const { name, channel } = parsed.data;
|
|
49
46
|
// Resolve channel name to ID
|
|
50
47
|
const ch = await channelEngine.getChannel(db, workspace.id, channel);
|
|
51
48
|
if (!ch) {
|
|
52
|
-
return c
|
|
53
|
-
ok: false,
|
|
54
|
-
error: { code: 'channel_not_found', message: `Channel "${channel}" not found` },
|
|
55
|
-
}, 404);
|
|
49
|
+
return jsonNotFound(c, 'channel_not_found', `Channel "${channel}" not found`);
|
|
56
50
|
}
|
|
57
51
|
const result = await inboundWebhookEngine.createWebhook(db, workspace.id, ch.id, { name });
|
|
58
52
|
emitServerEvent(c, workspace.id, 'relaycast_server_inbound_webhook_created', {
|
|
59
53
|
webhook_id: result.webhook_id,
|
|
60
54
|
channel_name: channel,
|
|
61
55
|
});
|
|
62
|
-
return c
|
|
56
|
+
return jsonCreated(c, { ...result, url: hookUrl(c.req.url, result.webhook_id) });
|
|
63
57
|
}
|
|
64
58
|
catch (err) {
|
|
65
59
|
return errorResponse(c, err);
|
|
@@ -71,10 +65,7 @@ inboundWebhookRoutes.get('/webhooks', requireWorkspaceKey, rateLimit, async (c)
|
|
|
71
65
|
const db = c.get('db');
|
|
72
66
|
const workspace = c.get('workspace');
|
|
73
67
|
const result = await inboundWebhookEngine.listWebhooks(db, workspace.id);
|
|
74
|
-
return c.
|
|
75
|
-
ok: true,
|
|
76
|
-
data: result.map((webhook) => ({ ...webhook, url: hookUrl(c.req.url, webhook.id) })),
|
|
77
|
-
});
|
|
68
|
+
return jsonOk(c, result.map((webhook) => ({ ...webhook, url: hookUrl(c.req.url, webhook.id) })));
|
|
78
69
|
}
|
|
79
70
|
catch (err) {
|
|
80
71
|
return errorResponse(c, err);
|
|
@@ -87,15 +78,12 @@ inboundWebhookRoutes.delete('/webhooks/:id', requireWorkspaceKey, rateLimit, asy
|
|
|
87
78
|
const workspace = c.get('workspace');
|
|
88
79
|
const deleted = await inboundWebhookEngine.deleteWebhook(db, workspace.id, c.req.param('id'));
|
|
89
80
|
if (!deleted) {
|
|
90
|
-
return c
|
|
91
|
-
ok: false,
|
|
92
|
-
error: { code: 'webhook_not_found', message: 'Webhook not found' },
|
|
93
|
-
}, 404);
|
|
81
|
+
return jsonNotFound(c, 'webhook_not_found', 'Webhook not found');
|
|
94
82
|
}
|
|
95
83
|
emitServerEvent(c, workspace.id, 'relaycast_server_inbound_webhook_deleted', {
|
|
96
84
|
webhook_id: c.req.param('id'),
|
|
97
85
|
});
|
|
98
|
-
return c
|
|
86
|
+
return jsonNoContent(c);
|
|
99
87
|
}
|
|
100
88
|
catch (err) {
|
|
101
89
|
return errorResponse(c, err);
|
|
@@ -106,12 +94,9 @@ inboundWebhookRoutes.post('/hooks/:webhookId', async (c) => {
|
|
|
106
94
|
try {
|
|
107
95
|
const db = c.get('db');
|
|
108
96
|
const token = extractBearerToken(c.req.header('Authorization'));
|
|
109
|
-
const parsed =
|
|
110
|
-
if (!parsed.
|
|
111
|
-
return
|
|
112
|
-
ok: false,
|
|
113
|
-
error: { code: 'invalid_request', message: 'invalid webhook payload' },
|
|
114
|
-
}, 400);
|
|
97
|
+
const parsed = await parseJsonBody(c, triggerInboundWebhookSchema, 'invalid webhook payload');
|
|
98
|
+
if (!parsed.ok) {
|
|
99
|
+
return parsed.response;
|
|
115
100
|
}
|
|
116
101
|
const { text, message, source, author, payload } = parsed.data;
|
|
117
102
|
const result = await inboundWebhookEngine.triggerWebhook(db, c.req.param('webhookId'), token, {
|
|
@@ -121,10 +106,7 @@ inboundWebhookRoutes.post('/hooks/:webhookId', async (c) => {
|
|
|
121
106
|
payload: (payload && typeof payload === 'object') ? payload : undefined,
|
|
122
107
|
});
|
|
123
108
|
if (!result) {
|
|
124
|
-
return c
|
|
125
|
-
ok: false,
|
|
126
|
-
error: { code: 'webhook_not_found', message: 'Webhook not found or inactive' },
|
|
127
|
-
}, 404);
|
|
109
|
+
return jsonNotFound(c, 'webhook_not_found', 'Webhook not found or inactive');
|
|
128
110
|
}
|
|
129
111
|
const { workspace_id, channel_id, ...responseData } = result;
|
|
130
112
|
const eventData = { ...responseData, channel_id };
|
|
@@ -143,7 +125,7 @@ inboundWebhookRoutes.post('/hooks/:webhookId', async (c) => {
|
|
|
143
125
|
source: result.source ?? null,
|
|
144
126
|
author: result.author ?? null,
|
|
145
127
|
});
|
|
146
|
-
return c
|
|
128
|
+
return jsonCreated(c, responseData);
|
|
147
129
|
}
|
|
148
130
|
catch (err) {
|
|
149
131
|
return errorResponse(c, err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inboundWebhook.js","sourceRoot":"","sources":["../../src/routes/inboundWebhook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,oBAAoB,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,aAAa,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"inboundWebhook.js","sourceRoot":"","sources":["../../src/routes/inboundWebhook.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbox.d.ts","sourceRoot":"","sources":["../../src/routes/inbox.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"inbox.d.ts","sourceRoot":"","sources":["../../src/routes/inbox.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAUxC,eAAO,MAAM,WAAW,qDAAqB,CAAC"}
|
package/dist/routes/inbox.js
CHANGED
|
@@ -6,6 +6,7 @@ import * as deliveryEngine from '../engine/delivery.js';
|
|
|
6
6
|
import { notifyDeliveryFailures } from './deliveryRouting.js';
|
|
7
7
|
import { runInBackground } from './background.js';
|
|
8
8
|
import { errorResponse } from '../lib/httpError.js';
|
|
9
|
+
import { jsonOk } from '../lib/httpResponse.js';
|
|
9
10
|
export const inboxRoutes = new Hono();
|
|
10
11
|
// GET /v1/inbox - unified inbox for the calling agent
|
|
11
12
|
inboxRoutes.get('/inbox', requireAgentToken, rateLimit, async (c) => {
|
|
@@ -18,7 +19,7 @@ inboxRoutes.get('/inbox', requireAgentToken, rateLimit, async (c) => {
|
|
|
18
19
|
runInBackground(c, notifyDeliveryFailures(c, expired), 'fanout delivery expired');
|
|
19
20
|
}
|
|
20
21
|
const result = await inboxEngine.getInbox(db, workspace.id, agent.id);
|
|
21
|
-
return c
|
|
22
|
+
return jsonOk(c, result);
|
|
22
23
|
}
|
|
23
24
|
catch (err) {
|
|
24
25
|
return errorResponse(c, err);
|
package/dist/routes/inbox.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbox.js","sourceRoot":"","sources":["../../src/routes/inbox.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"inbox.js","sourceRoot":"","sources":["../../src/routes/inbox.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,IAAI,EAAU,CAAC;AAE9C,sDAAsD;AACtD,WAAW,CAAC,GAAG,CACb,QAAQ,EACR,iBAAiB,EACjB,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,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,mBAAmB,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;QAC3E,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,eAAe,CAAC,CAAC,EAAE,sBAAsB,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,yBAAyB,CAAC,CAAC;QACpF,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,KAAM,CAAC,EAAE,CAAC,CAAC;QACvE,OAAO,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAC3B,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":"message.d.ts","sourceRoot":"","sources":["../../src/routes/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../src/routes/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AA+BxC,eAAO,MAAM,aAAa,qDAAqB,CAAC"}
|
package/dist/routes/message.js
CHANGED
|
@@ -1,20 +1,22 @@
|
|
|
1
1
|
import { Hono } from 'hono';
|
|
2
2
|
import { z } from 'zod';
|
|
3
|
-
import { requireAuth } from '../middleware/auth.js';
|
|
3
|
+
import { requireAuth, requireWorkspaceRead } 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 messageEngine from '../engine/message.js';
|
|
7
7
|
import * as channelEngine from '../engine/channel.js';
|
|
8
8
|
import * as triggerEngine from '../engine/trigger.js';
|
|
9
9
|
import { resolveMailboxConfig } from '../engine/mailboxConfig.js';
|
|
10
|
-
import {
|
|
10
|
+
import { publishWorkspaceEvent } from './fanout.js';
|
|
11
11
|
import { notifyDeliveryRejections, routeDeliveryOutcomes } from './deliveryRouting.js';
|
|
12
12
|
import { buildMessageCreatedEventData } from '../engine/deliveryWire.js';
|
|
13
|
+
import { getChannelObserverResource, getMessageObserverResource, getObserverTokenFromContext, observerAllowsChannel, observerAllowsMessageResource, observerAllowsMessage, } from '../engine/observerToken.js';
|
|
13
14
|
import { runInBackground } from './background.js';
|
|
14
|
-
import { isFleetNodesEnabled } from '../lib/fleetNodes.js';
|
|
15
15
|
import { sendWebhookEvent } from './webhookOutbox.js';
|
|
16
16
|
import { emitServerEvent } from '../lib/serverTelemetry.js';
|
|
17
17
|
import { errorResponse } from '../lib/httpError.js';
|
|
18
|
+
import { jsonError, jsonNotFound, jsonOk, parseJsonBody, } from '../lib/httpResponse.js';
|
|
19
|
+
import { parsePaginationQuery } from '../lib/httpQuery.js';
|
|
18
20
|
export const messageRoutes = new Hono();
|
|
19
21
|
const postMessageSchema = z.object({
|
|
20
22
|
text: z.string().min(1),
|
|
@@ -24,43 +26,47 @@ const postMessageSchema = z.object({
|
|
|
24
26
|
content_type: z.string().optional(),
|
|
25
27
|
mode: z.enum(['wait', 'steer']).default('wait'),
|
|
26
28
|
});
|
|
29
|
+
function postMessageInvalidMessage(failure) {
|
|
30
|
+
const field = failure.error.issues[0]?.path[0];
|
|
31
|
+
if (field === 'text')
|
|
32
|
+
return 'text is required';
|
|
33
|
+
if (field === 'mode')
|
|
34
|
+
return 'mode must be "wait" or "steer"';
|
|
35
|
+
if (field === 'attachments')
|
|
36
|
+
return 'attachments must be an array of strings';
|
|
37
|
+
if (field === 'blocks')
|
|
38
|
+
return 'blocks must be an array';
|
|
39
|
+
if (field === 'data')
|
|
40
|
+
return 'data must be an object';
|
|
41
|
+
if (field === 'content_type')
|
|
42
|
+
return 'content_type must be a string';
|
|
43
|
+
return 'invalid message body';
|
|
44
|
+
}
|
|
27
45
|
// POST /v1/channels/:name/messages - post a message
|
|
28
46
|
messageRoutes.post('/channels/:name/messages', requireAuth, rateLimit, async (c) => {
|
|
29
47
|
try {
|
|
30
48
|
const db = c.get('db');
|
|
31
49
|
const workspace = c.get('workspace');
|
|
32
50
|
const agent = c.get('agent');
|
|
33
|
-
const parsed =
|
|
34
|
-
if (!parsed.
|
|
35
|
-
return
|
|
36
|
-
ok: false,
|
|
37
|
-
error: { code: 'invalid_request', message: 'text is required' },
|
|
38
|
-
}, 400);
|
|
51
|
+
const parsed = await parseJsonBody(c, postMessageSchema, postMessageInvalidMessage);
|
|
52
|
+
if (!parsed.ok) {
|
|
53
|
+
return parsed.response;
|
|
39
54
|
}
|
|
40
55
|
const { text, blocks, attachments, data, content_type, mode } = parsed.data;
|
|
41
56
|
const { key: idempotencyKey, error: idempotencyError } = parseIdempotencyKey(c.req.header('Idempotency-Key'));
|
|
42
57
|
if (idempotencyError) {
|
|
43
|
-
return c
|
|
44
|
-
ok: false,
|
|
45
|
-
error: { code: 'invalid_idempotency_key', message: idempotencyError },
|
|
46
|
-
}, 400);
|
|
58
|
+
return jsonError(c, 'invalid_idempotency_key', idempotencyError, 400);
|
|
47
59
|
}
|
|
48
60
|
const channelName = c.req.param('name');
|
|
49
61
|
// Resolve channel name to ID
|
|
50
62
|
const channel = await channelEngine.getChannel(db, workspace.id, channelName);
|
|
51
63
|
if (!channel) {
|
|
52
|
-
return c
|
|
53
|
-
ok: false,
|
|
54
|
-
error: { code: 'channel_not_found', message: `Channel "${channelName}" not found` },
|
|
55
|
-
}, 404);
|
|
64
|
+
return jsonNotFound(c, 'channel_not_found', `Channel "${channelName}" not found`);
|
|
56
65
|
}
|
|
57
66
|
// Determine agent ID (from agent token or body)
|
|
58
67
|
const agentId = agent?.id;
|
|
59
68
|
if (!agentId) {
|
|
60
|
-
return c
|
|
61
|
-
ok: false,
|
|
62
|
-
error: { code: 'agent_token_required', message: 'Agent token required to post messages' },
|
|
63
|
-
}, 403);
|
|
69
|
+
return jsonError(c, 'agent_token_required', 'Agent token required to post messages', 403);
|
|
64
70
|
}
|
|
65
71
|
const mailbox = resolveMailboxConfig(c.get('engine').config, workspace.id);
|
|
66
72
|
const toMessageCreatedEventData = (data) => buildMessageCreatedEventData(data, {
|
|
@@ -85,15 +91,12 @@ messageRoutes.post('/channels/:name/messages', requireAuth, rateLimit, async (c)
|
|
|
85
91
|
});
|
|
86
92
|
},
|
|
87
93
|
});
|
|
88
|
-
if (idempotent.replayed) {
|
|
89
|
-
c.header('Idempotency-Replayed', 'true');
|
|
90
|
-
}
|
|
91
94
|
// Durable event queue for webhook delivery; real-time pub/sub still fire-and-forget.
|
|
92
95
|
// Only publish for fresh writes, not idempotent replays.
|
|
93
96
|
if (!idempotent.replayed) {
|
|
94
97
|
const { _deliveries, _delivery_rejections, ...publicData } = idempotent.data;
|
|
95
98
|
const eventData = toMessageCreatedEventData(idempotent.data);
|
|
96
|
-
runInBackground(c,
|
|
99
|
+
runInBackground(c, publishWorkspaceEvent(c, 'message.created', eventData, channel.id), 'publish message.created');
|
|
97
100
|
if (_deliveries && _deliveries.length > 0) {
|
|
98
101
|
runInBackground(c, routeDeliveryOutcomes(c, _deliveries, 'message.created', eventData), 'route message deliveries');
|
|
99
102
|
}
|
|
@@ -106,15 +109,8 @@ messageRoutes.post('/channels/:name/messages', requireAuth, rateLimit, async (c)
|
|
|
106
109
|
message_kind: publicData.thread_id ? 'thread_reply' : 'channel_message',
|
|
107
110
|
has_attachments: Boolean(publicData.has_attachments),
|
|
108
111
|
});
|
|
109
|
-
runInBackground(c,
|
|
110
|
-
|
|
111
|
-
// fleet node control surface, so it is skipped entirely when the flag is
|
|
112
|
-
// off. Checked here (not per-trigger) so the policy lives at one boundary.
|
|
113
|
-
(async () => {
|
|
114
|
-
const { kv, config, nodeConnections } = c.get('engine');
|
|
115
|
-
if (!(await isFleetNodesEnabled(kv, workspace.id, config.fleetNodesEnabled ?? false))) {
|
|
116
|
-
return;
|
|
117
|
-
}
|
|
112
|
+
runInBackground(c, (async () => {
|
|
113
|
+
const { nodeConnections } = c.get('engine');
|
|
118
114
|
await triggerEngine.fireMessageTriggers({
|
|
119
115
|
db,
|
|
120
116
|
nodeConnections,
|
|
@@ -133,51 +129,62 @@ messageRoutes.post('/channels/:name/messages', requireAuth, rateLimit, async (c)
|
|
|
133
129
|
});
|
|
134
130
|
})(), 'fire message triggers');
|
|
135
131
|
}
|
|
136
|
-
|
|
137
|
-
const { _deliveries: _dropDeliveries, _delivery_rejections: _dropRejections, ...responseData } = idempotent.data;
|
|
138
|
-
return c.json({ ok: true, data: responseData }, idempotent.status);
|
|
132
|
+
return jsonIdempotentOk(c, idempotent);
|
|
139
133
|
}
|
|
140
134
|
catch (err) {
|
|
141
135
|
return errorResponse(c, err);
|
|
142
136
|
}
|
|
143
137
|
});
|
|
144
138
|
// GET /v1/channels/:name/messages - list messages
|
|
145
|
-
messageRoutes.get('/channels/:name/messages',
|
|
139
|
+
messageRoutes.get('/channels/:name/messages', requireWorkspaceRead('messages:read'), rateLimit, async (c) => {
|
|
146
140
|
try {
|
|
147
141
|
const db = c.get('db');
|
|
148
142
|
const workspace = c.get('workspace');
|
|
149
143
|
const channelName = c.req.param('name');
|
|
144
|
+
const observer = getObserverTokenFromContext(c);
|
|
145
|
+
if (observer) {
|
|
146
|
+
const resource = await getChannelObserverResource(db, workspace.id, channelName);
|
|
147
|
+
if (!resource || !observerAllowsChannel(observer, resource)) {
|
|
148
|
+
return jsonNotFound(c, 'channel_not_found', `Channel "${channelName}" not found`);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
150
151
|
const channel = await channelEngine.getChannel(db, workspace.id, channelName);
|
|
151
152
|
if (!channel) {
|
|
152
|
-
return c
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
153
|
+
return jsonNotFound(c, 'channel_not_found', `Channel "${channelName}" not found`);
|
|
154
|
+
}
|
|
155
|
+
const query = parsePaginationQuery(c);
|
|
156
|
+
if (!query.ok) {
|
|
157
|
+
return query.response;
|
|
156
158
|
}
|
|
157
|
-
const
|
|
158
|
-
const before = c.req.query('before');
|
|
159
|
-
const after = c.req.query('after');
|
|
159
|
+
const { limit, before, after } = query.data;
|
|
160
160
|
const messages = await messageEngine.getMessages(db, workspace.id, channel.id, { limit, before, after });
|
|
161
|
-
return c.
|
|
161
|
+
return jsonOk(c, messages.filter((message) => observerAllowsMessage(observer, message)));
|
|
162
162
|
}
|
|
163
163
|
catch (err) {
|
|
164
164
|
return errorResponse(c, err);
|
|
165
165
|
}
|
|
166
166
|
});
|
|
167
167
|
// GET /v1/messages/:id - get single message
|
|
168
|
-
messageRoutes.get('/messages/:id',
|
|
168
|
+
messageRoutes.get('/messages/:id', requireWorkspaceRead(['messages:read', 'dms:read']), rateLimit, async (c) => {
|
|
169
169
|
try {
|
|
170
170
|
const db = c.get('db');
|
|
171
171
|
const workspace = c.get('workspace');
|
|
172
172
|
const messageId = c.req.param('id');
|
|
173
|
+
const observer = getObserverTokenFromContext(c);
|
|
174
|
+
if (observer) {
|
|
175
|
+
const resource = await getMessageObserverResource(db, workspace.id, messageId);
|
|
176
|
+
if (!resource) {
|
|
177
|
+
return jsonNotFound(c, 'message_not_found', 'Message not found');
|
|
178
|
+
}
|
|
179
|
+
if (!observerAllowsMessageResource(observer, resource, { normalScope: 'messages:read' })) {
|
|
180
|
+
return jsonNotFound(c, 'message_not_found', 'Message not found');
|
|
181
|
+
}
|
|
182
|
+
}
|
|
173
183
|
const message = await messageEngine.getMessage(db, workspace.id, messageId);
|
|
174
184
|
if (!message) {
|
|
175
|
-
return c
|
|
176
|
-
ok: false,
|
|
177
|
-
error: { code: 'message_not_found', message: 'Message not found' },
|
|
178
|
-
}, 404);
|
|
185
|
+
return jsonNotFound(c, 'message_not_found', 'Message not found');
|
|
179
186
|
}
|
|
180
|
-
return c
|
|
187
|
+
return jsonOk(c, message);
|
|
181
188
|
}
|
|
182
189
|
catch (err) {
|
|
183
190
|
return errorResponse(c, err);
|