@puca/puca-core 7.7.2 → 7.8.0
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/core/services/comunication/comunication.service.js.map +1 -1
- package/dist/core/services/crud-base.controller.js +6 -5
- package/dist/core/services/crud-base.controller.js.map +1 -1
- package/dist/core/services/eval.service.d.ts +23 -0
- package/dist/core/services/eval.service.js +65 -0
- package/dist/core/services/eval.service.js.map +1 -0
- package/dist/core/services/index.d.ts +3 -1
- package/dist/core/services/index.js +6 -4
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/job/job.service.d.ts +3 -1
- package/dist/core/services/job/job.service.js +5 -4
- package/dist/core/services/job/job.service.js.map +1 -1
- package/dist/core/services/life-cycle.service.d.ts +3 -1
- package/dist/core/services/life-cycle.service.js +17 -8
- package/dist/core/services/life-cycle.service.js.map +1 -1
- package/dist/core/services/single-instance-ensure.service.d.ts +5 -0
- package/dist/core/services/single-instance-ensure.service.js +45 -7
- package/dist/core/services/single-instance-ensure.service.js.map +1 -1
- package/dist/core/services/source/gcloud-run-cloud/v1/application.service.js +9 -5
- package/dist/core/services/source/gcloud-run-cloud/v1/application.service.js.map +1 -1
- package/dist/plugins/eval/eval.service.d.ts +7 -4
- package/dist/plugins/eval/eval.service.js.map +1 -1
- package/dist/plugins/uuid/uuid.service.d.ts +1 -0
- package/dist/plugins/uuid/uuid.service.js +3 -0
- package/dist/plugins/uuid/uuid.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comunication.service.js","sourceRoot":"","sources":["../../../../src/core/services/comunication/comunication.service.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;
|
|
1
|
+
{"version":3,"file":"comunication.service.js","sourceRoot":"","sources":["../../../../src/core/services/comunication/comunication.service.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AAEhC,+CAAoC;AAUpC,MAAa,mBAAmB;IAC9B,YACmB,uBAAgD,EAChD,mBAAwC,EACxC,cAA8B,EAC9B,WAAwB;QAHxB,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,gBAAW,GAAX,WAAW,CAAa;IACvC,CAAC;IAEL,KAAK,CAAC,IAAI,CAAI,IASb;QACC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;SACnB;QAED,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;QAC/E,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC;YACtD,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAA;QAEF,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,iCACnC,IAAI,KACP,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,MAAM,IAC7B,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAAE,IAAI,EAAkB;QACzC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAA;QACrE,MAAM,QAAQ,GAAa;YACzB,GAAG,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE;YAC7C,OAAO,EAAE,IAAI;YACb,aAAa,EAAE,IAAI;YACnB,MAAM,EAAE;gBACN,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,OAAO,EAAE,YAAY,CAAC,OAAO;aAC9B;YACD,IAAI;YACJ,OAAO,EAAE,CAAC;SACX,CAAA;QAED,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,CAAA;QAC5D,IAAI,CAAC,UAAU,EAAE;YACf,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE;gBACxB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;aACxC;YAED,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAA;SAC3B;QAED,OAAO,mBAAI,CAAC,QAAQ,EAAE,UAAU,EAAE;YAChC,SAAS,EAAE,OAAO;SACnB,CAAC,CAAA;IACJ,CAAC;CACF;AA5DD,kDA4DC"}
|
|
@@ -22,7 +22,6 @@ const puca_auth_decorators_1 = require("../../plugins/nestjs/puca-auth.decorator
|
|
|
22
22
|
const abstract_controller_1 = require("./abstract-controller");
|
|
23
23
|
const _1 = require(".");
|
|
24
24
|
const services_1 = require("../../orm/services");
|
|
25
|
-
const eval_service_1 = require("../../plugins/eval/eval.service");
|
|
26
25
|
let CrudBaseController = class CrudBaseController extends abstract_controller_1.AbstractController {
|
|
27
26
|
constructor(className, crudService) {
|
|
28
27
|
super(className);
|
|
@@ -107,8 +106,9 @@ let CrudBaseController = class CrudBaseController extends abstract_controller_1.
|
|
|
107
106
|
});
|
|
108
107
|
for (let i = 0; i < rootDictionary.length; i++) {
|
|
109
108
|
const d = rootDictionary[i];
|
|
110
|
-
const evalService =
|
|
111
|
-
token: '='
|
|
109
|
+
const evalService = _1.evalServiceFactory.getInstance({}, {
|
|
110
|
+
token: '=',
|
|
111
|
+
user: pucaAuth.user
|
|
112
112
|
});
|
|
113
113
|
d.default_label = evalService.evalSync(d.default_label);
|
|
114
114
|
pushOnDictionary(d, `${alias}__${d.name}`);
|
|
@@ -126,8 +126,9 @@ let CrudBaseController = class CrudBaseController extends abstract_controller_1.
|
|
|
126
126
|
const alias = j.alias || j.tableName;
|
|
127
127
|
for (let j = 0; j < jdList.length; j++) {
|
|
128
128
|
const jd = jdList[j];
|
|
129
|
-
const evalService =
|
|
130
|
-
token: '='
|
|
129
|
+
const evalService = _1.evalServiceFactory.getInstance({}, {
|
|
130
|
+
token: '=',
|
|
131
|
+
user: pucaAuth.user
|
|
131
132
|
});
|
|
132
133
|
jd.default_label = evalService.evalSync(jd.default_label);
|
|
133
134
|
pushOnDictionary(jd, `${alias}__${jd.name}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crud-base.controller.js","sourceRoot":"","sources":["../../../src/core/services/crud-base.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAWwB;AAKxB,oFAA2E;AAC3E,kFAAyE;AAEzE,uEAGmC;AAEnC,0EAAqE;AACrE,oFAAiE;AACjE,+DAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"crud-base.controller.js","sourceRoot":"","sources":["../../../src/core/services/crud-base.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAWwB;AAKxB,oFAA2E;AAC3E,kFAAyE;AAEzE,uEAGmC;AAEnC,0EAAqE;AACrE,oFAAiE;AACjE,+DAA2D;AAC3D,wBAAsD;AACtD,iDAAsD;AAKtD,IAAa,kBAAkB,GAA/B,MAAa,kBAA0D,SAAQ,wCAAkB;IAC/F,YACE,SAAiB,EACE,WAA6C;QAEhE,KAAK,CAAC,SAAS,CAAC,CAAC;QAFE,gBAAW,GAAX,WAAW,CAAkC;IAGlE,CAAC;IAID,KAAK,CAAC,+BAA+B,CACb,WAAmB;QAEzC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,0CAA0C,EAAE,CAAA;QAC9E,MAAM,EAAE,GAAG,MAAM,+FAAqE,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;QAC5G,OAAO,EAAE,CAAA;IACX,CAAC;IAGD,KAAK,CAAC,IAAI,CACA,QAAkB,EACsB,MAAqB,EACtC,KAAY,EACb,IAAS,EACxB,IAAY,EACR,QAAgB,EACc,OAAuB,EACvB,OAAsB,EACzB,IAAY,EAC1C,KAAa,EACtB,GAAa;QAEpB,MAAM,IAAI,CAAC,QAAQ,CACjB,GAAG,EAAE,CACH,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;YACpB,KAAK;YACL,MAAM;YACN,IAAI;YACJ,KAAK;YACL,IAAI;YACJ,IAAI;YACJ,QAAQ;YACR,OAAO;YACP,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,OAAO;SACR,CAAC,EACJ,GAAG,CACJ,CAAC;IACJ,CAAC;IAGD,KAAK,CAAC,aAAa,CACT,QAAkB,EACP,OAAe,EACD,MAAqB,EACtC,KAAa,EACtB,GAAa;QAEpB,MAAM,IAAI,CAAC,QAAQ,CACjB,GAAG,EAAE,CACH,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC;YAC7B,MAAM;YACN,OAAO;YACP,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,KAAK;SACN,CAAC,EACJ,GAAG,CACJ,CAAC;IACJ,CAAC;IAGD,KAAK,CAAC,MAAM,CACF,QAAkB,EACP,QAAgB,EAC5B,GAAa;QAEpB,MAAM,IAAI,CAAC,QAAQ,CACjB,GAAG,EAAE,CACH,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;YACtB,QAAQ;YACR,IAAI,EAAE,QAAQ,CAAC,IAAI;SACpB,CAAC,EACJ,GAAG,CACJ,CAAC;IACJ,CAAC;IAGD,KAAK,CAAC,MAAM,CACF,QAAkB,EAClB,MAAW,EACZ,GAAa;QAEpB,MAAM,IAAI,CAAC,QAAQ,CACjB,GAAG,EAAE,CACH,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;YACtB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,QAAQ,CAAC,IAAI;SACpB,CAAC,EACJ,GAAG,CACJ,CAAC;IACJ,CAAC;IAGD,KAAK,CAAC,kBAAkB,CACd,QAAkB,EAClB,MAAgB,EACjB,GAAa;QAEpB,MAAM,IAAI,CAAC,QAAQ,CACjB,GAAG,EAAE,CACH,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC;YAClC,MAAM;YACN,IAAI,EAAE,QAAQ,CAAC,IAAI;SACpB,CAAC,EACJ,GAAG,CACJ,CAAC;IACJ,CAAC;IAGD,KAAK,CAAC,UAAU,CACN,QAAkB,EACR,OAAe,EACe,MAAqB,EACtC,KAAY,EACb,IAAS,EACxB,IAAY,EACR,QAAgB,EACc,OAAuB,EACvB,OAAsB,EACzB,QAAgB,EAC9C,aAAqB,EAC9B,GAAY,EACZ,GAAa;QAEpB,MAAM,IAAI,GAAG,QAAQ,IAAI,EAAE,CAAA;QAC3B,MAAM,KAAK,GAAG,aAAa,IAAI,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAA;QAE9D,MAAM,UAAU,GAAG,4BAAiB,CAAC,WAAW,CAAkB;YAChE,SAAS,EAAE,kBAAkB;SAC9B,CAAC,CAAA;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;YAC3C,KAAK;YACL,MAAM;YACN,IAAI;YACJ,KAAK;YACL,IAAI;YACJ,IAAI;YACJ,QAAQ;YACR,OAAO;YACP,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,OAAO;SACR,CAAC,CAAA;QAEF,MAAM,UAAU,GAAsB,EAAE,CAAA;QACxC,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAA;QACpE,MAAM,gBAAgB,GAAG,CAAC,CAAkB,EAAE,KAAa,EAAE,EAAE;YAC7D,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE;gBACxC,OAAM;aACP;YACD,UAAU,CAAC,IAAI,iCACV,CAAC,KACJ,IAAI,EAAE,KAAK,IACX,CAAA;QACJ,CAAC,CAAA;QAED,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC;YACvD,MAAM,EAAE,gBAAgB;YACxB,GAAG,EAAE,QAAQ;YACb,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE;YACtC,IAAI,EAAE,QAAQ,CAAC,IAAI;SACpB,CAAC,CAAA;QAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC9C,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;YAE3B,MAAM,WAAW,GAAG,qBAAkB,CAAC,WAAW,CAAC,EAClD,EAAE;gBACD,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,QAAQ,CAAC,IAAI;aACpB,CAAC,CAAA;YAEF,CAAC,CAAC,aAAa,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAA;YAEvD,gBAAgB,CAAC,CAAC,EAAE,GAAG,KAAK,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;SAC3C;QAED,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC;YAC/C,MAAM,EAAE,gBAAgB;YACxB,GAAG,EAAE,QAAQ;YACb,MAAM,EAAE,IAAI;iBACT,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACxB,IAAI,EAAE,QAAQ,CAAC,IAAI;SACpB,CAAC,CAAA;QAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACpC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;YACjB,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,SAAS,CAAC,CAAA;YACrE,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,SAAS,CAAA;YACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACtC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;gBAEpB,MAAM,WAAW,GAAG,qBAAkB,CAAC,WAAW,CAAC,EAClD,EAAE;oBACD,KAAK,EAAE,GAAG;oBACV,IAAI,EAAE,QAAQ,CAAC,IAAI;iBACpB,CAAC,CAAA;gBAEF,EAAE,CAAC,aAAa,GAAG,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,aAAa,CAAC,CAAA;gBAEzD,gBAAgB,CAAC,EAAE,EAAE,GAAG,KAAK,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,CAAA;aAC7C;SACF;QAED,MAAM,IAAI,mBACR,UAAU,IACP,QAAQ,CACZ,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAEzB,MAAM,gBAAa,CAAC,UAAU,CAAC;YAC7B,IAAI,EAAE;gBACJ,OAAO;gBACP,IAAI,EAAE,cAAc;aACrB;YACD,IAAI;YACJ,GAAG;YACH,GAAG;YACH,IAAI,EAAE,QAAQ,CAAC,IAAI;SACpB,CAAC,CAAA;IACJ,CAAC;CACF,CAAA;AA9NC;IAFC,YAAG,CAAC,qBAAqB,CAAC;IAC1B,eAAM,CAAC,eAAe,EAAE,cAAc,CAAC;IAErC,WAAA,cAAK,CAAC,aAAa,CAAC,CAAA;;;;yEAKtB;AAGD;IADC,YAAG,EAAE;IAEH,WAAA,2BAAI,EAAE,CAAA;IACN,WAAA,cAAK,CAAC,QAAQ,EAAE,qCAAc,EAAE,mCAAa,CAAC,CAAA;IAC9C,WAAA,cAAK,CAAC,OAAO,EAAE,mCAAa,CAAC,CAAA;IAC7B,WAAA,cAAK,CAAC,MAAM,EAAE,mCAAa,CAAC,CAAA;IAC5B,WAAA,cAAK,CAAC,MAAM,CAAC,CAAA;IACb,WAAA,cAAK,CAAC,UAAU,CAAC,CAAA;IACjB,WAAA,cAAK,CAAC,SAAS,EAAE,mCAAa,EAAE,qCAAc,CAAC,CAAA;IAC/C,WAAA,cAAK,CAAC,SAAS,EAAE,mCAAa,EAAE,qCAAc,CAAC,CAAA;IAC/C,WAAA,cAAK,CAAC,MAAM,EAAE,mCAAa,EAAE,qCAAc,CAAC,CAAA;IAC5C,WAAA,cAAK,CAAC,OAAO,CAAC,CAAA;IACd,YAAA,YAAG,EAAE,CAAA;;;;8CAkBP;AAGD;IADC,YAAG,CAAC,WAAW,CAAC;IAEd,WAAA,2BAAI,EAAE,CAAA;IACN,WAAA,cAAK,CAAC,UAAU,CAAC,CAAA;IACjB,WAAA,cAAK,CAAC,QAAQ,EAAE,qCAAc,CAAC,CAAA;IAC/B,WAAA,cAAK,CAAC,OAAO,CAAC,CAAA;IACd,WAAA,YAAG,EAAE,CAAA;;;;uDAYP;AAGD;IADC,eAAM,CAAC,WAAW,CAAC;IAEjB,WAAA,2BAAI,EAAE,CAAA;IACN,WAAA,cAAK,CAAC,UAAU,CAAC,CAAA;IACjB,WAAA,YAAG,EAAE,CAAA;;;;gDAUP;AAGD;IADC,aAAI,EAAE;IAEJ,WAAA,2BAAI,EAAE,CAAA;IACN,WAAA,aAAI,EAAE,CAAA;IACN,WAAA,YAAG,EAAE,CAAA;;;;gDAUP;AAGD;IADC,aAAI,CAAC,eAAe,CAAC;IAEnB,WAAA,2BAAI,EAAE,CAAA;IACN,WAAA,aAAI,EAAE,CAAA;IACN,WAAA,YAAG,EAAE,CAAA;;;;4DAUP;AAGD;IADC,YAAG,CAAC,iBAAiB,CAAC;IAEpB,WAAA,2BAAI,EAAE,CAAA;IACN,WAAA,cAAK,CAAC,SAAS,CAAC,CAAA;IAChB,WAAA,cAAK,CAAC,QAAQ,EAAE,qCAAc,EAAE,mCAAa,CAAC,CAAA;IAC9C,WAAA,cAAK,CAAC,OAAO,EAAE,mCAAa,CAAC,CAAA;IAC7B,WAAA,cAAK,CAAC,MAAM,EAAE,mCAAa,CAAC,CAAA;IAC5B,WAAA,cAAK,CAAC,MAAM,CAAC,CAAA;IACb,WAAA,cAAK,CAAC,UAAU,CAAC,CAAA;IACjB,WAAA,cAAK,CAAC,SAAS,EAAE,mCAAa,EAAE,qCAAc,CAAC,CAAA;IAC/C,WAAA,cAAK,CAAC,SAAS,EAAE,mCAAa,EAAE,qCAAc,CAAC,CAAA;IAC/C,WAAA,cAAK,CAAC,MAAM,EAAE,mCAAa,EAAE,qCAAc,CAAC,CAAA;IAC5C,YAAA,cAAK,CAAC,OAAO,CAAC,CAAA;IACd,YAAA,YAAG,EAAE,CAAA;IACL,YAAA,YAAG,EAAE,CAAA;;;;oDAmGP;AAvOU,kBAAkB;IAD9B,kBAAS,CAAC,+BAAa,CAAC;;GACZ,kBAAkB,CAwO9B;AAxOY,gDAAkB"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { User } from '../../models/user';
|
|
2
|
+
import { RepositoryFactory } from '../../orm/services/repository-factory';
|
|
3
|
+
import { EvalService as PluginEvalService, EvalServiceOpt as PluginEvalServiceOpt } from '../../plugins/eval/eval.service';
|
|
4
|
+
import { UuidService } from '../../plugins/uuid/uuid.service';
|
|
5
|
+
export interface EvalServiceOpt extends PluginEvalServiceOpt {
|
|
6
|
+
user: User;
|
|
7
|
+
}
|
|
8
|
+
interface Rule {
|
|
9
|
+
puca_pid: string;
|
|
10
|
+
puca_key: number;
|
|
11
|
+
}
|
|
12
|
+
declare class EvalService extends PluginEvalService {
|
|
13
|
+
constructor(rulesMap: Map<number, Rule>, context: any, opt: EvalServiceOpt, uuidService: UuidService);
|
|
14
|
+
}
|
|
15
|
+
export declare class EvalServiceFactory {
|
|
16
|
+
private readonly repositoryFactory;
|
|
17
|
+
private readonly uuidService;
|
|
18
|
+
private rulesMap;
|
|
19
|
+
constructor(repositoryFactory: RepositoryFactory, uuidService: UuidService);
|
|
20
|
+
private init;
|
|
21
|
+
getInstance(context: any, opt: EvalServiceOpt): EvalService;
|
|
22
|
+
}
|
|
23
|
+
export {};
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.EvalServiceFactory = void 0;
|
|
4
|
+
const _ = require("lodash");
|
|
5
|
+
const eval_service_1 = require("../../plugins/eval/eval.service");
|
|
6
|
+
class EvalService extends eval_service_1.EvalService {
|
|
7
|
+
constructor(rulesMap, context, opt, uuidService) {
|
|
8
|
+
super(context, {
|
|
9
|
+
token: _.get(opt, 'token'),
|
|
10
|
+
transforms: Object.assign({ userRoleAsPermission: (ruleKey) => {
|
|
11
|
+
if (!opt.user) {
|
|
12
|
+
throw new Error('Unable to eval user rule');
|
|
13
|
+
}
|
|
14
|
+
if (!opt.user.rules) {
|
|
15
|
+
throw new Error('Unable to eval user rule - 2');
|
|
16
|
+
}
|
|
17
|
+
const rule = uuidService.validate(`${ruleKey}`) ? { puca_pid: ruleKey } : rulesMap.get(+ruleKey);
|
|
18
|
+
if (!rule) {
|
|
19
|
+
throw new Error('Unable to eval user rule - 3');
|
|
20
|
+
}
|
|
21
|
+
return opt.user.rules.includes(rule.puca_pid);
|
|
22
|
+
} }, opt.transforms)
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
class EvalServiceFactory {
|
|
27
|
+
constructor(repositoryFactory, uuidService) {
|
|
28
|
+
this.repositoryFactory = repositoryFactory;
|
|
29
|
+
this.uuidService = uuidService;
|
|
30
|
+
this.init();
|
|
31
|
+
}
|
|
32
|
+
async init() {
|
|
33
|
+
const repository = this.repositoryFactory.getInstance({ tableName: 'puca_base_api_rules' });
|
|
34
|
+
const { data: allRules } = await repository.findAll({
|
|
35
|
+
fields: ["puca_pid", "puca_key"],
|
|
36
|
+
});
|
|
37
|
+
this.rulesMap = new Map();
|
|
38
|
+
allRules.forEach(r => {
|
|
39
|
+
this.rulesMap.set(+r.puca_key, r);
|
|
40
|
+
});
|
|
41
|
+
const cacheRepository = this.repositoryFactory.getCacheInstance({ tableName: 'puca_base_api_rules' });
|
|
42
|
+
cacheRepository.onChange(({ puca_pid, row }) => {
|
|
43
|
+
if (!row) {
|
|
44
|
+
const rule = Array.from(this.rulesMap.values())
|
|
45
|
+
.find(rule => {
|
|
46
|
+
return rule.puca_pid === puca_pid;
|
|
47
|
+
});
|
|
48
|
+
if (!rule) {
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
this.rulesMap.delete(+rule.puca_key);
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
this.rulesMap.set(+row.puca_key, row);
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
getInstance(context, opt) {
|
|
58
|
+
if (!this.rulesMap) {
|
|
59
|
+
throw new Error('Unable to eval user rule - 4');
|
|
60
|
+
}
|
|
61
|
+
return new EvalService(this.rulesMap, context, opt, this.uuidService);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
exports.EvalServiceFactory = EvalServiceFactory;
|
|
65
|
+
//# sourceMappingURL=eval.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"eval.service.js","sourceRoot":"","sources":["../../../src/core/services/eval.service.ts"],"names":[],"mappings":";;;AAAA,4BAA2B;AAG3B,kEAA0H;AAY1H,MAAM,WAAY,SAAQ,0BAAiB;IACzC,YAAY,QAA2B,EAAE,OAAY,EAAE,GAAmB,EAAE,WAAwB;QAClG,KAAK,CAAC,OAAO,EAAE;YACb,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC;YAC1B,UAAU,kBACR,oBAAoB,EAAE,CAAC,OAAwB,EAAE,EAAE;oBACjD,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;wBACb,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;qBAC5C;oBAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE;wBACnB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;qBAChD;oBAED,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAiB,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAA;oBAC1G,IAAI,CAAC,IAAI,EAAE;wBACT,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;qBAChD;oBAED,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;gBAC/C,CAAC,IACE,GAAG,CAAC,UAAU,CAClB;SACF,CAAC,CAAA;IACJ,CAAC;CACF;AAED,MAAa,kBAAkB;IAE7B,YAA6B,iBAAoC,EAAmB,WAAwB;QAA/E,sBAAiB,GAAjB,iBAAiB,CAAmB;QAAmB,gBAAW,GAAX,WAAW,CAAa;QAC1G,IAAI,CAAC,IAAI,EAAE,CAAA;IACb,CAAC;IACO,KAAK,CAAC,IAAI;QAChB,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,CAAC,CAAA;QACjG,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YAClD,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC;SACjC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAA;QACzB,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACnB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;QACnC,CAAC,CAAC,CAAA;QACF,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,CAAC,CAAA;QAC3G,eAAe,CAAC,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,EAAE;YAC7C,IAAG,CAAC,GAAG,EAAC;gBACN,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;qBAC5C,IAAI,CAAC,IAAI,CAAC,EAAE;oBACX,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAA;gBACnC,CAAC,CAAC,CAAA;gBACJ,IAAG,CAAC,IAAI,EAAC;oBACP,OAAM;iBACP;gBACD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;gBACpC,OAAM;aACP;YACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;QACvC,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,WAAW,CAAC,OAAY,EAAE,GAAmB;QAC3C,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;SAChD;QACD,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;IACvE,CAAC;CACF;AApCD,gDAoCC"}
|
|
@@ -16,11 +16,13 @@ import { ReportService } from './report.service';
|
|
|
16
16
|
import { NotificationService } from './notification.service';
|
|
17
17
|
import { JobService } from './job/job.service';
|
|
18
18
|
import { SingleInstanceEnsureService } from './single-instance-ensure.service';
|
|
19
|
+
import { EvalServiceFactory } from './eval.service';
|
|
19
20
|
export declare const singleInstanceEnsureService: SingleInstanceEnsureService;
|
|
20
21
|
export declare const configsService: ConfigsService;
|
|
21
|
-
export declare const storageServiceManager: StorageServiceManager;
|
|
22
22
|
export declare const moduleConfigService: ModuleConfigService;
|
|
23
|
+
export declare const evalServiceFactory: EvalServiceFactory;
|
|
23
24
|
export declare const jobService: JobService;
|
|
25
|
+
export declare const storageServiceManager: StorageServiceManager;
|
|
24
26
|
export declare const authService: AuthService;
|
|
25
27
|
export declare const cacheServiceFactory: CacheServiceFactory;
|
|
26
28
|
export declare const userConfigService: UserConfigService;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.lifeCycleService = exports.reportService = exports.notificationService = exports.webSocketService = exports.installService = exports.bootstrapService = exports.migrationService = exports.sourceService = exports.comunicationService = exports.comunicationHttpService = exports.userConfigService = exports.cacheServiceFactory = exports.authService = exports.jobService = exports.
|
|
3
|
+
exports.lifeCycleService = exports.reportService = exports.notificationService = exports.webSocketService = exports.installService = exports.bootstrapService = exports.migrationService = exports.sourceService = exports.comunicationService = exports.comunicationHttpService = exports.userConfigService = exports.cacheServiceFactory = exports.authService = exports.storageServiceManager = exports.jobService = exports.evalServiceFactory = exports.moduleConfigService = exports.configsService = exports.singleInstanceEnsureService = void 0;
|
|
4
4
|
const plugins_1 = require("../../plugins");
|
|
5
5
|
const essential_1 = require("../../essential");
|
|
6
6
|
const services_1 = require("../../orm/services");
|
|
@@ -25,12 +25,14 @@ const notification_service_1 = require("./notification.service");
|
|
|
25
25
|
const job_client_1 = require("./job/job.client");
|
|
26
26
|
const job_service_1 = require("./job/job.service");
|
|
27
27
|
const single_instance_ensure_service_1 = require("./single-instance-ensure.service");
|
|
28
|
+
const eval_service_1 = require("./eval.service");
|
|
28
29
|
exports.singleInstanceEnsureService = new single_instance_ensure_service_1.SingleInstanceEnsureService(services_1.redisManagerService);
|
|
29
30
|
exports.configsService = new configs_service_1.ConfigsService(plugins_1.fileSystemService);
|
|
30
31
|
const jobClientManager = new job_client_1.JobClientManager(essential_1.configService);
|
|
31
|
-
exports.storageServiceManager = new storage_service_1.StorageServiceManager(exports.configsService);
|
|
32
32
|
exports.moduleConfigService = new module_config_service_1.ModuleConfigService(plugins_1.fileSystemService);
|
|
33
|
-
exports.
|
|
33
|
+
exports.evalServiceFactory = new eval_service_1.EvalServiceFactory(services_1.repositoryFactory, plugins_1.uuidService);
|
|
34
|
+
exports.jobService = new job_service_1.JobService(jobClientManager, essential_1.configService, exports.moduleConfigService, exports.evalServiceFactory);
|
|
35
|
+
exports.storageServiceManager = new storage_service_1.StorageServiceManager(exports.configsService);
|
|
34
36
|
exports.authService = new auth_service_1.AuthService(exports.configsService, services_1.repositoryFactory, exports.moduleConfigService, plugins_1.uuidService);
|
|
35
37
|
exports.cacheServiceFactory = new cache_service_1.CacheServiceFactory(services_1.redisManagerService);
|
|
36
38
|
exports.userConfigService = new user_config_service_1.UserConfigService(exports.moduleConfigService, services_1.repositoryFactory, exports.configsService, exports.cacheServiceFactory);
|
|
@@ -48,5 +50,5 @@ exports.installService = new install_service_1.InstallService(exports.migrationS
|
|
|
48
50
|
exports.webSocketService = new web_socket_service_1.WebSocketService(services_1.redisManagerService, exports.authService);
|
|
49
51
|
exports.notificationService = new notification_service_1.NotificationService(exports.comunicationService);
|
|
50
52
|
exports.reportService = new report_service_1.ReportService(plugins_1.uuidService, exports.notificationService, services_1.repositoryFactory, exports.storageServiceManager, essential_1.configService);
|
|
51
|
-
exports.lifeCycleService = new life_cycle_service_1.LifeCycleService(services_1.databaseManagerService, services_1.redisManagerService, exports.bootstrapService, essential_1.envConfigService, exports.installService, services_1.repositoryFactory, exports.webSocketService, exports.configsService, exports.comunicationHttpService, services_1.sqlService, exports.reportService);
|
|
53
|
+
exports.lifeCycleService = new life_cycle_service_1.LifeCycleService(services_1.databaseManagerService, services_1.redisManagerService, exports.bootstrapService, essential_1.envConfigService, exports.installService, services_1.repositoryFactory, exports.webSocketService, exports.configsService, exports.comunicationHttpService, services_1.sqlService, exports.reportService, exports.singleInstanceEnsureService);
|
|
52
54
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":";;;AAAA,2CAA+D;AAC/D,+CAAkE;AAClE,iDAAgH;AAChH,2DAAuD;AACvD,8EAA0E;AAC1E,6DAAwD;AACxD,mEAA8D;AAC9D,2DAAuD;AACvD,uDAAmD;AACnD,+DAA0D;AAC1D,6DAAwD;AACxD,iDAA6C;AAC7C,+DAAkE;AAClE,oFAAkH;AAClH,0FAA4H;AAC5H,4DAAwD;AACxD,qEAAiE;AACjE,wFAAmF;AACnF,mDAAsD;AACtD,qDAAiD;AACjD,iEAA6D;AAC7D,iDAAoD;AACpD,mDAA+C;AAC/C,qFAA+E;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ConfigsService } from "../../../essential/configs.service";
|
|
2
2
|
import { ModuleConfigService } from "../module-config.service";
|
|
3
3
|
import { Args, JobClientManager } from "./job.client";
|
|
4
|
+
import { EvalServiceFactory } from '../eval.service';
|
|
4
5
|
export interface Job {
|
|
5
6
|
name: string;
|
|
6
7
|
cron: string;
|
|
@@ -13,7 +14,8 @@ export declare class JobService {
|
|
|
13
14
|
private readonly jobClientManager;
|
|
14
15
|
private readonly configService;
|
|
15
16
|
private readonly moduleConfigService;
|
|
16
|
-
|
|
17
|
+
private readonly evalServiceFactory;
|
|
18
|
+
constructor(jobClientManager: JobClientManager, configService: ConfigsService, moduleConfigService: ModuleConfigService, evalServiceFactory: EvalServiceFactory);
|
|
17
19
|
list(): Promise<import("./job.client").Job>;
|
|
18
20
|
update(j: Job): Promise<void>;
|
|
19
21
|
delete(args: Args): Promise<void>;
|
|
@@ -2,22 +2,23 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.JobService = void 0;
|
|
4
4
|
const _ = require("lodash");
|
|
5
|
-
const eval_service_1 = require("../../../plugins/eval/eval.service");
|
|
6
5
|
class JobService {
|
|
7
|
-
constructor(jobClientManager, configService, moduleConfigService) {
|
|
6
|
+
constructor(jobClientManager, configService, moduleConfigService, evalServiceFactory) {
|
|
8
7
|
this.jobClientManager = jobClientManager;
|
|
9
8
|
this.configService = configService;
|
|
10
9
|
this.moduleConfigService = moduleConfigService;
|
|
10
|
+
this.evalServiceFactory = evalServiceFactory;
|
|
11
11
|
}
|
|
12
12
|
async list() {
|
|
13
13
|
const jobClient = await this.jobClientManager.get();
|
|
14
14
|
return await jobClient.list();
|
|
15
15
|
}
|
|
16
16
|
async update(j) {
|
|
17
|
-
const evalService =
|
|
17
|
+
const evalService = this.evalServiceFactory.getInstance({
|
|
18
18
|
env: await this.configService.getEnv()
|
|
19
19
|
}, {
|
|
20
|
-
token: '='
|
|
20
|
+
token: '=',
|
|
21
|
+
user: null
|
|
21
22
|
});
|
|
22
23
|
const job = await evalService.evalObject(j);
|
|
23
24
|
const jobClient = await this.jobClientManager.get();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.service.js","sourceRoot":"","sources":["../../../../src/core/services/job/job.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;
|
|
1
|
+
{"version":3,"file":"job.service.js","sourceRoot":"","sources":["../../../../src/core/services/job/job.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAc5B,MAAa,UAAU;IACrB,YACmB,gBAAkC,EAClC,aAA6B,EAC7B,mBAAwC,EACxC,kBAAsC;QAHtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,kBAAa,GAAb,aAAa,CAAgB;QAC7B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,uBAAkB,GAAlB,kBAAkB,CAAoB;IAAI,CAAC;IAE9D,KAAK,CAAC,IAAI;QACR,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,IAAI,EAAE,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,CAAM;QACjB,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC;YACtD,GAAG,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;SACvC,EAAE;YACD,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,IAAI;SACX,CAAC,CAAA;QACF,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;QAE3C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/B,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAA;YAC7E,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,uBAAuB,EAAE,CAAA;YAC/E,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC;iBACrF,GAAG,CAAC,SAAS,CAAC;iBACd,KAAK,EAAE,CAAC;YACX,GAAG,CAAC,GAAG,GAAG,GAAG,OAAO,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;SAClC;QAED,OAAO,MAAM,SAAS,CAAC,MAAM,iCACxB,GAAG,KACJ,OAAO,EAAE,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EACpF,IAAI,EAAE,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,IAC1E,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAU;QACrB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAU;QACvB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACvC,CAAC;CACF;AA/CD,gCA+CC"}
|
|
@@ -10,6 +10,7 @@ import { RedisManagerService } from '../../orm/services/managers/redis-manager.s
|
|
|
10
10
|
import { ComunicationServiceHttp } from './comunication/comunication-http.service';
|
|
11
11
|
import { SqlService } from '../../orm/services/sql.service';
|
|
12
12
|
import { ReportService } from './report.service';
|
|
13
|
+
import { SingleInstanceEnsureService } from './single-instance-ensure.service';
|
|
13
14
|
export interface StartArgs {
|
|
14
15
|
appModule: any;
|
|
15
16
|
execBootStrap?: boolean;
|
|
@@ -29,10 +30,11 @@ export declare class LifeCycleService {
|
|
|
29
30
|
private readonly comunicationServiceHttp;
|
|
30
31
|
private readonly sqlService;
|
|
31
32
|
private readonly reportService;
|
|
33
|
+
private readonly singleInstanceEnsureService;
|
|
32
34
|
private readonly logger;
|
|
33
35
|
private app;
|
|
34
36
|
private readonly intervals;
|
|
35
|
-
constructor(databaseManagerService: DatabaseManagerService, redisManagerService: RedisManagerService, bootstrapService: BootstrapService, envConfigService: EnvConfigService, installService: InstallService, repositoryFactory: RepositoryFactory, webSocketService: WebSocketService, configsService: ConfigsService, comunicationServiceHttp: ComunicationServiceHttp, sqlService: SqlService, reportService: ReportService);
|
|
37
|
+
constructor(databaseManagerService: DatabaseManagerService, redisManagerService: RedisManagerService, bootstrapService: BootstrapService, envConfigService: EnvConfigService, installService: InstallService, repositoryFactory: RepositoryFactory, webSocketService: WebSocketService, configsService: ConfigsService, comunicationServiceHttp: ComunicationServiceHttp, sqlService: SqlService, reportService: ReportService, singleInstanceEnsureService: SingleInstanceEnsureService);
|
|
36
38
|
stop(): Promise<void>;
|
|
37
39
|
start(args: StartArgs): Promise<INestApplication>;
|
|
38
40
|
private connectToRedis;
|
|
@@ -6,7 +6,7 @@ const database_manager_service_1 = require("../../orm/services/managers/database
|
|
|
6
6
|
const core_1 = require("@nestjs/core");
|
|
7
7
|
const logger_1 = require("./logger");
|
|
8
8
|
class LifeCycleService {
|
|
9
|
-
constructor(databaseManagerService, redisManagerService, bootstrapService, envConfigService, installService, repositoryFactory, webSocketService, configsService, comunicationServiceHttp, sqlService, reportService) {
|
|
9
|
+
constructor(databaseManagerService, redisManagerService, bootstrapService, envConfigService, installService, repositoryFactory, webSocketService, configsService, comunicationServiceHttp, sqlService, reportService, singleInstanceEnsureService) {
|
|
10
10
|
this.databaseManagerService = databaseManagerService;
|
|
11
11
|
this.redisManagerService = redisManagerService;
|
|
12
12
|
this.bootstrapService = bootstrapService;
|
|
@@ -18,19 +18,28 @@ class LifeCycleService {
|
|
|
18
18
|
this.comunicationServiceHttp = comunicationServiceHttp;
|
|
19
19
|
this.sqlService = sqlService;
|
|
20
20
|
this.reportService = reportService;
|
|
21
|
+
this.singleInstanceEnsureService = singleInstanceEnsureService;
|
|
21
22
|
this.logger = new logger_1.Logger('LifeCycleService');
|
|
22
23
|
this.intervals = [];
|
|
23
24
|
}
|
|
24
25
|
async stop() {
|
|
25
|
-
|
|
26
|
+
this.intervals.forEach(clearInterval);
|
|
27
|
+
this.comunicationServiceHttp.shutdown();
|
|
28
|
+
this.reportService.shutdown();
|
|
29
|
+
const tasks = [];
|
|
30
|
+
tasks.push(this.webSocketService.disconnect);
|
|
31
|
+
tasks.push(this.repositoryFactory.shuwdown);
|
|
32
|
+
tasks.push(this.databaseManagerService.get().disconnect);
|
|
33
|
+
tasks.push(this.singleInstanceEnsureService.shutdown);
|
|
26
34
|
if (this.app) {
|
|
27
|
-
|
|
35
|
+
tasks.push(this.app.close);
|
|
36
|
+
}
|
|
37
|
+
try {
|
|
38
|
+
await Promise.all(tasks);
|
|
39
|
+
}
|
|
40
|
+
catch (e) {
|
|
41
|
+
this.logger.error(e);
|
|
28
42
|
}
|
|
29
|
-
await this.repositoryFactory.shuwdown();
|
|
30
|
-
this.intervals.forEach(clearInterval);
|
|
31
|
-
await this.databaseManagerService.get().disconnect();
|
|
32
|
-
await this.comunicationServiceHttp.shutdown();
|
|
33
|
-
await this.reportService.shutdown();
|
|
34
43
|
}
|
|
35
44
|
async start(args) {
|
|
36
45
|
logger_1.Logger.setStackCondition(await this.envConfigService.getEnvByName('LOG_STACK_CONDITION', ''));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":";;;AACA,+BAA8B;AAE9B,mGAG8D;AAI9D,uCAA2C;AAC3C,qCAAkC;
|
|
1
|
+
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,13 @@ import { RedisManagerService } from "../../orm/services/managers/redis-manager.s
|
|
|
2
2
|
export declare class SingleInstanceEnsureService {
|
|
3
3
|
private readonly redisManagerService;
|
|
4
4
|
private readonly logger;
|
|
5
|
+
private readonly running;
|
|
6
|
+
private readonly healthCheck;
|
|
5
7
|
constructor(redisManagerService: RedisManagerService);
|
|
6
8
|
ensure(key: string, func: () => Promise<void>, opt: {
|
|
7
9
|
timeoutInSeconds: number;
|
|
8
10
|
}): Promise<boolean>;
|
|
11
|
+
private toCompleteKey;
|
|
12
|
+
private shutdownByKey;
|
|
13
|
+
shutdown(): Promise<void>;
|
|
9
14
|
}
|
|
@@ -6,37 +6,75 @@ class SingleInstanceEnsureService {
|
|
|
6
6
|
constructor(redisManagerService) {
|
|
7
7
|
this.redisManagerService = redisManagerService;
|
|
8
8
|
this.logger = new logger_1.Logger('SingleInstanceEnsureService');
|
|
9
|
+
this.running = [];
|
|
10
|
+
this.healthCheck = setInterval(() => {
|
|
11
|
+
if (this.running.length) {
|
|
12
|
+
this.logger.log("Running: " + this.running.reduce((a, b) => `${a},${b}`));
|
|
13
|
+
}
|
|
14
|
+
}, 5000);
|
|
9
15
|
}
|
|
10
16
|
ensure(key, func, opt) {
|
|
11
17
|
return new Promise((resolve, reject) => {
|
|
12
|
-
const completeKey =
|
|
18
|
+
const completeKey = this.toCompleteKey(key);
|
|
13
19
|
const r = this.redisManagerService.get();
|
|
14
20
|
r.get(completeKey, (error, data) => {
|
|
15
21
|
if (error) {
|
|
16
22
|
return reject(error);
|
|
17
23
|
}
|
|
18
24
|
if (data) {
|
|
19
|
-
this.logger.log(`processo ${key} já em execução por outro pod`);
|
|
25
|
+
this.logger.log(`processo '${key}' já em execução por outro pod`);
|
|
20
26
|
return resolve(false);
|
|
21
27
|
}
|
|
22
28
|
r.setex(completeKey, opt.timeoutInSeconds, 'locked', () => {
|
|
23
|
-
this.logger.log(`processo ${key} iniciado`);
|
|
29
|
+
this.logger.log(`processo '${key}' iniciado`);
|
|
24
30
|
resolve(true);
|
|
31
|
+
this.running.push(key);
|
|
25
32
|
func()
|
|
26
33
|
.catch((error) => {
|
|
27
34
|
this.logger.error(error);
|
|
28
35
|
})
|
|
29
36
|
.finally(() => {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
}
|
|
37
|
+
this.shutdownByKey(key)
|
|
38
|
+
.catch(error => {
|
|
39
|
+
this.logger.error(error);
|
|
34
40
|
});
|
|
35
41
|
});
|
|
36
42
|
});
|
|
37
43
|
});
|
|
38
44
|
});
|
|
39
45
|
}
|
|
46
|
+
toCompleteKey(key) {
|
|
47
|
+
return `SingleInstanceEnsureService-${key}`;
|
|
48
|
+
}
|
|
49
|
+
async shutdownByKey(key) {
|
|
50
|
+
const completeKey = this.toCompleteKey(key);
|
|
51
|
+
const r = this.redisManagerService.get();
|
|
52
|
+
return new Promise((resolve, reject) => {
|
|
53
|
+
r.del(completeKey, error => {
|
|
54
|
+
this.logger.log(`processo '${key}' finalizado`);
|
|
55
|
+
this.running.splice(this.running.findIndex(r => r === key), 1);
|
|
56
|
+
if (error) {
|
|
57
|
+
return reject(error);
|
|
58
|
+
}
|
|
59
|
+
return resolve();
|
|
60
|
+
});
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
async shutdown() {
|
|
64
|
+
clearInterval(this.healthCheck);
|
|
65
|
+
await Promise.all(this.running.map(key => () => {
|
|
66
|
+
return new Promise(async (r) => {
|
|
67
|
+
try {
|
|
68
|
+
await this.shutdownByKey(key);
|
|
69
|
+
r();
|
|
70
|
+
}
|
|
71
|
+
catch (e) {
|
|
72
|
+
this.logger.error(e);
|
|
73
|
+
r();
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
}));
|
|
77
|
+
}
|
|
40
78
|
}
|
|
41
79
|
exports.SingleInstanceEnsureService = SingleInstanceEnsureService;
|
|
42
80
|
//# sourceMappingURL=single-instance-ensure.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"single-instance-ensure.service.js","sourceRoot":"","sources":["../../../src/core/services/single-instance-ensure.service.ts"],"names":[],"mappings":";;;AACA,qCAAkC;AAGlC,MAAa,2BAA2B;
|
|
1
|
+
{"version":3,"file":"single-instance-ensure.service.js","sourceRoot":"","sources":["../../../src/core/services/single-instance-ensure.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,12 +16,16 @@ class ApplicationService {
|
|
|
16
16
|
async exec({ root, request: { method, path = '', query = {}, body = null, headers = {} }, user, }) {
|
|
17
17
|
const supportsBody = method.toLowerCase() != 'get';
|
|
18
18
|
const url = [root, path].filter(i => i).join('/');
|
|
19
|
+
const h = Object.assign(Object.assign({}, _.chain(headers)
|
|
20
|
+
.omit('host')
|
|
21
|
+
.value()), { 'authorization': await this.comunicationService.computeToken({
|
|
22
|
+
user
|
|
23
|
+
}) });
|
|
24
|
+
if (_.has(headers, 'host')) {
|
|
25
|
+
h.domain = headers.host;
|
|
26
|
+
}
|
|
19
27
|
const request = {
|
|
20
|
-
headers:
|
|
21
|
-
.omit('host')
|
|
22
|
-
.value()), { 'authorization': await this.comunicationService.computeToken({
|
|
23
|
-
user
|
|
24
|
-
}) }),
|
|
28
|
+
headers: h,
|
|
25
29
|
method,
|
|
26
30
|
params: query,
|
|
27
31
|
url,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.service.js","sourceRoot":"","sources":["../../../../../../src/core/services/source/gcloud-run-cloud/v1/application.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,iCAA4C;AAa5C,MAAa,kBAAkB;IAC7B,YAA6B,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAE1E,SAAS;QACP,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,IAAI,CAAI,EACZ,IAAI,EACJ,OAAO,EAAE,EACP,MAAM,EACN,IAAI,GAAG,EAAE,EACT,KAAK,GAAG,EAAE,EACV,IAAI,GAAG,IAAI,EACX,OAAO,GAAG,EAAE,EACb,EACD,IAAI,GAC4B;QAChC,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,EAAE,IAAI,KAAK,CAAA;QAClD,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEjD,MAAM,
|
|
1
|
+
{"version":3,"file":"application.service.js","sourceRoot":"","sources":["../../../../../../src/core/services/source/gcloud-run-cloud/v1/application.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,iCAA4C;AAa5C,MAAa,kBAAkB;IAC7B,YAA6B,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAE1E,SAAS;QACP,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,IAAI,CAAI,EACZ,IAAI,EACJ,OAAO,EAAE,EACP,MAAM,EACN,IAAI,GAAG,EAAE,EACT,KAAK,GAAG,EAAE,EACV,IAAI,GAAG,IAAI,EACX,OAAO,GAAG,EAAE,EACb,EACD,IAAI,GAC4B;QAChC,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,EAAE,IAAI,KAAK,CAAA;QAClD,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEjD,MAAM,CAAC,GAAG,gCACL,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;aAChB,IAAI,CAAC,MAAM,CAAC;aACZ,KAAK,EAAE,KACV,eAAe,EAAE,MAAM,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC;gBAC3D,IAAI;aACL,CAAC,GACI,CAAA;QAER,IAAG,CAAC,CAAC,GAAG,CAAC,OAAO,EAAC,MAAM,CAAC,EAAE;YACxB,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAA;SACxB;QAED,MAAM,OAAO,GAAG;YACd,OAAO,EAAE,CAAC;YACV,MAAM;YACN,MAAM,EAAE,KAAK;YACb,GAAG;YACH,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;SACjC,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,OAAO,CAAsB,OAAO,CAAC,CAAA;QAClE,OAAO;YACL,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;SACR,CAAA;IACf,CAAC;CACF;AApDD,gDAoDC"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
|
+
export interface EvalServiceOpt {
|
|
2
|
+
transforms?: {
|
|
3
|
+
[key: string]: (...args: any) => any;
|
|
4
|
+
};
|
|
5
|
+
token?: string;
|
|
6
|
+
}
|
|
1
7
|
export declare class EvalService {
|
|
2
8
|
private readonly context;
|
|
3
9
|
private readonly opt;
|
|
4
10
|
private readonly jexl;
|
|
5
|
-
constructor(context: any, opt?:
|
|
6
|
-
transforms?: any[];
|
|
7
|
-
token?: string;
|
|
8
|
-
});
|
|
11
|
+
constructor(context: any, opt?: EvalServiceOpt);
|
|
9
12
|
private prepare;
|
|
10
13
|
eval(str: string): Promise<any>;
|
|
11
14
|
evalSync(str: string): any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eval.service.js","sourceRoot":"","sources":["../../../src/plugins/eval/eval.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,+BAA4B;AAC5B,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"eval.service.js","sourceRoot":"","sources":["../../../src/plugins/eval/eval.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uuid.service.js","sourceRoot":"","sources":["../../../src/plugins/uuid/uuid.service.ts"],"names":[],"mappings":";;;AACA,+
|
|
1
|
+
{"version":3,"file":"uuid.service.js","sourceRoot":"","sources":["../../../src/plugins/uuid/uuid.service.ts"],"names":[],"mappings":";;;AACA,+BAAmC;AAGnC,MAAa,WAAW;IACtB,EAAE;QACA,OAAO,SAAE,EAAE,CAAC;IACd,CAAC;IACD,QAAQ,CAAC,IAAY;QACnB,OAAO,eAAQ,CAAC,IAAI,CAAC,CAAA;IACvB,CAAC;CACF;AAPD,kCAOC"}
|