Skip to content

Commit

Permalink
ref: do not log known errors in handlers
Browse files Browse the repository at this point in the history
  • Loading branch information
akiver committed Jan 31, 2025
1 parent 73cb0b9 commit 76678a7
Show file tree
Hide file tree
Showing 22 changed files with 44 additions and 118 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import type { DemosTableFilter } from 'csdm/node/database/demos/demos-table-filter';
import { fetchDemosTable } from 'csdm/node/database/demos/fetch-demos-table';
import { server } from 'csdm/server/server';
import { RendererServerMessageName } from 'csdm/server/renderer-server-message-name';
import { handleError } from '../../handle-error';

export async function fetchDemosTableHandler(filter: DemosTableFilter) {
try {
Expand All @@ -20,9 +20,6 @@ export async function fetchDemosTableHandler(filter: DemosTableFilter) {

return demos;
} catch (error) {
logger.error('Error while fetching demos table');
logger.error(error);
const errorCode = getErrorCodeFromError(error);
throw errorCode;
handleError(error, 'Error while fetching demos table');
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { DemoType } from 'csdm/common/types/counter-strike';
import { updateDemosType } from 'csdm/node/database/demos/update-demos-type';
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import { handleError } from '../../handle-error';

export type UpdateDemosTypePayload = {
checksums: string[];
Expand All @@ -11,9 +11,6 @@ export async function updateDemosTypeHandler({ checksums, type }: UpdateDemosTyp
try {
await updateDemosType(checksums, type);
} catch (error) {
logger.error('Error while updating demos type');
logger.error(error);
const errorCode = getErrorCodeFromError(error);
throw errorCode;
handleError(error, 'Error while updating demos type');
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import { downloadDemoQueue } from 'csdm/server/download-queue';
import { getErrorCodeFromError } from '../../../get-error-code-from-error';
import { handleError } from '../../handle-error';

export async function abortDownloadHandler(matchId: string) {
try {
downloadDemoQueue.abortDownload(matchId);
return Promise.resolve();
} catch (error) {
logger.error(`Error while aborting download with match id ${matchId}`);
logger.error(error);
const errorCode = getErrorCodeFromError(error);
throw errorCode;
handleError(error, `Error while aborting download with match id ${matchId}`);
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import { downloadDemoQueue } from 'csdm/server/download-queue';
import { getErrorCodeFromError } from '../../../get-error-code-from-error';
import { handleError } from '../../handle-error';

export async function abortDownloadsHandler() {
try {
downloadDemoQueue.abortDownloads();
return Promise.resolve();
} catch (error) {
logger.error('Error while aborting downloads');
logger.error(error);
const errorCode = getErrorCodeFromError(error);
throw errorCode;
handleError(error, 'Error while aborting downloads');
}
}
7 changes: 2 additions & 5 deletions src/server/handlers/renderer-process/map/add-map-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import { writeMapThumbnailFileFromBase64 } from 'csdm/node/filesystem/maps/write
import { writeMapRadarFileFromBase64 } from 'csdm/node/filesystem/maps/write-map-radar-image-from-base64';
import { insertMaps } from 'csdm/node/database/maps/insert-maps';
import { writeMapLowerRadarFileFromBase64 } from 'csdm/node/filesystem/maps/write-map-lower-radar-file-from-base64';
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import type { MapPayload } from './map-payload';
import type { InsertableMap } from 'csdm/node/database/maps/map-table';
import { mapRowToMap } from 'csdm/node/database/maps/map-row-to-map';
import { isPngBase64String } from 'csdm/node/filesystem/is-png-base64-string';
import { handleError } from '../../handle-error';

export async function addMapHandler({
name,
Expand Down Expand Up @@ -46,9 +46,6 @@ export async function addMapHandler({

return map;
} catch (error) {
logger.error('Error while adding map');
logger.error(error);
const errorCode = getErrorCodeFromError(error);
throw errorCode;
handleError(error, 'Error while adding map');
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import type { Map } from 'csdm/common/types/map';
import { deleteMap } from 'csdm/node/database/maps/delete-map';
import { handleError } from '../../handle-error';

export async function deleteMapHandler(map: Map) {
try {
await deleteMap(map);
} catch (error) {
logger.error('Error while deleting map');
logger.error(error);
throw error;
handleError(error, 'Error while deleting map');
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Game } from 'csdm/common/types/counter-strike';
import { fetchMaps } from 'csdm/node/database/maps/fetch-maps';
import { resetDefaultMaps } from 'csdm/node/database/maps/reset-default-maps';
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import { handleError } from '../../handle-error';

export async function resetMapsHandler(game: Game) {
try {
Expand All @@ -10,9 +10,6 @@ export async function resetMapsHandler(game: Game) {

return maps;
} catch (error) {
const errorCode = getErrorCodeFromError(error);
logger.error('Error while resetting maps');
logger.error(error);
throw errorCode;
handleError(error, 'Error while resetting maps');
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import { getMapRadarBase64 } from 'csdm/node/filesystem/maps/get-map-radar-base6
import { updateMap } from 'csdm/node/database/maps/update-map';
import { getMapLowerRadarBase64 } from 'csdm/node/filesystem/maps/get-map-lower-radar-base64';
import { writeMapLowerRadarFileFromBase64 } from 'csdm/node/filesystem/maps/write-map-lower-radar-file-from-base64';
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import type { MapPayload } from './map-payload';
import type { UpdatableMap } from 'csdm/node/database/maps/map-table';
import { mapRowToMap } from 'csdm/node/database/maps/map-row-to-map';
import { isPngBase64String } from 'csdm/node/filesystem/is-png-base64-string';
import { handleError } from '../../handle-error';

export async function updateMapHandler({
id,
Expand Down Expand Up @@ -57,9 +57,6 @@ export async function updateMapHandler({

return updatedMap;
} catch (error) {
logger.error('Error while updating map');
logger.error(error);
const errorCode = getErrorCodeFromError(error);
throw errorCode;
handleError(error, 'Error while updating map');
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { fetchMatchKillsPoints } from 'csdm/node/database/heatmap/fetch-match-ki
import { fetchMatchShotsPoints } from 'csdm/node/database/heatmap/fetch-match-shots-points';
import type { Point } from 'csdm/common/types/point';
import { fetchMatchGrenadePoints } from 'csdm/node/database/heatmap/fetch-match-grenade-points';
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import { assertNever } from 'csdm/common/assert-never';
import { handleError } from '../../handle-error';

export async function fetchMatchHeatmapPointsHandler(filter: MatchHeatmapFilter) {
try {
Expand All @@ -31,9 +31,6 @@ export async function fetchMatchHeatmapPointsHandler(filter: MatchHeatmapFilter)

return points;
} catch (error) {
logger.error('Error while fetching match heatmap points');
logger.error(error);
const errorCode = getErrorCodeFromError(error);
throw errorCode;
handleError(error, 'Error while fetching match heatmap points');
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { fetchMatchesTable } from 'csdm/node/database/matches/fetch-matches-table';
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import type { MatchTable } from 'csdm/common/types/match-table';
import type { MatchesTableFilter } from 'csdm/node/database/matches/matches-table-filter';
import { handleError } from '../../handle-error';

export type FetchMatchesTablePayload = MatchesTableFilter;

Expand All @@ -11,9 +11,6 @@ export async function fetchMatchesTableHandler(payload: FetchMatchesTablePayload

return matches;
} catch (error) {
logger.error('Error while fetching matches table');
logger.error(error);
const errorCode = getErrorCodeFromError(error);
throw errorCode;
handleError(error, 'Error while fetching matches table');
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { updateMatchesTeamNames } from 'csdm/node/database/matches/update-matches-teams-names';
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import { RendererServerMessageName } from 'csdm/server/renderer-server-message-name';
import { server } from 'csdm/server/server';
import type { TeamNamesPerChecksum } from 'csdm/node/database/matches/fetch-team-names-per-checksum';
import { abortRendererController, createRendererAbortController } from 'csdm/server/abort-controller';
import { handleError } from '../../handle-error';

export type UpdateMatchesTeamNamesPayload = {
checksums: string[];
Expand Down Expand Up @@ -37,10 +37,7 @@ export async function updateMatchesTeamNamesHandler({

return checksumsUpdated;
} catch (error) {
logger.error('Error while updating matches team names');
logger.error(error);
const errorCode = getErrorCodeFromError(error);
throw errorCode;
handleError(error, 'Error while updating matches team names');
} finally {
abortRendererController();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { DemoType } from 'csdm/common/types/counter-strike';
import { updateMatchesType } from 'csdm/node/database/matches/update-matches-type';
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import { handleError } from '../../handle-error';

export type UpdateMatchesTypePayload = {
checksums: string[];
Expand All @@ -11,9 +11,6 @@ export async function updateMatchesTypeHandler({ checksums, type }: UpdateMatche
try {
await updateMatchesType(checksums, type);
} catch (error) {
logger.error('Error while updating matches type');
logger.error(error);
const errorCode = getErrorCodeFromError(error);
throw errorCode;
handleError(error, 'Error while updating matches type');
}
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
import { fetchPlayer } from 'csdm/node/database/player/fetch-player';
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import type { FetchPlayerFilters } from 'csdm/node/database/player/fetch-player-filters';
import { ErrorCode } from 'csdm/common/error-code';
import { handleError } from '../../handle-error';

export async function fetchPlayerHandler(payload: FetchPlayerFilters) {
try {
const player = await fetchPlayer(payload);

return player;
} catch (error) {
const errorCode = getErrorCodeFromError(error);
if (errorCode === ErrorCode.UnknownError) {
logger.error(`Error while fetching player with steamID ${payload.steamId}`);
logger.error(error);
}
throw errorCode;
handleError(error, `Error while fetching player with steamID ${payload.steamId}`);
}
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
import { fetchPlayersTable } from 'csdm/node/database/players/fetch-players-table';
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import type { PlayersTableFilter } from 'csdm/node/database/players/players-table-filter';
import { handleError } from '../../handle-error';

export async function fetchPlayersHandler(filter: PlayersTableFilter) {
try {
const players = await fetchPlayersTable(filter);

return players;
} catch (error) {
logger.error('Error while fetching players table');
logger.error(error);
const errorCode = getErrorCodeFromError(error);
throw errorCode;
handleError(error, 'Error while fetching players table');
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import { updateSteamAccountName } from 'csdm/node/database/steam-accounts/update-steam-account-name';
import { handleError } from '../../handle-error';

export type UpdateSteamAccountNamePayload = {
steamId: string;
Expand All @@ -10,9 +10,6 @@ export async function updateSteamAccountNameHandler({ steamId, name }: UpdateSte
try {
return await updateSteamAccountName(steamId, name);
} catch (error) {
logger.error('Error while updating steam account name');
logger.error(error);
const errorCode = getErrorCodeFromError(error);
throw errorCode;
handleError(error, 'Error while updating steam account name');
}
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import { deleteTag } from 'csdm/node/database/tags/delete-tag';
import { removeTagIdFromSettings } from 'csdm/node/settings/remove-tag-id-from-settings';
import { handleError } from '../../handle-error';

export async function deleteTagHandler(tagId: string) {
try {
await deleteTag(tagId);
await removeTagIdFromSettings(tagId);
} catch (error) {
logger.error('Error while deleting tag');
logger.error(error);
const errorCode = getErrorCodeFromError(error);
throw errorCode;
handleError(error, 'Error while deleting tag');
}
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import type { Tag } from 'csdm/common/types/tag';
import { insertTag } from 'csdm/node/database/tags/insert-tag';
import { handleError } from '../../handle-error';

export async function insertTagHandler(tag: Omit<Tag, 'id'>) {
try {
const newTag = await insertTag(tag);

return newTag;
} catch (error) {
logger.error('Error while inserting tag');
logger.error(error);
const errorCode = getErrorCodeFromError(error);
throw errorCode;
handleError(error, 'Error while inserting tag');
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import type { Tag } from 'csdm/common/types/tag';
import { updateTag } from 'csdm/node/database/tags/update-tag';
import { handleError } from '../../handle-error';

export async function updateTagHandler(tag: Tag) {
try {
await updateTag(tag);
} catch (error) {
logger.error('Error while updating tag');
logger.error(error);
const errorCode = getErrorCodeFromError(error);
throw errorCode;
handleError(error, 'Error while updating tag');
}
}
10 changes: 2 additions & 8 deletions src/server/handlers/renderer-process/team/fetch-team-handler.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
import { ErrorCode } from 'csdm/common/error-code';
import { fetchTeam } from 'csdm/node/database/team/fetch-team';
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import type { FetchTeamFilters } from 'csdm/node/database/team/fetch-team-filters';
import { handleError } from '../../handle-error';

export async function fetchTeamHandler(payload: FetchTeamFilters) {
try {
const team = await fetchTeam(payload);

return team;
} catch (error) {
const errorCode = getErrorCodeFromError(error);
if (errorCode === ErrorCode.UnknownError) {
logger.error(`Error while fetching team with name ${payload.name}`);
logger.error(error);
}
throw errorCode;
handleError(error, `Error while fetching team with name ${payload.name}`);
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { TeamHeatmapFilter } from 'csdm/common/types/heatmap-filters';
import { HeatmapEvent } from 'csdm/common/types/heatmap-event';
import type { Point } from 'csdm/common/types/point';
import { getErrorCodeFromError } from 'csdm/server/get-error-code-from-error';
import { assertNever } from 'csdm/common/assert-never';
import { fetchTeamKillsPoints } from 'csdm/node/database/heatmap/fetch-team-kills-points';
import { fetchTeamShotsPoints } from 'csdm/node/database/heatmap/fetch-team-shots-points';
import { fetchTeamGrenadePoints } from 'csdm/node/database/heatmap/fetch-team-grenade-points';
import { handleError } from '../../handle-error';

export async function fetchTeamHeatmapPointsHandler(filter: TeamHeatmapFilter) {
try {
Expand All @@ -31,9 +31,6 @@ export async function fetchTeamHeatmapPointsHandler(filter: TeamHeatmapFilter) {

return points;
} catch (error) {
logger.error('Error while fetching team heatmap points');
logger.error(error);
const errorCode = getErrorCodeFromError(error);
throw errorCode;
handleError(error, 'Error while fetching team heatmap points');
}
}
Loading

0 comments on commit 76678a7

Please sign in to comment.