x15904151985/iptvnator
1
0 Fork 0
mirror of https://github.com/4gray/iptvnator.git synced 2026-10-12 12:06:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

fix(pwa): harden xtream identity normalization

Browse Source
This commit is contained in:
4gray committed 2026-05-21 19:27:40 +03:00
1 parent 1d4d793aac
commit 1ea6914f98
2 files changed
+76 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libs/portal/xtream/data-access/src/lib/data-sources/pwa-xtream-data-source.spec.ts
+71
View File
@@ -48,6 +48,7 @@ describe('PwaXtreamDataSource', () => {
case 'live':
return Promise.resolve([
{
id: '0',
stream_id: 101,
name: 'News Live',
stream_icon: 'live.png',
@@ -58,6 +59,7 @@ describe('PwaXtreamDataSource', () => {
case 'movie':
return Promise.resolve([
{
id: 0,
stream_id: 202,
name: 'Movie One',
stream_icon: 'movie.png',
@@ -184,4 +186,73 @@ describe('PwaXtreamDataSource', () => {
}),
]);
});
it('does not persist zero or invalid Xtream identities as user collections', async () => {
apiService.getStreams.mockResolvedValue([
{
id: 0,
name: 'Headless Zero',
category_id: '20',
},
{
id: 'not-a-number',
name: 'Headless Invalid',
category_id: '20',
},
]);
const content = (await dataSource.getContent(
'playlist-1',
credentials,
'movie'
)) as Array<Record<string, unknown>>;
expect(content).toEqual([
expect.objectContaining({
id: -1,
xtream_id: -1,
}),
expect.objectContaining({
id: -1,
xtream_id: -1,
}),
]);
await dataSource.addFavorite(-1, 'playlist-1');
await dataSource.addRecentItem(-1, 'playlist-1');
expect(localStorage.getItem('xtream-favorites')).toBeNull();
expect(localStorage.getItem('xtream-recent-items')).toBeNull();
localStorage.setItem(
'xtream-favorites',
JSON.stringify({ 'playlist-1': [-1, 0, 'not-a-number'] })
);
localStorage.setItem(
'xtream-recent-items',
JSON.stringify({
'playlist-1': [
{
id: -1,
viewedAt: '2026-05-21T12:00:00.000Z',
},
{
id: 0,
viewedAt: '2026-05-21T12:00:00.000Z',
},
{
id: 'not-a-number',
viewedAt: '2026-05-21T12:00:00.000Z',
},
],
})
);
await expect(dataSource.getFavorites('playlist-1')).resolves.toEqual(
[]
);
await expect(dataSource.getRecentItems('playlist-1')).resolves.toEqual(
[]
);
});
});
libs/portal/xtream/data-access/src/lib/data-sources/pwa-xtream-data-source.ts
+5 -3
View File
@@ -330,7 +330,7 @@ export class PwaXtreamDataSource implements IXtreamDataSource {
...item,
added: item.added ?? item.last_modified ?? '',
category_id: item.category_id ?? '',
id: Number.isFinite(id) ? id : xtreamId,
id: Number.isFinite(id) && id > 0 ? id : xtreamId,
name: item.name ?? title,
poster_url: posterUrl,
rating: String(item.rating ?? ''),
@@ -351,7 +351,7 @@ export class PwaXtreamDataSource implements IXtreamDataSource {
item.series_id ??
item.id;
const numericId = Number(preferredId);
return Number.isFinite(numericId) ? numericId : 0;
return Number.isFinite(numericId) && numericId > 0 ? numericId : -1;
}
// =========================================================================
@@ -724,7 +724,9 @@ export class PwaXtreamDataSource implements IXtreamDataSource {
private normalizeStoredId(value: unknown): number | null {
const numericValue = Number(value);
return Number.isFinite(numericValue) ? numericValue : null;
return Number.isFinite(numericValue) && numericValue > 0
? numericValue
: null;
}
private normalizeFavoriteStorage(value: unknown): Record<string, number[]> {