create-fullstack-scaffold 0.5.0 → 0.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-fullstack-scaffold",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "type": "module",
   "bin": {
     "create-fullstack-scaffold": "dist/cli/index.js"

package/template/drizzle.config.ts

@@ -1,13 +1,21 @@
-import { defineConfig } from 'drizzle-kit';
-import { getDatabaseConfig } from './src/server/db/config';
+import { defineConfig } from 'drizzle-kit'
+import { mkdirSync } from 'node:fs'
 
-const config = getDatabaseConfig();
+// fresh clone 时 data/ 不存在，libsql 直接报 error 14（连不上库文件）。
+// 在配置加载阶段就确保目录存在，令 `npm run db:push` / `npm run dev`
+// 真正开箱即用（README 的 zero-config 承诺）
+mkdirSync('data', { recursive: true })
+import { getDatabaseConfig } from './src/server/db/config'
+
+const config = getDatabaseConfig()
 
 export default defineConfig({
   schema: './src/server/db/schema/index.ts',
   out: './drizzle',
   dialect: 'sqlite',
   dbCredentials: {
+    // 与运行时保持同一库文件：drizzle-kit 在无 NODE_ENV 下执行时
+    // config.sqlitePath 会解析为 development.db，这里不能写死 app.db
     url: config.sqlitePath || './data/app.db',
   },
-});
+})

package/template/package.json

@@ -1,7 +1,7 @@
 {
   "name": "biomimic-todo-app",
   "private": true,
-  "version": "0.5.0",
+  "version": "0.5.2",
   "type": "module",
   "bin": {
     "biomimic": "./dist/cli/index.js"

package/template/src/server/config.ts

@@ -66,9 +66,7 @@ export function getAppConfig(): AppConfig {
     database: {
       driver: isCloudflare ? 'd1' : dbDriver,
       sqlitePath:
-        typeof process !== 'undefined'
-          ? process.env.SQLITE_PATH || `./data/${nodeEnv}.db`
-          : undefined,
+        typeof process !== 'undefined' ? process.env.SQLITE_PATH || './data/app.db' : undefined,
       mysqlHost: typeof process !== 'undefined' ? process.env.MYSQL_HOST || 'localhost' : undefined,
       mysqlPort:
         typeof process !== 'undefined' ? parseInt(process.env.MYSQL_PORT || '3306', 10) : undefined,

package/template/src/server/core/__tests__/isr-cache-cf.test.ts

@@ -0,0 +1,96 @@
+/**
+ * @framework-baseline 4fce8de3d919d2fb
+
+ * CloudflareCacheStore 单测：索引清单（manifest）驱动的 purgePattern。
+ *
+ * 背景：Cache API 没有 list()，purgePattern 曾是恒不执行的死代码——
+ * CF 生产上内容更新后陈旧详情页服务到自然过期。现实现用 isr:__index__
+ * 键记录已缓存 pathname，pattern 据此真清剿。此文件验证该行为。
+ */
+
+import { describe, it, expect, beforeEach, afterEach } from 'vitest'
+
+/** 极简 Cache API mock：Map<urlString, Response> */
+function makeFakeCaches() {
+  const store = new Map<string, Response>()
+  const cache = {
+    async match(req: Request | string) {
+      const key = typeof req === 'string' ? req : req.url
+      return store.get(key) ?? undefined
+    },
+    async put(req: Request | string, res: Response) {
+      const key = typeof req === 'string' ? req : req.url
+      store.set(key, res)
+    },
+    async delete(req: Request | string) {
+      const key = typeof req === 'string' ? req : req.url
+      return store.delete(key)
+    },
+  }
+  return { caches: { open: async () => cache }, store }
+}
+
+describe('CloudflareCacheStore purgePattern (manifest)', () => {
+  let fake: ReturnType<typeof makeFakeCaches>
+  let originalCaches: unknown
+
+  beforeEach(async () => {
+    fake = makeFakeCaches()
+    originalCaches = (globalThis as { caches?: unknown }).caches
+    ;(globalThis as { caches?: unknown }).caches = fake.caches as never
+    const mod = await import('@server/core/isr-cache')
+    // 重新构造以绑定 mock caches
+    const { createISRCache } = mod
+    const cache = createISRCache({ maxAge: 60, staleWhileRevalidate: 60 })
+    ;(globalThis as Record<string, unknown>).__testCache = cache
+  })
+
+  afterEach(() => {
+    ;(globalThis as { caches?: unknown }).caches = originalCaches as never
+  })
+
+  function getCache() {
+    return (globalThis as Record<string, unknown>).__testCache as {
+      store: (key: string, html: string) => Promise<void>
+      purgePattern: (pattern: string) => Promise<void>
+      lookup: (pathname: string) => Promise<{ status: string }>
+    }
+  }
+
+  it('purgePattern 清剿匹配键并保留其余（索引驱动，非死代码）', async () => {
+    const c = getCache()
+    await c.store('/', 'home')
+    await c.store('/content', 'list')
+    await c.store('/content/123', 'detail-123')
+    await c.store('/content/456', 'detail-456')
+    await c.store('/todos', 'todos')
+
+    await c.purgePattern('isr:/content/*')
+
+    expect((await c.lookup('/content/123')).status).toBe('miss')
+    expect((await c.lookup('/content/456')).status).toBe('miss')
+    // 列表页本身不匹配 isr:/content/*（无尾斜杠通配不到裸键）
+    expect((await c.lookup('/todos')).status).toBe('fresh')
+  })
+
+  it('正则元字符键名不误伤（escapeForPattern）', async () => {
+    const c = getCache()
+    await c.store('/content/1+2', 'plus')
+    await c.store('/content/abc', 'plain')
+
+    // '1+2' 中的 + 若未转义会被当量词，误匹配 '12' 等——这里验证只清目标
+    await c.purgePattern('isr:/content/1+2')
+
+    expect((await c.lookup('/content/1+2')).status).toBe('miss')
+    expect((await c.lookup('/content/abc')).status).toBe('fresh')
+  })
+
+  it('purge 单键后索引同步收缩，后续 purgePattern 不再删幽灵键', async () => {
+    const c = getCache()
+    await c.store('/a', 'a')
+    await c.store('/b', 'b')
+    await c.purgePattern('isr:/a')
+    // 无异常即通过（索引写回路径被走到）
+    expect((await c.lookup('/b')).status).toBe('fresh')
+  })
+})

package/template/src/server/core/isr-cache.ts

@@ -130,6 +130,33 @@ class CloudflareCacheStore implements ISRCacheStore {
     return { html, createdAt, revalidateAt }
   }
 
+  // Cache API 没有 list()：用专用索引键记录所有已缓存 pathname（JSON 数组），
+  // purgePattern 据此清剿。跨 isolate 各自记账，最终一致（各自清理各自的键，
+  // 键相同即覆盖，无重复副作用）。
+  private static readonly INDEX_KEY = 'isr:__index__'
+
+  private async readIndex(): Promise<string[]> {
+    const cache = await this.getCache()
+    const res = await cache.match(this.toUrl(CloudflareCacheStore.INDEX_KEY))
+    if (!res) return []
+    try {
+      const parsed = JSON.parse(await res.text())
+      return Array.isArray(parsed) ? parsed : []
+    } catch {
+      return []
+    }
+  }
+
+  private async writeIndex(keys: string[]): Promise<void> {
+    const cache = await this.getCache()
+    // 索引不必常驻新鲜——purge 类操作低频，短 TTL 控制体积
+    const body = JSON.stringify([...new Set(keys)])
+    await cache.put(
+      this.toUrl(CloudflareCacheStore.INDEX_KEY),
+      new Response(body, { headers: { 'Content-Type': 'application/json' } })
+    )
+  }
+
   async set(key: string, html: string, options: Required<ISRCacheOptions>): Promise<void> {
     const cache = await this.getCache()
     const url = this.toUrl(key)
@@ -147,26 +174,48 @@ class CloudflareCacheStore implements ISRCacheStore {
     })
 
     await cache.put(url, response)
+
+    const index = await this.readIndex()
+    if (!index.includes(key)) {
+      index.push(key)
+      await this.writeIndex(index)
+    }
   }
 
   async purge(key: string): Promise<void> {
     const cache = await this.getCache()
     const url = this.toUrl(key)
     await cache.delete(url)
+
+    const index = await this.readIndex()
+    if (index.includes(key)) {
+      await this.writeIndex(index.filter(k => k !== key))
+    }
   }
 
   async purgePattern(pattern: string): Promise<void> {
+    // 此前为永远不执行的死代码（allKeys 恒空）——CF 上内容更新后
+    // 陈旧详情页会一直服务到自然过期。现按索引清单真清剿。
+    const regex = new RegExp('^' + this.escapeForPattern(pattern).replace(/\*/g, '.*') + '$')
+    const index = await this.readIndex()
     const cache = await this.getCache()
-    const regex = new RegExp('^' + pattern.replace(/\*/g, '.*') + '$')
-    const allKeys: Request[] = []
+    const survivors: string[] = []
 
-    for (const request of allKeys) {
-      const url = new URL(request.url)
-      const key = `isr:${url.pathname}`
+    for (const key of index) {
       if (regex.test(key)) {
-        await cache.delete(request)
+        await cache.delete(this.toUrl(key))
+      } else {
+        survivors.push(key)
       }
     }
+    if (survivors.length !== index.length) {
+      await this.writeIndex(survivors)
+    }
+  }
+
+  private escapeForPattern(pattern: string): string {
+    // 转义除 * 外的正则元字符，防 'content/1+2' 之类键名误匹配
+    return pattern.replace(/[.+?^${}()|[\]]/g, '\\$&')
   }
 }
 

package/template/src/server/entries/cloudflare.ts

@@ -135,17 +135,30 @@ export default {
   },
 }
 
-async function regeneratePage(
+// 单飞：同 isolate 内并发 stale 请求共享同一次重建，防缓存击穿
+const inflightRevalidations = new Map<string, Promise<void>>()
+
+function regeneratePage(
   pathname: string,
   env: CloudflareBindings,
   request: Request
 ): Promise<void> {
-  try {
-    const html = await renderISRForRoute(pathname, env, request)
-    await isrCache.store(pathname, html)
-  } catch (error) {
-    console.error('ISR regeneration failed:', error)
-  }
+  const existing = inflightRevalidations.get(pathname)
+  if (existing) return existing
+
+  const task = (async () => {
+    try {
+      const html = await renderISRForRoute(pathname, env, request)
+      await isrCache.store(pathname, html)
+    } catch (error) {
+      console.error('ISR regeneration failed:', error)
+    } finally {
+      inflightRevalidations.delete(pathname)
+    }
+  })()
+
+  inflightRevalidations.set(pathname, task)
+  return task
 }
 
 async function renderISRForRoute(

package/template/src/server/entries/node.ts

@@ -202,7 +202,9 @@ export async function startServer() {
     await initializeDatabase()
     bootstrapLog.info({}, 'Database ready')
   } catch (err) {
-    bootstrapLog.error({ err }, 'Database initialization failed')
+    // pino 走异步 thread-stream transport，process.exit 前不 flush——
+    // 生产致命错误必须同步 console.error，否则静默死（exit 1 零输出）
+    console.error('Database initialization failed:', err)
     process.exit(1)
   }