@rehers/rehers-roleplay-sdk 2.5.2 → 2.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rehers/rehers-roleplay-sdk",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "description": "Seamless Roleplay SDK — embed roleplay call sessions via a modal + iframe",
   "main": "roleplay-sdk.js",
   "types": "index.d.ts",
@@ -32,6 +32,6 @@
   "license": "UNLICENSED",
   "repository": {
     "type": "git",
-    "url": "https://github.com/rehers/seamless-frontend-independent"
+    "url": "git+https://github.com/rehers/seamless-frontend-independent.git"
   }
 }

package/roleplay-sdk.js

@@ -28,6 +28,8 @@
   var sessionExpiresAt = 0; // epoch ms
   var refreshTimer = null;
   var fetchingSession = null; // single-flight Promise
+  var activeSessionXhr = null;
+  var activeInitVersion = 0;
 
   var initCallbacks = { onReady: null, onError: null };
   var initCalled = false;
@@ -93,24 +95,54 @@
 
   // ── Session management ────────────────────────────────────────────
 
+  function clearSessionRequest() {
+    if (activeSessionXhr) {
+      try {
+        activeSessionXhr.abort();
+      } catch (_) {}
+      activeSessionXhr = null;
+    }
+    fetchingSession = null;
+  }
+
   function fetchSession() {
-    if (fetchingSession) return fetchingSession;
+    var requestInitVersion = activeInitVersion;
 
-    fetchingSession = new Promise(function (resolve, reject) {
+    if (fetchingSession && fetchingSession.initVersion === requestInitVersion) {
+      return fetchingSession.promise;
+    }
+
+    var requestPromise = new Promise(function (resolve, reject) {
       var url = getApiOrigin() + "/api/sdk/session";
       var body = userToken
         ? { userToken: userToken }
         : { userId: userId, userEmail: userEmail, userRole: userRole };
 
       var xhr = new XMLHttpRequest();
+      activeSessionXhr = xhr;
       xhr.open("POST", url, true);
       xhr.setRequestHeader("Content-Type", "application/json");
       xhr.setRequestHeader("X-Publishable-Key", publishableKey);
       xhr.withCredentials = false;
       xhr.timeout = SESSION_TIMEOUT_MS;
 
+      function cleanupRequest() {
+        if (activeSessionXhr === xhr) {
+          activeSessionXhr = null;
+        }
+        if (fetchingSession && fetchingSession.promise === requestPromise) {
+          fetchingSession = null;
+        }
+      }
+
       xhr.onload = function () {
-        fetchingSession = null;
+        cleanupRequest();
+
+        if (requestInitVersion !== activeInitVersion) {
+          reject({ code: "ABORTED", message: "Stale session response ignored" });
+          return;
+        }
+
         var data;
         try {
           data = JSON.parse(xhr.responseText);
@@ -143,24 +175,29 @@
       };
 
       xhr.onerror = function () {
-        fetchingSession = null;
+        cleanupRequest();
         reject({ code: "NETWORK_ERROR", message: "Network error contacting session endpoint" });
       };
 
       xhr.ontimeout = function () {
-        fetchingSession = null;
+        cleanupRequest();
         reject({ code: "TIMEOUT", message: "Session request timed out after " + SESSION_TIMEOUT_MS + "ms" });
       };
 
       xhr.onabort = function () {
-        fetchingSession = null;
+        cleanupRequest();
         reject({ code: "ABORTED", message: "Session request was aborted" });
       };
 
       xhr.send(JSON.stringify(body));
     });
 
-    return fetchingSession;
+    fetchingSession = {
+      initVersion: requestInitVersion,
+      promise: requestPromise,
+    };
+
+    return requestPromise;
   }
 
   function getSessionToken() {
@@ -407,6 +444,7 @@
      */
     init: function (opts) {
       try {
+        var initVersion = activeInitVersion + 1;
         var hasUserToken = !!(opts && opts.userToken && String(opts.userToken).trim());
         var hasLegacyIdentity = !!(opts && opts.userId && opts.userEmail);
 
@@ -427,7 +465,8 @@
           clearTimeout(refreshTimer);
           refreshTimer = null;
         }
-        fetchingSession = null;
+        activeInitVersion = initVersion;
+        clearSessionRequest();
         sessionToken = null;
         sessionExpiresAt = 0;
         paymentLink = null;
@@ -445,6 +484,7 @@
         // Fetch session immediately
         fetchSession()
           .then(function (result) {
+            if (initVersion !== activeInitVersion) return;
             if (result.trialMode && !paymentLink) {
               // User not found and no payment link from server — still call onReady
               // The open() will show an error state in the iframe
@@ -452,6 +492,8 @@
             if (initCallbacks.onReady) initCallbacks.onReady();
           })
           .catch(function (err) {
+            if (initVersion !== activeInitVersion) return;
+            if (err && err.code === "ABORTED") return;
             if (initCallbacks.onError) {
               initCallbacks.onError({ code: err.code || "INIT_ERROR", message: err.message || "Initialization failed" });
             }
@@ -753,10 +795,12 @@
      */
     destroy: function () {
       try {
+        activeInitVersion++;
         if (refreshTimer) {
           clearTimeout(refreshTimer);
           refreshTimer = null;
         }
+        clearSessionRequest();
         teardownDialog();
         teardownMount();
         publishableKey = null;
@@ -767,7 +811,6 @@
         paymentLink = null;
         sessionToken = null;
         sessionExpiresAt = 0;
-        fetchingSession = null;
         initCallbacks = { onReady: null, onError: null };
         initCalled = false;
       } catch (e) {