fix: align types in redirectHandler, sendRequest

Author: barjin

packages/core/src/cookie_utils.ts

@@ -14,14 +14,12 @@ export interface ResponseLike {
  */
 export function getCookiesFromResponse(response: Response): Cookie[] {
     const headers = response.headers;
-    const cookieHeader = headers.getSetCookie();
+    const cookieHeaders = headers.getSetCookie();
 
     try {
-        return Array.isArray(cookieHeader)
-            ? cookieHeader.map((cookie) => Cookie.parse(cookie)!)
-            : [Cookie.parse(cookieHeader)!];
+        return cookieHeaders.map((cookie) => Cookie.parse(cookie)!);
     } catch (e) {
-        throw new CookieParseError(cookieHeader);
+        throw new CookieParseError(cookieHeaders);
     }
 }
 

packages/core/src/crawlers/crawler_commons.ts

@@ -163,7 +163,7 @@ export interface CrawlingContext<Crawler = unknown, UserData extends Dictionary
      * },
      * ```
      */
-    sendRequest<Response = string>(overrideOptions?: Partial<OptionsInit>): Promise<GotResponse<Response>>;
+    sendRequest(overrideOptions?: Partial<OptionsInit>): Promise<Response>;
 }
 
 /**

packages/core/src/http_clients/got-scraping-http-client.ts

@@ -57,9 +57,14 @@ export class GotScrapingHttpClient implements BaseHttpClient {
         return new Promise(async (resolve, reject) => {
             const stream = gotScraping({ ...request, isStream: true });
 
-            stream.on('redirect', (updatedOptions: Options, redirectResponse: Response) => {
-                // TODO - the types here likely don't match
-                handleRedirect?.(redirectResponse, updatedOptions);
+            stream.on('redirect', (updatedOptions: Options, redirectResponse: any) => {
+                const nativeRedirectResponse = new ResponseWithUrl(redirectResponse.rawBody, {
+                    headers: redirectResponse.headers,
+                    status: redirectResponse.statusCode,
+                    statusText: redirectResponse.statusMessage,
+                    url: redirectResponse.url,
+                });
+                handleRedirect?.(nativeRedirectResponse, updatedOptions);
             });
 
             // We need to end the stream for DELETE requests, otherwise it will hang.

test/core/crawlers/http_crawler.test.ts

@@ -410,7 +410,7 @@ test('works with a custom HttpClient', async () => {
         requestHandler: async ({ body, sendRequest }) => {
             results.push(body as string);
 
-            results.push((await sendRequest()).body);
+            results.push(await (await sendRequest()).text());
         },
         httpClient: {
             async sendRequest(request) {