@futdevpro/nts-dynamo 1.12.6 → 1.12.7
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/.github/workflows/main.yml +3 -3
- package/build/_models/interfaces/global-settings.interface.d.ts +4 -0
- package/build/_models/interfaces/global-settings.interface.d.ts.map +1 -1
- package/build/_services/route/routing-module.service.d.ts.map +1 -1
- package/build/_services/route/routing-module.service.js +72 -1
- package/build/_services/route/routing-module.service.js.map +1 -1
- package/build/_services/route/routing-module.service.spec.js +1 -1
- package/package.json +1 -1
- package/src/_collections/global-settings.const.ts +1 -1
- package/src/_models/interfaces/global-settings.interface.ts +5 -0
- package/src/_services/route/routing-module.service.spec.ts +1 -1
- package/src/_services/route/routing-module.service.ts +102 -3
|
@@ -288,7 +288,7 @@ jobs:
|
|
|
288
288
|
"projects": [
|
|
289
289
|
{
|
|
290
290
|
"environment": "prod",
|
|
291
|
-
"
|
|
291
|
+
"stepResults": [
|
|
292
292
|
{
|
|
293
293
|
"stepName": "checkDevLeftovers",
|
|
294
294
|
"resultCode": "${{ needs.check_dev_leftovers.result }}",
|
|
@@ -344,6 +344,8 @@ jobs:
|
|
|
344
344
|
RUN_ID: ${{ github.run_id }}
|
|
345
345
|
REPOSITORY: ${{ github.repository }}
|
|
346
346
|
START_TIME: ${{ needs.notification0.outputs.start }}
|
|
347
|
+
DISCORD_WEBHOOK_ID: ${{ secrets.DISCORD_WEBHOOK_ID }}
|
|
348
|
+
DISCORD_WEBHOOK_TOKEN: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
|
|
347
349
|
STEPS_CONFIG: |
|
|
348
350
|
[
|
|
349
351
|
{
|
|
@@ -378,8 +380,6 @@ jobs:
|
|
|
378
380
|
"resultCode": "${{ needs.build_report.result }}"
|
|
379
381
|
}
|
|
380
382
|
]
|
|
381
|
-
DISCORD_WEBHOOK_ID: ${{ secrets.DISCORD_WEBHOOK_ID }}
|
|
382
|
-
DISCORD_WEBHOOK_TOKEN: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
|
|
383
383
|
|
|
384
384
|
|
|
385
385
|
|
|
@@ -37,6 +37,10 @@ export interface DyNTS_Global_Settings {
|
|
|
37
37
|
* this is the version of the system, this will be used for the logs and errors
|
|
38
38
|
*/
|
|
39
39
|
systemVersion: string;
|
|
40
|
+
/**
|
|
41
|
+
* this setting will set if the default route should be created
|
|
42
|
+
*/
|
|
43
|
+
dontCreateDefaultRoute?: boolean;
|
|
40
44
|
/**
|
|
41
45
|
*
|
|
42
46
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-settings.interface.d.ts","sourceRoot":"","sources":["../../../src/_models/interfaces/global-settings.interface.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAE9E;;;;;;;GAOG;AACH,MAAM,WAAW,qBAAqB;IAEpC,YAAY,EAAE,0BAA0B,CAAC;IAEzC;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,oBAAoB,EAAE,mBAAmB,CAAC;IAC1C;;OAEG;IACH,qBAAqB,EAAE,oBAAoB,CAAC;IAE5C;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,oCAAoC,EAAE,OAAO,CAAC;IAE9C;;OAEG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAE9B;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;OAEG;IAGH;;OAEG;IACH,YAAY,EAAE,wBAAwB,CAAC;IAEvC;;OAEG;IACH,kBAAkB,EAAE,OAAO,CAAC;IAE5B;;;;;;OAMG;IACH,YAAY,EAAE,GAAG,CAAC;IAElB;;;;;;OAMG;IACH,eAAe,EAAE,GAAG,CAAC;IAErB;;;;;;;OAOG;IACH,aAAa,EAAE,GAAG,CAAC;IAEnB;;OAEG;IACH,WAAW,EAAE;QACX,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;CACH"}
|
|
1
|
+
{"version":3,"file":"global-settings.interface.d.ts","sourceRoot":"","sources":["../../../src/_models/interfaces/global-settings.interface.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAE9E;;;;;;;GAOG;AACH,MAAM,WAAW,qBAAqB;IAEpC,YAAY,EAAE,0BAA0B,CAAC;IAEzC;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,oBAAoB,EAAE,mBAAmB,CAAC;IAC1C;;OAEG;IACH,qBAAqB,EAAE,oBAAoB,CAAC;IAE5C;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAEjC;;OAEG;IACH,oCAAoC,EAAE,OAAO,CAAC;IAE9C;;OAEG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAE9B;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;OAEG;IAGH;;OAEG;IACH,YAAY,EAAE,wBAAwB,CAAC;IAEvC;;OAEG;IACH,kBAAkB,EAAE,OAAO,CAAC;IAE5B;;;;;;OAMG;IACH,YAAY,EAAE,GAAG,CAAC;IAElB;;;;;;OAMG;IACH,eAAe,EAAE,GAAG,CAAC;IAErB;;;;;;;OAOG;IACH,aAAa,EAAE,GAAG,CAAC;IAEnB;;OAEG;IACH,WAAW,EAAE;QACX,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;CACH"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routing-module.service.d.ts","sourceRoot":"","sources":["../../../src/_services/route/routing-module.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"routing-module.service.d.ts","sourceRoot":"","sources":["../../../src/_services/route/routing-module.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,MAAM,EAAE,MAAM,SAAS,CAAC;AAWpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EACL,qBAAqB,EACtB,MAAM,4DAA4D,CAAC;AACpE,OAAO,EACL,4BAA4B,EAC7B,MAAM,4DAA4D,CAAC;AAGpE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,qBAAa,mBAAmB;IAI9B,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEvB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IACjD,SAAS,EAAE,qBAAqB,EAAE,CAAM;IAExC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAY;IACvC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAY;IAEzC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAE/B,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,mBAAmB,SAEoC;gBAGrD,GAAG,EAAE,4BAA4B;IA4CnC;;OAEG;IACH,OAAO,CAAC,WAAW;IA2HnB;;;OAGG;IACH,OAAO,CAAC,WAAW;IA4DnB;;;OAGG;IACH,OAAO,CAAC,cAAc;IAuCtB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAyCxB,OAAO,CAAC,uBAAuB;CAiBhC"}
|
|
@@ -5,6 +5,7 @@ const express_1 = require("express");
|
|
|
5
5
|
const fsm_dynamo_1 = require("@futdevpro/fsm-dynamo");
|
|
6
6
|
const global_settings_const_1 = require("../../_collections/global-settings.const");
|
|
7
7
|
const route_security_enum_1 = require("../../_enums/route-security.enum");
|
|
8
|
+
const endpoint_params_control_model_1 = require("../../_models/control-models/endpoint-params.control-model");
|
|
8
9
|
/**
|
|
9
10
|
* Routing Module
|
|
10
11
|
* Handling route setup and control
|
|
@@ -120,6 +121,75 @@ class DyNTS_RoutingModule {
|
|
|
120
121
|
this.endpoints.push(...controller.endpoints);
|
|
121
122
|
}
|
|
122
123
|
});
|
|
124
|
+
if (!global_settings_const_1.DyNTS_global_settings.dontCreateDefaultRoute &&
|
|
125
|
+
!this.endpoints.some((endpoint) => endpoint.endpoint === '/*')) {
|
|
126
|
+
this.endpoints.push(new endpoint_params_control_model_1.DyNTS_Endpoint_Params({
|
|
127
|
+
name: 'defaultGet',
|
|
128
|
+
endpoint: '/*',
|
|
129
|
+
type: fsm_dynamo_1.DyFM_HttpCallType.get,
|
|
130
|
+
tasks: [
|
|
131
|
+
async (req, res, issuer) => {
|
|
132
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
133
|
+
...this.getDefaultErrorSettings('defaultRoute', new Error(`Invalid route (404): ${req.originalUrl}`)),
|
|
134
|
+
status: 404,
|
|
135
|
+
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-RMS-G404`,
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
],
|
|
139
|
+
}), new endpoint_params_control_model_1.DyNTS_Endpoint_Params({
|
|
140
|
+
name: 'defaultPost',
|
|
141
|
+
endpoint: '/*',
|
|
142
|
+
type: fsm_dynamo_1.DyFM_HttpCallType.post,
|
|
143
|
+
tasks: [
|
|
144
|
+
async (req, res, issuer) => {
|
|
145
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
146
|
+
...this.getDefaultErrorSettings('defaultRoute', new Error(`Invalid route (404): ${req.originalUrl}`)),
|
|
147
|
+
status: 404,
|
|
148
|
+
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-RMS-PO404`,
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
],
|
|
152
|
+
}), new endpoint_params_control_model_1.DyNTS_Endpoint_Params({
|
|
153
|
+
name: 'defaultPut',
|
|
154
|
+
endpoint: '/*',
|
|
155
|
+
type: fsm_dynamo_1.DyFM_HttpCallType.put,
|
|
156
|
+
tasks: [
|
|
157
|
+
async (req, res, issuer) => {
|
|
158
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
159
|
+
...this.getDefaultErrorSettings('defaultRoute', new Error(`Invalid route (404): ${req.originalUrl}`)),
|
|
160
|
+
status: 404,
|
|
161
|
+
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-RMS-PU404`,
|
|
162
|
+
});
|
|
163
|
+
}
|
|
164
|
+
],
|
|
165
|
+
}), new endpoint_params_control_model_1.DyNTS_Endpoint_Params({
|
|
166
|
+
name: 'defaultPatch',
|
|
167
|
+
endpoint: '/*',
|
|
168
|
+
type: fsm_dynamo_1.DyFM_HttpCallType.patch,
|
|
169
|
+
tasks: [
|
|
170
|
+
async (req, res, issuer) => {
|
|
171
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
172
|
+
...this.getDefaultErrorSettings('defaultRoute', new Error(`Invalid route (404): ${req.originalUrl}`)),
|
|
173
|
+
status: 404,
|
|
174
|
+
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-RMS-PA404`,
|
|
175
|
+
});
|
|
176
|
+
}
|
|
177
|
+
],
|
|
178
|
+
}), new endpoint_params_control_model_1.DyNTS_Endpoint_Params({
|
|
179
|
+
name: 'defaultDelete',
|
|
180
|
+
endpoint: '/*',
|
|
181
|
+
type: fsm_dynamo_1.DyFM_HttpCallType.delete,
|
|
182
|
+
tasks: [
|
|
183
|
+
async (req, res, issuer) => {
|
|
184
|
+
throw new fsm_dynamo_1.DyFM_Error({
|
|
185
|
+
...this.getDefaultErrorSettings('defaultRoute', new Error(`Invalid route (404): ${req.originalUrl}`)),
|
|
186
|
+
status: 404,
|
|
187
|
+
errorCode: `${global_settings_const_1.DyNTS_global_settings.systemShortCodeName}|DyNTS-RMS-D404`,
|
|
188
|
+
});
|
|
189
|
+
}
|
|
190
|
+
],
|
|
191
|
+
}));
|
|
192
|
+
}
|
|
123
193
|
}
|
|
124
194
|
/**
|
|
125
195
|
*
|
|
@@ -146,7 +216,8 @@ class DyNTS_RoutingModule {
|
|
|
146
216
|
}
|
|
147
217
|
if (this.logSetup)
|
|
148
218
|
console.log(`endpoint mount (${endpoint.security}): ${this.route}${endpoint.endpoint}`);
|
|
149
|
-
const existingEndPoints = this.endpoints.filter((e_params) => e_params.endpoint === endpoint.endpoint
|
|
219
|
+
const existingEndPoints = this.endpoints.filter((e_params) => e_params.endpoint === endpoint.endpoint &&
|
|
220
|
+
e_params.type === endpoint.type);
|
|
150
221
|
if (1 < existingEndPoints.length) {
|
|
151
222
|
const error = new Error(`ENDPOINT DUPLICATION: ${endpoint.endpoint}`);
|
|
152
223
|
const errorStack = error.stack.split('\n');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routing-module.service.js","sourceRoot":"","sources":["../../../src/_services/route/routing-module.service.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"routing-module.service.js","sourceRoot":"","sources":["../../../src/_services/route/routing-module.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ describe('| DyNTS_RoutingModule', () => {
|
|
|
26
26
|
});
|
|
27
27
|
it('| should initialize with given settings', () => {
|
|
28
28
|
expect(routingModule.route).toContain('/test');
|
|
29
|
-
expect(routingModule.endpoints.length).toBe(
|
|
29
|
+
expect(routingModule.endpoints.length).toBe(5);
|
|
30
30
|
});
|
|
31
31
|
it('| should setup routes by calling setupEndpoints on each controller', () => {
|
|
32
32
|
routingModule['setupRoutes']();
|
package/package.json
CHANGED
|
@@ -14,7 +14,7 @@ export const DyNTS_global_settings: DyNTS_Global_Settings = {
|
|
|
14
14
|
systemVersion: 'unknown-version',
|
|
15
15
|
defaultRouteSecurity: DyNTS_RouteSecurity.open,
|
|
16
16
|
defaultSocketSecurity: DyNTS_SocketSecurity.open,
|
|
17
|
-
|
|
17
|
+
|
|
18
18
|
defaultPageSize: 10,
|
|
19
19
|
archiveListAfter: 100,
|
|
20
20
|
env_settings: DyNTS_getEnvironment_settings(),
|
|
@@ -37,7 +37,7 @@ describe('| DyNTS_RoutingModule', () => {
|
|
|
37
37
|
|
|
38
38
|
it('| should initialize with given settings', () => {
|
|
39
39
|
expect(routingModule.route).toContain('/test');
|
|
40
|
-
expect(routingModule.endpoints.length).toBe(
|
|
40
|
+
expect(routingModule.endpoints.length).toBe(5);
|
|
41
41
|
});
|
|
42
42
|
|
|
43
43
|
it('| should setup routes by calling setupEndpoints on each controller', () => {
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
import { Router } from 'express';
|
|
1
|
+
import { Request, Response, Router } from 'express';
|
|
3
2
|
|
|
4
3
|
import {
|
|
5
4
|
DyFM_AnyError, DyFM_Error, DyFM_ErrorLevel, DyFM_Error_Settings,
|
|
@@ -157,6 +156,104 @@ export class DyNTS_RoutingModule {
|
|
|
157
156
|
this.endpoints.push(...controller.endpoints);
|
|
158
157
|
}
|
|
159
158
|
});
|
|
159
|
+
|
|
160
|
+
if (
|
|
161
|
+
!DyNTS_global_settings.dontCreateDefaultRoute &&
|
|
162
|
+
!this.endpoints.some((endpoint: DyNTS_Endpoint_Params): boolean => endpoint.endpoint === '/*')
|
|
163
|
+
) {
|
|
164
|
+
this.endpoints.push(
|
|
165
|
+
new DyNTS_Endpoint_Params({
|
|
166
|
+
name: 'defaultGet',
|
|
167
|
+
endpoint: '/*',
|
|
168
|
+
type: DyFM_HttpCallType.get,
|
|
169
|
+
tasks: [
|
|
170
|
+
async (req: Request, res: Response, issuer: string): Promise<void> => {
|
|
171
|
+
throw new DyFM_Error({
|
|
172
|
+
...this.getDefaultErrorSettings(
|
|
173
|
+
'defaultRoute',
|
|
174
|
+
new Error(`Invalid route (404): ${req.originalUrl}`)
|
|
175
|
+
),
|
|
176
|
+
|
|
177
|
+
status: 404,
|
|
178
|
+
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-RMS-G404`,
|
|
179
|
+
});
|
|
180
|
+
}
|
|
181
|
+
],
|
|
182
|
+
}),
|
|
183
|
+
new DyNTS_Endpoint_Params({
|
|
184
|
+
name: 'defaultPost',
|
|
185
|
+
endpoint: '/*',
|
|
186
|
+
type: DyFM_HttpCallType.post,
|
|
187
|
+
tasks: [
|
|
188
|
+
async (req: Request, res: Response, issuer: string): Promise<void> => {
|
|
189
|
+
throw new DyFM_Error({
|
|
190
|
+
...this.getDefaultErrorSettings(
|
|
191
|
+
'defaultRoute',
|
|
192
|
+
new Error(`Invalid route (404): ${req.originalUrl}`)
|
|
193
|
+
),
|
|
194
|
+
|
|
195
|
+
status: 404,
|
|
196
|
+
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-RMS-PO404`,
|
|
197
|
+
});
|
|
198
|
+
}
|
|
199
|
+
],
|
|
200
|
+
}),
|
|
201
|
+
new DyNTS_Endpoint_Params({
|
|
202
|
+
name: 'defaultPut',
|
|
203
|
+
endpoint: '/*',
|
|
204
|
+
type: DyFM_HttpCallType.put,
|
|
205
|
+
tasks: [
|
|
206
|
+
async (req: Request, res: Response, issuer: string): Promise<void> => {
|
|
207
|
+
throw new DyFM_Error({
|
|
208
|
+
...this.getDefaultErrorSettings(
|
|
209
|
+
'defaultRoute',
|
|
210
|
+
new Error(`Invalid route (404): ${req.originalUrl}`)
|
|
211
|
+
),
|
|
212
|
+
|
|
213
|
+
status: 404,
|
|
214
|
+
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-RMS-PU404`,
|
|
215
|
+
});
|
|
216
|
+
}
|
|
217
|
+
],
|
|
218
|
+
}),
|
|
219
|
+
new DyNTS_Endpoint_Params({
|
|
220
|
+
name: 'defaultPatch',
|
|
221
|
+
endpoint: '/*',
|
|
222
|
+
type: DyFM_HttpCallType.patch,
|
|
223
|
+
tasks: [
|
|
224
|
+
async (req: Request, res: Response, issuer: string): Promise<void> => {
|
|
225
|
+
throw new DyFM_Error({
|
|
226
|
+
...this.getDefaultErrorSettings(
|
|
227
|
+
'defaultRoute',
|
|
228
|
+
new Error(`Invalid route (404): ${req.originalUrl}`)
|
|
229
|
+
),
|
|
230
|
+
|
|
231
|
+
status: 404,
|
|
232
|
+
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-RMS-PA404`,
|
|
233
|
+
});
|
|
234
|
+
}
|
|
235
|
+
],
|
|
236
|
+
}),
|
|
237
|
+
new DyNTS_Endpoint_Params({
|
|
238
|
+
name: 'defaultDelete',
|
|
239
|
+
endpoint: '/*',
|
|
240
|
+
type: DyFM_HttpCallType.delete,
|
|
241
|
+
tasks: [
|
|
242
|
+
async (req: Request, res: Response, issuer: string): Promise<void> => {
|
|
243
|
+
throw new DyFM_Error({
|
|
244
|
+
...this.getDefaultErrorSettings(
|
|
245
|
+
'defaultRoute',
|
|
246
|
+
new Error(`Invalid route (404): ${req.originalUrl}`)
|
|
247
|
+
),
|
|
248
|
+
|
|
249
|
+
status: 404,
|
|
250
|
+
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-RMS-D404`,
|
|
251
|
+
});
|
|
252
|
+
}
|
|
253
|
+
],
|
|
254
|
+
})
|
|
255
|
+
);
|
|
256
|
+
}
|
|
160
257
|
}
|
|
161
258
|
|
|
162
259
|
/**
|
|
@@ -185,7 +282,9 @@ export class DyNTS_RoutingModule {
|
|
|
185
282
|
`endpoint mount (${endpoint.security}): ${this.route}${endpoint.endpoint}`
|
|
186
283
|
);
|
|
187
284
|
const existingEndPoints: DyNTS_Endpoint_Params[] = this.endpoints.filter(
|
|
188
|
-
(e_params: DyNTS_Endpoint_Params): boolean =>
|
|
285
|
+
(e_params: DyNTS_Endpoint_Params): boolean =>
|
|
286
|
+
e_params.endpoint === endpoint.endpoint &&
|
|
287
|
+
e_params.type === endpoint.type
|
|
189
288
|
);
|
|
190
289
|
|
|
191
290
|
if (1 < existingEndPoints.length) {
|