@puca/puca-core 10.9.0 → 10.9.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.
@@ -44,7 +44,7 @@ exports.singleInstanceEnsureService = new single_instance_ensure_service_1.Singl
44
44
  exports.evalServiceFactory = new eval_service_1.EvalServiceFactory(services_1.repositoryFactory, plugins_1.uuidService);
45
45
  exports.systemParametersEnvs = new system_parameters_envs_service_1.SystemParametersEnvs(services_1.repositoryFactory, essential_1.configService);
46
46
  exports.jobService = new job_service_1.JobService(new job_client_1.JobClientManager(essential_1.configService), essential_1.configService, essential_1.moduleConfigService);
47
- exports.storageServiceManager = new storage_service_1.StorageServiceManager(essential_1.configService);
47
+ exports.storageServiceManager = new storage_service_1.StorageServiceManager(services_1.redisManagerService, essential_1.configService);
48
48
  exports.authService = new auth_service_1.AuthService(essential_1.configService, services_1.repositoryFactory, essential_1.moduleConfigService, plugins_1.uuidService);
49
49
  exports.userConfigService = new user_config_service_1.UserConfigService(essential_1.moduleConfigService, services_1.repositoryFactory, essential_1.configService, exports.evalServiceFactory);
50
50
  exports.comunicationHttpService = new comunication_http_service_1.ComunicationServiceHttp(essential_1.configService);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@
2
2
  import { Response } from 'express';
3
3
  import { StorageService } from '../storage.service';
4
4
  import { FileString } from '../../../../plugins/file-system/file-system.service';
5
+ import { RedisManagerService } from '../../../../orm/services/managers/redis-manager.service';
5
6
  export interface S3Config {
6
7
  region: string;
7
8
  accessKeyId: string;
@@ -9,10 +10,13 @@ export interface S3Config {
9
10
  bucket: string;
10
11
  }
11
12
  export declare class S3ClientService implements StorageService {
13
+ private readonly redisManagerService;
12
14
  private readonly s3Config;
13
15
  private readonly namespace;
14
16
  private readonly s3Client;
15
- constructor(s3Config: S3Config, namespace: string);
17
+ private redisInstance;
18
+ constructor(redisManagerService: RedisManagerService, s3Config: S3Config, namespace: string);
19
+ init(): Promise<void>;
16
20
  writeFile({ path, buffer, cacheControl, publicLink }: {
17
21
  path: string;
18
22
  buffer: Buffer;
@@ -3,11 +3,15 @@ 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, namespace) {
6
+ constructor(redisManagerService, s3Config, namespace) {
7
+ this.redisManagerService = redisManagerService;
7
8
  this.s3Config = s3Config;
8
9
  this.namespace = namespace;
9
10
  this.s3Client = new aws_sdk_1.S3(s3Config);
10
11
  }
12
+ async init() {
13
+ this.redisInstance = await this.redisManagerService.get();
14
+ }
11
15
  async writeFile({ path, buffer, cacheControl, publicLink = false }) {
12
16
  const uploadParams = {
13
17
  Bucket: this.s3Config.bucket,
@@ -28,7 +32,9 @@ class S3ClientService {
28
32
  });
29
33
  }
30
34
  async readFileResponse({ path, res, mode = 'redirect' }) {
31
- const link = await this.getDownloadLink({ path, expires: 600 });
35
+ const maxAge = 600;
36
+ const link = await this.getDownloadLink({ path, expires: maxAge });
37
+ res.setHeader('Cache-Control', `max-age=${maxAge}`);
32
38
  switch (mode) {
33
39
  case 'link': {
34
40
  res.setHeader('download-mode', 'link');
@@ -43,11 +49,31 @@ class S3ClientService {
43
49
  }
44
50
  }
45
51
  async getDownloadLink({ path, expires = 600, publicLink = false }) {
52
+ if (expires) {
53
+ const cacheLink = await new Promise((response, reject) => {
54
+ this.redisInstance.get(`S3ClientService.getDownloadLink-${path}`, (err, data) => {
55
+ if (err) {
56
+ return reject(err);
57
+ }
58
+ response(data);
59
+ });
60
+ });
61
+ if (cacheLink) {
62
+ return cacheLink;
63
+ }
64
+ }
46
65
  const completePath = await this.buildCompletePath({
47
66
  path,
48
67
  });
68
+ const addLinkOnCache = async (link) => {
69
+ if (!expires) {
70
+ return;
71
+ }
72
+ this.redisInstance.set(`S3ClientService.getDownloadLink-${path}`, link, 'EX', expires);
73
+ };
49
74
  if (publicLink) {
50
75
  const link = `https://${this.s3Config.bucket}.s3.${this.s3Config.region}.amazonaws.com/${completePath}`;
76
+ await addLinkOnCache(link);
51
77
  return link;
52
78
  }
53
79
  const params = {
@@ -56,6 +82,7 @@ class S3ClientService {
56
82
  Expires: expires,
57
83
  };
58
84
  const link = await this.s3Client.getSignedUrlPromise('getObject', params);
85
+ await addLinkOnCache(link);
59
86
  return link;
60
87
  }
61
88
  async readFile({ path, pathFormat = 'default' }) {
@@ -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;AAY7B,MAAa,eAAe;IAG1B,YAA6B,QAAkB,EAAmB,SAAiB;QAAtD,aAAQ,GAAR,QAAQ,CAAU;QAAmB,cAAS,GAAT,SAAS,CAAQ;QACjF,IAAI,CAAC,QAAQ,GAAG,IAAI,YAAE,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EACd,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,UAAU,GAAG,KAAK,EAMnB;QACC,MAAM,YAAY,GAA8B;YAC9C,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;YAC5B,GAAG,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC;gBAChC,IAAI;aACL,CAAC;YACF,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS;SAC5C,CAAC;QACF,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC,EAAE;gBACvC,IAAI,GAAG,EAAE;oBACP,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;iBACpB;gBACD,OAAO,OAAO,EAAE,CAAC;YACnB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,EACrB,IAAI,EACJ,GAAG,EACH,IAAI,GAAG,UAAU,EAKlB;QACC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;QAChE,QAAQ,IAAI,EAAE;YACZ,KAAK,MAAM,CAAC,CAAC;gBACX,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;gBACtC,GAAG,CAAC,IAAI,CAAC;oBACP,IAAI;iBACL,CAAC,CAAA;gBACF,OAAM;aACP;YACD,OAAO,CAAC,CAAC;gBACP,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;aACnB;SACF;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,GAAG,EAAE,UAAU,GAAG,KAAK,EAA4D;QACzH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC;YAChD,IAAI;SACL,CAAC,CAAC;QAEH,IAAI,UAAU,EAAE;YACd,MAAM,IAAI,GAAG,WAAW,IAAI,CAAC,QAAQ,CAAC,MAAM,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,kBAAkB,YAAY,EAAE,CAAC;YAExG,OAAO,IAAI,CAAA;SACZ;QAED,MAAM,MAAM,GAAG;YACb,GAAG,EAAE,YAAY;YACjB,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;YAC5B,OAAO,EAAE,OAAO;SACjB,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC1E,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EACb,IAAI,EACJ,UAAU,GAAG,SAAS,EAIvB;QACC,MAAM,YAAY,GAAG,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC;YACnF,IAAI;SACL,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG;YACb,GAAG,EAAE,YAAY;YACjB,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;SAC7B,CAAA;QAED,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC7C,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;gBAC9C,IAAI,KAAK,EAAE;oBACT,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;iBACrB;gBACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;YAC/B,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,EAC9B,IAAI,GAGL;QACC,OAAO,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAsB;IAEvC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAEhB;QACC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC;YAChD,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAA;QAEF,OAAO,IAAI,OAAO,CAAe,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;gBACxB,MAAM,EAAE,YAAY;gBACpB,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;aAC7B,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBACvB,IAAI,KAAK,EAAE;oBACT,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;iBACrB;gBAED,IAAI;oBACF,MAAM,QAAQ,GAAiB,EAAE,CAAA;oBACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;wBAChC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;4BAC/B,IAAI,EAAE,OAAO,CAAC,GAAG;4BACjB,UAAU,EAAE,UAAU;yBACvB,CAAC,CAAA;wBAEF,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG;6BAChC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;6BACzB,KAAK,CAAC,GAAG,CAAC;6BACV,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;wBAEjB,QAAQ,CAAC,IAAI,CAAC;4BACZ,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;4BAC9F,IAAI,EAAE,kBAAkB,CAAC,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;4BACrE,OAAO,EAAE,IAAI;yBACd,CAAC,CAAA;qBACH;oBACD,OAAO,CAAC,QAAQ,CAAC,CAAA;iBAClB;gBAAC,OAAO,CAAC,EAAE;oBACV,MAAM,CAAC,CAAC,CAAC,CAAA;iBACV;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AAnKD,0CAmKC"}
1
+ {"version":3,"file":"s3-client.service.js","sourceRoot":"","sources":["../../../../../src/core/services/storage/implementation/s3-client.service.ts"],"names":[],"mappings":";;;AAAA,qCAA6B;AAe7B,MAAa,eAAe;IAI1B,YACmB,mBAAwC,EACxC,QAAkB,EAClB,SAAiB;QAFjB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,aAAQ,GAAR,QAAQ,CAAU;QAClB,cAAS,GAAT,SAAS,CAAQ;QAClC,IAAI,CAAC,QAAQ,GAAG,IAAI,YAAE,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,aAAa,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAA;IAC3D,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EACd,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,UAAU,GAAG,KAAK,EAMnB;QACC,MAAM,YAAY,GAA8B;YAC9C,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;YAC5B,GAAG,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC;gBAChC,IAAI;aACL,CAAC;YACF,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS;SAC5C,CAAC;QACF,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC,EAAE;gBACvC,IAAI,GAAG,EAAE;oBACP,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;iBACpB;gBACD,OAAO,OAAO,EAAE,CAAC;YACnB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,EACrB,IAAI,EACJ,GAAG,EACH,IAAI,GAAG,UAAU,EAKlB;QACC,MAAM,MAAM,GAAG,GAAG,CAAA;QAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACnE,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,WAAW,MAAM,EAAE,CAAC,CAAA;QACnD,QAAQ,IAAI,EAAE;YACZ,KAAK,MAAM,CAAC,CAAC;gBACX,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;gBACtC,GAAG,CAAC,IAAI,CAAC;oBACP,IAAI;iBACL,CAAC,CAAA;gBACF,OAAM;aACP;YACD,OAAO,CAAC,CAAC;gBACP,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;aACnB;SACF;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,GAAG,EAAE,UAAU,GAAG,KAAK,EAA4D;QACzH,IAAG,OAAO,EAAC;YACT,MAAM,SAAS,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;gBAC/D,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,mCAAmC,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;oBAC9E,IAAI,GAAG,EAAE;wBACP,OAAO,MAAM,CAAC,GAAG,CAAC,CAAA;qBACnB;oBACD,QAAQ,CAAC,IAAI,CAAC,CAAA;gBAChB,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;YAEF,IAAI,SAAS,EAAE;gBACb,OAAO,SAAS,CAAA;aACjB;SACF;QAGD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC;YAChD,IAAI;SACL,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;YAM5C,IAAG,CAAC,OAAO,EAAC;gBACV,OAAM;aACP;YACD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,mCAAmC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;QACxF,CAAC,CAAA;QAED,IAAI,UAAU,EAAE;YACd,MAAM,IAAI,GAAG,WAAW,IAAI,CAAC,QAAQ,CAAC,MAAM,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,kBAAkB,YAAY,EAAE,CAAC;YACxG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAA;YAC1B,OAAO,IAAI,CAAA;SACZ;QAED,MAAM,MAAM,GAAG;YACb,GAAG,EAAE,YAAY;YACjB,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;YAC5B,OAAO,EAAE,OAAO;SACjB,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC1E,MAAM,cAAc,CAAC,IAAI,CAAC,CAAA;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EACb,IAAI,EACJ,UAAU,GAAG,SAAS,EAIvB;QACC,MAAM,YAAY,GAAG,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC;YACnF,IAAI;SACL,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG;YACb,GAAG,EAAE,YAAY;YACjB,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;SAC7B,CAAA;QAED,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC7C,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;gBAC9C,IAAI,KAAK,EAAE;oBACT,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;iBACrB;gBACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;YAC/B,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,EAC9B,IAAI,GAGL;QACC,OAAO,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAsB;IAEvC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAEhB;QACC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC;YAChD,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAA;QAEF,OAAO,IAAI,OAAO,CAAe,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;gBACxB,MAAM,EAAE,YAAY;gBACpB,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;aAC7B,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBACvB,IAAI,KAAK,EAAE;oBACT,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;iBACrB;gBAED,IAAI;oBACF,MAAM,QAAQ,GAAiB,EAAE,CAAA;oBACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;wBAChC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;4BAC/B,IAAI,EAAE,OAAO,CAAC,GAAG;4BACjB,UAAU,EAAE,UAAU;yBACvB,CAAC,CAAA;wBAEF,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG;6BAChC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;6BACzB,KAAK,CAAC,GAAG,CAAC;6BACV,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;wBAEjB,QAAQ,CAAC,IAAI,CAAC;4BACZ,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;4BAC9F,IAAI,EAAE,kBAAkB,CAAC,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;4BACrE,OAAO,EAAE,IAAI;yBACd,CAAC,CAAA;qBACH;oBACD,OAAO,CAAC,QAAQ,CAAC,CAAA;iBAClB;gBAAC,OAAO,CAAC,EAAE;oBACV,MAAM,CAAC,CAAC,CAAC,CAAA;iBACV;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AA1MD,0CA0MC"}
@@ -2,6 +2,7 @@
2
2
  import { Response } from 'express';
3
3
  import { FileString } from '../../../plugins/file-system/file-system.service';
4
4
  import { ConfigService } from '../../../essential/config.service';
5
+ import { RedisManagerService } from '../../../orm/services/managers/redis-manager.service';
5
6
  export declare abstract class StorageService {
6
7
  abstract writeFile(args: {
7
8
  path: string;
@@ -30,10 +31,11 @@ export declare abstract class StorageService {
30
31
  }): Promise<FileString[]>;
31
32
  }
32
33
  export declare class StorageServiceManager {
34
+ private readonly redisManagerService;
33
35
  private readonly configService;
34
36
  private readonly logger;
35
37
  private status;
36
38
  private instance;
37
- constructor(configService: ConfigService);
39
+ constructor(redisManagerService: RedisManagerService, configService: ConfigService);
38
40
  getInstance(): Promise<StorageService>;
39
41
  }
@@ -7,7 +7,8 @@ class StorageService {
7
7
  }
8
8
  exports.StorageService = StorageService;
9
9
  class StorageServiceManager {
10
- constructor(configService) {
10
+ constructor(redisManagerService, configService) {
11
+ this.redisManagerService = redisManagerService;
11
12
  this.configService = configService;
12
13
  this.logger = new logger_1.Logger('StorageServiceManager');
13
14
  this.status = 'New';
@@ -21,13 +22,17 @@ class StorageServiceManager {
21
22
  const implementations = [
22
23
  {
23
24
  apply: () => true,
24
- build: () => new s3_client_service_1.S3ClientService(configS3, namespace),
25
+ build: async () => {
26
+ const s3 = new s3_client_service_1.S3ClientService(this.redisManagerService, configS3, namespace);
27
+ await s3.init();
28
+ return s3;
29
+ },
25
30
  name: 'S3ClientService',
26
31
  },
27
32
  ];
28
33
  const implementation = implementations.find(i => i.apply());
29
34
  this.logger.debug(`Storage iniciado usando a implementação: ${implementation.name}`);
30
- this.instance = implementation.build();
35
+ this.instance = await implementation.build();
31
36
  this.status = 'Ready';
32
37
  }
33
38
  return this.instance;
@@ -1 +1 @@
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;CAgBnC;AAhBD,wCAgBC;AAED,MAAa,qBAAqB;IAKhC,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAJxC,WAAM,GAAG,IAAI,eAAM,CAAC,uBAAuB,CAAC,CAAA;QACrD,WAAM,GAAgC,KAAK,CAAA;IAGU,CAAC;IAE9D,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,aAAa,CAAC,SAAS,EAAE,CAAA;YAEpE,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
+ {"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../../../src/core/services/storage/storage.service.ts"],"names":[],"mappings":";;;AACA,0EAAqE;AACrE,sCAAmC;AAInC,MAAsB,cAAc;CAgBnC;AAhBD,wCAgBC;AAED,MAAa,qBAAqB;IAKhC,YACmB,mBAAwC,EACxC,aAA4B;QAD5B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,kBAAa,GAAb,aAAa,CAAe;QAN9B,WAAM,GAAG,IAAI,eAAM,CAAC,uBAAuB,CAAC,CAAA;QACrD,WAAM,GAAgC,KAAK,CAAA;IAM/C,CAAC;IAEL,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,aAAa,CAAC,SAAS,EAAE,CAAA;YAEpE,MAAM,eAAe,GAAG;gBACtB;oBACE,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI;oBACjB,KAAK,EAAE,KAAK,IAAI,EAAE;wBAChB,MAAM,EAAE,GAAG,IAAI,mCAAe,CAAC,IAAI,CAAC,mBAAmB,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;wBAC7E,MAAM,EAAE,CAAC,IAAI,EAAE,CAAA;wBACf,OAAO,EAAE,CAAA;oBACX,CAAC;oBACD,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,MAAM,cAAc,CAAC,KAAK,EAAE,CAAC;YAC7C,IAAI,CAAC,MAAM,GAAG,OAAO,CAAA;SACtB;QACD,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;CACF;AArCD,sDAqCC"}