refactor: use modern things (#29)

* refactor: use modern things

* refactor package.json

* remove showRoutes

Author: yusukebe

jest.config.js

@@ -4,36 +4,35 @@
   "main": "src/index.ts",
   "type": "module",
   "scripts": {
-    "test": "jest --verbose",
-    "validate": "jest ./validation/* --verbose",
-    "dev": "wrangler dev --live-reload src/index.ts",
-    "deploy": "wrangler deploy --minify src/index.ts",
-    "tail": "wrangler tail"
+    "test": "vitest",
+    "validate": "vitest run --config vitest.validation.config.ts",
+    "dev": "wrangler dev",
+    "deploy": "wrangler deploy --minify",
+    "tail": "wrangler tail",
+    "cf-typegen": "wrangler types"
   },
   "license": "MIT",
   "dependencies": {
     "@hono/graphql-server": "^0.4.1",
-    "@modelcontextprotocol/sdk": "^1.11.4",
+    "@modelcontextprotocol/sdk": "^1.12.1",
     "fetch-to-node": "^2.1.0",
     "graphql": "^16.6.0",
-    "hono": "^4.7.10",
+    "hono": "^4.7.11",
     "zod": "^3.25.7"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20231218.0",
+    "@cloudflare/vitest-pool-workers": "^0.8.36",
     "@hono/eslint-config": "^0.0.3",
-    "@jest/expect": "^29.1.2",
-    "@types/jest": "^29.1.2",
-    "esbuild": "^0.15.10",
-    "esbuild-jest": "^0.5.0",
+    "@types/node": "^22.15.30",
     "eslint": "^8.56.0",
-    "jest": "^29.1.2",
-    "jest-environment-miniflare": "^2.14.1",
-    "miniflare": "^2.10.0",
     "typescript": "^5.3.3",
-    "wrangler": "3"
+    "vitest": "~3.1.0",
+    "wrangler": "^4.19.1"
   },
   "engines": {
     "node": ">=18"
+  },
+  "resolutions": {
+    "graphql": "^16.6.0"
   }
-}
+}

mock/authors/yusukebe/info.json

@@ -1,6 +1,11 @@
-import type { KVNamespace } from '@cloudflare/workers-types'
 import type { Context } from 'hono'
-import { getContentFromKVAsset } from './workers-utils'
+import { getMimeType } from 'hono/utils/mime'
+import {
+  getShopsData,
+  getShopInfo,
+  getAuthorInfo,
+  getShopImageResponse,
+} from './data'
 
 export const BASE_URL = 'http://localhost/'
 
@@ -9,7 +14,9 @@ export type Env = {
     BASE_URL: string
   }
   Bindings: {
-    __STATIC_CONTENT: KVNamespace
+    ASSETS?: Fetcher
+    __STATIC_CONTENT?: KVNamespace
+    MCP_OBJECT?: DurableObjectNamespace
   }
 }
 
@@ -52,7 +59,7 @@ type listShopsResult = {
   totalCount: number
 }
 
-type listShopsWithPagerResult = {
+export type listShopsWithPagerResult = {
   shops: Shop[]
   totalCount: number
   pageInfo: pageInfo
@@ -106,11 +113,7 @@ export const listShops = async (
   options: Options
 ): Promise<listShopsResult> => {
   const { limit = 10, offset = 0 } = params
-  const c = options.c
-  const buffer = await getContentFromKVAsset('shops.json', {
-    namespace: c.env ? c.env.__STATIC_CONTENT : undefined,
-  })
-  const data = arrayBufferToJSON(buffer)
+  const data = await getShopsData(options.c.env.ASSETS, options.c.req.url)
 
   const shopIdsAll = data['shopIds']
   const totalCount = shopIdsAll.length
@@ -147,29 +150,31 @@ export const findIndexFromId = async (
 export const getShop = async (id: string, options: Options): Promise<Shop> => {
   let shop: Shop
   try {
-    const c = options.c
-    const buffer = await getContentFromKVAsset(`shops/${id}/info.json`, {
-      namespace: c.env ? c.env.__STATIC_CONTENT : undefined,
-    })
-    shop = arrayBufferToJSON(buffer)
-  } catch (e) {
-    throw new Error(`"shops/${id}/info.json" is not found: ${e}`)
-  }
+    shop = (await getShopInfo(
+      id,
+      options.c.env.ASSETS,
+      options.c.req.url
+    )) as Shop
+  } catch {} // Do nothing
   if (!shop) return
   shop.photos?.map((photo: Photo) => {
     photo.url = fixPhotoURL({ shopId: id, path: photo.name }, options)
   })
   return shop
 }
 
-export const getAuthor = async (id: string): Promise<Author> => {
+export const getAuthor = async (
+  id: string,
+  options?: Options
+): Promise<Author> => {
   let author: Author
   try {
-    const buffer = await getContentFromKVAsset(`authors/${id}/info.json`)
-    author = arrayBufferToJSON(buffer)
-  } catch (e) {
-    throw new Error(`"authors/${id}/info.json" is not found: ${e}`)
-  }
+    author = (await getAuthorInfo(
+      id,
+      options?.c.env?.ASSETS,
+      options?.c.req?.url
+    )) as Author
+  } catch {} // Do nothing
   if (!author) return
   return author
 }
@@ -188,45 +193,35 @@ const fixPhotoURL = (
   return `${options.c.var.BASE_URL}images/${shopId}/${path}`
 }
 
-const arrayBufferToJSON = (arrayBuffer: ArrayBuffer) => {
-  if (arrayBuffer instanceof ArrayBuffer) {
-    const text = new TextDecoder().decode(arrayBuffer)
-    if (text) return JSON.parse(text)
-  } else {
-    return arrayBuffer
-  }
-}
-
 export const getShopPhotosWithData = async (
   shopId: string,
   options: Options
 ): Promise<PhotoWithData[]> => {
   const shop = await getShop(shopId, options)
-
-  const photos = await Promise.all(
-    shop.photos?.map(async (photo): Promise<PhotoWithData | null> => {
-      try {
-        const buffer = await getContentFromKVAsset(
-          `shops/${shopId}/${photo.name}`,
-          {
-            namespace: options.c.env
-              ? options.c.env.__STATIC_CONTENT
-              : undefined,
-          }
-        )
-        const base64 = arrayBufferToBase64(buffer)
-        return {
+  if (!shop || !shop.photos) return []
+
+  const photos: PhotoWithData[] = []
+
+  for (const photo of shop.photos) {
+    try {
+      const response = await getShopImageResponse(
+        shopId,
+        photo.name,
+        options.c.env.ASSETS,
+        options.c.var.BASE_URL
+      )
+      if (response.ok) {
+        const arrayBuffer = await response.arrayBuffer()
+        const base64 = arrayBufferToBase64(arrayBuffer)
+        photos.push({
           ...photo,
           base64,
-        }
-      } catch (e) {
-        console.error(`Failed to load image ${photo.name}:`, e)
-        return null
+        })
       }
-    }) || []
-  )
+    } catch {} // Do nothing
+  }
 
-  return photos.filter(Boolean)
+  return photos
 }
 
 export const arrayBufferToBase64 = (arrayBuffer: ArrayBuffer): string => {
@@ -237,3 +232,24 @@ export const arrayBufferToBase64 = (arrayBuffer: ArrayBuffer): string => {
   }
   return btoa(binary)
 }
+
+export const getShopImage = async (
+  shopId: string,
+  filename: string,
+  assets: Fetcher,
+  baseUrl: string
+): Promise<Response> => {
+  const mimeType = getMimeType(filename)
+  const response = await getShopImageResponse(shopId, filename, assets, baseUrl)
+
+  if (response.ok) {
+    const content = await response.arrayBuffer()
+    return new Response(content, {
+      headers: {
+        'Content-Type': mimeType || 'application/octet-stream',
+      },
+    })
+  }
+
+  return new Response(null, { status: 404 })
+}

mock/shops.json

@@ -0,0 +1,41 @@
+const CONTENT_PREFIX =
+  process.env && process.env.NODE_ENV === 'test' ? '/content' : ''
+
+export const getShopsData = async (assets: Fetcher, baseUrl: string) => {
+  const response = await assets.fetch(
+    new URL(`${CONTENT_PREFIX}/shops.json`, baseUrl)
+  )
+  return await response.json()
+}
+
+export const getShopInfo = async (
+  shopId: string,
+  assets: Fetcher,
+  baseUrl: string
+) => {
+  const response = await assets.fetch(
+    new URL(`${CONTENT_PREFIX}/shops/${shopId}/info.json`, baseUrl)
+  )
+  return await response.json()
+}
+
+export const getAuthorInfo = async (
+  authorId: string,
+  assets: Fetcher,
+  baseUrl: string
+) => {
+  const response = await assets.fetch(
+    new URL(`${CONTENT_PREFIX}/authors/${authorId}/info.json`, baseUrl)
+  )
+  return await response.json()
+}
+
+export const getShopImageResponse = async (
+  shopId: string,
+  filename: string,
+  assets: Fetcher,
+  baseUrl: string
+) => {
+  const path = `${CONTENT_PREFIX}/shops/${shopId}/${filename}`
+  return await assets.fetch(new URL(path, baseUrl))
+}