+4 -4

config/config.json.example

Reviewed

··· 2 2 "debugMode": false, 3 3 "disableWeb": false, 4 4 "sourceDefaults": { 5 5 - "maxPollRetries": 1, 6 6 - "maxRequestRetries": 1, 7 7 - "retryMultiplier": 1.5, 8 5 "options": { 9 6 "logPayload": false, 10 7 "logFilterFailure": "warn", ··· 12 9 "scrobbleThresholds": { 13 10 "duration": 30, 14 11 "percent": 50 15 15 - } 12 12 + }, 13 13 + "maxPollRetries": 1, 14 14 + "maxRequestRetries": 1, 15 15 + "retryMultiplier": 1.5 16 16 } 17 17 }, 18 18 "clientDefaults": {

+2 -2

src/backend/common/infrastructure/config/source/index.ts

Reviewed

··· 39 39 percent?: number | null 40 40 } 41 41 42 42 - export interface CommonSourceOptions { 42 42 + export interface CommonSourceOptions extends SourceRetryOptions { 43 43 /** 44 44 * If this source has INGRESS to MS (sends a payload, rather than MS GETTING requesting a payload) 45 45 * then setting this option to true will make MS log the payload JSON to DEBUG output ··· 90 90 scrobbleThresholds?: ScrobbleThresholds 91 91 } 92 92 93 93 - export interface CommonSourceData extends CommonData, SourceRetryOptions { 93 93 + export interface CommonSourceData extends CommonData { 94 94 95 95 } 96 96

+2 -2

src/backend/sources/AbstractSource.ts

Reviewed

··· 397 397 this.pollRetries = 0; 398 398 399 399 const { 400 400 - data: { 400 400 + options: { 401 401 maxPollRetries = 5, 402 402 retryMultiplier = DEFAULT_RETRY_MULTIPLIER, 403 403 - } = {}, 403 403 + } 404 404 } = this.config; 405 405 406 406 // can't have negative retries!

+1 -1

src/backend/sources/DeezerSource.ts

Reviewed

··· 142 142 const { 143 143 maxRequestRetries = 1, 144 144 retryMultiplier = DEFAULT_RETRY_MULTIPLIER 145 145 - } = this.config.data; 145 145 + } = this.config.options; 146 146 147 147 req.query({ 148 148 access_token: this.config.data.accessToken,

+1 -1

src/backend/sources/SpotifySource.ts

Reviewed

··· 414 414 const { 415 415 maxRequestRetries = 1, 416 416 retryMultiplier = 2, 417 417 - } = this.config.data; 417 417 + } = this.config.options; 418 418 try { 419 419 return await func(this.spotifyApi); 420 420 } catch (e) {

+9 -5

src/backend/sources/SubsonicSource.ts

Reviewed

··· 70 70 71 71 callApi = async <T extends SubsonicResponseCommon = SubsonicResponseCommon>(req: Request, retries = 0): Promise<T> => { 72 72 const { 73 73 - user, 74 74 - password, 75 75 - maxRequestRetries = 1, 76 76 - retryMultiplier = DEFAULT_RETRY_MULTIPLIER 77 77 - } = this.config.data; 73 73 + data: { 74 74 + user, 75 75 + password 76 76 + } = {}, 77 77 + options: { 78 78 + maxRequestRetries = 1, 79 79 + retryMultiplier = DEFAULT_RETRY_MULTIPLIER 80 80 + } = {}, 81 81 + } = this.config; 78 82 79 83 const queryOpts: Record<string, string> = { 80 84 u: user,