@futdevpro/nts-dynamo 1.10.63 → 1.10.65

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.
Files changed (14) hide show
  1. package/build/_models/control-models/api-call-params.control-model.d.ts.map +1 -1
  2. package/build/_models/control-models/api-call-params.control-model.js +8 -5
  3. package/build/_models/control-models/api-call-params.control-model.js.map +1 -1
  4. package/build/_services/base/api.service-base.d.ts +2 -2
  5. package/build/_services/base/api.service-base.d.ts.map +1 -1
  6. package/build/_services/base/api.service-base.js +14 -5
  7. package/build/_services/base/api.service-base.js.map +1 -1
  8. package/build/_services/core/api.service.d.ts.map +1 -1
  9. package/build/_services/core/api.service.js +11 -2
  10. package/build/_services/core/api.service.js.map +1 -1
  11. package/package.json +1 -1
  12. package/src/_models/control-models/api-call-params.control-model.ts +11 -8
  13. package/src/_services/base/api.service-base.ts +22 -7
  14. package/src/_services/core/api.service.ts +15 -3
package/build/_models/control-models/api-call-params.control-model.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api-call-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/api-call-params.control-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,iBAAiB,EAAE,qBAAqB,EAAa,MAAM,uBAAuB,CAAC;AAGnH;;;;;;GAMG;AACH,qBAAa,oBAAoB;IAC/B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,IAAI,EAAE,iBAAiB,CAAyB;IAChD;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,eAAe,EAAE,OAAO,CAAS;IACjC;;OAEG;IACH,WAAW,EAAE,GAAG,CAAM;IAEtB,aAAa,EAAE,MAAM,EAAE,CAAM;IAE7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;;IAGrB;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC,oBAAoB,CAAC;CAwCrC;AAED;;;;;GAKG;AACH,qBAAa,iBAAiB;IAC5B,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,OAAO,CAAC,EAAE;QACR,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;KACrC,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,CAAC;gBAGxB,GAAG,EAAE;QACH,YAAY,CAAC,EAAE,qBAAqB,CAAC;QACrC,OAAO,CAAC,EAAE;YACR,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;SACrC,CAAC;QACF,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,eAAe,CAAC,EAAE,OAAO,CAAA;KAC1B;CAQJ"}
1
+ {"version":3,"file":"api-call-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/api-call-params.control-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,iBAAiB,EAAE,qBAAqB,EAAa,MAAM,uBAAuB,CAAC;AAGnH;;;;;;GAMG;AACH,qBAAa,oBAAoB;IAC/B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,IAAI,EAAE,iBAAiB,CAAyB;IAChD;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,eAAe,EAAE,OAAO,CAAS;IACjC;;OAEG;IACH,WAAW,EAAE,GAAG,CAAM;IAEtB,aAAa,EAAE,MAAM,EAAE,CAAM;IAE7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;;IAGrB;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC,oBAAoB,CAAC;CA2CrC;AAED;;;;;GAKG;AACH,qBAAa,iBAAiB;IAC5B,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,OAAO,CAAC,EAAE;QACR,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;KACrC,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,CAAC;gBAGxB,GAAG,EAAE;QACH,YAAY,CAAC,EAAE,qBAAqB,CAAC;QACrC,OAAO,CAAC,EAAE;YACR,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;SACrC,CAAC;QACF,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,eAAe,CAAC,EAAE,OAAO,CAAA;KAC1B;CAQJ"}
package/build/_models/control-models/api-call-params.control-model.js CHANGED
@@ -47,20 +47,23 @@ class DyNTS_ApiCall_Params {
47
47
  set) {
48
48
  this.stack = (0, fsm_dynamo_1.DyFM_getStackLocation)();
49
49
  if (!set.name) {
50
- fsm_dynamo_1.DyFM_Log.warn('DyNTS_ApiCall_Params: name is not provided, using stack location!', '\nstack:', this.stack);
50
+ // ?TODO: nullable warning
51
+ fsm_dynamo_1.DyFM_Log.warn('WARNING: DyNTS_ApiCall_Params: name is not provided, using stack location!', '\n stack:', this.stack);
51
52
  this.name = this.stack;
52
53
  }
53
54
  if (!set.baseUrl) {
54
- fsm_dynamo_1.DyFM_Log.error('DyNTS_ApiCall_Params: baseUrl is not provided, using global baseUrl!', '\nstack:', this.stack);
55
+ // ?TODO: nullable warning
56
+ fsm_dynamo_1.DyFM_Log.error('ERROR: DyNTS_ApiCall_Params: baseUrl is not provided, using global baseUrl!', '\n stack:', this.stack);
55
57
  this.baseUrl = global_settings_const_1.DyNTS_global_settings.baseUrl;
56
58
  }
57
59
  if (!set.endpoint) {
58
- fsm_dynamo_1.DyFM_Log.warn('DyNTS_ApiCall_Params: endpoint is not provided', '\nstack:', this.stack);
60
+ // ?TODO: nullable warning
61
+ fsm_dynamo_1.DyFM_Log.warn('WARNING: DyNTS_ApiCall_Params: endpoint is not provided', '\n stack:', this.stack);
59
62
  this.endpoint = '';
60
63
  }
61
64
  else if (set.endpoint.includes('{')) {
62
- fsm_dynamo_1.DyFM_Log.warn(`using {param} bracets in endpoint definitions will be deprecated... (${set.endpoint})` +
63
- 'use :param instead ({pathparam} --> :pathparam)');
65
+ fsm_dynamo_1.DyFM_Log.warn(`WARNING: using {param} bracets in endpoint definitions will be deprecated... (${set.endpoint})` +
66
+ '\n use :param instead ({pathparam} --> :pathparam)');
64
67
  set.endpoint = set.endpoint.replace(/{/g, ':').replace(/}/g, '');
65
68
  }
66
69
  else {
package/build/_models/control-models/api-call-params.control-model.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api-call-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/api-call-params.control-model.ts"],"names":[],"mappings":";;;AACA,sDAAmH;AACnH,oFAAiF;AAEjF;;;;;;GAMG;AACH,MAAa,oBAAoB;IAC/B;;OAEG;IACH,IAAI,CAAS;IACb;;OAEG;IACH,IAAI,GAAsB,8BAAiB,CAAC,GAAG,CAAC;IAChD;;;;OAIG;IACH,OAAO,CAAS;IAChB;;;OAGG;IACH,QAAQ,CAAS;IAEjB;;OAEG;IACH,eAAe,GAAY,KAAK,CAAC;IACjC;;OAEG;IACH,WAAW,GAAQ,EAAE,CAAC;IAEtB,aAAa,GAAa,EAAE,CAAC;IAEpB,KAAK,CAAS;IAEvB;IACE;;OAEG;IACH,GAAkC;QAElC,IAAI,CAAC,KAAK,GAAG,IAAA,kCAAqB,GAAE,CAAC;QAErC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YACd,qBAAQ,CAAC,IAAI,CACX,mEAAmE,EACnE,UAAU,EAAE,IAAI,CAAC,KAAK,CACvB,CAAC;YACF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YACjB,qBAAQ,CAAC,KAAK,CACZ,sEAAsE,EACtE,UAAU,EAAE,IAAI,CAAC,KAAK,CACvB,CAAC;YACF,IAAI,CAAC,OAAO,GAAG,6CAAqB,CAAC,OAAO,CAAC;QAC/C,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAClB,qBAAQ,CAAC,IAAI,CACX,gDAAgD,EAChD,UAAU,EAAE,IAAI,CAAC,KAAK,CACvB,CAAC;YACF,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACrB,CAAC;aAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACtC,qBAAQ,CAAC,IAAI,CACX,wEAAwE,GAAG,CAAC,QAAQ,GAAG;gBACvF,iDAAiD,CAClD,CAAC;YACF,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;iBACzC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBACpC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC3B,CAAC;CACF;AA9ED,oDA8EC;AAED;;;;;GAKG;AACH,MAAa,iBAAiB;IAC5B,YAAY,CAAyB;IACrC,OAAO,CAEL;IACF,OAAO,CAAU;IACjB,cAAc,CAAW;IACzB,eAAe,CAAW;IAE1B,YACE,GAQC;QAED,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC,cAAc,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC,eAAe,CAAC;IAC7C,CAAC;CACF;AA1BD,8CA0BC"}
1
+ {"version":3,"file":"api-call-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/api-call-params.control-model.ts"],"names":[],"mappings":";;;AACA,sDAAmH;AACnH,oFAAiF;AAEjF;;;;;;GAMG;AACH,MAAa,oBAAoB;IAC/B;;OAEG;IACH,IAAI,CAAS;IACb;;OAEG;IACH,IAAI,GAAsB,8BAAiB,CAAC,GAAG,CAAC;IAChD;;;;OAIG;IACH,OAAO,CAAS;IAChB;;;OAGG;IACH,QAAQ,CAAS;IAEjB;;OAEG;IACH,eAAe,GAAY,KAAK,CAAC;IACjC;;OAEG;IACH,WAAW,GAAQ,EAAE,CAAC;IAEtB,aAAa,GAAa,EAAE,CAAC;IAEpB,KAAK,CAAS;IAEvB;IACE;;OAEG;IACH,GAAkC;QAElC,IAAI,CAAC,KAAK,GAAG,IAAA,kCAAqB,GAAE,CAAC;QAErC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YACd,0BAA0B;YAC1B,qBAAQ,CAAC,IAAI,CACX,4EAA4E,EAC5E,YAAY,EAAE,IAAI,CAAC,KAAK,CACzB,CAAC;YACF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YACjB,0BAA0B;YAC1B,qBAAQ,CAAC,KAAK,CACZ,6EAA6E,EAC7E,YAAY,EAAE,IAAI,CAAC,KAAK,CACzB,CAAC;YACF,IAAI,CAAC,OAAO,GAAG,6CAAqB,CAAC,OAAO,CAAC;QAC/C,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAClB,0BAA0B;YAC1B,qBAAQ,CAAC,IAAI,CACX,yDAAyD,EACzD,YAAY,EAAE,IAAI,CAAC,KAAK,CACzB,CAAC;YACF,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACrB,CAAC;aAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACtC,qBAAQ,CAAC,IAAI,CACX,iFAAiF,GAAG,CAAC,QAAQ,GAAG;gBAChG,qDAAqD,CACtD,CAAC;YACF,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;iBACzC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;iBACpC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC3B,CAAC;CACF;AAjFD,oDAiFC;AAED;;;;;GAKG;AACH,MAAa,iBAAiB;IAC5B,YAAY,CAAyB;IACrC,OAAO,CAEL;IACF,OAAO,CAAU;IACjB,cAAc,CAAW;IACzB,eAAe,CAAW;IAE1B,YACE,GAQC;QAED,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,GAAG,CAAC,cAAc,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,GAAG,CAAC,eAAe,CAAC;IAC7C,CAAC;CACF;AA1BD,8CA0BC"}
package/build/_services/base/api.service-base.d.ts CHANGED
@@ -1,10 +1,10 @@
1
1
  import { DyNTS_SingletonService } from './singleton.service';
2
2
  export declare abstract class DyNTS_ApiService_Base extends DyNTS_SingletonService {
3
3
  abstract get baseUrl(): string;
4
- abstract get test(): string;
4
+ abstract get testEndpoint(): string;
5
5
  abstract get connectingSystemName(): string;
6
6
  runApiCallWithAvailabilityCheck<T>(apiCall: () => Promise<T>, issuer: string): Promise<T>;
7
7
  checkServerAvailability(issuer: string): Promise<void>;
8
- testGet(): Promise<void>;
8
+ testGet(issuer: string): Promise<void>;
9
9
  }
10
10
  //# sourceMappingURL=api.service-base.d.ts.map
package/build/_services/base/api.service-base.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api.service-base.d.ts","sourceRoot":"","sources":["../../../src/_services/base/api.service-base.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAI7D,8BAAsB,qBAAsB,SAAQ,sBAAsB;IAOxE,QAAQ,KAAK,OAAO,IAAI,MAAM,CAAC;IAC/B,QAAQ,KAAK,IAAI,IAAI,MAAM,CAAC;IAC5B,QAAQ,KAAK,oBAAoB,IAAI,MAAM,CAAC;IAEtC,+BAA+B,CAAC,CAAC,EACrC,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,CAAC,CAAC;IAUP,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBtD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAU/B"}
1
+ {"version":3,"file":"api.service-base.d.ts","sourceRoot":"","sources":["../../../src/_services/base/api.service-base.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAI7D,8BAAsB,qBAAsB,SAAQ,sBAAsB;IAOxE,QAAQ,KAAK,OAAO,IAAI,MAAM,CAAC;IAC/B,QAAQ,KAAK,YAAY,IAAI,MAAM,CAAC;IACpC,QAAQ,KAAK,oBAAoB,IAAI,MAAM,CAAC;IAEtC,+BAA+B,CAAC,CAAC,EACrC,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,CAAC,CAAC;IAUP,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBtD,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAsB7C"}
package/build/_services/base/api.service-base.js CHANGED
@@ -16,22 +16,31 @@ class DyNTS_ApiService_Base extends singleton_service_1.DyNTS_SingletonService {
16
16
  }
17
17
  }
18
18
  async checkServerAvailability(issuer) {
19
- await this.testGet().catch(() => {
19
+ try {
20
+ await this.testGet(issuer);
21
+ }
22
+ catch (error) {
20
23
  throw new fsm_dynamo_1.DyFM_Error({
21
24
  ...this.getDefaultErrorSettings('checkServerAvailability', new Error(`${this.connectingSystemName} server is not available\n` +
22
25
  `\n baseUrl: ${this.baseUrl}`), issuer),
23
26
  userMessage: `${this.connectingSystemName} server is not available`,
24
27
  errorCode: `${__1.DyNTS_global_settings.systemShortCodeName}|DyNTS-ASB-CSA0`,
25
28
  });
26
- });
29
+ }
27
30
  }
28
- async testGet() {
29
- return await api_service_1.DyNTS_ApiService.startApiCall(new __1.DyNTS_ApiCall_Params({
31
+ async testGet(issuer) {
32
+ if (!this.testEndpoint) {
33
+ throw new fsm_dynamo_1.DyFM_Error({
34
+ ...this.getDefaultErrorSettings('testGet', new Error(`testEndpoint is not set for ${this.connectingSystemName}`), issuer),
35
+ });
36
+ }
37
+ await api_service_1.DyNTS_ApiService.startApiCall(new __1.DyNTS_ApiCall_Params({
30
38
  name: `${this.connectingSystemName} testGet`,
31
39
  type: fsm_dynamo_1.DyFM_HttpCallType.get,
32
40
  baseUrl: this.baseUrl,
33
- endpoint: this.test,
41
+ endpoint: this.testEndpoint,
34
42
  }));
43
+ fsm_dynamo_1.DyFM_Log.success(`${this.connectingSystemName} is available`);
35
44
  }
36
45
  }
37
46
  exports.DyNTS_ApiService_Base = DyNTS_ApiService_Base;
package/build/_services/base/api.service-base.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api.service-base.js","sourceRoot":"","sources":["../../../src/_services/base/api.service-base.ts"],"names":[],"mappings":";;;AAAA,sDAE+B;AAE/B,2DAA6D;AAC7D,qDAAuD;AACvD,6BAAoE;AAEpE,MAAsB,qBAAsB,SAAQ,0CAAsB;IAWxE,KAAK,CAAC,+BAA+B,CACnC,OAAyB,EACzB,MAAc;QAEd,IAAI,CAAC;YACH,OAAO,MAAM,OAAO,EAAE,CAAC;QACzB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;YAE3C,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,MAAc;QAC1C,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;YAC9B,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAC7B,yBAAyB,EACzB,IAAI,KAAK,CACP,GAAG,IAAI,CAAC,oBAAoB,4BAA4B;oBACxD,kBAAkB,IAAI,CAAC,OAAO,EAAE,CACjC,EACD,MAAM,CACP;gBACD,WAAW,EAAE,GAAG,IAAI,CAAC,oBAAoB,0BAA0B;gBACnE,SAAS,EAAE,GAAG,yBAAqB,CAAC,mBAAmB,iBAAiB;aACzE,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO;QACX,OAAO,MAAM,8BAAgB,CAAC,YAAY,CACxC,IAAI,wBAAoB,CAAC;YACvB,IAAI,EAAE,GAAG,IAAI,CAAC,oBAAoB,UAAU;YAC5C,IAAI,EAAE,8BAAiB,CAAC,GAAG;YAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,IAAI;SACpB,CAAC,CACH,CAAC;IACJ,CAAC;CACF;AAnDD,sDAmDC"}
1
+ {"version":3,"file":"api.service-base.js","sourceRoot":"","sources":["../../../src/_services/base/api.service-base.ts"],"names":[],"mappings":";;;AAAA,sDAG+B;AAE/B,2DAA6D;AAC7D,qDAAuD;AACvD,6BAAoE;AAEpE,MAAsB,qBAAsB,SAAQ,0CAAsB;IAWxE,KAAK,CAAC,+BAA+B,CACnC,OAAyB,EACzB,MAAc;QAEd,IAAI,CAAC;YACH,OAAO,MAAM,OAAO,EAAE,CAAC;QACzB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;YAE3C,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,MAAc;QAC1C,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAC7B,yBAAyB,EACzB,IAAI,KAAK,CACP,GAAG,IAAI,CAAC,oBAAoB,4BAA4B;oBACxD,kBAAkB,IAAI,CAAC,OAAO,EAAE,CACjC,EACD,MAAM,CACP;gBACD,WAAW,EAAE,GAAG,IAAI,CAAC,oBAAoB,0BAA0B;gBACnE,SAAS,EAAE,GAAG,yBAAqB,CAAC,mBAAmB,iBAAiB;aACzE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc;QAC1B,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAC7B,SAAS,EACT,IAAI,KAAK,CAAC,+BAA+B,IAAI,CAAC,oBAAoB,EAAE,CAAC,EACrE,MAAM,CACP;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,8BAAgB,CAAC,YAAY,CACjC,IAAI,wBAAoB,CAAC;YACvB,IAAI,EAAE,GAAG,IAAI,CAAC,oBAAoB,UAAU;YAC5C,IAAI,EAAE,8BAAiB,CAAC,GAAG;YAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,YAAY;SAC5B,CAAC,CACH,CAAC;QAEF,qBAAQ,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,oBAAoB,eAAe,CAAC,CAAC;IAChE,CAAC;CACF;AAjED,sDAiEC"}
package/build/_services/core/api.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,oBAAoB,EACrB,MAAM,4DAA4D,CAAC;AAEpE,MAAM,WAAW,yBAAyB,CAAC,MAAM,GAAG,GAAG;IACrD,UAAU,CAAC,EAAE;QACX;;WAEG;QACH,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;KACzB,CAAC;IACF;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAE3B,MAAM,CAAC,QAAQ,CAAC,mBAAmB,SAGH;IAEhC;;;;;;;OAOG;WACiB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG;IACvD;;;OAGG;IACH,UAAU,EAAE,oBAAoB;IAChC;;OAEG;IACH,WAAW,CAAC,EAAE,yBAAyB,CAAC,MAAM,CAAC,GAC9C,OAAO,CAAC,UAAU,CAA6B;IAyIlD,OAAO,CAAC,MAAM,CAAC,WAAW;mBAiJL,YAAY;mBA4BZ,MAAM;mBAsBN,GAAG;IAwBxB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAyBvB,OAAO,CAAC,MAAM,CAAC,YAAY;IAoB3B,OAAO,CAAC,MAAM,CAAC,eAAe;IA0D9B,OAAO,CAAC,MAAM,CAAC,wBAAwB;CAexC"}
1
+ {"version":3,"file":"api.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,oBAAoB,EACrB,MAAM,4DAA4D,CAAC;AAEpE,MAAM,WAAW,yBAAyB,CAAC,MAAM,GAAG,GAAG;IACrD,UAAU,CAAC,EAAE;QACX;;WAEG;QACH,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;KACzB,CAAC;IACF;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAE3B,MAAM,CAAC,QAAQ,CAAC,mBAAmB,SAGH;IAEhC;;;;;;;OAOG;WACiB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG;IACvD;;;OAGG;IACH,UAAU,EAAE,oBAAoB;IAChC;;OAEG;IACH,WAAW,CAAC,EAAE,yBAAyB,CAAC,MAAM,CAAC,GAC9C,OAAO,CAAC,UAAU,CAA6B;IAiJlD,OAAO,CAAC,MAAM,CAAC,WAAW;mBAqJL,YAAY;mBA4BZ,MAAM;mBAsBN,GAAG;IAwBxB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAyBvB,OAAO,CAAC,MAAM,CAAC,YAAY;IAoB3B,OAAO,CAAC,MAAM,CAAC,eAAe;IA0D9B,OAAO,CAAC,MAAM,CAAC,wBAAwB;CAexC"}
package/build/_services/core/api.service.js CHANGED
@@ -35,6 +35,12 @@ class DyNTS_ApiService {
35
35
  let a;
36
36
  url = callParams.baseUrl + callParams.endpoint;
37
37
  const axios = Axios.default.create();
38
+ if (!callParams.baseUrl) {
39
+ fsm_dynamo_1.DyFM_Log.warn(`WARNING: missing baseUrl in api call (${callParams.name})`);
40
+ }
41
+ if (!callParams.endpoint) {
42
+ fsm_dynamo_1.DyFM_Log.warn(`WARNING: missing endpoint in api call (${callParams.name})`);
43
+ }
38
44
  if (callParams.pathParamKeys.length) {
39
45
  callParams.pathParamKeys.forEach(key => {
40
46
  if (!inputParams?.pathParams?.[key]) {
@@ -145,9 +151,12 @@ class DyNTS_ApiService {
145
151
  callParams.httpOptions.params = httpParams;
146
152
  } */
147
153
  static handleError(callParams, error, inputParams, url) {
154
+ const errorMsg = fsm_dynamo_1.DyFM_Error.isDyFMError(error?.response?.data) ?
155
+ fsm_dynamo_1.DyFM_Error.getAnyMessage(error?.response?.data) :
156
+ fsm_dynamo_1.DyFM_Error.getAnyMessage(error);
148
157
  let msg = `\n---> API ERROR: "${callParams?.name}" failed (${fsm_dynamo_1.DyFM_Error.getErrorStatus(error)})...` +
149
158
  `\n endpoint: ${callParams?.type} "${callParams?.baseUrl}${callParams?.endpoint}"` +
150
- `\n BE-BE requestStackLocation: "${fsm_dynamo_1.DyFM_Error.getErrorStack(error)}"` +
159
+ `\n BE-BE requestStackLocation: "${callParams?.stack}"` +
151
160
  `\n error: "${fsm_dynamo_1.DyFM_Error.getAnyMessage(error)}"`;
152
161
  if (global_settings_const_1.DyNTS_global_settings.log_settings.detailedErrors) {
153
162
  fsm_dynamo_1.DyFM_Log.error(`${msg}\ncallParams:`, callParams);
@@ -167,7 +176,7 @@ class DyNTS_ApiService {
167
176
  ...this._getDefaultErrorSettings(callParams.name + ' startApiCall', dyfmErrorInAxiosResponse),
168
177
  errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-API-HE1`,
169
178
  message: `API call "${callParams.name}" failed on the other end!` +
170
- `\nerror response found: ${dyfmErrorInAxiosResponse._message}`,
179
+ `\nerror response found: ${errorMsg}`,
171
180
  error: dyfmErrorInAxiosResponse,
172
181
  additionalContent: {
173
182
  callParams: callParams,
package/build/_services/core/api.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api.service.js","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api.service.js","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":";;;;AACA,qDAA+B;AAE/B,sDAO+B;AAE/B,oFAAiF;AAkBjF;;GAEG;AACH,MAAa,gBAAgB;IAE3B,MAAM,CAAU,mBAAmB,GACjC,sCAAsC;QACtC,sDAAsD;QACtD,6BAA6B,CAAC;IAEhC;;;;;;;OAOG;IACI,MAAM,CAAC,KAAK,CAAC,YAAY;IAC9B;;;OAGG;IACH,UAAgC;IAChC;;OAEG;IACH,WAA+C;QAE/C,IAAI,GAAW,CAAC;QAEhB,IAAI,CAAC;YACH,IAAI,CAAa,CAAC;YAClB,GAAG,GAAG,UAAU,CAAC,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC;YAC/C,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAErC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBACxB,qBAAQ,CAAC,IAAI,CAAC,yCAAyC,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC;YAC7E,CAAC;YAED,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;gBACzB,qBAAQ,CAAC,IAAI,CAAC,0CAA0C,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC;YAC9E,CAAC;YAED,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;gBACpC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBACrC,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;wBACpC,MAAM,IAAI,uBAAU,CAAC;4BACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,cAAc,EACd,IAAI,KAAK,CAAC,uBAAuB,GAAG,GAAG,CAAC,CACzC;4BACD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,iBAAiB;yBACzE,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;YAED,IAAI,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;gBACrC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YACvC,CAAC;YAED,IAAI,WAAW,EAAE,UAAU,EAAE,CAAC;gBAC5B,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YAC1D,CAAC;YAED;;gBAEI;YAEJ,IAAI,6CAAqB,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;gBAClD,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;YAC9C,CAAC;YAED,QAAQ,UAAU,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,8BAAiB,CAAC,GAAG;oBACxB,IAAI,WAAW,EAAE,IAAI,EAAE,CAAC;wBACtB,qBAAQ,CAAC,IAAI,CAAC,4CAA4C,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC;oBAChF,CAAC;oBAED,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAa,KAAK,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;oBACvD,MAAM;gBAER,KAAK,8BAAiB,CAAC,MAAM;oBAC3B,IAAI,WAAW,EAAE,IAAI,EAAE,CAAC;wBACtB,qBAAQ,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;oBAC9D,CAAC;oBAED,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,CAAa,KAAK,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;oBAC1D,MAAM;gBAER,KAAK,8BAAiB,CAAC,IAAI,CAAC;gBAC5B,KAAK,8BAAiB,CAAC,GAAG,CAAC;gBAC3B,KAAK,8BAAiB,CAAC,KAAK;oBAC1B,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC;wBACvB,IAAI,CAAC,WAAW,EAAE,CAAC;4BACjB,WAAW,GAAG,EAAE,CAAC;wBACnB,CAAC;wBAED,WAAW,CAAC,IAAI,GAAG,EAAY,CAAC;oBAClC,CAAC;oBAED,CAAC,GAAG,MAAM,IAAI,CAAC,YAAY,CAAqB,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;oBACrF,MAAM;gBAER;oBACE,MAAM,IAAI,uBAAU,CAAC;wBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,cAAc,EACd,IAAI,KAAK,CAAC,0BAA0B,UAAU,CAAC,IAAI,EAAE,CAAC,CACvD;wBACD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,iBAAiB;wBACxE,iBAAiB,EAAE;4BACjB,UAAU;4BACV,WAAW;yBACZ;qBACF,CAAC,CAAC;YACP,CAAC;YAED,IAAK,CAAgB,EAAE,IAAI,EAAE,QAAQ,CAAC,2BAAc,CAAC,EAAE,CAAC;gBACtD,MAAM,CAAC,CAAC;YACV,CAAC;YAED,OAAO,CAAC,CAAC;YACT;;;;;gBAKI;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAK,KAAoB,EAAE,IAAI,EAAE,QAAQ,CAAC,2BAAc,CAAC,EAAE,CAAC;gBAC1D,MAAM,KAAK,CAAC;gBACd;;;;;;;;;kCASkB;YAClB,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,WAAW,CAAS,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;QAsBI;IAEI,MAAM,CAAC,WAAW,CACxB,UAAgC,EAChC,KAAuC,EACvC,WAMC,EACD,GAAW;QAEX,MAAM,QAAQ,GAAW,uBAAU,CAAC,WAAW,CAAE,KAA0B,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;YAC5F,uBAAU,CAAC,aAAa,CAAE,KAA0B,EAAE,QAAQ,EAAE,IAAqB,CAAC,CAAC,CAAC;YACxF,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAElC,IAAI,GAAG,GACL,wBAAwB,UAAU,EAAE,IAAI,aAAa,uBAAU,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM;YAC3F,wBAAwB,UAAU,EAAE,IAAI,KAAK,UAAU,EAAE,OAAO,GAAG,UAAU,EAAE,QAAQ,GAAG;YAC1F,2CAA2C,UAAU,EAAE,KAAK,GAAG;YAC/D,sBAAsB,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC;QAE3D,IAAI,6CAAqB,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC;YACtD,qBAAQ,CAAC,KAAK,CAAC,GAAG,GAAG,eAAe,EAAE,UAAU,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,qBAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;QAED,IACE,KAAK;YACL,OAAQ,KAAoB,EAAE,KAAK,KAAK,QAAQ;YAChD,UAAU,EAAE,WAAW,EAAE,YAAY,KAAK,kCAAqB,CAAC,IAAI,EACpE,CAAC;YACA,KAAoB,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAE,KAAoB,EAAE,KAAsB,CAAC,CAAC;QAC1F,CAAC;QAED,IAAI,uBAAU,CAAC,WAAW,CAAE,KAA0B,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;YACxE,qBAAQ,CAAC,KAAK,CAAC,MAAM,UAAU,CAAC,IAAI,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;YAE9E,MAAM,wBAAwB,GAAI,KAA0B,EAAE,QAAQ,EAAE,IAAqB,CAAC;YAE9F,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,UAAU,CAAC,IAAI,GAAG,eAAe,EACjC,wBAAwB,CACzB;gBAED,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;gBACvE,OAAO,EACL,aAAa,UAAU,CAAC,IAAI,4BAA4B;oBACxD,2BAA2B,QAAQ,EAAE;gBACvC,KAAK,EAAE,wBAAwB;gBAC/B,iBAAiB,EAAE;oBACjB,UAAU,EAAE,UAAU;oBACtB,WAAW,EAAE,WAAW;oBACxB,QAAQ,EAAG,KAA0B,EAAE,QAAQ;iBAChD;aACF,CAAC,CAAC;QAEL,CAAC;aAAM,IAAK,KAA0B,EAAE,IAAI,KAAK,WAAW,EAAE,CAAC;YAC7D,qBAAQ,CAAC,KAAK,CAAC,MAAM,UAAU,CAAC,IAAI,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;YAE9E,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,UAAU,CAAC,IAAI,GAAG,eAAe,EACjC,KAAK,CACN;gBAED,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;gBACvE,OAAO,EAAE,wCAAwC;gBACjD,iBAAiB,EAAE;oBACjB,UAAU,EAAE,UAAU;oBACtB,WAAW,EAAE,WAAW;oBACxB,QAAQ,EAAG,KAA0B,EAAE,QAAQ;iBAChD;aACF,CAAC,CAAC;QAEL,CAAC;aAAM,IAAK,KAA0B,EAAE,IAAI,KAAK,cAAc,EAAE,CAAC;YAChE,qBAAQ,CAAC,KAAK,CAAC,MAAM,UAAU,CAAC,IAAI,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;YAE9E,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,UAAU,CAAC,IAAI,GAAG,eAAe,EACjC,KAAK,CACN;gBAED,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;gBACvE,OAAO,EAAE,kCAAkC,UAAU,CAAC,IAAI,KAAK,GAAG,GAAG;gBACrE,iBAAiB,EAAE;oBACjB,UAAU,EAAE,UAAU;oBACtB,WAAW,EAAE,WAAW;oBACxB,GAAG,EAAE,GAAG;oBACR,QAAQ,EAAG,KAA0B,EAAE,QAAQ;iBAChD;aACF,CAAC,CAAC;QAEL,CAAC;aAAM,IAAK,KAA0B,EAAE,MAAM,IAAK,KAA0B,EAAE,OAAO,EAAE,CAAC;YAEvF,IAAI,GAAG,GAAY,KAA0B,EAAE,OAAO,CAAC;YACvD,IAAI,MAAM,GAAY,KAA0B,EAAE,QAAQ,EAAE,MAAM;gBAC/D,KAA0B,EAAE,MAAM;gBACnC,yFAAyF;gBACzF,CAAE,KAA0B,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC1E,GAAG,CAAC;YAEN,IAAK,KAA0B,EAAE,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;gBAClE,GAAG,IAAI,eAAe,UAAU,CAAC,OAAO,GAAG,UAAU,CAAC,QAAQ,EAAE;oBAC9D,iBACE,WAAW,EAAE,UAAU,CAAC,CAAC;wBACvB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;wBAChD,kBACJ,EAAE;oBACF,2BAA2B,UAAU,CAAC,KAAK,EAAE,CAAC;YAClD,CAAC;YAED,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,UAAU,CAAC,IAAI,GAAG,eAAe,EACjC,KAAK,CACN;gBAED,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,GAAG;gBACZ,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;gBACvE,iBAAiB,EAAE;oBACjB,UAAU,EAAE,UAAU;oBACtB,WAAW,EAAE,WAAW;oBACxB,QAAQ,EAAG,KAA0B,EAAE,QAAQ;iBAChD;aACF,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IACE,6CAAqB,CAAC,YAAY,CAAC,cAAc;gBACjD,CAAC,CAAC,KAAK,YAAY,uBAAU,CAAC,EAC9B,CAAC;gBACD,qBAAQ,CAAC,KAAK,CACZ,IAAI,UAAU,CAAC,IAAI,6BAA6B,EAChD,UAAU,EAAE,KAAK,CAClB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,SAAS,CAAC,IAAI,UAAU,CAAC,IAAI,6BAA6B,CAAC,CAAC;YACpE,CAAC;YAED,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,YAAY,CAC/B,KAA0B,EAC1B,UAAgC,EAChC,GAAW,EACX,WAA8C;QAE9C,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CACjC,GAAG,EACH,WAAW,CAAC,IAAI,EAChB,UAAU,CAAC,WAAW,CACvB,CAAC,IAAI,CAAC,CAAC,GAAwB,EAAc,EAAE;YAC9C,IAAI,6CAAqB,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;gBAClD,IAAI,6CAAqB,CAAC,YAAY,CAAC,oBAAoB,EAAE,CAAC;oBAC5D,qBAAQ,CAAC,OAAO,CAAC,WAAW,UAAU,CAAC,IAAI,2BAA2B,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;gBAEpF,CAAC;qBAAM,CAAC;oBACN,qBAAQ,CAAC,OAAO,CAAC,WAAW,UAAU,CAAC,IAAI,2BAA2B,CAAC,CAAC;gBAC1E,CAAC;YACH,CAAC;YAED,IAAI,UAAU,CAAC,eAAe,EAAE,CAAC;gBAC/B,OAAO,GAAiB,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,CAAC,IAAI,CAAC;YAClB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,MAAM,CACzB,KAA0B,EAC1B,GAAW,EACX,UAAgC;QAEhC,OAAO,MAAM,KAAK,CAAC,MAAM,CAAa,GAAG,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,CACrE,CAAC,GAAwB,EAAc,EAAE;YACvC,IAAI,6CAAqB,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;gBAClD,IAAI,6CAAqB,CAAC,YAAY,CAAC,oBAAoB,EAAE,CAAC;oBAC5D,qBAAQ,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,IAAI,2BAA2B,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC7E,CAAC;qBAAM,CAAC;oBACN,qBAAQ,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,IAAI,2BAA2B,CAAC,CAAC;gBACnE,CAAC;YACH,CAAC;YAED,IAAI,UAAU,CAAC,eAAe,EAAE,CAAC;gBAC/B,OAAO,GAAiB,CAAC;YAC3B,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,GAAG,CACtB,KAA0B,EAC1B,GAAW,EACX,UAAgC;QAEhC,OAAO,MAAM,KAAK,CAAC,GAAG,CAAa,GAAG,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC,IAAI,CAClE,CAAC,GAAwB,EAAc,EAAE;YACvC,IAAI,6CAAqB,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;gBAClD,IAAI,6CAAqB,CAAC,YAAY,CAAC,oBAAoB,EAAE,CAAC;oBAC5D,qBAAQ,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,IAAI,2BAA2B,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC7E,CAAC;qBAAM,CAAC;oBACN,qBAAQ,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,IAAI,2BAA2B,CAAC,CAAC;gBACnE,CAAC;YACH,CAAC;YAED,IAAI,UAAU,CAAC,eAAe,EAAE,CAAC;gBAC/B,OAAO,GAAiB,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,CAAC,IAAI,CAAC;YAClB,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,QAAQ,CACrB,GAAW,EACX,WAA8C,EAC9C,UAAgC;QAEhC,IAAI,6CAAqB,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC;YAC3D,qBAAQ,CAAC,GAAG,CACV,8BAA8B,UAAU,EAAE,IAAI,IAAI;gBAClD,MAAM,GAAG,GAAG;gBACZ,SAAS,EAAE,WAAW,EAAE,IAAI,CAC7B,CAAC;QAEJ,CAAC;aAAM,CAAC;YACN,qBAAQ,CAAC,GAAG,CAAC,8BAA8B,UAAU,EAAE,IAAI,GAAG,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,6CAAqB,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC;YAC3D,qBAAQ,CAAC,GAAG,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;YACxC,qBAAQ,CAAC,GAAG,CAAC,cAAc,EAAE;gBAC3B,UAAU,EAAE,WAAW,CAAC,UAAU,IAAI,EAAE;gBACxC,IAAI,EAAE,WAAW,CAAC,IAAI,IAAI,IAAI;aAC/B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,YAAY,CACzB,UAAgC,EAChC,KAA0B;QAE1B,KAAK,MAAM,SAAS,IAAI,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YACvD,IAAI,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9C,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAEvF,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,cAAc,EACd,IAAI,KAAK,CAAC,mBAAmB,SAAS,EAAE,CAAC,CAC1C;oBACD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;iBACxE,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,eAAe,CAC5B,UAAwC,EACxC,GAAW;QAEX,KAAK,MAAM,YAAY,IAAI,UAAU,EAAE,CAAC;YACtC,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC7B,MAAM,SAAS,GAAG,OAAO,UAAU,CAAC,YAAY,CAAC,CAAC;gBAElD,QAAQ,SAAS,EAAE,CAAC;oBAClB,KAAK,QAAQ;wBACX,GAAG,GAAG,GAAG,CAAC,OAAO,CACf,IAAI,YAAY,EAAE,EAClB,UAAU,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CACpC,CAAC;wBACF,MAAM;oBAER,KAAK,QAAQ;wBACX,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,YAAY,EAAE,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;wBAChE,MAAM;oBAER;wBACE;;;;;;;6BAOK;wBACL,MAAM,IAAI,uBAAU,CAAC;4BACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,iBAAiB,EACjB,IAAI,KAAK,CACP,2BAA2B,YAAY,OAAO,SAAS,GAAG;gCAC1D,KAAK,UAAU,CAAC,YAAY,CAAC,EAAE,CAChC,CACF;4BACD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;4BACvE,iBAAiB,EAAE;gCACjB,UAAU,EAAE,UAAU;gCACtB,GAAG,EAAE,GAAG;6BACT;yBACF,CAAC,CAAC;gBACP,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,wBAAwB,CAC9B,iBAAiB,EACjB,IAAI,KAAK,CAAC,uBAAuB,YAAY,GAAG,CAAC,CAClD;oBACD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,gBAAgB;iBACxE,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAEO,MAAM,CAAC,wBAAwB,CACrC,MAAc,EACd,KAAoB;QAEpB,OAAO;YACL,MAAM,EAAG,KAAoB,EAAE,SAAS,IAAI,GAAG;YAC/C,OAAO,EAAG,KAAe,EAAE,OAAO;gBAC/B,KAAoB,EAAE,QAAQ;gBAC/B,GAAG,MAAM,yBAAyB;YACpC,cAAc,EAAE,CAAE,KAAoB,EAAE,aAAa;YACrD,WAAW,EAAG,KAAoB,EAAE,aAAa,IAAI,IAAI,CAAC,mBAAmB;YAC7E,aAAa,EAAE,GAAG,IAAI,EAAE,WAAW,EAAE,IAAI,IAAI,IAAI,EAAE,IAAI,mBAAmB;YAC1E,KAAK,EAAE,KAAK;SACb,CAAC;IACJ,CAAC;;AA9fH,4CA+fC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@futdevpro/nts-dynamo",
3
- "version": "01.10.63",
3
+ "version": "01.10.65",
4
4
  "description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Program Ltd.",
5
5
  "DyBu_settings": {
6
6
  "packageType": "server-package",
package/src/_models/control-models/api-call-params.control-model.ts CHANGED
@@ -52,31 +52,34 @@ export class DyNTS_ApiCall_Params {
52
52
  this.stack = DyFM_getStackLocation();
53
53
 
54
54
  if (!set.name) {
55
+ // ?TODO: nullable warning
55
56
  DyFM_Log.warn(
56
- 'DyNTS_ApiCall_Params: name is not provided, using stack location!',
57
- '\nstack:', this.stack
57
+ 'WARNING: DyNTS_ApiCall_Params: name is not provided, using stack location!',
58
+ '\n stack:', this.stack
58
59
  );
59
60
  this.name = this.stack;
60
61
  }
61
62
 
62
63
  if (!set.baseUrl) {
64
+ // ?TODO: nullable warning
63
65
  DyFM_Log.error(
64
- 'DyNTS_ApiCall_Params: baseUrl is not provided, using global baseUrl!',
65
- '\nstack:', this.stack
66
+ 'ERROR: DyNTS_ApiCall_Params: baseUrl is not provided, using global baseUrl!',
67
+ '\n stack:', this.stack
66
68
  );
67
69
  this.baseUrl = DyNTS_global_settings.baseUrl;
68
70
  }
69
71
 
70
72
  if (!set.endpoint) {
73
+ // ?TODO: nullable warning
71
74
  DyFM_Log.warn(
72
- 'DyNTS_ApiCall_Params: endpoint is not provided',
73
- '\nstack:', this.stack
75
+ 'WARNING: DyNTS_ApiCall_Params: endpoint is not provided',
76
+ '\n stack:', this.stack
74
77
  );
75
78
  this.endpoint = '';
76
79
  } else if (set.endpoint.includes('{')) {
77
80
  DyFM_Log.warn(
78
- `using {param} bracets in endpoint definitions will be deprecated... (${set.endpoint})` +
79
- 'use :param instead ({pathparam} --> :pathparam)'
81
+ `WARNING: using {param} bracets in endpoint definitions will be deprecated... (${set.endpoint})` +
82
+ '\n use :param instead ({pathparam} --> :pathparam)'
80
83
  );
81
84
  set.endpoint = set.endpoint.replace(/{/g, ':').replace(/}/g, '');
82
85
  } else {
package/src/_services/base/api.service-base.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import {
2
- DyFM_Error, DyFM_HttpCallType,
2
+ DyFM_Error, DyFM_HttpCallType,
3
+ DyFM_Log,
3
4
  } from '@futdevpro/fsm-dynamo';
4
5
  import { DyNTS_AuthService } from '../core/auth.service';
5
6
  import { DyNTS_SingletonService } from './singleton.service';
@@ -14,7 +15,7 @@ export abstract class DyNTS_ApiService_Base extends DyNTS_SingletonService {
14
15
 
15
16
  /* abstract get env(): { baseUrl: string, test: string }; */
16
17
  abstract get baseUrl(): string;
17
- abstract get test(): string;
18
+ abstract get testEndpoint(): string;
18
19
  abstract get connectingSystemName(): string;
19
20
 
20
21
  async runApiCallWithAvailabilityCheck<T>(
@@ -31,7 +32,9 @@ export abstract class DyNTS_ApiService_Base extends DyNTS_SingletonService {
31
32
  }
32
33
 
33
34
  async checkServerAvailability(issuer: string): Promise<void> {
34
- await this.testGet().catch(() => {
35
+ try {
36
+ await this.testGet(issuer);
37
+ } catch (error) {
35
38
  throw new DyFM_Error({
36
39
  ...this.getDefaultErrorSettings(
37
40
  'checkServerAvailability',
@@ -44,17 +47,29 @@ export abstract class DyNTS_ApiService_Base extends DyNTS_SingletonService {
44
47
  userMessage: `${this.connectingSystemName} server is not available`,
45
48
  errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-ASB-CSA0`,
46
49
  });
47
- });
50
+ }
48
51
  }
49
52
 
50
- async testGet(): Promise<void> {
51
- return await DyNTS_ApiService.startApiCall<void>(
53
+ async testGet(issuer: string): Promise<void> {
54
+ if (!this.testEndpoint) {
55
+ throw new DyFM_Error({
56
+ ...this.getDefaultErrorSettings(
57
+ 'testGet',
58
+ new Error(`testEndpoint is not set for ${this.connectingSystemName}`),
59
+ issuer
60
+ ),
61
+ });
62
+ }
63
+
64
+ await DyNTS_ApiService.startApiCall<void>(
52
65
  new DyNTS_ApiCall_Params({
53
66
  name: `${this.connectingSystemName} testGet`,
54
67
  type: DyFM_HttpCallType.get,
55
68
  baseUrl: this.baseUrl,
56
- endpoint: this.test,
69
+ endpoint: this.testEndpoint,
57
70
  }),
58
71
  );
72
+
73
+ DyFM_Log.success(`${this.connectingSystemName} is available`);
59
74
  }
60
75
  }
package/src/_services/core/api.service.ts CHANGED
@@ -64,6 +64,14 @@ export class DyNTS_ApiService {
64
64
  url = callParams.baseUrl + callParams.endpoint;
65
65
  const axios = Axios.default.create();
66
66
 
67
+ if (!callParams.baseUrl) {
68
+ DyFM_Log.warn(`WARNING: missing baseUrl in api call (${callParams.name})`);
69
+ }
70
+
71
+ if (!callParams.endpoint) {
72
+ DyFM_Log.warn(`WARNING: missing endpoint in api call (${callParams.name})`);
73
+ }
74
+
67
75
  if (callParams.pathParamKeys.length) {
68
76
  callParams.pathParamKeys.forEach(key => {
69
77
  if (!inputParams?.pathParams?.[key]) {
@@ -205,10 +213,14 @@ export class DyNTS_ApiService {
205
213
  },
206
214
  url: string
207
215
  ): void {
216
+ const errorMsg: string = DyFM_Error.isDyFMError((error as Axios.AxiosError)?.response?.data) ?
217
+ DyFM_Error.getAnyMessage((error as Axios.AxiosError)?.response?.data as DyFM_AnyError) :
218
+ DyFM_Error.getAnyMessage(error);
219
+
208
220
  let msg: string =
209
221
  `\n---> API ERROR: "${callParams?.name}" failed (${DyFM_Error.getErrorStatus(error)})...` +
210
222
  `\n endpoint: ${callParams?.type} "${callParams?.baseUrl}${callParams?.endpoint}"` +
211
- `\n BE-BE requestStackLocation: "${DyFM_Error.getErrorStack(error)}"` +
223
+ `\n BE-BE requestStackLocation: "${callParams?.stack}"` +
212
224
  `\n error: "${DyFM_Error.getAnyMessage(error)}"`;
213
225
 
214
226
  if (DyNTS_global_settings.log_settings.detailedErrors) {
@@ -228,7 +240,7 @@ export class DyNTS_ApiService {
228
240
  if (DyFM_Error.isDyFMError((error as Axios.AxiosError)?.response?.data)) {
229
241
  DyFM_Log.error(`\n'${callParams.name}' was UNSUCCESSFUL` /* , new Error() */);
230
242
 
231
- const dyfmErrorInAxiosResponse = (error as Axios.AxiosError)?.response?.data as DyFM_Error;
243
+ const dyfmErrorInAxiosResponse = (error as Axios.AxiosError)?.response?.data as DyFM_AnyError;
232
244
 
233
245
  throw new DyFM_Error({
234
246
  ...this._getDefaultErrorSettings(
@@ -239,7 +251,7 @@ export class DyNTS_ApiService {
239
251
  errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-API-HE1`,
240
252
  message:
241
253
  `API call "${callParams.name}" failed on the other end!`+
242
- `\nerror response found: ${dyfmErrorInAxiosResponse._message}`,
254
+ `\nerror response found: ${errorMsg}`,
243
255
  error: dyfmErrorInAxiosResponse,
244
256
  additionalContent: {
245
257
  callParams: callParams,