@tmhs/homelab-mcp 0.15.3 → 0.16.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.
Files changed (140) hide show
  1. package/README.md +9 -4
  2. package/dist/index.js +1 -1
  3. package/dist/tools/adguardFilters.d.ts.map +1 -1
  4. package/dist/tools/adguardFilters.js +7 -26
  5. package/dist/tools/adguardFilters.js.map +1 -1
  6. package/dist/tools/adguardQueryLog.d.ts.map +1 -1
  7. package/dist/tools/adguardQueryLog.js +8 -26
  8. package/dist/tools/adguardQueryLog.js.map +1 -1
  9. package/dist/tools/adguardStats.d.ts.map +1 -1
  10. package/dist/tools/adguardStats.js +7 -26
  11. package/dist/tools/adguardStats.js.map +1 -1
  12. package/dist/tools/alertList.d.ts +5 -0
  13. package/dist/tools/alertList.d.ts.map +1 -1
  14. package/dist/tools/alertList.js +16 -17
  15. package/dist/tools/alertList.js.map +1 -1
  16. package/dist/tools/aptHistory.d.ts +6 -0
  17. package/dist/tools/aptHistory.d.ts.map +1 -1
  18. package/dist/tools/aptHistory.js +14 -4
  19. package/dist/tools/aptHistory.js.map +1 -1
  20. package/dist/tools/aptUpdate.d.ts.map +1 -1
  21. package/dist/tools/aptUpdate.js +20 -5
  22. package/dist/tools/aptUpdate.js.map +1 -1
  23. package/dist/tools/backupDiff.d.ts.map +1 -1
  24. package/dist/tools/backupDiff.js +2 -1
  25. package/dist/tools/backupDiff.js.map +1 -1
  26. package/dist/tools/backupList.d.ts.map +1 -1
  27. package/dist/tools/backupList.js +7 -4
  28. package/dist/tools/backupList.js.map +1 -1
  29. package/dist/tools/backupRestore.d.ts.map +1 -1
  30. package/dist/tools/backupRestore.js +4 -3
  31. package/dist/tools/backupRestore.js.map +1 -1
  32. package/dist/tools/backupRun.d.ts.map +1 -1
  33. package/dist/tools/backupRun.js +10 -2
  34. package/dist/tools/backupRun.js.map +1 -1
  35. package/dist/tools/backupStatus.d.ts.map +1 -1
  36. package/dist/tools/backupStatus.js +8 -4
  37. package/dist/tools/backupStatus.js.map +1 -1
  38. package/dist/tools/certList.d.ts.map +1 -1
  39. package/dist/tools/certList.js +25 -18
  40. package/dist/tools/certList.js.map +1 -1
  41. package/dist/tools/certRenew.js +2 -2
  42. package/dist/tools/certRenew.js.map +1 -1
  43. package/dist/tools/composeDown.d.ts.map +1 -1
  44. package/dist/tools/composeDown.js +3 -10
  45. package/dist/tools/composeDown.js.map +1 -1
  46. package/dist/tools/composePs.d.ts.map +1 -1
  47. package/dist/tools/composePs.js +2 -2
  48. package/dist/tools/composePs.js.map +1 -1
  49. package/dist/tools/composePull.d.ts.map +1 -1
  50. package/dist/tools/composePull.js +3 -10
  51. package/dist/tools/composePull.js.map +1 -1
  52. package/dist/tools/composeUp.d.ts.map +1 -1
  53. package/dist/tools/composeUp.js +5 -11
  54. package/dist/tools/composeUp.js.map +1 -1
  55. package/dist/tools/containerScan.d.ts.map +1 -1
  56. package/dist/tools/containerScan.js +14 -6
  57. package/dist/tools/containerScan.js.map +1 -1
  58. package/dist/tools/diagnostics.d.ts +5 -0
  59. package/dist/tools/diagnostics.d.ts.map +1 -1
  60. package/dist/tools/diagnostics.js +26 -19
  61. package/dist/tools/diagnostics.js.map +1 -1
  62. package/dist/tools/diskUsage.d.ts.map +1 -1
  63. package/dist/tools/diskUsage.js +4 -3
  64. package/dist/tools/diskUsage.js.map +1 -1
  65. package/dist/tools/grafanaSnapshot.d.ts.map +1 -1
  66. package/dist/tools/grafanaSnapshot.js +11 -34
  67. package/dist/tools/grafanaSnapshot.js.map +1 -1
  68. package/dist/tools/healthCheck.d.ts +8 -0
  69. package/dist/tools/healthCheck.d.ts.map +1 -1
  70. package/dist/tools/healthCheck.js +56 -21
  71. package/dist/tools/healthCheck.js.map +1 -1
  72. package/dist/tools/journalLogs.d.ts.map +1 -1
  73. package/dist/tools/journalLogs.js +1 -0
  74. package/dist/tools/journalLogs.js.map +1 -1
  75. package/dist/tools/logSearch.d.ts.map +1 -1
  76. package/dist/tools/logSearch.js +20 -6
  77. package/dist/tools/logSearch.js.map +1 -1
  78. package/dist/tools/nodeList.d.ts.map +1 -1
  79. package/dist/tools/nodeList.js +22 -11
  80. package/dist/tools/nodeList.js.map +1 -1
  81. package/dist/tools/npmCerts.d.ts.map +1 -1
  82. package/dist/tools/npmCerts.js +6 -38
  83. package/dist/tools/npmCerts.js.map +1 -1
  84. package/dist/tools/npmProxyHosts.d.ts.map +1 -1
  85. package/dist/tools/npmProxyHosts.js +6 -38
  86. package/dist/tools/npmProxyHosts.js.map +1 -1
  87. package/dist/tools/ntfySend.d.ts.map +1 -1
  88. package/dist/tools/ntfySend.js +6 -16
  89. package/dist/tools/ntfySend.js.map +1 -1
  90. package/dist/tools/ntfyTopics.d.ts +4 -0
  91. package/dist/tools/ntfyTopics.d.ts.map +1 -1
  92. package/dist/tools/ntfyTopics.js +26 -17
  93. package/dist/tools/ntfyTopics.js.map +1 -1
  94. package/dist/tools/prometheusQuery.d.ts.map +1 -1
  95. package/dist/tools/prometheusQuery.js +8 -16
  96. package/dist/tools/prometheusQuery.js.map +1 -1
  97. package/dist/tools/serviceLogs.d.ts.map +1 -1
  98. package/dist/tools/serviceLogs.js +5 -1
  99. package/dist/tools/serviceLogs.js.map +1 -1
  100. package/dist/tools/speedtestResults.d.ts.map +1 -1
  101. package/dist/tools/speedtestResults.js +7 -16
  102. package/dist/tools/speedtestResults.js.map +1 -1
  103. package/dist/tools/sshTest.js +4 -4
  104. package/dist/tools/sshTest.js.map +1 -1
  105. package/dist/tools/uptimeKumaStatus.d.ts +4 -0
  106. package/dist/tools/uptimeKumaStatus.d.ts.map +1 -1
  107. package/dist/tools/uptimeKumaStatus.js +30 -16
  108. package/dist/tools/uptimeKumaStatus.js.map +1 -1
  109. package/dist/tools/volumeBackup.d.ts.map +1 -1
  110. package/dist/tools/volumeBackup.js +4 -3
  111. package/dist/tools/volumeBackup.js.map +1 -1
  112. package/dist/utils/compose.d.ts +27 -0
  113. package/dist/utils/compose.d.ts.map +1 -0
  114. package/dist/utils/compose.js +92 -0
  115. package/dist/utils/compose.js.map +1 -0
  116. package/dist/utils/config.d.ts +4 -0
  117. package/dist/utils/config.d.ts.map +1 -0
  118. package/dist/utils/config.js +7 -0
  119. package/dist/utils/config.js.map +1 -0
  120. package/dist/utils/errors.d.ts +2 -2
  121. package/dist/utils/errors.d.ts.map +1 -1
  122. package/dist/utils/errors.js +8 -4
  123. package/dist/utils/errors.js.map +1 -1
  124. package/dist/utils/restic.d.ts +13 -0
  125. package/dist/utils/restic.d.ts.map +1 -0
  126. package/dist/utils/restic.js +21 -0
  127. package/dist/utils/restic.js.map +1 -0
  128. package/dist/utils/service-http.d.ts +82 -0
  129. package/dist/utils/service-http.d.ts.map +1 -0
  130. package/dist/utils/service-http.js +104 -0
  131. package/dist/utils/service-http.js.map +1 -0
  132. package/dist/utils/since-param.d.ts +13 -0
  133. package/dist/utils/since-param.d.ts.map +1 -0
  134. package/dist/utils/since-param.js +21 -0
  135. package/dist/utils/since-param.js.map +1 -0
  136. package/dist/utils/ssh-api.d.ts +54 -3
  137. package/dist/utils/ssh-api.d.ts.map +1 -1
  138. package/dist/utils/ssh-api.js +222 -33
  139. package/dist/utils/ssh-api.js.map +1 -1
  140. package/package.json +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"grafanaSnapshot.js","sourceRoot":"","sources":["../../src/tools/grafanaSnapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,YAAY,GAAG,IAAI,CAAC;AAC1B,MAAM,YAAY,GAAG,SAAS,CAAC;AAE/B,MAAM,WAAW,GAAG;IAClB,GAAG,SAAS;IACZ,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,yBAAyB,CAAC;CACjE,CAAC;AAEF,SAAS,OAAO;IACd,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;IAClD,OAAO,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;AAC1D,CAAC;AAED,SAAS,eAAe;IACtB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;IAChD,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,6BAA6B,KAAK,GAAG,CAAC;IAC/C,CAAC;IACD,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,OAAO,CAAC;IACzD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;IACtD,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,OAAO,IAAI,IAAI,QAAQ,GAAG,CAAC;IACpC,CAAC;IACD,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,IAAI,CACT,yBAAyB,EACzB,iDAAiD,EACjD,WAAW,EACX,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,eAAe,EAAE,CAAC;YAC/B,MAAM,MAAM,GAAG,MAAM,OAAO,CAC1B,YAAY,IAAI,sBAAsB,IAAI,uBAAuB,IAAI,CAAC,SAAS,GAAG,EAClF,IAAI,CAAC,IAAI,CACV,CAAC;YAEF,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QAChE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,kBAAkB,EAAE,CAAC;gBACxC,IAAI,KAAK,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;oBACzB,OAAO,aAAa,CAClB,IAAI,KAAK,CACP,mBAAmB,YAAY,gBAAgB,IAAI,mBAAmB;wBACpE,uDAAuD,CAC1D,CACF,CAAC;gBACJ,CAAC;gBACD,IAAI,KAAK,CAAC,QAAQ,KAAK,EAAE,EAAE,CAAC;oBAC1B,OAAO,aAAa,CAClB,IAAI,KAAK,CACP,GAAG,YAAY,mDAAmD;wBAChE,wFAAwF;wBACxF,kCAAkC,IAAI,CAAC,SAAS,WAAW,CAC9D,CACF,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"grafanaSnapshot.js","sourceRoot":"","sources":["../../src/tools/grafanaSnapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAEjG,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;AAEjC,MAAM,WAAW,GAAG;IAClB,GAAG,SAAS;IACZ,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,yBAAyB,CAAC;CACjE,CAAC;AAEF,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,IAAI,CACT,yBAAyB,EACzB,iDAAiD,EACjD,WAAW,EACX,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,IAAI,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC;QAC/B,IAAI,CAAC;YACH,IAAI,GAAG,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACpC,MAAM,MAAM,GAAG,MAAM,OAAO,CAC1B,YAAY,IAAI,sBAAsB,IAAI,uBAAuB,IAAI,CAAC,SAAS,GAAG,EAClF,IAAI,CAAC,IAAI,CACV,CAAC;YAEF,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QAChE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE;gBAC7C,SAAS,EACP,GAAG,OAAO,CAAC,IAAI,4BAA4B,OAAO,CAAC,QAAQ,GAAG;oBAC9D,kCAAkC,IAAI,CAAC,SAAS,2BAA2B,IAAI,cAAc;oBAC7F,2EAA2E;aAC9E,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC"}
@@ -1,3 +1,11 @@
1
1
  import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
2
+ interface CheckResult {
3
+ name: string;
4
+ status: "pass" | "fail";
5
+ detail: string;
6
+ }
7
+ export declare function buildHealthCheckScript(): string;
8
+ export declare function parseHealthCheckOutput(output: string): CheckResult[];
2
9
  export declare function register(server: McpServer): void;
10
+ export {};
3
11
  //# sourceMappingURL=healthCheck.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"healthCheck.d.ts","sourceRoot":"","sources":["../../src/tools/healthCheck.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAyBzE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAmChD"}
1
+ {"version":3,"file":"healthCheck.d.ts","sourceRoot":"","sources":["../../src/tools/healthCheck.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAMzE,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB;AAcD,wBAAgB,sBAAsB,IAAI,MAAM,CAM/C;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,EAAE,CAepE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CA2ChD"}
@@ -1,36 +1,71 @@
1
1
  import { execSSH, errorResponse } from "../utils/ssh-api.js";
2
2
  import { nodeParam } from "../utils/node-param.js";
3
3
  const inputSchema = { ...nodeParam };
4
- async function runCheck(name, command, node) {
5
- try {
6
- const output = await execSSH(command, node);
7
- return { name, status: "pass", detail: output.split("\n")[0] };
8
- }
9
- catch {
10
- return { name, status: "fail", detail: "not available" };
4
+ /** Checks run on the node in a single SSH round trip. Commands are constants. */
5
+ const CHECKS = [
6
+ ["Docker", "docker --version"],
7
+ ["Docker Compose", "docker compose version"],
8
+ ["curl", "command -v curl"],
9
+ ["restic", "command -v restic"],
10
+ ["certbot", "command -v certbot"],
11
+ ["systemd", "systemctl --version"],
12
+ ];
13
+ const MARK = "@@CHECK";
14
+ export function buildHealthCheckScript() {
15
+ return CHECKS.map(([name, cmd]) => `if out=$( { ${cmd}; } 2>&1 ); then s=pass; else s=fail; fi; ` +
16
+ `printf '%s|%s|%s|%s\\n' '${MARK}' "$s" '${name}' "$(printf '%s' "$out" | head -1)"`).join("; ") + "; true";
17
+ }
18
+ export function parseHealthCheckOutput(output) {
19
+ const results = [];
20
+ for (const line of output.split("\n")) {
21
+ if (!line.startsWith(`${MARK}|`))
22
+ continue;
23
+ const rest = line.slice(MARK.length + 1);
24
+ const [status, name, ...detail] = rest.split("|");
25
+ if (status !== "pass" && status !== "fail")
26
+ continue;
27
+ const text = detail.join("|").trim();
28
+ results.push({
29
+ name,
30
+ status,
31
+ detail: text || (status === "pass" ? "ok" : "not available"),
32
+ });
11
33
  }
34
+ return results;
12
35
  }
13
36
  export function register(server) {
14
37
  server.tool("homelab_healthCheck", "Comprehensive self-test: SSH connectivity, Docker, required tools", inputSchema, async (args) => {
38
+ let output;
15
39
  try {
16
- const checks = [];
17
- checks.push(await runCheck("SSH connectivity", "echo ok", args.node));
18
- checks.push(await runCheck("Docker", "docker --version", args.node));
19
- checks.push(await runCheck("Docker Compose", "docker compose version", args.node));
20
- checks.push(await runCheck("curl", "command -v curl", args.node));
21
- checks.push(await runCheck("restic", "command -v restic", args.node));
22
- checks.push(await runCheck("certbot", "command -v certbot", args.node));
23
- checks.push(await runCheck("systemd", "systemctl --version | head -1", args.node));
24
- const passed = checks.filter((c) => c.status === "pass").length;
25
- const lines = checks.map((c) => `[${c.status === "pass" ? "PASS" : "FAIL"}] ${c.name}: ${c.detail}`);
26
- lines.push("", `${passed}/${checks.length} checks passed`);
40
+ output = await execSSH(buildHealthCheckScript(), args.node);
41
+ }
42
+ catch (error) {
43
+ // Every check depends on SSH; report the cause and stop.
44
+ const reason = error instanceof Error ? error.message.split("\n")[0] : String(error);
45
+ const base = errorResponse(error);
27
46
  return {
28
- content: [{ type: "text", text: lines.join("\n") }],
47
+ ...base,
48
+ content: [{
49
+ type: "text",
50
+ text: `[FAIL] SSH connectivity: ${reason}\n\nRemaining checks skipped.`,
51
+ }],
29
52
  };
30
53
  }
31
- catch (error) {
32
- return errorResponse(error);
54
+ const parsed = parseHealthCheckOutput(output);
55
+ if (parsed.length === 0) {
56
+ // For example dry-run mode: show what would have run.
57
+ return { content: [{ type: "text", text: output }] };
33
58
  }
59
+ const checks = [
60
+ { name: "SSH connectivity", status: "pass", detail: "ok" },
61
+ ...parsed,
62
+ ];
63
+ const passed = checks.filter((c) => c.status === "pass").length;
64
+ const lines = checks.map((c) => `[${c.status === "pass" ? "PASS" : "FAIL"}] ${c.name}: ${c.detail}`);
65
+ lines.push("", `${passed}/${checks.length} checks passed`);
66
+ return {
67
+ content: [{ type: "text", text: lines.join("\n") }],
68
+ };
34
69
  });
35
70
  }
36
71
  //# sourceMappingURL=healthCheck.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"healthCheck.js","sourceRoot":"","sources":["../../src/tools/healthCheck.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,WAAW,GAAG,EAAE,GAAG,SAAS,EAAE,CAAC;AAQrC,KAAK,UAAU,QAAQ,CACrB,IAAY,EACZ,OAAe,EACf,IAAa;IAEb,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;IAC3D,CAAC;AACH,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,IAAI,CACT,qBAAqB,EACrB,mEAAmE,EACnE,WAAW,EACX,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,IAAI,CAAC;YACH,MAAM,MAAM,GAAkB,EAAE,CAAC;YAEjC,MAAM,CAAC,IAAI,CAAC,MAAM,QAAQ,CAAC,kBAAkB,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACtE,MAAM,CAAC,IAAI,CAAC,MAAM,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACrE,MAAM,CAAC,IAAI,CACT,MAAM,QAAQ,CAAC,gBAAgB,EAAE,wBAAwB,EAAE,IAAI,CAAC,IAAI,CAAC,CACtE,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,MAAM,QAAQ,CAAC,MAAM,EAAE,iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAClE,MAAM,CAAC,IAAI,CAAC,MAAM,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACtE,MAAM,CAAC,IAAI,CAAC,MAAM,QAAQ,CAAC,SAAS,EAAE,oBAAoB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACxE,MAAM,CAAC,IAAI,CACT,MAAM,QAAQ,CAAC,SAAS,EAAE,+BAA+B,EAAE,IAAI,CAAC,IAAI,CAAC,CACtE,CAAC;YAEF,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,MAAM,CAAC;YAChE,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CACtB,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,MAAM,EAAE,CAC3E,CAAC;YACF,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,MAAM,IAAI,MAAM,CAAC,MAAM,gBAAgB,CAAC,CAAC;YAE3D,OAAO;gBACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;aAC7D,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"healthCheck.js","sourceRoot":"","sources":["../../src/tools/healthCheck.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"journalLogs.d.ts","sourceRoot":"","sources":["../../src/tools/journalLogs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA8BzE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAkBhD"}
1
+ {"version":3,"file":"journalLogs.d.ts","sourceRoot":"","sources":["../../src/tools/journalLogs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA+BzE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAkBhD"}
@@ -22,6 +22,7 @@ const inputSchema = {
22
22
  .number()
23
23
  .int()
24
24
  .positive()
25
+ .max(5000)
25
26
  .optional()
26
27
  .default(50)
27
28
  .describe("Number of journal lines to return"),
@@ -1 +1 @@
1
- {"version":3,"file":"journalLogs.js","sourceRoot":"","sources":["../../src/tools/journalLogs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,WAAW,GAAG;IAClB,GAAG,SAAS;IACZ,IAAI,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,gEAAgE,CAAC;IAC7E,QAAQ,EAAE,CAAC;SACR,MAAM,EAAE;SACR,GAAG,EAAE;SACL,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,EAAE;SACV,QAAQ,CAAC,wEAAwE,CAAC;IACrF,KAAK,EAAE,CAAC;SACL,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,6DAA6D,CAAC;IAC1E,KAAK,EAAE,CAAC;SACL,MAAM,EAAE;SACR,GAAG,EAAE;SACL,QAAQ,EAAE;SACV,QAAQ,EAAE;SACV,OAAO,CAAC,EAAE,CAAC;SACX,QAAQ,CAAC,mCAAmC,CAAC;CACjD,CAAC;AAEF,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,IAAI,CACT,qBAAqB,EACrB,kEAAkE,EAClE,WAAW,EACX,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;YAC/D,IAAI,IAAI,CAAC,IAAI;gBAAE,KAAK,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;YACnD,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS;gBAAE,KAAK,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC3E,IAAI,IAAI,CAAC,KAAK;gBAAE,KAAK,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;YACtD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACzD,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,MAAM,IAAI,yCAAyC,EAAE,CAAC,EAAE,CAAC;QAC7G,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"journalLogs.js","sourceRoot":"","sources":["../../src/tools/journalLogs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,WAAW,GAAG;IAClB,GAAG,SAAS;IACZ,IAAI,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,gEAAgE,CAAC;IAC7E,QAAQ,EAAE,CAAC;SACR,MAAM,EAAE;SACR,GAAG,EAAE;SACL,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,EAAE;SACV,QAAQ,CAAC,wEAAwE,CAAC;IACrF,KAAK,EAAE,CAAC;SACL,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,6DAA6D,CAAC;IAC1E,KAAK,EAAE,CAAC;SACL,MAAM,EAAE;SACR,GAAG,EAAE;SACL,QAAQ,EAAE;SACV,GAAG,CAAC,IAAI,CAAC;SACT,QAAQ,EAAE;SACV,OAAO,CAAC,EAAE,CAAC;SACX,QAAQ,CAAC,mCAAmC,CAAC;CACjD,CAAC;AAEF,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,IAAI,CACT,qBAAqB,EACrB,kEAAkE,EAClE,WAAW,EACX,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;YAC/D,IAAI,IAAI,CAAC,IAAI;gBAAE,KAAK,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;YACnD,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS;gBAAE,KAAK,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC3E,IAAI,IAAI,CAAC,KAAK;gBAAE,KAAK,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;YACtD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACzD,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,MAAM,IAAI,yCAAyC,EAAE,CAAC,EAAE,CAAC;QAC7G,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"logSearch.d.ts","sourceRoot":"","sources":["../../src/tools/logSearch.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAuBzE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAkBhD"}
1
+ {"version":3,"file":"logSearch.d.ts","sourceRoot":"","sources":["../../src/tools/logSearch.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA8BzE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CA2BhD"}
@@ -1,6 +1,7 @@
1
1
  import { z } from "zod";
2
- import { execSSH, errorResponse } from "../utils/ssh-api.js";
2
+ import { execSSH, errorResponse, TIMEOUTS } from "../utils/ssh-api.js";
3
3
  import { nodeParam } from "../utils/node-param.js";
4
+ import { sinceSchema, toDockerSince } from "../utils/since-param.js";
4
5
  const inputSchema = {
5
6
  ...nodeParam,
6
7
  pattern: z
@@ -15,19 +16,32 @@ const inputSchema = {
15
16
  .number()
16
17
  .int()
17
18
  .positive()
19
+ .max(5000)
18
20
  .optional()
19
21
  .default(100)
20
- .describe("Maximum matching lines to return"),
22
+ .describe("Maximum matching lines to return (per container when searching all)"),
23
+ since: sinceSchema("Only search logs newer than this (e.g. 30m, 24h, 7d, or an ISO date). Default 24h")
24
+ .optional()
25
+ .default("24h"),
21
26
  };
22
27
  export function register(server) {
23
28
  server.tool("homelab_logSearch", "Search across Docker container logs with grep patterns", inputSchema, async (args) => {
24
29
  try {
25
30
  const escaped = args.pattern.replace(/'/g, "'\\''");
31
+ // Bound the work: only read logs inside the time window instead of
32
+ // every container's full history. -e keeps patterns that start with
33
+ // "-" from being parsed as grep options.
34
+ const since = `--since ${toDockerSince(args.since)}`;
26
35
  const cmd = args.service
27
- ? `docker logs '${args.service}' 2>&1 | grep -i '${escaped}' | tail -${args.lines}`
28
- : `docker ps --format '{{.Names}}' | while read name; do matches=$(docker logs "$name" 2>&1 | grep -i '${escaped}' | tail -${args.lines}); if [ -n "$matches" ]; then echo "=== $name ==="; echo "$matches"; echo; fi; done`;
29
- const output = await execSSH(cmd, args.node);
30
- return { content: [{ type: "text", text: output || `No matches found for pattern '${args.pattern}'.` }] };
36
+ ? `docker logs ${since} '${args.service}' 2>&1 | grep -i -e '${escaped}' | tail -${args.lines}`
37
+ : `docker ps --format '{{.Names}}' | while read name; do matches=$(docker logs ${since} "$name" 2>&1 | grep -i -e '${escaped}' | tail -${args.lines}); if [ -n "$matches" ]; then echo "=== $name ==="; echo "$matches"; echo; fi; done`;
38
+ const output = await execSSH(cmd, args.node, { timeoutMs: TIMEOUTS.medium });
39
+ return {
40
+ content: [{
41
+ type: "text",
42
+ text: output || `No matches found for pattern '${args.pattern}' in the last ${args.since}.`,
43
+ }],
44
+ };
31
45
  }
32
46
  catch (error) {
33
47
  return errorResponse(error);
@@ -1 +1 @@
1
- {"version":3,"file":"logSearch.js","sourceRoot":"","sources":["../../src/tools/logSearch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,WAAW,GAAG;IAClB,GAAG,SAAS;IACZ,OAAO,EAAE,CAAC;SACP,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,CAAC,8CAA8C,CAAC;IAC3D,OAAO,EAAE,CAAC;SACP,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,sEAAsE,CAAC;IACnF,KAAK,EAAE,CAAC;SACL,MAAM,EAAE;SACR,GAAG,EAAE;SACL,QAAQ,EAAE;SACV,QAAQ,EAAE;SACV,OAAO,CAAC,GAAG,CAAC;SACZ,QAAQ,CAAC,kCAAkC,CAAC;CAChD,CAAC;AAEF,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,IAAI,CACT,mBAAmB,EACnB,wDAAwD,EACxD,WAAW,EACX,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACpD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO;gBACtB,CAAC,CAAC,gBAAgB,IAAI,CAAC,OAAO,qBAAqB,OAAO,aAAa,IAAI,CAAC,KAAK,EAAE;gBACnF,CAAC,CAAC,uGAAuG,OAAO,aAAa,IAAI,CAAC,KAAK,qFAAqF,CAAC;YAC/N,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7C,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,MAAM,IAAI,iCAAiC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;QACrH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"logSearch.js","sourceRoot":"","sources":["../../src/tools/logSearch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAErE,MAAM,WAAW,GAAG;IAClB,GAAG,SAAS;IACZ,OAAO,EAAE,CAAC;SACP,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,CAAC,8CAA8C,CAAC;IAC3D,OAAO,EAAE,CAAC;SACP,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,sEAAsE,CAAC;IACnF,KAAK,EAAE,CAAC;SACL,MAAM,EAAE;SACR,GAAG,EAAE;SACL,QAAQ,EAAE;SACV,GAAG,CAAC,IAAI,CAAC;SACT,QAAQ,EAAE;SACV,OAAO,CAAC,GAAG,CAAC;SACZ,QAAQ,CAAC,qEAAqE,CAAC;IAClF,KAAK,EAAE,WAAW,CAChB,mFAAmF,CACpF;SACE,QAAQ,EAAE;SACV,OAAO,CAAC,KAAK,CAAC;CAClB,CAAC;AAEF,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,IAAI,CACT,mBAAmB,EACnB,wDAAwD,EACxD,WAAW,EACX,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACpD,mEAAmE;YACnE,oEAAoE;YACpE,yCAAyC;YACzC,MAAM,KAAK,GAAG,WAAW,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACrD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO;gBACtB,CAAC,CAAC,eAAe,KAAK,KAAK,IAAI,CAAC,OAAO,wBAAwB,OAAO,aAAa,IAAI,CAAC,KAAK,EAAE;gBAC/F,CAAC,CAAC,+EAA+E,KAAK,+BAA+B,OAAO,aAAa,IAAI,CAAC,KAAK,qFAAqF,CAAC;YAC3O,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;YAC7E,OAAO;gBACL,OAAO,EAAE,CAAC;wBACR,IAAI,EAAE,MAAe;wBACrB,IAAI,EAAE,MAAM,IAAI,iCAAiC,IAAI,CAAC,OAAO,iBAAiB,IAAI,CAAC,KAAK,GAAG;qBAC5F,CAAC;aACH,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"nodeList.d.ts","sourceRoot":"","sources":["../../src/tools/nodeList.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAKzE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CA0BhD"}
1
+ {"version":3,"file":"nodeList.d.ts","sourceRoot":"","sources":["../../src/tools/nodeList.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAOzE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAsChD"}
@@ -1,18 +1,29 @@
1
- import { execSSH, listNodes } from "../utils/ssh-api.js";
1
+ import { execSSH, listNodes, errorResponse } from "../utils/ssh-api.js";
2
2
  const inputSchema = {};
3
+ const PROBE_TIMEOUT_MS = 15_000;
3
4
  export function register(server) {
4
5
  server.tool("homelab_nodeList", "List all managed nodes and their connection status", inputSchema, async () => {
5
- const nodes = listNodes();
6
- const results = [];
7
- for (const node of nodes) {
8
- try {
9
- await execSSH("echo ok", node.name === "default" ? undefined : node.name);
10
- results.push(`${node.name} (${node.host}) -- online`);
11
- }
12
- catch {
13
- results.push(`${node.name} (${node.host}) -- offline`);
14
- }
6
+ let nodes;
7
+ try {
8
+ nodes = listNodes();
15
9
  }
10
+ catch (error) {
11
+ // Invalid HOMELAB_NODES: report it instead of hiding the nodes.
12
+ return errorResponse(error);
13
+ }
14
+ // Probe all nodes in parallel so total time is roughly the slowest
15
+ // node rather than the sum of every connect timeout.
16
+ const probes = await Promise.allSettled(nodes.map((node) => execSSH("echo ok", node.name === "default" ? undefined : node.name, {
17
+ timeoutMs: PROBE_TIMEOUT_MS,
18
+ })));
19
+ const results = nodes.map((node, i) => {
20
+ const probe = probes[i];
21
+ if (probe.status === "fulfilled")
22
+ return `${node.name} (${node.host}) -- online`;
23
+ const error = probe.reason;
24
+ const reason = error instanceof Error ? error.message.split("\n")[0] : String(error);
25
+ return `${node.name} (${node.host}) -- offline (${reason})`;
26
+ });
16
27
  return {
17
28
  content: [{
18
29
  type: "text",
@@ -1 +1 @@
1
- {"version":3,"file":"nodeList.js","sourceRoot":"","sources":["../../src/tools/nodeList.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,IAAI,CACT,kBAAkB,EAClB,oDAAoD,EACpD,WAAW,EACX,KAAK,IAAI,EAAE;QACT,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC;QAC1B,MAAM,OAAO,GAAa,EAAE,CAAC;QAE7B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,MAAM,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC1E,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,aAAa,CAAC,CAAC;YACxD,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,cAAc,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;QAED,OAAO;YACL,OAAO,EAAE,CAAC;oBACR,IAAI,EAAE,MAAe;oBACrB,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,sBAAsB;iBACnD,CAAC;SACH,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"nodeList.js","sourceRoot":"","sources":["../../src/tools/nodeList.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAExE,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAEhC,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,IAAI,CACT,kBAAkB,EAClB,oDAAoD,EACpD,WAAW,EACX,KAAK,IAAI,EAAE;QACT,IAAI,KAAuC,CAAC;QAC5C,IAAI,CAAC;YACH,KAAK,GAAG,SAAS,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,gEAAgE;YAChE,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;QACD,mEAAmE;QACnE,qDAAqD;QACrD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CACrC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACjB,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE;YAClE,SAAS,EAAE,gBAAgB;SAC5B,CAAC,CACH,CACF,CAAC;QACF,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;YACpC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW;gBAAE,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,aAAa,CAAC;YACjF,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;YAC3B,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACrF,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,iBAAiB,MAAM,GAAG,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,OAAO,EAAE,CAAC;oBACR,IAAI,EAAE,MAAe;oBACrB,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,sBAAsB;iBACnD,CAAC;SACH,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"npmCerts.d.ts","sourceRoot":"","sources":["../../src/tools/npmCerts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAgCzE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CA+ChD"}
1
+ {"version":3,"file":"npmCerts.d.ts","sourceRoot":"","sources":["../../src/tools/npmCerts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAOzE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAsBhD"}
@@ -1,51 +1,19 @@
1
- import { execSSH, errorResponse } from "../utils/ssh-api.js";
2
- import { CommandFailedError } from "../utils/errors.js";
1
+ import { execSSH } from "../utils/ssh-api.js";
3
2
  import { nodeParam } from "../utils/node-param.js";
4
- const DEFAULT_PORT = 81;
5
- const SERVICE_NAME = "Nginx Proxy Manager";
6
- function getPort() {
7
- const override = process.env.HOMELAB_NPM_PORT;
8
- return override ? parseInt(override, 10) : DEFAULT_PORT;
9
- }
10
- function getCredentials() {
11
- return {
12
- email: process.env.HOMELAB_NPM_EMAIL || "admin@example.com",
13
- password: process.env.HOMELAB_NPM_PASSWORD || "changeme",
14
- };
15
- }
16
- async function getNpmToken(port, node) {
17
- const { email, password } = getCredentials();
18
- const payload = JSON.stringify({ identity: email, secret: password });
19
- const output = await execSSH(`curl -sf -X POST -H 'Content-Type: application/json' ` +
20
- `-d '${payload}' 'http://localhost:${port}/api/tokens'`, node);
21
- const parsed = JSON.parse(output);
22
- return parsed.token;
23
- }
3
+ import { SERVICES, servicePort, getNpmToken, curlErrorResponse } from "../utils/service-http.js";
4
+ const SERVICE = SERVICES.npm;
24
5
  export function register(server) {
25
6
  server.tool("homelab_npmCerts", "List SSL certificates managed by Nginx Proxy Manager with expiry dates", { ...nodeParam }, async (args) => {
26
- const port = getPort();
7
+ let port = SERVICE.defaultPort;
27
8
  try {
9
+ port = servicePort(SERVICE, args.node);
28
10
  const token = await getNpmToken(port, args.node);
29
11
  const output = await execSSH(`curl -sf -H 'Authorization: Bearer ${token}' ` +
30
12
  `'http://localhost:${port}/api/nginx/certificates'`, args.node);
31
13
  return { content: [{ type: "text", text: output }] };
32
14
  }
33
15
  catch (error) {
34
- if (error instanceof CommandFailedError) {
35
- if (error.exitCode === 7) {
36
- return errorResponse(new Error(`Could not connect to ${SERVICE_NAME} on port ${port}. Is it running? ` +
37
- `Set HOMELAB_NPM_PORT if using a non-default port.`));
38
- }
39
- if (error.exitCode === 22) {
40
- return errorResponse(new Error(`${SERVICE_NAME} returned an HTTP error. Check authentication -- ` +
41
- `set HOMELAB_NPM_EMAIL and HOMELAB_NPM_PASSWORD.`));
42
- }
43
- }
44
- if (error instanceof SyntaxError) {
45
- return errorResponse(new Error(`Failed to parse ${SERVICE_NAME} authentication response. ` +
46
- `Verify HOMELAB_NPM_EMAIL and HOMELAB_NPM_PASSWORD are correct.`));
47
- }
48
- return errorResponse(error);
16
+ return curlErrorResponse(error, SERVICE, port);
49
17
  }
50
18
  });
51
19
  }
@@ -1 +1 @@
1
- {"version":3,"file":"npmCerts.js","sourceRoot":"","sources":["../../src/tools/npmCerts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,YAAY,GAAG,EAAE,CAAC;AACxB,MAAM,YAAY,GAAG,qBAAqB,CAAC;AAE3C,SAAS,OAAO;IACd,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;IAC9C,OAAO,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;AAC1D,CAAC;AAED,SAAS,cAAc;IACrB,OAAO;QACL,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,mBAAmB;QAC3D,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,UAAU;KACzD,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,IAAY,EAAE,IAAa;IACpD,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,cAAc,EAAE,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,MAAM,OAAO,CAC1B,uDAAuD;QACrD,OAAO,OAAO,uBAAuB,IAAI,cAAc,EACzD,IAAI,CACL,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC,KAAK,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,IAAI,CACT,kBAAkB,EAClB,wEAAwE,EACxE,EAAE,GAAG,SAAS,EAAE,EAChB,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACjD,MAAM,MAAM,GAAG,MAAM,OAAO,CAC1B,sCAAsC,KAAK,IAAI;gBAC7C,qBAAqB,IAAI,0BAA0B,EACrD,IAAI,CAAC,IAAI,CACV,CAAC;YAEF,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QAChE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,kBAAkB,EAAE,CAAC;gBACxC,IAAI,KAAK,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;oBACzB,OAAO,aAAa,CAClB,IAAI,KAAK,CACP,wBAAwB,YAAY,YAAY,IAAI,mBAAmB;wBACrE,mDAAmD,CACtD,CACF,CAAC;gBACJ,CAAC;gBACD,IAAI,KAAK,CAAC,QAAQ,KAAK,EAAE,EAAE,CAAC;oBAC1B,OAAO,aAAa,CAClB,IAAI,KAAK,CACP,GAAG,YAAY,mDAAmD;wBAChE,iDAAiD,CACpD,CACF,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;gBACjC,OAAO,aAAa,CAClB,IAAI,KAAK,CACP,mBAAmB,YAAY,4BAA4B;oBACzD,gEAAgE,CACnE,CACF,CAAC;YACJ,CAAC;YACD,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"npmCerts.js","sourceRoot":"","sources":["../../src/tools/npmCerts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAEjG,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC;AAE7B,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,IAAI,CACT,kBAAkB,EAClB,wEAAwE,EACxE,EAAE,GAAG,SAAS,EAAE,EAChB,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,IAAI,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC;QAC/B,IAAI,CAAC;YACH,IAAI,GAAG,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACjD,MAAM,MAAM,GAAG,MAAM,OAAO,CAC1B,sCAAsC,KAAK,IAAI;gBAC7C,qBAAqB,IAAI,0BAA0B,EACrD,IAAI,CAAC,IAAI,CACV,CAAC;YAEF,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QAChE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACjD,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"npmProxyHosts.d.ts","sourceRoot":"","sources":["../../src/tools/npmProxyHosts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAgCzE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CA+ChD"}
1
+ {"version":3,"file":"npmProxyHosts.d.ts","sourceRoot":"","sources":["../../src/tools/npmProxyHosts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAOzE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAsBhD"}
@@ -1,51 +1,19 @@
1
- import { execSSH, errorResponse } from "../utils/ssh-api.js";
2
- import { CommandFailedError } from "../utils/errors.js";
1
+ import { execSSH } from "../utils/ssh-api.js";
3
2
  import { nodeParam } from "../utils/node-param.js";
4
- const DEFAULT_PORT = 81;
5
- const SERVICE_NAME = "Nginx Proxy Manager";
6
- function getPort() {
7
- const override = process.env.HOMELAB_NPM_PORT;
8
- return override ? parseInt(override, 10) : DEFAULT_PORT;
9
- }
10
- function getCredentials() {
11
- return {
12
- email: process.env.HOMELAB_NPM_EMAIL || "admin@example.com",
13
- password: process.env.HOMELAB_NPM_PASSWORD || "changeme",
14
- };
15
- }
16
- async function getNpmToken(port, node) {
17
- const { email, password } = getCredentials();
18
- const payload = JSON.stringify({ identity: email, secret: password });
19
- const output = await execSSH(`curl -sf -X POST -H 'Content-Type: application/json' ` +
20
- `-d '${payload}' 'http://localhost:${port}/api/tokens'`, node);
21
- const parsed = JSON.parse(output);
22
- return parsed.token;
23
- }
3
+ import { SERVICES, servicePort, getNpmToken, curlErrorResponse } from "../utils/service-http.js";
4
+ const SERVICE = SERVICES.npm;
24
5
  export function register(server) {
25
6
  server.tool("homelab_npmProxyHosts", "List all Nginx Proxy Manager proxy host configurations", { ...nodeParam }, async (args) => {
26
- const port = getPort();
7
+ let port = SERVICE.defaultPort;
27
8
  try {
9
+ port = servicePort(SERVICE, args.node);
28
10
  const token = await getNpmToken(port, args.node);
29
11
  const output = await execSSH(`curl -sf -H 'Authorization: Bearer ${token}' ` +
30
12
  `'http://localhost:${port}/api/nginx/proxy-hosts'`, args.node);
31
13
  return { content: [{ type: "text", text: output }] };
32
14
  }
33
15
  catch (error) {
34
- if (error instanceof CommandFailedError) {
35
- if (error.exitCode === 7) {
36
- return errorResponse(new Error(`Could not connect to ${SERVICE_NAME} on port ${port}. Is it running? ` +
37
- `Set HOMELAB_NPM_PORT if using a non-default port.`));
38
- }
39
- if (error.exitCode === 22) {
40
- return errorResponse(new Error(`${SERVICE_NAME} returned an HTTP error. Check authentication -- ` +
41
- `set HOMELAB_NPM_EMAIL and HOMELAB_NPM_PASSWORD.`));
42
- }
43
- }
44
- if (error instanceof SyntaxError) {
45
- return errorResponse(new Error(`Failed to parse ${SERVICE_NAME} authentication response. ` +
46
- `Verify HOMELAB_NPM_EMAIL and HOMELAB_NPM_PASSWORD are correct.`));
47
- }
48
- return errorResponse(error);
16
+ return curlErrorResponse(error, SERVICE, port);
49
17
  }
50
18
  });
51
19
  }
@@ -1 +1 @@
1
- {"version":3,"file":"npmProxyHosts.js","sourceRoot":"","sources":["../../src/tools/npmProxyHosts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,YAAY,GAAG,EAAE,CAAC;AACxB,MAAM,YAAY,GAAG,qBAAqB,CAAC;AAE3C,SAAS,OAAO;IACd,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;IAC9C,OAAO,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;AAC1D,CAAC;AAED,SAAS,cAAc;IACrB,OAAO;QACL,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,mBAAmB;QAC3D,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,UAAU;KACzD,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,IAAY,EAAE,IAAa;IACpD,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,cAAc,EAAE,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,MAAM,OAAO,CAC1B,uDAAuD;QACrD,OAAO,OAAO,uBAAuB,IAAI,cAAc,EACzD,IAAI,CACL,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC,KAAK,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,IAAI,CACT,uBAAuB,EACvB,wDAAwD,EACxD,EAAE,GAAG,SAAS,EAAE,EAChB,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACjD,MAAM,MAAM,GAAG,MAAM,OAAO,CAC1B,sCAAsC,KAAK,IAAI;gBAC7C,qBAAqB,IAAI,yBAAyB,EACpD,IAAI,CAAC,IAAI,CACV,CAAC;YAEF,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QAChE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,kBAAkB,EAAE,CAAC;gBACxC,IAAI,KAAK,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;oBACzB,OAAO,aAAa,CAClB,IAAI,KAAK,CACP,wBAAwB,YAAY,YAAY,IAAI,mBAAmB;wBACrE,mDAAmD,CACtD,CACF,CAAC;gBACJ,CAAC;gBACD,IAAI,KAAK,CAAC,QAAQ,KAAK,EAAE,EAAE,CAAC;oBAC1B,OAAO,aAAa,CAClB,IAAI,KAAK,CACP,GAAG,YAAY,mDAAmD;wBAChE,iDAAiD,CACpD,CACF,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;gBACjC,OAAO,aAAa,CAClB,IAAI,KAAK,CACP,mBAAmB,YAAY,4BAA4B;oBACzD,gEAAgE,CACnE,CACF,CAAC;YACJ,CAAC;YACD,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"npmProxyHosts.js","sourceRoot":"","sources":["../../src/tools/npmProxyHosts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAEjG,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC;AAE7B,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,IAAI,CACT,uBAAuB,EACvB,wDAAwD,EACxD,EAAE,GAAG,SAAS,EAAE,EAChB,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,IAAI,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC;QAC/B,IAAI,CAAC;YACH,IAAI,GAAG,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACjD,MAAM,MAAM,GAAG,MAAM,OAAO,CAC1B,sCAAsC,KAAK,IAAI;gBAC7C,qBAAqB,IAAI,yBAAyB,EACpD,IAAI,CAAC,IAAI,CACV,CAAC;YAEF,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QAChE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACjD,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"ntfySend.d.ts","sourceRoot":"","sources":["../../src/tools/ntfySend.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAqCzE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CA+BhD"}
1
+ {"version":3,"file":"ntfySend.d.ts","sourceRoot":"","sources":["../../src/tools/ntfySend.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA+BzE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAsBhD"}
@@ -1,9 +1,8 @@
1
1
  import { z } from "zod";
2
- import { execSSH, errorResponse } from "../utils/ssh-api.js";
3
- import { CommandFailedError } from "../utils/errors.js";
2
+ import { execSSH } from "../utils/ssh-api.js";
4
3
  import { nodeParam } from "../utils/node-param.js";
5
- const DEFAULT_PORT = 8080;
6
- const SERVICE_NAME = "Ntfy";
4
+ import { SERVICES, servicePort, curlErrorResponse } from "../utils/service-http.js";
5
+ const SERVICE = SERVICES.ntfy;
7
6
  const inputSchema = {
8
7
  ...nodeParam,
9
8
  topic: z
@@ -27,14 +26,11 @@ const inputSchema = {
27
26
  .optional()
28
27
  .describe("Comma-separated tags/emojis (e.g. 'warning,server')"),
29
28
  };
30
- function getPort() {
31
- const override = process.env.HOMELAB_NTFY_PORT;
32
- return override ? parseInt(override, 10) : DEFAULT_PORT;
33
- }
34
29
  export function register(server) {
35
30
  server.tool("homelab_ntfySend", "Send a push notification via Ntfy", inputSchema, async (args) => {
36
- const port = getPort();
31
+ let port = SERVICE.defaultPort;
37
32
  try {
33
+ port = servicePort(SERVICE, args.node);
38
34
  const headers = [];
39
35
  if (args.title)
40
36
  headers.push(`-H 'Title: ${args.title}'`);
@@ -48,13 +44,7 @@ export function register(server) {
48
44
  return { content: [{ type: "text", text: output || `Notification sent to topic '${args.topic}'.` }] };
49
45
  }
50
46
  catch (error) {
51
- if (error instanceof CommandFailedError) {
52
- if (error.exitCode === 7) {
53
- return errorResponse(new Error(`Could not connect to ${SERVICE_NAME} on port ${port}. Is it running? ` +
54
- `Set HOMELAB_NTFY_PORT if using a non-default port.`));
55
- }
56
- }
57
- return errorResponse(error);
47
+ return curlErrorResponse(error, SERVICE, port);
58
48
  }
59
49
  });
60
50
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ntfySend.js","sourceRoot":"","sources":["../../src/tools/ntfySend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,YAAY,GAAG,IAAI,CAAC;AAC1B,MAAM,YAAY,GAAG,MAAM,CAAC;AAE5B,MAAM,WAAW,GAAG;IAClB,GAAG,SAAS;IACZ,KAAK,EAAE,CAAC;SACL,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,CAAC,0BAA0B,CAAC;IACvC,OAAO,EAAE,CAAC;SACP,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,CAAC,2BAA2B,CAAC;IACxC,KAAK,EAAE,CAAC;SACL,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,oBAAoB,CAAC;IACjC,QAAQ,EAAE,CAAC;SACR,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;SACjD,QAAQ,EAAE;SACV,QAAQ,CAAC,6BAA6B,CAAC;IAC1C,IAAI,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,qDAAqD,CAAC;CACnE,CAAC;AAEF,SAAS,OAAO;IACd,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;IAC/C,OAAO,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,IAAI,CACT,kBAAkB,EAClB,mCAAmC,EACnC,WAAW,EACX,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,OAAO,GAAa,EAAE,CAAC;YAC7B,IAAI,IAAI,CAAC,KAAK;gBAAE,OAAO,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;YAC1D,IAAI,IAAI,CAAC,QAAQ;gBAAE,OAAO,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;YACnE,IAAI,IAAI,CAAC,IAAI;gBAAE,OAAO,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;YACvD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACpD,MAAM,GAAG,GAAG,gBAAgB,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,sBAAsB,IAAI,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC;YACrG,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7C,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,MAAM,IAAI,+BAA+B,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,CAAC;QACjH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,kBAAkB,EAAE,CAAC;gBACxC,IAAI,KAAK,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;oBACzB,OAAO,aAAa,CAClB,IAAI,KAAK,CACP,wBAAwB,YAAY,YAAY,IAAI,mBAAmB;wBACrE,oDAAoD,CACvD,CACF,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"ntfySend.js","sourceRoot":"","sources":["../../src/tools/ntfySend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAEpF,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC;AAE9B,MAAM,WAAW,GAAG;IAClB,GAAG,SAAS;IACZ,KAAK,EAAE,CAAC;SACL,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,CAAC,0BAA0B,CAAC;IACvC,OAAO,EAAE,CAAC;SACP,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,CAAC,2BAA2B,CAAC;IACxC,KAAK,EAAE,CAAC;SACL,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,oBAAoB,CAAC;IACjC,QAAQ,EAAE,CAAC;SACR,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;SACjD,QAAQ,EAAE;SACV,QAAQ,CAAC,6BAA6B,CAAC;IAC1C,IAAI,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,qDAAqD,CAAC;CACnE,CAAC;AAEF,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,IAAI,CACT,kBAAkB,EAClB,mCAAmC,EACnC,WAAW,EACX,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,IAAI,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC;QAC/B,IAAI,CAAC;YACH,IAAI,GAAG,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,OAAO,GAAa,EAAE,CAAC;YAC7B,IAAI,IAAI,CAAC,KAAK;gBAAE,OAAO,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;YAC1D,IAAI,IAAI,CAAC,QAAQ;gBAAE,OAAO,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;YACnE,IAAI,IAAI,CAAC,IAAI;gBAAE,OAAO,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;YACvD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACpD,MAAM,GAAG,GAAG,gBAAgB,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,sBAAsB,IAAI,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC;YACrG,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7C,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,MAAM,IAAI,+BAA+B,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,CAAC;QACjH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACjD,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC"}
@@ -1,3 +1,7 @@
1
1
  import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
2
+ /** Ntfy topic names: [-_A-Za-z0-9]{1,64}; several can be joined with commas. */
3
+ export declare const TOPIC_LIST_RE: RegExp;
4
+ /** Resolve the topic list from the argument or HOMELAB_NTFY_TOPICS. */
5
+ export declare function resolveTopics(topic?: string, node?: string): string | null;
2
6
  export declare function register(server: McpServer): void;
3
7
  //# sourceMappingURL=ntfyTopics.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ntfyTopics.d.ts","sourceRoot":"","sources":["../../src/tools/ntfyTopics.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA0BzE,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CA2BhD"}
1
+ {"version":3,"file":"ntfyTopics.d.ts","sourceRoot":"","sources":["../../src/tools/ntfyTopics.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAOzE,gFAAgF;AAChF,eAAO,MAAM,aAAa,QAAiD,CAAC;AAE5E,uEAAuE;AACvE,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI1E;AAmBD,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CA+BhD"}
@@ -1,42 +1,51 @@
1
1
  import { z } from "zod";
2
2
  import { execSSH, errorResponse } from "../utils/ssh-api.js";
3
- import { CommandFailedError } from "../utils/errors.js";
4
3
  import { nodeParam } from "../utils/node-param.js";
5
- const DEFAULT_PORT = 8080;
6
- const SERVICE_NAME = "Ntfy";
4
+ import { SERVICES, servicePort, setting, curlErrorResponse } from "../utils/service-http.js";
5
+ const SERVICE = SERVICES.ntfy;
6
+ /** Ntfy topic names: [-_A-Za-z0-9]{1,64}; several can be joined with commas. */
7
+ export const TOPIC_LIST_RE = /^[-_A-Za-z0-9]{1,64}(,[-_A-Za-z0-9]{1,64})*$/;
8
+ /** Resolve the topic list from the argument or HOMELAB_NTFY_TOPICS. */
9
+ export function resolveTopics(topic, node) {
10
+ const candidate = (topic ?? setting(node, "HOMELAB_NTFY_TOPICS") ?? "").replace(/\s+/g, "");
11
+ if (!candidate)
12
+ return null;
13
+ return TOPIC_LIST_RE.test(candidate) ? candidate : null;
14
+ }
7
15
  const inputSchema = {
8
16
  ...nodeParam,
9
17
  topic: z
10
18
  .string()
19
+ .regex(TOPIC_LIST_RE, "Topic names may only contain letters, digits, '-' and '_' (comma-separate several)")
11
20
  .optional()
12
- .describe("Specific topic to check. Lists all cached messages if omitted"),
21
+ .describe("Topic, or comma-separated topics (e.g. 'alerts,backups'). Defaults to HOMELAB_NTFY_TOPICS. " +
22
+ "Ntfy has no 'all topics' subscription, so at least one topic is required"),
13
23
  since: z
14
24
  .string()
15
25
  .optional()
16
26
  .default("1h")
17
27
  .describe("Time window for recent messages (e.g. '1h', '30m', '1d')"),
18
28
  };
19
- function getPort() {
20
- const override = process.env.HOMELAB_NTFY_PORT;
21
- return override ? parseInt(override, 10) : DEFAULT_PORT;
22
- }
23
29
  export function register(server) {
24
30
  server.tool("homelab_ntfyTopics", "List Ntfy topics and recent messages", inputSchema, async (args) => {
25
- const port = getPort();
31
+ let port = SERVICE.defaultPort;
32
+ let topicPath = null;
26
33
  try {
27
- const topicPath = args.topic || "*";
34
+ port = servicePort(SERVICE, args.node);
35
+ topicPath = resolveTopics(args.topic, args.node);
36
+ if (!topicPath) {
37
+ return errorResponse(new Error("No ntfy topic given. Pass `topic` (one topic or a comma-separated list such as " +
38
+ "'alerts,backups') or set HOMELAB_NTFY_TOPICS. Ntfy has no wildcard subscription for all topics."));
39
+ }
28
40
  const cmd = `curl -sf 'http://localhost:${port}/${topicPath}/json?since=${args.since}&poll=1'`;
29
41
  const output = await execSSH(cmd, args.node);
30
42
  return { content: [{ type: "text", text: output || "No recent messages found." }] };
31
43
  }
32
44
  catch (error) {
33
- if (error instanceof CommandFailedError) {
34
- if (error.exitCode === 7) {
35
- return errorResponse(new Error(`Could not connect to ${SERVICE_NAME} on port ${port}. Is it running? ` +
36
- `Set HOMELAB_NTFY_PORT if using a non-default port.`));
37
- }
38
- }
39
- return errorResponse(error);
45
+ return curlErrorResponse(error, SERVICE, port, {
46
+ httpError: `${SERVICE.name} returned an HTTP error for topic(s) "${topicPath}". Check the topic ` +
47
+ `names, the 'since' value (e.g. 1h, 30m, all), and access control on the server.`,
48
+ });
40
49
  }
41
50
  });
42
51
  }