@puca/puca-core 11.8.11 → 11.8.12

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.
Files changed (172) hide show
  1. package/dist/core/services/auth.service.d.ts +1 -0
  2. package/dist/core/services/auth.service.js +7 -1
  3. package/dist/core/services/auth.service.js.map +1 -1
  4. package/dist/core/services/bootstrap-commands.js +107 -1
  5. package/dist/core/services/bootstrap-commands.js.map +1 -1
  6. package/dist/core/services/comunication/comunication-http.service.js +11 -2
  7. package/dist/core/services/comunication/comunication-http.service.js.map +1 -1
  8. package/dist/core/services/comunication/comunication.service.d.ts +1 -3
  9. package/dist/core/services/comunication/comunication.service.js +2 -3
  10. package/dist/core/services/comunication/comunication.service.js.map +1 -1
  11. package/dist/core/services/crud-base-testable.service.d.ts +10 -4
  12. package/dist/core/services/crud-base-testable.service.js +21 -12
  13. package/dist/core/services/crud-base-testable.service.js.map +1 -1
  14. package/dist/core/services/crud-base.controller.d.ts +4 -3
  15. package/dist/core/services/crud-base.controller.js +40 -15
  16. package/dist/core/services/crud-base.controller.js.map +1 -1
  17. package/dist/core/services/crud-base.service.d.ts +1 -1
  18. package/dist/core/services/crud-base.service.js +1 -1
  19. package/dist/core/services/crud-base.service.js.map +1 -1
  20. package/dist/core/services/crud-front-base.service.d.ts +34 -8
  21. package/dist/core/services/crud-front-base.service.js +66 -48
  22. package/dist/core/services/crud-front-base.service.js.map +1 -1
  23. package/dist/core/services/domain-life-cycle.service.d.ts +43 -0
  24. package/dist/core/services/domain-life-cycle.service.js +107 -0
  25. package/dist/core/services/domain-life-cycle.service.js.map +1 -0
  26. package/dist/core/services/email.service.d.ts +2 -1
  27. package/dist/core/services/email.service.js +44 -26
  28. package/dist/core/services/email.service.js.map +1 -1
  29. package/dist/core/services/eval.service.d.ts +2 -1
  30. package/dist/core/services/eval.service.js +17 -7
  31. package/dist/core/services/eval.service.js.map +1 -1
  32. package/dist/core/services/incremental-search.service.d.ts +4 -1
  33. package/dist/core/services/incremental-search.service.js +8 -2
  34. package/dist/core/services/incremental-search.service.js.map +1 -1
  35. package/dist/core/services/index.d.ts +33 -32
  36. package/dist/core/services/index.js +44 -37
  37. package/dist/core/services/index.js.map +1 -1
  38. package/dist/core/services/install.service.d.ts +7 -9
  39. package/dist/core/services/install.service.js +13 -14
  40. package/dist/core/services/install.service.js.map +1 -1
  41. package/dist/core/services/job/job.client.d.ts +1 -0
  42. package/dist/core/services/job/job.client.js +8 -2
  43. package/dist/core/services/job/job.client.js.map +1 -1
  44. package/dist/core/services/job/job.service.d.ts +1 -0
  45. package/dist/core/services/job/job.service.js +3 -0
  46. package/dist/core/services/job/job.service.js.map +1 -1
  47. package/dist/core/services/job-executor/job-executor.service.d.ts +10 -7
  48. package/dist/core/services/job-executor/job-executor.service.js +66 -33
  49. package/dist/core/services/job-executor/job-executor.service.js.map +1 -1
  50. package/dist/core/services/link-builder.d.ts +3 -3
  51. package/dist/core/services/link-builder.js +5 -4
  52. package/dist/core/services/link-builder.js.map +1 -1
  53. package/dist/core/services/migration/migration.service.d.ts +7 -7
  54. package/dist/core/services/migration/migration.service.js +16 -16
  55. package/dist/core/services/migration/migration.service.js.map +1 -1
  56. package/dist/core/services/module-especification.service.d.ts +3 -3
  57. package/dist/core/services/module-especification.service.js +6 -6
  58. package/dist/core/services/module-especification.service.js.map +1 -1
  59. package/dist/core/services/monitor.js +1 -1
  60. package/dist/core/services/monitor.js.map +1 -1
  61. package/dist/core/services/mq/mq.service.d.ts +4 -1
  62. package/dist/core/services/mq/mq.service.js +32 -9
  63. package/dist/core/services/mq/mq.service.js.map +1 -1
  64. package/dist/core/services/plugin.service.d.ts +7 -1
  65. package/dist/core/services/plugin.service.js +11 -10
  66. package/dist/core/services/plugin.service.js.map +1 -1
  67. package/dist/core/services/report.service.d.ts +3 -1
  68. package/dist/core/services/report.service.js +5 -5
  69. package/dist/core/services/report.service.js.map +1 -1
  70. package/dist/core/services/server-life-cycle.service.d.ts +23 -0
  71. package/dist/core/services/server-life-cycle.service.js +81 -0
  72. package/dist/core/services/server-life-cycle.service.js.map +1 -0
  73. package/dist/core/services/storage/implementation/s3-client.service.d.ts +3 -5
  74. package/dist/core/services/storage/implementation/s3-client.service.js +4 -7
  75. package/dist/core/services/storage/implementation/s3-client.service.js.map +1 -1
  76. package/dist/core/services/storage/storage.service.d.ts +10 -10
  77. package/dist/core/services/storage/storage.service.js +5 -9
  78. package/dist/core/services/storage/storage.service.js.map +1 -1
  79. package/dist/core/services/system-parameters-envs.service.d.ts +1 -0
  80. package/dist/core/services/system-parameters-envs.service.js +4 -1
  81. package/dist/core/services/system-parameters-envs.service.js.map +1 -1
  82. package/dist/core/services/table-permission.service.d.ts +1 -3
  83. package/dist/core/services/table-permission.service.js +1 -2
  84. package/dist/core/services/table-permission.service.js.map +1 -1
  85. package/dist/core/services/user.service.js.map +1 -1
  86. package/dist/core/services/web-socket.service.d.ts +6 -9
  87. package/dist/core/services/web-socket.service.js +26 -20
  88. package/dist/core/services/web-socket.service.js.map +1 -1
  89. package/dist/essential/config.service.d.ts +3 -0
  90. package/dist/essential/config.service.js +20 -5
  91. package/dist/essential/config.service.js.map +1 -1
  92. package/dist/essential/envs-config.service.d.ts +1 -0
  93. package/dist/essential/envs-config.service.js +9 -6
  94. package/dist/essential/envs-config.service.js.map +1 -1
  95. package/dist/essential/index.d.ts +3 -4
  96. package/dist/essential/index.js +5 -6
  97. package/dist/essential/index.js.map +1 -1
  98. package/dist/essential/module-config.service.d.ts +3 -3
  99. package/dist/essential/module-config.service.js +4 -4
  100. package/dist/essential/module-config.service.js.map +1 -1
  101. package/dist/functions/index.d.ts +2 -1
  102. package/dist/functions/index.js +2 -1
  103. package/dist/functions/index.js.map +1 -1
  104. package/dist/models/crud-controller-especification-environment.d.ts +9 -0
  105. package/dist/models/crud-controller-especification-environment.js.map +1 -1
  106. package/dist/models/secret.d.ts +1 -0
  107. package/dist/orm/cases/bo/ddl.service.js.map +1 -1
  108. package/dist/orm/cases/bo/sql.service.js +19 -19
  109. package/dist/orm/cases/bo/sql.service.js.map +1 -1
  110. package/dist/orm/services/cache-repository/cache-repository-redis.d.ts +3 -3
  111. package/dist/orm/services/cache-repository/cache-repository-redis.js +8 -4
  112. package/dist/orm/services/cache-repository/cache-repository-redis.js.map +1 -1
  113. package/dist/orm/services/cache-repository/cache-repository.d.ts +3 -3
  114. package/dist/orm/services/cache-repository/cache-repository.js +3 -3
  115. package/dist/orm/services/cache-repository/cache-repository.js.map +1 -1
  116. package/dist/orm/services/cache.service.d.ts +5 -5
  117. package/dist/orm/services/cache.service.js +13 -16
  118. package/dist/orm/services/cache.service.js.map +1 -1
  119. package/dist/orm/services/index.d.ts +8 -7
  120. package/dist/orm/services/index.js +11 -8
  121. package/dist/orm/services/index.js.map +1 -1
  122. package/dist/orm/services/managers/database-manager.service.d.ts +4 -2
  123. package/dist/orm/services/managers/database-manager.service.js +30 -9
  124. package/dist/orm/services/managers/database-manager.service.js.map +1 -1
  125. package/dist/orm/services/managers/puca-orm-client.service.d.ts +1 -0
  126. package/dist/orm/services/managers/puca-orm-client.service.js +3 -0
  127. package/dist/orm/services/managers/puca-orm-client.service.js.map +1 -1
  128. package/dist/orm/services/repository-factory.d.ts +3 -3
  129. package/dist/orm/services/repository-factory.js +4 -4
  130. package/dist/orm/services/repository-factory.js.map +1 -1
  131. package/dist/orm/services/repository.d.ts +3 -3
  132. package/dist/orm/services/repository.js +5 -5
  133. package/dist/orm/services/repository.js.map +1 -1
  134. package/dist/orm/services/secundary-database/secundary-database.service.d.ts +25 -0
  135. package/dist/orm/services/secundary-database/secundary-database.service.js +78 -0
  136. package/dist/orm/services/secundary-database/secundary-database.service.js.map +1 -0
  137. package/dist/orm/services/transaction.d.ts +4 -6
  138. package/dist/orm/services/transaction.js +24 -13
  139. package/dist/orm/services/transaction.js.map +1 -1
  140. package/dist/plugins/file-system/file-system.service.d.ts +6 -3
  141. package/dist/plugins/file-system/file-system.service.js +12 -5
  142. package/dist/plugins/file-system/file-system.service.js.map +1 -1
  143. package/dist/plugins/file-system/shared-file-system.service.d.ts +25 -0
  144. package/dist/plugins/file-system/shared-file-system.service.js +121 -0
  145. package/dist/plugins/file-system/shared-file-system.service.js.map +1 -0
  146. package/dist/plugins/index.d.ts +4 -1
  147. package/dist/plugins/index.js +5 -2
  148. package/dist/plugins/index.js.map +1 -1
  149. package/dist/plugins/multi-tenant/multi-tentant.adapter.d.ts +15 -0
  150. package/dist/plugins/multi-tenant/multi-tentant.adapter.js +68 -0
  151. package/dist/plugins/multi-tenant/multi-tentant.adapter.js.map +1 -0
  152. package/dist/plugins/multi-tenant/puca-hub.service.d.ts +54 -0
  153. package/dist/plugins/multi-tenant/puca-hub.service.js +211 -0
  154. package/dist/plugins/multi-tenant/puca-hub.service.js.map +1 -0
  155. package/dist/plugins/nestjs/puca-auth.decorators.js +1 -1
  156. package/dist/plugins/nestjs/puca-auth.decorators.js.map +1 -1
  157. package/dist/plugins/nestjs/puca-auth.guard.js +4 -1
  158. package/dist/plugins/nestjs/puca-auth.guard.js.map +1 -1
  159. package/dist/tsconfig.tsbuildinfo +1 -1
  160. package/package.json +1 -1
  161. package/dist/core/services/life-cycle.service.d.ts +0 -67
  162. package/dist/core/services/life-cycle.service.js +0 -194
  163. package/dist/core/services/life-cycle.service.js.map +0 -1
  164. package/dist/core/services/single-instance-ensure.service.d.ts +0 -8
  165. package/dist/core/services/single-instance-ensure.service.js +0 -23
  166. package/dist/core/services/single-instance-ensure.service.js.map +0 -1
  167. package/dist/essential/audit.service.d.ts +0 -22
  168. package/dist/essential/audit.service.js +0 -52
  169. package/dist/essential/audit.service.js.map +0 -1
  170. package/dist/orm/services/managers/redis-manager.service.d.ts +0 -6
  171. package/dist/orm/services/managers/redis-manager.service.js +0 -16
  172. package/dist/orm/services/managers/redis-manager.service.js.map +0 -1
@@ -5,6 +5,7 @@ export interface ConsumeOptions extends Options.Consume {
5
5
  maxSimultaneousMessages?: number;
6
6
  }
7
7
  export declare class MqService {
8
+ private readonly domain;
8
9
  private readonly configService;
9
10
  private closing;
10
11
  private static readonly DEAD_LETTER_QUEUE;
@@ -13,7 +14,8 @@ export declare class MqService {
13
14
  private mainChannel;
14
15
  private readonly queues;
15
16
  private connection;
16
- constructor(configService: ConfigService);
17
+ private additionalChannels;
18
+ constructor(domain: string, configService: ConfigService);
17
19
  private connect;
18
20
  init(): Promise<void>;
19
21
  shutdown(): Promise<void>;
@@ -25,4 +27,5 @@ export declare class MqService {
25
27
  publish(exchange: string, routingKey: string, content: any, options?: Options.Publish): Promise<boolean>;
26
28
  sendToQueue(queue: string, content: any, options?: Options.Publish): Promise<boolean>;
27
29
  consume<T>(queue: string, onMessage: (msg: T) => Promise<void>, options?: ConsumeOptions): Promise<void>;
30
+ ensure<T>(funcImpl: (args: T) => Promise<void>, args?: T): Promise<void>;
28
31
  }
@@ -4,18 +4,16 @@ exports.MqService = void 0;
4
4
  const amqplib_1 = require("amqplib");
5
5
  const logger_1 = require("../logger");
6
6
  class MqService {
7
- constructor(configService) {
7
+ constructor(domain, configService) {
8
+ this.domain = domain;
8
9
  this.configService = configService;
9
10
  this.closing = false;
10
11
  this.logger = new logger_1.Logger('MqService');
11
12
  this.queues = {};
13
+ this.additionalChannels = [];
12
14
  }
13
15
  async connect(t = 0) {
14
16
  const { rabbitMq } = await this.configService.getSecret();
15
- if (!rabbitMq) {
16
- this.logger.warn('rabbitMq not defined');
17
- return;
18
- }
19
17
  if (!(rabbitMq === null || rabbitMq === void 0 ? void 0 : rabbitMq.hostname)) {
20
18
  throw new Error('rabbitMq.hostname not defined');
21
19
  }
@@ -26,7 +24,7 @@ class MqService {
26
24
  port,
27
25
  username,
28
26
  password,
29
- vhost: vhost || '/',
27
+ vhost: vhost || this.domain
30
28
  });
31
29
  }
32
30
  catch (error) {
@@ -34,8 +32,7 @@ class MqService {
34
32
  if (t < 20) {
35
33
  return await new Promise((resolve) => setTimeout(() => resolve(this.connect(t + 1)), 1000));
36
34
  }
37
- process.exit(1);
38
- return;
35
+ throw new Error('Failed to connect to RabbitMQ');
39
36
  }
40
37
  this.logger.log('Connected to RabbitMQ');
41
38
  this.connection.on('close', async () => {
@@ -43,7 +40,7 @@ class MqService {
43
40
  return;
44
41
  }
45
42
  this.logger.warn('Connection to RabbitMQ closed, reconnecting...');
46
- process.exit(1);
43
+ throw new Error('Connection to RabbitMQ closed');
47
44
  });
48
45
  this.connection.on('error', (error) => {
49
46
  this.logger.error('Connection to RabbitMQ error', error);
@@ -66,10 +63,15 @@ class MqService {
66
63
  }
67
64
  async shutdown() {
68
65
  this.closing = true;
66
+ this.connection.removeAllListeners('close');
67
+ this.connection.removeAllListeners('error');
69
68
  await this.mainChannel.close();
70
69
  for (const { channel } of Object.values(this.queues)) {
71
70
  await channel.close();
72
71
  }
72
+ for (const channel of this.additionalChannels) {
73
+ await channel.close();
74
+ }
73
75
  await this.connection.close();
74
76
  }
75
77
  async reconnectConsumers() {
@@ -109,6 +111,7 @@ class MqService {
109
111
  const channel = ((options === null || options === void 0 ? void 0 : options.maxSimultaneousMessages) ? await this.connection.createChannel() : this.mainChannel);
110
112
  if (options === null || options === void 0 ? void 0 : options.maxSimultaneousMessages) {
111
113
  await channel.prefetch(options.maxSimultaneousMessages);
114
+ this.additionalChannels.push(channel);
112
115
  }
113
116
  this.queues[queue] = {
114
117
  channel,
@@ -155,6 +158,26 @@ class MqService {
155
158
  }
156
159
  }, options);
157
160
  }
161
+ async ensure(funcImpl, args = null) {
162
+ const mainChannel = this.mainChannel;
163
+ const { queue } = await mainChannel.assertQueue('', {
164
+ exclusive: true,
165
+ autoDelete: true,
166
+ });
167
+ mainChannel.consume(queue, async (msg) => {
168
+ const args = JSON.parse(msg.content.toString());
169
+ try {
170
+ await funcImpl(args);
171
+ mainChannel.ack(msg);
172
+ }
173
+ catch (error) {
174
+ this.logger.error('Failed to ensure', error);
175
+ await new Promise((resolve) => setTimeout(resolve, 1000));
176
+ mainChannel.nack(msg);
177
+ }
178
+ });
179
+ await mainChannel.sendToQueue(queue, Buffer.from(JSON.stringify(args)));
180
+ }
158
181
  }
159
182
  exports.MqService = MqService;
160
183
  MqService.DEAD_LETTER_QUEUE = 'general-dead-letter-queue';
@@ -1 +1 @@
1
- {"version":3,"file":"mq.service.js","sourceRoot":"","sources":["../../../../src/core/services/mq/mq.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mq.service.js","sourceRoot":"","sources":["../../../../src/core/services/mq/mq.service.ts"],"names":[],"mappings":";;;AAAA,qCAA+D;AAE/D,sCAAmC;AASnC,MAAa,SAAS;IAiBpB,YACmB,MAAc,EACd,aAA4B;QAD5B,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAlBvC,YAAO,GAAG,KAAK,CAAA;QAGN,WAAM,GAAG,IAAI,eAAM,CAAC,WAAW,CAAC,CAAA;QAEhC,WAAM,GAOnB,EAAE,CAAA;QAEE,uBAAkB,GAAc,EAAE,CAAA;IAKtC,CAAC;IAEG,KAAK,CAAC,OAAO,CAAC,IAAY,CAAC;QACjC,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA;QACzD,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,CAAA,EAAE;YAEvB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;SACjD;QAED,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAA;QAE9D,IAAI;YACF,IAAI,CAAC,UAAU,GAAG,MAAM,iBAAO,CAAC;gBAC9B,QAAQ;gBACR,IAAI;gBACJ,QAAQ;gBACR,QAAQ;gBACR,KAAK,EAAE,KAAK,IAAI,IAAI,CAAC,MAAM;aAC5B,CAAC,CAAA;SACH;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAA;YAGzD,IAAI,CAAC,GAAG,EAAE,EAAE;gBACV,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;aAC5F;YACD,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;SACjD;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;QAExC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YACrC,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,OAAM;aACP;YACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAA;YAGlE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;QAClD,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAA;QAC1D,CAAC,CAAC,CAAA;QAEF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAA;QAEzD,MAAM,WAAW,CAAC,WAAW,CAC3B,SAAS,CAAC,iBAAiB,EAC3B;YACE,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QACL,MAAM,WAAW,CAAC,cAAc,CAC9B,SAAS,CAAC,cAAc,EACxB,mBAAmB,EACnB;YACE,OAAO,EAAE,IAAI;YACb,SAAS,EAAE;gBACT,gBAAgB,EAAE,QAAQ;aAC3B;SACF,CAAC,CAAC;QAEL,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAE9B,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QAEnB,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAE5C,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAA;QAC9B,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACpD,MAAM,OAAO,CAAC,KAAK,EAAE,CAAA;SACtB;QAED,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,kBAAkB,EAAE;YAC7C,MAAM,OAAO,CAAC,KAAK,EAAE,CAAA;SACtB;QAED,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAA;IAC/B,CAAC;IAEO,KAAK,CAAC,kBAAkB;IAahC,CAAC;IAEO,iBAAiB,CAAC,KAAa,EAAE,UAAkB;QACzD,MAAM,IAAI,GAAG,CAAC,CAAC;QACf,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC;QACrD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAa,EAAE,OAA6B;QAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;QAEpC,MAAM,YAAY,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,KAAK,kBACtD,OAAO,EAAE,IAAI,IACV,OAAO,EACV,CAAA;QAEF,MAAM,WAAW,CAAC,SAAS,CACzB,KAAK,EACL,SAAS,CAAC,cAAc,EACxB,KAAK,CACN,CAAC;QACF,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,QAAgB,EAAE,OAAe,QAAQ,EAAE,OAAgC;QAC9F,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;QAEpC,OAAO,MAAM,WAAW,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,kBACpD,OAAO,EAAE,IAAI,IACV,OAAO,EACV,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAa,EAAE,QAAgB,EAAE,OAAe,EAAE,IAAU;QAC1E,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;QACpC,OAAO,MAAM,WAAW,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;IACpE,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,QAAgB,EAAE,UAAkB,EAAE,OAAY,EAAE,OAAyB;QACzF,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;YAC3C,OAAM;SACP;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;QACpC,OAAO,MAAM,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;IACvG,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAa,EAAE,OAAY,EAAE,OAAyB;QACtE,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;QACpC,OAAO,MAAM,WAAW,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;IAC5F,CAAC;IAED,KAAK,CAAC,OAAO,CACX,KAAa,EACb,SAAoC,EACpC,OAAwB;QAExB,MAAM,OAAO,GAAG,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,uBAAuB,EAAC,CAAC,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAE7G,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,uBAAuB,EAAE;YACpC,MAAM,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAA;YACvD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SACtC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG;YACnB,OAAO;YACP,KAAK;YACL,SAAS;YACT,OAAO;SACR,CAAA;QAED,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACzC,IAAI,GAAG,EAAE;gBACP,IAAI;oBACF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAM,CAAA;oBACpD,MAAM,SAAS,CAAC,IAAI,CAAC,CAAA;oBACrB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;iBACjB;gBAAC,OAAO,KAAK,EAAE;oBACd,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;oBAC9D,MAAM,aAAa,GAAG,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;oBACtE,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CACtC,IAAI,CAAC,GAAG,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,KAAI,IAAI,CAAC,EAC3C,UAAU,CACX,CAAC;oBACF,MAAM,QAAQ,GAAG,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;oBAEhF,IAAI,UAAU,GAAG,aAAa,EAAE;wBAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+CAA+C,UAAU,GAAG,CAAC,IAAI,aAAa,yCAAyC,SAAS,KAAK,CAAC,CAAC;wBACxJ,MAAM,OAAO,GAAG;4BACd,SAAS,EAAE,SAAS;4BACpB,aAAa,EAAE,UAAU,GAAG,CAAC;4BAC7B,iBAAiB,EAAE,aAAa;4BAChC,WAAW,EAAE,QAAQ;yBACtB,CAAC;wBACF,OAAO,CAAC,OAAO,CACb,SAAS,CAAC,cAAc,EACxB,KAAK,EACL,GAAG,CAAC,OAAO,EACX,EAAE,OAAO,EAAE,CACZ,CAAC;wBACF,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;qBAClB;yBAAM,IAAI,UAAU,IAAI,aAAa,EAAE;wBACtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,aAAa,sCAAsC,CAAC,CAAC;wBAC9F,MAAM,WAAW,GAAG;4BAClB,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE;4BAC/B,UAAU,EAAE,KAAK;4BACjB,WAAW,EAAE,UAAU;4BACvB,eAAe,EAAE,aAAa;4BAC9B,SAAS,EAAE,QAAQ;yBACpB,CAAA;wBACD,OAAO,CAAC,WAAW,CACjB,SAAS,CAAC,iBAAiB,EAC3B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CACzC,CAAC;wBACF,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;qBAClB;iBACF;aACF;QACH,CAAC,EAAE,OAAO,CAAC,CAAA;IACb,CAAC;IAED,KAAK,CAAC,MAAM,CACV,QAAoC,EACpC,OAAU,IAAI;QAEd,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;QAEpC,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,EAAE,EAAE;YAClD,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,IAAI;SACjB,CAAC,CAAA;QAEF,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACvC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAM,CAAA;YACpD,IAAI;gBACF,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAA;gBACpB,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;aACrB;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAA;gBAC5C,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAA;gBACzD,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;aACtB;QACH,CAAC,CAAC,CAAA;QAEF,MAAM,WAAW,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACzE,CAAC;;AA5QH,8BA6QC;AA3QyB,2BAAiB,GAAG,2BAA2B,CAAA;AAC/C,wBAAc,GAAG,wBAAwB,CAAA"}
@@ -1,8 +1,11 @@
1
1
  import { Method } from 'axios';
2
2
  import { User } from '../../models/user';
3
3
  import { ConfigService } from '../../essential/config.service';
4
+ import { CacheServiceFactory } from '../../orm/services/cache.service';
4
5
  import { ComunicationService } from './comunication/comunication.service';
5
6
  import { EnvConfigService } from '../../essential/envs-config.service';
7
+ import { LinkBuilder } from './link-builder';
8
+ import { RepositoryFactory } from '../../orm/services/repository-factory';
6
9
  export interface Plugin {
7
10
  name?: string;
8
11
  label?: string;
@@ -19,9 +22,12 @@ export declare class PluginService {
19
22
  private readonly configService;
20
23
  private readonly comunicationService;
21
24
  private readonly envConfigService;
25
+ private readonly linkBuilder;
26
+ private readonly cacheServiceFactory;
27
+ private readonly repositoryFactory;
22
28
  private readonly logger;
23
29
  private cachePluginList;
24
- constructor(configService: ConfigService, comunicationService: ComunicationService, envConfigService: EnvConfigService);
30
+ constructor(configService: ConfigService, comunicationService: ComunicationService, envConfigService: EnvConfigService, linkBuilder: LinkBuilder, cacheServiceFactory: CacheServiceFactory, repositoryFactory: RepositoryFactory);
25
31
  init(): Promise<void>;
26
32
  clearCache(): Promise<void>;
27
33
  private getPluginLogRepository;
@@ -3,18 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.PluginService = void 0;
4
4
  const _ = require("lodash");
5
5
  const axios_1 = require("axios");
6
- const services_1 = require("../../orm/services");
7
6
  const logger_1 = require("./logger");
8
- const _1 = require(".");
9
7
  class PluginService {
10
- constructor(configService, comunicationService, envConfigService) {
8
+ constructor(configService, comunicationService, envConfigService, linkBuilder, cacheServiceFactory, repositoryFactory) {
11
9
  this.configService = configService;
12
10
  this.comunicationService = comunicationService;
13
11
  this.envConfigService = envConfigService;
12
+ this.linkBuilder = linkBuilder;
13
+ this.cacheServiceFactory = cacheServiceFactory;
14
+ this.repositoryFactory = repositoryFactory;
14
15
  this.logger = new logger_1.Logger('PluginService');
15
16
  }
16
17
  async init() {
17
- this.cachePluginList = services_1.cacheServiceFactory.get('pluginList', async () => {
18
+ this.cachePluginList = this.cacheServiceFactory.get('pluginList', async () => {
18
19
  return await this.getPluginsWithoutCache({
19
20
  computeStatus: true
20
21
  });
@@ -24,13 +25,13 @@ class PluginService {
24
25
  await this.cachePluginList.invalidate();
25
26
  }
26
27
  getPluginLogRepository(args = {}) {
27
- return services_1.repositoryFactory.getInstance({
28
+ return this.repositoryFactory.getInstance({
28
29
  tableName: 'puca_base_api_plugin_log',
29
30
  transaction: args.transaction
30
31
  });
31
32
  }
32
33
  getPluginRepository(args = {}) {
33
- return services_1.repositoryFactory.getInstance({
34
+ return this.repositoryFactory.getInstance({
34
35
  tableName: 'puca_base_api_plugin',
35
36
  transaction: args.transaction
36
37
  });
@@ -50,7 +51,7 @@ class PluginService {
50
51
  key: serverPlugin.key,
51
52
  }
52
53
  };
53
- const domain = await this.envConfigService.getEnvByName('MAIN_DOMAIN', 'localhost:3999');
54
+ const { namespace: domain } = await this.configService.getSecret();
54
55
  const { data: dataPlugins } = await axios_1.default.get(`${serverPlugin.host}/plugins/` + domain, config);
55
56
  const filterPluginWithoutMultipleInstance = _.cloneDeep(dataPlugins.filter(plugin => !plugin.multiple_instances));
56
57
  const filterPluginWithMultipleInstance = dataPlugins.filter(plugin => plugin.multiple_instances);
@@ -88,12 +89,12 @@ class PluginService {
88
89
  key: serverPlugin.key,
89
90
  }
90
91
  };
91
- const domain = await this.envConfigService.getEnvByName('MAIN_DOMAIN', 'localhost:3999');
92
+ const { namespace: domain } = await this.configService.getSecret();
92
93
  const response = await axios_1.default.post(`${serverPlugin.host}/generate-token`, Object.assign(Object.assign({}, dataBody), { domain }), config);
93
94
  return response.data.token;
94
95
  }
95
96
  async getPlugins() {
96
- const environment = await this.envConfigService.getEnvByName('ENVIRONMENT', 'DEVELOPMENT');
97
+ const environment = process.env.ENVIRONMENT.toUpperCase();
97
98
  if (environment === 'DEVELOPMENT') {
98
99
  return await this.getPluginsWithoutCache({ computeStatus: true });
99
100
  }
@@ -164,7 +165,7 @@ class PluginService {
164
165
  this.logger.verbose(args);
165
166
  const url = args.plugin.url.startsWith('http')
166
167
  ? args.plugin.url
167
- : await _1.linkBuilder.build(args.plugin.url);
168
+ : await this.linkBuilder.build(args.plugin.url);
168
169
  const options = {
169
170
  headers: Object.assign({ 'Content-Type': 'application/json', 'server-authorization': args.plugin.secret, 'authorization': await this.computeToken(args.user) }, args.headers),
170
171
  method: args.method || 'POST',
@@ -1 +1 @@
1
- {"version":3,"file":"plugin.service.js","sourceRoot":"","sources":["../../../src/core/services/plugin.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugin.service.js","sourceRoot":"","sources":["../../../src/core/services/plugin.service.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,7 @@ import { StorageServiceManager } from "./storage/storage.service";
5
5
  import { ConfigService } from "../../essential/config.service";
6
6
  import { JobExecutorFactory } from "./job-executor/job-executor.service";
7
7
  import { RepositoryFactory } from '../../orm/services/repository-factory';
8
+ import { LinkBuilder } from './link-builder';
8
9
  import { UserConfigService } from './user-config.service';
9
10
  export interface ReportConfig {
10
11
  puca_pid?: string;
@@ -57,10 +58,11 @@ export declare class ReportService {
57
58
  private readonly configService;
58
59
  private readonly jobExecutorFactory;
59
60
  private readonly userConfigService;
61
+ private readonly linkBuilder;
60
62
  private readonly logger;
61
63
  private readonly folderCache;
62
64
  private jobReportExecutor;
63
- constructor(uuidService: UuidService, notificationService: NotificationService, repositoryFactory: RepositoryFactory, storageServiceManager: StorageServiceManager, configService: ConfigService, jobExecutorFactory: JobExecutorFactory, userConfigService: UserConfigService);
65
+ constructor(uuidService: UuidService, notificationService: NotificationService, repositoryFactory: RepositoryFactory, storageServiceManager: StorageServiceManager, configService: ConfigService, jobExecutorFactory: JobExecutorFactory, userConfigService: UserConfigService, linkBuilder: LinkBuilder);
64
66
  prepare({ activateReportJobProcessator }: {
65
67
  activateReportJobProcessator: Boolean;
66
68
  }): Promise<void>;
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ReportService = exports.ReportMode = void 0;
4
4
  const axios_1 = require("axios");
5
5
  const _ = require("lodash");
6
- const _1 = require(".");
7
6
  const logger_1 = require("./logger");
8
7
  var ReportMode;
9
8
  (function (ReportMode) {
@@ -58,7 +57,7 @@ class FolderCache {
58
57
  const response = await get(`${url}?${select}`, {
59
58
  headers: await this.getDefaultHeaders()
60
59
  });
61
- const namespace = secret.namespace;
60
+ const namespace = secret.legacyNamespace || secret.namespace;
62
61
  this.logger.verbose(() => response.data, namespace);
63
62
  const cache = response.data.value.map(f => {
64
63
  try {
@@ -117,7 +116,7 @@ class FolderCache {
117
116
  }
118
117
  }
119
118
  class ReportService {
120
- constructor(uuidService, notificationService, repositoryFactory, storageServiceManager, configService, jobExecutorFactory, userConfigService) {
119
+ constructor(uuidService, notificationService, repositoryFactory, storageServiceManager, configService, jobExecutorFactory, userConfigService, linkBuilder) {
121
120
  this.uuidService = uuidService;
122
121
  this.notificationService = notificationService;
123
122
  this.repositoryFactory = repositoryFactory;
@@ -125,6 +124,7 @@ class ReportService {
125
124
  this.configService = configService;
126
125
  this.jobExecutorFactory = jobExecutorFactory;
127
126
  this.userConfigService = userConfigService;
127
+ this.linkBuilder = linkBuilder;
128
128
  this.logger = new logger_1.Logger('ReportService');
129
129
  this.folderCache = new FolderCache(configService, this.getDefaultHeaders.bind(this));
130
130
  }
@@ -192,7 +192,7 @@ class ReportService {
192
192
  shortid: args.shortid,
193
193
  },
194
194
  data: Object.assign({ headers: {
195
- host: await _1.linkBuilder.build(),
195
+ host: await this.linkBuilder.build(),
196
196
  token: user.token
197
197
  } }, data),
198
198
  },
@@ -229,7 +229,7 @@ class ReportService {
229
229
  ]
230
230
  },
231
231
  data: Object.assign({ _headers: {
232
- host: await _1.linkBuilder.build(),
232
+ host: await this.linkBuilder.build(),
233
233
  token: user.token
234
234
  } }, data)
235
235
  },
@@ -1 +1 @@
1
- {"version":3,"file":"report.service.js","sourceRoot":"","sources":["../../../src/core/services/report.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"report.service.js","sourceRoot":"","sources":["../../../src/core/services/report.service.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,23 @@
1
+ import { INestApplication } from '@nestjs/common';
2
+ import { PucaHubService } from '../../plugins/multi-tenant/puca-hub.service';
3
+ export interface StartArgs {
4
+ appModule: any;
5
+ execBootStrap?: boolean;
6
+ bodyParser?: boolean;
7
+ startOneSignal?: boolean;
8
+ activateReportJobProcessator?: boolean;
9
+ }
10
+ export interface ShutdownArgs {
11
+ exit?: () => any;
12
+ }
13
+ export declare class ServerLifeCycleService {
14
+ private readonly pucaHubService;
15
+ private readonly logger;
16
+ private _isReady;
17
+ private app;
18
+ private readonly intervals;
19
+ constructor(pucaHubService: PucaHubService);
20
+ shutdown(opt?: ShutdownArgs): Promise<void>;
21
+ start(args: StartArgs): Promise<INestApplication>;
22
+ isReady(): boolean;
23
+ }
@@ -0,0 +1,81 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ServerLifeCycleService = void 0;
4
+ const core_1 = require("@nestjs/core");
5
+ const logger_1 = require("./logger");
6
+ const query_params_middleware_1 = require("../../plugins/nestjs/query-params.middleware");
7
+ const puca_hub_service_1 = require("../../plugins/multi-tenant/puca-hub.service");
8
+ const web_socket_service_1 = require("./web-socket.service");
9
+ class ServerLifeCycleService {
10
+ constructor(pucaHubService) {
11
+ this.pucaHubService = pucaHubService;
12
+ this.logger = new logger_1.Logger('LifeCycleService');
13
+ this._isReady = false;
14
+ this.intervals = [];
15
+ }
16
+ async shutdown(opt) {
17
+ this.logger.warn('Finalizando o servidor');
18
+ const serviceTasks = [];
19
+ const essencialTasks = [];
20
+ essencialTasks.push(web_socket_service_1.WebSocketService.disconnectServer);
21
+ try {
22
+ if (this.app) {
23
+ await this.app.close();
24
+ }
25
+ await Promise.all(serviceTasks);
26
+ await Promise.all(essencialTasks);
27
+ await puca_hub_service_1.pucaHubService.tearDownAll();
28
+ const exit = (opt === null || opt === void 0 ? void 0 : opt.exit) || process.exit;
29
+ exit(0);
30
+ }
31
+ catch (e) {
32
+ this.logger.error(e);
33
+ }
34
+ }
35
+ async start(args) {
36
+ const environment = (process.env.ENVIRONMENT || 'DEVELOPMENT').toUpperCase();
37
+ logger_1.Logger.setStackCondition((process.env.LOG_STACK_CONDITION || ''));
38
+ const logLevel = (process.env.LOG_LEVEL || '');
39
+ logLevel
40
+ .split(',')
41
+ .filter(l => l)
42
+ .forEach(logger_1.Logger.addLogLevel);
43
+ const logClass = (process.env.LOG_CLASS || '');
44
+ logClass
45
+ .split(',')
46
+ .filter(l => l)
47
+ .forEach(logger_1.Logger.addLogClass);
48
+ if (environment !== 'PRODUCTION') {
49
+ this.logger.warn('Environment is not production (1)');
50
+ }
51
+ const nodeEnv = process.env.NODE_ENV || 'development';
52
+ if (nodeEnv !== 'production') {
53
+ this.logger.warn('Node env is not production (2)');
54
+ }
55
+ this.pucaHubService.setContext('application');
56
+ this.app = await core_1.NestFactory.create(args.appModule, {
57
+ bodyParser: args.bodyParser === undefined ? true : args.bodyParser,
58
+ cors: environment !== 'PRODUCTION',
59
+ });
60
+ this.app.use(new query_params_middleware_1.QueryParamsMiddleware().use);
61
+ const server = this.app.getHttpServer();
62
+ await this.pucaHubService.setUpAll();
63
+ await web_socket_service_1.WebSocketService.initServer(server);
64
+ if (!process.env.PORT) {
65
+ throw new Error('PORT is not defined');
66
+ }
67
+ await this.app.listen(process.env.PORT);
68
+ try {
69
+ this.app.enableShutdownHooks();
70
+ }
71
+ finally {
72
+ this._isReady = true;
73
+ }
74
+ return this.app;
75
+ }
76
+ isReady() {
77
+ return this._isReady;
78
+ }
79
+ }
80
+ exports.ServerLifeCycleService = ServerLifeCycleService;
81
+ //# sourceMappingURL=server-life-cycle.service.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"server-life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/server-life-cycle.service.ts"],"names":[],"mappings":"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"}
@@ -2,7 +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
+ import { SecondaryDatabase } from '../../../../orm/services/secundary-database/secundary-database.service';
6
6
  export interface S3Config {
7
7
  region: string;
8
8
  accessKeyId: string;
@@ -10,13 +10,11 @@ export interface S3Config {
10
10
  bucket: string;
11
11
  }
12
12
  export declare class S3ClientService implements StorageService {
13
- private readonly redisManagerService;
13
+ private readonly secondaryDataBase;
14
14
  private readonly s3Config;
15
15
  private readonly namespace;
16
16
  private readonly s3Client;
17
- private redisInstance;
18
- constructor(redisManagerService: RedisManagerService, s3Config: S3Config, namespace: string);
19
- init(): Promise<void>;
17
+ constructor(secondaryDataBase: SecondaryDatabase, s3Config: S3Config, namespace: string);
20
18
  writeFile({ path, buffer, cacheControl, publicLink }: {
21
19
  path: string;
22
20
  buffer: Buffer;
@@ -3,15 +3,12 @@ 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(redisManagerService, s3Config, namespace) {
7
- this.redisManagerService = redisManagerService;
6
+ constructor(secondaryDataBase, s3Config, namespace) {
7
+ this.secondaryDataBase = secondaryDataBase;
8
8
  this.s3Config = s3Config;
9
9
  this.namespace = namespace;
10
10
  this.s3Client = new aws_sdk_1.S3(s3Config);
11
11
  }
12
- async init() {
13
- this.redisInstance = await this.redisManagerService.get();
14
- }
15
12
  async writeFile({ path, buffer, cacheControl, publicLink = false }) {
16
13
  const uploadParams = {
17
14
  Bucket: this.s3Config.bucket,
@@ -51,7 +48,7 @@ class S3ClientService {
51
48
  async getDownloadLink({ path, expires = 600, publicLink = false }) {
52
49
  if (expires) {
53
50
  const cacheLink = await new Promise((response, reject) => {
54
- this.redisInstance.get(`S3ClientService.getDownloadLink-${path}`, (err, data) => {
51
+ this.secondaryDataBase.get(`S3ClientService.getDownloadLink-${path}`, (err, data) => {
55
52
  if (err) {
56
53
  return reject(err);
57
54
  }
@@ -69,7 +66,7 @@ class S3ClientService {
69
66
  if (!expires) {
70
67
  return;
71
68
  }
72
- this.redisInstance.set(`S3ClientService.getDownloadLink-${path}`, link, 'EX', expires);
69
+ this.secondaryDataBase.setex(`S3ClientService.getDownloadLink-${path}`, expires, link);
73
70
  };
74
71
  if (publicLink) {
75
72
  const link = `https://${this.s3Config.bucket}.s3.${this.s3Config.region}.amazonaws.com/${completePath}`;