exodus-framework 2.2.10928 → 2.2.10929

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.
Files changed (27) hide show
  1. package/lib/contracts/communication/operation.d.ts +24 -5
  2. package/lib/contracts/communication/operation.d.ts.map +1 -1
  3. package/lib/services/task/TaskServiceBase.d.ts.map +1 -1
  4. package/lib/services/task/TaskServiceBase.js +3 -1
  5. package/lib/services/task/TaskServiceBase.js.map +1 -1
  6. package/lib/services/task/queue/QueueService.d.ts.map +1 -1
  7. package/lib/services/task/queue/QueueService.js +11 -3
  8. package/lib/services/task/queue/QueueService.js.map +1 -1
  9. package/lib/services/task/queue/QueueTask.d.ts.map +1 -1
  10. package/lib/services/task/queue/QueueTask.js +20 -19
  11. package/lib/services/task/queue/QueueTask.js.map +1 -1
  12. package/lib/services/task/queue/SingleQueue.d.ts.map +1 -1
  13. package/lib/services/task/queue/SingleQueue.js +16 -4
  14. package/lib/services/task/queue/SingleQueue.js.map +1 -1
  15. package/lib/services/task/scheduler/SchedulerService.d.ts +1 -0
  16. package/lib/services/task/scheduler/SchedulerService.d.ts.map +1 -1
  17. package/lib/services/task/scheduler/SchedulerService.js +13 -4
  18. package/lib/services/task/scheduler/SchedulerService.js.map +1 -1
  19. package/lib/services/task/scheduler/SchedulerTask.d.ts +4 -1
  20. package/lib/services/task/scheduler/SchedulerTask.d.ts.map +1 -1
  21. package/lib/services/task/scheduler/SchedulerTask.js +48 -16
  22. package/lib/services/task/scheduler/SchedulerTask.js.map +1 -1
  23. package/package.json +1 -1
  24. package/lib/services/sequelize.d.ts +0 -50
  25. package/lib/services/sequelize.d.ts.map +0 -1
  26. package/lib/services/sequelize.js +0 -319
  27. package/lib/services/sequelize.js.map +0 -1
package/lib/contracts/communication/operation.d.ts CHANGED
@@ -1,10 +1,29 @@
1
+ export type TAttendanceExpirationTrigger = {
2
+ id: string;
3
+ type: 'WAIT';
4
+ minutes: number;
5
+ } | {
6
+ id: string;
7
+ type: 'MESSAGE';
8
+ message: string;
9
+ } | {
10
+ id: string;
11
+ type: 'CLOSE';
12
+ } | {
13
+ id: string;
14
+ type: 'QUEUE';
15
+ queueId: string;
16
+ routeMode: 'ATTENDANT' | 'QUEUE';
17
+ };
1
18
  export type TServiceConnectionParams = {
2
- expiration?: {
19
+ autoAttendanceIgnoredPhones?: string[];
20
+ dispatcher?: {
21
+ enabled?: boolean;
22
+ balanceStrategy?: 'least-load' | 'round-robin';
23
+ };
24
+ attendanceExpiration?: {
3
25
  activate: boolean;
4
- firstWarningTime: number;
5
- firstWarningMessage: string;
6
- postWarningTime: number;
7
- endMessage: string;
26
+ triggers: TAttendanceExpirationTrigger[];
8
27
  };
9
28
  signature?: boolean;
10
29
  queues?: string[];
package/lib/contracts/communication/operation.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"operation.d.ts","sourceRoot":"","sources":["../../../src/contracts/communication/operation.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,CAAC,EAAE;QAEX,QAAQ,EAAE,OAAO,CAAC;QAClB,gBAAgB,EAAE,MAAM,CAAC;QACzB,mBAAmB,EAAE,MAAM,CAAC;QAC5B,eAAe,EAAE,MAAM,CAAC;QACxB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,CAAC,EAAE;QACb,OAAO,CAAC,EAAE;YACR,QAAQ,CAAC,EAAE,OAAO,CAAC;YACnB,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,GAAG,CAAC,EAAE,MAAM,CAAC;YACb,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;SAC1B,CAAC;QACF,IAAI,CAAC,EAAE;YACL,QAAQ,CAAC,EAAE,OAAO,CAAC;YACnB,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,QAAQ,CAAC,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC;IACF,YAAY,CAAC,EAAE;QACb,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAChC,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B,wBAAwB,EAAE,MAAM,CAAC;KAClC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,SAAS,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,SAAS,GACjB,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,WAAW,GACX,UAAU,GACV,QAAQ,GACR,UAAU,CAAC;AAEf,MAAM,MAAM,MAAM,GAAG;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb,CAAC"}
1
+ {"version":3,"file":"operation.d.ts","sourceRoot":"","sources":["../../../src/contracts/communication/operation.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,4BAA4B,GACpC;IACE,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,GACD;IACE,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,GACD;IACE,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,OAAO,CAAC;CACf,GACD;IACE,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,WAAW,GAAG,OAAO,CAAC;CAClC,CAAC;AAEN,MAAM,MAAM,wBAAwB,GAAG;IACrC,2BAA2B,CAAC,EAAE,MAAM,EAAE,CAAC;IACvC,UAAU,CAAC,EAAE;QACX,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,eAAe,CAAC,EAAE,YAAY,GAAG,aAAa,CAAC;KAChD,CAAC;IACF,oBAAoB,CAAC,EAAE;QACrB,QAAQ,EAAE,OAAO,CAAC;QAClB,QAAQ,EAAE,4BAA4B,EAAE,CAAC;KAC1C,CAAC;IACF,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,CAAC,EAAE;QACb,OAAO,CAAC,EAAE;YACR,QAAQ,CAAC,EAAE,OAAO,CAAC;YACnB,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,GAAG,CAAC,EAAE,MAAM,CAAC;YACb,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;SAC1B,CAAC;QACF,IAAI,CAAC,EAAE;YACL,QAAQ,CAAC,EAAE,OAAO,CAAC;YACnB,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,QAAQ,CAAC,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC;IACF,YAAY,CAAC,EAAE;QACb,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAChC,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B,wBAAwB,EAAE,MAAM,CAAC;KAClC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,SAAS,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,SAAS,GACjB,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,WAAW,GACX,UAAU,GACV,QAAQ,GACR,UAAU,CAAC;AAEf,MAAM,MAAM,MAAM,GAAG;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb,CAAC"}
package/lib/services/task/TaskServiceBase.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TaskServiceBase.d.ts","sourceRoot":"","sources":["../../../src/services/task/TaskServiceBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,uBAAe,eAAe,CAAC,CAAC,CAAE,SAAQ,OAAO;IAC/C,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,CAAM;IAE1B,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM;IAI/B,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;CAG/B;AAED,eAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"TaskServiceBase.d.ts","sourceRoot":"","sources":["../../../src/services/task/TaskServiceBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,uBAAe,eAAe,CAAC,CAAC,CAAE,SAAQ,OAAO;IAC/C,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,CAAM;IAE1B,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM;IAI/B,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;CAI/B;AAED,eAAe,eAAe,CAAC"}
package/lib/services/task/TaskServiceBase.js CHANGED
@@ -5,7 +5,9 @@ class TaskServiceBase extends Service {
5
5
  this.getService().jobsPath = path;
6
6
  }
7
7
  static registerTask(task) {
8
- this.getService().tasks.push(task);
8
+ const service = this.getService();
9
+ if (!service.tasks.includes(task))
10
+ service.tasks.push(task);
9
11
  }
10
12
  }
11
13
  export default TaskServiceBase;
package/lib/services/task/TaskServiceBase.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TaskServiceBase.js","sourceRoot":"","sources":["../../../src/services/task/TaskServiceBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAe,eAAmB,SAAQ,OAAO;IACrC,KAAK,GAAQ,EAAE,CAAC;IAE1B,MAAM,CAAC,WAAW,CAAC,IAAY;QAC5B,IAAY,CAAC,UAAU,EAAE,CAAC,QAAQ,GAAG,IAAI,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,YAAY,CAAI,IAAO;QAC3B,IAAY,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;CACF;AAED,eAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"TaskServiceBase.js","sourceRoot":"","sources":["../../../src/services/task/TaskServiceBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAe,eAAmB,SAAQ,OAAO;IACrC,KAAK,GAAQ,EAAE,CAAC;IAE1B,MAAM,CAAC,WAAW,CAAC,IAAY;QAC5B,IAAY,CAAC,UAAU,EAAE,CAAC,QAAQ,GAAG,IAAI,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,YAAY,CAAI,IAAO;QAC5B,MAAM,OAAO,GAAI,IAAY,CAAC,UAAU,EAAE,CAAC;QAC3C,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC;CACF;AAED,eAAe,eAAe,CAAC"}
package/lib/services/task/queue/QueueService.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"QueueService.d.ts","sourceRoot":"","sources":["../../../../src/services/task/queue/QueueService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAIhD,OAAO,eAAe,MAAM,uBAAuB,CAAC;AACpD,OAAO,SAAS,MAAM,gBAAgB,CAAC;AAGvC,cAAM,gBAAiB,SAAQ,eAAe,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;IACnE,OAAO,CAAC,UAAU,CAAC,CAAoB;IAE1B,OAAO;IAmBP,eAAe;IAUf,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC;IA2CpC,kBAAkB;IAIZ,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAoBvC;AAED,eAAe,gBAAgB,CAAC"}
1
+ {"version":3,"file":"QueueService.d.ts","sourceRoot":"","sources":["../../../../src/services/task/queue/QueueService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAIhD,OAAO,eAAe,MAAM,uBAAuB,CAAC;AACpD,OAAO,SAAS,MAAM,gBAAgB,CAAC;AAGvC,cAAM,gBAAiB,SAAQ,eAAe,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;IACnE,OAAO,CAAC,UAAU,CAAC,CAAoB;IAE1B,OAAO;IAmBP,eAAe;IAUf,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC;IAmDpC,kBAAkB;IAIZ,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAoBvC;AAED,eAAe,gBAAgB,CAAC"}
package/lib/services/task/queue/QueueService.js CHANGED
@@ -21,12 +21,12 @@ class QueueTaskService extends TaskServiceBase {
21
21
  async onExodusStarted() {
22
22
  this.log('Initializing jobs', 'info');
23
23
  for (const task of this.tasks) {
24
- this.startTask(task.singleton());
24
+ await this.startTask(task.singleton());
25
25
  }
26
26
  this.log('All jobs initialized', 'info');
27
27
  }
28
28
  async startTask(task) {
29
- task.taskInit();
29
+ await task.taskInit();
30
30
  if (!task.getActive())
31
31
  return;
32
32
  if (task.getSide() === eExecutionSide.ANY ||
@@ -51,7 +51,15 @@ class QueueTaskService extends TaskServiceBase {
51
51
  task.setWorker(worker);
52
52
  }
53
53
  }
54
- const queue = new Queue(task.getName(), this.connection ? { connection: this.connection } : undefined);
54
+ const queue = new Queue(task.getName(), this.connection
55
+ ? {
56
+ connection: this.connection,
57
+ defaultJobOptions: {
58
+ removeOnComplete: true,
59
+ removeOnFail: { age: 60 * 60 * 24 * 7, count: 1000 }
60
+ }
61
+ }
62
+ : undefined);
55
63
  task.setQueue(queue);
56
64
  this.log(`Task '${task.getName()}' started...`, 'warning');
57
65
  }
package/lib/services/task/queue/QueueService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"QueueService.js","sourceRoot":"","sources":["../../../../src/services/task/queue/QueueService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueueService.js","sourceRoot":"","sources":["../../../../src/services/task/queue/QueueService.ts"],"names":[],"mappings":"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"}
package/lib/services/task/queue/QueueTask.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"QueueTask.d.ts","sourceRoot":"","sources":["../../../../src/services/task/queue/QueueTask.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueueTask.d.ts","sourceRoot":"","sources":["../../../../src/services/task/queue/QueueTask.ts"],"names":[],"mappings":"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"}
package/lib/services/task/queue/QueueTask.js CHANGED
@@ -63,38 +63,39 @@ class QueueTask extends Singleton {
63
63
  }
64
64
  //# Basic Handlers
65
65
  async execute(job, token) {
66
- return (async () => {
67
- try {
68
- await this.onExecute(job, token);
69
- if (this.isCluster()) {
70
- await this.onClusterExecute(job, token);
71
- }
72
- if (this.isMaster()) {
73
- await this.onMasterExecute(job, token);
74
- }
66
+ try {
67
+ await this.onExecute(job, token);
68
+ if (this.isCluster()) {
69
+ await this.onClusterExecute(job, token);
75
70
  }
76
- catch (err) {
77
- new ErrorHandler(`Erro ao executar task ${this.getName()}`, err);
78
- throw err;
71
+ if (this.isMaster()) {
72
+ await this.onMasterExecute(job, token);
79
73
  }
80
- })();
74
+ }
75
+ catch (error) {
76
+ new ErrorHandler(`Erro ao executar task ${this.getName()}`, error);
77
+ throw error;
78
+ }
81
79
  }
82
80
  async addJob(data) {
83
81
  if (!this.getActive()) {
84
- new ErrorHandler('falha ao adicionar uma tarefa', new Error('A task não está ativa'));
85
- return;
82
+ const error = new Error('A task não está ativa');
83
+ new ErrorHandler('falha ao adicionar uma tarefa', error);
84
+ throw error;
86
85
  }
87
86
  const queue = this.getQueue();
88
87
  if (!queue) {
89
- new ErrorHandler('falha ao adicionar uma tarefa', new Error('A task não está pronta'));
90
- return;
88
+ const error = new Error('A task não está pronta');
89
+ new ErrorHandler('falha ao adicionar uma tarefa', error);
90
+ throw error;
91
91
  }
92
92
  await queue.add(this.getName(), data, {
93
93
  attempts: 3,
94
94
  backoff: { type: 'exponential', delay: 5000 },
95
- removeOnComplete: true
95
+ removeOnComplete: true,
96
+ removeOnFail: { age: 60 * 60 * 24 * 7, count: 1000 }
96
97
  });
97
- this.onNewJob(data);
98
+ await this.onNewJob(data);
98
99
  // this.log('Nova tarefa disponível.', 'comment');
99
100
  }
100
101
  static async addJob(data) {
package/lib/services/task/queue/QueueTask.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"QueueTask.js","sourceRoot":"","sources":["../../../../src/services/task/queue/QueueTask.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueueTask.js","sourceRoot":"","sources":["../../../../src/services/task/queue/QueueTask.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,0BAA0B,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,MAAe,SAIb,SAAQ,SAAS;IACT,KAAK,CAA8B;IACnC,WAAW,GAAY,KAAK,CAAC;IAC3B,KAAK,CAAS;IACd,MAAM,CAAU;IAChB,IAAI,CAAkB;IACtB,IAAI,CAAU;IACd,MAAM,CAAW;IACjB,WAAW,CAAU;IAE/B,QAAQ;IACD,KAAK,CAAC,QAAQ;QACnB,IAAI,IAAI,CAAC,WAAW;YAAE,OAAO;QAE7B,IAAI,CAAC,KAAK,GAAG,IAAI,0BAA0B,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACnE,IAAI,CAAC,KAAK,CAAC,EAAE,CACX,mBAAmB,CAAC,wBAAwB,EAC5C,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CACrC,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,EAAE,CACX,mBAAmB,CAAC,uBAAuB,EAC3C,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CACtC,CAAC;QAEF,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC,GAAG,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QAErB,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAExB,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YACpB,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAChC,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACrB,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACjC,CAAC;QAED,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED,WAAW;IACJ,QAAQ;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IACM,SAAS;QACd,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC5B,OAAO,CACL,CAAC,IAAI,KAAK,cAAc,CAAC,GAAG;YAC1B,CAAC,IAAI,KAAK,cAAc,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACrD,CAAC,IAAI,KAAK,cAAc,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,MAAM,IAAI,SAAS,CACzB,CAAC;IACJ,CAAC;IACM,SAAS;QACd,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IACM,OAAO;QACZ,OAAO,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IAC5C,CAAC;IACM,OAAO;QACZ,OAAO,IAAI,CAAC,IAAI,IAAI,cAAc,CAAC,GAAG,CAAC;IACzC,CAAC;IACM,cAAc;QACnB,OAAO,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,WAAW;IACJ,QAAQ,CAAC,KAAY;QAC1B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IACM,SAAS,CAAC,MAAc;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,kBAAkB;IACX,KAAK,CAAC,OAAO,CAAC,GAAwC,EAAE,KAAc;QAC3E,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACjC,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;gBACrB,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAC1C,CAAC;YACD,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACpB,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,YAAY,CAAC,yBAAyB,IAAI,CAAC,OAAO,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;YACnE,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IACM,KAAK,CAAC,MAAM,CAAC,IAAc;QAChC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACtB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;YACjD,IAAI,YAAY,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;YACzD,MAAM,KAAK,CAAC;QACd,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAClD,IAAI,YAAY,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;YACzD,MAAM,KAAK,CAAC;QACd,CAAC;QACD,MAAM,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE;YACpC,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE;YAC7C,gBAAgB,EAAE,IAAI;YACtB,YAAY,EAAE,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE;SACrD,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC1B,kDAAkD;IACpD,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,MAAM,CAEjB,IAAwD;QAExD,+DAA+D;QAC/D,OAAQ,IAAY,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,IAAW,CAAC,CAAC;IACvD,CAAC;IAED,UAAU;IACA,UAAU;QAClB,OAAO;IACT,CAAC;IACS,iBAAiB;QACzB,OAAO;IACT,CAAC;IACS,gBAAgB;QACxB,OAAO;IACT,CAAC;IACD,8EAA8E;IACpE,oBAAoB,CAAC,OAAsB,EAAE,SAAiB,EAAE,KAAe;QACvF,OAAO;IACT,CAAC;IACS,qBAAqB,CAAC,SAAiB,EAAE,KAAe;QAChE,OAAO;IACT,CAAC;IACD,8EAA8E;IACvE,gBAAgB,CACrB,IAAyC,EACzC,MAAe;QAEf,OAAO;IACT,CAAC;IACM,eAAe,CACpB,IAAyC,EACzC,MAAe;QAEf,OAAO;IACT,CAAC;IACM,SAAS,CACd,IAAyC,EACzC,MAAe;QAEf,OAAO;IACT,CAAC;IACD,8EAA8E;IACvE,QAAQ,CAAC,KAAe;QAC7B,OAAO;IACT,CAAC;IAED,WAAW;IACD,iBAAiB,CAAC,SAAiB,EAAE,KAAa,EAAE,IAAc;QAC1E,IAAI,CAAC,KAAM,CAAC,oBAAoB,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAC3D,CAAC;IACS,gBAAgB,CAAC,KAAa,EAAE,IAAc;QACtD,IAAI,CAAC,KAAM,CAAC,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;CACF;AACD,eAAe,SAAS,CAAC"}
package/lib/services/task/queue/SingleQueue.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SingleQueue.d.ts","sourceRoot":"","sources":["../../../../src/services/task/queue/SingleQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,MAAM,MAAM,gCAAgC,CAAC;AAIpD,cAAM,WAAW,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,MAAM;IAO3B,SAAS,CAAC,QAAQ,EAAE,MAAM;IANtC,SAAS,CAAC,MAAM,EAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC7B,SAAS,CAAC,KAAK,EAAG,KAAK,CAAC;IACxB,SAAS,CAAC,WAAW,SAAK;IAC1B,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,MAAM,EAAG,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;gBAExB,QAAQ,EAAE,MAAM;IAK/B,KAAK;IAKZ,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,YAAY;IASb,cAAc,CAAC,WAAW,EAAE,MAAM;IAK5B,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS;IAQlD,OAAO,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAIhC,MAAM,CAAC,IAAI,EAAE,CAAC;IASpB,UAAU;IAKV,WAAW;CAInB;AAED,eAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"SingleQueue.d.ts","sourceRoot":"","sources":["../../../../src/services/task/queue/SingleQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,MAAM,MAAM,gCAAgC,CAAC;AAIpD,cAAM,WAAW,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,MAAM;IAO3B,SAAS,CAAC,QAAQ,EAAE,MAAM;IANtC,SAAS,CAAC,MAAM,EAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC7B,SAAS,CAAC,KAAK,EAAG,KAAK,CAAC;IACxB,SAAS,CAAC,WAAW,SAAK;IAC1B,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,MAAM,EAAG,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;gBAExB,QAAQ,EAAE,MAAM;IAK/B,KAAK;IAKZ,OAAO,CAAC,WAAW;IAgBnB,OAAO,CAAC,YAAY;IAYb,cAAc,CAAC,WAAW,EAAE,MAAM;IAK5B,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS;IAQlD,OAAO,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAIhC,MAAM,CAAC,IAAI,EAAE,CAAC;IAUpB,UAAU;IAKV,WAAW;CAInB;AAED,eAAe,WAAW,CAAC"}
package/lib/services/task/queue/SingleQueue.js CHANGED
@@ -20,7 +20,15 @@ class SingleQueue extends System {
20
20
  }
21
21
  createQueue() {
22
22
  const conn = QueueTaskService.getService().getCacheConnection();
23
- this.queue = new Queue(this.name, conn ? { connection: conn } : undefined);
23
+ this.queue = new Queue(this.name, conn
24
+ ? {
25
+ connection: conn,
26
+ defaultJobOptions: {
27
+ removeOnComplete: true,
28
+ removeOnFail: { age: 60 * 60 * 24 * 7, count: 1000 }
29
+ }
30
+ }
31
+ : undefined);
24
32
  }
25
33
  createWorker() {
26
34
  const conn = QueueTaskService.getService().getCacheConnection();
@@ -28,7 +36,10 @@ class SingleQueue extends System {
28
36
  new ErrorHandler('Cache configuration missing', new Error('Cache connection inválida'));
29
37
  return;
30
38
  }
31
- this.worker = new Worker(this.name, this.tick.bind(this), { connection: conn, concurrency: this.concurrency });
39
+ this.worker = new Worker(this.name, this.tick.bind(this), {
40
+ connection: conn,
41
+ concurrency: this.concurrency
42
+ });
32
43
  }
33
44
  setConcurrency(concurrency) {
34
45
  if (concurrency < 1)
@@ -46,8 +57,9 @@ class SingleQueue extends System {
46
57
  }
47
58
  async addJob(data) {
48
59
  if (!this.queue) {
49
- new ErrorHandler('falha ao adicionar uma tarefa', new Error('A task não está pronta'));
50
- return;
60
+ const error = new Error('A task não está pronta');
61
+ new ErrorHandler('falha ao adicionar uma tarefa', error);
62
+ throw error;
51
63
  }
52
64
  await this.queue.add(this.name, data);
53
65
  }
package/lib/services/task/queue/SingleQueue.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SingleQueue.js","sourceRoot":"","sources":["../../../../src/services/task/queue/SingleQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,MAAM,MAAM,gCAAgC,CAAC;AACpD,OAAO,gBAAgB,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,WAAqB,SAAQ,MAAM;IAOjB;IANZ,MAAM,CAAa;IACnB,KAAK,CAAS;IACd,WAAW,GAAG,CAAC,CAAC;IAChB,IAAI,CAAS;IACb,MAAM,CAA8B;IAE9C,YAAsB,QAAgB;QACpC,KAAK,EAAE,CAAC;QADY,aAAQ,GAAR,QAAQ,CAAQ;QAEpC,IAAI,CAAC,IAAI,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC1D,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAEO,WAAW;QACjB,MAAM,IAAI,GAAG,gBAAgB,CAAC,UAAU,EAAE,CAAC,kBAAkB,EAAE,CAAC;QAChE,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC7E,CAAC;IAEO,YAAY;QAClB,MAAM,IAAI,GAAG,gBAAgB,CAAC,UAAU,EAAE,CAAC,kBAAkB,EAAE,CAAC;QAChE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,YAAY,CAAC,6BAA6B,EAAE,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,CAAC;YACxF,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IACjH,CAAC;IAEM,cAAc,CAAC,WAAmB;QACvC,IAAI,WAAW,GAAG,CAAC;YAAE,WAAW,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,GAAW,EAAE,MAA0B;QACvD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;YAErB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAEM,OAAO,CAAC,EAA8B;QAC3C,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,IAAO;QACzB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,YAAY,CAAC,+BAA+B,EAAE,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC;YACvF,OAAO;QACT,CAAC;QAED,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;IAEM,UAAU;QACf,IAAI,CAAC,IAAI,CAAC,KAAK;YAAE,OAAO;QACxB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;IAEM,WAAW;QAChB,IAAI,CAAC,IAAI,CAAC,KAAK;YAAE,OAAO;QACxB,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;IACtB,CAAC;CACF;AAED,eAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"SingleQueue.js","sourceRoot":"","sources":["../../../../src/services/task/queue/SingleQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,MAAM,MAAM,gCAAgC,CAAC;AACpD,OAAO,gBAAgB,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,WAAqB,SAAQ,MAAM;IAOjB;IANZ,MAAM,CAAa;IACnB,KAAK,CAAS;IACd,WAAW,GAAG,CAAC,CAAC;IAChB,IAAI,CAAS;IACb,MAAM,CAA8B;IAE9C,YAAsB,QAAgB;QACpC,KAAK,EAAE,CAAC;QADY,aAAQ,GAAR,QAAQ,CAAQ;QAEpC,IAAI,CAAC,IAAI,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC1D,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAEO,WAAW;QACjB,MAAM,IAAI,GAAG,gBAAgB,CAAC,UAAU,EAAE,CAAC,kBAAkB,EAAE,CAAC;QAChE,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CACpB,IAAI,CAAC,IAAI,EACT,IAAI;YACF,CAAC,CAAC;gBACE,UAAU,EAAE,IAAI;gBAChB,iBAAiB,EAAE;oBACjB,gBAAgB,EAAE,IAAI;oBACtB,YAAY,EAAE,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE;iBACrD;aACF;YACH,CAAC,CAAC,SAAS,CACd,CAAC;IACJ,CAAC;IAEO,YAAY;QAClB,MAAM,IAAI,GAAG,gBAAgB,CAAC,UAAU,EAAE,CAAC,kBAAkB,EAAE,CAAC;QAChE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,YAAY,CAAC,6BAA6B,EAAE,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,CAAC;YACxF,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACxD,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC,CAAC;IACL,CAAC;IAEM,cAAc,CAAC,WAAmB;QACvC,IAAI,WAAW,GAAG,CAAC;YAAE,WAAW,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,GAAW,EAAE,MAA0B;QACvD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;YAErB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAEM,OAAO,CAAC,EAA8B;QAC3C,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,IAAO;QACzB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAClD,IAAI,YAAY,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;YACzD,MAAM,KAAK,CAAC;QACd,CAAC;QAED,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;IAEM,UAAU;QACf,IAAI,CAAC,IAAI,CAAC,KAAK;YAAE,OAAO;QACxB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;IAEM,WAAW;QAChB,IAAI,CAAC,IAAI,CAAC,KAAK;YAAE,OAAO;QACxB,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;IACtB,CAAC;CACF;AAED,eAAe,WAAW,CAAC"}
package/lib/services/task/scheduler/SchedulerService.d.ts CHANGED
@@ -3,6 +3,7 @@ import ScheduleTask from './SchedulerTask.js';
3
3
  declare class SchedulerTaskService extends TaskServiceBase<typeof ScheduleTask> {
4
4
  onExodusStarted(): Promise<void>;
5
5
  private startTask;
6
+ shutdown(): Promise<void>;
6
7
  }
7
8
  export default SchedulerTaskService;
8
9
  //# sourceMappingURL=SchedulerService.d.ts.map
package/lib/services/task/scheduler/SchedulerService.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SchedulerService.d.ts","sourceRoot":"","sources":["../../../../src/services/task/scheduler/SchedulerService.ts"],"names":[],"mappings":"AAEA,OAAO,eAAe,MAAM,uBAAuB,CAAC;AACpD,OAAO,YAAY,MAAM,oBAAoB,CAAC;AAE9C,cAAM,oBAAqB,SAAQ,eAAe,CAAC,OAAO,YAAY,CAAC;IACxD,eAAe;YASd,SAAS;CAgBxB;AAED,eAAe,oBAAoB,CAAC"}
1
+ {"version":3,"file":"SchedulerService.d.ts","sourceRoot":"","sources":["../../../../src/services/task/scheduler/SchedulerService.ts"],"names":[],"mappings":"AAEA,OAAO,eAAe,MAAM,uBAAuB,CAAC;AACpD,OAAO,YAAY,MAAM,oBAAoB,CAAC;AAE9C,cAAM,oBAAqB,SAAQ,eAAe,CAAC,OAAO,YAAY,CAAC;IACxD,eAAe;YASd,SAAS;IAsBV,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAKvC;AAED,eAAe,oBAAoB,CAAC"}
package/lib/services/task/scheduler/SchedulerService.js CHANGED
@@ -6,7 +6,7 @@ class SchedulerTaskService extends TaskServiceBase {
6
6
  this.log('Initializing taks...');
7
7
  for (const task of this.tasks) {
8
8
  const intanceTask = task.singleton();
9
- this.startTask(intanceTask);
9
+ await this.startTask(intanceTask);
10
10
  }
11
11
  }
12
12
  async startTask(task) {
@@ -16,13 +16,22 @@ class SchedulerTaskService extends TaskServiceBase {
16
16
  if (task.getSide() === eExecutionSide.ANY ||
17
17
  (task.getSide() === eExecutionSide.CLUSTER && this.isCluster()) ||
18
18
  (task.getSide() === eExecutionSide.MASTER && this.isMaster())) {
19
- const job = scheduleJob(task.getCronTask(), task.execute.bind(task));
19
+ const job = scheduleJob(task.getCronTask(), async () => task.execute());
20
+ if (!job) {
21
+ throw new Error(`Expressão cron inválida para a task '${task.getName()}'.`);
22
+ }
20
23
  task.setJob(job);
21
- if (task.isImmediate())
22
- task.execute();
24
+ if (task.isImmediate()) {
25
+ void task.execute().catch(() => undefined);
26
+ }
23
27
  }
24
28
  this.log(`Job '${task.getName()}' started...`, 'warning');
25
29
  }
30
+ async shutdown() {
31
+ for (const task of this.tasks) {
32
+ task.singleton().cancel();
33
+ }
34
+ }
26
35
  }
27
36
  export default SchedulerTaskService;
28
37
  //# sourceMappingURL=SchedulerService.js.map
package/lib/services/task/scheduler/SchedulerService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SchedulerService.js","sourceRoot":"","sources":["../../../../src/services/task/scheduler/SchedulerService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,eAAe,MAAM,uBAAuB,CAAC;AAGpD,MAAM,oBAAqB,SAAQ,eAAoC;IAC9D,KAAK,CAAC,eAAe;QAC1B,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAEjC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,MAAM,WAAW,GAAI,IAAY,CAAC,SAAS,EAAE,CAAC;YAC9C,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,IAAkB;QACxC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YAAE,OAAO;QAE9B,IACE,IAAI,CAAC,OAAO,EAAE,KAAK,cAAc,CAAC,GAAG;YACrC,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,cAAc,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC/D,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,cAAc,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,EAC7D,CAAC;YACD,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACrE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACjB,IAAI,IAAI,CAAC,WAAW,EAAE;gBAAE,IAAI,CAAC,OAAO,EAAE,CAAC;QACzC,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;IAC5D,CAAC;CACF;AAED,eAAe,oBAAoB,CAAC"}
1
+ {"version":3,"file":"SchedulerService.js","sourceRoot":"","sources":["../../../../src/services/task/scheduler/SchedulerService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,eAAe,MAAM,uBAAuB,CAAC;AAGpD,MAAM,oBAAqB,SAAQ,eAAoC;IAC9D,KAAK,CAAC,eAAe;QAC1B,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAEjC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,MAAM,WAAW,GAAI,IAAY,CAAC,SAAS,EAAE,CAAC;YAC9C,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,IAAkB;QACxC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YAAE,OAAO;QAE9B,IACE,IAAI,CAAC,OAAO,EAAE,KAAK,cAAc,CAAC,GAAG;YACrC,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,cAAc,CAAC,OAAO,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC/D,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,cAAc,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,EAC7D,CAAC;YACD,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,MAAM,IAAI,KAAK,CAAC,wCAAwC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC9E,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACjB,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBACvB,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;IAC5D,CAAC;IAEM,KAAK,CAAC,QAAQ;QACnB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC7B,IAAY,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC;QACrC,CAAC;IACH,CAAC;CACF;AAED,eAAe,oBAAoB,CAAC"}
package/lib/services/task/scheduler/SchedulerTask.d.ts CHANGED
@@ -16,7 +16,9 @@ declare abstract class ScheduleTask extends Singleton {
16
16
  protected active: boolean;
17
17
  protected name: string;
18
18
  protected side: eExecutionSide;
19
- protected job: Job;
19
+ protected job?: Job;
20
+ private initialized;
21
+ private running;
20
22
  /**
21
23
  * Deve ser executada imediatamente e depois agendada?
22
24
  *
@@ -48,6 +50,7 @@ declare abstract class ScheduleTask extends Singleton {
48
50
  getSide(): eExecutionSide;
49
51
  isImmediate(): boolean;
50
52
  setJob(job: Job): void;
53
+ cancel(): void;
51
54
  onExecute(): Promise<void> | void;
52
55
  onClusterExecute(): Promise<void> | void;
53
56
  onMasterExecute(): Promise<void> | void;
package/lib/services/task/scheduler/SchedulerTask.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SchedulerTask.d.ts","sourceRoot":"","sources":["../../../../src/services/task/scheduler/SchedulerTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAGxE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,GAAG,CAAC;CACf,CAAC;AAEF,uBAAe,YAAa,SAAQ,SAAS;IAC3C,OAAO,CAAC,KAAK,CAA8B;IAC3C,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAC1D,SAAS,CAAC,uBAAuB,EAAE,MAAM,CAAK;IAC9C,SAAS,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAa;IAC/D,SAAS,CAAC,IAAI,EAAG,MAAM,GAAG,qBAAqB,CAAC;IAChD,SAAS,CAAC,MAAM,EAAG,OAAO,CAAC;IAC3B,SAAS,CAAC,IAAI,EAAG,MAAM,CAAC;IACxB,SAAS,CAAC,IAAI,EAAG,cAAc,CAAC;IAChC,SAAS,CAAC,GAAG,EAAG,GAAG,CAAC;IACpB;;;;;;OAMG;IACH,SAAS,CAAC,SAAS,EAAG,OAAO,CAAC;IAC9B;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,EAAG,OAAO,CAAC;IAElB,OAAO;IAaP,QAAQ;IAsBrB,SAAS,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;IAGvE,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;IAK5C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAGlC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAGzC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAIxC,WAAW,IAAI,qBAAqB,GAAG,MAAM;IAG7C,SAAS,IAAI,OAAO;IAGpB,OAAO,IAAI,MAAM;IAGjB,OAAO,IAAI,cAAc;IAGzB,WAAW,IAAI,OAAO;IAGtB,MAAM,CAAC,GAAG,EAAE,GAAG;IAKf,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAGjC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAGxC,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAIvC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG;IAShD,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG;IAG5D,SAAS,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;IAWzD,SAAS,CAAC,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;IAGjE,SAAS,CAAC,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa;IAK3E,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;IAkBxE,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG;IAc1E,SAAS,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa;IAG3F,SAAS,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa;IAG3F,SAAS,CAAC,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG;IAU7D,SAAS,CAAC,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAMxD,SAAS,CAAC,qBAAqB,CAAC,OAAO,EAAE,MAAM;IAQ/C,SAAS,CAAC,uBAAuB,CAAC,OAAO,EAAE,MAAM;CAGlD;AACD,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"SchedulerTask.d.ts","sourceRoot":"","sources":["../../../../src/services/task/scheduler/SchedulerTask.ts"],"names":[],"mappings":"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"}
package/lib/services/task/scheduler/SchedulerTask.js CHANGED
@@ -1,4 +1,4 @@
1
- import { Singleton } from '../../../app/index.js';
1
+ import { ErrorHandler, Singleton } from '../../../app/index.js';
2
2
  import { eScheduleTaskInterval } from '../../../contracts/contansts.js';
3
3
  import { eEventCommunication } from '../../../contracts/service.js';
4
4
  import RestrictEventCommunication from '../../../app/classes/communication.js';
@@ -13,6 +13,8 @@ class ScheduleTask extends Singleton {
13
13
  name;
14
14
  side;
15
15
  job;
16
+ initialized = false;
17
+ running = false;
16
18
  /**
17
19
  * Deve ser executada imediatamente e depois agendada?
18
20
  *
@@ -32,17 +34,31 @@ class ScheduleTask extends Singleton {
32
34
  */
33
35
  persistent;
34
36
  async execute() {
35
- this.onExecute();
36
- if (this.isCluster()) {
37
- this.onClusterExecute();
37
+ if (this.running) {
38
+ this.log(`Task '${this.getName()}' ignorada: execução anterior ainda está em andamento.`, 'warning');
39
+ return;
38
40
  }
39
- if (this.isMaster()) {
40
- this.onMasterExecute();
41
+ this.running = true;
42
+ try {
43
+ await this.onExecute();
44
+ if (this.isCluster())
45
+ await this.onClusterExecute();
46
+ if (this.isMaster())
47
+ await this.onMasterExecute();
48
+ }
49
+ catch (error) {
50
+ new ErrorHandler(`Erro ao executar task agendada ${this.getName()}`, error);
51
+ throw error;
52
+ }
53
+ finally {
54
+ this.running = false;
55
+ if (!this.persistent)
56
+ this.job?.cancel();
41
57
  }
42
- if (!this.persistent)
43
- this.job.cancel();
44
58
  }
45
59
  async taskInit() {
60
+ if (this.initialized)
61
+ return;
46
62
  this.cron = eScheduleTaskInterval.DEFAULT;
47
63
  this.active = true;
48
64
  this.name = this.constructor.name;
@@ -52,14 +68,15 @@ class ScheduleTask extends Singleton {
52
68
  this.rECom = new RestrictEventCommunication(this.name);
53
69
  this.rECom.on(eEventCommunication.RECEIVED_CLUSTER_MESSAGE, this.taskMasterReceived.bind(this));
54
70
  this.rECom.on(eEventCommunication.RECEIVED_MASTER_MESSAGE, this.taskClusterReceived.bind(this));
55
- this.onTaskInit();
71
+ await this.onTaskInit();
56
72
  if (this.isMaster()) {
57
- this.onTaskMasterInit();
73
+ await this.onTaskMasterInit();
58
74
  }
59
75
  if (this.isCluster()) {
60
- this.onTaskClusterInit();
76
+ await this.onTaskClusterInit();
61
77
  this.sendToTaskMaster('task.init', {});
62
78
  }
79
+ this.initialized = true;
63
80
  }
64
81
  sendToTaskCluster(clusterId, event, data) {
65
82
  this.rECom.sendToServiceCluster(clusterId, event, data);
@@ -94,9 +111,13 @@ class ScheduleTask extends Singleton {
94
111
  }
95
112
  setJob(job) {
96
113
  if (this.job)
97
- return;
114
+ this.job.cancel();
98
115
  this.job = job;
99
116
  }
117
+ cancel() {
118
+ this.job?.cancel();
119
+ this.job = undefined;
120
+ }
100
121
  onExecute() {
101
122
  return;
102
123
  }
@@ -171,17 +192,28 @@ class ScheduleTask extends Singleton {
171
192
  return;
172
193
  }
173
194
  sendTaskWorkToCluster(workId, workData) {
174
- const total = this.getClusterCount();
175
- if (!this.workPerCluster.has(workId)) {
176
- const nextCluster = this.lastDesignatedClusterId + 1 > total ? 1 : this.lastDesignatedClusterId + 1;
177
- this.sendToTaskCluster(nextCluster, 'work.add', { workId, workData });
195
+ if (this.workPerCluster.has(workId))
196
+ return;
197
+ const clusterIds = [...this.registeredClusters.keys()];
198
+ if (!clusterIds.length) {
199
+ this.log(`Nenhum cluster registrado para receber o trabalho '${workId}'.`, 'warning');
200
+ return;
178
201
  }
202
+ const previousIndex = clusterIds.indexOf(this.lastDesignatedClusterId);
203
+ const nextCluster = clusterIds[(previousIndex + 1) % clusterIds.length];
204
+ this.lastDesignatedClusterId = nextCluster;
205
+ this.workPerCluster.set(workId, nextCluster);
206
+ this.sendToTaskCluster(nextCluster, 'work.add', { workId, workData });
179
207
  }
180
208
  onClusterDown(_, worker) {
181
209
  if (this.registeredClusters.has(worker.id)) {
182
210
  // console.log('removendo cluster da lista de registrados');
183
211
  this.registeredClusters.delete(worker.id);
184
212
  }
213
+ for (const [workId, clusterId] of this.workPerCluster) {
214
+ if (clusterId === worker.id)
215
+ this.workPerCluster.delete(workId);
216
+ }
185
217
  }
186
218
  taskClusterRegistered(_worker) {
187
219
  if (!this.registeredClusters.has(_worker.id)) {
package/lib/services/task/scheduler/SchedulerTask.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SchedulerTask.js","sourceRoot":"","sources":["../../../../src/services/task/scheduler/SchedulerTask.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SchedulerTask.js","sourceRoot":"","sources":["../../../../src/services/task/scheduler/SchedulerTask.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "exodus-framework",
3
- "version": "2.2.10928",
3
+ "version": "2.2.10929",
4
4
  "description": "Exodus Framework",
5
5
  "author": "jhownpaixao",
6
6
  "type": "module",
package/lib/services/sequelize.d.ts DELETED
@@ -1,50 +0,0 @@
1
- import { Dialect, Model, ModelStatic, Sequelize } from 'sequelize';
2
- import { ServiceModel } from '../app/index.js';
3
- import Service from '../app/classes/service.js';
4
- import { EnvDBHost } from '../models/index.js';
5
- import { StaticServiceModel } from '../contracts/index.js';
6
- /**
7
- * Serviço de gerênciamento do banco de dados
8
- *
9
- * @class SequelizeService
10
- * @extends {Service}
11
- * @deprecated Use {@link DatabaseService}
12
- * @implements {IService}
13
- */
14
- declare class SequelizeService extends Service {
15
- serviceDB: Sequelize;
16
- models: StaticServiceModel<any>[];
17
- connections: Map<string, Sequelize>;
18
- initializedModels: Map<string, ModelStatic<any>>;
19
- initializingdModels: Map<string, boolean>;
20
- relations: Map<string, EnvDBHost>;
21
- private isReconnecting;
22
- private isMasterConnected;
23
- private isServiceConnected;
24
- onServiceInit(): Promise<void>;
25
- onStart(): Promise<boolean>;
26
- onStartFail(): Promise<void>;
27
- connectDatabases(): Promise<boolean>;
28
- getDB(tenantId: string): Promise<false | Sequelize | undefined>;
29
- createDB(hostUuid: string, name: string): Promise<boolean>;
30
- hasDB(hostUuid: string, name: string): Promise<boolean>;
31
- deleteDB(hostUuid: string, name: string): Promise<boolean>;
32
- initDB(tenantId: string): Promise<false | Sequelize | undefined>;
33
- initModelsByConnection(tenantId: string, connection: Sequelize): Promise<void>;
34
- getDBName(envToken: string): string;
35
- reconnect(db: Sequelize, attempts?: number): void;
36
- createConnection(hostUuid: string, database?: string): Promise<false | Sequelize>;
37
- testConnection(data: {
38
- host: string;
39
- port: number;
40
- username: string;
41
- password: string;
42
- dialect: Dialect;
43
- }): Promise<boolean>;
44
- getRelation(tenantId: string): Promise<EnvDBHost | null | undefined>;
45
- getModel<M extends ServiceModel<Model>>(model: StaticServiceModel<M>, tenantId: string): Promise<ModelStatic<M> | undefined>;
46
- static registerModels(models: StaticServiceModel<any>[]): void;
47
- initModels(): Promise<void>;
48
- }
49
- export default SequelizeService;
50
- //# sourceMappingURL=sequelize.d.ts.map
package/lib/services/sequelize.d.ts.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"sequelize.d.ts","sourceRoot":"","sources":["../../src/services/sequelize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAsB,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,OAAO,MAAM,2BAA2B,CAAC;AAChD,OAAO,EAAE,SAAS,EAAgB,MAAM,oBAAoB,CAAC;AAI7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAK3D;;;;;;;GAOG;AACH,cAAM,gBAAiB,SAAQ,OAAO;IAC7B,SAAS,EAAG,SAAS,CAAC;IACtB,MAAM,EAAG,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;IACnC,WAAW,EAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACrC,iBAAiB,EAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;IAClD,mBAAmB,EAAG,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,SAAS,EAAG,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC1C,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,kBAAkB,CAAS;IAGtB,aAAa;IAiBb,OAAO;IAaP,WAAW;IAMX,gBAAgB;IAyBhB,KAAK,CAAC,QAAQ,EAAE,MAAM;IAa7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA8BhC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAsBpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAiBvC,MAAM,CAAC,QAAQ,EAAE,MAAM;IA2BvB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS;IAkBpE,SAAS,CAAC,QAAQ,EAAE,MAAM;IAK1B,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,SAAI;IAkB/B,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM;IA2CpD,cAAc,CAAC,IAAI,EAAE;QAChC,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,OAAO,CAAC;KAClB;IA4BY,WAAW,CAAC,QAAQ,EAAE,MAAM;IAe5B,QAAQ,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EACjD,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAC5B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;WAWxB,cAAc,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE;IAGjD,UAAU;CAOxB;AAED,eAAe,gBAAgB,CAAC"}
package/lib/services/sequelize.js DELETED
@@ -1,319 +0,0 @@
1
- import { Sequelize } from 'sequelize';
2
- import { Core, ErrorHandler } from '../app/index.js';
3
- import Service from '../app/classes/service.js';
4
- import { EnvDBHost, NativeModels } from '../models/index.js';
5
- import { DatabaseHost } from '../models/DatabaseHost.js';
6
- import { mainDb } from '../utils/database.js';
7
- import LoggerService from './logger.js';
8
- import SecurityService from './security.js';
9
- /**
10
- * Serviço de gerênciamento do banco de dados
11
- *
12
- * @class SequelizeService
13
- * @extends {Service}
14
- * @deprecated Use {@link DatabaseService}
15
- * @implements {IService}
16
- */
17
- class SequelizeService extends Service {
18
- serviceDB;
19
- models;
20
- connections;
21
- initializedModels;
22
- initializingdModels;
23
- relations;
24
- isReconnecting = false; // Flag para evitar múltiplas tentativas simultâneas de reconexão
25
- isMasterConnected = false; // Flag para controlar o estado da conexão
26
- isServiceConnected = false; // Flag para controlar o estado da conexão
27
- //# Initialization
28
- async onServiceInit() {
29
- await super.onServiceInit();
30
- if (!this.models)
31
- throw new Error('Models are requireds! Call registerModels(modelsArray)');
32
- this.serviceDB = mainDb;
33
- this.connections = new Map();
34
- this.initializedModels = new Map();
35
- this.initializingdModels = new Map();
36
- this.relations = new Map();
37
- this.models = [...this.models, ...NativeModels];
38
- this.startAttemptDelay = 5 * 1000;
39
- this.maxStartAttempts = 3;
40
- }
41
- async onStart() {
42
- await super.onStart();
43
- if (await this.connectDatabases()) {
44
- this.log(`⌛️ Inicializando models`);
45
- await this.initModels();
46
- this.log(`✅ Models inicializados`);
47
- return true;
48
- }
49
- return false;
50
- }
51
- async onStartFail() {
52
- await super.onStartFail();
53
- this.log(`Not possible to connect database`, 'danger');
54
- }
55
- async connectDatabases() {
56
- if (this.isMasterConnected && this.isServiceConnected)
57
- return true;
58
- if (this.isReconnecting)
59
- return false;
60
- this.log(`⌛️ Connecting Sequelize to database: ${this.currentStartAttempts}/${this.maxStartAttempts}`);
61
- try {
62
- if (!this.isServiceConnected) {
63
- await this.serviceDB.sync({ force: false });
64
- this.isServiceConnected = true;
65
- this.log('✅ Connected service database sucessfully', 'success');
66
- }
67
- this.log('✅ All databases connecteds sucessfully', 'success');
68
- return true;
69
- }
70
- catch (error) {
71
- LoggerService.logger().error(error, `Not connected Sequelize to database`);
72
- this.isReconnecting = false;
73
- return false;
74
- }
75
- }
76
- // #Database
77
- async getDB(tenantId) {
78
- /* master or service */
79
- if (tenantId == Core.settings.getDatabase().main.database) {
80
- return mainDb;
81
- }
82
- const relation = await this.getRelation(tenantId);
83
- if (!relation)
84
- return false;
85
- const key = `${relation.hostUuid}@${this.getDBName(relation.envToken)}`;
86
- return this.connections.get(key) || (await this.initDB(tenantId));
87
- }
88
- async createDB(hostUuid, name) {
89
- const host = await DatabaseHost.findByPk(hostUuid);
90
- if (!host) {
91
- this.log('Database host information not found: ' + hostUuid);
92
- return false;
93
- }
94
- const dbQueryName = `${Core.settings.getDatabase().main.database}_${name}`;
95
- const connection = await this.createConnection(hostUuid);
96
- if (connection) {
97
- try {
98
- const [results] = await connection.query(`SHOW DATABASES LIKE '${dbQueryName}';`);
99
- if (results.length === 0) {
100
- // Se o banco de dados não existir, cria-o
101
- await connection.query(`CREATE DATABASE ${dbQueryName};`);
102
- this.log(`Database "${dbQueryName}" has been created.`);
103
- return true;
104
- }
105
- else {
106
- this.log(`Database "${dbQueryName}" already exists.`);
107
- return false;
108
- }
109
- }
110
- catch (error) {
111
- new ErrorHandler('Erro on creating database', error);
112
- }
113
- finally {
114
- connection.close();
115
- }
116
- }
117
- return false;
118
- }
119
- async hasDB(hostUuid, name) {
120
- const host = await DatabaseHost.findByPk(hostUuid);
121
- if (!host) {
122
- this.log('Database host information not found: ' + hostUuid);
123
- return false;
124
- }
125
- const dbQueryName = `${Core.settings.getDatabase().main.database}_${name}`;
126
- const connection = await this.createConnection(hostUuid);
127
- if (connection) {
128
- try {
129
- const [results] = await connection.query(`SHOW DATABASES LIKE '${dbQueryName}';`);
130
- return results.length > 0;
131
- }
132
- catch (error) {
133
- new ErrorHandler('Erro on creating database', error);
134
- }
135
- finally {
136
- connection.close();
137
- }
138
- }
139
- return false;
140
- }
141
- async deleteDB(hostUuid, name) {
142
- const dbQueryName = `${Core.settings.getDatabase().main.database}_${name}`;
143
- const connection = await this.createConnection(hostUuid);
144
- if (connection) {
145
- try {
146
- await connection.query(`DROP DATABASE IF EXISTS ${dbQueryName};`);
147
- this.log(`Database "${dbQueryName}" has been deleted.`);
148
- return true;
149
- }
150
- catch (error) {
151
- return false;
152
- }
153
- finally {
154
- connection.close();
155
- }
156
- }
157
- return false;
158
- }
159
- async initDB(tenantId) {
160
- let connection = false;
161
- if (tenantId == Core.settings.getDatabase().main.database) {
162
- connection = mainDb;
163
- }
164
- else {
165
- const relation = await this.getRelation(tenantId);
166
- if (!relation)
167
- return false;
168
- const dbName = this.getDBName(relation.envToken);
169
- const key = `${relation.hostUuid}@${this.getDBName(relation.envToken)}`;
170
- if (this.connections.has(key))
171
- return this.connections.get(key);
172
- connection = await this.createConnection(relation.hostUuid, dbName);
173
- if (connection) {
174
- this.log(`✅ Connected ${dbName} database sucessfully`, 'success');
175
- this.connections.set(key, connection);
176
- }
177
- }
178
- if (connection) {
179
- await this.initModelsByConnection(tenantId, connection);
180
- }
181
- return connection;
182
- }
183
- async initModelsByConnection(tenantId, connection) {
184
- const entities = [];
185
- await Promise.all(this.models.map(async (model) => {
186
- const modelKey = `${tenantId}#${model.name}`;
187
- const entity = model.initialize(connection);
188
- await entity.sync();
189
- entities.push(entity);
190
- this.initializedModels.set(modelKey, entity);
191
- }));
192
- await Promise.all(this.models.map(async (model) => {
193
- model.associate(entities);
194
- }));
195
- }
196
- getDBName(envToken) {
197
- return `${Core.settings.getDatabase().main.database}_${envToken}`;
198
- }
199
- //#Connection
200
- reconnect(db, attempts = 2) {
201
- db.sync()
202
- .then(() => {
203
- this.log('Database pronto', 'success');
204
- })
205
- .catch((reason) => {
206
- this.log('Attemping to connect master database', 'warning');
207
- LoggerService.logger().warn('Erro ao inicializar o banco de dados, tentando novamente...', reason);
208
- if (attempts > 0) {
209
- setTimeout(() => this.reconnect(db, attempts - 1), 5000);
210
- }
211
- else {
212
- new ErrorHandler('Error on connecting master database', reason);
213
- }
214
- });
215
- }
216
- async createConnection(hostUuid, database) {
217
- const host = await DatabaseHost.findByPk(hostUuid);
218
- if (!host) {
219
- this.log('createConnection:: Database host information not found: ' + hostUuid);
220
- return false;
221
- }
222
- const key = await SecurityService.singleton().loadKeyByStr(host.credential);
223
- const data = await SecurityService.singleton().verifySignature(host.password, key);
224
- if (!data) {
225
- this.log('createConnection::Error on decript password by credential: ' + hostUuid, 'danger');
226
- return false;
227
- }
228
- const password = data.payload;
229
- const queryHost = host.host.split(':');
230
- const sequelize = new Sequelize({
231
- host: queryHost[0],
232
- port: Number(queryHost[1]),
233
- dialect: host.dialect,
234
- database,
235
- username: host.username,
236
- password: password,
237
- define: {
238
- timestamps: true
239
- },
240
- timezone: '-03:00',
241
- logging: Core.settings.getDatabase().service.log
242
- });
243
- return new Promise((resolve, reject) => {
244
- sequelize
245
- .authenticate()
246
- .then(async () => {
247
- resolve(sequelize);
248
- })
249
- .catch((reason) => {
250
- reject(reason);
251
- });
252
- });
253
- }
254
- async testConnection(data) {
255
- const sequelize = new Sequelize({
256
- host: data.host,
257
- port: data.port,
258
- username: data.username,
259
- password: data.password,
260
- dialect: data.dialect,
261
- timezone: '-03:00',
262
- pool: Core.settings.getDatabase().service.pool,
263
- logging: Core.settings.getDatabase().service.log
264
- });
265
- return new Promise((resolve) => {
266
- sequelize
267
- .authenticate()
268
- .then(async () => {
269
- resolve(true);
270
- })
271
- .catch((reason) => {
272
- new ErrorHandler('teste de conexão falhou', reason);
273
- resolve(false);
274
- })
275
- .finally(() => {
276
- sequelize.close();
277
- });
278
- });
279
- }
280
- //# Common
281
- async getRelation(tenantId) {
282
- let relation;
283
- /* fetch relation */
284
- if (this.relations.get(tenantId)) {
285
- relation = this.relations.get(tenantId);
286
- }
287
- else {
288
- relation = await EnvDBHost.findOne({ where: { envUuid: tenantId } });
289
- if (relation) {
290
- this.relations.set(tenantId, relation);
291
- }
292
- }
293
- return relation;
294
- }
295
- // #Entity
296
- async getModel(model, tenantId) {
297
- try {
298
- const modelKey = `${tenantId}#${model.name}`;
299
- if (!this.initializedModels.has(modelKey)) {
300
- await this.initDB(tenantId);
301
- }
302
- return this.initializedModels.get(modelKey);
303
- }
304
- catch (error) {
305
- throw new ErrorHandler('Erro ao obter o model', error);
306
- }
307
- }
308
- static registerModels(models) {
309
- this.getService().models = models;
310
- }
311
- async initModels() {
312
- const tenants = await EnvDBHost.findAll({ attributes: ['envUuid'] });
313
- for (const model of this.models) {
314
- await Promise.all(tenants.map(async (t) => await this.getModel(model, t.envUuid)));
315
- }
316
- }
317
- }
318
- export default SequelizeService;
319
- //# sourceMappingURL=sequelize.js.map
package/lib/services/sequelize.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"sequelize.js","sourceRoot":"","sources":["../../src/services/sequelize.ts"],"names":[],"mappings":"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"}