albert-heijn-mcp 1.7.0 → 1.7.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/README.md +19 -10
- package/dist/auth/login.js +10 -6
- package/dist/auth/login.js.map +1 -1
- package/dist/auth/session.js +1 -1
- package/dist/auth/session.js.map +1 -1
- package/dist/config.js +1 -0
- package/dist/config.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/loginCommand.js +2 -2
- package/dist/loginCommand.js.map +1 -1
- package/dist/tools/account.js +16 -9
- package/dist/tools/account.js.map +1 -1
- package/dist/tools/common.js +24 -11
- package/dist/tools/common.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -155,16 +155,17 @@ The window uses a fresh, empty browser profile, so type your password: saved pas
|
|
|
155
155
|
|
|
156
156
|
**On a server** (ChatGPT, Claude.ai), or when no login window can open, you copy a code by hand. AH's login page has a captcha that only works on AH's own website, so the code has to come from your browser:
|
|
157
157
|
|
|
158
|
-
|
|
159
|
-
2. **Copy the code back into the chat.** After you log in, AH tries to open its phone app, which your browser can't do, so the page seems stuck. The code you need is in the browser's developer console, a panel for web developers that you can open safely:
|
|
160
|
-
- Open it in Chrome with <kbd>⌘</kbd> <kbd>⌥</kbd> <kbd>J</kbd> on Mac, or <kbd>Ctrl</kbd> <kbd>Shift</kbd> <kbd>J</kbd> on Windows and Linux.
|
|
161
|
-
- Find this red line:
|
|
158
|
+
You need a computer for this, not a phone or tablet: their browsers have no developer console. Chrome, Edge or Brave work best.
|
|
162
159
|
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
160
|
+
1. **Open the link** your assistant gives you, but don't log in yet.
|
|
161
|
+
2. **Open the developer console** in that tab, a panel for web developers that you can open safely: <kbd>⌘</kbd> <kbd>⌥</kbd> <kbd>J</kbd> on Mac, or <kbd>Ctrl</kbd> <kbd>Shift</kbd> <kbd>J</kbd> on Windows and Linux.
|
|
162
|
+
3. **Log in** as usual. AH then tries to open its phone app, which your browser can't do, so the page seems stuck. In the console, find this red line:
|
|
166
163
|
|
|
167
|
-
|
|
164
|
+
```
|
|
165
|
+
Failed to launch 'appie://login-exit?code=…' because the scheme does not have a registered handler.
|
|
166
|
+
```
|
|
167
|
+
|
|
168
|
+
4. **Copy the part from `appie://` up to the closing quote** and paste it into the chat. The code works once and expires quickly, so paste it right away.
|
|
168
169
|
|
|
169
170
|
No line there? See [Troubleshooting](#troubleshooting). To log a server in without the developer console, see [Running it on a server](#running-it-on-a-server).
|
|
170
171
|
|
|
@@ -193,7 +194,7 @@ The login window needs Chrome, Edge, Brave or Chromium installed in the usual pl
|
|
|
193
194
|
<details>
|
|
194
195
|
<summary><b>No "Failed to launch" line after logging in</b></summary>
|
|
195
196
|
|
|
196
|
-
|
|
197
|
+
The developer console has to be open before you log in. Open it, then open the login link again in that same tab and log in. If AH skips the login form because you're still logged in, that's fine: the line appears all the same. You can also look for the `appie://login-exit?code=…` request in the Network tab. Browsers other than Chrome, Edge or Brave may show the link in an error page or dialog instead.
|
|
197
198
|
</details>
|
|
198
199
|
|
|
199
200
|
<details>
|
|
@@ -208,6 +209,14 @@ Codes work once and expire quickly. Ask to log in again and paste the new link s
|
|
|
208
209
|
Ask your assistant to log you out and back in, or delete `tokens.json` from the [login location](#logging-in) and log in again.
|
|
209
210
|
</details>
|
|
210
211
|
|
|
212
|
+
<details>
|
|
213
|
+
<summary><b>"The Albert Heijn login has expired"</b></summary>
|
|
214
|
+
|
|
215
|
+
Albert Heijn no longer accepts the stored login. Ask your assistant to log in to Albert Heijn again. Reconnecting your app to the server doesn't help: that's a separate login.
|
|
216
|
+
|
|
217
|
+
If it keeps expiring on your server, keep `tokens.json` on storage that survives restarts and redeploys, and run a single instance. AH replaces the login every time it's renewed, so an older copy of the file, or a second instance renewing on its own, gets rejected.
|
|
218
|
+
</details>
|
|
219
|
+
|
|
211
220
|
<details>
|
|
212
221
|
<summary><b>"Already connected as …" when pasting a login code</b></summary>
|
|
213
222
|
|
|
@@ -311,7 +320,7 @@ The service can write only to `/home/albert-heijn-mcp`, where it keeps its token
|
|
|
311
320
|
|
|
312
321
|
## Configuration
|
|
313
322
|
|
|
314
|
-
Settings are environment variables. They can also go in a `.env` file in the working directory (see [`.env.example`](.env.example)); variables already set in the environment take precedence.
|
|
323
|
+
Settings are environment variables. They can also go in a `.env` file in the working directory (see [`.env.example`](.env.example)); variables already set in the environment take precedence. On a hosting platform, set them in its environment variable or secret settings instead of a `.env` file, so `AH_MCP_TOKEN` stays out of the app's files.
|
|
315
324
|
|
|
316
325
|
| Variable | Default | Description |
|
|
317
326
|
|---|---|---|
|
package/dist/auth/login.js
CHANGED
|
@@ -17,13 +17,17 @@ export function extractCode(input) {
|
|
|
17
17
|
return trimmed;
|
|
18
18
|
throw new Error("no login code found: paste the appie://login-exit?code=... link or the code itself");
|
|
19
19
|
}
|
|
20
|
-
/**
|
|
20
|
+
/** Said before a login when AH no longer accepts the stored one. */
|
|
21
|
+
export const STALE_LOGIN = "The stored Albert Heijn login no longer works, so log in to Albert Heijn again.";
|
|
22
|
+
/** The steps for logging in by copying the code by hand; paste says where the last step pastes the link. */
|
|
21
23
|
export function manualLoginSteps(opened, paste) {
|
|
22
|
-
return `1. Open this link${opened ? " (it
|
|
24
|
+
return `1. Open this link in Chrome, Edge or Brave${opened ? " (it may have opened in your default browser; use that tab only if it's one of these)" : ""}, but don't log in yet:
|
|
23
25
|
${LOGIN_URL}
|
|
24
|
-
2.
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
2. On that page, open the developer console first: Cmd+Option+J on Mac, Ctrl+Shift+J on Windows/Linux.
|
|
27
|
+
It's a panel for web developers and safe to open. If you already logged in, open the link again in that same tab.
|
|
28
|
+
3. Log in. The page then seems stuck: AH tries to open its phone app, which the browser can't.
|
|
29
|
+
In the console, find the red line "Failed to launch 'appie://login-exit?code=...'" and copy
|
|
30
|
+
the link from appie:// up to the closing quote. Other browsers may show the link in an error page instead.
|
|
31
|
+
4. Paste that link ${paste}. It works once and expires quickly, so do this right away.`;
|
|
28
32
|
}
|
|
29
33
|
//# sourceMappingURL=login.js.map
|
package/dist/auth/login.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,kHAAkH;AAClH,MAAM,UAAU,GAAG,6DAA6D,CAAC;AACjF,mBAAmB;AACnB,MAAM,SAAS,GAAG,uBAAuB,CAAC;AAE1C,sFAAsF;AACtF,MAAM,UAAU,QAAQ,CAAC,IAAY;IACnC,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACpC,CAAC;AAED,yFAAyF;AACzF,MAAM,UAAU,WAAW,CAAC,KAAa;IACvC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC/B,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IACtB,IAAI,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,OAAO,CAAC;IAC5C,MAAM,IAAI,KAAK,CAAC,oFAAoF,CAAC,CAAC;AACxG,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,kHAAkH;AAClH,MAAM,UAAU,GAAG,6DAA6D,CAAC;AACjF,mBAAmB;AACnB,MAAM,SAAS,GAAG,uBAAuB,CAAC;AAE1C,sFAAsF;AACtF,MAAM,UAAU,QAAQ,CAAC,IAAY;IACnC,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACpC,CAAC;AAED,yFAAyF;AACzF,MAAM,UAAU,WAAW,CAAC,KAAa;IACvC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC/B,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IACtB,IAAI,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,OAAO,CAAC;IAC5C,MAAM,IAAI,KAAK,CAAC,oFAAoF,CAAC,CAAC;AACxG,CAAC;AAED,oEAAoE;AACpE,MAAM,CAAC,MAAM,WAAW,GAAG,iFAAiF,CAAC;AAE7G,4GAA4G;AAC5G,MAAM,UAAU,gBAAgB,CAAC,MAAe,EAAE,KAAa;IAC7D,OAAO,6CAA6C,MAAM,CAAC,CAAC,CAAC,uFAAuF,CAAC,CAAC,CAAC,EAAE;KACtJ,SAAS;;;;;;qBAMO,KAAK,6DAA6D,CAAC;AACxF,CAAC"}
|
package/dist/auth/session.js
CHANGED
|
@@ -16,7 +16,7 @@ export class NotLoggedInError extends Error {
|
|
|
16
16
|
/** AH rejected the stored refresh token (expired or revoked): the user must log in again. */
|
|
17
17
|
export class SessionExpiredError extends ContextError {
|
|
18
18
|
constructor(cause) {
|
|
19
|
-
super("token refresh failed; log in again", cause);
|
|
19
|
+
super("token refresh failed: the Albert Heijn login expired or was revoked; log in to Albert Heijn again", cause);
|
|
20
20
|
this.name = "SessionExpiredError";
|
|
21
21
|
}
|
|
22
22
|
}
|
package/dist/auth/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/auth/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAe,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE/J,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,UAAU,EAAkB,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEpH,yDAAyD;AACzD,MAAM,iBAAiB,GAAG,MAAM,CAAC;AAEjC,4BAA4B;AAC5B,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IACzC;QACE,KAAK,CAAC,eAAe,CAAC,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF;AAED,6FAA6F;AAC7F,MAAM,OAAO,mBAAoB,SAAQ,YAAY;IACnD,YAAY,KAAc;QACxB,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/auth/session.ts"],"names":[],"mappings":"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"}
|
package/dist/config.js
CHANGED
|
@@ -44,6 +44,7 @@ export function loadConfig(argv, env = process.env) {
|
|
|
44
44
|
transport,
|
|
45
45
|
// Over HTTP the user is elsewhere, so a browser opened on this machine wouldn't reach them.
|
|
46
46
|
remote: values.remote || env.AH_REMOTE === "true" || transport === "streamable-http",
|
|
47
|
+
hosted: transport === "streamable-http",
|
|
47
48
|
showVersion: values.version,
|
|
48
49
|
showHelp: values.help,
|
|
49
50
|
tokensPath: env.AH_TOKENS_PATH || defaultTokensPath(),
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,iBAAiB,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -45,7 +45,7 @@ async function main() {
|
|
|
45
45
|
if (cfg.logFile)
|
|
46
46
|
await logToFile(cfg.logFile);
|
|
47
47
|
log.info("albert-heijn-mcp", { version });
|
|
48
|
-
const ctx = newToolContext(new Session(cfg.tokensPath), cfg
|
|
48
|
+
const ctx = newToolContext(new Session(cfg.tokensPath), cfg);
|
|
49
49
|
const newServer = () => {
|
|
50
50
|
const server = new McpServer({ name: "Albert Heijn", version, icons: [ICON] }, { instructions: INSTRUCTIONS });
|
|
51
51
|
registerTools(server, ctx);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,0FAA0F;AAE1F,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,iBAAiB,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAE/F,CAAC;AAEF,kDAAkD;AAClD,MAAM,IAAI,GAAG;IACX,GAAG,EAAE,yBAAyB,YAAY,CAAC,IAAI,GAAG,CAAC,oBAAoB,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;IAC/G,QAAQ,EAAE,WAAW;IACrB,KAAK,EAAE,CAAC,SAAS,CAAC;CACnB,CAAC;AAEF,kCAAkC;AAClC,MAAM,YAAY,GAChB,6FAA6F;IAC7F,+GAA+G;IAC/G,mGAAmG;IACnG,+EAA+E,CAAC;AAElF,KAAK,UAAU,IAAI;IACjB,UAAU,EAAE,CAAC;IACb,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;QACjB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO;IACT,CAAC;IACD,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,oBAAoB,OAAO,EAAE,CAAC,CAAC;QAC3C,OAAO;IACT,CAAC;IACD,IAAI,GAAG,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC;YACH,MAAM,QAAQ,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,iBAAkB,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YACzD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACvB,CAAC;QACD,OAAO;IACT,CAAC;IACD,IAAI,GAAG,CAAC,OAAO;QAAE,MAAM,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC9C,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IAE1C,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/loginCommand.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createInterface } from "node:readline/promises";
|
|
2
2
|
import { fullName, LOGIN_URL } from "./ahapi/index.js";
|
|
3
3
|
import { findBrowser, loginInWindow, openInDefaultBrowser } from "./auth/browser.js";
|
|
4
|
-
import { extractCode, manualLoginSteps } from "./auth/login.js";
|
|
4
|
+
import { extractCode, manualLoginSteps, STALE_LOGIN } from "./auth/login.js";
|
|
5
5
|
/**
|
|
6
6
|
* `albert-heijn-mcp login`: logs in from the terminal and saves the tokens, e.g. to copy them to a
|
|
7
7
|
* server afterwards. Uses a login window when a Chromium-based browser is installed, unless remote;
|
|
@@ -15,7 +15,7 @@ export async function runLogin(session, remote) {
|
|
|
15
15
|
return;
|
|
16
16
|
}
|
|
17
17
|
if (status.state === "stale")
|
|
18
|
-
console.log(
|
|
18
|
+
console.log(STALE_LOGIN);
|
|
19
19
|
// A login saved meanwhile, e.g. by an MCP client, is kept.
|
|
20
20
|
const save = (code) => session.completeLogin(code, status.refreshToken);
|
|
21
21
|
const saved = (remote ? undefined : await windowLogin(save)) ?? (await save(await manualCode(!remote)));
|
package/dist/loginCommand.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loginCommand.js","sourceRoot":"","sources":["../src/loginCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"loginCommand.js","sourceRoot":"","sources":["../src/loginCommand.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/account.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
2
|
import { fullName, getMember, LOGIN_URL } from "../ahapi/index.js";
|
|
3
3
|
import { openInDefaultBrowser } from "../auth/browser.js";
|
|
4
|
-
import { extractCode, manualLoginSteps } from "../auth/login.js";
|
|
4
|
+
import { extractCode, manualLoginSteps, STALE_LOGIN } from "../auth/login.js";
|
|
5
5
|
import { log } from "../log.js";
|
|
6
6
|
import { addAuthedTool, addTool, structured, text } from "./common.js";
|
|
7
7
|
export function registerAccountTools(server, ctx) {
|
|
@@ -11,9 +11,10 @@ export function registerAccountTools(server, ctx) {
|
|
|
11
11
|
kind: "additive",
|
|
12
12
|
description: "Log in to Albert Heijn. Call without arguments to start. " +
|
|
13
13
|
"On the user's own computer this usually opens a login window that finishes the login by itself. " +
|
|
14
|
-
"Otherwise it returns the AH login link and instructions to
|
|
15
|
-
"the
|
|
16
|
-
"that link (or just the code) to finish.
|
|
14
|
+
"Otherwise it returns the AH login link and step-by-step instructions: show them to the user as given, " +
|
|
15
|
+
"in order (the developer console must be open before they log in). The user then copies a link like " +
|
|
16
|
+
"appie://login-exit?code=...; call ah_login again with code set to that link (or just the code) to finish. " +
|
|
17
|
+
"Codes are single-use and expire quickly. " +
|
|
17
18
|
"If already logged in, returns the account name; to switch accounts, call ah_logout first.",
|
|
18
19
|
input: {
|
|
19
20
|
code: z
|
|
@@ -46,9 +47,9 @@ export function registerAccountTools(server, ctx) {
|
|
|
46
47
|
const name = await ctx.session.memberName();
|
|
47
48
|
return text(name ? `Login successful! Connected as ${name}.` : "Login successful!");
|
|
48
49
|
}
|
|
49
|
-
const intro = status.state === "stale" ?
|
|
50
|
+
const intro = status.state === "stale" ? `${STALE_LOGIN}\n\n` : "";
|
|
50
51
|
if (ctx.remote)
|
|
51
|
-
return text(intro + manualLogin(false));
|
|
52
|
+
return text(intro + manualLogin(false, ctx.hosted));
|
|
52
53
|
if (ctx.browserLogin.running) {
|
|
53
54
|
return text(`${intro}The login window is still open: ask the user to finish logging in there, then call ah_login again.\n\n` +
|
|
54
55
|
`If they can't find the window, they can log in this way instead.\n\n${manualLogin(false)}`);
|
|
@@ -112,8 +113,14 @@ function maskEmail(email) {
|
|
|
112
113
|
return email ? "…" : "";
|
|
113
114
|
return `${email.slice(0, Math.min(3, at - 1))}…${email.slice(at)}`;
|
|
114
115
|
}
|
|
115
|
-
/**
|
|
116
|
-
|
|
117
|
-
|
|
116
|
+
/** Hosted logins are often started from a phone app, whose browser has no developer console. */
|
|
117
|
+
const HOSTED_LOGIN_NOTE = "This needs a computer: phone browsers have no developer console.\n\n";
|
|
118
|
+
/** For whoever runs the server: the login command needs no developer console. */
|
|
119
|
+
const SERVER_LOGIN_HINT = "\n\nWhoever runs this server can instead log it in without the console, from their own computer: " +
|
|
120
|
+
"see https://github.com/olekpuchka/albert-heijn-mcp#running-it-on-a-server";
|
|
121
|
+
/** Steps for logging in by copying the code by hand; hosted adds what matters when the server runs elsewhere. */
|
|
122
|
+
function manualLogin(opened, hosted = false) {
|
|
123
|
+
const steps = manualLoginSteps(opened, "here");
|
|
124
|
+
return `To log in to Albert Heijn:\n\n${hosted ? HOSTED_LOGIN_NOTE + steps + SERVER_LOGIN_HINT : steps}`;
|
|
118
125
|
}
|
|
119
126
|
//# sourceMappingURL=account.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.js","sourceRoot":"","sources":["../../src/tools/account.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"account.js","sourceRoot":"","sources":["../../src/tools/account.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/common.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
2
|
import { getMember, hasStatus, isUnauthorized } from "../ahapi/index.js";
|
|
3
3
|
import { BrowserLogin } from "../auth/browser.js";
|
|
4
|
-
import { NotLoggedInError } from "../auth/session.js";
|
|
4
|
+
import { NotLoggedInError, SessionExpiredError } from "../auth/session.js";
|
|
5
|
+
import { DamagedTokensError } from "../auth/tokens.js";
|
|
5
6
|
import { log } from "../log.js";
|
|
6
7
|
import { TtlCache } from "./cache.js";
|
|
7
8
|
/**
|
|
@@ -16,10 +17,11 @@ export const productItems = z
|
|
|
16
17
|
.array(z.object({ product_id: z.number().int().describe("numeric product ID"), quantity: quantitySchema.describe("number of units") }))
|
|
17
18
|
.max(MAX_ITEMS);
|
|
18
19
|
export const confirmInput = { confirm: z.string().describe('Must be "yes" to confirm') };
|
|
19
|
-
export function newToolContext(session, remote) {
|
|
20
|
+
export function newToolContext(session, { remote, hosted }) {
|
|
20
21
|
return {
|
|
21
22
|
session,
|
|
22
23
|
remote,
|
|
24
|
+
hosted,
|
|
23
25
|
browserLogin: new BrowserLogin(),
|
|
24
26
|
searches: new TtlCache(5 * 60_000),
|
|
25
27
|
products: new TtlCache(10 * 60_000),
|
|
@@ -51,7 +53,7 @@ export function structured(data, message) {
|
|
|
51
53
|
/** Errors can quote AH; enough of that to explain the error, not a whole error page. */
|
|
52
54
|
const MAX_ERROR_LENGTH = 500;
|
|
53
55
|
function errorResult(err) {
|
|
54
|
-
const message = err instanceof Error ? err.message : String(err);
|
|
56
|
+
const message = err instanceof Error ? (modelMessage(err) ?? err.message) : String(err);
|
|
55
57
|
const text = message.length > MAX_ERROR_LENGTH ? `${message.slice(0, MAX_ERROR_LENGTH)}…` : message;
|
|
56
58
|
return { content: [{ type: "text", text }], isError: true };
|
|
57
59
|
}
|
|
@@ -89,16 +91,27 @@ const NOT_AUTHENTICATED = JSON.stringify({
|
|
|
89
91
|
error: "not_authenticated",
|
|
90
92
|
message: "Not logged in. Call ah_login first.",
|
|
91
93
|
});
|
|
94
|
+
// Not "log in again" alone: that reads as reconnecting the MCP client, which doesn't help.
|
|
95
|
+
const SESSION_EXPIRED = JSON.stringify({
|
|
96
|
+
error: "session_expired",
|
|
97
|
+
message: "The Albert Heijn login has expired or was revoked. Call ah_login to log in to Albert Heijn again; " +
|
|
98
|
+
"reconnecting the MCP client doesn't help.",
|
|
99
|
+
});
|
|
100
|
+
/**
|
|
101
|
+
* What to tell the model instead of err's message, for errors it should act on in a set way. Not when
|
|
102
|
+
* wrapped: then something else failed, and loginStatus wouldn't agree that a login is needed.
|
|
103
|
+
*/
|
|
104
|
+
function modelMessage(err) {
|
|
105
|
+
// A damaged tokens file is replaced by the next login; its path is the server's business.
|
|
106
|
+
if (err instanceof NotLoggedInError || err instanceof DamagedTokensError)
|
|
107
|
+
return NOT_AUTHENTICATED;
|
|
108
|
+
if (err instanceof SessionExpiredError)
|
|
109
|
+
return SESSION_EXPIRED;
|
|
110
|
+
return undefined;
|
|
111
|
+
}
|
|
92
112
|
/** Registers a tool that needs a login. On a 401, refreshes the token and retries once. */
|
|
93
113
|
export function addAuthedTool(server, ctx, def, handler) {
|
|
94
|
-
addTool(server, def,
|
|
95
|
-
try {
|
|
96
|
-
return await ctx.session.withClient((c) => handler(c, args));
|
|
97
|
-
}
|
|
98
|
-
catch (err) {
|
|
99
|
-
throw err instanceof NotLoggedInError ? new Error(NOT_AUTHENTICATED) : err;
|
|
100
|
-
}
|
|
101
|
-
});
|
|
114
|
+
addTool(server, def, (args) => ctx.session.withClient((c) => handler(c, args)));
|
|
102
115
|
}
|
|
103
116
|
export { wrapError } from "../ahapi/index.js";
|
|
104
117
|
/** Runs fn; a non-401 error goes to onError. 401s propagate so addAuthedTool can refresh the token. */
|
package/dist/tools/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/tools/common.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAiB,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/tools/common.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED