@dainprotocol/service-sdk 1.0.78 → 1.0.80
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 +30 -90
- package/dist/__tests__/api-sdk.test.js.map +1 -1
- package/dist/__tests__/humanActions.test.d.ts +1 -0
- package/dist/__tests__/humanActions.test.js +221 -0
- package/dist/__tests__/humanActions.test.js.map +1 -0
- package/dist/__tests__/integration.test.js +295 -2
- package/dist/__tests__/integration.test.js.map +1 -1
- package/dist/__tests__/mealMeSchemas.test.d.ts +2 -2
- package/dist/__tests__/oauth.test.js +118 -0
- package/dist/__tests__/oauth.test.js.map +1 -1
- package/dist/client/api-sdk.js +7 -9
- package/dist/client/api-sdk.js.map +1 -1
- package/dist/client/client.d.ts +17 -1
- package/dist/client/client.js +20 -0
- package/dist/client/client.js.map +1 -1
- package/dist/client/types.d.ts +109 -0
- package/dist/client/types.js +28 -1
- package/dist/client/types.js.map +1 -1
- package/dist/service/oauth2.d.ts +4 -1
- package/dist/service/oauth2.js +57 -20
- package/dist/service/oauth2.js.map +1 -1
- package/dist/service/processes.d.ts +79 -3
- package/dist/service/processes.js +238 -1
- package/dist/service/processes.js.map +1 -1
- package/dist/service/server.js +85 -1
- package/dist/service/server.js.map +1 -1
- package/dist/service/service.js +5 -1
- package/dist/service/service.js.map +1 -1
- package/dist/service/types.d.ts +18 -3
- package/package.json +1 -1
|
@@ -5,8 +5,11 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const nodeService_1 = require("../service/nodeService");
|
|
6
6
|
const core_1 = require("@/service/core");
|
|
7
7
|
const zod_1 = require("zod");
|
|
8
|
+
const supertest_1 = tslib_1.__importDefault(require("supertest"));
|
|
8
9
|
const ed25519_1 = require("@noble/curves/ed25519");
|
|
9
10
|
const bs58_1 = tslib_1.__importDefault(require("bs58"));
|
|
11
|
+
const convertToVercelTool_1 = require("@/lib/convertToVercelTool");
|
|
12
|
+
const schemaStructure_1 = require("@/lib/schemaStructure");
|
|
10
13
|
const client_auth_1 = require("@/client/client-auth");
|
|
11
14
|
const client_1 = require("@/client/client");
|
|
12
15
|
describe("DAIN Framework Integration", () => {
|
|
@@ -54,6 +57,35 @@ describe("DAIN Framework Integration", () => {
|
|
|
54
57
|
};
|
|
55
58
|
},
|
|
56
59
|
});
|
|
60
|
+
// Add a new tool with confirmation for testing
|
|
61
|
+
const confirmationTool = (0, nodeService_1.createTool)({
|
|
62
|
+
id: "confirmation-test-tool",
|
|
63
|
+
name: "Confirmation Test Tool",
|
|
64
|
+
description: "Tool that requires confirmation",
|
|
65
|
+
input: zod_1.z.object({ action: zod_1.z.string() }),
|
|
66
|
+
output: zod_1.z.object({ result: zod_1.z.string() }),
|
|
67
|
+
suggestConfirmation: true,
|
|
68
|
+
suggestConfirmationUI: async (input) => ({
|
|
69
|
+
success: input.action !== "dangerous",
|
|
70
|
+
ui: {
|
|
71
|
+
type: "confirmation",
|
|
72
|
+
title: "Confirm Action",
|
|
73
|
+
message: `Are you sure you want to perform: ${input.action}?`,
|
|
74
|
+
fields: [
|
|
75
|
+
{
|
|
76
|
+
type: "text",
|
|
77
|
+
label: "Additional Notes",
|
|
78
|
+
placeholder: "Add any notes here..."
|
|
79
|
+
}
|
|
80
|
+
]
|
|
81
|
+
}
|
|
82
|
+
}),
|
|
83
|
+
handler: async ({ action }) => ({
|
|
84
|
+
text: `Performed action: ${action}`,
|
|
85
|
+
data: { result: `completed-${action}` },
|
|
86
|
+
ui: null,
|
|
87
|
+
}),
|
|
88
|
+
});
|
|
57
89
|
const weatherService = (0, nodeService_1.createService)({
|
|
58
90
|
id: "weather-service",
|
|
59
91
|
name: "Weather Service",
|
|
@@ -112,7 +144,7 @@ describe("DAIN Framework Integration", () => {
|
|
|
112
144
|
privateKey: bs58_1.default.encode(privateKey),
|
|
113
145
|
},
|
|
114
146
|
services: [weatherService],
|
|
115
|
-
tools: [weatherTool, extraDataTool],
|
|
147
|
+
tools: [weatherTool, extraDataTool, confirmationTool],
|
|
116
148
|
toolboxes: [weatherToolbox],
|
|
117
149
|
contexts: [weatherContext],
|
|
118
150
|
pinnables: [weatherPinnable],
|
|
@@ -124,7 +156,221 @@ describe("DAIN Framework Integration", () => {
|
|
|
124
156
|
afterAll(async () => {
|
|
125
157
|
await server.shutdown();
|
|
126
158
|
});
|
|
127
|
-
|
|
159
|
+
test("Service metadata is correct", () => {
|
|
160
|
+
const metadata = dainService.getMetadata();
|
|
161
|
+
expect(metadata.title).toBe("Weather DAIN Service");
|
|
162
|
+
expect(metadata.tags).toContain("weather");
|
|
163
|
+
});
|
|
164
|
+
test("Service has correct tools and services", () => {
|
|
165
|
+
expect(dainService.getTools()).toHaveLength(3);
|
|
166
|
+
expect(dainService.getServices()).toHaveLength(1);
|
|
167
|
+
expect(dainService.getToolboxes()).toHaveLength(1);
|
|
168
|
+
});
|
|
169
|
+
test("Can call weather tool with valid signature", async () => {
|
|
170
|
+
const app = server.address();
|
|
171
|
+
const port = app.port;
|
|
172
|
+
const response = await dainConnection.makeRequest("POST", "/tools/get-weather", { city: "New York" });
|
|
173
|
+
expect(response).toEqual({
|
|
174
|
+
data: { temperature: 22, condition: "Sunny" },
|
|
175
|
+
text: "The weather in New York is Sunny with a temperature of 22°C.",
|
|
176
|
+
ui: null,
|
|
177
|
+
});
|
|
178
|
+
});
|
|
179
|
+
test("Rejects call with invalid signature", async () => {
|
|
180
|
+
const app = server.address();
|
|
181
|
+
const port = app.port;
|
|
182
|
+
const method = "POST";
|
|
183
|
+
const path = "/tools/get-weather";
|
|
184
|
+
const body = JSON.stringify({ city: "New York" });
|
|
185
|
+
const headers = {
|
|
186
|
+
"Content-Type": "application/json",
|
|
187
|
+
"X-DAIN-Address": address,
|
|
188
|
+
};
|
|
189
|
+
const timestamp = new Date().toISOString();
|
|
190
|
+
headers["X-DAIN-Timestamp"] = timestamp;
|
|
191
|
+
const response = await (0, supertest_1.default)(`http://localhost:${port}`)
|
|
192
|
+
.post("/tools/get-weather")
|
|
193
|
+
.set("X-DAIN-Signature", "1231232113121")
|
|
194
|
+
.set("X-DAIN-Address", address)
|
|
195
|
+
.set("X-DAIN-Timestamp", timestamp)
|
|
196
|
+
.send({ city: "New York" });
|
|
197
|
+
expect(response.status).toBe(401);
|
|
198
|
+
});
|
|
199
|
+
describe("HTTP Output to Vercel AI Tool", () => {
|
|
200
|
+
it("should convert a DAIN tool to HTTP output and then to Vercel AI tool format", () => {
|
|
201
|
+
// Simulate a DAIN tool
|
|
202
|
+
const dainTool = {
|
|
203
|
+
id: "get-weather",
|
|
204
|
+
name: "Get Weather",
|
|
205
|
+
description: "Fetches weather for a city",
|
|
206
|
+
pricing: { pricePerUse: 0.01, currency: "USD" },
|
|
207
|
+
input: zod_1.z.object({
|
|
208
|
+
city: zod_1.z.string().describe("The name of the city"),
|
|
209
|
+
country: zod_1.z.string().optional().describe("The country of the city"),
|
|
210
|
+
}),
|
|
211
|
+
output: zod_1.z.object({
|
|
212
|
+
temperature: zod_1.z.number(),
|
|
213
|
+
condition: zod_1.z.string(),
|
|
214
|
+
}),
|
|
215
|
+
handler: async () => ({ temperature: 22, condition: "Sunny" }),
|
|
216
|
+
};
|
|
217
|
+
// Simulate the HTTP output
|
|
218
|
+
const httpOutput = {
|
|
219
|
+
id: dainTool.id,
|
|
220
|
+
name: dainTool.name,
|
|
221
|
+
description: dainTool.description,
|
|
222
|
+
pricing: dainTool.pricing,
|
|
223
|
+
inputSchema: (0, schemaStructure_1.getDetailedSchemaStructure)(dainTool.input),
|
|
224
|
+
outputSchema: (0, schemaStructure_1.getDetailedSchemaStructure)(dainTool.output),
|
|
225
|
+
};
|
|
226
|
+
// Convert HTTP output to Vercel AI tool
|
|
227
|
+
const vercelAITool = (0, convertToVercelTool_1.convertHttpToolToVercelAITool)(httpOutput);
|
|
228
|
+
// Assertions
|
|
229
|
+
expect(vercelAITool.name).toBe("get-weather");
|
|
230
|
+
expect(vercelAITool.description).toBe("Fetches weather for a city");
|
|
231
|
+
expect(vercelAITool.parameters).toBeInstanceOf(zod_1.z.ZodObject);
|
|
232
|
+
const params = vercelAITool.parameters.safeParse({
|
|
233
|
+
city: "New York",
|
|
234
|
+
country: "USA",
|
|
235
|
+
});
|
|
236
|
+
expect(params.success).toBe(true);
|
|
237
|
+
// Use Zod's built-in methods to inspect the schema
|
|
238
|
+
const schemaShape = vercelAITool.parameters._def.shape();
|
|
239
|
+
expect(schemaShape.city.description).toBe("The name of the city");
|
|
240
|
+
expect(schemaShape.country.description).toBe("The country of the city");
|
|
241
|
+
// Test that the optional field is correctly preserved
|
|
242
|
+
const paramsWithoutCountry = vercelAITool.parameters.safeParse({
|
|
243
|
+
city: "Tokyo",
|
|
244
|
+
});
|
|
245
|
+
expect(paramsWithoutCountry.success).toBe(true);
|
|
246
|
+
// Additional check for the optional nature of the country field
|
|
247
|
+
expect(schemaShape.country instanceof zod_1.z.ZodOptional).toBe(true);
|
|
248
|
+
});
|
|
249
|
+
});
|
|
250
|
+
it("Can List Contexts", async () => {
|
|
251
|
+
const app = server.address();
|
|
252
|
+
const port = app.port;
|
|
253
|
+
const response = await dainConnection.makeRequest("GET", "/contexts", {});
|
|
254
|
+
expect(response).toEqual([
|
|
255
|
+
{
|
|
256
|
+
id: "weather-context",
|
|
257
|
+
name: "Weather Context",
|
|
258
|
+
description: "Context for weather data",
|
|
259
|
+
},
|
|
260
|
+
]);
|
|
261
|
+
});
|
|
262
|
+
it("Can call weather context with valid signature", async () => {
|
|
263
|
+
const app = server.address();
|
|
264
|
+
const port = app.port;
|
|
265
|
+
const response = await dainConnection.makeRequest("GET", "/contexts/weather-context", {});
|
|
266
|
+
expect(response).toEqual({
|
|
267
|
+
id: "weather-context",
|
|
268
|
+
name: "Weather Context",
|
|
269
|
+
description: "Context for weather data",
|
|
270
|
+
data: "Weather data",
|
|
271
|
+
});
|
|
272
|
+
});
|
|
273
|
+
it("Can get all tools as json schema", async () => {
|
|
274
|
+
const app = server.address();
|
|
275
|
+
const port = app.port;
|
|
276
|
+
const response = await dainConnection.makeRequest("GET", "/getAllToolsAsJsonSchema", {});
|
|
277
|
+
console.log("JSON SCHEMA", JSON.stringify(response, null, 2));
|
|
278
|
+
expect(response).toEqual({
|
|
279
|
+
"tools": [
|
|
280
|
+
{
|
|
281
|
+
"id": "get-weather",
|
|
282
|
+
"name": "Get Weather",
|
|
283
|
+
"description": "Fetches weather for a city",
|
|
284
|
+
"inputSchema": {
|
|
285
|
+
"type": "object",
|
|
286
|
+
"properties": {
|
|
287
|
+
"city": {
|
|
288
|
+
"type": "string"
|
|
289
|
+
}
|
|
290
|
+
},
|
|
291
|
+
"required": [
|
|
292
|
+
"city"
|
|
293
|
+
],
|
|
294
|
+
"additionalProperties": false,
|
|
295
|
+
"$schema": "http://json-schema.org/draft-07/schema#"
|
|
296
|
+
},
|
|
297
|
+
"outputSchema": {
|
|
298
|
+
"type": "object",
|
|
299
|
+
"properties": {
|
|
300
|
+
"temperature": {
|
|
301
|
+
"type": "number"
|
|
302
|
+
},
|
|
303
|
+
"condition": {
|
|
304
|
+
"type": "string"
|
|
305
|
+
}
|
|
306
|
+
},
|
|
307
|
+
"required": [
|
|
308
|
+
"temperature",
|
|
309
|
+
"condition"
|
|
310
|
+
],
|
|
311
|
+
"additionalProperties": false,
|
|
312
|
+
"$schema": "http://json-schema.org/draft-07/schema#"
|
|
313
|
+
}
|
|
314
|
+
},
|
|
315
|
+
{
|
|
316
|
+
"id": "extra-data-tool",
|
|
317
|
+
"name": "Extra Data Tool",
|
|
318
|
+
"description": "Tool to test extra data",
|
|
319
|
+
"inputSchema": {
|
|
320
|
+
"type": "object",
|
|
321
|
+
"properties": {
|
|
322
|
+
"cool": {
|
|
323
|
+
"type": "string"
|
|
324
|
+
}
|
|
325
|
+
},
|
|
326
|
+
"required": [
|
|
327
|
+
"cool"
|
|
328
|
+
],
|
|
329
|
+
"additionalProperties": false,
|
|
330
|
+
"$schema": "http://json-schema.org/draft-07/schema#"
|
|
331
|
+
},
|
|
332
|
+
"outputSchema": {
|
|
333
|
+
"$schema": "http://json-schema.org/draft-07/schema#"
|
|
334
|
+
}
|
|
335
|
+
},
|
|
336
|
+
{
|
|
337
|
+
"id": "confirmation-test-tool",
|
|
338
|
+
"name": "Confirmation Test Tool",
|
|
339
|
+
"description": "Tool that requires confirmation",
|
|
340
|
+
"inputSchema": {
|
|
341
|
+
"type": "object",
|
|
342
|
+
"properties": {
|
|
343
|
+
"action": {
|
|
344
|
+
"type": "string"
|
|
345
|
+
}
|
|
346
|
+
},
|
|
347
|
+
"required": [
|
|
348
|
+
"action"
|
|
349
|
+
],
|
|
350
|
+
"additionalProperties": false,
|
|
351
|
+
"$schema": "http://json-schema.org/draft-07/schema#"
|
|
352
|
+
},
|
|
353
|
+
"outputSchema": {
|
|
354
|
+
"type": "object",
|
|
355
|
+
"properties": {
|
|
356
|
+
"result": {
|
|
357
|
+
"type": "string"
|
|
358
|
+
}
|
|
359
|
+
},
|
|
360
|
+
"required": [
|
|
361
|
+
"result"
|
|
362
|
+
],
|
|
363
|
+
"additionalProperties": false,
|
|
364
|
+
"$schema": "http://json-schema.org/draft-07/schema#"
|
|
365
|
+
},
|
|
366
|
+
"suggestConfirmation": true
|
|
367
|
+
}
|
|
368
|
+
],
|
|
369
|
+
"reccomendedPrompts": [
|
|
370
|
+
"Use these tools for weather-related tasks"
|
|
371
|
+
]
|
|
372
|
+
});
|
|
373
|
+
});
|
|
128
374
|
describe("Pinnables", () => {
|
|
129
375
|
it("Can list pinnables", async () => {
|
|
130
376
|
const response = await dainConnection.getPinnables();
|
|
@@ -136,6 +382,7 @@ describe("DAIN Framework Integration", () => {
|
|
|
136
382
|
name: "Weather Info",
|
|
137
383
|
description: "Displays current weather information",
|
|
138
384
|
icon: "☀️",
|
|
385
|
+
size: "small",
|
|
139
386
|
});
|
|
140
387
|
});
|
|
141
388
|
it("Can get a specific pinnable", async () => {
|
|
@@ -147,6 +394,7 @@ describe("DAIN Framework Integration", () => {
|
|
|
147
394
|
name: "Weather Info",
|
|
148
395
|
description: "Displays current weather information",
|
|
149
396
|
icon: "☀️",
|
|
397
|
+
size: "small",
|
|
150
398
|
widget: {
|
|
151
399
|
text: "Current weather: Sunny, 22°C",
|
|
152
400
|
data: { temperature: 22, condition: "Sunny" },
|
|
@@ -175,6 +423,7 @@ describe("DAIN Framework Integration", () => {
|
|
|
175
423
|
id: "weather-pinnable",
|
|
176
424
|
type: "widget",
|
|
177
425
|
label: "Weather Widget",
|
|
426
|
+
size: "small",
|
|
178
427
|
name: "Weather Info",
|
|
179
428
|
description: "Displays current weather information",
|
|
180
429
|
icon: "☀️",
|
|
@@ -189,5 +438,49 @@ describe("DAIN Framework Integration", () => {
|
|
|
189
438
|
await expect(dainConnection.getPinnable("non-existent-pinnable")).rejects.toThrow();
|
|
190
439
|
});
|
|
191
440
|
});
|
|
441
|
+
// Add new test suite for confirmation functionality
|
|
442
|
+
describe("Tool Confirmation", () => {
|
|
443
|
+
it("Tool metadata includes confirmation settings", async () => {
|
|
444
|
+
const tool = await dainConnection.getTool("confirmation-test-tool");
|
|
445
|
+
expect(tool.suggestConfirmation).toBe(true);
|
|
446
|
+
});
|
|
447
|
+
it("Can get confirmation UI for a tool", async () => {
|
|
448
|
+
const confirmation = await dainConnection.getToolConfirmation("confirmation-test-tool", {
|
|
449
|
+
action: "test-action"
|
|
450
|
+
});
|
|
451
|
+
expect(confirmation).toEqual({
|
|
452
|
+
success: true,
|
|
453
|
+
ui: {
|
|
454
|
+
type: "confirmation",
|
|
455
|
+
title: "Confirm Action",
|
|
456
|
+
message: "Are you sure you want to perform: test-action?",
|
|
457
|
+
fields: [
|
|
458
|
+
{
|
|
459
|
+
type: "text",
|
|
460
|
+
label: "Additional Notes",
|
|
461
|
+
placeholder: "Add any notes here..."
|
|
462
|
+
}
|
|
463
|
+
]
|
|
464
|
+
}
|
|
465
|
+
});
|
|
466
|
+
});
|
|
467
|
+
it("Returns success: false for dangerous actions", async () => {
|
|
468
|
+
const confirmation = await dainConnection.getToolConfirmation("confirmation-test-tool", {
|
|
469
|
+
action: "dangerous"
|
|
470
|
+
});
|
|
471
|
+
expect(confirmation.success).toBe(false);
|
|
472
|
+
});
|
|
473
|
+
it("Returns default success response for tools without confirmation UI", async () => {
|
|
474
|
+
const confirmation = await dainConnection.getToolConfirmation("get-weather", {
|
|
475
|
+
city: "London"
|
|
476
|
+
});
|
|
477
|
+
expect(confirmation).toEqual({
|
|
478
|
+
success: true
|
|
479
|
+
});
|
|
480
|
+
});
|
|
481
|
+
it("Rejects confirmation request for non-existent tool", async () => {
|
|
482
|
+
await expect(dainConnection.getToolConfirmation("non-existent-tool", {})).rejects.toThrow();
|
|
483
|
+
});
|
|
484
|
+
});
|
|
192
485
|
});
|
|
193
486
|
//# sourceMappingURL=integration.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integration.test.js","sourceRoot":"","sources":["../../src/__tests__/integration.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"integration.test.js","sourceRoot":"","sources":["../../src/__tests__/integration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -133,8 +133,8 @@ export declare const searchStoreOptionsSchema: z.ZodObject<{
|
|
|
133
133
|
use_new_db: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
|
|
134
134
|
}, "strip", z.ZodTypeAny, {
|
|
135
135
|
sort?: string;
|
|
136
|
-
query?: string;
|
|
137
136
|
timeout?: number;
|
|
137
|
+
query?: string;
|
|
138
138
|
store_type?: "" | "restaurant" | "grocery";
|
|
139
139
|
pickup?: boolean;
|
|
140
140
|
budget?: number;
|
|
@@ -164,8 +164,8 @@ export declare const searchStoreOptionsSchema: z.ZodObject<{
|
|
|
164
164
|
use_new_db?: boolean;
|
|
165
165
|
}, {
|
|
166
166
|
sort?: string;
|
|
167
|
-
query?: string;
|
|
168
167
|
timeout?: number;
|
|
168
|
+
query?: string;
|
|
169
169
|
store_type?: "" | "restaurant" | "grocery";
|
|
170
170
|
pickup?: boolean;
|
|
171
171
|
budget?: number;
|
|
@@ -251,5 +251,123 @@ describe("OAuth Integration", () => {
|
|
|
251
251
|
expect(requirements.providers[0].connected).toBe(true);
|
|
252
252
|
});
|
|
253
253
|
});
|
|
254
|
+
describe("PKCE and Basic Auth", () => {
|
|
255
|
+
let pkceServer;
|
|
256
|
+
let pkceSdk;
|
|
257
|
+
beforeAll(async () => {
|
|
258
|
+
// Create mock OAuth provider with PKCE support
|
|
259
|
+
const mockPKCEApp = new hono_1.Hono();
|
|
260
|
+
// Add auth endpoint that validates PKCE parameters
|
|
261
|
+
mockPKCEApp.get('/auth', (c) => {
|
|
262
|
+
const codeChallenge = c.req.query('code_challenge');
|
|
263
|
+
const codeChallengeMethod = c.req.query('code_challenge_method');
|
|
264
|
+
// Verify PKCE parameters are present
|
|
265
|
+
if (!codeChallenge || codeChallengeMethod !== 'S256') {
|
|
266
|
+
return c.json({ error: 'invalid_request' }, 400);
|
|
267
|
+
}
|
|
268
|
+
return c.redirect(c.req.query('redirect_uri') +
|
|
269
|
+
'?code=pkce-test-code&state=' + c.req.query('state'));
|
|
270
|
+
});
|
|
271
|
+
// Add token endpoint that validates PKCE code verifier and Basic Auth
|
|
272
|
+
mockPKCEApp.post('/token', async (c) => {
|
|
273
|
+
const authHeader = c.req.header('Authorization');
|
|
274
|
+
const body = await c.req.parseBody();
|
|
275
|
+
// Verify Basic Auth
|
|
276
|
+
const expectedAuth = 'Basic ' + Buffer.from('pkce-client-id:pkce-client-secret').toString('base64');
|
|
277
|
+
if (authHeader !== expectedAuth) {
|
|
278
|
+
return c.json({ error: 'invalid_client' }, 401);
|
|
279
|
+
}
|
|
280
|
+
// Verify PKCE code verifier is present
|
|
281
|
+
if (!body.code_verifier) {
|
|
282
|
+
return c.json({ error: 'invalid_request' }, 400);
|
|
283
|
+
}
|
|
284
|
+
return c.json({
|
|
285
|
+
access_token: 'pkce_access_token',
|
|
286
|
+
token_type: 'Bearer',
|
|
287
|
+
expires_in: 3600,
|
|
288
|
+
refresh_token: 'pkce_refresh_token',
|
|
289
|
+
scope: 'pkce_scope',
|
|
290
|
+
});
|
|
291
|
+
});
|
|
292
|
+
const mockPKCEServer = (0, node_server_1.serve)({
|
|
293
|
+
fetch: mockPKCEApp.fetch,
|
|
294
|
+
port: 4456
|
|
295
|
+
});
|
|
296
|
+
// Create service with PKCE and Basic Auth enabled
|
|
297
|
+
const pkceService = (0, nodeService_1.defineDAINService)({
|
|
298
|
+
metadata: {
|
|
299
|
+
title: "PKCE OAuth Test Service",
|
|
300
|
+
description: "Testing PKCE and Basic Auth",
|
|
301
|
+
version: "1.0.0",
|
|
302
|
+
author: "Test Author",
|
|
303
|
+
tags: ["test", "oauth", "pkce"],
|
|
304
|
+
},
|
|
305
|
+
identity: {
|
|
306
|
+
publicKey: bs58_1.default.encode(publicKey),
|
|
307
|
+
privateKey: bs58_1.default.encode(privateKey),
|
|
308
|
+
agentId: "test-agent",
|
|
309
|
+
orgId: "test-org",
|
|
310
|
+
},
|
|
311
|
+
oauth2: {
|
|
312
|
+
baseUrl: "http://localhost:4424",
|
|
313
|
+
tokenStore: new oauth2Store_1.InMemoryOAuth2TokenStore(),
|
|
314
|
+
providers: {
|
|
315
|
+
pkce_provider: {
|
|
316
|
+
clientId: "pkce-client-id",
|
|
317
|
+
clientSecret: "pkce-client-secret",
|
|
318
|
+
authorizationUrl: "http://localhost:4456/auth",
|
|
319
|
+
tokenUrl: "http://localhost:4456/token",
|
|
320
|
+
scopes: ["pkce_scope"],
|
|
321
|
+
reason: "Testing PKCE flow",
|
|
322
|
+
requiredTools: ["pkce-test-tool"],
|
|
323
|
+
usePKCE: true,
|
|
324
|
+
useBasicAuth: true,
|
|
325
|
+
},
|
|
326
|
+
},
|
|
327
|
+
},
|
|
328
|
+
tools: [
|
|
329
|
+
(0, nodeService_1.createTool)({
|
|
330
|
+
id: "pkce-test-tool",
|
|
331
|
+
name: "PKCE Test Tool",
|
|
332
|
+
description: "Tool for testing PKCE flow",
|
|
333
|
+
input: zod_1.z.object({}),
|
|
334
|
+
output: zod_1.z.object({ success: zod_1.z.boolean() }),
|
|
335
|
+
handler: async () => ({
|
|
336
|
+
text: "PKCE test",
|
|
337
|
+
data: { success: true },
|
|
338
|
+
ui: null,
|
|
339
|
+
}),
|
|
340
|
+
}),
|
|
341
|
+
],
|
|
342
|
+
});
|
|
343
|
+
pkceServer = await pkceService.startNode({ port: 4424 });
|
|
344
|
+
pkceSdk = new api_sdk_1.DainSDK("http://localhost:4424", agentAuth);
|
|
345
|
+
await pkceSdk.initialize();
|
|
346
|
+
});
|
|
347
|
+
afterAll(async () => {
|
|
348
|
+
if (pkceServer) {
|
|
349
|
+
await pkceServer.shutdown();
|
|
350
|
+
}
|
|
351
|
+
});
|
|
352
|
+
it("should generate auth URL with PKCE parameters", async () => {
|
|
353
|
+
const url = await pkceSdk.getOAuthConnectUrl("pkce_provider");
|
|
354
|
+
const urlParams = new URL(url).searchParams;
|
|
355
|
+
expect(urlParams.get('code_challenge')).toBeTruthy();
|
|
356
|
+
expect(urlParams.get('code_challenge_method')).toBe('S256');
|
|
357
|
+
});
|
|
358
|
+
it("should complete PKCE flow with Basic Auth", async () => {
|
|
359
|
+
const url = await pkceSdk.getOAuthConnectUrl("pkce_provider");
|
|
360
|
+
const urlParams = new URL(url).searchParams;
|
|
361
|
+
const state = urlParams.get('state');
|
|
362
|
+
// Simulate callback with auth code
|
|
363
|
+
const response = await fetch(`http://localhost:4424/oauth2/callback/pkce_provider?code=pkce-test-code&state=${state}`);
|
|
364
|
+
expect(response.status).toBe(200);
|
|
365
|
+
// Wait for token processing
|
|
366
|
+
await new Promise(resolve => setTimeout(resolve, 100));
|
|
367
|
+
// Verify connection status
|
|
368
|
+
const requirements = await pkceSdk.getToolOAuthRequirements("pkce-test-tool");
|
|
369
|
+
expect(requirements.providers[0].connected).toBe(true);
|
|
370
|
+
});
|
|
371
|
+
});
|
|
254
372
|
});
|
|
255
373
|
//# sourceMappingURL=oauth.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.test.js","sourceRoot":"","sources":["../../src/__tests__/oauth.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauth.test.js","sourceRoot":"","sources":["../../src/__tests__/oauth.test.ts"],"names":[],"mappings":"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"}
|
package/dist/client/api-sdk.js
CHANGED
|
@@ -57,10 +57,9 @@ class DainSDK {
|
|
|
57
57
|
docs += `**Scopes Required:** ${provider.config.scopes.join(', ')}\n\n`;
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
|
-
// Document all available tools
|
|
60
|
+
// Document all available tools
|
|
61
61
|
docs += `## Available Tools\n\n`;
|
|
62
|
-
const
|
|
63
|
-
for (const tool of tools) {
|
|
62
|
+
for (const tool of this.toolsCache.values()) {
|
|
64
63
|
docs += `### ${tool.name}\n\n`;
|
|
65
64
|
docs += `**Method Name:** \`${this.sanitizeMethodName(tool.name)}\`\n\n`;
|
|
66
65
|
docs += `${tool.description}\n\n`;
|
|
@@ -68,12 +67,12 @@ class DainSDK {
|
|
|
68
67
|
docs += `**Input Schema:**\n\`\`\`typescript\ntype Input = ${this.jsonSchemaToTypeScript(tool.inputSchema)};\n\`\`\`\n\n`;
|
|
69
68
|
// Document output schema
|
|
70
69
|
docs += `**Output Schema:**\n\`\`\`typescript\ntype Output = ${this.jsonSchemaToTypeScript(tool.outputSchema)};\n\`\`\`\n\n`;
|
|
71
|
-
// Add example usage
|
|
70
|
+
// Add example usage
|
|
72
71
|
docs += `**Example Usage:**\n\`\`\`typescript\nconst result = await sdk.${this.sanitizeMethodName(tool.name)}(${this.generateTypedExample(tool.inputSchema)});\n\n`;
|
|
73
72
|
docs += `// Result type:\ntype Result = {\n`;
|
|
74
|
-
docs += ` data: Output
|
|
75
|
-
docs += ` text: string
|
|
76
|
-
docs += ` ui: any
|
|
73
|
+
docs += ` data: Output;\n`;
|
|
74
|
+
docs += ` text: string;\n`;
|
|
75
|
+
docs += ` ui: any;\n`;
|
|
77
76
|
docs += `};\n\`\`\`\n\n`;
|
|
78
77
|
// Add OAuth requirements for this tool
|
|
79
78
|
const oauthReqs = await this.getToolOAuthRequirements(tool.id);
|
|
@@ -342,8 +341,7 @@ class DainSDK {
|
|
|
342
341
|
});
|
|
343
342
|
return `{\n${properties.join(';\n')};\n${indent}}`;
|
|
344
343
|
case 'array':
|
|
345
|
-
|
|
346
|
-
return `${itemType}[]`;
|
|
344
|
+
return `${this.jsonSchemaToTypeScript(schema.items, indent)}[]`;
|
|
347
345
|
case 'string':
|
|
348
346
|
if (schema.enum) {
|
|
349
347
|
return schema.enum.map(v => `'${v}'`).join(' | ');
|