Revert "feat: support local host"

This reverts commit cb61722.

Author: banzhe

.gitignore

@@ -41,6 +41,4 @@ note.md
 note_zh.md
 
 docs/.vitepress/dist
-docs/.vitepress/cache
-
-.env
+docs/.vitepress/cache

packages/server/.env.example

@@ -9,17 +9,13 @@
     "init:local": "./scripts/init_local.sh"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.821.0",
-    "better-sqlite3": "^11.10.0",
-    "dotenv": "^16.5.0",
     "hono": "^4.4.8"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20240529.0",
     "@hono/vite-cloudflare-pages": "^0.4.1",
     "@hono/vite-dev-server": "^0.12.1",
     "@types/bcryptjs": "^2.4.6",
-    "@types/better-sqlite3": "^7.6.13",
     "@web-archive/shared": "workspace:*",
     "wrangler": "^3.57.2"
   }

packages/server/package.json

@@ -1,9 +1,7 @@
 import { Hono } from 'hono'
-import { ListObjectsV2Command, type _Object } from '@aws-sdk/client-s3'
 import type { HonoTypeUserInformation } from '~/constants/binding'
 import { getHomeChartData } from '~/model/data'
 import result from '~/utils/result'
-import { S3_BUCKET_NAME } from '~/constants/config'
 
 const app = new Hono<HonoTypeUserInformation>()
 
@@ -14,13 +12,10 @@ app.get('/page_chart_data', async (c) => {
 })
 
 app.get('/r2_usage', async (c) => {
-  const command = new ListObjectsV2Command({
-    Bucket: S3_BUCKET_NAME,
-  })
-  const objects = await c.env.BUCKET.send(command)
+  const res = await c.env.BUCKET.list()
   return c.json(result.success({
-    size: objects.Contents?.reduce((acc: number, obj: _Object) => acc + (obj.Size ?? 0), 0) ?? 0,
-    count: objects.Contents?.length ?? 0,
+    size: res.objects.reduce((acc, obj) => acc + obj.size, 0),
+    count: res.objects.length,
   }))
 })
 

packages/server/src/api/data.ts

@@ -60,11 +60,15 @@ app.delete(
 
     const { folderResult, pageResult } = await deleteFolderById(c.env.DB, id)
 
-    if (folderResult.changes === 0 && pageResult.changes === 0) {
+    if (folderResult.error || pageResult.error) {
+      throw folderResult.error || pageResult.error
+    }
+
+    if (folderResult.meta.changes === 0 && pageResult.meta.changes === 0) {
       return c.json(result.error(400, 'No changes made'))
     }
 
-    if (folderResult.changes !== 1 || pageResult.changes !== allPages.length) {
+    if (folderResult.meta.changes !== 1 || pageResult.meta.changes !== allPages.length) {
       return c.json(result.error(400, 'Some folders or pages are not deleted'))
     }
 
@@ -91,8 +95,8 @@ app.put(
   async (c) => {
     const { id, name } = c.req.valid('json')
 
-    const success = await updateFolder(c.env.DB, { id, name })
-    if (!success) {
+    const sqlResult = await updateFolder(c.env.DB, { id, name })
+    if (sqlResult.meta.changes === 0) {
       if (!(await checkFolderExists(c.env.DB, name))) {
         return c.json(result.error(400, 'Folder does not exists'))
       }

packages/server/src/api/folders.ts

@@ -2,16 +2,13 @@ import { Hono } from 'hono'
 import { validator } from 'hono/validator'
 import { isNil, isNotNil, isNumberString } from '@web-archive/shared/utils'
 import { z } from 'zod'
-import { GetObjectCommand } from '@aws-sdk/client-s3'
 import type { HonoTypeUserInformation } from '~/constants/binding'
 import result from '~/utils/result'
 import { clearDeletedPage, deletePageById, getPageById, insertPage, queryAllPageIds, queryDeletedPage, queryPage, queryPageByUrl, queryRecentSavePage, restorePage, selectPageTotalCount, updatePage } from '~/model/page'
 import { getFolderById, restoreFolder } from '~/model/folder'
 import { getFileFromBucket, saveFileToBucket } from '~/utils/file'
 import { updateShowcase } from '~/model/showcase'
 import { updateBindPageByTagName } from '~/model/tag'
-import type { TagBindRecord } from '~/model/tag'
-import { S3_BUCKET_NAME } from '~/constants/config'
 
 const app = new Hono<HonoTypeUserInformation>()
 
@@ -85,11 +82,7 @@ app.post(
       isShowcased,
     })
     if (isNotNil(insertId)) {
-      const updateTagResult = await updateBindPageByTagName(
-        c.env.DB,
-        bindTags.map(tagName => ({ tagName, pageIds: [Number(insertId)] })),
-        [],
-      )
+      const updateTagResult = await updateBindPageByTagName(c.env.DB, bindTags.map(tagName => ({ tagName, pageIds: [insertId] })), [])
       if (updateTagResult)
         return c.json(result.success(null))
     }
@@ -375,18 +368,14 @@ app.get(
       return c.json(result.error(500, 'Page not found'))
     }
 
-    const command = new GetObjectCommand({
-      Bucket: S3_BUCKET_NAME,
-      Key: page.contentUrl,
-    })
-    const content = await c.env.BUCKET.send(command)
-    if (!content.Body) {
+    const content = await c.env.BUCKET.get(page.contentUrl)
+    if (!content) {
       return c.json(result.error(500, 'Page data not found'))
     }
 
     c.res.headers.set('cache-control', 'private, max-age=604800')
     return c.html(
-      await content.Body.transformToString(),
+      await content.text(),
     )
   },
 )

packages/server/src/api/pages.ts

@@ -1,14 +1,11 @@
 import { isNotNil } from '@web-archive/shared/utils'
 import { Hono } from 'hono'
 import { validator } from 'hono/validator'
-import { GetObjectCommand } from '@aws-sdk/client-s3'
 import type { HonoTypeUserInformation } from '~/constants/binding'
 import { getNextShowcasePageId, getShowcaseDetailById, queryShowcase } from '~/model/showcase'
 import type { Page } from '~/sql/types'
 import { getBase64FileFromBucket } from '~/utils/file'
 import result from '~/utils/result'
-import { S3_BUCKET_NAME } from '~/constants/config'
-import { getPageById } from '~/model/page'
 
 const app = new Hono<HonoTypeUserInformation>()
 
@@ -50,22 +47,25 @@ app.get('/content', async (c) => {
   }
 
   // todo refactor
-  const page = await getPageById(c.env.DB, { id: Number(pageId), isDeleted: false })
-  if (!page || !page.isShowcased) {
-    return c.json(result.error(500, 'Page not found'))
+  const pageListResult = await c.env.DB.prepare('SELECT * FROM pages WHERE isShowcased = 1 AND isDeleted = 0 AND id = ?')
+    .bind(pageId)
+    .all()
+  if (!pageListResult.success) {
+    return c.redirect('/error')
+  }
+
+  const page = pageListResult.results?.[0] as Page
+  if (!page) {
+    return c.redirect('/error')
   }
 
-  const command = new GetObjectCommand({
-    Bucket: S3_BUCKET_NAME,
-    Key: page.contentUrl,
-  })
-  const content = await c.env.BUCKET.send(command)
-  if (!content.Body) {
+  const content = await c.env.BUCKET.get(page.contentUrl)
+  if (!content) {
     return c.redirect('/error')
   }
 
   return c.html(
-    await content.Body.transformToString(),
+    await content?.text(),
   )
 })
 

packages/server/src/api/showcase.ts

@@ -1,10 +1,8 @@
-import type { Database } from 'better-sqlite3'
-import type { S3Client } from '@aws-sdk/client-s3'
-
 export type Bindings = {
   JWT_SECRET: string
-  DB: Database
-  BUCKET: S3Client
+  DB: D1Database
+  KV: KVNamespace
+  BUCKET: R2Bucket
   AI: Ai
 }
 

packages/server/src/constants/binding.ts

@@ -1,8 +1,8 @@
-import type { Database } from 'better-sqlite3'
+import type { D1Database } from '@cloudflare/workers-types/experimental'
 import { selectAllPageCount, selectPageTotalCount } from './page'
 import { selectAllFolders } from './folder'
 
-async function getHomeChartData(DB: Database) {
+async function getHomeChartData(DB: D1Database) {
   const folderList = await selectAllFolders(DB)
   const folderPageCountList = await Promise.all(folderList.map(async (folder) => {
     const pageCount = await selectPageTotalCount(DB, { folderId: folder.id })