@puca/puca-core 4.0.1 → 4.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/services/auth.service.d.ts +3 -3
- package/dist/core/services/auth.service.js +3 -5
- package/dist/core/services/auth.service.js.map +1 -1
- package/dist/core/services/comunication.service.d.ts +3 -5
- package/dist/core/services/comunication.service.js +3 -6
- package/dist/core/services/comunication.service.js.map +1 -1
- package/dist/core/services/configs.service.d.ts +17 -0
- package/dist/core/services/configs.service.js +34 -0
- package/dist/core/services/configs.service.js.map +1 -0
- package/dist/core/services/envs-config.service.d.ts +3 -5
- package/dist/core/services/envs-config.service.js +3 -23
- package/dist/core/services/envs-config.service.js.map +1 -1
- package/dist/core/services/index.d.ts +2 -0
- package/dist/core/services/index.js +10 -8
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/life-cycle.service.d.ts +3 -1
- package/dist/core/services/life-cycle.service.js +4 -5
- package/dist/core/services/life-cycle.service.js.map +1 -1
- package/dist/core/services/storage/implementation/s3-client.service.d.ts +3 -4
- package/dist/core/services/storage/implementation/s3-client.service.js +3 -9
- package/dist/core/services/storage/implementation/s3-client.service.js.map +1 -1
- package/dist/core/services/storage/storage.service.d.ts +4 -3
- package/dist/core/services/storage/storage.service.js +4 -6
- package/dist/core/services/storage/storage.service.js.map +1 -1
- package/dist/core/services/user-config.service.d.ts +3 -3
- package/dist/core/services/user-config.service.js +3 -3
- package/dist/core/services/user-config.service.js.map +1 -1
- package/dist/core/services/web-socket.service.d.ts +4 -2
- package/dist/core/services/web-socket.service.js +11 -2
- package/dist/core/services/web-socket.service.js.map +1 -1
- package/dist/models/redis-config.d.ts +5 -0
- package/dist/models/redis-config.js +3 -0
- package/dist/models/redis-config.js.map +1 -0
- package/dist/models/secret.d.ts +2 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -1
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { Request } from 'express';
|
|
2
2
|
import { PucaAuth } from "../../models/puca-auth";
|
|
3
3
|
import { RepositoryFactory } from "../../orm/services/repository-factory";
|
|
4
|
-
import { FileSystemService } from "../../plugins/file-system/file-system.service";
|
|
5
4
|
import { UuidService } from "../../plugins/uuid/uuid.service";
|
|
6
5
|
import { ModuleConfigService } from "./module-config.service";
|
|
6
|
+
import { ConfigsService } from './configs.service';
|
|
7
7
|
export declare class AuthService {
|
|
8
|
-
private readonly
|
|
8
|
+
private readonly configService;
|
|
9
9
|
private readonly moduleConfigService;
|
|
10
10
|
private readonly uuidService;
|
|
11
11
|
private readonly logger;
|
|
12
12
|
private readonly userManager;
|
|
13
|
-
constructor(
|
|
13
|
+
constructor(configService: ConfigsService, repositoryFactory: RepositoryFactory, moduleConfigService: ModuleConfigService, uuidService: UuidService);
|
|
14
14
|
private getPublicKey;
|
|
15
15
|
private unsaveDecode;
|
|
16
16
|
private isValid;
|
|
@@ -37,8 +37,8 @@ class UserManager {
|
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
class AuthService {
|
|
40
|
-
constructor(
|
|
41
|
-
this.
|
|
40
|
+
constructor(configService, repositoryFactory, moduleConfigService, uuidService) {
|
|
41
|
+
this.configService = configService;
|
|
42
42
|
this.moduleConfigService = moduleConfigService;
|
|
43
43
|
this.uuidService = uuidService;
|
|
44
44
|
this.logger = new logger_1.Logger('AuthService');
|
|
@@ -46,9 +46,7 @@ class AuthService {
|
|
|
46
46
|
}
|
|
47
47
|
async getPublicKey({ moduleName }) {
|
|
48
48
|
const getPublicKeyByModuleName = async (moduleName) => {
|
|
49
|
-
const moduleConfigList = await this.
|
|
50
|
-
throwErrors: false,
|
|
51
|
-
});
|
|
49
|
+
const moduleConfigList = await this.configService.getExternalModuleConfig();
|
|
52
50
|
const moduleConfig = moduleConfigList.find(m => m.name = moduleName);
|
|
53
51
|
return _.get(moduleConfig, 'publicKey');
|
|
54
52
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/core/services/auth.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,oCAAmC;
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/core/services/auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,14 @@
|
|
|
1
1
|
import { CallResponse } from '../../models/call-response';
|
|
2
2
|
import { User } from '../../models/user';
|
|
3
|
-
import { EnvConfigService } from './envs-config.service';
|
|
4
|
-
import { FileSystemService } from '../../plugins/file-system/file-system.service';
|
|
5
3
|
import { ModuleConfigService } from './module-config.service';
|
|
6
4
|
import { UuidService } from '../../plugins/uuid/uuid.service';
|
|
5
|
+
import { ConfigsService } from './configs.service';
|
|
7
6
|
export declare class ComunicationService {
|
|
8
|
-
private readonly envConfigService;
|
|
9
|
-
private readonly fileSystemService;
|
|
10
7
|
private readonly moduleConfigService;
|
|
11
8
|
private readonly uuidService;
|
|
9
|
+
private readonly configsService;
|
|
12
10
|
private readonly logger;
|
|
13
|
-
constructor(
|
|
11
|
+
constructor(moduleConfigService: ModuleConfigService, uuidService: UuidService, configsService: ConfigsService);
|
|
14
12
|
private internalCall;
|
|
15
13
|
call<B>({ moduleName, path, headers, body, user, protocol, method }: {
|
|
16
14
|
moduleName: string;
|
|
@@ -6,11 +6,10 @@ const axios_1 = require("axios");
|
|
|
6
6
|
const logger_1 = require("./logger");
|
|
7
7
|
const jsonwebtoken_1 = require("jsonwebtoken");
|
|
8
8
|
class ComunicationService {
|
|
9
|
-
constructor(
|
|
10
|
-
this.envConfigService = envConfigService;
|
|
11
|
-
this.fileSystemService = fileSystemService;
|
|
9
|
+
constructor(moduleConfigService, uuidService, configsService) {
|
|
12
10
|
this.moduleConfigService = moduleConfigService;
|
|
13
11
|
this.uuidService = uuidService;
|
|
12
|
+
this.configsService = configsService;
|
|
14
13
|
this.logger = new logger_1.Logger('ComunicationService');
|
|
15
14
|
}
|
|
16
15
|
async internalCall({ domain, path, body, headers, protocol, method }) {
|
|
@@ -55,9 +54,7 @@ class ComunicationService {
|
|
|
55
54
|
user,
|
|
56
55
|
version: 1
|
|
57
56
|
};
|
|
58
|
-
const { privateKey } = await this.
|
|
59
|
-
throwErrors: true
|
|
60
|
-
});
|
|
57
|
+
const { privateKey } = await this.configsService.getSecret();
|
|
61
58
|
if (!privateKey) {
|
|
62
59
|
if (!pucaAuth.user.token) {
|
|
63
60
|
throw new Error('computeToken error 1');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comunication.service.js","sourceRoot":"","sources":["../../../src/core/services/comunication.service.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AAIhC,iCAA0B;AAE1B,qCAAkC;
|
|
1
|
+
{"version":3,"file":"comunication.service.js","sourceRoot":"","sources":["../../../src/core/services/comunication.service.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AAIhC,iCAA0B;AAE1B,qCAAkC;AAClC,+CAAoC;AAKpC,MAAa,mBAAmB;IAE9B,YACmB,mBAAwC,EACxC,WAAwB,EACxB,cAA8B;QAF9B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAJhC,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAqB,CAAC,CAAC;IAKtD,CAAC;IACC,KAAK,CAAC,YAAY,CAAI,EAC5B,MAAM,EACN,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,MAAM,EAQP;QACC,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC;QAChC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE;YAC9C,OAAO;SACR,CAAC,CAAC;QACH,OAAO;YACL,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;SACpB,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,IAAI,CAAI,EACZ,UAAU,EACV,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,IAAI,EAEJ,QAAQ,GAAG,MAAM,EAGjB,MAAM,GAAG,MAAM,EAWhB;QACC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,GAAG,EAAE,CAAC;SACd;QAED,OAAO,CAAC,eAAe,CAAC,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC;YACjD,IAAI;SACL,CAAC,CAAA;QAEF,OAAO,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;QAErE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAI;YAC1C,MAAM,EAAE,UAAU;YAClB,IAAI;YACJ,OAAO;YACP,IAAI;YACJ,QAAQ;YACR,MAAM;SACP,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAAE,IAAI,EAAkB;QACzC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAA;QACrE,MAAM,QAAQ,GAAa;YACzB,GAAG,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE;YAC7C,OAAO,EAAE,IAAI;YACb,aAAa,EAAE,IAAI;YACnB,MAAM,EAAE;gBACN,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,OAAO,EAAE,YAAY,CAAC,OAAO;aAC9B;YACD,IAAI;YACJ,OAAO,EAAE,CAAC;SACX,CAAA;QAED,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,CAAA;QAC5D,IAAI,CAAC,UAAU,EAAE;YACf,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE;gBACxB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;aACxC;YAED,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAA;SAC3B;QAED,OAAO,mBAAI,CAAC,QAAQ,EAAE,UAAU,EAAE;YAChC,SAAS,EAAE,OAAO;SACnB,CAAC,CAAA;IACJ,CAAC;CACF;AAtGD,kDAsGC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
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
|
+
export declare class ConfigsService {
|
|
7
|
+
private readonly fileSystemService;
|
|
8
|
+
private readonly MODULE;
|
|
9
|
+
private readonly ENV;
|
|
10
|
+
private readonly FRONT_END_TO_BACK_END_MAP;
|
|
11
|
+
private readonly SECRET;
|
|
12
|
+
constructor(fileSystemService: FileSystemService);
|
|
13
|
+
getExternalModuleConfig(): Promise<ExternalModuleConfig[]>;
|
|
14
|
+
getSecret(): Promise<Secret>;
|
|
15
|
+
getEnv(): Promise<EnvsConfig>;
|
|
16
|
+
getFrontEndToBackEndMap(): Promise<FrontEndToBackEndMap[]>;
|
|
17
|
+
}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ConfigsService = void 0;
|
|
4
|
+
class ConfigsService {
|
|
5
|
+
constructor(fileSystemService) {
|
|
6
|
+
this.fileSystemService = fileSystemService;
|
|
7
|
+
this.MODULE = process.env.MODULE_PATH || 'config/modules.json';
|
|
8
|
+
this.ENV = process.env.ENV_PATH || 'config/env.json';
|
|
9
|
+
this.FRONT_END_TO_BACK_END_MAP = process.env.FRONT_END_TO_BACK_END_MAP_PATH || 'config/front-end-to-back-end-map.json';
|
|
10
|
+
this.SECRET = process.env.SECRET_PATH || 'config/secret.json';
|
|
11
|
+
}
|
|
12
|
+
async getExternalModuleConfig() {
|
|
13
|
+
return await this.fileSystemService.readJSONFile(this.MODULE, {
|
|
14
|
+
throwErrors: true,
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
async getSecret() {
|
|
18
|
+
return await this.fileSystemService.readJSONFile(this.SECRET, {
|
|
19
|
+
throwErrors: true
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
async getEnv() {
|
|
23
|
+
return await this.fileSystemService.readJSONFile(this.ENV, {
|
|
24
|
+
throwErrors: true
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
async getFrontEndToBackEndMap() {
|
|
28
|
+
return await this.fileSystemService.readJSONFile(this.FRONT_END_TO_BACK_END_MAP, {
|
|
29
|
+
throwErrors: true
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
exports.ConfigsService = ConfigsService;
|
|
34
|
+
//# sourceMappingURL=configs.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configs.service.js","sourceRoot":"","sources":["../../../src/core/services/configs.service.ts"],"names":[],"mappings":";;;AAMA,MAAa,cAAc;IAMzB,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;QALhD,WAAM,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,qBAAqB,CAAC;QAC1D,QAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,iBAAiB,CAAC;QAChD,8BAAyB,GAAG,OAAO,CAAC,GAAG,CAAC,8BAA8B,IAAI,uCAAuC,CAAC;QAClH,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,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAS,IAAI,CAAC,MAAM,EAAE;YACpE,WAAW,EAAE,IAAI;SAClB,CAAC,CAAA;IACJ,CAAC;IAGD,KAAK,CAAC,MAAM;QACV,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAa,IAAI,CAAC,GAAG,EAAE;YACrE,WAAW,EAAE,IAAI;SAClB,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC3B,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAyB,IAAI,CAAC,yBAAyB,EAAE;YACvG,WAAW,EAAE,IAAI;SAClB,CAAC,CAAA;IACJ,CAAC;CACF;AAhCD,wCAgCC"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ConfigsService } from './configs.service';
|
|
2
2
|
export declare class EnvConfigService {
|
|
3
|
-
private readonly
|
|
4
|
-
private logger;
|
|
3
|
+
private readonly configsService;
|
|
5
4
|
private envConfig;
|
|
6
|
-
constructor(
|
|
7
|
-
private log;
|
|
5
|
+
constructor(configsService: ConfigsService);
|
|
8
6
|
private getEnvConfig;
|
|
9
7
|
getEnvByName(envName: string, fallBack?: string): Promise<string>;
|
|
10
8
|
}
|
|
@@ -2,33 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EnvConfigService = void 0;
|
|
4
4
|
const _ = require("lodash");
|
|
5
|
-
const logger_1 = require("./logger");
|
|
6
5
|
class EnvConfigService {
|
|
7
|
-
constructor(
|
|
8
|
-
this.
|
|
9
|
-
setImmediate(() => {
|
|
10
|
-
this.logger = new logger_1.Logger('EnvConfigService');
|
|
11
|
-
});
|
|
12
|
-
}
|
|
13
|
-
log(level, ...args) {
|
|
14
|
-
if (!this.logger) {
|
|
15
|
-
console.log(level, ...args);
|
|
16
|
-
return;
|
|
17
|
-
}
|
|
18
|
-
this.logger[level](...args);
|
|
6
|
+
constructor(configsService) {
|
|
7
|
+
this.configsService = configsService;
|
|
19
8
|
}
|
|
20
9
|
async getEnvConfig() {
|
|
21
10
|
if (!this.envConfig) {
|
|
22
|
-
this.envConfig = await this.
|
|
23
|
-
throwErrors: true
|
|
24
|
-
});
|
|
25
|
-
if (this.envConfig) {
|
|
26
|
-
this.log('log', 'EnvConfig encontrado com sucesso', this.envConfig);
|
|
27
|
-
}
|
|
28
|
-
else {
|
|
29
|
-
this.log('warn', 'EnvConfig não encontrado', process.cwd(), 'config/env.json');
|
|
30
|
-
this.envConfig = {};
|
|
31
|
-
}
|
|
11
|
+
this.envConfig = await this.configsService.getEnv();
|
|
32
12
|
}
|
|
33
13
|
return this.envConfig;
|
|
34
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envs-config.service.js","sourceRoot":"","sources":["../../../src/core/services/envs-config.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAG5B,
|
|
1
|
+
{"version":3,"file":"envs-config.service.js","sourceRoot":"","sources":["../../../src/core/services/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"}
|
|
@@ -9,6 +9,8 @@ import { WebSocketService } from './web-socket.service';
|
|
|
9
9
|
import { AuthService } from './auth.service';
|
|
10
10
|
import { StorageServiceManager } from './storage/storage.service';
|
|
11
11
|
import { SourceService } from './source/source.service';
|
|
12
|
+
import { ConfigsService } from './configs.service';
|
|
13
|
+
export declare const configsService: ConfigsService;
|
|
12
14
|
export declare const envConfigService: EnvConfigService;
|
|
13
15
|
export declare const storageServiceManager: StorageServiceManager;
|
|
14
16
|
export declare const moduleConfigService: ModuleConfigService;
|
|
@@ -1,6 +1,6 @@
|
|
|
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.envConfigService = void 0;
|
|
3
|
+
exports.lifeCycleService = exports.webSocketService = exports.installService = exports.bootstrapService = exports.sourceService = exports.comunicationService = exports.userConfigService = exports.authService = exports.moduleConfigService = exports.storageServiceManager = exports.envConfigService = exports.configsService = void 0;
|
|
4
4
|
const services_1 = require("../../orm/services");
|
|
5
5
|
const plugins_1 = require("../../plugins");
|
|
6
6
|
const bootstrap_service_1 = require("./bootstrap.service");
|
|
@@ -17,12 +17,14 @@ 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
|
-
|
|
21
|
-
exports.
|
|
20
|
+
const configs_service_1 = require("./configs.service");
|
|
21
|
+
exports.configsService = new configs_service_1.ConfigsService(plugins_1.fileSystemService);
|
|
22
|
+
exports.envConfigService = new envs_config_service_1.EnvConfigService(exports.configsService);
|
|
23
|
+
exports.storageServiceManager = new storage_service_1.StorageServiceManager(exports.configsService);
|
|
22
24
|
exports.moduleConfigService = new module_config_service_1.ModuleConfigService(plugins_1.fileSystemService);
|
|
23
|
-
exports.authService = new auth_service_1.AuthService(
|
|
24
|
-
exports.userConfigService = new user_config_service_1.UserConfigService(exports.moduleConfigService, services_1.repositoryFactory,
|
|
25
|
-
exports.comunicationService = new comunication_service_1.ComunicationService(exports.
|
|
25
|
+
exports.authService = new auth_service_1.AuthService(exports.configsService, services_1.repositoryFactory, exports.moduleConfigService, plugins_1.uuidService);
|
|
26
|
+
exports.userConfigService = new user_config_service_1.UserConfigService(exports.moduleConfigService, services_1.repositoryFactory, exports.configsService);
|
|
27
|
+
exports.comunicationService = new comunication_service_1.ComunicationService(exports.moduleConfigService, plugins_1.uuidService, exports.configsService);
|
|
26
28
|
const applicationJavascriptV1Service = new application_service_1.ApplicationService(`${process.cwd()}//node_modules/@puca/puca-core/javascriptV1/javascriptV1.js`, plugins_1.fileSystemService, exports.comunicationService, plugins_1.uuidService, exports.storageServiceManager);
|
|
27
29
|
const applicationGcloudRunCloudV1Service = new application_service_2.ApplicationService(exports.comunicationService);
|
|
28
30
|
exports.sourceService = new source_service_1.SourceService(services_1.repositoryFactory, [
|
|
@@ -32,6 +34,6 @@ exports.sourceService = new source_service_1.SourceService(services_1.repository
|
|
|
32
34
|
const migrationService = new migration_service_1.MigrationService(services_1.databaseManagerService, services_1.repositoryFactory, exports.moduleConfigService);
|
|
33
35
|
exports.bootstrapService = new bootstrap_service_1.BootstrapService(migrationService);
|
|
34
36
|
exports.installService = new install_service_1.InstallService(migrationService, services_1.repositoryFactory);
|
|
35
|
-
exports.webSocketService = new web_socket_service_1.WebSocketService(exports.authService);
|
|
36
|
-
exports.lifeCycleService = new life_cycle_service_1.LifeCycleService(services_1.databaseManagerService, exports.bootstrapService, exports.envConfigService, exports.installService, services_1.repositoryFactory, plugins_1.fileSystemService, exports.moduleConfigService, exports.webSocketService);
|
|
37
|
+
exports.webSocketService = new web_socket_service_1.WebSocketService(plugins_1.fileSystemService, exports.authService);
|
|
38
|
+
exports.lifeCycleService = new life_cycle_service_1.LifeCycleService(services_1.databaseManagerService, exports.bootstrapService, exports.envConfigService, exports.installService, services_1.repositoryFactory, plugins_1.fileSystemService, exports.moduleConfigService, exports.webSocketService, exports.configsService);
|
|
37
39
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":";;;AAAA,iDAA+E;AAC/E,2CAA+D;AAC/D,2DAAuD;AACvD,iEAA6D;AAC7D,+DAAyD;AACzD,6DAAwD;AACxD,mEAA8D;AAC9D,2DAAuD;AACvD,uDAAmD;AACnD,+DAA0D;AAC1D,6DAAwD;AACxD,iDAA6C;AAC7C,+DAAkE;AAClE,oFAAkH;AAClH,0FAA4H;AAC5H,4DAAwD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":";;;AAAA,iDAA+E;AAC/E,2CAA+D;AAC/D,2DAAuD;AACvD,iEAA6D;AAC7D,+DAAyD;AACzD,6DAAwD;AACxD,mEAA8D;AAC9D,2DAAuD;AACvD,uDAAmD;AACnD,+DAA0D;AAC1D,6DAAwD;AACxD,iDAA6C;AAC7C,+DAAkE;AAClE,oFAAkH;AAClH,0FAA4H;AAC5H,4DAAwD;AACxD,uDAAmD;AAEtC,QAAA,cAAc,GAAG,IAAI,gCAAc,CAAC,2BAAiB,CAAC,CAAA;AACtD,QAAA,gBAAgB,GAAG,IAAI,sCAAgB,CAAC,sBAAc,CAAC,CAAC;AACxD,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,2BAAiB,EACjB,mBAAW,CACZ,CAAA;AACY,QAAA,gBAAgB,GAAG,IAAI,qCAAgB,CAClD,iCAAsB,EACtB,wBAAgB,EAChB,wBAAgB,EAChB,sBAAc,EACd,4BAAiB,EACjB,2BAAiB,EACjB,2BAAmB,EACnB,wBAAgB,EAChB,sBAAc,CACf,CAAC"}
|
|
@@ -7,6 +7,7 @@ import { ModuleConfigService } from './module-config.service';
|
|
|
7
7
|
import { FileSystemService } from '../../plugins/file-system/file-system.service';
|
|
8
8
|
import { WebSocketService } from './web-socket.service';
|
|
9
9
|
import { INestApplication } from '@nestjs/common';
|
|
10
|
+
import { ConfigsService } from './configs.service';
|
|
10
11
|
export interface StartArgs {
|
|
11
12
|
appModule: any;
|
|
12
13
|
execBootStrap?: boolean;
|
|
@@ -22,10 +23,11 @@ export declare class LifeCycleService {
|
|
|
22
23
|
private readonly fileSystemService;
|
|
23
24
|
private readonly moduleConfigService;
|
|
24
25
|
private readonly webSocketService;
|
|
26
|
+
private readonly configsService;
|
|
25
27
|
private readonly logger;
|
|
26
28
|
private app;
|
|
27
29
|
private readonly intervals;
|
|
28
|
-
constructor(databaseManagerService: DatabaseManagerService, bootstrapService: BootstrapService, envConfigService: EnvConfigService, installService: InstallService, repositoryFactory: RepositoryFactory, fileSystemService: FileSystemService, moduleConfigService: ModuleConfigService, webSocketService: WebSocketService);
|
|
30
|
+
constructor(databaseManagerService: DatabaseManagerService, bootstrapService: BootstrapService, envConfigService: EnvConfigService, installService: InstallService, repositoryFactory: RepositoryFactory, fileSystemService: FileSystemService, moduleConfigService: ModuleConfigService, webSocketService: WebSocketService, configsService: ConfigsService);
|
|
29
31
|
stop(): Promise<void>;
|
|
30
32
|
start(args: StartArgs): Promise<INestApplication>;
|
|
31
33
|
checkDatabaseConnection(): Promise<void>;
|
|
@@ -9,7 +9,7 @@ const crud_front_base_service_1 = require("./crud-front-base.service");
|
|
|
9
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) {
|
|
12
|
+
constructor(databaseManagerService, bootstrapService, envConfigService, installService, repositoryFactory, fileSystemService, moduleConfigService, webSocketService, configsService) {
|
|
13
13
|
this.databaseManagerService = databaseManagerService;
|
|
14
14
|
this.bootstrapService = bootstrapService;
|
|
15
15
|
this.envConfigService = envConfigService;
|
|
@@ -18,6 +18,7 @@ class LifeCycleService {
|
|
|
18
18
|
this.fileSystemService = fileSystemService;
|
|
19
19
|
this.moduleConfigService = moduleConfigService;
|
|
20
20
|
this.webSocketService = webSocketService;
|
|
21
|
+
this.configsService = configsService;
|
|
21
22
|
this.logger = new logger_1.Logger('LifeCycleService');
|
|
22
23
|
this.intervals = [];
|
|
23
24
|
}
|
|
@@ -53,7 +54,7 @@ class LifeCycleService {
|
|
|
53
54
|
});
|
|
54
55
|
const httpServer = this.app.getHttpServer();
|
|
55
56
|
if (args.useWebSocket) {
|
|
56
|
-
this.webSocketService.config(httpServer);
|
|
57
|
+
await this.webSocketService.config(httpServer);
|
|
57
58
|
}
|
|
58
59
|
await this.app.listen(await this.envConfigService.getEnvByName('SERVER_PORT', '4000'));
|
|
59
60
|
const repository = this.repositoryFactory.getInstance({
|
|
@@ -140,9 +141,7 @@ class LifeCycleService {
|
|
|
140
141
|
async connectToDataBase() {
|
|
141
142
|
const application_name = (await this.moduleConfigService.getModuleConfig())
|
|
142
143
|
.name;
|
|
143
|
-
const { databaseConfig } = await this.
|
|
144
|
-
throwErrors: true,
|
|
145
|
-
});
|
|
144
|
+
const { databaseConfig } = await this.configsService.getSecret();
|
|
146
145
|
const max = +(await this.envConfigService.getEnvByName('pool-max', `${DEFAULT_MAX_CONNECTION}`));
|
|
147
146
|
const database = new database_manager_service_1.Database(Object.assign(Object.assign({ max }, databaseConfig), { application_name }));
|
|
148
147
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAE5B,0FAGqD;AAMrD,uCAA2C;AAC3C,qCAAkC;AAClC,uEAGmC;AAQnC,0EAAqE;AAGrE,MAAM,sBAAsB,GAAG,GAAG,CAAC;AASnC,MAAa,gBAAgB;IAI3B,YACmB,sBAA8C,EAC9C,gBAAkC,EAClC,gBAAkC,EAClC,cAA8B,EAC9B,iBAAoC,EACpC,iBAAoC,EACpC,mBAAwC,EACxC,gBAAkC;
|
|
1
|
+
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
|
4
|
+
import { FileString } from '../../../../plugins/file-system/file-system.service';
|
|
5
5
|
export interface S3Config {
|
|
6
6
|
region: string;
|
|
7
7
|
accessKeyId: string;
|
|
@@ -10,10 +10,9 @@ export interface S3Config {
|
|
|
10
10
|
}
|
|
11
11
|
export declare class S3ClientService implements StorageService {
|
|
12
12
|
private readonly s3Config;
|
|
13
|
-
private readonly
|
|
13
|
+
private readonly namespace;
|
|
14
14
|
private readonly s3Client;
|
|
15
|
-
constructor(s3Config: S3Config,
|
|
16
|
-
private getNamespace;
|
|
15
|
+
constructor(s3Config: S3Config, namespace: any);
|
|
17
16
|
writeFile({ path, buffer, }: {
|
|
18
17
|
path: string;
|
|
19
18
|
buffer: Buffer;
|
|
@@ -3,17 +3,11 @@ 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, namespace) {
|
|
7
7
|
this.s3Config = s3Config;
|
|
8
|
-
this.
|
|
8
|
+
this.namespace = namespace;
|
|
9
9
|
this.s3Client = new aws_sdk_1.S3(s3Config);
|
|
10
10
|
}
|
|
11
|
-
async getNamespace() {
|
|
12
|
-
const { namespace } = await this.fileSystemService.readJSONFile('config/secret.json', {
|
|
13
|
-
throwErrors: false,
|
|
14
|
-
});
|
|
15
|
-
return namespace;
|
|
16
|
-
}
|
|
17
11
|
async writeFile({ path, buffer, }) {
|
|
18
12
|
const uploadParams = {
|
|
19
13
|
Bucket: this.s3Config.bucket,
|
|
@@ -64,7 +58,7 @@ class S3ClientService {
|
|
|
64
58
|
});
|
|
65
59
|
}
|
|
66
60
|
async buildCompletePath({ path, }) {
|
|
67
|
-
return `${
|
|
61
|
+
return `${this.namespace}/${path}`;
|
|
68
62
|
}
|
|
69
63
|
async deleteFile(args) {
|
|
70
64
|
}
|
|
@@ -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,6 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Response } from 'express';
|
|
3
|
-
import { FileString
|
|
3
|
+
import { FileString } from '../../../plugins/file-system/file-system.service';
|
|
4
|
+
import { ConfigsService } from '../configs.service';
|
|
4
5
|
export declare abstract class StorageService {
|
|
5
6
|
abstract writeFile(args: {
|
|
6
7
|
path: string;
|
|
@@ -21,10 +22,10 @@ export declare abstract class StorageService {
|
|
|
21
22
|
}): Promise<FileString[]>;
|
|
22
23
|
}
|
|
23
24
|
export declare class StorageServiceManager {
|
|
24
|
-
private readonly
|
|
25
|
+
private readonly configsService;
|
|
25
26
|
private readonly logger;
|
|
26
27
|
private status;
|
|
27
28
|
private instance;
|
|
28
|
-
constructor(
|
|
29
|
+
constructor(configsService: ConfigsService);
|
|
29
30
|
getInstance(): Promise<StorageService>;
|
|
30
31
|
}
|
|
@@ -7,8 +7,8 @@ class StorageService {
|
|
|
7
7
|
}
|
|
8
8
|
exports.StorageService = StorageService;
|
|
9
9
|
class StorageServiceManager {
|
|
10
|
-
constructor(
|
|
11
|
-
this.
|
|
10
|
+
constructor(configsService) {
|
|
11
|
+
this.configsService = configsService;
|
|
12
12
|
this.logger = new logger_1.Logger('StorageServiceManager');
|
|
13
13
|
this.status = 'New';
|
|
14
14
|
}
|
|
@@ -17,13 +17,11 @@ class StorageServiceManager {
|
|
|
17
17
|
await new Promise(r => setTimeout(r, 100));
|
|
18
18
|
}
|
|
19
19
|
if (this.status === 'New') {
|
|
20
|
-
const { configS3 } = await this.
|
|
21
|
-
throwErrors: true
|
|
22
|
-
});
|
|
20
|
+
const { configS3, namespace } = await this.configsService.getSecret();
|
|
23
21
|
const implementations = [
|
|
24
22
|
{
|
|
25
23
|
apply: () => true,
|
|
26
|
-
build: () => new s3_client_service_1.S3ClientService(configS3,
|
|
24
|
+
build: () => new s3_client_service_1.S3ClientService(configS3, namespace),
|
|
27
25
|
name: 'S3ClientService',
|
|
28
26
|
},
|
|
29
27
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../../../src/core/services/storage/storage.service.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../../../src/core/services/storage/storage.service.ts"],"names":[],"mappings":";;;AACA,0EAAqE;AACrE,sCAAmC;AAGnC,MAAsB,cAAc;CAanC;AAbD,wCAaC;AAED,MAAa,qBAAqB;IAKhC,YAA6B,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAJ1C,WAAM,GAAG,IAAI,eAAM,CAAC,uBAAuB,CAAC,CAAA;QACrD,WAAM,GAAgC,KAAK,CAAA;IAGY,CAAC;IAEhE,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,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,CAAA;YAErE,MAAM,eAAe,GAAG;gBACtB;oBACE,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI;oBACjB,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,mCAAe,CAAC,QAAQ,EAAE,SAAS,CAAC;oBACrD,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;AA9BD,sDA8BC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { User } from '../../models/user';
|
|
2
2
|
import { RepositoryFactory } from '../../orm/services/repository-factory';
|
|
3
|
-
import {
|
|
3
|
+
import { ConfigsService } from './configs.service';
|
|
4
4
|
import { ModuleConfigService } from './module-config.service';
|
|
5
5
|
export declare class UserConfigService {
|
|
6
6
|
private readonly moduleConfigService;
|
|
7
7
|
private readonly repositoryFactory;
|
|
8
|
-
private readonly
|
|
9
|
-
constructor(moduleConfigService: ModuleConfigService, repositoryFactory: RepositoryFactory,
|
|
8
|
+
private readonly configService;
|
|
9
|
+
constructor(moduleConfigService: ModuleConfigService, repositoryFactory: RepositoryFactory, configService: ConfigsService);
|
|
10
10
|
private getUserConfigDefinitionRepository;
|
|
11
11
|
private getUserConfigRepository;
|
|
12
12
|
private findBackEnd;
|
|
@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.UserConfigService = void 0;
|
|
4
4
|
const _ = require("lodash");
|
|
5
5
|
class UserConfigService {
|
|
6
|
-
constructor(moduleConfigService, repositoryFactory,
|
|
6
|
+
constructor(moduleConfigService, repositoryFactory, configService) {
|
|
7
7
|
this.moduleConfigService = moduleConfigService;
|
|
8
8
|
this.repositoryFactory = repositoryFactory;
|
|
9
|
-
this.
|
|
9
|
+
this.configService = configService;
|
|
10
10
|
}
|
|
11
11
|
getUserConfigDefinitionRepository() {
|
|
12
12
|
return this.repositoryFactory.getCacheInstance({
|
|
@@ -19,7 +19,7 @@ class UserConfigService {
|
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
21
|
async findBackEnd(moduleName) {
|
|
22
|
-
const maps = await this.
|
|
22
|
+
const maps = await this.configService.getFrontEndToBackEndMap();
|
|
23
23
|
const map = maps.find(m => m.frontEnd = moduleName);
|
|
24
24
|
return _.get(map, 'backEnd');
|
|
25
25
|
}
|
|
@@ -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;AAS5B,MAAa,iBAAiB;IAC5B,YACmB,mBAAwC,EACxC,iBAAoC,EACpC,aAA6B;QAF7B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,kBAAa,GAAb,aAAa,CAAgB;IAC5C,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,aAAa,CAAC,uBAAuB,EAAE,CAAA;QAC/D,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"}
|
|
@@ -1,19 +1,21 @@
|
|
|
1
1
|
import { Socket } from 'socket.io';
|
|
2
2
|
import { PucaAuth } from '../../models/puca-auth';
|
|
3
3
|
import { AuthService } from './auth.service';
|
|
4
|
+
import { FileSystemService } from '../../plugins/file-system/file-system.service';
|
|
4
5
|
export interface SocketDetail {
|
|
5
6
|
socket: Socket;
|
|
6
7
|
pucaAuth: PucaAuth;
|
|
7
8
|
method: string;
|
|
8
9
|
}
|
|
9
10
|
export declare class WebSocketService {
|
|
11
|
+
private readonly fileSystemService;
|
|
10
12
|
private readonly authService;
|
|
11
|
-
constructor(authService: AuthService);
|
|
13
|
+
constructor(fileSystemService: FileSystemService, authService: AuthService);
|
|
12
14
|
private readonly logger;
|
|
13
15
|
private io;
|
|
14
16
|
private checkLogin;
|
|
15
17
|
private computeRoomName;
|
|
16
|
-
config(server: unknown): void
|
|
18
|
+
config(server: unknown): Promise<void>;
|
|
17
19
|
send({ destination, method, message, }: {
|
|
18
20
|
destination: string;
|
|
19
21
|
method: string;
|