asma-helpers 0.2.37 → 0.2.38

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/global.d.ts CHANGED
@@ -22,7 +22,7 @@ declare global {
22
22
  * @experimental need to be tested
23
23
  */
24
24
  logoutMfes?: (() => void)[];
25
- cancelRequest?: () => boolean;
25
+ abortController?: AbortController;
26
26
  };
27
27
  _env_cloud?: Record<'adopus' | 'adcuris', Record<string, string>>;
28
28
  _srvUrls?: Record<string, string>;
@@ -1 +1 @@
1
- {"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../src/global.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAG5D,OAAO,EAAE,CAAA;AAET,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAC9B,WAAW,EAAE;YACT,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;SACxC,CAAA;QACD,mBAAmB,CAAC,EAAE;YAClB,IAAI,EAAE,MAAM,CAAA;YACZ,KAAK,EAAE,MAAM,CAAA;YACb,SAAS,EAAE,MAAM,CAAA;YACjB,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;YAClC,UAAU,EAAE,MAAM,CAAA;SACrB,EAAE,CAAA;QACH,eAAe,CAAC,EAAE;YACd,OAAO,CAAC,EAAE,OAAO,CAAA;YACjB,aAAa,CAAC,EAAE,OAAO,CAAA;YACvB,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAA;YACxB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAA;YACvB;;eAEG;YACH,UAAU,CAAC,EAAE,CAAC,MAAM,IAAI,CAAC,EAAE,CAAA;YAC3B,aAAa,CAAC,EAAE,MAAM,OAAO,CAAA;SAChC,CAAA;QAED,UAAU,CAAC,EAAE,MAAM,CAAC,QAAQ,GAAG,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;QACjE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACjC;;;;WAIG;QACH,QAAQ,EAAE,OAAO,CAAA;QACjB;;;WAGG;QACH,UAAU,EAAE,MAAM,IAAI,CAAA;QACtB,YAAY,EAAE,GAAG,CAAA;KACpB;CACJ;AAED,eAAO,MAAM,OAAO,SAA4D,CAAA;AAEhF,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAA"}
1
+ {"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../src/global.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAG5D,OAAO,EAAE,CAAA;AAET,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAC9B,WAAW,EAAE;YACT,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;SACxC,CAAA;QACD,mBAAmB,CAAC,EAAE;YAClB,IAAI,EAAE,MAAM,CAAA;YACZ,KAAK,EAAE,MAAM,CAAA;YACb,SAAS,EAAE,MAAM,CAAA;YACjB,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;YAClC,UAAU,EAAE,MAAM,CAAA;SACrB,EAAE,CAAA;QACH,eAAe,CAAC,EAAE;YACd,OAAO,CAAC,EAAE,OAAO,CAAA;YACjB,aAAa,CAAC,EAAE,OAAO,CAAA;YACvB,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAA;YACxB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAA;YACvB;;eAEG;YACH,UAAU,CAAC,EAAE,CAAC,MAAM,IAAI,CAAC,EAAE,CAAA;YAC3B,eAAe,CAAC,EAAE,eAAe,CAAA;SACpC,CAAA;QAED,UAAU,CAAC,EAAE,MAAM,CAAC,QAAQ,GAAG,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;QACjE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACjC;;;;WAIG;QACH,QAAQ,EAAE,OAAO,CAAA;QACjB;;;WAGG;QACH,UAAU,EAAE,MAAM,IAAI,CAAA;QACtB,YAAY,EAAE,GAAG,CAAA;KACpB;CACJ;AAED,eAAO,MAAM,OAAO,SAA4D,CAAA;AAEhF,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAA"}
@@ -1 +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;;4BAkDuC,UAAU,KAAQ,QAAQ,CAAC,GAAG,IAAI,CAAC;;EAkD1E"}
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;;4BA6CuC,UAAU,KAAQ,QAAQ,CAAC,GAAG,IAAI,CAAC;;EAgD1E"}
@@ -1,5 +1,5 @@
1
1
  import { httpToWs } from './Config';
2
- import { cancelRequest } from './generateSrvAuthBindings';
2
+ import { getAbortController } from './generateSrvAuthBindings';
3
3
  export function generateGenqlClient({ setReqConfig, createClient, serviceUrl, path = '/v1/graphql', }) {
4
4
  // let jwt_exp = 0
5
5
  let client = null;
@@ -16,10 +16,6 @@ export function generateGenqlClient({ setReqConfig, createClient, serviceUrl, pa
16
16
  * @returns genql client for gql requests
17
17
  */
18
18
  async function getGenqlClient() {
19
- if (cancelRequest()) {
20
- console.info(`${serviceUrl()}:, cancelRequest() is true, returning null`);
21
- return null;
22
- }
23
19
  if ( /* accessTokenHasExpired() || */client === null) {
24
20
  client = await genqlClient();
25
21
  return client;
@@ -43,11 +39,8 @@ export function generateGenqlClient({ setReqConfig, createClient, serviceUrl, pa
43
39
  */
44
40
  async function genqlClient(options = {}) {
45
41
  //let req_headers: Record<string, string> = {}
46
- const { anonymous, headers, ...rest } = options;
47
- if (cancelRequest() && anonymous) {
48
- console.info(`${serviceUrl()}:, cancelRequest() is true, returning null`);
49
- return null;
50
- }
42
+ var _a;
43
+ const { anonymous, headers, signal, ...rest } = options;
51
44
  if (!serviceUrl()) {
52
45
  console.warn('requred param srv_url is undefined, please check EnvConfig object!');
53
46
  }
@@ -64,11 +57,13 @@ export function generateGenqlClient({ setReqConfig, createClient, serviceUrl, pa
64
57
  ...headers,
65
58
  });
66
59
  },
60
+ signal: signal !== null && signal !== void 0 ? signal : (_a = getAbortController()) === null || _a === void 0 ? void 0 : _a.signal,
67
61
  batch: { batchInterval: 50, maxBatchSize: 100 },
68
62
  ...rest,
69
63
  });
70
64
  }
71
65
  async function genqlClientWs() {
66
+ var _a;
72
67
  if ( /* accessTokenHasExpired() || */!wsClient) {
73
68
  //const req_headers = ((await setReqConfig()).headers ?? {}) as Record<string, string>
74
69
  //setJwtExp(req_headers['Authorization'])
@@ -76,6 +71,7 @@ export function generateGenqlClient({ setReqConfig, createClient, serviceUrl, pa
76
71
  url: `${httpToWs(serviceUrl())}${path}`,
77
72
  cache: 'reload',
78
73
  batch: { batchInterval: 50, maxBatchSize: 100 },
74
+ signal: (_a = getAbortController()) === null || _a === void 0 ? void 0 : _a.signal,
79
75
  subscription: {
80
76
  reconnect: true,
81
77
  reconnectionAttempts: 5,
@@ -1 +1 @@
1
- {"version":3,"file":"generateGenqlClient.js","sourceRoot":"","sources":["../../src/helpers/generateGenqlClient.ts"],"names":[],"mappings":"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"}
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,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAO9D,MAAM,UAAU,mBAAmB,CAA4C,EAC3E,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,IAAI,GAAG,aAAa,GAWvB;IACG,kBAAkB;IAElB,IAAI,MAAM,GAAa,IAAI,CAAA;IAE3B,IAAI,QAAQ,GAAa,IAAI,CAAA;IAE7B,oCAAoC;IACpC,6DAA6D;IAC7D,EAAE;IACF,2DAA2D;IAC3D,oCAAoC;IACpC,GAAG;IACH;;;;OAIG;IACH,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,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAA;QAEvD,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,MAAM,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,MAAA,kBAAkB,EAAE,0CAAE,MAAM;YAC9C,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,MAAM,EAAE,MAAA,kBAAkB,EAAE,0CAAE,MAAM;gBACpC,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"}
@@ -1,6 +1,6 @@
1
1
  import { type AxiosResponse, type ResponseType } from 'axios';
2
2
  import { EnvironmentEnums } from '..';
3
- export declare function cancelRequest(): boolean;
3
+ export declare function getAbortController(): AbortController | undefined;
4
4
  export declare function generateSrvAuthBindings<FeatureEnums = never>(SRV_AUTH: () => string, DEVELOPMENT: () => boolean, EnvironmentToOperateFn: () => string, logout?: () => void): {
5
5
  hasFeature: (featureName: FeatureEnums) => boolean;
6
6
  getFeatures: () => Set<FeatureEnums> | undefined;
@@ -23,6 +23,7 @@ export declare function generateSrvAuthBindings<FeatureEnums = never>(SRV_AUTH:
23
23
  user_id: string;
24
24
  exp: number;
25
25
  }>() => R_1 | undefined;
26
+ abortController: AbortController;
26
27
  getJwtToken: () => string;
27
28
  cancelRequest: () => boolean;
28
29
  accessTokenHasExpired: () => boolean;
@@ -1 +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;AACpE,OAAO,EAAE,gBAAgB,EAAY,MAAM,IAAI,CAAA;AAI/C,wBAAgB,aAAa,YAE5B;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;8BAwKc,YAAY;;;kBApGlB,MAAM,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;eACpB,MAAM;kBAAY,YAAY,EAAE;;yBAtC7C,MAAM,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;;qEA2ER,YAAY;;;;;;;qBAxBxD,MAAM;;iBAwES,MAAM;aAAO,MAAM;;;;iCAjGtB,OAAO;EAwI5C;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"}
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;AACpE,OAAO,EAAE,gBAAgB,EAAY,MAAM,IAAI,CAAA;AAM/C,wBAAgB,kBAAkB,gCAEjC;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;;;kBAxGlB,MAAM,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;eAGpB,MAAM;kBAAY,YAAY,EAAE;;yBAzC7C,MAAM,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;;qEA8ER,YAAY;;;;;;;qBAxBxD,MAAM;;iBA0ES,MAAM;aAAO,MAAM;;;;;iCArGtB,OAAO;EA+I5C;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"}
@@ -1,9 +1,10 @@
1
1
  import axios from 'axios';
2
2
  import { EnvironmentEnums, parseJwt } from '..';
3
3
  let logoutsuccesfull = false;
4
- export function cancelRequest() {
5
- var _a, _b, _c;
6
- return (_c = (_b = (_a = window.__ASMA__SHELL__) === null || _a === void 0 ? void 0 : _a.cancelRequest) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : false;
4
+ let abortController = null;
5
+ export function getAbortController() {
6
+ var _a;
7
+ return (_a = window.__ASMA__SHELL__) === null || _a === void 0 ? void 0 : _a.abortController;
7
8
  }
8
9
  export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOperateFn, logout) {
9
10
  var _a, _b;
@@ -25,6 +26,7 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
25
26
  return logoutsuccesfull;
26
27
  }
27
28
  async function srvAuthGet(url, headers) {
29
+ var _a;
28
30
  if (DEVELOPMENT() && EnvironmentToOperateFn()) {
29
31
  if (EnvironmentToOperateFn() in EnvironmentEnums) {
30
32
  url = `${url}&env=${EnvironmentToOperateFn()}`;
@@ -35,6 +37,7 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
35
37
  }
36
38
  }
37
39
  return axios.get(`${SRV_AUTH()}${url}`, {
40
+ signal: (_a = getAbortController()) === null || _a === void 0 ? void 0 : _a.signal,
38
41
  headers: {
39
42
  ...headers,
40
43
  'asma-origin': window.location.origin,
@@ -50,6 +53,7 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
50
53
  return accessTokenExpDate - 10 <= nowTime;
51
54
  }
52
55
  async function signin(url, headers) {
56
+ abortController = new AbortController();
53
57
  const { data } = await srvAuthGet(url, headers);
54
58
  setAuthData(data);
55
59
  logoutsuccesfull = false;
@@ -103,6 +107,7 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
103
107
  if (!data || data.errors || data.message != 'Success' || !data.token) {
104
108
  logout === null || logout === void 0 ? void 0 : logout();
105
109
  logoutsuccesfull = true;
110
+ abortController === null || abortController === void 0 ? void 0 : abortController.abort();
106
111
  //signoutAuth()
107
112
  }
108
113
  setAuthData({ token: data.token || '', features: data.features || [] });
@@ -110,6 +115,7 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
110
115
  catch (error) {
111
116
  logout === null || logout === void 0 ? void 0 : logout();
112
117
  logoutsuccesfull = true;
118
+ abortController === null || abortController === void 0 ? void 0 : abortController.abort();
113
119
  //signoutAuth()
114
120
  setAuthData({ token: '', features: [] });
115
121
  console.error(error);
@@ -136,6 +142,7 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
136
142
  function hasFeature(featureName) {
137
143
  return !!(features === null || features === void 0 ? void 0 : features.has(featureName));
138
144
  }
145
+ abortController = new AbortController();
139
146
  const auth_bindings = {
140
147
  hasFeature,
141
148
  getFeatures,
@@ -148,6 +155,7 @@ export function generateSrvAuthBindings(SRV_AUTH, DEVELOPMENT, EnvironmentToOper
148
155
  getNewJwtToken,
149
156
  getUserId,
150
157
  getParsedJwt,
158
+ abortController,
151
159
  getJwtToken,
152
160
  cancelRequest,
153
161
  accessTokenHasExpired,
@@ -1 +1 @@
1
- {"version":3,"file":"generateSrvAuthBindings.js","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generateSrvAuthBindings.js","sourceRoot":"","sources":["../../src/helpers/generateSrvAuthBindings.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "asma-helpers",
3
- "version": "0.2.37",
3
+ "version": "0.2.38",
4
4
  "description": "helpers methods for asma",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib",
package/src/global.ts CHANGED
@@ -25,7 +25,7 @@ declare global {
25
25
  * @experimental need to be tested
26
26
  */
27
27
  logoutMfes?: (() => void)[]
28
- cancelRequest?: () => boolean
28
+ abortController?: AbortController
29
29
  }
30
30
 
31
31
  _env_cloud?: Record<'adopus' | 'adcuris', Record<string, string>>
@@ -1,7 +1,7 @@
1
1
  import type { AxiosRequestConfig } from 'axios'
2
2
  import type { ClientOptions, createClient } from '@genql/runtime'
3
3
  import { httpToWs } from './Config'
4
- import { cancelRequest } from './generateSrvAuthBindings'
4
+ import { getAbortController } from './generateSrvAuthBindings'
5
5
  //import { parseJwt } from '../helpers/parseJwt'
6
6
 
7
7
  interface CliOptions extends Omit<ClientOptions, 'url'> {
@@ -42,11 +42,6 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
42
42
  * @returns genql client for gql requests
43
43
  */
44
44
  async function getGenqlClient() {
45
- if (cancelRequest()) {
46
- console.info(`${serviceUrl()}:, cancelRequest() is true, returning null`)
47
- return null
48
- }
49
-
50
45
  if (/* accessTokenHasExpired() || */ client === null) {
51
46
  client = await genqlClient()
52
47
 
@@ -76,11 +71,7 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
76
71
  async function genqlClient(options: CliOptions = {}): Promise<T | null> {
77
72
  //let req_headers: Record<string, string> = {}
78
73
 
79
- const { anonymous, headers, ...rest } = options
80
- if (cancelRequest() && anonymous) {
81
- console.info(`${serviceUrl()}:, cancelRequest() is true, returning null`)
82
- return null
83
- }
74
+ const { anonymous, headers, signal, ...rest } = options
84
75
 
85
76
  if (!serviceUrl()) {
86
77
  console.warn('requred param srv_url is undefined, please check EnvConfig object!')
@@ -96,6 +87,7 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
96
87
  ...(options.anonymous ? {} : (((await setReqConfig()).headers ?? {}) as Record<string, string>)),
97
88
  ...headers,
98
89
  }),
90
+ signal: signal ?? getAbortController()?.signal,
99
91
  batch: { batchInterval: 50, maxBatchSize: 100 },
100
92
  ...rest,
101
93
  })
@@ -111,6 +103,7 @@ export function generateGenqlClient<T extends ReturnType<typeof createClient>>({
111
103
  url: `${httpToWs(serviceUrl())}${path}`,
112
104
  cache: 'reload',
113
105
  batch: { batchInterval: 50, maxBatchSize: 100 },
106
+ signal: getAbortController()?.signal,
114
107
  subscription: {
115
108
  reconnect: true,
116
109
  reconnectionAttempts: 5,
@@ -3,8 +3,10 @@ import { EnvironmentEnums, parseJwt } from '..'
3
3
 
4
4
  let logoutsuccesfull = false
5
5
 
6
- export function cancelRequest() {
7
- return window.__ASMA__SHELL__?.cancelRequest?.() ?? false
6
+ let abortController: AbortController | null = null
7
+
8
+ export function getAbortController() {
9
+ return window.__ASMA__SHELL__?.abortController
8
10
  }
9
11
 
10
12
  export function generateSrvAuthBindings<FeatureEnums = never>(
@@ -60,6 +62,7 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
60
62
  }
61
63
 
62
64
  return axios.get<unknown, AxiosResponse<R>>(`${SRV_AUTH()}${url}`, {
65
+ signal: getAbortController()?.signal,
63
66
  headers: {
64
67
  ...headers,
65
68
  'asma-origin': window.location.origin,
@@ -80,6 +83,8 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
80
83
  }
81
84
 
82
85
  async function signin(url: string, headers?: Record<string, string>) {
86
+ abortController = new AbortController()
87
+
83
88
  const { data } = await srvAuthGet<{ token: string; features: FeatureEnums[] }>(url, headers)
84
89
 
85
90
  setAuthData(data)
@@ -145,7 +150,7 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
145
150
  if (!data || data.errors || data.message != 'Success' || !data.token) {
146
151
  logout?.()
147
152
  logoutsuccesfull = true
148
-
153
+ abortController?.abort()
149
154
  //signoutAuth()
150
155
  }
151
156
 
@@ -153,6 +158,8 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
153
158
  } catch (error) {
154
159
  logout?.()
155
160
  logoutsuccesfull = true
161
+ abortController?.abort()
162
+
156
163
  //signoutAuth()
157
164
 
158
165
  setAuthData({ token: '', features: [] })
@@ -183,6 +190,8 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
183
190
  return !!features?.has(featureName)
184
191
  }
185
192
 
193
+ abortController = new AbortController()
194
+
186
195
  const auth_bindings = {
187
196
  hasFeature,
188
197
  getFeatures,
@@ -195,6 +204,7 @@ export function generateSrvAuthBindings<FeatureEnums = never>(
195
204
  getNewJwtToken,
196
205
  getUserId,
197
206
  getParsedJwt,
207
+ abortController,
198
208
  getJwtToken,
199
209
  cancelRequest,
200
210
  accessTokenHasExpired,