@dainprotocol/service-sdk 1.0.57 → 1.0.58
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/__tests__/api-sdk.test.js.map +1 -1
- package/dist/__tests__/oauth.test.d.ts +1 -0
- package/dist/__tests__/oauth.test.js +255 -0
- package/dist/__tests__/oauth.test.js.map +1 -0
- package/dist/__tests__/processes.test.js +3 -3
- package/dist/client/api-sdk.d.ts +26 -1
- package/dist/client/api-sdk.js +83 -3
- package/dist/client/api-sdk.js.map +1 -1
- package/dist/client/client.d.ts +3 -1
- package/dist/client/client.js +8 -0
- package/dist/client/client.js.map +1 -1
- package/dist/client/types.d.ts +49 -0
- package/dist/client/types.js +14 -1
- package/dist/client/types.js.map +1 -1
- package/dist/service/index.d.ts +1 -0
- package/dist/service/index.js +1 -0
- package/dist/service/index.js.map +1 -1
- package/dist/service/oauth2.d.ts +9 -2
- package/dist/service/oauth2.js +32 -4
- package/dist/service/oauth2.js.map +1 -1
- package/dist/service/oauth2Store.d.ts +22 -0
- package/dist/service/oauth2Store.js +66 -0
- package/dist/service/oauth2Store.js.map +1 -0
- package/dist/service/server.js +49 -14
- package/dist/service/server.js.map +1 -1
- package/dist/service/types.d.ts +12 -3
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-sdk.test.js","sourceRoot":"","sources":["../../src/__tests__/api-sdk.test.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAC5C,uDAAuD;AACvD,mDAAgD;AAChD,wDAAwB;AACxB,wDAAuE;AACvE,6BAAwB;
|
|
1
|
+
{"version":3,"file":"api-sdk.test.js","sourceRoot":"","sources":["../../src/__tests__/api-sdk.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,255 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const api_sdk_1 = require("../client/api-sdk");
|
|
5
|
+
const client_auth_1 = require("../client/client-auth");
|
|
6
|
+
const ed25519_1 = require("@noble/curves/ed25519");
|
|
7
|
+
const bs58_1 = tslib_1.__importDefault(require("bs58"));
|
|
8
|
+
const nodeService_1 = require("../service/nodeService");
|
|
9
|
+
const zod_1 = require("zod");
|
|
10
|
+
const oauth2Store_1 = require("../service/oauth2Store");
|
|
11
|
+
const hono_1 = require("hono");
|
|
12
|
+
const node_server_1 = require("@hono/node-server");
|
|
13
|
+
describe("OAuth Integration", () => {
|
|
14
|
+
const privateKey = ed25519_1.ed25519.utils.randomPrivateKey();
|
|
15
|
+
const publicKey = ed25519_1.ed25519.getPublicKey(privateKey);
|
|
16
|
+
const clientPrivateKey = ed25519_1.ed25519.utils.randomPrivateKey();
|
|
17
|
+
const clientPublicKey = ed25519_1.ed25519.getPublicKey(clientPrivateKey);
|
|
18
|
+
const agentAuth = new client_auth_1.DainClientAuth({
|
|
19
|
+
privateKeyBase58: bs58_1.default.encode(clientPrivateKey),
|
|
20
|
+
agentId: "agent-12",
|
|
21
|
+
orgId: "org-12",
|
|
22
|
+
});
|
|
23
|
+
const mockTokenStore = new oauth2Store_1.InMemoryOAuth2TokenStore();
|
|
24
|
+
let oauthServer;
|
|
25
|
+
let oauthSdk;
|
|
26
|
+
let oauth2Handler;
|
|
27
|
+
let mockOAuthProvider;
|
|
28
|
+
beforeAll(async () => {
|
|
29
|
+
// Create mock OAuth provider server
|
|
30
|
+
const mockOAuthApp = new hono_1.Hono();
|
|
31
|
+
// Add auth endpoint
|
|
32
|
+
mockOAuthApp.get('/auth', (c) => {
|
|
33
|
+
return c.redirect(c.req.query('redirect_uri') +
|
|
34
|
+
'?code=test-code&state=' + c.req.query('state'));
|
|
35
|
+
});
|
|
36
|
+
mockOAuthApp.post('/token', async (c) => {
|
|
37
|
+
const body = await c.req.parseBody();
|
|
38
|
+
// Verify the expected OAuth token request
|
|
39
|
+
if (body.grant_type === 'authorization_code' &&
|
|
40
|
+
body.client_id === 'test-client-id' &&
|
|
41
|
+
body.client_secret === 'test-client-secret' &&
|
|
42
|
+
body.code === 'test-code') {
|
|
43
|
+
return c.json({
|
|
44
|
+
access_token: 'mock_access_token',
|
|
45
|
+
token_type: 'Bearer',
|
|
46
|
+
expires_in: 3600,
|
|
47
|
+
refresh_token: 'mock_refresh_token',
|
|
48
|
+
scope: 'test_scope',
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
return c.json({ error: 'invalid_request' }, 400);
|
|
52
|
+
});
|
|
53
|
+
const mockOAuthServer = (0, node_server_1.serve)({
|
|
54
|
+
fetch: mockOAuthApp.fetch,
|
|
55
|
+
port: 4455
|
|
56
|
+
});
|
|
57
|
+
// Update the OAuth service config to use mock server
|
|
58
|
+
const oauthService = (0, nodeService_1.defineDAINService)({
|
|
59
|
+
metadata: {
|
|
60
|
+
title: "Test OAuth Service",
|
|
61
|
+
description: "A test OAuth service",
|
|
62
|
+
version: "1.0.0",
|
|
63
|
+
author: "Test Author",
|
|
64
|
+
tags: ["test", "oauth"],
|
|
65
|
+
},
|
|
66
|
+
identity: {
|
|
67
|
+
publicKey: bs58_1.default.encode(publicKey),
|
|
68
|
+
agentId: "test-agent",
|
|
69
|
+
orgId: "test-org",
|
|
70
|
+
privateKey: bs58_1.default.encode(privateKey),
|
|
71
|
+
},
|
|
72
|
+
oauth2: {
|
|
73
|
+
baseUrl: "http://localhost:4422",
|
|
74
|
+
tokenStore: mockTokenStore,
|
|
75
|
+
providers: {
|
|
76
|
+
test_provider: {
|
|
77
|
+
clientId: "test-client-id",
|
|
78
|
+
clientSecret: "test-client-secret",
|
|
79
|
+
authorizationUrl: "http://localhost:4455/auth", // Point to mock server
|
|
80
|
+
tokenUrl: "http://localhost:4455/token", // Point to mock server
|
|
81
|
+
scopes: ["test_scope"],
|
|
82
|
+
reason: "Required for testing",
|
|
83
|
+
requiredTools: ["test-oauth-tool"],
|
|
84
|
+
onSuccess: async (agentId, tokens) => {
|
|
85
|
+
console.log("OAuth success", agentId, tokens);
|
|
86
|
+
},
|
|
87
|
+
},
|
|
88
|
+
},
|
|
89
|
+
},
|
|
90
|
+
tools: [
|
|
91
|
+
(0, nodeService_1.createTool)({
|
|
92
|
+
id: "test-oauth-tool",
|
|
93
|
+
name: "Test OAuth Tool",
|
|
94
|
+
description: "Tool that requires OAuth",
|
|
95
|
+
input: zod_1.z.object({}),
|
|
96
|
+
output: zod_1.z.object({ success: zod_1.z.boolean() }),
|
|
97
|
+
pricing: { pricePerUse: 0.01, currency: "USD" },
|
|
98
|
+
handler: async () => ({
|
|
99
|
+
text: "OAuth test",
|
|
100
|
+
data: { success: true },
|
|
101
|
+
ui: null,
|
|
102
|
+
}),
|
|
103
|
+
}),
|
|
104
|
+
],
|
|
105
|
+
});
|
|
106
|
+
const service = await oauthService.startService();
|
|
107
|
+
oauthServer = await oauthService.startNode({ port: 4422 });
|
|
108
|
+
oauthSdk = new api_sdk_1.DainSDK("http://localhost:4422", agentAuth);
|
|
109
|
+
await oauthSdk.initialize();
|
|
110
|
+
oauth2Handler = service.oauth2;
|
|
111
|
+
mockOAuthProvider = mockOAuthServer;
|
|
112
|
+
});
|
|
113
|
+
afterAll(async () => {
|
|
114
|
+
if (oauthServer) {
|
|
115
|
+
await oauthServer.shutdown();
|
|
116
|
+
}
|
|
117
|
+
if (mockOAuthProvider) {
|
|
118
|
+
await mockOAuthProvider.close();
|
|
119
|
+
}
|
|
120
|
+
});
|
|
121
|
+
describe("Provider Management", () => {
|
|
122
|
+
it("should list available OAuth providers", async () => {
|
|
123
|
+
const providers = await oauthSdk.getOAuthProviders();
|
|
124
|
+
expect(providers).toHaveLength(1);
|
|
125
|
+
expect(providers[0].name).toBe("test_provider");
|
|
126
|
+
expect(providers[0].config.reason).toBe("Required for testing");
|
|
127
|
+
expect(providers[0].config.scopes).toEqual(["test_scope"]);
|
|
128
|
+
expect(providers[0].config.requiredTools).toEqual(["test-oauth-tool"]);
|
|
129
|
+
});
|
|
130
|
+
it("should generate OAuth connect URL", async () => {
|
|
131
|
+
const url = await oauthSdk.getOAuthConnectUrl("test_provider");
|
|
132
|
+
expect(url).toContain("http://localhost:4455/auth");
|
|
133
|
+
expect(url).toContain("client_id=test-client-id");
|
|
134
|
+
expect(url).toContain("scope=test_scope");
|
|
135
|
+
});
|
|
136
|
+
it("should throw error for invalid provider", async () => {
|
|
137
|
+
await expect(oauthSdk.getOAuthConnectUrl("invalid_provider"))
|
|
138
|
+
.rejects
|
|
139
|
+
.toThrow();
|
|
140
|
+
});
|
|
141
|
+
});
|
|
142
|
+
describe("Tool Requirements", () => {
|
|
143
|
+
it("should identify tools requiring OAuth", async () => {
|
|
144
|
+
const requirements = await oauthSdk.getToolOAuthRequirements("test-oauth-tool");
|
|
145
|
+
expect(requirements.required).toBe(true);
|
|
146
|
+
expect(requirements.providers).toHaveLength(1);
|
|
147
|
+
expect(requirements.providers[0].name).toBe("test_provider");
|
|
148
|
+
expect(requirements.providers[0].reason).toBe("Required for testing");
|
|
149
|
+
});
|
|
150
|
+
it("should handle tools without OAuth requirements", async () => {
|
|
151
|
+
const noOAuthTool = (0, nodeService_1.createTool)({
|
|
152
|
+
id: "no-oauth-tool",
|
|
153
|
+
name: "No OAuth Tool",
|
|
154
|
+
description: "Tool that doesn't require OAuth",
|
|
155
|
+
input: zod_1.z.object({}),
|
|
156
|
+
output: zod_1.z.object({}),
|
|
157
|
+
pricing: { pricePerUse: 0.01, currency: "USD" },
|
|
158
|
+
handler: async () => ({
|
|
159
|
+
text: "No OAuth",
|
|
160
|
+
data: {},
|
|
161
|
+
ui: null,
|
|
162
|
+
}),
|
|
163
|
+
});
|
|
164
|
+
const service = (0, nodeService_1.defineDAINService)({
|
|
165
|
+
metadata: {
|
|
166
|
+
title: "Test OAuth Service",
|
|
167
|
+
description: "A test OAuth service",
|
|
168
|
+
version: "1.0.0",
|
|
169
|
+
author: "Test Author",
|
|
170
|
+
tags: ["test", "oauth"],
|
|
171
|
+
},
|
|
172
|
+
identity: {
|
|
173
|
+
publicKey: bs58_1.default.encode(publicKey),
|
|
174
|
+
agentId: "test-agent",
|
|
175
|
+
orgId: "test-org",
|
|
176
|
+
privateKey: bs58_1.default.encode(privateKey),
|
|
177
|
+
},
|
|
178
|
+
oauth2: {
|
|
179
|
+
baseUrl: "http://localhost:4423",
|
|
180
|
+
tokenStore: mockTokenStore,
|
|
181
|
+
providers: {
|
|
182
|
+
test_provider: {
|
|
183
|
+
clientId: "test-client-id",
|
|
184
|
+
clientSecret: "test-client-secret",
|
|
185
|
+
authorizationUrl: "https://test.com/auth",
|
|
186
|
+
tokenUrl: "https://test.com/token",
|
|
187
|
+
scopes: ["test_scope"],
|
|
188
|
+
reason: "Required for testing",
|
|
189
|
+
requiredTools: ["test-oauth-tool"],
|
|
190
|
+
onSuccess: async (agentId, tokens) => {
|
|
191
|
+
console.log("OAuth success", agentId, tokens);
|
|
192
|
+
},
|
|
193
|
+
},
|
|
194
|
+
},
|
|
195
|
+
},
|
|
196
|
+
tools: [(0, nodeService_1.createTool)({
|
|
197
|
+
id: "test-oauth-tool",
|
|
198
|
+
name: "Test OAuth Tool",
|
|
199
|
+
description: "Tool that requires OAuth",
|
|
200
|
+
input: zod_1.z.object({}),
|
|
201
|
+
output: zod_1.z.object({ success: zod_1.z.boolean() }),
|
|
202
|
+
pricing: { pricePerUse: 0.01, currency: "USD" },
|
|
203
|
+
handler: async () => ({
|
|
204
|
+
text: "OAuth test",
|
|
205
|
+
data: { success: true },
|
|
206
|
+
ui: null,
|
|
207
|
+
}),
|
|
208
|
+
}), noOAuthTool],
|
|
209
|
+
});
|
|
210
|
+
const newServer = await service.startNode({ port: 4423 });
|
|
211
|
+
const newSdk = new api_sdk_1.DainSDK("http://localhost:4423", agentAuth);
|
|
212
|
+
await newSdk.initialize();
|
|
213
|
+
const requirements = await newSdk.getToolOAuthRequirements("no-oauth-tool");
|
|
214
|
+
expect(requirements.required).toBe(false);
|
|
215
|
+
expect(requirements.providers).toHaveLength(0);
|
|
216
|
+
await newServer.shutdown();
|
|
217
|
+
});
|
|
218
|
+
});
|
|
219
|
+
describe("Documentation", () => {
|
|
220
|
+
it("should include OAuth requirements in documentation", async () => {
|
|
221
|
+
const docs = await oauthSdk.getDocumentation();
|
|
222
|
+
expect(docs).toContain("## OAuth Requirements");
|
|
223
|
+
expect(docs).toContain("test_provider");
|
|
224
|
+
expect(docs).toContain("Required for testing");
|
|
225
|
+
expect(docs).toContain("test_scope");
|
|
226
|
+
expect(docs).toContain("**OAuth Requirements:**");
|
|
227
|
+
expect(docs).toContain("test_provider: Required for testing");
|
|
228
|
+
});
|
|
229
|
+
});
|
|
230
|
+
describe("Token Management", () => {
|
|
231
|
+
it("should check OAuth requirements before executing tool", async () => {
|
|
232
|
+
// @ts-ignore - Accessing generated method
|
|
233
|
+
await expect(oauthSdk.testOauthTool({}))
|
|
234
|
+
.rejects
|
|
235
|
+
.toThrow(/Missing required OAuth connections/);
|
|
236
|
+
});
|
|
237
|
+
it("should store and validate tokens", async () => {
|
|
238
|
+
const code = "test-code";
|
|
239
|
+
const state = await oauth2Handler.encodeState({
|
|
240
|
+
agentId: "address_" + bs58_1.default.encode(clientPublicKey),
|
|
241
|
+
provider: "test_provider",
|
|
242
|
+
timestamp: Date.now(),
|
|
243
|
+
});
|
|
244
|
+
const response = await fetch(`http://localhost:4422/oauth2/callback/test_provider?code=${code}&state=${state}`);
|
|
245
|
+
expect(response.status).toBe(200);
|
|
246
|
+
console.log(await response.text());
|
|
247
|
+
// Add a small delay to ensure token processing is complete
|
|
248
|
+
await new Promise(resolve => setTimeout(resolve, 100));
|
|
249
|
+
const requirements = await oauthSdk.getToolOAuthRequirements("test-oauth-tool");
|
|
250
|
+
console.log(requirements);
|
|
251
|
+
expect(requirements.providers[0].connected).toBe(true);
|
|
252
|
+
});
|
|
253
|
+
});
|
|
254
|
+
});
|
|
255
|
+
//# sourceMappingURL=oauth.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth.test.js","sourceRoot":"","sources":["../../src/__tests__/oauth.test.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAC5C,uDAAuD;AACvD,mDAAgD;AAChD,wDAAwB;AACxB,wDAAuE;AACvE,6BAAwB;AACxB,wDAAyG;AAEzG,+BAA4B;AAC5B,mDAA0C;AAE1C,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,MAAM,UAAU,GAAG,iBAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;IACpD,MAAM,SAAS,GAAG,iBAAO,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACnD,MAAM,gBAAgB,GAAG,iBAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAC1D,MAAM,eAAe,GAAG,iBAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAE/D,MAAM,SAAS,GAAG,IAAI,4BAAc,CAAC;QACnC,gBAAgB,EAAE,cAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;QAC/C,OAAO,EAAE,UAAU;QACnB,KAAK,EAAE,QAAQ;KAChB,CAAC,CAAC;IAIH,MAAM,cAAc,GAAG,IAAI,sCAAwB,EAAE,CAAC;IAEtD,IAAI,WAAgB,CAAC;IACrB,IAAI,QAAiB,CAAC;IACtB,IAAI,aAAkB,CAAC;IACvB,IAAI,iBAAsB,CAAC;IAE3B,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,oCAAoC;QACpC,MAAM,YAAY,GAAG,IAAI,WAAI,EAAE,CAAC;QAEhC,oBAAoB;QACpB,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC;gBAC3C,wBAAwB,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YAErC,0CAA0C;YAC1C,IACE,IAAI,CAAC,UAAU,KAAK,oBAAoB;gBACxC,IAAI,CAAC,SAAS,KAAK,gBAAgB;gBACnC,IAAI,CAAC,aAAa,KAAK,oBAAoB;gBAC3C,IAAI,CAAC,IAAI,KAAK,WAAW,EACzB,CAAC;gBACD,OAAO,CAAC,CAAC,IAAI,CAAC;oBACZ,YAAY,EAAE,mBAAmB;oBACjC,UAAU,EAAE,QAAQ;oBACpB,UAAU,EAAE,IAAI;oBAChB,aAAa,EAAE,oBAAoB;oBACnC,KAAK,EAAE,YAAY;iBACpB,CAAC,CAAC;YACL,CAAC;YAED,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,GAAG,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,IAAA,mBAAK,EAAC;YAC5B,KAAK,EAAE,YAAY,CAAC,KAAK;YACzB,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;QAEH,qDAAqD;QACrD,MAAM,YAAY,GAAG,IAAA,+BAAiB,EAAC;YACrC,QAAQ,EAAE;gBACR,KAAK,EAAE,oBAAoB;gBAC3B,WAAW,EAAE,sBAAsB;gBACnC,OAAO,EAAE,OAAO;gBAChB,MAAM,EAAE,aAAa;gBACrB,IAAI,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;aACxB;YACD,QAAQ,EAAE;gBACR,SAAS,EAAE,cAAI,CAAC,MAAM,CAAC,SAAS,CAAC;gBACjC,OAAO,EAAE,YAAY;gBACrB,KAAK,EAAE,UAAU;gBACjB,UAAU,EAAE,cAAI,CAAC,MAAM,CAAC,UAAU,CAAC;aACpC;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,uBAAuB;gBAChC,UAAU,EAAE,cAAc;gBAC1B,SAAS,EAAE;oBACT,aAAa,EAAE;wBACb,QAAQ,EAAE,gBAAgB;wBAC1B,YAAY,EAAE,oBAAoB;wBAClC,gBAAgB,EAAE,4BAA4B,EAAE,uBAAuB;wBACvE,QAAQ,EAAE,6BAA6B,EAAE,uBAAuB;wBAChE,MAAM,EAAE,CAAC,YAAY,CAAC;wBACtB,MAAM,EAAE,sBAAsB;wBAC9B,aAAa,EAAE,CAAC,iBAAiB,CAAC;wBAClC,SAAS,EAAE,KAAK,EAAE,OAAe,EAAE,MAAoB,EAAE,EAAE;4BACzD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;wBAChD,CAAC;qBACF;iBACF;aACF;YACD,KAAK,EAAE;gBACL,IAAA,wBAAU,EAAC;oBACT,EAAE,EAAE,iBAAiB;oBACrB,IAAI,EAAE,iBAAiB;oBACvB,WAAW,EAAE,0BAA0B;oBACvC,KAAK,EAAE,OAAC,CAAC,MAAM,CAAC,EAAE,CAAC;oBACnB,MAAM,EAAE,OAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,OAAC,CAAC,OAAO,EAAE,EAAE,CAAC;oBAC1C,OAAO,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE;oBAC/C,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;wBACpB,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;wBACvB,EAAE,EAAE,IAAI;qBACT,CAAC;iBACH,CAAC;aACH;SACF,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,YAAY,EAAE,CAAC;QAClD,WAAW,GAAG,MAAM,YAAY,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,QAAQ,GAAG,IAAI,iBAAO,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;QAC3D,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;QAC5B,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;QAC/B,iBAAiB,GAAG,eAAe,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,KAAK,IAAI,EAAE;QAClB,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,WAAW,CAAC,QAAQ,EAAE,CAAC;QAC/B,CAAC;QACD,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,iBAAiB,CAAC,KAAK,EAAE,CAAC;QAClC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACrD,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,iBAAiB,EAAE,CAAC;YACrD,MAAM,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAChD,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YAChE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;YAC3D,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YACjD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;YAC/D,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;YACpD,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;YAClD,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;YACvD,MAAM,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;iBAC1D,OAAO;iBACP,OAAO,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACrD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;YAChF,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzC,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAC/C,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC7D,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;YAC9D,MAAM,WAAW,GAAG,IAAA,wBAAU,EAAC;gBAC7B,EAAE,EAAE,eAAe;gBACnB,IAAI,EAAE,eAAe;gBACrB,WAAW,EAAE,iCAAiC;gBAC9C,KAAK,EAAE,OAAC,CAAC,MAAM,CAAC,EAAE,CAAC;gBACnB,MAAM,EAAE,OAAC,CAAC,MAAM,CAAC,EAAE,CAAC;gBACpB,OAAO,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE;gBAC/C,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;oBACpB,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,EAAE;oBACR,EAAE,EAAE,IAAI;iBACT,CAAC;aACH,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAA,+BAAiB,EAAC;gBAChC,QAAQ,EAAE;oBACR,KAAK,EAAE,oBAAoB;oBAC3B,WAAW,EAAE,sBAAsB;oBACnC,OAAO,EAAE,OAAO;oBAChB,MAAM,EAAE,aAAa;oBACrB,IAAI,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;iBACxB;gBACD,QAAQ,EAAE;oBACR,SAAS,EAAE,cAAI,CAAC,MAAM,CAAC,SAAS,CAAC;oBACjC,OAAO,EAAE,YAAY;oBACrB,KAAK,EAAE,UAAU;oBACjB,UAAU,EAAE,cAAI,CAAC,MAAM,CAAC,UAAU,CAAC;iBACpC;gBACD,MAAM,EAAE;oBACN,OAAO,EAAE,uBAAuB;oBAChC,UAAU,EAAE,cAAc;oBAC1B,SAAS,EAAE;wBACT,aAAa,EAAE;4BACb,QAAQ,EAAE,gBAAgB;4BAC1B,YAAY,EAAE,oBAAoB;4BAClC,gBAAgB,EAAE,uBAAuB;4BACzC,QAAQ,EAAE,wBAAwB;4BAClC,MAAM,EAAE,CAAC,YAAY,CAAC;4BACtB,MAAM,EAAE,sBAAsB;4BAC9B,aAAa,EAAE,CAAC,iBAAiB,CAAC;4BAClC,SAAS,EAAE,KAAK,EAAE,OAAe,EAAE,MAAoB,EAAE,EAAE;gCACzD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;4BAChD,CAAC;yBACF;qBACF;iBACF;gBACD,KAAK,EAAE,CAAC,IAAA,wBAAU,EAAC;wBACjB,EAAE,EAAE,iBAAiB;wBACrB,IAAI,EAAE,iBAAiB;wBACvB,WAAW,EAAE,0BAA0B;wBACvC,KAAK,EAAE,OAAC,CAAC,MAAM,CAAC,EAAE,CAAC;wBACnB,MAAM,EAAE,OAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,OAAC,CAAC,OAAO,EAAE,EAAE,CAAC;wBAC1C,OAAO,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE;wBAC/C,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;4BACpB,IAAI,EAAE,YAAY;4BAClB,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;4BACvB,EAAE,EAAE,IAAI;yBACT,CAAC;qBACH,CAAC,EAAE,WAAW,CAAC;aACjB,CAAC,CAAC;YAEH,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1D,MAAM,MAAM,GAAG,IAAI,iBAAO,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;YAC/D,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;YAE1B,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,eAAe,CAAC,CAAC;YAC5E,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAE/C,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC7B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YAClE,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,gBAAgB,EAAE,CAAC;YAE/C,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;YAChD,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;YAC/C,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;YAErC,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;YAClD,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,qCAAqC,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAEhC,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;YACrE,0CAA0C;YAC1C,MAAM,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;iBACrC,OAAO;iBACP,OAAO,CAAC,oCAAoC,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;YAChD,MAAM,IAAI,GAAG,WAAW,CAAC;YACzB,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,WAAW,CAAC;gBAC5C,OAAO,EAAE,UAAU,GAAG,cAAI,CAAC,MAAM,CAAC,eAAe,CAAC;gBAClD,QAAQ,EAAE,eAAe;gBACzB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,4DAA4D,IAAI,UAAU,KAAK,EAAE,CAAC,CAAC;YAChH,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAGlC,OAAO,CAAC,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;YACnC,2DAA2D;YAC3D,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;YAEvD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;YAChF,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAC1B,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IAEL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -15,7 +15,7 @@ describe("Process Handler", () => {
|
|
|
15
15
|
// Store webhook calls
|
|
16
16
|
let webhookCalls = [];
|
|
17
17
|
let webhookServer;
|
|
18
|
-
const WEBHOOK_PORT =
|
|
18
|
+
const WEBHOOK_PORT = 3099;
|
|
19
19
|
const agentAuth = new client_auth_1.DainClientAuth({
|
|
20
20
|
privateKeyBase58: bs58_1.default.encode(clientPrivateKey),
|
|
21
21
|
agentId: "agent-12",
|
|
@@ -151,8 +151,8 @@ describe("Process Handler", () => {
|
|
|
151
151
|
});
|
|
152
152
|
});
|
|
153
153
|
// Start DAIN service
|
|
154
|
-
server = await dainService.startNode({ port:
|
|
155
|
-
sdk = new api_sdk_1.DainSDK("http://localhost:
|
|
154
|
+
server = await dainService.startNode({ port: 3018 });
|
|
155
|
+
sdk = new api_sdk_1.DainSDK("http://localhost:3018", agentAuth);
|
|
156
156
|
await sdk.initialize();
|
|
157
157
|
});
|
|
158
158
|
afterAll(async () => {
|
package/dist/client/api-sdk.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DainClientAuth } from './client-auth';
|
|
2
|
-
import type { ServiceMetadata, ToolConfig } from './types';
|
|
2
|
+
import type { ServiceMetadata, ToolConfig, OAuth2ProviderInfo } from './types';
|
|
3
3
|
import { z } from 'zod';
|
|
4
4
|
type ToolMethod<T extends z.ZodType, U extends z.ZodType> = (params: z.infer<T>) => Promise<{
|
|
5
5
|
data: z.infer<U>;
|
|
@@ -13,6 +13,7 @@ export declare class DainSDK {
|
|
|
13
13
|
private connection;
|
|
14
14
|
private toolsCache;
|
|
15
15
|
private metadata?;
|
|
16
|
+
private oauthProvidersCache;
|
|
16
17
|
constructor(baseUrl: string, auth: DainClientAuth);
|
|
17
18
|
/**
|
|
18
19
|
* Initializes the SDK by loading all tools and metadata.
|
|
@@ -46,5 +47,29 @@ export declare class DainSDK {
|
|
|
46
47
|
* Returns all available tool configurations
|
|
47
48
|
*/
|
|
48
49
|
getAvailableTools(): ToolConfig[];
|
|
50
|
+
/**
|
|
51
|
+
* Gets information about all available OAuth providers and their connection status
|
|
52
|
+
* @returns List of OAuth providers with their connection status
|
|
53
|
+
*/
|
|
54
|
+
getOAuthProviders(): Promise<OAuth2ProviderInfo[]>;
|
|
55
|
+
/**
|
|
56
|
+
* Gets an authentication URL for connecting with a specific OAuth provider
|
|
57
|
+
* @param provider The name of the OAuth provider
|
|
58
|
+
* @returns URL to initiate OAuth flow
|
|
59
|
+
*/
|
|
60
|
+
getOAuthConnectUrl(provider: string): Promise<string>;
|
|
61
|
+
/**
|
|
62
|
+
* Checks if a tool requires specific OAuth connections and returns requirements
|
|
63
|
+
* @param toolId The ID of the tool to check
|
|
64
|
+
* @returns Required OAuth connections and their status
|
|
65
|
+
*/
|
|
66
|
+
getToolOAuthRequirements(toolId: string): Promise<{
|
|
67
|
+
required: boolean;
|
|
68
|
+
providers: {
|
|
69
|
+
name: string;
|
|
70
|
+
reason?: string;
|
|
71
|
+
connected: boolean;
|
|
72
|
+
}[];
|
|
73
|
+
}>;
|
|
49
74
|
}
|
|
50
75
|
export {};
|
package/dist/client/api-sdk.js
CHANGED
|
@@ -7,6 +7,7 @@ class DainSDK {
|
|
|
7
7
|
connection;
|
|
8
8
|
toolsCache = new Map();
|
|
9
9
|
metadata;
|
|
10
|
+
oauthProvidersCache = new Map();
|
|
10
11
|
constructor(baseUrl, auth) {
|
|
11
12
|
this.connection = new client_1.DainServiceConnection(baseUrl, auth);
|
|
12
13
|
}
|
|
@@ -21,6 +22,9 @@ class DainSDK {
|
|
|
21
22
|
// Cache all tools
|
|
22
23
|
const tools = await this.connection.getTools();
|
|
23
24
|
tools.forEach(tool => this.toolsCache.set(tool.id, tool));
|
|
25
|
+
// Also cache OAuth providers
|
|
26
|
+
const providers = await this.connection.getOAuth2Providers();
|
|
27
|
+
providers.forEach(provider => this.oauthProvidersCache.set(provider.name, provider));
|
|
24
28
|
// Dynamically add methods for each tool
|
|
25
29
|
await this.generateToolMethods();
|
|
26
30
|
return this;
|
|
@@ -42,6 +46,24 @@ class DainSDK {
|
|
|
42
46
|
docs += `- ${this.metadata.tags.join('\n- ')}\n\n`;
|
|
43
47
|
// Document all available tools
|
|
44
48
|
docs += `## Available Tools\n\n`;
|
|
49
|
+
// Add OAuth section after metadata
|
|
50
|
+
const providers = await this.getOAuthProviders();
|
|
51
|
+
if (providers.length > 0) {
|
|
52
|
+
docs += `## OAuth Requirements\n\n`;
|
|
53
|
+
docs += `This service requires authentication with the following providers:\n\n`;
|
|
54
|
+
for (const provider of providers) {
|
|
55
|
+
docs += `### ${provider.name}\n`;
|
|
56
|
+
if (provider.config.reason) {
|
|
57
|
+
docs += `**Reason:** ${provider.config.reason}\n`;
|
|
58
|
+
}
|
|
59
|
+
docs += `**Scopes Required:** ${provider.config.scopes.join(', ')}\n\n`;
|
|
60
|
+
docs += `To connect with ${provider.name}, use:\n`;
|
|
61
|
+
docs += `\`\`\`typescript\n`;
|
|
62
|
+
docs += `const authUrl = await sdk.getOAuthConnectUrl("${provider.name}");\n`;
|
|
63
|
+
docs += `// Redirect user to authUrl to complete authentication\n`;
|
|
64
|
+
docs += `\`\`\`\n\n`;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
45
67
|
for (const [_, tool] of this.toolsCache) {
|
|
46
68
|
docs += `### ${tool.name}\n\n`;
|
|
47
69
|
docs += `**Method Name:** \`${this.sanitizeMethodName(tool.name)}\`\n\n`;
|
|
@@ -66,6 +88,19 @@ class DainSDK {
|
|
|
66
88
|
docs += ` ui: any\n`;
|
|
67
89
|
docs += `};\n`;
|
|
68
90
|
docs += `\`\`\`\n(Example Parameters are just placeholders for the type, they are not real values)\n\n`;
|
|
91
|
+
// Add OAuth requirements for this tool
|
|
92
|
+
const oauthReqs = await this.getToolOAuthRequirements(tool.id);
|
|
93
|
+
if (oauthReqs.required) {
|
|
94
|
+
docs += `**OAuth Requirements:**\n`;
|
|
95
|
+
for (const provider of oauthReqs.providers) {
|
|
96
|
+
docs += `- ${provider.name}${provider.reason ? `: ${provider.reason}` : ''}\n`;
|
|
97
|
+
}
|
|
98
|
+
docs += `\n**Connection Check:**\n\`\`\`typescript\n`;
|
|
99
|
+
docs += `const requirements = await sdk.getToolOAuthRequirements("${tool.id}");\n`;
|
|
100
|
+
docs += `if (!requirements.providers.every(p => p.connected)) {\n`;
|
|
101
|
+
docs += ` // Handle missing OAuth connections\n`;
|
|
102
|
+
docs += `}\n\`\`\`\n\n`;
|
|
103
|
+
}
|
|
69
104
|
}
|
|
70
105
|
return docs;
|
|
71
106
|
}
|
|
@@ -160,11 +195,18 @@ class DainSDK {
|
|
|
160
195
|
const methodName = this.sanitizeMethodName(toolConfig.name);
|
|
161
196
|
this[methodName] = async (params) => {
|
|
162
197
|
try {
|
|
198
|
+
// Check OAuth requirements before executing
|
|
199
|
+
const oauthReqs = await this.getToolOAuthRequirements(toolId);
|
|
200
|
+
if (oauthReqs.required) {
|
|
201
|
+
const missingConnections = oauthReqs.providers.filter(p => !p.connected);
|
|
202
|
+
if (missingConnections.length > 0) {
|
|
203
|
+
throw new Error(`Missing required OAuth connections for ${toolConfig.name}:\n` +
|
|
204
|
+
missingConnections.map(p => `- ${p.name}${p.reason ? ` (${p.reason})` : ''}`).join('\n'));
|
|
205
|
+
}
|
|
206
|
+
}
|
|
163
207
|
const tool = (0, convertToVercelTool_1.convertHttpToolToVercelAITool)(toolConfig);
|
|
164
|
-
// Validate input parameters
|
|
165
208
|
tool.parameters.parse(params);
|
|
166
209
|
const result = await this.connection.callTool(toolId, params);
|
|
167
|
-
// Validate output against the return schema
|
|
168
210
|
tool.returnSchema.parse(result.data);
|
|
169
211
|
return result;
|
|
170
212
|
}
|
|
@@ -173,7 +215,7 @@ class DainSDK {
|
|
|
173
215
|
throw new Error(`Invalid parameters for ${toolConfig.name}: ${error.message}`);
|
|
174
216
|
}
|
|
175
217
|
else {
|
|
176
|
-
throw new Error(`
|
|
218
|
+
throw new Error(`Error executing ${toolConfig.name}: ${error.message}`);
|
|
177
219
|
}
|
|
178
220
|
}
|
|
179
221
|
};
|
|
@@ -191,6 +233,44 @@ class DainSDK {
|
|
|
191
233
|
getAvailableTools() {
|
|
192
234
|
return Array.from(this.toolsCache.values());
|
|
193
235
|
}
|
|
236
|
+
/**
|
|
237
|
+
* Gets information about all available OAuth providers and their connection status
|
|
238
|
+
* @returns List of OAuth providers with their connection status
|
|
239
|
+
*/
|
|
240
|
+
async getOAuthProviders() {
|
|
241
|
+
return await this.connection.getOAuth2Providers();
|
|
242
|
+
}
|
|
243
|
+
/**
|
|
244
|
+
* Gets an authentication URL for connecting with a specific OAuth provider
|
|
245
|
+
* @param provider The name of the OAuth provider
|
|
246
|
+
* @returns URL to initiate OAuth flow
|
|
247
|
+
*/
|
|
248
|
+
async getOAuthConnectUrl(provider) {
|
|
249
|
+
return await this.connection.getOAuth2ConnectUrl(provider);
|
|
250
|
+
}
|
|
251
|
+
/**
|
|
252
|
+
* Checks if a tool requires specific OAuth connections and returns requirements
|
|
253
|
+
* @param toolId The ID of the tool to check
|
|
254
|
+
* @returns Required OAuth connections and their status
|
|
255
|
+
*/
|
|
256
|
+
async getToolOAuthRequirements(toolId) {
|
|
257
|
+
const tool = this.toolsCache.get(toolId);
|
|
258
|
+
if (!tool) {
|
|
259
|
+
throw new Error(`Tool ${toolId} not found`);
|
|
260
|
+
}
|
|
261
|
+
const providers = await this.getOAuthProviders();
|
|
262
|
+
const requiredProviders = providers.filter(p =>
|
|
263
|
+
// Check if this tool is explicitly required by the provider
|
|
264
|
+
p.config.requiredTools?.includes(toolId));
|
|
265
|
+
return {
|
|
266
|
+
required: requiredProviders.length > 0,
|
|
267
|
+
providers: requiredProviders.map(p => ({
|
|
268
|
+
name: p.name,
|
|
269
|
+
reason: p.config.reason,
|
|
270
|
+
connected: p.connected
|
|
271
|
+
}))
|
|
272
|
+
};
|
|
273
|
+
}
|
|
194
274
|
}
|
|
195
275
|
exports.DainSDK = DainSDK;
|
|
196
276
|
// Example usage with type safety:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-sdk.js","sourceRoot":"","sources":["../../src/client/api-sdk.ts"],"names":[],"mappings":";;;AAAA,qCAAiD;AAIjD,oEAA2E;AAmB3E,MAAa,OAAO;IACV,UAAU,CAAwB;IAClC,UAAU,GAA4B,IAAI,GAAG,EAAE,CAAC;IAChD,QAAQ,CAAmB;
|
|
1
|
+
{"version":3,"file":"api-sdk.js","sourceRoot":"","sources":["../../src/client/api-sdk.ts"],"names":[],"mappings":"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"}
|
package/dist/client/client.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { CoreTool } from "ai";
|
|
2
2
|
import { DainClientAuth } from "./client-auth";
|
|
3
|
-
import { ServiceMetadata, ServiceConfig, ToolboxConfig, ToolConfig, ServiceContext, ServiceContextWithData, ToolWithJsonSchema, ServicePinnable, ServicePinnableWithWidget } from "./types";
|
|
3
|
+
import { ServiceMetadata, ServiceConfig, ToolboxConfig, ToolConfig, ServiceContext, ServiceContextWithData, ToolWithJsonSchema, ServicePinnable, ServicePinnableWithWidget, OAuth2ProviderInfo } from "./types";
|
|
4
4
|
export type { ServiceMetadata, ServiceConfig, ToolboxConfig, ToolConfig };
|
|
5
5
|
export declare class DainServiceConnection {
|
|
6
6
|
private baseUrl;
|
|
@@ -46,4 +46,6 @@ export declare class DainServiceConnection {
|
|
|
46
46
|
ui?: any;
|
|
47
47
|
}[];
|
|
48
48
|
} | null>;
|
|
49
|
+
getOAuth2Providers(): Promise<OAuth2ProviderInfo[]>;
|
|
50
|
+
getOAuth2ConnectUrl(provider: string): Promise<string>;
|
|
49
51
|
}
|
package/dist/client/client.js
CHANGED
|
@@ -214,6 +214,14 @@ class DainServiceConnection {
|
|
|
214
214
|
throw error;
|
|
215
215
|
}
|
|
216
216
|
}
|
|
217
|
+
async getOAuth2Providers() {
|
|
218
|
+
const data = await this.makeRequest("GET", "/oauth2/providers");
|
|
219
|
+
return zod_1.z.array(types_1.OAuth2ProviderInfoSchema).parse(data);
|
|
220
|
+
}
|
|
221
|
+
async getOAuth2ConnectUrl(provider) {
|
|
222
|
+
const data = await this.makeRequest("GET", `/oauth2/connect/${provider}`);
|
|
223
|
+
return zod_1.z.object({ authUrl: zod_1.z.string() }).parse(data).authUrl;
|
|
224
|
+
}
|
|
217
225
|
}
|
|
218
226
|
exports.DainServiceConnection = DainServiceConnection;
|
|
219
227
|
//# sourceMappingURL=client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":";AAAA,6BAA6B;;;;AAE7B,6BAAwB;AACxB,2BAAoC;AACpC,0DAA0B;AAK1B,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"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"}
|
package/dist/client/types.d.ts
CHANGED
|
@@ -291,6 +291,54 @@ export declare const ServicePinnableWithWidgetSchema: z.ZodObject<z.objectUtil.e
|
|
|
291
291
|
label?: string;
|
|
292
292
|
icon?: string;
|
|
293
293
|
}>;
|
|
294
|
+
export declare const OAuth2ProviderInfoSchema: z.ZodObject<{
|
|
295
|
+
name: z.ZodString;
|
|
296
|
+
config: z.ZodObject<{
|
|
297
|
+
clientId: z.ZodString;
|
|
298
|
+
authorizationUrl: z.ZodString;
|
|
299
|
+
tokenUrl: z.ZodString;
|
|
300
|
+
scopes: z.ZodArray<z.ZodString, "many">;
|
|
301
|
+
reason: z.ZodOptional<z.ZodString>;
|
|
302
|
+
requiredTools: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
303
|
+
}, "strip", z.ZodTypeAny, {
|
|
304
|
+
clientId?: string;
|
|
305
|
+
authorizationUrl?: string;
|
|
306
|
+
tokenUrl?: string;
|
|
307
|
+
scopes?: string[];
|
|
308
|
+
reason?: string;
|
|
309
|
+
requiredTools?: string[];
|
|
310
|
+
}, {
|
|
311
|
+
clientId?: string;
|
|
312
|
+
authorizationUrl?: string;
|
|
313
|
+
tokenUrl?: string;
|
|
314
|
+
scopes?: string[];
|
|
315
|
+
reason?: string;
|
|
316
|
+
requiredTools?: string[];
|
|
317
|
+
}>;
|
|
318
|
+
connected: z.ZodBoolean;
|
|
319
|
+
}, "strip", z.ZodTypeAny, {
|
|
320
|
+
name?: string;
|
|
321
|
+
config?: {
|
|
322
|
+
clientId?: string;
|
|
323
|
+
authorizationUrl?: string;
|
|
324
|
+
tokenUrl?: string;
|
|
325
|
+
scopes?: string[];
|
|
326
|
+
reason?: string;
|
|
327
|
+
requiredTools?: string[];
|
|
328
|
+
};
|
|
329
|
+
connected?: boolean;
|
|
330
|
+
}, {
|
|
331
|
+
name?: string;
|
|
332
|
+
config?: {
|
|
333
|
+
clientId?: string;
|
|
334
|
+
authorizationUrl?: string;
|
|
335
|
+
tokenUrl?: string;
|
|
336
|
+
scopes?: string[];
|
|
337
|
+
reason?: string;
|
|
338
|
+
requiredTools?: string[];
|
|
339
|
+
};
|
|
340
|
+
connected?: boolean;
|
|
341
|
+
}>;
|
|
294
342
|
export type PricingInfo = z.infer<typeof PricingInfoSchema>;
|
|
295
343
|
export type ServiceMetadata = z.infer<typeof MetadataSchema>;
|
|
296
344
|
export type ServiceConfig = z.infer<typeof ServiceConfigSchema>;
|
|
@@ -301,3 +349,4 @@ export type ServiceContextWithData = z.infer<typeof ServiceContextWithDataSchema
|
|
|
301
349
|
export type ToolWithJsonSchema = z.infer<typeof ToolWithJsonSchemaSchema>;
|
|
302
350
|
export type ServicePinnable = z.infer<typeof ServicePinnableSchema>;
|
|
303
351
|
export type ServicePinnableWithWidget = z.infer<typeof ServicePinnableWithWidgetSchema>;
|
|
352
|
+
export type OAuth2ProviderInfo = z.infer<typeof OAuth2ProviderInfoSchema>;
|
package/dist/client/types.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ServicePinnableWithWidgetSchema = exports.ServicePinnableSchema = exports.GetAllToolsAsJsonSchemaResponseSchema = exports.ToolWithJsonSchemaSchema = exports.ServiceContextWithDataSchema = exports.ServiceContextSchema = exports.ToolConfigSchema = exports.ToolboxConfigSchema = exports.ServiceConfigSchema = exports.MetadataSchema = exports.PricingInfoSchema = void 0;
|
|
3
|
+
exports.OAuth2ProviderInfoSchema = exports.ServicePinnableWithWidgetSchema = exports.ServicePinnableSchema = exports.GetAllToolsAsJsonSchemaResponseSchema = exports.ToolWithJsonSchemaSchema = exports.ServiceContextWithDataSchema = exports.ServiceContextSchema = exports.ToolConfigSchema = exports.ToolboxConfigSchema = exports.ServiceConfigSchema = exports.MetadataSchema = exports.PricingInfoSchema = void 0;
|
|
4
4
|
const zod_1 = require("zod");
|
|
5
5
|
// Define and export types for DAIN service responses
|
|
6
6
|
exports.PricingInfoSchema = zod_1.z.object({
|
|
@@ -78,4 +78,17 @@ exports.ServicePinnableWithWidgetSchema = exports.ServicePinnableSchema.extend({
|
|
|
78
78
|
ui: zod_1.z.any().optional(),
|
|
79
79
|
}),
|
|
80
80
|
});
|
|
81
|
+
// Add these new schemas
|
|
82
|
+
exports.OAuth2ProviderInfoSchema = zod_1.z.object({
|
|
83
|
+
name: zod_1.z.string(),
|
|
84
|
+
config: zod_1.z.object({
|
|
85
|
+
clientId: zod_1.z.string(),
|
|
86
|
+
authorizationUrl: zod_1.z.string(),
|
|
87
|
+
tokenUrl: zod_1.z.string(),
|
|
88
|
+
scopes: zod_1.z.array(zod_1.z.string()),
|
|
89
|
+
reason: zod_1.z.string().optional(),
|
|
90
|
+
requiredTools: zod_1.z.array(zod_1.z.string()).optional()
|
|
91
|
+
}),
|
|
92
|
+
connected: zod_1.z.boolean()
|
|
93
|
+
});
|
|
81
94
|
//# sourceMappingURL=types.js.map
|
package/dist/client/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/client/types.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,qDAAqD;AACxC,QAAA,iBAAiB,GAAG,OAAC,CAAC,MAAM,CAAC;IACxC,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE;CACrB,CAAC,CAAC;AAEU,QAAA,cAAc,GAAG,OAAC,CAAC,MAAM,CAAC;IACrC,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;IACjB,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE;IACnB,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE;IAClB,IAAI,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC;CAC1B,CAAC,CAAC;AAEU,QAAA,mBAAmB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC1C,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,QAAQ,EAAE,OAAC,CAAC,MAAM,CAAC;QACjB,YAAY,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC;QACjC,SAAS,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC;KAC/B,CAAC;IACF,iBAAiB,EAAE,OAAC,CAAC,MAAM,EAAE;IAC7B,gBAAgB,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC;CACtC,CAAC,CAAC;AAEU,QAAA,mBAAmB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC1C,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,KAAK,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE,OAAC,CAAC,MAAM,CAAC;QACjB,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE;QACtB,gBAAgB,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC;KACtC,CAAC;IACF,iBAAiB,EAAE,OAAC,CAAC,MAAM,EAAE;CAC9B,CAAC,CAAC;AAEU,QAAA,gBAAgB,GAAG,OAAC,CAAC,MAAM,CAAC;IACvC,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,OAAO,EAAE,yBAAiB;IAC1B,WAAW,EAAE,OAAC,CAAC,GAAG,EAAE,EAAE,iCAAiC;IACvD,YAAY,EAAE,OAAC,CAAC,GAAG,EAAE,EAAE,iCAAiC;CACzD,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC3C,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;CACxB,CAAC,CAAC;AAEU,QAAA,4BAA4B,GAAG,4BAAoB,CAAC,MAAM,CAAC;IACtE,IAAI,EAAE,OAAC,CAAC,GAAG,EAAE;CACd,CAAC,CAAC;AAEU,QAAA,wBAAwB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC/C,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,WAAW,EAAE,OAAC,CAAC,GAAG,EAAE;CACrB,CAAC,CAAC;AAEU,QAAA,qCAAqC,GAAG,OAAC,CAAC,MAAM,CAAC;IAC5D,KAAK,EAAE,OAAC,CAAC,KAAK,CAAC,gCAAwB,CAAC;IACxC,kBAAkB,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC;CACxC,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC5C,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAClC,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;IACjB,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;CACjB,CAAC,CAAC;AAEU,QAAA,+BAA+B,GAAG,6BAAqB,CAAC,MAAM,CAAC;IAC1E,MAAM,EAAE,OAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,EAAE,OAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;QACxB,EAAE,EAAE,OAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;KACvB,CAAC;CACH,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/client/types.ts"],"names":[],"mappings":"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"}
|
package/dist/service/index.d.ts
CHANGED
|
@@ -6,3 +6,4 @@ import { createTool, createService, createToolbox, CoreUtils, createOAuth2Tool }
|
|
|
6
6
|
export declare const defineDAINService: (config: DAINServiceConfig) => DAINService;
|
|
7
7
|
export { defineNodeService, defineDenoService, defineCloudflareService, createTool, createService, createToolbox, CoreUtils, createOAuth2Tool };
|
|
8
8
|
export * from './types';
|
|
9
|
+
export * from './oauth2Store';
|
package/dist/service/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":";AAAA,6BAA6B;;;;AAG7B,+CAAuE;AAUrE,kGAV4B,+BAAiB,OAU5B;AATnB,+CAAuE;AAUrE,kGAV4B,+BAAiB,OAU5B;AATnB,2DAAmF;AAUjF,wGAV4B,qCAAuB,OAU5B;AATzB,iCAA+F;AAU7F,2FAVO,iBAAU,OAUP;AACV,8FAXmB,oBAAa,OAWnB;AACb,8FAZkC,oBAAa,OAYlC;AACb,0FAbiD,gBAAS,OAajD;AACT,iGAd4D,uBAAgB,OAc5D;AAZX,MAAM,iBAAiB,GAAG,CAAC,MAAyB,EAAe,EAAE;IAC1E,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAC;AACrG,CAAC,CAAC;AAFW,QAAA,iBAAiB,qBAE5B;AAaF,sBAAsB;AACtB,kDAAwB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":";AAAA,6BAA6B;;;;AAG7B,+CAAuE;AAUrE,kGAV4B,+BAAiB,OAU5B;AATnB,+CAAuE;AAUrE,kGAV4B,+BAAiB,OAU5B;AATnB,2DAAmF;AAUjF,wGAV4B,qCAAuB,OAU5B;AATzB,iCAA+F;AAU7F,2FAVO,iBAAU,OAUP;AACV,8FAXmB,oBAAa,OAWnB;AACb,8FAZkC,oBAAa,OAYlC;AACb,0FAbiD,gBAAS,OAajD;AACT,iGAd4D,uBAAgB,OAc5D;AAZX,MAAM,iBAAiB,GAAG,CAAC,MAAyB,EAAe,EAAE;IAC1E,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAC;AACrG,CAAC,CAAC;AAFW,QAAA,iBAAiB,qBAE5B;AAaF,sBAAsB;AACtB,kDAAwB;AAExB,wDAA8B"}
|
package/dist/service/oauth2.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { OAuth2ProviderConfig, OAuth2Tokens } from "./types";
|
|
1
|
+
import { OAuth2ProviderConfig, OAuth2Tokens, OAuth2TokenStoreAdapter } from "./types";
|
|
2
2
|
interface StateData {
|
|
3
3
|
agentId: string;
|
|
4
4
|
provider: string;
|
|
@@ -8,7 +8,8 @@ export declare class OAuth2Handler {
|
|
|
8
8
|
private readonly providers;
|
|
9
9
|
private readonly privateKey;
|
|
10
10
|
private readonly baseUrl;
|
|
11
|
-
|
|
11
|
+
private readonly tokenStore;
|
|
12
|
+
constructor(privateKey: string, baseUrl: string, tokenStore?: OAuth2TokenStoreAdapter);
|
|
12
13
|
registerProvider(name: string, config: OAuth2ProviderConfig): void;
|
|
13
14
|
generateAuthUrl(provider: string, agentId: string): Promise<string>;
|
|
14
15
|
handleCallback(code: string, state: string): Promise<{
|
|
@@ -19,5 +20,11 @@ export declare class OAuth2Handler {
|
|
|
19
20
|
exchangeCodeForTokens(code: string, config: OAuth2ProviderConfig, provider: string): Promise<OAuth2Tokens>;
|
|
20
21
|
encodeState(data: StateData): Promise<string>;
|
|
21
22
|
decodeState(state: string): Promise<StateData>;
|
|
23
|
+
hasValidTokens(provider: string, agentId: string): Promise<boolean>;
|
|
24
|
+
getProviders(agentId: string): Promise<Array<{
|
|
25
|
+
name: string;
|
|
26
|
+
config: Omit<OAuth2ProviderConfig, 'clientSecret' | 'onSuccess'>;
|
|
27
|
+
connected: boolean;
|
|
28
|
+
}>>;
|
|
22
29
|
}
|
|
23
30
|
export {};
|
package/dist/service/oauth2.js
CHANGED
|
@@ -2,14 +2,17 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.OAuth2Handler = void 0;
|
|
4
4
|
const iron_session_1 = require("iron-session");
|
|
5
|
+
const oauth2Store_1 = require("./oauth2Store");
|
|
5
6
|
class OAuth2Handler {
|
|
6
7
|
providers;
|
|
7
8
|
privateKey;
|
|
8
9
|
baseUrl;
|
|
9
|
-
|
|
10
|
+
tokenStore;
|
|
11
|
+
constructor(privateKey, baseUrl, tokenStore) {
|
|
10
12
|
this.providers = new Map();
|
|
11
13
|
this.privateKey = privateKey;
|
|
12
14
|
this.baseUrl = baseUrl;
|
|
15
|
+
this.tokenStore = tokenStore || new oauth2Store_1.InMemoryOAuth2TokenStore();
|
|
13
16
|
}
|
|
14
17
|
registerProvider(name, config) {
|
|
15
18
|
this.providers.set(name, config);
|
|
@@ -34,14 +37,18 @@ class OAuth2Handler {
|
|
|
34
37
|
return `${providerConfig.authorizationUrl}?${params.toString()}`;
|
|
35
38
|
}
|
|
36
39
|
async handleCallback(code, state) {
|
|
37
|
-
// Decode and verify state
|
|
38
40
|
const stateData = await this.decodeState(state);
|
|
39
41
|
const providerConfig = this.providers.get(stateData.provider);
|
|
40
42
|
if (!providerConfig) {
|
|
41
43
|
throw new Error("Invalid provider");
|
|
42
44
|
}
|
|
43
|
-
// Exchange code for tokens
|
|
44
45
|
const tokens = await this.exchangeCodeForTokens(code, providerConfig, stateData.provider);
|
|
46
|
+
// Store tokens using the adapter
|
|
47
|
+
await this.tokenStore.saveTokens(stateData.agentId, stateData.provider, tokens);
|
|
48
|
+
// Call onSuccess handler if provided
|
|
49
|
+
if (providerConfig.onSuccess) {
|
|
50
|
+
await providerConfig.onSuccess(stateData.agentId, tokens);
|
|
51
|
+
}
|
|
45
52
|
return {
|
|
46
53
|
agentId: stateData.agentId,
|
|
47
54
|
provider: stateData.provider,
|
|
@@ -71,8 +78,8 @@ class OAuth2Handler {
|
|
|
71
78
|
return {
|
|
72
79
|
accessToken: data.access_token,
|
|
73
80
|
refreshToken: data.refresh_token,
|
|
74
|
-
expiresIn: data.expires_in,
|
|
75
81
|
scope: data.scope,
|
|
82
|
+
createdAt: Date.now()
|
|
76
83
|
};
|
|
77
84
|
}
|
|
78
85
|
async encodeState(data) {
|
|
@@ -81,6 +88,27 @@ class OAuth2Handler {
|
|
|
81
88
|
async decodeState(state) {
|
|
82
89
|
return await (0, iron_session_1.unsealData)(state, { password: this.privateKey });
|
|
83
90
|
}
|
|
91
|
+
async hasValidTokens(provider, agentId) {
|
|
92
|
+
const providerConfig = this.providers.get(provider);
|
|
93
|
+
if (!providerConfig)
|
|
94
|
+
throw new Error(`Unknown provider: ${provider}`);
|
|
95
|
+
return this.tokenStore.hasValidTokens(agentId, provider);
|
|
96
|
+
}
|
|
97
|
+
async getProviders(agentId) {
|
|
98
|
+
const providers = await Promise.all(Array.from(this.providers.entries()).map(async ([name, config]) => ({
|
|
99
|
+
name,
|
|
100
|
+
config: {
|
|
101
|
+
clientId: config.clientId,
|
|
102
|
+
authorizationUrl: config.authorizationUrl,
|
|
103
|
+
tokenUrl: config.tokenUrl,
|
|
104
|
+
scopes: config.scopes,
|
|
105
|
+
reason: config.reason,
|
|
106
|
+
requiredTools: config.requiredTools
|
|
107
|
+
},
|
|
108
|
+
connected: await this.tokenStore.hasValidTokens(agentId, name)
|
|
109
|
+
})));
|
|
110
|
+
return providers;
|
|
111
|
+
}
|
|
84
112
|
}
|
|
85
113
|
exports.OAuth2Handler = OAuth2Handler;
|
|
86
114
|
//# sourceMappingURL=oauth2.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth2.js","sourceRoot":"","sources":["../../src/service/oauth2.ts"],"names":[],"mappings":";;;AAIA,+CAAoD;
|
|
1
|
+
{"version":3,"file":"oauth2.js","sourceRoot":"","sources":["../../src/service/oauth2.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import Redis from "ioredis";
|
|
2
|
+
import { OAuth2TokenStoreAdapter, OAuth2Tokens } from "./types";
|
|
3
|
+
export { OAuth2TokenStoreAdapter, OAuth2Tokens };
|
|
4
|
+
export declare class InMemoryOAuth2TokenStore implements OAuth2TokenStoreAdapter {
|
|
5
|
+
private tokens;
|
|
6
|
+
constructor();
|
|
7
|
+
private getKey;
|
|
8
|
+
saveTokens(agentId: string, provider: string, tokens: OAuth2Tokens): Promise<void>;
|
|
9
|
+
getTokens(agentId: string, provider: string): Promise<OAuth2Tokens | null>;
|
|
10
|
+
hasValidTokens(agentId: string, provider: string): Promise<boolean>;
|
|
11
|
+
deleteTokens(agentId: string, provider: string): Promise<void>;
|
|
12
|
+
}
|
|
13
|
+
export declare class RedisOAuth2TokenStore implements OAuth2TokenStoreAdapter {
|
|
14
|
+
private redis;
|
|
15
|
+
private prefix;
|
|
16
|
+
constructor(redis: Redis, prefix?: string);
|
|
17
|
+
private getKey;
|
|
18
|
+
saveTokens(agentId: string, provider: string, tokens: OAuth2Tokens): Promise<void>;
|
|
19
|
+
getTokens(agentId: string, provider: string): Promise<OAuth2Tokens | null>;
|
|
20
|
+
hasValidTokens(agentId: string, provider: string): Promise<boolean>;
|
|
21
|
+
deleteTokens(agentId: string, provider: string): Promise<void>;
|
|
22
|
+
}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RedisOAuth2TokenStore = exports.InMemoryOAuth2TokenStore = void 0;
|
|
4
|
+
class InMemoryOAuth2TokenStore {
|
|
5
|
+
tokens;
|
|
6
|
+
constructor() {
|
|
7
|
+
this.tokens = new Map();
|
|
8
|
+
}
|
|
9
|
+
getKey(agentId, provider) {
|
|
10
|
+
return `${agentId}:${provider}`;
|
|
11
|
+
}
|
|
12
|
+
async saveTokens(agentId, provider, tokens) {
|
|
13
|
+
const key = this.getKey(agentId, provider);
|
|
14
|
+
this.tokens.set(key, tokens);
|
|
15
|
+
}
|
|
16
|
+
async getTokens(agentId, provider) {
|
|
17
|
+
const key = this.getKey(agentId, provider);
|
|
18
|
+
return this.tokens.get(key) || null;
|
|
19
|
+
}
|
|
20
|
+
async hasValidTokens(agentId, provider) {
|
|
21
|
+
const tokens = await this.getTokens(agentId, provider);
|
|
22
|
+
console.log("Checking tokens for", { agentId, provider, tokens });
|
|
23
|
+
return tokens !== null;
|
|
24
|
+
}
|
|
25
|
+
async deleteTokens(agentId, provider) {
|
|
26
|
+
const key = this.getKey(agentId, provider);
|
|
27
|
+
this.tokens.delete(key);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
exports.InMemoryOAuth2TokenStore = InMemoryOAuth2TokenStore;
|
|
31
|
+
// Example Redis adapter
|
|
32
|
+
class RedisOAuth2TokenStore {
|
|
33
|
+
redis;
|
|
34
|
+
prefix;
|
|
35
|
+
constructor(redis, prefix = 'oauth2:') {
|
|
36
|
+
this.redis = redis;
|
|
37
|
+
this.prefix = prefix;
|
|
38
|
+
}
|
|
39
|
+
getKey(agentId, provider) {
|
|
40
|
+
return `${this.prefix}${agentId}:${provider}`;
|
|
41
|
+
}
|
|
42
|
+
async saveTokens(agentId, provider, tokens) {
|
|
43
|
+
const key = this.getKey(agentId, provider);
|
|
44
|
+
await this.redis.set(key, JSON.stringify({
|
|
45
|
+
...tokens,
|
|
46
|
+
createdAt: Date.now()
|
|
47
|
+
}));
|
|
48
|
+
}
|
|
49
|
+
async getTokens(agentId, provider) {
|
|
50
|
+
const key = this.getKey(agentId, provider);
|
|
51
|
+
const data = await this.redis.get(key);
|
|
52
|
+
return data ? JSON.parse(data) : null;
|
|
53
|
+
}
|
|
54
|
+
async hasValidTokens(agentId, provider) {
|
|
55
|
+
const tokens = await this.getTokens(agentId, provider);
|
|
56
|
+
if (!tokens)
|
|
57
|
+
return false;
|
|
58
|
+
return true;
|
|
59
|
+
}
|
|
60
|
+
async deleteTokens(agentId, provider) {
|
|
61
|
+
const key = this.getKey(agentId, provider);
|
|
62
|
+
await this.redis.del(key);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
exports.RedisOAuth2TokenStore = RedisOAuth2TokenStore;
|
|
66
|
+
//# sourceMappingURL=oauth2Store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth2Store.js","sourceRoot":"","sources":["../../src/service/oauth2Store.ts"],"names":[],"mappings":"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"}
|
package/dist/service/server.js
CHANGED
|
@@ -332,31 +332,24 @@ function setupHttpServer(config, tools, services, toolboxes, metadata, privateKe
|
|
|
332
332
|
if (!config.oauth2?.baseUrl) {
|
|
333
333
|
throw new Error("config.oauth2.baseUrl is required for OAuth2");
|
|
334
334
|
}
|
|
335
|
-
const oauth2Handler = new oauth2_1.OAuth2Handler(bs58_1.default.encode(privateKey), config.oauth2.baseUrl);
|
|
335
|
+
const oauth2Handler = new oauth2_1.OAuth2Handler(bs58_1.default.encode(privateKey), config.oauth2.baseUrl, config.oauth2.tokenStore);
|
|
336
336
|
// Register providers
|
|
337
337
|
Object.entries(config.oauth2.providers).forEach(([name, providerConfig]) => {
|
|
338
338
|
oauth2Handler.registerProvider(name, providerConfig);
|
|
339
339
|
});
|
|
340
340
|
// OAuth callback route
|
|
341
341
|
app.get("/oauth2/callback/:provider", async (c) => {
|
|
342
|
+
if (!app.oauth2) {
|
|
343
|
+
throw new http_exception_1.HTTPException(404, { message: "OAuth2 not configured" });
|
|
344
|
+
}
|
|
342
345
|
const provider = c.req.param("provider");
|
|
343
346
|
const code = c.req.query("code");
|
|
344
347
|
const state = c.req.query("state");
|
|
345
|
-
console.log("Received OAuth callback for provider:", provider);
|
|
346
|
-
console.log("Code:", code);
|
|
347
|
-
console.log("State:", state);
|
|
348
348
|
if (!code || !state) {
|
|
349
|
-
console.log("Missing code or state");
|
|
350
349
|
throw new http_exception_1.HTTPException(400, { message: "Missing code or state" });
|
|
351
350
|
}
|
|
352
351
|
try {
|
|
353
|
-
|
|
354
|
-
console.log("Successfully handled OAuth callback");
|
|
355
|
-
// Call provider's onSuccess handler if defined
|
|
356
|
-
const providerConfig = config.oauth2?.providers[provider];
|
|
357
|
-
if (providerConfig?.onSuccess) {
|
|
358
|
-
await providerConfig.onSuccess(agentId, tokens);
|
|
359
|
-
}
|
|
352
|
+
await app.oauth2.handleCallback(code, state);
|
|
360
353
|
return c.html(`
|
|
361
354
|
<html>
|
|
362
355
|
<body>
|
|
@@ -370,8 +363,18 @@ function setupHttpServer(config, tools, services, toolboxes, metadata, privateKe
|
|
|
370
363
|
`);
|
|
371
364
|
}
|
|
372
365
|
catch (error) {
|
|
373
|
-
console.error("
|
|
374
|
-
return c.html(
|
|
366
|
+
console.error("OAuth callback error:", error);
|
|
367
|
+
return c.html(`
|
|
368
|
+
<html>
|
|
369
|
+
<body>
|
|
370
|
+
<script>
|
|
371
|
+
window.opener.postMessage({ type: 'oauth2-error', provider: '${provider}', error: '${error.message}' }, '*');
|
|
372
|
+
window.close();
|
|
373
|
+
</script>
|
|
374
|
+
<h1>Authentication failed! You can close this window.</h1>
|
|
375
|
+
</body>
|
|
376
|
+
</html>
|
|
377
|
+
`);
|
|
375
378
|
}
|
|
376
379
|
});
|
|
377
380
|
// Make oauth2Handler available to tools
|
|
@@ -395,6 +398,38 @@ function setupHttpServer(config, tools, services, toolboxes, metadata, privateKe
|
|
|
395
398
|
throw error;
|
|
396
399
|
}
|
|
397
400
|
});
|
|
401
|
+
// Get all OAuth providers and connection status
|
|
402
|
+
app.get("/oauth2/providers", async (c) => {
|
|
403
|
+
if (!app.oauth2) {
|
|
404
|
+
return c.json([]);
|
|
405
|
+
}
|
|
406
|
+
const agentInfo = await getAgentInfo(c);
|
|
407
|
+
const providers = await app.oauth2.getProviders(agentInfo.agentId);
|
|
408
|
+
// Get connection status for each provider
|
|
409
|
+
const providersWithStatus = await Promise.all(providers.map(async ({ name, config }) => ({
|
|
410
|
+
name,
|
|
411
|
+
config,
|
|
412
|
+
connected: await app.oauth2.hasValidTokens(name, agentInfo.id)
|
|
413
|
+
})));
|
|
414
|
+
return c.json(providersWithStatus);
|
|
415
|
+
});
|
|
416
|
+
// Get auth URL for specific provider
|
|
417
|
+
app.get("/oauth2/connect/:provider", async (c) => {
|
|
418
|
+
if (!app.oauth2) {
|
|
419
|
+
throw new http_exception_1.HTTPException(404, { message: "OAuth2 not configured" });
|
|
420
|
+
}
|
|
421
|
+
const provider = c.req.param("provider");
|
|
422
|
+
const agentInfo = await getAgentInfo(c);
|
|
423
|
+
try {
|
|
424
|
+
const authUrl = await app.oauth2.generateAuthUrl(provider, agentInfo.id);
|
|
425
|
+
return c.json({ authUrl });
|
|
426
|
+
}
|
|
427
|
+
catch (error) {
|
|
428
|
+
throw new http_exception_1.HTTPException(400, {
|
|
429
|
+
message: `Invalid provider: ${provider}`
|
|
430
|
+
});
|
|
431
|
+
}
|
|
432
|
+
});
|
|
398
433
|
return app;
|
|
399
434
|
}
|
|
400
435
|
//# sourceMappingURL=server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/service/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/service/server.ts"],"names":[],"mappings":";AAAA,8BAA8B;;AAsB9B,0CA2gBC;;AA/hBD,+BAAqC;AACrC,oCAAiC;AACjC,wDAAoD;AAWpD,iCAA+E;AAC/E,4DAAoE;AACpE,oFAAiD;AACjD,qCAAyC;AACzC,wDAAwB;AACxB,2CAA6C;AAE7C,SAAgB,eAAe,CAC7B,MAAyB,EACzB,KAAmB,EACnB,QAAyB,EACzB,SAA0B,EAC1B,QAAkB,EAClB,UAAsB,EACtB,QAA0B,EAC1B,SAA4B;IAE5B,MAAM,GAAG,GAAG,IAAI,WAAI,EAAE,CAAC;IAEvB,MAAM,cAAc,GAAG,IAAI,0BAAc,CACvC,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAG,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,EAClE,UAAU,EACV,MAAM,CAAC,YAAY,CACpB,CAAC;IACF,GAAG,CAAC,SAAS,GAAG,cAAc,CAAC;IAE/B,kBAAkB;IAClB,GAAG,CAAC,GAAG,CACL,GAAG,EACH,IAAA,WAAI,EAAC;QACH,MAAM,EAAE,GAAG;QACX,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC;QACzD,YAAY,EAAE;YACZ,kBAAkB;YAClB,0BAA0B;YAC1B,iBAAiB;YACjB,eAAe;YACf,gBAAgB;YAChB,kBAAkB;YAClB,oBAAoB;YACpB,cAAc;YACd,eAAe;YACf,QAAQ;YACR,QAAQ;YACR,kBAAkB;SACnB;KACF,CAAC,CACH,CAAC;IAEF,8CAA8C;IAC9C,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE;QACrB,OAAO,CAAC,CAAC,IAAI,CAAC,0BAA0B,EAAE,GAAG,EAAE;YAC7C,6BAA6B,EAAE,GAAG;YAClC,8BAA8B,EAAE,iCAAiC;YACjE,8BAA8B,EAC5B,6KAA6K;YAC/K,wBAAwB,EAAE,OAAO;SAClC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,mCAAmC;IACnC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;QAC7B,MAAM,IAAI,EAAE,CAAC;QACb,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;QACxC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,IAAA,mBAAY,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAChE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC9D,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC1D,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC/D,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,wCAAwC;IACxC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;QAC7B,4CAA4C;QAC5C,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC/C,MAAM,IAAI,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC/C,MAAM,SAAS,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAEjE,mDAAmD;QACnD,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC;YACzC,MAAM,IAAI,8BAAa,CAAC,GAAG,EAAE;gBAC3B,OAAO,EAAE,gCAAgC;aAC1C,CAAC,CAAC;QACL,CAAC;QAED,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC;QAC5B,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;QACxB,MAAM,OAAO,GAAG,IAAA,sBAAe,EAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QAEhC,IACE,CAAC,IAAA,6BAAsB,EACrB,SAAS,EACT,MAAM,EACN,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,OAAO,EACP,eAAe,CAChB,EACD,CAAC;YACD,MAAM,IAAI,8BAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;QACjE,CAAC;QAED,MAAM,IAAI,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,KAAK,UAAU,YAAY,CAAC,CAAU;QACpC,MAAM,eAAe,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;QACjE,MAAM,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAChD,MAAM,UAAU,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAEtD,OAAO;YACL,OAAO,EAAE,OAAO;YAChB,OAAO,EAAE,OAAO;YAChB,eAAe,EAAE,eAAe;YAChC,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC,WAAW,eAAe,EAAE,CAAC,CAAC,CAAC,WAAW,OAAO,EAAE;YACzE,UAAU,EAAE,UAAU;SACvB,CAAC;IACJ,CAAC;IACD,2BAA2B;IAC3B,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CACrB,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CACzE,CAAC;IAEF,oBAAoB;IACpB,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE9C,sBAAsB;IACtB,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE;QACtB,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACpC,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAA,4CAA0B,EAAC,IAAI,CAAC,KAAK,CAAC;YACnD,YAAY,EAAE,IAAA,4CAA0B,EAAC,IAAI,CAAC,MAAM,CAAC;SACtD,CAAC,CAAC,CAAC;QACJ,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE;QACzB,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAC7C,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC,CAAC,CAAC;QACJ,OAAO,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,sBAAsB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC1C,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAC3B,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CACrD,CAAC;QAEF,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC;YACxC,OAAO,CAAC,CAAC,IAAI,CAAC;gBACZ,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,IAAI,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC;aAC9C,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,8BAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;QACjE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACrC,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CACpC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;YAC/B,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,IAAI,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC;SAC9C,CAAC,CAAC,CACJ,CAAC;QACF,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE;QAC1B,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAChD,EAAE,EAAE,QAAQ,CAAC,EAAE;YACf,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,WAAW,EAAE,QAAQ,CAAC,WAAW;YACjC,IAAI,EAAE,QAAQ,CAAC,IAAI;SACpB,CAAC,CAAC,CAAC;QACJ,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,wBAAwB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC5C,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAC7B,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CACxD,CAAC;QAEF,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC;YACxC,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YACvD,OAAO,CAAC,CAAC,IAAI,CAAC;gBACZ,EAAE,EAAE,QAAQ,CAAC,EAAE;gBACf,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,WAAW,EAAE,QAAQ,CAAC,WAAW;gBACjC,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,MAAM,EAAE,UAAU;aACnB,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,8BAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAC;QAClE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACrC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;YACjC,EAAE,EAAE,QAAQ,CAAC,EAAE;YACf,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,WAAW,EAAE,QAAQ,CAAC,WAAW;YACjC,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,MAAM,EAAE,MAAM,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC;SAC5C,CAAC,CAAC,CACJ,CAAC;QACF,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,yBAAyB;IACzB,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE;QACzB,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAC7C,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;YAC5C,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;gBACxD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC;gBAChD,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;YAC1D,CAAC,CAAC;SACH,CAAC,CAAC,CAAC;QACJ,OAAO,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,0BAA0B;IAC1B,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhD,4CAA4C;IAC5C,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YACxC,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC;gBACxC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBAEhC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAC/B,EAAE,GAAG,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,EACvC,SAAS,EACT;oBACE,GAAG,EAAE,wBAAwB;oBAC7B,SAAS,EAAE,IAAI,CAAC,eAAe;iBAChC,CACF,CAAC;gBACF,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,wBAAwB,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;gBACzD,MAAM,IAAI,8BAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC,CAAC;YACrE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,2CAA2C;IAC3C,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,EAAE,0BAA0B,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YAChE,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC;gBAExC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBAEhC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAC/B,EAAE,GAAG,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,EACvC,SAAS,EACT;oBACE,GAAG,EAAE,wBAAwB;oBAC7B,SAAS,EAAE,IAAI,CAAC,eAAe;iBAChC,CACF,CAAC;gBAEF,IAAI,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;oBAC/B,EAAE,EAAE,OAAO,CAAC,EAAE;oBACd,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,WAAW,EAAE,OAAO,CAAC,WAAW;oBAChC,IAAI,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC;iBAC9C,CAAC,CAAC,CACJ,CAAC;gBACF,OAAO,CAAC,CAAC,IAAI,CAAC;oBACZ,UAAU,EAAE,MAAM;oBAClB,OAAO,EAAE,WAAW;iBACrB,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,wBAAwB,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;gBACzD,MAAM,IAAI,8BAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC,CAAC;YACrE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,0BAA0B,EAAE,CAAC,CAAC,EAAE,EAAE;QACxC,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACpC,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,WAAW,EAAE,IAAA,4BAAe,EAAC,IAAI,CAAC,KAAK,CAAC;SACzC,CAAC,CAAC,CAAC;QAEJ,OAAO,CAAC,CAAC,IAAI,CAAC;YACZ,KAAK,EAAE,QAAQ;YACf,kBAAkB,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC;SAC1E,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,oCAAoC;IACpC,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC,EAAE,EAAE;QAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC/D,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,WAAW,GAAG;gBAClB,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,WAAW,EAAE,IAAA,4CAA0B,EAAC,IAAI,CAAC,KAAK,CAAC;gBACnD,YAAY,EAAE,IAAA,4CAA0B,EAAC,IAAI,CAAC,MAAM,CAAC;aACtD,CAAC;YACF,OAAO,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,8BAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,uCAAuC;IACvC,GAAG,CAAC,GAAG,CAAC,sBAAsB,EAAE,CAAC,CAAC,EAAE,EAAE;QACpC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QACxE,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,cAAc,GAAG;gBACrB,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBACxD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC;oBAChD,OAAO,IAAI;wBACT,CAAC,CAAC;4BACE,EAAE,EAAE,IAAI,CAAC,EAAE;4BACX,IAAI,EAAE,IAAI,CAAC,IAAI;4BACf,WAAW,EAAE,IAAI,CAAC,WAAW;4BAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;4BACrB,WAAW,EAAE,IAAA,4CAA0B,EAAC,IAAI,CAAC,KAAK,CAAC;4BACnD,YAAY,EAAE,IAAA,4CAA0B,EAAC,IAAI,CAAC,MAAM,CAAC;yBACtD;wBACH,CAAC,CAAC;4BACE,EAAE,EAAE,MAAM;4BACV,IAAI,EAAE,cAAc;4BACpB,WAAW,EAAE,gBAAgB;yBAC9B,CAAC;gBACR,CAAC,CAAC;aACH,CAAC;YACF,OAAO,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,8BAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;QACjE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,uCAAuC;IACvC,GAAG,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAAC,CAAC,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QACzE,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,8BAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;QACjE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,wBAAwB;IACxB,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CACvB,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CACnE,CAAC;IAEF,kCAAkC;IAClC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC;QAC7B,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,aAAa,GAAG,IAAI,sBAAa,CACrC,cAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EACvB,MAAM,CAAC,MAAM,CAAC,OAAO,EACrB,MAAM,CAAC,MAAM,CAAC,UAAU,CACzB,CAAC;QAEF,qBAAqB;QACrB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAC7C,CAAC,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE;YACzB,aAAa,CAAC,gBAAgB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACvD,CAAC,CACF,CAAC;QAEF,uBAAuB;QACvB,GAAG,CAAC,GAAG,CAAC,4BAA4B,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YAChD,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;gBAChB,MAAM,IAAI,8BAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC,CAAC;YACrE,CAAC;YAED,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACzC,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACjC,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAEnC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACpB,MAAM,IAAI,8BAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC,CAAC;YACrE,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAE7C,OAAO,CAAC,CAAC,IAAI,CAAC;;;;iFAI2D,QAAQ;;;;;;SAMhF,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;gBAC9C,OAAO,CAAC,CAAC,IAAI,CAAC;;;;+EAIyD,QAAQ,cAAc,KAAK,CAAC,OAAO;;;;;;SAMzG,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,wCAAwC;QACxC,GAAG,CAAC,MAAM,GAAG,aAAa,CAAC;IAC7B,CAAC;IAED,2DAA2D;IAC3D,GAAG,CAAC,GAAG,CAAC,8BAA8B,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAClD,MAAM,SAAS,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC3C,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC;QAExC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,SAAU,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;YAEnF,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,8BAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;YACjE,CAAC;YAED,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,CAAC,OAAO,KAAK,gCAAgC,EAAE,CAAC;gBACvD,MAAM,IAAI,8BAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,gCAAgC,EAAE,CAAC,CAAC;YAC9E,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,gDAAgD;IAChD,GAAG,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACvC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpB,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAEnE,0CAA0C;QAC1C,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC3C,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YACzC,IAAI;YACJ,MAAM;YACN,SAAS,EAAE,MAAM,GAAG,CAAC,MAAO,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC;SAChE,CAAC,CAAC,CACJ,CAAC;QAEF,OAAO,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,qCAAqC;IACrC,GAAG,CAAC,GAAG,CAAC,2BAA2B,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC/C,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,IAAI,8BAAa,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC,CAAC;QACrE,CAAC;QAED,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC;QAExC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;YACzE,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAC7B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,8BAAa,CAAC,GAAG,EAAE;gBAC3B,OAAO,EAAE,qBAAqB,QAAQ,EAAE;aACzC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/dist/service/types.d.ts
CHANGED
|
@@ -137,6 +137,7 @@ export type DAINServiceConfig = {
|
|
|
137
137
|
pinnables?: ServicePinnable[];
|
|
138
138
|
oauth2?: OAuth2Config & {
|
|
139
139
|
baseUrl: string;
|
|
140
|
+
tokenStore?: OAuth2TokenStoreAdapter;
|
|
140
141
|
};
|
|
141
142
|
processStore?: ProcessStoreAdapter;
|
|
142
143
|
};
|
|
@@ -156,17 +157,25 @@ export type OAuth2ProviderConfig = {
|
|
|
156
157
|
authorizationUrl: string;
|
|
157
158
|
tokenUrl: string;
|
|
158
159
|
scopes: string[];
|
|
160
|
+
reason?: string;
|
|
161
|
+
requiredTools?: string[];
|
|
159
162
|
onSuccess?: (agentId: string, tokens: OAuth2Tokens) => Promise<void>;
|
|
160
163
|
};
|
|
161
164
|
export type OAuth2Config = {
|
|
162
165
|
providers: Record<string, OAuth2ProviderConfig>;
|
|
163
166
|
};
|
|
164
|
-
export
|
|
167
|
+
export interface OAuth2Tokens {
|
|
165
168
|
accessToken: string;
|
|
166
169
|
refreshToken?: string;
|
|
167
|
-
expiresIn?: number;
|
|
168
170
|
scope?: string;
|
|
169
|
-
|
|
171
|
+
createdAt?: number;
|
|
172
|
+
}
|
|
173
|
+
export interface OAuth2TokenStoreAdapter {
|
|
174
|
+
saveTokens(agentId: string, provider: string, tokens: OAuth2Tokens): Promise<void>;
|
|
175
|
+
getTokens(agentId: string, provider: string): Promise<OAuth2Tokens | null>;
|
|
176
|
+
hasValidTokens(agentId: string, provider: string): Promise<boolean>;
|
|
177
|
+
deleteTokens(agentId: string, provider: string): Promise<void>;
|
|
178
|
+
}
|
|
170
179
|
declare module 'hono' {
|
|
171
180
|
interface Hono {
|
|
172
181
|
oauth2?: OAuth2Handler;
|