@contrail/flexplm 1.7.7 → 1.7.8-alpha.69dcae1

package/lib/util/flexplm-connect.d.ts

@@ -5,11 +5,27 @@ export declare class FlexPLMConnect {
     private staticHeaders;
     payloadSendAsArray: boolean;
     constructor(_config: FCConfig, endPoint?: any, payloadAsArray?: any);
+    private get sessionOptions();
+    /**
+     * Waits until no cold session acquisition is running for this key.
+     * Callers must `await` this only when it returns a promise: awaiting even a resolved promise yields,
+     * and the check-then-register in runColdAcquisition has to stay synchronous to be race free.
+     */
+    private waitForInFlightAcquisition;
+    /** Runs a cold acquisition and registers it so concurrent callers wait for it instead of opening their own session. */
+    private runColdAcquisition;
+    private getSessionKey;
+    /** Releases the connection of a rejected response before it is replaced by a retry. */
+    private discardBody;
+    private getCachedSession;
+    private storeSession;
+    private clearSession;
+    /** Returns the session cookie value Windchill issued on this response, if any (last one wins). */
+    private extractSessionCookie;
+    private cookieHeader;
     private getRequestOptions;
-    getCSRF(): Promise<{
-        nonce_key: any;
-        nonce: any;
-    }>;
+    getCSRF(getNewSession?: boolean, rejectedCookie?: string): any;
+    private fetchCSRF;
     sendRequest(csrf: any, payload: any): Promise<Response>;
     protected processRequest(payload: any): Promise<FlexPLMResponseData>;
     sendToFlexPLM(payload: PayloadType): Promise<FlexPLMResponseData>;

package/lib/util/flexplm-connect.js

@@ -2,6 +2,56 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlexPLMConnect = void 0;
 const app_framework_1 = require("@contrail/app-framework");
+// Module-level on purpose: a new FlexPLMConnect is constructed for every event. Declaring for Session reusing use case.
+const sessionCache = new Map();
+// Upper bound so users/option combinations that are never requested again cannot accumulate cookies forever.
+const MAX_CACHED_SESSIONS = 100;
+const pruneSessionCache = () => {
+    const now = Date.now();
+    for (const [key, session] of sessionCache) {
+        if (session.expiresAt <= now)
+            sessionCache.delete(key);
+    }
+    // Still full: drop the oldest entries (Map keeps insertion order).
+    while (sessionCache.size >= MAX_CACHED_SESSIONS) {
+        sessionCache.delete(sessionCache.keys().next().value);
+    }
+};
+// In-flight cold session acquisitions per key, so concurrent events share one FlexPLM session instead of each creating their own.
+const inFlightAcquisitions = new Map();
+const DEFAULT_SESSION_COOKIE_NAME = 'JSESSIONID';
+const DEFAULT_SESSION_TTL_SECONDS = 900;
+const DEFAULT_RETRY_STATUSES = [401, 403];
+const COOKIE_NAME_TOKEN = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
+// Thrown internally when a cached cookie was rejected, so the caller can re-acquire under the lock.
+class SessionRejectedError extends Error {
+}
+const escapeRegExp = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+const parseRetryStatuses = (value) => {
+    let list = [];
+    if (Array.isArray(value))
+        list = value;
+    else if (typeof value === 'string')
+        list = value.split(',');
+    else if (value !== undefined && value !== null)
+        list = [value];
+    const statuses = list
+        .map(status => (typeof status === 'string' ? status.trim() : status))
+        .filter(status => status !== '' && status !== null && status !== undefined)
+        .map(Number)
+        // Only client-error statuses can mean "session rejected". 2xx/5xx would resend events the server already processed.
+        .filter(status => Number.isInteger(status) && status >= 400 && status <= 499);
+    return statuses.length ? statuses : DEFAULT_RETRY_STATUSES;
+};
+const parseTtlSeconds = (value) => {
+    const ttl = Number(value);
+    return Number.isFinite(ttl) && ttl > 0 ? ttl : DEFAULT_SESSION_TTL_SECONDS;
+};
+const parseCookieName = (value) => {
+    const name = typeof value === 'string' ? value.trim() : '';
+    return COOKIE_NAME_TOKEN.test(name) ? name : DEFAULT_SESSION_COOKIE_NAME;
+};
+// Added for Session reuse - ET-390 - Ends
 class FlexPLMConnect {
     constructor(_config, endPoint = undefined, payloadAsArray = undefined) {
         this.vibeEventEndpoint = '';
@@ -19,9 +69,124 @@ class FlexPLMConnect {
         }
     }
     /////////////////////////////////////////////////////////////////////////////
+    ///////// ET-390 - Session reuse: start
+    /////////////////////////////////////////////////////////////////////////////
+    get sessionOptions() {
+        const sessReuse = this.config?.flexplmConnect?.sessionReuse;
+        const enabled = sessReuse?.enabled;
+        return {
+            enabled: enabled === true || String(enabled).toLowerCase() === 'true',
+            ttlMs: parseTtlSeconds(sessReuse?.ttlSeconds) * 1000,
+            cookieName: parseCookieName(sessReuse?.cookieName),
+            retryStatuses: parseRetryStatuses(sessReuse?.retryStatuses),
+        };
+    }
+    /**
+     * Waits until no cold session acquisition is running for this key.
+     * Callers must `await` this only when it returns a promise: awaiting even a resolved promise yields,
+     * and the check-then-register in runColdAcquisition has to stay synchronous to be race free.
+     */
+    waitForInFlightAcquisition() {
+        const key = this.getSessionKey();
+        if (!inFlightAcquisitions.has(key))
+            return undefined;
+        return (async () => {
+            let pending = inFlightAcquisitions.get(key);
+            while (pending) {
+                await pending.catch(() => undefined);
+                pending = inFlightAcquisitions.get(key);
+            }
+        })();
+    }
+    /** Runs a cold acquisition and registers it so concurrent callers wait for it instead of opening their own session. */
+    async runColdAcquisition(acquire) {
+        const key = this.getSessionKey();
+        const acquisition = acquire();
+        inFlightAcquisitions.set(key, acquisition);
+        try {
+            return await acquisition;
+        }
+        finally {
+            if (inFlightAcquisitions.get(key) === acquisition)
+                inFlightAcquisitions.delete(key);
+        }
+    }
+    getSessionKey() {
+        // Options that change the cached value are part of the key; JSON avoids '|' collisions between fields.
+        const { cookieName, ttlMs } = this.sessionOptions;
+        return JSON.stringify([
+            this.config.apiHost, this.config.urlContext, this.config.userName(), this.config.plmEnviornment, cookieName, ttlMs,
+        ]);
+    }
+    /** Releases the connection of a rejected response before it is replaced by a retry. */
+    async discardBody(response) {
+        try {
+            if (typeof response?.body?.cancel === 'function')
+                await response.body.cancel();
+        }
+        catch (e) {
+            // best effort: nothing to do if the body is already consumed or locked
+        }
+    }
+    getCachedSession() {
+        if (!this.sessionOptions.enabled)
+            return undefined;
+        const key = this.getSessionKey();
+        const cachedSessValue = sessionCache.get(key);
+        if (!cachedSessValue)
+            return undefined;
+        if (cachedSessValue.expiresAt <= Date.now()) {
+            sessionCache.delete(key);
+            return undefined;
+        }
+        return cachedSessValue.cookie;
+    }
+    storeSession(cookie) {
+        // sliding expiry: Windchill's session timeout is also sliding
+        const key = this.getSessionKey();
+        // delete first so a refreshed entry moves to the newest position (oldest-first eviction then acts as LRU)
+        sessionCache.delete(key);
+        pruneSessionCache();
+        sessionCache.set(key, { cookie, expiresAt: Date.now() + this.sessionOptions.ttlMs });
+    }
+    clearSession() {
+        sessionCache.delete(this.getSessionKey());
+    }
+    /** Returns the session cookie value Windchill issued on this response, if any (last one wins). */
+    extractSessionCookie(response) {
+        const respHeader = response?.headers;
+        if (!respHeader)
+            return undefined;
+        let raw = [];
+        if (typeof respHeader.getSetCookie === 'function') {
+            raw = respHeader.getSetCookie();
+        }
+        else if (typeof respHeader.get === 'function' && respHeader.get('set-cookie')) {
+            raw = [respHeader.get('set-cookie')];
+        }
+        const name = this.sessionOptions.cookieName;
+        const regexFilter = new RegExp('(?:^|[,\\s])' + escapeRegExp(name) + '=([^;,\\s]+)', 'g');
+        let jSession;
+        for (const line of raw) {
+            let cookieNameMatcher = regexFilter.exec(line);
+            while (cookieNameMatcher !== null) {
+                jSession = cookieNameMatcher[1];
+                cookieNameMatcher = regexFilter.exec(line);
+            }
+        }
+        return jSession;
+    }
+    cookieHeader(sessionCookie) {
+        return sessionCookie ? `${this.sessionOptions.cookieName}=${sessionCookie}` : undefined;
+    }
+    /////////////////////////////////////////////////////////////////////////////
+    ///////// ET-390 - Session reuse: end
+    /////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////
     ///////// Custom getRequestOptions: start
     /////////////////////////////////////////////////////////////////////////////
-    getRequestOptions(method) {
+    // ET-390 - adding a new parameter sessionCookie to the getRequestOptions function
+    getRequestOptions(method, sessionCookie) {
         const csrfOptions = {
             method,
             headers: {
@@ -33,9 +198,19 @@ class FlexPLMConnect {
         if (this.staticHeaders) {
             Object.assign(csrfOptions.headers, this.staticHeaders);
         }
+        // Added for Session reuse - ET-390 - Starts
+        const cookie = this.cookieHeader(sessionCookie);
+        if (cookie) {
+            csrfOptions.headers['Cookie'] = cookie;
+        }
+        // Added for Session reuse - ET-390 - Ends
         if (app_framework_1.Logger.isInfoOn()) {
             const logOptions = JSON.parse(JSON.stringify(csrfOptions));
             logOptions['headers']['Authorization'] = logOptions?.headers?.Authorization.substring(0, 9);
+            // Added for Session reuse - ET-390 - Starts
+            if (logOptions.headers['Cookie'])
+                logOptions.headers['Cookie'] = '***masked***';
+            // Added for Session reuse - ET-390 - Ends
             console.info('csrfOptions: ' + JSON.stringify(logOptions));
         }
         return csrfOptions;
@@ -43,13 +218,52 @@ class FlexPLMConnect {
     /////////////////////////////////////////////////////////////////////////////
     ///////// Custom getRequestOptions: end
     /////////////////////////////////////////////////////////////////////////////
-    async getCSRF() {
+    // ET-390 - adding a new parameter getNewSession to the getCSRF function
+    // Whenever a getCSRF is called without getNewSession, the default value of false will be used
+    // rejectedCookie: the cookie that was rejected by the caller, so a refresh already done by a concurrent event is not thrown away
+    async getCSRF(getNewSession = false, rejectedCookie) {
+        // Added for Session reuse - ET-390 - Starts
+        if (!this.sessionOptions.enabled)
+            return this.fetchCSRF(undefined);
+        for (let wait = this.waitForInFlightAcquisition(); wait; wait = this.waitForInFlightAcquisition())
+            await wait;
+        if (getNewSession) {
+            const current = this.getCachedSession();
+            if (rejectedCookie === undefined || !current || current === rejectedCookie)
+                this.clearSession();
+        }
+        const cached = this.getCachedSession();
+        if (cached) {
+            try {
+                return await this.fetchCSRF(cached);
+            }
+            catch (e) {
+                if (!(e instanceof SessionRejectedError))
+                    throw e;
+                // if the cached cookie is rejected (401/403), drop it and acquire a new session (serialized)
+                if (this.getCachedSession() === cached)
+                    this.clearSession();
+                return this.getCSRF();
+            }
+        }
+        return this.runColdAcquisition(() => this.fetchCSRF(undefined));
+        // Added for Session reuse - ET-390 - Ends
+    }
+    async fetchCSRF(sentCookie) {
         const urlContext = this.config.urlContext;
         const csrfEndpoint = this.config.csrfEndpoint;
         const csrfURL = this.config.apiHost + urlContext + csrfEndpoint;
         console.info('csrfURL: ' + csrfURL);
-        const csrfOptions = this.getRequestOptions('GET');
+        // getRequestOptions will be called with additional sentCookie parameter
+        const csrfOptions = this.getRequestOptions('GET', sentCookie);
         const response = await fetch(csrfURL, csrfOptions);
+        // Added for Session reuse - ET-390 - Starts
+        if (sentCookie && this.sessionOptions.retryStatuses.includes(response.status)) {
+            console.warn('Cached FlexPLM session rejected on csrf call (status ' + response.status + '). Retrying with a new session.');
+            await this.discardBody(response);
+            throw new SessionRejectedError();
+        }
+        // Added for Session reuse - ET-390 - Ends
         if (response.status >= 300) {
             const message = 'Error connecting to FlexPLM:status: ' + response.status;
             console.error(message);
@@ -58,14 +272,24 @@ class FlexPLMConnect {
             e['httpResponseStatus'] = response.status;
             throw e;
         }
+        // Added for Session reuse - ET-390 - Starts
+        // If the cookie we sent was invalid, Windchill answers with a fresh Set-Cookie --> replace the cache.
+        let sessionCookie = sentCookie;
+        if (this.sessionOptions.enabled) {
+            sessionCookie = this.extractSessionCookie(response) ?? sentCookie;
+            if (sessionCookie)
+                this.storeSession(sessionCookie);
+        }
+        // Added for Session reuse - ET-390 - Ends
         try {
             const body = await response.json();
             const nonce_key = body.items[0].attributes.nonce_key;
             const nonce = body.items[0].attributes.nonce;
-            console.info('nonce_key: ' + nonce_key);
+            // ET-390 - adding sessionCookie to the return
             return {
                 nonce_key,
-                nonce
+                nonce,
+                sessionCookie,
             };
         }
         catch (e) {
@@ -79,7 +303,7 @@ class FlexPLMConnect {
         if (this.payloadSendAsArray && !Array.isArray(payload)) {
             payload = [payload];
         }
-        const xferOptions = this.getRequestOptions('POST');
+        const xferOptions = this.getRequestOptions('POST', csrf?.sessionCookie);
         xferOptions['body'] = JSON.stringify(payload);
         xferOptions.headers[csrf.nonce_key] = csrf.nonce;
         const urlContext = this.config.urlContext;
@@ -90,6 +314,8 @@ class FlexPLMConnect {
             const logOptions = JSON.parse(JSON.stringify(xferOptions));
             if (logOptions?.headers?.Authorization)
                 logOptions.headers.Authorization = logOptions?.headers?.Authorization.substring(0, 9);
+            if (logOptions?.headers?.Cookie)
+                logOptions.headers.Cookie = '***masked***';
             if (csrf?.nonce_key)
                 logOptions.headers[csrf.nonce_key] = csrf.nonce ? `***masked(length:${csrf.nonce.length})***` : '***masked(empty)***';
             console.info('csrfOptions: ' + JSON.stringify(logOptions));
@@ -107,13 +333,22 @@ class FlexPLMConnect {
         if (app_framework_1.Logger.isInfoOn()) {
             console.info('payload: ' + JSON.stringify(payload));
         }
-        const csrf = await this.getCSRF();
+        let csrf = await this.getCSRF();
         if (!csrf) {
             const message = 'Failed to get CSRF nonce';
             console.error(message);
             throw new Error(message);
         }
-        const response = await this.sendRequest(csrf, payload);
+        /// Added for Session reuse - ET-390 - Starts
+        // const response = await this.sendRequest(csrf, payload);
+        let response = await this.sendRequest(csrf, payload);
+        if (csrf.sessionCookie && this.sessionOptions.retryStatuses.includes(response.status)) {
+            console.warn('FlexPLM rejected session/nonce (status ' + response.status + '). Getting a new session and retrying once.');
+            await this.discardBody(response);
+            csrf = await this.getCSRF(true, csrf.sessionCookie);
+            response = await this.sendRequest(csrf, payload);
+        }
+        // Added for Session reuse - ET-390 - Ends
         const status = response.status;
         if (status >= 300) {
             const message = 'Error sending data to FlexPLM:status: ' + response.status;
@@ -166,8 +401,35 @@ class FlexPLMConnect {
         const urlContext = includeUrlContext ? this.config.urlContext : '';
         const path = urlPath || ('/servlet/rest' + this.vibeEventEndpoint);
         const vibeEventsURL = this.config.apiHost + urlContext + path;
-        const csrfOptions = this.getRequestOptions('GET');
-        const response = await fetch(vibeEventsURL, csrfOptions);
+        // Added for Session reuse - ET-390 - Starts
+        const attempt = async () => {
+            if (!this.sessionOptions.enabled) {
+                return { response: await fetch(vibeEventsURL, this.getRequestOptions('GET')), sent: undefined };
+            }
+            for (let wait = this.waitForInFlightAcquisition(); wait; wait = this.waitForInFlightAcquisition())
+                await wait;
+            const sent = this.getCachedSession();
+            const call = async () => {
+                const res = await fetch(vibeEventsURL, this.getRequestOptions('GET', sent));
+                // A rejected cookie must not be stored again; only keep a cookie that was accepted or newly issued.
+                if (!(sent && this.sessionOptions.retryStatuses.includes(res.status))) {
+                    const cookie = this.extractSessionCookie(res) ?? sent;
+                    if (cookie)
+                        this.storeSession(cookie);
+                }
+                return { response: res, sent };
+            };
+            return sent ? call() : this.runColdAcquisition(call);
+        };
+        const first = await attempt();
+        let response = first.response;
+        if (first.sent && this.sessionOptions.retryStatuses.includes(response.status)) {
+            await this.discardBody(response);
+            if (this.getCachedSession() === first.sent)
+                this.clearSession();
+            response = (await attempt()).response;
+        }
+        // Added for Session reuse - ET-390 - Ends
         if (response.status >= 300) {
             const message = 'Error connecting to FlexPLM:status: ' + response.status;
             console.error(message);

package/lib/util/flexplm-connect.spec.js

@@ -28,6 +28,23 @@ const createConfig = (overrides) => ({
     useDistinctRestEndPointForImages: false,
     ...overrides,
 });
+// Added for Session reuse - ET-390 - Starts
+const csrfBody = { items: [{ attributes: { nonce_key: 'CSRF_NONCE', nonce: 'n1' } }] };
+// Response with Set-Cookie support. setCookie = list of raw Set-Cookie header lines.
+const resp = (status, setCookie = [], json = csrfBody) => ({
+    status,
+    json: jest.fn().mockResolvedValue(json),
+    text: jest.fn().mockResolvedValue('error text'),
+    headers: { getSetCookie: () => setCookie, get: () => null },
+});
+let userCounter = 0;
+const uniqueUser = () => 'sess-user-' + (++userCounter);
+// The connector config nests the entries: { flexplmConnect: { sessionReuse: { enabled: true, ... } } }
+const sessionConfig = (user, sessionReuse = { enabled: true }) => createConfig({ userName: () => user, flexplmConnect: { sessionReuse } });
+const fetchMock = () => global.fetch;
+const callHeaders = (i) => fetchMock().mock.calls[i][1].headers;
+const callMethod = (i) => fetchMock().mock.calls[i][1].method;
+// Added for Session reuse - ET-390 - Ends
 describe('FlexPLMConnect.getRequest', () => {
     it('should call default URL with urlContext when no params provided', async () => {
         const connect = new flexplm_connect_1.FlexPLMConnect(createConfig());
@@ -121,3 +138,523 @@ describe('FlexPLMConnect.sendRequest', () => {
         consoleInfoSpy.mockRestore();
     });
 });
+// Added for Session reuse - ET-390 - Starts
+describe('FlexPLMConnect session reuse', () => {
+    const payload = { id: '123' };
+    it('should capture JSESSIONID from the CSRF GET and send it on the POST', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=abc.tomcat1; Path=/; HttpOnly']))
+            .mockResolvedValueOnce(resp(200, [], {}));
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM(payload);
+        expect(fetchMock()).toHaveBeenCalledTimes(2);
+        expect(callHeaders(0).Cookie).toBeUndefined(); // first ever call: no cached session
+        expect(callHeaders(1).Cookie).toBe('JSESSIONID=abc.tomcat1');
+        expect(callHeaders(1).CSRF_NONCE).toBe('n1');
+    });
+    it('should reuse the cached session on the next event (new FlexPLMConnect instance)', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=abc.tomcat1; Path=/'])) // event 1 GET
+            .mockResolvedValueOnce(resp(200, [], {})) // event 1 POST
+            .mockResolvedValueOnce(resp(200, [])) // event 2 GET (valid session -> no Set-Cookie)
+            .mockResolvedValueOnce(resp(200, [], {})); // event 2 POST
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM(payload);
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM(payload);
+        expect(callHeaders(2).Cookie).toBe('JSESSIONID=abc.tomcat1'); // GET reuses it
+        expect(callHeaders(3).Cookie).toBe('JSESSIONID=abc.tomcat1'); // POST reuses it
+    });
+    it('should replace the cached session when Windchill answers the GET with a new Set-Cookie', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=old.tomcat1; Path=/']))
+            .mockResolvedValueOnce(resp(200, [], {}))
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=new.tomcat1; Path=/'])) // old one was stale -> new issued
+            .mockResolvedValueOnce(resp(200, [], {}))
+            .mockResolvedValueOnce(resp(200, []))
+            .mockResolvedValueOnce(resp(200, [], {}));
+        const connect = () => new flexplm_connect_1.FlexPLMConnect(sessionConfig(u));
+        await connect().sendToFlexPLM(payload);
+        await connect().sendToFlexPLM(payload);
+        await connect().sendToFlexPLM(payload);
+        expect(callHeaders(2).Cookie).toBe('JSESSIONID=old.tomcat1'); // event 2 GET sent the old one
+        expect(callHeaders(3).Cookie).toBe('JSESSIONID=new.tomcat1'); // POST uses the replacement
+        expect(callHeaders(4).Cookie).toBe('JSESSIONID=new.tomcat1'); // event 3 GET sends the replacement
+    });
+    it('should retry once with a new session when the POST is rejected with 403', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=old.tomcat1; Path=/'])) // GET
+            .mockResolvedValueOnce(resp(403, [], {})) // POST rejected
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=new.tomcat1; Path=/'])) // GET again, fresh session
+            .mockResolvedValueOnce(resp(200, [], { ok: true })); // POST succeeds
+        const result = await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM(payload);
+        expect(fetchMock()).toHaveBeenCalledTimes(4);
+        expect(callHeaders(2).Cookie).toBeUndefined(); // retry GET must NOT send the stale cookie
+        expect(callHeaders(3).Cookie).toBe('JSESSIONID=new.tomcat1');
+        expect(result.status).toBe(200);
+        expect(result.data).toEqual({ ok: true });
+    });
+    it('should also retry on 401', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=old.tomcat1']))
+            .mockResolvedValueOnce(resp(401, [], {}))
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=new.tomcat1']))
+            .mockResolvedValueOnce(resp(200, [], {}));
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM(payload);
+        expect(fetchMock()).toHaveBeenCalledTimes(4);
+    });
+    it('should not loop: a second 403 after the retry is surfaced as an error', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=old.tomcat1']))
+            .mockResolvedValueOnce(resp(403, [], {}))
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=new.tomcat1']))
+            .mockResolvedValueOnce(resp(403, [], {}));
+        await expect(new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM(payload))
+            .rejects.toThrow('Error sending data to FlexPLM:status: 403');
+        expect(fetchMock()).toHaveBeenCalledTimes(4);
+    });
+    it('should not retry on non-auth errors such as 500 (event may already be processed)', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=abc.tomcat1']))
+            .mockResolvedValueOnce(resp(500, [], {}));
+        await expect(new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM(payload))
+            .rejects.toThrow('Error sending data to FlexPLM:status: 500');
+        expect(fetchMock()).toHaveBeenCalledTimes(2);
+    });
+    it('should retry the csrf GET without a cookie when the cached session is rejected there', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=old.tomcat1'])) // event 1 GET
+            .mockResolvedValueOnce(resp(200, [], {})) // event 1 POST
+            .mockResolvedValueOnce(resp(401, [])) // event 2 GET with cached cookie rejected
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=new.tomcat1'])) // event 2 GET retry, no cookie
+            .mockResolvedValueOnce(resp(200, [], {})); // event 2 POST
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM(payload);
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM(payload);
+        expect(callHeaders(2).Cookie).toBe('JSESSIONID=old.tomcat1');
+        expect(callHeaders(3).Cookie).toBeUndefined();
+        expect(callHeaders(4).Cookie).toBe('JSESSIONID=new.tomcat1');
+    });
+    it('should expire the cached session after ttlSeconds', async () => {
+        const u = uniqueUser();
+        const realNow = Date.now();
+        const nowSpy = jest.spyOn(Date, 'now').mockReturnValue(realNow);
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=abc.tomcat1']))
+            .mockResolvedValueOnce(resp(200, [], {}))
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=def.tomcat1']))
+            .mockResolvedValueOnce(resp(200, [], {}));
+        const cfg = sessionConfig(u, { enabled: true, ttlSeconds: 1 });
+        await new flexplm_connect_1.FlexPLMConnect(cfg).sendToFlexPLM(payload);
+        nowSpy.mockReturnValue(realNow + 2000); // 2s later > 1s ttl
+        await new flexplm_connect_1.FlexPLMConnect(cfg).sendToFlexPLM(payload);
+        expect(callHeaders(2).Cookie).toBeUndefined(); // expired -> GET sends no cookie
+        expect(callHeaders(3).Cookie).toBe('JSESSIONID=def.tomcat1');
+        nowSpy.mockRestore();
+    });
+    it('should use the last JSESSIONID when several Set-Cookie lines are returned', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=first.tomcat1; Path=/', 'OTHER=x; Path=/', 'JSESSIONID=second.tomcat1; Path=/']))
+            .mockResolvedValueOnce(resp(200, [], {}));
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM(payload);
+        expect(callHeaders(1).Cookie).toBe('JSESSIONID=second.tomcat1');
+    });
+    it('should fall back to headers.get("set-cookie") when getSetCookie is not available', async () => {
+        const u = uniqueUser();
+        const legacy = {
+            status: 200,
+            json: jest.fn().mockResolvedValue(csrfBody),
+            text: jest.fn(),
+            headers: { get: (k) => (k.toLowerCase() === 'set-cookie' ? 'JSESSIONID=legacy.tomcat1; Path=/' : null) },
+        };
+        fetchMock().mockResolvedValueOnce(legacy).mockResolvedValueOnce(resp(200, [], {}));
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM(payload);
+        expect(callHeaders(1).Cookie).toBe('JSESSIONID=legacy.tomcat1');
+    });
+    it('should honour a custom cookieName', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['MYSESSION=zzz; Path=/', 'JSESSIONID=ignored; Path=/']))
+            .mockResolvedValueOnce(resp(200, [], {}));
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u, { enabled: true, cookieName: 'MYSESSION' })).sendToFlexPLM(payload);
+        expect(callHeaders(1).Cookie).toBe('MYSESSION=zzz');
+    });
+    it('should accept enabled as the string "true"', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=abc.tomcat1']))
+            .mockResolvedValueOnce(resp(200, [], {}));
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u, { enabled: 'true' })).sendToFlexPLM(payload);
+        expect(callHeaders(1).Cookie).toBe('JSESSIONID=abc.tomcat1');
+    });
+    it('should evict expired sessions of other users when a new session is stored', async () => {
+        const userA = uniqueUser();
+        const userB = uniqueUser();
+        const realNow = Date.now();
+        const nowSpy = jest.spyOn(Date, 'now').mockReturnValue(realNow);
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=a.tomcat1'])) // A GET
+            .mockResolvedValueOnce(resp(200, [], {})) // A POST
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=b.tomcat1'])) // B GET
+            .mockResolvedValueOnce(resp(200, [], {})) // B POST
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=a2.tomcat1'])) // A GET again
+            .mockResolvedValueOnce(resp(200, [], {}));
+        const cfg = (u) => sessionConfig(u, { enabled: true, ttlSeconds: 1 });
+        await new flexplm_connect_1.FlexPLMConnect(cfg(userA)).sendToFlexPLM(payload);
+        nowSpy.mockReturnValue(realNow + 2000); // A has expired
+        await new flexplm_connect_1.FlexPLMConnect(cfg(userB)).sendToFlexPLM(payload); // storing B sweeps A
+        nowSpy.mockReturnValue(realNow); // rewind: only a swept A has no entry left
+        await new flexplm_connect_1.FlexPLMConnect(cfg(userA)).sendToFlexPLM(payload);
+        expect(callHeaders(4).Cookie).toBeUndefined();
+        nowSpy.mockRestore();
+    });
+    it('should not hold more than the maximum number of cached sessions', async () => {
+        const first = uniqueUser();
+        fetchMock().mockImplementation(async () => resp(200, ['JSESSIONID=s.tomcat1']));
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(first)).sendToFlexPLM(payload);
+        for (let i = 0; i < 100; i++) {
+            await new flexplm_connect_1.FlexPLMConnect(sessionConfig(uniqueUser())).sendToFlexPLM(payload);
+        }
+        fetchMock().mockClear();
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(first)).sendToFlexPLM(payload);
+        expect(callHeaders(0).Cookie).toBeUndefined(); // oldest entry was evicted
+    });
+    it('should keep separate sessions per user', async () => {
+        const a = uniqueUser();
+        const b = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=aaa.tomcat1']))
+            .mockResolvedValueOnce(resp(200, [], {}))
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=bbb.tomcat1']))
+            .mockResolvedValueOnce(resp(200, [], {}));
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(a)).sendToFlexPLM(payload);
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(b)).sendToFlexPLM(payload);
+        expect(callHeaders(2).Cookie).toBeUndefined(); // user b must not see user a's cookie
+        expect(callHeaders(3).Cookie).toBe('JSESSIONID=bbb.tomcat1');
+    });
+    it('should never log the cookie value', async () => {
+        const isInfoOn = jest.spyOn(app_framework_1.Logger, 'isInfoOn').mockReturnValue(true);
+        const info = jest.spyOn(console, 'info').mockImplementation();
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=supersecret.tomcat1']))
+            .mockResolvedValueOnce(resp(200, [], {}))
+            .mockResolvedValueOnce(resp(200, []))
+            .mockResolvedValueOnce(resp(200, [], {}));
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM(payload);
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM(payload); // 2nd event sends Cookie on GET and POST
+        const logged = info.mock.calls.map(c => String(c[0] ?? '')).join('\n');
+        expect(logged).toContain('"Cookie":"***masked***"');
+        expect(logged).not.toContain('supersecret');
+        isInfoOn.mockRestore();
+        info.mockRestore();
+    });
+    describe('option normalisation', () => {
+        const rejectedOnceThenOk = (u, opts) => {
+            fetchMock()
+                .mockResolvedValueOnce(resp(200, ['JSESSIONID=old.tomcat1']))
+                .mockResolvedValueOnce(resp(403, [], {}))
+                .mockResolvedValueOnce(resp(200, ['JSESSIONID=new.tomcat1']))
+                .mockResolvedValueOnce(resp(200, [], {}));
+            return new flexplm_connect_1.FlexPLMConnect(sessionConfig(u, { enabled: true, ...opts })).sendToFlexPLM(payload);
+        };
+        it.each([
+            ['a scalar number', 403],
+            ['a comma separated string', '401, 403'],
+            ['garbage (falls back to 401/403)', 'abc'],
+            ['an empty array (falls back to 401/403)', []],
+        ])('should not throw and still retry on 403 when retryStatuses is %s', async (_label, retryStatuses) => {
+            await rejectedOnceThenOk(uniqueUser(), { retryStatuses });
+            expect(fetchMock()).toHaveBeenCalledTimes(4);
+        });
+        it.each([['abc'], [0], [-5]])('should fall back to the 900s default when ttlSeconds is invalid (%p)', async (ttlSeconds) => {
+            const u = uniqueUser();
+            const realNow = Date.now();
+            const nowSpy = jest.spyOn(Date, 'now').mockReturnValue(realNow);
+            fetchMock()
+                .mockResolvedValueOnce(resp(200, ['JSESSIONID=abc.tomcat1']))
+                .mockResolvedValueOnce(resp(200, [], {}))
+                .mockResolvedValueOnce(resp(200, []))
+                .mockResolvedValueOnce(resp(200, [], {}));
+            const cfg = sessionConfig(u, { enabled: true, ttlSeconds });
+            await new flexplm_connect_1.FlexPLMConnect(cfg).sendToFlexPLM(payload);
+            nowSpy.mockReturnValue(realNow + 2000);
+            await new flexplm_connect_1.FlexPLMConnect(cfg).sendToFlexPLM(payload);
+            expect(callHeaders(2).Cookie).toBe('JSESSIONID=abc.tomcat1');
+            nowSpy.mockRestore();
+        });
+        it('should fall back to JSESSIONID when cookieName is blank', async () => {
+            const u = uniqueUser();
+            fetchMock()
+                .mockResolvedValueOnce(resp(200, ['JSESSIONID=abc.tomcat1']))
+                .mockResolvedValueOnce(resp(200, [], {}));
+            await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u, { enabled: true, cookieName: '   ' })).sendToFlexPLM(payload);
+            expect(callHeaders(1).Cookie).toBe('JSESSIONID=abc.tomcat1');
+        });
+    });
+    describe('retryStatuses restricted to client-error statuses', () => {
+        const postFailsWith = async (status, retryStatuses) => {
+            const u = uniqueUser();
+            fetchMock()
+                .mockResolvedValueOnce(resp(200, ['JSESSIONID=abc.tomcat1']))
+                .mockResolvedValueOnce(resp(status, [], {}));
+            await expect(new flexplm_connect_1.FlexPLMConnect(sessionConfig(u, { enabled: true, retryStatuses })).sendToFlexPLM({ id: '1' }))
+                .rejects.toThrow('Error sending data to FlexPLM:status: ' + status);
+            expect(fetchMock()).toHaveBeenCalledTimes(2); // no retry
+        };
+        it.each([[500], ['500'], [[200, 500]]])('should ignore non-4xx retryStatuses (%p) and not retry a 500', async (retryStatuses) => {
+            await postFailsWith(500, retryStatuses);
+        });
+        it('should keep 4xx entries and drop others from a mixed retryStatuses list', async () => {
+            await postFailsWith(500, [401, 500]);
+        });
+        it('should not resend a successful event when retryStatuses is configured as 200', async () => {
+            const u = uniqueUser();
+            fetchMock()
+                .mockResolvedValueOnce(resp(200, ['JSESSIONID=abc.tomcat1']))
+                .mockResolvedValueOnce(resp(200, [], {}));
+            await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u, { enabled: true, retryStatuses: 200 })).sendToFlexPLM({ id: '1' });
+            expect(fetchMock()).toHaveBeenCalledTimes(2);
+        });
+    });
+    describe('session cache key includes session options', () => {
+        it('should not share a cached cookie between different cookieNames for the same user', async () => {
+            const u = uniqueUser();
+            fetchMock()
+                .mockResolvedValueOnce(resp(200, ['AAA=a1; Path=/']))
+                .mockResolvedValueOnce(resp(200, [], {}))
+                .mockResolvedValueOnce(resp(200, ['BBB=b1; Path=/']))
+                .mockResolvedValueOnce(resp(200, [], {}));
+            await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u, { enabled: true, cookieName: 'AAA' })).sendToFlexPLM({ id: '1' });
+            await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u, { enabled: true, cookieName: 'BBB' })).sendToFlexPLM({ id: '1' });
+            expect(callHeaders(2).Cookie).toBeUndefined(); // BBB config must not pick up the AAA session
+            expect(callHeaders(3).Cookie).toBe('BBB=b1');
+        });
+        it('should not share a cached session between different ttlSeconds for the same user', async () => {
+            const u = uniqueUser();
+            fetchMock()
+                .mockResolvedValueOnce(resp(200, ['JSESSIONID=short.tomcat1']))
+                .mockResolvedValueOnce(resp(200, [], {}))
+                .mockResolvedValueOnce(resp(200, ['JSESSIONID=long.tomcat1']))
+                .mockResolvedValueOnce(resp(200, [], {}));
+            await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u, { enabled: true, ttlSeconds: 1 })).sendToFlexPLM({ id: '1' });
+            await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u, { enabled: true, ttlSeconds: 900 })).sendToFlexPLM({ id: '1' });
+            expect(callHeaders(2).Cookie).toBeUndefined();
+            expect(callHeaders(3).Cookie).toBe('JSESSIONID=long.tomcat1');
+        });
+    });
+    describe('rejected response disposal', () => {
+        const withBody = (r) => Object.assign(r, { body: { cancel: jest.fn().mockResolvedValue(undefined) } });
+        it('should cancel the body of a POST rejected with 403 before retrying', async () => {
+            const u = uniqueUser();
+            const rejected = withBody(resp(403, [], {}));
+            fetchMock()
+                .mockResolvedValueOnce(resp(200, ['JSESSIONID=old.tomcat1']))
+                .mockResolvedValueOnce(rejected)
+                .mockResolvedValueOnce(resp(200, ['JSESSIONID=new.tomcat1']))
+                .mockResolvedValueOnce(resp(200, [], {}));
+            await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM({ id: '1' });
+            expect(rejected.body.cancel).toHaveBeenCalledTimes(1);
+        });
+        it('should cancel the body of a CSRF GET rejected with the cached cookie before retrying', async () => {
+            const u = uniqueUser();
+            const rejected = withBody(resp(401, []));
+            fetchMock()
+                .mockResolvedValueOnce(resp(200, ['JSESSIONID=old.tomcat1']))
+                .mockResolvedValueOnce(resp(200, [], {}))
+                .mockResolvedValueOnce(rejected)
+                .mockResolvedValueOnce(resp(200, ['JSESSIONID=new.tomcat1']))
+                .mockResolvedValueOnce(resp(200, [], {}));
+            await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM({ id: '1' });
+            await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM({ id: '1' });
+            expect(rejected.body.cancel).toHaveBeenCalledTimes(1);
+        });
+        it('should cancel the body of a getRequest rejected with the cached cookie before retrying', async () => {
+            const u = uniqueUser();
+            const rejected = withBody(resp(401, []));
+            fetchMock()
+                .mockResolvedValueOnce(resp(200, ['JSESSIONID=old.tomcat1']))
+                .mockResolvedValueOnce(resp(200, [], {}))
+                .mockResolvedValueOnce(rejected)
+                .mockResolvedValueOnce(resp(200, [], { items: [] }));
+            const connect = new flexplm_connect_1.FlexPLMConnect(sessionConfig(u));
+            await connect.sendToFlexPLM({ id: '1' });
+            await connect.getRequest();
+            expect(rejected.body.cancel).toHaveBeenCalledTimes(1);
+        });
+        it('should still retry when cancelling the body throws', async () => {
+            const u = uniqueUser();
+            const rejected = resp(403, [], {});
+            rejected.body = { cancel: jest.fn().mockRejectedValue(new Error('locked')) };
+            fetchMock()
+                .mockResolvedValueOnce(resp(200, ['JSESSIONID=old.tomcat1']))
+                .mockResolvedValueOnce(rejected)
+                .mockResolvedValueOnce(resp(200, ['JSESSIONID=new.tomcat1']))
+                .mockResolvedValueOnce(resp(200, [], {}));
+            await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM({ id: '1' });
+            expect(fetchMock()).toHaveBeenCalledTimes(4);
+        });
+    });
+    describe('cookie names containing regex metacharacters', () => {
+        it('should extract a cookie whose name contains "+"', async () => {
+            const u = uniqueUser();
+            fetchMock()
+                .mockResolvedValueOnce(resp(200, ['SID+=abc; Path=/']))
+                .mockResolvedValueOnce(resp(200, [], {}));
+            await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u, { enabled: true, cookieName: 'SID+' })).sendToFlexPLM(payload);
+            expect(callHeaders(1).Cookie).toBe('SID+=abc');
+        });
+        it('should treat "." literally and not match a look-alike cookie', async () => {
+            const u = uniqueUser();
+            fetchMock()
+                .mockResolvedValueOnce(resp(200, ['AxB=wrong; Path=/']))
+                .mockResolvedValueOnce(resp(200, [], {}));
+            await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u, { enabled: true, cookieName: 'A.B' })).sendToFlexPLM(payload);
+            expect(callHeaders(1).Cookie).toBeUndefined();
+        });
+    });
+    describe('concurrent session acquisition', () => {
+        const flush = () => new Promise(r => setImmediate(r));
+        const isColdGet = (call) => call[1].method === 'GET' && !call[1].headers.Cookie;
+        it('should share one session across concurrent events on a cold cache', async () => {
+            const u = uniqueUser();
+            let release;
+            const gate = new Promise(r => { release = r; });
+            fetchMock().mockImplementation(async (_url, opts) => {
+                if (opts.method === 'GET' && !opts.headers.Cookie) {
+                    await gate;
+                    return resp(200, ['JSESSIONID=abc.tomcat1']);
+                }
+                return resp(200, []);
+            });
+            const all = Promise.all([1, 2, 3].map(() => new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).getCSRF()));
+            await flush();
+            expect(fetchMock()).toHaveBeenCalledTimes(1); // the other two are waiting for the first acquisition
+            release();
+            const results = await all;
+            expect(fetchMock().mock.calls.filter(isColdGet)).toHaveLength(1);
+            results.forEach(r => expect(r.sessionCookie).toBe('abc.tomcat1'));
+        });
+        it('should not make a waiter inherit the failure of the first acquisition', async () => {
+            const u = uniqueUser();
+            let release;
+            const gate = new Promise(r => { release = r; });
+            fetchMock()
+                .mockImplementationOnce(async () => { await gate; return resp(500, []); })
+                .mockResolvedValueOnce(resp(200, ['JSESSIONID=abc.tomcat1']));
+            const first = new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).getCSRF();
+            const firstResult = first.catch(e => e);
+            const second = new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).getCSRF();
+            await flush();
+            release();
+            expect(await firstResult).toBeInstanceOf(Error);
+            expect((await second).sessionCookie).toBe('abc.tomcat1');
+        });
+        it('should create only one replacement session for parallel events rejected with 403', async () => {
+            const u = uniqueUser();
+            fetchMock().mockResolvedValueOnce(resp(200, ['JSESSIONID=old.tomcat1']));
+            await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).getCSRF(); // prime the cache with the old session
+            fetchMock().mockReset();
+            fetchMock().mockImplementation(async (_url, opts) => {
+                const cookie = opts.headers.Cookie;
+                if (opts.method === 'POST')
+                    return cookie === 'JSESSIONID=new.tomcat1' ? resp(200, [], {}) : resp(403, [], {});
+                if (!cookie)
+                    return resp(200, ['JSESSIONID=new.tomcat1']);
+                return resp(200, []);
+            });
+            await Promise.all([1, 2, 3].map(() => new flexplm_connect_1.FlexPLMConnect(sessionConfig(u)).sendToFlexPLM(payload)));
+            expect(fetchMock().mock.calls.filter(isColdGet)).toHaveLength(1);
+        });
+    });
+});
+describe('FlexPLMConnect session reuse - feature disabled (default)', () => {
+    const payload = { id: '123' };
+    it('should send no Cookie header and make exactly one GET + one POST', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=abc.tomcat1'])) // Set-Cookie present but must be ignored
+            .mockResolvedValueOnce(resp(200, [], {}))
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=def.tomcat1']))
+            .mockResolvedValueOnce(resp(200, [], {}));
+        const cfg = createConfig({ userName: () => u }); // no flexplmConnect at all
+        await new flexplm_connect_1.FlexPLMConnect(cfg).sendToFlexPLM(payload);
+        await new flexplm_connect_1.FlexPLMConnect(cfg).sendToFlexPLM(payload);
+        for (let i = 0; i < 4; i++) {
+            expect(callHeaders(i).Cookie).toBeUndefined();
+        }
+    });
+    it('should not retry on 403 (behaves exactly as before)', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200))
+            .mockResolvedValueOnce(resp(403, [], {}));
+        await expect(new flexplm_connect_1.FlexPLMConnect(createConfig({ userName: () => u })).sendToFlexPLM(payload))
+            .rejects.toThrow('Error sending data to FlexPLM:status: 403');
+        expect(fetchMock()).toHaveBeenCalledTimes(2);
+    });
+    it('should behave the same as not configured when enabled is false', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=abc.tomcat1']))
+            .mockResolvedValueOnce(resp(200, [], {}));
+        await new flexplm_connect_1.FlexPLMConnect(sessionConfig(u, { enabled: false })).sendToFlexPLM(payload);
+        expect(callHeaders(1).Cookie).toBeUndefined();
+    });
+    it('should ignore the legacy flat key form', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=abc.tomcat1'])) // Set-Cookie present but must be ignored
+            .mockResolvedValueOnce(resp(200, [], {}));
+        const cfg = createConfig({ userName: () => u, 'flexplmConnect.sessionReuse.enabled': true });
+        await new flexplm_connect_1.FlexPLMConnect(cfg).sendToFlexPLM(payload);
+        expect(callHeaders(1).Cookie).toBeUndefined();
+    });
+});
+describe('FlexPLMConnect.getRequest session reuse', () => {
+    it('should send the cached cookie on image/GET requests', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=abc.tomcat1'])) // csrf GET primes the cache
+            .mockResolvedValueOnce(resp(200, [], {})) // POST
+            .mockResolvedValueOnce(resp(200, [], { items: [] })); // getRequest
+        const connect = new flexplm_connect_1.FlexPLMConnect(sessionConfig(u));
+        await connect.sendToFlexPLM({ id: '1' });
+        await connect.getRequest();
+        expect(callHeaders(2).Cookie).toBe('JSESSIONID=abc.tomcat1');
+    });
+    it('should retry once without the cookie when the cached session is rejected on getRequest', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=abc.tomcat1']))
+            .mockResolvedValueOnce(resp(200, [], {}))
+            .mockResolvedValueOnce(resp(401, [])) // getRequest with cached cookie
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=new.tomcat1'], { items: [] })); // retry, no cookie
+        const connect = new flexplm_connect_1.FlexPLMConnect(sessionConfig(u));
+        await connect.sendToFlexPLM({ id: '1' });
+        await connect.getRequest();
+        expect(callHeaders(2).Cookie).toBe('JSESSIONID=abc.tomcat1');
+        expect(callHeaders(3).Cookie).toBeUndefined();
+    });
+    it('should not re-store the rejected cookie when the retry issues no Set-Cookie', async () => {
+        const u = uniqueUser();
+        fetchMock()
+            .mockResolvedValueOnce(resp(200, ['JSESSIONID=stale.tomcat1']))
+            .mockResolvedValueOnce(resp(200, [], {}))
+            .mockResolvedValueOnce(resp(401, [])) // getRequest with the cached cookie
+            .mockResolvedValueOnce(resp(200, [], { items: [] })) // retry succeeds, no Set-Cookie
+            .mockResolvedValueOnce(resp(200, [], { items: [] })); // next getRequest
+        const connect = new flexplm_connect_1.FlexPLMConnect(sessionConfig(u));
+        await connect.sendToFlexPLM({ id: '1' });
+        await connect.getRequest();
+        await connect.getRequest();
+        expect(callHeaders(3).Cookie).toBeUndefined();
+        expect(callHeaders(4).Cookie).toBeUndefined(); // stale cookie must not be sent again
+    });
+});
+// Added for Session reuse - ET-390 - Ends

package/lib/util/type-utils.js

@@ -14,6 +14,11 @@ class TypeUtils {
             id,
             relations: ['typeProperties', 'typeInterfaces']
         });
+        // The API answers 200 with an empty body for a missing/deleted type, which the SDK returns as null.
+        if (!type) {
+            throw new Error('getTypeById: type not found for typeId: ' + id
+                + '. The entity references a type that no longer exists.');
+        }
         return type;
     }
     async getByRootAndPath(options) {

package/lib/util/type-utils.spec.js

@@ -190,3 +190,16 @@ describe('filterProperties-color', () => {
         expect(filteredProps.length).toEqual(len);
     });
 });
+describe('TypeUtils.getTypeById() tests', () => {
+    it('throws a descriptive error when the type does not exist', async () => {
+        const tu = new type_utils_1.TypeUtils();
+        tu['typesObj'] = { getType: jest.fn().mockResolvedValue(null) };
+        await expect(tu.getTypeById('missingTypeId')).rejects.toThrow('type not found for typeId: missingTypeId');
+    });
+    it('returns the type when it exists', async () => {
+        const tu = new type_utils_1.TypeUtils();
+        const type = { id: 'typeId', typeProperties: [] };
+        tu['typesObj'] = { getType: jest.fn().mockResolvedValue(type) };
+        expect(await tu.getTypeById('typeId')).toBe(type);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/flexplm",
-  "version": "1.7.7",
+  "version": "1.7.8-alpha.69dcae1",
   "description": "Library used for integration with flexplm.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",