eliott/worldmonitor
1
0
Fork 0
mirror of https://github.com/koala73/worldmonitor.git synced 2026-04-25 17:14:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(services): unsafe non-null assertions on protobuf response fields (#1826)

Browse Source 
* refactor(services): unsafe non-null assertions on protobuf response fields

The code uses non-null assertions (`proto.summary!` and `s.globalTotals!`) when mapping Protobuf responses. In Protobuf, message fields are optional and can be undefined if not set or if the response is empty. This will cause a runtime `TypeError` if the backend returns a response without these fields.


Affected files: index.ts

* fix(displacement): return shallow copy of emptyResult to prevent shared-reference mutation

---------

Co-authored-by: Elie Habib <elie.habib@gmail.com>
This commit is contained in:
Tang Vu
2026-03-19 04:54:45 +07:00
committed by GitHub
parent 897a45cbc3
commit c5b24f83eb
1 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/services/displacement/index.ts
View File

@@ -57,35 +57,44 @@ export interface UnhcrFetchResult {
// ─── Internal: proto -> legacy mapping ───
const emptyResult: UnhcrSummary = {
year: new Date().getFullYear(),
globalTotals: { refugees: 0, asylumSeekers: 0, idps: 0, stateless: 0, total: 0 },
countries: [],
topFlows: [],
};
function toDisplaySummary(proto: ProtoResponse): UnhcrSummary {
const s = proto.summary!;
const gt = s.globalTotals!;
const s = proto.summary;
if (!s) return { ...emptyResult, globalTotals: { ...emptyResult.globalTotals } };
const gt = s.globalTotals || { refugees: 0, asylumSeekers: 0, idps: 0, stateless: 0, total: 0 };
return {
year: s.year,
year: s.year || new Date().getFullYear(),
globalTotals: {
refugees: Number(gt.refugees),
asylumSeekers: Number(gt.asylumSeekers),
idps: Number(gt.idps),
stateless: Number(gt.stateless),
total: Number(gt.total),
refugees: Number(gt.refugees || 0),
asylumSeekers: Number(gt.asylumSeekers || 0),
idps: Number(gt.idps || 0),
stateless: Number(gt.stateless || 0),
total: Number(gt.total || 0),
},
countries: s.countries.map(toDisplayCountry),
topFlows: s.topFlows.map(toDisplayFlow),
countries: (s.countries || []).map(toDisplayCountry),
topFlows: (s.topFlows || []).map(toDisplayFlow),
};
}
function toDisplayCountry(proto: ProtoCountry): CountryDisplacement {
return {
code: proto.code,
name: proto.name,
refugees: Number(proto.refugees),
asylumSeekers: Number(proto.asylumSeekers),
idps: Number(proto.idps),
stateless: Number(proto.stateless),
totalDisplaced: Number(proto.totalDisplaced),
hostRefugees: Number(proto.hostRefugees),
hostAsylumSeekers: Number(proto.hostAsylumSeekers),
hostTotal: Number(proto.hostTotal),
code: proto.code || '',
name: proto.name || '',
refugees: Number(proto.refugees || 0),
asylumSeekers: Number(proto.asylumSeekers || 0),
idps: Number(proto.idps || 0),
stateless: Number(proto.stateless || 0),
totalDisplaced: Number(proto.totalDisplaced || 0),
hostRefugees: Number(proto.hostRefugees || 0),
hostAsylumSeekers: Number(proto.hostAsylumSeekers || 0),
hostTotal: Number(proto.hostTotal || 0),
lat: proto.location?.latitude,
lon: proto.location?.longitude,
};
@@ -93,11 +102,11 @@ function toDisplayCountry(proto: ProtoCountry): CountryDisplacement {
function toDisplayFlow(proto: ProtoFlow): DisplacementFlow {
return {
originCode: proto.originCode,
originName: proto.originName,
asylumCode: proto.asylumCode,
asylumName: proto.asylumName,
refugees: Number(proto.refugees),
originCode: proto.originCode || '',
originName: proto.originName || '',
asylumCode: proto.asylumCode || '',
asylumName: proto.asylumName || '',
refugees: Number(proto.refugees || 0),
originLat: proto.originLocation?.latitude,
originLon: proto.originLocation?.longitude,
asylumLat: proto.asylumLocation?.latitude,
@@ -109,13 +118,6 @@ function toDisplayFlow(proto: ProtoFlow): DisplacementFlow {
const client = new DisplacementServiceClient(getRpcBaseUrl(), { fetch: (...args) => globalThis.fetch(...args) });
const emptyResult: UnhcrSummary = {
year: new Date().getFullYear(),
globalTotals: { refugees: 0, asylumSeekers: 0, idps: 0, stateless: 0, total: 0 },
countries: [],
topFlows: [],
};
const breaker = createCircuitBreaker<UnhcrSummary>({
name: 'UNHCR Displacement',
cacheTtlMs: 10 * 60 * 1000,