@ixo/common 1.1.34 → 1.1.35
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/.turbo/turbo-build.log +1 -1
- package/dist/services/memory-engine/memory-engine.service.d.ts +4 -1
- package/dist/services/memory-engine/memory-engine.service.d.ts.map +1 -1
- package/dist/services/memory-engine/memory-engine.service.js +34 -22
- package/dist/services/memory-engine/memory-engine.service.js.map +1 -1
- package/dist/services/session-manager/dto.d.ts +1 -0
- package/dist/services/session-manager/dto.d.ts.map +1 -1
- package/dist/services/session-manager/dto.js +6 -0
- package/dist/services/session-manager/dto.js.map +1 -1
- package/dist/services/session-manager/session-manager.service.d.ts.map +1 -1
- package/dist/services/session-manager/session-manager.service.js +5 -4
- package/dist/services/session-manager/session-manager.service.js.map +1 -1
- package/dist/utils/get-user-subscription.d.ts +2 -1
- package/dist/utils/get-user-subscription.d.ts.map +1 -1
- package/dist/utils/get-user-subscription.js +9 -5
- package/dist/utils/get-user-subscription.js.map +1 -1
- package/package.json +4 -4
- package/src/services/memory-engine/memory-engine.service.ts +48 -21
- package/src/services/session-manager/dto.ts +4 -0
- package/src/services/session-manager/session-manager.service.ts +5 -4
- package/src/utils/get-user-subscription.ts +11 -4
- package/tsconfig.tsbuildinfo +1 -1
package/.turbo/turbo-build.log
CHANGED
|
@@ -3,6 +3,7 @@ export declare class MemoryEngineService {
|
|
|
3
3
|
private readonly memoryEngineUrl;
|
|
4
4
|
private readonly QUERY_TIMEOUT_MS;
|
|
5
5
|
constructor(memoryEngineUrl: string);
|
|
6
|
+
private buildHeaders;
|
|
6
7
|
private withTimeout;
|
|
7
8
|
gatherUserContext(params: {
|
|
8
9
|
oracleDid: string;
|
|
@@ -11,6 +12,7 @@ export declare class MemoryEngineService {
|
|
|
11
12
|
userToken: string;
|
|
12
13
|
oracleHomeServer: string;
|
|
13
14
|
userHomeServer: string;
|
|
15
|
+
ucanInvocation?: string;
|
|
14
16
|
}): Promise<UserContextData>;
|
|
15
17
|
private queryIdentity;
|
|
16
18
|
private queryWork;
|
|
@@ -18,7 +20,7 @@ export declare class MemoryEngineService {
|
|
|
18
20
|
private queryInterests;
|
|
19
21
|
private queryRelationships;
|
|
20
22
|
private queryRecent;
|
|
21
|
-
processConversationHistory({ messages, roomId, oracleToken, userToken, oracleHomeServer, userHomeServer, }: {
|
|
23
|
+
processConversationHistory({ messages, roomId, oracleToken, userToken, oracleHomeServer, userHomeServer, ucanInvocation, }: {
|
|
22
24
|
messages: Array<{
|
|
23
25
|
content: string;
|
|
24
26
|
role_type: 'user' | 'assistant' | 'system';
|
|
@@ -31,6 +33,7 @@ export declare class MemoryEngineService {
|
|
|
31
33
|
userToken: string;
|
|
32
34
|
oracleHomeServer: string;
|
|
33
35
|
userHomeServer: string;
|
|
36
|
+
ucanInvocation?: string;
|
|
34
37
|
}): Promise<{
|
|
35
38
|
success: boolean;
|
|
36
39
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-engine.service.d.ts","sourceRoot":"","sources":["../../../src/services/memory-engine/memory-engine.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGV,eAAe,EAChB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"memory-engine.service.d.ts","sourceRoot":"","sources":["../../../src/services/memory-engine/memory-engine.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGV,eAAe,EAChB,MAAM,YAAY,CAAC;AAWpB,qBAAa,mBAAmB;IAGlB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAF5C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAQ;gBAEZ,eAAe,EAAE,MAAM;IAKpD,OAAO,CAAC,YAAY;YAyBN,WAAW;IAgBnB,iBAAiB,CAAC,MAAM,EAAE;QAC9B,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,gBAAgB,EAAE,MAAM,CAAC;QACzB,cAAc,EAAE,MAAM,CAAC;QAEvB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,GAAG,OAAO,CAAC,eAAe,CAAC;YAuGd,aAAa;YAoCb,SAAS;YA2CT,UAAU;YAmCV,cAAc;YA0Cd,kBAAkB;YAmClB,WAAW;IA+BnB,0BAA0B,CAAC,EAC/B,QAAQ,EACR,MAAM,EACN,WAAW,EACX,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,cAAc,GACf,EAAE;QACD,QAAQ,EAAE,KAAK,CAAC;YACd,OAAO,EAAE,MAAM,CAAC;YAChB,SAAS,EAAE,MAAM,GAAG,WAAW,GAAG,QAAQ,CAAC;YAC3C,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,kBAAkB,CAAC,EAAE,MAAM,CAAC;SAC7B,CAAC,CAAC;QACH,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,gBAAgB,EAAE,MAAM,CAAC;QACzB,cAAc,EAAE,MAAM,CAAC;QAEvB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;YA0DnB,YAAY;CA8C3B"}
|
|
@@ -5,6 +5,24 @@ export class MemoryEngineService {
|
|
|
5
5
|
constructor(memoryEngineUrl) {
|
|
6
6
|
this.memoryEngineUrl = memoryEngineUrl;
|
|
7
7
|
}
|
|
8
|
+
buildHeaders(auth, roomId) {
|
|
9
|
+
if (auth.ucanInvocation) {
|
|
10
|
+
return {
|
|
11
|
+
Authorization: `Bearer ${auth.ucanInvocation}`,
|
|
12
|
+
'X-Auth-Type': 'ucan',
|
|
13
|
+
'x-room-id': roomId,
|
|
14
|
+
'Content-Type': 'application/json',
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
return {
|
|
18
|
+
'x-oracle-token': auth.oracleToken,
|
|
19
|
+
'x-user-token': auth.userToken,
|
|
20
|
+
'x-oracle-matrix-homeserver': auth.oracleHomeServer,
|
|
21
|
+
'x-user-matrix-homeserver': auth.userHomeServer,
|
|
22
|
+
'x-room-id': roomId,
|
|
23
|
+
'Content-Type': 'application/json',
|
|
24
|
+
};
|
|
25
|
+
}
|
|
8
26
|
async withTimeout(promise, timeoutMs, fallback) {
|
|
9
27
|
return Promise.race([
|
|
10
28
|
promise,
|
|
@@ -12,7 +30,7 @@ export class MemoryEngineService {
|
|
|
12
30
|
]);
|
|
13
31
|
}
|
|
14
32
|
async gatherUserContext(params) {
|
|
15
|
-
const { oracleDid, roomId, oracleToken, userToken, oracleHomeServer, userHomeServer, } = params;
|
|
33
|
+
const { oracleDid, roomId, oracleToken, userToken, oracleHomeServer, userHomeServer, ucanInvocation, } = params;
|
|
16
34
|
Logger.info(`[MemoryEngineService] Gathering user context for oracle: ${oracleDid}, room: ${roomId}`);
|
|
17
35
|
try {
|
|
18
36
|
const authHeaders = {
|
|
@@ -20,6 +38,7 @@ export class MemoryEngineService {
|
|
|
20
38
|
userToken,
|
|
21
39
|
oracleHomeServer,
|
|
22
40
|
userHomeServer,
|
|
41
|
+
ucanInvocation,
|
|
23
42
|
};
|
|
24
43
|
const results = await Promise.allSettled([
|
|
25
44
|
this.withTimeout(this.queryIdentity(oracleDid, roomId, authHeaders), this.QUERY_TIMEOUT_MS, undefined),
|
|
@@ -214,13 +233,13 @@ export class MemoryEngineService {
|
|
|
214
233
|
};
|
|
215
234
|
return this.executeQuery(request, roomId, auth);
|
|
216
235
|
}
|
|
217
|
-
async processConversationHistory({ messages, roomId, oracleToken, userToken, oracleHomeServer, userHomeServer, }) {
|
|
236
|
+
async processConversationHistory({ messages, roomId, oracleToken, userToken, oracleHomeServer, userHomeServer, ucanInvocation, }) {
|
|
218
237
|
if (!roomId) {
|
|
219
238
|
Logger.warn(`[MemoryEngineService] No room id provided, skipping conversation processing`);
|
|
220
239
|
return { success: false };
|
|
221
240
|
}
|
|
222
|
-
if (!oracleToken || !userToken) {
|
|
223
|
-
Logger.warn(`[MemoryEngineService] Missing
|
|
241
|
+
if (!ucanInvocation && (!oracleToken || !userToken)) {
|
|
242
|
+
Logger.warn(`[MemoryEngineService] Missing auth (no UCAN and no Matrix tokens), skipping conversation processing`);
|
|
224
243
|
return { success: false };
|
|
225
244
|
}
|
|
226
245
|
if (!messages || messages.length === 0) {
|
|
@@ -228,16 +247,16 @@ export class MemoryEngineService {
|
|
|
228
247
|
return { success: true };
|
|
229
248
|
}
|
|
230
249
|
try {
|
|
250
|
+
const auth = {
|
|
251
|
+
oracleToken,
|
|
252
|
+
userToken,
|
|
253
|
+
oracleHomeServer,
|
|
254
|
+
userHomeServer,
|
|
255
|
+
ucanInvocation,
|
|
256
|
+
};
|
|
231
257
|
const response = await fetch(`${this.memoryEngineUrl}/messages`, {
|
|
232
258
|
method: 'POST',
|
|
233
|
-
headers:
|
|
234
|
-
'x-oracle-token': oracleToken,
|
|
235
|
-
'x-user-token': userToken,
|
|
236
|
-
'x-oracle-matrix-homeserver': oracleHomeServer,
|
|
237
|
-
'x-user-matrix-homeserver': userHomeServer,
|
|
238
|
-
'x-room-id': roomId,
|
|
239
|
-
'Content-Type': 'application/json',
|
|
240
|
-
},
|
|
259
|
+
headers: this.buildHeaders(auth, roomId),
|
|
241
260
|
body: JSON.stringify({ messages }),
|
|
242
261
|
});
|
|
243
262
|
if (!response.ok) {
|
|
@@ -258,21 +277,14 @@ export class MemoryEngineService {
|
|
|
258
277
|
Logger.warn(`[MemoryEngineService] No room id provided, skipping query "${request.query}"`);
|
|
259
278
|
return undefined;
|
|
260
279
|
}
|
|
261
|
-
if (!auth.oracleToken || !auth.userToken) {
|
|
262
|
-
Logger.warn(`[MemoryEngineService] Missing
|
|
280
|
+
if (!auth.ucanInvocation && (!auth.oracleToken || !auth.userToken)) {
|
|
281
|
+
Logger.warn(`[MemoryEngineService] Missing auth (no UCAN and no Matrix tokens), skipping query "${request.query}"`);
|
|
263
282
|
return undefined;
|
|
264
283
|
}
|
|
265
284
|
try {
|
|
266
285
|
const response = await fetch(`${this.memoryEngineUrl}/search-enhanced`, {
|
|
267
286
|
method: 'POST',
|
|
268
|
-
headers:
|
|
269
|
-
'x-oracle-token': auth.oracleToken,
|
|
270
|
-
'x-user-token': auth.userToken,
|
|
271
|
-
'x-oracle-matrix-homeserver': auth.oracleHomeServer,
|
|
272
|
-
'x-user-matrix-homeserver': auth.userHomeServer,
|
|
273
|
-
'x-room-id': roomId,
|
|
274
|
-
'Content-Type': 'application/json',
|
|
275
|
-
},
|
|
287
|
+
headers: this.buildHeaders(auth, roomId),
|
|
276
288
|
body: JSON.stringify(request),
|
|
277
289
|
});
|
|
278
290
|
if (!response.ok) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-engine.service.js","sourceRoot":"","sources":["../../../src/services/memory-engine/memory-engine.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"memory-engine.service.js","sourceRoot":"","sources":["../../../src/services/memory-engine/memory-engine.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ export declare class CreateChatSessionDto extends UserAuthDto {
|
|
|
17
17
|
userToken?: string;
|
|
18
18
|
oracleHomeServer?: string;
|
|
19
19
|
userHomeServer?: string;
|
|
20
|
+
ucanInvocation?: string;
|
|
20
21
|
}
|
|
21
22
|
export declare class DeleteChatSessionDto extends UserAuthDto {
|
|
22
23
|
sessionId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dto.d.ts","sourceRoot":"","sources":["../../../src/services/session-manager/dto.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,qBAAa,WAAW;IAGtB,GAAG,EAAE,MAAM,CAAC;IAIZ,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,mBAAoB,SAAQ,WAAW;IAGlD,eAAe,EAAE,MAAM,CAAC;IAKxB,KAAK,CAAC,EAAE,MAAM,CAAC;IAKf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,oBAAqB,SAAQ,WAAW;IAGnD,SAAS,EAAE,MAAM,CAAC;IAIlB,eAAe,EAAE,MAAM,CAAC;IAIxB,UAAU,EAAE,MAAM,CAAC;IAInB,aAAa,CAAC,EAAE,MAAM,CAAC;IAIvB,WAAW,CAAC,EAAE,MAAM,CAAC;IAIrB,SAAS,CAAC,EAAE,MAAM,CAAC;IAInB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAI1B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,oBAAqB,SAAQ,WAAW;IAGnD,SAAS,EAAE,MAAM,CAAC;IAIlB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,WAAW;IAGtB,SAAS,EAAE,MAAM,CAAC;IAIlB,KAAK,CAAC,EAAE,MAAM,CAAC;IAIf,aAAa,EAAE,MAAM,CAAC;IAItB,SAAS,EAAE,MAAM,CAAC;IAIlB,UAAU,EAAE,MAAM,CAAC;IAInB,SAAS,EAAE,MAAM,CAAC;IAIlB,eAAe,EAAE,MAAM,CAAC;IAIxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAG5B,WAAW,CAAC,EAAE,eAAe,CAAC;IAI9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAIhB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,2BAA2B;IAGtC,QAAQ,EAAE,WAAW,EAAE,CAAC;IAIxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,4BAA6B,SAAQ,WAAW;CAAG"}
|
|
1
|
+
{"version":3,"file":"dto.d.ts","sourceRoot":"","sources":["../../../src/services/session-manager/dto.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,qBAAa,WAAW;IAGtB,GAAG,EAAE,MAAM,CAAC;IAIZ,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,mBAAoB,SAAQ,WAAW;IAGlD,eAAe,EAAE,MAAM,CAAC;IAKxB,KAAK,CAAC,EAAE,MAAM,CAAC;IAKf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,oBAAqB,SAAQ,WAAW;IAGnD,SAAS,EAAE,MAAM,CAAC;IAIlB,eAAe,EAAE,MAAM,CAAC;IAIxB,UAAU,EAAE,MAAM,CAAC;IAInB,aAAa,CAAC,EAAE,MAAM,CAAC;IAIvB,WAAW,CAAC,EAAE,MAAM,CAAC;IAIrB,SAAS,CAAC,EAAE,MAAM,CAAC;IAInB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAI1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAIxB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,oBAAqB,SAAQ,WAAW;IAGnD,SAAS,EAAE,MAAM,CAAC;IAIlB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,WAAW;IAGtB,SAAS,EAAE,MAAM,CAAC;IAIlB,KAAK,CAAC,EAAE,MAAM,CAAC;IAIf,aAAa,EAAE,MAAM,CAAC;IAItB,SAAS,EAAE,MAAM,CAAC;IAIlB,UAAU,EAAE,MAAM,CAAC;IAInB,SAAS,EAAE,MAAM,CAAC;IAIlB,eAAe,EAAE,MAAM,CAAC;IAIxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAG5B,WAAW,CAAC,EAAE,eAAe,CAAC;IAI9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAIhB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,2BAA2B;IAGtC,QAAQ,EAAE,WAAW,EAAE,CAAC;IAIxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,4BAA6B,SAAQ,WAAW;CAAG"}
|
|
@@ -53,6 +53,7 @@ export class CreateChatSessionDto extends UserAuthDto {
|
|
|
53
53
|
userToken;
|
|
54
54
|
oracleHomeServer;
|
|
55
55
|
userHomeServer;
|
|
56
|
+
ucanInvocation;
|
|
56
57
|
}
|
|
57
58
|
__decorate([
|
|
58
59
|
IsString(),
|
|
@@ -94,6 +95,11 @@ __decorate([
|
|
|
94
95
|
IsOptional(),
|
|
95
96
|
__metadata("design:type", String)
|
|
96
97
|
], CreateChatSessionDto.prototype, "userHomeServer", void 0);
|
|
98
|
+
__decorate([
|
|
99
|
+
IsString(),
|
|
100
|
+
IsOptional(),
|
|
101
|
+
__metadata("design:type", String)
|
|
102
|
+
], CreateChatSessionDto.prototype, "ucanInvocation", void 0);
|
|
97
103
|
export class DeleteChatSessionDto extends UserAuthDto {
|
|
98
104
|
sessionId;
|
|
99
105
|
oracleEntityDid;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dto.js","sourceRoot":"","sources":["../../../src/services/session-manager/dto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACL,OAAO,EACP,UAAU,EACV,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,GAAG,GACJ,MAAM,iBAAiB,CAAC;AAGzB,MAAM,OAAO,WAAW;IAGtB,GAAG,CAAS;IAIZ,UAAU,CAAU;CACrB;AALC;IAFC,QAAQ,EAAE;IACV,UAAU,EAAE;;wCACD;AAIZ;IAFC,QAAQ,EAAE;IACV,UAAU,EAAE;;+CACO;AAGtB,MAAM,OAAO,mBAAoB,SAAQ,WAAW;IAGlD,eAAe,CAAS;IAKxB,KAAK,CAAU;IAKf,MAAM,CAAU;CACjB;AAXC;IAFC,QAAQ,EAAE;IACV,UAAU,EAAE;;4DACW;AAKxB;IAHC,QAAQ,EAAE;IACV,UAAU,EAAE;IACZ,GAAG,CAAC,CAAC,CAAC;;kDACQ;AAKf;IAHC,QAAQ,EAAE;IACV,UAAU,EAAE;IACZ,GAAG,CAAC,CAAC,CAAC;;mDACS;AAGlB,MAAM,OAAO,oBAAqB,SAAQ,WAAW;IAGnD,SAAS,CAAS;IAIlB,eAAe,CAAS;IAIxB,UAAU,CAAS;IAInB,aAAa,CAAU;IAIvB,WAAW,CAAU;IAIrB,SAAS,CAAU;IAInB,gBAAgB,CAAU;IAI1B,cAAc,CAAU;CACzB;
|
|
1
|
+
{"version":3,"file":"dto.js","sourceRoot":"","sources":["../../../src/services/session-manager/dto.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-manager.service.d.ts","sourceRoot":"","sources":["../../../src/services/session-manager/session-manager.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAO/C,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,oBAAoB,EACzB,KAAK,4BAA4B,EACjC,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EACjC,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,oBAAoB;IACnC,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACrD;AAED,qBAAa,qBAAqB;IAE9B,OAAO,CAAC,QAAQ,CAAC,WAAW;aACZ,YAAY;IAC5B,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC;gBAFpB,WAAW,EAAE,oBAAoB,EAClC,YAAY,gBAA8B,EACzC,mBAAmB,CAAC,EAAE,mBAAmB,YAAA;IAGrD,mBAAmB,CAAC,EACzB,eAAe,GAChB,EAAE;QACD,eAAe,EAAE,MAAM,CAAC;KACzB,GAAG,GAAG,MAAM,IAAI,MAAM,EAAE;YAIX,kBAAkB;IAgFnB,wBAAwB,CAAC,EACpC,SAAS,EACT,GAAG,EACH,kBAAkB,GACnB,EAAE;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,GAAG,EAAE,MAAM,CAAC;QACZ,kBAAkB,EAAE,MAAM,CAAC;KAC5B,GAAG,OAAO,CAAC,IAAI,CAAC;IAQJ,cAAc,CAAC,EAC1B,SAAS,EACT,GAAG,EACH,QAAQ,EACR,eAAe,EACf,UAAU,EACV,MAAM,EACN,kBAAkB,EAClB,SAAS,EACT,WAAW,EACX,aAAa,GACd,EAAE;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,eAAe,EAAE,MAAM,CAAC;QACxB,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,eAAe,CAAC;QAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,GAAG,OAAO,CAAC,WAAW,CAAC;IAsGX,UAAU,CACrB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,eAAe,GAAE,OAAc,GAC9B,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAuDtB,YAAY,CACvB,eAAe,EAAE,mBAAmB,GACnC,OAAO,CAAC,2BAA2B,CAAC;IAsD1B,aAAa,CACxB,gBAAgB,EAAE,oBAAoB,EACtC,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"session-manager.service.d.ts","sourceRoot":"","sources":["../../../src/services/session-manager/session-manager.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAO/C,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,oBAAoB,EACzB,KAAK,4BAA4B,EACjC,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EACjC,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,oBAAoB;IACnC,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACrD;AAED,qBAAa,qBAAqB;IAE9B,OAAO,CAAC,QAAQ,CAAC,WAAW;aACZ,YAAY;IAC5B,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC;gBAFpB,WAAW,EAAE,oBAAoB,EAClC,YAAY,gBAA8B,EACzC,mBAAmB,CAAC,EAAE,mBAAmB,YAAA;IAGrD,mBAAmB,CAAC,EACzB,eAAe,GAChB,EAAE;QACD,eAAe,EAAE,MAAM,CAAC;KACzB,GAAG,GAAG,MAAM,IAAI,MAAM,EAAE;YAIX,kBAAkB;IAgFnB,wBAAwB,CAAC,EACpC,SAAS,EACT,GAAG,EACH,kBAAkB,GACnB,EAAE;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,GAAG,EAAE,MAAM,CAAC;QACZ,kBAAkB,EAAE,MAAM,CAAC;KAC5B,GAAG,OAAO,CAAC,IAAI,CAAC;IAQJ,cAAc,CAAC,EAC1B,SAAS,EACT,GAAG,EACH,QAAQ,EACR,eAAe,EACf,UAAU,EACV,MAAM,EACN,kBAAkB,EAClB,SAAS,EACT,WAAW,EACX,aAAa,GACd,EAAE;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,eAAe,EAAE,MAAM,CAAC;QACxB,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,eAAe,CAAC;QAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,GAAG,OAAO,CAAC,WAAW,CAAC;IAsGX,UAAU,CACrB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,eAAe,GAAE,OAAc,GAC9B,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAuDtB,YAAY,CACvB,eAAe,EAAE,mBAAmB,GACnC,OAAO,CAAC,2BAA2B,CAAC;IAsD1B,aAAa,CACxB,gBAAgB,EAAE,oBAAoB,EACtC,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,4BAA4B,CAAC;IA4D3B,aAAa,CACxB,gBAAgB,EAAE,oBAAoB,GACrC,OAAO,CAAC,IAAI,CAAC;CAMjB"}
|
|
@@ -240,17 +240,18 @@ ___________________________________________________________
|
|
|
240
240
|
}));
|
|
241
241
|
let userContext;
|
|
242
242
|
if (this.memoryEngineService &&
|
|
243
|
-
createSessionDto.
|
|
244
|
-
|
|
243
|
+
(createSessionDto.ucanInvocation ||
|
|
244
|
+
(createSessionDto.oracleToken && createSessionDto.userToken))) {
|
|
245
245
|
try {
|
|
246
246
|
Logger.debug('Gathering user context from Memory Engine');
|
|
247
247
|
userContext = await this.memoryEngineService.gatherUserContext({
|
|
248
248
|
oracleDid: createSessionDto.oracleDid,
|
|
249
249
|
roomId,
|
|
250
|
-
oracleToken: createSessionDto.oracleToken,
|
|
251
|
-
userToken: createSessionDto.userToken,
|
|
250
|
+
oracleToken: createSessionDto.oracleToken ?? '',
|
|
251
|
+
userToken: createSessionDto.userToken ?? '',
|
|
252
252
|
oracleHomeServer: createSessionDto.oracleHomeServer ?? '',
|
|
253
253
|
userHomeServer: createSessionDto.userHomeServer ?? '',
|
|
254
|
+
ucanInvocation: createSessionDto.ucanInvocation,
|
|
254
255
|
});
|
|
255
256
|
}
|
|
256
257
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-manager.service.js","sourceRoot":"","sources":["../../../src/services/session-manager/session-manager.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"session-manager.service.js","sourceRoot":"","sources":["../../../src/services/session-manager/session-manager.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export interface GetUserSubscriptionParams {
|
|
|
16
16
|
network: 'mainnet' | 'testnet' | 'devnet';
|
|
17
17
|
bearerToken: string;
|
|
18
18
|
subscriptionUrl?: string;
|
|
19
|
+
authType?: 'ucan';
|
|
19
20
|
}
|
|
20
|
-
export declare const getUserSubscription: ({ bearerToken, network, subscriptionUrl: _subscriptionUrl, }: GetUserSubscriptionParams) => Promise<GetMySubscriptionsResponseDto | null>;
|
|
21
|
+
export declare const getUserSubscription: ({ bearerToken, network, subscriptionUrl: _subscriptionUrl, authType, }: GetUserSubscriptionParams) => Promise<GetMySubscriptionsResponseDto | null>;
|
|
21
22
|
//# sourceMappingURL=get-user-subscription.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-user-subscription.d.ts","sourceRoot":"","sources":["../../src/utils/get-user-subscription.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,2BAA2B,GACtC,SAAS,SAAS,GAAG,SAAS,GAAG,QAAQ,WAO1C,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAElC,8BAA8B,CAAC,EAAE,MAAM,CAAC;CACzC;AAED,MAAM,WAAW,6BAA6B;IAC5C,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,QAAQ,GAAG,UAAU,GAAG,YAAY,GAAG,OAAO,CAAC;IACvD,YAAY,EAAE,MAAM,CAAC;CACtB;AAMD,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAC;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"get-user-subscription.d.ts","sourceRoot":"","sources":["../../src/utils/get-user-subscription.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,2BAA2B,GACtC,SAAS,SAAS,GAAG,SAAS,GAAG,QAAQ,WAO1C,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAElC,8BAA8B,CAAC,EAAE,MAAM,CAAC;CACzC;AAED,MAAM,WAAW,6BAA6B;IAC5C,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,QAAQ,GAAG,UAAU,GAAG,YAAY,GAAG,OAAO,CAAC;IACvD,YAAY,EAAE,MAAM,CAAC;CACtB;AAMD,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAC;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,mBAAmB,GAAU,wEAKvC,yBAAyB,KAAG,OAAO,CAAC,6BAA6B,GAAG,IAAI,CA6C1E,CAAC"}
|
|
@@ -6,16 +6,20 @@ export const getSubscriptionUrlByNetwork = (network) => {
|
|
|
6
6
|
devnet: 'https://subscriptions-api.ixo-api.workers.dev',
|
|
7
7
|
}[network];
|
|
8
8
|
};
|
|
9
|
-
export const getUserSubscription = async ({ bearerToken, network, subscriptionUrl: _subscriptionUrl, }) => {
|
|
9
|
+
export const getUserSubscription = async ({ bearerToken, network, subscriptionUrl: _subscriptionUrl, authType, }) => {
|
|
10
10
|
const subscriptionUrl = _subscriptionUrl ?? getSubscriptionUrlByNetwork(network);
|
|
11
11
|
try {
|
|
12
12
|
Logger.debug('Fetching user subscription from:', subscriptionUrl);
|
|
13
|
+
const headers = {
|
|
14
|
+
Authorization: `Bearer ${bearerToken}`,
|
|
15
|
+
'Content-Type': 'application/json',
|
|
16
|
+
};
|
|
17
|
+
if (authType === 'ucan') {
|
|
18
|
+
headers['X-Auth-Type'] = 'ucan';
|
|
19
|
+
}
|
|
13
20
|
const response = await fetch(`${subscriptionUrl.endsWith('/') ? subscriptionUrl.slice(0, -1) : subscriptionUrl}/api/v1/subscriptions`, {
|
|
14
21
|
method: 'GET',
|
|
15
|
-
headers
|
|
16
|
-
Authorization: `Bearer ${bearerToken}`,
|
|
17
|
-
'Content-Type': 'application/json',
|
|
18
|
-
},
|
|
22
|
+
headers,
|
|
19
23
|
});
|
|
20
24
|
if (!response.ok) {
|
|
21
25
|
Logger.error(`Failed to fetch user subscription: ${response.status} ${response.statusText}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-user-subscription.js","sourceRoot":"","sources":["../../src/utils/get-user-subscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,OAAyC,EACzC,EAAE;IACF,OAAO;QACL,OAAO,EAAE,uDAAuD;QAChE,OAAO,EAAE,uDAAuD;QAChE,MAAM,EAAE,+CAA+C;KACxD,CAAC,OAAO,CAAC,CAAC;AACb,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"get-user-subscription.js","sourceRoot":"","sources":["../../src/utils/get-user-subscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,OAAyC,EACzC,EAAE;IACF,OAAO;QACL,OAAO,EAAE,uDAAuD;QAChE,OAAO,EAAE,uDAAuD;QAChE,MAAM,EAAE,+CAA+C;KACxD,CAAC,OAAO,CAAC,CAAC;AACb,CAAC,CAAC;AA8BF,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,EACxC,WAAW,EACX,OAAO,EACP,eAAe,EAAE,gBAAgB,EACjC,QAAQ,GACkB,EAAiD,EAAE;IAC7E,MAAM,eAAe,GACnB,gBAAgB,IAAI,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC3D,IAAI,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,eAAe,CAAC,CAAC;QAClE,MAAM,OAAO,GAA2B;YACtC,aAAa,EAAE,UAAU,WAAW,EAAE;YACtC,cAAc,EAAE,kBAAkB;SACnC,CAAC;QACF,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACxB,OAAO,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC;QAClC,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC1B,GAAG,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,uBAAuB,EACxG;YACE,MAAM,EAAE,KAAK;YACb,OAAO;SACR,CACF,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,CAAC,KAAK,CACV,sCAAsC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAC/E,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,YAAY,GAAG,IAAmC,CAAC;QACzD,OAAO;YACL,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;YAC/C,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,eAAe,EAAE,YAAY,CAAC,eAAe;YAC7C,YAAY,EAAE,YAAY,CAAC,YAAY;YACvC,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,MAAM,EAAE,YAAY,CAAC,MAAM;YAC3B,YAAY,EAAE,YAAY,CAAC,YAAY;SACxC,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ixo/common",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.35",
|
|
4
4
|
"private": false,
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
"better-sqlite3": "^12.4.6",
|
|
33
33
|
"testcontainers": "^10.16.0",
|
|
34
34
|
"typescript": "^5.3.3",
|
|
35
|
-
"@ixo/eslint-config": "2.0.0",
|
|
36
35
|
"@ixo/oracles-events": "^1.0.4",
|
|
37
36
|
"@ixo/typescript-config": "1.0.0",
|
|
37
|
+
"@ixo/eslint-config": "2.0.0",
|
|
38
38
|
"@ixo/vitest-config": "1.0.0"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
@@ -66,8 +66,8 @@
|
|
|
66
66
|
"store": "^2.0.12",
|
|
67
67
|
"zod": "^4.3.6",
|
|
68
68
|
"@ixo/logger": "0.0.2",
|
|
69
|
-
"@ixo/
|
|
70
|
-
"@ixo/
|
|
69
|
+
"@ixo/oracles-chain-client": "1.2.1",
|
|
70
|
+
"@ixo/matrix": "1.2.2"
|
|
71
71
|
},
|
|
72
72
|
"scripts": {
|
|
73
73
|
"build": "tsc && tsc-alias",
|
|
@@ -10,6 +10,8 @@ interface MemoryEngineAuthHeaders {
|
|
|
10
10
|
userToken: string;
|
|
11
11
|
oracleHomeServer: string;
|
|
12
12
|
userHomeServer: string;
|
|
13
|
+
/** When set, uses UCAN auth instead of Matrix tokens */
|
|
14
|
+
ucanInvocation?: string;
|
|
13
15
|
}
|
|
14
16
|
|
|
15
17
|
export class MemoryEngineService {
|
|
@@ -17,6 +19,31 @@ export class MemoryEngineService {
|
|
|
17
19
|
|
|
18
20
|
constructor(private readonly memoryEngineUrl: string) {}
|
|
19
21
|
|
|
22
|
+
/**
|
|
23
|
+
* Build HTTP headers for memory engine requests (UCAN or Matrix)
|
|
24
|
+
*/
|
|
25
|
+
private buildHeaders(
|
|
26
|
+
auth: MemoryEngineAuthHeaders,
|
|
27
|
+
roomId: string,
|
|
28
|
+
): Record<string, string> {
|
|
29
|
+
if (auth.ucanInvocation) {
|
|
30
|
+
return {
|
|
31
|
+
Authorization: `Bearer ${auth.ucanInvocation}`,
|
|
32
|
+
'X-Auth-Type': 'ucan',
|
|
33
|
+
'x-room-id': roomId,
|
|
34
|
+
'Content-Type': 'application/json',
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
return {
|
|
38
|
+
'x-oracle-token': auth.oracleToken,
|
|
39
|
+
'x-user-token': auth.userToken,
|
|
40
|
+
'x-oracle-matrix-homeserver': auth.oracleHomeServer,
|
|
41
|
+
'x-user-matrix-homeserver': auth.userHomeServer,
|
|
42
|
+
'x-room-id': roomId,
|
|
43
|
+
'Content-Type': 'application/json',
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
|
|
20
47
|
/**
|
|
21
48
|
* Wraps a promise with a timeout, returning fallback value if timeout is exceeded
|
|
22
49
|
*/
|
|
@@ -43,6 +70,8 @@ export class MemoryEngineService {
|
|
|
43
70
|
userToken: string;
|
|
44
71
|
oracleHomeServer: string;
|
|
45
72
|
userHomeServer: string;
|
|
73
|
+
/** When set, uses UCAN auth instead of Matrix tokens */
|
|
74
|
+
ucanInvocation?: string;
|
|
46
75
|
}): Promise<UserContextData> {
|
|
47
76
|
const {
|
|
48
77
|
oracleDid,
|
|
@@ -51,6 +80,7 @@ export class MemoryEngineService {
|
|
|
51
80
|
userToken,
|
|
52
81
|
oracleHomeServer,
|
|
53
82
|
userHomeServer,
|
|
83
|
+
ucanInvocation,
|
|
54
84
|
} = params;
|
|
55
85
|
|
|
56
86
|
Logger.info(
|
|
@@ -59,11 +89,12 @@ export class MemoryEngineService {
|
|
|
59
89
|
|
|
60
90
|
try {
|
|
61
91
|
// Execute all 6 queries in parallel with timeouts using Promise.allSettled
|
|
62
|
-
const authHeaders = {
|
|
92
|
+
const authHeaders: MemoryEngineAuthHeaders = {
|
|
63
93
|
oracleToken,
|
|
64
94
|
userToken,
|
|
65
95
|
oracleHomeServer,
|
|
66
96
|
userHomeServer,
|
|
97
|
+
ucanInvocation,
|
|
67
98
|
};
|
|
68
99
|
|
|
69
100
|
const results = await Promise.allSettled([
|
|
@@ -373,6 +404,7 @@ export class MemoryEngineService {
|
|
|
373
404
|
userToken,
|
|
374
405
|
oracleHomeServer,
|
|
375
406
|
userHomeServer,
|
|
407
|
+
ucanInvocation,
|
|
376
408
|
}: {
|
|
377
409
|
messages: Array<{
|
|
378
410
|
content: string;
|
|
@@ -386,6 +418,8 @@ export class MemoryEngineService {
|
|
|
386
418
|
userToken: string;
|
|
387
419
|
oracleHomeServer: string;
|
|
388
420
|
userHomeServer: string;
|
|
421
|
+
/** When set, uses UCAN auth instead of Matrix tokens */
|
|
422
|
+
ucanInvocation?: string;
|
|
389
423
|
}): Promise<{ success: boolean }> {
|
|
390
424
|
if (!roomId) {
|
|
391
425
|
Logger.warn(
|
|
@@ -393,9 +427,9 @@ export class MemoryEngineService {
|
|
|
393
427
|
);
|
|
394
428
|
return { success: false };
|
|
395
429
|
}
|
|
396
|
-
if (!oracleToken || !userToken) {
|
|
430
|
+
if (!ucanInvocation && (!oracleToken || !userToken)) {
|
|
397
431
|
Logger.warn(
|
|
398
|
-
`[MemoryEngineService] Missing
|
|
432
|
+
`[MemoryEngineService] Missing auth (no UCAN and no Matrix tokens), skipping conversation processing`,
|
|
399
433
|
);
|
|
400
434
|
return { success: false };
|
|
401
435
|
}
|
|
@@ -407,16 +441,16 @@ export class MemoryEngineService {
|
|
|
407
441
|
}
|
|
408
442
|
|
|
409
443
|
try {
|
|
444
|
+
const auth: MemoryEngineAuthHeaders = {
|
|
445
|
+
oracleToken,
|
|
446
|
+
userToken,
|
|
447
|
+
oracleHomeServer,
|
|
448
|
+
userHomeServer,
|
|
449
|
+
ucanInvocation,
|
|
450
|
+
};
|
|
410
451
|
const response = await fetch(`${this.memoryEngineUrl}/messages`, {
|
|
411
452
|
method: 'POST',
|
|
412
|
-
headers:
|
|
413
|
-
'x-oracle-token': oracleToken,
|
|
414
|
-
'x-user-token': userToken,
|
|
415
|
-
'x-oracle-matrix-homeserver': oracleHomeServer,
|
|
416
|
-
'x-user-matrix-homeserver': userHomeServer,
|
|
417
|
-
'x-room-id': roomId,
|
|
418
|
-
'Content-Type': 'application/json',
|
|
419
|
-
},
|
|
453
|
+
headers: this.buildHeaders(auth, roomId),
|
|
420
454
|
body: JSON.stringify({ messages }),
|
|
421
455
|
});
|
|
422
456
|
|
|
@@ -455,9 +489,9 @@ export class MemoryEngineService {
|
|
|
455
489
|
);
|
|
456
490
|
return undefined;
|
|
457
491
|
}
|
|
458
|
-
if (!auth.oracleToken || !auth.userToken) {
|
|
492
|
+
if (!auth.ucanInvocation && (!auth.oracleToken || !auth.userToken)) {
|
|
459
493
|
Logger.warn(
|
|
460
|
-
`[MemoryEngineService] Missing
|
|
494
|
+
`[MemoryEngineService] Missing auth (no UCAN and no Matrix tokens), skipping query "${request.query}"`,
|
|
461
495
|
);
|
|
462
496
|
return undefined;
|
|
463
497
|
}
|
|
@@ -465,14 +499,7 @@ export class MemoryEngineService {
|
|
|
465
499
|
try {
|
|
466
500
|
const response = await fetch(`${this.memoryEngineUrl}/search-enhanced`, {
|
|
467
501
|
method: 'POST',
|
|
468
|
-
headers:
|
|
469
|
-
'x-oracle-token': auth.oracleToken,
|
|
470
|
-
'x-user-token': auth.userToken,
|
|
471
|
-
'x-oracle-matrix-homeserver': auth.oracleHomeServer,
|
|
472
|
-
'x-user-matrix-homeserver': auth.userHomeServer,
|
|
473
|
-
'x-room-id': roomId,
|
|
474
|
-
'Content-Type': 'application/json',
|
|
475
|
-
},
|
|
502
|
+
headers: this.buildHeaders(auth, roomId),
|
|
476
503
|
body: JSON.stringify(request),
|
|
477
504
|
});
|
|
478
505
|
|
|
@@ -401,18 +401,19 @@ ___________________________________________________________
|
|
|
401
401
|
let userContext: UserContextData | undefined;
|
|
402
402
|
if (
|
|
403
403
|
this.memoryEngineService &&
|
|
404
|
-
createSessionDto.
|
|
405
|
-
|
|
404
|
+
(createSessionDto.ucanInvocation ||
|
|
405
|
+
(createSessionDto.oracleToken && createSessionDto.userToken))
|
|
406
406
|
) {
|
|
407
407
|
try {
|
|
408
408
|
Logger.debug('Gathering user context from Memory Engine');
|
|
409
409
|
userContext = await this.memoryEngineService.gatherUserContext({
|
|
410
410
|
oracleDid: createSessionDto.oracleDid,
|
|
411
411
|
roomId,
|
|
412
|
-
oracleToken: createSessionDto.oracleToken,
|
|
413
|
-
userToken: createSessionDto.userToken,
|
|
412
|
+
oracleToken: createSessionDto.oracleToken ?? '',
|
|
413
|
+
userToken: createSessionDto.userToken ?? '',
|
|
414
414
|
oracleHomeServer: createSessionDto.oracleHomeServer ?? '',
|
|
415
415
|
userHomeServer: createSessionDto.userHomeServer ?? '',
|
|
416
|
+
ucanInvocation: createSessionDto.ucanInvocation,
|
|
416
417
|
});
|
|
417
418
|
} catch (error) {
|
|
418
419
|
Logger.error('Failed to gather user context:', error);
|
|
@@ -34,25 +34,32 @@ export interface GetUserSubscriptionParams {
|
|
|
34
34
|
network: 'mainnet' | 'testnet' | 'devnet';
|
|
35
35
|
bearerToken: string;
|
|
36
36
|
subscriptionUrl?: string;
|
|
37
|
+
/** When set to 'ucan', includes X-Auth-Type header for UCAN invocation auth */
|
|
38
|
+
authType?: 'ucan';
|
|
37
39
|
}
|
|
38
40
|
|
|
39
41
|
export const getUserSubscription = async ({
|
|
40
42
|
bearerToken,
|
|
41
43
|
network,
|
|
42
44
|
subscriptionUrl: _subscriptionUrl,
|
|
45
|
+
authType,
|
|
43
46
|
}: GetUserSubscriptionParams): Promise<GetMySubscriptionsResponseDto | null> => {
|
|
44
47
|
const subscriptionUrl =
|
|
45
48
|
_subscriptionUrl ?? getSubscriptionUrlByNetwork(network);
|
|
46
49
|
try {
|
|
47
50
|
Logger.debug('Fetching user subscription from:', subscriptionUrl);
|
|
51
|
+
const headers: Record<string, string> = {
|
|
52
|
+
Authorization: `Bearer ${bearerToken}`,
|
|
53
|
+
'Content-Type': 'application/json',
|
|
54
|
+
};
|
|
55
|
+
if (authType === 'ucan') {
|
|
56
|
+
headers['X-Auth-Type'] = 'ucan';
|
|
57
|
+
}
|
|
48
58
|
const response = await fetch(
|
|
49
59
|
`${subscriptionUrl.endsWith('/') ? subscriptionUrl.slice(0, -1) : subscriptionUrl}/api/v1/subscriptions`,
|
|
50
60
|
{
|
|
51
61
|
method: 'GET',
|
|
52
|
-
headers
|
|
53
|
-
Authorization: `Bearer ${bearerToken}`,
|
|
54
|
-
'Content-Type': 'application/json',
|
|
55
|
-
},
|
|
62
|
+
headers,
|
|
56
63
|
},
|
|
57
64
|
);
|
|
58
65
|
|