Browse Source

Improve error handling

pull/5413/head
Thomas Kaul 4 months ago
parent
commit
4ea383d687
  1. 5
      apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts
  2. 4
      apps/api/src/services/data-provider/data-provider.service.ts
  3. 14
      apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts
  4. 3
      apps/api/src/services/data-provider/financial-modeling-prep/financial-modeling-prep.service.ts
  5. 161
      apps/api/src/services/data-provider/ghostfolio/ghostfolio.service.ts
  6. 11
      apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts
  7. 17
      apps/api/src/services/data-provider/manual/manual.service.ts
  8. 11
      apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts

5
apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts

@ -163,7 +163,7 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
public async getAssetProfile(
aSymbol: string
): Promise<Partial<SymbolProfile>> {
const response: Partial<SymbolProfile> = {};
let response: Partial<SymbolProfile> = {};
try {
let symbol = aSymbol;
@ -241,10 +241,13 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
}
const url = assetProfile.summaryProfile?.website;
if (url) {
response.url = url;
}
} catch (error) {
response = undefined;
if (error.message === `Quote not found for symbol: ${aSymbol}`) {
throw new AssetProfileDelistedError(
`No data found, ${aSymbol} (${this.getName()}) may be delisted`

4
apps/api/src/services/data-provider/data-provider.service.ts

@ -107,7 +107,9 @@ export class DataProviderService implements OnModuleInit {
promises.push(
promise.then((symbolProfile) => {
response[symbol] = symbolProfile;
if (symbolProfile) {
response[symbol] = symbolProfile;
}
})
);
}

14
apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts

@ -55,14 +55,18 @@ export class EodHistoricalDataService implements DataProviderInterface {
}: GetAssetProfileParams): Promise<Partial<SymbolProfile>> {
const [searchResult] = await this.getSearchResult(symbol);
if (!searchResult) {
return undefined;
}
return {
symbol,
assetClass: searchResult?.assetClass,
assetSubClass: searchResult?.assetSubClass,
currency: this.convertCurrency(searchResult?.currency),
assetClass: searchResult.assetClass,
assetSubClass: searchResult.assetSubClass,
currency: this.convertCurrency(searchResult.currency),
dataSource: this.getName(),
isin: searchResult?.isin,
name: searchResult?.name
isin: searchResult.isin,
name: searchResult.name
};
}

3
apps/api/src/services/data-provider/financial-modeling-prep/financial-modeling-prep.service.ts

@ -64,7 +64,7 @@ export class FinancialModelingPrepService implements DataProviderInterface {
requestTimeout = this.configurationService.get('REQUEST_TIMEOUT'),
symbol
}: GetAssetProfileParams): Promise<Partial<SymbolProfile>> {
const response: Partial<SymbolProfile> = {
let response: Partial<SymbolProfile> = {
symbol,
dataSource: this.getName()
};
@ -201,6 +201,7 @@ export class FinancialModelingPrepService implements DataProviderInterface {
}
} catch (error) {
let message = error;
response = undefined;
if (['AbortError', 'TimeoutError'].includes(error?.name)) {
message = `RequestError: The operation to get the asset profile for ${symbol} was aborted because the request to the data provider took more than ${(

161
apps/api/src/services/data-provider/ghostfolio/ghostfolio.service.ts

@ -51,19 +51,26 @@ export class GhostfolioService implements DataProviderInterface {
requestTimeout = this.configurationService.get('REQUEST_TIMEOUT'),
symbol
}: GetAssetProfileParams): Promise<Partial<SymbolProfile>> {
let response: DataProviderGhostfolioAssetProfileResponse = {};
let response: DataProviderGhostfolioAssetProfileResponse;
try {
const assetProfile = (await fetch(
const res = await fetch(
`${this.URL}/v1/data-providers/ghostfolio/asset-profile/${symbol}`,
{
headers: await this.getRequestHeaders(),
signal: AbortSignal.timeout(requestTimeout)
}
).then((res) =>
res.json()
)) as DataProviderGhostfolioAssetProfileResponse;
);
if (!res.ok) {
throw new Response(await res.text(), {
status: res.status,
statusText: res.statusText
});
}
const assetProfile =
(await res.json()) as DataProviderGhostfolioAssetProfileResponse;
response = assetProfile;
} catch (error) {
let message = error;
@ -72,18 +79,15 @@ export class GhostfolioService implements DataProviderInterface {
message = `RequestError: The operation to get the asset profile for ${symbol} was aborted because the request to the data provider took more than ${(
requestTimeout / 1000
).toFixed(3)} seconds`;
} else if (error?.status === StatusCodes.TOO_MANY_REQUESTS) {
message = 'RequestError: The daily request limit has been exceeded';
} else if (
error?.response?.statusCode === StatusCodes.TOO_MANY_REQUESTS
[StatusCodes.FORBIDDEN, StatusCodes.UNAUTHORIZED].includes(
error?.status
)
) {
message = 'RequestError: The daily request limit has been exceeded';
} else if (error?.response?.statusCode === StatusCodes.UNAUTHORIZED) {
if (!error?.request?.options?.headers?.authorization?.includes('-')) {
message =
'RequestError: The provided API key is invalid. Please update it in the Settings section of the Admin Control panel.';
} else {
message =
'RequestError: The provided API key has expired. Please request a new one and update it in the Settings section of the Admin Control panel.';
}
message =
'RequestError: The API key is invalid. Please update it in the Settings section of the Admin Control panel.';
}
Logger.error(message, 'GhostfolioService');
@ -115,7 +119,7 @@ export class GhostfolioService implements DataProviderInterface {
} = {};
try {
const { dividends } = (await fetch(
const res = await fetch(
`${this.URL}/v2/data-providers/ghostfolio/dividends/${symbol}?from=${format(from, DATE_FORMAT)}&granularity=${granularity}&to=${format(
to,
DATE_FORMAT
@ -124,22 +128,29 @@ export class GhostfolioService implements DataProviderInterface {
headers: await this.getRequestHeaders(),
signal: AbortSignal.timeout(requestTimeout)
}
).then((res) => res.json())) as DividendsResponse;
);
if (!res.ok) {
throw new Response(await res.text(), {
status: res.status,
statusText: res.statusText
});
}
const { dividends } = (await res.json()) as DividendsResponse;
response = dividends;
} catch (error) {
let message = error;
if (error.response?.statusCode === StatusCodes.TOO_MANY_REQUESTS) {
if (error?.status === StatusCodes.TOO_MANY_REQUESTS) {
message = 'RequestError: The daily request limit has been exceeded';
} else if (error.response?.statusCode === StatusCodes.UNAUTHORIZED) {
if (!error.request?.options?.headers?.authorization?.includes('-')) {
message =
'RequestError: The provided API key is invalid. Please update it in the Settings section of the Admin Control panel.';
} else {
message =
'RequestError: The provided API key has expired. Please request a new one and update it in the Settings section of the Admin Control panel.';
}
} else if (
[StatusCodes.FORBIDDEN, StatusCodes.UNAUTHORIZED].includes(
error?.status
)
) {
message =
'RequestError: The API key is invalid. Please update it in the Settings section of the Admin Control panel.';
}
Logger.error(message, 'GhostfolioService');
@ -158,7 +169,7 @@ export class GhostfolioService implements DataProviderInterface {
[symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
}> {
try {
const { historicalData } = (await fetch(
const res = await fetch(
`${this.URL}/v2/data-providers/ghostfolio/historical/${symbol}?from=${format(from, DATE_FORMAT)}&granularity=${granularity}&to=${format(
to,
DATE_FORMAT
@ -167,27 +178,36 @@ export class GhostfolioService implements DataProviderInterface {
headers: await this.getRequestHeaders(),
signal: AbortSignal.timeout(requestTimeout)
}
).then((res) => res.json())) as HistoricalResponse;
);
if (!res.ok) {
throw new Response(await res.text(), {
status: res.status,
statusText: res.statusText
});
}
const { historicalData } = (await res.json()) as HistoricalResponse;
return {
[symbol]: historicalData
};
} catch (error) {
let message = error;
if (error.response?.statusCode === StatusCodes.TOO_MANY_REQUESTS) {
message = 'RequestError: The daily request limit has been exceeded';
} else if (error.response?.statusCode === StatusCodes.UNAUTHORIZED) {
if (!error.request?.options?.headers?.authorization?.includes('-')) {
message =
'RequestError: The provided API key is invalid. Please update it in the Settings section of the Admin Control panel.';
} else {
message =
'RequestError: The provided API key has expired. Please request a new one and update it in the Settings section of the Admin Control panel.';
}
if (error?.status === StatusCodes.TOO_MANY_REQUESTS) {
error.name = 'RequestError';
error.message =
'RequestError: The daily request limit has been exceeded';
} else if (
[StatusCodes.FORBIDDEN, StatusCodes.UNAUTHORIZED].includes(
error?.status
)
) {
error.name = 'RequestError';
error.message =
'RequestError: The API key is invalid. Please update it in the Settings section of the Admin Control panel.';
}
Logger.error(message, 'GhostfolioService');
Logger.error(error.message, 'GhostfolioService');
throw new Error(
`Could not get historical market data for ${symbol} (${this.getName()}) from ${format(
@ -219,14 +239,22 @@ export class GhostfolioService implements DataProviderInterface {
}
try {
const { quotes } = (await fetch(
const res = await fetch(
`${this.URL}/v2/data-providers/ghostfolio/quotes?symbols=${symbols.join(',')}`,
{
headers: await this.getRequestHeaders(),
signal: AbortSignal.timeout(requestTimeout)
}
).then((res) => res.json())) as QuotesResponse;
);
if (!res.ok) {
throw new Response(await res.text(), {
status: res.status,
statusText: res.statusText
});
}
const { quotes } = (await res.json()) as QuotesResponse;
response = quotes;
} catch (error) {
let message = error;
@ -237,18 +265,15 @@ export class GhostfolioService implements DataProviderInterface {
)} was aborted because the request to the data provider took more than ${(
requestTimeout / 1000
).toFixed(3)} seconds`;
} else if (error?.status === StatusCodes.TOO_MANY_REQUESTS) {
message = 'RequestError: The daily request limit has been exceeded';
} else if (
error?.response?.statusCode === StatusCodes.TOO_MANY_REQUESTS
[StatusCodes.FORBIDDEN, StatusCodes.UNAUTHORIZED].includes(
error?.status
)
) {
message = 'RequestError: The daily request limit has been exceeded';
} else if (error?.response?.statusCode === StatusCodes.UNAUTHORIZED) {
if (!error?.request?.options?.headers?.authorization?.includes('-')) {
message =
'RequestError: The provided API key is invalid. Please update it in the Settings section of the Admin Control panel.';
} else {
message =
'RequestError: The provided API key has expired. Please request a new one and update it in the Settings section of the Admin Control panel.';
}
message =
'RequestError: The API key is invalid. Please update it in the Settings section of the Admin Control panel.';
}
Logger.error(message, 'GhostfolioService');
@ -268,13 +293,22 @@ export class GhostfolioService implements DataProviderInterface {
let searchResult: LookupResponse = { items: [] };
try {
searchResult = (await fetch(
const res = await fetch(
`${this.URL}/v2/data-providers/ghostfolio/lookup?query=${query}`,
{
headers: await this.getRequestHeaders(),
signal: AbortSignal.timeout(requestTimeout)
}
).then((res) => res.json())) as LookupResponse;
);
if (!res.ok) {
throw new Response(await res.text(), {
status: res.status,
statusText: res.statusText
});
}
searchResult = (await res.json()) as LookupResponse;
} catch (error) {
let message = error;
@ -282,18 +316,15 @@ export class GhostfolioService implements DataProviderInterface {
message = `RequestError: The operation to search for ${query} was aborted because the request to the data provider took more than ${(
requestTimeout / 1000
).toFixed(3)} seconds`;
} else if (error?.status === StatusCodes.TOO_MANY_REQUESTS) {
message = 'RequestError: The daily request limit has been exceeded';
} else if (
error?.response?.statusCode === StatusCodes.TOO_MANY_REQUESTS
[StatusCodes.FORBIDDEN, StatusCodes.UNAUTHORIZED].includes(
error?.status
)
) {
message = 'RequestError: The daily request limit has been exceeded';
} else if (error.response?.statusCode === StatusCodes.UNAUTHORIZED) {
if (!error?.request?.options?.headers?.authorization?.includes('-')) {
message =
'RequestError: The provided API key is invalid. Please update it in the Settings section of the Admin Control panel.';
} else {
message =
'RequestError: The provided API key has expired. Please request a new one and update it in the Settings section of the Admin Control panel.';
}
message =
'RequestError: The API key is invalid. Please update it in the Settings section of the Admin Control panel.';
}
Logger.error(message, 'GhostfolioService');

11
apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts

@ -36,13 +36,10 @@ export class GoogleSheetsService implements DataProviderInterface {
return true;
}
public async getAssetProfile({
symbol
}: GetAssetProfileParams): Promise<Partial<SymbolProfile>> {
return {
symbol,
dataSource: this.getName()
};
public async getAssetProfile({}: GetAssetProfileParams): Promise<
Partial<SymbolProfile>
> {
return undefined;
}
public getDataProviderInfo(): DataProviderInfo {

17
apps/api/src/services/data-provider/manual/manual.service.ts

@ -45,21 +45,20 @@ export class ManualService implements DataProviderInterface {
public async getAssetProfile({
symbol
}: GetAssetProfileParams): Promise<Partial<SymbolProfile>> {
const assetProfile: Partial<SymbolProfile> = {
symbol,
dataSource: this.getName()
};
const [symbolProfile] = await this.symbolProfileService.getSymbolProfiles([
{ symbol, dataSource: this.getName() }
]);
if (symbolProfile) {
assetProfile.currency = symbolProfile.currency;
assetProfile.name = symbolProfile.name;
if (!symbolProfile) {
return undefined;
}
return assetProfile;
return {
symbol,
currency: symbolProfile.currency,
dataSource: this.getName(),
name: symbolProfile.name
};
}
public getDataProviderInfo(): DataProviderInfo {

11
apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts

@ -35,13 +35,10 @@ export class RapidApiService implements DataProviderInterface {
return !!this.configurationService.get('API_KEY_RAPID_API');
}
public async getAssetProfile({
symbol
}: GetAssetProfileParams): Promise<Partial<SymbolProfile>> {
return {
symbol,
dataSource: this.getName()
};
public async getAssetProfile({}: GetAssetProfileParams): Promise<
Partial<SymbolProfile>
> {
return undefined;
}
public getDataProviderInfo(): DataProviderInfo {

Loading…
Cancel
Save