asma-helpers 0.3.0 → 0.3.1

package/lib/helpers/generateGenqlClient.d.ts

@@ -1,16 +1,12 @@
 import type { AxiosRequestConfig } from 'axios';
 import type { ClientOptions } from '@genql/runtime';
-interface CliOptions extends Omit<ClientOptions, 'url'> {
+interface CliOptions extends Omit<ClientOptions, 'url' | 'signal'> {
     anonymous?: boolean;
 }
 export declare function generateGenqlClient<T extends ReturnType<typeof createClient>>({ setReqConfig, createClient, serviceUrl, path, }: {
     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>;

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;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CAChB;;;4BA2BuC,UAAU,GAAG;QAAE,eAAe,CAAC,EAAE,eAAe,CAAA;KAAE,KAAQ,QAAQ,CAAC,CAAC;;EAwD3G"}
+{"version":3,"file":"generateGenqlClient.d.ts","sourceRoot":"","sources":["../../src/helpers/generateGenqlClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAA;AAE/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAMnD,UAAU,UAAW,SAAQ,IAAI,CAAC,aAAa,EAAE,KAAK,GAAG,QAAQ,CAAC;IAC9D,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;IACC,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;;;4BAsCuC,UAAU,GAAG;QAAE,eAAe,CAAC,EAAE,eAAe,CAAA;KAAE,KAAQ,QAAQ,CAAC,CAAC;;EAoD3G"}

package/lib/helpers/generateGenqlClient.js

@@ -7,8 +7,9 @@ export function generateGenqlClient({ setReqConfig, createClient, serviceUrl, pa
         client = null;
         wsClient = null;
     }
-    registerCallbackOnSrvAuthEvents('jwt_changed', resetClients);
+    //registerCallbackOnSrvAuthEvents('logout_event', resetClients)
     async function getGenqlClient() {
+        console.log('getGenqlClient', client, serviceUrl());
         if (client === null) {
             client = await genqlClient();
             return client;
@@ -19,12 +20,18 @@ export function generateGenqlClient({ setReqConfig, createClient, serviceUrl, pa
         client = null;
         wsClient = null;
     }
+    let logoutEventAbort = new AbortController();
+    registerCallbackOnSrvAuthEvents('logout_event', () => {
+        logoutEventAbort === null || logoutEventAbort === void 0 ? void 0 : logoutEventAbort.abort();
+        resetClients();
+        logoutEventAbort = new AbortController();
+    });
     async function genqlClient(options = {}) {
-        const { anonymous, headers, abortController, ...rest } = options;
+        const { headers, abortController: abortControlleFromOpts, ...rest } = options;
         if (!serviceUrl()) {
-            console.warn('requred param srv_url is undefined, please check EnvConfig object!');
+            throw Error('requred param srv_url is undefined, please check EnvConfig object!');
         }
-        const localAbrotController = createabortControllerAndAbortOnLogoutEvent(abortController);
+        const abortControllerlocal = createabortControllerAndAbortOnLogoutEvent(abortControlleFromOpts);
         return createClient({
             url: `${serviceUrl()}${path}`,
             headers: async () => {
@@ -34,19 +41,19 @@ export function generateGenqlClient({ setReqConfig, createClient, serviceUrl, pa
                     ...headers,
                 });
             },
-            signal: localAbrotController.signal,
+            signal: abortControllerlocal.signal,
             batch: { batchInterval: 50, maxBatchSize: 100 },
             ...rest,
         });
     }
     async function genqlClientWs() {
         if (!wsClient) {
-            const localAbrotController = createabortControllerAndAbortOnLogoutEvent();
+            const aborControllerLocal = createabortControllerAndAbortOnLogoutEvent();
             wsClient = createClient({
                 url: `${httpToWs(serviceUrl())}${path}`,
                 cache: 'reload',
                 batch: { batchInterval: 50, maxBatchSize: 100 },
-                signal: localAbrotController.signal,
+                signal: aborControllerLocal.signal,
                 subscription: {
                     reconnect: true,
                     reconnectionAttempts: 5,
@@ -56,13 +63,11 @@ export function generateGenqlClient({ setReqConfig, createClient, serviceUrl, pa
         }
         return wsClient;
     }
-    function createabortControllerAndAbortOnLogoutEvent(abortController) {
-        let localAbrotController = abortController || new AbortController();
-        const { unregister } = registerCallbackOnSrvAuthEvents('logout_event', () => {
-            localAbrotController === null || localAbrotController === void 0 ? void 0 : localAbrotController.abort();
-            resetClients();
-            unregister();
-        });
+    function createabortControllerAndAbortOnLogoutEvent(abortControllerFromFnSig) {
+        const localAbrotController = abortControllerFromFnSig || new AbortController();
+        logoutEventAbort.signal.onabort = () => {
+            localAbrotController.abort();
+        };
         return localAbrotController;
     }
     return { getGenqlClient, resetGenqlClient, genqlClient, genqlClientWs };

package/lib/helpers/generateGenqlClient.js.map

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

package/lib/helpers/generateSrvAuthBindings.d.ts

@@ -9,6 +9,7 @@ export declare const dispatchSrvAuthEvents: <Key extends "logout_event" | "jwt_c
 }[Key_1]) => void) => {
     unregister: () => void;
 };
+declare function dispatchLogoutEvent(): void;
 export declare function generateSrvAuthBindings<FeatureEnums = never>(SRV_AUTH: () => string, DEVELOPMENT: () => boolean, EnvironmentToOperateFn: () => string, logout?: () => void): {
     hasFeature: (featureName: FeatureEnums) => boolean;
     getFeatures: () => Set<FeatureEnums> | undefined;
@@ -18,7 +19,7 @@ export declare function generateSrvAuthBindings<FeatureEnums = never>(SRV_AUTH:
         features: FeatureEnums[];
     }, any> | undefined>;
     srvAuthGet: <R>(url: string, headers?: Record<string, string>) => Promise<AxiosResponse<R, any> | undefined>;
-    signoutAuth: () => Promise<void>;
+    signoutAuth: typeof dispatchLogoutEvent;
     setReqConfig: <T = unknown>(data?: T | undefined, responseType?: ResponseType) => Promise<{
         data: T | undefined;
         responseType: ResponseType | undefined;
@@ -48,4 +49,5 @@ export declare function generateSrvAuthBindings<FeatureEnums = never>(SRV_AUTH:
  *
  */
 export declare function generateSrvAuthBindingsMicroApp(SRV_AUTH: () => string, DEVELOPMENT: () => boolean, ENVIRONMENT_TO_OPERATE: () => EnvironmentEnums, logout?: () => void): {};
+export {};
 //# 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,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"}
+{"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,iBAAS,mBAAmB,SAE3B;AAKD,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;8BAkLc,YAAY;;;kBAtGlB,MAAM,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;eACxB,MAAM;kBAAY,YAAY,EAAE;;yBAvDzC,MAAM,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;;qEAoGR,YAAY;;;;;;;IAsE1E;;OAEG;;;;;;;qBAtGe,MAAM;;iBAwES,MAAM;aAAO,MAAM;;;iCAlGtB,OAAO;EA6I5C;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

@@ -3,6 +3,12 @@ import { EventBus } from 'asma-event-bus/lib/event-buss';
 import { EnvironmentEnums, parseJwt } from '..';
 //let logoutsuccesfull = false
 export const { dispatch: dispatchSrvAuthEvents, register: registerCallbackOnSrvAuthEvents } = EventBus('auth-bindings');
+function dispatchLogoutEvent() {
+    dispatchSrvAuthEvents('logout_event', {}, false);
+}
+function dispatchJwtChangedEvent() {
+    dispatchSrvAuthEvents('jwt_changed', {}, false);
+}
 export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOperateFn, logout) {
     var _a;
     if (logout) {
@@ -14,14 +20,8 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
     let jwtToken = '';
     let features;
     let parsed_jwt;
-    /*  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()) {
@@ -61,13 +61,11 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
         const tokenObj = getParsedJwt();
         const accessTokenExpDate = (tokenObj === null || tokenObj === void 0 ? void 0 : tokenObj.exp) || 0;
         const nowTime = Math.floor(new Date().getTime() / 1000);
-        //set exp time -20sec for token to be refreshed early
         return accessTokenExpDate - 10 <= nowTime;
     }
     async function signin(url, headers) {
         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', () => {
@@ -75,10 +73,6 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
         srvAuthGet('/signout');
         unregister();
     });
-    async function signoutAuth() {
-        dispatchSrvAuthEvents('logout_event', {}, false);
-        // return srvAuthGet('/signout')
-    }
     function getUserId() {
         var _a;
         return ((_a = getParsedJwt()) === null || _a === void 0 ? void 0 : _a['user_id']) || '-1';
@@ -89,7 +83,7 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
             features = new Set(data.features);
             parsed_jwt = parseJwt(jwtToken);
         }
-        dispatchSrvAuthEvents('jwt_changed', {}, false);
+        dispatchJwtChangedEvent();
     }
     function getJwtToken() {
         return jwtToken;
@@ -123,17 +117,16 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
             } */
             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);
+                dispatchLogoutEvent();
                 return;
             }
             setAuthData({ token: data.data.token || '', features: data.data.features || [] });
+            return jwtToken;
         }
         catch (error) {
-            dispatchSrvAuthEvents('logout_event', {}, false);
+            dispatchLogoutEvent();
             setAuthData({ token: '', features: [] });
             console.error(error);
-        }
-        finally {
             return jwtToken;
         }
     }
@@ -160,7 +153,7 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
         isJwtValid,
         signin,
         srvAuthGet,
-        signoutAuth,
+        signoutAuth: dispatchLogoutEvent,
         setReqConfig,
         getJwtTokenAsync,
         getNewJwtToken,

package/lib/helpers/generateSrvAuthBindings.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateSrvAuthBindings.js","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAgD,MAAM,OAAO,CAAA;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AACxD,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAE/C,8BAA8B;AAE9B,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,qBAAqB,EAAE,QAAQ,EAAE,+BAA+B,EAAE,GAAG,QAAQ,CAGnG,eAAe,CAAC,CAAA;AAEnB,MAAM,UAAU,uBAAuB,CACnC,QAAsB,EACtB,WAA0B,EAC1B,sBAAoC,EACpC,MAAmB;;IAEnB,IAAI,MAAM,EAAE;QACR,+BAA+B,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;KAC1D;IAED,IAAI,MAAA,MAAM,CAAC,eAAe,0CAAE,aAAa,EAAE;QACvC,OAAO,MAAM,CAAC,eAAe,CAAC,aAAqC,CAAA;KACtE;IAED,IAAI,QAAQ,GAAG,EAAE,CAAA;IAEjB,IAAI,QAAuC,CAAA;IAE3C,IAAI,UAA+B,CAAA;IAEnC;;uBAEmB;IAEnB,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,CAAC,QAAQ,IAAI,qBAAqB,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAA;IAE7E,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,CAAC,YAAY,EAAE,CAAA;IAExC,4BAA4B;IAC5B,6BAA6B;IAC7B,IAAI;IAEJ,MAAM,eAAe,GAAyC,EAAE,CAAA;IAEhE,KAAK,UAAU,UAAU,CAAI,GAAW,EAAE,OAAgC;QACtE,IAAI,WAAW,EAAE,IAAI,sBAAsB,EAAE,EAAE;YAC3C,IAAI,sBAAsB,EAAE,IAAI,gBAAgB,EAAE;gBAC9C,GAAG,GAAG,GAAG,GAAG,QAAQ,sBAAsB,EAAE,EAAE,CAAA;gBAE9C,oGAAoG;gBACpG,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;aAC9E;iBAAM;gBACH,OAAO,CAAC,IAAI,CACR,0DAA0D,EAC1D,kBAAkB,EAClB,gBAAgB,EAChB,eAAe,EACf,sBAAsB,EAAE,CAC3B,CAAA;aACJ;SACJ;QAED,MAAM,OAAO,GACT,eAAe,CAAC,GAAG,CAAC;YACpB,KAAK,CAAC,GAAG,CAA4B,GAAG,QAAQ,EAAE,GAAG,GAAG,EAAE,EAAE;gBACxD,OAAO,EAAE;oBACL,GAAG,OAAO;oBACV,aAAa,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM;iBACxC;gBACD,eAAe,EAAE,IAAI;aACxB,CAAC,CAAA;QAEN,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE;YACvB,eAAe,CAAC,GAAG,CAAC,GAAG,OAAO,CAAA;SACjC;QACD,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,OAAO,CAAA;YAEzB,OAAO,GAA4B,CAAA;SACtC;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YAChB,OAAM;SACT;gBAAS;YACN,OAAO,eAAe,CAAC,GAAG,CAAC,CAAA;SAC9B;IACL,CAAC;IAED,SAAS,qBAAqB;QAC1B,MAAM,QAAQ,GAAG,YAAY,EAAE,CAAA;QAE/B,MAAM,kBAAkB,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,KAAI,CAAC,CAAA;QAE7C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAA;QAEvD,qDAAqD;QACrD,OAAO,kBAAkB,GAAG,EAAE,IAAI,OAAO,CAAA;IAC7C,CAAC;IAED,KAAK,UAAU,MAAM,CAAC,GAAW,EAAE,OAAgC;QAC/D,MAAM,IAAI,GAAG,MAAM,UAAU,CAA8C,GAAG,EAAE,OAAO,CAAC,CAAA;QAExF,WAAW,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAC,CAAA;QAEvB,2BAA2B;QAE3B,OAAO,IAAI,CAAA;IACf,CAAC;IAED,MAAM,EAAE,UAAU,EAAE,GAAG,+BAA+B,CAAC,cAAc,EAAE,GAAG,EAAE;QACxE,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAA;QAE1B,UAAU,CAAC,UAAU,CAAC,CAAA;QAEtB,UAAU,EAAE,CAAA;IAChB,CAAC,CAAC,CAAA;IAEF,KAAK,UAAU,WAAW;QACtB,qBAAqB,CAAC,cAAc,EAAE,EAAE,EAAE,KAAK,CAAC,CAAA;QAEhD,gCAAgC;IACpC,CAAC;IAED,SAAS,SAAS;;QACd,OAAO,CAAA,MAAA,YAAY,EAAE,0CAAG,SAAS,CAAC,KAAI,IAAI,CAAA;IAC9C,CAAC;IAED,SAAS,WAAW,CAAC,IAAmD;QACpE,IAAI,IAAI,EAAE;YACN,QAAQ,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,CAAA;YAEtB,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAEjC,UAAU,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAA;SAClC;QAED,qBAAqB,CAAC,aAAa,EAAE,EAAE,EAAE,KAAK,CAAC,CAAA;IACnD,CAAC;IAED,SAAS,WAAW;QAChB,OAAO,QAAQ,CAAA;IACnB,CAAC;IAED,KAAK,UAAU,gBAAgB;QAC3B,IAAI,YAAY,EAAE,EAAE;YAChB,MAAM,OAAO,GAAG,MAAM,cAAc,EAAE,CAAA;YAEtC,OAAO,OAAO,CAAA;SACjB;aAAM;YACH,OAAO,QAAQ,CAAA;SAClB;IACL,CAAC;IAED,KAAK,UAAU,YAAY,CAAc,IAAQ,EAAE,YAA2B;QAC1E,MAAM,KAAK,GAAG,MAAM,gBAAgB,EAAE,CAAA;QAEtC,MAAM,GAAG,GAAG;YACR,IAAI,EAAE,IAAI;YACV,YAAY,EAAE,YAAY;YAC1B,OAAO,EAAE,EAA4B;SACxC,CAAA;QAED,IAAI,KAAK,EAAE;YACP,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,KAAK,EAAE,CAAA;SACnD;QAED,OAAO,GAAG,CAAA;IACd,CAAC;IAED,KAAK,UAAU,cAAc;;QACzB,IAAI;YACA;;gBAEI;YAEJ,MAAM,IAAI,GAAG,MAAM,UAAU,CAA+D,QAAQ,CAAC,CAAA;YAErG,IAAI,CAAC,IAAI,KAAI,MAAA,IAAI,CAAC,IAAI,0CAAE,MAAM,CAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;gBAChD,qBAAqB,CAAC,cAAc,EAAE,EAAE,EAAE,KAAK,CAAC,CAAA;gBAEhD,OAAM;aACT;YAED,WAAW,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC,CAAA;SACpF;QAAC,OAAO,KAAK,EAAE;YACZ,qBAAqB,CAAC,cAAc,EAAE,EAAE,EAAE,KAAK,CAAC,CAAA;YAEhD,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAA;YAExC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;SACvB;gBAAS;YACN,OAAO,QAAQ,CAAA;SAClB;IACL,CAAC;IAED,SAAS,YAAY;QACjB,IAAI,CAAC,UAAU,EAAE;YACb,UAAU,GAAG,QAAQ,CAAI,QAAQ,CAAC,CAAA;SACrC;QACD,OAAO,UAAe,CAAA;IAC1B,CAAC;IACD,SAAS,WAAW;QAChB,OAAO,QAAQ,CAAA;IACnB,CAAC;IACD;;;;OAIG;IACH,SAAS,UAAU,CAAC,WAAyB;QACzC,OAAO,CAAC,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,CAAC,WAAW,CAAC,CAAA,CAAA;IACvC,CAAC;IAED,MAAM,aAAa,GAAG;QAClB,UAAU;QACV,WAAW;QACX,UAAU;QACV,MAAM;QACN,UAAU;QACV,WAAW;QACX,YAAY;QACZ,gBAAgB;QAChB,cAAc;QACd;;WAEG;QACH,oBAAoB,EAAE,+BAA+B;QACrD,SAAS;QACT,YAAY;QACZ,WAAW;QACX,iBAAiB;QACjB,qBAAqB;KACxB,CAAA;IACD,MAAM,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,EAAE,CAAA;IAErD,MAAM,CAAC,eAAe,CAAC,aAAa,GAAG,aAAa,CAAA;IAEpD,OAAO,aAAa,CAAA;AACxB,CAAC;AACD;;;GAGG;AACH,MAAM,UAAU,+BAA+B,CAC3C,QAAsB,EACtB,WAA0B,EAC1B,sBAA8C,EAC9C,MAAmB;;IAEnB,OAAO,CACH,CAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,aAAa;QACrC,uBAAuB,CAAC,QAAQ,EAAE,WAAW,EAAE,sBAAsB,EAAE,MAAM,CAAC,CACjF,CAAA;AACL,CAAC"}
+{"version":3,"file":"generateSrvAuthBindings.js","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/helpers/generateGenqlClient.ts

@@ -1,10 +1,12 @@
 import type { AxiosRequestConfig } from 'axios'
-import type { ClientOptions, createClient } from '@genql/runtime'
+import type { createClient } from '@genql/runtime'
+import type { ClientOptions } from '@genql/runtime'
 import { httpToWs } from './Config'
 import { registerCallbackOnSrvAuthEvents } from './generateSrvAuthBindings'
+
 //import { parseJwt } from '../helpers/parseJwt'
 
-interface CliOptions extends Omit<ClientOptions, 'url'> {
+interface CliOptions extends Omit<ClientOptions, 'url' | 'signal'> {
     anonymous?: boolean
 }
 
@@ -14,14 +16,9 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
     serviceUrl,
     path = '/v1/graphql',
 }: {
-    // jwt_exp: number
     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 client: T | null = null
@@ -33,9 +30,11 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
         wsClient = null
     }
 
-    registerCallbackOnSrvAuthEvents('jwt_changed', resetClients)
+    //registerCallbackOnSrvAuthEvents('logout_event', resetClients)
 
     async function getGenqlClient() {
+        console.log('getGenqlClient', client, serviceUrl())
+
         if (client === null) {
             client = await genqlClient()
 
@@ -49,15 +48,24 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
         client = null
         wsClient = null
     }
+    let logoutEventAbort = new AbortController()
+
+    registerCallbackOnSrvAuthEvents('logout_event', () => {
+        logoutEventAbort?.abort()
+
+        resetClients()
+
+        logoutEventAbort = new AbortController()
+    })
 
     async function genqlClient(options: CliOptions & { abortController?: AbortController } = {}): Promise<T> {
-        const { anonymous, headers, abortController, ...rest } = options
+        const { headers, abortController: abortControlleFromOpts, ...rest } = options
 
         if (!serviceUrl()) {
-            console.warn('requred param srv_url is undefined, please check EnvConfig object!')
+            throw Error('requred param srv_url is undefined, please check EnvConfig object!')
         }
 
-        const localAbrotController = createabortControllerAndAbortOnLogoutEvent(abortController)
+        const abortControllerlocal = createabortControllerAndAbortOnLogoutEvent(abortControlleFromOpts)
 
         return createClient({
             url: `${serviceUrl()}${path}`,
@@ -65,7 +73,7 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
                 ...(options.anonymous ? {} : (((await setReqConfig()).headers ?? {}) as Record<string, string>)),
                 ...headers,
             }),
-            signal: localAbrotController.signal,
+            signal: abortControllerlocal.signal,
             batch: { batchInterval: 50, maxBatchSize: 100 },
             ...rest,
         })
@@ -73,13 +81,13 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
 
     async function genqlClientWs() {
         if (!wsClient) {
-            const localAbrotController = createabortControllerAndAbortOnLogoutEvent()
+            const aborControllerLocal = createabortControllerAndAbortOnLogoutEvent()
 
             wsClient = createClient({
                 url: `${httpToWs(serviceUrl())}${path}`,
                 cache: 'reload',
                 batch: { batchInterval: 50, maxBatchSize: 100 },
-                signal: localAbrotController.signal,
+                signal: aborControllerLocal.signal,
                 subscription: {
                     reconnect: true,
                     reconnectionAttempts: 5,
@@ -91,16 +99,12 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
         return wsClient
     }
 
-    function createabortControllerAndAbortOnLogoutEvent(abortController?: AbortController) {
-        let localAbrotController = abortController || new AbortController()
+    function createabortControllerAndAbortOnLogoutEvent(abortControllerFromFnSig?: AbortController) {
+        const localAbrotController = abortControllerFromFnSig || new AbortController()
 
-        const { unregister } = registerCallbackOnSrvAuthEvents('logout_event', () => {
-            localAbrotController?.abort()
-
-            resetClients()
-
-            unregister()
-        })
+        logoutEventAbort.signal.onabort = () => {
+            localAbrotController.abort()
+        }
 
         return localAbrotController
     }

package/src/helpers/generateSrvAuthBindings.ts

@@ -9,6 +9,13 @@ export const { dispatch: dispatchSrvAuthEvents, register: registerCallbackOnSrvA
     logout_event: {}
 }>('auth-bindings')
 
+function dispatchLogoutEvent() {
+    dispatchSrvAuthEvents('logout_event', {}, false)
+}
+function dispatchJwtChangedEvent() {
+    dispatchSrvAuthEvents('jwt_changed', {}, false)
+}
+
 export function generateSrvAuthBindings<FeatureEnums = never>(
     SRV_AUTH: () => string,
     DEVELOPMENT: () => boolean,
@@ -29,18 +36,10 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
 
     let parsed_jwt: unknown | undefined
 
-    /*  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: Record<string, Promise<unknown>> = <{}>{}
 
     async function srvAuthGet<R>(url: string, headers?: Record<string, string>) {
@@ -74,6 +73,7 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
         if (!promiseRegistry[url]) {
             promiseRegistry[url] = promise
         }
+
         try {
             const res = await promise
 
@@ -93,7 +93,6 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
 
         const nowTime = Math.floor(new Date().getTime() / 1000)
 
-        //set exp time -20sec for token to be refreshed early
         return accessTokenExpDate - 10 <= nowTime
     }
 
@@ -102,8 +101,6 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
 
         setAuthData(data?.data)
 
-        // logoutsuccesfull = false
-
         return data
     }
 
@@ -115,12 +112,6 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
         unregister()
     })
 
-    async function signoutAuth() {
-        dispatchSrvAuthEvents('logout_event', {}, false)
-
-        // return srvAuthGet('/signout')
-    }
-
     function getUserId(): string {
         return getParsedJwt()?.['user_id'] || '-1'
     }
@@ -134,7 +125,7 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
             parsed_jwt = parseJwt(jwtToken)
         }
 
-        dispatchSrvAuthEvents('jwt_changed', {}, false)
+        dispatchJwtChangedEvent()
     }
 
     function getJwtToken() {
@@ -176,19 +167,19 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
             const data = await srvAuthGet<{ errors?: string; token: string; features: FeatureEnums[] }>('/token')
 
             if (!data || data.data?.errors || !data.data.token) {
-                dispatchSrvAuthEvents('logout_event', {}, false)
+                dispatchLogoutEvent()
 
                 return
             }
 
             setAuthData({ token: data.data.token || '', features: data.data.features || [] })
+            return jwtToken
         } catch (error) {
-            dispatchSrvAuthEvents('logout_event', {}, false)
+            dispatchLogoutEvent()
 
             setAuthData({ token: '', features: [] })
 
             console.error(error)
-        } finally {
             return jwtToken
         }
     }
@@ -217,7 +208,7 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
         isJwtValid,
         signin,
         srvAuthGet,
-        signoutAuth,
+        signoutAuth: dispatchLogoutEvent,
         setReqConfig,
         getJwtTokenAsync,
         getNewJwtToken,