diff --git a/src/background/messages/makeRequest.ts b/src/background/messages/makeRequest.ts index cbfeed9..42534a9 100644 --- a/src/background/messages/makeRequest.ts +++ b/src/background/messages/makeRequest.ts @@ -15,14 +15,16 @@ export interface Request extends BaseRequest { body?: string | FormData | URLSearchParams; } -type Response = BaseResponse<{ - status: number; - requestHeaders: Record; - responseHeaders: Record; - body: string | Record; +type Response = BaseResponse<{ + response: { + statusCode: number; + headers: Record; + finalUrl: string; + body: T; + }; }>; -const handler: PlasmoMessaging.MessageHandler = async (req, res) => { +const handler: PlasmoMessaging.MessageHandler> = async (req, res) => { try { await validateDomainWhiteList(req.body.requestDomain); @@ -36,10 +38,12 @@ const handler: PlasmoMessaging.MessageHandler = async (req, r res.send({ success: true, - status: response.status, - requestHeaders: req.body.headers, - responseHeaders: Object.fromEntries(response.headers.entries()), - body, + response: { + statusCode: response.status, + headers: Object.fromEntries(response.headers.entries()), // Headers object isn't serializable + body, + finalUrl: response.url, + }, }); } catch (err) { res.send({