@relaycast/engine 5.0.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/realtime.d.ts +9 -1
- package/dist/adapters/node/realtime.d.ts.map +1 -1
- package/dist/adapters/node/realtime.js +64 -7
- 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/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 +329 -0
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +32 -3
- package/dist/db/schema.js.map +1 -1
- package/dist/engine/action.d.ts +2 -2
- package/dist/engine/action.d.ts.map +1 -1
- package/dist/engine/action.js +182 -7
- 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 +0 -155
- 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 +2 -0
- package/dist/engine/delivery.d.ts.map +1 -1
- package/dist/engine/delivery.js +4 -0
- 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 +1 -0
- package/dist/engine/deliveryWrites.d.ts.map +1 -1
- package/dist/engine/deliveryWrites.js +7 -2
- 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 +9 -2
- package/dist/engine/invocationCompletion.js.map +1 -1
- package/dist/engine/message.d.ts.map +1 -1
- package/dist/engine/message.js +15 -44
- package/dist/engine/message.js.map +1 -1
- package/dist/engine/node.d.ts +13 -1
- package/dist/engine/node.d.ts.map +1 -1
- package/dist/engine/node.js +100 -31
- package/dist/engine/node.js.map +1 -1
- package/dist/engine/nodeContext.d.ts.map +1 -1
- package/dist/engine/nodeContext.js +8 -32
- package/dist/engine/nodeContext.js.map +1 -1
- 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 +8 -0
- package/dist/engine/thread.js.map +1 -1
- package/dist/engine/wsAuth.d.ts +2 -6
- package/dist/engine/wsAuth.d.ts.map +1 -1
- package/dist/engine/wsAuth.js +20 -12
- package/dist/engine/wsAuth.js.map +1 -1
- 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 +4 -25
- package/dist/engine.js.map +1 -1
- package/dist/entrypoints/node.d.ts.map +1 -1
- package/dist/entrypoints/node.js +1 -14
- 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/middleware/auth.d.ts +8 -0
- package/dist/middleware/auth.d.ts.map +1 -1
- package/dist/middleware/auth.js +62 -0
- package/dist/middleware/auth.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 +9 -2
- package/dist/middleware/planLimits.js.map +1 -1
- package/dist/middleware/rateLimit.d.ts.map +1 -1
- package/dist/middleware/rateLimit.js +13 -1
- 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/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/action.d.ts.map +1 -1
- package/dist/routes/action.js +13 -5
- package/dist/routes/action.js.map +1 -1
- package/dist/routes/agent.d.ts.map +1 -1
- package/dist/routes/agent.js +107 -51
- package/dist/routes/agent.js.map +1 -1
- package/dist/routes/channel.d.ts.map +1 -1
- package/dist/routes/channel.js +38 -12
- package/dist/routes/channel.js.map +1 -1
- package/dist/routes/console.d.ts.map +1 -1
- package/dist/routes/console.js +39 -9
- package/dist/routes/console.js.map +1 -1
- package/dist/routes/deliveryRouting.js +28 -19
- package/dist/routes/deliveryRouting.js.map +1 -1
- package/dist/routes/fanout.d.ts.map +1 -1
- package/dist/routes/fanout.js +26 -18
- package/dist/routes/fanout.js.map +1 -1
- package/dist/routes/file.d.ts.map +1 -1
- package/dist/routes/file.js +15 -5
- package/dist/routes/file.js.map +1 -1
- package/dist/routes/message.d.ts.map +1 -1
- package/dist/routes/message.js +22 -4
- package/dist/routes/message.js.map +1 -1
- package/dist/routes/node.d.ts.map +1 -1
- package/dist/routes/node.js +61 -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 +6 -3
- package/dist/routes/presence.js.map +1 -1
- package/dist/routes/reaction.d.ts.map +1 -1
- package/dist/routes/reaction.js +59 -7
- 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/search.d.ts.map +1 -1
- package/dist/routes/search.js +7 -4
- package/dist/routes/search.js.map +1 -1
- package/dist/routes/thread.d.ts.map +1 -1
- package/dist/routes/thread.js +20 -3
- package/dist/routes/thread.js.map +1 -1
- package/dist/routes/workspace.d.ts.map +1 -1
- package/dist/routes/workspace.js +20 -7
- package/dist/routes/workspace.js.map +1 -1
- package/package.json +3 -3
package/dist/engine/thread.js
CHANGED
|
@@ -24,6 +24,11 @@ export async function postReply(db, workspaceId, parentId, agentId, data, option
|
|
|
24
24
|
.where(eq(dmConversations.channelId, parent.channelId));
|
|
25
25
|
const replyId = generateId();
|
|
26
26
|
const metadata = sanitizeUserMessageMetadata(data.data);
|
|
27
|
+
const mentionPattern = /(?:^|\s)@(\w+)/g;
|
|
28
|
+
const mentionedHandles = new Set();
|
|
29
|
+
for (let match = mentionPattern.exec(data.text); match !== null; match = mentionPattern.exec(data.text)) {
|
|
30
|
+
mentionedHandles.add(match[1]);
|
|
31
|
+
}
|
|
27
32
|
const mailbox = options.mailbox ?? {
|
|
28
33
|
ttlMs: DEFAULT_MAILBOX_TTL_MS,
|
|
29
34
|
depthCap: DEFAULT_MAILBOX_DEPTH_CAP,
|
|
@@ -68,6 +73,7 @@ export async function postReply(db, workspaceId, parentId, agentId, data, option
|
|
|
68
73
|
ttlMs: mailbox.ttlMs,
|
|
69
74
|
depthCap: mailbox.depthCap,
|
|
70
75
|
reason: 'thread-reply',
|
|
76
|
+
mentionHandles: Array.from(mentionedHandles),
|
|
71
77
|
}));
|
|
72
78
|
return writes;
|
|
73
79
|
});
|
|
@@ -82,11 +88,13 @@ export async function postReply(db, workspaceId, parentId, agentId, data, option
|
|
|
82
88
|
messageId: replyId,
|
|
83
89
|
channelId: parent.channelId,
|
|
84
90
|
senderAgentId: agentId,
|
|
91
|
+
mentionHandles: Array.from(mentionedHandles),
|
|
85
92
|
});
|
|
86
93
|
return {
|
|
87
94
|
id: reply.id,
|
|
88
95
|
channel_id: reply.channelId,
|
|
89
96
|
channel_name: ch?.name,
|
|
97
|
+
...(dmConversation ? { conversation_id: dmConversation.id } : {}),
|
|
90
98
|
agent_id: reply.agentId,
|
|
91
99
|
agent_name: agent?.name || 'unknown',
|
|
92
100
|
thread_id: reply.threadId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thread.js","sourceRoot":"","sources":["../../src/engine/thread.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAoB,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EACL,yBAAyB,EACzB,yBAAyB,EACzB,4BAA4B,EAC5B,0BAA0B,GAE3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AAC5G,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAsB,MAAM,oBAAoB,CAAC;AAC3G,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAIjD,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,EAAM,EACN,WAAmB,EACnB,QAAgB,EAChB,OAAe,EACf,IAAwF,EACxF,UAAuC,EAAE;IAEzC,yBAAyB;IACzB,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE;SACtB,MAAM,EAAE;SACR,IAAI,CAAC,QAAQ,CAAC;SACd,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAEhF,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,UAAU,CAAC,0BAA0B,EAAE,mBAAmB,EAAE,GAAG,CAAC,CAAC;IACzE,CAAC;IAED,6FAA6F;IAC7F,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,EAAE,CAAC;IAE9C,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IAC9G,MAAM,CAAC,cAAc,CAAC,GAAG,MAAM,EAAE;SAC9B,MAAM,CAAC,EAAE,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,CAAC;SAClC,IAAI,CAAC,eAAe,CAAC;SACrB,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IAE1D,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI;QACjC,KAAK,EAAE,sBAAsB;QAC7B,QAAQ,EAAE,yBAAyB;KACpC,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;IAElG,6EAA6E;IAC7E,wEAAwE;IACxE,sCAAsC;IACtC,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE;QACpD,MAAM,MAAM,GAAkB;YAC5B,OAAO;iBACJ,MAAM,CAAC,QAAQ,CAAC;iBAChB,MAAM,CAAC;gBACN,EAAE,EAAE,OAAO;gBACX,WAAW;gBACX,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,OAAO;gBACP,QAAQ;gBACR,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,IAAI;gBAC3B,QAAQ;gBACR,cAAc,EAAE,KAAK;aACtB,CAAC;iBACD,SAAS,EAAE;SACf,CAAC;QAEF,MAAM,CAAC,IAAI,CACT,cAAc;YACZ,CAAC,CAAC,yBAAyB,CAAC,OAAO,EAAE;gBACnC,WAAW;gBACX,SAAS,EAAE,OAAO;gBAClB,cAAc,EAAE,cAAc,CAAC,EAAE;gBACjC,aAAa,EAAE,OAAO;gBACtB,IAAI,EAAE,WAAW;gBACjB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;aAC3B,CAAC;YACF,CAAC,CAAC,yBAAyB,CAAC,OAAO,EAAE;gBACnC,WAAW;gBACX,SAAS,EAAE,OAAO;gBAClB,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,aAAa,EAAE,OAAO;gBACtB,IAAI,EAAE,WAAW;gBACjB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,MAAM,EAAE,cAAc;
|
|
1
|
+
{"version":3,"file":"thread.js","sourceRoot":"","sources":["../../src/engine/thread.ts"],"names":[],"mappings":"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"}
|
package/dist/engine/wsAuth.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AuthProvider,
|
|
1
|
+
import type { AuthProvider, Workspace, ObserverToken } from '../ports/auth.js';
|
|
2
2
|
import type { EngineDb } from '../ports/database.js';
|
|
3
3
|
import { getNodeByTokenHash } from './node.js';
|
|
4
4
|
type WsAuthErrorCode = 'unauthorized' | 'invalid_token';
|
|
@@ -10,14 +10,10 @@ export interface WsAuthError {
|
|
|
10
10
|
upgradeMessage: 'Unauthorized';
|
|
11
11
|
}
|
|
12
12
|
export type RealtimeWsAuthResult = {
|
|
13
|
-
ok: true;
|
|
14
|
-
scope: 'agent';
|
|
15
|
-
workspace: Workspace;
|
|
16
|
-
agent: Agent;
|
|
17
|
-
} | {
|
|
18
13
|
ok: true;
|
|
19
14
|
scope: 'workspace';
|
|
20
15
|
workspace: Workspace;
|
|
16
|
+
observerToken?: ObserverToken;
|
|
21
17
|
} | WsAuthError;
|
|
22
18
|
export type NodeWsAuthResult = {
|
|
23
19
|
ok: true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wsAuth.d.ts","sourceRoot":"","sources":["../../src/engine/wsAuth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"wsAuth.d.ts","sourceRoot":"","sources":["../../src/engine/wsAuth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAG/C,KAAK,eAAe,GAAG,cAAc,GAAG,eAAe,CAAC;AAExD,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,KAAK,CAAC;IACV,MAAM,EAAE,GAAG,CAAC;IACZ,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,cAAc,CAAC;CAChC;AAED,MAAM,MAAM,oBAAoB,GAC5B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE,SAAS,CAAC;IAAC,aAAa,CAAC,EAAE,aAAa,CAAA;CAAE,GACrF,WAAW,CAAC;AAEhB,MAAM,MAAM,gBAAgB,GACxB;IACE,EAAE,EAAE,IAAI,CAAC;IACT,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC,CAAC;CACnE,GACD,WAAW,CAAC;AAEhB,UAAU,UAAU;IAClB,IAAI,EAAE,YAAY,CAAC;IACnB,EAAE,EAAE,QAAQ,CAAC;CACd;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAIrF;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAG5H;AAED,wBAAgB,cAAc,IAAI,WAAW,CAQ5C;AAYD,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA2B3G;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAYnG"}
|
package/dist/engine/wsAuth.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { getAuthTokenKind } from '../auth/tokenKind.js';
|
|
1
2
|
import { getNodeByTokenHash } from './node.js';
|
|
3
|
+
import { hasObserverScope } from './observerToken.js';
|
|
2
4
|
export function extractBearerToken(authHeader) {
|
|
3
5
|
return authHeader && /^bearer\s+/i.test(authHeader)
|
|
4
6
|
? authHeader.replace(/^bearer\s+/i, '').trim()
|
|
@@ -27,24 +29,30 @@ function invalidWsToken(message) {
|
|
|
27
29
|
};
|
|
28
30
|
}
|
|
29
31
|
export async function authenticateRealtimeWs(deps, token) {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
return
|
|
32
|
+
const tokenKind = getAuthTokenKind(token);
|
|
33
|
+
if (tokenKind === 'agent') {
|
|
34
|
+
return invalidWsToken('Agent realtime WebSockets have moved to node transport');
|
|
35
|
+
}
|
|
36
|
+
if (tokenKind === 'workspace') {
|
|
37
|
+
return invalidWsToken('Observer token required for workspace stream');
|
|
36
38
|
}
|
|
37
|
-
if (
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
if (tokenKind === 'node') {
|
|
40
|
+
return invalidWsToken('Node token cannot open the workspace stream');
|
|
41
|
+
}
|
|
42
|
+
if (tokenKind === 'observer') {
|
|
43
|
+
const result = await deps.auth.authenticate({ token, require: 'observer', db: deps.db });
|
|
44
|
+
if (!result.ok || !result.observerToken) {
|
|
45
|
+
return invalidWsToken('Invalid observer token');
|
|
46
|
+
}
|
|
47
|
+
if (!hasObserverScope(result.observerToken, 'stream:read')) {
|
|
48
|
+
return invalidWsToken('Observer token lacks stream:read');
|
|
41
49
|
}
|
|
42
|
-
return { ok: true, scope: 'workspace', workspace: result.workspace };
|
|
50
|
+
return { ok: true, scope: 'workspace', workspace: result.workspace, observerToken: result.observerToken };
|
|
43
51
|
}
|
|
44
52
|
return invalidWsToken('Invalid token format');
|
|
45
53
|
}
|
|
46
54
|
export async function authenticateNodeWs(deps, token) {
|
|
47
|
-
if (
|
|
55
|
+
if (getAuthTokenKind(token) !== 'node') {
|
|
48
56
|
return invalidWsToken('Invalid node token format');
|
|
49
57
|
}
|
|
50
58
|
const hash = await deps.auth.hashToken(token);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wsAuth.js","sourceRoot":"","sources":["../../src/engine/wsAuth.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"wsAuth.js","sourceRoot":"","sources":["../../src/engine/wsAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wsTransform.d.ts","sourceRoot":"","sources":["../../src/engine/wsTransform.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"wsTransform.d.ts","sourceRoot":"","sources":["../../src/engine/wsTransform.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAuP1E"}
|
|
@@ -6,11 +6,18 @@ import { stableRelaycastEventId } from './event-id.js';
|
|
|
6
6
|
*/
|
|
7
7
|
export function transformForClient(event) {
|
|
8
8
|
const d = event.data;
|
|
9
|
+
const createdAt = typeof d.created_at === 'string' ? d.created_at : event.timestamp;
|
|
10
|
+
const withCreatedAt = { created_at: createdAt };
|
|
11
|
+
const agentId = (typeof d.agent_id === 'string' ? d.agent_id : null)
|
|
12
|
+
?? (typeof d.subject_agent_id === 'string' ? d.subject_agent_id : null);
|
|
13
|
+
const agentRef = { ...(agentId ? { id: agentId } : {}), name: d.agent_name };
|
|
9
14
|
switch (event.type) {
|
|
10
15
|
case 'message.created':
|
|
11
16
|
return {
|
|
12
17
|
id: stableRelaycastEventId(d.id),
|
|
13
18
|
type: 'message.created',
|
|
19
|
+
...withCreatedAt,
|
|
20
|
+
...(event.channel_id ? { channel_id: event.channel_id } : {}),
|
|
14
21
|
channel: d.channel_name,
|
|
15
22
|
message: {
|
|
16
23
|
id: d.id,
|
|
@@ -24,6 +31,8 @@ export function transformForClient(event) {
|
|
|
24
31
|
case 'message.updated':
|
|
25
32
|
return {
|
|
26
33
|
type: 'message.updated',
|
|
34
|
+
...withCreatedAt,
|
|
35
|
+
...(event.channel_id ? { channel_id: event.channel_id } : {}),
|
|
27
36
|
channel: d.channel_name,
|
|
28
37
|
message: {
|
|
29
38
|
id: d.id,
|
|
@@ -36,6 +45,9 @@ export function transformForClient(event) {
|
|
|
36
45
|
return {
|
|
37
46
|
id: stableRelaycastEventId(d.id),
|
|
38
47
|
type: 'thread.reply',
|
|
48
|
+
...withCreatedAt,
|
|
49
|
+
...(event.channel_id ? { channel_id: event.channel_id } : {}),
|
|
50
|
+
...(d.conversation_id ? { conversation_id: d.conversation_id } : {}),
|
|
39
51
|
channel: d.channel_name,
|
|
40
52
|
parent_id: d.thread_id,
|
|
41
53
|
message: {
|
|
@@ -48,8 +60,13 @@ export function transformForClient(event) {
|
|
|
48
60
|
case 'message.reacted':
|
|
49
61
|
return {
|
|
50
62
|
type: 'message.reacted',
|
|
63
|
+
...withCreatedAt,
|
|
64
|
+
...(event.channel_id ? { channel_id: event.channel_id } : {}),
|
|
65
|
+
...(d.channel_name ? { channel: d.channel_name } : {}),
|
|
66
|
+
...(d.conversation_id ? { conversation_id: d.conversation_id } : {}),
|
|
51
67
|
message_id: d.message_id,
|
|
52
68
|
emoji: d.emoji,
|
|
69
|
+
...(d.agent_id ? { agent_id: d.agent_id } : {}),
|
|
53
70
|
agent_name: d.agent_name,
|
|
54
71
|
action: d.action ?? 'added',
|
|
55
72
|
};
|
|
@@ -60,6 +77,7 @@ export function transformForClient(event) {
|
|
|
60
77
|
return {
|
|
61
78
|
id: stableRelaycastEventId((msg.id ?? d.id)),
|
|
62
79
|
type: 'dm.received',
|
|
80
|
+
...withCreatedAt,
|
|
63
81
|
conversation_id: d.conversation_id,
|
|
64
82
|
message: {
|
|
65
83
|
id: (msg.id ?? d.id),
|
|
@@ -78,6 +96,7 @@ export function transformForClient(event) {
|
|
|
78
96
|
return {
|
|
79
97
|
id: stableRelaycastEventId((msg.id ?? d.id)),
|
|
80
98
|
type: 'group_dm.received',
|
|
99
|
+
...withCreatedAt,
|
|
81
100
|
conversation_id: d.conversation_id,
|
|
82
101
|
message: {
|
|
83
102
|
id: (msg.id ?? d.id),
|
|
@@ -92,95 +111,100 @@ export function transformForClient(event) {
|
|
|
92
111
|
case 'agent.status.active':
|
|
93
112
|
return {
|
|
94
113
|
type: 'agent.status.active',
|
|
95
|
-
|
|
114
|
+
...withCreatedAt,
|
|
115
|
+
agent: agentRef,
|
|
96
116
|
status: 'active',
|
|
97
117
|
};
|
|
98
118
|
case 'agent.status.offline':
|
|
99
119
|
return {
|
|
100
120
|
type: 'agent.status.offline',
|
|
101
|
-
|
|
121
|
+
...withCreatedAt,
|
|
122
|
+
agent: agentRef,
|
|
102
123
|
status: 'offline',
|
|
103
124
|
};
|
|
104
125
|
case 'agent.status.changed':
|
|
105
126
|
return {
|
|
106
127
|
type: 'agent.status.changed',
|
|
107
|
-
|
|
128
|
+
...withCreatedAt,
|
|
129
|
+
agent: agentRef,
|
|
108
130
|
status: d.status,
|
|
109
131
|
};
|
|
110
132
|
case 'agent.status.idle':
|
|
111
133
|
return {
|
|
112
134
|
type: 'agent.status.idle',
|
|
113
|
-
|
|
135
|
+
...withCreatedAt,
|
|
136
|
+
agent: agentRef,
|
|
114
137
|
status: 'idle',
|
|
115
138
|
};
|
|
116
139
|
case 'agent.status.blocked':
|
|
117
140
|
return {
|
|
118
141
|
type: 'agent.status.blocked',
|
|
119
|
-
|
|
142
|
+
...withCreatedAt,
|
|
143
|
+
agent: agentRef,
|
|
120
144
|
status: 'blocked',
|
|
121
145
|
};
|
|
122
146
|
case 'agent.status.waiting':
|
|
123
147
|
return {
|
|
124
148
|
type: 'agent.status.waiting',
|
|
125
|
-
|
|
149
|
+
...withCreatedAt,
|
|
150
|
+
agent: agentRef,
|
|
126
151
|
status: 'waiting',
|
|
127
152
|
};
|
|
128
|
-
case 'agent.spawn_requested':
|
|
129
|
-
return {
|
|
130
|
-
type: 'agent.spawn_requested',
|
|
131
|
-
agent: {
|
|
132
|
-
name: d.agent_name,
|
|
133
|
-
cli: d.cli,
|
|
134
|
-
task: d.task,
|
|
135
|
-
channel: d.channel ?? null,
|
|
136
|
-
model: d.model ?? null,
|
|
137
|
-
already_existed: d.already_existed,
|
|
138
|
-
},
|
|
139
|
-
};
|
|
140
|
-
case 'agent.release_requested':
|
|
141
|
-
return {
|
|
142
|
-
type: 'agent.release_requested',
|
|
143
|
-
agent: { name: d.agent_name },
|
|
144
|
-
reason: d.reason ?? null,
|
|
145
|
-
deleted: d.deleted,
|
|
146
|
-
};
|
|
147
153
|
case 'channel.created':
|
|
148
154
|
return {
|
|
149
155
|
type: 'channel.created',
|
|
156
|
+
...withCreatedAt,
|
|
157
|
+
...(event.channel_id || d.id ? { channel_id: (event.channel_id ?? d.id) } : {}),
|
|
150
158
|
channel: { name: d.channel_name ?? d.name, topic: d.topic ?? null },
|
|
151
159
|
};
|
|
152
160
|
case 'channel.updated':
|
|
153
161
|
return {
|
|
154
162
|
type: 'channel.updated',
|
|
163
|
+
...withCreatedAt,
|
|
164
|
+
...(event.channel_id || d.id ? { channel_id: (event.channel_id ?? d.id) } : {}),
|
|
155
165
|
channel: { name: d.channel_name ?? d.name, topic: d.topic ?? null },
|
|
156
166
|
};
|
|
157
167
|
case 'channel.archived':
|
|
158
168
|
return {
|
|
159
169
|
type: 'channel.archived',
|
|
170
|
+
...withCreatedAt,
|
|
171
|
+
...(event.channel_id ? { channel_id: event.channel_id } : {}),
|
|
160
172
|
channel: { name: d.channel_name },
|
|
161
173
|
};
|
|
162
174
|
case 'member.joined':
|
|
163
175
|
return {
|
|
164
176
|
type: 'member.joined',
|
|
177
|
+
...withCreatedAt,
|
|
178
|
+
...(event.channel_id ? { channel_id: event.channel_id } : {}),
|
|
165
179
|
channel: d.channel_name,
|
|
180
|
+
...(d.agent_id ? { agent_id: d.agent_id } : {}),
|
|
166
181
|
agent_name: d.agent_name,
|
|
167
182
|
};
|
|
168
183
|
case 'member.left':
|
|
169
184
|
return {
|
|
170
185
|
type: 'member.left',
|
|
186
|
+
...withCreatedAt,
|
|
187
|
+
...(event.channel_id ? { channel_id: event.channel_id } : {}),
|
|
171
188
|
channel: d.channel_name,
|
|
189
|
+
...(d.agent_id ? { agent_id: d.agent_id } : {}),
|
|
172
190
|
agent_name: d.agent_name,
|
|
173
191
|
};
|
|
174
192
|
case 'message.read':
|
|
175
193
|
return {
|
|
176
194
|
type: 'message.read',
|
|
195
|
+
...withCreatedAt,
|
|
196
|
+
...(event.channel_id ? { channel_id: event.channel_id } : {}),
|
|
177
197
|
message_id: d.message_id,
|
|
198
|
+
...(d.conversation_id ? { conversation_id: d.conversation_id } : {}),
|
|
199
|
+
...(d.agent_id ? { agent_id: d.agent_id } : {}),
|
|
178
200
|
agent_name: d.agent_name,
|
|
179
201
|
read_at: d.read_at,
|
|
180
202
|
};
|
|
181
203
|
case 'file.uploaded':
|
|
182
204
|
return {
|
|
183
205
|
type: 'file.uploaded',
|
|
206
|
+
...withCreatedAt,
|
|
207
|
+
...(d.agent_id ? { agent_id: d.agent_id } : {}),
|
|
184
208
|
file: {
|
|
185
209
|
file_id: d.file_id ?? d.id,
|
|
186
210
|
filename: d.filename,
|
|
@@ -190,6 +214,8 @@ export function transformForClient(event) {
|
|
|
190
214
|
case 'webhook.received':
|
|
191
215
|
return {
|
|
192
216
|
type: 'webhook.received',
|
|
217
|
+
...withCreatedAt,
|
|
218
|
+
...(event.channel_id ? { channel_id: event.channel_id } : {}),
|
|
193
219
|
webhook_id: d.webhook_id,
|
|
194
220
|
channel: d.channel,
|
|
195
221
|
message: {
|
|
@@ -199,19 +225,9 @@ export function transformForClient(event) {
|
|
|
199
225
|
author: d.author ?? null,
|
|
200
226
|
},
|
|
201
227
|
};
|
|
202
|
-
case 'command.invoked':
|
|
203
|
-
return {
|
|
204
|
-
type: 'command.invoked',
|
|
205
|
-
command: d.command,
|
|
206
|
-
channel: d.channel,
|
|
207
|
-
invoked_by: d.invoked_by,
|
|
208
|
-
handler_agent_id: d.handler_agent_id,
|
|
209
|
-
args: d.args ?? null,
|
|
210
|
-
parameters: d.parameters ?? null,
|
|
211
|
-
};
|
|
212
228
|
default: {
|
|
213
229
|
const { workspace_id: _workspace_id, channel_id: _channel_id, timestamp: _timestamp, data, ...rest } = event;
|
|
214
|
-
return { ...rest, ...data };
|
|
230
|
+
return { ...rest, ...data, ...withCreatedAt };
|
|
215
231
|
}
|
|
216
232
|
}
|
|
217
233
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wsTransform.js","sourceRoot":"","sources":["../../src/engine/wsTransform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAUvD;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"wsTransform.js","sourceRoot":"","sources":["../../src/engine/wsTransform.ts"],"names":[],"mappings":"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"}
|
package/dist/engine.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,UAAU,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AA4CnD;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,UAAU,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AA4CnD;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CA8L3D"}
|
package/dist/engine.js
CHANGED
|
@@ -9,10 +9,10 @@ import { jsonError, jsonMalformedBody, jsonNotFound } from './lib/httpResponse.j
|
|
|
9
9
|
import { requiredOriginInfo } from './lib/origin.js';
|
|
10
10
|
import { emitServerEvent } from './lib/serverTelemetry.js';
|
|
11
11
|
import { authenticateNodeWs, authenticateRealtimeWs, missingWsToken, queryOrBearerToken, } from './engine/wsAuth.js';
|
|
12
|
-
import { ensureDirectNodeForAgent } from './engine/node.js';
|
|
13
12
|
// Route imports
|
|
14
13
|
import { healthRoutes } from './routes/health.js';
|
|
15
14
|
import { workspaceRoutes } from './routes/workspace.js';
|
|
15
|
+
import { observerTokenRoutes } from './routes/observerToken.js';
|
|
16
16
|
import { agentRoutes } from './routes/agent.js';
|
|
17
17
|
import { channelRoutes } from './routes/channel.js';
|
|
18
18
|
import { messageRoutes } from './routes/message.js';
|
|
@@ -86,7 +86,7 @@ export function createEngine(deps) {
|
|
|
86
86
|
if (!token) {
|
|
87
87
|
return jsonError(c, 'unauthorized', 'Missing token', 401);
|
|
88
88
|
}
|
|
89
|
-
const { auth, connections
|
|
89
|
+
const { auth, connections } = c.get('engine');
|
|
90
90
|
const db = c.get('db');
|
|
91
91
|
const originInfo = requiredOriginInfo(c.req.raw);
|
|
92
92
|
const origin = {
|
|
@@ -98,35 +98,13 @@ export function createEngine(deps) {
|
|
|
98
98
|
if (!authResult.ok) {
|
|
99
99
|
return jsonError(c, authResult.code, authResult.message, authResult.status);
|
|
100
100
|
}
|
|
101
|
-
if (authResult.scope === 'agent') {
|
|
102
|
-
await ensureDirectNodeForAgent(db, authResult.workspace.id, authResult.agent, {
|
|
103
|
-
online: true,
|
|
104
|
-
});
|
|
105
|
-
// Register the agent online (fire-and-forget)
|
|
106
|
-
presence.heartbeat(authResult.workspace.id, authResult.agent.id, authResult.agent.name).catch(() => { });
|
|
107
|
-
const response = await connections.upgrade({
|
|
108
|
-
request: c.req.raw,
|
|
109
|
-
scope: 'agent',
|
|
110
|
-
workspaceId: authResult.workspace.id,
|
|
111
|
-
agentId: authResult.agent.id,
|
|
112
|
-
agentName: authResult.agent.name,
|
|
113
|
-
origin,
|
|
114
|
-
originActor,
|
|
115
|
-
});
|
|
116
|
-
if (response.status === 101) {
|
|
117
|
-
emitServerEvent(c, authResult.workspace.id, 'relaycast_server_ws_session_started', {
|
|
118
|
-
agent_id: authResult.agent.id,
|
|
119
|
-
session_scope: 'agent',
|
|
120
|
-
});
|
|
121
|
-
}
|
|
122
|
-
return response;
|
|
123
|
-
}
|
|
124
101
|
const response = await connections.upgrade({
|
|
125
102
|
request: c.req.raw,
|
|
126
103
|
scope: 'workspace',
|
|
127
104
|
workspaceId: authResult.workspace.id,
|
|
128
105
|
origin,
|
|
129
106
|
originActor,
|
|
107
|
+
observerToken: authResult.observerToken,
|
|
130
108
|
});
|
|
131
109
|
if (response.status === 101) {
|
|
132
110
|
emitServerEvent(c, authResult.workspace.id, 'relaycast_server_ws_session_started', {
|
|
@@ -182,6 +160,7 @@ export function createEngine(deps) {
|
|
|
182
160
|
v1.route('/', presenceRoutes);
|
|
183
161
|
v1.route('/', systemPromptRoutes);
|
|
184
162
|
v1.route('/', workspaceRoutes);
|
|
163
|
+
v1.route('/', observerTokenRoutes);
|
|
185
164
|
v1.route('/', agentRoutes);
|
|
186
165
|
v1.route('/', channelRoutes);
|
|
187
166
|
v1.route('/', messageRoutes);
|
package/dist/engine.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACnF,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,cAAc,EACd,kBAAkB,GACnB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/entrypoints/node.ts"],"names":[],"mappings":"AAIA,OAAO,EAAS,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAK3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAIL,KAAK,wBAAwB,EAC7B,KAAK,WAAW,EACjB,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/entrypoints/node.ts"],"names":[],"mappings":"AAIA,OAAO,EAAS,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAK3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAIL,KAAK,wBAAwB,EAC7B,KAAK,WAAW,EACjB,MAAM,2BAA2B,CAAC;AAQnC,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,yDAAyD;IACzD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,QAAQ,CAAC,EAAE,wBAAwB,CAAC;CACrC;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAkBD;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,aAAa,CAmGtE"}
|
package/dist/entrypoints/node.js
CHANGED
|
@@ -5,7 +5,6 @@ import { createEngine } from '../engine.js';
|
|
|
5
5
|
import { jsonNotFound } from '../lib/httpResponse.js';
|
|
6
6
|
import { createNodeRuntime, FILE_ROUTE_PREFIX, } from '../adapters/node/index.js';
|
|
7
7
|
import { authenticateNodeWs, authenticateRealtimeWs, missingWsToken, queryOrBearerToken, } from '../engine/wsAuth.js';
|
|
8
|
-
import { ensureDirectNodeForAgent } from '../engine/node.js';
|
|
9
8
|
function toEngineSocket(ws) {
|
|
10
9
|
return {
|
|
11
10
|
send: (data) => ws.send(data),
|
|
@@ -90,20 +89,8 @@ export function startServer(options) {
|
|
|
90
89
|
rejectUpgrade(socket, authResult.status, authResult.upgradeMessage);
|
|
91
90
|
return;
|
|
92
91
|
}
|
|
93
|
-
if (authResult.scope === 'agent') {
|
|
94
|
-
await ensureDirectNodeForAgent(db, authResult.workspace.id, authResult.agent, {
|
|
95
|
-
online: true,
|
|
96
|
-
});
|
|
97
|
-
wss.handleUpgrade(req, socket, head, (ws) => {
|
|
98
|
-
const handle = runtime.realtime.attachAgentSocket(authResult.workspace.id, authResult.agent.id, toEngineSocket(ws));
|
|
99
|
-
runtime.deps.presence.heartbeat(authResult.workspace.id, authResult.agent.id, authResult.agent.name).catch(() => { });
|
|
100
|
-
ws.on('message', (data) => { void handle.handleMessage(data.toString()); });
|
|
101
|
-
ws.on('close', () => { void handle.handleClose(); });
|
|
102
|
-
});
|
|
103
|
-
return;
|
|
104
|
-
}
|
|
105
92
|
wss.handleUpgrade(req, socket, head, (ws) => {
|
|
106
|
-
const handle = runtime.realtime.attachWorkspaceSocket(authResult.workspace.id, toEngineSocket(ws));
|
|
93
|
+
const handle = runtime.realtime.attachWorkspaceSocket(authResult.workspace.id, toEngineSocket(ws), authResult.observerToken);
|
|
107
94
|
ws.on('message', (data) => { void handle.handleMessage(data.toString()); });
|
|
108
95
|
ws.on('close', () => { void handle.handleClose(); });
|
|
109
96
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/entrypoints/node.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAmB,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAA8B,MAAM,IAAI,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAMtD,OAAO,EACL,iBAAiB,EACjB,iBAAiB,GAIlB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,cAAc,EACd,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/entrypoints/node.ts"],"names":[],"mappings":"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"}
|