@casys/mcp-erpnext 3.2.1 → 3.2.3

package/README.md

@@ -11,7 +11,7 @@ English | [繁體中文](README.zh-TW.md)
 
 > [!IMPORTANT]
 > **Installing 3.2:** for npm/Node use `npx -y @casys/mcp-erpnext@latest`; for
-> Deno use `deno run -A jsr:@casys/mcp-erpnext@3.2.1/server`. 3.2.1 is the
+> Deno use `deno run -A jsr:@casys/mcp-erpnext@3.2.3/server`. 3.2.3 is the
 > stable release and carries npm's `latest` tag; prereleases, when published,
 > use the `next` tag. 3.2 adds the generic document viewer and attachment
 > workflows, so test it with the MCP host your users actually run before
@@ -96,7 +96,7 @@ stable 3.0.5 and 3.1.0 releases. Features remain capability-gated by the MCP
 host; Buy evidence does not purchase or qualify a live ERP.
 
 For stable npm installations use `@casys/mcp-erpnext@latest`; for Deno use
-`jsr:@casys/mcp-erpnext@3.2.1/server`.
+`jsr:@casys/mcp-erpnext@3.2.3/server`.
 
 See the [CHANGELOG](CHANGELOG.md) for the full release history, or the
 [latest release](https://github.com/Casys-AI/mcp-erpnext/releases/latest) for

package/mcp-erpnext.mjs

@@ -42376,6 +42376,31 @@ function stableStringify(value) {
   }
   return JSON.stringify(value);
 }
+var CALLER_ABORT_STATUS = 499;
+function relayAbort(from, to) {
+  if (!from) return () => {
+  };
+  if (from.aborted) {
+    to.abort();
+    return () => {
+    };
+  }
+  const onAbort = () => to.abort();
+  from.addEventListener("abort", onAbort, { once: true });
+  return () => from.removeEventListener("abort", onAbort);
+}
+function sleep2(ms, signal) {
+  return new Promise((resolve) => {
+    if (signal?.aborted) return resolve();
+    const done = () => {
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", done);
+      resolve();
+    };
+    const timer = setTimeout(done, ms);
+    signal?.addEventListener("abort", done, { once: true });
+  });
+}
 var DEFAULT_RETRY_STATUSES = [408, 429, 502, 503, 504];
 var DEFAULT_RETRY_METHODS = ["GET"];
 var DEFAULT_MAX_UPLOAD_BYTES = 10 * 1024 * 1024;
@@ -42536,7 +42561,8 @@ function normalizeFrappeSiteUrl(baseUrl) {
 var FrappeAPIError = class extends Error {
   /**
    * @param message - Human-readable error description
-   * @param status - HTTP status code (0 for network errors, 408 for timeouts)
+   * @param status - HTTP status code (0 for network errors, 408 for timeouts,
+   *                 499 when the caller aborted through its `signal`)
    * @param body - Raw response body (parsed JSON object or plain text string)
    * @param retryAfterMs - When the server sent a `Retry-After` header on a
    *                      retryable status (typically 429), the parsed delay
@@ -42550,6 +42576,13 @@ var FrappeAPIError = class extends Error {
     this.name = "FrappeAPIError";
   }
 };
+function callerAbortError(method, path) {
+  return new FrappeAPIError(
+    `Request aborted by caller: ${method} ${path}`,
+    CALLER_ABORT_STATUS,
+    null
+  );
+}
 function parseRetryAfter(raw2) {
   if (!raw2) return void 0;
   const trimmed = raw2.trim();
@@ -42659,28 +42692,51 @@ var FrappeClient = class {
     }
     return this.retryBackoffMs * 2 ** attempt;
   }
-  async request(method, path, body, multipart = false) {
+  async request(method, path, body, multipart = false, options = {}) {
+    const { signal } = options;
+    const retries = options.retry === false ? 0 : this.retries;
     let lastError;
-    for (let attempt = 0; attempt <= this.retries; attempt++) {
+    for (let attempt = 0; attempt <= retries; attempt++) {
+      if (signal?.aborted) throw callerAbortError(method, path);
       try {
-        return await this.requestOnce(method, path, body, multipart);
+        return await this.requestOnce(
+          method,
+          path,
+          body,
+          multipart,
+          signal
+        );
       } catch (err) {
         lastError = err;
-        if (attempt === this.retries || !this.isRetryable(err, method)) {
+        if (attempt === retries || signal?.aborted || !this.isRetryable(err, method)) {
           throw err;
         }
         const delay = this.computeBackoff(attempt, err);
-        if (delay > 0) {
-          await new Promise((resolve) => setTimeout(resolve, delay));
-        }
+        if (delay > 0) await sleep2(delay, signal);
       }
     }
     throw lastError;
   }
-  async requestOnce(method, path, body, multipart = false) {
-    const url2 = `${this.baseUrl}${path}`;
+  async requestOnce(method, path, body, multipart = false, signal) {
     const controller = new AbortController();
+    const detach = relayAbort(signal, controller);
     const timer = setTimeout(() => controller.abort(), this.timeoutMs);
+    try {
+      return await this.sendOnce(
+        method,
+        path,
+        body,
+        multipart,
+        controller,
+        signal
+      );
+    } finally {
+      clearTimeout(timer);
+      detach();
+    }
+  }
+  async sendOnce(method, path, body, multipart, controller, callerSignal) {
+    const url2 = `${this.baseUrl}${path}`;
     let response;
     try {
       response = await fetch(url2, {
@@ -42690,8 +42746,8 @@ var FrappeClient = class {
         signal: controller.signal
       });
     } catch (err) {
-      clearTimeout(timer);
       if (err instanceof Error && err.name === "AbortError") {
+        if (callerSignal?.aborted) throw callerAbortError(method, path);
         throw new FrappeAPIError(
           `Request timed out after ${this.timeoutMs}ms: ${method} ${path}`,
           408,
@@ -42704,8 +42760,20 @@ var FrappeClient = class {
         null
       );
     }
-    clearTimeout(timer);
-    const rawText = await response.text();
+    let rawText;
+    try {
+      rawText = await response.text();
+    } catch (err) {
+      if (callerSignal?.aborted) throw callerAbortError(method, path);
+      if (err instanceof Error && err.name === "AbortError") {
+        throw new FrappeAPIError(
+          `Request timed out after ${this.timeoutMs}ms: ${method} ${path}`,
+          408,
+          null
+        );
+      }
+      throw err;
+    }
     const contentType = response.headers.get("content-type") ?? "";
     let responseBody = rawText;
     if (contentType.includes("application/json") && rawText.length > 0) {
@@ -43145,8 +43213,11 @@ var FrappeClient = class {
    * its `message`. Needed for methods that fill `frappe.response` rather than
    * returning a value, such as `frappe.desk.form.load.getdoctype` (`docs` at
    * the top level, no `message`).
+   *
+   * `options` borne un appel facultatif : `{ retry: false }` coupe les reprises
+   * et `signal` annule la requête en cours.
    */
-  async callMethodRaw(method, args = {}, httpMethod = "POST") {
+  async callMethodRaw(method, args = {}, httpMethod = "POST", options = {}) {
     if (httpMethod === "GET") {
       const params = new URLSearchParams();
       for (const [key, value] of Object.entries(args)) {
@@ -43157,9 +43228,21 @@ var FrappeClient = class {
         );
       }
       const query = params.toString() ? `?${params.toString()}` : "";
-      return await this.request("GET", `/api/method/${method}${query}`);
+      return await this.request(
+        "GET",
+        `/api/method/${method}${query}`,
+        void 0,
+        false,
+        options
+      );
     }
-    return await this.request("POST", `/api/method/${method}`, args);
+    return await this.request(
+      "POST",
+      `/api/method/${method}`,
+      args,
+      false,
+      options
+    );
   }
 };
 var _client = null;
@@ -55074,6 +55157,7 @@ function withUiRefreshRequest(result, toolName, args, now = /* @__PURE__ */ new
 var DOCTYPE_LAYOUT_TTL_MS = 60 * 60 * 1e3;
 var DOCTYPE_LAYOUT_FAILURE_TTL_MS = 60 * 1e3;
 var DOCTYPE_LAYOUT_MAX_ENTRIES = 200;
+var DOCTYPE_LAYOUT_TIMEOUT_MS = 1500;
 var DOCTYPE_LAYOUT_SKIPPED = /* @__PURE__ */ new Set([
   "Company",
   "DocType"
@@ -55217,12 +55301,25 @@ async function fetchDocTypeLayout(client, doctype, options = {}) {
   const memo3 = options.memo ?? docTypeLayoutMemo;
   const remembered = memo3.get(doctype);
   if (remembered !== void 0) return remembered;
+  const timeoutMs = options.timeoutMs ?? DOCTYPE_LAYOUT_TIMEOUT_MS;
+  const controller = new AbortController();
+  let timer;
+  const budget = new Promise((_resolve, reject) => {
+    timer = setTimeout(() => {
+      reject(new Error(`getdoctype exceeded the ${timeoutMs}ms budget`));
+      controller.abort();
+    }, timeoutMs);
+  });
   try {
-    const response = await client.callMethodRaw(
-      GETDOCTYPE_METHOD,
-      { doctype },
-      "GET"
-    );
+    const response = await Promise.race([
+      client.callMethodRaw(
+        GETDOCTYPE_METHOD,
+        { doctype },
+        "GET",
+        { signal: controller.signal, retry: false }
+      ),
+      budget
+    ]);
     const layout = docTypeLayoutOf(response);
     if (!layout) throw new Error("unreadable getdoctype response");
     memo3.set(doctype, layout);
@@ -55233,6 +55330,8 @@ async function fetchDocTypeLayout(client, doctype, options = {}) {
     );
     memo3.set(doctype, null);
     return null;
+  } finally {
+    clearTimeout(timer);
   }
 }
 
@@ -56047,6 +56146,9 @@ function loadMrtrConfig() {
   return { signingKey };
 }
 
+// src/server-instructions.ts
+var ACTIVE_CONTEXT_INSTRUCTIONS = 'User selections in ERPNext viewers are shared as model context on compatible hosts with schema "casys.erpnext/active-context", version 2, and an items array of {id, view, label, value?}. This context identifies the documents and values the user is referring to. Document selections have IDs of the form record:<doctype>:<name>. Their <name> component is accepted as the name argument by the matching *_get tool; erpnext_doc_get accepts <doctype> and <name> as separate arguments. Child-row selections add :row:<table>:<row> to the document ID.';
+
 // server.ts
 var DEFAULT_HTTP_PORT = 3012;
 function registerBuyViewAppManifest(server) {
@@ -56108,7 +56210,8 @@ async function main() {
   assertNonEmptySelection(toolsClient.selection);
   const server = new McpApp({
     name: "mcp-erpnext",
-    version: "3.2.1",
+    version: "3.2.3",
+    instructions: ACTIVE_CONTEXT_INSTRUCTIONS,
     transport: "stateless",
     cache: {
       ttlMs: 36e5,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@casys/mcp-erpnext",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "description": "MCP server for ERPNext with interactive UI viewers",
   "type": "module",
   "bin": {