@padua/cli 2.0.8 → 2.0.10
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 +3 -3
- package/dist/commands/login/mcp-steps.d.ts.map +1 -1
- package/dist/commands/login/mcp-steps.js +23 -2
- package/dist/commands/login/mcp-steps.js.map +1 -1
- package/dist/mcp/daemon/entry.js +112 -42
- package/dist/mcp/daemon/entry.js.map +1 -1
- package/dist/mcp/server/adapter.d.ts +22 -0
- package/dist/mcp/server/adapter.d.ts.map +1 -0
- package/dist/mcp/server/adapter.js +38 -0
- package/dist/mcp/server/adapter.js.map +1 -0
- package/dist/mcp/token/http-client.d.ts.map +1 -1
- package/dist/mcp/token/http-client.js +5 -1
- package/dist/mcp/token/http-client.js.map +1 -1
- package/dist/mcp/token/oauth.js +1 -1
- package/dist/mcp/token/oauth.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -75,7 +75,7 @@ Running `padua login` now performs a 7-step authentication flow:
|
|
|
75
75
|
6. **Atlassian** — OAuth2 authentication
|
|
76
76
|
7. **MCP Daemon** — Start background server on port 8919
|
|
77
77
|
|
|
78
|
-
The MCP daemon runs as a background process and serves tools via HTTP at `http://127.0.0.1:8919/mcp`.
|
|
78
|
+
OAuth tokens are persisted to `~/.padua/tokens.db` (AES-256-GCM encrypted) with the encryption key auto-generated at `~/.padua/encryption.key`. Tokens are automatically refreshed on every MCP tool call — no manual re-authentication needed until the refresh token expires. The MCP daemon runs as a background process and serves tools via HTTP at `http://127.0.0.1:8919/mcp`. Subsequent logins automatically kill any orphaned daemon before starting a fresh one.
|
|
79
79
|
|
|
80
80
|
### Available Tools
|
|
81
81
|
|
|
@@ -144,8 +144,8 @@ This migrates encrypted tokens from the legacy `padua-mcp` database to the new i
|
|
|
144
144
|
| Issue | Solution |
|
|
145
145
|
|-------|----------|
|
|
146
146
|
| Daemon not starting | Run `padua doctor` for diagnostics |
|
|
147
|
-
| Port 8919 in use |
|
|
148
|
-
| Token issues | Delete `~/.padua/tokens.db` and run `padua login` |
|
|
147
|
+
| Port 8919 in use | `padua login` auto-kills orphaned processes; or set `mcp.port` in `~/.padua/padua.config.json` |
|
|
148
|
+
| Token issues | Delete `~/.padua/tokens.db` and `~/.padua/encryption.key`, then run `padua login` |
|
|
149
149
|
| Legacy daemon running | `pkill -f padua-mcp-daemon` |
|
|
150
150
|
|
|
151
151
|
### Downgrade to 1.x
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-steps.d.ts","sourceRoot":"","sources":["../../../src/commands/login/mcp-steps.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAQxC,OAAO,KAAK,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC5G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAWxD;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CA6CrF;
|
|
1
|
+
{"version":3,"file":"mcp-steps.d.ts","sourceRoot":"","sources":["../../../src/commands/login/mcp-steps.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAQxC,OAAO,KAAK,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC5G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAWxD;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CA6CrF;AAwBD;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,oBAAoB,EAC5B,UAAU,CAAC,EAAE,UAAU,GACtB,OAAO,CAAC,aAAa,CAAC,CAyBxB;AAED;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,uBAAuB,EAC/B,UAAU,CAAC,EAAE,UAAU,GACtB,OAAO,CAAC,aAAa,CAAC,CAyBxB;AAMD;;;;;;;GAOG;AACH,wBAAsB,eAAe,CAAC,SAAS,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAyBxF"}
|
|
@@ -64,6 +64,27 @@ async function downloadProvidersConfig(profile) {
|
|
|
64
64
|
};
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
|
+
/**
|
|
68
|
+
* Attempt to reuse an existing token, refreshing it if expired.
|
|
69
|
+
*
|
|
70
|
+
* Returns true when the token is valid (either still fresh or successfully
|
|
71
|
+
* refreshed). Returns false when no token exists or refresh fails — the
|
|
72
|
+
* caller should then run the full browser OAuth flow.
|
|
73
|
+
*/
|
|
74
|
+
async function tryRefreshExisting(tokenManager) {
|
|
75
|
+
if (!tokenManager.isAuthenticated()) {
|
|
76
|
+
return false;
|
|
77
|
+
}
|
|
78
|
+
try {
|
|
79
|
+
await tokenManager.getAccessToken();
|
|
80
|
+
return true;
|
|
81
|
+
}
|
|
82
|
+
catch {
|
|
83
|
+
// Refresh failed (e.g. refresh token itself expired) — fall through to
|
|
84
|
+
// full re-authentication so the caller opens the browser flow.
|
|
85
|
+
return false;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
67
88
|
/**
|
|
68
89
|
* Authenticate to GitLab using the PKCE OAuth flow.
|
|
69
90
|
*
|
|
@@ -79,7 +100,7 @@ async function authenticateGitLab(config, tokenStore) {
|
|
|
79
100
|
const oauthConfig = (0, auth_1.createGitLabOAuthConfig)(config);
|
|
80
101
|
const tokenManager = new manager_1.OAuthTokenManager(oauthConfig, store, 'gitlab', GITLAB_CALLBACK_PORT);
|
|
81
102
|
try {
|
|
82
|
-
if (tokenManager
|
|
103
|
+
if (await tryRefreshExisting(tokenManager)) {
|
|
83
104
|
tokenManager.shutdown();
|
|
84
105
|
return { success: true, skipped: false, duration: Date.now() - start };
|
|
85
106
|
}
|
|
@@ -111,7 +132,7 @@ async function authenticateAtlassian(config, tokenStore) {
|
|
|
111
132
|
const oauthConfig = (0, auth_2.createAtlassianOAuthConfig)(config);
|
|
112
133
|
const tokenManager = new manager_1.OAuthTokenManager(oauthConfig, store, 'atlassian', ATLASSIAN_CALLBACK_PORT);
|
|
113
134
|
try {
|
|
114
|
-
if (tokenManager
|
|
135
|
+
if (await tryRefreshExisting(tokenManager)) {
|
|
115
136
|
tokenManager.shutdown();
|
|
116
137
|
return { success: true, skipped: false, duration: Date.now() - start };
|
|
117
138
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-steps.js","sourceRoot":"","sources":["../../../src/commands/login/mcp-steps.ts"],"names":[],"mappings":";;AA6BA,0DA6CC;
|
|
1
|
+
{"version":3,"file":"mcp-steps.js","sourceRoot":"","sources":["../../../src/commands/login/mcp-steps.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/daemon/entry.js
CHANGED
|
@@ -8,71 +8,141 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
const node_path_1 = require("node:path");
|
|
10
10
|
const node_os_1 = require("node:os");
|
|
11
|
-
const node_fs_1 = require("node:fs");
|
|
12
11
|
const logging_1 = require("../server/logging");
|
|
13
12
|
const server_1 = require("../server/server");
|
|
13
|
+
const adapter_1 = require("../server/adapter");
|
|
14
14
|
const key_1 = require("../store/key");
|
|
15
|
+
const loaders_1 = require("../config/loaders");
|
|
16
|
+
const registry_1 = require("../providers/registry");
|
|
17
|
+
const provider_1 = require("../providers/gitlab/provider");
|
|
18
|
+
const provider_2 = require("../providers/atlassian/provider");
|
|
19
|
+
const auth_1 = require("../providers/gitlab/auth");
|
|
20
|
+
const auth_2 = require("../providers/atlassian/auth");
|
|
21
|
+
const manager_1 = require("../token/manager");
|
|
15
22
|
const entry_logic_1 = require("./entry-logic");
|
|
16
23
|
const port = parseInt(process.env.PADUA_MCP_PORT ?? '8919', 10);
|
|
17
24
|
const bearerToken = process.env.PADUA_MCP_BEARER_TOKEN ?? '';
|
|
18
25
|
const logger = (0, logging_1.createLogger)();
|
|
19
26
|
// Ignore SIGINT — the daemon must not respond to Ctrl-C from the parent terminal.
|
|
20
27
|
process.on('SIGINT', () => { });
|
|
21
|
-
//
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
28
|
+
// ---------------------------------------------------------------------------
|
|
29
|
+
// Composition root: providers, token managers, registry
|
|
30
|
+
// ---------------------------------------------------------------------------
|
|
31
|
+
/** Token managers keyed by provider name, for health queries. */
|
|
32
|
+
const tokenManagers = new Map();
|
|
33
|
+
const registry = new registry_1.ProviderRegistry();
|
|
34
|
+
/** Providers config — which providers are configured. */
|
|
35
|
+
const configuredProviders = new Set();
|
|
27
36
|
/**
|
|
28
|
-
*
|
|
29
|
-
* Returns
|
|
37
|
+
* Build providers from mcp-providers.json config.
|
|
38
|
+
* Returns the TokenStore if one was opened (must be closed on shutdown).
|
|
30
39
|
*/
|
|
40
|
+
function wireProviders() {
|
|
41
|
+
const providersConfig = (0, loaders_1.loadProvidersConfig)();
|
|
42
|
+
if (!providersConfig) {
|
|
43
|
+
logger.info('No mcp-providers.json found — no providers registered');
|
|
44
|
+
return null;
|
|
45
|
+
}
|
|
46
|
+
const hexKey = (0, key_1.resolveEncryptionKey)();
|
|
47
|
+
if (!hexKey) {
|
|
48
|
+
logger.warn('No encryption key available — cannot open token store');
|
|
49
|
+
return null;
|
|
50
|
+
}
|
|
51
|
+
const dbPath = (0, node_path_1.join)((0, node_os_1.homedir)(), '.padua', 'tokens.db');
|
|
52
|
+
// Dynamic require avoids pulling better-sqlite3 eagerly on import.
|
|
53
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
54
|
+
const { SqliteTokenStore } = require('../store/sqlite');
|
|
55
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
56
|
+
const { createEncryptor } = require('../store/encrypt');
|
|
57
|
+
const store = SqliteTokenStore.create(dbPath, createEncryptor(hexKey));
|
|
58
|
+
// GitLab
|
|
59
|
+
if (providersConfig.providers.gitlab) {
|
|
60
|
+
const gitlabConfig = providersConfig.providers.gitlab;
|
|
61
|
+
const oauthConfig = (0, auth_1.createGitLabOAuthConfig)(gitlabConfig);
|
|
62
|
+
const tm = new manager_1.OAuthTokenManager(oauthConfig, store, 'gitlab', gitlabConfig.redirectPort ?? 18080);
|
|
63
|
+
const provider = new provider_1.GitLabProvider(gitlabConfig, tm);
|
|
64
|
+
registry.register(provider);
|
|
65
|
+
tokenManagers.set('gitlab', tm);
|
|
66
|
+
configuredProviders.add('gitlab');
|
|
67
|
+
logger.info('GitLab provider registered');
|
|
68
|
+
}
|
|
69
|
+
// Atlassian
|
|
70
|
+
if (providersConfig.providers.atlassian) {
|
|
71
|
+
const atlassianConfig = providersConfig.providers.atlassian;
|
|
72
|
+
const oauthConfig = (0, auth_2.createAtlassianOAuthConfig)(atlassianConfig);
|
|
73
|
+
const tm = new manager_1.OAuthTokenManager(oauthConfig, store, 'atlassian', atlassianConfig.redirectPort ?? 18080);
|
|
74
|
+
const provider = new provider_2.AtlassianProvider(atlassianConfig, tm);
|
|
75
|
+
registry.register(provider);
|
|
76
|
+
tokenManagers.set('atlassian', tm);
|
|
77
|
+
configuredProviders.add('atlassian');
|
|
78
|
+
logger.info('Atlassian provider registered');
|
|
79
|
+
}
|
|
80
|
+
return store;
|
|
81
|
+
}
|
|
82
|
+
// ---------------------------------------------------------------------------
|
|
83
|
+
// Provider health for the /health endpoint
|
|
84
|
+
// ---------------------------------------------------------------------------
|
|
31
85
|
function getProviderStatuses() {
|
|
32
86
|
const statuses = {};
|
|
33
|
-
|
|
34
|
-
const
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
}
|
|
39
|
-
// Dynamic require avoids pulling better-sqlite3 eagerly on import.
|
|
40
|
-
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
41
|
-
const { SqliteTokenStore } = require('../store/sqlite');
|
|
42
|
-
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
43
|
-
const { createEncryptor } = require('../store/encrypt');
|
|
44
|
-
const store = SqliteTokenStore.create(dbPath, createEncryptor(hexKey));
|
|
45
|
-
const nowSec = Math.floor(Date.now() / 1000);
|
|
46
|
-
try {
|
|
47
|
-
for (const provider of ['gitlab', 'atlassian']) {
|
|
48
|
-
const token = store.get(provider);
|
|
49
|
-
if (!token) {
|
|
50
|
-
statuses[provider] = 'not_configured';
|
|
51
|
-
}
|
|
52
|
-
else if (token.expiresAt <= nowSec) {
|
|
53
|
-
statuses[provider] = 'error';
|
|
54
|
-
}
|
|
55
|
-
else {
|
|
56
|
-
statuses[provider] = 'ready';
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
finally {
|
|
61
|
-
store.close();
|
|
87
|
+
for (const name of ['gitlab', 'atlassian']) {
|
|
88
|
+
const tm = tokenManagers.get(name);
|
|
89
|
+
if (!tm || !configuredProviders.has(name)) {
|
|
90
|
+
statuses[name] = 'not_configured';
|
|
91
|
+
continue;
|
|
62
92
|
}
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
return { gitlab: 'error', atlassian: 'error' };
|
|
93
|
+
const status = tm.getTokenStatus();
|
|
94
|
+
statuses[name] = status.authenticated ? 'ready' : 'error';
|
|
66
95
|
}
|
|
67
96
|
return statuses;
|
|
68
97
|
}
|
|
98
|
+
// ---------------------------------------------------------------------------
|
|
99
|
+
// Main
|
|
100
|
+
// ---------------------------------------------------------------------------
|
|
69
101
|
async function main() {
|
|
70
102
|
logger.info('Daemon starting', { pid: process.pid, port });
|
|
71
103
|
const version = (0, entry_logic_1.getPackageVersion)();
|
|
104
|
+
const tokenStore = wireProviders();
|
|
72
105
|
const server = (0, server_1.createMcpServer)({ port, bearerToken, version }, getProviderStatuses);
|
|
106
|
+
// Register all provider tools and resources on the MCP server.
|
|
107
|
+
const adapter = new adapter_1.McpServerAdapter(server.mcpServer);
|
|
108
|
+
registry.registerAll(adapter);
|
|
109
|
+
// Start the HTTP + MCP transport.
|
|
73
110
|
await server.start();
|
|
111
|
+
// Check provider readiness (non-blocking — failures are logged, not fatal).
|
|
112
|
+
const readyResults = await registry.readyAll();
|
|
113
|
+
for (const result of readyResults) {
|
|
114
|
+
if (result.ready) {
|
|
115
|
+
logger.info(`Provider ready: ${result.name}`);
|
|
116
|
+
}
|
|
117
|
+
else {
|
|
118
|
+
logger.warn(`Provider not ready: ${result.name}`, { error: result.error?.message });
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
// Graceful shutdown: clean up providers, store, and daemon files.
|
|
122
|
+
process.on('SIGTERM', async () => {
|
|
123
|
+
logger.info('Shutting down daemon...');
|
|
124
|
+
try {
|
|
125
|
+
await registry.shutdownAll();
|
|
126
|
+
}
|
|
127
|
+
catch (err) {
|
|
128
|
+
logger.warn('Provider shutdown error', { error: String(err) });
|
|
129
|
+
}
|
|
130
|
+
if (tokenStore) {
|
|
131
|
+
try {
|
|
132
|
+
tokenStore.close();
|
|
133
|
+
}
|
|
134
|
+
catch { /* already closed */ }
|
|
135
|
+
}
|
|
136
|
+
(0, entry_logic_1.cleanupOnShutdown)(process.pid);
|
|
137
|
+
process.exit(0);
|
|
138
|
+
});
|
|
74
139
|
const startupFilePath = (0, entry_logic_1.writeStartupFile)(process.pid, port);
|
|
75
|
-
logger.info('Daemon ready', {
|
|
140
|
+
logger.info('Daemon ready', {
|
|
141
|
+
port,
|
|
142
|
+
startupFile: startupFilePath,
|
|
143
|
+
version,
|
|
144
|
+
providers: Array.from(configuredProviders),
|
|
145
|
+
});
|
|
76
146
|
}
|
|
77
147
|
main().catch((err) => {
|
|
78
148
|
logger.error('Daemon failed to start', { error: String(err) });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entry.js","sourceRoot":"","sources":["../../../src/mcp/daemon/entry.ts"],"names":[],"mappings":";;AACA;;;;GAIG;;AAEH,yCAAiC;AACjC,qCAAkC;AAClC
|
|
1
|
+
{"version":3,"file":"entry.js","sourceRoot":"","sources":["../../../src/mcp/daemon/entry.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Adapter that bridges the MCP SDK's McpServer to the ToolRegistrar port.
|
|
3
|
+
*
|
|
4
|
+
* Providers depend on ToolRegistrar (no MCP SDK import). This adapter is the
|
|
5
|
+
* single place where the SDK dependency enters the tool registration path.
|
|
6
|
+
*/
|
|
7
|
+
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
|
|
8
|
+
import type { ToolRegistrar } from '../providers/types';
|
|
9
|
+
/**
|
|
10
|
+
* Adapts McpServer to the ToolRegistrar interface used by providers.
|
|
11
|
+
*
|
|
12
|
+
* - registerTool delegates to McpServer.registerTool()
|
|
13
|
+
* - registerResource delegates to McpServer.registerResource() with a
|
|
14
|
+
* ResourceTemplate for URI-templated resources
|
|
15
|
+
*/
|
|
16
|
+
export declare class McpServerAdapter implements ToolRegistrar {
|
|
17
|
+
private readonly mcpServer;
|
|
18
|
+
constructor(mcpServer: McpServer);
|
|
19
|
+
registerTool(name: string, schema: unknown, handler: unknown): void;
|
|
20
|
+
registerResource(template: unknown, handler: unknown): void;
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=adapter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/mcp/server/adapter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAcxD;;;;;;GAMG;AACH,qBAAa,gBAAiB,YAAW,aAAa;IACxC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAEjD,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAanE,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;CAU5D"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Adapter that bridges the MCP SDK's McpServer to the ToolRegistrar port.
|
|
4
|
+
*
|
|
5
|
+
* Providers depend on ToolRegistrar (no MCP SDK import). This adapter is the
|
|
6
|
+
* single place where the SDK dependency enters the tool registration path.
|
|
7
|
+
*/
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.McpServerAdapter = void 0;
|
|
10
|
+
const mcp_js_1 = require("@modelcontextprotocol/sdk/server/mcp.js");
|
|
11
|
+
/**
|
|
12
|
+
* Adapts McpServer to the ToolRegistrar interface used by providers.
|
|
13
|
+
*
|
|
14
|
+
* - registerTool delegates to McpServer.registerTool()
|
|
15
|
+
* - registerResource delegates to McpServer.registerResource() with a
|
|
16
|
+
* ResourceTemplate for URI-templated resources
|
|
17
|
+
*/
|
|
18
|
+
class McpServerAdapter {
|
|
19
|
+
mcpServer;
|
|
20
|
+
constructor(mcpServer) {
|
|
21
|
+
this.mcpServer = mcpServer;
|
|
22
|
+
}
|
|
23
|
+
registerTool(name, schema, handler) {
|
|
24
|
+
const s = schema;
|
|
25
|
+
this.mcpServer.registerTool(name, {
|
|
26
|
+
description: s.description,
|
|
27
|
+
inputSchema: s.inputSchema,
|
|
28
|
+
annotations: s.annotations,
|
|
29
|
+
}, handler);
|
|
30
|
+
}
|
|
31
|
+
registerResource(template, handler) {
|
|
32
|
+
const t = template;
|
|
33
|
+
const resourceTemplate = new mcp_js_1.ResourceTemplate(t.uriTemplate, { list: undefined });
|
|
34
|
+
this.mcpServer.registerResource(t.name, resourceTemplate, { description: t.description }, handler);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
exports.McpServerAdapter = McpServerAdapter;
|
|
38
|
+
//# sourceMappingURL=adapter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/mcp/server/adapter.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,oEAA2E;AAe3E;;;;;;GAMG;AACH,MAAa,gBAAgB;IACE;IAA7B,YAA6B,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAErD,YAAY,CAAC,IAAY,EAAE,MAAe,EAAE,OAAgB;QAC1D,MAAM,CAAC,GAAG,MAAoB,CAAC;QAC/B,IAAI,CAAC,SAAS,CAAC,YAAY,CACzB,IAAI,EACJ;YACE,WAAW,EAAE,CAAC,CAAC,WAAW;YAC1B,WAAW,EAAE,CAAC,CAAC,WAAsE;YACrF,WAAW,EAAE,CAAC,CAAC,WAAsE;SACtF,EACD,OAAmD,CACpD,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,QAAiB,EAAE,OAAgB;QAClD,MAAM,CAAC,GAAG,QAAkC,CAAC;QAC7C,MAAM,gBAAgB,GAAG,IAAI,yBAAgB,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAClF,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAC7B,CAAC,CAAC,IAAI,EACN,gBAAgB,EAChB,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,EAC9B,OAAuD,CACxD,CAAC;IACJ,CAAC;CACF;AA1BD,4CA0BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-client.d.ts","sourceRoot":"","sources":["../../../src/mcp/token/http-client.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,EAAe,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"http-client.d.ts","sourceRoot":"","sources":["../../../src/mcp/token/http-client.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,EAAe,MAAM,SAAS,CAAC;AAqLtF,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,YAAY,GAAG,SAAS,CAgEhG"}
|
|
@@ -12,7 +12,11 @@ const PROVIDER = 'http-client';
|
|
|
12
12
|
// Low-level request
|
|
13
13
|
// ---------------------------------------------------------------------------
|
|
14
14
|
function buildUrl(baseUrl, path, params) {
|
|
15
|
-
|
|
15
|
+
// Ensure baseUrl ends with '/' and path is relative so URL resolution
|
|
16
|
+
// appends to the base path (e.g. /api/v4) instead of replacing it.
|
|
17
|
+
const normalizedBase = baseUrl.endsWith('/') ? baseUrl : baseUrl + '/';
|
|
18
|
+
const normalizedPath = path.startsWith('/') ? path.slice(1) : path;
|
|
19
|
+
const url = new node_url_1.URL(normalizedPath, normalizedBase);
|
|
16
20
|
if (params) {
|
|
17
21
|
for (const [key, value] of Object.entries(params)) {
|
|
18
22
|
url.searchParams.set(key, value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../../src/mcp/token/http-client.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../../src/mcp/token/http-client.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/token/oauth.js
CHANGED
|
@@ -225,7 +225,7 @@ function startCallbackServer(port, expectedState, timeoutMs = DEFAULT_TIMEOUT_MS
|
|
|
225
225
|
}
|
|
226
226
|
if (code) {
|
|
227
227
|
res.writeHead(200, { 'Content-Type': 'text/html' });
|
|
228
|
-
res.end('<html><body><h1>Authentication successful</h1><p>
|
|
228
|
+
res.end('<html><body><h1>Authentication successful</h1><p>This tab will close automatically.</p><script>window.close()</script></body></html>');
|
|
229
229
|
settle(() => resolve({ code, state }), server);
|
|
230
230
|
return;
|
|
231
231
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../src/mcp/token/oauth.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../src/mcp/token/oauth.ts"],"names":[],"mappings":"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"}
|