@aiquants/daily-report 0.2.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiquants/daily-report",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "Reusable daily-report feature package: shared types/schemas, React (Router v7) UI with virtual scrolling + optimistic updates + SSE sync, and a drizzle (mssql) server layer with DI ports (auth, user resolution, redis, external sources).",
   "sideEffects": false,
   "main": "dist/index.js",

package/src/client/components/daily-report-detail-list.tsx

@@ -454,14 +454,11 @@ const DailyReportHeader = ({
     sourceTypeConfigs?: Record<string, SourceTypeConfig>
 }) => (
     <div className="flex flex-wrap items-center gap-2 font-medium text-slate-600 text-xs">
-        <button
-            type="button"
-            onClick={onToggleRead}
-            className="flex h-6 w-6 items-center justify-center rounded-full transition-colors hover:bg-slate-200 focus:outline-none dark:hover:bg-slate-700"
-            title={isRead ? "未読にする" : "既読にする"}
-            data-detail-read-button={report.reportHubId}>
-            {isRead ? <Check className="h-3.5 w-3.5 text-blue-500" /> : <UnreadIndicator className="text-xs" />}
-        </button>
+        {(() => {
+            const sourceType = report.sourceType
+            const sourceConfig = sourceType ? sourceTypeConfigs?.[sourceType] : undefined
+            return sourceConfig ? <span className={cn("inline-flex items-center rounded px-2 py-0.5 font-semibold text-[10px] tracking-wide", sourceConfig.badgeClassName)}>{sourceConfig.label}</span> : null
+        })()}
         <button
             type="button"
             onClick={onToggleStar}
@@ -470,6 +467,14 @@ const DailyReportHeader = ({
             data-detail-star-button={report.reportHubId}>
             {isStarred ? <Star className="h-3.5 w-3.5 fill-yellow-400 text-yellow-400" /> : <Star className="h-3.5 w-3.5 text-slate-300 dark:text-slate-500" />}
         </button>
+        <button
+            type="button"
+            onClick={onToggleRead}
+            className="flex h-6 w-6 items-center justify-center rounded-full transition-colors hover:bg-slate-200 focus:outline-none dark:hover:bg-slate-700"
+            title={isRead ? "未読にする" : "既読にする"}
+            data-detail-read-button={report.reportHubId}>
+            {isRead ? <Check className="h-3.5 w-3.5 text-blue-500" /> : <UnreadIndicator className="text-xs" />}
+        </button>
         {isMine && (
             <button type="button" onClick={onDelete} data-detail-delete-button={report.reportHubId} className="text-lg leading-none transition-transform focus:outline-none active:scale-125" title="削除する">
                 <Trash2 className="h-4 w-4 text-slate-300 hover:text-red-500" />
@@ -479,11 +484,7 @@ const DailyReportHeader = ({
             <span className="text-[10px] text-blue-500 uppercase tracking-wide">{fieldLabels.id}</span>
             {report.reportHubId}
         </span>
-        {(() => {
-            const sourceType = report.sourceType
-            const sourceConfig = sourceType ? sourceTypeConfigs?.[sourceType] : undefined
-            return sourceConfig ? <span className={cn("inline-flex items-center rounded px-2 py-0.5 font-semibold text-[10px] tracking-wide", sourceConfig.badgeClassName)}>{sourceConfig.label}</span> : null
-        })()}
+
         <span className="inline-flex items-center gap-1 whitespace-nowrap rounded-full bg-slate-100 px-3 py-1">
             <span className="text-[10px] text-slate-400 uppercase tracking-wide">{fieldLabels.businessDate}</span>
             {formatToIsoDate(report.date)}

package/src/client/components/daily-report-list.tsx

@@ -995,12 +995,12 @@ const ListReportItem = ({ item, isActive, onSelect }: { item: DailyReportItem; i
                     <span className="inline-flex min-w-0 max-w-full items-center rounded-full bg-slate-100 px-3 py-1 font-semibold text-xs dark:bg-slate-800 dark:text-slate-200">
                         <span className="truncate font-medium text-slate-900 dark:text-slate-100">{creator}</span>
                     </span>
-                    {(() => {
-                        const sourceType = report?.sourceType
-                        const sourceConfig = sourceType ? sourceTypeConfigs?.[sourceType] : undefined
-                        return sourceConfig ? <span className={cn("inline-flex shrink-0 items-center rounded px-2 py-0.5 font-semibold text-[10px] tracking-wide", sourceConfig.badgeClassName)}>{sourceConfig.label}</span> : null
-                    })()}
                     <div className="ml-auto flex items-center gap-1.5">
+                        {(() => {
+                            const sourceType = report?.sourceType
+                            const sourceConfig = sourceType ? sourceTypeConfigs?.[sourceType] : undefined
+                            return sourceConfig ? <span className={cn("inline-flex shrink-0 items-center rounded px-2 py-0.5 font-semibold text-[10px] tracking-wide", sourceConfig.badgeClassName)}>{sourceConfig.label}</span> : null
+                        })()}
                         <button
                             type="button"
                             title={report.isStarred ? "スターを外す" : "スターを付ける"}

package/src/server/cache.spec.ts

@@ -0,0 +1,47 @@
+import { describe, expect, it, vi } from "vitest"
+import { createEpochStore, SqlResultCache } from "./cache"
+
+describe("SqlResultCache Memory Cleanup", () => {
+    it("should clean up expired cache entries when map size exceeds 500", async () => {
+        // Mock epoch store
+        const epochStore = createEpochStore(undefined)
+        vi.spyOn(epochStore, "getEpoch").mockResolvedValue(0)
+
+        const cache = new SqlResultCache({ defaultTtlMs: 1000 }, epochStore)
+
+        // 1. 期限切れのキャッシュを 500 件作成 (expireAt を過去に設定)
+        // 直接プライベートフィールド buckets に流し込むことでモック状態を作る
+        const buckets = (cache as any).buckets
+        for (let i = 0; i < 505; i++) {
+            buckets.set(`expired-key-${i}`, {
+                records: [i],
+                expireAt: Date.now() - 1000, // 過去時間
+                epoch: 0,
+            })
+        }
+
+        // 2. 有効なキャッシュを 10 件作成 (expireAt を未来に設定)
+        for (let i = 0; i < 10; i++) {
+            buckets.set(`valid-key-${i}`, {
+                records: [i],
+                expireAt: Date.now() + 100000, // 未来時間
+                epoch: 0,
+            })
+        }
+
+        expect(buckets.size).toBe(515)
+
+        // 3. getOrFetch を実行して 500 件超えの閾値トリガーを引く
+        const fetcher = vi.fn().mockResolvedValue(["new-value"])
+        await cache.getOrFetch({
+            cacheKey: "trigger-key",
+            fetcher,
+        })
+
+        // 4. 検証: 期限切れの 505 件のデータが cleanExpired で削除され、有効な 10 件 + 新規の 1 件のみ残っていること
+        expect(buckets.size).toBe(11) // 10 (valid) + 1 (trigger-key)
+        expect(buckets.has("trigger-key")).toBe(true)
+        expect(buckets.has("valid-key-0")).toBe(true)
+        expect(buckets.has("expired-key-0")).toBe(false)
+    })
+})

package/src/server/cache.ts

@@ -123,6 +123,10 @@ export class SqlResultCache {
                 // キャッシュ保存時に現在の epoch を記録
                 const epoch = opts.epochKey ? await this.epochStore.getEpoch(opts.epochKey) : 0
                 this.buckets.set(cacheKey, { records, expireAt, epoch })
+                // 蓄積防止のため、サイズが一定値を超えたら期限切れキャッシュを一括クリーンアップ
+                if (this.buckets.size > 500) {
+                    this.cleanExpired()
+                }
             }
             return records
         })()
@@ -162,4 +166,18 @@ export class SqlResultCache {
             }
         }
     }
+
+    /**
+     * Cleans up all expired cache buckets to prevent memory accumulation.
+     * メモリー蓄積を防ぐため、期限切れのキャッシュバケットをすべてクリーンアップする処理。
+     */
+    private cleanExpired(): void {
+        const now = Date.now()
+        // 期限切れのキーを削除
+        for (const [key, bucket] of this.buckets.entries()) {
+            if (bucket.expireAt <= now) {
+                this.buckets.delete(key)
+            }
+        }
+    }
 }