@mcp-abap-adt/connection 1.7.0 → 1.8.1

package/dist/connection/AbstractAbapConnection.d.ts

@@ -83,6 +83,14 @@ declare abstract class AbstractAbapConnection implements AbapConnection {
     private updateCookiesFromResponse;
     private getAxiosInstance;
     private ensureFreshCsrfToken;
+    /**
+     * Clear SAP-side session state when SAP rejects the cached CSRF token + session
+     * cookies (HTTP 401 on a mutation while a cached token exists). This forces the
+     * next request path to fetch a fresh token and a fresh SAP_SESSIONID cookie.
+     *
+     * Distinct from reset(): this leaves the axios instance and interceptors in place.
+     */
+    private invalidateSession;
     private shouldRetryCsrf;
 }
 export { AbstractAbapConnection };

package/dist/connection/AbstractAbapConnection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractAbapConnection.d.ts","sourceRoot":"","sources":["../../src/connection/AbstractAbapConnection.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAkB,MAAM,0BAA0B,CAAC;AAM7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9E,uBAAe,sBAAuB,YAAW,cAAc;IAW3D,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI;IAX3C,OAAO,CAAC,aAAa,CAA8B;IACnD,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,WAAW,CAAkC;IACrD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,WAAW,CAAyC;IAC5D,OAAO,CAAC,eAAe,CAAU;IAEjC,SAAS,aACU,MAAM,EAAE,SAAS,EACf,MAAM,EAAE,OAAO,GAAG,IAAI,EACzC,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE;IAqBzC;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI;IAUpD;;OAEG;IACH,cAAc,IAAI,WAAW,GAAG,UAAU;IAI1C;;;OAGG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAKrC;;OAEG;IACH,YAAY,IAAI,MAAM,GAAG,IAAI;IAI7B,SAAS,IAAI,SAAS;IAItB,KAAK,IAAI,IAAI;IAYP,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAI7B,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAevD;;;;;;;;OAQG;IACH,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAE3B,cAAc,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,EACnC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IA4P9B,SAAS,CAAC,QAAQ,CAAC,wBAAwB,IAAI,MAAM;IAErD;;;OAGG;cACa,cAAc,CAC5B,GAAG,EAAE,MAAM,EACX,UAAU,GAAE,MAAgC,EAC5C,UAAU,GAAE,MAAgC,GAC3C,OAAO,CAAC,MAAM,CAAC;IA2ClB;;OAEG;YACW,0BAA0B;IAsKxC;;OAEG;IACH,SAAS,CAAC,YAAY,IAAI,MAAM,GAAG,IAAI;IAIvC;;OAEG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAIlD;;OAEG;IACH,SAAS,CAAC,UAAU,IAAI,MAAM,GAAG,IAAI;IAIrC,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIlD,OAAO,CAAC,yBAAyB;IAkEjC,OAAO,CAAC,gBAAgB;YAqBV,oBAAoB;IAiClC,OAAO,CAAC,eAAe;CA+BxB;AAGD,OAAO,EAAE,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"AbstractAbapConnection.d.ts","sourceRoot":"","sources":["../../src/connection/AbstractAbapConnection.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAkB,MAAM,0BAA0B,CAAC;AAM7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9E,uBAAe,sBAAuB,YAAW,cAAc;IAW3D,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI;IAX3C,OAAO,CAAC,aAAa,CAA8B;IACnD,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,WAAW,CAAkC;IACrD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,WAAW,CAAyC;IAC5D,OAAO,CAAC,eAAe,CAAU;IAEjC,SAAS,aACU,MAAM,EAAE,SAAS,EACf,MAAM,EAAE,OAAO,GAAG,IAAI,EACzC,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE;IAqBzC;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI;IAUpD;;OAEG;IACH,cAAc,IAAI,WAAW,GAAG,UAAU;IAI1C;;;OAGG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAKrC;;OAEG;IACH,YAAY,IAAI,MAAM,GAAG,IAAI;IAI7B,SAAS,IAAI,SAAS;IAItB,KAAK,IAAI,IAAI;IAYP,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAI7B,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAevD;;;;;;;;OAQG;IACH,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAE3B,cAAc,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,EACnC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IA+R9B,SAAS,CAAC,QAAQ,CAAC,wBAAwB,IAAI,MAAM;IAErD;;;OAGG;cACa,cAAc,CAC5B,GAAG,EAAE,MAAM,EACX,UAAU,GAAE,MAAgC,EAC5C,UAAU,GAAE,MAAgC,GAC3C,OAAO,CAAC,MAAM,CAAC;IA2ClB;;OAEG;YACW,0BAA0B;IAsKxC;;OAEG;IACH,SAAS,CAAC,YAAY,IAAI,MAAM,GAAG,IAAI;IAIvC;;OAEG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAIlD;;OAEG;IACH,SAAS,CAAC,UAAU,IAAI,MAAM,GAAG,IAAI;IAIrC,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIlD,OAAO,CAAC,yBAAyB;IAkEjC,OAAO,CAAC,gBAAgB;YAqBV,oBAAoB;IAiClC;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,eAAe;CA+BxB;AAGD,OAAO,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/connection/AbstractAbapConnection.js

@@ -263,22 +263,51 @@ class AbstractAbapConnection {
             else {
                 this.logger?.error(errorDetails.message, errorDetails);
             }
-            // Retry logic for CSRF token errors (403 with CSRF message)
-            if (this.shouldRetryCsrf(error)) {
-                this.logger?.debug('CSRF token validation failed, fetching new token and retrying request', {
+            // Detect the "login-form 401" pattern: SAP returned 401 for a mutation while
+            // we have a cached CSRF token. The token and its bound SAP session must be
+            // discarded before the retry. Basic auth only — JWT/SAML lifecycles are
+            // managed elsewhere.
+            const isCachedTokenStale = error instanceof axios_1.AxiosError &&
+                this.config.authType === 'basic' &&
+                (normalizedMethod === 'POST' ||
+                    normalizedMethod === 'PUT' ||
+                    normalizedMethod === 'DELETE') &&
+                error.response?.status === 401 &&
+                this.getCsrfToken() !== null;
+            // Retry logic for CSRF token errors (403 with CSRF message) and the
+            // login-form 401 pattern.
+            if (this.shouldRetryCsrf(error) || isCachedTokenStale) {
+                this.logger?.debug(isCachedTokenStale
+                    ? 'Stale CSRF token / SAP session — invalidating and retrying'
+                    : 'CSRF token validation failed, fetching new token and retrying request', {
                     url: requestUrl,
                     method: normalizedMethod,
                 });
-                this.csrfToken = await this.fetchCsrfToken(requestUrl, 5, 2000);
-                if (this.csrfToken) {
-                    requestHeaders['x-csrf-token'] = this.csrfToken;
+                if (isCachedTokenStale) {
+                    this.invalidateSession();
+                    delete requestHeaders.Cookie;
+                    delete requestHeaders.cookie;
                 }
-                if (this.cookies) {
-                    requestHeaders.Cookie = this.cookies;
+                try {
+                    this.setCsrfToken(await this.fetchCsrfToken(requestUrl, 5, 2000));
+                    const refreshedToken = this.getCsrfToken();
+                    if (refreshedToken) {
+                        requestHeaders['x-csrf-token'] = refreshedToken;
+                    }
+                    const refreshedCookies = this.getCookies();
+                    if (refreshedCookies) {
+                        requestHeaders.Cookie = refreshedCookies;
+                    }
+                    const retryResponse = await this.getAxiosInstance()(requestConfig);
+                    this.updateCookiesFromResponse(retryResponse.headers);
+                    return retryResponse;
+                }
+                catch (retryError) {
+                    this.logger?.debug(`CSRF retry failed; rethrowing original error: ${retryError instanceof Error
+                        ? retryError.message
+                        : String(retryError)}`);
+                    throw error;
                 }
-                const retryResponse = await this.getAxiosInstance()(requestConfig);
-                this.updateCookiesFromResponse(retryResponse.headers);
-                return retryResponse;
             }
             // Retry logic for 401 errors on GET requests (authentication issue - need cookies)
             // Only for basic auth - JWT auth will be handled by refresh logic below
@@ -585,6 +614,18 @@ class AbstractAbapConnection {
             throw error;
         }
     }
+    /**
+     * Clear SAP-side session state when SAP rejects the cached CSRF token + session
+     * cookies (HTTP 401 on a mutation while a cached token exists). This forces the
+     * next request path to fetch a fresh token and a fresh SAP_SESSIONID cookie.
+     *
+     * Distinct from reset(): this leaves the axios instance and interceptors in place.
+     */
+    invalidateSession() {
+        this.setCsrfToken(null);
+        this.cookies = null;
+        this.cookieStore.clear();
+    }
     shouldRetryCsrf(error) {
         if (!(error instanceof axios_1.AxiosError)) {
             return false;

package/dist/connection/RfcAbapConnection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RfcAbapConnection.d.ts","sourceRoot":"","sources":["../../src/connection/RfcAbapConnection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACb,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA0F1D;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,iBAAkB,YAAW,cAAc;IASpD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IATzB,OAAO,CAAC,SAAS,CAA2B;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsB;IAChD,OAAO,CAAC,WAAW,CAAyC;IAC5D,OAAO,CAAC,aAAa,CAAuB;gBAGzB,MAAM,EAAE,SAAS,EACjB,MAAM,GAAE,OAAO,GAAG,IAAW;IAa1C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BxB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAInC,YAAY,IAAI,MAAM,GAAG,IAAI;IAI7B,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI;IAU9C,cAAc,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,EACnC,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IA8L9B;;;OAGG;IACH,KAAK,IAAI,IAAI;IAIb;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAc5B,OAAO,CAAC,MAAM,CAAC,cAAc;CAqB9B"}
+{"version":3,"file":"RfcAbapConnection.d.ts","sourceRoot":"","sources":["../../src/connection/RfcAbapConnection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACb,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAkG1D;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,iBAAkB,YAAW,cAAc;IASpD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IATzB,OAAO,CAAC,SAAS,CAA2B;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsB;IAChD,OAAO,CAAC,WAAW,CAAyC;IAC5D,OAAO,CAAC,aAAa,CAAuB;gBAGzB,MAAM,EAAE,SAAS,EACjB,MAAM,GAAE,OAAO,GAAG,IAAW;IAa1C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BxB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAInC,YAAY,IAAI,MAAM,GAAG,IAAI;IAI7B,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI;IAU9C,cAAc,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,EACnC,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IA8L9B;;;OAGG;IACH,KAAK,IAAI,IAAI;IAIb;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAY5B,OAAO,CAAC,MAAM,CAAC,cAAc;CAqB9B"}

package/dist/connection/RfcAbapConnection.js

@@ -2,6 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RfcAbapConnection = void 0;
 const node_crypto_1 = require("node:crypto");
+function rfcErrorMessage(e) {
+    if (e instanceof Error)
+        return e.message;
+    if (e && typeof e === 'object')
+        return JSON.stringify(e);
+    return String(e);
+}
 /**
  * Derive RFC connection parameters from ISapConfig.
  * Parses hostname from config.url, system number from port (80XX → XX).
@@ -14,8 +21,10 @@ const node_crypto_1 = require("node:crypto");
 function buildRfcParams(config) {
     const parsed = new URL(config.url);
     const port = Number.parseInt(parsed.port || '8000', 10);
-    // SAP HTTP port convention: 80XX where XX = system number
-    const sysnr = String(port - 8000).padStart(2, '0');
+    // SAP HTTP port convention: 80XX where XX = system number.
+    // SAP_SYSNR env var overrides derivation for non-standard ports (e.g. 50400).
+    const derivedSysnr = String(port - 8000).padStart(2, '0');
+    const sysnr = process.env.SAP_SYSNR?.trim() || derivedSysnr;
     return {
         ashost: parsed.hostname,
         sysnr,
@@ -105,7 +114,7 @@ class RfcAbapConnection {
         catch (e) {
             throw new Error('@mcp-abap-adt/sap-rfc-lite is not available. To use RFC connections, install SAP NW RFC SDK ' +
                 'and run: npm install @mcp-abap-adt/sap-rfc-lite. ' +
-                `Details: ${e instanceof Error ? e.message : String(e)}`);
+                `Details: ${rfcErrorMessage(e)}`);
         }
         this.rfcClient = new Client(this.rfcParams);
         try {
@@ -114,7 +123,7 @@ class RfcAbapConnection {
         }
         catch (e) {
             this.rfcClient = null;
-            const msg = e instanceof Error ? e.message : String(e);
+            const msg = rfcErrorMessage(e);
             this.logger?.error(`RFC connection failed: ${msg}`);
             throw new Error(`Failed to open RFC connection: ${msg}`);
         }
@@ -277,7 +286,7 @@ class RfcAbapConnection {
                 throw e;
             }
             // RFC-level error
-            const msg = e instanceof Error ? e.message : String(e);
+            const msg = rfcErrorMessage(e);
             this.logger?.error(`RFC call failed: ${msg}`);
             throw new Error(`RFC call to SADT_REST_RFC_ENDPOINT failed: ${msg}`);
         }
@@ -299,7 +308,7 @@ class RfcAbapConnection {
                 this.logger?.debug('RFC connection closed');
             }
             catch (e) {
-                this.logger?.debug(`RFC close error: ${e instanceof Error ? e.message : String(e)}`);
+                this.logger?.debug(`RFC close error: ${rfcErrorMessage(e)}`);
             }
             this.rfcClient = null;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcp-abap-adt/connection",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "description": "ABAP connection layer for MCP ABAP ADT server",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",