💥 UnexpectedResponseError don't have Request

Author: takker99

rest/error.ts

@@ -4,19 +4,14 @@ import { tryToErrorLike } from "../is.ts";
 /** 想定されない応答が帰ってきたときに投げる例外 */
 export class UnexpectedResponseError extends Error {
   name = "UnexpectedResponseError";
-  request: Request;
-  response: Response;
 
   constructor(
-    init: { request: Request; response: Response },
+    public response: Response,
   ) {
     super(
-      `${init.response.status} ${init.response.statusText} when fetching ${init.request.url}`,
+      `${response.status} ${response.statusText} when fetching ${response.url}`,
     );
 
-    this.request = init.request.clone();
-    this.response = init.response.clone();
-
     // @ts-ignore only available on V8
     if (Error.captureStackTrace) {
       // @ts-ignore only available on V8
@@ -27,14 +22,13 @@ export class UnexpectedResponseError extends Error {
 
 /** 失敗した要求からエラー情報を取り出す */
 export const makeError = async <T extends ErrorLike>(
-  req: Request,
   res: Response,
 ): Promise<{ ok: false; value: T }> => {
   const response = res.clone();
   const text = await response.text();
   const value = tryToErrorLike(text);
   if (!value) {
-    throw new UnexpectedResponseError({ request: req, response });
+    throw new UnexpectedResponseError(response);
   }
   return {
     ok: false,

rest/getGyazoToken.ts

@@ -34,10 +34,7 @@ export const getGyazoToken = async (
 
   const res = await fetch(req);
   if (!res.ok) {
-    return makeError<NotLoggedInError>(
-      req,
-      res,
-    );
+    return makeError<NotLoggedInError>(res);
   }
 
   const { token } = (await res.json()) as { token?: string };

rest/getSnapshots.ts

@@ -58,10 +58,7 @@ export const getSnapshots = async (
         },
       };
     }
-    return makeError<NotFoundError | NotLoggedInError | NotMemberError>(
-      req,
-      res,
-    );
+    return makeError<NotFoundError | NotLoggedInError | NotMemberError>(res);
   }
 
   const data = (await res.json()) as PageSnapshot;

rest/getTweetInfo.ts

@@ -53,7 +53,7 @@ export const getTweetInfo = async (
         },
       };
     }
-    return makeError<SessionError | BadRequestError>(req, res);
+    return makeError<SessionError | BadRequestError>(res);
   }
 
   const tweet = (await res.json()) as TweetInfo;

rest/getWebPageTitle.ts

@@ -53,7 +53,7 @@ export const getWebPageTitle = async (
         },
       };
     }
-    return makeError<SessionError | BadRequestError>(req, res);
+    return makeError<SessionError | BadRequestError>(res);
   }
 
   const { title } = (await res.json()) as { title: string };

rest/link.ts

@@ -53,7 +53,7 @@ export const getLinks = async (
       };
     }
 
-    return makeError<NotFoundError | NotLoggedInError>(req, res);
+    return makeError<NotFoundError | NotLoggedInError>(res);
   }
 
   const pages = (await res.json()) as SearchedTitle[];

rest/page-data.ts

@@ -49,7 +49,7 @@ export const importPages = async (
 
   const res = await fetch(req);
   if (!res.ok) {
-    return makeError(req, res);
+    return makeError(res);
   }
 
   const { message } = (await res.json()) as { message: string };
@@ -83,9 +83,7 @@ export const exportPages = async <withMetadata extends true | false>(
   const res = await fetch(req);
 
   if (!res.ok) {
-    return makeError<
-      NotFoundError | NotPrivilegeError | NotLoggedInError
-    >(req, res);
+    return makeError<NotFoundError | NotPrivilegeError | NotLoggedInError>(res);
   }
 
   const value = (await res.json()) as ExportedData<withMetadata>;

rest/pages.ts

@@ -39,10 +39,7 @@ export const getPage = async (
   );
   const res = await fetch(req);
   if (!res.ok) {
-    return makeError<NotFoundError | NotLoggedInError | NotMemberError>(
-      req,
-      res,
-    );
+    return makeError<NotFoundError | NotLoggedInError | NotMemberError>(res);
   }
   const value = (await res.json()) as Page;
   return { ok: true, value };
@@ -102,10 +99,7 @@ export const listPages = async (
 
   const res = await fetch(req);
   if (!res.ok) {
-    return makeError<NotFoundError | NotLoggedInError | NotMemberError>(
-      req,
-      res,
-    );
+    return makeError<NotFoundError | NotLoggedInError | NotMemberError>(res);
   }
   const value = (await res.json()) as PageList;
   return { ok: true, value };

rest/profile.ts

@@ -17,7 +17,7 @@ export const getProfile = async (
   );
   const response = await fetch(request);
   if (!response.ok) {
-    throw new UnexpectedResponseError({ request, response });
+    throw new UnexpectedResponseError(response);
   }
   return (await response.json()) as MemberUser | GuestUser;
 };

rest/project.ts

@@ -35,10 +35,7 @@ export const getProject = async (
   const res = await fetch(req);
 
   if (!res.ok) {
-    return makeError<NotFoundError | NotMemberError | NotLoggedInError>(
-      req,
-      res,
-    );
+    return makeError<NotFoundError | NotMemberError | NotLoggedInError>(res);
   }
 
   const value = (await res.json()) as MemberProject | NotMemberProject;
@@ -68,7 +65,7 @@ export const listProjects = async (
   const res = await fetch(req);
 
   if (!res.ok) {
-    return makeError<NotLoggedInError>(req, res);
+    return makeError<NotLoggedInError>(res);
   }
 
   const value = (await res.json()) as ProjectResponse;