@servicelabsco/nestjs-utility-services 1.2.41 → 1.2.43
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/dist/platformUtility/commands/sqs.worker.command.d.ts +1 -1
- package/dist/platformUtility/commands/sqs.worker.command.js +19 -5
- package/dist/platformUtility/commands/sqs.worker.command.js.map +1 -1
- package/dist/platformUtility/libraries/common.sqs.polling.d.ts +2 -1
- package/dist/platformUtility/libraries/common.sqs.polling.js +6 -6
- package/dist/platformUtility/libraries/common.sqs.polling.js.map +1 -1
- package/dist/system/commands/ses.event.tracking.command.js +2 -1
- package/dist/system/commands/ses.event.tracking.command.js.map +1 -1
- package/dist/system/services/client.credential.service.js +4 -2
- package/dist/system/services/client.credential.service.js.map +1 -1
- package/dist/system/services/internal.server.connect.service.js +1 -0
- package/dist/system/services/internal.server.connect.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -7,6 +7,6 @@ export declare class SqsWorkerCommand extends CommonSqsPolling {
|
|
|
7
7
|
protected readonly maintenanceService: MaintenanceService;
|
|
8
8
|
private readonly propertyService;
|
|
9
9
|
constructor(queueService: QueueService, maintenanceService: MaintenanceService, propertyService: PropertyService);
|
|
10
|
-
process(): Promise<void>;
|
|
10
|
+
process(type: string): Promise<void>;
|
|
11
11
|
private processJob;
|
|
12
12
|
}
|
|
@@ -8,6 +8,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.SqsWorkerCommand = void 0;
|
|
13
16
|
const common_1 = require("@nestjs/common");
|
|
@@ -17,19 +20,23 @@ const queue_service_1 = require("../../platformUtility/services/queue.service");
|
|
|
17
20
|
const property_service_1 = require("../../system/services/property.service");
|
|
18
21
|
const common_sqs_polling_1 = require("../libraries/common.sqs.polling");
|
|
19
22
|
const maintenance_service_1 = require("./../services/maintenance.service");
|
|
23
|
+
const operation_exception_1 = require("../../common/exceptions/operation.exception");
|
|
20
24
|
let SqsWorkerCommand = class SqsWorkerCommand extends common_sqs_polling_1.CommonSqsPolling {
|
|
21
25
|
constructor(queueService, maintenanceService, propertyService) {
|
|
22
26
|
super();
|
|
23
27
|
this.queueService = queueService;
|
|
24
28
|
this.maintenanceService = maintenanceService;
|
|
25
29
|
this.propertyService = propertyService;
|
|
30
|
+
this.callingFunction = this.processJob;
|
|
26
31
|
}
|
|
27
|
-
async process() {
|
|
32
|
+
async process(type) {
|
|
28
33
|
await this.queueService.pause();
|
|
29
|
-
this.logger = new common_1.Logger(
|
|
30
|
-
this.sqsQueue = await this.propertyService.get(
|
|
34
|
+
this.logger = new common_1.Logger(`SqsWorker ${type}`);
|
|
35
|
+
this.sqsQueue = await this.propertyService.get(`sqs.${type}.url`);
|
|
31
36
|
this.logger.log(`logging queue ${this.sqsQueue}`);
|
|
32
|
-
|
|
37
|
+
if (!this.sqsQueue)
|
|
38
|
+
throw new operation_exception_1.OperationException(`Queue property sqs.${type}.url is not set`);
|
|
39
|
+
await this.handle();
|
|
33
40
|
}
|
|
34
41
|
async processJob(data) {
|
|
35
42
|
await platform_constants_1.default.jobs[data.job].handle(data.payload);
|
|
@@ -41,8 +48,15 @@ __decorate([
|
|
|
41
48
|
command: 'queue:sqs',
|
|
42
49
|
describe: 'run worker through sqs',
|
|
43
50
|
}),
|
|
51
|
+
__param(0, (0, nestjs_command_1.Option)({
|
|
52
|
+
name: 'type',
|
|
53
|
+
describe: 'sqs property name to pull',
|
|
54
|
+
type: 'string',
|
|
55
|
+
alias: 't',
|
|
56
|
+
required: true,
|
|
57
|
+
})),
|
|
44
58
|
__metadata("design:type", Function),
|
|
45
|
-
__metadata("design:paramtypes", []),
|
|
59
|
+
__metadata("design:paramtypes", [String]),
|
|
46
60
|
__metadata("design:returntype", Promise)
|
|
47
61
|
], SqsWorkerCommand.prototype, "process", null);
|
|
48
62
|
exports.SqsWorkerCommand = SqsWorkerCommand = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqs.worker.command.js","sourceRoot":"","sources":["../../../src/platformUtility/commands/sqs.worker.command.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sqs.worker.command.js","sourceRoot":"","sources":["../../../src/platformUtility/commands/sqs.worker.command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,mDAAiD;AACjD,wEAAgE;AAChE,gFAA4E;AAC5E,6EAAyE;AACzE,wEAAmE;AACnE,2EAAuE;AACvE,qFAAiF;AAQ1E,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,qCAAgB;IAMlD,YACuB,YAA0B,EAC1B,kBAAsC,EACxC,eAAgC;QAEjD,KAAK,EAAE,CAAC;QAJW,iBAAY,GAAZ,YAAY,CAAc;QAC1B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACxC,oBAAe,GAAf,eAAe,CAAiB;QAGjD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC;IAC3C,CAAC;IAMK,AAAN,KAAK,CAAC,OAAO,CAQT,IAAY;QAEZ,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAEhC,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,IAAI,MAAM,CAAC,CAAC;QAClE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAElD,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,wCAAkB,CAAC,sBAAsB,IAAI,iBAAiB,CAAC,CAAC;QAE9F,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;IACxB,CAAC;IAQO,KAAK,CAAC,UAAU,CAAC,IAAS;QAC9B,MAAM,4BAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAChE,CAAC;CACJ,CAAA;AAjDY,4CAAgB;AAmBnB;IAJL,IAAA,wBAAO,EAAC;QACL,OAAO,EAAE,WAAW;QACpB,QAAQ,EAAE,wBAAwB;KACrC,CAAC;IAEG,WAAA,IAAA,uBAAM,EAAC;QACJ,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,2BAA2B;QACrC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,IAAI;KACjB,CAAC,CAAA;;;;+CAYL;2BAtCQ,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAQ4B,4BAAY;QACN,wCAAkB;QACvB,kCAAe;GAT5C,gBAAgB,CAiD5B"}
|
|
@@ -10,11 +10,12 @@ export declare class CommonSqsPolling {
|
|
|
10
10
|
loggingTime: number;
|
|
11
11
|
messagesToReceive: number;
|
|
12
12
|
};
|
|
13
|
+
protected callingFunction: any;
|
|
13
14
|
protected sqsQueue: string;
|
|
14
15
|
protected readonly queueService: QueueService;
|
|
15
16
|
protected readonly maintenanceService: MaintenanceService;
|
|
16
17
|
protected logger: Logger;
|
|
17
|
-
handle(
|
|
18
|
+
handle(): Promise<void>;
|
|
18
19
|
private startLogging;
|
|
19
20
|
private processMessage;
|
|
20
21
|
private processMessages;
|
|
@@ -10,7 +10,7 @@ class CommonSqsPolling {
|
|
|
10
10
|
this.sTime = date_util_1.DateUtil.now();
|
|
11
11
|
this.preferences = { idlingTime: 1000, loggingTime: 30000, messagesToReceive: 10 };
|
|
12
12
|
}
|
|
13
|
-
async handle(
|
|
13
|
+
async handle() {
|
|
14
14
|
this.startLogging();
|
|
15
15
|
while (true) {
|
|
16
16
|
await this.checkForSystem();
|
|
@@ -24,7 +24,7 @@ class CommonSqsPolling {
|
|
|
24
24
|
if (!record?.Messages)
|
|
25
25
|
await platform_utility_1.PlatformUtility.sleep(this.preferences.idlingTime);
|
|
26
26
|
if (record?.Messages && Array.isArray(record.Messages)) {
|
|
27
|
-
await this.processMessages(record.Messages
|
|
27
|
+
await this.processMessages(record.Messages);
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
}
|
|
@@ -33,14 +33,14 @@ class CommonSqsPolling {
|
|
|
33
33
|
this.logger.log(`[events] [${this.start_time}] events-processed : ${this.counter} ${((Date.now() - this.sTime) / 1000).toFixed(0)}s`);
|
|
34
34
|
}, this.preferences.loggingTime);
|
|
35
35
|
}
|
|
36
|
-
async processMessage(message
|
|
36
|
+
async processMessage(message) {
|
|
37
37
|
++this.counter;
|
|
38
38
|
const data = JSON.parse(message.Body);
|
|
39
39
|
const name = data?.name || '';
|
|
40
40
|
this.logger.log(`[Processing] ${message.MessageId} : ${name} `);
|
|
41
41
|
const startTime = date_util_1.DateUtil.now();
|
|
42
42
|
try {
|
|
43
|
-
await
|
|
43
|
+
await this.callingFunction(data);
|
|
44
44
|
const timeTaken = date_util_1.DateUtil.now() - startTime;
|
|
45
45
|
this.logger.log(`[Processed] ${message.MessageId} : ${name} ${timeTaken} ms`);
|
|
46
46
|
}
|
|
@@ -53,9 +53,9 @@ class CommonSqsPolling {
|
|
|
53
53
|
this.dropMessage(message.ReceiptHandle);
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
|
-
async processMessages(messages
|
|
56
|
+
async processMessages(messages) {
|
|
57
57
|
for (const message of messages)
|
|
58
|
-
await this.processMessage(message
|
|
58
|
+
await this.processMessage(message);
|
|
59
59
|
}
|
|
60
60
|
async dropMessage(id) {
|
|
61
61
|
return this.queueService.sqsService.delete(this.sqsQueue, id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.sqs.polling.js","sourceRoot":"","sources":["../../../src/platformUtility/libraries/common.sqs.polling.ts"],"names":[],"mappings":";;;AACA,gEAA4D;AAC5D,8EAA0E;AAI1E,MAAa,gBAAgB;IAA7B;QACY,YAAO,GAAG,CAAC,CAAC;QACZ,eAAU,GAAG,oBAAQ,CAAC,mBAAmB,EAAE,CAAC;QAC5C,UAAK,GAAG,oBAAQ,CAAC,GAAG,EAAE,CAAC;QAErB,gBAAW,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"common.sqs.polling.js","sourceRoot":"","sources":["../../../src/platformUtility/libraries/common.sqs.polling.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,7 @@ let SesEventTrackingCommand = class SesEventTrackingCommand extends common_sqs_p
|
|
|
25
25
|
this.queueService = queueService;
|
|
26
26
|
this.maintenanceService = maintenanceService;
|
|
27
27
|
this.propertyService = propertyService;
|
|
28
|
+
this.callingFunction = this.processJob;
|
|
28
29
|
}
|
|
29
30
|
async process() {
|
|
30
31
|
await this.queueService.pause();
|
|
@@ -33,7 +34,7 @@ let SesEventTrackingCommand = class SesEventTrackingCommand extends common_sqs_p
|
|
|
33
34
|
if (!this.sqsQueue)
|
|
34
35
|
throw new operation_exception_1.OperationException(`Given queue is not defined`);
|
|
35
36
|
this.logger.log(`logging queue ${this.sqsQueue}`);
|
|
36
|
-
await this.handle(
|
|
37
|
+
await this.handle();
|
|
37
38
|
}
|
|
38
39
|
async processJob(data) {
|
|
39
40
|
const event = data.eventType || data.notificationType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ses.event.tracking.command.js","sourceRoot":"","sources":["../../../src/system/commands/ses.event.tracking.command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAoD;AACpD,mDAAyC;AACzC,qFAAiF;AACjF,2FAAsF;AACtF,4FAAwF;AACxF,gFAA4E;AAC5E,qEAAgE;AAChE,iEAA4D;AAC5D,mEAA+D;AAGxD,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,qCAAgB;IACzD,YACuB,YAA0B,EAC1B,kBAAsC,EACxC,eAAgC;QAEjD,KAAK,EAAE,CAAC;QAJW,iBAAY,GAAZ,YAAY,CAAc;QAC1B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACxC,oBAAe,GAAf,eAAe,CAAiB;
|
|
1
|
+
{"version":3,"file":"ses.event.tracking.command.js","sourceRoot":"","sources":["../../../src/system/commands/ses.event.tracking.command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAoD;AACpD,mDAAyC;AACzC,qFAAiF;AACjF,2FAAsF;AACtF,4FAAwF;AACxF,gFAA4E;AAC5E,qEAAgE;AAChE,iEAA4D;AAC5D,mEAA+D;AAGxD,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,qCAAgB;IACzD,YACuB,YAA0B,EAC1B,kBAAsC,EACxC,eAAgC;QAEjD,KAAK,EAAE,CAAC;QAJW,iBAAY,GAAZ,YAAY,CAAc;QAC1B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACxC,oBAAe,GAAf,eAAe,CAAiB;QAGjD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC;IAC3C,CAAC;IAMK,AAAN,KAAK,CAAC,OAAO;QACT,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAEhC,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC,gBAAgB,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAEpE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,wCAAkB,CAAC,4BAA4B,CAAC,CAAC;QAE/E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAElD,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;IACxB,CAAC;IAQO,KAAK,CAAC,UAAU,CAAC,IAAS;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,gBAAgB,CAAC;QACtD,MAAM,IAAI,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QACjC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;QAEvC,MAAM,CAAC,GAAG,mCAAe,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3C,CAAC,CAAC,UAAU,GAAG,UAAU,CAAC;QAE1B,MAAM,IAAI,GAAG,MAAM,+BAAa,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;QAEpE,IAAI,IAAI;YAAE,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;QAE9B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC;QACnC,IAAI,IAAI;YAAE,CAAC,CAAC,WAAW,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;QAEzC,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC;QAEpB,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IACnB,CAAC;CACJ,CAAA;AApDY,0DAAuB;AAc1B;IAJL,IAAA,wBAAO,EAAC;QACL,OAAO,EAAE,iBAAiB;QAC1B,QAAQ,EAAE,+CAA+C;KAC5D,CAAC;;;;sDAYD;kCAzBQ,uBAAuB;IADnC,IAAA,mBAAU,GAAE;qCAG4B,4BAAY;QACN,wCAAkB;QACvB,kCAAe;GAJ5C,uBAAuB,CAoDnC"}
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.ClientCredentialService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const date_fns_1 = require("date-fns");
|
|
15
|
+
const access_exception_1 = require("../../common/exceptions/access.exception");
|
|
15
16
|
const hash_1 = require("../../common/libraries/hash");
|
|
16
17
|
const cache_service_1 = require("../../platformUtility/services/cache.service");
|
|
17
18
|
const client_credential_entity_1 = require("../entities/client.credential.entity");
|
|
@@ -22,15 +23,16 @@ let ClientCredentialService = class ClientCredentialService {
|
|
|
22
23
|
async validate(payload) {
|
|
23
24
|
const data = await this.getCredential(payload.client_id);
|
|
24
25
|
if (!data)
|
|
25
|
-
|
|
26
|
+
throw new access_exception_1.AccessException(`Invalid client id`);
|
|
26
27
|
const validated = hash_1.Hash.compare(payload.client_secret, data.credential);
|
|
27
28
|
if (!validated)
|
|
28
|
-
|
|
29
|
+
throw new access_exception_1.AccessException(`Invalid client credential`);
|
|
29
30
|
if (!data.ips.length)
|
|
30
31
|
return data.client_id;
|
|
31
32
|
const isIpSet = data.ips.includes(payload.ip);
|
|
32
33
|
if (isIpSet)
|
|
33
34
|
return data.client_id;
|
|
35
|
+
throw new access_exception_1.AccessException(`IP is not whitelisted`);
|
|
34
36
|
}
|
|
35
37
|
async setCredentialCache(key) {
|
|
36
38
|
const identifier = this.getCacheIdentifier(key);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.credential.service.js","sourceRoot":"","sources":["../../../src/system/services/client.credential.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAAsC;AACtC,sDAAmD;AACnD,gFAA4E;AAE5E,mFAA8E;AAQvE,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAMhC,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAQ3D,KAAK,CAAC,QAAQ,CAAC,OAA4B;QACvC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI;YAAE,
|
|
1
|
+
{"version":3,"file":"client.credential.service.js","sourceRoot":"","sources":["../../../src/system/services/client.credential.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal.server.connect.service.js","sourceRoot":"","sources":["../../../src/system/services/internal.server.connect.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAAsC;AACtC,qFAAiF;AACjF,kGAA6F;AAC7F,yDAAqD;AAQ9C,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAerC,YACqB,oBAA0C,EAC1C,eAAgC;QADhC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,oBAAe,GAAf,eAAe,CAAiB;QAV7C,gBAAW,GAAQ,EAAE,CAAC;IAW3B,CAAC;IAUJ,KAAK,CAAC,IAAI,CAAC,IAAY,EAAE,QAAgB,EAAE,IAAY;QACnD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,EAAE,aAAa,EAAE,UAAU,CAAC,QAAQ,EAAE,iBAAiB,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC;QAEnG,MAAM,GAAG,GAAG,GAAG,UAAU,CAAC,GAAG,aAAa,QAAQ,EAAE,CAAC;QAErD,MAAM,OAAO,GAAG;YACZ,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,GAAG;YACR,OAAO;YACP,IAAI;SACP,CAAC;QAEF,OAAO,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAUD,KAAK,CAAC,GAAG,CAAC,IAAY,EAAE,QAAgB;QACpC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,EAAE,aAAa,EAAE,UAAU,CAAC,QAAQ,EAAE,iBAAiB,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC;QAEnG,MAAM,GAAG,GAAG,GAAG,UAAU,CAAC,GAAG,aAAa,QAAQ,EAAE,CAAC;QAErD,MAAM,OAAO,GAAG;YACZ,MAAM,EAAE,KAAK;YACb,GAAG;YACH,OAAO;SACV,CAAC;QAEF,OAAO,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IASO,KAAK,CAAC,aAAa,CAAC,IAAY;QACpC,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,UAAU,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE;gBAAE,OAAO,UAAU,CAAC;QAC7D,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IASO,KAAK,CAAC,aAAa,CAAC,IAAY;QACpC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,IAAI,mBAAmB,EAAE,KAAK,CAAC,CAAC;QACnF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,IAAI,uBAAuB,EAAE,KAAK,CAAC,CAAC;QAC3F,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,IAAI,aAAa,EAAE,KAAK,CAAC,CAAC;QAExE,IAAI,CAAC,CAAC,QAAQ,IAAI,YAAY,IAAI,GAAG,CAAC;YAAE,MAAM,IAAI,wCAAkB,CAAC,iCAAiC,IAAI,SAAS,CAAC,CAAC;QAErH,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,IAAA,qBAAU,EAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;QAEhG,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;CACJ,CAAA;
|
|
1
|
+
{"version":3,"file":"internal.server.connect.service.js","sourceRoot":"","sources":["../../../src/system/services/internal.server.connect.service.ts"],"names":[],"mappings":"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"}
|