@agentforge-io/nest 3.0.1 → 4.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/modules/public-chat/public-chat.controller.js +23 -13
- package/dist/modules/public-chat/public-chat.controller.js.map +1 -1
- package/dist/modules/queue/processors/agent.processor.d.ts +11 -5
- package/dist/modules/queue/processors/agent.processor.js +5 -5
- package/dist/modules/queue/processors/agent.processor.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -0
- package/package.json +3 -3
|
@@ -50,7 +50,7 @@ let PublicChatController = class PublicChatController {
|
|
|
50
50
|
initialMessage: body.initialMessage,
|
|
51
51
|
});
|
|
52
52
|
return {
|
|
53
|
-
conversation: { id: result.conversation.id },
|
|
53
|
+
conversation: { id: result.conversation.code ?? result.conversation.id },
|
|
54
54
|
firstResponse: result.firstResponse,
|
|
55
55
|
};
|
|
56
56
|
}
|
|
@@ -59,9 +59,9 @@ let PublicChatController = class PublicChatController {
|
|
|
59
59
|
throw new common_1.BadRequestException('content and browserSessionId are required');
|
|
60
60
|
}
|
|
61
61
|
const t = await this.authorize(token, req);
|
|
62
|
-
await this.assertConversationBelongsToToken(conversationId, body.browserSessionId, t.agentId);
|
|
62
|
+
const conv = await this.assertConversationBelongsToToken(conversationId, body.browserSessionId, t.agentId);
|
|
63
63
|
return this.agents.sendMessage({
|
|
64
|
-
conversationId,
|
|
64
|
+
conversationId: conv.id,
|
|
65
65
|
userId: browserUserId(body.browserSessionId),
|
|
66
66
|
content: body.content,
|
|
67
67
|
});
|
|
@@ -82,7 +82,10 @@ let PublicChatController = class PublicChatController {
|
|
|
82
82
|
content: body.content,
|
|
83
83
|
})) {
|
|
84
84
|
if (evt.kind === 'conversation') {
|
|
85
|
-
|
|
85
|
+
const created = await this.conversations.ensureOwned(evt.conversationId, userId);
|
|
86
|
+
writeSse(res, 'conversation', {
|
|
87
|
+
id: created.code ?? evt.conversationId,
|
|
88
|
+
});
|
|
86
89
|
}
|
|
87
90
|
else {
|
|
88
91
|
writeChunk(res, evt.chunk);
|
|
@@ -102,11 +105,11 @@ let PublicChatController = class PublicChatController {
|
|
|
102
105
|
throw new common_1.BadRequestException('content and browserSessionId are required');
|
|
103
106
|
}
|
|
104
107
|
const t = await this.authorize(token, req);
|
|
105
|
-
await this.assertConversationBelongsToToken(conversationId, body.browserSessionId, t.agentId);
|
|
108
|
+
const conv = await this.assertConversationBelongsToToken(conversationId, body.browserSessionId, t.agentId);
|
|
106
109
|
openSse(res);
|
|
107
110
|
try {
|
|
108
111
|
for await (const chunk of this.agents.streamMessage({
|
|
109
|
-
conversationId,
|
|
112
|
+
conversationId: conv.id,
|
|
110
113
|
userId: browserUserId(body.browserSessionId),
|
|
111
114
|
content: body.content,
|
|
112
115
|
})) {
|
|
@@ -126,10 +129,10 @@ let PublicChatController = class PublicChatController {
|
|
|
126
129
|
throw new common_1.BadRequestException('browserSessionId is required');
|
|
127
130
|
}
|
|
128
131
|
const t = await this.authorize(token, req);
|
|
129
|
-
await this.assertConversationBelongsToToken(conversationId, browserSessionId, t.agentId);
|
|
130
|
-
const history = await this.conversations.getHistory(
|
|
132
|
+
const conv = await this.assertConversationBelongsToToken(conversationId, browserSessionId, t.agentId);
|
|
133
|
+
const history = await this.conversations.getHistory(conv.id, browserUserId(browserSessionId));
|
|
131
134
|
return {
|
|
132
|
-
conversationId: history.conversationId,
|
|
135
|
+
conversationId: conv.code ?? history.conversationId,
|
|
133
136
|
status: history.status,
|
|
134
137
|
messages: history.messages.map((m) => ({
|
|
135
138
|
id: m.id,
|
|
@@ -145,8 +148,8 @@ let PublicChatController = class PublicChatController {
|
|
|
145
148
|
throw new common_1.BadRequestException('browserSessionId is required');
|
|
146
149
|
}
|
|
147
150
|
const t = await this.authorize(token, req);
|
|
148
|
-
await this.assertConversationBelongsToToken(conversationId, body.browserSessionId, t.agentId);
|
|
149
|
-
await this.conversations.markCompleted(
|
|
151
|
+
const conv = await this.assertConversationBelongsToToken(conversationId, body.browserSessionId, t.agentId);
|
|
152
|
+
await this.conversations.markCompleted(conv.id);
|
|
150
153
|
}
|
|
151
154
|
async authorize(rawToken, req) {
|
|
152
155
|
const origin = req.headers.origin ?? undefined;
|
|
@@ -169,11 +172,15 @@ let PublicChatController = class PublicChatController {
|
|
|
169
172
|
async resolveAgent(agentId) {
|
|
170
173
|
return this.agents.resolveAgent({ agentId });
|
|
171
174
|
}
|
|
172
|
-
async assertConversationBelongsToToken(
|
|
173
|
-
const
|
|
175
|
+
async assertConversationBelongsToToken(handle, browserSessionId, agentId) {
|
|
176
|
+
const userId = browserUserId(browserSessionId);
|
|
177
|
+
const conv = uuidLike(handle)
|
|
178
|
+
? await this.conversations.ensureOwned(handle, userId)
|
|
179
|
+
: await this.conversations.getByCode(handle, userId);
|
|
174
180
|
if (conv.agentId !== agentId) {
|
|
175
181
|
throw new common_1.NotFoundException('Conversation not found');
|
|
176
182
|
}
|
|
183
|
+
return conv;
|
|
177
184
|
}
|
|
178
185
|
};
|
|
179
186
|
exports.PublicChatController = PublicChatController;
|
|
@@ -263,6 +270,9 @@ exports.PublicChatController = PublicChatController = __decorate([
|
|
|
263
270
|
core_1.AgentService,
|
|
264
271
|
core_1.ConversationService])
|
|
265
272
|
], PublicChatController);
|
|
273
|
+
function uuidLike(s) {
|
|
274
|
+
return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(s);
|
|
275
|
+
}
|
|
266
276
|
function browserUserId(browserSessionId) {
|
|
267
277
|
return `browser:${browserSessionId}`;
|
|
268
278
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-chat.controller.js","sourceRoot":"","sources":["../../../src/modules/public-chat/public-chat.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAcwB;AACxB,6CAAwD;AAExD,8CAM6B;AAC7B,kEAAqD;AAqB9C,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YACmB,UAA4B,EAC5B,MAAoB,EACpB,aAAkC;QAFlC,eAAU,GAAV,UAAU,CAAkB;QAC5B,WAAM,GAAN,MAAM,CAAc;QACpB,kBAAa,GAAb,aAAa,CAAqB;IAClD,CAAC;IAME,AAAN,KAAK,CAAC,QAAQ,CAAiB,KAAa,EAAS,GAAY;QAC/D,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAKjD,MAAM,KAAK,GAAG,KAA2C,CAAC;QAC1D,OAAO;YACL,KAAK,EAAE;gBACL,EAAE,EAAE,KAAK,CAAC,EAAE;gBACZ,IAAI,EAAG,KAAK,CAAC,IAA2B,IAAI,KAAK,CAAC,EAAE;gBACpD,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,WAAW,EAAE,KAAK,CAAC,WAAW;aAC/B;YACD,KAAK,EAAG,KAAK,CAAC,UAAkD,IAAI,IAAI;SACzE,CAAC;IACJ,CAAC;IAOK,AAAN,KAAK,CAAC,kBAAkB,CACN,KAAa,EACrB,IAA0D,EAC3D,GAAY;QAEnB,IAAI,CAAC,IAAI,EAAE,cAAc,IAAI,CAAC,IAAI,EAAE,gBAAgB,EAAE,CAAC;YACrD,MAAM,IAAI,4BAAmB,CAAC,kDAAkD,CAAC,CAAC;QACpF,CAAC;QACD,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC;YAClD,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC;YAC5C,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,KAAK,EAAE,SAAS;YAChB,QAAQ,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE;YACtD,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,CAAC,CAAC;QACH,OAAO;
|
|
1
|
+
{"version":3,"file":"public-chat.controller.js","sourceRoot":"","sources":["../../../src/modules/public-chat/public-chat.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,18 @@
|
|
|
1
1
|
import { WorkerHost } from '@nestjs/bullmq';
|
|
2
|
-
import { Job } from 'bullmq';
|
|
3
2
|
import { AgentJobWorker } from '@agentforge-io/core';
|
|
4
|
-
import type {
|
|
3
|
+
import type { AgentJobResult } from '../../../types';
|
|
4
|
+
type WorkerJob = Parameters<WorkerHost['process']>[0];
|
|
5
|
+
type WorkerEventJob = {
|
|
6
|
+
id?: string | number;
|
|
7
|
+
timestamp: number;
|
|
8
|
+
attemptsMade: number;
|
|
9
|
+
};
|
|
5
10
|
export declare class AgentProcessor extends WorkerHost {
|
|
6
11
|
private readonly jobWorker;
|
|
7
12
|
private readonly logger;
|
|
8
13
|
constructor(jobWorker: AgentJobWorker);
|
|
9
|
-
process(job:
|
|
10
|
-
onCompleted(job:
|
|
11
|
-
onFailed(job:
|
|
14
|
+
process(job: WorkerJob): Promise<AgentJobResult>;
|
|
15
|
+
onCompleted(job: WorkerEventJob): void;
|
|
16
|
+
onFailed(job: WorkerEventJob, error: Error): void;
|
|
12
17
|
}
|
|
18
|
+
export {};
|
|
@@ -13,7 +13,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
exports.AgentProcessor = void 0;
|
|
14
14
|
const common_1 = require("@nestjs/common");
|
|
15
15
|
const bullmq_1 = require("@nestjs/bullmq");
|
|
16
|
-
const bullmq_2 = require("bullmq");
|
|
17
16
|
const core_1 = require("@agentforge-io/core");
|
|
18
17
|
const constants_1 = require("../../../constants");
|
|
19
18
|
let AgentProcessor = AgentProcessor_1 = class AgentProcessor extends bullmq_1.WorkerHost {
|
|
@@ -23,14 +22,15 @@ let AgentProcessor = AgentProcessor_1 = class AgentProcessor extends bullmq_1.Wo
|
|
|
23
22
|
this.logger = new common_1.Logger(AgentProcessor_1.name);
|
|
24
23
|
}
|
|
25
24
|
async process(job) {
|
|
25
|
+
const payload = job.data;
|
|
26
26
|
const ctx = {
|
|
27
|
-
jobId: job.id ??
|
|
27
|
+
jobId: job.id ?? payload.jobId,
|
|
28
28
|
updateProgress: async (percent) => {
|
|
29
29
|
await job.updateProgress(percent);
|
|
30
30
|
},
|
|
31
31
|
};
|
|
32
32
|
try {
|
|
33
|
-
return await this.jobWorker.process(
|
|
33
|
+
return await this.jobWorker.process(payload, ctx);
|
|
34
34
|
}
|
|
35
35
|
catch (error) {
|
|
36
36
|
const message = error instanceof Error ? error.message : String(error);
|
|
@@ -49,13 +49,13 @@ exports.AgentProcessor = AgentProcessor;
|
|
|
49
49
|
__decorate([
|
|
50
50
|
(0, bullmq_1.OnWorkerEvent)('completed'),
|
|
51
51
|
__metadata("design:type", Function),
|
|
52
|
-
__metadata("design:paramtypes", [
|
|
52
|
+
__metadata("design:paramtypes", [Object]),
|
|
53
53
|
__metadata("design:returntype", void 0)
|
|
54
54
|
], AgentProcessor.prototype, "onCompleted", null);
|
|
55
55
|
__decorate([
|
|
56
56
|
(0, bullmq_1.OnWorkerEvent)('failed'),
|
|
57
57
|
__metadata("design:type", Function),
|
|
58
|
-
__metadata("design:paramtypes", [
|
|
58
|
+
__metadata("design:paramtypes", [Object, Error]),
|
|
59
59
|
__metadata("design:returntype", void 0)
|
|
60
60
|
], AgentProcessor.prototype, "onFailed", null);
|
|
61
61
|
exports.AgentProcessor = AgentProcessor = AgentProcessor_1 = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.processor.js","sourceRoot":"","sources":["../../../../src/modules/queue/processors/agent.processor.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAwC;AACxC,2CAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"agent.processor.js","sourceRoot":"","sources":["../../../../src/modules/queue/processors/agent.processor.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAwC;AACxC,2CAAsE;AACtE,8CAAqD;AAErD,kDAAsD;AAY/C,IAAM,cAAc,sBAApB,MAAM,cAAe,SAAQ,mBAAU;IAG5C,YAA6B,SAAyB;QACpD,KAAK,EAAE,CAAC;QADmB,cAAS,GAAT,SAAS,CAAgB;QAFrC,WAAM,GAAG,IAAI,eAAM,CAAC,gBAAc,CAAC,IAAI,CAAC,CAAC;IAI1D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAc;QAC1B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAuB,CAAC;QAC5C,MAAM,GAAG,GAAe;YACtB,KAAK,EAAE,GAAG,CAAC,EAAE,IAAI,OAAO,CAAC,KAAK;YAC9B,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;gBAChC,MAAM,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YACpC,CAAC;SACF,CAAC;QAEF,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACpD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,YAAY,OAAO,EAAE,CAAC,CAAC;YACtD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAGD,WAAW,CAAC,GAAmB;QAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,iBAAiB,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,SAAS,IAAI,CAAC,CAAC;IAClF,CAAC;IAGD,QAAQ,CAAC,GAAmB,EAAE,KAAY;QACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,iBAAiB,GAAG,CAAC,YAAY,cAAc,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IACjG,CAAC;CACF,CAAA;AAlCY,wCAAc;AA0BzB;IADC,IAAA,sBAAa,EAAC,WAAW,CAAC;;;;iDAG1B;AAGD;IADC,IAAA,sBAAa,EAAC,QAAQ,CAAC;;6CACa,KAAK;;8CAEzC;yBAjCU,cAAc;IAD1B,IAAA,kBAAS,EAAC,4BAAgB,CAAC;qCAIc,qBAAc;GAH3C,cAAc,CAkC1B"}
|