@tyvm/knowhow 0.0.110 → 0.0.111
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/package.json +1 -1
- package/src/auth/browserLogin.ts +129 -3
- package/src/login.ts +3 -2
- package/src/services/Mcp.ts +14 -1
- package/src/utils/http.ts +9 -2
- package/ts_build/package.json +1 -1
- package/ts_build/src/auth/browserLogin.d.ts +2 -0
- package/ts_build/src/auth/browserLogin.js +91 -3
- package/ts_build/src/auth/browserLogin.js.map +1 -1
- package/ts_build/src/login.js +2 -2
- package/ts_build/src/login.js.map +1 -1
- package/ts_build/src/services/Mcp.js +9 -1
- package/ts_build/src/services/Mcp.js.map +1 -1
- package/ts_build/src/utils/http.d.ts +2 -1
- package/ts_build/src/utils/http.js +11 -2
- package/ts_build/src/utils/http.js.map +1 -1
package/package.json
CHANGED
package/src/auth/browserLogin.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { exec } from "child_process";
|
|
|
3
3
|
import { promisify } from "util";
|
|
4
4
|
import * as os from "os";
|
|
5
5
|
import * as fs from "fs";
|
|
6
|
+
import * as path from "path";
|
|
6
7
|
import { KNOWHOW_API_URL } from "../services/KnowhowClient";
|
|
7
8
|
import { Spinner } from "./spinner";
|
|
8
9
|
import { BrowserLoginError } from "./errors";
|
|
@@ -21,6 +22,8 @@ interface SessionStatusResponse {
|
|
|
21
22
|
|
|
22
23
|
interface RetrieveTokenResponse {
|
|
23
24
|
jwt: string;
|
|
25
|
+
requiresDeviceConfirmation?: boolean;
|
|
26
|
+
jwtSessionId?: string;
|
|
24
27
|
}
|
|
25
28
|
|
|
26
29
|
export class BrowserLoginService {
|
|
@@ -102,9 +105,32 @@ export class BrowserLoginService {
|
|
|
102
105
|
`${this.baseUrl}/api/cli-login/session/${sessionData.sessionId}/token`
|
|
103
106
|
);
|
|
104
107
|
|
|
105
|
-
const
|
|
106
|
-
await this.storeJwt(jwt);
|
|
108
|
+
const tokenData = tokenResponse.data as RetrieveTokenResponse;
|
|
107
109
|
spinner.stop();
|
|
110
|
+
|
|
111
|
+
if (tokenData.requiresDeviceConfirmation) {
|
|
112
|
+
// Token was issued but the device needs confirmation via email code.
|
|
113
|
+
// Store it now so it's ready once confirmed.
|
|
114
|
+
if (tokenData.jwt) {
|
|
115
|
+
await this.storeJwt(tokenData.jwt);
|
|
116
|
+
}
|
|
117
|
+
console.log("\n⚠️ New device detected — device confirmation required!");
|
|
118
|
+
console.log("─────────────────────────────────────────────────────");
|
|
119
|
+
console.log("A confirmation code has been sent to your email.");
|
|
120
|
+
console.log("You must confirm this device in your browser to complete login.");
|
|
121
|
+
console.log("\nPlease check the browser window you just used to approve the CLI session.");
|
|
122
|
+
console.log("Enter the email code there to confirm this device.");
|
|
123
|
+
console.log("\nAlternatively, visit your settings page:");
|
|
124
|
+
console.log(` ${process.env.KNOWHOW_FRONTEND_URL || "https://knowhow.tyvm.ai"}/settings?tab=security`);
|
|
125
|
+
console.log("─────────────────────────────────────────────────────\n");
|
|
126
|
+
|
|
127
|
+
// Wait for the user to confirm the device — poll /api/users/me until
|
|
128
|
+
// the session becomes ACTIVE (device confirmed) or we time out.
|
|
129
|
+
await this.waitForDeviceConfirmation(tokenData.jwt);
|
|
130
|
+
return;
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
await this.storeJwt(tokenData.jwt);
|
|
108
134
|
return;
|
|
109
135
|
} else if (status.status.toLowerCase() === "denied") {
|
|
110
136
|
throw new BrowserLoginError(
|
|
@@ -146,7 +172,8 @@ export class BrowserLoginService {
|
|
|
146
172
|
try {
|
|
147
173
|
const response = await http.post<CreateSessionResponse>(
|
|
148
174
|
`${this.baseUrl}/api/cli-login/session`,
|
|
149
|
-
{}
|
|
175
|
+
{},
|
|
176
|
+
{ headers: { "User-Agent": getCliUserAgent() } }
|
|
150
177
|
);
|
|
151
178
|
return response.data;
|
|
152
179
|
} catch (error) {
|
|
@@ -188,6 +215,83 @@ export class BrowserLoginService {
|
|
|
188
215
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
189
216
|
}
|
|
190
217
|
|
|
218
|
+
/**
|
|
219
|
+
* Poll /api/users/me with the pending JWT until the device confirmation is
|
|
220
|
+
* completed (session becomes ACTIVE) or we time out (~10 minutes).
|
|
221
|
+
* Shows a spinner so the user knows the CLI is still waiting.
|
|
222
|
+
*/
|
|
223
|
+
private async waitForDeviceConfirmation(jwt: string): Promise<void> {
|
|
224
|
+
const spinner = new Spinner();
|
|
225
|
+
spinner.start("Waiting for device confirmation");
|
|
226
|
+
|
|
227
|
+
let isCancelled = false;
|
|
228
|
+
const cancelHandler = () => {
|
|
229
|
+
isCancelled = true;
|
|
230
|
+
spinner.stop();
|
|
231
|
+
console.log("\n\nCancelled. Your token is stored — once you confirm the device, re-run your command.");
|
|
232
|
+
process.exit(0);
|
|
233
|
+
};
|
|
234
|
+
process.once("SIGINT", cancelHandler);
|
|
235
|
+
|
|
236
|
+
const maxAttempts = 120; // 10 minutes at 5-second intervals
|
|
237
|
+
let attempt = 0;
|
|
238
|
+
|
|
239
|
+
while (attempt < maxAttempts) {
|
|
240
|
+
attempt++;
|
|
241
|
+
|
|
242
|
+
// Sleep in small increments so SIGINT can be checked more responsively
|
|
243
|
+
for (let i = 0; i < 10; i++) {
|
|
244
|
+
await this.sleep(500);
|
|
245
|
+
if (isCancelled) return;
|
|
246
|
+
}
|
|
247
|
+
|
|
248
|
+
try {
|
|
249
|
+
const response = await http.get(`${this.baseUrl}/api/users/me`, {
|
|
250
|
+
headers: { Authorization: `Bearer ${jwt}` },
|
|
251
|
+
timeout: 10000,
|
|
252
|
+
});
|
|
253
|
+
|
|
254
|
+
if (response.status === 200) {
|
|
255
|
+
// Device confirmed — session is now ACTIVE
|
|
256
|
+
spinner.stop();
|
|
257
|
+
process.removeListener("SIGINT", cancelHandler);
|
|
258
|
+
console.log("✅ Device confirmed! You are now logged in.");
|
|
259
|
+
return;
|
|
260
|
+
}
|
|
261
|
+
} catch (error) {
|
|
262
|
+
if (http.isHttpError(error)) {
|
|
263
|
+
if (error.status === 403) {
|
|
264
|
+
// Still pending — keep waiting
|
|
265
|
+
continue;
|
|
266
|
+
}
|
|
267
|
+
if (error.status === 401) {
|
|
268
|
+
// 401 can mean:
|
|
269
|
+
// - Session not found yet (timing issue, check-device may not have run)
|
|
270
|
+
// - Session is PENDING_DEVICE_CONFIRMATION (some backend versions return 401)
|
|
271
|
+
// - Token was actually revoked/expired
|
|
272
|
+
// Keep polling for the first ~5 attempts before giving up, to handle timing issues.
|
|
273
|
+
if (attempt >= 10) {
|
|
274
|
+
spinner.stop();
|
|
275
|
+
process.removeListener("SIGINT", cancelHandler);
|
|
276
|
+
throw new BrowserLoginError(
|
|
277
|
+
"Token expired or revoked during device confirmation. Please run 'knowhow login' again.",
|
|
278
|
+
"TOKEN_EXPIRED"
|
|
279
|
+
);
|
|
280
|
+
}
|
|
281
|
+
continue;
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
|
|
287
|
+
spinner.stop();
|
|
288
|
+
process.removeListener("SIGINT", cancelHandler);
|
|
289
|
+
console.log("\n⏰ Timed out waiting for device confirmation.");
|
|
290
|
+
console.log("Your token is stored — once you confirm the device at:");
|
|
291
|
+
console.log(` ${process.env.KNOWHOW_FRONTEND_URL || "https://knowhow.tyvm.ai"}/settings?tab=security`);
|
|
292
|
+
console.log("you can re-run your command and it will work.\n");
|
|
293
|
+
}
|
|
294
|
+
|
|
191
295
|
/**
|
|
192
296
|
* Set up signal handlers for graceful shutdown
|
|
193
297
|
*/
|
|
@@ -201,6 +305,28 @@ export class BrowserLoginService {
|
|
|
201
305
|
}
|
|
202
306
|
}
|
|
203
307
|
|
|
308
|
+
/**
|
|
309
|
+
* Build a descriptive User-Agent string for CLI sessions so they show up
|
|
310
|
+
* with meaningful device info in the sessions UI (e.g. "Knowhow CLI on macOS").
|
|
311
|
+
*/
|
|
312
|
+
export function getCliUserAgent(): string {
|
|
313
|
+
let cliVersion = "unknown";
|
|
314
|
+
try {
|
|
315
|
+
// __dirname is ts_build/src/auth/ at runtime, so go up 3 levels to package root
|
|
316
|
+
const pkgPath = path.resolve(__dirname, "../../../package.json");
|
|
317
|
+
const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
|
|
318
|
+
cliVersion = pkg.version ?? "unknown";
|
|
319
|
+
} catch {
|
|
320
|
+
// ignore — version is cosmetic
|
|
321
|
+
}
|
|
322
|
+
const platform = os.platform();
|
|
323
|
+
const osName =
|
|
324
|
+
platform === "darwin" ? "macOS" :
|
|
325
|
+
platform === "win32" ? "Windows" :
|
|
326
|
+
platform === "linux" ? "Linux" : platform;
|
|
327
|
+
return `Knowhow CLI/${cliVersion} (${osName})`;
|
|
328
|
+
}
|
|
329
|
+
|
|
204
330
|
/**
|
|
205
331
|
* Utility function to open a URL in the default browser across different platforms
|
|
206
332
|
*/
|
package/src/login.ts
CHANGED
|
@@ -74,9 +74,10 @@ export async function login(jwtFlag?: boolean): Promise<void> {
|
|
|
74
74
|
await updateConfig(config);
|
|
75
75
|
} catch (error) {
|
|
76
76
|
if (http.isHttpError(error) && error.response) {
|
|
77
|
-
|
|
77
|
+
// error.body is the parsed JSON response body (set by http.ts when response is not ok)
|
|
78
|
+
const errData = error.body ?? { message: "Unknown error" };
|
|
78
79
|
throw new Error(
|
|
79
|
-
`Error: ${error.status} - ${errData
|
|
80
|
+
`Error: ${error.status} - ${errData?.message || "Unknown error"}`
|
|
80
81
|
);
|
|
81
82
|
}
|
|
82
83
|
console.log(
|
package/src/services/Mcp.ts
CHANGED
|
@@ -528,7 +528,20 @@ export class McpService {
|
|
|
528
528
|
// skip adding tools for unconnected clients
|
|
529
529
|
continue;
|
|
530
530
|
}
|
|
531
|
-
|
|
531
|
+
|
|
532
|
+
let clientTools: Awaited<ReturnType<typeof client.listTools>>;
|
|
533
|
+
try {
|
|
534
|
+
clientTools = await client.listTools();
|
|
535
|
+
} catch (error) {
|
|
536
|
+
// The MCP server connected at the transport level but the underlying
|
|
537
|
+
// server returned an error (e.g. -32603 "Not connected" from the proxy).
|
|
538
|
+
// Mark it as disconnected and skip — don't crash the worker.
|
|
539
|
+
console.warn(
|
|
540
|
+
`⚠ MCP server '${config.name}' failed to list tools (marking as disconnected): ${error instanceof Error ? error.message : error}`
|
|
541
|
+
);
|
|
542
|
+
this.connected[i] = false;
|
|
543
|
+
continue;
|
|
544
|
+
}
|
|
532
545
|
|
|
533
546
|
for (const tool of clientTools.tools) {
|
|
534
547
|
const transformed = this.toOpenAiTool(i, tool as any as McpTool);
|
package/src/utils/http.ts
CHANGED
|
@@ -13,7 +13,8 @@ export class HttpError extends Error {
|
|
|
13
13
|
constructor(
|
|
14
14
|
public status: number,
|
|
15
15
|
public response: Response,
|
|
16
|
-
message: string
|
|
16
|
+
message: string,
|
|
17
|
+
public body?: any,
|
|
17
18
|
) {
|
|
18
19
|
super(message);
|
|
19
20
|
this.name = "HttpError";
|
|
@@ -102,7 +103,13 @@ async function request<T = any>(
|
|
|
102
103
|
|
|
103
104
|
if (!response.ok) {
|
|
104
105
|
const text = await response.text().catch(() => "");
|
|
105
|
-
|
|
106
|
+
let parsedBody: any;
|
|
107
|
+
try {
|
|
108
|
+
parsedBody = JSON.parse(text);
|
|
109
|
+
} catch {
|
|
110
|
+
parsedBody = { message: text };
|
|
111
|
+
}
|
|
112
|
+
throw new HttpError(response.status, response, `HTTP ${response.status}: ${text}`, parsedBody);
|
|
106
113
|
}
|
|
107
114
|
|
|
108
115
|
const data = await parseBody<T>(response, responseType);
|
package/ts_build/package.json
CHANGED
|
@@ -6,7 +6,9 @@ export declare class BrowserLoginService {
|
|
|
6
6
|
private createSession;
|
|
7
7
|
private storeJwt;
|
|
8
8
|
private sleep;
|
|
9
|
+
private waitForDeviceConfirmation;
|
|
9
10
|
private setupSignalHandlers;
|
|
10
11
|
}
|
|
12
|
+
export declare function getCliUserAgent(): string;
|
|
11
13
|
export declare function openBrowser(url: string): Promise<void>;
|
|
12
14
|
export declare function validateJwt(jwt: string): boolean;
|
|
@@ -37,6 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.BrowserLoginService = void 0;
|
|
40
|
+
exports.getCliUserAgent = getCliUserAgent;
|
|
40
41
|
exports.openBrowser = openBrowser;
|
|
41
42
|
exports.validateJwt = validateJwt;
|
|
42
43
|
const http_1 = __importDefault(require("../utils/http"));
|
|
@@ -44,6 +45,7 @@ const child_process_1 = require("child_process");
|
|
|
44
45
|
const util_1 = require("util");
|
|
45
46
|
const os = __importStar(require("os"));
|
|
46
47
|
const fs = __importStar(require("fs"));
|
|
48
|
+
const path = __importStar(require("path"));
|
|
47
49
|
const KnowhowClient_1 = require("../services/KnowhowClient");
|
|
48
50
|
const spinner_1 = require("./spinner");
|
|
49
51
|
const errors_1 = require("./errors");
|
|
@@ -94,9 +96,25 @@ class BrowserLoginService {
|
|
|
94
96
|
spinner.stop();
|
|
95
97
|
spinner.start("Authentication successful! Retrieving token");
|
|
96
98
|
const tokenResponse = await http_1.default.post(`${this.baseUrl}/api/cli-login/session/${sessionData.sessionId}/token`);
|
|
97
|
-
const
|
|
98
|
-
await this.storeJwt(jwt);
|
|
99
|
+
const tokenData = tokenResponse.data;
|
|
99
100
|
spinner.stop();
|
|
101
|
+
if (tokenData.requiresDeviceConfirmation) {
|
|
102
|
+
if (tokenData.jwt) {
|
|
103
|
+
await this.storeJwt(tokenData.jwt);
|
|
104
|
+
}
|
|
105
|
+
console.log("\n⚠️ New device detected — device confirmation required!");
|
|
106
|
+
console.log("─────────────────────────────────────────────────────");
|
|
107
|
+
console.log("A confirmation code has been sent to your email.");
|
|
108
|
+
console.log("You must confirm this device in your browser to complete login.");
|
|
109
|
+
console.log("\nPlease check the browser window you just used to approve the CLI session.");
|
|
110
|
+
console.log("Enter the email code there to confirm this device.");
|
|
111
|
+
console.log("\nAlternatively, visit your settings page:");
|
|
112
|
+
console.log(` ${process.env.KNOWHOW_FRONTEND_URL || "https://knowhow.tyvm.ai"}/settings?tab=security`);
|
|
113
|
+
console.log("─────────────────────────────────────────────────────\n");
|
|
114
|
+
await this.waitForDeviceConfirmation(tokenData.jwt);
|
|
115
|
+
return;
|
|
116
|
+
}
|
|
117
|
+
await this.storeJwt(tokenData.jwt);
|
|
100
118
|
return;
|
|
101
119
|
}
|
|
102
120
|
else if (status.status.toLowerCase() === "denied") {
|
|
@@ -123,7 +141,7 @@ class BrowserLoginService {
|
|
|
123
141
|
}
|
|
124
142
|
async createSession() {
|
|
125
143
|
try {
|
|
126
|
-
const response = await http_1.default.post(`${this.baseUrl}/api/cli-login/session`, {});
|
|
144
|
+
const response = await http_1.default.post(`${this.baseUrl}/api/cli-login/session`, {}, { headers: { "User-Agent": getCliUserAgent() } });
|
|
127
145
|
return response.data;
|
|
128
146
|
}
|
|
129
147
|
catch (error) {
|
|
@@ -145,6 +163,61 @@ class BrowserLoginService {
|
|
|
145
163
|
async sleep(ms) {
|
|
146
164
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
147
165
|
}
|
|
166
|
+
async waitForDeviceConfirmation(jwt) {
|
|
167
|
+
const spinner = new spinner_1.Spinner();
|
|
168
|
+
spinner.start("Waiting for device confirmation");
|
|
169
|
+
let isCancelled = false;
|
|
170
|
+
const cancelHandler = () => {
|
|
171
|
+
isCancelled = true;
|
|
172
|
+
spinner.stop();
|
|
173
|
+
console.log("\n\nCancelled. Your token is stored — once you confirm the device, re-run your command.");
|
|
174
|
+
process.exit(0);
|
|
175
|
+
};
|
|
176
|
+
process.once("SIGINT", cancelHandler);
|
|
177
|
+
const maxAttempts = 120;
|
|
178
|
+
let attempt = 0;
|
|
179
|
+
while (attempt < maxAttempts) {
|
|
180
|
+
attempt++;
|
|
181
|
+
for (let i = 0; i < 10; i++) {
|
|
182
|
+
await this.sleep(500);
|
|
183
|
+
if (isCancelled)
|
|
184
|
+
return;
|
|
185
|
+
}
|
|
186
|
+
try {
|
|
187
|
+
const response = await http_1.default.get(`${this.baseUrl}/api/users/me`, {
|
|
188
|
+
headers: { Authorization: `Bearer ${jwt}` },
|
|
189
|
+
timeout: 10000,
|
|
190
|
+
});
|
|
191
|
+
if (response.status === 200) {
|
|
192
|
+
spinner.stop();
|
|
193
|
+
process.removeListener("SIGINT", cancelHandler);
|
|
194
|
+
console.log("✅ Device confirmed! You are now logged in.");
|
|
195
|
+
return;
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
catch (error) {
|
|
199
|
+
if (http_1.default.isHttpError(error)) {
|
|
200
|
+
if (error.status === 403) {
|
|
201
|
+
continue;
|
|
202
|
+
}
|
|
203
|
+
if (error.status === 401) {
|
|
204
|
+
if (attempt >= 10) {
|
|
205
|
+
spinner.stop();
|
|
206
|
+
process.removeListener("SIGINT", cancelHandler);
|
|
207
|
+
throw new errors_1.BrowserLoginError("Token expired or revoked during device confirmation. Please run 'knowhow login' again.", "TOKEN_EXPIRED");
|
|
208
|
+
}
|
|
209
|
+
continue;
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
spinner.stop();
|
|
215
|
+
process.removeListener("SIGINT", cancelHandler);
|
|
216
|
+
console.log("\n⏰ Timed out waiting for device confirmation.");
|
|
217
|
+
console.log("Your token is stored — once you confirm the device at:");
|
|
218
|
+
console.log(` ${process.env.KNOWHOW_FRONTEND_URL || "https://knowhow.tyvm.ai"}/settings?tab=security`);
|
|
219
|
+
console.log("you can re-run your command and it will work.\n");
|
|
220
|
+
}
|
|
148
221
|
setupSignalHandlers() {
|
|
149
222
|
const gracefulShutdown = () => {
|
|
150
223
|
console.log("\n\nAuthentication cancelled by user.");
|
|
@@ -154,6 +227,21 @@ class BrowserLoginService {
|
|
|
154
227
|
}
|
|
155
228
|
}
|
|
156
229
|
exports.BrowserLoginService = BrowserLoginService;
|
|
230
|
+
function getCliUserAgent() {
|
|
231
|
+
let cliVersion = "unknown";
|
|
232
|
+
try {
|
|
233
|
+
const pkgPath = path.resolve(__dirname, "../../../package.json");
|
|
234
|
+
const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
|
|
235
|
+
cliVersion = pkg.version ?? "unknown";
|
|
236
|
+
}
|
|
237
|
+
catch {
|
|
238
|
+
}
|
|
239
|
+
const platform = os.platform();
|
|
240
|
+
const osName = platform === "darwin" ? "macOS" :
|
|
241
|
+
platform === "win32" ? "Windows" :
|
|
242
|
+
platform === "linux" ? "Linux" : platform;
|
|
243
|
+
return `Knowhow CLI/${cliVersion} (${osName})`;
|
|
244
|
+
}
|
|
157
245
|
async function openBrowser(url) {
|
|
158
246
|
const execAsync = (0, util_1.promisify)(child_process_1.exec);
|
|
159
247
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browserLogin.js","sourceRoot":"","sources":["../../../src/auth/browserLogin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"browserLogin.js","sourceRoot":"","sources":["../../../src/auth/browserLogin.ts"],"names":[],"mappings":"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"}
|
package/ts_build/src/login.js
CHANGED
|
@@ -65,8 +65,8 @@ async function login(jwtFlag) {
|
|
|
65
65
|
}
|
|
66
66
|
catch (error) {
|
|
67
67
|
if (http_1.default.isHttpError(error) && error.response) {
|
|
68
|
-
const errData =
|
|
69
|
-
throw new Error(`Error: ${error.status} - ${errData
|
|
68
|
+
const errData = error.body ?? { message: "Unknown error" };
|
|
69
|
+
throw new Error(`Error: ${error.status} - ${errData?.message || "Unknown error"}`);
|
|
70
70
|
}
|
|
71
71
|
console.log("Error: Unable to fetch user information. Please check your JWT and try again.", error);
|
|
72
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/login.ts"],"names":[],"mappings":";;;;;AASA,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -385,7 +385,15 @@ class McpService {
|
|
|
385
385
|
if (!this.connected[i]) {
|
|
386
386
|
continue;
|
|
387
387
|
}
|
|
388
|
-
|
|
388
|
+
let clientTools;
|
|
389
|
+
try {
|
|
390
|
+
clientTools = await client.listTools();
|
|
391
|
+
}
|
|
392
|
+
catch (error) {
|
|
393
|
+
console.warn(`⚠ MCP server '${config.name}' failed to list tools (marking as disconnected): ${error instanceof Error ? error.message : error}`);
|
|
394
|
+
this.connected[i] = false;
|
|
395
|
+
continue;
|
|
396
|
+
}
|
|
389
397
|
for (const tool of clientTools.tools) {
|
|
390
398
|
const transformed = this.toOpenAiTool(i, tool);
|
|
391
399
|
if (transformed.function.name !== tool.name) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mcp.js","sourceRoot":"","sources":["../../../src/services/Mcp.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Mcp.js","sourceRoot":"","sources":["../../../src/services/Mcp.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,8 @@ export interface HttpResponse<T = any> {
|
|
|
6
6
|
export declare class HttpError extends Error {
|
|
7
7
|
status: number;
|
|
8
8
|
response: Response;
|
|
9
|
-
|
|
9
|
+
body?: any;
|
|
10
|
+
constructor(status: number, response: Response, message: string, body?: any);
|
|
10
11
|
}
|
|
11
12
|
declare function request<T = any>(url: string, options?: {
|
|
12
13
|
method?: string;
|
|
@@ -4,10 +4,12 @@ exports.http = exports.HttpError = void 0;
|
|
|
4
4
|
class HttpError extends Error {
|
|
5
5
|
status;
|
|
6
6
|
response;
|
|
7
|
-
|
|
7
|
+
body;
|
|
8
|
+
constructor(status, response, message, body) {
|
|
8
9
|
super(message);
|
|
9
10
|
this.status = status;
|
|
10
11
|
this.response = response;
|
|
12
|
+
this.body = body;
|
|
11
13
|
this.name = "HttpError";
|
|
12
14
|
}
|
|
13
15
|
}
|
|
@@ -81,7 +83,14 @@ async function request(url, options = {}) {
|
|
|
81
83
|
}
|
|
82
84
|
if (!response.ok) {
|
|
83
85
|
const text = await response.text().catch(() => "");
|
|
84
|
-
|
|
86
|
+
let parsedBody;
|
|
87
|
+
try {
|
|
88
|
+
parsedBody = JSON.parse(text);
|
|
89
|
+
}
|
|
90
|
+
catch {
|
|
91
|
+
parsedBody = { message: text };
|
|
92
|
+
}
|
|
93
|
+
throw new HttpError(response.status, response, `HTTP ${response.status}: ${text}`, parsedBody);
|
|
85
94
|
}
|
|
86
95
|
const data = await parseBody(response, responseType);
|
|
87
96
|
return { data, status: response.status, headers: response.headers };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/utils/http.ts"],"names":[],"mappings":";;;AAWA,MAAa,SAAU,SAAQ,KAAK;IAEzB;IACA;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/utils/http.ts"],"names":[],"mappings":"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"}
|