@futdevpro/nts-dynamo 1.14.54 → 1.14.56
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/.c8rc.json +26 -0
- package/build/_modules/ai/_modules/open-ai/_services/data-services/oai-doc-chunk-data.service.js +1 -1
- package/build/_modules/ai/_modules/open-ai/_services/data-services/oai-doc-chunk-data.service.js.map +1 -1
- package/build/_modules/messaging/_collections/msg-global-settings.const.d.ts.map +1 -1
- package/build/_modules/messaging/_collections/msg-global-settings.const.js +3 -2
- package/build/_modules/messaging/_collections/msg-global-settings.const.js.map +1 -1
- package/build/_modules/server/server-status/server-status.control-service.d.ts +1 -2
- package/build/_modules/server/server-status/server-status.control-service.d.ts.map +1 -1
- package/build/_modules/server/server-status/server-status.control-service.js +6 -3
- package/build/_modules/server/server-status/server-status.control-service.js.map +1 -1
- package/build/_services/core/api.service.d.ts.map +1 -1
- package/build/_services/core/api.service.js +5 -5
- package/build/_services/core/api.service.js.map +1 -1
- package/build/_services/core/global.service.d.ts +2 -0
- package/build/_services/core/global.service.d.ts.map +1 -1
- package/build/_services/core/global.service.js +55 -27
- package/build/_services/core/global.service.js.map +1 -1
- package/package.json +2 -1
- package/scripts/run-coverage-tests.js +24 -0
- package/spec/support/helpers/ts-node-helper.js +9 -0
- package/spec/support/jasmine.coverage.json +23 -0
- package/src/_modules/ai/_modules/open-ai/_services/data-services/oai-doc-chunk-data.service.ts +1 -1
- package/src/_modules/messaging/_collections/msg-global-settings.const.ts +3 -2
- package/src/_modules/server/server-status/server-status.control-service.ts +23 -13
- package/src/_services/core/api.service.ts +6 -5
- package/src/_services/core/global.service.ts +67 -35
package/.c8rc.json
ADDED
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
{
|
|
2
|
+
"reporter": [
|
|
3
|
+
"html",
|
|
4
|
+
"text",
|
|
5
|
+
"lcov"
|
|
6
|
+
],
|
|
7
|
+
"reports-dir": "./coverage",
|
|
8
|
+
"include": [
|
|
9
|
+
"src/**/*.ts"
|
|
10
|
+
],
|
|
11
|
+
"exclude": [
|
|
12
|
+
"src/**/*.spec.ts",
|
|
13
|
+
"src/**/*.spec.js",
|
|
14
|
+
"src/spec/**",
|
|
15
|
+
"**/node_modules/**",
|
|
16
|
+
"**/coverage/**",
|
|
17
|
+
"**/*.d.ts",
|
|
18
|
+
"**/*.const.ts",
|
|
19
|
+
"**/*.enum.ts",
|
|
20
|
+
"**/*.interface.ts",
|
|
21
|
+
"**/*.type.ts",
|
|
22
|
+
"**/index.ts"
|
|
23
|
+
],
|
|
24
|
+
"all": true
|
|
25
|
+
}
|
|
26
|
+
|
package/build/_modules/ai/_modules/open-ai/_services/data-services/oai-doc-chunk-data.service.js
CHANGED
|
@@ -181,7 +181,7 @@ class DyNTS_OAI_DocChunkDataService extends oai_vector_data_service_1.DyNTS_OAI_
|
|
|
181
181
|
}
|
|
182
182
|
clickupWorkspaceId;
|
|
183
183
|
getPageLink(page) {
|
|
184
|
-
return dai_document_util_1.DyNTS_DAI_Document_Util.getClickupPageLink(page.name, this.clickupWorkspaceId, page.
|
|
184
|
+
return dai_document_util_1.DyNTS_DAI_Document_Util.getClickupPageLink(page.name, this.clickupWorkspaceId, page.externalDocumentId, page.externalPageId);
|
|
185
185
|
}
|
|
186
186
|
}
|
|
187
187
|
exports.DyNTS_OAI_DocChunkDataService = DyNTS_OAI_DocChunkDataService;
|
package/build/_modules/ai/_modules/open-ai/_services/data-services/oai-doc-chunk-data.service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oai-doc-chunk-data.service.js","sourceRoot":"","sources":["../../../../../../../src/_modules/ai/_modules/open-ai/_services/data-services/oai-doc-chunk-data.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oai-doc-chunk-data.service.js","sourceRoot":"","sources":["../../../../../../../src/_modules/ai/_modules/open-ai/_services/data-services/oai-doc-chunk-data.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"msg-global-settings.const.d.ts","sourceRoot":"","sources":["../../../../src/_modules/messaging/_collections/msg-global-settings.const.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"msg-global-settings.const.d.ts","sourceRoot":"","sources":["../../../../src/_modules/messaging/_collections/msg-global-settings.const.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AAErF;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,yBAevC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DyNTS_Msg_global_settings = void 0;
|
|
4
|
+
const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
4
5
|
/**
|
|
5
6
|
* Default messaging module settings
|
|
6
7
|
*/
|
|
@@ -10,13 +11,13 @@ exports.DyNTS_Msg_global_settings = {
|
|
|
10
11
|
enableThreading: true,
|
|
11
12
|
enableReactions: true,
|
|
12
13
|
enableAttachments: true,
|
|
13
|
-
maxAttachmentSize: 10 *
|
|
14
|
+
maxAttachmentSize: 10 * fsm_dynamo_1.megabyte, // 10MB
|
|
14
15
|
enableMentions: true,
|
|
15
16
|
enableReadReceipts: true,
|
|
16
17
|
enableTypingIndicators: true,
|
|
17
18
|
retry: {
|
|
18
19
|
maxRetries: 3,
|
|
19
|
-
retryDelay:
|
|
20
|
+
retryDelay: fsm_dynamo_1.second, // 1 second
|
|
20
21
|
},
|
|
21
22
|
};
|
|
22
23
|
//# sourceMappingURL=msg-global-settings.const.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"msg-global-settings.const.js","sourceRoot":"","sources":["../../../../src/_modules/messaging/_collections/msg-global-settings.const.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"msg-global-settings.const.js","sourceRoot":"","sources":["../../../../src/_modules/messaging/_collections/msg-global-settings.const.ts"],"names":[],"mappings":";;;AAAA,sDAAyD;AAGzD;;GAEG;AACU,QAAA,yBAAyB,GAA8B;IAClE,oBAAoB,EAAE,IAAI;IAC1B,kBAAkB,EAAE,EAAE;IACtB,eAAe,EAAE,IAAI;IACrB,eAAe,EAAE,IAAI;IACrB,iBAAiB,EAAE,IAAI;IACvB,iBAAiB,EAAE,EAAE,GAAG,qBAAQ,EAAE,OAAO;IACzC,cAAc,EAAE,IAAI;IACpB,kBAAkB,EAAE,IAAI;IACxB,sBAAsB,EAAE,IAAI;IAE5B,KAAK,EAAE;QACL,UAAU,EAAE,CAAC;QACb,UAAU,EAAE,mBAAM,EAAE,WAAW;KAChC;CACF,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { DyNTS_SingletonService } from '../../../_services/base/singleton.servic
|
|
|
4
4
|
import { DyNTS_Errors_ControlService } from '../errors/errors.control-service';
|
|
5
5
|
import { DyNTS_ServerStatusSnapshot_ControlService } from './server-status-snapshot.control-service';
|
|
6
6
|
import { DyNTS_ApiService_Base } from '../../../_services/base/api.service-base';
|
|
7
|
-
interface DyNTS_ServerConnection {
|
|
7
|
+
export interface DyNTS_ServerConnection {
|
|
8
8
|
name: string;
|
|
9
9
|
apiService: DyNTS_ApiService_Base;
|
|
10
10
|
accessible?: boolean;
|
|
@@ -42,5 +42,4 @@ export declare abstract class DyNTS_ServerStatus_ControlService<T_ServerStatus e
|
|
|
42
42
|
protected triggerCreateSnapshot(issuer: string): Promise<void>;
|
|
43
43
|
getServerStatusSnapshot(issuer: string): Promise<T_ServerStatusSnapshot>;
|
|
44
44
|
}
|
|
45
|
-
export {};
|
|
46
45
|
//# sourceMappingURL=server-status.control-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-status.control-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/server/server-status/server-status.control-service.ts"],"names":[],"mappings":"AAEA,OAAO,EACU,iBAAiB,EAAa,iBAAiB,EAC9D,UAAU,EAAE,qBAAqB,EAAE,WAAW,EAG9C,gCAAgC,
|
|
1
|
+
{"version":3,"file":"server-status.control-service.d.ts","sourceRoot":"","sources":["../../../../src/_modules/server/server-status/server-status.control-service.ts"],"names":[],"mappings":"AAEA,OAAO,EACU,iBAAiB,EAAa,iBAAiB,EAC9D,UAAU,EAAE,qBAAqB,EAAE,WAAW,EAG9C,gCAAgC,EAGjC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAS,MAAM,MAAM,CAAC;AAG3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAEnF,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,yCAAyC,EAAE,MAAM,0CAA0C,CAAC;AAErG,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AAEjF,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,qBAAqB,CAAC;IAClC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,IAAI,CAAC;CAClB;AAED,8BAAsB,iCAAiC,CACrD,cAAc,SAAS,iBAAiB,EACxC,OAAO,SAAS,UAAU,EAC1B,QAAQ,SAAS,WAAW,CAAC,OAAO,CAAC,EACrC,uBAAuB,SAAS,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,EAC9E,sBAAsB,SAAS,iBAAiB,EAChD,qCAAqC,SAAS,yCAAyC,CAAC,sBAAsB,CAAC,CAC/G,SAAQ,sBAAsB;IAE9B,SAAS,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CACxC,GAAG,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,QAAQ,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GACzC,uBAAuB;IAE1B,SAAS,CAAC,QAAQ,CAAC,qCAAqC,CAAC,CACvD,GAAG,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,cAAc,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAC/C,qCAAqC;IAExC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAc;IAEzC,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAA0C;IAC1F,IAAI,aAAa,IAAI,MAAM,CAA2B;IACtD,IAAI,oBAAoB,IAAI,MAAM,CAAuC;IAEzE,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACvC,SAAS,CAAC,2BAA2B,EAAE,MAAM,CAAC;IAC9C,IAAI,mBAAmB,IAAI,MAAM,CAAsC;IACvE,IAAI,0BAA0B,IAAI,MAAM,CAA6C;IAErF,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,sBAAsB,EAAE,CAAC;IACvE,SAAS,CAAC,2BAA2B,SAAe;IAEpD,SAAkB,mBAAmB,0BAA0B;IAE/D,QAAQ,CAAC,gBAAgB,SAAY;IACrC,QAAQ,EAAE,YAAY,CAAC;IAEvB,SAAS;IA8BH,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA6BnF,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gCAAgC,CAAC;IAoCjF,kBAAkB,CACtB,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,qBAAqB,CAAC;IA+FjC,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAUpD,SAAS,CAAC,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO;IA4B/D,SAAS,CAAC,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,GAAG,IAAI;cAO3E,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB9D,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;CAiB/E"}
|
|
@@ -73,9 +73,12 @@ class DyNTS_ServerStatus_ControlService extends singleton_service_1.DyNTS_Single
|
|
|
73
73
|
async checkServerConnections(issuer) {
|
|
74
74
|
try {
|
|
75
75
|
const connections = {};
|
|
76
|
-
|
|
76
|
+
await fsm_dynamo_1.DyFM_Array.asyncForEachAllAtOnce(this.requiredServerConnections, async (connection) => {
|
|
77
77
|
if (!connection.accessible || Date.now() - connection.lastCheck.getTime() > this.connectionMaxCheckFrequency) {
|
|
78
|
-
await connection.apiService.checkServerAvailability(issuer).catch(() => {
|
|
78
|
+
await connection.apiService.checkServerAvailability(issuer).catch((error) => {
|
|
79
|
+
fsm_dynamo_1.DyFM_Error.logSimple(`(checkServerConnections) "${connection.name}" server is not available` +
|
|
80
|
+
`\n baseUrl: ${connection.apiService.baseUrl}` +
|
|
81
|
+
`\n testEndpoint: ${connection.apiService.testEndpoint ?? ''}`, error);
|
|
79
82
|
connection.accessible = false;
|
|
80
83
|
}).then(() => {
|
|
81
84
|
connection.accessible = true;
|
|
@@ -84,7 +87,7 @@ class DyNTS_ServerStatus_ControlService extends singleton_service_1.DyNTS_Single
|
|
|
84
87
|
connection.lastCheck = new Date();
|
|
85
88
|
}
|
|
86
89
|
connections[connection.name] = connection.accessible ? fsm_dynamo_1.DyFM_ServerConnection_Status.accessible : fsm_dynamo_1.DyFM_ServerConnection_Status.unaccessible;
|
|
87
|
-
}
|
|
90
|
+
});
|
|
88
91
|
return connections;
|
|
89
92
|
}
|
|
90
93
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-status.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/server/server-status/server-status.control-service.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"server-status.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/server/server-status/server-status.control-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"AAeA,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;mBAqKL,YAAY;mBA4BZ,MAAM;mBAwBN,GAAG;IAwBxB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAyBvB,OAAO,CAAC,MAAM,CAAC,gBAAgB;IA2D/B,OAAO,CAAC,MAAM,CAAC,eAAe;
|
|
1
|
+
{"version":3,"file":"api.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/api.service.ts"],"names":[],"mappings":"AAeA,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;mBAqKL,YAAY;mBA4BZ,MAAM;mBAwBN,GAAG;IAwBxB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAyBvB,OAAO,CAAC,MAAM,CAAC,gBAAgB;IA2D/B,OAAO,CAAC,MAAM,CAAC,eAAe;IA2D9B,OAAO,CAAC,MAAM,CAAC,wBAAwB;CAexC"}
|
|
@@ -45,7 +45,7 @@ class DyNTS_ApiService {
|
|
|
45
45
|
callParams.pathParamKeys.forEach(key => {
|
|
46
46
|
if (!inputParams?.pathParams?.[key]) {
|
|
47
47
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
48
|
-
...this._getDefaultErrorSettings('startApiCall', new Error(`missing pathParam: "${key}"`)),
|
|
48
|
+
...this._getDefaultErrorSettings('startApiCall', new Error(`missing pathParam: "${key}" (${callParams.name})`)),
|
|
49
49
|
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-API-SAC1`,
|
|
50
50
|
});
|
|
51
51
|
}
|
|
@@ -55,7 +55,7 @@ class DyNTS_ApiService {
|
|
|
55
55
|
this.setupAxiosConfig(callParams, axios);
|
|
56
56
|
}
|
|
57
57
|
if (inputParams?.pathParams) {
|
|
58
|
-
url = this.setupPathParams(inputParams.pathParams, url);
|
|
58
|
+
url = this.setupPathParams(inputParams.pathParams, url, callParams);
|
|
59
59
|
}
|
|
60
60
|
/* if (inputParams?.queryParams) {
|
|
61
61
|
this.setupQueryParams<T_Body>(inputParams, callParams);
|
|
@@ -379,7 +379,7 @@ class DyNTS_ApiService {
|
|
|
379
379
|
axios.defaults.responseType = callParams.httpOptions.responseType;
|
|
380
380
|
}
|
|
381
381
|
}
|
|
382
|
-
static setupPathParams(pathParams, url) {
|
|
382
|
+
static setupPathParams(pathParams, url, callParams) {
|
|
383
383
|
for (const pathParamKey in pathParams) {
|
|
384
384
|
if (pathParams[pathParamKey]) {
|
|
385
385
|
const paramType = typeof pathParams[pathParamKey];
|
|
@@ -400,7 +400,7 @@ class DyNTS_ApiService {
|
|
|
400
400
|
new Error()
|
|
401
401
|
); */
|
|
402
402
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
403
|
-
...this._getDefaultErrorSettings('setupPathParams', new Error(`wrong path param type: (${pathParamKey}): "${paramType}"` +
|
|
403
|
+
...this._getDefaultErrorSettings('setupPathParams', new Error(`wrong path param type: (${pathParamKey}): "${paramType}" (${callParams.name})` +
|
|
404
404
|
`\n${pathParams[pathParamKey]}`)),
|
|
405
405
|
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-API-SP1`,
|
|
406
406
|
additionalContent: {
|
|
@@ -412,7 +412,7 @@ class DyNTS_ApiService {
|
|
|
412
412
|
}
|
|
413
413
|
else {
|
|
414
414
|
throw new fsm_dynamo_1.DyFM_Error({
|
|
415
|
-
...this._getDefaultErrorSettings('setupPathParams', new Error(`missing pathParam: "${pathParamKey}"`)),
|
|
415
|
+
...this._getDefaultErrorSettings('setupPathParams', new Error(`missing pathParam: "${pathParamKey}" (${callParams.name})`)),
|
|
416
416
|
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-API-SP0`,
|
|
417
417
|
});
|
|
418
418
|
}
|
|
@@ -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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"}
|
|
@@ -28,6 +28,8 @@ export declare class DyNTS_GlobalService extends DyNTS_SingletonService {
|
|
|
28
28
|
*/
|
|
29
29
|
static setServices(set: DyNTS_GlobalService_Settings): Promise<void>;
|
|
30
30
|
private static setDBServices;
|
|
31
|
+
static createDBService(dbModel: DyFM_DataModel_Params<any>): void;
|
|
32
|
+
static unmountDBService(dbModel: DyFM_DataModel_Params<any>): void;
|
|
31
33
|
private static setAuthService;
|
|
32
34
|
private static setEmailServices;
|
|
33
35
|
private static setErrorHandler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/global.service.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EAEb,qBAAqB,EAErB,mBAAmB,EAGnB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uDAAuD,CAAC;AAEzF,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC7B,MAAM,4DAA4D,CAAC;AAEpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAGxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAInE;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,sBAAsB;IAE7D,MAAM,CAAC,WAAW,IAAI,mBAAmB;IAIzC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAmB;IACzC,MAAM,KAAK,MAAM,IAAI,gBAAgB,CAEpC;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IACpD,MAAM,KAAK,OAAO,IAAI,IAAI,CAEzB;IACD,MAAM,KAAK,MAAM,IAAI,MAAM,CAE1B;IAED,WAAW,EAAE,iBAAiB,CAAC;IAC/B,mBAAmB,EAAE,wBAAwB,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;IAEpE,sBAAsB,EAAE,wBAAwB,CAAC,kBAAkB,CAAC,CAAC;IAErE,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAEY;IAEvD,MAAM,CAAC,kBAAkB,EAAE,0BAA0B,CAGlD;IAEH;;OAEG;WACU,WAAW,CAAC,GAAG,EAAE,4BAA4B,GAAG,OAAO,CAAC,IAAI,CAAC;mBAoBrD,aAAa;
|
|
1
|
+
{"version":3,"file":"global.service.d.ts","sourceRoot":"","sources":["../../../src/_services/core/global.service.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EAEb,qBAAqB,EAErB,mBAAmB,EAGnB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uDAAuD,CAAC;AAEzF,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC7B,MAAM,4DAA4D,CAAC;AAEpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAGxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAInE;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,sBAAsB;IAE7D,MAAM,CAAC,WAAW,IAAI,mBAAmB;IAIzC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAmB;IACzC,MAAM,KAAK,MAAM,IAAI,gBAAgB,CAEpC;IAED,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IACpD,MAAM,KAAK,OAAO,IAAI,IAAI,CAEzB;IACD,MAAM,KAAK,MAAM,IAAI,MAAM,CAE1B;IAED,WAAW,EAAE,iBAAiB,CAAC;IAC/B,mBAAmB,EAAE,wBAAwB,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;IAEpE,sBAAsB,EAAE,wBAAwB,CAAC,kBAAkB,CAAC,CAAC;IAErE,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAEY;IAEvD,MAAM,CAAC,kBAAkB,EAAE,0BAA0B,CAGlD;IAEH;;OAEG;WACU,WAAW,CAAC,GAAG,EAAE,4BAA4B,GAAG,OAAO,CAAC,IAAI,CAAC;mBAoBrD,aAAa;IAqDlC,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,qBAAqB,CAAC,GAAG,CAAC,GAAG,IAAI;IAkDjE,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,qBAAqB,CAAC,GAAG,CAAC,GAAG,IAAI;mBAgB7C,cAAc;mBAgBd,gBAAgB;mBAuBhB,eAAe;IA0CpC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI;IAIhD;;;OAGG;IACH,MAAM,CAAC,cAAc,IAAI,iBAAiB;IAc1C;;;OAGG;IACH,MAAM,CAAC,sBAAsB,IAAI,wBAAwB,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;IAe/E;;;;OAIG;IACH,MAAM,CAAC,YAAY,CAAC,CAAC,SAAS,aAAa,EACzC,UAAU,EAAE,qBAAqB,CAAC,CAAC,CAAC,GACnC,eAAe,CAAC,CAAC,CAAC;IAIrB;;;;OAIG;IACH,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC;IAiBlF;;;OAGG;IACH,MAAM,CAAC,yBAAyB,IAAI,wBAAwB,CAAC,kBAAkB,CAAC;IAiBhF;;;OAGG;IAaH;;;;OAIG;IAiCH,SAAS,CAAC,MAAM,CAAC,uBAAuB,CACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,MAAM,GACb,mBAAmB;CAavB"}
|
|
@@ -82,33 +82,7 @@ class DyNTS_GlobalService extends singleton_service_1.DyNTS_SingletonService {
|
|
|
82
82
|
}
|
|
83
83
|
});
|
|
84
84
|
dbModels?.forEach((dbModel) => {
|
|
85
|
-
|
|
86
|
-
throw new fsm_dynamo_1.DyFM_Error({
|
|
87
|
-
...this.getDefaultErrorSettings('setDBServices', new Error(`"${dbModel.dataName}" dbModel is not constructed!` +
|
|
88
|
-
`\n use new DyFM_DataModel_Params() to properly construct it.`), 'DyNTS_GlobalService'),
|
|
89
|
-
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-GS0-SDBS1`,
|
|
90
|
-
additionalContent: {
|
|
91
|
-
dbModel: dbModel,
|
|
92
|
-
},
|
|
93
|
-
});
|
|
94
|
-
}
|
|
95
|
-
try {
|
|
96
|
-
this.instance.dbServiceCollection[dbModel.dataName] = new db_service_1.DyNTS_DBService(dbModel);
|
|
97
|
-
}
|
|
98
|
-
catch (error) {
|
|
99
|
-
if (error instanceof fsm_dynamo_1.DyFM_Error && !fsm_dynamo_1.DyFM_global_settings.log_settings.highDetailedLogs) {
|
|
100
|
-
error.logSimple(`Failed to create DyNTS_DBService (${dbModel.dataName}).`);
|
|
101
|
-
}
|
|
102
|
-
else {
|
|
103
|
-
fsm_dynamo_1.DyFM_Log.error(`Failed to create DyNTS_DBService (${dbModel.dataName}).`, error);
|
|
104
|
-
}
|
|
105
|
-
throw new fsm_dynamo_1.DyFM_Error({
|
|
106
|
-
...this.getDefaultErrorSettings('setDBServices', error, 'DyNTS_GlobalService'),
|
|
107
|
-
additionalContent: {
|
|
108
|
-
dbModel: dbModel,
|
|
109
|
-
},
|
|
110
|
-
});
|
|
111
|
-
}
|
|
85
|
+
this.createDBService(dbModel);
|
|
112
86
|
});
|
|
113
87
|
if (fsm_dynamo_1.DyFM_global_settings.log_settings.dbSetup) {
|
|
114
88
|
fsm_dynamo_1.DyFM_Log.info(`DB Services setup complete. DB Models:`, `\n ${Object.keys(this.instance.dbServiceCollection).join('\n ')}`);
|
|
@@ -121,6 +95,60 @@ class DyNTS_GlobalService extends singleton_service_1.DyNTS_SingletonService {
|
|
|
121
95
|
});
|
|
122
96
|
}
|
|
123
97
|
}
|
|
98
|
+
static createDBService(dbModel) {
|
|
99
|
+
try {
|
|
100
|
+
if (!dbModel.constructed) {
|
|
101
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
102
|
+
...this.getDefaultErrorSettings('setDBServices', new Error(`"${dbModel.dataName}" dbModel is not constructed!` +
|
|
103
|
+
`\n use new DyFM_DataModel_Params() to properly construct it.`), 'DyNTS_GlobalService'),
|
|
104
|
+
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-GS0-CDBS1`,
|
|
105
|
+
additionalContent: {
|
|
106
|
+
dbModel: dbModel,
|
|
107
|
+
},
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
if (this.instance.dbServiceCollection[dbModel.dataName]) {
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
try {
|
|
114
|
+
this.instance.dbServiceCollection[dbModel.dataName] = new db_service_1.DyNTS_DBService(dbModel);
|
|
115
|
+
}
|
|
116
|
+
catch (error) {
|
|
117
|
+
if (error instanceof fsm_dynamo_1.DyFM_Error && !fsm_dynamo_1.DyFM_global_settings.log_settings.highDetailedLogs) {
|
|
118
|
+
error.logSimple(`Failed to create DyNTS_DBService (${dbModel.dataName}).`);
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
fsm_dynamo_1.DyFM_Log.error(`Failed to create DyNTS_DBService (${dbModel.dataName}).`, error);
|
|
122
|
+
}
|
|
123
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
124
|
+
...this.getDefaultErrorSettings('setDBServices', error, 'DyNTS_GlobalService'),
|
|
125
|
+
additionalContent: {
|
|
126
|
+
dbModel: dbModel,
|
|
127
|
+
},
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
catch (error) {
|
|
132
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
133
|
+
...this.getDefaultErrorSettings('createDBService', error, 'DyNTS_GlobalService'),
|
|
134
|
+
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-GS0-SDBS0`,
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
static unmountDBService(dbModel) {
|
|
139
|
+
try {
|
|
140
|
+
if (!this.instance.dbServiceCollection[dbModel.dataName]) {
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
delete this.instance.dbServiceCollection[dbModel.dataName];
|
|
144
|
+
}
|
|
145
|
+
catch (error) {
|
|
146
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
147
|
+
...this.getDefaultErrorSettings('unmountDBService', error, 'DyNTS_GlobalService'),
|
|
148
|
+
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-GS0-UDBS0`,
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
}
|
|
124
152
|
static async setAuthService(authService) {
|
|
125
153
|
try {
|
|
126
154
|
if (!authService) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global.service.js","sourceRoot":"","sources":["../../../src/_services/core/global.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"global.service.js","sourceRoot":"","sources":["../../../src/_services/core/global.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@futdevpro/nts-dynamo",
|
|
3
|
-
"version": "01.14.
|
|
3
|
+
"version": "01.14.56",
|
|
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",
|
|
@@ -28,6 +28,7 @@
|
|
|
28
28
|
|
|
29
29
|
"test": "npm run build-base && jasmine",
|
|
30
30
|
"test-clean": "npm run build-clean && jasmine",
|
|
31
|
+
"test:coverage": "npx c8 --reporter=html --reporter=text --reporter=lcov node scripts/run-coverage-tests.js",
|
|
31
32
|
"start-clean": "npm run clean && npm run start",
|
|
32
33
|
"nodemon-run": "npm run build-tgz",
|
|
33
34
|
"lint": "eslint src --ext .ts",
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
const { execSync } = require('child_process');
|
|
2
|
+
const path = require('path');
|
|
3
|
+
|
|
4
|
+
const configPath = path.join(__dirname, '../spec/support/jasmine.coverage.json');
|
|
5
|
+
const tsNodeRegister = require.resolve('ts-node/register/transpile-only');
|
|
6
|
+
|
|
7
|
+
const env = {
|
|
8
|
+
...process.env,
|
|
9
|
+
NODE_OPTIONS: `--require ${tsNodeRegister}`
|
|
10
|
+
};
|
|
11
|
+
|
|
12
|
+
try {
|
|
13
|
+
execSync(`npx jasmine --config="${configPath}"`, {
|
|
14
|
+
stdio: 'inherit',
|
|
15
|
+
cwd: path.join(__dirname, '..'),
|
|
16
|
+
shell: true,
|
|
17
|
+
env: env
|
|
18
|
+
});
|
|
19
|
+
} catch (error) {
|
|
20
|
+
// Exit with the same status code as jasmine (3 = test failures, 1 = other errors)
|
|
21
|
+
// This allows c8 to still generate coverage reports even if tests fail
|
|
22
|
+
process.exit(error.status || 1);
|
|
23
|
+
}
|
|
24
|
+
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
{
|
|
2
|
+
"reporters": [
|
|
3
|
+
{
|
|
4
|
+
"name": "jasmine-json-reporter",
|
|
5
|
+
"options": {
|
|
6
|
+
"pretty": true
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
],
|
|
10
|
+
"spec_dir": "src/",
|
|
11
|
+
"spec_files": [
|
|
12
|
+
"**/*.spec.ts",
|
|
13
|
+
"**/*[sS]pec.ts"
|
|
14
|
+
],
|
|
15
|
+
"helpers": [
|
|
16
|
+
"../../spec/support/helpers/ts-node-helper.js"
|
|
17
|
+
],
|
|
18
|
+
"env": {
|
|
19
|
+
"stopSpecOnExpectationFailure": false,
|
|
20
|
+
"random": true
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { megabyte, second } from '@futdevpro/fsm-dynamo';
|
|
1
2
|
import { DyNTS_Msg_Global_Settings } from '../_models/msg-global-settings.interface';
|
|
2
3
|
|
|
3
4
|
/**
|
|
@@ -9,13 +10,13 @@ export const DyNTS_Msg_global_settings: DyNTS_Msg_Global_Settings = {
|
|
|
9
10
|
enableThreading: true,
|
|
10
11
|
enableReactions: true,
|
|
11
12
|
enableAttachments: true,
|
|
12
|
-
maxAttachmentSize: 10 *
|
|
13
|
+
maxAttachmentSize: 10 * megabyte, // 10MB
|
|
13
14
|
enableMentions: true,
|
|
14
15
|
enableReadReceipts: true,
|
|
15
16
|
enableTypingIndicators: true,
|
|
16
17
|
|
|
17
18
|
retry: {
|
|
18
19
|
maxRetries: 3,
|
|
19
|
-
retryDelay:
|
|
20
|
+
retryDelay: second, // 1 second
|
|
20
21
|
},
|
|
21
22
|
};
|
|
@@ -6,7 +6,8 @@ import {
|
|
|
6
6
|
DyFM_Paged,
|
|
7
7
|
hour, minute,
|
|
8
8
|
DyFM_ServerConnectionCheckResult,
|
|
9
|
-
DyFM_ServerConnection_Status
|
|
9
|
+
DyFM_ServerConnection_Status,
|
|
10
|
+
DyFM_Array
|
|
10
11
|
} from '@futdevpro/fsm-dynamo';
|
|
11
12
|
import { Subscription, timer } from 'rxjs';
|
|
12
13
|
|
|
@@ -18,7 +19,7 @@ import { DyNTS_ServerStatusSnapshot_ControlService } from './server-status-snaps
|
|
|
18
19
|
import { DyNTS_GlobalService } from '../../../_services/core/global.service';
|
|
19
20
|
import { DyNTS_ApiService_Base } from '../../../_services/base/api.service-base';
|
|
20
21
|
|
|
21
|
-
interface DyNTS_ServerConnection {
|
|
22
|
+
export interface DyNTS_ServerConnection {
|
|
22
23
|
name: string,
|
|
23
24
|
apiService: DyNTS_ApiService_Base,
|
|
24
25
|
accessible?: boolean,
|
|
@@ -124,19 +125,28 @@ export abstract class DyNTS_ServerStatus_ControlService<
|
|
|
124
125
|
try {
|
|
125
126
|
const connections: DyFM_ServerConnectionCheckResult = {};
|
|
126
127
|
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
128
|
+
await DyFM_Array.asyncForEachAllAtOnce(
|
|
129
|
+
this.requiredServerConnections,
|
|
130
|
+
async (connection: DyNTS_ServerConnection) => {
|
|
131
|
+
if (!connection.accessible || Date.now() - connection.lastCheck.getTime() > this.connectionMaxCheckFrequency) {
|
|
132
|
+
await connection.apiService.checkServerAvailability(issuer).catch((error) => {
|
|
133
|
+
DyFM_Error.logSimple(
|
|
134
|
+
`(checkServerConnections) "${connection.name}" server is not available` +
|
|
135
|
+
`\n baseUrl: ${connection.apiService.baseUrl}` +
|
|
136
|
+
`\n testEndpoint: ${connection.apiService.testEndpoint ?? ''}`,
|
|
137
|
+
error
|
|
138
|
+
);
|
|
139
|
+
connection.accessible = false;
|
|
140
|
+
}).then(() => {
|
|
141
|
+
connection.accessible = true;
|
|
142
|
+
});
|
|
132
143
|
connection.accessible = true;
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
connection.lastCheck = new Date();
|
|
136
|
-
}
|
|
144
|
+
connection.lastCheck = new Date();
|
|
145
|
+
}
|
|
137
146
|
|
|
138
|
-
|
|
139
|
-
|
|
147
|
+
connections[connection.name] = connection.accessible ? DyFM_ServerConnection_Status.accessible : DyFM_ServerConnection_Status.unaccessible;
|
|
148
|
+
}
|
|
149
|
+
)
|
|
140
150
|
|
|
141
151
|
return connections;
|
|
142
152
|
} catch (error) {
|
|
@@ -80,7 +80,7 @@ export class DyNTS_ApiService {
|
|
|
80
80
|
throw new DyFM_Error({
|
|
81
81
|
...this._getDefaultErrorSettings(
|
|
82
82
|
'startApiCall',
|
|
83
|
-
new Error(`missing pathParam: "${key}"`)
|
|
83
|
+
new Error(`missing pathParam: "${key}" (${callParams.name})`)
|
|
84
84
|
),
|
|
85
85
|
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-API-SAC1`,
|
|
86
86
|
});
|
|
@@ -93,7 +93,7 @@ export class DyNTS_ApiService {
|
|
|
93
93
|
}
|
|
94
94
|
|
|
95
95
|
if (inputParams?.pathParams) {
|
|
96
|
-
url = this.setupPathParams(inputParams.pathParams, url);
|
|
96
|
+
url = this.setupPathParams(inputParams.pathParams, url, callParams);
|
|
97
97
|
}
|
|
98
98
|
|
|
99
99
|
/* if (inputParams?.queryParams) {
|
|
@@ -530,7 +530,8 @@ export class DyNTS_ApiService {
|
|
|
530
530
|
|
|
531
531
|
private static setupPathParams(
|
|
532
532
|
pathParams: { [param: string]: string; },
|
|
533
|
-
url: string
|
|
533
|
+
url: string,
|
|
534
|
+
callParams: DyNTS_ApiCall_Params
|
|
534
535
|
): string {
|
|
535
536
|
for (const pathParamKey in pathParams) {
|
|
536
537
|
if (pathParams[pathParamKey]) {
|
|
@@ -561,7 +562,7 @@ export class DyNTS_ApiService {
|
|
|
561
562
|
...this._getDefaultErrorSettings(
|
|
562
563
|
'setupPathParams',
|
|
563
564
|
new Error(
|
|
564
|
-
`wrong path param type: (${pathParamKey}): "${paramType}"` +
|
|
565
|
+
`wrong path param type: (${pathParamKey}): "${paramType}" (${callParams.name})` +
|
|
565
566
|
`\n${pathParams[pathParamKey]}`
|
|
566
567
|
)
|
|
567
568
|
),
|
|
@@ -576,7 +577,7 @@ export class DyNTS_ApiService {
|
|
|
576
577
|
throw new DyFM_Error({
|
|
577
578
|
...this._getDefaultErrorSettings(
|
|
578
579
|
'setupPathParams',
|
|
579
|
-
new Error(`missing pathParam: "${pathParamKey}"`)
|
|
580
|
+
new Error(`missing pathParam: "${pathParamKey}" (${callParams.name})`)
|
|
580
581
|
),
|
|
581
582
|
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-API-SP0`,
|
|
582
583
|
});
|
|
@@ -125,41 +125,7 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
|
|
|
125
125
|
});
|
|
126
126
|
|
|
127
127
|
dbModels?.forEach((dbModel: DyFM_DataModel_Params<any>): void => {
|
|
128
|
-
|
|
129
|
-
throw new DyFM_Error({
|
|
130
|
-
...this.getDefaultErrorSettings(
|
|
131
|
-
'setDBServices',
|
|
132
|
-
new Error(
|
|
133
|
-
`"${dbModel.dataName}" dbModel is not constructed!` +
|
|
134
|
-
`\n use new DyFM_DataModel_Params() to properly construct it.`
|
|
135
|
-
),
|
|
136
|
-
'DyNTS_GlobalService'
|
|
137
|
-
),
|
|
138
|
-
|
|
139
|
-
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-GS0-SDBS1`,
|
|
140
|
-
additionalContent: {
|
|
141
|
-
dbModel: dbModel,
|
|
142
|
-
},
|
|
143
|
-
});
|
|
144
|
-
}
|
|
145
|
-
|
|
146
|
-
try {
|
|
147
|
-
this.instance.dbServiceCollection[dbModel.dataName] = new DyNTS_DBService(dbModel);
|
|
148
|
-
} catch (error) {
|
|
149
|
-
if (error instanceof DyFM_Error && !DyFM_global_settings.log_settings.highDetailedLogs) {
|
|
150
|
-
error.logSimple(`Failed to create DyNTS_DBService (${dbModel.dataName}).`);
|
|
151
|
-
} else {
|
|
152
|
-
DyFM_Log.error(`Failed to create DyNTS_DBService (${dbModel.dataName}).`, error);
|
|
153
|
-
}
|
|
154
|
-
|
|
155
|
-
throw new DyFM_Error({
|
|
156
|
-
...this.getDefaultErrorSettings('setDBServices', error, 'DyNTS_GlobalService'),
|
|
157
|
-
|
|
158
|
-
additionalContent: {
|
|
159
|
-
dbModel: dbModel,
|
|
160
|
-
},
|
|
161
|
-
});
|
|
162
|
-
}
|
|
128
|
+
this.createDBService(dbModel);
|
|
163
129
|
});
|
|
164
130
|
|
|
165
131
|
if (DyFM_global_settings.log_settings.dbSetup) {
|
|
@@ -177,6 +143,72 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
|
|
|
177
143
|
}
|
|
178
144
|
}
|
|
179
145
|
|
|
146
|
+
static createDBService(dbModel: DyFM_DataModel_Params<any>): void {
|
|
147
|
+
try {
|
|
148
|
+
if (!dbModel.constructed) {
|
|
149
|
+
throw new DyFM_Error({
|
|
150
|
+
...this.getDefaultErrorSettings(
|
|
151
|
+
'setDBServices',
|
|
152
|
+
new Error(
|
|
153
|
+
`"${dbModel.dataName}" dbModel is not constructed!` +
|
|
154
|
+
`\n use new DyFM_DataModel_Params() to properly construct it.`
|
|
155
|
+
),
|
|
156
|
+
'DyNTS_GlobalService'
|
|
157
|
+
),
|
|
158
|
+
|
|
159
|
+
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-GS0-CDBS1`,
|
|
160
|
+
additionalContent: {
|
|
161
|
+
dbModel: dbModel,
|
|
162
|
+
},
|
|
163
|
+
});
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
if (this.instance.dbServiceCollection[dbModel.dataName]) {
|
|
167
|
+
return;
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
try {
|
|
171
|
+
this.instance.dbServiceCollection[dbModel.dataName] = new DyNTS_DBService(dbModel);
|
|
172
|
+
} catch (error) {
|
|
173
|
+
if (error instanceof DyFM_Error && !DyFM_global_settings.log_settings.highDetailedLogs) {
|
|
174
|
+
error.logSimple(`Failed to create DyNTS_DBService (${dbModel.dataName}).`);
|
|
175
|
+
} else {
|
|
176
|
+
DyFM_Log.error(`Failed to create DyNTS_DBService (${dbModel.dataName}).`, error);
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
throw new DyFM_Error({
|
|
180
|
+
...this.getDefaultErrorSettings('setDBServices', error, 'DyNTS_GlobalService'),
|
|
181
|
+
|
|
182
|
+
additionalContent: {
|
|
183
|
+
dbModel: dbModel,
|
|
184
|
+
},
|
|
185
|
+
});
|
|
186
|
+
}
|
|
187
|
+
} catch (error) {
|
|
188
|
+
throw new DyFM_Error({
|
|
189
|
+
...this.getDefaultErrorSettings('createDBService', error, 'DyNTS_GlobalService'),
|
|
190
|
+
|
|
191
|
+
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-GS0-SDBS0`,
|
|
192
|
+
});
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
static unmountDBService(dbModel: DyFM_DataModel_Params<any>): void {
|
|
197
|
+
try {
|
|
198
|
+
if (!this.instance.dbServiceCollection[dbModel.dataName]) {
|
|
199
|
+
return;
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
delete this.instance.dbServiceCollection[dbModel.dataName];
|
|
203
|
+
} catch (error) {
|
|
204
|
+
throw new DyFM_Error({
|
|
205
|
+
...this.getDefaultErrorSettings('unmountDBService', error, 'DyNTS_GlobalService'),
|
|
206
|
+
|
|
207
|
+
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-GS0-UDBS0`,
|
|
208
|
+
});
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
|
|
180
212
|
private static async setAuthService(authService?: DyNTS_AuthService): Promise<void> {
|
|
181
213
|
try {
|
|
182
214
|
if (!authService) {
|