mcp-creatio 0.6.4 → 0.6.7

package/README.md

@@ -198,21 +198,30 @@ CREATIO_BASE_URL=https://your-creatio.com
 A request with **no** `Authorization` header gets `401` with a `WWW-Authenticate` challenge pointing
 at Creatio Identity (RFC 9728), so a compliant client knows where to log in.
 
+> **Forwarding a Creatio session cookie instead of a Bearer.** A client that authenticated to Creatio
+> the classic way holds a **Forms-auth session** (cookie + `BPMCSRF`), not an OAuth token. It can
+> forward that session instead of a Bearer by sending the cookie in **`X-Creatio-Cookie`** (and,
+> optionally, the anti-forgery token in `X-Creatio-Bpmcsrf` — otherwise it is read from the cookie).
+> The MCP attaches `Cookie` + `BPMCSRF` + `ForceUseSession` statelessly and lets Creatio validate it.
+> `Authorization: Bearer` takes precedence when both are present.
+
 ### `gateway`
 
-A trusted fronting service (Creatio.ai Control-Plane) injects the Bearer; the MCP trusts and uses
+A trusted fronting service (Creatio.ai Control-Plane) injects the credential; the MCP trusts and uses
 it. The optional `X-Creatio-Base-Url` header routes a request to a specific Creatio instance
-(multi-tenant) — honored only in this mode. Because that override decides where the request's Bearer
-is sent, it is validated: set **`CREATIO_MCP_ALLOWED_BASE_URLS`** (comma-separated origins) to
-restrict it to your tenants. When unset, any `http(s)` host is accepted (trusting the gateway) except
-the cloud-metadata link-local address, which is always blocked (SSRF guard).
+(multi-tenant) — honored only in this mode. Because that override decides where the request's
+credential is sent, it is validated: set **`CREATIO_MCP_ALLOWED_BASE_URLS`** (comma-separated origins)
+to restrict it to your tenants. When unset, any `http(s)` host is accepted (trusting the gateway)
+except the cloud-metadata link-local address, which is always blocked (SSRF guard).
 
 **Who sends what.** Unlike `delegated`, the end client talks to the **gateway**, not to the MCP — so
-the **gateway** is what injects the per-request headers. On each forwarded `/mcp` call it sends:
+the **gateway** is what injects the per-request headers. On each forwarded `/mcp` call it sends a
+Creatio credential — either a Bearer token, or a forwarded Forms-auth session:
 
 ```http
 POST /mcp HTTP/1.1
-Authorization: Bearer <CREATIO_ACCESS_TOKEN>     # required — the tenant's Creatio token
+Authorization: Bearer <CREATIO_ACCESS_TOKEN>     # a Bearer token …
+X-Creatio-Cookie: BPMCSRF=<csrf>; .ASPXAUTH=<s>   # … OR forward a Forms-auth session instead
 X-Creatio-Base-Url: https://tenant-a.creatio.com  # optional — pick the tenant's instance (multi-tenant)
 ```
 
@@ -234,10 +243,21 @@ curl -sS http://localhost:3000/mcp \
   -d '{"jsonrpc":"2.0","id":1,"method":"tools/call","params":{"name":"get-current-user-info","arguments":{}}}'
 ```
 
-> **Only the Bearer token is injected** — not arbitrary credentials. The gateway owns auth: it should
-> exchange whatever it holds (SSO, cookie, etc.) into a Creatio OAuth access token **before** calling
-> the MCP. (Injecting other credential shapes, e.g. cookie/basic per tenant, is intentionally out of
-> scope for now.)
+> **Bearer or session cookie — nothing else.** The gateway injects either a Creatio OAuth **Bearer**
+> token or a forwarded **Forms-auth session** (`X-Creatio-Cookie` + `BPMCSRF`); the MCP forwards it
+> statelessly (no cookie jar, no per-credential pool) and Creatio validates it. The gateway owns auth —
+> it should hold a ready Creatio credential of one of those two shapes. Other shapes (Basic, API key)
+> are intentionally out of scope.
+
+> **Per-tenant tool isolation.** A single MCP deployment serving many instances keeps each tenant's
+> tool surface separate, keyed by the effective base URL (`X-Creatio-Base-Url`, else `CREATIO_BASE_URL`).
+> Optional capabilities are **probed per tenant** and the tools they expose (DataForge, Global Search,
+> and any dynamically discovered per-instance tools) are registered only for the tenant they were
+> discovered on. Tenant A's tools or DataForge verdict never leak into tenant B's session, even though
+> both share one process. The
+> per-tenant state is pooled with idle-TTL + LRU eviction, so memory stays bounded as the number of
+> distinct instances grows. Single-tenant modes (everything except `gateway` with an override) all map
+> to one bucket, so their behavior is unchanged.
 
 ### `client_credentials` / `legacy`
 

package/dist/creatio/auth/headers.d.ts

@@ -1,3 +1,10 @@
 /** Builds the standard Creatio request headers, optionally with a JSON content-type and a Bearer token. */
 export declare function buildHeaders(accept: string, isJson?: boolean, token?: string): Record<string, string>;
+/**
+ * Builds Creatio request headers for a Forms-auth (cookie) session: the base headers plus the
+ * session `Cookie`, its `BPMCSRF` anti-forgery token, and `ForceUseSession` so Creatio honours the
+ * cookie session. Single source of the cookie-header convention, shared by the legacy self-login
+ * provider and the stateless gateway/delegated cookie passthrough.
+ */
+export declare function buildCookieHeaders(accept: string, isJson: boolean, cookie: string, bpmcsrf?: string): Record<string, string>;
 //# sourceMappingURL=headers.d.ts.map

package/dist/creatio/auth/headers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"headers.d.ts","sourceRoot":"","sources":["../../../src/creatio/auth/headers.ts"],"names":[],"mappings":"AAAA,2GAA2G;AAC3G,wBAAgB,YAAY,CAC3B,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,OAAO,EAChB,KAAK,CAAC,EAAE,MAAM,GACZ,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CASxB"}
+{"version":3,"file":"headers.d.ts","sourceRoot":"","sources":["../../../src/creatio/auth/headers.ts"],"names":[],"mappings":"AAAA,2GAA2G;AAC3G,wBAAgB,YAAY,CAC3B,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,OAAO,EAChB,KAAK,CAAC,EAAE,MAAM,GACZ,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CASxB;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CACjC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,GACd,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQxB"}

package/dist/creatio/auth/headers.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildHeaders = buildHeaders;
+exports.buildCookieHeaders = buildCookieHeaders;
 /** Builds the standard Creatio request headers, optionally with a JSON content-type and a Bearer token. */
 function buildHeaders(accept, isJson, token) {
     const headers = { Accept: accept };
@@ -12,4 +13,19 @@ function buildHeaders(accept, isJson, token) {
     }
     return headers;
 }
+/**
+ * Builds Creatio request headers for a Forms-auth (cookie) session: the base headers plus the
+ * session `Cookie`, its `BPMCSRF` anti-forgery token, and `ForceUseSession` so Creatio honours the
+ * cookie session. Single source of the cookie-header convention, shared by the legacy self-login
+ * provider and the stateless gateway/delegated cookie passthrough.
+ */
+function buildCookieHeaders(accept, isJson, cookie, bpmcsrf) {
+    const headers = buildHeaders(accept, isJson);
+    headers['ForceUseSession'] = 'true';
+    headers['Cookie'] = cookie;
+    if (bpmcsrf) {
+        headers['BPMCSRF'] = bpmcsrf;
+    }
+    return headers;
+}
 //# sourceMappingURL=headers.js.map

package/dist/creatio/auth/headers.js.map

@@ -1 +1 @@
-{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../../src/creatio/auth/headers.ts"],"names":[],"mappings":";;AACA,oCAaC;AAdD,2GAA2G;AAC3G,SAAgB,YAAY,CAC3B,MAAc,EACd,MAAgB,EAChB,KAAc;IAEd,MAAM,OAAO,GAA2B,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC3D,IAAI,MAAM,EAAE,CAAC;QACZ,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC;IAC9C,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACX,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,KAAK,EAAE,CAAC;IAC9C,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC"}
+{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../../src/creatio/auth/headers.ts"],"names":[],"mappings":";;AACA,oCAaC;AAQD,gDAaC;AAnCD,2GAA2G;AAC3G,SAAgB,YAAY,CAC3B,MAAc,EACd,MAAgB,EAChB,KAAc;IAEd,MAAM,OAAO,GAA2B,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC3D,IAAI,MAAM,EAAE,CAAC;QACZ,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC;IAC9C,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACX,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,KAAK,EAAE,CAAC;IAC9C,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,SAAgB,kBAAkB,CACjC,MAAc,EACd,MAAe,EACf,MAAc,EACd,OAAgB;IAEhB,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,OAAO,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC;IACpC,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;IAC3B,IAAI,OAAO,EAAE,CAAC;QACb,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC;IAC9B,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC"}

package/dist/creatio/auth/providers/legacy-provider.d.ts

@@ -3,7 +3,9 @@ import { BaseProvider } from './base-provider';
 export declare class LegacyProvider extends BaseProvider<LegacyAuthConfig> {
     private _bpmCsrf;
     private _cookieHeader;
+    private _inflightLogin;
     private _ensureSession;
+    private _login;
     getHeaders(accept: string, isJson?: boolean): Promise<Record<string, string>>;
     refresh(): Promise<void>;
 }

package/dist/creatio/auth/providers/legacy-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"legacy-provider.d.ts","sourceRoot":"","sources":["../../../../src/creatio/auth/providers/legacy-provider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,qBAAa,cAAe,SAAQ,YAAY,CAAC,gBAAgB,CAAC;IACjE,OAAO,CAAC,QAAQ,CAAqB;IAErC,OAAO,CAAC,aAAa,CAAqB;YAE5B,cAAc;IAyCf,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAW7E,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAIrC"}
+{"version":3,"file":"legacy-provider.d.ts","sourceRoot":"","sources":["../../../../src/creatio/auth/providers/legacy-provider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,qBAAa,cAAe,SAAQ,YAAY,CAAC,gBAAgB,CAAC;IACjE,OAAO,CAAC,QAAQ,CAAqB;IAErC,OAAO,CAAC,aAAa,CAAqB;IAK1C,OAAO,CAAC,cAAc,CAA4B;YAEpC,cAAc;YAad,MAAM;IAsCP,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAK7E,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAIrC"}

package/dist/creatio/auth/providers/legacy-provider.js

@@ -12,10 +12,23 @@ const base_provider_1 = require("./base-provider");
 class LegacyProvider extends base_provider_1.BaseProvider {
     _bpmCsrf;
     _cookieHeader;
+    // Single-flight: a burst of concurrent first-calls (or 401-driven refreshes) that all find no
+    // session triggers ONE login, not N — avoids a thundering herd against AuthService on expiry.
+    // Mirrors the dedup BaseOAuth2Provider and the broker provider already do.
+    _inflightLogin;
     async _ensureSession() {
         if (this._cookieHeader) {
             return;
         }
+        if (this._inflightLogin) {
+            return this._inflightLogin;
+        }
+        this._inflightLogin = this._login().finally(() => {
+            this._inflightLogin = undefined;
+        });
+        return this._inflightLogin;
+    }
+    async _login() {
         const url = `${this.config.baseUrl.replace(/\/$/, '')}/ServiceModel/AuthService.svc/Login`;
         const body = JSON.stringify({
             UserName: this.authConfig.login,
@@ -56,13 +69,7 @@ class LegacyProvider extends base_provider_1.BaseProvider {
     }
     async getHeaders(accept, isJson) {
         await this._ensureSession();
-        const h = (0, auth_1.buildHeaders)(accept, Boolean(isJson));
-        h['ForceUseSession'] = 'true';
-        h['Cookie'] = this._cookieHeader;
-        if (this._bpmCsrf) {
-            h['BPMCSRF'] = this._bpmCsrf;
-        }
-        return h;
+        return (0, auth_1.buildCookieHeaders)(accept, Boolean(isJson), this._cookieHeader, this._bpmCsrf);
     }
     async refresh() {
         this._cookieHeader = undefined;

package/dist/creatio/auth/providers/legacy-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"legacy-provider.js","sourceRoot":"","sources":["../../../../src/creatio/auth/providers/legacy-provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"legacy-provider.js","sourceRoot":"","sources":["../../../../src/creatio/auth/providers/legacy-provider.ts"],"names":[],"mappings":"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"}

package/dist/creatio/auth/providers/oauth2-bearer-provider.d.ts

@@ -1,14 +1,15 @@
 import { BearerAuthConfig } from '../../client-config';
 import { BaseProvider } from './base-provider';
 /**
- * Stateless per-request Bearer passthrough provider.
+ * Stateless per-request credential passthrough provider (delegated / gateway).
  *
- * The MCP issues and stores no tokens: every request already carries a Creatio access token
- * (obtained by the client from Creatio Identity in `delegated` mode, or injected by a trusted
- * Control-Plane in `gateway` mode). This provider simply attaches that token — read from the
- * per-request {@link getBearerToken} context — to outgoing Creatio calls. Token acquisition and
- * refresh are the client's / gateway's responsibility, which is why there is nothing to refresh
- * here and no server-side token store.
+ * The MCP issues and stores no tokens: every request already carries a Creatio credential — obtained
+ * by the client from Creatio Identity in `delegated` mode, or injected by a trusted Control-Plane in
+ * `gateway` mode. This provider reads that credential from the per-request {@link getInjectedCredential}
+ * context and formats the matching headers: a Bearer token, or a Forms-auth session (Cookie + BPMCSRF
+ * + ForceUseSession). It holds no cookie jar and needs no client pool — the headers are rebuilt from
+ * the context on every call. Token/session acquisition and refresh are the client's / gateway's
+ * responsibility, which is why there is nothing to refresh here.
  */
 export declare class OAuth2BearerProvider extends BaseProvider<BearerAuthConfig> {
     getHeaders(accept: string, isJson?: boolean): Promise<Record<string, string>>;

package/dist/creatio/auth/providers/oauth2-bearer-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth2-bearer-provider.d.ts","sourceRoot":"","sources":["../../../../src/creatio/auth/providers/oauth2-bearer-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;;;;;GASG;AACH,qBAAa,oBAAqB,SAAQ,YAAY,CAAC,gBAAgB,CAAC;IAC1D,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAU7E,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAIrC"}
+{"version":3,"file":"oauth2-bearer-provider.d.ts","sourceRoot":"","sources":["../../../../src/creatio/auth/providers/oauth2-bearer-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;;;;;;GAUG;AACH,qBAAa,oBAAqB,SAAQ,YAAY,CAAC,gBAAgB,CAAC;IAC1D,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAa7E,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAKrC"}

package/dist/creatio/auth/providers/oauth2-bearer-provider.js

@@ -5,28 +5,33 @@ const utils_1 = require("../../../utils");
 const auth_1 = require("../auth");
 const base_provider_1 = require("./base-provider");
 /**
- * Stateless per-request Bearer passthrough provider.
+ * Stateless per-request credential passthrough provider (delegated / gateway).
  *
- * The MCP issues and stores no tokens: every request already carries a Creatio access token
- * (obtained by the client from Creatio Identity in `delegated` mode, or injected by a trusted
- * Control-Plane in `gateway` mode). This provider simply attaches that token — read from the
- * per-request {@link getBearerToken} context — to outgoing Creatio calls. Token acquisition and
- * refresh are the client's / gateway's responsibility, which is why there is nothing to refresh
- * here and no server-side token store.
+ * The MCP issues and stores no tokens: every request already carries a Creatio credential — obtained
+ * by the client from Creatio Identity in `delegated` mode, or injected by a trusted Control-Plane in
+ * `gateway` mode. This provider reads that credential from the per-request {@link getInjectedCredential}
+ * context and formats the matching headers: a Bearer token, or a Forms-auth session (Cookie + BPMCSRF
+ * + ForceUseSession). It holds no cookie jar and needs no client pool — the headers are rebuilt from
+ * the context on every call. Token/session acquisition and refresh are the client's / gateway's
+ * responsibility, which is why there is nothing to refresh here.
  */
 class OAuth2BearerProvider extends base_provider_1.BaseProvider {
     async getHeaders(accept, isJson) {
-        const token = (0, utils_1.getBearerToken)();
-        if (!token) {
-            // No token in context ⇒ unauthenticated request. The HTTP edge turns this into a 401
+        const credential = (0, utils_1.getInjectedCredential)();
+        if (!credential) {
+            // No credential in context ⇒ unauthenticated request. The HTTP edge turns this into a 401
             // (delegated: with a WWW-Authenticate challenge; gateway: a plain rejection).
-            throw new Error('bearer_token_required');
+            throw new Error('credential_required');
         }
-        return (0, auth_1.buildHeaders)(accept, Boolean(isJson), token);
+        if (credential.kind === 'cookie') {
+            return (0, auth_1.buildCookieHeaders)(accept, Boolean(isJson), credential.cookie, credential.bpmcsrf);
+        }
+        return (0, auth_1.buildHeaders)(accept, Boolean(isJson), credential.token);
     }
     async refresh() {
-        // Nothing to refresh: the client (delegated) or gateway owns the token lifecycle. A stale
-        // token surfaces as a 401 from Creatio, which the caller resolves by presenting a fresh one.
+        // Nothing to refresh: the client (delegated) or gateway owns the credential lifecycle. A stale
+        // token/session surfaces as a 401 from Creatio, which the caller resolves by presenting a fresh
+        // one.
     }
 }
 exports.OAuth2BearerProvider = OAuth2BearerProvider;

package/dist/creatio/auth/providers/oauth2-bearer-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth2-bearer-provider.js","sourceRoot":"","sources":["../../../../src/creatio/auth/providers/oauth2-bearer-provider.ts"],"names":[],"mappings":";;;AAAA,0CAAgD;AAEhD,kCAAuC;AAEvC,mDAA+C;AAE/C;;;;;;;;;GASG;AACH,MAAa,oBAAqB,SAAQ,4BAA8B;IAChE,KAAK,CAAC,UAAU,CAAC,MAAc,EAAE,MAAgB;QACvD,MAAM,KAAK,GAAG,IAAA,sBAAc,GAAE,CAAC;QAC/B,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,qFAAqF;YACrF,8EAA8E;YAC9E,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,IAAA,mBAAY,EAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC;IAEM,KAAK,CAAC,OAAO;QACnB,0FAA0F;QAC1F,6FAA6F;IAC9F,CAAC;CACD;AAfD,oDAeC"}
+{"version":3,"file":"oauth2-bearer-provider.js","sourceRoot":"","sources":["../../../../src/creatio/auth/providers/oauth2-bearer-provider.ts"],"names":[],"mappings":";;;AAAA,0CAAuD;AAEvD,kCAA2D;AAE3D,mDAA+C;AAE/C;;;;;;;;;;GAUG;AACH,MAAa,oBAAqB,SAAQ,4BAA8B;IAChE,KAAK,CAAC,UAAU,CAAC,MAAc,EAAE,MAAgB;QACvD,MAAM,UAAU,GAAG,IAAA,6BAAqB,GAAE,CAAC;QAC3C,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,0FAA0F;YAC1F,8EAA8E;YAC9E,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAClC,OAAO,IAAA,yBAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;QAC3F,CAAC;QACD,OAAO,IAAA,mBAAY,EAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;IAChE,CAAC;IAEM,KAAK,CAAC,OAAO;QACnB,+FAA+F;QAC/F,gGAAgG;QAChG,OAAO;IACR,CAAC;CACD;AAnBD,oDAmBC"}

package/dist/creatio/services/dataservice/data-service-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-service-schema.d.ts","sourceRoot":"","sources":["../../../../src/creatio/services/dataservice/data-service-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAoB7E;;;;;;;;;GASG;AACH,qBAAa,yBAAyB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAuB;IAClD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0B;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8B;IACvD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkC;IAK7D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA6E;gBAGzG,SAAS,EAAE,oBAAoB,EAC/B,YAAY,0BAAgC,EAC5C,OAAO,8BAAoC,EAC3C,SAAS,CAAC,EAAE,mBAAmB;YAQlB,iBAAiB;IAqB/B,OAAO,CAAC,QAAQ;IAIhB,6DAA6D;IACtD,cAAc,IAAI,sBAAsB;IAWlC,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAanC,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAgBhF,4FAA4F;IAC/E,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;CAS7E"}
+{"version":3,"file":"data-service-schema.d.ts","sourceRoot":"","sources":["../../../../src/creatio/services/dataservice/data-service-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAG/D,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAwB7E;;;;;;;;;GASG;AACH,qBAAa,yBAAyB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAuB;IAClD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0B;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8B;IACvD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkC;IAI7D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA0E;gBAGtG,SAAS,EAAE,oBAAoB,EAC/B,YAAY,0BAAgC,EAC5C,OAAO,8BAAoC,EAC3C,SAAS,CAAC,EAAE,mBAAmB;YAQlB,iBAAiB;IAkB/B,OAAO,CAAC,QAAQ;IAIhB,6DAA6D;IACtD,cAAc,IAAI,sBAAsB;IAWlC,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAanC,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAgBhF,4FAA4F;IAC/E,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;CAS7E"}

package/dist/creatio/services/dataservice/data-service-schema.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataServiceSchemaProvider = void 0;
+const versioned_ttl_cache_1 = require("../versioned-ttl-cache");
 const data_service_filter_translator_1 = require("./data-service-filter-translator");
 const data_service_query_builder_1 = require("./data-service-query-builder");
 const data_service_types_1 = require("./data-service-types");
 const CACHE_TTL_MS = 30 * 60 * 1000;
+// Keyed per (base URL, entity), so the cap spans every entity described across every tenant; sized
+// generously since a single tenant can legitimately describe many entities, but still bounded so a
+// long-lived multi-tenant gateway cannot grow the schema cache without limit.
+const MAX_SCHEMA_ENTRIES = 1000;
 const ENTITY_LIST_SCHEMA = 'VwSysSchemaInWorkspace';
 const ENTITY_MANAGER = 'EntitySchemaManager';
 /**
@@ -23,10 +28,9 @@ class DataServiceSchemaProvider {
     _filters;
     _freshness;
     // Keyed by `${baseUrl}::${name}` so a multi-tenant gateway never serves tenant A's schema to B.
-    // Each entry is stamped with the freshness version at fetch time; a version mismatch (the data
-    // model changed) treats it as a miss. The TTL is a coarse backstop (and the sole freshness gate
-    // when no SchemaFreshnessGate is wired — then `version` is constant and behaviour is unchanged).
-    _schemaCache = new Map();
+    // Version-stamped (a data-model change is a miss), TTL-bounded, and LRU-capped — all delegated to
+    // the shared cache so this provider and ODataMetadataStore share one freshness/eviction policy.
+    _schemaCache = new versioned_ttl_cache_1.VersionedTtlCache(CACHE_TTL_MS, MAX_SCHEMA_ENTRIES);
     constructor(transport, queryBuilder = new data_service_query_builder_1.DataServiceQueryBuilder(), filters = new data_service_filter_translator_1.DataServiceFilterTranslator(), freshness) {
         this._transport = transport;
         this._queryBuilder = queryBuilder;
@@ -37,17 +41,14 @@ class DataServiceSchemaProvider {
         const baseUrl = this._transport.baseUrl;
         const version = this._freshness ? await this._freshness.getSchemaVersion(baseUrl) : '';
         const key = `${baseUrl}::${name}`;
-        const cached = this._schemaCache.get(key);
-        if (cached && cached.version === version && Date.now() - cached.at < CACHE_TTL_MS) {
-            return cached.schema;
-        }
-        const body = await this._transport.post('RuntimeEntitySchemaRequest', { name }, { logContext: { entity: name }, checkSuccess: true });
-        const schema = body?.schema;
-        if (!schema || !schema.name) {
-            throw new Error(`entity_not_found:${name}`);
-        }
-        this._schemaCache.set(key, { schema, version, at: Date.now() });
-        return schema;
+        return this._schemaCache.getOrLoad(key, version, async () => {
+            const body = await this._transport.post('RuntimeEntitySchemaRequest', { name }, { logContext: { entity: name }, checkSuccess: true });
+            const schema = body?.schema;
+            if (!schema || !schema.name) {
+                throw new Error(`entity_not_found:${name}`);
+            }
+            return schema;
+        });
     }
     _columns(schema) {
         return Object.values(schema.columns?.Items ?? {});

package/dist/creatio/services/dataservice/data-service-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-service-schema.js","sourceRoot":"","sources":["../../../../src/creatio/services/dataservice/data-service-schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-service-schema.js","sourceRoot":"","sources":["../../../../src/creatio/services/dataservice/data-service-schema.ts"],"names":[],"mappings":"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"}

package/dist/creatio/services/odata/metadata-store.d.ts

@@ -3,32 +3,25 @@ import { CreatioHttpClient } from '../http-client';
 import { SchemaFreshnessGate } from '../schema-freshness-gate';
 export declare class ODataMetadataStore {
     private static readonly METADATA_TTL_MS;
+    /** Max distinct base URLs (tenants) retained per cache; least-recently-used dropped past it. */
+    private static readonly DEFAULT_MAX_TENANTS;
     private readonly _client;
     private readonly _freshness;
-    private _metadataXml?;
-    private _metadataParsed?;
-    private _metadataFetchedAt;
-    private _entitySetsCache?;
-    private _entitySetsFetchedAt;
-    private _metadataBaseUrl?;
-    private _metadataVersion?;
-    private _entitySetsBaseUrl?;
-    private _entitySetsVersion?;
-    private _entityTypeBySet;
-    private _typeNodeByName;
-    constructor(client: CreatioHttpClient, freshness?: SchemaFreshnessGate);
-    private _isFresh;
+    private readonly _docs;
+    private readonly _entitySets;
+    constructor(client: CreatioHttpClient, freshness?: SchemaFreshnessGate, maxTenants?: number);
     /** Freshness version for the current request's base URL (empty when no gate is wired, which
      *  keeps the cache purely TTL-driven — the prior behaviour). */
     private _version;
     private _arrayify;
-    private _getMetadataXml;
+    /** The cached metadata document for the current request's base URL, fetching/refreshing the raw
+     *  `$metadata` on a miss (different tenant, stale TTL, or a changed freshness version). */
+    private _getDoc;
     private _getParsedMetadata;
     private _extractSchemas;
     private _tryGetEntitySetsFromService;
-    /** Build (once per parsed document) the entitySet→entityType and typeName→typeNode lookups.
-     *  Always goes through {@link _getParsedMetadata} first so the TTL refresh runs (and nulls the
-     *  indexes on a refetch); only the index build itself is cached. */
+    /** Build (once per parsed document) the entitySet→entityType and typeName→typeNode lookups on the
+     *  document, so describeEntity is O(1) instead of two O(N) scans over the entire EDMX per call. */
     private _ensureIndexes;
     private _getEntitySetsFromMetadata;
     private _parseEntityProperties;

package/dist/creatio/services/odata/metadata-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metadata-store.d.ts","sourceRoot":"","sources":["../../../../src/creatio/services/odata/metadata-store.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAI/D,qBAAa,kBAAkB;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAkB;IACzD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;IAC5C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkC;IAC7D,OAAO,CAAC,YAAY,CAAC,CAAS;IAC9B,OAAO,CAAC,eAAe,CAAC,CAAM;IAC9B,OAAO,CAAC,kBAAkB,CAAK;IAC/B,OAAO,CAAC,gBAAgB,CAAC,CAAW;IACpC,OAAO,CAAC,oBAAoB,CAAK;IAKjC,OAAO,CAAC,gBAAgB,CAAC,CAAS;IAClC,OAAO,CAAC,gBAAgB,CAAC,CAAS;IAClC,OAAO,CAAC,kBAAkB,CAAC,CAAS;IACpC,OAAO,CAAC,kBAAkB,CAAC,CAAS;IAGpC,OAAO,CAAC,gBAAgB,CAAkC;IAC1D,OAAO,CAAC,eAAe,CAA+B;gBAE1C,MAAM,EAAE,iBAAiB,EAAE,SAAS,CAAC,EAAE,mBAAmB;IAKtE,OAAO,CAAC,QAAQ;IAIhB;oEACgE;YAClD,QAAQ;IAMtB,OAAO,CAAC,SAAS;YAOH,eAAe;YAwBf,kBAAkB;IAahC,OAAO,CAAC,eAAe;YAKT,4BAA4B;IA4B1C;;wEAEoE;YACtD,cAAc;YA4Bd,0BAA0B;IAKxC,OAAO,CAAC,sBAAsB;IA2BjB,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAoBnC,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC;CAkBhF"}
+{"version":3,"file":"metadata-store.d.ts","sourceRoot":"","sources":["../../../../src/creatio/services/odata/metadata-store.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAe/D,qBAAa,kBAAkB;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAkB;IACzD,gGAAgG;IAChG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAO;IAClD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;IAC5C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkC;IAK7D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IACvD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;gBAGzD,MAAM,EAAE,iBAAiB,EACzB,SAAS,CAAC,EAAE,mBAAmB,EAC/B,UAAU,GAAE,MAA+C;IAW5D;oEACgE;YAClD,QAAQ;IAMtB,OAAO,CAAC,SAAS;IAOjB;+FAC2F;YAC7E,OAAO;IAWrB,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,eAAe;YAKT,4BAA4B;IA4B1C;uGACmG;IACnG,OAAO,CAAC,cAAc;YA4BR,0BAA0B;IAMxC,OAAO,CAAC,sBAAsB;IA2BjB,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IASnC,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC;CAmBhF"}

package/dist/creatio/services/odata/metadata-store.js

@@ -6,34 +6,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ODataMetadataStore = void 0;
 const fast_xml_parser_1 = require("fast-xml-parser");
 const log_1 = __importDefault(require("../../../log"));
+const versioned_ttl_cache_1 = require("../versioned-ttl-cache");
 const odata_routes_1 = require("./odata-routes");
 class ODataMetadataStore {
     static METADATA_TTL_MS = 30 * 60 * 1000;
+    /** Max distinct base URLs (tenants) retained per cache; least-recently-used dropped past it. */
+    static DEFAULT_MAX_TENANTS = 100;
     _client;
     _freshness;
-    _metadataXml;
-    _metadataParsed;
-    _metadataFetchedAt = 0;
-    _entitySetsCache;
-    _entitySetsFetchedAt = 0;
-    // The base URL + freshness version the cached document/list were fetched under. A change in
-    // either (a different tenant via the gateway override, or a data-model change) invalidates the
-    // single-slot cache. Single-slot is intentional: per-tenant pooling is the multitenancy epic;
-    // here correctness (never serve another tenant's / a stale model's metadata) is what matters.
-    _metadataBaseUrl;
-    _metadataVersion;
-    _entitySetsBaseUrl;
-    _entitySetsVersion;
-    // Built once per parsed-metadata document so describeEntity is O(1) instead of two O(N) scans
-    // over the entire (hundreds-to-thousands of types) Creatio EDMX on every call.
-    _entityTypeBySet;
-    _typeNodeByName;
-    constructor(client, freshness) {
+    // Keyed by base URL so a multi-tenant gateway never serves tenant A's metadata to B AND never
+    // thrashes: tenant A's parsed document survives an interleaved call to B (the prior single-slot
+    // design re-fetched A's whole $metadata on every tenant switch). Version-stamping + TTL + LRU are
+    // all the shared cache's job.
+    _docs;
+    _entitySets;
+    constructor(client, freshness, maxTenants = ODataMetadataStore.DEFAULT_MAX_TENANTS) {
         this._client = client;
         this._freshness = freshness;
-    }
-    _isFresh(fetchedAt) {
-        return Date.now() - fetchedAt < ODataMetadataStore.METADATA_TTL_MS;
+        this._docs = new versioned_ttl_cache_1.VersionedTtlCache(ODataMetadataStore.METADATA_TTL_MS, maxTenants);
+        this._entitySets = new versioned_ttl_cache_1.VersionedTtlCache(ODataMetadataStore.METADATA_TTL_MS, maxTenants);
     }
     /** Freshness version for the current request's base URL (empty when no gate is wired, which
      *  keeps the cache purely TTL-driven — the prior behaviour). */
@@ -48,38 +39,27 @@ class ODataMetadataStore {
         }
         return Array.isArray(value) ? value : [value];
     }
-    async _getMetadataXml() {
+    /** The cached metadata document for the current request's base URL, fetching/refreshing the raw
+     *  `$metadata` on a miss (different tenant, stale TTL, or a changed freshness version). */
+    async _getDoc() {
         const baseUrl = this._client.normalizedBaseUrl;
         const version = await this._version();
-        if (this._metadataXml &&
-            this._metadataBaseUrl === baseUrl &&
-            this._metadataVersion === version &&
-            this._isFresh(this._metadataFetchedAt)) {
-            return this._metadataXml;
-        }
-        const headers = await this._client.getXmlHeaders();
-        const metadataUrl = `${(0, odata_routes_1.odataRoot)(baseUrl)}/$metadata`;
-        const xmlContent = await this._client.fetchText(metadataUrl, async () => ({ headers }));
-        this._metadataXml = xmlContent;
-        this._metadataParsed = undefined; // force re-parse against the refreshed document
-        this._entityTypeBySet = undefined; // and rebuild the lookup indexes
-        this._typeNodeByName = undefined;
-        this._metadataBaseUrl = baseUrl;
-        this._metadataVersion = version;
-        this._metadataFetchedAt = Date.now();
-        return this._metadataXml;
+        return this._docs.getOrLoad(baseUrl, version, async () => {
+            const headers = await this._client.getXmlHeaders();
+            const metadataUrl = `${(0, odata_routes_1.odataRoot)(baseUrl)}/$metadata`;
+            const xml = await this._client.fetchText(metadataUrl, async () => ({ headers }));
+            return { xml };
+        });
     }
-    async _getParsedMetadata() {
-        const xmlContent = await this._getMetadataXml();
-        if (this._metadataParsed) {
-            return this._metadataParsed;
+    _getParsedMetadata(doc) {
+        if (!doc.parsed) {
+            const parser = new fast_xml_parser_1.XMLParser({
+                ignoreAttributes: false,
+                attributeNamePrefix: '@_',
+            });
+            doc.parsed = parser.parse(doc.xml);
         }
-        const parser = new fast_xml_parser_1.XMLParser({
-            ignoreAttributes: false,
-            attributeNamePrefix: '@_',
-        });
-        this._metadataParsed = parser.parse(xmlContent);
-        return this._metadataParsed;
+        return doc.parsed;
     }
     _extractSchemas(metadata) {
         const dataServices = metadata['edmx:Edmx']?.['edmx:DataServices'];
@@ -113,14 +93,13 @@ class ODataMetadataStore {
         }
         return null;
     }
-    /** Build (once per parsed document) the entitySet→entityType and typeName→typeNode lookups.
-     *  Always goes through {@link _getParsedMetadata} first so the TTL refresh runs (and nulls the
-     *  indexes on a refetch); only the index build itself is cached. */
-    async _ensureIndexes() {
-        const metadata = await this._getParsedMetadata();
-        if (this._entityTypeBySet && this._typeNodeByName) {
+    /** Build (once per parsed document) the entitySet→entityType and typeName→typeNode lookups on the
+     *  document, so describeEntity is O(1) instead of two O(N) scans over the entire EDMX per call. */
+    _ensureIndexes(doc) {
+        if (doc.entityTypeBySet && doc.typeNodeByName) {
             return;
         }
+        const metadata = this._getParsedMetadata(doc);
         const schemas = this._extractSchemas(metadata);
         const bySet = new Map();
         const byType = new Map();
@@ -140,12 +119,13 @@ class ODataMetadataStore {
                 }
             }
         }
-        this._entityTypeBySet = bySet;
-        this._typeNodeByName = byType;
+        doc.entityTypeBySet = bySet;
+        doc.typeNodeByName = byType;
     }
     async _getEntitySetsFromMetadata() {
-        await this._ensureIndexes();
-        return Array.from(this._entityTypeBySet.keys());
+        const doc = await this._getDoc();
+        this._ensureIndexes(doc);
+        return Array.from(doc.entityTypeBySet.keys());
     }
     _parseEntityProperties(entityTypeNode) {
         const keyRefs = this._arrayify(entityTypeNode.Key?.PropertyRef);
@@ -165,30 +145,22 @@ class ODataMetadataStore {
     async listEntitySets() {
         const baseUrl = this._client.normalizedBaseUrl;
         const version = await this._version();
-        if (this._entitySetsCache &&
-            this._entitySetsBaseUrl === baseUrl &&
-            this._entitySetsVersion === version &&
-            this._isFresh(this._entitySetsFetchedAt)) {
-            return this._entitySetsCache;
-        }
-        const serviceSets = await this._tryGetEntitySetsFromService();
-        const result = serviceSets ?? (await this._getEntitySetsFromMetadata());
-        this._entitySetsCache = result;
-        this._entitySetsBaseUrl = baseUrl;
-        this._entitySetsVersion = version;
-        this._entitySetsFetchedAt = Date.now();
-        return result;
+        return this._entitySets.getOrLoad(baseUrl, version, async () => {
+            const serviceSets = await this._tryGetEntitySetsFromService();
+            return serviceSets ?? (await this._getEntitySetsFromMetadata());
+        });
     }
     async describeEntity(entitySet) {
-        await this._ensureIndexes();
-        const fullType = this._entityTypeBySet.get(entitySet) ?? '';
+        const doc = await this._getDoc();
+        this._ensureIndexes(doc);
+        const fullType = doc.entityTypeBySet.get(entitySet) ?? '';
         if (!fullType) {
             const error = `entity_not_found:${entitySet}`;
             log_1.default.error('creatio.metadata.describe_entity.error', { entitySet, error });
             throw new Error(error);
         }
         const typeName = fullType.split('.').pop();
-        const entityTypeNode = this._typeNodeByName.get(typeName);
+        const entityTypeNode = doc.typeNodeByName.get(typeName);
         if (!entityTypeNode) {
             const error = `entity_type_not_found:${typeName}`;
             log_1.default.error('creatio.metadata.describe_entity.error', { entitySet, error });