exodus-framework 2.0.824 → 2.0.826
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/lib/app/controller.d.ts +3 -4
- package/lib/app/controller.d.ts.map +1 -1
- package/lib/app/controller.js +5 -6
- package/lib/contracts/core.d.ts +5 -0
- package/lib/contracts/core.d.ts.map +1 -1
- package/lib/contracts/core.js +8 -1
- package/lib/contracts/tasks.d.ts +1 -0
- package/lib/contracts/tasks.d.ts.map +1 -0
- package/lib/contracts/tasks.js +1 -0
- package/lib/services/task/queue/QueueService.d.ts.map +1 -1
- package/lib/services/task/queue/QueueService.js +8 -5
- package/lib/services/task/queue/QueueTask.d.ts +8 -3
- package/lib/services/task/queue/QueueTask.d.ts.map +1 -1
- package/lib/services/task/queue/QueueTask.js +6 -1
- package/lib/tasks/queue/teste.d.ts.map +1 -1
- package/lib/tasks/queue/teste.js +2 -0
- package/package.json +1 -1
package/lib/app/controller.d.ts
CHANGED
@@ -1,13 +1,12 @@
|
|
1
1
|
import { NextFunction, Response } from 'express';
|
2
2
|
import { IAccount, IServiceRequestor, THttpResponse, TSocket, TSocketEventDataMap, TSocketEventHandle } from '../contracts';
|
3
3
|
import Managed from './classes/managed';
|
4
|
-
|
5
|
-
export declare abstract class HttpController extends System {
|
4
|
+
export declare abstract class HttpController extends Managed {
|
6
5
|
constructor();
|
7
6
|
protected send<D = any>(objResponse: THttpResponse<D>, res: Response, next?: NextFunction): void;
|
8
7
|
protected validate(data: Record<string, any>): Promise<void>;
|
9
8
|
}
|
10
|
-
export declare abstract class SocketController extends
|
9
|
+
export declare abstract class SocketController extends Managed {
|
11
10
|
constructor();
|
12
11
|
protected handlerEventBind<K extends keyof TSocketEventDataMap>(cb: TSocketEventHandle<K>): (req: SocketRequest, data: TSocketEventDataMap[K]) => void;
|
13
12
|
protected bufferToData(data: Buffer): number[];
|
@@ -32,7 +31,7 @@ export declare class SocketRequest extends Managed {
|
|
32
31
|
getSocket(): TSocket;
|
33
32
|
protected dataToBuffer(data: any): Buffer;
|
34
33
|
}
|
35
|
-
export declare abstract class MessagingController extends
|
34
|
+
export declare abstract class MessagingController extends Managed {
|
36
35
|
constructor();
|
37
36
|
protected bufferToData(data: Buffer): number[];
|
38
37
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/app/controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,aAAa,EACb,OAAO,EACP,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,cAAc,CAAC;AAEtB,OAAO,OAAO,MAAM,mBAAmB,CAAC;
|
1
|
+
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/app/controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,aAAa,EACb,OAAO,EACP,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,cAAc,CAAC;AAEtB,OAAO,OAAO,MAAM,mBAAmB,CAAC;AASxC,8BAAsB,cAAe,SAAQ,OAAO;;IAelD,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,YAAY,GAAG,IAAI;IAIhG,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAG7C;AAUD,8BAAsB,gBAAiB,SAAQ,OAAO;;IAKpD,SAAS,CAAC,gBAAgB,CAAC,CAAC,SAAS,MAAM,mBAAmB,EAAE,EAAE,EAAE,kBAAkB,CAAC,CAAC,CAAC,SAC1E,aAAa,QAAQ,mBAAmB,CAAC,CAAC,CAAC;IAM1D,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM;CAGpC;AACD,qBAAa,aAAc,SAAQ,OAAO;IAatC,SAAS,CAAC,MAAM,EAAE,OAAO;IACzB,SAAS,CAAC,KAAK,EAAE,MAAM,mBAAmB;IAb5C,QAAQ,CAAC,IAAI,EAAE;QACb,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,EAAE,QAAQ,CAAC;KACnB,CAAC;IACF,QAAQ,CAAC,MAAM,EAAE;QACf,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;IACF,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC;IACtC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;gBAEpB,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,MAAM,mBAAmB;IAS5C,IAAI,CAAC,CAAC,SAAS,MAAM,mBAAmB,GAAG,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAI5F,QAAQ;IAGR,SAAS;IAIT,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG;CAGjC;AAED,8BAAsB,mBAAoB,SAAQ,OAAO;;IAKvD,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM;CAGpC;AAED,eAAe,cAAc,CAAC"}
|
package/lib/app/controller.js
CHANGED
@@ -6,16 +6,15 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
exports.default = exports.SocketRequest = exports.SocketController = exports.MessagingController = exports.HttpController = void 0;
|
7
7
|
var _express = _interopRequireDefault(require("../services/express"));
|
8
8
|
var _managed = _interopRequireDefault(require("./classes/managed"));
|
9
|
-
var _system = _interopRequireDefault(require("./classes/system"));
|
10
9
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
11
10
|
/**
|
12
11
|
* Classe base dos conttrolers http
|
13
12
|
*
|
14
13
|
* @abstract
|
15
14
|
* @class Controller
|
16
|
-
* @extends {
|
15
|
+
* @extends {Managed}
|
17
16
|
*/
|
18
|
-
class HttpController extends
|
17
|
+
class HttpController extends _managed.default {
|
19
18
|
constructor() {
|
20
19
|
super();
|
21
20
|
}
|
@@ -44,10 +43,10 @@ class HttpController extends _system.default {
|
|
44
43
|
* @export
|
45
44
|
* @abstract
|
46
45
|
* @class SocketController
|
47
|
-
* @extends {
|
46
|
+
* @extends {Managed}
|
48
47
|
*/
|
49
48
|
exports.HttpController = HttpController;
|
50
|
-
class SocketController extends
|
49
|
+
class SocketController extends _managed.default {
|
51
50
|
constructor() {
|
52
51
|
super();
|
53
52
|
}
|
@@ -90,7 +89,7 @@ class SocketRequest extends _managed.default {
|
|
90
89
|
}
|
91
90
|
}
|
92
91
|
exports.SocketRequest = SocketRequest;
|
93
|
-
class MessagingController extends
|
92
|
+
class MessagingController extends _managed.default {
|
94
93
|
constructor() {
|
95
94
|
super();
|
96
95
|
}
|
package/lib/contracts/core.d.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../src/contracts/core.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,GAAG,CAAC;CACX,CAAC"}
|
1
|
+
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../src/contracts/core.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,GAAG,CAAC;CACX,CAAC;AAEF,oBAAY,cAAc;IACxB,MAAM,IAAA;IACN,OAAO,IAAA;IACP,GAAG,IAAA;CACJ"}
|
package/lib/contracts/core.js
CHANGED
@@ -2,4 +2,11 @@
|
|
2
2
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
4
4
|
value: true
|
5
|
-
});
|
5
|
+
});
|
6
|
+
exports.eExecutionSide = void 0;
|
7
|
+
let eExecutionSide = exports.eExecutionSide = /*#__PURE__*/function (eExecutionSide) {
|
8
|
+
eExecutionSide[eExecutionSide["MASTER"] = 0] = "MASTER";
|
9
|
+
eExecutionSide[eExecutionSide["CLUSTER"] = 1] = "CLUSTER";
|
10
|
+
eExecutionSide[eExecutionSide["ANY"] = 2] = "ANY";
|
11
|
+
return eExecutionSide;
|
12
|
+
}({});
|
@@ -0,0 +1 @@
|
|
1
|
+
//# sourceMappingURL=tasks.d.ts.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../src/contracts/tasks.ts"],"names":[],"mappings":""}
|
@@ -0,0 +1 @@
|
|
1
|
+
"use strict";
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"QueueService.d.ts","sourceRoot":"","sources":["../../../../src/services/task/queue/QueueService.ts"],"names":[],"mappings":"AAIA,OAAO,eAAe,MAAM,oBAAoB,CAAC;AACjD,OAAO,SAAS,MAAM,aAAa,CAAC;
|
1
|
+
{"version":3,"file":"QueueService.d.ts","sourceRoot":"","sources":["../../../../src/services/task/queue/QueueService.ts"],"names":[],"mappings":"AAIA,OAAO,eAAe,MAAM,oBAAoB,CAAC;AACjD,OAAO,SAAS,MAAM,aAAa,CAAC;AAIpC,cAAM,gBAAiB,SAAQ,eAAe,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;IACnE,OAAO,CAAC,UAAU,CAAoB;IACtC,OAAO,CAAC,QAAQ,CAAM;IAEhB,aAAa;YAmBL,aAAa;YAUb,cAAc;IAMf,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC;CAuB5C;AAED,eAAe,gBAAgB,CAAC"}
|
@@ -8,6 +8,7 @@ var _bullmq = require("bullmq");
|
|
8
8
|
var _fs = require("fs");
|
9
9
|
var _app = require("../../../app");
|
10
10
|
var _TaskServiceBase = _interopRequireDefault(require("../TaskServiceBase"));
|
11
|
+
var _core = require("../../../contracts/core");
|
11
12
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
12
13
|
//* Queue
|
13
14
|
class QueueTaskService extends _TaskServiceBase.default {
|
@@ -48,15 +49,17 @@ class QueueTaskService extends _TaskServiceBase.default {
|
|
48
49
|
}
|
49
50
|
async startTask(task) {
|
50
51
|
if (!task.getActive()) return;
|
52
|
+
task.taskInit();
|
53
|
+
if (task.getSide() === _core.eExecutionSide.ANY || task.getSide() === _core.eExecutionSide.CLUSTER && this.isCluster() || task.getSide() === _core.eExecutionSide.MASTER && this.isMaster()) {
|
54
|
+
const worker = new _bullmq.Worker(task.getName(), task.execute.bind(task), {
|
55
|
+
connection: this.connection
|
56
|
+
});
|
57
|
+
task.setWorker(worker);
|
58
|
+
}
|
51
59
|
const queue = new _bullmq.Queue(task.getName(), {
|
52
60
|
connection: this.connection
|
53
61
|
});
|
54
|
-
const worker = new _bullmq.Worker(task.getName(), task.execute.bind(task), {
|
55
|
-
connection: this.connection
|
56
|
-
});
|
57
62
|
task.setQueue(queue);
|
58
|
-
task.setWorker(worker);
|
59
|
-
task.taskInit();
|
60
63
|
this.log(`Task '${task.getName()}' started...`, 'warning');
|
61
64
|
}
|
62
65
|
}
|
@@ -1,13 +1,18 @@
|
|
1
1
|
import { Job, Queue, Worker } from 'bullmq';
|
2
2
|
import { Singleton } from '../../../app';
|
3
|
+
import { eExecutionSide } from '../../../contracts/core';
|
3
4
|
declare abstract class QueueTask<DataType, ResultType = any, NameType extends string = string> extends Singleton {
|
4
5
|
private rECom;
|
5
6
|
protected queue: Queue;
|
6
|
-
protected worker
|
7
|
-
|
8
|
-
|
7
|
+
protected worker?: Worker;
|
8
|
+
protected side: eExecutionSide.ANY;
|
9
|
+
getQueue(): Queue;
|
10
|
+
getWorker(): this is {
|
11
|
+
worker: Worker;
|
12
|
+
};
|
9
13
|
getActive(): boolean;
|
10
14
|
getName(): string;
|
15
|
+
getSide(): eExecutionSide;
|
11
16
|
setQueue(queue: Queue): void;
|
12
17
|
setWorker(worker: Worker): void;
|
13
18
|
taskInit(): Promise<void>;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"QueueTask.d.ts","sourceRoot":"","sources":["../../../../src/services/task/queue/QueueTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAgB,SAAS,EAAE,MAAM,cAAc,CAAC;
|
1
|
+
{"version":3,"file":"QueueTask.d.ts","sourceRoot":"","sources":["../../../../src/services/task/queue/QueueTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAgB,SAAS,EAAE,MAAM,cAAc,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,uBAAe,SAAS,CACtB,QAAQ,EACR,UAAU,GAAG,GAAG,EAChB,QAAQ,SAAS,MAAM,GAAG,MAAM,CAChC,SAAQ,SAAS;IACjB,OAAO,CAAC,KAAK,CAA6B;IAC1C,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,IAAI,EAAE,cAAc,CAAC,GAAG,CAAC;IAG5B,QAAQ,IAAI,KAAK;IAGjB,SAAS,IAAI,IAAI,IAAI;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE;IAQvC,SAAS,IAAI,OAAO;IAGpB,OAAO,IAAI,MAAM;IAGjB,OAAO,IAAI,cAAc;IAKzB,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAG5B,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAKzB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB/B,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAShE,MAAM,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;WAarC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAK5D,SAAS,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAG5C,SAAS,CAAC,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAGnD,SAAS,CAAC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAIlD,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI;IAGzF,SAAS,CAAC,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI;IAIlE,gBAAgB,CACrB,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,EACzC,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAGhB,eAAe,CACpB,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,EACzC,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAGhB,SAAS,CACd,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,EACzC,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAIhB,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAKtD,SAAS,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ;IAG5E,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ;CAGzD;AACD,eAAe,SAAS,CAAC"}
|
@@ -7,18 +7,20 @@ exports.default = void 0;
|
|
7
7
|
var _app = require("../../../app");
|
8
8
|
var _communication = _interopRequireDefault(require("../../../app/classes/communication"));
|
9
9
|
var _service = require("../../../contracts/service");
|
10
|
+
var _core = require("../../../contracts/core");
|
10
11
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
11
12
|
class QueueTask extends _app.Singleton {
|
12
13
|
rECom;
|
13
14
|
queue;
|
14
15
|
worker;
|
16
|
+
side;
|
15
17
|
|
16
18
|
//# Getters
|
17
19
|
getQueue() {
|
18
20
|
return this.queue;
|
19
21
|
}
|
20
22
|
getWorker() {
|
21
|
-
return this.worker;
|
23
|
+
return (this.side === _core.eExecutionSide.ANY || this.side === _core.eExecutionSide.CLUSTER && this.isCluster() || this.side === _core.eExecutionSide.MASTER && this.isMaster()) && this.worker != undefined;
|
22
24
|
}
|
23
25
|
getActive() {
|
24
26
|
return true;
|
@@ -26,6 +28,9 @@ class QueueTask extends _app.Singleton {
|
|
26
28
|
getName() {
|
27
29
|
return this.constructor.name;
|
28
30
|
}
|
31
|
+
getSide() {
|
32
|
+
return this.side;
|
33
|
+
}
|
29
34
|
|
30
35
|
//# Setters
|
31
36
|
setQueue(queue) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"teste.d.ts","sourceRoot":"","sources":["../../../src/tasks/queue/teste.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;
|
1
|
+
{"version":3,"file":"teste.d.ts","sourceRoot":"","sources":["../../../src/tasks/queue/teste.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,cAAM,aAAc,SAAQ,SAAS,CAAC,MAAM,CAAC;IAC3C,OAAO,IAAI,MAAM;IAIX,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;CAG/E;AAED,eAAe,aAAa,CAAC"}
|
package/lib/tasks/queue/teste.js
CHANGED
@@ -5,11 +5,13 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
});
|
6
6
|
exports.default = void 0;
|
7
7
|
var _services = require("../../services");
|
8
|
+
var _core = require("../../contracts/core");
|
8
9
|
class TestTaskQueue extends _services.QueueTask {
|
9
10
|
getName() {
|
10
11
|
return 'Teste Job Queue';
|
11
12
|
}
|
12
13
|
async onTaskInit() {
|
14
|
+
this.side = _core.eExecutionSide.ANY;
|
13
15
|
this.queue.drain();
|
14
16
|
}
|
15
17
|
async onExecute(_job, _token) {
|