@puca/puca-core 3.12.0 → 4.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/.vscode/launch.json +23 -23
- package/dist/core/services/auth.service.d.ts +1 -5
- package/dist/core/services/auth.service.js +35 -46
- package/dist/core/services/auth.service.js.map +1 -1
- package/dist/core/services/bootstrap-commands.js +0 -96
- package/dist/core/services/bootstrap-commands.js.map +1 -1
- package/dist/core/services/bootstrap.service.d.ts +1 -4
- package/dist/core/services/bootstrap.service.js +5 -22
- package/dist/core/services/bootstrap.service.js.map +1 -1
- package/dist/core/services/comunication.service.d.ts +3 -8
- package/dist/core/services/comunication.service.js +10 -47
- package/dist/core/services/comunication.service.js.map +1 -1
- package/dist/core/services/crud-base-testable.service.d.ts +2 -9
- package/dist/core/services/crud-base-testable.service.js +8 -23
- package/dist/core/services/crud-base-testable.service.js.map +1 -1
- package/dist/core/services/crud-base.controller.js +0 -5
- package/dist/core/services/crud-base.controller.js.map +1 -1
- package/dist/core/services/crud-base.service.js +1 -2
- package/dist/core/services/crud-base.service.js.map +1 -1
- package/dist/core/services/crud-front-base.service.d.ts +1 -2
- package/dist/core/services/crud-front-base.service.js +1 -2
- package/dist/core/services/crud-front-base.service.js.map +1 -1
- package/dist/core/services/envs-config.service.d.ts +1 -2
- package/dist/core/services/envs-config.service.js +3 -4
- package/dist/core/services/envs-config.service.js.map +1 -1
- package/dist/core/services/index.d.ts +0 -10
- package/dist/core/services/index.js +8 -19
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/install.service.d.ts +6 -14
- package/dist/core/services/install.service.js +20 -103
- package/dist/core/services/install.service.js.map +1 -1
- package/dist/core/services/life-cycle.service.d.ts +1 -4
- package/dist/core/services/life-cycle.service.js +54 -101
- package/dist/core/services/life-cycle.service.js.map +1 -1
- package/dist/core/services/migration.service.d.ts +1 -2
- package/dist/core/services/migration.service.js +3 -7
- package/dist/core/services/migration.service.js.map +1 -1
- package/dist/core/services/module-config.service.js +0 -2
- package/dist/core/services/module-config.service.js.map +1 -1
- package/dist/core/services/source/application.interface.d.ts +0 -1
- package/dist/core/services/source/gcloud-run-cloud/v1/application.service.d.ts +1 -1
- package/dist/core/services/source/gcloud-run-cloud/v1/application.service.js +3 -3
- package/dist/core/services/source/gcloud-run-cloud/v1/application.service.js.map +1 -1
- package/dist/core/services/source/javascript/v1/application.service.js +0 -3
- package/dist/core/services/source/javascript/v1/application.service.js.map +1 -1
- package/dist/core/services/source/source.service.d.ts +1 -2
- package/dist/core/services/source/source.service.js +1 -3
- package/dist/core/services/source/source.service.js.map +1 -1
- package/dist/core/services/storage/implementation/s3-client.service.d.ts +8 -14
- package/dist/core/services/storage/implementation/s3-client.service.js +13 -11
- package/dist/core/services/storage/implementation/s3-client.service.js.map +1 -1
- package/dist/core/services/storage/storage.service.d.ts +1 -12
- package/dist/core/services/storage/storage.service.js +6 -16
- package/dist/core/services/storage/storage.service.js.map +1 -1
- package/dist/core/services/user-config.service.d.ts +4 -3
- package/dist/core/services/user-config.service.js +12 -16
- package/dist/core/services/user-config.service.js.map +1 -1
- package/dist/core/services/web-socket.service.d.ts +1 -2
- package/dist/core/services/web-socket.service.js +2 -4
- package/dist/core/services/web-socket.service.js.map +1 -1
- package/dist/models/env-config.d.ts +1 -0
- package/dist/models/external-module-config.d.ts +4 -0
- package/dist/models/{company-config.js → external-module-config.js} +1 -1
- package/dist/models/external-module-config.js.map +1 -0
- package/dist/models/front-end-to-back-end-map.d.ts +4 -0
- package/dist/models/{company-feature.js → front-end-to-back-end-map.js} +1 -1
- package/dist/models/front-end-to-back-end-map.js.map +1 -0
- package/dist/models/module-config.d.ts +0 -4
- package/dist/models/module-especification.d.ts +0 -13
- package/dist/models/puca-auth.d.ts +0 -3
- package/dist/models/secret.d.ts +8 -0
- package/dist/models/{user-feature.js → secret.js} +1 -1
- package/dist/models/secret.js.map +1 -0
- package/dist/orm/cases/ddl/ddl.service.d.ts +1 -4
- package/dist/orm/cases/ddl/ddl.service.js +1 -39
- package/dist/orm/cases/ddl/ddl.service.js.map +1 -1
- package/dist/orm/cases/sql/sql.service.js +0 -42
- package/dist/orm/cases/sql/sql.service.js.map +1 -1
- package/dist/orm/services/database-manager.service.d.ts +3 -8
- package/dist/orm/services/database-manager.service.js +4 -11
- package/dist/orm/services/database-manager.service.js.map +1 -1
- package/dist/orm/services/repository-factory.d.ts +2 -5
- package/dist/orm/services/repository-factory.js +12 -21
- package/dist/orm/services/repository-factory.js.map +1 -1
- package/dist/orm/services/repository.d.ts +1 -3
- package/dist/orm/services/repository.js +0 -1
- package/dist/orm/services/repository.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/javascriptV1/javascriptV1.js +81 -82
- package/package.json +1 -1
- package/readme.md +29 -0
- package/dist/core/cases/index.d.ts +0 -4
- package/dist/core/cases/index.js +0 -8
- package/dist/core/cases/index.js.map +0 -1
- package/dist/core/cases/version-resolver.service.d.ts +0 -16
- package/dist/core/cases/version-resolver.service.js +0 -34
- package/dist/core/cases/version-resolver.service.js.map +0 -1
- package/dist/core/cases/version.service.d.ts +0 -9
- package/dist/core/cases/version.service.js +0 -20
- package/dist/core/cases/version.service.js.map +0 -1
- package/dist/core/services/company-features.repository.d.ts +0 -29
- package/dist/core/services/company-features.repository.js +0 -91
- package/dist/core/services/company-features.repository.js.map +0 -1
- package/dist/core/services/company.service.d.ts +0 -12
- package/dist/core/services/company.service.js +0 -22
- package/dist/core/services/company.service.js.map +0 -1
- package/dist/core/services/module-especification.repository.d.ts +0 -16
- package/dist/core/services/module-especification.repository.js +0 -65
- package/dist/core/services/module-especification.repository.js.map +0 -1
- package/dist/core/services/module-especification.service.d.ts +0 -32
- package/dist/core/services/module-especification.service.js +0 -94
- package/dist/core/services/module-especification.service.js.map +0 -1
- package/dist/core/services/storage/implementation/internal-storage.service.d.ts +0 -36
- package/dist/core/services/storage/implementation/internal-storage.service.js +0 -41
- package/dist/core/services/storage/implementation/internal-storage.service.js.map +0 -1
- package/dist/core/services/user-feature.service.d.ts +0 -23
- package/dist/core/services/user-feature.service.js +0 -67
- package/dist/core/services/user-feature.service.js.map +0 -1
- package/dist/models/company-config.d.ts +0 -6
- package/dist/models/company-config.js.map +0 -1
- package/dist/models/company-feature.d.ts +0 -4
- package/dist/models/company-feature.js.map +0 -1
- package/dist/models/company-module.d.ts +0 -7
- package/dist/models/company-module.js +0 -3
- package/dist/models/company-module.js.map +0 -1
- package/dist/models/user-feature.d.ts +0 -6
- package/dist/models/user-feature.js.map +0 -1
|
@@ -13,8 +13,7 @@ export declare class MigrationService {
|
|
|
13
13
|
private readonly moduleConfigService;
|
|
14
14
|
private readonly logger;
|
|
15
15
|
constructor(databaseManagerService: DatabaseManagerService, repositoryFactory: RepositoryFactory, moduleConfigService: ModuleConfigService);
|
|
16
|
-
install({
|
|
17
|
-
companyKey: string;
|
|
16
|
+
install({ ddlCommands, user, moduleName, }: {
|
|
18
17
|
ddlCommands: TypeDDlCommand[];
|
|
19
18
|
user: User;
|
|
20
19
|
moduleName?: string;
|
|
@@ -11,7 +11,7 @@ class MigrationService {
|
|
|
11
11
|
this.moduleConfigService = moduleConfigService;
|
|
12
12
|
this.logger = new logger_1.Logger('MigrationService');
|
|
13
13
|
}
|
|
14
|
-
async install({
|
|
14
|
+
async install({ ddlCommands, user, moduleName, }) {
|
|
15
15
|
const isValidType = async (type) => {
|
|
16
16
|
const values = Object.values(interfaces_1.TableFieldTypeEnum);
|
|
17
17
|
if (values.includes(type)) {
|
|
@@ -19,7 +19,6 @@ class MigrationService {
|
|
|
19
19
|
}
|
|
20
20
|
const tableDictionaryRepository = this.repositoryFactory.getInstance({
|
|
21
21
|
tableName: 'table_dictionary',
|
|
22
|
-
companyKey,
|
|
23
22
|
});
|
|
24
23
|
return !!(await tableDictionaryRepository.findOneBy({
|
|
25
24
|
fields: ['puca_pid'],
|
|
@@ -28,12 +27,11 @@ class MigrationService {
|
|
|
28
27
|
user
|
|
29
28
|
}));
|
|
30
29
|
};
|
|
31
|
-
const database = this.databaseManagerService.
|
|
30
|
+
const database = this.databaseManagerService.get();
|
|
32
31
|
if (!moduleName) {
|
|
33
32
|
moduleName = (await this.moduleConfigService.getModuleConfig()).name;
|
|
34
33
|
}
|
|
35
34
|
const migrationRepository = this.repositoryFactory.getInstance({
|
|
36
|
-
companyKey,
|
|
37
35
|
tableName: 'migration',
|
|
38
36
|
});
|
|
39
37
|
let migrations = [];
|
|
@@ -81,9 +79,7 @@ class MigrationService {
|
|
|
81
79
|
await migrationRepository.save({
|
|
82
80
|
entity: c,
|
|
83
81
|
user,
|
|
84
|
-
options: {
|
|
85
|
-
shouldGeneratePucaLog: c.command.shouldGeneratePucaLog,
|
|
86
|
-
},
|
|
82
|
+
options: {},
|
|
87
83
|
});
|
|
88
84
|
}
|
|
89
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration.service.js","sourceRoot":"","sources":["../../../src/core/services/migration.service.ts"],"names":[],"mappings":";;;AACA,2CAAyD;AAKzD,qDAAsE;AAItE,qCAAkC;AASlC,MAAa,gBAAgB;IAE3B,YACmB,sBAA8C,EAC9C,iBAAoC,EACpC,mBAAwC;QAFxC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,wBAAmB,GAAnB,mBAAmB,CAAqB;QAJ1C,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAkB,CAAC,CAAC;IAKtD,CAAC;IACJ,KAAK,CAAC,OAAO,CAAC,EACZ,
|
|
1
|
+
{"version":3,"file":"migration.service.js","sourceRoot":"","sources":["../../../src/core/services/migration.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,8 +24,6 @@ class ModuleConfigService {
|
|
|
24
24
|
this.moduleConfig = {
|
|
25
25
|
name: packageJson.name,
|
|
26
26
|
version: packageJson.version,
|
|
27
|
-
pucaDependency: packageJson.pucaDependency,
|
|
28
|
-
submodules: packageJson.submodules,
|
|
29
27
|
label: packageJson.label,
|
|
30
28
|
showOnMenu: packageJson.showOnMenu,
|
|
31
29
|
useAccessControl: packageJson.useAccessControl,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-config.service.js","sourceRoot":"","sources":["../../../src/core/services/module-config.service.ts"],"names":[],"mappings":";;;AAEA,4BAA4B;AAC5B,qCAAkC;AAElC,MAAa,mBAAmB;IAG9B,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAFhD,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAqB,CAAC,CAAC;QAG1D,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACnC,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;gBAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;gBACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;YACD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;gBACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,eAAe;QACnB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAC3D,gBAAgB,CACjB,CAAC;YACF,IAAI,CAAC,YAAY,GAAG;gBAClB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,
|
|
1
|
+
{"version":3,"file":"module-config.service.js","sourceRoot":"","sources":["../../../src/core/services/module-config.service.ts"],"names":[],"mappings":";;;AAEA,4BAA4B;AAC5B,qCAAkC;AAElC,MAAa,mBAAmB;IAG9B,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAFhD,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAqB,CAAC,CAAC;QAG1D,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACnC,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;gBAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;gBACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;YACD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;gBACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,eAAe;QACnB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAC3D,gBAAgB,CACjB,CAAC;YACF,IAAI,CAAC,YAAY,GAAG;gBAClB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,UAAU,EAAE,WAAW,CAAC,UAAU;gBAClC,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;aAC/C,CAAC;SACH;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CACF;AA9BD,kDA8BC"}
|
|
@@ -12,5 +12,5 @@ export declare class ApplicationService implements ApplicationInterface<Request>
|
|
|
12
12
|
constructor(comunicationService: ComunicationService);
|
|
13
13
|
getEngine(): string;
|
|
14
14
|
getVersion(): string;
|
|
15
|
-
exec<U>({
|
|
15
|
+
exec<U>({ root, request: { method, path, query, body, headers }, user, }: ApplicationServiceExec<Request>): Promise<U>;
|
|
16
16
|
}
|
|
@@ -13,18 +13,18 @@ class ApplicationService {
|
|
|
13
13
|
getVersion() {
|
|
14
14
|
return 'v1';
|
|
15
15
|
}
|
|
16
|
-
async exec({
|
|
16
|
+
async exec({ root, request: { method, path = '', query = {}, body = null, headers = {} }, user, }) {
|
|
17
17
|
const supportsBody = method.toLowerCase() != 'get';
|
|
18
|
+
const url = [root, path].filter(i => i).join('/');
|
|
18
19
|
const request = {
|
|
19
20
|
headers: Object.assign(Object.assign({}, _.chain(headers)
|
|
20
21
|
.omit('host')
|
|
21
22
|
.value()), { 'authorization': await this.comunicationService.computeToken({
|
|
22
|
-
companyKey,
|
|
23
23
|
user
|
|
24
24
|
}) }),
|
|
25
25
|
method,
|
|
26
26
|
params: query,
|
|
27
|
-
url
|
|
27
|
+
url,
|
|
28
28
|
data: supportsBody ? body : null,
|
|
29
29
|
};
|
|
30
30
|
const response = await axios_1.default.request(request);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.service.js","sourceRoot":"","sources":["../../../../../../src/core/services/source/gcloud-run-cloud/v1/application.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,iCAA4C;AAa5C,MAAa,kBAAkB;IAC7B,YAA6B,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAE1E,SAAS;QACP,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,IAAI,CAAI,EACZ,
|
|
1
|
+
{"version":3,"file":"application.service.js","sourceRoot":"","sources":["../../../../../../src/core/services/source/gcloud-run-cloud/v1/application.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,iCAA4C;AAa5C,MAAa,kBAAkB;IAC7B,YAA6B,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAE1E,SAAS;QACP,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,IAAI,CAAI,EACZ,IAAI,EACJ,OAAO,EAAE,EACP,MAAM,EACN,IAAI,GAAG,EAAE,EACT,KAAK,GAAG,EAAE,EACV,IAAI,GAAG,IAAI,EACX,OAAO,GAAG,EAAE,EACb,EACD,IAAI,GAC4B;QAChC,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,EAAE,IAAI,KAAK,CAAA;QAClD,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEjD,MAAM,OAAO,GAAG;YACd,OAAO,kCACF,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;iBAChB,IAAI,CAAC,MAAM,CAAC;iBACZ,KAAK,EAAE,KACV,eAAe,EAAE,MAAM,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC;oBAC3D,IAAI;iBACL,CAAC,GACH;YACD,MAAM;YACN,MAAM,EAAE,KAAK;YACb,GAAG;YACH,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;SACjC,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,OAAO,CAAsB,OAAO,CAAC,CAAA;QAClE,OAAO;YACL,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;SACR,CAAA;IACf,CAAC;CACF;AA9CD,gDA8CC"}
|
|
@@ -77,7 +77,6 @@ class ApplicationService {
|
|
|
77
77
|
async exec(args) {
|
|
78
78
|
const storageService = await this.storageServiceManager.getInstance();
|
|
79
79
|
const files = await storageService.readFolder({
|
|
80
|
-
companyKey: args.companyKey,
|
|
81
80
|
root: args.root + '/index.js'
|
|
82
81
|
});
|
|
83
82
|
if (_.isEmpty(files)) {
|
|
@@ -110,7 +109,6 @@ class ApplicationService {
|
|
|
110
109
|
break;
|
|
111
110
|
case "comunicationServiceCall":
|
|
112
111
|
const response = await this.comunicationService.call({
|
|
113
|
-
companyKey: args.companyKey,
|
|
114
112
|
user: args.user,
|
|
115
113
|
moduleName: message.moduleName,
|
|
116
114
|
path: message.path,
|
|
@@ -129,7 +127,6 @@ class ApplicationService {
|
|
|
129
127
|
type: "request",
|
|
130
128
|
id: this.uuidService.v4(),
|
|
131
129
|
request: args.request,
|
|
132
|
-
companyKey: args.companyKey,
|
|
133
130
|
user: args.user,
|
|
134
131
|
path: fileIndex
|
|
135
132
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.service.js","sourceRoot":"","sources":["../../../../../../src/core/services/source/javascript/v1/application.service.ts"],"names":[],"mappings":";;;AAAA,4BAA2B;AAC3B,iDAAkD;AAMlD,4CAAwC;
|
|
1
|
+
{"version":3,"file":"application.service.js","sourceRoot":"","sources":["../../../../../../src/core/services/source/javascript/v1/application.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@ import { RepositoryFactory } from "../../../orm/services/repository-factory";
|
|
|
2
2
|
import { User } from "../../../models/user";
|
|
3
3
|
import { ApplicationInterface, Request } from "./application.interface";
|
|
4
4
|
export interface CallArgs<T extends Request> {
|
|
5
|
-
companyKey: string;
|
|
6
5
|
user: User;
|
|
7
6
|
request: T;
|
|
8
7
|
sourcePid: string;
|
|
@@ -19,5 +18,5 @@ export declare class SourceService {
|
|
|
19
18
|
private readonly repositoryFactory;
|
|
20
19
|
private readonly applicationServiceList;
|
|
21
20
|
constructor(repositoryFactory: RepositoryFactory, applicationServiceList: ApplicationInterface<unknown>[]);
|
|
22
|
-
call<T, U>({ sourcePid,
|
|
21
|
+
call<T, U>({ sourcePid, user, request, }: CallArgs<T>): Promise<U>;
|
|
23
22
|
}
|
|
@@ -6,9 +6,8 @@ class SourceService {
|
|
|
6
6
|
this.repositoryFactory = repositoryFactory;
|
|
7
7
|
this.applicationServiceList = applicationServiceList;
|
|
8
8
|
}
|
|
9
|
-
async call({ sourcePid,
|
|
9
|
+
async call({ sourcePid, user, request, }) {
|
|
10
10
|
const source = await this.repositoryFactory.getInstance({
|
|
11
|
-
companyKey,
|
|
12
11
|
tableName: 'puca_base_api_source'
|
|
13
12
|
}).findByPucaPid({
|
|
14
13
|
fields: [
|
|
@@ -28,7 +27,6 @@ class SourceService {
|
|
|
28
27
|
throw new Error("ApplicationService not found");
|
|
29
28
|
}
|
|
30
29
|
return await applicationService.exec({
|
|
31
|
-
companyKey,
|
|
32
30
|
user,
|
|
33
31
|
request,
|
|
34
32
|
root: source.root,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source.service.js","sourceRoot":"","sources":["../../../../src/core/services/source/source.service.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"source.service.js","sourceRoot":"","sources":["../../../../src/core/services/source/source.service.ts"],"names":[],"mappings":";;;AAiBA,MAAa,aAAa;IACxB,YACmB,iBAAoC,EACpC,sBAAuD;QADvD,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,2BAAsB,GAAtB,sBAAsB,CAAiC;IAC1E,CAAC;IAED,KAAK,CAAC,IAAI,CAAO,EACf,SAAS,EACT,IAAI,EACJ,OAAO,GACK;QACZ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAS;YAC9D,SAAS,EAAE,sBAAsB;SAClC,CAAC,CAAC,aAAa,CAAC;YACf,MAAM,EAAE;gBACN,MAAM;gBACN,SAAS;gBACT,MAAM;gBACN,QAAQ;gBACR,gBAAgB;aACjB;YACD,OAAO,EAAE,SAAS;SACnB,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;SACpC;QAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,UAAU,EAAE,IAAI,MAAM,CAAC,cAAc,CAA4B,CAAA;QAEzK,IAAG,CAAC,kBAAkB,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;SAChD;QAED,OAAO,MAAM,kBAAkB,CAAC,IAAI,CAAI;YACtC,IAAI;YACJ,OAAO;YACP,IAAI,EAAE,MAAM,CAAC,IAAI;SAClB,CAAC,CAAA;IACJ,CAAC;CACF;AAxCD,sCAwCC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Response } from 'express';
|
|
3
3
|
import { StorageService } from '../storage.service';
|
|
4
|
-
import { FileString } from '../../../../plugins/file-system/file-system.service';
|
|
4
|
+
import { FileString, FileSystemService } from '../../../../plugins/file-system/file-system.service';
|
|
5
5
|
export interface S3Config {
|
|
6
6
|
region: string;
|
|
7
7
|
accessKeyId: string;
|
|
@@ -10,33 +10,27 @@ export interface S3Config {
|
|
|
10
10
|
}
|
|
11
11
|
export declare class S3ClientService implements StorageService {
|
|
12
12
|
private readonly s3Config;
|
|
13
|
+
private readonly fileSystemService;
|
|
13
14
|
private readonly s3Client;
|
|
14
|
-
constructor(s3Config: S3Config);
|
|
15
|
-
|
|
15
|
+
constructor(s3Config: S3Config, fileSystemService: FileSystemService);
|
|
16
|
+
private getNamespace;
|
|
17
|
+
writeFile({ path, buffer, }: {
|
|
16
18
|
path: string;
|
|
17
19
|
buffer: Buffer;
|
|
18
|
-
companyKey: string;
|
|
19
20
|
}): Promise<void>;
|
|
20
|
-
readFileResponse({ path,
|
|
21
|
+
readFileResponse({ path, res, }: {
|
|
21
22
|
path: string;
|
|
22
|
-
companyKey: string;
|
|
23
23
|
res: Response;
|
|
24
24
|
}): Promise<void>;
|
|
25
|
-
readFile({ path,
|
|
25
|
+
readFile({ path, pathFormat }: {
|
|
26
26
|
path: string;
|
|
27
|
-
companyKey: string;
|
|
28
27
|
pathFormat: 'internal' | 'default';
|
|
29
28
|
}): Promise<string>;
|
|
30
|
-
buildCompletePath
|
|
31
|
-
path: string;
|
|
32
|
-
companyKey: string;
|
|
33
|
-
}): Promise<string>;
|
|
29
|
+
private buildCompletePath;
|
|
34
30
|
deleteFile(args: {
|
|
35
31
|
path: string;
|
|
36
|
-
companyKey: string;
|
|
37
32
|
}): Promise<void>;
|
|
38
33
|
readFolder(args: {
|
|
39
34
|
root: string;
|
|
40
|
-
companyKey: string;
|
|
41
35
|
}): Promise<FileString[]>;
|
|
42
36
|
}
|
|
@@ -3,16 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.S3ClientService = void 0;
|
|
4
4
|
const aws_sdk_1 = require("aws-sdk");
|
|
5
5
|
class S3ClientService {
|
|
6
|
-
constructor(s3Config) {
|
|
6
|
+
constructor(s3Config, fileSystemService) {
|
|
7
7
|
this.s3Config = s3Config;
|
|
8
|
+
this.fileSystemService = fileSystemService;
|
|
8
9
|
this.s3Client = new aws_sdk_1.S3(s3Config);
|
|
9
10
|
}
|
|
10
|
-
async
|
|
11
|
+
async getNamespace() {
|
|
12
|
+
const { namespace } = await this.fileSystemService.readJSONFile('config/secret.json', {
|
|
13
|
+
throwErrors: false,
|
|
14
|
+
});
|
|
15
|
+
return namespace;
|
|
16
|
+
}
|
|
17
|
+
async writeFile({ path, buffer, }) {
|
|
11
18
|
const uploadParams = {
|
|
12
19
|
Bucket: this.s3Config.bucket,
|
|
13
20
|
Key: await this.buildCompletePath({
|
|
14
21
|
path,
|
|
15
|
-
companyKey,
|
|
16
22
|
}),
|
|
17
23
|
Body: buffer,
|
|
18
24
|
};
|
|
@@ -25,9 +31,8 @@ class S3ClientService {
|
|
|
25
31
|
});
|
|
26
32
|
});
|
|
27
33
|
}
|
|
28
|
-
async readFileResponse({ path,
|
|
34
|
+
async readFileResponse({ path, res, }) {
|
|
29
35
|
const completePath = await this.buildCompletePath({
|
|
30
|
-
companyKey,
|
|
31
36
|
path,
|
|
32
37
|
});
|
|
33
38
|
const params = {
|
|
@@ -41,9 +46,8 @@ class S3ClientService {
|
|
|
41
46
|
link,
|
|
42
47
|
});
|
|
43
48
|
}
|
|
44
|
-
async readFile({ path,
|
|
49
|
+
async readFile({ path, pathFormat = 'default' }) {
|
|
45
50
|
const completePath = pathFormat === 'internal' ? path : await this.buildCompletePath({
|
|
46
|
-
companyKey,
|
|
47
51
|
path,
|
|
48
52
|
});
|
|
49
53
|
const params = {
|
|
@@ -59,14 +63,13 @@ class S3ClientService {
|
|
|
59
63
|
});
|
|
60
64
|
});
|
|
61
65
|
}
|
|
62
|
-
async buildCompletePath({
|
|
63
|
-
return `${
|
|
66
|
+
async buildCompletePath({ path, }) {
|
|
67
|
+
return `${await this.getNamespace()}/${path}`;
|
|
64
68
|
}
|
|
65
69
|
async deleteFile(args) {
|
|
66
70
|
}
|
|
67
71
|
async readFolder(args) {
|
|
68
72
|
const completePath = await this.buildCompletePath({
|
|
69
|
-
companyKey: args.companyKey,
|
|
70
73
|
path: args.root
|
|
71
74
|
});
|
|
72
75
|
return new Promise((resolve, reject) => {
|
|
@@ -83,7 +86,6 @@ class S3ClientService {
|
|
|
83
86
|
const content = data.Contents[i];
|
|
84
87
|
const body = await this.readFile({
|
|
85
88
|
path: content.Key,
|
|
86
|
-
companyKey: args.companyKey,
|
|
87
89
|
pathFormat: 'internal'
|
|
88
90
|
});
|
|
89
91
|
const splitedFileName = content.Key
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"s3-client.service.js","sourceRoot":"","sources":["../../../../../src/core/services/storage/implementation/s3-client.service.ts"],"names":[],"mappings":";;;AAAA,qCAA6B;
|
|
1
|
+
{"version":3,"file":"s3-client.service.js","sourceRoot":"","sources":["../../../../../src/core/services/storage/implementation/s3-client.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,41 +1,30 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Response } from 'express';
|
|
3
|
-
import { EnvConfigService } from '../envs-config.service';
|
|
4
3
|
import { FileString, FileSystemService } from '../../../plugins/file-system/file-system.service';
|
|
5
4
|
export declare abstract class StorageService {
|
|
6
5
|
abstract writeFile(args: {
|
|
7
6
|
path: string;
|
|
8
7
|
buffer: Buffer;
|
|
9
|
-
companyKey: string;
|
|
10
8
|
}): Promise<void>;
|
|
11
9
|
abstract readFile(args: {
|
|
12
10
|
path: string;
|
|
13
|
-
companyKey: string;
|
|
14
11
|
}): Promise<string>;
|
|
15
12
|
abstract readFileResponse(args: {
|
|
16
13
|
path: string;
|
|
17
|
-
companyKey: string;
|
|
18
14
|
res: Response;
|
|
19
15
|
}): any;
|
|
20
|
-
abstract buildCompletePath(args: {
|
|
21
|
-
path: string;
|
|
22
|
-
companyKey: string;
|
|
23
|
-
}): Promise<string>;
|
|
24
16
|
abstract deleteFile(args: {
|
|
25
17
|
path: string;
|
|
26
|
-
companyKey: string;
|
|
27
18
|
}): Promise<void>;
|
|
28
19
|
abstract readFolder(args: {
|
|
29
20
|
root: string;
|
|
30
|
-
companyKey: string;
|
|
31
21
|
}): Promise<FileString[]>;
|
|
32
22
|
}
|
|
33
23
|
export declare class StorageServiceManager {
|
|
34
|
-
private readonly envConfigService;
|
|
35
24
|
private readonly fileSystemService;
|
|
36
25
|
private readonly logger;
|
|
37
26
|
private status;
|
|
38
27
|
private instance;
|
|
39
|
-
constructor(
|
|
28
|
+
constructor(fileSystemService: FileSystemService);
|
|
40
29
|
getInstance(): Promise<StorageService>;
|
|
41
30
|
}
|
|
@@ -2,14 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.StorageServiceManager = exports.StorageService = void 0;
|
|
4
4
|
const s3_client_service_1 = require("./implementation/s3-client.service");
|
|
5
|
-
const internal_storage_service_1 = require("./implementation/internal-storage.service");
|
|
6
5
|
const logger_1 = require("../logger");
|
|
7
6
|
class StorageService {
|
|
8
7
|
}
|
|
9
8
|
exports.StorageService = StorageService;
|
|
10
9
|
class StorageServiceManager {
|
|
11
|
-
constructor(
|
|
12
|
-
this.envConfigService = envConfigService;
|
|
10
|
+
constructor(fileSystemService) {
|
|
13
11
|
this.fileSystemService = fileSystemService;
|
|
14
12
|
this.logger = new logger_1.Logger('StorageServiceManager');
|
|
15
13
|
this.status = 'New';
|
|
@@ -19,22 +17,14 @@ class StorageServiceManager {
|
|
|
19
17
|
await new Promise(r => setTimeout(r, 100));
|
|
20
18
|
}
|
|
21
19
|
if (this.status === 'New') {
|
|
22
|
-
const configS3 = {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
secretAccessKey: (await this.envConfigService.getEnvByName('aws-s-3-secretaccesskey')),
|
|
26
|
-
bucket: (await this.envConfigService.getEnvByName('aws-s-3-bucket')),
|
|
27
|
-
};
|
|
20
|
+
const { configS3 } = await this.fileSystemService.readJSONFile('config/secret.json', {
|
|
21
|
+
throwErrors: true
|
|
22
|
+
});
|
|
28
23
|
const implementations = [
|
|
29
|
-
{
|
|
30
|
-
apply: () => Object.values(configS3).every(c => c),
|
|
31
|
-
build: () => new s3_client_service_1.S3ClientService(configS3),
|
|
32
|
-
name: 'S3ClientService',
|
|
33
|
-
},
|
|
34
24
|
{
|
|
35
25
|
apply: () => true,
|
|
36
|
-
build: () => new
|
|
37
|
-
name: '
|
|
26
|
+
build: () => new s3_client_service_1.S3ClientService(configS3, this.fileSystemService),
|
|
27
|
+
name: 'S3ClientService',
|
|
38
28
|
},
|
|
39
29
|
];
|
|
40
30
|
const implementation = implementations.find(i => i.apply());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../../../src/core/services/storage/storage.service.ts"],"names":[],"mappings":";;;AACA,0EAA+E;AAC/E,
|
|
1
|
+
{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../../../src/core/services/storage/storage.service.ts"],"names":[],"mappings":";;;AACA,0EAA+E;AAC/E,sCAAmC;AAKnC,MAAsB,cAAc;CAanC;AAbD,wCAaC;AAED,MAAa,qBAAqB;IAKhC,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAJhD,WAAM,GAAG,IAAI,eAAM,CAAC,uBAAuB,CAAC,CAAA;QACrD,WAAM,GAAgC,KAAK,CAAA;IAGkB,CAAC;IAEtE,KAAK,CAAC,WAAW;QACf,OAAO,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;YAChC,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAA;SAC3C;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE;YACzB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAS,oBAAoB,EAAE;gBAC3F,WAAW,EAAE,IAAI;aAClB,CAAC,CAAA;YAEF,MAAM,eAAe,GAAG;gBACtB;oBACE,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI;oBACjB,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,mCAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC;oBAClE,IAAI,EAAE,iBAAiB;iBACxB;aACF,CAAC;YACF,MAAM,cAAc,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;YAC5D,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,4CAA4C,cAAc,CAAC,IAAI,EAAE,CAClE,CAAC;YACF,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC,KAAK,EAAE,CAAC;YACvC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAA;SACtB;QACD,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;CACF;AAhCD,sDAgCC"}
|
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
import { User } from '../../models/user';
|
|
2
2
|
import { RepositoryFactory } from '../../orm/services/repository-factory';
|
|
3
|
+
import { FileSystemService } from '../../plugins/file-system/file-system.service';
|
|
3
4
|
import { ModuleConfigService } from './module-config.service';
|
|
4
5
|
export declare class UserConfigService {
|
|
5
6
|
private readonly moduleConfigService;
|
|
6
7
|
private readonly repositoryFactory;
|
|
7
|
-
|
|
8
|
+
private readonly fileSystemService;
|
|
9
|
+
constructor(moduleConfigService: ModuleConfigService, repositoryFactory: RepositoryFactory, fileSystemService: FileSystemService);
|
|
8
10
|
private getUserConfigDefinitionRepository;
|
|
9
11
|
private getUserConfigRepository;
|
|
10
12
|
private findBackEnd;
|
|
11
|
-
eval({ accessCondition,
|
|
13
|
+
eval({ accessCondition, user, moduleName, }: {
|
|
12
14
|
accessCondition: string;
|
|
13
|
-
companyKey: string;
|
|
14
15
|
user: User;
|
|
15
16
|
moduleName?: string;
|
|
16
17
|
}): Promise<boolean>;
|
|
@@ -2,32 +2,28 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.UserConfigService = void 0;
|
|
4
4
|
const _ = require("lodash");
|
|
5
|
-
const _1 = require(".");
|
|
6
5
|
class UserConfigService {
|
|
7
|
-
constructor(moduleConfigService, repositoryFactory) {
|
|
6
|
+
constructor(moduleConfigService, repositoryFactory, fileSystemService) {
|
|
8
7
|
this.moduleConfigService = moduleConfigService;
|
|
9
8
|
this.repositoryFactory = repositoryFactory;
|
|
9
|
+
this.fileSystemService = fileSystemService;
|
|
10
10
|
}
|
|
11
|
-
getUserConfigDefinitionRepository(
|
|
11
|
+
getUserConfigDefinitionRepository() {
|
|
12
12
|
return this.repositoryFactory.getCacheInstance({
|
|
13
|
-
companyKey,
|
|
14
13
|
tableName: 'puca_base_api_system_user_config_definition',
|
|
15
14
|
});
|
|
16
15
|
}
|
|
17
|
-
getUserConfigRepository(
|
|
16
|
+
getUserConfigRepository() {
|
|
18
17
|
return this.repositoryFactory.getCacheInstance({
|
|
19
|
-
companyKey,
|
|
20
18
|
tableName: 'puca_base_api_system_user_config',
|
|
21
19
|
});
|
|
22
20
|
}
|
|
23
|
-
async findBackEnd(
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
});
|
|
28
|
-
return _.get(moduleEspecification, [0, 'backend']);
|
|
21
|
+
async findBackEnd(moduleName) {
|
|
22
|
+
const maps = await this.fileSystemService.readJSONFile('config/front-end-to-back-end-map.json');
|
|
23
|
+
const map = maps.find(m => m.frontEnd = moduleName);
|
|
24
|
+
return _.get(map, 'backEnd');
|
|
29
25
|
}
|
|
30
|
-
async eval({ accessCondition,
|
|
26
|
+
async eval({ accessCondition, user, moduleName, }) {
|
|
31
27
|
if (user.username === 'puca-user') {
|
|
32
28
|
return true;
|
|
33
29
|
}
|
|
@@ -36,11 +32,11 @@ class UserConfigService {
|
|
|
36
32
|
}
|
|
37
33
|
const modules = [
|
|
38
34
|
moduleName,
|
|
39
|
-
await this.findBackEnd(
|
|
35
|
+
await this.findBackEnd(moduleName),
|
|
40
36
|
].filter(f => f);
|
|
41
|
-
const allUserConfigDefinitions = await this.getUserConfigDefinitionRepository(
|
|
37
|
+
const allUserConfigDefinitions = await this.getUserConfigDefinitionRepository().findAll();
|
|
42
38
|
const userConfigDefinitions = allUserConfigDefinitions.filter(ucd => modules.includes(ucd.module));
|
|
43
|
-
const userConfig = (await this.getUserConfigRepository(
|
|
39
|
+
const userConfig = (await this.getUserConfigRepository().findAll()).find(uc => uc.system_user === user.puca_pid &&
|
|
44
40
|
userConfigDefinitions.find(ucd => {
|
|
45
41
|
return (ucd.puca_pid === uc.system_user_config_definition &&
|
|
46
42
|
ucd.name === accessCondition &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-config.service.js","sourceRoot":"","sources":["../../../src/core/services/user-config.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;
|
|
1
|
+
{"version":3,"file":"user-config.service.js","sourceRoot":"","sources":["../../../src/core/services/user-config.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAU5B,MAAa,iBAAiB;IAC5B,YACmB,mBAAwC,EACxC,iBAAoC,EACpC,iBAAoC;QAFpC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,sBAAiB,GAAjB,iBAAiB,CAAmB;IACnD,CAAC;IAEG,iCAAiC;QAEvC,OAAO,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC;YAC7C,SAAS,EAAE,6CAA6C;SACzD,CAAC,CAAC;IACL,CAAC;IAEO,uBAAuB;QAE7B,OAAO,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC;YAC7C,SAAS,EAAE,kCAAkC;SAC9C,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,UAAkB;QAC1C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAyB,uCAAuC,CAAC,CAAA;QACvH,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,UAAU,CAAC,CAAA;QACnD,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IAC9B,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EACT,eAAe,EACf,IAAI,EACJ,UAAU,GAKX;QACC,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,EAAE;YACjC,OAAO,IAAI,CAAC;SACb;QAED,IAAI,CAAC,UAAU,EAAE;YACf,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAC,CAAC,IAAI,CAAC;SACtE;QAED,MAAM,OAAO,GAAG;YACd,UAAU;YACV,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC;SACnC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAEjB,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,iCAAiC,EAAE,CAAC,OAAO,EAAE,CAAC;QAE1F,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAClE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAC7B,CAAC;QAEF,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CACtE,EAAE,CAAC,EAAE,CACH,EAAE,CAAC,WAAW,KAAK,IAAI,CAAC,QAAQ;YAChC,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBAC/B,OAAO,CACL,GAAG,CAAC,QAAQ,KAAK,EAAE,CAAC,6BAA6B;oBACjD,GAAG,CAAC,IAAI,KAAK,eAAe;oBAC5B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAC7B,CAAC;YACJ,CAAC,CAAC,CACL,CAAC;QACF,OAAO,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;IACnD,CAAC;CACF;AApED,8CAoEC"}
|
|
@@ -14,8 +14,7 @@ export declare class WebSocketService {
|
|
|
14
14
|
private checkLogin;
|
|
15
15
|
private computeRoomName;
|
|
16
16
|
config(server: unknown): void;
|
|
17
|
-
send({
|
|
18
|
-
companyKey: string;
|
|
17
|
+
send({ destination, method, message, }: {
|
|
19
18
|
destination: string;
|
|
20
19
|
method: string;
|
|
21
20
|
message: any;
|
|
@@ -24,7 +24,7 @@ class WebSocketService {
|
|
|
24
24
|
return decoded;
|
|
25
25
|
}
|
|
26
26
|
computeRoomName(roomID) {
|
|
27
|
-
return `${roomID.
|
|
27
|
+
return `${roomID.user_pid}-${roomID.method}`;
|
|
28
28
|
}
|
|
29
29
|
config(server) {
|
|
30
30
|
this.io = new socket_io_1.Server(server);
|
|
@@ -41,7 +41,6 @@ class WebSocketService {
|
|
|
41
41
|
'method',
|
|
42
42
|
]);
|
|
43
43
|
socket.join(this.computeRoomName({
|
|
44
|
-
companyKey: pucaAuth.company.companyKey,
|
|
45
44
|
method,
|
|
46
45
|
user_pid: pucaAuth.user.puca_pid
|
|
47
46
|
}));
|
|
@@ -53,9 +52,8 @@ class WebSocketService {
|
|
|
53
52
|
this.logger.error(error);
|
|
54
53
|
});
|
|
55
54
|
}
|
|
56
|
-
async send({
|
|
55
|
+
async send({ destination, method, message, }) {
|
|
57
56
|
this.io.to(this.computeRoomName({
|
|
58
|
-
companyKey,
|
|
59
57
|
user_pid: destination,
|
|
60
58
|
method
|
|
61
59
|
})).emit('message', message);
|
|
@@ -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;AAE3C,qCAAkC;
|
|
1
|
+
{"version":3,"file":"web-socket.service.js","sourceRoot":"","sources":["../../../src/core/services/web-socket.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,yCAA2C;AAE3C,qCAAkC;AAYlC,MAAa,gBAAgB;IAC3B,YAA6B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;QAEpC,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAkB,CAAC,CAAC;IAFF,CAAC;IAKhD,KAAK,CAAC,UAAU,CAAC,KAAa;QACpC,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,IAAI,CAAC;SACb;QACD,IAAI,OAAiB,CAAC;QACtB,IAAI;YACF,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;SACzD;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrB,OAAO,GAAG,IAAI,CAAC;SAChB;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,eAAe,CAAC,MAAc;QACpC,OAAO,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE,CAAA;IAC9C,CAAC;IAED,MAAM,CAAC,MAAe;QACpB,IAAI,CAAC,EAAE,GAAG,IAAI,kBAAM,CAAC,MAAM,CAAC,CAAC;QAC7B,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,EAAE,KAAK,EAAC,MAAM,EAAC,EAAE;YACtC,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,CAAW,CAAC;YACtE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAC9C,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,CAAC,UAAU,EAAE,CAAC;gBACpB,OAAO;aACR;YAED,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE;gBAC3B,WAAW;gBACX,SAAS;gBACT,QAAQ;aACT,CAAW,CAAC;YAEb,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;gBAC/B,MAAM;gBACN,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ;aACjC,CAAC,CAAC,CAAA;YAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;gBACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EACT,WAAW,EACX,MAAM,EACN,OAAO,GAKR;QACC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC;YAC9B,QAAQ,EAAE,WAAW;YACrB,MAAM;SACP,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,EAAC,OAAO,CAAC,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAG,CAAC,IAAI,CAAC,EAAE,EAAC;YACV,OAAM;SACP;QACD,MAAM,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;QACrC,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAA;IACvB,CAAC;CACF;AA5ED,4CA4EC"}
|