hamzus-ui 0.0.226 → 0.0.228

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "hamzus-ui",
-	"version": "0.0.226",
+	"version": "0.0.228",
 	"type": "module",
 	"main": "index.js",
 	"svelte": "index.js",

package/src/utils/request.js

@@ -1,6 +1,8 @@
 import { getCookie } from "./clientCookie";
 import { config } from "./hamzus.config.js";
 
+let on401Promise = null; // promesse partagée pendant que on401 tourne
+
 export function sendRequest(request) {
     return new Promise((resolve, reject) => {
         request = {
@@ -12,55 +14,62 @@ export function sendRequest(request) {
             ...request
         }
 
-
-        const formData = new FormData();
-
-        if (request.data) {
-            for (const [key, value] of Object.entries(request.data)) {
-                formData.append(key, value);
+        function buildFormData() {
+            const formData = new FormData();
+            if (request.data) {
+                for (const [key, value] of Object.entries(request.data)) {
+                    formData.append(key, value);
+                }
             }
-        }
-        if (request.includeToken) {
-            const myToken = getCookie(config['sessionTokenName']);
-
-            formData.append(config['sessionTokenName'], myToken)
-        }
-
-        if (request.formData) {
-            for (const [key, value] of request.formData.entries()) {
-                formData.append(key, value);
+            if (request.includeToken) {
+                const myToken = getCookie(config['sessionTokenName']);
+                formData.append(config['sessionTokenName'], myToken)
             }
+            if (request.formData) {
+                for (const [key, value] of request.formData.entries()) {
+                    formData.append(key, value);
+                }
+            }
+            return formData;
         }
 
-        // Création de la requête XHR
-        var scriptPath = request.url + request.path;
-        const xhr = new XMLHttpRequest();
-        xhr.open('POST', scriptPath, true);
-        xhr.withCredentials = config.requestWithCredentials;
-
-        xhr.onload = function () {
-
-            if (xhr.status === 200) {
+        function executeRequest(isRetry = false) {
+            var scriptPath = request.url + request.path;
+            const xhr = new XMLHttpRequest();
+            xhr.open('POST', scriptPath, true);
+            xhr.withCredentials = config.requestWithCredentials;
 
-
-                const response = JSON.parse(xhr.responseText)
-                resolve(response)
-            } else if (xhr.status === 400 || xhr.status === 409) {
-                const response = JSON.parse(xhr.responseText)
-                resolve(response)
-            } else if (xhr.status === 401) {
-                if (config.on401 !== null) {
-                    config.on401()
+            xhr.onload = function () {
+                if (xhr.status === 200) {
+                    resolve(JSON.parse(xhr.responseText))
+                } else if (xhr.status === 400 || xhr.status === 409) {
+                    resolve(JSON.parse(xhr.responseText))
+                } else if (xhr.status === 401) {
+                    if (!isRetry && config.on401 != null) {
+                        if (!on401Promise) {
+                            // Personne d'autre ne tourne on401, on le lance
+                            const result = config.on401();
+                            on401Promise = (result instanceof Promise ? result : Promise.resolve())
+                                .finally(() => { on401Promise = null; });
+                        }
+                        if (config.replayAfter401 === true) {
+                            // On attend la fin du on401 (le nôtre ou celui d'un autre)
+                            on401Promise.then(() => executeRequest(true));
+                            return;
+                        }
+                    }
+                    resolve(false);
                 }
-            }
+            };
 
-            resolve(false)
-        };
+            xhr.onerror = function () {
+                console.error('Erreur réseau.');
+                reject(new Error('Erreur réseau.'));
+            };
+
+            xhr.send(buildFormData());
+        }
 
-        xhr.onerror = function () {
-            console.error('Erreur réseau.');
-        };
-        // Envoi des données sous forme JSON
-        xhr.send(formData);
+        executeRequest();
     })
 }