@servicelabsco/nestjs-utility-services 1.2.93 → 1.2.95
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/app.controller.js +3 -1
- package/dist/app.controller.js.map +1 -1
- package/dist/platformUtility/libraries/file.system.utility.d.ts +0 -1
- package/dist/platformUtility/services/mail.service.js +1 -1
- package/dist/platformUtility/services/mail.service.js.map +1 -1
- package/dist/system/dtos/file.upload.spec.dto.d.ts +0 -1
- package/dist/system/jobs/set.scheduled.event.job.d.ts +2 -1
- package/dist/system/jobs/set.scheduled.event.job.js +2 -1
- package/dist/system/jobs/set.scheduled.event.job.js.map +1 -1
- package/dist/system/services/aws.s3.service.js +2 -0
- package/dist/system/services/aws.s3.service.js.map +1 -1
- package/dist/system/services/scheduled.event.service.d.ts +5 -2
- package/dist/system/services/scheduled.event.service.js +18 -11
- package/dist/system/services/scheduled.event.service.js.map +1 -1
- package/dist/system/services/upload.service.d.ts +0 -1
- package/dist/system/services/upload.service.js +2 -2
- package/package.json +1 -1
package/dist/app.controller.js
CHANGED
@@ -46,7 +46,9 @@ let AppController = class AppController {
|
|
46
46
|
async queue(id) {
|
47
47
|
return this.queueService.getJobDetails(id);
|
48
48
|
}
|
49
|
-
async set(req) {
|
49
|
+
async set(req) {
|
50
|
+
return this.setScheduledEventJob.dispatch();
|
51
|
+
}
|
50
52
|
};
|
51
53
|
exports.AppController = AppController;
|
52
54
|
__decorate([
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../src/app.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA0E;AAE1E,kDAA+C;AAC/C,8DAA0D;AAC1D,0EAAsE;AACtE,4EAAwE;AACxE,wEAAoE;AACpE,mFAA6E;AAC7E,yEAAqE;AAG9D,IAAM,aAAa,GAAnB,MAAM,aAAa;IACtB,YACqB,YAA0B,EACxB,OAAgB,EAChB,oBAA0C,EAC1C,WAAwB,EACxB,eAAgC,EAChC,UAAsB;QALxB,iBAAY,GAAZ,YAAY,CAAc;QACxB,YAAO,GAAP,OAAO,CAAS;QAChB,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,gBAAW,GAAX,WAAW,CAAa;QACxB,oBAAe,GAAf,eAAe,CAAiB;QAChC,eAAU,GAAV,UAAU,CAAY;IAC1C,CAAC;IAGE,AAAN,KAAK,CAAC,GAAG;QACL,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;IACvC,CAAC;IAQK,AAAN,KAAK,CAAC,iBAAiB;QACnB,OAAO,WAAI,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO;QACT,OAAO,WAAI,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CAAU,KAAU,IAAiB,CAAC;IAG3C,AAAN,KAAK,CAAC,gBAAgB;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;IAClC,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CAAc,EAAU;QAC/B,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC/C,CAAC;IAGK,AAAN,KAAK,CAAC,GAAG,CAAQ,GAAY,
|
1
|
+
{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../src/app.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA0E;AAE1E,kDAA+C;AAC/C,8DAA0D;AAC1D,0EAAsE;AACtE,4EAAwE;AACxE,wEAAoE;AACpE,mFAA6E;AAC7E,yEAAqE;AAG9D,IAAM,aAAa,GAAnB,MAAM,aAAa;IACtB,YACqB,YAA0B,EACxB,OAAgB,EAChB,oBAA0C,EAC1C,WAAwB,EACxB,eAAgC,EAChC,UAAsB;QALxB,iBAAY,GAAZ,YAAY,CAAc;QACxB,YAAO,GAAP,OAAO,CAAS;QAChB,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,gBAAW,GAAX,WAAW,CAAa;QACxB,oBAAe,GAAf,eAAe,CAAiB;QAChC,eAAU,GAAV,UAAU,CAAY;IAC1C,CAAC;IAGE,AAAN,KAAK,CAAC,GAAG;QACL,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;IACvC,CAAC;IAQK,AAAN,KAAK,CAAC,iBAAiB;QACnB,OAAO,WAAI,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO;QACT,OAAO,WAAI,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CAAU,KAAU,IAAiB,CAAC;IAG3C,AAAN,KAAK,CAAC,gBAAgB;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;IAClC,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CAAc,EAAU;QAC/B,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC/C,CAAC;IAGK,AAAN,KAAK,CAAC,GAAG,CAAQ,GAAY;QACzB,OAAO,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC;IAChD,CAAC;CACJ,CAAA;AA/CY,sCAAa;AAWhB;IADL,IAAA,YAAG,GAAE;;;;wCAGL;AAQK;IADL,IAAA,YAAG,EAAC,UAAU,CAAC;;;;sDAGf;AAGK;IADL,IAAA,YAAG,EAAC,UAAU,CAAC;;;;4CAGf;AAGK;IADL,IAAA,YAAG,EAAC,QAAQ,CAAC;IACD,WAAA,IAAA,cAAK,GAAE,CAAA;;;;0CAA6B;AAG3C;IADL,IAAA,YAAG,EAAC,OAAO,CAAC;;;;qDAGZ;AAGK;IADL,IAAA,YAAG,EAAC,WAAW,CAAC;IACJ,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;0CAEvB;AAGK;IADL,IAAA,aAAI,EAAC,MAAM,CAAC;IACF,WAAA,IAAA,YAAG,GAAE,CAAA;;;;wCAEf;wBA9CQ,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAG0B,4BAAY;QACf,kBAAO;QACM,8CAAoB;QAC7B,0BAAW;QACP,kCAAe;QACpB,wBAAU;GAPpC,aAAa,CA+CzB"}
|
@@ -35,7 +35,7 @@ let MailService = class MailService {
|
|
35
35
|
const gateway = options.gateway || this.gateway;
|
36
36
|
const body = { gateway, identifier };
|
37
37
|
const log = (0, class_transformer_1.plainToClass)(mail_log_entity_1.MailLogEntity, { ...body, ...metadata });
|
38
|
-
log.attributes = { ...attributes, attachments: options.files || {} };
|
38
|
+
log.attributes = { ...attributes, attachments: options.files || {}, metadata };
|
39
39
|
log.processed_on = new Date();
|
40
40
|
log.body = await this.getBody(options);
|
41
41
|
log.subject = options.subject;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"mail.service.js","sourceRoot":"","sources":["../../../src/platformUtility/services/mail.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yDAAiD;AACjD,uCAAsC;AACtC,8EAA0E;AAC1E,uFAAkF;AAClF,6EAAyE;AACzE,yEAAqE;AACrE,oEAA+D;AAC/D,4EAAsE;AACtE,sEAAiE;AACjE,6EAAwE;AAExE,6DAAwD;AAQjD,IAAM,WAAW,GAAjB,MAAM,WAAW;IAqBpB,YACqB,eAAgC,EAChC,aAA4B,EAC5B,gBAAkC;QAFlC,oBAAe,GAAf,eAAe,CAAiB;QAChC,kBAAa,GAAb,aAAa,CAAe;QAC5B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAlB/C,gBAAW,GAA2C,EAAE,CAAC;QAOzD,YAAO,GAAG,IAAI,CAAC;IAYpB,CAAC;IASJ,KAAK,CAAC,IAAI,CAAC,OAAuB,EAAE,QAAc;QAC9C,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC5F,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC;QAEhD,MAAM,IAAI,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;QAErC,MAAM,GAAG,GAAG,IAAA,gCAAY,EAAC,+BAAa,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;QAElE,GAAG,CAAC,UAAU,GAAG,EAAE,GAAG,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;
|
1
|
+
{"version":3,"file":"mail.service.js","sourceRoot":"","sources":["../../../src/platformUtility/services/mail.service.ts"],"names":[],"mappings":"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"}
|
@@ -4,7 +4,8 @@ import { ScheduledEventService } from '../services/scheduled.event.service';
|
|
4
4
|
export declare class SetScheduledEventJob extends CommonJob {
|
5
5
|
protected readonly queueService: QueueService;
|
6
6
|
private readonly scheduledEventService;
|
7
|
+
protected timeout: number;
|
7
8
|
constructor(queueService: QueueService, scheduledEventService: ScheduledEventService);
|
8
|
-
handle(
|
9
|
+
handle(): Promise<void>;
|
9
10
|
private handleAllActiveJobs;
|
10
11
|
}
|
@@ -19,8 +19,9 @@ let SetScheduledEventJob = class SetScheduledEventJob extends common_job_1.Commo
|
|
19
19
|
super('40d4fd2c9c09856b54d90643c5f03171');
|
20
20
|
this.queueService = queueService;
|
21
21
|
this.scheduledEventService = scheduledEventService;
|
22
|
+
this.timeout = 300000;
|
22
23
|
}
|
23
|
-
async handle(
|
24
|
+
async handle() {
|
24
25
|
return this.handleAllActiveJobs();
|
25
26
|
}
|
26
27
|
async handleAllActiveJobs() {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"set.scheduled.event.job.js","sourceRoot":"","sources":["../../../src/system/jobs/set.scheduled.event.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,kEAA8D;AAC9D,gFAA4E;AAC5E,iFAA4E;AAGrE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,sBAAS;
|
1
|
+
{"version":3,"file":"set.scheduled.event.job.js","sourceRoot":"","sources":["../../../src/system/jobs/set.scheduled.event.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,kEAA8D;AAC9D,gFAA4E;AAC5E,iFAA4E;AAGrE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,sBAAS;IAG/C,YACuB,YAA0B,EAC5B,qBAA4C;QAE7D,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAHvB,iBAAY,GAAZ,YAAY,CAAc;QAC5B,0BAAqB,GAArB,qBAAqB,CAAuB;QAJvD,YAAO,GAAW,MAAM,CAAC;IAOnC,CAAC;IACD,KAAK,CAAC,MAAM;QACR,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAC;IACtC,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAC7B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,EAAE,CAAC;QAE5E,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACvC,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;QACtE,CAAC;IACL,CAAC;CACJ,CAAA;AApBY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAK4B,4BAAY;QACL,+CAAqB;GALxD,oBAAoB,CAoBhC"}
|
@@ -69,6 +69,8 @@ let AwsS3Service = class AwsS3Service {
|
|
69
69
|
return client.send(command);
|
70
70
|
}
|
71
71
|
async moveObject(source, destination) {
|
72
|
+
if (source.bucket === destination.bucket && source.key === destination.key)
|
73
|
+
return;
|
72
74
|
const response = await this.copyObject(source, destination);
|
73
75
|
await this.dropObject(source);
|
74
76
|
return response;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"aws.s3.service.js","sourceRoot":"","sources":["../../../src/system/services/aws.s3.service.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"aws.s3.service.js","sourceRoot":"","sources":["../../../src/system/services/aws.s3.service.ts"],"names":[],"mappings":"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"}
|
@@ -1,16 +1,19 @@
|
|
1
|
+
import { SqlService } from '../../platformUtility/services/sql.service';
|
1
2
|
import { EventQueueEntity } from '../entities/event.queue.entity';
|
2
3
|
import { ScheduledEventEntity } from '../entities/scheduled.event.entity';
|
3
4
|
import { PropertyService } from './property.service';
|
4
5
|
export declare class ScheduledEventService {
|
5
6
|
private readonly propertyService;
|
6
|
-
|
7
|
+
protected readonly sqlService: SqlService;
|
8
|
+
constructor(propertyService: PropertyService, sqlService: SqlService);
|
7
9
|
getActiveEvents(id: number): Promise<EventQueueEntity[]>;
|
10
|
+
getActiveEventsSummary(id: number): Promise<any>;
|
8
11
|
getCompletedEvents(id: number): Promise<EventQueueEntity[]>;
|
9
12
|
deleteActiveEvents(id: number): Promise<EventQueueEntity[]>;
|
10
13
|
setNewEvent(job: ScheduledEventEntity, scheduledTime: Date): Promise<EventQueueEntity>;
|
11
14
|
createEventsForJob(job: ScheduledEventEntity): Promise<ScheduledEventEntity>;
|
12
15
|
getActiveSchedules(): Promise<ScheduledEventEntity[]>;
|
13
|
-
private
|
16
|
+
private getScheduleStartTime;
|
14
17
|
private withTimezoneOffset;
|
15
18
|
private reverseTimezoneOffset;
|
16
19
|
}
|
@@ -15,13 +15,15 @@ const parser = require("cron-parser");
|
|
15
15
|
const date_fns_1 = require("date-fns");
|
16
16
|
const typeorm_1 = require("typeorm");
|
17
17
|
const date_util_1 = require("../../common/libraries/date.util");
|
18
|
+
const sql_service_1 = require("../../platformUtility/services/sql.service");
|
18
19
|
const event_queue_entity_1 = require("../entities/event.queue.entity");
|
19
20
|
const scheduled_event_entity_1 = require("../entities/scheduled.event.entity");
|
20
21
|
const property_service_1 = require("./property.service");
|
21
22
|
const SourceHash = require("../../config/source.hash");
|
22
23
|
let ScheduledEventService = class ScheduledEventService {
|
23
|
-
constructor(propertyService) {
|
24
|
+
constructor(propertyService, sqlService) {
|
24
25
|
this.propertyService = propertyService;
|
26
|
+
this.sqlService = sqlService;
|
25
27
|
}
|
26
28
|
async getActiveEvents(id) {
|
27
29
|
return event_queue_entity_1.EventQueueEntity.find({
|
@@ -35,6 +37,10 @@ let ScheduledEventService = class ScheduledEventService {
|
|
35
37
|
},
|
36
38
|
});
|
37
39
|
}
|
40
|
+
async getActiveEventsSummary(id) {
|
41
|
+
const sql = `select count(1) count, max(a.scheduled_start_time) scheduled_start_time from sys_event_queues a where a.deleted_at is null and a.start_time is null and a.source_type = '${SourceHash.scheduledEvent}' and a.source_id = ${id}`;
|
42
|
+
return this.sqlService.readFirst(sql);
|
43
|
+
}
|
38
44
|
async getCompletedEvents(id) {
|
39
45
|
return event_queue_entity_1.EventQueueEntity.find({
|
40
46
|
where: {
|
@@ -70,11 +76,11 @@ let ScheduledEventService = class ScheduledEventService {
|
|
70
76
|
const now = new Date();
|
71
77
|
if (!(job && job.event))
|
72
78
|
return job;
|
73
|
-
const
|
74
|
-
let inQueueCount =
|
75
|
-
if (inQueueCount >
|
79
|
+
const summary = await this.getActiveEventsSummary(job.id);
|
80
|
+
let inQueueCount = summary.count;
|
81
|
+
if (inQueueCount > 100)
|
76
82
|
return job;
|
77
|
-
let lastRunTime = await this.
|
83
|
+
let lastRunTime = await this.getScheduleStartTime(summary);
|
78
84
|
lastRunTime = lastRunTime < job.start_time ? job.start_time : lastRunTime;
|
79
85
|
if (lastRunTime > job.end_time)
|
80
86
|
return;
|
@@ -82,7 +88,7 @@ let ScheduledEventService = class ScheduledEventService {
|
|
82
88
|
currentDate: lastRunTime,
|
83
89
|
endDate: job.end_time,
|
84
90
|
});
|
85
|
-
while (inQueueCount <=
|
91
|
+
while (inQueueCount <= 1000) {
|
86
92
|
if (!nextTime.hasNext())
|
87
93
|
return;
|
88
94
|
const next = nextTime.next().toDate();
|
@@ -105,11 +111,11 @@ let ScheduledEventService = class ScheduledEventService {
|
|
105
111
|
},
|
106
112
|
});
|
107
113
|
}
|
108
|
-
async
|
109
|
-
if (!
|
114
|
+
async getScheduleStartTime(summary) {
|
115
|
+
if (!summary?.scheduled_start_time)
|
110
116
|
return new Date();
|
111
|
-
const
|
112
|
-
return this.reverseTimezoneOffset(
|
117
|
+
const latestDate = new Date(summary.scheduled_start_time);
|
118
|
+
return this.reverseTimezoneOffset(latestDate);
|
113
119
|
}
|
114
120
|
async withTimezoneOffset(date) {
|
115
121
|
const offset = await this.propertyService.get(`scheduled.job.timezone.offset`, 0);
|
@@ -127,6 +133,7 @@ let ScheduledEventService = class ScheduledEventService {
|
|
127
133
|
exports.ScheduledEventService = ScheduledEventService;
|
128
134
|
exports.ScheduledEventService = ScheduledEventService = __decorate([
|
129
135
|
(0, common_1.Injectable)(),
|
130
|
-
__metadata("design:paramtypes", [property_service_1.PropertyService
|
136
|
+
__metadata("design:paramtypes", [property_service_1.PropertyService,
|
137
|
+
sql_service_1.SqlService])
|
131
138
|
], ScheduledEventService);
|
132
139
|
//# sourceMappingURL=scheduled.event.service.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"scheduled.event.service.js","sourceRoot":"","sources":["../../../src/system/services/scheduled.event.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,sCAAsC;AACtC,uCAAkD;AAClD,qCAAgD;AAChD,gEAA4D;AAC5D,uEAAkE;AAClE,+EAA0E;AAC1E,yDAAqD;AACrD,uDAAwD;AAQjD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAM9B,
|
1
|
+
{"version":3,"file":"scheduled.event.service.js","sourceRoot":"","sources":["../../../src/system/services/scheduled.event.service.ts"],"names":[],"mappings":"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"}
|
@@ -25,7 +25,7 @@ let UploadService = class UploadService {
|
|
25
25
|
const config = await this.awsConfigService.getConfig();
|
26
26
|
const folder = options.folder || 'public';
|
27
27
|
const fileName = this.getFileName(file, options);
|
28
|
-
const
|
28
|
+
const urlKey = `${folder}/${fileName}`;
|
29
29
|
let Body;
|
30
30
|
if (file.url)
|
31
31
|
Body = await this.getBufferFromUrl(file.url);
|
@@ -34,7 +34,7 @@ let UploadService = class UploadService {
|
|
34
34
|
const params = {
|
35
35
|
Body,
|
36
36
|
Bucket: options.bucket || config.bucket,
|
37
|
-
Key:
|
37
|
+
Key: urlKey,
|
38
38
|
ACL: options.acl || 'public-read',
|
39
39
|
};
|
40
40
|
if (options.mime_type)
|
package/package.json
CHANGED