[Improve code]: lib/* 手動formatter・Linter対応

astro/package.json

@@ -36,7 +36,8 @@
     "tailwind-variants": "^0.1.20",
     "tailwindcss": "^3.4.1",
     "twitter-text": "^3.1.0",
-    "typescript": "^5.3.3"
+    "typescript": "^5.3.3",
+    "zod": "^3.22.4"
   },
   "devDependencies": {
     "@changesets/cli": "^2.27.1",

astro/src/components/Client/bsky/buttons/PostButton.tsx

@@ -303,7 +303,7 @@ export const Component = ({
                     accessJwt: session.accessJwt,
                     uri: createRecordResult.uri,
                 })
-                if (typeof createPageResult?.error !== "undefined") {
+                if ("error" in createPageResult) {
                     const e: Error = new Error(createPageResult.message)
                     e.name = createPageResult.error
                     throw e

astro/src/components/Client/pagedb/PageDeleteButton.tsx

@@ -28,15 +28,14 @@ const Component = ({
                 did: session.did,
                 accessJwt: session.accessJwt
             })
-            if (typeof resDeletePage?.error === "undefined" &&
-                resDeletePage.result === "ok") {
+            if (!("error" in resDeletePage)) {
                 setMsgInfo({
                     isError: false,
                     msg: "ページを削除しました!"
                 })
                 window.location.reload()
             } else {
-                let e: Error = new Error(resDeletePage.message)
+                const e: Error = new Error(resDeletePage.message)
                 e.name = "pagedelete.tsx"
                 throw e
             }

astro/src/components/Client/pagedb/PageViewForm.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useContext, useState, ReactNode, Dispatch, SetStateAction } from "react"
 import { pagesPrefix } from "@/env/envs"
-import getIds from "@/lib/pagedbAPI/geIds"
+import getIds from "@/lib/pagedbAPI/getIds"
 import { Session_context } from "../common/contexts"
 import { load_circle, link } from "../common/tailwindVariants"
 import ProfileCard from "./ProfileCard"
@@ -34,20 +34,21 @@ const Component = ({
             const ids = await getIds({
                 handle: session.handle!
             })
-            if (typeof ids?.error !== "undefined") {
-                let e: Error = new Error(ids.message)
+            if ("error" in ids) {
+                const e: Error = new Error(ids.message)
                 e.name = ids.error
                 throw e
             }
             setMsgInfo({
                 isError: false,
                 msg: "投稿一覧を読み込みました!"
             })
+
             setList(
                 <div className="mx-auto">
                     <div>OGP生成したページ一覧</div>
                     <div className="grid sm:grid-cols-3 grid-cols-1">
-                        {ids?.ids.map((value) => {
+                        {ids.ids.map((value) => {
                             return (
                                 <div className=" bg-white rounded-lg px-2 py-1 m-1 border-2">
                                     <a className={link()} target="_blank"

astro/src/lib/api/createErrResponse.ts

@@ -1,7 +1,7 @@
 import { errorResponse } from "./types"
 
 const createErrResponse = ({
-    statusCode
+    statusCode,
 }: {
     statusCode: number
 }): errorResponse => {
@@ -10,31 +10,33 @@ const createErrResponse = ({
         case 405:
             response = <errorResponse>{
                 error: "Method Not Allowed",
-                message: "Invalid method requested. API allow GET only."
+                message: "Invalid method requested. API allow GET only.",
             }
             break
         case 406:
             response = <errorResponse>{
                 error: "Not Acceptable",
-                message: "Invalid parameter requested. Check your request."
+                message: "Invalid parameter requested. Check your request.",
             }
             break
         case 502:
             response = <errorResponse>{
                 error: "Bad Gateway",
-                message: "Failed to get correct response from gateway. Announce server administrator."
+                message:
+                    "Failed to get correct response from gateway. Announce server administrator.",
             }
             break
         case 500:
             response = <errorResponse>{
                 error: "Internal Server Error",
-                message: "Failed to internal process. Announce server administrator."
+                message:
+                    "Failed to internal process. Announce server administrator.",
             }
             break
         default:
             response = <errorResponse>{
                 error: "Unexpected Error",
-                message: "Unexpected Error occured."
+                message: "Unexpected Error occured.",
             }
     }
     response.status = statusCode

astro/src/lib/api/types.ts

@@ -1,19 +1,26 @@
-export type ogpMetaData = {
-    type: "meta"
-    title: string,
-    description: string,
-    image: string,
-}
+import { z } from "zod"
+
+export const ZodOgpMetaData = z.object({
+    type: z.literal("meta"),
+    title: z.string(),
+    description: z.string(),
+    image: z.string(),
+})
+export type ogpMetaData = z.infer<typeof ZodOgpMetaData>
+
 // APIのエラーレスポンスを定義
-export type errorResponse = {
-    type: "error"
-    error: string,
-    message: string,
-    status: number,
-}
 
-export type apiRequest = {
-    type: "api"
-    decodedUrl: string,
-    language: string,
-}
+export const ZodErrorResponse = z.object({
+    type: z.literal("error"),
+    error: z.string(),
+    message: z.string(),
+    status: z.number(),
+})
+export type errorResponse = z.infer<typeof ZodErrorResponse>
+
+export const ZodApiRequest = z.object({
+    type: z.literal("api"),
+    decodedUrl: z.string(),
+    language: z.string(),
+})
+export type apiRequest = z.infer<typeof ZodApiRequest>

astro/src/lib/api/validateRequest.ts

@@ -1,8 +1,9 @@
-import createErrResponse from "./createErrResponse";
+import createErrResponse from "./createErrResponse"
 import { isNotProduction } from "@/lib/vars"
-import { apiRequest, errorResponse } from "./types";
+import { apiRequest, errorResponse } from "./types"
 
-const protocol_validation: RegExp = /(dict|file|ftp|gopher|ldap|smtp|telnet|tftp):\/\//
+const protocol_validation: RegExp =
+    /(dict|file|ftp|gopher|ldap|smtp|telnet|tftp):\/\//
 const loopback_validation: RegExp = /localhost/
 const ipv4_validation: RegExp = /(?:\d{0,3}\.){3}\d{0,3}/
 const ipv6_validation: RegExp = /\[[0-9a-fA-F:]+\]/
@@ -13,7 +14,7 @@ const ipv6_validation: RegExp = /\[[0-9a-fA-F:]+\]/
  * @returns apiResponse または エラーレスポンス
  */
 const validateRequestReturnURL = ({
-    request
+    request,
 }: {
     request: Request
 }): apiRequest | errorResponse => {
@@ -24,8 +25,8 @@ const validateRequestReturnURL = ({
         })
     }
 
-    const url = new URL(request.url).searchParams.get("url");
-    const lang = new URL(request.url).searchParams.get("lang");
+    const url: string | null = new URL(request.url).searchParams.get("url")
+    const lang: string | null = new URL(request.url).searchParams.get("lang")
     if (url === null) {
         return createErrResponse({
             statusCode: 406,
@@ -36,20 +37,18 @@ const validateRequestReturnURL = ({
             statusCode: 406,
         })
     }
-    const decodedUrl = decodeURIComponent(url)
+    const decodedUrl: string = decodeURIComponent(url)
     // SSRF対策
     // Productionではない環境についてはlocalhostの実行を許可
-    const validation = !isNotProduction ? (
-        // Productionの場合は厳格なルールを指定
-        protocol_validation.test(decodedUrl) ||
-        loopback_validation.test(decodedUrl) ||
-        ipv4_validation.test(decodedUrl) ||
-        ipv6_validation.test(decodedUrl)
-    ) : (
-        // Not Productionの場合は(Cloudflare Zero Trustといった)
-        // 低レイヤー対策前提でlocalhostを許可
-        protocol_validation.test(decodedUrl)
-    )
+    const validation: boolean = !isNotProduction
+        ? // Productionの場合は厳格なルールを指定
+          protocol_validation.test(decodedUrl) ||
+          loopback_validation.test(decodedUrl) ||
+          ipv4_validation.test(decodedUrl) ||
+          ipv6_validation.test(decodedUrl)
+        : // Not Productionの場合は(Cloudflare Zero Trustといった)
+          // 低レイヤー対策前提でlocalhostを許可
+          protocol_validation.test(decodedUrl)
     if (validation) {
         return createErrResponse({
             statusCode: 502,
@@ -59,7 +58,7 @@ const validateRequestReturnURL = ({
     return <apiRequest>{
         type: "api",
         decodedUrl: decodedUrl,
-        language: lang
+        language: lang,
     }
 }
 export default validateRequestReturnURL

astro/src/lib/getOgp.ts

@@ -1,65 +1,91 @@
-import type { ogpMetaData, errorResponse } from "@/lib/api/types";
+import type { errorResponse, ogpMetaData } from "@/lib/api/types"
+import { ZodErrorResponse, ZodOgpMetaData } from "@/lib/api/types"
 
-// note: エラー規格を型定義として決めた方がいい（ error@Component: message　とするなど）
+// note: エラー規格を型定義として決めた方がいい（ error@Component: message とするなど）
 export const getOgpMeta = async ({
     siteurl,
     externalUrl,
     languageCode,
 }: {
-    siteurl: string,
-    externalUrl: string,
-    languageCode: string,
+    siteurl: string
+    externalUrl: string
+    languageCode: string
 }): Promise<ogpMetaData | errorResponse> => {
     const apiUrl = new URL("/api/getOgpMeta", siteurl)
     apiUrl.searchParams.append("url", encodeURIComponent(externalUrl))
     apiUrl.searchParams.append("lang", languageCode)
     return await fetch(apiUrl, {
-        method: 'GET',
+        method: "GET",
         headers: {
-            'Content-Type': 'application/json',
+            "Content-Type": "application/json",
             "Accept-Language": languageCode,
             "Cache-Control": "no-cache",
-        }
-    }).then(async (response) => {
-        if (!response?.ok) {
-            let res: errorResponse = await response.json()
-            let e: Error = new Error(res.message)
-            e.name = res.error
-            throw e
-        }
-        return await response.json() as ogpMetaData
-    }).catch((e: Error) => {
-        return <errorResponse>{
-            type: "error",
-            error: `${e.name}@getOgpMeta`,
-            message: e.message
-        }
+        },
     })
+        .then(async response => {
+            const jsonResponse: unknown = await response.json()
+            const responseParsedAsError =
+                ZodErrorResponse.safeParse(jsonResponse)
+            const responseParsedAsOgpMetaData =
+                ZodOgpMetaData.safeParse(jsonResponse)
+
+            if (!(response.ok && responseParsedAsOgpMetaData.success)) {
+                const e: Error = new Error(
+                    responseParsedAsError.success
+                        ? responseParsedAsError.data.message
+                        : "Unexpected Response Type@getOgpMeta",
+                )
+                e.name = responseParsedAsError.success
+                    ? responseParsedAsError.data.error
+                    : "Unexpected Response Type"
+                throw e
+            }
+
+            return responseParsedAsOgpMetaData.data
+        })
+        .catch((e: Error) => {
+            return {
+                type: "error",
+                error: `${e.name}@getOgpMeta`,
+                message: e.message,
+                status: 500,
+            }
+        })
 }
 // Blob型はユニオン型として扱うことが難しいため、エラーハンドリングできない
 export const getOgpBlob = async ({
     siteurl,
     externalUrl,
     languageCode,
 }: {
-    siteurl: string,
-    externalUrl: string,
-    languageCode: string,
+    siteurl: string
+    externalUrl: string
+    languageCode: string
 }): Promise<Blob> => {
     const apiUrl = new URL("/api/getOgpBlob", siteurl)
     apiUrl.searchParams.append("url", encodeURIComponent(externalUrl))
     apiUrl.searchParams.append("lang", languageCode)
     return await fetch(apiUrl, {
-        method: 'GET',
+        method: "GET",
         headers: {
             "Accept-Language": languageCode,
             "Cache-Control": "no-cache",
-        }
-    }).then(async (response) => {
-        if (!response?.ok) {
-            let res: errorResponse = await response.json()
-            let e: Error = new Error(res.message)
-            e.name = `${res.error}@getOgpBlob`
+        },
+    }).then(async response => {
+        if (!response.ok) {
+            const responseParsedAsError = ZodErrorResponse.safeParse(
+                response.json(),
+            )
+            const e: Error = new Error(
+                responseParsedAsError.success
+                    ? responseParsedAsError.data.message
+                    : "Unexpected Response Type@getOgpBlob",
+            )
+            e.name = `${
+                responseParsedAsError.success
+                    ? responseParsedAsError.data.error
+                    : "Unexpected Response Type"
+            }@getOgpBlob`
             throw e
         }
         return await response.blob()