@klauswuestefeld/jux-web 2024.3.13 → 2024.4.1

package/dist/api-client.d.ts

@@ -1,7 +1,7 @@
 export declare const setBackendUrl: (backendUrl: string) => void;
 export declare const getBackendUrl: () => string;
 export declare const handleJuxEvent: (ev: Event) => void;
-export declare const backendRequest: (url: string, options: any, onSuccess: any, onError: any, onRedirect?: any, handleUnauthorized?: () => void, retrial?: boolean, retrialNum?: number) => Promise<any>;
+export declare const backendRequest: (url: string, options: any, onSuccess: any, onError: any, onRedirect?: any, requestType?: string, handleUnauthorized?: () => void, retrial?: boolean, retrialNum?: number) => Promise<any>;
 export declare const backendPost: (endpoint: string, postContent: any, onJsonResponse: (response: any) => any, onHelpMessage: (message: string) => any) => void;
 export declare const backendGet: (endpoint: string, params: any, onJsonResponse: (response: any) => any, onHelpMessage: (message: string) => any) => void;
 export declare const requestMagicLink: (data: any, onJsonResponse: (response: any) => any, onUnauthorized: () => void) => void;

package/dist/jux/jux-event.d.ts

@@ -1,11 +1,12 @@
 export declare class JuxEvent extends Event {
+    requestType: string;
     method: string;
     endpoint: string;
     onResult?: (result: any) => any;
     params: any;
     onError?: (error: any) => void;
     onRedirect?: (result: any) => any;
-    constructor(method: string, endpoint: string, onResult?: (result: any) => any, params?: any, onError?: (error: any) => void, onRedirect?: (result: any) => any);
+    constructor(type: string, method: string, endpoint: string, onResult?: (result: any) => any, params?: any, onError?: (error: any) => void, onRedirect?: (result: any) => any);
 }
 export declare const query: (element: HTMLElement, endpoint: string, onResult: (result: any) => any, params?: any, onError?: ((error: any) => void) | undefined, onRedirect?: ((result: any) => any) | undefined) => void;
 export declare const command: (element: HTMLElement, endpoint: string, onResult?: ((result: any) => any) | undefined, params?: any, onError?: ((error: any) => void) | undefined, onRedirect?: ((result: any) => any) | undefined) => void;

package/dist/jux-web.js

@@ -159,10 +159,10 @@ var juxWeb = (function (exports) {
   };
   // TODO: use jux-events to call commands and queries inside jux-web library
   const handleJuxEvent = (ev) => {
-      const { endpoint, onResult, params, onError, onRedirect } = ev;
+      const { requestType, endpoint, onResult, params, onError, onRedirect } = ev;
       const onJsonResponse = (res) => onResult ? onResult(res) : null;
       const onHelpMessage = (err) => onError ? onError(err) : null;
-      post(endpoint, params, onJsonResponse, onHelpMessage, onRedirect);
+      post(endpoint, params, onJsonResponse, onHelpMessage, onRedirect, requestType);
   };
   const applySpinnerStyle = (spinner) => {
       spinner.style.position = 'fixed';
@@ -193,9 +193,9 @@ var juxWeb = (function (exports) {
   };
   let requestRunning = false;
   const maxRetries = 20;
-  const backendRequest = (url_1, options_1, onSuccess_1, onError_1, onRedirect_1, ...args_1) => __awaiter$2(void 0, [url_1, options_1, onSuccess_1, onError_1, onRedirect_1, ...args_1], void 0, function* (url, options, onSuccess, onError, onRedirect, handleUnauthorized = defaultHandleUnauthorized, retrial = false, retrialNum = 0) {
+  const backendRequest = (url_1, options_1, onSuccess_1, onError_1, onRedirect_1, ...args_1) => __awaiter$2(void 0, [url_1, options_1, onSuccess_1, onError_1, onRedirect_1, ...args_1], void 0, function* (url, options, onSuccess, onError, onRedirect, requestType = 'query', handleUnauthorized = defaultHandleUnauthorized, retrial = false, retrialNum = 0) {
       if (requestRunning && !retrial) { // only allow one request at a time
-          setTimeout(() => backendRequest(url, options, onSuccess, onError, onRedirect, handleUnauthorized, false), 300);
+          setTimeout(() => backendRequest(url, options, onSuccess, onError, onRedirect, requestType, handleUnauthorized, false), 300);
           return;
       }
       // @ts-ignore
@@ -207,7 +207,10 @@ var juxWeb = (function (exports) {
       }
       let response;
       requestRunning = true;
-      const requestInit = Object.assign(Object.assign({}, options), { signal: AbortSignal.timeout(6000) });
+      const requestInit = Object.assign({}, options);
+      if (requestType === 'query') {
+          requestInit.signal = AbortSignal.timeout(15000);
+      }
       if (onRedirect)
           requestInit.redirect = 'manual'; // Treat redirects manually instead of following them automatically.
       try {
@@ -215,6 +218,12 @@ var juxWeb = (function (exports) {
       }
       catch (err) {
           // network errors
+          if (requestType === 'command') {
+              // Do not retry applying command if it fails for the first time.
+              onError('There was an error performing your request. Please try again later.');
+              requestRunning = false;
+              return;
+          }
           if (retrialNum > maxRetries) {
               removeOverlay();
               requestRunning = false;
@@ -231,7 +240,7 @@ var juxWeb = (function (exports) {
               else if (url.includes(getSecondaryBackendUrl())) {
                   url = url.replace(getSecondaryBackendUrl(), getBackendUrl());
               }
-              setTimeout(() => backendRequest(url, options, onSuccess, onError, onRedirect, handleUnauthorized, true, retrialNum), 2000);
+              setTimeout(() => backendRequest(url, options, onSuccess, onError, onRedirect, requestType, handleUnauthorized, true, retrialNum), 2000);
           };
           retryRequest();
           return;
@@ -266,7 +275,7 @@ var juxWeb = (function (exports) {
           onError(err);
       }
   });
-  const post = (endpoint, body, onSuccess, onError, onRedirect) => {
+  const post = (endpoint, body, onSuccess, onError, onRedirect, requestType = "query") => {
       const options = {
           method: 'POST',
           headers: {
@@ -278,7 +287,7 @@ var juxWeb = (function (exports) {
           // @ts-ignore
           options.body = JSON.stringify(body);
       }
-      return backendRequest(getApiUrl() + endpoint, options, onSuccess, onError, onRedirect);
+      return backendRequest(getApiUrl() + endpoint, options, onSuccess, onError, onRedirect, requestType);
   };
   const get = (endpoint, onSuccess, onError, onRedirect) => {
       const options = {
@@ -308,7 +317,7 @@ var juxWeb = (function (exports) {
       const { email, token } = data;
       const url = getMagicAuthReqUrl() + encodeURIComponent(email) + '&destination=' + extractTokenFromWindowLocation('destination') + '&token=' + token;
       const options = {};
-      backendRequest(url, options, onJsonResponse, console.error, null, onUnauthorized);
+      backendRequest(url, options, onJsonResponse, console.error, null, 'query', onUnauthorized);
   };
   const openMagicLink = (magicToken, onJsonResponse, onHelpMessage) => {
       backendRequest(getMagicAuthUrl() + magicToken, {}, onJsonResponse, onHelpMessage);
@@ -14593,8 +14602,9 @@ var juxWeb = (function (exports) {
   };
 
   class JuxEvent extends Event {
-      constructor(method, endpoint, onResult, params, onError, onRedirect) {
+      constructor(type, method, endpoint, onResult, params, onError, onRedirect) {
           super('jux-event', { bubbles: true, cancelable: true, composed: true });
+          this.requestType = type;
           this.method = method;
           this.endpoint = endpoint;
           this.onResult = onResult;
@@ -14604,10 +14614,10 @@ var juxWeb = (function (exports) {
       }
   }
   const query = (element, endpoint, onResult, params, onError, onRedirect) => {
-      element.dispatchEvent(new JuxEvent('POST', endpoint, onResult, params, onError, onRedirect));
+      element.dispatchEvent(new JuxEvent('query', 'POST', endpoint, onResult, params, onError, onRedirect));
   };
   const command = (element, endpoint, onResult, params, onError, onRedirect) => {
-      element.dispatchEvent(new JuxEvent('POST', endpoint, onResult, params, onError, onRedirect));
+      element.dispatchEvent(new JuxEvent('command', 'POST', endpoint, onResult, params, onError, onRedirect));
   };
 
   exports.chosenLanguage = chosenLanguage;

package/dist/main.esm.js

@@ -158,10 +158,10 @@ const getMagicAuthReqUrl = () => {
 };
 // TODO: use jux-events to call commands and queries inside jux-web library
 const handleJuxEvent = (ev) => {
-    const { endpoint, onResult, params, onError, onRedirect } = ev;
+    const { requestType, endpoint, onResult, params, onError, onRedirect } = ev;
     const onJsonResponse = (res) => onResult ? onResult(res) : null;
     const onHelpMessage = (err) => onError ? onError(err) : null;
-    post(endpoint, params, onJsonResponse, onHelpMessage, onRedirect);
+    post(endpoint, params, onJsonResponse, onHelpMessage, onRedirect, requestType);
 };
 const applySpinnerStyle = (spinner) => {
     spinner.style.position = 'fixed';
@@ -192,9 +192,9 @@ const defaultHandleUnauthorized = () => {
 };
 let requestRunning = false;
 const maxRetries = 20;
-const backendRequest = (url_1, options_1, onSuccess_1, onError_1, onRedirect_1, ...args_1) => __awaiter(void 0, [url_1, options_1, onSuccess_1, onError_1, onRedirect_1, ...args_1], void 0, function* (url, options, onSuccess, onError, onRedirect, handleUnauthorized = defaultHandleUnauthorized, retrial = false, retrialNum = 0) {
+const backendRequest = (url_1, options_1, onSuccess_1, onError_1, onRedirect_1, ...args_1) => __awaiter(void 0, [url_1, options_1, onSuccess_1, onError_1, onRedirect_1, ...args_1], void 0, function* (url, options, onSuccess, onError, onRedirect, requestType = 'query', handleUnauthorized = defaultHandleUnauthorized, retrial = false, retrialNum = 0) {
     if (requestRunning && !retrial) { // only allow one request at a time
-        setTimeout(() => backendRequest(url, options, onSuccess, onError, onRedirect, handleUnauthorized, false), 300);
+        setTimeout(() => backendRequest(url, options, onSuccess, onError, onRedirect, requestType, handleUnauthorized, false), 300);
         return;
     }
     // @ts-ignore
@@ -206,7 +206,10 @@ const backendRequest = (url_1, options_1, onSuccess_1, onError_1, onRedirect_1,
     }
     let response;
     requestRunning = true;
-    const requestInit = Object.assign(Object.assign({}, options), { signal: AbortSignal.timeout(6000) });
+    const requestInit = Object.assign({}, options);
+    if (requestType === 'query') {
+        requestInit.signal = AbortSignal.timeout(15000);
+    }
     if (onRedirect)
         requestInit.redirect = 'manual'; // Treat redirects manually instead of following them automatically.
     try {
@@ -214,6 +217,12 @@ const backendRequest = (url_1, options_1, onSuccess_1, onError_1, onRedirect_1,
     }
     catch (err) {
         // network errors
+        if (requestType === 'command') {
+            // Do not retry applying command if it fails for the first time.
+            onError('There was an error performing your request. Please try again later.');
+            requestRunning = false;
+            return;
+        }
         if (retrialNum > maxRetries) {
             removeOverlay();
             requestRunning = false;
@@ -230,7 +239,7 @@ const backendRequest = (url_1, options_1, onSuccess_1, onError_1, onRedirect_1,
             else if (url.includes(getSecondaryBackendUrl())) {
                 url = url.replace(getSecondaryBackendUrl(), getBackendUrl());
             }
-            setTimeout(() => backendRequest(url, options, onSuccess, onError, onRedirect, handleUnauthorized, true, retrialNum), 2000);
+            setTimeout(() => backendRequest(url, options, onSuccess, onError, onRedirect, requestType, handleUnauthorized, true, retrialNum), 2000);
         };
         retryRequest();
         return;
@@ -265,7 +274,7 @@ const backendRequest = (url_1, options_1, onSuccess_1, onError_1, onRedirect_1,
         onError(err);
     }
 });
-const post = (endpoint, body, onSuccess, onError, onRedirect) => {
+const post = (endpoint, body, onSuccess, onError, onRedirect, requestType = "query") => {
     const options = {
         method: 'POST',
         headers: {
@@ -277,7 +286,7 @@ const post = (endpoint, body, onSuccess, onError, onRedirect) => {
         // @ts-ignore
         options.body = JSON.stringify(body);
     }
-    return backendRequest(getApiUrl() + endpoint, options, onSuccess, onError, onRedirect);
+    return backendRequest(getApiUrl() + endpoint, options, onSuccess, onError, onRedirect, requestType);
 };
 const get = (endpoint, onSuccess, onError, onRedirect) => {
     const options = {
@@ -307,7 +316,7 @@ const requestMagicLink = (data, onJsonResponse, onUnauthorized) => {
     const { email, token } = data;
     const url = getMagicAuthReqUrl() + encodeURIComponent(email) + '&destination=' + extractTokenFromWindowLocation('destination') + '&token=' + token;
     const options = {};
-    backendRequest(url, options, onJsonResponse, console.error, null, onUnauthorized);
+    backendRequest(url, options, onJsonResponse, console.error, null, 'query', onUnauthorized);
 };
 const openMagicLink = (magicToken, onJsonResponse, onHelpMessage) => {
     backendRequest(getMagicAuthUrl() + magicToken, {}, onJsonResponse, onHelpMessage);
@@ -1273,8 +1282,9 @@ const loginPage = (clientApp, backgroundImg, onUserLogin, loginTypes) => {
 };
 
 class JuxEvent extends Event {
-    constructor(method, endpoint, onResult, params, onError, onRedirect) {
+    constructor(type, method, endpoint, onResult, params, onError, onRedirect) {
         super('jux-event', { bubbles: true, cancelable: true, composed: true });
+        this.requestType = type;
         this.method = method;
         this.endpoint = endpoint;
         this.onResult = onResult;
@@ -1284,10 +1294,10 @@ class JuxEvent extends Event {
     }
 }
 const query = (element, endpoint, onResult, params, onError, onRedirect) => {
-    element.dispatchEvent(new JuxEvent('POST', endpoint, onResult, params, onError, onRedirect));
+    element.dispatchEvent(new JuxEvent('query', 'POST', endpoint, onResult, params, onError, onRedirect));
 };
 const command = (element, endpoint, onResult, params, onError, onRedirect) => {
-    element.dispatchEvent(new JuxEvent('POST', endpoint, onResult, params, onError, onRedirect));
+    element.dispatchEvent(new JuxEvent('command', 'POST', endpoint, onResult, params, onError, onRedirect));
 };
 
 export { chosenLanguage, command, getTranslation, handleJuxEvent, handleMagicLinkRequest, initLanguage, initSession, loginButton, loginPage, magicLinkModal, onMicrosoftSignIn, query, reloadWithLanguageOverride, requestMagicLink };

package/dist/main.js

@@ -182,10 +182,10 @@ const getMagicAuthReqUrl = () => {
 };
 // TODO: use jux-events to call commands and queries inside jux-web library
 const handleJuxEvent = (ev) => {
-    const { endpoint, onResult, params, onError, onRedirect } = ev;
+    const { requestType, endpoint, onResult, params, onError, onRedirect } = ev;
     const onJsonResponse = (res) => onResult ? onResult(res) : null;
     const onHelpMessage = (err) => onError ? onError(err) : null;
-    post(endpoint, params, onJsonResponse, onHelpMessage, onRedirect);
+    post(endpoint, params, onJsonResponse, onHelpMessage, onRedirect, requestType);
 };
 const applySpinnerStyle = (spinner) => {
     spinner.style.position = 'fixed';
@@ -216,9 +216,9 @@ const defaultHandleUnauthorized = () => {
 };
 let requestRunning = false;
 const maxRetries = 20;
-const backendRequest = (url_1, options_1, onSuccess_1, onError_1, onRedirect_1, ...args_1) => __awaiter(void 0, [url_1, options_1, onSuccess_1, onError_1, onRedirect_1, ...args_1], void 0, function* (url, options, onSuccess, onError, onRedirect, handleUnauthorized = defaultHandleUnauthorized, retrial = false, retrialNum = 0) {
+const backendRequest = (url_1, options_1, onSuccess_1, onError_1, onRedirect_1, ...args_1) => __awaiter(void 0, [url_1, options_1, onSuccess_1, onError_1, onRedirect_1, ...args_1], void 0, function* (url, options, onSuccess, onError, onRedirect, requestType = 'query', handleUnauthorized = defaultHandleUnauthorized, retrial = false, retrialNum = 0) {
     if (requestRunning && !retrial) { // only allow one request at a time
-        setTimeout(() => backendRequest(url, options, onSuccess, onError, onRedirect, handleUnauthorized, false), 300);
+        setTimeout(() => backendRequest(url, options, onSuccess, onError, onRedirect, requestType, handleUnauthorized, false), 300);
         return;
     }
     // @ts-ignore
@@ -230,7 +230,10 @@ const backendRequest = (url_1, options_1, onSuccess_1, onError_1, onRedirect_1,
     }
     let response;
     requestRunning = true;
-    const requestInit = Object.assign(Object.assign({}, options), { signal: AbortSignal.timeout(6000) });
+    const requestInit = Object.assign({}, options);
+    if (requestType === 'query') {
+        requestInit.signal = AbortSignal.timeout(15000);
+    }
     if (onRedirect)
         requestInit.redirect = 'manual'; // Treat redirects manually instead of following them automatically.
     try {
@@ -238,6 +241,12 @@ const backendRequest = (url_1, options_1, onSuccess_1, onError_1, onRedirect_1,
     }
     catch (err) {
         // network errors
+        if (requestType === 'command') {
+            // Do not retry applying command if it fails for the first time.
+            onError('There was an error performing your request. Please try again later.');
+            requestRunning = false;
+            return;
+        }
         if (retrialNum > maxRetries) {
             removeOverlay();
             requestRunning = false;
@@ -254,7 +263,7 @@ const backendRequest = (url_1, options_1, onSuccess_1, onError_1, onRedirect_1,
             else if (url.includes(getSecondaryBackendUrl())) {
                 url = url.replace(getSecondaryBackendUrl(), getBackendUrl());
             }
-            setTimeout(() => backendRequest(url, options, onSuccess, onError, onRedirect, handleUnauthorized, true, retrialNum), 2000);
+            setTimeout(() => backendRequest(url, options, onSuccess, onError, onRedirect, requestType, handleUnauthorized, true, retrialNum), 2000);
         };
         retryRequest();
         return;
@@ -289,7 +298,7 @@ const backendRequest = (url_1, options_1, onSuccess_1, onError_1, onRedirect_1,
         onError(err);
     }
 });
-const post = (endpoint, body, onSuccess, onError, onRedirect) => {
+const post = (endpoint, body, onSuccess, onError, onRedirect, requestType = "query") => {
     const options = {
         method: 'POST',
         headers: {
@@ -301,7 +310,7 @@ const post = (endpoint, body, onSuccess, onError, onRedirect) => {
         // @ts-ignore
         options.body = JSON.stringify(body);
     }
-    return backendRequest(getApiUrl() + endpoint, options, onSuccess, onError, onRedirect);
+    return backendRequest(getApiUrl() + endpoint, options, onSuccess, onError, onRedirect, requestType);
 };
 const get = (endpoint, onSuccess, onError, onRedirect) => {
     const options = {
@@ -331,7 +340,7 @@ const requestMagicLink = (data, onJsonResponse, onUnauthorized) => {
     const { email, token } = data;
     const url = getMagicAuthReqUrl() + encodeURIComponent(email) + '&destination=' + extractTokenFromWindowLocation('destination') + '&token=' + token;
     const options = {};
-    backendRequest(url, options, onJsonResponse, console.error, null, onUnauthorized);
+    backendRequest(url, options, onJsonResponse, console.error, null, 'query', onUnauthorized);
 };
 const openMagicLink = (magicToken, onJsonResponse, onHelpMessage) => {
     backendRequest(getMagicAuthUrl() + magicToken, {}, onJsonResponse, onHelpMessage);
@@ -1297,8 +1306,9 @@ const loginPage = (clientApp, backgroundImg, onUserLogin, loginTypes) => {
 };
 
 class JuxEvent extends Event {
-    constructor(method, endpoint, onResult, params, onError, onRedirect) {
+    constructor(type, method, endpoint, onResult, params, onError, onRedirect) {
         super('jux-event', { bubbles: true, cancelable: true, composed: true });
+        this.requestType = type;
         this.method = method;
         this.endpoint = endpoint;
         this.onResult = onResult;
@@ -1308,10 +1318,10 @@ class JuxEvent extends Event {
     }
 }
 const query = (element, endpoint, onResult, params, onError, onRedirect) => {
-    element.dispatchEvent(new JuxEvent('POST', endpoint, onResult, params, onError, onRedirect));
+    element.dispatchEvent(new JuxEvent('query', 'POST', endpoint, onResult, params, onError, onRedirect));
 };
 const command = (element, endpoint, onResult, params, onError, onRedirect) => {
-    element.dispatchEvent(new JuxEvent('POST', endpoint, onResult, params, onError, onRedirect));
+    element.dispatchEvent(new JuxEvent('command', 'POST', endpoint, onResult, params, onError, onRedirect));
 };
 
 exports.chosenLanguage = chosenLanguage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@klauswuestefeld/jux-web",
-  "version": "2024.3.13",
+  "version": "2024.4.1",
   "author": "Jux.House",
   "license": "Copyrighted",
   "description": "",