@meith/db 0.17.1 → 0.18.0

package/migrations/meta/_journal.json

@@ -400,6 +400,13 @@
       "when": 1787524084640,
       "tag": "0056_marketplace_catalog",
       "breakpoints": true
+    },
+    {
+      "idx": 57,
+      "version": "7",
+      "when": 1787650466674,
+      "tag": "0057_promotion_scan_cursor",
+      "breakpoints": true
     }
   ]
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@meith/db",
-  "version": "0.17.1",
-  "license": "LGPL-3.0-or-later",
+  "version": "0.18.0",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/meith-dev/meith.git",
@@ -22,35 +22,35 @@
   "dependencies": {
     "drizzle-orm": "^0.45.2",
     "postgres": "^3.4.7",
-    "@meith/accounts": "0.17.1",
-    "@meith/admin": "0.17.1",
-    "@meith/antispam": "0.17.1",
-    "@meith/attachments": "0.17.1",
-    "@meith/authorization": "0.17.1",
-    "@meith/api": "0.17.1",
-    "@meith/core": "0.17.1",
-    "@meith/avatars": "0.17.1",
-    "@meith/drafts": "0.17.1",
-    "@meith/groups": "0.17.1",
-    "@meith/forums": "0.17.1",
-    "@meith/events": "0.17.1",
-    "@meith/i18n": "0.17.1",
-    "@meith/marketplace": "0.17.1",
-    "@meith/messages": "0.17.1",
-    "@meith/moderation": "0.17.1",
-    "@meith/plugin-kit": "0.17.1",
-    "@meith/markdown": "0.17.1",
-    "@meith/profile-fields": "0.17.1",
-    "@meith/notifications": "0.17.1",
-    "@meith/relations": "0.17.1",
-    "@meith/polls": "0.17.1",
-    "@meith/settings": "0.17.1",
-    "@meith/subscriptions": "0.17.1",
-    "@meith/threads": "0.17.1",
-    "@meith/search": "0.17.1",
-    "@meith/signatures": "0.17.1",
-    "@meith/tasks": "0.17.1",
-    "@meith/reputation": "0.17.1"
+    "@meith/admin": "0.18.0",
+    "@meith/accounts": "0.18.0",
+    "@meith/api": "0.18.0",
+    "@meith/antispam": "0.18.0",
+    "@meith/attachments": "0.18.0",
+    "@meith/authorization": "0.18.0",
+    "@meith/avatars": "0.18.0",
+    "@meith/core": "0.18.0",
+    "@meith/forums": "0.18.0",
+    "@meith/groups": "0.18.0",
+    "@meith/drafts": "0.18.0",
+    "@meith/events": "0.18.0",
+    "@meith/i18n": "0.18.0",
+    "@meith/markdown": "0.18.0",
+    "@meith/marketplace": "0.18.0",
+    "@meith/moderation": "0.18.0",
+    "@meith/plugin-kit": "0.18.0",
+    "@meith/polls": "0.18.0",
+    "@meith/messages": "0.18.0",
+    "@meith/reputation": "0.18.0",
+    "@meith/notifications": "0.18.0",
+    "@meith/profile-fields": "0.18.0",
+    "@meith/search": "0.18.0",
+    "@meith/relations": "0.18.0",
+    "@meith/subscriptions": "0.18.0",
+    "@meith/settings": "0.18.0",
+    "@meith/tasks": "0.18.0",
+    "@meith/threads": "0.18.0",
+    "@meith/signatures": "0.18.0"
   },
   "devDependencies": {
     "drizzle-kit": "^0.31.6",

package/src/index.ts

@@ -146,6 +146,7 @@ export {
   INSTALL_LOCK_KEY,
   isInstalled,
   markInstalled,
+  tryInstallLock,
   withInstallLock,
 } from './install-repo'
 export {

package/src/install-repo.ts

@@ -50,17 +50,28 @@ export async function markInstalled(db: Database, version: string): Promise<bool
   return rows.length > 0
 }
 
-export async function withInstallLock<T>(url: string, body: () => Promise<T>): Promise<T | null> {
-  const client = postgres(url, { max: 1, prepare: false, onnotice: () => {} })
+export async function tryInstallLock<T>(
+  sql: ReturnType<typeof postgres>,
+  body: () => Promise<T>,
+): Promise<T | null> {
+  const rows = await sql`
+    select pg_try_advisory_lock(${INSTALL_LOCK_KEY}::bigint) as locked
+  `
+
+  if (rows[0]?.locked !== true) return null
 
   try {
-    const rows = await client`
-      select pg_try_advisory_lock(${INSTALL_LOCK_KEY}::bigint) as locked
-    `
+    return await body()
+  } finally {
+    await sql`select pg_advisory_unlock(${INSTALL_LOCK_KEY}::bigint)`.catch(() => undefined)
+  }
+}
 
-    if (rows[0]?.locked !== true) return null
+export async function withInstallLock<T>(url: string, body: () => Promise<T>): Promise<T | null> {
+  const client = postgres(url, { max: 1, prepare: false, onnotice: () => {} })
 
-    return await body()
+  try {
+    return await tryInstallLock(client, body)
   } finally {
     await client.end({ timeout: 5 })
   }

package/src/marketplace-repo.ts

@@ -82,30 +82,23 @@ export class PostgresMarketplaceCacheRepository implements MarketplaceCacheRepos
     `)
   }
 
-  async hasNotified(key: string, version: string): Promise<boolean> {
+  async claimNotified(key: string, version: string): Promise<boolean> {
+    const marker = `${key}@${version}`
     const rows = resultRows(
       await this.db.execute(sql`
-        select 1
-          from marketplace_catalog
-         where id = 1
-           and notified_updates @> ${JSON.stringify([`${key}@${version}`])}::jsonb
+        insert into marketplace_catalog (id, notified_updates, updated_at)
+        values (1, ${JSON.stringify([marker])}::jsonb, now())
+        on conflict (id) do update
+          set notified_updates = (
+                select jsonb_agg(distinct value)
+                  from jsonb_array_elements(marketplace_catalog.notified_updates || excluded.notified_updates)
+              ),
+              updated_at = now()
+        where not (marketplace_catalog.notified_updates @> excluded.notified_updates)
+        returning 1
       `),
     ) as unknown[]
 
     return rows.length > 0
   }
-
-  async markNotified(key: string, version: string): Promise<void> {
-    const marker = `${key}@${version}`
-    await this.db.execute(sql`
-      insert into marketplace_catalog (id, notified_updates, updated_at)
-      values (1, ${JSON.stringify([marker])}::jsonb, now())
-      on conflict (id) do update
-        set notified_updates = (
-              select jsonb_agg(distinct value)
-                from jsonb_array_elements(marketplace_catalog.notified_updates || excluded.notified_updates)
-            ),
-            updated_at = now()
-    `)
-  }
 }

package/src/promotion-repo.ts

@@ -13,9 +13,11 @@ import { promotionRuleProblem } from '@meith/groups'
 import { msg } from '@meith/i18n'
 
 import type { Database } from './client'
-import { groupPromotions, users } from './schema'
+import { groupPromotions, promotionScanState, users } from './schema'
 import { keptDisplayGroupSql } from './staff-groups'
 
+const SCAN_STATE_ID = 'default'
+
 function optionalNumber(value: number | null): number | undefined {
   return value === null ? undefined : value
 }
@@ -120,6 +122,28 @@ export class PostgresPromotionRepository implements PromotionRepository, Promoti
     return rows
   }
 
+  async scanCursor(): Promise<number> {
+    const rows = await this.db
+      .select({ cursor: promotionScanState.cursor })
+      .from(promotionScanState)
+      .where(eq(promotionScanState.id, SCAN_STATE_ID))
+
+    return Number(rows[0]?.cursor ?? 0)
+  }
+
+  async advanceScanCursor(afterUserId: number): Promise<void> {
+    const completedPass = afterUserId === 0
+
+    await this.db.execute(sql`
+      insert into promotion_scan_state (id, cursor, passes, updated_at)
+      values (${SCAN_STATE_ID}, ${afterUserId}, ${completedPass ? 1 : 0}, now())
+      on conflict (id) do update
+        set cursor = ${afterUserId},
+            passes = promotion_scan_state.passes + ${completedPass ? 1 : 0},
+            updated_at = now()
+    `)
+  }
+
   async applyPromotions(outcomes: readonly PromotionOutcome[]): Promise<void> {
     if (outcomes.length === 0) return
 

package/src/schema/platform.ts

@@ -248,6 +248,13 @@ export const counterRecountState = pgTable('counter_recount_state', {
   updatedAt: timestamp('updated_at', { withTimezone: true }).notNull().defaultNow(),
 })
 
+export const promotionScanState = pgTable('promotion_scan_state', {
+  id: text('id').primaryKey(),
+  cursor: integer('cursor').notNull().default(0),
+  passes: integer('passes').notNull().default(0),
+  updatedAt: timestamp('updated_at', { withTimezone: true }).notNull().defaultNow(),
+})
+
 export const massMails = pgTable('mass_mails', {
   id: integer('id').primaryKey().generatedByDefaultAsIdentity(),
   subject: text('subject').notNull(),