@dainprotocol/service-sdk 2.0.46 → 2.0.48-beta.0
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.d.ts +1 -0
- package/dist/__tests__/api-sdk.test.js +102 -0
- package/dist/__tests__/api-sdk.test.js.map +1 -0
- package/dist/__tests__/auth.test.d.ts +1 -0
- package/dist/__tests__/auth.test.js +110 -0
- package/dist/__tests__/auth.test.js.map +1 -0
- package/dist/__tests__/citations-plugin.test.d.ts +1 -0
- package/dist/__tests__/citations-plugin.test.js +491 -0
- package/dist/__tests__/citations-plugin.test.js.map +1 -0
- package/dist/__tests__/context-behavior.test.d.ts +1 -0
- package/dist/__tests__/context-behavior.test.js +290 -0
- package/dist/__tests__/context-behavior.test.js.map +1 -0
- package/dist/__tests__/convertToVercelTool.test.d.ts +1 -0
- package/dist/__tests__/convertToVercelTool.test.js +527 -0
- package/dist/__tests__/convertToVercelTool.test.js.map +1 -0
- package/dist/__tests__/core.test.d.ts +1 -0
- package/dist/__tests__/core.test.js +154 -0
- package/dist/__tests__/core.test.js.map +1 -0
- package/dist/__tests__/crypto-plugin.test.d.ts +1 -0
- package/dist/__tests__/crypto-plugin.test.js +694 -0
- package/dist/__tests__/crypto-plugin.test.js.map +1 -0
- 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.d.ts +1 -0
- package/dist/__tests__/integration.test.js +1573 -0
- package/dist/__tests__/integration.test.js.map +1 -0
- package/dist/__tests__/mealMeSchemas.test.d.ts +576 -0
- package/dist/__tests__/mealMeSchemas.test.js +627 -0
- package/dist/__tests__/mealMeSchemas.test.js.map +1 -0
- package/dist/__tests__/oauth-context-simple.test.d.ts +1 -0
- package/dist/__tests__/oauth-context-simple.test.js +90 -0
- package/dist/__tests__/oauth-context-simple.test.js.map +1 -0
- package/dist/__tests__/oauth-context.test.d.ts +1 -0
- package/dist/__tests__/oauth-context.test.js +282 -0
- package/dist/__tests__/oauth-context.test.js.map +1 -0
- package/dist/__tests__/oauth.test.d.ts +1 -0
- package/dist/__tests__/oauth.test.js +378 -0
- package/dist/__tests__/oauth.test.js.map +1 -0
- package/dist/__tests__/oauth2-client-context.test.d.ts +1 -0
- package/dist/__tests__/oauth2-client-context.test.js +165 -0
- package/dist/__tests__/oauth2-client-context.test.js.map +1 -0
- package/dist/__tests__/oauth2-client-integration.test.d.ts +1 -0
- package/dist/__tests__/oauth2-client-integration.test.js +182 -0
- package/dist/__tests__/oauth2-client-integration.test.js.map +1 -0
- package/dist/__tests__/oauth2-client-simple.test.d.ts +1 -0
- package/dist/__tests__/oauth2-client-simple.test.js +144 -0
- package/dist/__tests__/oauth2-client-simple.test.js.map +1 -0
- package/dist/__tests__/oauth2-context.test.d.ts +1 -0
- package/dist/__tests__/oauth2-context.test.js +201 -0
- package/dist/__tests__/oauth2-context.test.js.map +1 -0
- package/dist/__tests__/oauth2-datasource.test.d.ts +1 -0
- package/dist/__tests__/oauth2-datasource.test.js +251 -0
- package/dist/__tests__/oauth2-datasource.test.js.map +1 -0
- package/dist/__tests__/plugin.test.d.ts +1 -0
- package/dist/__tests__/plugin.test.js +900 -0
- package/dist/__tests__/plugin.test.js.map +1 -0
- package/dist/__tests__/processes.test.d.ts +1 -0
- package/dist/__tests__/processes.test.js +239 -0
- package/dist/__tests__/processes.test.js.map +1 -0
- package/dist/__tests__/streaming.test.d.ts +1 -0
- package/dist/__tests__/streaming.test.js +592 -0
- package/dist/__tests__/streaming.test.js.map +1 -0
- package/dist/__tests__/testEnums.d.ts +1 -0
- package/dist/__tests__/testEnums.js +73 -0
- package/dist/__tests__/testEnums.js.map +1 -0
- package/dist/__tests__/testOptionals.test.d.ts +1 -0
- package/dist/__tests__/testOptionals.test.js +83 -0
- package/dist/__tests__/testOptionals.test.js.map +1 -0
- package/dist/__tests__/types.test.d.ts +1 -0
- package/dist/__tests__/types.test.js +98 -0
- package/dist/__tests__/types.test.js.map +1 -0
- package/dist/client/client.d.ts +5 -4
- package/dist/client/client.js +60 -26
- package/dist/client/client.js.map +1 -1
- package/dist/service/core.d.ts +23 -2
- package/dist/service/core.js +62 -15
- package/dist/service/core.js.map +1 -1
- package/dist/service/oauth2Manager.js +9 -2
- package/dist/service/oauth2Manager.js.map +1 -1
- package/dist/service/server.js +158 -40
- package/dist/service/server.js.map +1 -1
- package/dist/service/types.d.ts +1 -0
- package/dist/service/zod-json-converter.d.ts +14 -0
- package/dist/service/zod-json-converter.js +203 -0
- package/dist/service/zod-json-converter.js.map +1 -0
- package/package.json +13 -14
package/dist/service/core.d.ts
CHANGED
|
@@ -29,6 +29,27 @@ export declare const CoreUtils: {
|
|
|
29
29
|
export declare function createToolWithInterface<T extends ToolInterfaceType>(config: ToolConfig & {
|
|
30
30
|
interface: T;
|
|
31
31
|
}): ToolConfig;
|
|
32
|
-
|
|
33
|
-
|
|
32
|
+
/**
|
|
33
|
+
* Utility function to convert text to slug (kebab-case)
|
|
34
|
+
*/
|
|
35
|
+
declare function toSlug(text: string): string;
|
|
36
|
+
/**
|
|
37
|
+
* Creates an OAuth2 authentication tool with standardized naming and discoverable description
|
|
38
|
+
* Tool ID format: oauth2-{serviceSlug}-{provider}
|
|
39
|
+
*
|
|
40
|
+
* @param provider - OAuth provider name (e.g., 'google', 'microsoft')
|
|
41
|
+
* @param serviceSlug - Service identifier slug (derived from service name)
|
|
42
|
+
* @param config - Optional configuration for UI and metadata
|
|
43
|
+
*/
|
|
44
|
+
export declare function createOAuth2Tool(provider: string, serviceSlug: string, config?: {
|
|
45
|
+
logoUrl?: string;
|
|
46
|
+
reason?: string;
|
|
47
|
+
requiredTools?: string[];
|
|
48
|
+
}): ToolConfig<z.ZodObject<{}, z.core.$strip>, z.ZodObject<{
|
|
49
|
+
authUrl: z.ZodOptional<z.ZodString>;
|
|
50
|
+
success: z.ZodBoolean;
|
|
51
|
+
authUrlRequired: z.ZodOptional<z.ZodBoolean>;
|
|
52
|
+
provider: z.ZodOptional<z.ZodString>;
|
|
53
|
+
message: z.ZodOptional<z.ZodString>;
|
|
34
54
|
}, z.core.$strip>>;
|
|
55
|
+
export { toSlug };
|
package/dist/service/core.js
CHANGED
|
@@ -18,8 +18,8 @@ exports.validatePricing = validatePricing;
|
|
|
18
18
|
exports.isToolInToolbox = isToolInToolbox;
|
|
19
19
|
exports.createToolWithInterface = createToolWithInterface;
|
|
20
20
|
exports.createOAuth2Tool = createOAuth2Tool;
|
|
21
|
+
exports.toSlug = toSlug;
|
|
21
22
|
const zod_1 = require("zod");
|
|
22
|
-
const utils_1 = require("@dainprotocol/utils");
|
|
23
23
|
function createTool(config) {
|
|
24
24
|
// Validate the config
|
|
25
25
|
if (!config.id || !config.name || !config.description) {
|
|
@@ -233,14 +233,40 @@ function createToolWithInterface(config) {
|
|
|
233
233
|
interface: config.interface,
|
|
234
234
|
});
|
|
235
235
|
}
|
|
236
|
-
|
|
236
|
+
/**
|
|
237
|
+
* Utility function to convert text to slug (kebab-case)
|
|
238
|
+
*/
|
|
239
|
+
function toSlug(text) {
|
|
240
|
+
return text.toLowerCase()
|
|
241
|
+
.replace(/[^a-z0-9]+/g, '-') // Replace non-alphanumeric with dash
|
|
242
|
+
.replace(/^-+|-+$/g, ''); // Remove leading/trailing dashes
|
|
243
|
+
}
|
|
244
|
+
/**
|
|
245
|
+
* Creates an OAuth2 authentication tool with standardized naming and discoverable description
|
|
246
|
+
* Tool ID format: oauth2-{serviceSlug}-{provider}
|
|
247
|
+
*
|
|
248
|
+
* @param provider - OAuth provider name (e.g., 'google', 'microsoft')
|
|
249
|
+
* @param serviceSlug - Service identifier slug (derived from service name)
|
|
250
|
+
* @param config - Optional configuration for UI and metadata
|
|
251
|
+
*/
|
|
252
|
+
function createOAuth2Tool(provider, serviceSlug, config) {
|
|
253
|
+
const toolId = `oauth2-${serviceSlug}-${provider}`;
|
|
254
|
+
const providerCapitalized = provider.charAt(0).toUpperCase() + provider.slice(1);
|
|
255
|
+
// Create discoverable description with multiple trigger phrases
|
|
256
|
+
const description = config?.reason
|
|
257
|
+
? `Authenticate with ${providerCapitalized} to ${config.reason}. Use this when you need to connect your ${providerCapitalized} account. Simple requests like "auth me", "connect ${provider}", or "login to ${provider}" will trigger this tool.`
|
|
258
|
+
: `Authenticate with ${providerCapitalized} to access ${serviceSlug} features. Use this tool when you need to connect your ${providerCapitalized} account. Simple requests like "auth me", "connect ${provider}", or "login to ${provider}" will trigger this tool.`;
|
|
237
259
|
return createTool({
|
|
238
|
-
id:
|
|
239
|
-
name: `${
|
|
240
|
-
description
|
|
260
|
+
id: toolId,
|
|
261
|
+
name: `${providerCapitalized} OAuth Login`,
|
|
262
|
+
description,
|
|
241
263
|
input: zod_1.z.object({}),
|
|
242
264
|
output: zod_1.z.object({
|
|
243
|
-
authUrl: zod_1.z.string(),
|
|
265
|
+
authUrl: zod_1.z.string().optional(),
|
|
266
|
+
success: zod_1.z.boolean(),
|
|
267
|
+
authUrlRequired: zod_1.z.boolean().optional(),
|
|
268
|
+
provider: zod_1.z.string().optional(),
|
|
269
|
+
message: zod_1.z.string().optional(),
|
|
244
270
|
}),
|
|
245
271
|
pricing: {
|
|
246
272
|
pricePerUse: 0,
|
|
@@ -252,17 +278,38 @@ function createOAuth2Tool(provider, prefix = "") {
|
|
|
252
278
|
if (!oauth2Handler) {
|
|
253
279
|
throw new Error("OAuth2 not configured for this service");
|
|
254
280
|
}
|
|
255
|
-
console.log(
|
|
281
|
+
console.log(`[OAuth Tool ${toolId}] Generating auth URL for provider:`, provider, "for agent:", agentInfo.id);
|
|
256
282
|
const authUrl = await oauth2Handler.generateAuthUrl(provider, agentInfo.id);
|
|
283
|
+
// TODO: Standardize UI generation in service-sdk
|
|
284
|
+
// Create a unified UI builder/helper system for all UI types (OAuth, forms, cards, etc.)
|
|
285
|
+
// This should provide:
|
|
286
|
+
// 1. Type-safe UI builders for different UI types
|
|
287
|
+
// 2. Consistent Blueprint format output
|
|
288
|
+
// 3. Validation of UI structure
|
|
289
|
+
// 4. Reusable across all service tools
|
|
290
|
+
// Reference: inbox-service requestAuthenticationToolV2 pattern
|
|
291
|
+
// Use flat UI structure (Blueprint format) compatible with Maestro
|
|
292
|
+
// This matches the format used by inbox-service requestAuthenticationToolV2
|
|
257
293
|
return {
|
|
258
|
-
text: `Please authenticate with ${
|
|
259
|
-
data: {
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
.
|
|
265
|
-
|
|
294
|
+
text: `Please authenticate with ${providerCapitalized} using the link provided`,
|
|
295
|
+
data: {
|
|
296
|
+
authUrl,
|
|
297
|
+
success: true,
|
|
298
|
+
authUrlRequired: true,
|
|
299
|
+
provider,
|
|
300
|
+
message: `Authentication required with ${providerCapitalized}. Please follow the instructions.`
|
|
301
|
+
},
|
|
302
|
+
ui: {
|
|
303
|
+
text: `Please authenticate with ${providerCapitalized} first, I have displayed a component to authenticate with ${providerCapitalized}`,
|
|
304
|
+
data: null,
|
|
305
|
+
type: "oauth2",
|
|
306
|
+
renderMode: "Inline",
|
|
307
|
+
title: `${providerCapitalized} Authentication`,
|
|
308
|
+
logo: config?.logoUrl,
|
|
309
|
+
content: `Please authenticate with ${providerCapitalized} to continue`,
|
|
310
|
+
url: authUrl,
|
|
311
|
+
provider: provider,
|
|
312
|
+
},
|
|
266
313
|
};
|
|
267
314
|
},
|
|
268
315
|
});
|
package/dist/service/core.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../src/service/core.ts"],"names":[],"mappings":";AAAA,4BAA4B;;;
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../src/service/core.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,8 +80,15 @@ class OAuth2Manager {
|
|
|
80
80
|
*/
|
|
81
81
|
async hasValidTokens(provider, agentId) {
|
|
82
82
|
try {
|
|
83
|
-
|
|
84
|
-
|
|
83
|
+
// Use queryTokens instead of getValidToken to match how tools query tokens
|
|
84
|
+
// Tokens are stored by userId, not by the dummy email format
|
|
85
|
+
const query = {
|
|
86
|
+
userId: agentId,
|
|
87
|
+
provider: provider
|
|
88
|
+
};
|
|
89
|
+
const tokens = await this.client.queryTokens(query);
|
|
90
|
+
// Check if we have at least one valid (non-expired) token
|
|
91
|
+
return tokens.length > 0;
|
|
85
92
|
}
|
|
86
93
|
catch {
|
|
87
94
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth2Manager.js","sourceRoot":"","sources":["../../src/service/oauth2Manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oauth2Manager.js","sourceRoot":"","sources":["../../src/service/oauth2Manager.ts"],"names":[],"mappings":"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"}
|