betterstart-cli 0.0.99 → 0.0.101

package/dist/assets/adapters/next/templates/init/lib/actions/media/delete-media.ts

@@ -1,11 +1,12 @@
 'use server'
 
 import type { DeleteMediaResult } from './types'
-import { getAuditRequestMetadata } from '@admin/actions/audit/request-metadata'
+import { getAuditRequestMetadata } from '@admin/actions/audit/get-audit-request-metadata'
 import { requireRole, UserRole } from '@admin/auth/middleware'
 import db from '@admin/db'
 import { adminMedia } from '@admin/db/schema'
 import { runAdminEventHooks } from '@admin/lib/lifecycle-hooks'
+import { toActionError } from '@admin/utils/error/to-action-error'
 import { eq } from 'drizzle-orm'
 import { updateTag } from 'next/cache'
 import { mediaCacheTags } from './types'
@@ -37,7 +38,7 @@ export async function deleteMedia(id: string): Promise<DeleteMediaResult> {
   } catch (error) {
     return {
       success: false,
-      error: error instanceof Error ? error.message : 'Failed to delete media'
+      error: toActionError(error, 'Failed to delete media')
     }
   }
 }

package/dist/assets/adapters/next/templates/init/lib/actions/media/get-media-by-id.ts

@@ -2,7 +2,8 @@
 
 import type { AdminMedia } from '@admin/types'
 import { adminMedia } from '@admin/db/schema'
-import { mapMediaRow, selectMedia } from '@admin/utils/media/query'
+import { mapMediaRow } from '@admin/utils/media/map-media-row'
+import { selectMedia } from '@admin/utils/media/select-media'
 import { eq } from 'drizzle-orm'
 import { cacheLife, cacheTag } from 'next/cache'
 import { mediaCacheTags } from './types'

package/dist/assets/adapters/next/templates/init/lib/actions/media/get-media-by-ids.ts

@@ -2,7 +2,8 @@
 
 import type { AdminMedia } from '@admin/types'
 import { adminMedia } from '@admin/db/schema'
-import { mapMediaRow, selectMedia } from '@admin/utils/media/query'
+import { mapMediaRow } from '@admin/utils/media/map-media-row'
+import { selectMedia } from '@admin/utils/media/select-media'
 import { inArray } from 'drizzle-orm'
 import { cacheLife, cacheTag } from 'next/cache'
 import { mediaCacheTags } from './types'

package/dist/assets/adapters/next/templates/init/lib/actions/media/get-media.ts

@@ -1,35 +1,19 @@
 'use server'
 
 import type { MediaListParams, MediaListResult } from '@admin/types'
+import { clampMediaPage } from '@admin/actions/media/clamp-media-page'
+import { clampMediaPageSize } from '@admin/actions/media/clamp-media-page-size'
+import { mediaCacheTags } from '@admin/actions/media/types'
 import db from '@admin/db'
 import { adminMedia } from '@admin/db/schema'
-import { mapMediaRow, selectMedia } from '@admin/utils/media/query'
+import { mapMediaRow } from '@admin/utils/media/map-media-row'
+import { selectMedia } from '@admin/utils/media/select-media'
 import { and, desc, ilike, sql } from 'drizzle-orm'
 import { cacheLife, cacheTag } from 'next/cache'
-import { mediaCacheTags } from './types'
-
-const DEFAULT_MEDIA_PAGE = 1
-const DEFAULT_MEDIA_PAGE_SIZE = 40
 
 type GetMediaParams = MediaListParams
 type GetMediaResult = MediaListResult
 
-function clampMediaPage(value: number | undefined): number {
-  if (typeof value !== 'number' || !Number.isFinite(value)) {
-    return DEFAULT_MEDIA_PAGE
-  }
-
-  return Math.max(DEFAULT_MEDIA_PAGE, Math.floor(value))
-}
-
-function clampMediaPageSize(value: number | undefined): number {
-  if (typeof value !== 'number' || !Number.isFinite(value) || value <= 0) {
-    return DEFAULT_MEDIA_PAGE_SIZE
-  }
-
-  return Math.max(1, Math.floor(value))
-}
-
 export async function getMedia(params: GetMediaParams = {}) {
   'use cache'
   cacheLife('max')

package/dist/assets/adapters/next/templates/init/lib/actions/media/update-media.ts

@@ -1,12 +1,13 @@
 'use server'
 
 import type { UpdateMediaResult } from './types'
-import { getAuditRequestMetadata } from '@admin/actions/audit/request-metadata'
+import { getAuditRequestMetadata } from '@admin/actions/audit/get-audit-request-metadata'
 import { requireRole, UserRole } from '@admin/auth/middleware'
 import db from '@admin/db'
 import { adminMedia } from '@admin/db/schema'
 import { runAdminEventHooks } from '@admin/lib/lifecycle-hooks'
-import { getChangedFieldNames } from '@admin/utils/audit/audit'
+import { getChangedFieldNames } from '@admin/utils/audit/get-changed-field-names'
+import { toActionError } from '@admin/utils/error/to-action-error'
 import { eq } from 'drizzle-orm'
 import { updateTag } from 'next/cache'
 import { mediaCacheTags } from './types'
@@ -51,7 +52,7 @@ export async function updateMedia(
   } catch (error) {
     return {
       success: false,
-      error: error instanceof Error ? error.message : 'Failed to update media'
+      error: toActionError(error, 'Failed to update media')
     }
   }
 }

package/dist/assets/adapters/next/templates/init/lib/actions/profile/change-own-password.ts

@@ -1,10 +1,11 @@
 'use server'
 
 import type { ChangeOwnPasswordInput, ChangeOwnPasswordResult } from './types'
-import { getAuditRequestMetadata } from '@admin/actions/audit/request-metadata'
+import { getAuditRequestMetadata } from '@admin/actions/audit/get-audit-request-metadata'
 import { auth } from '@admin/auth'
 import { getSession } from '@admin/auth/middleware'
 import { runAdminEventHooks } from '@admin/lib/lifecycle-hooks'
+import { toActionError } from '@admin/utils/error/to-action-error'
 import { headers } from 'next/headers'
 import { invalidateUsersCache } from './invalidate-users-cache'
 
@@ -53,7 +54,7 @@ export async function changeOwnPassword(
   } catch (error) {
     return {
       success: false,
-      error: error instanceof Error ? error.message : 'Failed to change password'
+      error: toActionError(error, 'Failed to change password')
     }
   }
 }

package/dist/assets/adapters/next/templates/init/lib/actions/profile/update-email.ts

@@ -1,12 +1,13 @@
 'use server'
 
 import type { UpdateEmailResult } from './types'
-import { getAuditRequestMetadata } from '@admin/actions/audit/request-metadata'
+import { getAuditRequestMetadata } from '@admin/actions/audit/get-audit-request-metadata'
 import { auth } from '@admin/auth'
 import { getSession } from '@admin/auth/middleware'
 import db from '@admin/db'
 import { user } from '@admin/db/schema'
 import { runAdminEventHooks } from '@admin/lib/lifecycle-hooks'
+import { toActionError } from '@admin/utils/error/to-action-error'
 import { eq } from 'drizzle-orm'
 import { headers } from 'next/headers'
 import { invalidateUsersCache } from './invalidate-users-cache'
@@ -68,7 +69,7 @@ export async function updateEmail(
   } catch (error) {
     return {
       success: false,
-      error: error instanceof Error ? error.message : 'Failed to update email'
+      error: toActionError(error, 'Failed to update email')
     }
   }
 }

package/dist/assets/adapters/next/templates/init/lib/actions/storage/local.ts

@@ -5,7 +5,7 @@ import type {
   AdminStorageUploadInput,
   AdminStorageUploadResult
 } from '@admin/actions/storage/types'
-import { buildLocalStorageKey } from '@admin/utils/storage/local'
+import { buildLocalStorageKey } from '@admin/utils/storage/build-local-storage-key'
 
 async function saveLocally({
   buffer,

package/dist/assets/adapters/next/templates/init/lib/actions/upload/upload-media-from-url.ts

@@ -4,12 +4,10 @@ import type { RemoteUploadOptions, UploadResult } from './types'
 import { createMedia } from '@admin/actions/media'
 import { saveUpload } from '@admin/actions/storage'
 import { requireRole, UserRole } from '@admin/auth/middleware'
-import {
-  DEFAULT_REMOTE_ACCEPT,
-  getRemoteFilename,
-  isAcceptedRemoteType,
-  REMOTE_FETCH_TIMEOUT_MS
-} from '@admin/utils/upload/remote'
+import { DEFAULT_REMOTE_ACCEPT } from '@admin/utils/upload/default-remote-accept'
+import { getRemoteFilename } from '@admin/utils/upload/get-remote-filename'
+import { isAcceptedRemoteType } from '@admin/utils/upload/is-accepted-remote-type'
+import { REMOTE_FETCH_TIMEOUT_MS } from '@admin/utils/upload/remote-fetch-timeout-ms'
 
 export async function uploadMediaFromUrl(
   mediaUrl: string,
@@ -33,7 +31,7 @@ export async function uploadMediaFromUrl(
     if (!response.ok) {
       return {
         success: false,
-        error: `Failed to fetch media: ${response.status}`
+        error: "Couldn't reach that URL. Check the link and try again."
       }
     }
 
@@ -43,7 +41,7 @@ export async function uploadMediaFromUrl(
       .toLowerCase()
 
     if (!contentType.startsWith('image/') && !contentType.startsWith('video/')) {
-      return { success: false, error: `Invalid content type: ${contentType}` }
+      return { success: false, error: 'That link is not an image or video.' }
     }
 
     const filename = getRemoteFilename(url, contentType)

package/dist/assets/adapters/next/templates/init/lib/actions/users/change-user-password.ts

@@ -1,12 +1,13 @@
 'use server'
 
 import type { ChangeUserPasswordInput, ChangeUserPasswordResult } from './types'
-import { getAuditRequestMetadata } from '@admin/actions/audit/request-metadata'
+import { getAuditRequestMetadata } from '@admin/actions/audit/get-audit-request-metadata'
 import { auth } from '@admin/auth'
 import { requireRole, UserRole } from '@admin/auth/middleware'
 import db from '@admin/db'
 import { user } from '@admin/db/schema'
 import { runAdminEventHooks } from '@admin/lib/lifecycle-hooks'
+import { toActionError } from '@admin/utils/error/to-action-error'
 import { eq } from 'drizzle-orm'
 import { updateTag } from 'next/cache'
 import { headers } from 'next/headers'
@@ -71,7 +72,7 @@ export async function changeUserPassword(
   } catch (error) {
     return {
       success: false,
-      error: error instanceof Error ? error.message : 'Failed to change user password'
+      error: toActionError(error, 'Failed to change user password')
     }
   }
 }

package/dist/assets/adapters/next/templates/init/lib/actions/users/create-user.ts

@@ -1,13 +1,14 @@
 'use server'
 
 import type { CreateUserInput, CreateUserResult } from './types'
-import { getAuditRequestMetadata } from '@admin/actions/audit/request-metadata'
+import { getAuditRequestMetadata } from '@admin/actions/audit/get-audit-request-metadata'
 import { auth } from '@admin/auth'
 import { requireRole, UserRole } from '@admin/auth/middleware'
 import db from '@admin/db'
 import { user } from '@admin/db/schema'
 import { runAdminEventHooks } from '@admin/lib/lifecycle-hooks'
-import { getTouchedFieldNames } from '@admin/utils/audit/audit'
+import { getTouchedFieldNames } from '@admin/utils/audit/get-touched-field-names'
+import { toActionError } from '@admin/utils/error/to-action-error'
 import { eq } from 'drizzle-orm'
 import { updateTag } from 'next/cache'
 import { usersCacheTags } from './types'
@@ -67,7 +68,7 @@ export async function createUser(input: CreateUserInput): Promise<CreateUserResu
   } catch (error) {
     return {
       success: false,
-      error: error instanceof Error ? error.message : 'Failed to create user'
+      error: toActionError(error, 'Failed to create user')
     }
   }
 }

package/dist/assets/adapters/next/templates/init/lib/actions/users/delete-user.ts

@@ -1,11 +1,12 @@
 'use server'
 
 import type { DeleteUserResult } from './types'
-import { getAuditRequestMetadata } from '@admin/actions/audit/request-metadata'
+import { getAuditRequestMetadata } from '@admin/actions/audit/get-audit-request-metadata'
 import { requireRole, UserRole } from '@admin/auth/middleware'
 import db from '@admin/db'
 import { user } from '@admin/db/schema'
 import { runAdminEventHooks } from '@admin/lib/lifecycle-hooks'
+import { toActionError } from '@admin/utils/error/to-action-error'
 import { eq } from 'drizzle-orm'
 import { updateTag } from 'next/cache'
 import { usersCacheTags } from './types'
@@ -40,7 +41,7 @@ export async function deleteUser(userId: string): Promise<DeleteUserResult> {
   } catch (error) {
     return {
       success: false,
-      error: error instanceof Error ? error.message : 'Failed to delete user'
+      error: toActionError(error, 'Failed to delete user')
     }
   }
 }

package/dist/assets/adapters/next/templates/init/lib/actions/users/get-cached-users.ts

@@ -0,0 +1,40 @@
+import type { User, UsersPage } from '@admin/actions/users/types'
+import { usersCacheTags } from '@admin/actions/users/types'
+import db from '@admin/db'
+import { user } from '@admin/db/schema'
+import { cacheLife, cacheTag } from 'next/cache'
+
+export async function getCachedUsers(): Promise<UsersPage> {
+  'use cache'
+  cacheLife('max')
+  cacheTag(usersCacheTags.all)
+
+  try {
+    const users = await db
+      .select({
+        id: user.id,
+        email: user.email,
+        name: user.name,
+        emailVerified: user.emailVerified,
+        createdAt: user.createdAt,
+        updatedAt: user.updatedAt,
+        role: user.role
+      })
+      .from(user)
+      .orderBy(user.createdAt)
+
+    const userData: User[] = users.map((u) => ({
+      id: u.id,
+      email: u.email,
+      name: u.name,
+      emailVerified: u.emailVerified,
+      createdAt: u.createdAt.toISOString(),
+      updatedAt: u.updatedAt.toISOString(),
+      role: u.role || 'member'
+    }))
+
+    return { users: userData, total: userData.length }
+  } catch {
+    return { users: [], total: 0 }
+  }
+}

package/dist/assets/adapters/next/templates/init/lib/actions/users/get-users.ts

@@ -1,46 +1,8 @@
 'use server'
 
-import type { User, UsersPage } from './types'
+import type { UsersPage } from '@admin/actions/users/types'
+import { getCachedUsers } from '@admin/actions/users/get-cached-users'
 import { requireRole, UserRole } from '@admin/auth/middleware'
-import db from '@admin/db'
-import { user } from '@admin/db/schema'
-import { cacheLife, cacheTag } from 'next/cache'
-import { usersCacheTags } from './types'
-
-async function getCachedUsers(): Promise<UsersPage> {
-  'use cache'
-  cacheLife('max')
-  cacheTag(usersCacheTags.all)
-
-  try {
-    const users = await db
-      .select({
-        id: user.id,
-        email: user.email,
-        name: user.name,
-        emailVerified: user.emailVerified,
-        createdAt: user.createdAt,
-        updatedAt: user.updatedAt,
-        role: user.role
-      })
-      .from(user)
-      .orderBy(user.createdAt)
-
-    const userData: User[] = users.map((u) => ({
-      id: u.id,
-      email: u.email,
-      name: u.name,
-      emailVerified: u.emailVerified,
-      createdAt: u.createdAt.toISOString(),
-      updatedAt: u.updatedAt.toISOString(),
-      role: u.role || 'member'
-    }))
-
-    return { users: userData, total: userData.length }
-  } catch {
-    return { users: [], total: 0 }
-  }
-}
 
 export async function getUsers(): Promise<UsersPage> {
   await requireRole([UserRole.ADMIN, UserRole.EDITOR])

package/dist/assets/adapters/next/templates/init/lib/actions/users/update-user-role.ts

@@ -1,11 +1,12 @@
 'use server'
 
 import type { UpdateUserRoleResult } from './types'
-import { getAuditRequestMetadata } from '@admin/actions/audit/request-metadata'
+import { getAuditRequestMetadata } from '@admin/actions/audit/get-audit-request-metadata'
 import { requireRole, UserRole } from '@admin/auth/middleware'
 import db from '@admin/db'
 import { user } from '@admin/db/schema'
 import { runAdminEventHooks } from '@admin/lib/lifecycle-hooks'
+import { toActionError } from '@admin/utils/error/to-action-error'
 import { eq } from 'drizzle-orm'
 import { updateTag } from 'next/cache'
 import { usersCacheTags } from './types'
@@ -44,7 +45,7 @@ export async function updateUserRole(
   } catch (error) {
     return {
       success: false,
-      error: error instanceof Error ? error.message : 'Failed to update user role'
+      error: toActionError(error, 'Failed to update user role')
     }
   }
 }

package/dist/assets/adapters/next/templates/init/lib/actions/webhooks/create-webhook.ts

@@ -4,7 +4,8 @@ import type { CreateWebhookInput, WebhookResult } from './types'
 import { requireRole, UserRole } from '@admin/auth/middleware'
 import db from '@admin/db'
 import { webhookSubscriptions, webhooks } from '@admin/db/schema'
-import { generateWebhookSecret } from '@admin/utils/webhook/signature'
+import { toActionError } from '@admin/utils/error/to-action-error'
+import { generateWebhookSecret } from '@admin/utils/webhook/generate-webhook-secret'
 import { updateTag } from 'next/cache'
 import { webhooksCacheTags } from './types'
 
@@ -49,7 +50,7 @@ export async function createWebhook(input: CreateWebhookInput): Promise<WebhookR
     console.error('Error creating webhook:', error)
     return {
       success: false,
-      error: error instanceof Error ? error.message : 'Failed to create webhook'
+      error: toActionError(error, 'Failed to create webhook')
     }
   }
 }

package/dist/assets/adapters/next/templates/init/lib/actions/webhooks/delete-webhook.ts

@@ -4,6 +4,7 @@ import type { WebhookResult } from './types'
 import { requireRole, UserRole } from '@admin/auth/middleware'
 import db from '@admin/db'
 import { webhooks } from '@admin/db/schema'
+import { toActionError } from '@admin/utils/error/to-action-error'
 import { eq } from 'drizzle-orm'
 import { updateTag } from 'next/cache'
 import { webhooksCacheTags } from './types'
@@ -20,7 +21,7 @@ export async function deleteWebhook(id: string): Promise<WebhookResult> {
     console.error('Error deleting webhook:', error)
     return {
       success: false,
-      error: error instanceof Error ? error.message : 'Failed to delete webhook'
+      error: toActionError(error, 'Failed to delete webhook')
     }
   }
 }

package/dist/assets/adapters/next/templates/init/lib/actions/webhooks/deliver-to-endpoint.ts

@@ -0,0 +1,55 @@
+import type { ActiveWebhookEndpoint } from '@admin/actions/webhooks/internal-get-active-endpoints'
+import { recordWebhookDelivery } from '@admin/actions/webhooks/record-webhook-delivery'
+import { signWebhookPayload } from '@admin/utils/webhook/sign-webhook-payload'
+
+const MAX_ATTEMPTS = 3
+const RETRY_DELAYS_MS = [1_000, 5_000]
+const REQUEST_TIMEOUT_MS = 10_000
+
+export async function deliverToEndpoint(
+  endpoint: ActiveWebhookEndpoint,
+  eventId: string,
+  event: string,
+  body: string
+): Promise<void> {
+  for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
+    const startedAt = Date.now()
+    let statusCode: number | null = null
+    let errorMessage: string | null = null
+
+    try {
+      const timestamp = Math.floor(Date.now() / 1000).toString()
+      const response = await fetch(endpoint.url, {
+        method: 'POST',
+        headers: {
+          'content-type': 'application/json',
+          'x-webhook-id': eventId,
+          'x-webhook-timestamp': timestamp,
+          'x-webhook-signature': signWebhookPayload(endpoint.secret, timestamp, body)
+        },
+        body,
+        signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
+      })
+      statusCode = response.status
+      if (!response.ok) errorMessage = `Webhook returned status ${response.status}`
+    } catch (error) {
+      errorMessage = error instanceof Error ? error.message : 'Webhook request failed'
+    }
+
+    await recordWebhookDelivery({
+      webhookId: endpoint.id,
+      event,
+      eventId,
+      attempt,
+      success: errorMessage === null,
+      statusCode,
+      durationMs: Date.now() - startedAt,
+      error: errorMessage
+    })
+
+    if (errorMessage === null) return
+    if (attempt < MAX_ATTEMPTS) {
+      await new Promise((resolve) => setTimeout(resolve, RETRY_DELAYS_MS[attempt - 1]))
+    }
+  }
+}

package/dist/assets/adapters/next/templates/init/lib/actions/webhooks/deliver-webhook-event.ts

@@ -0,0 +1,19 @@
+import { deliverToEndpoint } from '@admin/actions/webhooks/deliver-to-endpoint'
+import { getActiveEndpointsForEvent } from '@admin/actions/webhooks/internal-get-active-endpoints'
+
+export async function deliverWebhookEvent(
+  eventId: string,
+  event: string,
+  body: string
+): Promise<void> {
+  try {
+    const endpoints = await getActiveEndpointsForEvent(event)
+    if (endpoints.length === 0) return
+
+    await Promise.allSettled(
+      endpoints.map((endpoint) => deliverToEndpoint(endpoint, eventId, event, body))
+    )
+  } catch (error) {
+    console.error('Webhook delivery failed:', { event, error })
+  }
+}

package/dist/assets/adapters/next/templates/init/lib/actions/webhooks/emit-webhook-event.ts

@@ -0,0 +1,22 @@
+import { deliverWebhookEvent } from '@admin/actions/webhooks/deliver-webhook-event'
+import { createWebhookEventId } from '@admin/utils/webhook/create-webhook-event-id'
+import { after } from 'next/server'
+
+export function emitWebhookEvent(event: string, data: unknown): void {
+  const eventId = createWebhookEventId()
+  const body = JSON.stringify({
+    id: eventId,
+    event,
+    timestamp: new Date().toISOString(),
+    data
+  })
+
+  try {
+    after(() => deliverWebhookEvent(eventId, event, body))
+  } catch (error) {
+    console.error('Webhook dispatch skipped (no request scope):', {
+      event,
+      error
+    })
+  }
+}

package/dist/assets/adapters/next/templates/init/lib/actions/webhooks/entity-event-payload.ts

@@ -0,0 +1,20 @@
+import type {
+  AfterLifecycleHookEvent,
+  LifecycleHookContext
+} from '@admin/lib/lifecycle-hooks/types'
+
+export function entityEventPayload(
+  hook: AfterLifecycleHookEvent,
+  context: LifecycleHookContext
+): unknown {
+  if (hook === 'afterRestore') {
+    return {
+      record: context.data ?? null,
+      restoredFromVersion: context.metadata?.restoredFromVersion ?? null
+    }
+  }
+  if (hook === 'afterDelete') {
+    return context.data ?? { id: context.entityId ?? null }
+  }
+  return context.data ?? null
+}

package/dist/assets/adapters/next/templates/init/lib/actions/webhooks/get-webhook-deliveries.ts

@@ -4,7 +4,7 @@ import type { WebhookDeliveriesPage, WebhookDeliveriesQuery } from './types'
 import { requireRole, UserRole } from '@admin/auth/middleware'
 import db from '@admin/db'
 import { webhookDeliveries, webhooks } from '@admin/db/schema'
-import { getExclusiveDateUpperBound } from '@admin/utils/date/date'
+import { getExclusiveDateUpperBound } from '@admin/utils/date/get-exclusive-date-upper-bound'
 import { and, asc, desc, eq, gte, ilike, lt, or, sql } from 'drizzle-orm'
 
 const SORTABLE_COLUMNS = {

package/dist/assets/adapters/next/templates/init/lib/actions/webhooks/get-webhook-secret.ts

@@ -4,6 +4,7 @@ import type { WebhookSecretResult } from './types'
 import { requireRole, UserRole } from '@admin/auth/middleware'
 import db from '@admin/db'
 import { webhooks } from '@admin/db/schema'
+import { toActionError } from '@admin/utils/error/to-action-error'
 import { eq } from 'drizzle-orm'
 
 export async function getWebhookSecret(id: string): Promise<WebhookSecretResult> {
@@ -22,7 +23,7 @@ export async function getWebhookSecret(id: string): Promise<WebhookSecretResult>
     console.error('Error fetching webhook secret:', error)
     return {
       success: false,
-      error: error instanceof Error ? error.message : 'Failed to fetch webhook secret'
+      error: toActionError(error, 'Failed to fetch webhook secret')
     }
   }
 }

package/dist/assets/adapters/next/templates/init/lib/actions/webhooks/get-webhook-subscriptions.ts

@@ -1,24 +1,8 @@
 'use server'
 
-import type { WebhookSubscriptionEntry } from './types'
+import type { WebhookSubscriptionEntry } from '@admin/actions/webhooks/types'
+import { readWebhookSubscriptions } from '@admin/actions/webhooks/read-webhook-subscriptions'
 import { requireRole, UserRole } from '@admin/auth/middleware'
-import db from '@admin/db'
-import { webhookSubscriptions } from '@admin/db/schema'
-import { cacheLife, cacheTag } from 'next/cache'
-import { webhooksCacheTags } from './types'
-
-async function readWebhookSubscriptions(): Promise<WebhookSubscriptionEntry[]> {
-  'use cache'
-  cacheLife('max')
-  cacheTag(webhooksCacheTags.subscriptions)
-
-  return db
-    .select({
-      webhookId: webhookSubscriptions.webhookId,
-      event: webhookSubscriptions.event
-    })
-    .from(webhookSubscriptions)
-}
 
 export async function getWebhookSubscriptions(): Promise<WebhookSubscriptionEntry[]> {
   await requireRole([UserRole.ADMIN])

package/dist/assets/adapters/next/templates/init/lib/actions/webhooks/get-webhooks.ts

@@ -4,7 +4,7 @@ import type { WebhooksPage, WebhooksQuery } from './types'
 import { requireRole, UserRole } from '@admin/auth/middleware'
 import db from '@admin/db'
 import { webhookDeliveries, webhookSubscriptions, webhooks } from '@admin/db/schema'
-import { getExclusiveDateUpperBound } from '@admin/utils/date/date'
+import { getExclusiveDateUpperBound } from '@admin/utils/date/get-exclusive-date-upper-bound'
 import { and, asc, count, desc, eq, gte, ilike, isNull, lt, or, sql } from 'drizzle-orm'
 
 // Deliberately uncached: filters and sorting depend on delivery rows written

package/dist/assets/adapters/next/templates/init/lib/actions/webhooks/prune-webhook-deliveries.ts

@@ -0,0 +1,26 @@
+import db from '@admin/db'
+import { webhookDeliveries } from '@admin/db/schema'
+import { and, desc, eq, notInArray } from 'drizzle-orm'
+
+const DELIVERY_LOG_LIMIT = 100
+
+export async function pruneWebhookDeliveries(webhookId: string): Promise<void> {
+  const keepRows = await db
+    .select({ id: webhookDeliveries.id })
+    .from(webhookDeliveries)
+    .where(eq(webhookDeliveries.webhookId, webhookId))
+    .orderBy(desc(webhookDeliveries.createdAt))
+    .limit(DELIVERY_LOG_LIMIT)
+
+  if (keepRows.length < DELIVERY_LOG_LIMIT) return
+
+  await db.delete(webhookDeliveries).where(
+    and(
+      eq(webhookDeliveries.webhookId, webhookId),
+      notInArray(
+        webhookDeliveries.id,
+        keepRows.map((row) => row.id)
+      )
+    )
+  )
+}