@puca/puca-core 4.3.4 → 5.0.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/auth.service.js +1 -1
- package/dist/core/services/auth.service.js.map +1 -1
- package/dist/core/services/bootstrap-commands.js +42 -0
- package/dist/core/services/bootstrap-commands.js.map +1 -1
- package/dist/core/services/comunication/comunication-http.service.d.ts +18 -0
- package/dist/core/services/comunication/comunication-http.service.js +47 -0
- package/dist/core/services/comunication/comunication-http.service.js.map +1 -0
- package/dist/core/services/comunication/comunication.service.d.ts +26 -0
- package/dist/core/services/comunication/comunication.service.js +49 -0
- package/dist/core/services/comunication/comunication.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/life-cycle.service.d.ts +4 -3
- package/dist/core/services/life-cycle.service.js +15 -55
- package/dist/core/services/life-cycle.service.js.map +1 -1
- package/dist/core/services/source/gcloud-run-cloud/v1/application.service.d.ts +1 -1
- package/dist/core/services/source/javascript/v1/application.service.d.ts +1 -1
- package/dist/core/services/user-config.service.js +1 -1
- package/dist/core/services/user-config.service.js.map +1 -1
- package/dist/models/secret.d.ts +4 -2
- package/dist/orm/cases/sql/sql.service.js +12 -6
- package/dist/orm/cases/sql/sql.service.js.map +1 -1
- package/dist/orm/services/cache-repository/cache-repository.js +1 -4
- package/dist/orm/services/cache-repository/cache-repository.js.map +1 -1
- package/dist/orm/services/managers/database-manager.service.d.ts +4 -41
- package/dist/orm/services/managers/database-manager.service.js +18 -127
- package/dist/orm/services/managers/database-manager.service.js.map +1 -1
- package/dist/orm/services/managers/puca-orm-client.service.d.ts +30 -0
- package/dist/orm/services/managers/puca-orm-client.service.js +104 -0
- package/dist/orm/services/managers/puca-orm-client.service.js.map +1 -0
- package/dist/orm/services/repository.d.ts +91 -82
- package/dist/orm/services/repository.js +2 -5
- package/dist/orm/services/repository.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
- package/puca-orm.proto +38 -0
- package/yarn-error.log +560 -243
- package/dist/core/services/comunication.service.d.ts +0 -26
- package/dist/core/services/comunication.service.js +0 -77
- package/dist/core/services/comunication.service.js.map +0 -1
- package/dist/orm/services/cache-repository/cache-repository-postgres.d.ts +0 -23
- package/dist/orm/services/cache-repository/cache-repository-postgres.js +0 -128
- package/dist/orm/services/cache-repository/cache-repository-postgres.js.map +0 -1
- package/readme.md +0 -13
|
@@ -108,7 +108,7 @@ class SqlService {
|
|
|
108
108
|
args: [`$internal_change`, 'puca_pid::varchar'],
|
|
109
109
|
} : null,
|
|
110
110
|
...(returningPuca || []),
|
|
111
|
-
],
|
|
111
|
+
].filter(f => f),
|
|
112
112
|
})), { commandName: 'insertPuca' }),
|
|
113
113
|
Object.assign(Object.assign({}, this.sqlBuilderService.insert({
|
|
114
114
|
tableName: computeUserTable(insert.tableName),
|
|
@@ -116,7 +116,9 @@ class SqlService {
|
|
|
116
116
|
args: Object.assign({}, (insert.notify ? {
|
|
117
117
|
internal_change: `${insert.tableName}.change`,
|
|
118
118
|
} : {})),
|
|
119
|
-
returning:
|
|
119
|
+
returning: [
|
|
120
|
+
...(returningUser || [])
|
|
121
|
+
].filter(f => f),
|
|
120
122
|
})), { commandName: 'insertUser' }),
|
|
121
123
|
].filter(r => r);
|
|
122
124
|
return retorno;
|
|
@@ -177,7 +179,7 @@ class SqlService {
|
|
|
177
179
|
args: [`$internal_change`, 'puca_pid::varchar'],
|
|
178
180
|
} : null,
|
|
179
181
|
...(returningPuca || []),
|
|
180
|
-
],
|
|
182
|
+
].filter(f => f),
|
|
181
183
|
})), { commandName: 'updatePuca' }) : null,
|
|
182
184
|
!_.isEqual(setUser, {})
|
|
183
185
|
? Object.assign(Object.assign({}, this.sqlBuilderService.update({
|
|
@@ -189,7 +191,9 @@ class SqlService {
|
|
|
189
191
|
operator: interfaces_1.ConditionalOpertator.equals,
|
|
190
192
|
v2: '$puca_pid',
|
|
191
193
|
},
|
|
192
|
-
returning:
|
|
194
|
+
returning: [
|
|
195
|
+
...returningUser || [],
|
|
196
|
+
].filter(f => f)
|
|
193
197
|
})), { commandName: 'updateUser' }) : null,
|
|
194
198
|
].filter(f => f);
|
|
195
199
|
return retorno;
|
|
@@ -221,7 +225,9 @@ class SqlService {
|
|
|
221
225
|
operator: interfaces_1.ConditionalOpertator.equals,
|
|
222
226
|
v2: '$puca_pid',
|
|
223
227
|
},
|
|
224
|
-
returning:
|
|
228
|
+
returning: [
|
|
229
|
+
...returningUser || [],
|
|
230
|
+
].filter(f => f)
|
|
225
231
|
})), { commandName: 'deleteUser' }),
|
|
226
232
|
Object.assign(Object.assign({}, this.sqlBuilderService.delete({
|
|
227
233
|
tableName: pucaTable,
|
|
@@ -242,7 +248,7 @@ class SqlService {
|
|
|
242
248
|
args: [`$internal_change`, 'puca_pid::varchar'],
|
|
243
249
|
} : null,
|
|
244
250
|
...(returningPuca || []),
|
|
245
|
-
],
|
|
251
|
+
].filter(f => f),
|
|
246
252
|
})), { commandName: 'deletePuca' }),
|
|
247
253
|
];
|
|
248
254
|
return retorno;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql.service.js","sourceRoot":"","sources":["../../../../src/orm/cases/sql/sql.service.ts"],"names":[],"mappings":";;;AAAA,iDAO0B;AAC1B,4BAA4B;AAK5B,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC;AAC5D,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC;AAE5D,MAAM,kBAAkB,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,EAA0B,EAAE,EAAE;IACjE,OAAO;QACL;YACE,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,CAAC,KAAK,cAAc,CAAC;YAC9B,CAAC;YACD,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YACjC,CAAC;SACF;QACD;YACE,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,CAAC,KAAK,kBAAkB,CAAC;YAClC,CAAC;YACD,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YACjC,CAAC;SACF;QACD;YACE,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC;YACd,CAAC;YACD,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,CAAC,CAAC;YACX,CAAC;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAA6B,EAAE,EAAE;IAC5E,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;SACxB,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACd,OAAO;YACL,CAAC;YACD,kBAAkB,CAAC;gBACjB,IAAI;gBACJ,CAAC;aACF,CAAC;iBACC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;iBACpB,KAAK,EAAE;SACX,CAAC;IACJ,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACpB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACT,OAAO,CAAC,CAAC;IACX,CAAC,EAAE,EAAE,CAAC,CAAC;AACX,CAAC,CAAC;AAEF,MAAa,UAAU;IACrB,YACmB,IAAiB,EACjB,iBAAoC;QADpC,SAAI,GAAJ,IAAI,CAAa;QACjB,sBAAiB,GAAjB,iBAAiB,CAAmB;IACnD,CAAC;IACL,MAAM,CACJ,MAGC,EACD,IAAU;QAMV,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACzE,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;aAC7D,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;aACzE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACd,OAAO;gBACL,CAAC;gBACD,kBAAkB,CAAC;oBACjB,IAAI;oBACJ,CAAC;iBACF,CAAC;qBACC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;qBACpB,KAAK,EAAE;aACX,CAAC;QACJ,CAAC,CAAC;aACD,MAAM,CACL,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC9D,OAAO,CAAC,CAAC;QACX,CAAC,EACD;YACE,UAAU,EAAE;gBACV,QAAQ;gBACR,eAAe,EAAE,GAAG;aACrB;YACD,UAAU,EAAE;gBACV,QAAQ,EAAE,QAAQ;aACnB;SACF,CACF,CAAC;QACJ,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,CACrD,MAAM,CAAC,SAAS,IAAI,EAAE,CACvB,CAAC,MAAM,CACN,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrE,OAAO,CAAC,CAAC;QACX,CAAC,EACD;YACE,aAAa,EAAE,EAAE;YACjB,aAAa,EAAE,EAAE;SAClB,CACF,CAAC;QACF,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,OAAO,GAAiB;4CAEvB,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBAC/B,SAAS;gBACT,MAAM,oBACD,UAAU,CACd;gBACD,IAAI,oBACC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;oBAClB,eAAe,EAAE,GAAG,MAAM,CAAC,SAAS,SAAS;iBAC9C,CAAC,CAAC,CAAC,EAAE,CAAC,CACR;gBACD,SAAS,EAAE;oBACT,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;wBACd,QAAQ,EAAE,WAAW;wBACrB,IAAI,EAAE,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;qBAChD,CAAC,CAAC,CAAC,IAAI;oBACR,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;iBACzB;
|
|
1
|
+
{"version":3,"file":"sql.service.js","sourceRoot":"","sources":["../../../../src/orm/cases/sql/sql.service.ts"],"names":[],"mappings":";;;AAAA,iDAO0B;AAC1B,4BAA4B;AAK5B,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC;AAC5D,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC;AAE5D,MAAM,kBAAkB,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,EAA0B,EAAE,EAAE;IACjE,OAAO;QACL;YACE,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,CAAC,KAAK,cAAc,CAAC;YAC9B,CAAC;YACD,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YACjC,CAAC;SACF;QACD;YACE,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,CAAC,KAAK,kBAAkB,CAAC;YAClC,CAAC;YACD,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YACjC,CAAC;SACF;QACD;YACE,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC;YACd,CAAC;YACD,KAAK,EAAE,GAAG,EAAE;gBACV,OAAO,CAAC,CAAC;YACX,CAAC;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAA6B,EAAE,EAAE;IAC5E,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;SACxB,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACd,OAAO;YACL,CAAC;YACD,kBAAkB,CAAC;gBACjB,IAAI;gBACJ,CAAC;aACF,CAAC;iBACC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;iBACpB,KAAK,EAAE;SACX,CAAC;IACJ,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACpB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACT,OAAO,CAAC,CAAC;IACX,CAAC,EAAE,EAAE,CAAC,CAAC;AACX,CAAC,CAAC;AAEF,MAAa,UAAU;IACrB,YACmB,IAAiB,EACjB,iBAAoC;QADpC,SAAI,GAAJ,IAAI,CAAa;QACjB,sBAAiB,GAAjB,iBAAiB,CAAmB;IACnD,CAAC;IACL,MAAM,CACJ,MAGC,EACD,IAAU;QAMV,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACzE,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;aAC7D,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;aACzE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACd,OAAO;gBACL,CAAC;gBACD,kBAAkB,CAAC;oBACjB,IAAI;oBACJ,CAAC;iBACF,CAAC;qBACC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;qBACpB,KAAK,EAAE;aACX,CAAC;QACJ,CAAC,CAAC;aACD,MAAM,CACL,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC9D,OAAO,CAAC,CAAC;QACX,CAAC,EACD;YACE,UAAU,EAAE;gBACV,QAAQ;gBACR,eAAe,EAAE,GAAG;aACrB;YACD,UAAU,EAAE;gBACV,QAAQ,EAAE,QAAQ;aACnB;SACF,CACF,CAAC;QACJ,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,CACrD,MAAM,CAAC,SAAS,IAAI,EAAE,CACvB,CAAC,MAAM,CACN,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrE,OAAO,CAAC,CAAC;QACX,CAAC,EACD;YACE,aAAa,EAAE,EAAE;YACjB,aAAa,EAAE,EAAE;SAClB,CACF,CAAC;QACF,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,OAAO,GAAiB;4CAEvB,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBAC/B,SAAS;gBACT,MAAM,oBACD,UAAU,CACd;gBACD,IAAI,oBACC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;oBAClB,eAAe,EAAE,GAAG,MAAM,CAAC,SAAS,SAAS;iBAC9C,CAAC,CAAC,CAAC,EAAE,CAAC,CACR;gBACD,SAAS,EAAE;oBACT,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;wBACd,QAAQ,EAAE,WAAW;wBACrB,IAAI,EAAE,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;qBAChD,CAAC,CAAC,CAAC,IAAI;oBACR,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;iBACzB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACjB,CAAC,KACF,WAAW,EAAE,YAAY;4CAGtB,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBAC/B,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC7C,MAAM,EAAE,UAAU;gBAClB,IAAI,oBACC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;oBAClB,eAAe,EAAE,GAAG,MAAM,CAAC,SAAS,SAAS;iBAC9C,CAAC,CAAC,CAAC,EAAE,CAAC,CACR;gBACD,SAAS,EAAE;oBACT,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;iBACzB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACjB,CAAC,KACF,WAAW,EAAE,YAAY;SAsB5B,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,MAEN,EAAE,IAAU;QACX,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACzC;QACD,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAErD,MAAM,UAAU,GAAG,uBAAuB,CAAC;YACzC,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI;SACL,CAAC,CAAC;QAEH,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC;aACpD,MAAM,CACL,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CACN,CAAC,CAAC,UAAU,EAAE,iBAAiB,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CACvE;aACA,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACd,OAAO;gBACL,CAAC;gBACD,kBAAkB,CAAC;oBACjB,IAAI;oBACJ,CAAC;iBACF,CAAC;qBACC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;qBACpB,KAAK,EAAE;aACX,CAAC;QACJ,CAAC,CAAC;aACD,MAAM,CACL,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACxD,OAAO,CAAC,CAAC;QACX,CAAC,EACD;YACE,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,EAAE;SACZ,CACF,CAAC;QAEJ,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,CACrD,MAAM,CAAC,SAAS,IAAI,EAAE,CACvB,CAAC,MAAM,CACN,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrE,OAAO,CAAC,CAAC;QACX,CAAC,EACD;YACE,aAAa,EAAE,EAAE;YACjB,aAAa,EAAE,EAAE;SAClB,CACF,CAAC;QACF,MAAM,OAAO,GAAiB;YAC5B,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;gBACrB,CAAC,iCACI,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;oBAC/B,SAAS,EAAE,SAAS;oBACpB,IAAI,kCACC,UAAU,GACV,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;wBAClB,eAAe,EAAE,GAAG,MAAM,CAAC,SAAS,SAAS;qBAC9C,CAAC,CAAC,CAAC,EAAE,CAAC,CAER;oBACD,GAAG,EAAE,OAAO;oBACZ,KAAK,EAAE;wBACL,EAAE,EAAE,UAAU;wBACd,QAAQ,EAAE,iCAAoB,CAAC,MAAM;wBACrC,EAAE,EAAE,WAAW;qBAChB;oBACD,SAAS,EAAE;wBACT,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;4BACd,QAAQ,EAAE,WAAW;4BACrB,IAAI,EAAE,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;yBAChD,CAAC,CAAC,CAAC,IAAI;wBACR,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;qBACzB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;iBACjB,CAAC,KACF,WAAW,EAAE,YAAY,IAE3B,CAAC,CAAC,IAAI;YACR,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;gBACrB,CAAC,iCACI,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;oBAC/B,SAAS,EAAE,SAAS;oBACpB,IAAI,kCACC,UAAU,KACb,QAAQ,EAAE,MAAM,CAAC,QAAQ,GAC1B;oBACD,GAAG,EAAE,OAAO;oBACZ,KAAK,EAAE;wBACL,EAAE,EAAE,UAAU;wBACd,QAAQ,EAAE,iCAAoB,CAAC,MAAM;wBACrC,EAAE,EAAE,WAAW;qBAChB;oBACD,SAAS,EAAE;wBACT,GAAG,aAAa,IAAI,EAAE;qBACvB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;iBACjB,CAAC,KACF,WAAW,EAAE,YAAY,IAE3B,CAAC,CAAC,IAAI;SAmBT,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,CAEN,EAAE,IAAU;QACX,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACzC;QACD,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,CACrD,CAAC,CAAC,SAAS,IAAI,EAAE,CAClB,CAAC,MAAM,CACN,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrE,OAAO,CAAC,CAAC;QACX,CAAC,EACD;YACE,aAAa,EAAE,EAAE;YACjB,aAAa,EAAE,EAAE;SAClB,CACF,CAAC;QACF,MAAM,OAAO,GAAiB;4CAEvB,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBAC/B,SAAS,EAAE,SAAS;gBACpB,IAAI,EAAE,uBAAuB,CAAC;oBAC5B,IAAI,EAAE;wBACJ,QAAQ,EAAE,CAAC,CAAC,QAAQ;qBACrB;oBACD,IAAI;iBACL,CAAC;gBACF,KAAK,EAAE;oBACL,EAAE,EAAE,UAAU;oBACd,QAAQ,EAAE,iCAAoB,CAAC,MAAM;oBACrC,EAAE,EAAE,WAAW;iBAChB;gBACD,SAAS,EAAE;oBACT,GAAG,aAAa,IAAI,EAAE;iBACvB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACjB,CAAC,KACF,WAAW,EAAE,YAAY;4CAGtB,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBAC/B,SAAS,EAAE,SAAS;gBACpB,IAAI,EAAE,uBAAuB,CAAC;oBAC5B,IAAI,kBACF,QAAQ,EAAE,CAAC,CAAC,QAAQ,IACjB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;wBACb,eAAe,EAAE,GAAG,CAAC,CAAC,SAAS,SAAS;qBACzC,CAAC,CAAC,CAAC,EAAE,CAAC,CACR;oBACD,IAAI;iBACL,CAAC;gBACF,KAAK,EAAE;oBACL,EAAE,EAAE,UAAU;oBACd,QAAQ,EAAE,iCAAoB,CAAC,MAAM;oBACrC,EAAE,EAAE,WAAW;iBAChB;gBACD,SAAS,EAAE;oBACT,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;wBACT,QAAQ,EAAE,WAAW;wBACrB,IAAI,EAAE,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;qBAChD,CAAC,CAAC,CAAC,IAAI;oBACR,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;iBACzB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACjB,CAAC,KACF,WAAW,EAAE,YAAY;SAoB5B,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,MAAM,CAAC,cAAsB,EAAE,OAAa,IAAI;QAC9C,IAAI,CAAC,cAAc,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE;YAC3D,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;SACnD;QACD,MAAM,MAAM,GAAG,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAC3C,MAAM,CAAC,IAAI,GAAG,uBAAuB,CAAC;YACpC,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI;SACL,CAAC,CAAC;QACH,uCACK,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,KACxC,WAAW,EAAE,QAAQ,IACrB;IACJ,CAAC;CACF;AA5VD,gCA4VC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CacheRepository = void 0;
|
|
4
|
-
const cache_repository_postgres_1 = require("./cache-repository-postgres");
|
|
5
4
|
const cache_repository_redis_1 = require("./cache-repository-redis");
|
|
6
5
|
class CacheRepository {
|
|
7
6
|
constructor(envConfigService, database, redisClient, table) {
|
|
@@ -15,11 +14,9 @@ class CacheRepository {
|
|
|
15
14
|
const cacheRepositoryProvider = await this.envConfigService.getEnvByName('CACHE_REPOSITORY_PROVIDER');
|
|
16
15
|
switch (cacheRepositoryProvider) {
|
|
17
16
|
case 'redis':
|
|
17
|
+
default:
|
|
18
18
|
this.instance = new cache_repository_redis_1.CacheRepositoryRedis(this.database, this.redisClient, this.table);
|
|
19
19
|
break;
|
|
20
|
-
case 'postgres':
|
|
21
|
-
default:
|
|
22
|
-
this.instance = new cache_repository_postgres_1.CacheRepositoryPostgres(this.database, this.table);
|
|
23
20
|
}
|
|
24
21
|
}
|
|
25
22
|
return this.instance;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-repository.js","sourceRoot":"","sources":["../../../../src/orm/services/cache-repository/cache-repository.ts"],"names":[],"mappings":";;;AAIA,
|
|
1
|
+
{"version":3,"file":"cache-repository.js","sourceRoot":"","sources":["../../../../src/orm/services/cache-repository/cache-repository.ts"],"names":[],"mappings":";;;AAIA,qEAAgE;AAgChE,MAAa,eAAe;IAG1B,YACmB,gBAAkC,EAClC,QAAkB,EAClB,WAAwB,EACxB,KAAa;QAHb,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,aAAQ,GAAR,QAAQ,CAAU;QAClB,gBAAW,GAAX,WAAW,CAAa;QACxB,UAAK,GAAL,KAAK,CAAQ;IAC5B,CAAC;IAEG,KAAK,CAAC,WAAW;QACvB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,2BAA2B,CAAC,CAAA;YACrG,QAAQ,uBAAuB,EAAE;gBAC/B,KAAK,OAAO,CAAC;gBACb;oBACE,IAAI,CAAC,QAAQ,GAAG,IAAI,6CAAoB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;oBACrF,MAAK;aACR;SACF;QACD,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;QACzC,OAAO,QAAQ,CAAC,OAAO,EAAE,CAAA;IAC3B,CAAC;IACD,KAAK,CAAC,QAAQ,CAAC,OAA8B;QAC3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;QACzC,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IACnC,CAAC;IACD,KAAK,CAAC,QAAQ;QACZ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;QACzC,OAAO,QAAQ,CAAC,QAAQ,EAAE,CAAA;IAC5B,CAAC;CACF;AAnCD,0CAmCC"}
|
|
@@ -1,50 +1,14 @@
|
|
|
1
|
-
import { PoolClient as OriginalPoolClient } from 'pg';
|
|
2
1
|
import { SqlCommand } from '../../interfaces';
|
|
3
|
-
|
|
4
|
-
commandName: string;
|
|
5
|
-
result: T[];
|
|
6
|
-
rowsAffected: number;
|
|
7
|
-
}
|
|
8
|
-
export interface DatabaseConfig {
|
|
9
|
-
user: string;
|
|
10
|
-
database: string;
|
|
11
|
-
password: string;
|
|
12
|
-
port: number;
|
|
13
|
-
host: string;
|
|
14
|
-
max: number;
|
|
15
|
-
}
|
|
2
|
+
import { PucaOrmClientConnection, PucaOrmQueryOpt, QueryResult } from './puca-orm-client.service';
|
|
16
3
|
export declare type Handler = (payload: string) => void;
|
|
17
|
-
declare type PoolClient = OriginalPoolClient & {
|
|
18
|
-
uuid: string;
|
|
19
|
-
};
|
|
20
|
-
export declare enum DatabaseState {
|
|
21
|
-
Ready = "Ready",
|
|
22
|
-
Closed = "Closed",
|
|
23
|
-
Shutdown = "Shutdown"
|
|
24
|
-
}
|
|
25
4
|
export declare class Database {
|
|
26
|
-
private readonly config;
|
|
27
|
-
private readonly poolHelthCheck;
|
|
28
5
|
private readonly logger;
|
|
29
|
-
private readonly
|
|
30
|
-
|
|
31
|
-
private subscriptions;
|
|
32
|
-
private status;
|
|
33
|
-
constructor(config: DatabaseConfig & {
|
|
34
|
-
application_name: string;
|
|
35
|
-
});
|
|
6
|
+
private readonly pucaOrmClient;
|
|
7
|
+
constructor(config: PucaOrmClientConnection);
|
|
36
8
|
connect(): Promise<void>;
|
|
37
|
-
private _subscribe;
|
|
38
|
-
getConnection(): Promise<PoolClient>;
|
|
39
|
-
subscribe(topic: string, handler: Handler): Promise<void>;
|
|
40
9
|
private query;
|
|
41
10
|
exec<T>(sqlCommand: SqlCommand): Promise<T[]>;
|
|
42
|
-
serialExec
|
|
43
|
-
transaction: boolean;
|
|
44
|
-
}): Promise<SerialExecResult<T>[]>;
|
|
45
|
-
getConfig(): DatabaseConfig & {
|
|
46
|
-
application_name: string;
|
|
47
|
-
};
|
|
11
|
+
serialExec(sqlCommandList: SqlCommand[], opt?: PucaOrmQueryOpt): Promise<QueryResult[]>;
|
|
48
12
|
disconnect(): Promise<void>;
|
|
49
13
|
}
|
|
50
14
|
export declare class DatabaseManagerService {
|
|
@@ -52,4 +16,3 @@ export declare class DatabaseManagerService {
|
|
|
52
16
|
get(): Database;
|
|
53
17
|
set(d: Database): void;
|
|
54
18
|
}
|
|
55
|
-
export {};
|
|
@@ -1,58 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DatabaseManagerService = exports.Database =
|
|
4
|
-
const
|
|
3
|
+
exports.DatabaseManagerService = exports.Database = void 0;
|
|
4
|
+
const _ = require("lodash");
|
|
5
5
|
const logger_1 = require("../../../core/services/logger");
|
|
6
|
-
const
|
|
7
|
-
var DatabaseState;
|
|
8
|
-
(function (DatabaseState) {
|
|
9
|
-
DatabaseState["Ready"] = "Ready";
|
|
10
|
-
DatabaseState["Closed"] = "Closed";
|
|
11
|
-
DatabaseState["Shutdown"] = "Shutdown";
|
|
12
|
-
})(DatabaseState = exports.DatabaseState || (exports.DatabaseState = {}));
|
|
6
|
+
const puca_orm_client_service_1 = require("./puca-orm-client.service");
|
|
13
7
|
class Database {
|
|
14
8
|
constructor(config) {
|
|
15
|
-
this.config = config;
|
|
16
9
|
this.logger = new logger_1.Logger('Database');
|
|
17
|
-
this.
|
|
18
|
-
this.subscriptions = [];
|
|
19
|
-
this.status = DatabaseState.Ready;
|
|
20
|
-
this.pool = new pg_1.Pool(Object.assign({}, config));
|
|
21
|
-
this.poolHelthCheck = setInterval(() => {
|
|
22
|
-
if (this.pool.waitingCount > 0) {
|
|
23
|
-
this.logger.warn('waitingCount: ' + this.pool.waitingCount);
|
|
24
|
-
}
|
|
25
|
-
}, 5000);
|
|
26
|
-
this.pool.on('acquire', client => {
|
|
27
|
-
const c = client;
|
|
28
|
-
c.uuid = plugins_1.uuidService.v4();
|
|
29
|
-
this.clients.set(c.uuid, c);
|
|
30
|
-
});
|
|
31
|
-
this.pool.on('remove', client => {
|
|
32
|
-
const c = client;
|
|
33
|
-
this.subscriptions = this.subscriptions.reduce((retorno, s) => {
|
|
34
|
-
if (s.client.uuid === c.uuid && this.status === DatabaseState.Ready) {
|
|
35
|
-
s.client.removeAllListeners('error');
|
|
36
|
-
s.client.removeAllListeners('notification');
|
|
37
|
-
this.logger.debug('resubscrevendo o topico ' + s.topic);
|
|
38
|
-
this.subscribe(s.topic, s.handler);
|
|
39
|
-
}
|
|
40
|
-
else {
|
|
41
|
-
retorno.push(s);
|
|
42
|
-
}
|
|
43
|
-
return retorno;
|
|
44
|
-
}, []);
|
|
45
|
-
this.clients.delete(c.uuid);
|
|
46
|
-
});
|
|
47
|
-
this.pool.on('error', error => {
|
|
48
|
-
this.logger.error(error);
|
|
49
|
-
});
|
|
10
|
+
this.pucaOrmClient = new puca_orm_client_service_1.PucaOrmClient(config);
|
|
50
11
|
}
|
|
51
12
|
async connect() {
|
|
52
13
|
try {
|
|
53
14
|
await this.exec({
|
|
54
15
|
sql: 'select now()',
|
|
55
|
-
commandName: null
|
|
16
|
+
commandName: null
|
|
56
17
|
});
|
|
57
18
|
}
|
|
58
19
|
catch (e) {
|
|
@@ -60,97 +21,27 @@ class Database {
|
|
|
60
21
|
throw new Error('Fail to connect on database');
|
|
61
22
|
}
|
|
62
23
|
}
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
});
|
|
70
|
-
this.subscriptions.push({
|
|
71
|
-
client,
|
|
72
|
-
handler,
|
|
73
|
-
topic,
|
|
74
|
-
});
|
|
75
|
-
this.logger.debug(`subscrevendo no '${topic}' no client ${client.uuid}`);
|
|
76
|
-
await client.query(`listen "${topic}"`);
|
|
77
|
-
}
|
|
78
|
-
getConnection() {
|
|
79
|
-
return new Promise(async (resolve, reject) => {
|
|
80
|
-
try {
|
|
81
|
-
const r = await this.pool.connect();
|
|
82
|
-
resolve(r);
|
|
83
|
-
}
|
|
84
|
-
catch (e) {
|
|
85
|
-
this.logger.error(e);
|
|
86
|
-
reject(new Error('Não foi possível atender esta solicitação, for favor tente mais tarde'));
|
|
87
|
-
throw e;
|
|
88
|
-
}
|
|
89
|
-
});
|
|
90
|
-
}
|
|
91
|
-
async subscribe(topic, handler) {
|
|
92
|
-
const client = await this.getConnection();
|
|
93
|
-
await this._subscribe(client, topic, handler);
|
|
94
|
-
}
|
|
95
|
-
query(client, sqlCommand) {
|
|
96
|
-
this.logger.verbose(() => sqlCommand.sql, () => sqlCommand.args);
|
|
97
|
-
return client.query(sqlCommand.sql, sqlCommand.args);
|
|
24
|
+
query(sqlCommandList, opt) {
|
|
25
|
+
sqlCommandList.forEach(sqlCommand => this.logger.verbose(() => sqlCommand.sql, () => sqlCommand.args));
|
|
26
|
+
return this.pucaOrmClient.query(sqlCommandList.map(sqlCommand => ({
|
|
27
|
+
name: sqlCommand.commandName,
|
|
28
|
+
text: sqlCommand.sql,
|
|
29
|
+
values: sqlCommand.args
|
|
30
|
+
})), opt);
|
|
98
31
|
}
|
|
99
32
|
async exec(sqlCommand) {
|
|
100
|
-
const
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
}
|
|
105
|
-
catch (e) {
|
|
106
|
-
this.logger.warn(sqlCommand, e);
|
|
107
|
-
throw e;
|
|
108
|
-
}
|
|
109
|
-
finally {
|
|
110
|
-
await client.release();
|
|
111
|
-
}
|
|
33
|
+
const result = await this.query([sqlCommand], {
|
|
34
|
+
transaction: false
|
|
35
|
+
});
|
|
36
|
+
return _.get(result, [0, 'result']);
|
|
112
37
|
}
|
|
113
38
|
async serialExec(sqlCommandList, opt = {
|
|
114
39
|
transaction: true,
|
|
115
40
|
}) {
|
|
116
|
-
const
|
|
117
|
-
|
|
118
|
-
await client.query('begin');
|
|
119
|
-
}
|
|
120
|
-
let sqlCommand;
|
|
121
|
-
try {
|
|
122
|
-
const retorno = [];
|
|
123
|
-
for (let j = 0; j < sqlCommandList.length; j++) {
|
|
124
|
-
sqlCommand = sqlCommandList[j];
|
|
125
|
-
const result = await this.query(client, sqlCommand);
|
|
126
|
-
retorno.push({
|
|
127
|
-
commandName: sqlCommand.commandName,
|
|
128
|
-
result: result.rows,
|
|
129
|
-
rowsAffected: result.rowCount,
|
|
130
|
-
});
|
|
131
|
-
}
|
|
132
|
-
await client.query('commit');
|
|
133
|
-
return retorno;
|
|
134
|
-
}
|
|
135
|
-
catch (e) {
|
|
136
|
-
this.logger.warn(sqlCommand, e);
|
|
137
|
-
if (opt.transaction) {
|
|
138
|
-
await client.query('rollback');
|
|
139
|
-
}
|
|
140
|
-
throw e;
|
|
141
|
-
}
|
|
142
|
-
finally {
|
|
143
|
-
await client.release();
|
|
144
|
-
}
|
|
145
|
-
}
|
|
146
|
-
getConfig() {
|
|
147
|
-
return this.config;
|
|
41
|
+
const result = await this.query(sqlCommandList, { transaction: opt.transaction });
|
|
42
|
+
return result;
|
|
148
43
|
}
|
|
149
44
|
async disconnect() {
|
|
150
|
-
this.status = DatabaseState.Shutdown;
|
|
151
|
-
clearTimeout(this.poolHelthCheck);
|
|
152
|
-
await this.pool.end();
|
|
153
|
-
this.status = DatabaseState.Closed;
|
|
154
45
|
}
|
|
155
46
|
}
|
|
156
47
|
exports.Database = Database;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database-manager.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/database-manager.service.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"database-manager.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/database-manager.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAE5B,0DAAuD;AACvD,uEAAiH;AAIjH,MAAa,QAAQ;IAInB,YAAY,MAA+B;QAH1B,WAAM,GAAG,IAAI,eAAM,CAAC,UAAU,CAAC,CAAC;QAI/C,IAAI,CAAC,aAAa,GAAG,IAAI,uCAAa,CAAC,MAAM,CAAC,CAAA;IAChD,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI;YACF,MAAM,IAAI,CAAC,IAAI,CAAC;gBACd,GAAG,EAAE,cAAc;gBACnB,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;SAChD;IACH,CAAC;IAEO,KAAK,CAAC,cAA4B,EAAE,GAAoB;QAC9D,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;QACtG,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAChE,IAAI,EAAE,UAAU,CAAC,WAAW;YAC5B,IAAI,EAAE,UAAU,CAAC,GAAG;YACpB,MAAM,EAAE,UAAU,CAAC,IAAI;SACxB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;IACX,CAAC;IAED,KAAK,CAAC,IAAI,CAAI,UAAsB;QAClC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,EAAE;YAC5C,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QACH,OAAO,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAQ,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,UAAU,CACd,cAA4B,EAC5B,MAAuB;QACrB,WAAW,EAAE,IAAI;KAClB;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QAClF,OAAO,MAAM,CAAA;IACf,CAAC;IAED,KAAK,CAAC,UAAU;IAEhB,CAAC;CACF;AAjDD,4BAiDC;AAED,MAAa,sBAAsB;IAGjC,GAAG;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;SACzC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,CAAW;QACb,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAA;IACnB,CAAC;CACF;AAbD,wDAaC"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
export interface PucaOrmClientConnection {
|
|
2
|
+
grpcServiceAddress: string;
|
|
3
|
+
namespace: string;
|
|
4
|
+
key: string;
|
|
5
|
+
}
|
|
6
|
+
export interface PucaOrmQueryOpt {
|
|
7
|
+
transaction: boolean;
|
|
8
|
+
}
|
|
9
|
+
export interface QueryResult {
|
|
10
|
+
name: string;
|
|
11
|
+
result: any[];
|
|
12
|
+
rowsAffected: number;
|
|
13
|
+
}
|
|
14
|
+
export declare class PucaOrmClient {
|
|
15
|
+
private readonly config;
|
|
16
|
+
private readonly logger;
|
|
17
|
+
private readonly metadata;
|
|
18
|
+
private readonly constr;
|
|
19
|
+
private activeClientId;
|
|
20
|
+
private readonly clients;
|
|
21
|
+
constructor(config: PucaOrmClientConnection);
|
|
22
|
+
query(commandList: {
|
|
23
|
+
name: string;
|
|
24
|
+
text: string;
|
|
25
|
+
values: any[];
|
|
26
|
+
}[], opt: PucaOrmQueryOpt): Promise<QueryResult[]>;
|
|
27
|
+
private switchClient;
|
|
28
|
+
private connect;
|
|
29
|
+
private disconect;
|
|
30
|
+
}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PucaOrmClient = void 0;
|
|
4
|
+
const grpc_js_1 = require("@grpc/grpc-js");
|
|
5
|
+
const proto_loader_1 = require("@grpc/proto-loader");
|
|
6
|
+
const logger_1 = require("../../../core/services/logger");
|
|
7
|
+
class PucaOrmClient {
|
|
8
|
+
constructor(config) {
|
|
9
|
+
this.config = config;
|
|
10
|
+
this.logger = new logger_1.Logger('PucaOrmClient');
|
|
11
|
+
this.activeClientId = 0;
|
|
12
|
+
this.clients = [null, null];
|
|
13
|
+
const def = grpc_js_1.loadPackageDefinition(proto_loader_1.loadSync(`${process.cwd()}//node_modules/@puca/puca-core/puca-orm.proto`, {
|
|
14
|
+
json: true,
|
|
15
|
+
keepCase: true,
|
|
16
|
+
enums: String,
|
|
17
|
+
longs: Number,
|
|
18
|
+
arrays: true,
|
|
19
|
+
}));
|
|
20
|
+
this.constr = def.main.OrmService;
|
|
21
|
+
this.connect(this.activeClientId);
|
|
22
|
+
setInterval(async () => {
|
|
23
|
+
this.switchClient();
|
|
24
|
+
}, 60000);
|
|
25
|
+
this.metadata = new grpc_js_1.Metadata();
|
|
26
|
+
this.metadata.add('namespace', this.config.namespace);
|
|
27
|
+
this.metadata.add('key', this.config.key);
|
|
28
|
+
this.metadata.add('grpc-timeout', '10M');
|
|
29
|
+
}
|
|
30
|
+
async query(commandList, opt) {
|
|
31
|
+
const c = this.clients[this.activeClientId];
|
|
32
|
+
c.count++;
|
|
33
|
+
return new Promise((resolve, reject) => {
|
|
34
|
+
commandList.forEach(command => {
|
|
35
|
+
(command.values || []).forEach((v, i) => {
|
|
36
|
+
if (v === undefined) {
|
|
37
|
+
v = null;
|
|
38
|
+
}
|
|
39
|
+
command.values[i] = JSON.stringify(v);
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
c.client.Query({
|
|
43
|
+
commandList,
|
|
44
|
+
opt
|
|
45
|
+
}, this.metadata, (err, res) => {
|
|
46
|
+
c.count--;
|
|
47
|
+
if (err) {
|
|
48
|
+
return reject(err.message || err);
|
|
49
|
+
}
|
|
50
|
+
if (res.error) {
|
|
51
|
+
if (!res.error.message) {
|
|
52
|
+
this.logger.error(res.error);
|
|
53
|
+
}
|
|
54
|
+
return reject(new Error(res.error.message || 'Generic Error'));
|
|
55
|
+
}
|
|
56
|
+
(res.result || []).forEach(r => {
|
|
57
|
+
(r.result || []).forEach((v, i) => {
|
|
58
|
+
r.result[i] = JSON.parse(v);
|
|
59
|
+
});
|
|
60
|
+
});
|
|
61
|
+
resolve(res.result);
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
switchClient() {
|
|
66
|
+
const oldClient = this.clients[this.activeClientId];
|
|
67
|
+
const newClientId = this.activeClientId === 0 ? 1 : 0;
|
|
68
|
+
this.connect(newClientId);
|
|
69
|
+
this.activeClientId = newClientId;
|
|
70
|
+
let safe = true;
|
|
71
|
+
setTimeout(() => {
|
|
72
|
+
safe = false;
|
|
73
|
+
}, 60000);
|
|
74
|
+
const i = setInterval(() => {
|
|
75
|
+
if (!safe) {
|
|
76
|
+
this.logger.warn('Client close was forced');
|
|
77
|
+
}
|
|
78
|
+
if (!safe || !oldClient.count) {
|
|
79
|
+
this.disconect(oldClient);
|
|
80
|
+
clearInterval(i);
|
|
81
|
+
}
|
|
82
|
+
}, 1000);
|
|
83
|
+
}
|
|
84
|
+
connect(clientId) {
|
|
85
|
+
const options = {
|
|
86
|
+
'grpc.service_config': JSON.stringify({
|
|
87
|
+
loadBalancingPolicy: 'round_robin',
|
|
88
|
+
loadBalancingConfig: [{
|
|
89
|
+
round_robin: {}
|
|
90
|
+
}],
|
|
91
|
+
}),
|
|
92
|
+
};
|
|
93
|
+
this.clients[clientId] = {
|
|
94
|
+
client: new this.constr(this.config.grpcServiceAddress || "localhost:5000", grpc_js_1.credentials.createInsecure(), options),
|
|
95
|
+
count: 0
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
disconect(c) {
|
|
99
|
+
c.client.close();
|
|
100
|
+
c.count = 0;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
exports.PucaOrmClient = PucaOrmClient;
|
|
104
|
+
//# sourceMappingURL=puca-orm-client.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"puca-orm-client.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/puca-orm-client.service.ts"],"names":[],"mappings":"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"}
|