@trylight/app 0.3.6 → 0.3.7

package/README.md

@@ -91,10 +91,12 @@ drizzle-kit's own layout) and applied, whatever it does to the rows there (a
 removed column's values are archived first, below); one the rows refuse is taken back out,
 so the change stays pending rather than blocking every later migrate. Changed
 indexes and constraints are dropped before the columns they cover and enums
-only after, so the two halves apply in order. Syncs and migrates each hold a Postgres advisory lock (with a
-lock_timeout), so the dev server's watcher and an agent's own sync never
-overlap, and a process that dies releases it. `migrate` applies the journal; in an app's sandbox the agent's shell
-asks the platform's migrate socket to run it. `check` (in `pnpm build`)
+only after, so the two halves apply in order. Syncs and migrates each hold a
+Postgres advisory lock, so the dev server's watcher and an agent's own sync
+never overlap, and a process that dies releases it. A wait for the lock is
+bounded (`LOCK_WAIT_MS` in `src/db/locks.ts`), then fails naming its holder.
+`migrate` applies the journal; in an app's sandbox the agent's shell asks
+the platform's migrate socket to run it. `check` (in `pnpm build`)
 fails while `db/schema` has changes no migration holds.
 
 ## Recoverable deletes
@@ -103,13 +105,13 @@ fails while `db/schema` has changes no migration holds.
 that records each insert, update, delete and truncate in `light_changes` (the
 new row, `{ column: { from, to } }`, or the old row), whoever wrote it: the
 actor is `light.actor_kind/_id/_name`, which the entities route and the platform's
-`mii db write` set per transaction, or else the database role. A migration
+`light db write` set per transaction, or else the database role. A migration
 that drops a table or column or changes a column's type first copies what it
 destroys into `light_archive` (`light_archive_values`, called at the top of
 the migration, so in its transaction) and the migrate prints "Archived N
 values from table.column". Both tables refuse UPDATE, DELETE and TRUNCATE (a guard against mistakes:
 the owner role can still drop the trigger). DDL an agent runs itself (`drop
-table` through `mii db write`) is not archived.
+table` through `light db write`) is not archived.
 `migrate` installs the functions before applying migrations and the triggers
 after; the template's AGENTS.md has the restore SQL.
 

package/dist/db/cli.js

@@ -10,6 +10,7 @@ import { migrate } from "drizzle-orm/postgres-js/migrator";
 import postgres from "postgres";
 import { z } from "zod/v4";
 import { archiveNotices, entityTables, prepareAudit, trackTables } from "./audit.js";
+import { LockWaitError, takeLock } from "./locks.js";
 import { MIGRATIONS_DIR, SCHEMA_ENTRY, plan, unwriteMigration, writeMigration } from "./migrations.js";
 import { env } from "../server/env.js";
 /**
@@ -18,13 +19,9 @@ import { env } from "../server/env.js";
  * credential, behind this socket.
  */
 const PLATFORM_MIGRATE = "/run/mii/migrate.sock";
-/** Postgres advisory locks: one migrate, and one sync, of a database at a time. */
-const MIGRATE_LOCK_KEY = 4_815_162_342;
-const SYNC_LOCK_KEY = 4_815_162_343;
 /** Exit code of a migrate whose migrations committed but whose change tracking (triggers, index) didn't go on. */
 const APPLIED_UNTRACKED = 2;
-// pg_advisory_lock waits for the one before it; a process that dies releases it.
-// Only on a direct connection: behind a transaction pooler the lock stays on a
+// Session locks (./locks.ts) only on a direct connection: behind a transaction pooler the lock stays on a
 // pooled server connection after the process exits, and every later sync waits.
 const connect = (onnotice = () => undefined) => postgres(unpooledDatabaseUrl(), { max: 1, onnotice });
 const root = process.cwd();
@@ -50,7 +47,7 @@ function unpooledDatabaseUrl() {
 async function sync() {
     const client = connect();
     try {
-        await client `select pg_advisory_lock(${SYNC_LOCK_KEY})`;
+        await takeLock(client, "sync");
         const planned = await plan(root, await loadSchema());
         if (planned.statements.length === 0)
             return await applyMigrations();
@@ -64,7 +61,7 @@ async function sync() {
         });
         if (applied !== 0 && applied !== APPLIED_UNTRACKED) {
             unwriteMigration(root, tag);
-            console.error(`${MIGRATIONS_DIR}/${tag}.sql didn't apply, so it was taken back; change db/schema and save again.`);
+            console.error(`${MIGRATIONS_DIR}/${tag}.sql didn't apply, so it was taken back; sync again once the error above is dealt with.`);
         }
         return applied;
     }
@@ -93,7 +90,7 @@ async function applyMigrations() {
     const archived = archiveNotices();
     const client = connect(archived.onnotice);
     try {
-        await client `select pg_advisory_lock(${MIGRATE_LOCK_KEY})`;
+        await takeLock(client, "migrate");
         const tables = entityTables(await loadSchema());
         await prepareAudit(client);
         await migrate(drizzle(client), { migrationsFolder: join(root, MIGRATIONS_DIR) });
@@ -128,4 +125,10 @@ async function migrateThroughPlatform() {
 // Last, so every const above is initialized before a command reads it.
 const commands = { sync, migrate: applyMigrations, check };
 const usage = z.enum(["sync", "migrate", "check"], { error: "Usage: light-db sync | migrate | check" });
-process.exit(await commands[usage.parse(command)]());
+const exitCode = await commands[usage.parse(command)]().catch((error) => {
+    if (!(error instanceof LockWaitError))
+        throw error;
+    console.error(error.message);
+    return 1;
+});
+process.exit(exitCode);

package/dist/db/locks.d.ts

@@ -0,0 +1,13 @@
+import postgres from "postgres";
+/** Postgres advisory locks: one migrate, and one sync, of a database at a time. */
+export declare const LOCKS: {
+    migrate: number;
+    sync: number;
+};
+/** How long a sync or migrate waits for the one before it, then fails naming who holds the lock. */
+export declare const LOCK_WAIT_MS = 30000;
+/** A sync or migrate gave up waiting for its lock; the message says who holds it. */
+export declare class LockWaitError extends Error {
+}
+/** Takes `command`'s session lock, or throws naming its holder after `LOCK_WAIT_MS`. */
+export declare function takeLock(client: postgres.Sql, command: keyof typeof LOCKS): Promise<void>;

package/dist/db/locks.js

@@ -0,0 +1,35 @@
+import postgres from "postgres";
+import { z } from "zod/v4";
+/** Postgres advisory locks: one migrate, and one sync, of a database at a time. */
+export const LOCKS = { migrate: 4_815_162_342, sync: 4_815_162_343 };
+/** How long a sync or migrate waits for the one before it, then fails naming who holds the lock. */
+export const LOCK_WAIT_MS = 30_000;
+const LOCK_NOT_AVAILABLE = "55P03";
+// Exclusive, so at most one backend holds it.
+const holderRows = z.array(z.object({ pid: z.number() })).max(1);
+/** A sync or migrate gave up waiting for its lock; the message says who holds it. */
+export class LockWaitError extends Error {
+}
+/** Takes `command`'s session lock, or throws naming its holder after `LOCK_WAIT_MS`. */
+export async function takeLock(client, command) {
+    const key = LOCKS[command];
+    try {
+        await client.begin(async (tx) => {
+            await tx `select set_config('lock_timeout', ${`${LOCK_WAIT_MS}ms`}, true)`;
+            await tx `select pg_advisory_lock(${key})`;
+        });
+    }
+    catch (error) {
+        if (!(error instanceof postgres.PostgresError) || error.code !== LOCK_NOT_AVAILABLE)
+            throw error;
+        const [holder] = holderRows.parse(await client `
+      select pid from pg_locks
+      where locktype = 'advisory' and granted and objsubid = 1
+        and database = (select oid from pg_database where datname = current_database())
+        and ((classid::bigint << 32) | objid::bigint) = ${key}`);
+        const waited = `light-db ${command}: waited ${LOCK_WAIT_MS / 1000}s for the ${command} lock`;
+        if (holder === undefined)
+            throw new LockWaitError(`${waited}; it came free just now, so run it again.`);
+        throw new LockWaitError(`${waited}, held by backend ${holder.pid}; if no other sync or migrate is running, the database's owner ends it with pg_terminate_backend(${holder.pid}).`);
+    }
+}

package/dist/invoke/contracts.d.ts

@@ -1,7 +1,7 @@
 import type { z } from "zod/v4";
 type ObjectSchema = z.ZodType<Record<string, unknown>, Record<string, unknown>>;
 export type Contract = {
-    /** The id `mii contract create` printed. */
+    /** The id `light contract create` printed. */
     readonly id: string;
     readonly input: ObjectSchema;
     readonly output: ObjectSchema;

package/dist/schema.d.ts

@@ -17,7 +17,7 @@ export type FieldSources = Partial<Record<string, FieldSource>>;
  * Who may use a table through `app.table(...)`. Reads always go through the
  * app's door: members only, or anyone with the link on a public app. Writes
  * are either people signed in to the app ("door") or only the org's agents,
- * through `mii db write` ("agents").
+ * through `light db write` ("agents").
  */
 export type Access = {
     readonly read: "door";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trylight/app",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "The Light SDK every v2 org app depends on: entities (Drizzle tables with a typed client), sign-in, contracts and in-app chat.",
   "license": "UNLICENSED",
   "type": "module",
@@ -12,6 +12,7 @@
     "url": "https://github.com/shubh9/mii.git",
     "directory": "packages/app-sdk"
   },
+  "packageManager": "pnpm@11.0.9",
   "files": [
     "dist",
     "bin"
@@ -41,6 +42,15 @@
       "default": "./dist/vite.js"
     }
   },
+  "scripts": {
+    "build": "rm -rf dist && tsc -p tsconfig.build.json",
+    "typecheck": "tsc --noEmit",
+    "lint": "eslint src test --max-warnings 0",
+    "test": "node --test --import tsx \"test/**/*.test.ts\"",
+    "check": "tsx scripts/write-brand.ts --check && pnpm run typecheck && pnpm run lint && pnpm run test && pnpm run build",
+    "prepack": "pnpm run build",
+    "brand": "tsx scripts/write-brand.ts"
+  },
   "peerDependencies": {
     "@tanstack/react-query": ">=5.69",
     "@tanstack/react-router": ">=1.170",
@@ -74,13 +84,5 @@
     "typescript-eslint": "^8.70.1",
     "vite": "^8.2.0",
     "zod": "^4.6.5"
-  },
-  "scripts": {
-    "build": "rm -rf dist && tsc -p tsconfig.build.json",
-    "typecheck": "tsc --noEmit",
-    "lint": "eslint src test --max-warnings 0",
-    "test": "node --test --import tsx \"test/**/*.test.ts\"",
-    "check": "tsx scripts/write-brand.ts --check && pnpm run typecheck && pnpm run lint && pnpm run test && pnpm run build",
-    "brand": "tsx scripts/write-brand.ts"
   }
-}
+}