@puca/puca-core 10.1.2 → 10.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (28) hide show
  1. package/dist/core/services/life-cycle.service.js +22 -16
  2. package/dist/core/services/life-cycle.service.js.map +1 -1
  3. package/dist/core/services/logger.js +5 -1
  4. package/dist/core/services/logger.js.map +1 -1
  5. package/dist/core/services/module-especification.service.js +1 -2
  6. package/dist/core/services/module-especification.service.js.map +1 -1
  7. package/dist/core/services/report.service.d.ts +9 -0
  8. package/dist/core/services/report.service.js +71 -27
  9. package/dist/core/services/report.service.js.map +1 -1
  10. package/dist/core/services/storage/implementation/s3-client.service.d.ts +2 -1
  11. package/dist/core/services/storage/implementation/s3-client.service.js +8 -1
  12. package/dist/core/services/storage/implementation/s3-client.service.js.map +1 -1
  13. package/dist/core/services/storage/storage.service.d.ts +1 -0
  14. package/dist/essential/audit.service.js +1 -18
  15. package/dist/essential/audit.service.js.map +1 -1
  16. package/dist/essential/module-config.service.js +1 -2
  17. package/dist/essential/module-config.service.js.map +1 -1
  18. package/dist/models/module-config.d.ts +0 -1
  19. package/dist/models/module-especification.d.ts +0 -1
  20. package/dist/orm/services/managers/database-manager.service.js +4 -4
  21. package/dist/orm/services/managers/database-manager.service.js.map +1 -1
  22. package/dist/orm/services/sql/sql-layer.service.js +8 -6
  23. package/dist/orm/services/sql/sql-layer.service.js.map +1 -1
  24. package/dist/orm/services/transaction.d.ts +1 -1
  25. package/dist/orm/services/transaction.js +17 -22
  26. package/dist/orm/services/transaction.js.map +1 -1
  27. package/dist/tsconfig.tsbuildinfo +1 -1
  28. package/package.json +1 -1
@@ -34,17 +34,19 @@ class LifeCycleService {
34
34
  async shutdown(opt) {
35
35
  this.logger.warn('Finalizando o servidor');
36
36
  this.intervals.forEach(clearInterval);
37
- const tasks = [];
38
- tasks.push(this.webSocketService.disconnect);
39
- tasks.push(this.repositoryFactory.shutdown);
40
- tasks.push(this.databaseManagerService.get().disconnect);
41
- tasks.push(this.databaseManagerService.getTransactionalDatabase().disconnect);
42
- tasks.push(() => job_executor_service_1.JobExecutor.shutdown(true));
43
- if (this.app) {
44
- tasks.push(this.app.close);
45
- }
37
+ const serviceTasks = [];
38
+ serviceTasks.push(this.repositoryFactory.shutdown);
39
+ serviceTasks.push(() => job_executor_service_1.JobExecutor.shutdown(true));
40
+ const essencialTasks = [];
41
+ essencialTasks.push(this.webSocketService.disconnect);
42
+ essencialTasks.push(this.databaseManagerService.get().disconnect);
43
+ essencialTasks.push(this.databaseManagerService.getTransactionalDatabase().disconnect);
46
44
  try {
47
- await Promise.all(tasks);
45
+ if (this.app) {
46
+ await this.app.close();
47
+ }
48
+ await Promise.all(serviceTasks);
49
+ await Promise.all(essencialTasks);
48
50
  const exit = (opt === null || opt === void 0 ? void 0 : opt.exit) || process.exit;
49
51
  exit(0);
50
52
  }
@@ -124,12 +126,16 @@ class LifeCycleService {
124
126
  doneEvent('pluginService');
125
127
  await this.app.listen(await this.envConfigService.getEnvByName('SERVER_PORT', '4000'));
126
128
  doneEvent('listen');
127
- events.forEach(e => {
128
- this.logger.log(`${e.name} in ${e.end.getTime() - e.start.getTime()}ms`);
129
- });
130
- this.logger.log(`ready in ${new Date().getTime() - startDate.getTime()}ms`);
131
- this.app.enableShutdownHooks();
132
- this._isReady = true;
129
+ try {
130
+ events.forEach(e => {
131
+ this.logger.log(`${e.name} in ${e.end.getTime() - e.start.getTime()}ms`);
132
+ });
133
+ this.logger.log(`ready in ${new Date().getTime() - startDate.getTime()}ms`);
134
+ this.app.enableShutdownHooks();
135
+ }
136
+ finally {
137
+ this._isReady = true;
138
+ }
133
139
  return this.app;
134
140
  }
135
141
  async connectToRedis() {
@@ -1 +1 @@
1
- {"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":"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"}
@@ -33,7 +33,7 @@ class Logger {
33
33
  awaysPrintLevel.includes(level);
34
34
  const printStack = () => !Logger.stackCondition ||
35
35
  new Error().stack.includes(Logger.stackCondition);
36
- if (!printLevel() || !printClass() || !printStack) {
36
+ if (!printLevel() || !printClass() || !printStack()) {
37
37
  return;
38
38
  }
39
39
  const args = originalArgs.map(a => (typeof a === 'function' ? a() : a));
@@ -48,6 +48,10 @@ class Logger {
48
48
  });
49
49
  },
50
50
  },
51
+ {
52
+ apply: () => a instanceof Date,
53
+ exec: () => a.toISOString(),
54
+ },
51
55
  {
52
56
  apply: () => typeof a === 'object',
53
57
  exec: () => JSON.stringify(a),
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/core/services/logger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/core/services/logger.ts"],"names":[],"mappings":"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"}
@@ -21,8 +21,7 @@ class ModuleEspecificationService {
21
21
  ddlCommands,
22
22
  menu: menuPlan,
23
23
  active: true,
24
- useAccessControl: moduleConfig.useAccessControl,
25
- indexPage: moduleConfig.indexPage
24
+ useAccessControl: moduleConfig.useAccessControl
26
25
  };
27
26
  }
28
27
  }
@@ -1 +1 @@
1
- {"version":3,"file":"module-especification.service.js","sourceRoot":"","sources":["../../../src/core/services/module-especification.service.ts"],"names":[],"mappings":";;;AAOA,MAAa,2BAA2B;IACtC,YAA6B,iBAAoC,EAAmB,mBAAwC;QAA/F,sBAAiB,GAAjB,iBAAiB,CAAmB;QAAmB,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAEjI,KAAK,CAAC,GAAG;QACP,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAE3D,aAAa,EAAE;YACf,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAC;QAEtE,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CACzD,cAAc,EACd;YACE,WAAW,EAAE,KAAK;SACnB,CACF,CAAC,IAAI,EAAE,CAAC;QAET,OAAO;YACL,WAAW,EAAE,YAAY,CAAC,IAAI;YAC9B,KAAK,EAAE,YAAY,CAAC,KAAK;YACzB,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,WAAW;YACX,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,IAAI;YACZ,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;YAC/C,SAAS,EAAE,YAAY,CAAC,SAAS;SACV,CAAC;IAC5B,CAAC;CACF;AA7BD,kEA6BC"}
1
+ {"version":3,"file":"module-especification.service.js","sourceRoot":"","sources":["../../../src/core/services/module-especification.service.ts"],"names":[],"mappings":";;;AAOA,MAAa,2BAA2B;IACtC,YAA6B,iBAAoC,EAAmB,mBAAwC;QAA/F,sBAAiB,GAAjB,iBAAiB,CAAmB;QAAmB,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAEjI,KAAK,CAAC,GAAG;QACP,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAE3D,aAAa,EAAE;YACf,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAC;QAEtE,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CACzD,cAAc,EACd;YACE,WAAW,EAAE,KAAK;SACnB,CACF,CAAC,IAAI,EAAE,CAAC;QAET,OAAO;YACL,WAAW,EAAE,YAAY,CAAC,IAAI;YAC9B,KAAK,EAAE,YAAY,CAAC,KAAK;YACzB,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,WAAW;YACX,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,IAAI;YACZ,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;SACxB,CAAC;IAC5B,CAAC;CACF;AA5BD,kEA4BC"}
@@ -11,12 +11,17 @@ export interface ReportConfig {
11
11
  shortid?: string;
12
12
  config?: unknown;
13
13
  }
14
+ export declare enum ReportMode {
15
+ PrivateAsyncTemp = "privateAsyncTemp",
16
+ PublicSyncPermanent = "publicSyncPermanent"
17
+ }
14
18
  export interface RenderDataArgs {
15
19
  args: {
16
20
  shortid: string;
17
21
  };
18
22
  data: any;
19
23
  user: User;
24
+ mode?: ReportMode;
20
25
  }
21
26
  export interface ReportTemplate {
22
27
  name: string;
@@ -41,8 +46,12 @@ export declare class ReportService {
41
46
  activateReportJobProcessator: Boolean;
42
47
  }): Promise<void>;
43
48
  private getDefaultHeaders;
49
+ private uploadFileTemp;
50
+ private uploadFilePermanent;
51
+ private uploadFile;
44
52
  private _renderData;
45
53
  renderData(args: RenderDataArgs): Promise<void>;
54
+ renderReportSync({ args, user, data, mode }: RenderDataArgs): Promise<string>;
46
55
  private getFolderByName;
47
56
  private getFoldersByShortId;
48
57
  private computeFolderList;
@@ -1,10 +1,15 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.ReportService = void 0;
3
+ exports.ReportService = exports.ReportMode = void 0;
4
4
  const axios_1 = require("axios");
5
5
  const _ = require("lodash");
6
6
  const _1 = require(".");
7
7
  const logger_1 = require("./logger");
8
+ var ReportMode;
9
+ (function (ReportMode) {
10
+ ReportMode["PrivateAsyncTemp"] = "privateAsyncTemp";
11
+ ReportMode["PublicSyncPermanent"] = "publicSyncPermanent";
12
+ })(ReportMode = exports.ReportMode || (exports.ReportMode = {}));
8
13
  class ReportService {
9
14
  constructor(uuidService, notificationService, repositoryFactory, storageServiceManager, configService, jobExecutorFactory, cacheServiceFactory) {
10
15
  this.uuidService = uuidService;
@@ -65,7 +70,48 @@ class ReportService {
65
70
  'Authorization': `Basic ${Buffer.from(`${secret.jsReport.username}:${secret.jsReport.password}`).toString('base64')}`
66
71
  };
67
72
  }
68
- async _renderData({ args, user, data }) {
73
+ async uploadFileTemp({ user, documentName, documentType, data }) {
74
+ const path = `spool/${user.username}/${documentName}-${this.uuidService.v4()}.${documentType}`;
75
+ const storageService = await this.storageServiceManager.getInstance();
76
+ await storageService.writeFile({
77
+ path,
78
+ buffer: data,
79
+ cacheControl: null
80
+ });
81
+ const expires = 604800;
82
+ const link = await storageService.getDownloadLink({
83
+ path,
84
+ expires
85
+ });
86
+ return link;
87
+ }
88
+ async uploadFilePermanent({ user, documentName, documentType, data }) {
89
+ const storagePublic = "public-spool";
90
+ const path = `${storagePublic}/${user.username}/${documentName}-${this.uuidService.v4()}.${documentType}`;
91
+ const storageService = await this.storageServiceManager.getInstance();
92
+ await storageService.writeFile({
93
+ path,
94
+ buffer: data,
95
+ cacheControl: null
96
+ });
97
+ const link = await storageService.getDownloadLink({
98
+ path,
99
+ publicLink: true
100
+ });
101
+ return link;
102
+ }
103
+ async uploadFile(args) {
104
+ if (args.mode === ReportMode.PrivateAsyncTemp || !args.mode) {
105
+ return await this.uploadFileTemp(args);
106
+ }
107
+ else if (args.mode === ReportMode.PublicSyncPermanent) {
108
+ return await this.uploadFilePermanent(args);
109
+ }
110
+ else {
111
+ throw new Error(`ReportMode ${args.mode} não suportado!`);
112
+ }
113
+ }
114
+ async _renderData({ args, user, data, mode }) {
69
115
  const body = {
70
116
  template: {
71
117
  shortid: args.shortid,
@@ -94,38 +140,36 @@ class ReportService {
94
140
  .get(0)
95
141
  .split('.')
96
142
  .value();
97
- const path = `spool/${user.username}/${documentName}-${this.uuidService.v4()}.${documentType}`;
98
- const storageService = await this.storageServiceManager.getInstance();
99
- await storageService.writeFile({
100
- path,
101
- buffer: response.data,
102
- cacheControl: null
103
- });
104
- return { storageService, path, documentName, documentType };
143
+ const link = await this.uploadFile({ user, documentName, documentType, data: response.data, mode });
144
+ return { link, documentName, documentType };
105
145
  };
106
- const { storageService, path, documentName, documentType } = await renderLink();
107
- const expires = 604800;
108
- const link = await storageService.getDownloadLink({
109
- path,
110
- expires
111
- });
112
- await this.notificationService.send({
113
- channels: ['toast'],
114
- method: 'success',
115
- destination: user.puca_pid,
116
- link: `0=document-viewer/${encodeURIComponent(link)}?name=${documentName}&type=${documentType}`,
117
- user,
118
- title: `O relatório '${documentName}' está disponível`,
119
- shortMessage: null,
120
- htmlMessage: null,
121
- expires
122
- });
146
+ const { link, documentName, documentType } = await renderLink();
147
+ if (mode === ReportMode.PublicSyncPermanent) {
148
+ return link;
149
+ }
150
+ else {
151
+ await this.notificationService.send({
152
+ channels: ['toast'],
153
+ method: 'success',
154
+ destination: user.puca_pid,
155
+ link: `0=document-viewer/${encodeURIComponent(link)}?name=${documentName}&type=${documentType}`,
156
+ user,
157
+ title: `O relatório '${documentName}' está disponível`,
158
+ shortMessage: null,
159
+ htmlMessage: null,
160
+ expires: 604800
161
+ });
162
+ }
123
163
  }
124
164
  async renderData(args) {
125
165
  await this.jobReportExecutor.add(args, {
126
166
  timeout: 1000 * 60 * 10
127
167
  });
128
168
  }
169
+ async renderReportSync({ args, user, data, mode }) {
170
+ const reportLink = await this._renderData({ args, user, data, mode });
171
+ return reportLink;
172
+ }
129
173
  async getFolderByName({ user, name }) {
130
174
  return await this.cacheGetFolderByName.get(name);
131
175
  }
@@ -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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"}
@@ -23,9 +23,10 @@ export declare class S3ClientService implements StorageService {
23
23
  res: Response;
24
24
  mode?: 'link' | 'redirect';
25
25
  }): Promise<void>;
26
- getDownloadLink({ path, expires }: {
26
+ getDownloadLink({ path, expires, publicLink }: {
27
27
  path: string;
28
28
  expires?: number;
29
+ publicLink?: boolean;
29
30
  }): Promise<string>;
30
31
  readFile({ path, pathFormat }: {
31
32
  path: string;
@@ -41,10 +41,17 @@ class S3ClientService {
41
41
  }
42
42
  }
43
43
  }
44
- async getDownloadLink({ path, expires = 600 }) {
44
+ async getDownloadLink({ path, expires = 600, publicLink = false }) {
45
45
  const completePath = await this.buildCompletePath({
46
46
  path,
47
47
  });
48
+ if (publicLink) {
49
+ const link = await this.s3Client.getSignedUrlPromise('getObject', {
50
+ Key: completePath,
51
+ Bucket: this.s3Config.bucket,
52
+ });
53
+ return link;
54
+ }
48
55
  const params = {
49
56
  Key: completePath,
50
57
  Bucket: this.s3Config.bucket,
@@ -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,EAKb;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;SACb,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,EAAsC;QAC/E,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC;YAChD,IAAI;SACL,CAAC,CAAC;QAEH,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;AA1JD,0CA0JC"}
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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"}
@@ -19,6 +19,7 @@ export declare abstract class StorageService {
19
19
  abstract getDownloadLink(args: {
20
20
  path: string;
21
21
  expires?: number;
22
+ publicLink?: boolean;
22
23
  }): Promise<string>;
23
24
  abstract deleteFile(args: {
24
25
  path: string;
@@ -25,24 +25,7 @@ class AuditService {
25
25
  this.active = false;
26
26
  }
27
27
  async start({ app }) {
28
- const { sentry: config } = await this.configService.getSecret();
29
- if (!config) {
30
- return;
31
- }
32
- this.active = true;
33
- const module = await this.moduleConfigService.getModuleConfig();
34
- let environment = (await this.envConfigService.getEnvByName('ENVIRONMENT', 'DEVELOPMENT')).toLowerCase();
35
- if (environment === 'PRODUCTION') {
36
- const { namespace } = await this.configService.getSecret();
37
- environment = namespace;
38
- }
39
- Sentry.init({
40
- dsn: config.dsn,
41
- tracesSampleRate: config.tracesSampleRate,
42
- release: module.version,
43
- environment,
44
- });
45
- app.useGlobalInterceptors(new Interceptor(this));
28
+ return;
46
29
  }
47
30
  captureException(error) {
48
31
  if (!this.active) {
@@ -1 +1 @@
1
- {"version":3,"file":"audit.service.js","sourceRoot":"","sources":["../../src/essential/audit.service.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AAKvC,+BAAuC;AAGvC,MAAM,WAAW;IACf,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAI,CAAC;IAE5D,SAAS,CAAC,OAAyB,EAAE,IAAsB;QACzD,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAa,CAAC;QAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAE1E,OAAO,IAAI;aACR,MAAM,EAAE;aACR,IAAI,CACH,UAAG,CAAC,GAAG,EAAE;YACP,WAAW,CAAC,MAAM,EAAE,CAAA;QACtB,CAAC,CAAC,CACH,CAAA;IACL,CAAC;CAEF;AAOD,MAAa,YAAY;IAGvB,YACmB,mBAAwC,EACxC,gBAAkC,EAClC,aAA4B;QAF5B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,kBAAa,GAAb,aAAa,CAAe;QALvC,WAAM,GAAY,KAAK,CAAC;IAM5B,CAAC;IAEL,KAAK,CAAC,KAAK,CAAC,EAAE,GAAG,EAEhB;QACC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA;QAE/D,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;SACR;QAED,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QAElB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAC;QAEhE,IAAI,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CACzD,aAAa,EACb,aAAa,CACd,CAAC,CAAC,WAAW,EAAE,CAAA;QAEhB,IAAG,WAAW,KAAK,YAAY,EAAE;YAC/B,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA;YAC1D,WAAW,GAAG,SAAS,CAAA;SACxB;QAED,MAAM,CAAC,IAAI,CAAC;YACV,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,WAAW;SACZ,CAAC,CAAC;QAEH,GAAG,CAAC,qBAAqB,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAA;IAClD,CAAC;IAED,gBAAgB,CAAC,KAAY;QAC3B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,OAAO;SACR;QACD,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,cAAc,CAAC,OAAe;QAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,OAAO;SACR;QACD,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,gBAAgB,CAAC,eAAuB;QACtC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,OAAO;gBACL,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC;aACI,CAAC;SACzB;QACD,OAAO,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;IAC5D,CAAC;CACF;AAhED,oCAgEC"}
1
+ {"version":3,"file":"audit.service.js","sourceRoot":"","sources":["../../src/essential/audit.service.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AAKvC,+BAAuC;AAGvC,MAAM,WAAW;IACf,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAI,CAAC;IAE5D,SAAS,CAAC,OAAyB,EAAE,IAAsB;QACzD,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAa,CAAC;QAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAE1E,OAAO,IAAI;aACR,MAAM,EAAE;aACR,IAAI,CACH,UAAG,CAAC,GAAG,EAAE;YACP,WAAW,CAAC,MAAM,EAAE,CAAA;QACtB,CAAC,CAAC,CACH,CAAA;IACL,CAAC;CAEF;AAOD,MAAa,YAAY;IAGvB,YACmB,mBAAwC,EACxC,gBAAkC,EAClC,aAA4B;QAF5B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,kBAAa,GAAb,aAAa,CAAe;QALvC,WAAM,GAAY,KAAK,CAAC;IAM5B,CAAC;IAEL,KAAK,CAAC,KAAK,CAAC,EAAE,GAAG,EAEhB;QAEC,OAAM;IA8BR,CAAC;IAED,gBAAgB,CAAC,KAAY;QAC3B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,OAAO;SACR;QACD,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,cAAc,CAAC,OAAe;QAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,OAAO;SACR;QACD,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,gBAAgB,CAAC,eAAuB;QACtC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,OAAO;gBACL,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC;aACI,CAAC;SACzB;QACD,OAAO,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;IAC5D,CAAC;CACF;AAnED,oCAmEC"}
@@ -25,8 +25,7 @@ class ModuleConfigService {
25
25
  name: packageJson.name,
26
26
  version: packageJson.version,
27
27
  label: packageJson.label,
28
- useAccessControl: packageJson.useAccessControl,
29
- indexPage: packageJson.indexPage
28
+ useAccessControl: packageJson.useAccessControl
30
29
  };
31
30
  }
32
31
  return this.moduleConfig;
@@ -1 +1 @@
1
- {"version":3,"file":"module-config.service.js","sourceRoot":"","sources":["../../src/essential/module-config.service.ts"],"names":[],"mappings":";;;AAEA,4BAA4B;AAC5B,oDAAiD;AAEjD,MAAa,mBAAmB;IAG9B,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAFhD,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAqB,CAAC,CAAC;QAG1D,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACnC,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;gBAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;gBACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;YACD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;gBACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,eAAe;QACnB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAC3D,gBAAgB,CACjB,CAAC;YACF,IAAI,CAAC,YAAY,GAAG;gBAClB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,SAAS,EAAE,WAAW,CAAC,SAAS;aACjC,CAAC;SACH;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CACF;AA9BD,kDA8BC"}
1
+ {"version":3,"file":"module-config.service.js","sourceRoot":"","sources":["../../src/essential/module-config.service.ts"],"names":[],"mappings":";;;AAEA,4BAA4B;AAC5B,oDAAiD;AAEjD,MAAa,mBAAmB;IAG9B,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAFhD,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAqB,CAAC,CAAC;QAG1D,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACnC,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;gBAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;gBACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;YACD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;gBACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,eAAe;QACnB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAC3D,gBAAgB,CACjB,CAAC;YACF,IAAI,CAAC,YAAY,GAAG;gBAClB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;aAC/C,CAAC;SACH;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CACF;AA7BD,kDA6BC"}
@@ -3,6 +3,5 @@ export interface ModuleConfig {
3
3
  name: string;
4
4
  label: string;
5
5
  version: string;
6
- indexPage?: string;
7
6
  useAccessControl?: UserAccessControlMode;
8
7
  }
@@ -7,7 +7,6 @@ export interface ModuleEspecification {
7
7
  label?: string;
8
8
  description?: string;
9
9
  ddlCommands: TypeDDlCommand[];
10
- indexPage?: string;
11
10
  menu?: MenuPlan[];
12
11
  useAccessControl?: UserAccessControlMode;
13
12
  }
@@ -83,10 +83,6 @@ class Database {
83
83
  apply: () => (typeof arg === 'boolean'),
84
84
  exec: () => arg
85
85
  },
86
- {
87
- apply: () => !isNaN(arg),
88
- exec: () => arg
89
- },
90
86
  {
91
87
  apply: () => _.isArray(arg),
92
88
  exec: () => arg.length ? `'{${arg.reduce((a, b) => `${a},${b}`)}}'` : `'{}'`
@@ -95,6 +91,10 @@ class Database {
95
91
  apply: () => arg instanceof Date,
96
92
  exec: () => `'${arg.toISOString()}'`
97
93
  },
94
+ {
95
+ apply: () => !isNaN(+arg),
96
+ exec: () => arg
97
+ },
98
98
  {
99
99
  apply: () => typeof arg === 'object',
100
100
  exec: () => arg
@@ -1 +1 @@
1
- {"version":3,"file":"database-manager.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/database-manager.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"database-manager.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/database-manager.service.ts"],"names":[],"mappings":"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"}
@@ -6,11 +6,7 @@ const logger_1 = require("../../../core/services/logger");
6
6
  const helpers_1 = require("./helpers");
7
7
  ;
8
8
  class UnsafeResolver {
9
- constructor() {
10
- this.logPath = false;
11
- }
12
9
  setLogPath(logPath) {
13
- this.logPath = logPath;
14
10
  }
15
11
  unsafeResolveStringValue(v, alias, path) {
16
12
  if (!v) {
@@ -100,7 +96,7 @@ class UnsafeResolver {
100
96
  };
101
97
  }
102
98
  else {
103
- return Object.assign(Object.assign({}, where), { v1: this.unsafeResolveValue({ field: where.v1, alias, path, user }), v2: this.unsafeResolveValue({ field: where.v2, alias, path, user }), comment: this.logPath ? path : undefined });
99
+ return Object.assign(Object.assign({}, where), { v1: this.unsafeResolveValue({ field: where.v1, alias, path, user }), v2: this.unsafeResolveValue({ field: where.v2, alias, path, user }) });
104
100
  }
105
101
  }
106
102
  unsafeResolveSelect(select, alias, path) {
@@ -711,6 +707,9 @@ class SqlLayerService {
711
707
  return resolved.field;
712
708
  }),
713
709
  fields: (select.fields || []).map(f => {
710
+ if (typeof f === 'string') {
711
+ return f;
712
+ }
714
713
  const resolved = this.safeResolveValue({
715
714
  field: f,
716
715
  td,
@@ -723,7 +722,10 @@ class SqlLayerService {
723
722
  args: resolved.args,
724
723
  tables: resolved.tables,
725
724
  });
726
- return resolved.field;
725
+ if (typeof resolved.field === 'string') {
726
+ return resolved.field;
727
+ }
728
+ return Object.assign(Object.assign({}, resolved.field), { cast: f.cast, alias: f.alias });
727
729
  }),
728
730
  query: (select.query || []).map(q => {
729
731
  const resolvedField = this.safeResolveValue({