asma-helpers 0.2.50 → 0.3.0

package/lib/helpers/generateGenqlClient.d.ts

@@ -7,10 +7,17 @@ export declare function generateGenqlClient<T extends ReturnType<typeof createCl
     setReqConfig: () => Promise<AxiosRequestConfig<any>>;
     createClient: (options?: ClientOptions | undefined) => T;
     serviceUrl: () => string;
+    /**
+     * Returns true whenether token and refresh token is epired! this helps to cancel all concurent requests after first request is invalidated.
+     * @returns true if request should be cancelled
+     */
     path?: string;
 }): {
     getGenqlClient: () => Promise<T>;
-    genqlClient: (options?: CliOptions) => Promise<T>;
+    resetGenqlClient: () => void;
+    genqlClient: (options?: CliOptions & {
+        abortController?: AbortController;
+    }) => Promise<T>;
     genqlClientWs: () => Promise<T>;
 };
 export {};

package/lib/helpers/generateGenqlClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateGenqlClient.d.ts","sourceRoot":"","sources":["../../src/helpers/generateGenqlClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAA;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,gBAAgB,CAAA;AAKjE,UAAU,UAAW,SAAQ,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC;IACnD,SAAS,CAAC,EAAE,OAAO,CAAA;CACtB;AAED,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,UAAU,CAAC,OAAO,YAAY,CAAC,EAAE,EAC3E,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,IAAoB,GACvB,EAAE;IAEC,YAAY,EAAE,MAAM,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAA;IACpD,YAAY,EAAE,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,SAAS,KAAK,CAAC,CAAA;IACxD,UAAU,EAAE,MAAM,MAAM,CAAA;IACxB,IAAI,CAAC,EAAE,MAAM,CAAA;CAChB;;4BA8CuC,UAAU,KAAQ,QAAQ,CAAC,CAAC;;EA8CnE"}
+{"version":3,"file":"generateGenqlClient.d.ts","sourceRoot":"","sources":["../../src/helpers/generateGenqlClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAA;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,gBAAgB,CAAA;AAKjE,UAAU,UAAW,SAAQ,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC;IACnD,SAAS,CAAC,EAAE,OAAO,CAAA;CACtB;AAED,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,UAAU,CAAC,OAAO,YAAY,CAAC,EAAE,EAC3E,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,IAAoB,GACvB,EAAE;IAEC,YAAY,EAAE,MAAM,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAA;IACpD,YAAY,EAAE,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,SAAS,KAAK,CAAC,CAAA;IACxD,UAAU,EAAE,MAAM,MAAM,CAAA;IACxB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CAChB;;;4BA2BuC,UAAU,GAAG;QAAE,eAAe,CAAC,EAAE,eAAe,CAAA;KAAE,KAAQ,QAAQ,CAAC,CAAC;;EAwD3G"}

package/lib/helpers/generateGenqlClient.js

@@ -1,51 +1,30 @@
 import { httpToWs } from './Config';
 import { registerCallbackOnSrvAuthEvents } from './generateSrvAuthBindings';
 export function generateGenqlClient({ setReqConfig, createClient, serviceUrl, path = '/v1/graphql', }) {
-    // let jwt_exp = 0
     let client = null;
     let wsClient = null;
-    registerCallbackOnSrvAuthEvents('jwt_changed', () => {
+    function resetClients() {
         client = null;
         wsClient = null;
-    });
-    //function accessTokenHasExpired() {
-    //    const nowTime = Math.floor(new Date().getTime() / 1000)
-    //
-    //    //set exp time -20sec for token to be refreshed early
-    //    return jwt_exp - 10 <= nowTime
-    //}
+    }
+    registerCallbackOnSrvAuthEvents('jwt_changed', resetClients);
     async function getGenqlClient() {
-        if ( /* accessTokenHasExpired() || */client === null) {
+        if (client === null) {
             client = await genqlClient();
             return client;
         }
         return client;
     }
-    //function resetGenqlClient() {
-    //    client = null
-    //}
-    // function setJwtExp(token?: string) {
-    //     if (!token) return
-    //
-    //     const parsed_jwt = parseJwt<{ exp: number }>(token)?.exp
-    //
-    //     jwt_exp = parsed_jwt || 0
-    // }
-    /**
-     *
-     * This is used for anonymous requests as well as authenticated requests
-     *
-     */
+    function resetGenqlClient() {
+        client = null;
+        wsClient = null;
+    }
     async function genqlClient(options = {}) {
-        //let req_headers: Record<string, string> = {}
-        const { anonymous, headers, ...rest } = options;
+        const { anonymous, headers, abortController, ...rest } = options;
         if (!serviceUrl()) {
             console.warn('requred param srv_url is undefined, please check EnvConfig object!');
         }
-        //if (!anonymous) {
-        //req_headers = ((await setReqConfig()).headers ?? {}) as Record<string, string>
-        // setJwtExp(req_headers['Authorization'])
-        // }
+        const localAbrotController = createabortControllerAndAbortOnLogoutEvent(abortController);
         return createClient({
             url: `${serviceUrl()}${path}`,
             headers: async () => {
@@ -55,18 +34,19 @@ export function generateGenqlClient({ setReqConfig, createClient, serviceUrl, pa
                     ...headers,
                 });
             },
+            signal: localAbrotController.signal,
             batch: { batchInterval: 50, maxBatchSize: 100 },
             ...rest,
         });
     }
     async function genqlClientWs() {
-        if ( /* accessTokenHasExpired() || */!wsClient) {
-            //const req_headers = ((await setReqConfig()).headers ?? {}) as Record<string, string>
-            //setJwtExp(req_headers['Authorization'])
+        if (!wsClient) {
+            const localAbrotController = createabortControllerAndAbortOnLogoutEvent();
             wsClient = createClient({
                 url: `${httpToWs(serviceUrl())}${path}`,
                 cache: 'reload',
                 batch: { batchInterval: 50, maxBatchSize: 100 },
+                signal: localAbrotController.signal,
                 subscription: {
                     reconnect: true,
                     reconnectionAttempts: 5,
@@ -76,6 +56,15 @@ export function generateGenqlClient({ setReqConfig, createClient, serviceUrl, pa
         }
         return wsClient;
     }
-    return { getGenqlClient, /* resetGenqlClient, */ genqlClient, genqlClientWs };
+    function createabortControllerAndAbortOnLogoutEvent(abortController) {
+        let localAbrotController = abortController || new AbortController();
+        const { unregister } = registerCallbackOnSrvAuthEvents('logout_event', () => {
+            localAbrotController === null || localAbrotController === void 0 ? void 0 : localAbrotController.abort();
+            resetClients();
+            unregister();
+        });
+        return localAbrotController;
+    }
+    return { getGenqlClient, resetGenqlClient, genqlClient, genqlClientWs };
 }
 //# sourceMappingURL=generateGenqlClient.js.map

package/lib/helpers/generateGenqlClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateGenqlClient.js","sourceRoot":"","sources":["../../src/helpers/generateGenqlClient.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACnC,OAAO,EAAE,+BAA+B,EAAE,MAAM,2BAA2B,CAAA;AAO3E,MAAM,UAAU,mBAAmB,CAA4C,EAC3E,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,IAAI,GAAG,aAAa,GAOvB;IACG,kBAAkB;IAElB,IAAI,MAAM,GAAa,IAAI,CAAA;IAE3B,IAAI,QAAQ,GAAa,IAAI,CAAA;IAE7B,+BAA+B,CAAC,aAAa,EAAE,GAAG,EAAE;QAChD,MAAM,GAAG,IAAI,CAAA;QACb,QAAQ,GAAG,IAAI,CAAA;IACnB,CAAC,CAAC,CAAA;IAEF,oCAAoC;IACpC,6DAA6D;IAC7D,EAAE;IACF,2DAA2D;IAC3D,oCAAoC;IACpC,GAAG;IAEH,KAAK,UAAU,cAAc;QACzB,KAAI,gCAAiC,MAAM,KAAK,IAAI,EAAE;YAClD,MAAM,GAAG,MAAM,WAAW,EAAE,CAAA;YAE5B,OAAO,MAAM,CAAA;SAChB;QAED,OAAO,MAAM,CAAA;IACjB,CAAC;IAED,+BAA+B;IAC/B,mBAAmB;IACnB,GAAG;IAEH,uCAAuC;IACvC,yBAAyB;IACzB,EAAE;IACF,+DAA+D;IAC/D,EAAE;IACF,gCAAgC;IAChC,IAAI;IAEJ;;;;OAIG;IACH,KAAK,UAAU,WAAW,CAAC,UAAsB,EAAE;QAC/C,8CAA8C;QAE9C,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAA;QAE/C,IAAI,CAAC,UAAU,EAAE,EAAE;YACf,OAAO,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAA;SACrF;QACD,mBAAmB;QACnB,gFAAgF;QAChF,0CAA0C;QAC1C,IAAI;QAEJ,OAAO,YAAY,CAAC;YAChB,GAAG,EAAE,GAAG,UAAU,EAAE,GAAG,IAAI,EAAE;YAC7B,OAAO,EAAE,KAAK,IAAI,EAAE;;gBAAC,OAAA,CAAC;oBAClB,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,CAAC,MAAA,CAAC,MAAM,YAAY,EAAE,CAAC,CAAC,OAAO,mCAAI,EAAE,CAA4B,CAAC;oBAChG,GAAG,OAAO;iBACb,CAAC,CAAA;aAAA;YACF,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE;YAC/C,GAAG,IAAI;SACV,CAAC,CAAA;IACN,CAAC;IAED,KAAK,UAAU,aAAa;QACxB,KAAI,gCAAiC,CAAC,QAAQ,EAAE;YAC5C,sFAAsF;YAEtF,yCAAyC;YAEzC,QAAQ,GAAG,YAAY,CAAC;gBACpB,GAAG,EAAE,GAAG,QAAQ,CAAC,UAAU,EAAE,CAAC,GAAG,IAAI,EAAE;gBACvC,KAAK,EAAE,QAAQ;gBACf,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE;gBAC/C,YAAY,EAAE;oBACV,SAAS,EAAE,IAAI;oBACf,oBAAoB,EAAE,CAAC;oBACvB,OAAO,EAAE,KAAK,IAAI,EAAE,WAAC,OAAA,CAAC,MAAA,CAAC,MAAM,YAAY,EAAE,CAAC,CAAC,OAAO,mCAAI,EAAE,CAA2B,CAAA,EAAA;iBACxF;aACJ,CAAC,CAAA;SACL;QAED,OAAO,QAAQ,CAAA;IACnB,CAAC;IAED,OAAO,EAAE,cAAc,EAAE,uBAAuB,CAAC,WAAW,EAAE,aAAa,EAAE,CAAA;AACjF,CAAC"}
+{"version":3,"file":"generateGenqlClient.js","sourceRoot":"","sources":["../../src/helpers/generateGenqlClient.ts"],"names":[],"mappings":"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"}

package/lib/helpers/generateSrvAuthBindings.d.ts

@@ -1,6 +1,6 @@
 import { type AxiosResponse, type ResponseType } from 'axios';
 import { EnvironmentEnums } from '..';
-export declare const dispatch: <Key extends "logout_event" | "jwt_changed">(event: Key, arg: {
+export declare const dispatchSrvAuthEvents: <Key extends "logout_event" | "jwt_changed">(event: Key, arg: {
     jwt_changed: {};
     logout_event: {};
 }[Key], shouldPersist?: boolean | undefined) => void, registerCallbackOnSrvAuthEvents: <Key_1 extends "logout_event" | "jwt_changed">(event: Key_1, callback: (val: {
@@ -13,11 +13,11 @@ export declare function generateSrvAuthBindings<FeatureEnums = never>(SRV_AUTH:
     hasFeature: (featureName: FeatureEnums) => boolean;
     getFeatures: () => Set<FeatureEnums> | undefined;
     isJwtValid: () => boolean;
-    signin: (url: string, headers?: Record<string, string>) => Promise<{
+    signin: (url: string, headers?: Record<string, string>) => Promise<AxiosResponse<{
         token: string;
         features: FeatureEnums[];
-    }>;
-    srvAuthGet: <R>(url: string, headers?: Record<string, string>) => Promise<AxiosResponse<R, any>>;
+    }, any> | undefined>;
+    srvAuthGet: <R>(url: string, headers?: Record<string, string>) => Promise<AxiosResponse<R, any> | undefined>;
     signoutAuth: () => Promise<void>;
     setReqConfig: <T = unknown>(data?: T | undefined, responseType?: ResponseType) => Promise<{
         data: T | undefined;
@@ -26,6 +26,15 @@ export declare function generateSrvAuthBindings<FeatureEnums = never>(SRV_AUTH:
     }>;
     getJwtTokenAsync: () => Promise<string | undefined>;
     getNewJwtToken: () => Promise<string | undefined>;
+    /**
+     * @deprecated use registerCallbackOnSrvAuthEvents directly
+     */
+    registerOnJwtChanges: <Key_1 extends "logout_event" | "jwt_changed">(event: Key_1, callback: (val: {
+        jwt_changed: {};
+        logout_event: {};
+    }[Key_1]) => void) => {
+        unregister: () => void;
+    };
     getUserId: () => string;
     getParsedJwt: <R_1 = {
         user_id: string;
@@ -36,11 +45,7 @@ export declare function generateSrvAuthBindings<FeatureEnums = never>(SRV_AUTH:
 };
 /**
  * @deprecated use generateSrvAuthBindings
- * @param SRV_AUTH
- * @param DEVELOPMENT
- * @param ENVIRONMENT_TO_OPERATE
- * @param logout
- * @returns
+ *
  */
 export declare function generateSrvAuthBindingsMicroApp(SRV_AUTH: () => string, DEVELOPMENT: () => boolean, ENVIRONMENT_TO_OPERATE: () => EnvironmentEnums, logout?: () => void): {};
 //# sourceMappingURL=generateSrvAuthBindings.d.ts.map

package/lib/helpers/generateSrvAuthBindings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateSrvAuthBindings.d.ts","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,OAAO,CAAA;AAEpE,OAAO,EAAE,gBAAgB,EAAY,MAAM,IAAI,CAAA;AAI/C,eAAO,MAAQ,QAAQ;iBAAwE,EAAE;kBAAgB,EAAE;sDAAhF,+BAA+B;iBAA6B,EAAE;kBAAgB,EAAE;;;CAElH,CAAA;AAED,wBAAgB,uBAAuB,CAAC,YAAY,GAAG,KAAK,EACxD,QAAQ,EAAE,MAAM,MAAM,EACtB,WAAW,EAAE,MAAM,OAAO,EAC1B,sBAAsB,EAAE,MAAM,MAAM,EACpC,MAAM,CAAC,EAAE,MAAM,IAAI;8BA6Kc,YAAY;;;kBA5GlB,MAAM,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;eACpB,MAAM;kBAAY,YAAY,EAAE;;yBAtC7C,MAAM,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;;qEAmFR,YAAY;;;;;;;qBAzBxD,MAAM;;iBAyES,MAAM;aAAO,MAAM;;;iCAzGtB,OAAO;EA+I5C;AACD;;;;;;;GAOG;AACH,wBAAgB,+BAA+B,CAC3C,QAAQ,EAAE,MAAM,MAAM,EACtB,WAAW,EAAE,MAAM,OAAO,EAC1B,sBAAsB,EAAE,MAAM,gBAAgB,EAC9C,MAAM,CAAC,EAAE,MAAM,IAAI,MAMtB"}
+{"version":3,"file":"generateSrvAuthBindings.d.ts","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,OAAO,CAAA;AAEpE,OAAO,EAAE,gBAAgB,EAAY,MAAM,IAAI,CAAA;AAI/C,eAAO,MAAkB,qBAAqB;iBAC7B,EAAE;kBACD,EAAE;sDAFsC,+BAA+B;iBACxE,EAAE;kBACD,EAAE;;;CACD,CAAA;AAEnB,wBAAgB,uBAAuB,CAAC,YAAY,GAAG,KAAK,EACxD,QAAQ,EAAE,MAAM,MAAM,EACtB,WAAW,EAAE,MAAM,OAAO,EAC1B,sBAAsB,EAAE,MAAM,MAAM,EACpC,MAAM,CAAC,EAAE,MAAM,IAAI;8BAkMc,YAAY;;;kBA9GlB,MAAM,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;eACxB,MAAM;kBAAY,YAAY,EAAE;;yBAvDzC,MAAM,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;;qEA4GR,YAAY;;;;;;;IAsE1E;;OAEG;;;;;;;qBAtGe,MAAM;;iBAwES,MAAM;aAAO,MAAM;;;iCA3GtB,OAAO;EAsJ5C;AACD;;;GAGG;AACH,wBAAgB,+BAA+B,CAC3C,QAAQ,EAAE,MAAM,MAAM,EACtB,WAAW,EAAE,MAAM,OAAO,EAC1B,sBAAsB,EAAE,MAAM,gBAAgB,EAC9C,MAAM,CAAC,EAAE,MAAM,IAAI,MAMtB"}

package/lib/helpers/generateSrvAuthBindings.js

@@ -1,41 +1,61 @@
 import axios from 'axios';
 import { EventBus } from 'asma-event-bus/lib/event-buss';
 import { EnvironmentEnums, parseJwt } from '..';
-let logoutsuccesfull = false;
-export const { dispatch, register: registerCallbackOnSrvAuthEvents } = EventBus('auth-bindings');
+//let logoutsuccesfull = false
+export const { dispatch: dispatchSrvAuthEvents, register: registerCallbackOnSrvAuthEvents } = EventBus('auth-bindings');
 export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOperateFn, logout) {
-    // let logoutMfes: (() => void)[] = []
     var _a;
     if (logout) {
         registerCallbackOnSrvAuthEvents('logout_event', logout);
     }
     if ((_a = window.__ASMA__SHELL__) === null || _a === void 0 ? void 0 : _a.auth_bindings) {
-        //window.__ASMA__SHELL__.logoutMfes = logoutMfes
         return window.__ASMA__SHELL__.auth_bindings;
     }
     let jwtToken = '';
     let features;
     let parsed_jwt;
-    let fetchJwtPromise = null;
+    /*  let fetchJwtPromise: Promise<{
+        data: { message: string; token?: string; features?: FeatureEnums[]; errors: { message: string }[] }
+    }> | null = null */
     const isJwtInvalid = () => (jwtToken && accessTokenHasExpired()) || !jwtToken;
     const isJwtValid = () => !isJwtInvalid();
+    //function cancelRequest() {
+    //    return logoutsuccesfull
+    // }
+    const promiseRegistry = {};
     async function srvAuthGet(url, headers) {
         if (DEVELOPMENT() && EnvironmentToOperateFn()) {
             if (EnvironmentToOperateFn() in EnvironmentEnums) {
                 url = `${url}&env=${EnvironmentToOperateFn()}`;
+                // file deepcode ignore GlobalReplacementRegex: <it is intended to be replaced only first occurence>
                 url = url.includes('&') && !url.includes('?') ? url.replace('&', '?') : url;
             }
             else {
                 console.warn('EnvironmentToOperateFn() is not a valid EnvironmentEnums', 'shall be one of:', EnvironmentEnums, 'actual value:', EnvironmentToOperateFn());
             }
         }
-        return axios.get(`${SRV_AUTH()}${url}`, {
-            headers: {
-                ...headers,
-                'asma-origin': window.location.origin,
-            },
-            withCredentials: true,
-        });
+        const promise = promiseRegistry[url] ||
+            axios.get(`${SRV_AUTH()}${url}`, {
+                headers: {
+                    ...headers,
+                    'asma-origin': window.location.origin,
+                },
+                withCredentials: true,
+            });
+        if (!promiseRegistry[url]) {
+            promiseRegistry[url] = promise;
+        }
+        try {
+            const res = await promise;
+            return res;
+        }
+        catch (e) {
+            console.error(e);
+            return;
+        }
+        finally {
+            delete promiseRegistry[url];
+        }
     }
     function accessTokenHasExpired() {
         const tokenObj = getParsedJwt();
@@ -45,32 +65,31 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
         return accessTokenExpDate - 10 <= nowTime;
     }
     async function signin(url, headers) {
-        const { data } = await srvAuthGet(url, headers);
-        setAuthData(data);
-        logoutsuccesfull = false;
+        const data = await srvAuthGet(url, headers);
+        setAuthData(data === null || data === void 0 ? void 0 : data.data);
+        // logoutsuccesfull = false
         return data;
     }
+    const { unregister } = registerCallbackOnSrvAuthEvents('logout_event', () => {
+        setAuthData({ token: '' });
+        srvAuthGet('/signout');
+        unregister();
+    });
     async function signoutAuth() {
-        try {
-            setAuthData({ token: '' });
-            await srvAuthGet('/signout');
-        }
-        catch (e) {
-            console.error(e);
-        }
-        finally {
-            dispatch('logout_event', {}, false);
-        }
+        dispatchSrvAuthEvents('logout_event', {}, false);
+        // return srvAuthGet('/signout')
     }
     function getUserId() {
         var _a;
         return ((_a = getParsedJwt()) === null || _a === void 0 ? void 0 : _a['user_id']) || '-1';
     }
     function setAuthData(data) {
-        jwtToken = data.token;
-        features = new Set(data.features);
-        parsed_jwt = undefined;
-        dispatch('jwt_changed', {}, false);
+        if (data) {
+            jwtToken = data === null || data === void 0 ? void 0 : data.token;
+            features = new Set(data.features);
+            parsed_jwt = parseJwt(jwtToken);
+        }
+        dispatchSrvAuthEvents('jwt_changed', {}, false);
     }
     function getJwtToken() {
         return jwtToken;
@@ -97,29 +116,24 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
         return res;
     }
     async function getNewJwtToken() {
-        if (logoutsuccesfull)
-            return;
+        var _a;
         try {
-            if (!fetchJwtPromise) {
-                fetchJwtPromise = srvAuthGet('/token');
-            }
-            const { data } = await fetchJwtPromise;
-            if (!data || data.errors || data.message != 'Success' || !data.token) {
-                logout === null || logout === void 0 ? void 0 : logout();
-                logoutsuccesfull = true;
-                //signoutAuth()
+            /*  if (!fetchJwtPromise) {
+                fetchJwtPromise = srvAuthGet('/token')
+            } */
+            const data = await srvAuthGet('/token');
+            if (!data || ((_a = data.data) === null || _a === void 0 ? void 0 : _a.errors) || !data.data.token) {
+                dispatchSrvAuthEvents('logout_event', {}, false);
+                return;
             }
-            setAuthData({ token: data.token || '', features: data.features || [] });
+            setAuthData({ token: data.data.token || '', features: data.data.features || [] });
         }
         catch (error) {
-            logout === null || logout === void 0 ? void 0 : logout();
-            logoutsuccesfull = true;
-            //signoutAuth()
+            dispatchSrvAuthEvents('logout_event', {}, false);
             setAuthData({ token: '', features: [] });
             console.error(error);
         }
         finally {
-            fetchJwtPromise = null;
             return jwtToken;
         }
     }
@@ -150,9 +164,14 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
         setReqConfig,
         getJwtTokenAsync,
         getNewJwtToken,
+        /**
+         * @deprecated use registerCallbackOnSrvAuthEvents directly
+         */
+        registerOnJwtChanges: registerCallbackOnSrvAuthEvents,
         getUserId,
         getParsedJwt,
         getJwtToken,
+        // cancelRequest,
         accessTokenHasExpired,
     };
     window.__ASMA__SHELL__ = window.__ASMA__SHELL__ || {};
@@ -161,11 +180,7 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
 }
 /**
  * @deprecated use generateSrvAuthBindings
- * @param SRV_AUTH
- * @param DEVELOPMENT
- * @param ENVIRONMENT_TO_OPERATE
- * @param logout
- * @returns
+ *
  */
 export function generateSrvAuthBindingsMicroApp(SRV_AUTH, DEVELOPMENT, ENVIRONMENT_TO_OPERATE, logout) {
     var _a;

package/lib/helpers/generateSrvAuthBindings.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateSrvAuthBindings.js","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generateSrvAuthBindings.js","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"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"}

package/lib/helpers/parseJwt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseJwt.d.ts","sourceRoot":"","sources":["../../src/helpers/parseJwt.ts"],"names":[],"mappings":"AAEA,wBAAgB,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,GAAC,SAAS,CAQzD"}
+{"version":3,"file":"parseJwt.d.ts","sourceRoot":"","sources":["../../src/helpers/parseJwt.ts"],"names":[],"mappings":"AAEA,wBAAgB,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,iBAQ3C"}

package/lib/helpers/parseJwt.js

@@ -1,7 +1,7 @@
 export function parseJwt(jwtToken) {
     const base64Url = jwtToken === null || jwtToken === void 0 ? void 0 : jwtToken.split('.')[1];
-    if (base64Url === undefined) {
-        return {};
+    if (!base64Url) {
+        return;
     }
     return JSON.parse(decodeURIComponent(escape(window.atob(base64Url))));
 }

package/lib/helpers/parseJwt.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseJwt.js","sourceRoot":"","sources":["../../src/helpers/parseJwt.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,QAAQ,CAAI,QAAgB;IACxC,MAAM,SAAS,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IAEzC,IAAI,SAAS,KAAK,SAAS,EAAE;QACzB,OAAO,EAAS,CAAA;KACnB;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;AACzE,CAAC"}
+{"version":3,"file":"parseJwt.js","sourceRoot":"","sources":["../../src/helpers/parseJwt.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,QAAQ,CAAI,QAAgB;IACxC,MAAM,SAAS,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IAEzC,IAAI,CAAC,SAAS,EAAE;QACZ,OAAM;KACT;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAM,CAAA;AAC9E,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "asma-helpers",
-    "version": "0.2.50",
+    "version": "0.3.0",
     "description": "helpers methods for asma",
     "main": "lib/index.js",
     "types": "lib",

package/src/helpers/generateGenqlClient.ts

@@ -18,28 +18,25 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
     setReqConfig: () => Promise<AxiosRequestConfig<any>>
     createClient: (options?: ClientOptions | undefined) => T
     serviceUrl: () => string
+    /**
+     * Returns true whenether token and refresh token is epired! this helps to cancel all concurent requests after first request is invalidated.
+     * @returns true if request should be cancelled
+     */
     path?: string
 }) {
-    // let jwt_exp = 0
-
     let client: T | null = null
 
     let wsClient: T | null = null
 
-    registerCallbackOnSrvAuthEvents('jwt_changed', () => {
+    function resetClients() {
         client = null
         wsClient = null
-    })
+    }
 
-    //function accessTokenHasExpired() {
-    //    const nowTime = Math.floor(new Date().getTime() / 1000)
-    //
-    //    //set exp time -20sec for token to be refreshed early
-    //    return jwt_exp - 10 <= nowTime
-    //}
+    registerCallbackOnSrvAuthEvents('jwt_changed', resetClients)
 
     async function getGenqlClient() {
-        if (/* accessTokenHasExpired() || */ client === null) {
+        if (client === null) {
             client = await genqlClient()
 
             return client
@@ -48,35 +45,19 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
         return client
     }
 
-    //function resetGenqlClient() {
-    //    client = null
-    //}
-
-    // function setJwtExp(token?: string) {
-    //     if (!token) return
-    //
-    //     const parsed_jwt = parseJwt<{ exp: number }>(token)?.exp
-    //
-    //     jwt_exp = parsed_jwt || 0
-    // }
-
-    /**
-     *
-     * This is used for anonymous requests as well as authenticated requests
-     *
-     */
-    async function genqlClient(options: CliOptions = {}): Promise<T> {
-        //let req_headers: Record<string, string> = {}
+    function resetGenqlClient() {
+        client = null
+        wsClient = null
+    }
 
-        const { anonymous, headers, ...rest } = options
+    async function genqlClient(options: CliOptions & { abortController?: AbortController } = {}): Promise<T> {
+        const { anonymous, headers, abortController, ...rest } = options
 
         if (!serviceUrl()) {
             console.warn('requred param srv_url is undefined, please check EnvConfig object!')
         }
-        //if (!anonymous) {
-        //req_headers = ((await setReqConfig()).headers ?? {}) as Record<string, string>
-        // setJwtExp(req_headers['Authorization'])
-        // }
+
+        const localAbrotController = createabortControllerAndAbortOnLogoutEvent(abortController)
 
         return createClient({
             url: `${serviceUrl()}${path}`,
@@ -84,21 +65,21 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
                 ...(options.anonymous ? {} : (((await setReqConfig()).headers ?? {}) as Record<string, string>)),
                 ...headers,
             }),
+            signal: localAbrotController.signal,
             batch: { batchInterval: 50, maxBatchSize: 100 },
             ...rest,
         })
     }
 
     async function genqlClientWs() {
-        if (/* accessTokenHasExpired() || */ !wsClient) {
-            //const req_headers = ((await setReqConfig()).headers ?? {}) as Record<string, string>
-
-            //setJwtExp(req_headers['Authorization'])
+        if (!wsClient) {
+            const localAbrotController = createabortControllerAndAbortOnLogoutEvent()
 
             wsClient = createClient({
                 url: `${httpToWs(serviceUrl())}${path}`,
                 cache: 'reload',
                 batch: { batchInterval: 50, maxBatchSize: 100 },
+                signal: localAbrotController.signal,
                 subscription: {
                     reconnect: true,
                     reconnectionAttempts: 5,
@@ -110,5 +91,19 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
         return wsClient
     }
 
-    return { getGenqlClient, /* resetGenqlClient, */ genqlClient, genqlClientWs }
+    function createabortControllerAndAbortOnLogoutEvent(abortController?: AbortController) {
+        let localAbrotController = abortController || new AbortController()
+
+        const { unregister } = registerCallbackOnSrvAuthEvents('logout_event', () => {
+            localAbrotController?.abort()
+
+            resetClients()
+
+            unregister()
+        })
+
+        return localAbrotController
+    }
+
+    return { getGenqlClient, resetGenqlClient, genqlClient, genqlClientWs }
 }

package/src/helpers/generateSrvAuthBindings.ts

@@ -2,11 +2,12 @@ import axios, { type AxiosResponse, type ResponseType } from 'axios'
 import { EventBus } from 'asma-event-bus/lib/event-buss'
 import { EnvironmentEnums, parseJwt } from '..'
 
-let logoutsuccesfull = false
+//let logoutsuccesfull = false
 
-export const { dispatch, register: registerCallbackOnSrvAuthEvents } = EventBus<{ jwt_changed: {}; logout_event: {} }>(
-    'auth-bindings',
-)
+export const { dispatch: dispatchSrvAuthEvents, register: registerCallbackOnSrvAuthEvents } = EventBus<{
+    jwt_changed: {}
+    logout_event: {}
+}>('auth-bindings')
 
 export function generateSrvAuthBindings<FeatureEnums = never>(
     SRV_AUTH: () => string,
@@ -14,15 +15,11 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
     EnvironmentToOperateFn: () => string,
     logout?: () => void,
 ) {
-    // let logoutMfes: (() => void)[] = []
-
     if (logout) {
         registerCallbackOnSrvAuthEvents('logout_event', logout)
     }
 
     if (window.__ASMA__SHELL__?.auth_bindings) {
-        //window.__ASMA__SHELL__.logoutMfes = logoutMfes
-
         return window.__ASMA__SHELL__.auth_bindings as typeof auth_bindings
     }
 
@@ -30,21 +27,28 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
 
     let features: Set<FeatureEnums> | undefined
 
-    let parsed_jwt: any | undefined
+    let parsed_jwt: unknown | undefined
 
-    let fetchJwtPromise: Promise<{
+    /*  let fetchJwtPromise: Promise<{
         data: { message: string; token?: string; features?: FeatureEnums[]; errors: { message: string }[] }
-    }> | null = null
+    }> | null = null */
 
     const isJwtInvalid = () => (jwtToken && accessTokenHasExpired()) || !jwtToken
 
     const isJwtValid = () => !isJwtInvalid()
 
+    //function cancelRequest() {
+    //    return logoutsuccesfull
+    // }
+
+    const promiseRegistry: Record<string, Promise<unknown>> = <{}>{}
+
     async function srvAuthGet<R>(url: string, headers?: Record<string, string>) {
         if (DEVELOPMENT() && EnvironmentToOperateFn()) {
             if (EnvironmentToOperateFn() in EnvironmentEnums) {
                 url = `${url}&env=${EnvironmentToOperateFn()}`
 
+                // file deepcode ignore GlobalReplacementRegex: <it is intended to be replaced only first occurence>
                 url = url.includes('&') && !url.includes('?') ? url.replace('&', '?') : url
             } else {
                 console.warn(
@@ -57,13 +61,29 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
             }
         }
 
-        return axios.get<unknown, AxiosResponse<R>>(`${SRV_AUTH()}${url}`, {
-            headers: {
-                ...headers,
-                'asma-origin': window.location.origin,
-            },
-            withCredentials: true,
-        })
+        const promise =
+            promiseRegistry[url] ||
+            axios.get<unknown, AxiosResponse<R>>(`${SRV_AUTH()}${url}`, {
+                headers: {
+                    ...headers,
+                    'asma-origin': window.location.origin,
+                },
+                withCredentials: true,
+            })
+
+        if (!promiseRegistry[url]) {
+            promiseRegistry[url] = promise
+        }
+        try {
+            const res = await promise
+
+            return res as AxiosResponse<R, any>
+        } catch (e) {
+            console.error(e)
+            return
+        } finally {
+            delete promiseRegistry[url]
+        }
     }
 
     function accessTokenHasExpired(): boolean {
@@ -78,35 +98,43 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
     }
 
     async function signin(url: string, headers?: Record<string, string>) {
-        const { data } = await srvAuthGet<{ token: string; features: FeatureEnums[] }>(url, headers)
+        const data = await srvAuthGet<{ token: string; features: FeatureEnums[] }>(url, headers)
 
-        setAuthData(data)
+        setAuthData(data?.data)
 
-        logoutsuccesfull = false
+        // logoutsuccesfull = false
 
         return data
     }
 
+    const { unregister } = registerCallbackOnSrvAuthEvents('logout_event', () => {
+        setAuthData({ token: '' })
+
+        srvAuthGet('/signout')
+
+        unregister()
+    })
+
     async function signoutAuth() {
-        try {
-            setAuthData({ token: '' })
+        dispatchSrvAuthEvents('logout_event', {}, false)
 
-            await srvAuthGet('/signout')
-        } catch (e) {
-            console.error(e)
-        } finally {
-            dispatch('logout_event', {}, false)
-        }
+        // return srvAuthGet('/signout')
     }
+
     function getUserId(): string {
         return getParsedJwt()?.['user_id'] || '-1'
     }
 
-    function setAuthData(data: { token: string; features?: FeatureEnums[] }) {
-        jwtToken = data.token
-        features = new Set(data.features)
-        parsed_jwt = undefined
-        dispatch('jwt_changed', {}, false)
+    function setAuthData(data?: { token: string; features?: FeatureEnums[] }) {
+        if (data) {
+            jwtToken = data?.token
+
+            features = new Set(data.features)
+
+            parsed_jwt = parseJwt(jwtToken)
+        }
+
+        dispatchSrvAuthEvents('jwt_changed', {}, false)
     }
 
     function getJwtToken() {
@@ -140,33 +168,27 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
     }
 
     async function getNewJwtToken() {
-        if (logoutsuccesfull) return
         try {
-            if (!fetchJwtPromise) {
+            /*  if (!fetchJwtPromise) {
                 fetchJwtPromise = srvAuthGet('/token')
-            }
+            } */
 
-            const { data } = await fetchJwtPromise
+            const data = await srvAuthGet<{ errors?: string; token: string; features: FeatureEnums[] }>('/token')
 
-            if (!data || data.errors || data.message != 'Success' || !data.token) {
-                logout?.()
-                logoutsuccesfull = true
+            if (!data || data.data?.errors || !data.data.token) {
+                dispatchSrvAuthEvents('logout_event', {}, false)
 
-                //signoutAuth()
+                return
             }
 
-            setAuthData({ token: data.token || '', features: data.features || [] })
+            setAuthData({ token: data.data.token || '', features: data.data.features || [] })
         } catch (error) {
-            logout?.()
-            logoutsuccesfull = true
-            //signoutAuth()
+            dispatchSrvAuthEvents('logout_event', {}, false)
 
             setAuthData({ token: '', features: [] })
 
             console.error(error)
         } finally {
-            fetchJwtPromise = null
-
             return jwtToken
         }
     }
@@ -175,7 +197,7 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
         if (!parsed_jwt) {
             parsed_jwt = parseJwt<R>(jwtToken)
         }
-        return parsed_jwt
+        return parsed_jwt as R
     }
     function getFeatures() {
         return features
@@ -199,9 +221,14 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
         setReqConfig,
         getJwtTokenAsync,
         getNewJwtToken,
+        /**
+         * @deprecated use registerCallbackOnSrvAuthEvents directly
+         */
+        registerOnJwtChanges: registerCallbackOnSrvAuthEvents,
         getUserId,
         getParsedJwt,
         getJwtToken,
+        // cancelRequest,
         accessTokenHasExpired,
     }
     window.__ASMA__SHELL__ = window.__ASMA__SHELL__ || {}
@@ -212,11 +239,7 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
 }
 /**
  * @deprecated use generateSrvAuthBindings
- * @param SRV_AUTH
- * @param DEVELOPMENT
- * @param ENVIRONMENT_TO_OPERATE
- * @param logout
- * @returns
+ *
  */
 export function generateSrvAuthBindingsMicroApp(
     SRV_AUTH: () => string,

package/src/helpers/parseJwt.ts

@@ -1,11 +1,11 @@
 
 
-export function parseJwt<R>(jwtToken: string): R|undefined {
+export function parseJwt<R>(jwtToken: string){
     const base64Url = jwtToken?.split('.')[1]
 
-    if (base64Url === undefined) {
-        return {} as any
+    if (!base64Url) {
+        return 
     }
 
-    return JSON.parse(decodeURIComponent(escape(window.atob(base64Url))))
+    return JSON.parse(decodeURIComponent(escape(window.atob(base64Url)))) as R
 }