@wunderio/wdrmcp 0.1.9 → 0.1.11
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/README.md +15 -5
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +29 -1
- package/dist/config.js.map +1 -1
- package/dist/executors/command.d.ts +4 -0
- package/dist/executors/command.d.ts.map +1 -1
- package/dist/executors/command.js +73 -12
- package/dist/executors/command.js.map +1 -1
- package/dist/executors/mcp-proxy.d.ts +1 -3
- package/dist/executors/mcp-proxy.d.ts.map +1 -1
- package/dist/executors/mcp-proxy.js +22 -28
- package/dist/executors/mcp-proxy.js.map +1 -1
- package/dist/executors/ssh.d.ts +6 -6
- package/dist/executors/ssh.d.ts.map +1 -1
- package/dist/executors/ssh.js +41 -40
- package/dist/executors/ssh.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/logger.d.ts +4 -2
- package/dist/logger.d.ts.map +1 -1
- package/dist/logger.js +8 -3
- package/dist/logger.js.map +1 -1
- package/dist/registry.d.ts +1 -0
- package/dist/registry.d.ts.map +1 -1
- package/dist/registry.js +153 -15
- package/dist/registry.js.map +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +42 -6
- package/dist/server.js.map +1 -1
- package/dist/types.d.ts +6 -1
- package/dist/types.d.ts.map +1 -1
- package/package.json +6 -5
package/dist/executors/ssh.js
CHANGED
|
@@ -6,45 +6,67 @@ import { getLogger } from "../logger.js";
|
|
|
6
6
|
*/
|
|
7
7
|
export class SshExecutor {
|
|
8
8
|
defaultUser;
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
strictHostKeyChecking;
|
|
10
|
+
constructor(options) {
|
|
11
|
+
this.defaultUser = options?.defaultUser ?? process.env.USER;
|
|
12
|
+
this.strictHostKeyChecking = options?.strictHostKeyChecking ?? false;
|
|
11
13
|
}
|
|
12
14
|
async execute(options) {
|
|
13
15
|
const { host, command, user, shell = "/bin/bash", workingDir } = options;
|
|
14
16
|
const log = getLogger();
|
|
17
|
+
const startTime = Date.now();
|
|
18
|
+
if (log.isVerbose()) {
|
|
19
|
+
log.debug(`SSH: Connecting to ${host}, workingDir=${workingDir || "/"}, shell=${shell}`);
|
|
20
|
+
}
|
|
15
21
|
// Determine the SSH user to connect as
|
|
16
22
|
const sshUser = this.resolveSshUser(user);
|
|
23
|
+
if (log.isVerbose()) {
|
|
24
|
+
log.debug(`SSH: User resolved to: ${sshUser || "default"}`);
|
|
25
|
+
}
|
|
17
26
|
// Build the full command, optionally with working directory change
|
|
18
27
|
let remoteCmd = command.join(" ");
|
|
19
28
|
if (workingDir) {
|
|
20
|
-
remoteCmd = `cd ${workingDir} && ${remoteCmd}`;
|
|
29
|
+
remoteCmd = `cd ${this.escapeShellArg(workingDir)} && ${remoteCmd}`;
|
|
21
30
|
}
|
|
22
31
|
const envPrelude = this.buildDdevEnvPrelude(workingDir);
|
|
23
32
|
if (envPrelude) {
|
|
24
33
|
remoteCmd = `${envPrelude}${remoteCmd}`;
|
|
34
|
+
if (log.isVerbose()) {
|
|
35
|
+
log.debug(`SSH: Adding DDEV env prelude`);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
if (log.isVerbose()) {
|
|
39
|
+
log.debug(`SSH: Full remote command: ${remoteCmd.substring(0, 200)}${remoteCmd.length > 200 ? "..." : ""}`);
|
|
25
40
|
}
|
|
26
41
|
// Quote the full command so bash -c receives it as a single string
|
|
27
42
|
const escapedCmd = this.escapeShellCommand(remoteCmd);
|
|
28
43
|
// Build SSH destination: "user@hostname" or just "hostname"
|
|
29
44
|
const sshDestination = sshUser ? `${sshUser}@${host}` : host;
|
|
30
45
|
const shellFlag = "-c";
|
|
31
|
-
const sshArgs = [
|
|
32
|
-
|
|
33
|
-
"-o", "
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
46
|
+
const sshArgs = ["-o", "LogLevel=ERROR"];
|
|
47
|
+
if (this.strictHostKeyChecking) {
|
|
48
|
+
sshArgs.push("-o", "StrictHostKeyChecking=yes");
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
sshArgs.push("-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null");
|
|
52
|
+
}
|
|
53
|
+
sshArgs.push(sshDestination, shell, shellFlag, escapedCmd);
|
|
54
|
+
if (log.isVerbose()) {
|
|
55
|
+
log.debug(`SSH: Executing ssh ${sshDestination} ${shell} -c '<command>'`);
|
|
56
|
+
}
|
|
41
57
|
return new Promise((resolve, reject) => {
|
|
42
58
|
execFile("ssh", sshArgs, { maxBuffer: 10 * 1024 * 1024, timeout: 120_000 }, (error, stdout, stderr) => {
|
|
59
|
+
const duration = Date.now() - startTime;
|
|
43
60
|
if (error) {
|
|
44
|
-
const cleanedError =
|
|
61
|
+
const cleanedError = (stderr?.trim() || error.message).trim();
|
|
62
|
+
log.error(`SSH: Command failed on ${host} (${duration}ms): ${cleanedError}`);
|
|
63
|
+
if (log.isVerbose()) {
|
|
64
|
+
log.debug(`SSH: Raw stderr: ${stderr}`);
|
|
65
|
+
}
|
|
45
66
|
reject(new Error(cleanedError));
|
|
46
67
|
return;
|
|
47
68
|
}
|
|
69
|
+
log.info(`SSH: Command succeeded on ${host} (${duration}ms)`);
|
|
48
70
|
resolve(stdout);
|
|
49
71
|
});
|
|
50
72
|
});
|
|
@@ -69,37 +91,16 @@ export class SshExecutor {
|
|
|
69
91
|
const escaped = cmd.replace(/'/g, "'\\''");
|
|
70
92
|
return `'${escaped}'`;
|
|
71
93
|
}
|
|
94
|
+
escapeShellArg(value) {
|
|
95
|
+
return `'${value.replace(/'/g, `'"'"'`)}'`;
|
|
96
|
+
}
|
|
72
97
|
buildDdevEnvPrelude(workingDir) {
|
|
73
98
|
if (!workingDir) {
|
|
74
99
|
return "";
|
|
75
100
|
}
|
|
76
101
|
const baseDir = workingDir.replace(/\/$/, "");
|
|
77
|
-
const configPath = this.
|
|
78
|
-
return `if [ -f ${configPath} ]; then
|
|
79
|
-
}
|
|
80
|
-
/**
|
|
81
|
-
* Extract the most relevant error information from stderr.
|
|
82
|
-
* Removes file paths, line numbers, and stack traces, keeping only actionable error lines.
|
|
83
|
-
*/
|
|
84
|
-
extractErrorMessage(stderr) {
|
|
85
|
-
const lines = stderr.split("\n");
|
|
86
|
-
const cleanedLines = [];
|
|
87
|
-
for (const line of lines) {
|
|
88
|
-
// Skip empty lines and common noise
|
|
89
|
-
if (!line.trim())
|
|
90
|
-
continue;
|
|
91
|
-
if (line.includes(".php in ") || line.includes("Stack trace:"))
|
|
92
|
-
continue;
|
|
93
|
-
if (line.match(/^\s+#\d+/))
|
|
94
|
-
continue; // Skip stack trace lines (e.g. " #0 Class::method()")
|
|
95
|
-
if (line.match(/at line \d+/i))
|
|
96
|
-
continue; // Skip "at line X" references
|
|
97
|
-
if (line.match(/^In .*\.php line \d+:/))
|
|
98
|
-
continue; // Skip file references
|
|
99
|
-
cleanedLines.push(line.trim());
|
|
100
|
-
}
|
|
101
|
-
// Return joined lines, or fall back to original if nothing cleaned up
|
|
102
|
-
return cleanedLines.join("\n").trim() || stderr;
|
|
102
|
+
const configPath = this.escapeShellArg(`${baseDir}/.ddev/config.yaml`);
|
|
103
|
+
return `if [ -f ${configPath} ]; then awk -F'- ' '/- (DB_(HOST|NAME|USER|PASS)|HASH_SALT|ENVIRONMENT_NAME)=/ {print $2}' ${configPath} | while IFS= read -r kv; do [ -n "$kv" ] && export "$kv"; done; fi; `;
|
|
103
104
|
}
|
|
104
105
|
}
|
|
105
106
|
//# sourceMappingURL=ssh.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh.js","sourceRoot":"","sources":["../../src/executors/ssh.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC;;;GAGG;AACH,MAAM,OAAO,WAAW;IACL,WAAW,CAAqB;
|
|
1
|
+
{"version":3,"file":"ssh.js","sourceRoot":"","sources":["../../src/executors/ssh.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -19,7 +19,7 @@ async function main() {
|
|
|
19
19
|
// Parse CLI arguments.
|
|
20
20
|
const config = parseArgs(process.argv);
|
|
21
21
|
// Initialize logger (stderr only — stdout is reserved for JSON-RPC).
|
|
22
|
-
initLogger(config.logLevel, config.logFile);
|
|
22
|
+
initLogger(config.logLevel, config.logFile, config.verboseLogging);
|
|
23
23
|
const log = getLogger();
|
|
24
24
|
try {
|
|
25
25
|
log.info("Starting WDRMCP (YAML Configuration MCP Server)");
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,KAAK,UAAU,IAAI;IACjB,uBAAuB;IACvB,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvC,qEAAqE;IACrE,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,KAAK,UAAU,IAAI;IACjB,uBAAuB;IACvB,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvC,qEAAqE;IACrE,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC;IACnE,MAAM,GAAG,GAAG,SAAS,EAAE,CAAC;IAExB,IAAI,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;QAC5D,GAAG,CAAC,IAAI,CAAC,sBAAsB,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;QACzD,GAAG,CAAC,IAAI,CAAC,iBAAiB,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;QAEhD,4CAA4C;QAC5C,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAClE,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,CAAC;QAE7C,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;YACpB,GAAG,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;QACjE,CAAC;QAED,mCAAmC;QACnC,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,IAAI,oBAAoB,EAAE,CAAC;QAC7C,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAEhC,GAAG,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;IAC7C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAC/B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,IAAI,EAAE,CAAC"}
|
package/dist/logger.d.ts
CHANGED
|
@@ -6,7 +6,9 @@ export type LogLevel = "debug" | "info" | "warn" | "error";
|
|
|
6
6
|
export declare class Logger {
|
|
7
7
|
private level;
|
|
8
8
|
private logFile?;
|
|
9
|
-
|
|
9
|
+
private verboseLogging;
|
|
10
|
+
constructor(level?: LogLevel, logFile?: string, verboseLogging?: boolean);
|
|
11
|
+
isVerbose(): boolean;
|
|
10
12
|
private formatArgs;
|
|
11
13
|
private log;
|
|
12
14
|
debug(message: string, ...args: unknown[]): void;
|
|
@@ -14,6 +16,6 @@ export declare class Logger {
|
|
|
14
16
|
warn(message: string, ...args: unknown[]): void;
|
|
15
17
|
error(message: string, ...args: unknown[]): void;
|
|
16
18
|
}
|
|
17
|
-
export declare function initLogger(level?: LogLevel, logFile?: string): Logger;
|
|
19
|
+
export declare function initLogger(level?: LogLevel, logFile?: string, verboseLogging?: boolean): Logger;
|
|
18
20
|
export declare function getLogger(): Logger;
|
|
19
21
|
//# sourceMappingURL=logger.d.ts.map
|
package/dist/logger.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAS3D,qBAAa,MAAM;IACf,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,OAAO,CAAC,CAAS;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAS3D,qBAAa,MAAM;IACf,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,cAAc,CAAU;gBAEpB,KAAK,GAAE,QAAiB,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,cAAc,UAAQ;IAe9E,SAAS,IAAI,OAAO;IAIpB,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,GAAG;IAyBX,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAIhD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAI/C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAI/C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;CAGnD;AAKD,wBAAgB,UAAU,CAAC,KAAK,GAAE,QAAiB,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,cAAc,UAAQ,GAAG,MAAM,CAGrG;AAED,wBAAgB,SAAS,IAAI,MAAM,CAElC"}
|
package/dist/logger.js
CHANGED
|
@@ -12,9 +12,11 @@ const LOG_LEVELS = {
|
|
|
12
12
|
export class Logger {
|
|
13
13
|
level;
|
|
14
14
|
logFile;
|
|
15
|
-
|
|
15
|
+
verboseLogging;
|
|
16
|
+
constructor(level = "info", logFile, verboseLogging = false) {
|
|
16
17
|
this.level = LOG_LEVELS[level];
|
|
17
18
|
this.logFile = logFile;
|
|
19
|
+
this.verboseLogging = verboseLogging;
|
|
18
20
|
// Truncate log file on start.
|
|
19
21
|
if (this.logFile) {
|
|
20
22
|
try {
|
|
@@ -25,6 +27,9 @@ export class Logger {
|
|
|
25
27
|
}
|
|
26
28
|
}
|
|
27
29
|
}
|
|
30
|
+
isVerbose() {
|
|
31
|
+
return this.verboseLogging;
|
|
32
|
+
}
|
|
28
33
|
formatArgs(args) {
|
|
29
34
|
if (args.length === 0)
|
|
30
35
|
return "";
|
|
@@ -68,8 +73,8 @@ export class Logger {
|
|
|
68
73
|
}
|
|
69
74
|
/** Singleton logger instance — call `initLogger()` to configure. */
|
|
70
75
|
let logger = new Logger();
|
|
71
|
-
export function initLogger(level = "info", logFile) {
|
|
72
|
-
logger = new Logger(level, logFile);
|
|
76
|
+
export function initLogger(level = "info", logFile, verboseLogging = false) {
|
|
77
|
+
logger = new Logger(level, logFile, verboseLogging);
|
|
73
78
|
return logger;
|
|
74
79
|
}
|
|
75
80
|
export function getLogger() {
|
package/dist/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAIxD,MAAM,UAAU,GAA6B;IACzC,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;CACX,CAAC;AAEF,MAAM,OAAO,MAAM;IACP,KAAK,CAAS;IACd,OAAO,CAAU;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
|
package/dist/registry.d.ts
CHANGED
package/dist/registry.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAYH,OAAO,KAAK,EACV,YAAY,EAIZ,mBAAmB,EACnB,cAAc,EAKf,MAAM,YAAY,CAAC;AAgEpB,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA0C;IAChE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;gBAE1C,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY;IAkBxD;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;YAyDpB,cAAc;IAoB5B;;;OAGG;YACW,kBAAkB;IAoDhC,OAAO,CAAC,cAAc;IAsGtB,YAAY,IAAI,MAAM,EAAE;IACxB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IACjD,WAAW,IAAI,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC;IAE1C;;;OAGG;IACG,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA6C5F;;OAEG;IACH,OAAO,CAAC,cAAc;IAuBtB,OAAO,CAAC,iCAAiC;CAU1C"}
|
package/dist/registry.js
CHANGED
|
@@ -11,11 +11,67 @@ import { readFileSync, existsSync } from "node:fs";
|
|
|
11
11
|
import { resolve, join } from "node:path";
|
|
12
12
|
import { globSync } from "glob";
|
|
13
13
|
import yaml from "js-yaml";
|
|
14
|
+
import { z } from "zod";
|
|
14
15
|
import { getLogger } from "./logger.js";
|
|
15
16
|
import { resolveEnvVars } from "./env-resolve.js";
|
|
16
17
|
import { SshExecutor } from "./executors/ssh.js";
|
|
17
18
|
import { CommandToolExecutor } from "./executors/command.js";
|
|
18
19
|
import { McpProxyExecutor, BoundRemoteToolExecutor } from "./executors/mcp-proxy.js";
|
|
20
|
+
const ValidationRuleSchema = z.object({
|
|
21
|
+
pattern: z.string(),
|
|
22
|
+
message: z.string().optional(),
|
|
23
|
+
}).strict();
|
|
24
|
+
const JsonSchemaPropertySchema = z.lazy(() => z.object({
|
|
25
|
+
type: z.string(),
|
|
26
|
+
description: z.string().optional(),
|
|
27
|
+
enum: z.array(z.string()).optional(),
|
|
28
|
+
default: z.unknown().optional(),
|
|
29
|
+
}).strict());
|
|
30
|
+
const JsonSchemaSchema = z.lazy(() => z.object({
|
|
31
|
+
type: z.string(),
|
|
32
|
+
properties: z.record(JsonSchemaPropertySchema).optional(),
|
|
33
|
+
required: z.array(z.string()).optional(),
|
|
34
|
+
}).strict());
|
|
35
|
+
const CommandToolConfigSchema = z.object({
|
|
36
|
+
name: z.string(),
|
|
37
|
+
enabled: z.boolean().optional(),
|
|
38
|
+
description: z.string(),
|
|
39
|
+
type: z.literal("command"),
|
|
40
|
+
input_schema: JsonSchemaSchema.optional(),
|
|
41
|
+
command_template: z.string(),
|
|
42
|
+
ssh_target: z.string(),
|
|
43
|
+
ssh_user: z.string().optional(),
|
|
44
|
+
working_dir: z.string().optional(),
|
|
45
|
+
shell: z.string().optional(),
|
|
46
|
+
default_args: z.record(z.string()).optional(),
|
|
47
|
+
disallowed_commands: z.array(z.string()).optional(),
|
|
48
|
+
validation_rules: z.array(ValidationRuleSchema).optional(),
|
|
49
|
+
max_arg_length: z.number().int().positive().optional(),
|
|
50
|
+
}).strict();
|
|
51
|
+
const McpServerToolConfigSchema = z.object({
|
|
52
|
+
name: z.string(),
|
|
53
|
+
enabled: z.boolean().optional(),
|
|
54
|
+
description: z.string(),
|
|
55
|
+
type: z.literal("mcp_server"),
|
|
56
|
+
input_schema: JsonSchemaSchema.optional(),
|
|
57
|
+
server_url: z.string(),
|
|
58
|
+
tool_prefix: z.string().optional(),
|
|
59
|
+
forward_args: z.boolean().optional(),
|
|
60
|
+
timeout: z.number().int().positive().optional(),
|
|
61
|
+
auth_username: z.string().optional(),
|
|
62
|
+
auth_password: z.string().optional(),
|
|
63
|
+
auth_token: z.string().optional(),
|
|
64
|
+
auth_token_basic: z.boolean().optional(),
|
|
65
|
+
expose_remote_tools: z.boolean().optional(),
|
|
66
|
+
init_timeout: z.number().int().positive().optional(),
|
|
67
|
+
}).strict();
|
|
68
|
+
const ToolConfigSchema = z.discriminatedUnion("type", [
|
|
69
|
+
CommandToolConfigSchema,
|
|
70
|
+
McpServerToolConfigSchema,
|
|
71
|
+
]);
|
|
72
|
+
const ToolsFileSchemaValidator = z.object({
|
|
73
|
+
tools: z.array(ToolConfigSchema),
|
|
74
|
+
}).strict();
|
|
19
75
|
export class ToolRegistry {
|
|
20
76
|
toolsConfigDir;
|
|
21
77
|
config;
|
|
@@ -27,7 +83,10 @@ export class ToolRegistry {
|
|
|
27
83
|
this.config = config;
|
|
28
84
|
// Initialize standard container executor (now SSH based)
|
|
29
85
|
// Pass the configured SSH user or fall back to environment
|
|
30
|
-
this.containerExecutor = new SshExecutor(
|
|
86
|
+
this.containerExecutor = new SshExecutor({
|
|
87
|
+
defaultUser: config.sshUser,
|
|
88
|
+
strictHostKeyChecking: config.strictHostKeyChecking,
|
|
89
|
+
});
|
|
31
90
|
// Path normalization as a composable preprocessor.
|
|
32
91
|
// Converts devcontainer paths (e.g. /workspace/...) to container paths (/var/www/html/...).
|
|
33
92
|
const hostRoot = config.hostProjectRoot;
|
|
@@ -43,21 +102,39 @@ export class ToolRegistry {
|
|
|
43
102
|
log.error(`Tools config directory not found: ${this.toolsConfigDir}`);
|
|
44
103
|
return 0;
|
|
45
104
|
}
|
|
105
|
+
log.info(`Loading tools from: ${this.toolsConfigDir}`);
|
|
46
106
|
const configFiles = globSync("*.yml", { cwd: this.toolsConfigDir }).sort();
|
|
107
|
+
if (configFiles.length === 0) {
|
|
108
|
+
log.warn(`No .yml files found in ${this.toolsConfigDir}`);
|
|
109
|
+
}
|
|
110
|
+
if (log.isVerbose()) {
|
|
111
|
+
log.debug(`Found config files: ${configFiles.join(", ")}`);
|
|
112
|
+
}
|
|
47
113
|
let loadedCount = 0;
|
|
48
114
|
for (const file of configFiles) {
|
|
49
115
|
const filePath = join(this.toolsConfigDir, file);
|
|
50
116
|
try {
|
|
117
|
+
if (log.isVerbose()) {
|
|
118
|
+
log.debug(`Loading config file: ${file}`);
|
|
119
|
+
}
|
|
51
120
|
const content = readFileSync(filePath, "utf-8");
|
|
52
|
-
const
|
|
53
|
-
if (!
|
|
121
|
+
const parsed = yaml.load(content);
|
|
122
|
+
if (!parsed) {
|
|
54
123
|
log.warn(`Empty config file: ${file}`);
|
|
55
124
|
continue;
|
|
56
125
|
}
|
|
57
|
-
|
|
58
|
-
|
|
126
|
+
const validation = ToolsFileSchemaValidator.safeParse(parsed);
|
|
127
|
+
if (!validation.success) {
|
|
128
|
+
const details = validation.error.issues
|
|
129
|
+
.map((issue) => `${issue.path.join(".") || "root"}: ${issue.message}`)
|
|
130
|
+
.join("; ");
|
|
131
|
+
log.error(`Invalid config schema in ${file}: ${details}`);
|
|
59
132
|
continue;
|
|
60
133
|
}
|
|
134
|
+
const fileConfig = validation.data;
|
|
135
|
+
if (log.isVerbose()) {
|
|
136
|
+
log.debug(`Found ${fileConfig.tools.length} tools in ${file}`);
|
|
137
|
+
}
|
|
61
138
|
for (const toolConfig of fileConfig.tools) {
|
|
62
139
|
loadedCount += await this.loadSingleTool(toolConfig);
|
|
63
140
|
}
|
|
@@ -66,7 +143,7 @@ export class ToolRegistry {
|
|
|
66
143
|
log.error(`Error loading ${file}: ${e instanceof yaml.YAMLException ? e.message : e}`);
|
|
67
144
|
}
|
|
68
145
|
}
|
|
69
|
-
log.info(`Loaded ${loadedCount} tools`);
|
|
146
|
+
log.info(`Loaded ${loadedCount} tools total`);
|
|
70
147
|
return loadedCount;
|
|
71
148
|
}
|
|
72
149
|
async loadSingleTool(toolConfig) {
|
|
@@ -161,8 +238,15 @@ export class ToolRegistry {
|
|
|
161
238
|
};
|
|
162
239
|
const bridgeVars = { DDEV_PROJECT: this.config.ddevProject };
|
|
163
240
|
const sshTarget = resolveEnvVars(cfg.ssh_target, envVars, bridgeVars);
|
|
241
|
+
this.ensureNoUnresolvedEnvPlaceholders(sshTarget, name, "ssh_target");
|
|
164
242
|
const sshUser = cfg.ssh_user ? resolveEnvVars(cfg.ssh_user, envVars, bridgeVars) : undefined;
|
|
243
|
+
if (sshUser) {
|
|
244
|
+
this.ensureNoUnresolvedEnvPlaceholders(sshUser, name, "ssh_user");
|
|
245
|
+
}
|
|
165
246
|
const workingDir = cfg.working_dir ? resolveEnvVars(cfg.working_dir, envVars, bridgeVars) : undefined;
|
|
247
|
+
if (workingDir) {
|
|
248
|
+
this.ensureNoUnresolvedEnvPlaceholders(workingDir, name, "working_dir");
|
|
249
|
+
}
|
|
166
250
|
return new CommandToolExecutor({
|
|
167
251
|
commandTemplate: cfg.command_template,
|
|
168
252
|
host: sshTarget,
|
|
@@ -173,6 +257,7 @@ export class ToolRegistry {
|
|
|
173
257
|
defaultArgs: cfg.default_args,
|
|
174
258
|
disallowedCommands: cfg.disallowed_commands,
|
|
175
259
|
validationRules: cfg.validation_rules,
|
|
260
|
+
maxArgLength: cfg.max_arg_length,
|
|
176
261
|
});
|
|
177
262
|
}
|
|
178
263
|
if (type === "mcp_server") {
|
|
@@ -181,15 +266,41 @@ export class ToolRegistry {
|
|
|
181
266
|
log.error(`Tool ${name}: missing server_url`);
|
|
182
267
|
return null;
|
|
183
268
|
}
|
|
269
|
+
const envVars = {
|
|
270
|
+
...process.env,
|
|
271
|
+
DDEV_SSH_USER: process.env.DDEV_SSH_USER ?? this.config.sshUser,
|
|
272
|
+
};
|
|
273
|
+
const bridgeVars = { DDEV_PROJECT: this.config.ddevProject };
|
|
274
|
+
const authUsername = cfg.auth_username
|
|
275
|
+
? resolveEnvVars(cfg.auth_username, envVars, bridgeVars)
|
|
276
|
+
: undefined;
|
|
277
|
+
if (authUsername) {
|
|
278
|
+
this.ensureNoUnresolvedEnvPlaceholders(authUsername, name, "auth_username");
|
|
279
|
+
}
|
|
280
|
+
const authPassword = cfg.auth_password
|
|
281
|
+
? resolveEnvVars(cfg.auth_password, envVars, bridgeVars)
|
|
282
|
+
: undefined;
|
|
283
|
+
if (authPassword) {
|
|
284
|
+
this.ensureNoUnresolvedEnvPlaceholders(authPassword, name, "auth_password");
|
|
285
|
+
}
|
|
286
|
+
const authToken = cfg.auth_token
|
|
287
|
+
? resolveEnvVars(cfg.auth_token, envVars, bridgeVars)
|
|
288
|
+
: undefined;
|
|
289
|
+
if (authToken) {
|
|
290
|
+
this.ensureNoUnresolvedEnvPlaceholders(authToken, name, "auth_token");
|
|
291
|
+
}
|
|
292
|
+
if ((cfg.auth_token && !cfg.auth_token.includes("${")) ||
|
|
293
|
+
(cfg.auth_password && !cfg.auth_password.includes("${"))) {
|
|
294
|
+
log.warn(`Tool ${name}: auth credentials appear to be literal values; prefer environment variable placeholders`);
|
|
295
|
+
}
|
|
184
296
|
return new McpProxyExecutor({
|
|
185
297
|
serverUrl: cfg.server_url,
|
|
186
298
|
forwardArgs: cfg.forward_args,
|
|
187
299
|
timeout: cfg.timeout,
|
|
188
|
-
authUsername
|
|
189
|
-
authPassword
|
|
190
|
-
authToken
|
|
300
|
+
authUsername,
|
|
301
|
+
authPassword,
|
|
302
|
+
authToken,
|
|
191
303
|
authTokenBasic: cfg.auth_token_basic,
|
|
192
|
-
verifySsl: cfg.verify_ssl,
|
|
193
304
|
});
|
|
194
305
|
}
|
|
195
306
|
log.error(`Unknown tool type: ${type}`);
|
|
@@ -211,23 +322,43 @@ export class ToolRegistry {
|
|
|
211
322
|
async executeTool(name, args) {
|
|
212
323
|
const log = getLogger();
|
|
213
324
|
const registered = this.tools.get(name);
|
|
214
|
-
if (!registered)
|
|
325
|
+
if (!registered) {
|
|
326
|
+
log.warn(`Tool not found: ${name}`);
|
|
215
327
|
return { content: `Error: Unknown tool '${name}'`, isError: true };
|
|
216
|
-
|
|
328
|
+
}
|
|
329
|
+
const { executor, config } = registered;
|
|
330
|
+
if (log.isVerbose()) {
|
|
331
|
+
log.debug(`Tool executor type: ${executor.constructor.name}`);
|
|
332
|
+
log.debug(`Tool config type: ${config.type || "command"}`);
|
|
333
|
+
}
|
|
217
334
|
try {
|
|
218
335
|
executor.validateArguments(args);
|
|
336
|
+
if (log.isVerbose()) {
|
|
337
|
+
log.debug(`Tool arguments validated: ${JSON.stringify(args)}`);
|
|
338
|
+
}
|
|
219
339
|
}
|
|
220
340
|
catch (e) {
|
|
221
|
-
|
|
341
|
+
const validationError = e.message;
|
|
342
|
+
log.warn(`Tool validation failed: ${validationError}`);
|
|
343
|
+
return { content: `Validation error: ${validationError}`, isError: true };
|
|
222
344
|
}
|
|
223
345
|
// Apply preprocessor (path normalization).
|
|
224
346
|
const processedArgs = this.argPreprocessor(args);
|
|
347
|
+
if (JSON.stringify(args) !== JSON.stringify(processedArgs)) {
|
|
348
|
+
if (log.isVerbose()) {
|
|
349
|
+
log.debug(`Path normalization applied: ${JSON.stringify(processedArgs)}`);
|
|
350
|
+
}
|
|
351
|
+
}
|
|
225
352
|
try {
|
|
226
353
|
return await executor.execute(processedArgs);
|
|
227
354
|
}
|
|
228
355
|
catch (e) {
|
|
229
|
-
|
|
230
|
-
|
|
356
|
+
const execError = e.message;
|
|
357
|
+
log.error(`Tool execution error: ${execError}`);
|
|
358
|
+
if (log.isVerbose()) {
|
|
359
|
+
log.debug(`Tool that failed: ${name}, executor: ${executor.constructor.name}`);
|
|
360
|
+
}
|
|
361
|
+
return { content: `Error: ${execError}`, isError: true };
|
|
231
362
|
}
|
|
232
363
|
}
|
|
233
364
|
/**
|
|
@@ -252,5 +383,12 @@ export class ToolRegistry {
|
|
|
252
383
|
};
|
|
253
384
|
return normalize(value);
|
|
254
385
|
}
|
|
386
|
+
ensureNoUnresolvedEnvPlaceholders(value, toolName, fieldName) {
|
|
387
|
+
const unresolved = [...value.matchAll(/\$\{(\w+)\}/g)].map((match) => match[1]);
|
|
388
|
+
if (unresolved.length === 0) {
|
|
389
|
+
return;
|
|
390
|
+
}
|
|
391
|
+
throw new Error(`Tool ${toolName}: missing required environment variable(s) for ${fieldName}: ${unresolved.join(", ")}`);
|
|
392
|
+
}
|
|
255
393
|
}
|
|
256
394
|
//# sourceMappingURL=registry.js.map
|
package/dist/registry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"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"}
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAiC7C,4EAA4E;AAC5E,wBAAgB,eAAe,CAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAiC7C,4EAA4E;AAC5E,wBAAgB,eAAe,CAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,CA2DjE"}
|
package/dist/server.js
CHANGED
|
@@ -40,12 +40,48 @@ export function createMcpServer(registry) {
|
|
|
40
40
|
const server = new McpServer({ name: "wdrmcp", version: "0.1.0" });
|
|
41
41
|
for (const [toolName, { config }] of registry.getAllTools()) {
|
|
42
42
|
server.tool(toolName, config.description ?? "Tool with no description", toZodShape(config.input_schema), async (args) => {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
}
|
|
43
|
+
const startTime = Date.now();
|
|
44
|
+
log.info(`========== TOOL START: ${toolName} ==========`);
|
|
45
|
+
if (log.isVerbose()) {
|
|
46
|
+
log.info(`Tool input arguments: ${JSON.stringify(args)}`);
|
|
47
|
+
log.debug(`Tool config: ${JSON.stringify(config)}`);
|
|
48
|
+
}
|
|
49
|
+
try {
|
|
50
|
+
const result = await registry.executeTool(toolName, args);
|
|
51
|
+
const duration = Date.now() - startTime;
|
|
52
|
+
if (result.isError) {
|
|
53
|
+
log.error(`TOOL RESULT (${duration}ms, ERROR): ${toolName}`);
|
|
54
|
+
if (log.isVerbose()) {
|
|
55
|
+
log.info(`TOOL OUTPUT (error, ${result.content.length} chars):`);
|
|
56
|
+
log.info(result.content);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
log.info(`TOOL RESULT (${duration}ms, SUCCESS): ${toolName}`);
|
|
61
|
+
if (log.isVerbose()) {
|
|
62
|
+
log.info(`TOOL OUTPUT (${result.content.length} chars):`);
|
|
63
|
+
log.info(result.content);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
log.info(`========== TOOL END: ${toolName} ==========`);
|
|
67
|
+
return {
|
|
68
|
+
content: [{ type: "text", text: result.content }],
|
|
69
|
+
isError: result.isError,
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
catch (error) {
|
|
73
|
+
const duration = Date.now() - startTime;
|
|
74
|
+
const errorMsg = error instanceof Error ? error.message : String(error);
|
|
75
|
+
log.error(`TOOL EXCEPTION (${duration}ms): ${toolName} - ${errorMsg}`);
|
|
76
|
+
if (log.isVerbose()) {
|
|
77
|
+
log.error(`Exception stack: ${error instanceof Error ? error.stack : ""}`);
|
|
78
|
+
}
|
|
79
|
+
log.info(`========== TOOL END: ${toolName} (EXCEPTION) ==========`);
|
|
80
|
+
return {
|
|
81
|
+
content: [{ type: "text", text: `Tool execution failed: ${errorMsg}` }],
|
|
82
|
+
isError: true,
|
|
83
|
+
};
|
|
84
|
+
}
|
|
49
85
|
});
|
|
50
86
|
}
|
|
51
87
|
log.info(`MCP server configured with ${registry.getToolNames().length} tools`);
|