create-m5kdev 0.28.7 → 0.28.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-m5kdev",
-  "version": "0.28.7",
+  "version": "0.28.8",
   "license": "GPL-3.0-only",
   "repository": {
     "type": "git",

package/templates/minimal-app/apps/server/drizzle/db.ts.tpl

@@ -1,26 +1,26 @@
-import { createClient } from "@libsql/client";
-import { drizzle } from "drizzle-orm/libsql";
-import * as schema from "../src/schema";
-
-/**
- * Standalone DB handle for scripts (seed, maintenance). Deliberately does NOT
- * import ./app — constructing the backend app opens Redis/queue connections
- * that keep short-lived scripts alive forever. The running server gets its own
- * connection through createBackendApp.
- */
-const databaseUrl = process.env.DATABASE_URL ?? "file:./local.db";
-const syncUrl = process.env.TURSO_DATABASE_URL;
-const authToken = process.env.TURSO_AUTH_TOKEN;
-
-export const isRemote = syncUrl && authToken;
-
-const client = createClient(
-  isRemote ? { url: databaseUrl, syncUrl, authToken } : { url: databaseUrl }
-);
-
-export const orm = drizzle(client, { schema });
-
-export type Orm = typeof orm;
-export type Schema = typeof schema;
-
-export { schema };
+import { createClient } from "@libsql/client";
+import { drizzle } from "drizzle-orm/libsql";
+import * as schema from "../src/schema";
+
+/**
+ * Standalone DB handle for scripts (seed, maintenance). Deliberately does NOT
+ * import ./app — constructing the backend app opens Redis/queue connections
+ * that keep short-lived scripts alive forever. The running server gets its own
+ * connection through createBackendApp.
+ */
+const databaseUrl = process.env.DATABASE_URL ?? "file:./local.db";
+const syncUrl = process.env.TURSO_DATABASE_URL;
+const authToken = process.env.TURSO_AUTH_TOKEN;
+
+export const isRemote = syncUrl && authToken;
+
+const client = createClient(
+  isRemote ? { url: databaseUrl, syncUrl, authToken } : { url: databaseUrl }
+);
+
+export const orm = drizzle(client, { schema });
+
+export type Orm = typeof orm;
+export type Schema = typeof schema;
+
+export { schema };

package/templates/minimal-app/apps/server/drizzle/guard.ts.tpl

@@ -0,0 +1,36 @@
+import net from "node:net";
+
+const CONNECT_TIMEOUT_MS = 500;
+
+function isPortInUse(port: number): Promise<boolean> {
+  return new Promise((resolve) => {
+    const socket = net.connect({ port, host: "127.0.0.1" });
+    const done = (result: boolean) => {
+      socket.destroy();
+      resolve(result);
+    };
+    socket.setTimeout(CONNECT_TIMEOUT_MS);
+    socket.once("connect", () => done(true));
+    socket.once("timeout", () => done(false));
+    socket.once("error", () => done(false));
+  });
+}
+
+/**
+ * The dev server holds its own libsql connection on the local database file —
+ * an embedded replica when Turso is configured. A second process syncing or
+ * deleting that file corrupts the WAL, so db scripts must not run while the
+ * server is up. Best-effort check: only the conventional PORT is probed.
+ */
+export async function ensureDevServerStopped(): Promise<void> {
+  if (process.env.SKIP_DB_GUARD === "true") return;
+  const databaseUrl = process.env.DATABASE_URL ?? "file:./local.db";
+  if (!databaseUrl.startsWith("file:")) return;
+  const port = Number.parseInt(process.env.PORT ?? "8080", 10);
+  if (Number.isNaN(port) || !(await isPortInUse(port))) return;
+  console.error(
+    `[drizzle] A server is listening on port ${port} and holds ${databaseUrl}. ` +
+      "Stop the dev server first, or set SKIP_DB_GUARD=true to override."
+  );
+  process.exit(1);
+}