@puca/puca-core 12.1.3 → 12.1.5
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/email.service.js +16 -5
- package/dist/core/services/email.service.js.map +1 -1
- package/dist/core/services/index.js +3 -3
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/install.service.d.ts +3 -3
- package/dist/core/services/install.service.js +3 -3
- package/dist/core/services/migration/migration.service.d.ts +3 -5
- package/dist/core/services/migration/migration.service.js +8 -9
- package/dist/core/services/migration/migration.service.js.map +1 -1
- package/dist/core/services/storage/implementation/s3-client.service.d.ts +3 -3
- package/dist/core/services/storage/implementation/s3-client.service.js +4 -4
- package/dist/core/services/storage/storage.service.d.ts +3 -3
- package/dist/core/services/storage/storage.service.js +3 -3
- package/dist/orm/services/cache-repository/cache-repository-redis.d.ts +3 -3
- package/dist/orm/services/cache-repository/cache-repository-redis.js +3 -3
- package/dist/orm/services/cache-repository/cache-repository.d.ts +3 -3
- package/dist/orm/services/cache-repository/cache-repository.js +3 -3
- package/dist/orm/services/cache.service.d.ts +5 -5
- package/dist/orm/services/cache.service.js +12 -11
- package/dist/orm/services/cache.service.js.map +1 -1
- package/dist/orm/services/index.d.ts +2 -2
- package/dist/orm/services/index.js +6 -6
- package/dist/orm/services/repository-factory.d.ts +3 -3
- package/dist/orm/services/repository-factory.js +4 -4
- package/dist/orm/services/repository.d.ts +3 -3
- package/dist/orm/services/repository.js +5 -5
- package/dist/orm/services/secundary-database/secundary-database.service.d.ts +4 -2
- package/dist/orm/services/secundary-database/secundary-database.service.js +25 -13
- package/dist/orm/services/secundary-database/secundary-database.service.js.map +1 -1
- package/dist/plugins/multi-tenant/multi-tentant.adapter.d.ts +2 -1
- package/dist/plugins/multi-tenant/multi-tentant.adapter.js +20 -7
- package/dist/plugins/multi-tenant/multi-tentant.adapter.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -4,15 +4,15 @@ exports.CacheServiceFactory = exports.CacheService = void 0;
|
|
|
4
4
|
const crypto_1 = require("crypto");
|
|
5
5
|
const logger_1 = require("../../core/services/logger");
|
|
6
6
|
class CacheService {
|
|
7
|
-
constructor(name,
|
|
8
|
-
this.
|
|
7
|
+
constructor(name, secondaryDataBase, fetch, lifetimeInSeconds, envConfigService) {
|
|
8
|
+
this.secondaryDataBase = secondaryDataBase;
|
|
9
9
|
this.fetch = fetch;
|
|
10
10
|
this.lifetimeInSeconds = lifetimeInSeconds;
|
|
11
11
|
this.envConfigService = envConfigService;
|
|
12
12
|
this.memoryCache = new Map();
|
|
13
13
|
this.prefix = `cache-${name}`;
|
|
14
14
|
this.logger = new logger_1.Logger(CacheService.name + '-' + name);
|
|
15
|
-
const subscriber = this.
|
|
15
|
+
const subscriber = this.secondaryDataBase.duplicate();
|
|
16
16
|
subscriber.onMessage((channel, message) => {
|
|
17
17
|
const keyStr = message;
|
|
18
18
|
this.memoryCache.delete(keyStr);
|
|
@@ -25,13 +25,13 @@ class CacheService {
|
|
|
25
25
|
}
|
|
26
26
|
async invalidateByKeyStr(keyStr) {
|
|
27
27
|
return new Promise((resolve, reject) => {
|
|
28
|
-
this.
|
|
28
|
+
this.secondaryDataBase.del(keyStr, (err) => {
|
|
29
29
|
if (err) {
|
|
30
30
|
reject(err);
|
|
31
31
|
return;
|
|
32
32
|
}
|
|
33
33
|
this.memoryCache.delete(keyStr);
|
|
34
|
-
this.
|
|
34
|
+
this.secondaryDataBase.publish(`${this.prefix}-invalidate`, keyStr, (err) => {
|
|
35
35
|
if (err) {
|
|
36
36
|
reject(err);
|
|
37
37
|
return;
|
|
@@ -48,6 +48,7 @@ class CacheService {
|
|
|
48
48
|
await this.invalidateByKeyStr(key);
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
|
+
this.memoryCache.clear();
|
|
51
52
|
}
|
|
52
53
|
async get(keyObj) {
|
|
53
54
|
const disableCache = await this.envConfigService.getEnvByName('DISABLE_CACHE', false);
|
|
@@ -113,14 +114,14 @@ class CacheService {
|
|
|
113
114
|
}
|
|
114
115
|
redisGet(keyStr, keyObj) {
|
|
115
116
|
return new Promise((resolve, reject) => {
|
|
116
|
-
this.
|
|
117
|
+
this.secondaryDataBase.get(keyStr, (err, reply) => {
|
|
117
118
|
if (err) {
|
|
118
119
|
reject(err);
|
|
119
120
|
return;
|
|
120
121
|
}
|
|
121
122
|
if (!reply) {
|
|
122
123
|
this.fetch(keyObj).then(value => {
|
|
123
|
-
this.
|
|
124
|
+
this.secondaryDataBase.setex(keyStr, this.lifetimeInSeconds, JSON.stringify(value) || '<<empty>>', (err) => {
|
|
124
125
|
if (err) {
|
|
125
126
|
reject(err);
|
|
126
127
|
return;
|
|
@@ -149,7 +150,7 @@ class CacheService {
|
|
|
149
150
|
}
|
|
150
151
|
getAllRedisCachedKeys() {
|
|
151
152
|
return new Promise((resolve, reject) => {
|
|
152
|
-
this.
|
|
153
|
+
this.secondaryDataBase.keys(`${this.prefix}*`, async (err, keys) => {
|
|
153
154
|
if (err) {
|
|
154
155
|
reject(err);
|
|
155
156
|
return;
|
|
@@ -161,12 +162,12 @@ class CacheService {
|
|
|
161
162
|
}
|
|
162
163
|
exports.CacheService = CacheService;
|
|
163
164
|
class CacheServiceFactory {
|
|
164
|
-
constructor(
|
|
165
|
-
this.
|
|
165
|
+
constructor(secondaryDataBase, envConfigService) {
|
|
166
|
+
this.secondaryDataBase = secondaryDataBase;
|
|
166
167
|
this.envConfigService = envConfigService;
|
|
167
168
|
}
|
|
168
169
|
get(name, fetch, lifetimeInSeconds) {
|
|
169
|
-
return new CacheService(name, this.
|
|
170
|
+
return new CacheService(name, this.secondaryDataBase, fetch, lifetimeInSeconds, this.envConfigService);
|
|
170
171
|
}
|
|
171
172
|
}
|
|
172
173
|
exports.CacheServiceFactory = CacheServiceFactory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.service.js","sourceRoot":"","sources":["../../../src/orm/services/cache.service.ts"],"names":[],"mappings":";;;AACA,mCAAmC;AAEnC,uDAAoD;AASpD,MAAa,YAAY;IAKvB,YACE,IAAY,EACK,iBAAoC,EACpC,KAAgC,EAChC,iBAAyB,EACzB,gBAAkC;QAHlC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,UAAK,GAAL,KAAK,CAA2B;QAChC,sBAAiB,GAAjB,iBAAiB,CAAQ;QACzB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAPpC,gBAAW,GAAG,IAAI,GAAG,EAAqB,CAAA;QASzD,IAAI,CAAC,MAAM,GAAG,SAAS,IAAI,EAAE,CAAA;QAC7B,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC,YAAY,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,CAAA;QAExD,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAA;QACrD,UAAU,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;YACxC,MAAM,MAAM,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,WAAW,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"cache.service.js","sourceRoot":"","sources":["../../../src/orm/services/cache.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,10 @@ import { CacheServiceFactory } from './cache.service';
|
|
|
5
5
|
import { TransactionFactory } from './transaction';
|
|
6
6
|
import { SqlParserService } from './sql-parser/sql-parser.service';
|
|
7
7
|
import { MultiTenantAdapter } from '../../plugins/multi-tenant/multi-tentant.adapter';
|
|
8
|
-
import {
|
|
8
|
+
import { SecondaryDatabase } from './secundary-database/secundary-database.service';
|
|
9
9
|
export declare const databaseManagerService: MultiTenantAdapter<DatabaseManagerService>;
|
|
10
10
|
export declare const transactionFactory: MultiTenantAdapter<TransactionFactory>;
|
|
11
|
-
export declare const
|
|
11
|
+
export declare const secondaryDataBase: MultiTenantAdapter<SecondaryDatabase>;
|
|
12
12
|
export declare const cacheServiceFactory: MultiTenantAdapter<CacheServiceFactory>;
|
|
13
13
|
export declare let repositoryFactory: MultiTenantAdapter<RepositoryFactory>;
|
|
14
14
|
export declare const sqlService: MultiTenantAdapter<SqlService>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.sqlParserService = exports.sqlService = exports.repositoryFactory = exports.cacheServiceFactory = exports.
|
|
3
|
+
exports.sqlParserService = exports.sqlService = exports.repositoryFactory = exports.cacheServiceFactory = exports.secondaryDataBase = exports.transactionFactory = exports.databaseManagerService = void 0;
|
|
4
4
|
const plugins_1 = require("../../plugins");
|
|
5
5
|
const sql_service_1 = require("./sql/sql.service");
|
|
6
6
|
const repository_factory_1 = require("./repository-factory");
|
|
@@ -14,11 +14,11 @@ const multi_tentant_adapter_1 = require("../../plugins/multi-tenant/multi-tentan
|
|
|
14
14
|
const secundary_database_service_1 = require("./secundary-database/secundary-database.service");
|
|
15
15
|
exports.databaseManagerService = new multi_tentant_adapter_1.MultiTenantAdapter((domain) => new database_manager_service_1.DatabaseManagerService(essential_1.configService.get(domain)), async (domain, databaseManagerService) => await databaseManagerService.connect());
|
|
16
16
|
exports.transactionFactory = new multi_tentant_adapter_1.MultiTenantAdapter((domain) => new transaction_1.TransactionFactory(exports.databaseManagerService.get(domain)));
|
|
17
|
-
exports.
|
|
18
|
-
return new secundary_database_service_1.
|
|
19
|
-
}, async (domain,
|
|
20
|
-
exports.cacheServiceFactory = new multi_tentant_adapter_1.MultiTenantAdapter((domain) => new cache_service_1.CacheServiceFactory(exports.
|
|
17
|
+
exports.secondaryDataBase = new multi_tentant_adapter_1.MultiTenantAdapter(domain => {
|
|
18
|
+
return new secundary_database_service_1.SecondaryDatabase(domain, essential_1.configService.get(domain));
|
|
19
|
+
}, async (domain, secondaryDataBase) => await secondaryDataBase.init(), async (domain, secondaryDataBase) => await secondaryDataBase.destroy());
|
|
20
|
+
exports.cacheServiceFactory = new multi_tentant_adapter_1.MultiTenantAdapter((domain) => new cache_service_1.CacheServiceFactory(exports.secondaryDataBase.get(domain), essential_1.envConfigService.get(domain)));
|
|
21
21
|
exports.sqlService = new multi_tentant_adapter_1.MultiTenantAdapter(domain => new sql_service_1.SqlService(cases_1.cSqlService, () => exports.repositoryFactory.get(domain), essential_1.envConfigService.get(domain)));
|
|
22
|
-
exports.repositoryFactory = new multi_tentant_adapter_1.MultiTenantAdapter(domain => new repository_factory_1.RepositoryFactory(exports.
|
|
22
|
+
exports.repositoryFactory = new multi_tentant_adapter_1.MultiTenantAdapter(domain => new repository_factory_1.RepositoryFactory(exports.secondaryDataBase.get(domain), exports.databaseManagerService.get(domain), exports.transactionFactory.get(domain), () => exports.sqlService.get(domain), plugins_1.uuidService));
|
|
23
23
|
exports.sqlParserService = new sql_parser_service_1.SqlParserService();
|
|
24
24
|
//# sourceMappingURL=index.js.map
|
|
@@ -4,19 +4,19 @@ import { CacheRepository } from './cache-repository/cache-repository';
|
|
|
4
4
|
import { DatabaseManagerService } from './managers/database-manager.service';
|
|
5
5
|
import { Repository } from './repository';
|
|
6
6
|
import { Transaction, TransactionFactory } from './transaction';
|
|
7
|
-
import {
|
|
7
|
+
import { SecondaryDatabase } from './secundary-database/secundary-database.service';
|
|
8
8
|
export interface CacheInstanceList {
|
|
9
9
|
tableName: string;
|
|
10
10
|
cacheRepository: CacheRepository<any>;
|
|
11
11
|
}
|
|
12
12
|
export declare class RepositoryFactory {
|
|
13
|
-
private readonly
|
|
13
|
+
private readonly secondaryDataBase;
|
|
14
14
|
private readonly databaseManagerService;
|
|
15
15
|
private readonly transactionFactory;
|
|
16
16
|
private readonly funcSqlService;
|
|
17
17
|
private readonly uuidService;
|
|
18
18
|
private readonly cacheInstances;
|
|
19
|
-
constructor(
|
|
19
|
+
constructor(secondaryDataBase: SecondaryDatabase, databaseManagerService: DatabaseManagerService, transactionFactory: TransactionFactory, funcSqlService: () => SqlService, uuidService: UuidService);
|
|
20
20
|
getInstance<T>({ tableName, transaction: oTransaction }: {
|
|
21
21
|
tableName: string;
|
|
22
22
|
transaction?: Transaction;
|
|
@@ -5,8 +5,8 @@ const cache_repository_1 = require("./cache-repository/cache-repository");
|
|
|
5
5
|
const repository_1 = require("./repository");
|
|
6
6
|
const sql_executor_1 = require("./sql-executor");
|
|
7
7
|
class RepositoryFactory {
|
|
8
|
-
constructor(
|
|
9
|
-
this.
|
|
8
|
+
constructor(secondaryDataBase, databaseManagerService, transactionFactory, funcSqlService, uuidService) {
|
|
9
|
+
this.secondaryDataBase = secondaryDataBase;
|
|
10
10
|
this.databaseManagerService = databaseManagerService;
|
|
11
11
|
this.transactionFactory = transactionFactory;
|
|
12
12
|
this.funcSqlService = funcSqlService;
|
|
@@ -19,12 +19,12 @@ class RepositoryFactory {
|
|
|
19
19
|
getInstance({ tableName, transaction: oTransaction }) {
|
|
20
20
|
const transaction = oTransaction || this.transactionFactory.getPseudoTransaction();
|
|
21
21
|
const sqlExecutor = new sql_executor_1.SqlExecutor(this.funcSqlService, transaction);
|
|
22
|
-
return new repository_1.Repository(transaction, sqlExecutor, this.
|
|
22
|
+
return new repository_1.Repository(transaction, sqlExecutor, this.secondaryDataBase, this.funcSqlService, this.uuidService, tableName, !oTransaction);
|
|
23
23
|
}
|
|
24
24
|
getCacheInstance({ tableName, version }) {
|
|
25
25
|
const versionKey = version ? 'v' + version : 'v2';
|
|
26
26
|
if (!this.cacheInstances[versionKey][tableName]) {
|
|
27
|
-
this.cacheInstances[versionKey][tableName] = new cache_repository_1.CacheRepository(this.databaseManagerService.get(), this.
|
|
27
|
+
this.cacheInstances[versionKey][tableName] = new cache_repository_1.CacheRepository(this.databaseManagerService.get(), this.secondaryDataBase, tableName, { version: version || 2 });
|
|
28
28
|
}
|
|
29
29
|
return this.cacheInstances[versionKey][tableName];
|
|
30
30
|
}
|
|
@@ -5,7 +5,7 @@ import { Join, OrderByField, SelectField, Where, From, With } from '../cases/bo/
|
|
|
5
5
|
import { Transaction } from './transaction';
|
|
6
6
|
import { Query, Select } from '../cases/vanilla/interfaces';
|
|
7
7
|
import { SqlExecutor } from './sql-executor';
|
|
8
|
-
import {
|
|
8
|
+
import { SecondaryDatabase } from './secundary-database/secundary-database.service';
|
|
9
9
|
export interface SelectResult<T> {
|
|
10
10
|
data: T[];
|
|
11
11
|
page?: number;
|
|
@@ -174,13 +174,13 @@ export declare class Repository<T extends {
|
|
|
174
174
|
}> {
|
|
175
175
|
private readonly transaction;
|
|
176
176
|
private readonly sqlExecutor;
|
|
177
|
-
private readonly
|
|
177
|
+
private readonly secondaryDataBase;
|
|
178
178
|
private readonly sqlServiceFunc;
|
|
179
179
|
private readonly uuidService;
|
|
180
180
|
private readonly table;
|
|
181
181
|
private readonly autoCommit;
|
|
182
182
|
private readonly log;
|
|
183
|
-
constructor(transaction: Transaction, sqlExecutor: SqlExecutor,
|
|
183
|
+
constructor(transaction: Transaction, sqlExecutor: SqlExecutor, secondaryDataBase: SecondaryDatabase, sqlServiceFunc: () => SqlService, uuidService: UuidService, table: string, autoCommit: boolean);
|
|
184
184
|
findByIn({ key, values, fields, orderBy, user, alias, totalizeMode, forUpdate, with: w, from, query, join, union, unionAll, disablePermissionSystem }: FindByInArgs): Promise<T[]>;
|
|
185
185
|
private getAlias;
|
|
186
186
|
findByPucaPid({ pucaPid, fields, user, alias: oAlias, forUpdate, with: w, from, join, query, disablePermissionSystem }: FindByPucaPidArgs & {
|
|
@@ -10,10 +10,10 @@ var TotalizeMode;
|
|
|
10
10
|
TotalizeMode["never"] = "never";
|
|
11
11
|
})(TotalizeMode = exports.TotalizeMode || (exports.TotalizeMode = {}));
|
|
12
12
|
class Repository {
|
|
13
|
-
constructor(transaction, sqlExecutor,
|
|
13
|
+
constructor(transaction, sqlExecutor, secondaryDataBase, sqlServiceFunc, uuidService, table, autoCommit) {
|
|
14
14
|
this.transaction = transaction;
|
|
15
15
|
this.sqlExecutor = sqlExecutor;
|
|
16
|
-
this.
|
|
16
|
+
this.secondaryDataBase = secondaryDataBase;
|
|
17
17
|
this.sqlServiceFunc = sqlServiceFunc;
|
|
18
18
|
this.uuidService = uuidService;
|
|
19
19
|
this.table = table;
|
|
@@ -327,7 +327,7 @@ class Repository {
|
|
|
327
327
|
throw new Error('Falha ao executar o insert, verifique se o usuário tem permissão para realizar a operação');
|
|
328
328
|
}
|
|
329
329
|
this.transaction.afterCommit(async () => {
|
|
330
|
-
await this.
|
|
330
|
+
await this.secondaryDataBase.publish(`${this.table}.change`, JSON.stringify({
|
|
331
331
|
version: 2,
|
|
332
332
|
puca_pid: r.puca_pid,
|
|
333
333
|
row: r,
|
|
@@ -388,7 +388,7 @@ class Repository {
|
|
|
388
388
|
mode = 'new';
|
|
389
389
|
}
|
|
390
390
|
this.transaction.afterCommit(async () => {
|
|
391
|
-
await this.
|
|
391
|
+
await this.secondaryDataBase.publish(`${this.table}.change`, JSON.stringify({
|
|
392
392
|
version: 2,
|
|
393
393
|
puca_pid: entity.puca_pid,
|
|
394
394
|
row: entity,
|
|
@@ -428,7 +428,7 @@ class Repository {
|
|
|
428
428
|
throw new Error('Falha ao executar a deleção, verifique se o usuário tem permissão para realizar a operação');
|
|
429
429
|
}
|
|
430
430
|
this.transaction.afterCommit(async () => {
|
|
431
|
-
await this.
|
|
431
|
+
await this.secondaryDataBase.publish(`${this.table}.change`, JSON.stringify({
|
|
432
432
|
version: 2,
|
|
433
433
|
puca_pid,
|
|
434
434
|
row: null,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Callback, RedisClient } from "redis";
|
|
2
2
|
import { ConfigService } from "../../../essential/config.service";
|
|
3
3
|
import { RedisConfig } from "../../../models/redis-config";
|
|
4
|
-
export declare class
|
|
4
|
+
export declare class SecondaryDatabase {
|
|
5
5
|
private readonly domain;
|
|
6
6
|
private readonly configService;
|
|
7
7
|
private redisClient;
|
|
@@ -10,10 +10,12 @@ export declare class SecundaryDatabase {
|
|
|
10
10
|
constructor(domain: string, configService: ConfigService | RedisConfig);
|
|
11
11
|
init(): Promise<void>;
|
|
12
12
|
destroy(): Promise<void>;
|
|
13
|
+
private addPrefix;
|
|
14
|
+
private removePrefix;
|
|
13
15
|
subscribe(topic: string, func?: Callback<string>): void;
|
|
14
16
|
publish(topic: string, message: string, callback?: Callback<number>): void;
|
|
15
17
|
onMessage(func: Callback<string>): void;
|
|
16
|
-
duplicate():
|
|
18
|
+
duplicate(): SecondaryDatabase;
|
|
17
19
|
get(key: string, callback?: Callback<string>): void;
|
|
18
20
|
set(key: string, value: string, func?: Callback<string>): void;
|
|
19
21
|
getRedisClient(): RedisClient;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.SecondaryDatabase = void 0;
|
|
4
4
|
const redis_1 = require("redis");
|
|
5
|
-
class
|
|
5
|
+
class SecondaryDatabase {
|
|
6
6
|
constructor(domain, configService) {
|
|
7
7
|
this.domain = domain;
|
|
8
8
|
this.configService = configService;
|
|
@@ -29,38 +29,50 @@ class SecundaryDatabase {
|
|
|
29
29
|
this.redisClient.removeAllListeners();
|
|
30
30
|
this.redisClient.quit();
|
|
31
31
|
}
|
|
32
|
+
addPrefix(key) {
|
|
33
|
+
return `${this.domain}-${key}`;
|
|
34
|
+
}
|
|
35
|
+
removePrefix(key) {
|
|
36
|
+
return key.replace(`${this.domain}-`, '');
|
|
37
|
+
}
|
|
32
38
|
subscribe(topic, func) {
|
|
33
|
-
this.redisClient.subscribe(
|
|
39
|
+
this.redisClient.subscribe(this.addPrefix(topic), func);
|
|
34
40
|
}
|
|
35
41
|
publish(topic, message, callback) {
|
|
36
|
-
this.redisClient.publish(
|
|
42
|
+
this.redisClient.publish(this.addPrefix(topic), message, callback);
|
|
37
43
|
}
|
|
38
44
|
onMessage(func) {
|
|
39
45
|
this.redisClient.on('message', func);
|
|
40
46
|
}
|
|
41
47
|
duplicate() {
|
|
42
|
-
const
|
|
43
|
-
this.children.push(
|
|
44
|
-
return
|
|
48
|
+
const instaceSecondaryDatabase = new SecondaryDatabase(this.domain, this.redisConfig);
|
|
49
|
+
this.children.push(instaceSecondaryDatabase);
|
|
50
|
+
return instaceSecondaryDatabase;
|
|
45
51
|
}
|
|
46
52
|
get(key, callback) {
|
|
47
|
-
this.redisClient.get(
|
|
53
|
+
this.redisClient.get(this.addPrefix(key), callback);
|
|
48
54
|
}
|
|
49
55
|
set(key, value, func) {
|
|
50
|
-
this.redisClient.set(
|
|
56
|
+
this.redisClient.set(this.addPrefix(key), value, func);
|
|
51
57
|
}
|
|
52
58
|
getRedisClient() {
|
|
53
59
|
return this.redisClient;
|
|
54
60
|
}
|
|
55
61
|
del(key, callback) {
|
|
56
|
-
this.redisClient.del(
|
|
62
|
+
this.redisClient.del(this.addPrefix(key), callback);
|
|
57
63
|
}
|
|
58
64
|
setex(key, seconds, value, callback) {
|
|
59
|
-
this.redisClient.setex(
|
|
65
|
+
this.redisClient.setex(this.addPrefix(key), seconds, value, callback);
|
|
60
66
|
}
|
|
61
67
|
keys(pattern, callback) {
|
|
62
|
-
this.redisClient.keys(`${this.domain}-${pattern}`,
|
|
68
|
+
this.redisClient.keys(`${this.domain}-${pattern}`, (err, keys) => {
|
|
69
|
+
if (err) {
|
|
70
|
+
return callback(err, null);
|
|
71
|
+
}
|
|
72
|
+
const keysWithoutPrefix = keys.map((key) => this.removePrefix(key));
|
|
73
|
+
callback(null, keysWithoutPrefix);
|
|
74
|
+
});
|
|
63
75
|
}
|
|
64
76
|
}
|
|
65
|
-
exports.
|
|
77
|
+
exports.SecondaryDatabase = SecondaryDatabase;
|
|
66
78
|
//# sourceMappingURL=secundary-database.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secundary-database.service.js","sourceRoot":"","sources":["../../../../src/orm/services/secundary-database/secundary-database.service.ts"],"names":[],"mappings":";;;AAAA,iCAA8C;AAI9C,MAAa,iBAAiB;IAK5B,YACmB,MAAc,EACd,aAA0C;QAD1C,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAA6B;QALrD,aAAQ,GAAwB,EAAE,CAAC;QAOzC,IAAI,MAAM,IAAI,aAAa,EAAE;YAE3B,IAAI,CAAC,WAAW,GAAG,aAAa,CAAC;YACjC,IAAI,CAAC,WAAW,GAAG,IAAI,mBAAW,CAAC,aAAa,CAAC,CAAC;SACnD;IACH,CAAC;IAED,KAAK,CAAC,IAAI;QAER,IAAI,MAAM,IAAI,IAAI,CAAC,aAAa,EAAE;YAChC,OAAM;SACP;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;QAC7D,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,IAAI,mBAAW,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,OAAO;QACX,KAAI,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC5B,MAAM,CAAC,CAAC,OAAO,EAAE,CAAA;SAClB;QAED,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;QAC/B,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;QAChC,IAAI,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAC;QACtC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAC1B,CAAC;IAED,SAAS,CAAC,KAAa,EAAE,IAAuB;QAC9C,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"secundary-database.service.js","sourceRoot":"","sources":["../../../../src/orm/services/secundary-database/secundary-database.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,11 @@ export declare class MultiTenantAdapter<T> {
|
|
|
5
5
|
private readonly onTearDown?;
|
|
6
6
|
private readonly opts?;
|
|
7
7
|
private readonly instances;
|
|
8
|
+
private readonly instancesByLegacyDomainName;
|
|
8
9
|
constructor(getNewInstance: (domain: string) => T, onSetup?: (domain: string, t: T, config: DomainConfig) => Promise<void>, onTearDown?: (domain: string, t: T, config: DomainConfig) => Promise<void>, opts?: {
|
|
9
10
|
priority?: number;
|
|
10
11
|
dependent?: string[];
|
|
11
12
|
className?: string;
|
|
12
13
|
});
|
|
13
|
-
get(
|
|
14
|
+
get(oDomain: string): T;
|
|
14
15
|
}
|
|
@@ -10,10 +10,15 @@ class MultiTenantAdapter {
|
|
|
10
10
|
this.onTearDown = onTearDown;
|
|
11
11
|
this.opts = opts;
|
|
12
12
|
this.instances = new Map();
|
|
13
|
+
this.instancesByLegacyDomainName = new Map();
|
|
13
14
|
puca_hub_service_1.pucaHubService.on('set-up', {
|
|
14
15
|
handleConstructor: (domain, config) => {
|
|
15
16
|
const instance = this.getNewInstance(domain);
|
|
16
17
|
this.instances.set(domain.toLowerCase(), instance);
|
|
18
|
+
const legacyDomainName = config.secret.legacyNamespace;
|
|
19
|
+
if (legacyDomainName) {
|
|
20
|
+
this.instancesByLegacyDomainName.set(legacyDomainName, instance);
|
|
21
|
+
}
|
|
17
22
|
const className = instance.constructor.name;
|
|
18
23
|
return className;
|
|
19
24
|
},
|
|
@@ -32,6 +37,10 @@ class MultiTenantAdapter {
|
|
|
32
37
|
const instance = this.instances.get(domain);
|
|
33
38
|
if (instance) {
|
|
34
39
|
this.instances.delete(domain);
|
|
40
|
+
const legacyDomainName = config.secret.legacyNamespace;
|
|
41
|
+
if (legacyDomainName) {
|
|
42
|
+
this.instancesByLegacyDomainName.delete(legacyDomainName);
|
|
43
|
+
}
|
|
35
44
|
if (this.onTearDown) {
|
|
36
45
|
await this.onTearDown(domain, instance, config);
|
|
37
46
|
}
|
|
@@ -39,16 +48,20 @@ class MultiTenantAdapter {
|
|
|
39
48
|
}
|
|
40
49
|
});
|
|
41
50
|
}
|
|
42
|
-
get(
|
|
43
|
-
if (!
|
|
51
|
+
get(oDomain) {
|
|
52
|
+
if (!oDomain) {
|
|
44
53
|
throw new Error('domain is required');
|
|
45
54
|
}
|
|
46
|
-
const
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
55
|
+
const domain = oDomain.toLowerCase();
|
|
56
|
+
let t = this.instances.get(domain);
|
|
57
|
+
if (t) {
|
|
58
|
+
return t;
|
|
59
|
+
}
|
|
60
|
+
const legacyInstance = this.instancesByLegacyDomainName.get(domain);
|
|
61
|
+
if (legacyInstance) {
|
|
62
|
+
return legacyInstance;
|
|
50
63
|
}
|
|
51
|
-
|
|
64
|
+
throw new Error(`tenant not found for domain ${domain}`);
|
|
52
65
|
}
|
|
53
66
|
}
|
|
54
67
|
exports.MultiTenantAdapter = MultiTenantAdapter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-tentant.adapter.js","sourceRoot":"","sources":["../../../src/plugins/multi-tenant/multi-tentant.adapter.ts"],"names":[],"mappings":";;;AAAA,yDAAkE;AAElE,MAAa,kBAAkB;
|
|
1
|
+
{"version":3,"file":"multi-tentant.adapter.js","sourceRoot":"","sources":["../../../src/plugins/multi-tenant/multi-tentant.adapter.ts"],"names":[],"mappings":"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"}
|