@dainprotocol/service-sdk 1.0.52 → 1.0.53
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/service/core.js +18 -16
- package/dist/service/core.js.map +1 -1
- package/package.json +1 -1
package/dist/service/core.js
CHANGED
|
@@ -22,7 +22,7 @@ function createTool(config) {
|
|
|
22
22
|
throw new Error("Tool config is missing required fields");
|
|
23
23
|
}
|
|
24
24
|
// Ensure the handler respects the input and output schemas
|
|
25
|
-
const wrappedHandler = async (input, agentInfo,
|
|
25
|
+
const wrappedHandler = async (input, agentInfo, context) => {
|
|
26
26
|
let parsedInput;
|
|
27
27
|
try {
|
|
28
28
|
parsedInput = config.input.parse(input);
|
|
@@ -33,18 +33,18 @@ function createTool(config) {
|
|
|
33
33
|
.map((issue) => issue.path.join("."))
|
|
34
34
|
.join(", ");
|
|
35
35
|
if (config.handleInputError) {
|
|
36
|
-
const errorResult = await config.handleInputError(error, agentInfo,
|
|
36
|
+
const errorResult = await config.handleInputError(error, agentInfo, context);
|
|
37
37
|
// Expand process IDs in error handler result
|
|
38
38
|
let expandedProcesses;
|
|
39
39
|
if (errorResult.processes?.length) {
|
|
40
40
|
expandedProcesses = await Promise.all(errorResult.processes.map(async (process) => {
|
|
41
|
-
if (typeof process ===
|
|
42
|
-
const processInfo = await
|
|
41
|
+
if (typeof process === "string") {
|
|
42
|
+
const processInfo = await context.app.processes.getProcess(process);
|
|
43
43
|
return {
|
|
44
44
|
id: process,
|
|
45
45
|
name: processInfo.name,
|
|
46
46
|
description: processInfo.description,
|
|
47
|
-
type: processInfo.type
|
|
47
|
+
type: processInfo.type,
|
|
48
48
|
};
|
|
49
49
|
}
|
|
50
50
|
return process;
|
|
@@ -52,7 +52,7 @@ function createTool(config) {
|
|
|
52
52
|
}
|
|
53
53
|
return {
|
|
54
54
|
...errorResult,
|
|
55
|
-
processes: expandedProcesses
|
|
55
|
+
processes: expandedProcesses,
|
|
56
56
|
};
|
|
57
57
|
}
|
|
58
58
|
return {
|
|
@@ -67,22 +67,23 @@ function createTool(config) {
|
|
|
67
67
|
throw error;
|
|
68
68
|
}
|
|
69
69
|
const result = await config.handler(parsedInput, agentInfo, {
|
|
70
|
-
app:
|
|
71
|
-
extraData:
|
|
70
|
+
app: context.app,
|
|
71
|
+
extraData: context.extraData,
|
|
72
72
|
});
|
|
73
73
|
// If processes is a string array, expand it
|
|
74
74
|
let expandedProcesses;
|
|
75
75
|
if (Array.isArray(result.processes)) {
|
|
76
|
-
if (result.processes.length > 0 &&
|
|
76
|
+
if (result.processes.length > 0 &&
|
|
77
|
+
typeof result.processes[0] === "string") {
|
|
77
78
|
expandedProcesses = await Promise.all(result.processes.map(async (processId) => {
|
|
78
|
-
const processInfo = await
|
|
79
|
+
const processInfo = await context.app.processes.getProcess(processId);
|
|
79
80
|
if (!processInfo)
|
|
80
81
|
throw new Error(`Process ${processId} not found`);
|
|
81
82
|
return {
|
|
82
83
|
id: processId,
|
|
83
84
|
name: processInfo.name,
|
|
84
85
|
description: processInfo.description,
|
|
85
|
-
type: processInfo.type
|
|
86
|
+
type: processInfo.type,
|
|
86
87
|
};
|
|
87
88
|
}));
|
|
88
89
|
}
|
|
@@ -95,7 +96,7 @@ function createTool(config) {
|
|
|
95
96
|
data: config.output.parse(result.data),
|
|
96
97
|
ui: result.ui,
|
|
97
98
|
pleasePay: result.pleasePay,
|
|
98
|
-
processes: expandedProcesses
|
|
99
|
+
processes: expandedProcesses,
|
|
99
100
|
};
|
|
100
101
|
};
|
|
101
102
|
return {
|
|
@@ -200,11 +201,12 @@ function createOAuth2Tool(provider) {
|
|
|
200
201
|
description: `Authenticate with ${provider}`,
|
|
201
202
|
input: zod_1.z.object({}),
|
|
202
203
|
output: zod_1.z.object({
|
|
203
|
-
authUrl: zod_1.z.string()
|
|
204
|
+
authUrl: zod_1.z.string(),
|
|
204
205
|
}),
|
|
205
206
|
handler: async (_, agentInfo, { app, extraData }) => {
|
|
207
|
+
// Destructure both app and extraData
|
|
206
208
|
if (!app.oauth2) {
|
|
207
|
-
throw new Error(
|
|
209
|
+
throw new Error("OAuth2 not configured for this service");
|
|
208
210
|
}
|
|
209
211
|
const authUrl = await app.oauth2.generateAuthUrl(provider, agentInfo.id);
|
|
210
212
|
return {
|
|
@@ -218,9 +220,9 @@ function createOAuth2Tool(provider) {
|
|
|
218
220
|
url: authUrl,
|
|
219
221
|
provider: provider,
|
|
220
222
|
}),
|
|
221
|
-
}
|
|
223
|
+
},
|
|
222
224
|
};
|
|
223
|
-
}
|
|
225
|
+
},
|
|
224
226
|
});
|
|
225
227
|
}
|
|
226
228
|
//# sourceMappingURL=core.js.map
|
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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"}
|