anki-mcp-http 0.22.0 → 0.22.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/tunnel/commands/login.command.js +1 -6
- package/dist/tunnel/commands/login.command.js.map +1 -1
- package/dist/tunnel/commands/perform-login.d.ts +1 -0
- package/dist/tunnel/commands/perform-login.js +10 -0
- package/dist/tunnel/commands/perform-login.js.map +1 -1
- package/dist/tunnel/commands/tunnel.command.js +46 -22
- package/dist/tunnel/commands/tunnel.command.js.map +1 -1
- package/dist/tunnel/tunnel.client.d.ts +3 -0
- package/dist/tunnel/tunnel.client.js +48 -2
- package/dist/tunnel/tunnel.client.js.map +1 -1
- package/package.json +1 -1
|
@@ -16,12 +16,7 @@ async function handleLogin(cli, tunnelUrl) {
|
|
|
16
16
|
}
|
|
17
17
|
catch (error) {
|
|
18
18
|
cli.blank();
|
|
19
|
-
|
|
20
|
-
cli.error((0, perform_login_1.translateDeviceFlowError)(error));
|
|
21
|
-
}
|
|
22
|
-
else {
|
|
23
|
-
cli.error(`Login failed: ${error instanceof Error ? error.message : String(error)}`, error instanceof Error ? error : undefined);
|
|
24
|
-
}
|
|
19
|
+
(0, perform_login_1.reportLoginError)(cli, error);
|
|
25
20
|
cli.blank();
|
|
26
21
|
process.exit(1);
|
|
27
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.command.js","sourceRoot":"","sources":["../../../src/tunnel/commands/login.command.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"login.command.js","sourceRoot":"","sources":["../../../src/tunnel/commands/login.command.ts"],"names":[],"mappings":";;AAsBA,kCAgBC;AAtCD,+BAAiE;AACjE,iEAAwD;AACxD,yCAA+C;AAE/C,mDAAiE;AAkB1D,KAAK,UAAU,WAAW,CAAC,GAAQ,EAAE,SAAkB;IAC5D,MAAM,kBAAkB,GAAG,IAAI,2BAAkB,EAAE,CAAC;IACpD,MAAM,eAAe,GAAG,IAAA,4BAAmB,EAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IACnE,MAAM,gBAAgB,GAAG,IAAI,qCAAgB,CAAC,eAAe,CAAC,CAAC;IAC/D,MAAM,iBAAiB,GAAG,IAAI,0BAAiB,CAAC,gBAAgB,CAAC,CAAC;IAElE,GAAG,CAAC,KAAK,EAAE,CAAC;IAEZ,IAAI,CAAC;QACH,MAAM,IAAA,4BAAY,EAAC,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,EAAE,CAAC,CAAC;IACrE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,KAAK,EAAE,CAAC;QACZ,IAAA,gCAAgB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7B,GAAG,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}
|
|
@@ -6,4 +6,5 @@ export interface PerformLoginDeps {
|
|
|
6
6
|
cli: Cli;
|
|
7
7
|
}
|
|
8
8
|
export declare function translateDeviceFlowError(error: DeviceFlowError): string;
|
|
9
|
+
export declare function reportLoginError(cli: Cli, error: unknown): void;
|
|
9
10
|
export declare function performLogin(deps: PerformLoginDeps): Promise<TunnelCredentials>;
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.translateDeviceFlowError = translateDeviceFlowError;
|
|
4
|
+
exports.reportLoginError = reportLoginError;
|
|
4
5
|
exports.performLogin = performLogin;
|
|
6
|
+
const tunnel_1 = require("..");
|
|
5
7
|
const spinner_1 = require("../../cli/spinner");
|
|
6
8
|
const child_process_1 = require("child_process");
|
|
7
9
|
const util_1 = require("util");
|
|
@@ -36,6 +38,14 @@ function translateDeviceFlowError(error) {
|
|
|
36
38
|
return `Authentication failed: ${error.message}`;
|
|
37
39
|
}
|
|
38
40
|
}
|
|
41
|
+
function reportLoginError(cli, error) {
|
|
42
|
+
if (error instanceof tunnel_1.DeviceFlowError) {
|
|
43
|
+
cli.error(translateDeviceFlowError(error));
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
cli.error(`Login failed: ${error instanceof Error ? error.message : String(error)}`, error instanceof Error ? error : undefined);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
39
49
|
async function performLogin(deps) {
|
|
40
50
|
const { credentialsService, deviceFlowService, cli } = deps;
|
|
41
51
|
const deviceCode = await deviceFlowService.requestDeviceCode();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"perform-login.js","sourceRoot":"","sources":["../../../src/tunnel/commands/perform-login.ts"],"names":[],"mappings":";;AAgEA,4DAYC;AAuBD,oCAyDC;
|
|
1
|
+
{"version":3,"file":"perform-login.js","sourceRoot":"","sources":["../../../src/tunnel/commands/perform-login.ts"],"names":[],"mappings":"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"}
|
|
@@ -78,12 +78,7 @@ async function ensureCredentials(cli, credentialsService, deviceFlowService) {
|
|
|
78
78
|
}
|
|
79
79
|
catch (error) {
|
|
80
80
|
cli.blank();
|
|
81
|
-
|
|
82
|
-
cli.error((0, perform_login_1.translateDeviceFlowError)(error));
|
|
83
|
-
}
|
|
84
|
-
else {
|
|
85
|
-
cli.error(`Login failed: ${error instanceof Error ? error.message : String(error)}`, error instanceof Error ? error : undefined);
|
|
86
|
-
}
|
|
81
|
+
(0, perform_login_1.reportLoginError)(cli, error);
|
|
87
82
|
cli.blank();
|
|
88
83
|
process.exit(1);
|
|
89
84
|
}
|
|
@@ -171,26 +166,55 @@ async function handleTunnel(cli, tunnelUrl, debug, readOnly) {
|
|
|
171
166
|
cli.error(`Tunnel error: ${error.message}`, error);
|
|
172
167
|
}
|
|
173
168
|
});
|
|
174
|
-
|
|
169
|
+
let connectSpinner = (0, spinner_1.startSpinner)("Connecting to tunnel service...");
|
|
175
170
|
let publicUrl;
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
171
|
+
let connectCredentials = credentials;
|
|
172
|
+
let reloginAttempted = false;
|
|
173
|
+
for (;;) {
|
|
174
|
+
try {
|
|
175
|
+
publicUrl = await tunnelClient.connect(connectCredentials);
|
|
176
|
+
connectSpinner();
|
|
177
|
+
cli.success("Tunnel established");
|
|
178
|
+
cli.blank();
|
|
179
|
+
break;
|
|
180
|
+
}
|
|
181
|
+
catch (error) {
|
|
182
|
+
connectSpinner();
|
|
183
|
+
const isSessionExpired = error instanceof tunnel_1.TunnelClientError &&
|
|
184
|
+
error.code === "session_expired";
|
|
185
|
+
if (isSessionExpired && !reloginAttempted && process.stdout.isTTY) {
|
|
186
|
+
reloginAttempted = true;
|
|
187
|
+
cli.blank();
|
|
188
|
+
cli.info("Session expired — re-authenticating...");
|
|
189
|
+
cli.blank();
|
|
190
|
+
let freshCredentials;
|
|
191
|
+
try {
|
|
192
|
+
freshCredentials = await (0, perform_login_1.performLogin)({
|
|
193
|
+
credentialsService,
|
|
194
|
+
deviceFlowService,
|
|
195
|
+
cli,
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
catch (loginError) {
|
|
199
|
+
cli.blank();
|
|
200
|
+
(0, perform_login_1.reportLoginError)(cli, loginError);
|
|
201
|
+
cli.blank();
|
|
202
|
+
return await gracefulExit(1);
|
|
203
|
+
}
|
|
204
|
+
connectCredentials = freshCredentials;
|
|
205
|
+
connectSpinner = (0, spinner_1.startSpinner)("Connecting to tunnel service...");
|
|
206
|
+
continue;
|
|
207
|
+
}
|
|
208
|
+
if (isSessionExpired) {
|
|
209
|
+
cli.blank();
|
|
210
|
+
cli.error(error.message);
|
|
211
|
+
return await gracefulExit(1);
|
|
212
|
+
}
|
|
213
|
+
const errorMessage = formatConnectionError(error, effectiveTunnelUrl);
|
|
214
|
+
cli.error(errorMessage, error instanceof Error ? error : undefined);
|
|
186
215
|
cli.blank();
|
|
187
|
-
cli.error(error.message);
|
|
188
216
|
return await gracefulExit(1);
|
|
189
217
|
}
|
|
190
|
-
const errorMessage = formatConnectionError(error, effectiveTunnelUrl);
|
|
191
|
-
cli.error(errorMessage, error instanceof Error ? error : undefined);
|
|
192
|
-
cli.blank();
|
|
193
|
-
return await gracefulExit(1);
|
|
194
218
|
}
|
|
195
219
|
printTunnelBoxes(cli, publicUrl);
|
|
196
220
|
cli.info("Tunnel is active. Press Ctrl+C to disconnect.");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel.command.js","sourceRoot":"","sources":["../../../src/tunnel/commands/tunnel.command.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"tunnel.command.js","sourceRoot":"","sources":["../../../src/tunnel/commands/tunnel.command.ts"],"names":[],"mappings":";;AA+CA,gDAIC;AA+ID,oCA6TC;AA/fD,uCAA2C;AAC3C,2CAAsE;AACtE,iDAAyC;AACzC,+BAOkB;AAClB,8DAA+D;AAC/D,iEAAwD;AACxD,yCAA+C;AAC/C,qDAA0D;AAC1D,+CAA6C;AAC7C,+CAIqB;AACrB,mDAAiE;AAKjE,SAAS,UAAU,CAAC,GAAQ,EAAE,KAAa,EAAE,GAAW;IACtD,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACtB,CAAC;AAmBD,SAAgB,kBAAkB,CAAC,SAAiB;IAClD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IAC/B,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACzD,OAAO,GAAG,CAAC,MAAM,CAAC;AACpB,CAAC;AAOD,SAAS,gBAAgB,CAAC,GAAQ,EAAE,SAAiB;IACnD,UAAU,CAAC,GAAG,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;IAC5C,GAAG,CAAC,KAAK,EAAE,CAAC;IACZ,UAAU,CAAC,GAAG,EAAE,cAAc,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;IAC/D,GAAG,CAAC,KAAK,EAAE,CAAC;AACd,CAAC;AASD,SAAS,qBAAqB,CAAC,KAAc,EAAE,SAAiB;IAE9D,IAAI,KAAK,YAAY,0BAAiB,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;QAC9D,MAAM,SAAS,GAAG,KAAK,CAAC,aAAkC,CAAC;QAC3D,IAAI,SAAS,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YACtC,OAAO,sCAAsC,SAAS;2CACjB,CAAC;QACxC,CAAC;IACH,CAAC;IAGD,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,IACE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;YACtC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAC9C,CAAC;YACD,OAAO,sCAAsC,SAAS;2CACjB,CAAC;QACxC,CAAC;QAGD,IACE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;YACjC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAC5C,CAAC;YACD,OAAO,yBAAyB,SAAS;4DACa,CAAC;QACzD,CAAC;QAGD,IACE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;YACtC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC7B,CAAC;YACD,OAAO;6EACgE,CAAC;QAC1E,CAAC;IACH,CAAC;IAGD,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvE,OAAO,sBAAsB,OAAO,EAAE,CAAC;AACzC,CAAC;AAeD,KAAK,UAAU,iBAAiB,CAC9B,GAAQ,EACR,kBAAsC,EACtC,iBAAoC;IAEpC,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,eAAe,EAAE,CAAC;IAC5D,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,QAAQ,CAAC;IAClB,CAAC;IAOD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC1B,GAAG,CAAC,KAAK,CACP,0EAA0E,CAC3E,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,GAAG,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;IAC5D,GAAG,CAAC,KAAK,EAAE,CAAC;IAEZ,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,IAAA,4BAAY,EAAC;YACrC,kBAAkB;YAClB,iBAAiB;YACjB,GAAG;SACJ,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACpC,GAAG,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,WAAW,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,KAAK,EAAE,CAAC;QACZ,IAAA,gCAAgB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7B,GAAG,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAyBM,KAAK,UAAU,YAAY,CAChC,GAAQ,EACR,SAAkB,EAClB,KAAe,EACf,QAAkB;IAElB,MAAM,kBAAkB,GAAG,IAAI,2BAAkB,EAAE,CAAC;IAGpD,MAAM,eAAe,GAAG,IAAA,4BAAmB,EAAC;QAC1C,KAAK;QACL,QAAQ;QACR,MAAM,EAAE,SAAS;KAClB,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAG,IAAI,qCAAgB,CAAC,eAAe,CAAC,CAAC;IAC/D,MAAM,iBAAiB,GAAG,IAAI,0BAAiB,CAAC,gBAAgB,CAAC,CAAC;IAKlE,IAAI,GAAwC,CAAC;IAC7C,IAAI,YAAsC,CAAC;IAI3C,IAAI,YAAY,GAAG,KAAK,CAAC;IAWzB,MAAM,YAAY,GAAG,KAAK,EACxB,IAAY,EACZ,OAAgB,EACA,EAAE;QAClB,IAAI,YAAY,EAAE,CAAC;YAGjB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;QACD,YAAY,GAAG,IAAI,CAAC;QAEpB,IAAI,CAAC;YACH,IAAI,OAAO,EAAE,CAAC;gBACZ,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpB,CAAC;YACD,YAAY,EAAE,UAAU,EAAE,CAAC;YAC3B,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;YACpB,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,KAAK,CACP,kBAAkB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CACrE,CAAC;QACJ,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,IAAA,yBAAY,EAAC,QAAQ,CAAC,CAAC,CAAC;IACjC,GAAG,CAAC,KAAK,EAAE,CAAC;IAEZ,IAAI,CAAC;QAKH,MAAM,WAAW,GAAG,MAAM,iBAAiB,CACzC,GAAG,EACH,kBAAkB,EAClB,iBAAiB,CAClB,CAAC;QAGF,MAAM,WAAW,GAAG,IAAA,sBAAY,EAAC,yBAAyB,CAAC,CAAC;QAC5D,IAAI,gBAAkC,CAAC;QAGvC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QAC1C,MAAM,UAAU,GAAG,IAAA,4BAAgB,EAAC,2BAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACtE,MAAM,aAAa,GAAG,IAAA,+BAAmB,EAAC,UAAU,CAAC,CAAC;QAKtD,IAAI,KAAK,EAAE,CAAC;YACV,eAAM,CAAC,cAAc,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;QACtE,CAAC;QACD,eAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QAErC,IAAI,CAAC;YACH,GAAG,GAAG,MAAM,kBAAW,CAAC,wBAAwB,CAC9C,sBAAS,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EACxC;gBACE,MAAM,EAAE,aAAa;aACtB,CACF,CAAC;YACF,gBAAgB,GAAG,GAAG,CAAC,GAAG,CAAC,qCAAgB,CAAC,CAAC;YAC7C,WAAW,EAAE,CAAC;YACd,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QACnC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,WAAW,EAAE,CAAC;YACd,GAAG,CAAC,KAAK,CACP,gCAAgC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EACxF,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAC3C,CAAC;YACF,GAAG,CAAC,KAAK,EAAE,CAAC;YAEZ,OAAO,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC;QAED,GAAG,CAAC,KAAK,EAAE,CAAC;QAGZ,MAAM,UAAU,GAAsB;YACpC,KAAK,CAAC,MAAM,CAAC,OAAO;gBAClB,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACxE,OAAO;oBACL,MAAM,EAAE,GAAG;oBACX,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;oBAC/C,IAAI,EAAE,YAAY;iBACnB,CAAC;YACJ,CAAC;SACF,CAAC;QAMF,MAAM,kBAAkB,GAAG,SAAS,IAAI,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC;QAEzE,YAAY,GAAG,IAAI,qBAAY,CAC7B,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,CACnB,CAAC;QAIF,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;YAExC,IACE,KAAK,YAAY,0BAAiB;gBAClC,KAAK,CAAC,IAAI,KAAK,iBAAiB,EAChC,CAAC;gBACD,GAAG,CAAC,KAAK,EAAE,CAAC;gBACZ,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAIzB,KAAK,YAAY,CAAC,CAAC,CAAC,CAAC;gBACrB,OAAO;YACT,CAAC;YAGD,IAAI,YAAY,EAAE,WAAW,EAAE,EAAE,CAAC;gBAChC,GAAG,CAAC,KAAK,CAAC,iBAAiB,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;YACrD,CAAC;QAEH,CAAC,CAAC,CAAC;QAEH,IAAI,cAAc,GAAG,IAAA,sBAAY,EAAC,iCAAiC,CAAC,CAAC;QACrE,IAAI,SAAiB,CAAC;QAUtB,IAAI,kBAAkB,GAAG,WAAW,CAAC;QACrC,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAE7B,SAAS,CAAC;YACR,IAAI,CAAC;gBACH,SAAS,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;gBAC3D,cAAc,EAAE,CAAC;gBACjB,GAAG,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;gBAClC,GAAG,CAAC,KAAK,EAAE,CAAC;gBACZ,MAAM;YACR,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,cAAc,EAAE,CAAC;gBAEjB,MAAM,gBAAgB,GACpB,KAAK,YAAY,0BAAiB;oBAClC,KAAK,CAAC,IAAI,KAAK,iBAAiB,CAAC;gBAMnC,IAAI,gBAAgB,IAAI,CAAC,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;oBAClE,gBAAgB,GAAG,IAAI,CAAC;oBACxB,GAAG,CAAC,KAAK,EAAE,CAAC;oBACZ,GAAG,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;oBACnD,GAAG,CAAC,KAAK,EAAE,CAAC;oBAEZ,IAAI,gBAAmC,CAAC;oBACxC,IAAI,CAAC;wBACH,gBAAgB,GAAG,MAAM,IAAA,4BAAY,EAAC;4BACpC,kBAAkB;4BAClB,iBAAiB;4BACjB,GAAG;yBACJ,CAAC,CAAC;oBACL,CAAC;oBAAC,OAAO,UAAU,EAAE,CAAC;wBACpB,GAAG,CAAC,KAAK,EAAE,CAAC;wBACZ,IAAA,gCAAgB,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC;wBAClC,GAAG,CAAC,KAAK,EAAE,CAAC;wBACZ,OAAO,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC;oBAC/B,CAAC;oBAED,kBAAkB,GAAG,gBAAgB,CAAC;oBACtC,cAAc,GAAG,IAAA,sBAAY,EAAC,iCAAiC,CAAC,CAAC;oBACjE,SAAS;gBACX,CAAC;gBAID,IAAI,gBAAgB,EAAE,CAAC;oBACrB,GAAG,CAAC,KAAK,EAAE,CAAC;oBACZ,GAAG,CAAC,KAAK,CAAE,KAA2B,CAAC,OAAO,CAAC,CAAC;oBAGhD,OAAO,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC;gBAC/B,CAAC;gBAID,MAAM,YAAY,GAAG,qBAAqB,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;gBACtE,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;gBACpE,GAAG,CAAC,KAAK,EAAE,CAAC;gBACZ,OAAO,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QAKD,gBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACjC,GAAG,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;QAC1D,GAAG,CAAC,KAAK,EAAE,CAAC;QAGZ,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,eAAe,CAAC,CAAC;QAC3C,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,SAAiB,EAAE,OAAO,EAAE,EAAE;YACxD,MAAM,CAAC,GAAG,CAAC,WAAW,SAAS,KAAK,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;QAEH,YAAY,CAAC,EAAE,CACb,cAAc,EACd,CAAC,IAAY,EAAE,MAAc,EAAE,aAAsB,EAAE,EAAE;YACvD,GAAG,CAAC,KAAK,EAAE,CAAC;YACZ,IAAI,aAAa,EAAE,CAAC;gBAGlB,GAAG,CAAC,IAAI,CACN,6BAA6B,IAAI,MAAM,MAAM,iBAAiB,CAC/D,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,KAAK,CAAC,6BAA6B,IAAI,MAAM,MAAM,EAAE,CAAC,CAAC;YAC7D,CAAC;YACD,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,CAAC,CACF,CAAC;QAQF,IAAI,eAAe,GAAG,SAAS,CAAC;QAChC,YAAY,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,GAAW,EAAE,EAAE;YAC5C,IAAI,GAAG,KAAK,eAAe,EAAE,CAAC;gBAC5B,OAAO;YACT,CAAC;YACD,eAAe,GAAG,GAAG,CAAC;YACtB,GAAG,CAAC,KAAK,EAAE,CAAC;YACZ,GAAG,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;YAChD,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QASH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACxB,GAAG,CAAC,KAAK,EAAE,CAAC;YACZ,KAAK,YAAY,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YACzB,GAAG,CAAC,KAAK,EAAE,CAAC;YACZ,KAAK,YAAY,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAGH,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAEf,GAAG,CAAC,KAAK,CACP,kBAAkB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAC1E,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAC3C,CAAC;QACF,GAAG,CAAC,KAAK,EAAE,CAAC;QACZ,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC;AACH,CAAC"}
|
|
@@ -29,6 +29,7 @@ export declare class TunnelClient extends EventEmitter {
|
|
|
29
29
|
private reconnectTimer;
|
|
30
30
|
private isConnecting;
|
|
31
31
|
private isManualDisconnect;
|
|
32
|
+
private isReconnecting;
|
|
32
33
|
private currentTunnelUrl;
|
|
33
34
|
private credentials;
|
|
34
35
|
private connectionTimeout;
|
|
@@ -41,6 +42,8 @@ export declare class TunnelClient extends EventEmitter {
|
|
|
41
42
|
isConnected(): boolean;
|
|
42
43
|
getTunnelUrl(): string | null;
|
|
43
44
|
private establishConnection;
|
|
45
|
+
private establishWithAuthRetry;
|
|
46
|
+
private isAuthFailure;
|
|
44
47
|
private handleMessage;
|
|
45
48
|
private handleRequest;
|
|
46
49
|
private mapHandlerError;
|
|
@@ -21,6 +21,7 @@ class TunnelClientError extends Error {
|
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
exports.TunnelClientError = TunnelClientError;
|
|
24
|
+
const PRE_ESTABLISHED_AUTH_FAILURE_CODE = "tunnel_auth_failed";
|
|
24
25
|
class TunnelClient extends events_1.EventEmitter {
|
|
25
26
|
mcpHandler;
|
|
26
27
|
credentialsService;
|
|
@@ -32,6 +33,7 @@ class TunnelClient extends events_1.EventEmitter {
|
|
|
32
33
|
reconnectTimer = null;
|
|
33
34
|
isConnecting = false;
|
|
34
35
|
isManualDisconnect = false;
|
|
36
|
+
isReconnecting = false;
|
|
35
37
|
currentTunnelUrl = null;
|
|
36
38
|
credentials = null;
|
|
37
39
|
connectionTimeout = null;
|
|
@@ -64,7 +66,7 @@ class TunnelClient extends events_1.EventEmitter {
|
|
|
64
66
|
this.logger.log("Access token expired, refreshing...");
|
|
65
67
|
await this.refreshTokenAndSave();
|
|
66
68
|
}
|
|
67
|
-
const tunnelUrl = await this.
|
|
69
|
+
const tunnelUrl = await this.establishWithAuthRetry(this.tunnelUrl);
|
|
68
70
|
this.reconnectAttempts = 0;
|
|
69
71
|
this.isConnecting = false;
|
|
70
72
|
return tunnelUrl;
|
|
@@ -144,12 +146,21 @@ class TunnelClient extends events_1.EventEmitter {
|
|
|
144
146
|
this.stopHealthCheck();
|
|
145
147
|
const reasonStr = reason.toString();
|
|
146
148
|
this.logger.log(`WebSocket closed: ${code} - ${reasonStr}`);
|
|
149
|
+
const wasEstablished = this.currentTunnelUrl !== null;
|
|
147
150
|
this.currentTunnelUrl = null;
|
|
148
151
|
const willReconnect = !this.isManualDisconnect &&
|
|
149
152
|
!this.isPermanentCloseCode(code) &&
|
|
150
153
|
this.reconnectAttempts < tunnel_protocol_1.TUNNEL_DEFAULTS.RECONNECT_MAX_ATTEMPTS;
|
|
151
154
|
this.emit("disconnected", code, reasonStr, willReconnect);
|
|
152
|
-
|
|
155
|
+
const isAuthClose = code === tunnel_protocol_1.TunnelCloseCodes.AUTH_FAILED ||
|
|
156
|
+
code === tunnel_protocol_1.TunnelCloseCodes.TUNNEL_AUTH_FAILED;
|
|
157
|
+
if (!wasEstablished) {
|
|
158
|
+
reject(new TunnelClientError(`Connection closed before tunnel established (code ${code})${reasonStr ? `: ${reasonStr}` : ""}`, isAuthClose
|
|
159
|
+
? PRE_ESTABLISHED_AUTH_FAILURE_CODE
|
|
160
|
+
: "connection_closed"));
|
|
161
|
+
}
|
|
162
|
+
const isFirstConnectPreEstablish = !wasEstablished && !this.isReconnecting;
|
|
163
|
+
if (!this.isManualDisconnect && !isFirstConnectPreEstablish) {
|
|
153
164
|
this.handleReconnection(code);
|
|
154
165
|
}
|
|
155
166
|
});
|
|
@@ -162,6 +173,37 @@ class TunnelClient extends events_1.EventEmitter {
|
|
|
162
173
|
});
|
|
163
174
|
});
|
|
164
175
|
}
|
|
176
|
+
async establishWithAuthRetry(url) {
|
|
177
|
+
if (this.isReconnecting) {
|
|
178
|
+
return this.establishConnection(url);
|
|
179
|
+
}
|
|
180
|
+
try {
|
|
181
|
+
return await this.establishConnection(url);
|
|
182
|
+
}
|
|
183
|
+
catch (error) {
|
|
184
|
+
if (!this.isAuthFailure(error) || this.isManualDisconnect) {
|
|
185
|
+
throw error;
|
|
186
|
+
}
|
|
187
|
+
this.logger.log("Auth failed before tunnel established — refreshing token and retrying once");
|
|
188
|
+
await this.refreshTokenAndSave();
|
|
189
|
+
if (this.isManualDisconnect) {
|
|
190
|
+
throw error;
|
|
191
|
+
}
|
|
192
|
+
try {
|
|
193
|
+
return await this.establishConnection(url);
|
|
194
|
+
}
|
|
195
|
+
catch (retryError) {
|
|
196
|
+
if (this.isAuthFailure(retryError)) {
|
|
197
|
+
throw new TunnelClientError("Session expired. Please run `ankimcp --login` to re-authenticate.", "session_expired", retryError);
|
|
198
|
+
}
|
|
199
|
+
throw retryError;
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
isAuthFailure(error) {
|
|
204
|
+
return (error instanceof TunnelClientError &&
|
|
205
|
+
error.code === PRE_ESTABLISHED_AUTH_FAILURE_CODE);
|
|
206
|
+
}
|
|
165
207
|
async handleMessage(message) {
|
|
166
208
|
switch (message.type) {
|
|
167
209
|
case "request":
|
|
@@ -294,6 +336,7 @@ class TunnelClient extends events_1.EventEmitter {
|
|
|
294
336
|
const isAuthError = closeCode === tunnel_protocol_1.TunnelCloseCodes.AUTH_FAILED ||
|
|
295
337
|
closeCode === tunnel_protocol_1.TunnelCloseCodes.TUNNEL_AUTH_FAILED;
|
|
296
338
|
this.reconnectTimer = setTimeout(async () => {
|
|
339
|
+
this.isReconnecting = true;
|
|
297
340
|
try {
|
|
298
341
|
if (isAuthError) {
|
|
299
342
|
this.logger.log("Auth error detected, refreshing token before reconnect");
|
|
@@ -311,6 +354,9 @@ class TunnelClient extends events_1.EventEmitter {
|
|
|
311
354
|
this.emit("error", new TunnelClientError("Reconnection failed", "reconnect_failed", error));
|
|
312
355
|
}
|
|
313
356
|
}
|
|
357
|
+
finally {
|
|
358
|
+
this.isReconnecting = false;
|
|
359
|
+
}
|
|
314
360
|
}, delay);
|
|
315
361
|
}
|
|
316
362
|
startHealthCheck() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel.client.js","sourceRoot":"","sources":["../../src/tunnel/tunnel.client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tunnel.client.js","sourceRoot":"","sources":["../../src/tunnel/tunnel.client.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "anki-mcp-http",
|
|
3
3
|
"mcpName": "ai.ankimcp/anki-mcp-server",
|
|
4
|
-
"version": "0.22.
|
|
4
|
+
"version": "0.22.1",
|
|
5
5
|
"description": "Model Context Protocol server for Anki - enables AI assistants to interact with your Anki flashcards",
|
|
6
6
|
"author": "Anatoly Tarnavsky",
|
|
7
7
|
"private": false,
|