@rockster/core 0.1.2 → 0.1.3

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 (12) hide show
  1. package/package.json +1 -1
  2. package/storage/services/routes.service.d.ts +2 -0
  3. package/storage/services/routes.service.js +3 -0
  4. package/storage/services/routes.service.js.map +1 -1
  5. package/storage/services/storage.service.d.ts +5 -0
  6. package/storage/services/storage.service.js +32 -3
  7. package/storage/services/storage.service.js.map +1 -1
  8. package/translations/controllers/translation.controller.js +17 -9
  9. package/translations/controllers/translation.controller.js.map +1 -1
  10. package/translations/services/translator.service.d.ts +2 -1
  11. package/translations/services/translator.service.js +14 -4
  12. package/translations/services/translator.service.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rockster/core",
3
- "version": "0.1.2",
3
+ "version": "0.1.3",
4
4
  "main": "index",
5
5
  "types": "index.d.ts",
6
6
  "scripts": {
package/storage/services/routes.service.d.ts CHANGED
@@ -6,9 +6,11 @@ import { Metadata } from "../entities/metadata.entity";
6
6
  import { Storage } from "../entities/storage.entity";
7
7
  import { StorageService } from "./storage.service";
8
8
  import { CurrentSession } from "../../core";
9
+ import { Logger } from "@rockster/logger";
9
10
  export declare class RoutesService {
10
11
  protected httpController: HttpController;
11
12
  protected storageService: StorageService;
13
+ protected logger: Logger;
12
14
  protected dataSource: DataSource;
13
15
  protected repository: Repository<Metadata>;
14
16
  protected storagePath: string;
package/storage/services/routes.service.js CHANGED
@@ -27,10 +27,12 @@ const storage_entity_1 = require("../entities/storage.entity");
27
27
  const storage_service_1 = require("./storage.service");
28
28
  const env_1 = require("../env");
29
29
  const use_auth_1 = require("../../security/functions/use-auth");
30
+ const logger_1 = require("@rockster/logger");
30
31
  let RoutesService = class RoutesService {
31
32
  constructor(httpController, storageService) {
32
33
  this.httpController = httpController;
33
34
  this.storageService = storageService;
35
+ this.logger = new logger_1.Logger('Storage');
34
36
  this.storagePath = '/storage';
35
37
  this.isAuthEnabled = false;
36
38
  }
@@ -70,6 +72,7 @@ let RoutesService = class RoutesService {
70
72
  .storageService
71
73
  .getReadStream(`${file.id}${file.extension ? file.extension : ''}`, file.storage);
72
74
  downloader.on('error', (err) => {
75
+ this.logger.error(`Failed to read file from GCS: ${err.message}`, err.stack);
73
76
  core.options.onRequestError?.apply(this, [err]);
74
77
  response.writeHead(common_1.HttpStatus.internalServerError);
75
78
  });
package/storage/services/routes.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"routes.service.js","sourceRoot":"./","sources":["storage/services/routes.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"routes.service.js","sourceRoot":"./","sources":["storage/services/routes.service.ts"],"names":[],"mappings":"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"}
package/storage/services/storage.service.d.ts CHANGED
@@ -1,7 +1,12 @@
1
1
  import { Storage } from "../entities/storage.entity";
2
+ import { Storage as GcpStorage } from "@google-cloud/storage";
2
3
  import { Repository } from "../../database";
4
+ import { GcpCredentials } from "../interfaces/storage-settings";
3
5
  export declare class StorageService {
4
6
  protected repository: Repository<Storage>;
7
+ protected gcpClients: Map<string, GcpStorage>;
8
+ protected normalizeCredentials(credentials: GcpCredentials): import("../interfaces").IGcpJwtInputCredendials;
9
+ protected getGcpClient(storage: Storage): GcpStorage;
5
10
  getStorage(originalUrl: string): Promise<Storage>;
6
11
  protected getGcpBucketFile(fileName: string, storage: Storage): import("@google-cloud/storage").File;
7
12
  deleteFile(fileName: string, storage: Storage): Promise<any>;
package/storage/services/storage.service.js CHANGED
@@ -17,6 +17,37 @@ const interfaces_1 = require("../interfaces");
17
17
  const storage_1 = require("@google-cloud/storage");
18
18
  const database_1 = require("../../database");
19
19
  let StorageService = class StorageService {
20
+ constructor() {
21
+ this.gcpClients = new Map();
22
+ }
23
+ normalizeCredentials(credentials) {
24
+ if (!credentials?.private_key) {
25
+ return credentials;
26
+ }
27
+ const privateKey = credentials.private_key.includes('\\n')
28
+ ? credentials.private_key.replace(/\\n/g, '\n')
29
+ : credentials.private_key;
30
+ if (privateKey === credentials.private_key) {
31
+ return credentials;
32
+ }
33
+ return {
34
+ ...credentials,
35
+ private_key: privateKey
36
+ };
37
+ }
38
+ getGcpClient(storage) {
39
+ const cached = this.gcpClients.get(storage.id);
40
+ if (cached) {
41
+ return cached;
42
+ }
43
+ const credentials = this.normalizeCredentials(storage.settings.credentials);
44
+ const client = new storage_1.Storage({
45
+ projectId: credentials.project_id,
46
+ credentials
47
+ });
48
+ this.gcpClients.set(storage.id, client);
49
+ return client;
50
+ }
20
51
  async getStorage(originalUrl) {
21
52
  const [, , bucket] = originalUrl.split('/');
22
53
  const storage = await this
@@ -44,9 +75,7 @@ let StorageService = class StorageService {
44
75
  return this.repository.save(current);
45
76
  }
46
77
  getGcpBucketFile(fileName, storage) {
47
- const gcpStorage = new storage_1.Storage({
48
- credentials: storage.settings.credentials
49
- });
78
+ const gcpStorage = this.getGcpClient(storage);
50
79
  const bucket = gcpStorage.bucket(storage.settings.bucket);
51
80
  const file = bucket.file(fileName);
52
81
  return file;
package/storage/services/storage.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"storage.service.js","sourceRoot":"./","sources":["storage/services/storage.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"storage.service.js","sourceRoot":"./","sources":["storage/services/storage.service.ts"],"names":[],"mappings":"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"}
package/translations/controllers/translation.controller.js CHANGED
@@ -35,19 +35,27 @@ let TranslationController = class TranslationController {
35
35
  this.translatorService = translatorService;
36
36
  }
37
37
  async postConfig(content) {
38
- return (0, execute_post_1.executePost)(content);
38
+ const result = await (0, execute_post_1.executePost)(content);
39
+ const referenceId = result?.referenceId
40
+ ?? content.data?.referenceId;
41
+ if (referenceId) {
42
+ await this.translatorService.invalidateReference(referenceId);
43
+ }
44
+ return result;
39
45
  }
40
46
  async postValues(content) {
41
47
  const result = await (0, execute_post_1.executePost)(content);
42
48
  const configId = result?.translationConfigId
43
- ?? content.data?.translationConfigId;
44
- if (configId) {
45
- const referenceId = await this
46
- .translationsService
47
- .getReferenceIdForConfig(configId);
48
- if (referenceId) {
49
- await this.translatorService.invalidateReference(referenceId);
50
- }
49
+ ?? content.data?.translationConfigId
50
+ ?? content.data?.translationConfig?.id;
51
+ const locale = result?.locale
52
+ ?? content.data?.locale;
53
+ const referenceId = content.data?.translationConfig?.referenceId
54
+ ?? (configId
55
+ ? await this.translationsService.getReferenceIdForConfig(configId)
56
+ : null);
57
+ if (referenceId) {
58
+ await this.translatorService.invalidateReference(referenceId, locale);
51
59
  }
52
60
  return result;
53
61
  }
package/translations/controllers/translation.controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"translation.controller.js","sourceRoot":"./","sources":["translations/controllers/translation.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,qFAA0E;AAC1E,uEAAmE;AACnE,kFAA6E;AAE7E,uDAAsD;AACtD,kFAA6E;AAC7E,uEAAmE;AACnE,qEAAgE;AAChE,uEAAkE;AAClE,2EAAuE;AAEvE,qFAA0E;AAC1E,4FAA+E;AAC/E,0FAA4E;AAC5E,4FAA8E;AAC9E,4GAA8F;AAC9F,4FAA+E;AAC/E,uEAAmE;AAG5D,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAE/B,YACsB,mBAAwC,EACxC,iBAAoC;QADpC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,sBAAiB,GAAjB,iBAAiB,CAAmB;IACvD,CAAC;IAKE,AAAN,KAAK,CAAC,UAAU,CACE,OAAwC;QAEvD,OAAO,IAAA,0BAAW,EAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAKK,AAAN,KAAK,CAAC,UAAU,CACE,OAAyC;QAExD,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAW,EAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAI,MAA4B,EAAE,mBAAmB;eAC7D,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC;QACxC,IAAI,QAAQ,EAAE,CAAC;YACZ,MAAM,WAAW,GAAG,MAAM,IAAI;iBAC1B,mBAAmB;iBACnB,uBAAuB,CAAC,QAAQ,CAAC,CAAC;YACtC,IAAI,WAAW,EAAE,CAAC;gBACf,MAAM,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;YACjE,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IACjB,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CACE,OAAyC;QAEzD,OAAO,IAAA,4BAAY,EAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAC7C,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CACE,OAAyC;QAEzD,OAAO,IAAA,4BAAY,EAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAC7C,CAAC;IAMK,AAAN,KAAK,CAAC,SAAS,CACK,OAAyB;QAE1C,MAAM,MAAM,GAAG,MAAM,IAAI;aACrB,mBAAmB;aACnB,SAAS,CACP,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,MAAM,CAChB,CAAC;QAEL,OAAO;YACJ,MAAM,EAAE,MAAM;SACK,CAAC;IAC1B,CAAC;CACH,CAAA;AApEY,sDAAqB;AAUzB;IAHL,IAAA,kCAAU,EAAC;QACT,IAAI,EAAE,GAAG,EAAE,CAAC,6CAAiB;KAC/B,CAAC;IAEE,WAAA,IAAA,oCAAW,GAAE,CAAA;;;;uDAGhB;AAKK;IAHL,IAAA,kCAAU,EAAC;QACT,IAAI,EAAE,GAAG,EAAE,CAAC,6CAAiB;KAC/B,CAAC;IAEE,WAAA,IAAA,oCAAW,GAAE,CAAA;;;;uDAchB;AAGK;IADL,IAAA,iDAAsB,GAAE;IAErB,WAAA,IAAA,yBAAY,GAAE,CAAA;;;;wDAGjB;AAGK;IADL,IAAA,iDAAsB,GAAE;IAErB,WAAA,IAAA,yBAAY,GAAE,CAAA;;;;wDAGjB;AAMK;IAJL,IAAA,yBAAM,EAAC;QACL,QAAQ,EAAE,GAAG,EAAE,CAAC,uCAAiB;QACjC,MAAM,EAAE,IAAI;KACd,CAAC;IAEE,WAAA,IAAA,wCAAa,GAAE,CAAA;;qCAAU,qCAAgB;;sDAY5C;gCAnES,qBAAqB;IADjC,IAAA,iCAAU,GAAE;qCAIiC,0CAAmB;QACrB,sCAAiB;GAJhD,qBAAqB,CAoEjC"}
1
+ {"version":3,"file":"translation.controller.js","sourceRoot":"./","sources":["translations/controllers/translation.controller.ts"],"names":[],"mappings":"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"}
package/translations/services/translator.service.d.ts CHANGED
@@ -6,7 +6,8 @@ export declare class TranslatorService {
6
6
  protected translationsService: TranslationsService;
7
7
  protected cache: CacheClient;
8
8
  constructor(translationsService: TranslationsService);
9
+ protected getCacheKey(referenceId: string, locale?: Locale): string;
9
10
  useValues(referenceId: string, locale: Locale): Promise<TranslatorHandle>;
10
- invalidateReference(referenceId: string): Promise<void>;
11
+ invalidateReference(referenceId: string, locale?: Locale): Promise<void>;
11
12
  protected getHandle(values: Dictionary<string>): TranslatorHandle;
12
13
  }
package/translations/services/translator.service.js CHANGED
@@ -18,8 +18,11 @@ let TranslatorService = class TranslatorService {
18
18
  constructor(translationsService) {
19
19
  this.translationsService = translationsService;
20
20
  }
21
+ getCacheKey(referenceId, locale) {
22
+ return `translations:${referenceId}${locale ? `:${locale}` : ''}`;
23
+ }
21
24
  async useValues(referenceId, locale) {
22
- const key = `translations:${referenceId}${locale ? `:${locale}` : ''}`;
25
+ const key = this.getCacheKey(referenceId, locale);
23
26
  const cached = await this
24
27
  .cache
25
28
  .get(key);
@@ -33,9 +36,16 @@ let TranslatorService = class TranslatorService {
33
36
  await this.cache.expire(key, env_1.env.cacheTTL);
34
37
  return this.getHandle(values);
35
38
  }
36
- async invalidateReference(referenceId) {
37
- const keys = await this.cache.keys(`translations:${referenceId}:*`);
38
- for (const key of keys) {
39
+ async invalidateReference(referenceId, locale) {
40
+ await this.cache.del(this.getCacheKey(referenceId));
41
+ if (locale) {
42
+ await this.cache.del(this.getCacheKey(referenceId, locale));
43
+ }
44
+ const pattern = `${this.getCacheKey(referenceId)}:*`;
45
+ for await (const key of this.cache.scanIterator({
46
+ MATCH: pattern,
47
+ COUNT: 100
48
+ })) {
39
49
  await this.cache.del(key);
40
50
  }
41
51
  }
package/translations/services/translator.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"translator.service.js","sourceRoot":"./","sources":["translations/services/translator.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAAsD;AACtD,iEAA6D;AAC7D,uCAGqB;AAOrB,gCAA6B;AAGtB,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAK3B,YACa,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAClD,CAAC;IAEJ,KAAK,CAAC,SAAS,CACZ,WAAmB,EACnB,MAAc;QAGd,MAAM,GAAG,GAAG,gBAAgB,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACvE,MAAM,MAAM,GAAG,MAAM,IAAI;aACrB,KAAK;aACL,GAAG,CAAC,GAAG,CAAC,CAAC;QAEb,IAAI,MAAM,EAAE,CAAC;YACV,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QAC7C,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI;aACrB,mBAAmB;aACnB,SAAS,CACP,WAAW,EACX,MAAM,CACR,CAAC;QAGL,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QAClD,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,SAAG,CAAC,QAAQ,CAAC,CAAC;QAE3C,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,WAAmB;QAC1C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,WAAW,IAAI,CAAC,CAAC;QACpE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACtB,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;IACJ,CAAC;IAES,SAAS,CAAC,MAA0B;QAC3C,OAAO,CAAC,GAAW,EAAE,WAA+B,EAAE,EAAE,EAAE;YACvD,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC;YAC/B,MAAM;iBACF,mBAAmB,CAAC,QAAQ,CAAC;iBAC7B,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAClB,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,OAAO,GAAG,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;YACN,OAAO,KAAK,CAAC;QAChB,CAAC,CAAA;IACJ,CAAC;CACH,CAAA;AAvDY,8CAAiB;AAGjB;IADT,IAAA,mBAAW,GAAE;;gDACe;4BAHnB,iBAAiB;IAD7B,IAAA,2BAAU,GAAE;qCAOwB,0CAAmB;GAN3C,iBAAiB,CAuD7B"}
1
+ {"version":3,"file":"translator.service.js","sourceRoot":"./","sources":["translations/services/translator.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAAsD;AACtD,iEAA6D;AAC7D,uCAGqB;AAMrB,gCAA6B;AAGtB,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAK3B,YACa,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IAClD,CAAC;IAEM,WAAW,CAClB,WAAmB,EACnB,MAAe;QAEf,OAAO,gBAAgB,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,SAAS,CACZ,WAAmB,EACnB,MAAc;QAGd,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,MAAM,IAAI;aACrB,KAAK;aACL,GAAG,CAAC,GAAG,CAAC,CAAC;QAEb,IAAI,MAAM,EAAE,CAAC;YACV,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QAC7C,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI;aACrB,mBAAmB;aACnB,SAAS,CACP,WAAW,EACX,MAAM,CACR,CAAC;QAGL,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QAClD,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,SAAG,CAAC,QAAQ,CAAC,CAAC;QAE3C,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,mBAAmB,CACtB,WAAmB,EACnB,MAAe;QAEf,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC;QACpD,IAAI,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC;QACrD,IAAI,KAAK,EAAE,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;YAC7C,KAAK,EAAE,OAAO;YACd,KAAK,EAAE,GAAG;SACZ,CAAC,EAAE,CAAC;YACF,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;IACJ,CAAC;IAES,SAAS,CAAC,MAA0B;QAC3C,OAAO,CAAC,GAAW,EAAE,WAA+B,EAAE,EAAE,EAAE;YACvD,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC;YAC/B,MAAM;iBACF,mBAAmB,CAAC,QAAQ,CAAC;iBAC7B,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAClB,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,OAAO,GAAG,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;YACN,OAAO,KAAK,CAAC;QAChB,CAAC,CAAA;IACJ,CAAC;CACH,CAAA;AAzEY,8CAAiB;AAGjB;IADT,IAAA,mBAAW,GAAE;;gDACe;4BAHnB,iBAAiB;IAD7B,IAAA,2BAAU,GAAE;qCAOwB,0CAAmB;GAN3C,iBAAiB,CAyE7B"}