Bound Assistant bridge HTTP sessions

Author: nicolas-albert

js/agent_bridge_client.js

@@ -978,14 +978,42 @@ C8O.assistantAgentBridge = C8O.assistantAgentBridge || {};
     return String(sb.toString());
   }
 
-  function currentHttpSessionCookie() {
+  var BRIDGE_SESSION_COOKIE_ATTR = "convertigo.assistant.bridge.session.";
+
+  function bridgeSessionSlot(params) {
+    return params && trim(params.__sequence) === "agent_events" ? "events" : "commands";
+  }
+
+  function bridgeSessionCookie(slot) {
     try {
       var session = context && context.httpSession;
-      var sessionId = session && session.getId ? trim(session.getId()) : "";
-      return sessionId.length ? "JSESSIONID=" + sessionId : "";
-    } catch (_ignoreHttpSession) {
+      var value = session && session.getAttribute ? session.getAttribute(BRIDGE_SESSION_COOKIE_ATTR + slot) : null;
+      return value === null || typeof value === "undefined" ? "" : trim(value);
+    } catch (_ignoreBridgeSession) {
+      return "";
+    }
+  }
+
+  function responseSessionCookie(header) {
+    var value = trim(header);
+    var match = /(?:^|[,;]\s*)(JSESSIONID=[^;,\s]+)/i.exec(value);
+    return match ? match[1] : "";
+  }
+
+  function rememberBridgeSessionCookie(slot, header) {
+    var cookie = responseSessionCookie(header);
+    if (!cookie.length) {
       return "";
     }
+    try {
+      var session = context && context.httpSession;
+      if (session && session.setAttribute) {
+        session.setAttribute(BRIDGE_SESSION_COOKIE_ATTR + slot, cookie);
+      }
+    } catch (_ignoreBridgeSession) {
+      // A request without an outer session keeps the historical stateless behavior.
+    }
+    return cookie;
   }
 
   function postForm(urlText, params, timeoutMs) {
@@ -995,7 +1023,8 @@ C8O.assistantAgentBridge = C8O.assistantAgentBridge || {};
     conn.setReadTimeout(timeoutMs);
     conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
     conn.setRequestProperty("Accept", "application/json");
-    var sessionCookie = currentHttpSessionCookie();
+    var sessionSlot = bridgeSessionSlot(params);
+    var sessionCookie = bridgeSessionCookie(sessionSlot);
     if (sessionCookie.length) {
       conn.setRequestProperty("Cookie", sessionCookie);
     }
@@ -1008,6 +1037,7 @@ C8O.assistantAgentBridge = C8O.assistantAgentBridge || {};
     out.close();
 
     var code = conn.getResponseCode();
+    rememberBridgeSessionCookie(sessionSlot, conn.getHeaderField("Set-Cookie"));
     var text = readStream(code >= 400 ? conn.getErrorStream() : conn.getInputStream());
     if (code >= 400) {
       throw new Error("HTTP " + code + " from agent bridge: " + text);

tests/assistant_routing.test.js

@@ -26,7 +26,7 @@ global.C8O = {};
 let source = fs.readFileSync("js/agent_bridge_client.js", "utf8");
 source = source.replace(
   /\}\(\)\);\s*$/,
-  "C8O.assistantAgentBridge._test = { assistantProfileDescriptor, buildSequencePrompt, currentHttpSessionCookie };}());"
+  "C8O.assistantAgentBridge._test = { assistantProfileDescriptor, buildSequencePrompt, bridgeSessionSlot, bridgeSessionCookie, responseSessionCookie, rememberBridgeSessionCookie };}());"
 );
 vm.runInThisContext(source, { filename: "agent_bridge_client.js" });
 
@@ -47,15 +47,26 @@ assert.match(prompt, /managed `convertigo-studio` routing skill/);
 assert.match(prompt, /Explicit Flow\/FlowScript\/Flow Svelte intent selects `convertigo-flow`/);
 assert.doesNotMatch(prompt, /Authoring policy: legacy-only/);
 
+const sessionAttributes = new Map();
 global.context = {
   httpSession: {
-    getId() {
-      return "studio-session";
+    getAttribute(name) {
+      return sessionAttributes.get(name) ?? null;
+    },
+    setAttribute(name, value) {
+      sessionAttributes.set(name, value);
     }
   }
 };
-assert.equal(testApi.currentHttpSessionCookie(), "JSESSIONID=studio-session");
+assert.equal(testApi.bridgeSessionSlot({ __sequence: "agent_events" }), "events");
+assert.equal(testApi.bridgeSessionSlot({ __sequence: "agent_settings" }), "commands");
+assert.equal(testApi.bridgeSessionCookie("commands"), "");
+assert.equal(testApi.responseSessionCookie("JSESSIONID=bridge-1; Path=/convertigo; HttpOnly"), "JSESSIONID=bridge-1");
+assert.equal(testApi.rememberBridgeSessionCookie("commands", "JSESSIONID=bridge-1; Path=/convertigo; HttpOnly"), "JSESSIONID=bridge-1");
+assert.equal(testApi.bridgeSessionCookie("commands"), "JSESSIONID=bridge-1");
+assert.equal(testApi.bridgeSessionCookie("events"), "");
+assert.equal(testApi.rememberBridgeSessionCookie("events", "ignored=value; Path=/"), "");
 global.context = {};
-assert.equal(testApi.currentHttpSessionCookie(), "");
+assert.equal(testApi.bridgeSessionCookie("commands"), "");
 
 console.log("Assistant routing contract OK");