add fetcher logic to makeRequest

src/background/messages/makeRequest.ts

@@ -2,12 +2,16 @@ import type { PlasmoMessaging } from '@plasmohq/messaging';
 
 import type { BaseRequest } from '~types/request';
 import type { BaseResponse } from '~types/response';
+import { makeFullUrl } from '~utils/fetcher';
 import { validateDomainWhiteList } from '~utils/storage';
 
-interface Request extends BaseRequest {
-  url: string;
-  method: string;
+export interface Request extends BaseRequest {
+  baseUrl?: string;
   headers?: Record<string, string>;
+  method?: string;
+  query?: Record<string, string>;
+  readHeaders?: Record<string, string>;
+  url: string;
   body?: string | FormData | URLSearchParams;
 }
 
@@ -15,27 +19,27 @@ type Response = BaseResponse<{
   status: number;
   requestHeaders: Record<string, string>;
   responseHeaders: Record<string, string>;
-  data: string | Record<string, unknown>;
+  body: string | Record<string, unknown>;
 }>;
 
 const handler: PlasmoMessaging.MessageHandler<Request, Response> = async (req, res) => {
   try {
     await validateDomainWhiteList(req.body.requestDomain);
 
-    const response = await fetch(req.body.url, {
+    const response = await fetch(makeFullUrl(req.body.url, req.body), {
       method: req.body.method,
       headers: req.body.headers,
       body: req.body.body,
     });
     const contentType = response.headers.get('content-type');
-    const data = contentType?.includes('application/json') ? await response.json() : await response.text();
+    const body = contentType?.includes('application/json') ? await response.json() : await response.text();
 
     res.send({
       success: true,
       status: response.status,
       requestHeaders: req.body.headers,
       responseHeaders: Object.fromEntries(response.headers.entries()),
-      data,
+      body,
     });
   } catch (err) {
     res.send({