@puca/puca-core 16.1.0 → 16.1.1
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/.cursor/skills/mcp-view-write-prefix-routing/SKILL.md +1 -10
- package/dist/core/services/user.service.js +34 -3
- package/dist/core/services/user.service.js.map +1 -1
- package/dist/models/secret.d.ts +1 -1
- package/dist/plugins/multi-tenant/multi-tentant.adapter.js +4 -2
- package/dist/plugins/multi-tenant/multi-tentant.adapter.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/analise-dual-write-vs-outbox-original.md +0 -146
|
@@ -1,21 +1,12 @@
|
|
|
1
1
|
---
|
|
2
2
|
name: mcp-view-write-prefix-routing
|
|
3
|
-
description: Orienta consultas MCP no Postgres com leitura por view e escrita por tabela física usando prefixo puca_ ou user_ conforme a coluna alterada.
|
|
3
|
+
description: Orienta consultas MCP no Postgres com leitura por view e escrita por tabela física usando prefixo puca_ ou user_ conforme a coluna alterada.
|
|
4
4
|
---
|
|
5
5
|
|
|
6
6
|
# MCP Postgres: View para leitura e tabela para escrita
|
|
7
7
|
|
|
8
8
|
Esta skill define as regras obrigatórias para uso da tool MCP de Postgres quando o LLM precisar montar SQL de leitura ou escrita.
|
|
9
9
|
|
|
10
|
-
## Qual banco (antes do SQL)
|
|
11
|
-
|
|
12
|
-
O parâmetro MCP `database` é a chave de `labs/mcp-postgres/dbs.json`, não o nome interno do Postgres. Seguir a skill `mcp-postgres-database`:
|
|
13
|
-
|
|
14
|
-
- usuário diz **local** / **fakeDistribuicao** → `database: local` (Docker; o Postgres interno também se chama `lifeapps`)
|
|
15
|
-
- usuário diz **lifeapps** → `database: lifeapps` (produção)
|
|
16
|
-
- nunca usar `fakeDistribuicao` como chave MCP
|
|
17
|
-
- nunca usar `lifeapps` só porque `env.json` do tenant local aponta `database: "lifeapps"`
|
|
18
|
-
|
|
19
10
|
## Regra principal
|
|
20
11
|
|
|
21
12
|
- Por padrão, toda **consulta de leitura** deve ser feita em **view**.
|
|
@@ -7,11 +7,13 @@ const logger_1 = require("./logger");
|
|
|
7
7
|
const request_cache_service_1 = require("../../orm/services/request-cache.service");
|
|
8
8
|
const security_flags_1 = require("./security-flags");
|
|
9
9
|
class CacheHelper {
|
|
10
|
-
constructor(repositoryFactory, tableName, initialQuery, onChangeFilter) {
|
|
10
|
+
constructor(repositoryFactory, tableName, initialQuery, onChangeFilter, shouldReloadRow, reloadRow) {
|
|
11
11
|
this.repositoryFactory = repositoryFactory;
|
|
12
12
|
this.tableName = tableName;
|
|
13
13
|
this.initialQuery = initialQuery;
|
|
14
14
|
this.onChangeFilter = onChangeFilter;
|
|
15
|
+
this.shouldReloadRow = shouldReloadRow;
|
|
16
|
+
this.reloadRow = reloadRow;
|
|
15
17
|
this.dataCache = [];
|
|
16
18
|
}
|
|
17
19
|
async init() {
|
|
@@ -25,7 +27,8 @@ class CacheHelper {
|
|
|
25
27
|
tableName: this.tableName,
|
|
26
28
|
version: 2
|
|
27
29
|
});
|
|
28
|
-
cacheRepository.onChange((event) => {
|
|
30
|
+
cacheRepository.onChange(async (event) => {
|
|
31
|
+
var _a;
|
|
29
32
|
if (event.mode === 'delete') {
|
|
30
33
|
const index = this.dataCache.findIndex((item) => item.puca_pid === event.puca_pid);
|
|
31
34
|
if (index !== -1) {
|
|
@@ -34,7 +37,13 @@ class CacheHelper {
|
|
|
34
37
|
return;
|
|
35
38
|
}
|
|
36
39
|
const oldData = this.dataCache.find((item) => item.puca_pid === event.puca_pid);
|
|
37
|
-
|
|
40
|
+
let newData = Object.assign(Object.assign({}, oldData), event.row);
|
|
41
|
+
if (((_a = this.shouldReloadRow) === null || _a === void 0 ? void 0 : _a.call(this, oldData, newData)) && this.reloadRow && event.puca_pid) {
|
|
42
|
+
const fullRow = await this.reloadRow(event.puca_pid);
|
|
43
|
+
if (fullRow) {
|
|
44
|
+
newData = Object.assign(Object.assign({}, fullRow), event.row);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
38
47
|
if (this.onChangeFilter && !this.onChangeFilter(oldData, newData)) {
|
|
39
48
|
return;
|
|
40
49
|
}
|
|
@@ -134,6 +143,28 @@ class UserService {
|
|
|
134
143
|
user: null
|
|
135
144
|
}, (oldData, newData) => {
|
|
136
145
|
return (oldData === null || oldData === void 0 ? void 0 : oldData.active) || newData.active;
|
|
146
|
+
}, (oldData, newData) => !oldData || !(newData === null || newData === void 0 ? void 0 : newData.username), async (pucaPid) => {
|
|
147
|
+
const { data } = await repositoryFactory.getInstance({
|
|
148
|
+
tableName: 'puca_base_api_system_user'
|
|
149
|
+
}).findWhere({
|
|
150
|
+
fields: [
|
|
151
|
+
'puca_pid',
|
|
152
|
+
'username',
|
|
153
|
+
'email',
|
|
154
|
+
'active',
|
|
155
|
+
],
|
|
156
|
+
where: {
|
|
157
|
+
v1: 'puca_pid',
|
|
158
|
+
operator: interfaces_1.ConditionalOperator.equals,
|
|
159
|
+
v2: '$puca_pid'
|
|
160
|
+
},
|
|
161
|
+
args: {
|
|
162
|
+
puca_pid: pucaPid
|
|
163
|
+
},
|
|
164
|
+
disablePermissionSystem: true,
|
|
165
|
+
user: null
|
|
166
|
+
});
|
|
167
|
+
return (data === null || data === void 0 ? void 0 : data[0]) || null;
|
|
137
168
|
});
|
|
138
169
|
this.userRuleCache = new CacheHelper(repositoryFactory, 'puca_base_api_system_user_rule', {
|
|
139
170
|
fields: ['puca_pid', 'system_user', 'rule'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/core/services/user.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/core/services/user.service.ts"],"names":[],"mappings":"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"}
|
package/dist/models/secret.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { S3Config } from "../core/services/storage/implementation/s3-client.serv
|
|
|
2
2
|
import { RedisConfig } from "./redis-config";
|
|
3
3
|
export interface Secret {
|
|
4
4
|
namespace: string;
|
|
5
|
-
legacyNamespace
|
|
5
|
+
legacyNamespace?: string;
|
|
6
6
|
pucaOrmConfig: {
|
|
7
7
|
key: string;
|
|
8
8
|
address: string;
|
|
@@ -15,9 +15,10 @@ class MultiTenantAdapter {
|
|
|
15
15
|
this.instancesByLegacyDomainName = new Map();
|
|
16
16
|
puca_hub_service_1.pucaHubService.on('set-up', {
|
|
17
17
|
handleConstructor: (domain, config) => {
|
|
18
|
+
var _a;
|
|
18
19
|
const instance = this.getNewInstance(domain);
|
|
19
20
|
this.instances.set(domain.toLowerCase(), instance);
|
|
20
|
-
const legacyDomainName = config.secret.legacyNamespace;
|
|
21
|
+
const legacyDomainName = (_a = config === null || config === void 0 ? void 0 : config.secret) === null || _a === void 0 ? void 0 : _a.legacyNamespace;
|
|
21
22
|
if (legacyDomainName) {
|
|
22
23
|
this.instancesByLegacyDomainName.set(legacyDomainName, instance);
|
|
23
24
|
}
|
|
@@ -36,10 +37,11 @@ class MultiTenantAdapter {
|
|
|
36
37
|
});
|
|
37
38
|
puca_hub_service_1.pucaHubService.on('tear-down', {
|
|
38
39
|
handler: async (domain, config) => {
|
|
40
|
+
var _a;
|
|
39
41
|
const instance = this.instances.get(domain);
|
|
40
42
|
if (instance) {
|
|
41
43
|
this.instances.delete(domain);
|
|
42
|
-
const legacyDomainName = config.secret.legacyNamespace;
|
|
44
|
+
const legacyDomainName = (_a = config === null || config === void 0 ? void 0 : config.secret) === null || _a === void 0 ? void 0 : _a.legacyNamespace;
|
|
43
45
|
if (legacyDomainName) {
|
|
44
46
|
this.instancesByLegacyDomainName.delete(legacyDomainName);
|
|
45
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-tentant.adapter.js","sourceRoot":"","sources":["../../../src/plugins/multi-tenant/multi-tentant.adapter.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AACpD,yDAAkE;AAGlE,MAAa,kBAAkB;IAK7B,YACmB,cAAqC,EACrC,OAAuE,EACvE,UAA0E,EAC1E,IAIhB;;QAPgB,mBAAc,GAAd,cAAc,CAAuB;QACrC,YAAO,GAAP,OAAO,CAAgE;QACvE,eAAU,GAAV,UAAU,CAAgE;QAC1E,SAAI,GAAJ,IAAI,CAIpB;QAZc,WAAM,GAAG,IAAI,eAAM,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;QAChD,cAAS,GAAG,IAAI,GAAG,EAAa,CAAC;QACjC,gCAA2B,GAAG,IAAI,GAAG,EAAa,CAAC;QAYlE,iCAAc,CAAC,EAAE,CAAC,QAAQ,EAAE;YAC1B,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"multi-tentant.adapter.js","sourceRoot":"","sources":["../../../src/plugins/multi-tenant/multi-tentant.adapter.ts"],"names":[],"mappings":"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"}
|