@puca/puca-core 4.2.3 → 4.3.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/dist/core/services/auth.service.d.ts +1 -1
- package/dist/core/services/comunication.service.d.ts +1 -1
- package/dist/core/services/index.d.ts +1 -3
- package/dist/core/services/index.js +7 -8
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/install.service.d.ts +2 -9
- package/dist/core/services/install.service.js +13 -13
- package/dist/core/services/install.service.js.map +1 -1
- package/dist/core/services/job.service.d.ts +1 -1
- package/dist/core/services/life-cycle.service.d.ts +6 -4
- package/dist/core/services/life-cycle.service.js +12 -5
- package/dist/core/services/life-cycle.service.js.map +1 -1
- package/dist/core/services/migration.service.d.ts +1 -1
- package/dist/core/services/storage/storage.service.d.ts +1 -1
- package/dist/core/services/user-config.service.d.ts +1 -1
- package/dist/core/services/web-socket.service.d.ts +3 -3
- package/dist/core/services/web-socket.service.js +3 -5
- package/dist/core/services/web-socket.service.js.map +1 -1
- package/dist/{core/services → essential}/configs.service.d.ts +5 -5
- package/dist/essential/configs.service.js.map +1 -0
- package/dist/essential/envs-config.service.js.map +1 -0
- package/dist/essential/index.d.ts +4 -0
- package/dist/essential/index.js +9 -0
- package/dist/essential/index.js.map +1 -0
- package/dist/models/secret.d.ts +1 -1
- package/dist/orm/cases/sql/sql.service.d.ts +7 -2
- package/dist/orm/cases/sql/sql.service.js +15 -14
- package/dist/orm/cases/sql/sql.service.js.map +1 -1
- package/dist/orm/services/cache-repository/cache-repository-postgres.d.ts +23 -0
- package/dist/orm/services/{cache-repository.js → cache-repository/cache-repository-postgres.js} +8 -15
- package/dist/orm/services/cache-repository/cache-repository-postgres.js.map +1 -0
- package/dist/orm/services/cache-repository/cache-repository-redis.d.ts +25 -0
- package/dist/orm/services/cache-repository/cache-repository-redis.js +117 -0
- package/dist/orm/services/cache-repository/cache-repository-redis.js.map +1 -0
- package/dist/orm/services/cache-repository/cache-repository.d.ts +35 -0
- package/dist/orm/services/cache-repository/cache-repository.js +41 -0
- package/dist/orm/services/cache-repository/cache-repository.js.map +1 -0
- package/dist/orm/services/index.d.ts +3 -1
- package/dist/orm/services/index.js +6 -3
- package/dist/orm/services/index.js.map +1 -1
- package/dist/orm/services/{database-manager.service.d.ts → managers/database-manager.service.d.ts} +1 -1
- package/dist/orm/services/{database-manager.service.js → managers/database-manager.service.js} +21 -9
- package/dist/orm/services/managers/database-manager.service.js.map +1 -0
- package/dist/orm/services/managers/redis-manager.service.d.ts +6 -0
- package/dist/orm/services/managers/redis-manager.service.js +16 -0
- package/dist/orm/services/managers/redis-manager.service.js.map +1 -0
- package/dist/orm/services/repository-factory.d.ts +7 -3
- package/dist/orm/services/repository-factory.js +6 -4
- package/dist/orm/services/repository-factory.js.map +1 -1
- package/dist/orm/services/repository.d.ts +6 -2
- package/dist/orm/services/repository.js +14 -2
- package/dist/orm/services/repository.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/readme.md +1 -1
- package/dist/core/services/configs.service.js.map +0 -1
- package/dist/core/services/envs-config.service.js.map +0 -1
- package/dist/orm/services/cache-repository.d.ts +0 -35
- package/dist/orm/services/cache-repository.js.map +0 -1
- package/dist/orm/services/database-manager.service.js.map +0 -1
- /package/dist/{core/services → essential}/configs.service.js +0 -0
- /package/dist/{core/services → essential}/envs-config.service.d.ts +0 -0
- /package/dist/{core/services → essential}/envs-config.service.js +0 -0
|
@@ -3,7 +3,7 @@ import { PucaAuth } from "../../models/puca-auth";
|
|
|
3
3
|
import { RepositoryFactory } from "../../orm/services/repository-factory";
|
|
4
4
|
import { UuidService } from "../../plugins/uuid/uuid.service";
|
|
5
5
|
import { ModuleConfigService } from "./module-config.service";
|
|
6
|
-
import { ConfigsService } from '
|
|
6
|
+
import { ConfigsService } from '../../essential/configs.service';
|
|
7
7
|
export declare class AuthService {
|
|
8
8
|
private readonly configService;
|
|
9
9
|
private readonly moduleConfigService;
|
|
@@ -2,7 +2,7 @@ import { CallResponse } from '../../models/call-response';
|
|
|
2
2
|
import { User } from '../../models/user';
|
|
3
3
|
import { ModuleConfigService } from './module-config.service';
|
|
4
4
|
import { UuidService } from '../../plugins/uuid/uuid.service';
|
|
5
|
-
import { ConfigsService } from '
|
|
5
|
+
import { ConfigsService } from '../../essential/configs.service';
|
|
6
6
|
export declare class ComunicationService {
|
|
7
7
|
private readonly moduleConfigService;
|
|
8
8
|
private readonly uuidService;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { BootstrapService } from './bootstrap.service';
|
|
2
2
|
import { ComunicationService } from './comunication.service';
|
|
3
|
-
import { EnvConfigService } from './envs-config.service';
|
|
4
3
|
import { LifeCycleService } from './life-cycle.service';
|
|
5
4
|
import { ModuleConfigService } from './module-config.service';
|
|
6
5
|
import { InstallService } from './install.service';
|
|
@@ -9,10 +8,9 @@ import { WebSocketService } from './web-socket.service';
|
|
|
9
8
|
import { AuthService } from './auth.service';
|
|
10
9
|
import { StorageServiceManager } from './storage/storage.service';
|
|
11
10
|
import { SourceService } from './source/source.service';
|
|
12
|
-
import { ConfigsService } from '
|
|
11
|
+
import { ConfigsService } from '../../essential/configs.service';
|
|
13
12
|
import { JobService } from './job.service';
|
|
14
13
|
export declare const configsService: ConfigsService;
|
|
15
|
-
export declare const envConfigService: EnvConfigService;
|
|
16
14
|
export declare const jobService: JobService;
|
|
17
15
|
export declare const storageServiceManager: StorageServiceManager;
|
|
18
16
|
export declare const moduleConfigService: ModuleConfigService;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.lifeCycleService = exports.webSocketService = exports.installService = exports.bootstrapService = exports.sourceService = exports.comunicationService = exports.userConfigService = exports.authService = exports.moduleConfigService = exports.storageServiceManager = exports.jobService = exports.
|
|
4
|
-
const services_1 = require("../../orm/services");
|
|
3
|
+
exports.lifeCycleService = exports.webSocketService = exports.installService = exports.bootstrapService = exports.sourceService = exports.comunicationService = exports.userConfigService = exports.authService = exports.moduleConfigService = exports.storageServiceManager = exports.jobService = exports.configsService = void 0;
|
|
5
4
|
const plugins_1 = require("../../plugins");
|
|
5
|
+
const essential_1 = require("../../essential");
|
|
6
|
+
const services_1 = require("../../orm/services");
|
|
6
7
|
const bootstrap_service_1 = require("./bootstrap.service");
|
|
7
8
|
const comunication_service_1 = require("./comunication.service");
|
|
8
|
-
const envs_config_service_1 = require("./envs-config.service");
|
|
9
9
|
const life_cycle_service_1 = require("./life-cycle.service");
|
|
10
10
|
const module_config_service_1 = require("./module-config.service");
|
|
11
11
|
const migration_service_1 = require("./migration.service");
|
|
@@ -17,11 +17,10 @@ const storage_service_1 = require("./storage/storage.service");
|
|
|
17
17
|
const application_service_1 = require("./source/javascript/v1/application.service");
|
|
18
18
|
const application_service_2 = require("./source/gcloud-run-cloud/v1/application.service");
|
|
19
19
|
const source_service_1 = require("./source/source.service");
|
|
20
|
-
const configs_service_1 = require("
|
|
20
|
+
const configs_service_1 = require("../../essential/configs.service");
|
|
21
21
|
const job_service_1 = require("./job.service");
|
|
22
22
|
exports.configsService = new configs_service_1.ConfigsService(plugins_1.fileSystemService);
|
|
23
|
-
exports.
|
|
24
|
-
exports.jobService = new job_service_1.JobService(exports.envConfigService);
|
|
23
|
+
exports.jobService = new job_service_1.JobService(essential_1.envConfigService);
|
|
25
24
|
exports.storageServiceManager = new storage_service_1.StorageServiceManager(exports.configsService);
|
|
26
25
|
exports.moduleConfigService = new module_config_service_1.ModuleConfigService(plugins_1.fileSystemService);
|
|
27
26
|
exports.authService = new auth_service_1.AuthService(exports.configsService, services_1.repositoryFactory, exports.moduleConfigService, plugins_1.uuidService);
|
|
@@ -36,6 +35,6 @@ exports.sourceService = new source_service_1.SourceService(services_1.repository
|
|
|
36
35
|
const migrationService = new migration_service_1.MigrationService(services_1.databaseManagerService, services_1.repositoryFactory, exports.moduleConfigService);
|
|
37
36
|
exports.bootstrapService = new bootstrap_service_1.BootstrapService(migrationService);
|
|
38
37
|
exports.installService = new install_service_1.InstallService(migrationService, services_1.repositoryFactory);
|
|
39
|
-
exports.webSocketService = new web_socket_service_1.WebSocketService(
|
|
40
|
-
exports.lifeCycleService = new life_cycle_service_1.LifeCycleService(services_1.databaseManagerService, exports.bootstrapService,
|
|
38
|
+
exports.webSocketService = new web_socket_service_1.WebSocketService(services_1.redisManagerService, exports.authService);
|
|
39
|
+
exports.lifeCycleService = new life_cycle_service_1.LifeCycleService(services_1.databaseManagerService, services_1.redisManagerService, exports.bootstrapService, essential_1.envConfigService, exports.installService, services_1.repositoryFactory, plugins_1.fileSystemService, exports.moduleConfigService, exports.webSocketService, exports.configsService);
|
|
41
40
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":";;;AAAA,2CAA+D;AAC/D,+CAAmD;AACnD,iDAAoG;AACpG,2DAAuD;AACvD,iEAA6D;AAC7D,6DAAwD;AACxD,mEAA8D;AAC9D,2DAAuD;AACvD,uDAAmD;AACnD,+DAA0D;AAC1D,6DAAwD;AACxD,iDAA6C;AAC7C,+DAAkE;AAClE,oFAAkH;AAClH,0FAA4H;AAC5H,4DAAwD;AACxD,qEAAiE;AACjE,+CAA2C;AAE9B,QAAA,cAAc,GAAG,IAAI,gCAAc,CAAC,2BAAiB,CAAC,CAAA;AACtD,QAAA,UAAU,GAAG,IAAI,wBAAU,CAAC,4BAAgB,CAAC,CAAA;AAC7C,QAAA,qBAAqB,GAAG,IAAI,uCAAqB,CAAC,sBAAc,CAAC,CAAA;AACjE,QAAA,mBAAmB,GAAG,IAAI,2CAAmB,CAAC,2BAAiB,CAAC,CAAC;AACjE,QAAA,WAAW,GAAG,IAAI,0BAAW,CACxC,sBAAc,EACd,4BAAiB,EACjB,2BAAmB,EACnB,qBAAW,CACZ,CAAA;AACY,QAAA,iBAAiB,GAAG,IAAI,uCAAiB,CACpD,2BAAmB,EACnB,4BAAiB,EACjB,sBAAc,CACf,CAAC;AACW,QAAA,mBAAmB,GAAG,IAAI,0CAAmB,CACxD,2BAAmB,EACnB,qBAAW,EACX,sBAAc,CACf,CAAC;AAEF,MAAM,8BAA8B,GAAG,IAAI,wCAA8B,CACvE,GAAG,OAAO,CAAC,GAAG,EAAE,6DAA6D,EAC7E,2BAAiB,EACjB,2BAAmB,EACnB,qBAAW,EACX,6BAAqB,CACtB,CAAA;AAED,MAAM,kCAAkC,GAAG,IAAI,wCAAkC,CAAC,2BAAmB,CAAC,CAAA;AAEzF,QAAA,aAAa,GAAG,IAAI,8BAAa,CAC5C,4BAAiB,EACjB;IACE,8BAA8B;IAC9B,kCAAkC;CACnC,CACF,CAAA;AAED,MAAM,gBAAgB,GAAG,IAAI,oCAAgB,CAC3C,iCAAsB,EACtB,4BAAiB,EACjB,2BAAmB,CACpB,CAAC;AACW,QAAA,gBAAgB,GAAG,IAAI,oCAAgB,CAClD,gBAAgB,CACjB,CAAC;AACW,QAAA,cAAc,GAAG,IAAI,gCAAc,CAC9C,gBAAgB,EAChB,4BAAiB,CAClB,CAAC;AACW,QAAA,gBAAgB,GAAG,IAAI,qCAAgB,CAClD,8BAAmB,EACnB,mBAAW,CACZ,CAAA;AACY,QAAA,gBAAgB,GAAG,IAAI,qCAAgB,CAClD,iCAAsB,EACtB,8BAAmB,EACnB,wBAAgB,EAChB,4BAAgB,EAChB,sBAAc,EACd,4BAAiB,EACjB,2BAAiB,EACjB,2BAAmB,EACnB,wBAAgB,EAChB,sBAAc,CACf,CAAC"}
|
|
@@ -18,17 +18,10 @@ export declare class InstallService {
|
|
|
18
18
|
}): Promise<void>;
|
|
19
19
|
private installUserConfigDefinitions;
|
|
20
20
|
private getMenuRepository;
|
|
21
|
+
private installMenu;
|
|
22
|
+
private installDdls;
|
|
21
23
|
installSingleMenu({ menu, user, }: {
|
|
22
24
|
user: User;
|
|
23
25
|
menu: MenuPlan;
|
|
24
26
|
}): Promise<void>;
|
|
25
|
-
installMenu({ user, especification, crudEspecification, }: {
|
|
26
|
-
user: User;
|
|
27
|
-
especification: ModuleEspecification;
|
|
28
|
-
crudEspecification: CrudControllerEspecification[];
|
|
29
|
-
}): Promise<void>;
|
|
30
|
-
installDdls({ user, especification, }: {
|
|
31
|
-
user: User;
|
|
32
|
-
especification: ModuleEspecification;
|
|
33
|
-
}): Promise<void>;
|
|
34
27
|
}
|
|
@@ -199,19 +199,6 @@ class InstallService {
|
|
|
199
199
|
tableName: 'puca_base_api_menu',
|
|
200
200
|
});
|
|
201
201
|
}
|
|
202
|
-
async installSingleMenu({ menu, user, }) {
|
|
203
|
-
const menuRepository = this.getMenuRepository();
|
|
204
|
-
const oldMenu = await menuRepository.findOneBy({
|
|
205
|
-
fields: ['puca_pid'],
|
|
206
|
-
key: 'name',
|
|
207
|
-
value: menu.name,
|
|
208
|
-
user,
|
|
209
|
-
});
|
|
210
|
-
await menuRepository.save({
|
|
211
|
-
entity: Object.assign(Object.assign({}, oldMenu), menu),
|
|
212
|
-
user,
|
|
213
|
-
});
|
|
214
|
-
}
|
|
215
202
|
async installMenu({ user, especification, crudEspecification, }) {
|
|
216
203
|
if (!crudEspecification) {
|
|
217
204
|
crudEspecification = [];
|
|
@@ -333,6 +320,19 @@ class InstallService {
|
|
|
333
320
|
});
|
|
334
321
|
}
|
|
335
322
|
}
|
|
323
|
+
async installSingleMenu({ menu, user, }) {
|
|
324
|
+
const menuRepository = this.getMenuRepository();
|
|
325
|
+
const oldMenu = await menuRepository.findOneBy({
|
|
326
|
+
fields: ['puca_pid'],
|
|
327
|
+
key: 'name',
|
|
328
|
+
value: menu.name,
|
|
329
|
+
user,
|
|
330
|
+
});
|
|
331
|
+
await menuRepository.save({
|
|
332
|
+
entity: Object.assign(Object.assign({}, oldMenu), menu),
|
|
333
|
+
user,
|
|
334
|
+
});
|
|
335
|
+
}
|
|
336
336
|
}
|
|
337
337
|
exports.InstallService = InstallService;
|
|
338
338
|
//# sourceMappingURL=install.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.service.js","sourceRoot":"","sources":["../../../src/core/services/install.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"install.service.js","sourceRoot":"","sources":["../../../src/core/services/install.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
import { DatabaseManagerService } from '../../orm/services/database-manager.service';
|
|
1
|
+
import { DatabaseManagerService } from '../../orm/services/managers/database-manager.service';
|
|
2
2
|
import { BootstrapService } from './bootstrap.service';
|
|
3
|
-
import { EnvConfigService } from './envs-config.service';
|
|
4
3
|
import { InstallService } from './install.service';
|
|
5
4
|
import { RepositoryFactory } from '../../orm/services/repository-factory';
|
|
6
5
|
import { ModuleConfigService } from './module-config.service';
|
|
7
6
|
import { FileSystemService } from '../../plugins/file-system/file-system.service';
|
|
8
7
|
import { WebSocketService } from './web-socket.service';
|
|
9
8
|
import { INestApplication } from '@nestjs/common';
|
|
10
|
-
import { ConfigsService } from '
|
|
9
|
+
import { ConfigsService } from '../../essential/configs.service';
|
|
10
|
+
import { EnvConfigService } from '../../essential/envs-config.service';
|
|
11
|
+
import { RedisManagerService } from '../../orm/services/managers/redis-manager.service';
|
|
11
12
|
export interface StartArgs {
|
|
12
13
|
appModule: any;
|
|
13
14
|
execBootStrap?: boolean;
|
|
@@ -16,6 +17,7 @@ export interface StartArgs {
|
|
|
16
17
|
}
|
|
17
18
|
export declare class LifeCycleService {
|
|
18
19
|
private readonly databaseManagerService;
|
|
20
|
+
private readonly redisManagerService;
|
|
19
21
|
private readonly bootstrapService;
|
|
20
22
|
private readonly envConfigService;
|
|
21
23
|
private readonly installService;
|
|
@@ -27,7 +29,7 @@ export declare class LifeCycleService {
|
|
|
27
29
|
private readonly logger;
|
|
28
30
|
private app;
|
|
29
31
|
private readonly intervals;
|
|
30
|
-
constructor(databaseManagerService: DatabaseManagerService, bootstrapService: BootstrapService, envConfigService: EnvConfigService, installService: InstallService, repositoryFactory: RepositoryFactory, fileSystemService: FileSystemService, moduleConfigService: ModuleConfigService, webSocketService: WebSocketService, configsService: ConfigsService);
|
|
32
|
+
constructor(databaseManagerService: DatabaseManagerService, redisManagerService: RedisManagerService, bootstrapService: BootstrapService, envConfigService: EnvConfigService, installService: InstallService, repositoryFactory: RepositoryFactory, fileSystemService: FileSystemService, moduleConfigService: ModuleConfigService, webSocketService: WebSocketService, configsService: ConfigsService);
|
|
31
33
|
stop(): Promise<void>;
|
|
32
34
|
start(args: StartArgs): Promise<INestApplication>;
|
|
33
35
|
checkDatabaseConnection(): Promise<void>;
|
|
@@ -2,15 +2,16 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.LifeCycleService = void 0;
|
|
4
4
|
const _ = require("lodash");
|
|
5
|
-
const
|
|
5
|
+
const redis = require("redis");
|
|
6
|
+
const database_manager_service_1 = require("../../orm/services/managers/database-manager.service");
|
|
6
7
|
const core_1 = require("@nestjs/core");
|
|
7
8
|
const logger_1 = require("./logger");
|
|
8
9
|
const crud_front_base_service_1 = require("./crud-front-base.service");
|
|
9
|
-
const cache_repository_1 = require("../../orm/services/cache-repository");
|
|
10
10
|
const DEFAULT_MAX_CONNECTION = 100;
|
|
11
11
|
class LifeCycleService {
|
|
12
|
-
constructor(databaseManagerService, bootstrapService, envConfigService, installService, repositoryFactory, fileSystemService, moduleConfigService, webSocketService, configsService) {
|
|
12
|
+
constructor(databaseManagerService, redisManagerService, bootstrapService, envConfigService, installService, repositoryFactory, fileSystemService, moduleConfigService, webSocketService, configsService) {
|
|
13
13
|
this.databaseManagerService = databaseManagerService;
|
|
14
|
+
this.redisManagerService = redisManagerService;
|
|
14
15
|
this.bootstrapService = bootstrapService;
|
|
15
16
|
this.envConfigService = envConfigService;
|
|
16
17
|
this.installService = installService;
|
|
@@ -27,7 +28,9 @@ class LifeCycleService {
|
|
|
27
28
|
if (this.app) {
|
|
28
29
|
await this.app.close();
|
|
29
30
|
}
|
|
30
|
-
await
|
|
31
|
+
await Promise.all(this.repositoryFactory.getAllCacheInstance().map(ci => ci.cacheRepository).map(async (r) => {
|
|
32
|
+
await r.shutdown();
|
|
33
|
+
}));
|
|
31
34
|
this.intervals.forEach(clearInterval);
|
|
32
35
|
await this.databaseManagerService.get().disconnect();
|
|
33
36
|
}
|
|
@@ -99,6 +102,7 @@ class LifeCycleService {
|
|
|
99
102
|
return this.app;
|
|
100
103
|
}
|
|
101
104
|
async checkDatabaseConnection() {
|
|
105
|
+
const cacheRepositoryProvider = await this.envConfigService.getEnvByName('CACHE_REPOSITORY_PROVIDER');
|
|
102
106
|
const minConectionsByDatabase = [this.databaseManagerService
|
|
103
107
|
.get()]
|
|
104
108
|
.map(database => database.getConfig())
|
|
@@ -111,7 +115,7 @@ class LifeCycleService {
|
|
|
111
115
|
})
|
|
112
116
|
.reduce((r, config) => {
|
|
113
117
|
if (!r[config.machine]) {
|
|
114
|
-
r[config.machine] = this.repositoryFactory.getAllCacheInstance().length;
|
|
118
|
+
r[config.machine] = (cacheRepositoryProvider || 'postgres' === 'postgres') ? this.repositoryFactory.getAllCacheInstance().length : 0;
|
|
115
119
|
}
|
|
116
120
|
r[config.machine] += config.max;
|
|
117
121
|
return r;
|
|
@@ -147,6 +151,9 @@ class LifeCycleService {
|
|
|
147
151
|
try {
|
|
148
152
|
await database.connect();
|
|
149
153
|
this.databaseManagerService.set(database);
|
|
154
|
+
const { redisConfig } = await this.configsService.getSecret();
|
|
155
|
+
const redisClient = redis.createClient(redisConfig);
|
|
156
|
+
this.redisManagerService.set(redisClient);
|
|
150
157
|
}
|
|
151
158
|
catch (e) {
|
|
152
159
|
this.logger.error(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;
|
|
1
|
+
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { User } from '../../models/user';
|
|
2
|
-
import { DatabaseManagerService } from '../../orm/services/database-manager.service';
|
|
2
|
+
import { DatabaseManagerService } from '../../orm/services/managers/database-manager.service';
|
|
3
3
|
import { RepositoryFactory } from '../../orm/services/repository-factory';
|
|
4
4
|
import { ModuleConfigService } from './module-config.service';
|
|
5
5
|
export declare type TypeDDlCommand = {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Response } from 'express';
|
|
3
3
|
import { FileString } from '../../../plugins/file-system/file-system.service';
|
|
4
|
-
import { ConfigsService } from '
|
|
4
|
+
import { ConfigsService } from '../../../essential/configs.service';
|
|
5
5
|
export declare abstract class StorageService {
|
|
6
6
|
abstract writeFile(args: {
|
|
7
7
|
path: string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { User } from '../../models/user';
|
|
2
2
|
import { RepositoryFactory } from '../../orm/services/repository-factory';
|
|
3
|
-
import { ConfigsService } from '
|
|
3
|
+
import { ConfigsService } from '../../essential/configs.service';
|
|
4
4
|
import { ModuleConfigService } from './module-config.service';
|
|
5
5
|
export declare class UserConfigService {
|
|
6
6
|
private readonly moduleConfigService;
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { Socket } from 'socket.io';
|
|
2
2
|
import { PucaAuth } from '../../models/puca-auth';
|
|
3
3
|
import { AuthService } from './auth.service';
|
|
4
|
-
import {
|
|
4
|
+
import { RedisManagerService } from '../../orm/services/managers/redis-manager.service';
|
|
5
5
|
export interface SocketDetail {
|
|
6
6
|
socket: Socket;
|
|
7
7
|
pucaAuth: PucaAuth;
|
|
8
8
|
method: string;
|
|
9
9
|
}
|
|
10
10
|
export declare class WebSocketService {
|
|
11
|
-
private readonly
|
|
11
|
+
private readonly redisManagerService;
|
|
12
12
|
private readonly authService;
|
|
13
|
-
constructor(
|
|
13
|
+
constructor(redisManagerService: RedisManagerService, authService: AuthService);
|
|
14
14
|
private readonly logger;
|
|
15
15
|
private io;
|
|
16
16
|
private checkLogin;
|
|
@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.WebSocketService = void 0;
|
|
4
4
|
const _ = require("lodash");
|
|
5
5
|
const socket_io_1 = require("socket.io");
|
|
6
|
-
const redis_1 = require("redis");
|
|
7
6
|
const redis_adapter_1 = require("@socket.io/redis-adapter");
|
|
8
7
|
const logger_1 = require("./logger");
|
|
9
8
|
class WebSocketService {
|
|
10
|
-
constructor(
|
|
11
|
-
this.
|
|
9
|
+
constructor(redisManagerService, authService) {
|
|
10
|
+
this.redisManagerService = redisManagerService;
|
|
12
11
|
this.authService = authService;
|
|
13
12
|
this.logger = new logger_1.Logger('WebSocketService');
|
|
14
13
|
}
|
|
@@ -54,8 +53,7 @@ class WebSocketService {
|
|
|
54
53
|
this.io.on('error', error => {
|
|
55
54
|
this.logger.error(error);
|
|
56
55
|
});
|
|
57
|
-
const
|
|
58
|
-
const pubClient = redis_1.createClient(redisConfig);
|
|
56
|
+
const pubClient = this.redisManagerService.get();
|
|
59
57
|
const subClient = pubClient.duplicate();
|
|
60
58
|
this.io.adapter(redis_adapter_1.createAdapter(pubClient, subClient));
|
|
61
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-socket.service.js","sourceRoot":"","sources":["../../../src/core/services/web-socket.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,yCAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"web-socket.service.js","sourceRoot":"","sources":["../../../src/core/services/web-socket.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { EnvsConfig } from "
|
|
2
|
-
import { ExternalModuleConfig } from "
|
|
3
|
-
import { FrontEndToBackEndMap } from "
|
|
4
|
-
import { Secret } from "
|
|
5
|
-
import { FileSystemService } from "
|
|
1
|
+
import { EnvsConfig } from "../models/env-config";
|
|
2
|
+
import { ExternalModuleConfig } from "../models/external-module-config";
|
|
3
|
+
import { FrontEndToBackEndMap } from "../models/front-end-to-back-end-map";
|
|
4
|
+
import { Secret } from "../models/secret";
|
|
5
|
+
import { FileSystemService } from "../plugins/file-system/file-system.service";
|
|
6
6
|
export declare class ConfigsService {
|
|
7
7
|
private readonly fileSystemService;
|
|
8
8
|
private readonly MODULE;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configs.service.js","sourceRoot":"","sources":["../../src/essential/configs.service.ts"],"names":[],"mappings":";;;AAMA,MAAa,cAAc;IAQzB,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAPhD,WAAM,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,qBAAqB,CAAC;QAC1D,eAAU,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC;QAC/C,QAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,iBAAiB,CAAC;QAChD,8BAAyB,GAAG,OAAO,CAAC,GAAG,CAAC,8BAA8B,IAAI,uCAAuC,CAAC;QAClH,kBAAa,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC;QACrD,WAAM,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,oBAAoB,CAAC;IAEL,CAAC;IAEtE,KAAK,CAAC,uBAAuB;QAC3B,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAyB,IAAI,CAAC,MAAM,EAAE;YACpF,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS;QACb,uCACK,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAS,IAAI,CAAC,aAAa,EAAE;YACvE,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,GACC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAS,IAAI,CAAC,MAAM,EAAE;YAChE,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,EACH;IACH,CAAC;IAGD,KAAK,CAAC,MAAM;QACV,uCACK,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAa,IAAI,CAAC,UAAU,EAAE;YACxE,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,GACC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAa,IAAI,CAAC,GAAG,EAAE;YACjE,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,EACH;IACH,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC3B,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAyB,IAAI,CAAC,yBAAyB,EAAE;YACvG,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,IAAI,EAAE,CAAA;IACV,CAAC;CACF;AAjDD,wCAiDC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"envs-config.service.js","sourceRoot":"","sources":["../../src/essential/envs-config.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAG5B,MAAa,gBAAgB;IAG3B,YAA6B,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IAAE,CAAC;IAEtD,KAAK,CAAC,YAAY;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAA;SACpD;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IACD,KAAK,CAAC,YAAY,CAChB,OAAe,EACf,WAAmB,IAAI;QAEvB,MAAM,WAAW,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,aAAa,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;QACzD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,OAAO,CACL,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,QAAQ,CACxE,CAAC;IACJ,CAAC;CACF;AAtBD,4CAsBC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.envConfigService = exports.configService = void 0;
|
|
4
|
+
const plugins_1 = require("../plugins");
|
|
5
|
+
const configs_service_1 = require("./configs.service");
|
|
6
|
+
const envs_config_service_1 = require("./envs-config.service");
|
|
7
|
+
exports.configService = new configs_service_1.ConfigsService(plugins_1.fileSystemService);
|
|
8
|
+
exports.envConfigService = new envs_config_service_1.EnvConfigService(exports.configService);
|
|
9
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/essential/index.ts"],"names":[],"mappings":";;;AAAA,wCAA+C;AAC/C,uDAAmD;AACnD,+DAAyD;AAE5C,QAAA,aAAa,GAAG,IAAI,gCAAc,CAAC,2BAAiB,CAAC,CAAA;AACrD,QAAA,gBAAgB,GAAG,IAAI,sCAAgB,CAAC,qBAAa,CAAC,CAAA"}
|
package/dist/models/secret.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { S3Config } from "../core/services/storage/implementation/s3-client.service";
|
|
2
|
-
import { DatabaseConfig } from "../orm/services/database-manager.service";
|
|
2
|
+
import { DatabaseConfig } from "../orm/services/managers/database-manager.service";
|
|
3
3
|
import { RedisConfig } from "./redis-config";
|
|
4
4
|
export interface Secret {
|
|
5
5
|
namespace: string;
|
|
@@ -8,8 +8,13 @@ export declare class SqlService {
|
|
|
8
8
|
constructor(uuid: UuidService, sqlBuilderService: SqlBuilderService);
|
|
9
9
|
insert(insert: Insert & {
|
|
10
10
|
shouldGeneratePucaLog?: boolean;
|
|
11
|
+
notify?: boolean;
|
|
12
|
+
}, user: User): SqlCommand[];
|
|
13
|
+
update(update: Update & {
|
|
14
|
+
notify?: boolean;
|
|
15
|
+
}, user: User): SqlCommand[];
|
|
16
|
+
delete(d: Delete & {
|
|
17
|
+
notify?: boolean;
|
|
11
18
|
}, user: User): SqlCommand[];
|
|
12
|
-
update(update: Update, user: User): SqlCommand[];
|
|
13
|
-
delete(d: Delete, user: User): SqlCommand[];
|
|
14
19
|
select(originalSelect: Select, user?: User): SqlCommand;
|
|
15
20
|
}
|
|
@@ -99,23 +99,23 @@ class SqlService {
|
|
|
99
99
|
Object.assign(Object.assign({}, this.sqlBuilderService.insert({
|
|
100
100
|
tableName,
|
|
101
101
|
values: Object.assign({}, valuesPuca),
|
|
102
|
-
args: {
|
|
102
|
+
args: Object.assign({}, (insert.notify ? {
|
|
103
103
|
internal_change: `${insert.tableName}.change`,
|
|
104
|
-
},
|
|
104
|
+
} : {})),
|
|
105
105
|
returning: [
|
|
106
|
-
{
|
|
106
|
+
insert.notify ? {
|
|
107
107
|
function: 'pg_notify',
|
|
108
108
|
args: [`$internal_change`, 'puca_pid::varchar'],
|
|
109
|
-
},
|
|
109
|
+
} : null,
|
|
110
110
|
...(returningPuca || []),
|
|
111
111
|
],
|
|
112
112
|
})), { commandName: 'insertPuca' }),
|
|
113
113
|
Object.assign(Object.assign({}, this.sqlBuilderService.insert({
|
|
114
114
|
tableName: computeUserTable(insert.tableName),
|
|
115
115
|
values: valuesUser,
|
|
116
|
-
args: {
|
|
116
|
+
args: Object.assign({}, (insert.notify ? {
|
|
117
117
|
internal_change: `${insert.tableName}.change`,
|
|
118
|
-
},
|
|
118
|
+
} : {})),
|
|
119
119
|
returning: returningUser || [],
|
|
120
120
|
})), { commandName: 'insertUser' }),
|
|
121
121
|
].filter(r => r);
|
|
@@ -162,7 +162,9 @@ class SqlService {
|
|
|
162
162
|
!_.isEqual(setPuca, {})
|
|
163
163
|
? Object.assign(Object.assign({}, this.sqlBuilderService.update({
|
|
164
164
|
tableName: pucaTable,
|
|
165
|
-
args: Object.assign(Object.assign({}, updateArgs),
|
|
165
|
+
args: Object.assign(Object.assign({}, updateArgs), (update.notify ? {
|
|
166
|
+
internal_change: `${update.tableName}.change`,
|
|
167
|
+
} : {})),
|
|
166
168
|
set: setPuca,
|
|
167
169
|
where: {
|
|
168
170
|
v1: 'puca_pid',
|
|
@@ -170,10 +172,10 @@ class SqlService {
|
|
|
170
172
|
v2: '$puca_pid',
|
|
171
173
|
},
|
|
172
174
|
returning: [
|
|
173
|
-
{
|
|
175
|
+
update.notify ? {
|
|
174
176
|
function: 'pg_notify',
|
|
175
177
|
args: [`$internal_change`, 'puca_pid::varchar'],
|
|
176
|
-
},
|
|
178
|
+
} : null,
|
|
177
179
|
...(returningPuca || []),
|
|
178
180
|
],
|
|
179
181
|
})), { commandName: 'updatePuca' }) : null,
|
|
@@ -224,10 +226,9 @@ class SqlService {
|
|
|
224
226
|
Object.assign(Object.assign({}, this.sqlBuilderService.delete({
|
|
225
227
|
tableName: pucaTable,
|
|
226
228
|
args: applyWildCardStrategies({
|
|
227
|
-
args: {
|
|
228
|
-
puca_pid: d.puca_pid,
|
|
229
|
+
args: Object.assign({ puca_pid: d.puca_pid }, (d.notify ? {
|
|
229
230
|
internal_change: `${d.tableName}.change`,
|
|
230
|
-
},
|
|
231
|
+
} : {})),
|
|
231
232
|
user,
|
|
232
233
|
}),
|
|
233
234
|
where: {
|
|
@@ -236,10 +237,10 @@ class SqlService {
|
|
|
236
237
|
v2: '$puca_pid',
|
|
237
238
|
},
|
|
238
239
|
returning: [
|
|
239
|
-
{
|
|
240
|
+
d.notify ? {
|
|
240
241
|
function: 'pg_notify',
|
|
241
242
|
args: [`$internal_change`, 'puca_pid::varchar'],
|
|
242
|
-
},
|
|
243
|
+
} : null,
|
|
243
244
|
...(returningPuca || []),
|
|
244
245
|
],
|
|
245
246
|
})), { commandName: 'deletePuca' }),
|