koguma 2.3.2 → 2.3.4

package/src/vite.js

@@ -2,35 +2,32 @@
 import { createHash } from "node:crypto";
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
-function kogumaHMR() {
-  const HASH_FILENAME = "dbhash";
-  const HASH_DIR = ".koguma";
-  const HASH_SUBPATH = `${HASH_DIR}/${HASH_FILENAME}`;
-  const SQLITE_GLOB = "**/.koguma/.wrangler/state/v3/d1/**/*.sqlite";
+function kogumaHMR(options = {}) {
+  const HASH_DIR = options.kogumaDir ?? ".koguma";
+  const HASH_FILE = "dbhash";
+  const HASH_SUBPATH = `${HASH_DIR}/${HASH_FILE}`;
   return {
     name: "koguma-hmr",
     configureServer(server) {
       const root = server.config.root;
       const hashDir = join(root, HASH_DIR);
       const hashPath = join(root, HASH_SUBPATH);
-      server.watcher.add(SQLITE_GLOB);
+      const wranglerDir = join(root, HASH_DIR, ".wrangler");
+      if (!existsSync(hashDir))
+        mkdirSync(hashDir, { recursive: true });
+      server.watcher.add(hashDir);
       server.watcher.on("change", (file) => {
-        if (!file.includes(".koguma/.wrangler/state/v3/d1") || !file.endsWith(".sqlite"))
+        if (file.startsWith(wranglerDir) && file.endsWith(".sqlite")) {
+          try {
+            const hash = createHash("sha256").update(readFileSync(file)).digest("hex");
+            writeFileSync(hashPath, hash);
+          } catch {}
           return;
-        try {
-          const hash = createHash("sha256").update(readFileSync(file)).digest("hex");
-          if (!existsSync(hashDir))
-            mkdirSync(hashDir, { recursive: true });
-          writeFileSync(hashPath, hash);
-        } catch {}
+        }
+        if (file === hashPath) {
+          server.ws.send({ type: "full-reload" });
+        }
       });
-      server.watcher.add(hashPath);
-    },
-    handleHotUpdate({ file, server }) {
-      if (file.endsWith(HASH_FILENAME) && file.includes(HASH_DIR)) {
-        server.ws.send({ type: "full-reload" });
-        return [];
-      }
     },
     config() {
       return {

package/src/vite.ts

@@ -15,25 +15,27 @@ import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'node:fs';
 import { join } from 'node:path';
 import type { Plugin } from 'vite';
 
+export interface KogumaHMROptions {
+  /**
+   * Path to the .koguma directory, relative to the Vite project root.
+   * Defaults to '.koguma'. Set this if your Vite config lives in a
+   * subdirectory of the repo (e.g. '../../.koguma').
+   */
+  kogumaDir?: string;
+}
+
 /**
  * Watches the wrangler local D1 SQLite file and triggers a full browser reload
- * when content actually changes. Rather than watching the binary SQLite directly
- * (which churns 3-4× per operation due to WAL writes), it writes a SHA-256 hash
- * of the DB to `.koguma/dbhash` and watches that text file as the reload trigger.
- *
- * Also suppresses Vite HMR for the `content/` directory, since those edits sync
- * through koguma's own file watcher → D1 → API, not through the Vite module graph.
+ * when content changes. Uses a SHA-256 hash file in .koguma/dbhash to debounce
+ * the multiple WAL writes that SQLite generates per D1 operation.
  *
- * Pair with the `server.proxy` pointing `/api` to `http://localhost:8787` so the
- * browser refetches fresh content on each reload.
+ * Also suppresses Vite HMR for content/ since those changes sync through
+ * koguma's own pipeline → D1 → API, not through the Vite module graph.
  */
-export function kogumaHMR(): Plugin {
-  const HASH_FILENAME = 'dbhash';
-  const HASH_DIR = '.koguma';
-  const HASH_SUBPATH = `${HASH_DIR}/${HASH_FILENAME}`;
-
-  // Glob passed to chokidar — must NOT go through path.resolve or the ** breaks
-  const SQLITE_GLOB = '**/.koguma/.wrangler/state/v3/d1/**/*.sqlite';
+export function kogumaHMR(options: KogumaHMROptions = {}): Plugin {
+  const HASH_DIR = options.kogumaDir ?? '.koguma';
+  const HASH_FILE = 'dbhash';
+  const HASH_SUBPATH = `${HASH_DIR}/${HASH_FILE}`;
 
   return {
     name: 'koguma-hmr',
@@ -42,38 +44,37 @@ export function kogumaHMR(): Plugin {
       const root = server.config.root;
       const hashDir = join(root, HASH_DIR);
       const hashPath = join(root, HASH_SUBPATH);
+      const wranglerDir = join(root, HASH_DIR, '.wrangler');
+
+      // Ensure .koguma exists so chokidar can watch it
+      if (!existsSync(hashDir)) mkdirSync(hashDir, { recursive: true });
 
-      // Add the wrangler SQLite glob directly (no resolve — globs need literal **)
-      server.watcher.add(SQLITE_GLOB);
+      // Watch .koguma/ directory — covers both the SQLite files inside
+      // .wrangler/ and the dbhash file we write ourselves.
+      server.watcher.add(hashDir);
 
       server.watcher.on('change', (file: string) => {
-        if (
-          !file.includes('.koguma/.wrangler/state/v3/d1') ||
-          !file.endsWith('.sqlite')
-        )
+        // SQLite changed → compute hash and write dbhash file.
+        // The next change event for dbhash will trigger the reload.
+        if (file.startsWith(wranglerDir) && file.endsWith('.sqlite')) {
+          try {
+            const hash = createHash('sha256')
+              .update(readFileSync(file))
+              .digest('hex');
+            writeFileSync(hashPath, hash);
+          } catch {
+            // SQLite may be locked mid-write — next write will succeed
+          }
           return;
-        try {
-          const hash = createHash('sha256')
-            .update(readFileSync(file))
-            .digest('hex');
-          if (!existsSync(hashDir)) mkdirSync(hashDir, { recursive: true });
-          writeFileSync(hashPath, hash);
-        } catch {
-          // SQLite may be locked mid-write — the next write will succeed
         }
-      });
-
-      // Watch the hash file — Vite does NOT auto-reload non-module files,
-      // so handleHotUpdate below is required to send the full-reload signal.
-      server.watcher.add(hashPath);
-    },
 
-    handleHotUpdate({ file, server }) {
-      // When the hash file changes, the DB has new content → reload the page
-      if (file.endsWith(HASH_FILENAME) && file.includes(HASH_DIR)) {
-        server.ws.send({ type: 'full-reload' });
-        return [];
-      }
+        // dbhash changed → new content is in D1 → reload the page.
+        // We send directly from here rather than via handleHotUpdate because
+        // handleHotUpdate only fires for files in Vite's module graph.
+        if (file === hashPath) {
+          server.ws.send({ type: 'full-reload' });
+        }
+      });
     },
 
     config() {