From f12cdbf76a2cc2daba9ef69134d26b5740867dcb Mon Sep 17 00:00:00 2001 From: Mike Conrad Date: Sun, 18 May 2025 21:00:53 -0400 Subject: [PATCH] Cleaned up some types --- app/controllers/replays_controller.ts | 34 +++++++++++++++++++++------ app/models/replay.ts | 5 ++-- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/app/controllers/replays_controller.ts b/app/controllers/replays_controller.ts index 3f1f688..35aeeb3 100644 --- a/app/controllers/replays_controller.ts +++ b/app/controllers/replays_controller.ts @@ -4,6 +4,19 @@ import type { HttpContext } from '@adonisjs/core/http' const SENTRY_TOKEN = env.get('SENTRY_TOKEN') const SENTRY_ORG = env.get('SENTRY_ORG') let recordsUpdated = 0 + + +interface ApiResponse { + data: T; + // optionally, you can define `meta`, `errors`, etc. if your API returns them +} + +interface SentryPagination { + previous: string; + hasPreviousResults: boolean; + hasNextResults: boolean; + next: string +} export default class ReplaysController { @@ -31,15 +44,23 @@ async function fetchBatch(url: string) { } } const req = await fetch(url, options) - const resp = await req.json() as unknown - const replays = await resp.data as unknown - const headers = await req.headers + if (!req.ok) { + throw new Error(`Request failed with status ${req.status}`); + } + + const resp = await req.json() as ApiResponse; + const replays = resp.data; + const headers = req.headers const cleanedData = replays.map(record => sanitizeInput(record, Replay.allowedFields)) let updated = await Replay.updateOrCreateMany('id', cleanedData ) recordsUpdated = recordsUpdated + updated.length - const pagination = parseSentryLinkHeader(headers.get('link')) + const linkHeader = headers.get('link') + if (!linkHeader) { + return {error: 'link header missing from Sentry API response'} + } + const pagination: SentryPagination = parseSentryLinkHeader(linkHeader) if (pagination.hasNextResults == true) { console.log('fetching', pagination.next) @@ -49,11 +70,10 @@ async function fetchBatch(url: string) { return {recordsUpdated} } -function parseSentryLinkHeader(header:string) { +function parseSentryLinkHeader(header:string): SentryPagination { const links = header.split(',').map(part => part.trim()) - const result = {} - + let result = {} as SentryPagination for (const link of links) { const match = link.match(/<([^>]+)>;\s*rel="([^"]+)";\s*results="([^"]+)";\s*cursor="([^"]+)"/) if (!match) continue diff --git a/app/models/replay.ts b/app/models/replay.ts index 066415f..4ec20ff 100644 --- a/app/models/replay.ts +++ b/app/models/replay.ts @@ -32,10 +32,10 @@ export default class Replay extends BaseModel { return JSON.stringify(value) } }) - declare tags: any + declare tags: string[] @column() - declare user: any + declare user: string[] @column() @@ -52,6 +52,7 @@ export default class Replay extends BaseModel { @column() declare device: any + @column() declare ota_updates: any