@novo-learning/service-lib 1.5.2 → 1.6.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.
@@ -7,4 +7,5 @@ export { ExerciseService } from './exercise-api/exercise.service';
7
7
  export { PronunciationApiModule } from './pronunciation-api/pronunciation-api.module';
8
8
  export { PronunciationService } from './pronunciation-api/pronunciation.service';
9
9
  export { PublisherApiModule } from './publisher-api/publisher-api.module';
10
+ export { DEFAULT_PUBLISHER_SETTINGS } from './publisher-api/publisher-settings.default';
10
11
  export { PublisherService } from './publisher-api/publisher.service';
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.PublisherService = exports.PublisherApiModule = exports.PronunciationService = exports.PronunciationApiModule = exports.ExerciseService = exports.ExerciseApiModule = exports.DataService = exports.DataApiModule = exports.AuthService = exports.AuthApiModule = void 0;
3
+ exports.PublisherService = exports.DEFAULT_PUBLISHER_SETTINGS = exports.PublisherApiModule = exports.PronunciationService = exports.PronunciationApiModule = exports.ExerciseService = exports.ExerciseApiModule = exports.DataService = exports.DataApiModule = exports.AuthService = exports.AuthApiModule = void 0;
4
4
  var auth_api_module_1 = require("./auth-api/auth-api.module");
5
5
  Object.defineProperty(exports, "AuthApiModule", { enumerable: true, get: function () { return auth_api_module_1.AuthApiModule; } });
6
6
  var auth_service_1 = require("./auth-api/auth.service");
@@ -19,6 +19,8 @@ var pronunciation_service_1 = require("./pronunciation-api/pronunciation.service
19
19
  Object.defineProperty(exports, "PronunciationService", { enumerable: true, get: function () { return pronunciation_service_1.PronunciationService; } });
20
20
  var publisher_api_module_1 = require("./publisher-api/publisher-api.module");
21
21
  Object.defineProperty(exports, "PublisherApiModule", { enumerable: true, get: function () { return publisher_api_module_1.PublisherApiModule; } });
22
+ var publisher_settings_default_1 = require("./publisher-api/publisher-settings.default");
23
+ Object.defineProperty(exports, "DEFAULT_PUBLISHER_SETTINGS", { enumerable: true, get: function () { return publisher_settings_default_1.DEFAULT_PUBLISHER_SETTINGS; } });
22
24
  var publisher_service_1 = require("./publisher-api/publisher.service");
23
25
  Object.defineProperty(exports, "PublisherService", { enumerable: true, get: function () { return publisher_service_1.PublisherService; } });
24
26
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/modules/clients/index.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAAlD,gHAAA,aAAa,OAAA;AACtB,wDAAsD;AAA7C,2GAAA,WAAW,OAAA;AACpB,8DAA2D;AAAlD,gHAAA,aAAa,OAAA;AACtB,wDAAsD;AAA7C,2GAAA,WAAW,OAAA;AACpB,0EAAuE;AAA9D,wHAAA,iBAAiB,OAAA;AAC1B,oEAAkE;AAAzD,mHAAA,eAAe,OAAA;AACxB,yFAAsF;AAA7E,kIAAA,sBAAsB,OAAA;AAC/B,mFAAiF;AAAxE,6HAAA,oBAAoB,OAAA;AAC7B,6EAA0E;AAAjE,0HAAA,kBAAkB,OAAA;AAC3B,uEAAqE;AAA5D,qHAAA,gBAAgB,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/modules/clients/index.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAAlD,gHAAA,aAAa,OAAA;AACtB,wDAAsD;AAA7C,2GAAA,WAAW,OAAA;AACpB,8DAA2D;AAAlD,gHAAA,aAAa,OAAA;AACtB,wDAAsD;AAA7C,2GAAA,WAAW,OAAA;AACpB,0EAAuE;AAA9D,wHAAA,iBAAiB,OAAA;AAC1B,oEAAkE;AAAzD,mHAAA,eAAe,OAAA;AACxB,yFAAsF;AAA7E,kIAAA,sBAAsB,OAAA;AAC/B,mFAAiF;AAAxE,6HAAA,oBAAoB,OAAA;AAC7B,6EAA0E;AAAjE,0HAAA,kBAAkB,OAAA;AAC3B,yFAAwF;AAA/E,wIAAA,0BAA0B,OAAA;AACnC,uEAAqE;AAA5D,qHAAA,gBAAgB,OAAA"}
@@ -1,5 +1,4 @@
1
1
  import { DynamicModule } from '@nestjs/common';
2
- import { PhoneSet } from '@novo-learning/novo-sdk';
3
2
  export declare class PronunciationApiModule {
4
- static forRoot(pronunciationApi: string, phoneSet: PhoneSet): DynamicModule;
3
+ static forRoot(pronunciationApi: string): DynamicModule;
5
4
  }
@@ -5,13 +5,13 @@ const http_module_1 = require("../../nest/http/http.module");
5
5
  const http_service_1 = require("../../nest/http/http.service");
6
6
  const pronunciation_service_1 = require("./pronunciation.service");
7
7
  class PronunciationApiModule {
8
- static forRoot(pronunciationApi, phoneSet) {
8
+ static forRoot(pronunciationApi) {
9
9
  return {
10
10
  module: PronunciationApiModule,
11
11
  providers: [
12
12
  {
13
13
  provide: pronunciation_service_1.PronunciationService,
14
- useFactory: () => new pronunciation_service_1.PronunciationService(new http_service_1.NovoHttpService(), pronunciationApi, phoneSet),
14
+ useFactory: () => new pronunciation_service_1.PronunciationService(new http_service_1.NovoHttpService(), pronunciationApi),
15
15
  },
16
16
  ],
17
17
  imports: [http_module_1.NovoHttpModule],
@@ -1 +1 @@
1
- {"version":3,"file":"pronunciation-api.module.js","sourceRoot":"","sources":["../../../../src/modules/clients/pronunciation-api/pronunciation-api.module.ts"],"names":[],"mappings":";;;AAEA,6DAA6D;AAC7D,+DAA+D;AAC/D,mEAA+D;AAE/D,MAAa,sBAAsB;IACjC,MAAM,CAAC,OAAO,CAAC,gBAAwB,EAAE,QAAkB;QACzD,OAAO;YACL,MAAM,EAAE,sBAAsB;YAC9B,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,4CAAoB;oBAC7B,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,4CAAoB,CAAC,IAAI,8BAAe,EAAE,EAAE,gBAAgB,EAAE,QAAQ,CAAC;iBAC9F;aACF;YACD,OAAO,EAAE,CAAC,4BAAc,CAAC;YACzB,OAAO,EAAE,CAAC,4CAAoB,CAAC;SAChC,CAAC;IACJ,CAAC;CACF;AAdD,wDAcC"}
1
+ {"version":3,"file":"pronunciation-api.module.js","sourceRoot":"","sources":["../../../../src/modules/clients/pronunciation-api/pronunciation-api.module.ts"],"names":[],"mappings":";;;AACA,6DAA6D;AAC7D,+DAA+D;AAC/D,mEAA+D;AAE/D,MAAa,sBAAsB;IACjC,MAAM,CAAC,OAAO,CAAC,gBAAwB;QACrC,OAAO;YACL,MAAM,EAAE,sBAAsB;YAC9B,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,4CAAoB;oBAC7B,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,4CAAoB,CAAC,IAAI,8BAAe,EAAE,EAAE,gBAAgB,CAAC;iBACpF;aACF;YACD,OAAO,EAAE,CAAC,4BAAc,CAAC;YACzB,OAAO,EAAE,CAAC,4CAAoB,CAAC;SAChC,CAAC;IACJ,CAAC;CACF;AAdD,wDAcC"}
@@ -1,18 +1,16 @@
1
- import { LanguageCode, MetadataDtoV1, PhoneArray, PhoneSet, PhrasePronunciationDtoV2 } from '@novo-learning/novo-sdk';
1
+ import { LanguageCode, MetadataDtoV1, PhoneArray, PhrasePronunciationDtoV2 } from '@novo-learning/novo-sdk';
2
2
  import { NovoHttpService } from '../../nest/http/http.service';
3
3
  export declare const PRONUNCIATION_API = "PRONUNCIATION_API";
4
- export declare const PHONE_SET = "PHONE_SET";
5
4
  export declare class PronunciationService {
6
5
  private readonly httpService;
7
6
  private readonly apiUrl;
8
- private readonly phoneSet;
9
7
  private readonly api;
10
8
  private readonly metadataApi;
11
- constructor(httpService: NovoHttpService, apiUrl: string, phoneSet: PhoneSet);
9
+ constructor(httpService: NovoHttpService, apiUrl: string);
12
10
  getPronunciation(prompt: {
13
11
  phrase: string;
14
12
  confusion?: string | PhoneArray[];
15
- }, accessToken: string): Promise<PhrasePronunciationDtoV2 | {
13
+ }, targetLanguage: LanguageCode, accessToken: string): Promise<PhrasePronunciationDtoV2 | {
16
14
  error: string;
17
15
  }>;
18
16
  getMetadata(phrase: string, targetLanguage: LanguageCode, accessToken: string): Promise<MetadataDtoV1[] | {
@@ -17,17 +17,16 @@ const common_1 = require("@nestjs/common");
17
17
  const novo_sdk_1 = require("@novo-learning/novo-sdk");
18
18
  const http_service_1 = require("../../nest/http/http.service");
19
19
  let PronunciationService = class PronunciationService {
20
- constructor(httpService, apiUrl, phoneSet) {
20
+ constructor(httpService, apiUrl) {
21
21
  this.httpService = httpService;
22
22
  this.apiUrl = apiUrl;
23
- this.phoneSet = phoneSet;
24
23
  const url = this.apiUrl.includes('://') ? this.apiUrl : `http://${this.apiUrl}`;
25
24
  this.api = new novo_sdk_1.PronunciationApi(undefined, url, this.httpService.axiosRef);
26
25
  this.metadataApi = new novo_sdk_1.MetadataApi(undefined, url, this.httpService.axiosRef);
27
26
  }
28
- async getPronunciation(prompt, accessToken) {
27
+ async getPronunciation(prompt, targetLanguage, accessToken) {
29
28
  try {
30
- const { data: pronunciation } = await this.api.getPronunciationsV2({ ...prompt, targetLanguage: novo_sdk_1.PhoneSetToLanguageCodeMap[this.phoneSet].language }, { headers: { Authorization: `Bearer ${accessToken}` } });
29
+ const { data: pronunciation } = await this.api.getPronunciationsV2({ ...prompt, targetLanguage }, { headers: { Authorization: `Bearer ${accessToken}` } });
31
30
  return pronunciation;
32
31
  }
33
32
  catch (err) {
@@ -52,8 +51,7 @@ let PronunciationService = class PronunciationService {
52
51
  };
53
52
  PronunciationService = __decorate([
54
53
  __param(1, (0, common_1.Inject)(exports.PRONUNCIATION_API)),
55
- __param(2, (0, common_1.Inject)(exports.PHONE_SET)),
56
- __metadata("design:paramtypes", [http_service_1.NovoHttpService, String, String])
54
+ __metadata("design:paramtypes", [http_service_1.NovoHttpService, String])
57
55
  ], PronunciationService);
58
56
  exports.PronunciationService = PronunciationService;
59
57
  //# sourceMappingURL=pronunciation.service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"pronunciation.service.js","sourceRoot":"","sources":["../../../../src/modules/clients/pronunciation-api/pronunciation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwC;AACxC,sDASiC;AACjC,+DAA+D;AAKxD,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAI/B,YACmB,WAA4B,EACD,MAAc,EACtB,QAAkB;QAFrC,gBAAW,GAAX,WAAW,CAAiB;QACD,WAAM,GAAN,MAAM,CAAQ;QACtB,aAAQ,GAAR,QAAQ,CAAU;QAEtD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,MAAM,EAAE,CAAC;QAChF,IAAI,CAAC,GAAG,GAAG,IAAI,2BAAgB,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC3E,IAAI,CAAC,WAAW,GAAG,IAAI,sBAAW,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAChF,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAC3B,MAA6D,EAC7D,WAAmB;QAEnB,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAChE,EAAE,GAAG,MAAM,EAAE,cAAc,EAAE,oCAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,EAChF,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,WAAW,EAAE,EAAE,EAAE,CACxD,CAAC;YACF,OAAO,aAAa,CAAC;SAEtB;QAAC,OAAO,GAAQ,EAAE;YACjB,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC;YAC5C,OAAO;gBACL,KAAK,EAAE,GAAG,oBAAoB,CAAC,IAAI,KAAK,OAAO,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,QAAQ,EAAE,UAAU,IAAI,GAAG,CAAC,IAAI,EAAE;aACzG,CAAC;SACH;IACH,CAAC;IAEM,KAAK,CAAC,WAAW,CACtB,MAAc,EACd,cAA4B,EAC5B,WAAmB;QAEnB,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CACnD,EAAE,MAAM,EAAE,cAAc,EAAE,EAC1B,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,WAAW,EAAE,EAAE,EAAE,CACxD,CAAC;YACF,OAAO,IAAI,CAAC;SAEb;QAAC,OAAO,GAAQ,EAAE;YACjB,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC;YAC5C,OAAO;gBACL,KAAK,EAAE,GAAG,oBAAoB,CAAC,IAAI,KAAK,OAAO,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,QAAQ,EAAE,UAAU,IAAI,GAAG,CAAC,IAAI,EAAE;aACzG,CAAC;SACH;IACH,CAAC;CACF,CAAA;AApDY,oBAAoB;IAM5B,WAAA,IAAA,eAAM,EAAC,yBAAiB,CAAC,CAAA;IACzB,WAAA,IAAA,eAAM,EAAC,iBAAS,CAAC,CAAA;qCAFY,8BAAe;GALpC,oBAAoB,CAoDhC;AApDY,oDAAoB"}
1
+ {"version":3,"file":"pronunciation.service.js","sourceRoot":"","sources":["../../../../src/modules/clients/pronunciation-api/pronunciation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwC;AACxC,sDAOiC;AACjC,+DAA+D;AAIxD,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAI/B,YACmB,WAA4B,EACD,MAAc;QADzC,gBAAW,GAAX,WAAW,CAAiB;QACD,WAAM,GAAN,MAAM,CAAQ;QAE1D,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,MAAM,EAAE,CAAC;QAChF,IAAI,CAAC,GAAG,GAAG,IAAI,2BAAgB,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC3E,IAAI,CAAC,WAAW,GAAG,IAAI,sBAAW,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAChF,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAC3B,MAA6D,EAC7D,cAA4B,EAC5B,WAAmB;QAEnB,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAChE,EAAE,GAAG,MAAM,EAAE,cAAc,EAAE,EAC7B,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,WAAW,EAAE,EAAE,EAAE,CACxD,CAAC;YACF,OAAO,aAAa,CAAC;SAEtB;QAAC,OAAO,GAAQ,EAAE;YACjB,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC;YAC5C,OAAO;gBACL,KAAK,EAAE,GAAG,oBAAoB,CAAC,IAAI,KAAK,OAAO,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,QAAQ,EAAE,UAAU,IAAI,GAAG,CAAC,IAAI,EAAE;aACzG,CAAC;SACH;IACH,CAAC;IAEM,KAAK,CAAC,WAAW,CACtB,MAAc,EACd,cAA4B,EAC5B,WAAmB;QAEnB,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CACnD,EAAE,MAAM,EAAE,cAAc,EAAE,EAC1B,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,WAAW,EAAE,EAAE,EAAE,CACxD,CAAC;YACF,OAAO,IAAI,CAAC;SAEb;QAAC,OAAO,GAAQ,EAAE;YACjB,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC;YAC5C,OAAO;gBACL,KAAK,EAAE,GAAG,oBAAoB,CAAC,IAAI,KAAK,OAAO,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,QAAQ,EAAE,UAAU,IAAI,GAAG,CAAC,IAAI,EAAE;aACzG,CAAC;SACH;IACH,CAAC;CACF,CAAA;AApDY,oBAAoB;IAM5B,WAAA,IAAA,eAAM,EAAC,yBAAiB,CAAC,CAAA;qCADI,8BAAe;GALpC,oBAAoB,CAoDhC;AApDY,oDAAoB"}
@@ -0,0 +1,2 @@
1
+ import { PublisherSettingsDto } from '@novo-learning/novo-sdk';
2
+ export declare const DEFAULT_PUBLISHER_SETTINGS: PublisherSettingsDto;
@@ -0,0 +1,33 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.DEFAULT_PUBLISHER_SETTINGS = void 0;
4
+ const novo_sdk_1 = require("@novo-learning/novo-sdk");
5
+ exports.DEFAULT_PUBLISHER_SETTINGS = {
6
+ feedbackSettings: {
7
+ alignment: true,
8
+ correctness: true,
9
+ confidence: true,
10
+ fluency: true,
11
+ accuracy: true,
12
+ phone: true,
13
+ timing: true,
14
+ detectSpeech: true,
15
+ },
16
+ retentionDays: 0,
17
+ authSettings: {
18
+ allowAnonymousLogin: false,
19
+ apiKey: '',
20
+ },
21
+ logSettings: {
22
+ confirmAudioReceived: false,
23
+ },
24
+ languageSettings: {},
25
+ allowedPermissions: [],
26
+ allowedLanguages: Object.values(novo_sdk_1.LanguageCode),
27
+ intermediateResultsSettings: {
28
+ eosDetection: true,
29
+ reportRecognized: true,
30
+ speechTimeout: 3000,
31
+ },
32
+ };
33
+ //# sourceMappingURL=publisher-settings.default.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"publisher-settings.default.js","sourceRoot":"","sources":["../../../../src/modules/clients/publisher-api/publisher-settings.default.ts"],"names":[],"mappings":";;;AAAA,sDAA6E;AAEhE,QAAA,0BAA0B,GAAyB;IAC9D,gBAAgB,EAAE;QAChB,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,IAAI;QACjB,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;QACZ,YAAY,EAAE,IAAI;KACnB;IACD,aAAa,EAAE,CAAC;IAChB,YAAY,EAAE;QACZ,mBAAmB,EAAE,KAAK;QAC1B,MAAM,EAAE,EAAE;KACX;IACD,WAAW,EAAE;QACX,oBAAoB,EAAE,KAAK;KAC5B;IACD,gBAAgB,EAAE,EAAE;IACpB,kBAAkB,EAAE,EAAE;IACtB,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,uBAAY,CAAC;IAC7C,2BAA2B,EAAE;QAC3B,YAAY,EAAE,IAAI;QAClB,gBAAgB,EAAE,IAAI;QACtB,aAAa,EAAE,IAAI;KACpB;CACF,CAAC"}
@@ -20,9 +20,7 @@ export declare class PublisherService {
20
20
  private makeKey;
21
21
  constructor(httpService: NovoHttpService, authService: AuthService, apiUrl: string, cacheManager: Cache, cacheTtl: number, name: string, token: string);
22
22
  private _getPublisher;
23
- getPublisher(id: string): Promise<PublisherResponseDto | {
24
- error: string;
25
- }>;
23
+ getPublisher(id: string): Promise<PublisherResponseDto>;
26
24
  publisherAllowed(publisherId: string, languageCode: LanguageCode): Promise<boolean>;
27
25
  private _getConfigurations;
28
26
  getConfigurations(language: LanguageCode): Promise<ConfigurationDto[] | {
@@ -18,6 +18,7 @@ const novo_sdk_1 = require("@novo-learning/novo-sdk");
18
18
  const axios_retry_1 = require("axios-retry");
19
19
  const http_service_1 = require("../../nest/http/http.service");
20
20
  const auth_service_1 = require("../auth-api/auth.service");
21
+ const publisher_settings_default_1 = require("./publisher-settings.default");
21
22
  let PublisherService = class PublisherService {
22
23
  constructor(httpService, authService, apiUrl, cacheManager, cacheTtl, name, token) {
23
24
  this.httpService = httpService;
@@ -42,15 +43,21 @@ let PublisherService = class PublisherService {
42
43
  headers: { Authorization: `Bearer ${accessToken}` },
43
44
  });
44
45
  await this.cacheManager.set(this.makeKey(id), publisher, { ttl: this.cacheTtl });
45
- setTimeout(() => this._getPublisher(id), 0.95 * 1000 * this.cacheTtl);
46
46
  return publisher;
47
47
  }
48
48
  catch (err) {
49
- setTimeout(() => this._getPublisher(id), 0.95 * 1000 * this.cacheTtl);
50
49
  const message = err.response?.data?.message;
51
50
  const error = `${PublisherService.name}: ${message || err.message || err.response?.statusText || err.code}`;
52
51
  this.logger.error(error);
53
- return { error };
52
+ const cachedPublisher = await this.cacheManager.get(this.makeKey(id));
53
+ if (cachedPublisher) {
54
+ await this.cacheManager.set(this.makeKey(id), cachedPublisher, { ttl: this.cacheTtl });
55
+ return cachedPublisher;
56
+ }
57
+ return { id, settings: publisher_settings_default_1.DEFAULT_PUBLISHER_SETTINGS };
58
+ }
59
+ finally {
60
+ setTimeout(() => this._getPublisher(id), 0.95 * 1000 * this.cacheTtl);
54
61
  }
55
62
  }
56
63
  async getPublisher(id) {
@@ -62,10 +69,6 @@ let PublisherService = class PublisherService {
62
69
  }
63
70
  async publisherAllowed(publisherId, languageCode) {
64
71
  const publisher = await this.getPublisher(publisherId);
65
- if ('error' in publisher) {
66
- this.logger.error(publisher.error);
67
- return true;
68
- }
69
72
  return publisher.settings?.allowedLanguages.includes(languageCode) ?? true;
70
73
  }
71
74
  async _getConfigurations(language) {
@@ -1 +1 @@
1
- {"version":3,"file":"publisher.service.js","sourceRoot":"","sources":["../../../../src/modules/clients/publisher-api/publisher.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"publisher.service.js","sourceRoot":"","sources":["../../../../src/modules/clients/publisher-api/publisher.service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@novo-learning/service-lib",
3
- "version": "1.5.2",
3
+ "version": "1.6.0",
4
4
  "description": "Common components for Novo services",
5
5
  "license": "UNLICENSED",
6
6
  "main": "dist/index.js",
@@ -41,7 +41,7 @@
41
41
  "@nestjs/core": "^10.4.4",
42
42
  "@nestjs/mongoose": "^10.0.10",
43
43
  "@nestjs/passport": "^10.0.3",
44
- "@novo-learning/novo-sdk": "^0.5.2",
44
+ "@novo-learning/novo-sdk": "^0.6.0",
45
45
  "@types/validator": "^13.12.2",
46
46
  "axios": "^1.7.7",
47
47
  "axios-retry": "^4.5.0",