@futdevpro/nts-dynamo 1.10.62 → 1.10.64
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/build/_models/control-models/endpoint-params.control-model.d.ts.map +1 -1
- package/build/_models/control-models/endpoint-params.control-model.js +1 -0
- package/build/_models/control-models/endpoint-params.control-model.js.map +1 -1
- package/build/_services/base/api.service-base.d.ts +1 -0
- package/build/_services/base/api.service-base.d.ts.map +1 -1
- package/build/_services/base/api.service-base.js +5 -4
- package/build/_services/base/api.service-base.js.map +1 -1
- package/build/_services/core/api.service.d.ts.map +1 -1
- package/build/_services/core/api.service.js +30 -25
- package/build/_services/core/api.service.js.map +1 -1
- package/nodemon.json +1 -1
- package/package.json +3 -3
- package/src/_models/control-models/endpoint-params.control-model.ts +3 -1
- package/src/_services/base/api.service-base.ts +9 -5
- package/src/_services/core/api.service.ts +39 -31
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoint-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/endpoint-params.control-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,
|
|
1
|
+
{"version":3,"file":"endpoint-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/endpoint-params.control-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,EAEO,0BAA0B,EAA2D,iBAAiB,EAEnH,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAGvE;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qBAAa,qBAAqB,CAChC,QAAQ,GAAG,OAAO,EAClB,QAAQ,SAAS,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAChC,MAAM,GAAG,SAAS,CAClB,SAAQ,0BAA0B,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC;IAE9D,QAAQ,EAAE,mBAAmB,CAAC;IAQ9B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAW;IAEtC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqD;IAClF,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAsE;IAE5F,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAU;IACrC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAU;IAC5C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAU;IAC7C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAU;IAC7C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAU;gBAG/C,GAAG,EAAE;QACH;;WAEG;QACH,IAAI,EAAE,MAAM,CAAC;QACb;;;;WAIG;QACH,QAAQ,CAAC,EAAE,mBAAmB,CAAC;QAE/B;;WAEG;QACH,IAAI,EAAE,iBAAiB,CAAC;QACxB;;;;WAIG;QACH,QAAQ,EAAE,MAAM,CAAC;QAEjB;;;WAGG;QACH,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAClE;;;WAGG;QACH,KAAK,EAAE,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAE1E;;WAEG;QACH,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB;;WAEG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B;;WAEG;QACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B;;WAEG;QACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B;;WAEG;QACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;KAClC;IAwDH;;;OAGG;YACW,MAAM;IA0BpB;;;OAGG;IACH,gBAAgB,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC;IA2ClE;;;;OAIG;YACW,KAAK;IAsInB,OAAO,CAAC,eAAe;IAuFvB,OAAO,CAAC,uBAAuB;CAShC"}
|
|
@@ -165,6 +165,7 @@ class DyNTS_Endpoint_Params extends fsm_dynamo_1.DyFM_Endpoint_SettingsBase {
|
|
|
165
165
|
if (error instanceof fsm_dynamo_1.DyFM_Error) {
|
|
166
166
|
msg += `\n ErrorCode: ${error._errorCode}`;
|
|
167
167
|
}
|
|
168
|
+
msg += `\n error: "${error?._message ?? error?.message}"`;
|
|
168
169
|
msg += '\n at ' + this.stack;
|
|
169
170
|
fsm_dynamo_1.DyFM_Log.testError(msg);
|
|
170
171
|
if (global_settings_const_1.DyNTS_global_settings.log_settings.highDetailedLogs ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoint-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/endpoint-params.control-model.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"endpoint-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/endpoint-params.control-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ 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
4
|
abstract get test(): string;
|
|
5
|
+
abstract get connectingSystemName(): string;
|
|
5
6
|
runApiCallWithAvailabilityCheck<T>(apiCall: () => Promise<T>, issuer: string): Promise<T>;
|
|
6
7
|
checkServerAvailability(issuer: string): Promise<void>;
|
|
7
8
|
testGet(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.service-base.d.ts","sourceRoot":"","sources":["../../../src/_services/base/api.service-base.ts"],"names":[],"mappings":"
|
|
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,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;CAY/B"}
|
|
@@ -18,20 +18,21 @@ class DyNTS_ApiService_Base extends singleton_service_1.DyNTS_SingletonService {
|
|
|
18
18
|
async checkServerAvailability(issuer) {
|
|
19
19
|
await this.testGet().catch(() => {
|
|
20
20
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
21
|
-
...this.getDefaultErrorSettings('checkServerAvailability', new Error(`${
|
|
21
|
+
...this.getDefaultErrorSettings('checkServerAvailability', new Error(`${this.connectingSystemName} server is not available\n` +
|
|
22
22
|
`\n baseUrl: ${this.baseUrl}`), issuer),
|
|
23
|
-
userMessage: `${
|
|
23
|
+
userMessage: `${this.connectingSystemName} server is not available`,
|
|
24
24
|
errorCode: `${__1.DyNTS_global_settings.systemShortCodeName}|DyNTS-ASB-CSA0`,
|
|
25
25
|
});
|
|
26
26
|
});
|
|
27
27
|
}
|
|
28
28
|
async testGet() {
|
|
29
|
-
|
|
30
|
-
name: `${
|
|
29
|
+
await api_service_1.DyNTS_ApiService.startApiCall(new __1.DyNTS_ApiCall_Params({
|
|
30
|
+
name: `${this.connectingSystemName} testGet`,
|
|
31
31
|
type: fsm_dynamo_1.DyFM_HttpCallType.get,
|
|
32
32
|
baseUrl: this.baseUrl,
|
|
33
33
|
endpoint: this.test,
|
|
34
34
|
}));
|
|
35
|
+
fsm_dynamo_1.DyFM_Log.success(`${this.connectingSystemName} is available`);
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
38
|
exports.DyNTS_ApiService_Base = DyNTS_ApiService_Base;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.service-base.js","sourceRoot":"","sources":["../../../src/_services/base/api.service-base.ts"],"names":[],"mappings":";;;AAAA,
|
|
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,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,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,IAAI;SACpB,CAAC,CACH,CAAC;QAEF,qBAAQ,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,oBAAoB,eAAe,CAAC,CAAC;IAChE,CAAC;CACF;AArDD,sDAqDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"
|
|
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;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"}
|
|
@@ -145,9 +145,13 @@ class DyNTS_ApiService {
|
|
|
145
145
|
callParams.httpOptions.params = httpParams;
|
|
146
146
|
} */
|
|
147
147
|
static handleError(callParams, error, inputParams, url) {
|
|
148
|
-
|
|
148
|
+
const errorMsg = fsm_dynamo_1.DyFM_Error.isDyFMError(error?.response?.data) ?
|
|
149
|
+
fsm_dynamo_1.DyFM_Error.getAnyMessage(error?.response?.data) :
|
|
150
|
+
fsm_dynamo_1.DyFM_Error.getAnyMessage(error);
|
|
151
|
+
let msg = `\n---> API ERROR: "${callParams?.name}" failed (${fsm_dynamo_1.DyFM_Error.getErrorStatus(error)})...` +
|
|
149
152
|
`\n endpoint: ${callParams?.type} "${callParams?.baseUrl}${callParams?.endpoint}"` +
|
|
150
|
-
`\n BE-BE requestStackLocation: "${callParams
|
|
153
|
+
`\n BE-BE requestStackLocation: "${callParams?.stack}"` +
|
|
154
|
+
`\n error: "${fsm_dynamo_1.DyFM_Error.getAnyMessage(error)}"`;
|
|
151
155
|
if (global_settings_const_1.DyNTS_global_settings.log_settings.detailedErrors) {
|
|
152
156
|
fsm_dynamo_1.DyFM_Log.error(`${msg}\ncallParams:`, callParams);
|
|
153
157
|
}
|
|
@@ -155,26 +159,27 @@ class DyNTS_ApiService {
|
|
|
155
159
|
fsm_dynamo_1.DyFM_Log.error(msg);
|
|
156
160
|
}
|
|
157
161
|
if (error &&
|
|
158
|
-
typeof error
|
|
162
|
+
typeof error?.error === 'string' &&
|
|
159
163
|
callParams?.httpOptions?.responseType === fsm_dynamo_1.DyFM_HttpResponseType.text) {
|
|
160
164
|
error.error = JSON.parse(error?.error);
|
|
161
165
|
}
|
|
162
|
-
if (error?.response?.data
|
|
166
|
+
if (fsm_dynamo_1.DyFM_Error.isDyFMError(error?.response?.data)) {
|
|
163
167
|
fsm_dynamo_1.DyFM_Log.error(`\n'${callParams.name}' was UNSUCCESSFUL` /* , new Error() */);
|
|
168
|
+
const dyfmErrorInAxiosResponse = error?.response?.data;
|
|
164
169
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
165
|
-
...this._getDefaultErrorSettings(callParams.name + ' startApiCall',
|
|
170
|
+
...this._getDefaultErrorSettings(callParams.name + ' startApiCall', dyfmErrorInAxiosResponse),
|
|
166
171
|
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-API-HE1`,
|
|
167
172
|
message: `API call "${callParams.name}" failed on the other end!` +
|
|
168
|
-
`\nerror response found: ${
|
|
169
|
-
error:
|
|
173
|
+
`\nerror response found: ${errorMsg}`,
|
|
174
|
+
error: dyfmErrorInAxiosResponse,
|
|
170
175
|
additionalContent: {
|
|
171
|
-
callParams,
|
|
172
|
-
inputParams,
|
|
173
|
-
response: error
|
|
176
|
+
callParams: callParams,
|
|
177
|
+
inputParams: inputParams,
|
|
178
|
+
response: error?.response,
|
|
174
179
|
},
|
|
175
180
|
});
|
|
176
181
|
}
|
|
177
|
-
else if (error
|
|
182
|
+
else if (error?.code === 'ENOTFOUND') {
|
|
178
183
|
fsm_dynamo_1.DyFM_Log.error(`\n'${callParams.name}' was UNSUCCESSFUL` /* , new Error() */);
|
|
179
184
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
180
185
|
...this._getDefaultErrorSettings(callParams.name + ' startApiCall', error),
|
|
@@ -182,13 +187,13 @@ class DyNTS_ApiService {
|
|
|
182
187
|
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-API-HE2`,
|
|
183
188
|
message: 'DNS error; address cannot be resolved!',
|
|
184
189
|
additionalContent: {
|
|
185
|
-
callParams,
|
|
186
|
-
inputParams,
|
|
187
|
-
response: error
|
|
190
|
+
callParams: callParams,
|
|
191
|
+
inputParams: inputParams,
|
|
192
|
+
response: error?.response,
|
|
188
193
|
},
|
|
189
194
|
});
|
|
190
195
|
}
|
|
191
|
-
else if (error
|
|
196
|
+
else if (error?.code === 'ECONNREFUSED') {
|
|
192
197
|
fsm_dynamo_1.DyFM_Log.error(`\n'${callParams.name}' was UNSUCCESSFUL` /* , new Error() */);
|
|
193
198
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
194
199
|
...this._getDefaultErrorSettings(callParams.name + ' startApiCall', error),
|
|
@@ -196,21 +201,21 @@ class DyNTS_ApiService {
|
|
|
196
201
|
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-API-HE3`,
|
|
197
202
|
message: `Can't connect to the endpoint! ${callParams.type} "${url}"`,
|
|
198
203
|
additionalContent: {
|
|
199
|
-
callParams,
|
|
200
|
-
inputParams,
|
|
201
|
-
url,
|
|
202
|
-
response: error
|
|
204
|
+
callParams: callParams,
|
|
205
|
+
inputParams: inputParams,
|
|
206
|
+
url: url,
|
|
207
|
+
response: error?.response,
|
|
203
208
|
},
|
|
204
209
|
});
|
|
205
210
|
}
|
|
206
|
-
else if (error
|
|
207
|
-
let msg = error
|
|
211
|
+
else if (error?.config && error?.message) {
|
|
212
|
+
let msg = error?.message;
|
|
208
213
|
let status = error?.response?.status ||
|
|
209
214
|
error?.status ||
|
|
210
215
|
/* get status from "status code {3 digits}" that might be in the middle of the message */
|
|
211
216
|
+error?.message?.match?.(/status code (\d{3})/)?.[1] ||
|
|
212
217
|
500;
|
|
213
|
-
if (error
|
|
218
|
+
if (error?.message?.includes('status code')) {
|
|
214
219
|
msg += `\nendpoint: ${callParams.baseUrl}${callParams.endpoint}` +
|
|
215
220
|
`\npathParams: ${inputParams?.pathParams ?
|
|
216
221
|
Object.keys(inputParams.pathParams).join(', ') :
|
|
@@ -223,9 +228,9 @@ class DyNTS_ApiService {
|
|
|
223
228
|
message: msg,
|
|
224
229
|
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-API-HE4`,
|
|
225
230
|
additionalContent: {
|
|
226
|
-
callParams,
|
|
227
|
-
inputParams,
|
|
228
|
-
response: error
|
|
231
|
+
callParams: callParams,
|
|
232
|
+
inputParams: inputParams,
|
|
233
|
+
response: error?.response,
|
|
229
234
|
},
|
|
230
235
|
});
|
|
231
236
|
}
|
|
@@ -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":"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"}
|
package/nodemon.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@futdevpro/nts-dynamo",
|
|
3
|
-
"version": "01.10.
|
|
3
|
+
"version": "01.10.64",
|
|
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",
|
|
@@ -136,12 +136,12 @@
|
|
|
136
136
|
},
|
|
137
137
|
"homepage": "https:/futdevpro.hu/projects/dynamo",
|
|
138
138
|
"DISABLED": {
|
|
139
|
-
"@futdevpro/fsm-dynamo": "file:../tgz-collection/dynamo-fsm/futdevpro-fsm-dynamo-01.10.
|
|
139
|
+
"@futdevpro/fsm-dynamo": "file:../tgz-collection/dynamo-fsm/futdevpro-fsm-dynamo-01.10.47.tgz",
|
|
140
140
|
|
|
141
141
|
"empty": ""
|
|
142
142
|
},
|
|
143
143
|
"peerDependencies": {
|
|
144
|
-
"@futdevpro/fsm-dynamo": "1.10.
|
|
144
|
+
"@futdevpro/fsm-dynamo": "1.10.47",
|
|
145
145
|
|
|
146
146
|
"@types/express": "4.17.21",
|
|
147
147
|
"@types/geoip-lite": "~1.4.1",
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Request, Response } from 'express';
|
|
2
2
|
|
|
3
3
|
import {
|
|
4
|
+
DyFM_AnyError,
|
|
4
5
|
DyFM_Array, DyFM_Endpoint_SettingsBase, DyFM_EnvironmentFlag, DyFM_Error, DyFM_getStackLocation, DyFM_HttpCallType,
|
|
5
6
|
DyFM_Log, DyFM_Shared
|
|
6
7
|
} from '@futdevpro/fsm-dynamo';
|
|
@@ -259,7 +260,7 @@ export class DyNTS_Endpoint_Params<
|
|
|
259
260
|
private async error(
|
|
260
261
|
req: Request,
|
|
261
262
|
res: Response,
|
|
262
|
-
error:
|
|
263
|
+
error: DyFM_AnyError,
|
|
263
264
|
issuer: string,
|
|
264
265
|
autoSecondTry?: boolean
|
|
265
266
|
): Promise<void> {
|
|
@@ -270,6 +271,7 @@ export class DyNTS_Endpoint_Params<
|
|
|
270
271
|
if (error instanceof DyFM_Error) {
|
|
271
272
|
msg += `\n ErrorCode: ${error._errorCode}`;
|
|
272
273
|
}
|
|
274
|
+
msg += `\n error: "${(error as DyFM_Error)?._message ?? (error as Error)?.message}"`;
|
|
273
275
|
msg += '\n at ' + this.stack;
|
|
274
276
|
|
|
275
277
|
DyFM_Log.testError(msg);
|
|
@@ -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';
|
|
@@ -15,6 +16,7 @@ export abstract class DyNTS_ApiService_Base extends DyNTS_SingletonService {
|
|
|
15
16
|
/* abstract get env(): { baseUrl: string, test: string }; */
|
|
16
17
|
abstract get baseUrl(): string;
|
|
17
18
|
abstract get test(): string;
|
|
19
|
+
abstract get connectingSystemName(): string;
|
|
18
20
|
|
|
19
21
|
async runApiCallWithAvailabilityCheck<T>(
|
|
20
22
|
apiCall: () => Promise<T>,
|
|
@@ -35,25 +37,27 @@ export abstract class DyNTS_ApiService_Base extends DyNTS_SingletonService {
|
|
|
35
37
|
...this.getDefaultErrorSettings(
|
|
36
38
|
'checkServerAvailability',
|
|
37
39
|
new Error(
|
|
38
|
-
`${
|
|
40
|
+
`${this.connectingSystemName} server is not available\n` +
|
|
39
41
|
`\n baseUrl: ${this.baseUrl}`
|
|
40
42
|
),
|
|
41
43
|
issuer
|
|
42
44
|
),
|
|
43
|
-
userMessage: `${
|
|
45
|
+
userMessage: `${this.connectingSystemName} server is not available`,
|
|
44
46
|
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-ASB-CSA0`,
|
|
45
47
|
});
|
|
46
48
|
});
|
|
47
49
|
}
|
|
48
50
|
|
|
49
51
|
async testGet(): Promise<void> {
|
|
50
|
-
|
|
52
|
+
await DyNTS_ApiService.startApiCall<void>(
|
|
51
53
|
new DyNTS_ApiCall_Params({
|
|
52
|
-
name: `${
|
|
54
|
+
name: `${this.connectingSystemName} testGet`,
|
|
53
55
|
type: DyFM_HttpCallType.get,
|
|
54
56
|
baseUrl: this.baseUrl,
|
|
55
57
|
endpoint: this.test,
|
|
56
58
|
}),
|
|
57
59
|
);
|
|
60
|
+
|
|
61
|
+
DyFM_Log.success(`${this.connectingSystemName} is available`);
|
|
58
62
|
}
|
|
59
63
|
}
|
|
@@ -6,7 +6,8 @@ import {
|
|
|
6
6
|
DyFM_errorFlag,
|
|
7
7
|
DyFM_ErrorLevel,
|
|
8
8
|
DyFM_HttpCallType, DyFM_HttpResponseType,
|
|
9
|
-
DyFM_Log
|
|
9
|
+
DyFM_Log,
|
|
10
|
+
DyFM_HttpErrorResponse
|
|
10
11
|
} from '@futdevpro/fsm-dynamo';
|
|
11
12
|
|
|
12
13
|
import { DyNTS_global_settings } from '../../_collections/global-settings.const';
|
|
@@ -194,7 +195,7 @@ export class DyNTS_ApiService {
|
|
|
194
195
|
|
|
195
196
|
private static handleError<T_Body>(
|
|
196
197
|
callParams: DyNTS_ApiCall_Params,
|
|
197
|
-
error:
|
|
198
|
+
error: DyFM_AnyError | Axios.AxiosError,
|
|
198
199
|
inputParams: {
|
|
199
200
|
pathParams?: { [param: string]: string; };
|
|
200
201
|
/**
|
|
@@ -204,10 +205,15 @@ export class DyNTS_ApiService {
|
|
|
204
205
|
},
|
|
205
206
|
url: string
|
|
206
207
|
): void {
|
|
208
|
+
const errorMsg: string = DyFM_Error.isDyFMError((error as Axios.AxiosError)?.response?.data) ?
|
|
209
|
+
DyFM_Error.getAnyMessage((error as Axios.AxiosError)?.response?.data as DyFM_AnyError) :
|
|
210
|
+
DyFM_Error.getAnyMessage(error);
|
|
211
|
+
|
|
207
212
|
let msg: string =
|
|
208
|
-
`\n---> API ERROR: "${callParams?.name}" failed (${error
|
|
213
|
+
`\n---> API ERROR: "${callParams?.name}" failed (${DyFM_Error.getErrorStatus(error)})...` +
|
|
209
214
|
`\n endpoint: ${callParams?.type} "${callParams?.baseUrl}${callParams?.endpoint}"` +
|
|
210
|
-
`\n BE-BE requestStackLocation: "${callParams
|
|
215
|
+
`\n BE-BE requestStackLocation: "${callParams?.stack}"` +
|
|
216
|
+
`\n error: "${DyFM_Error.getAnyMessage(error)}"`;
|
|
211
217
|
|
|
212
218
|
if (DyNTS_global_settings.log_settings.detailedErrors) {
|
|
213
219
|
DyFM_Log.error(`${msg}\ncallParams:`, callParams);
|
|
@@ -217,34 +223,36 @@ export class DyNTS_ApiService {
|
|
|
217
223
|
|
|
218
224
|
if (
|
|
219
225
|
error &&
|
|
220
|
-
typeof error
|
|
226
|
+
typeof (error as DyFM_Error)?.error === 'string' &&
|
|
221
227
|
callParams?.httpOptions?.responseType === DyFM_HttpResponseType.text
|
|
222
228
|
) {
|
|
223
|
-
error.error = JSON.parse(error?.error);
|
|
229
|
+
(error as DyFM_Error).error = JSON.parse((error as DyFM_Error)?.error as any as string);
|
|
224
230
|
}
|
|
225
231
|
|
|
226
|
-
if ((error
|
|
232
|
+
if (DyFM_Error.isDyFMError((error as Axios.AxiosError)?.response?.data)) {
|
|
227
233
|
DyFM_Log.error(`\n'${callParams.name}' was UNSUCCESSFUL` /* , new Error() */);
|
|
228
234
|
|
|
235
|
+
const dyfmErrorInAxiosResponse = (error as Axios.AxiosError)?.response?.data as DyFM_AnyError;
|
|
236
|
+
|
|
229
237
|
throw new DyFM_Error({
|
|
230
238
|
...this._getDefaultErrorSettings(
|
|
231
239
|
callParams.name + ' startApiCall',
|
|
232
|
-
|
|
240
|
+
dyfmErrorInAxiosResponse
|
|
233
241
|
),
|
|
234
242
|
|
|
235
243
|
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-API-HE1`,
|
|
236
244
|
message:
|
|
237
245
|
`API call "${callParams.name}" failed on the other end!`+
|
|
238
|
-
`\nerror response found: ${
|
|
239
|
-
error:
|
|
246
|
+
`\nerror response found: ${errorMsg}`,
|
|
247
|
+
error: dyfmErrorInAxiosResponse,
|
|
240
248
|
additionalContent: {
|
|
241
|
-
callParams,
|
|
242
|
-
inputParams,
|
|
243
|
-
response: error.response,
|
|
249
|
+
callParams: callParams,
|
|
250
|
+
inputParams: inputParams,
|
|
251
|
+
response: (error as Axios.AxiosError)?.response,
|
|
244
252
|
},
|
|
245
253
|
});
|
|
246
254
|
|
|
247
|
-
} else if (error.code === 'ENOTFOUND') {
|
|
255
|
+
} else if ((error as Axios.AxiosError)?.code === 'ENOTFOUND') {
|
|
248
256
|
DyFM_Log.error(`\n'${callParams.name}' was UNSUCCESSFUL` /* , new Error() */);
|
|
249
257
|
|
|
250
258
|
throw new DyFM_Error({
|
|
@@ -257,13 +265,13 @@ export class DyNTS_ApiService {
|
|
|
257
265
|
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-API-HE2`,
|
|
258
266
|
message: 'DNS error; address cannot be resolved!',
|
|
259
267
|
additionalContent: {
|
|
260
|
-
callParams,
|
|
261
|
-
inputParams,
|
|
262
|
-
response: error.response,
|
|
268
|
+
callParams: callParams,
|
|
269
|
+
inputParams: inputParams,
|
|
270
|
+
response: (error as Axios.AxiosError)?.response,
|
|
263
271
|
},
|
|
264
272
|
});
|
|
265
273
|
|
|
266
|
-
} else if (error.code === 'ECONNREFUSED') {
|
|
274
|
+
} else if ((error as Axios.AxiosError)?.code === 'ECONNREFUSED') {
|
|
267
275
|
DyFM_Log.error(`\n'${callParams.name}' was UNSUCCESSFUL` /* , new Error() */);
|
|
268
276
|
|
|
269
277
|
throw new DyFM_Error({
|
|
@@ -276,23 +284,23 @@ export class DyNTS_ApiService {
|
|
|
276
284
|
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-API-HE3`,
|
|
277
285
|
message: `Can't connect to the endpoint! ${callParams.type} "${url}"`,
|
|
278
286
|
additionalContent: {
|
|
279
|
-
callParams,
|
|
280
|
-
inputParams,
|
|
281
|
-
url,
|
|
282
|
-
response: error.response,
|
|
287
|
+
callParams: callParams,
|
|
288
|
+
inputParams: inputParams,
|
|
289
|
+
url: url,
|
|
290
|
+
response: (error as Axios.AxiosError)?.response,
|
|
283
291
|
},
|
|
284
292
|
});
|
|
285
293
|
|
|
286
|
-
} else if (error.config && error.message) {
|
|
294
|
+
} else if ((error as Axios.AxiosError)?.config && (error as Axios.AxiosError)?.message) {
|
|
287
295
|
|
|
288
|
-
let msg: string = error.message;
|
|
289
|
-
let status: number = error?.response?.status ||
|
|
290
|
-
error?.status ||
|
|
296
|
+
let msg: string = (error as Axios.AxiosError)?.message;
|
|
297
|
+
let status: number = (error as Axios.AxiosError)?.response?.status ||
|
|
298
|
+
(error as Axios.AxiosError)?.status ||
|
|
291
299
|
/* get status from "status code {3 digits}" that might be in the middle of the message */
|
|
292
|
-
+error?.message?.match?.(/status code (\d{3})/)?.[1] ||
|
|
300
|
+
+(error as Axios.AxiosError)?.message?.match?.(/status code (\d{3})/)?.[1] ||
|
|
293
301
|
500;
|
|
294
302
|
|
|
295
|
-
if (error.message
|
|
303
|
+
if ((error as Axios.AxiosError)?.message?.includes('status code')) {
|
|
296
304
|
msg += `\nendpoint: ${callParams.baseUrl}${callParams.endpoint}` +
|
|
297
305
|
`\npathParams: ${
|
|
298
306
|
inputParams?.pathParams ?
|
|
@@ -312,9 +320,9 @@ export class DyNTS_ApiService {
|
|
|
312
320
|
message: msg,
|
|
313
321
|
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-API-HE4`,
|
|
314
322
|
additionalContent: {
|
|
315
|
-
callParams,
|
|
316
|
-
inputParams,
|
|
317
|
-
response: error.response,
|
|
323
|
+
callParams: callParams,
|
|
324
|
+
inputParams: inputParams,
|
|
325
|
+
response: (error as Axios.AxiosError)?.response,
|
|
318
326
|
},
|
|
319
327
|
});
|
|
320
328
|
} else {
|