@stacksjs/defaults 0.70.356 → 0.70.358

package/app/Actions/Dashboard/Infrastructure/ServerShowAction.ts

@@ -3,6 +3,7 @@ import { Action } from '@stacksjs/actions'
 import { response } from '@stacksjs/router'
 import { tsCloud } from '~/config/cloud'
 import { getDashboardCloudSnapshot } from '../Cloud/cloud-overview'
+import { dashboardOperationalError } from '../dashboard-response'
 import { resolveDashboardServer } from './server-detail'
 
 export default new Action({
@@ -12,10 +13,16 @@ export default new Action({
   apiResponse: true,
   async handle(request: RequestInstance) {
     const identifier = request.getParam('id')
-    if (!identifier)
+    if (!identifier || !/^[A-Za-z0-9:_-]{1,160}$/.test(identifier))
       return response.json({ error: 'A server identifier is required.' }, 400)
 
-    const snapshot = await getDashboardCloudSnapshot(tsCloud)
+    let snapshot
+    try {
+      snapshot = await getDashboardCloudSnapshot(tsCloud)
+    }
+    catch (error) {
+      return dashboardOperationalError(error, 'Server state could not be loaded.', 'ServerShowAction')
+    }
     const detail = resolveDashboardServer(snapshot, identifier)
     if (!detail)
       return response.json({ error: 'Server state was not found.' }, 404)

package/app/Actions/Dashboard/Marketing/CampaignCancelAction.ts

@@ -1,9 +1,11 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
-import { campaigns } from '@stacksjs/newsletter'
+import { campaigns, CampaignStateConflictError } from '@stacksjs/newsletter'
 import { Campaign } from '@stacksjs/orm'
 import { response } from '@stacksjs/router'
+import { dashboardOperationalError } from '../dashboard-response'
 import { validateCampaignDelivery } from './campaign-delivery'
+import { marketingRecordId } from './marketing-response'
 
 export default new Action({
   name: 'CampaignCancelAction',
@@ -11,8 +13,17 @@ export default new Action({
   method: 'POST',
 
   async handle(request: RequestInstance) {
-    const id = Number(request.getParam('id'))
-    const campaign = await Campaign.find(id)
+    const id = marketingRecordId(request)
+    if (!id)
+      return response.json({ message: 'A valid campaign id is required.' }, 400)
+
+    let campaign
+    try {
+      campaign = await Campaign.find(id)
+    }
+    catch (error) {
+      return dashboardOperationalError(error, 'Campaign could not be loaded.', 'CampaignCancelAction.read')
+    }
     if (!campaign)
       return response.json({ message: 'Campaign not found.' }, 404)
 
@@ -20,7 +31,14 @@ export default new Action({
     if (validationError)
       return response.json({ message: validationError }, 422)
 
-    await campaigns.cancel(id)
-    return response.json({ id, status: 'cancelled' })
+    try {
+      await campaigns.cancel(id)
+      return response.json({ id, status: 'cancelled' })
+    }
+    catch (error) {
+      if (error instanceof CampaignStateConflictError)
+        return response.json({ message: 'Campaign delivery state changed. Refresh and try again.' }, 409)
+      return dashboardOperationalError(error, 'Campaign could not be cancelled.', 'CampaignCancelAction.cancel', 500)
+    }
   },
 })

package/app/Actions/Dashboard/Marketing/CampaignDestroyAction.ts

@@ -3,6 +3,7 @@ import { Action } from '@stacksjs/actions'
 import { db } from '@stacksjs/database'
 import { Campaign } from '@stacksjs/orm'
 import { response } from '@stacksjs/router'
+import { marketingModelError, marketingRecordId } from './marketing-response'
 
 export default new Action({
   name: 'CampaignDestroyAction',
@@ -10,24 +11,32 @@ export default new Action({
   method: 'DELETE',
 
   async handle(request: RequestInstance) {
-    const id = Number(request.getParam('id'))
-    const campaign = await Campaign.find(id)
-    if (!campaign)
-      return response.json({ message: 'Campaign not found.' }, 404)
+    const id = marketingRecordId(request)
+    if (!id)
+      return response.json({ message: 'A valid campaign id is required.' }, 400)
 
-    const status = String(campaign.get('status') || '')
-    const sendRow = await db
-      .selectFrom('campaign_sends')
-      .select(db.fn.count('id').as('count'))
-      .where('campaign_id', '=', id)
-      .executeTakeFirst()
-    if (Number(sendRow?.count || 0) > 0 || ['scheduled', 'sending', 'sent'].includes(status)) {
-      return response.json({
-        message: 'Scheduled campaigns and campaigns with delivery history cannot be deleted.',
-      }, 409)
-    }
+    try {
+      const campaign = await Campaign.find(id)
+      if (!campaign)
+        return response.json({ message: 'Campaign not found.' }, 404)
+
+      const status = String(campaign.get('status') || '')
+      const sendRow = await db
+        .selectFrom('campaign_sends')
+        .select(db.fn.count('id').as('count'))
+        .where('campaign_id', '=', id)
+        .executeTakeFirst()
+      if (Number(sendRow?.count || 0) > 0 || ['scheduled', 'sending', 'sent'].includes(status)) {
+        return response.json({
+          message: 'Scheduled campaigns and campaigns with delivery history cannot be deleted.',
+        }, 409)
+      }
 
-    await campaign.delete()
-    return response.noContent()
+      await campaign.delete()
+      return response.noContent()
+    }
+    catch (error) {
+      return marketingModelError(error, 'Campaign could not be deleted.', 'CampaignDestroyAction')
+    }
   },
 })

package/app/Actions/Dashboard/Marketing/CampaignIndexAction.ts

@@ -2,6 +2,7 @@ import { Action } from '@stacksjs/actions'
 import { config } from '@stacksjs/config'
 import { db } from '@stacksjs/database'
 import { Campaign, EmailList } from '@stacksjs/orm'
+import { dashboardOperationalError } from '../dashboard-response'
 import { normalizeCampaigns } from './campaign-records'
 
 export default new Action({
@@ -11,49 +12,54 @@ export default new Action({
   apiResponse: true,
 
   async handle() {
-    const [
-      campaigns,
-      lists,
-      membershipRows,
-      sendRows,
-      openedRows,
-      clickedRows,
-    ] = await Promise.all([
-      Campaign.orderByDesc('id').limit(500).get(),
-      EmailList.orderBy('name', 'asc').get(),
-      db
-        .selectFrom('email_list_subscribers')
-        .select(['email_list_id', db.fn.count('id').as('count')])
-        .where('status', '=', 'subscribed')
-        .groupBy('email_list_id')
-        .execute(),
-      db
-        .selectFrom('campaign_sends')
-        .select(['campaign_id', 'status', db.fn.count('id').as('count')])
-        .groupBy(['campaign_id', 'status'])
-        .execute(),
-      db
-        .selectFrom('campaign_sends')
-        .select(['campaign_id', db.fn.count('id').as('count')])
-        .whereNotNull('opened_at')
-        .groupBy('campaign_id')
-        .execute(),
-      db
-        .selectFrom('campaign_sends')
-        .select(['campaign_id', db.fn.count('id').as('count')])
-        .whereNotNull('clicked_at')
-        .groupBy('campaign_id')
-        .execute(),
-    ])
+    try {
+      const [
+        campaigns,
+        lists,
+        membershipRows,
+        sendRows,
+        openedRows,
+        clickedRows,
+      ] = await Promise.all([
+        Campaign.orderByDesc('id').limit(500).get(),
+        EmailList.orderBy('name', 'asc').get(),
+        db
+          .selectFrom('email_list_subscribers')
+          .select(['email_list_id', db.fn.count('id').as('count')])
+          .where('status', '=', 'subscribed')
+          .groupBy('email_list_id')
+          .execute(),
+        db
+          .selectFrom('campaign_sends')
+          .select(['campaign_id', 'status', db.fn.count('id').as('count')])
+          .groupBy(['campaign_id', 'status'])
+          .execute(),
+        db
+          .selectFrom('campaign_sends')
+          .select(['campaign_id', db.fn.count('id').as('count')])
+          .whereNotNull('opened_at')
+          .groupBy('campaign_id')
+          .execute(),
+        db
+          .selectFrom('campaign_sends')
+          .select(['campaign_id', db.fn.count('id').as('count')])
+          .whereNotNull('clicked_at')
+          .groupBy('campaign_id')
+          .execute(),
+      ])
 
-    return normalizeCampaigns(
-      campaigns,
-      lists,
-      membershipRows,
-      sendRows,
-      openedRows,
-      clickedRows,
-      String((config as any).commerce?.currency || 'USD').toUpperCase(),
-    )
+      return normalizeCampaigns(
+        campaigns,
+        lists,
+        membershipRows,
+        sendRows,
+        openedRows,
+        clickedRows,
+        String((config as any).commerce?.currency || 'USD').toUpperCase(),
+      )
+    }
+    catch (error) {
+      return dashboardOperationalError(error, 'Campaigns could not be loaded.', 'CampaignIndexAction')
+    }
   },
 })

package/app/Actions/Dashboard/Marketing/CampaignScheduleAction.ts

@@ -1,13 +1,14 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
-import { db } from '@stacksjs/database'
-import { campaigns } from '@stacksjs/newsletter'
-import { Campaign, EmailList } from '@stacksjs/orm'
+import { campaigns, CampaignStateConflictError } from '@stacksjs/newsletter'
 import { response } from '@stacksjs/router'
+import { dashboardOperationalError } from '../dashboard-response'
 import {
   campaignScheduleIso,
+  loadCampaignDeliveryContext,
   validateCampaignDelivery,
 } from './campaign-delivery'
+import { marketingRecordId } from './marketing-response'
 
 export default new Action({
   name: 'CampaignScheduleAction',
@@ -15,35 +16,40 @@ export default new Action({
   method: 'POST',
 
   async handle(request: RequestInstance) {
-    const id = Number(request.getParam('id'))
-    const campaign = await Campaign.find(id)
-    if (!campaign)
+    const id = marketingRecordId(request)
+    if (!id)
+      return response.json({ message: 'A valid campaign id is required.' }, 400)
+    const schedule = campaignScheduleIso((await request.all()).scheduledAt)
+    if (schedule.error)
+      return response.json({ message: schedule.error }, 422)
+
+    let context
+    try {
+      context = await loadCampaignDeliveryContext(id)
+    }
+    catch (error) {
+      return dashboardOperationalError(error, 'Campaign delivery prerequisites could not be loaded.', 'CampaignScheduleAction.prerequisites')
+    }
+    if (!context.campaign)
       return response.json({ message: 'Campaign not found.' }, 404)
 
-    const listId = Number(campaign.get('email_list_id') || 0)
-    const list = listId ? await EmailList.find(listId) : null
-    const memberRow = listId
-      ? await db
-          .selectFrom('email_list_subscribers')
-          .select(db.fn.count('id').as('count'))
-          .where('email_list_id', '=', listId)
-          .where('status', '=', 'subscribed')
-          .executeTakeFirst()
-      : null
     const validationError = validateCampaignDelivery(
-      campaign,
+      context.campaign,
       'schedule',
-      Number(memberRow?.count || 0),
-      String(list?.get('status') || ''),
+      context.activeMembers,
+      context.listStatus,
     )
     if (validationError)
       return response.json({ message: validationError }, 422)
 
-    const schedule = campaignScheduleIso((await request.all()).scheduledAt)
-    if (schedule.error)
-      return response.json({ message: schedule.error }, 422)
-
-    await campaigns.schedule(id, schedule.value)
-    return response.json({ id, status: 'scheduled', scheduledAt: schedule.value }, 202)
+    try {
+      await campaigns.schedule(id, schedule.value)
+      return response.json({ id, status: 'scheduled', scheduledAt: schedule.value }, 202)
+    }
+    catch (error) {
+      if (error instanceof CampaignStateConflictError)
+        return response.json({ message: 'Campaign delivery state changed. Refresh and try again.' }, 409)
+      return dashboardOperationalError(error, 'Campaign could not be scheduled.', 'CampaignScheduleAction.queue', 500)
+    }
   },
 })

package/app/Actions/Dashboard/Marketing/CampaignSendAction.ts

@@ -1,10 +1,10 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
-import { db } from '@stacksjs/database'
-import { campaigns } from '@stacksjs/newsletter'
-import { Campaign, EmailList } from '@stacksjs/orm'
+import { campaigns, CampaignStateConflictError } from '@stacksjs/newsletter'
 import { response } from '@stacksjs/router'
-import { validateCampaignDelivery } from './campaign-delivery'
+import { dashboardOperationalError } from '../dashboard-response'
+import { loadCampaignDeliveryContext, validateCampaignDelivery } from './campaign-delivery'
+import { marketingRecordId } from './marketing-response'
 
 export default new Action({
   name: 'CampaignSendAction',
@@ -12,31 +12,37 @@ export default new Action({
   method: 'POST',
 
   async handle(request: RequestInstance) {
-    const id = Number(request.getParam('id'))
-    const campaign = await Campaign.find(id)
-    if (!campaign)
+    const id = marketingRecordId(request)
+    if (!id)
+      return response.json({ message: 'A valid campaign id is required.' }, 400)
+
+    let context
+    try {
+      context = await loadCampaignDeliveryContext(id)
+    }
+    catch (error) {
+      return dashboardOperationalError(error, 'Campaign delivery prerequisites could not be loaded.', 'CampaignSendAction.prerequisites')
+    }
+    if (!context.campaign)
       return response.json({ message: 'Campaign not found.' }, 404)
 
-    const listId = Number(campaign.get('email_list_id') || 0)
-    const list = listId ? await EmailList.find(listId) : null
-    const memberRow = listId
-      ? await db
-          .selectFrom('email_list_subscribers')
-          .select(db.fn.count('id').as('count'))
-          .where('email_list_id', '=', listId)
-          .where('status', '=', 'subscribed')
-          .executeTakeFirst()
-      : null
     const validationError = validateCampaignDelivery(
-      campaign,
+      context.campaign,
       'send',
-      Number(memberRow?.count || 0),
-      String(list?.get('status') || ''),
+      context.activeMembers,
+      context.listStatus,
     )
     if (validationError)
       return response.json({ message: validationError }, 422)
 
-    await campaigns.sendNow(id)
-    return response.json({ id, status: 'sending' }, 202)
+    try {
+      await campaigns.sendNow(id)
+      return response.json({ id, status: 'sending' }, 202)
+    }
+    catch (error) {
+      if (error instanceof CampaignStateConflictError)
+        return response.json({ message: 'Campaign delivery state changed. Refresh and try again.' }, 409)
+      return dashboardOperationalError(error, 'Campaign could not be queued.', 'CampaignSendAction.queue', 500)
+    }
   },
 })

package/app/Actions/Dashboard/Marketing/CampaignStoreAction.ts

@@ -4,6 +4,7 @@ import { config } from '@stacksjs/config'
 import { Campaign } from '@stacksjs/orm'
 import { response } from '@stacksjs/router'
 import { campaignWriteData, validateCampaignWriteData } from './campaign-records'
+import { marketingModelError } from './marketing-response'
 
 export default new Action({
   name: 'CampaignStoreAction',
@@ -12,7 +13,6 @@ export default new Action({
   model: Campaign,
 
   async handle(request: RequestInstance) {
-    await request.validate()
     const data = campaignWriteData(
       await request.all(),
       String((config as any).commerce?.currency || 'USD').toUpperCase(),
@@ -23,14 +23,19 @@ export default new Action({
     if (['sending', 'sent'].includes(data.status))
       return response.json({ message: 'Campaign delivery status is managed by the send pipeline.' }, 422)
 
-    const campaign = await Campaign.create({
-      ...data,
-      audience_size: 0,
-      sent_count: 0,
-      open_rate: null,
-      click_rate: null,
-      conversion_rate: null,
-    })
-    return response.json({ id: campaign.get('id') }, 201)
+    try {
+      const campaign = await Campaign.create({
+        ...data,
+        audience_size: 0,
+        sent_count: 0,
+        open_rate: null,
+        click_rate: null,
+        conversion_rate: null,
+      })
+      return response.json({ id: campaign.get('id') }, 201)
+    }
+    catch (error) {
+      return marketingModelError(error, 'Campaign could not be created.', 'CampaignStoreAction')
+    }
   },
 })

package/app/Actions/Dashboard/Marketing/CampaignUpdateAction.ts

@@ -4,6 +4,7 @@ import { config } from '@stacksjs/config'
 import { Campaign } from '@stacksjs/orm'
 import { response } from '@stacksjs/router'
 import { campaignWriteData, validateCampaignWriteData } from './campaign-records'
+import { marketingModelError, marketingRecordId } from './marketing-response'
 
 export default new Action({
   name: 'CampaignUpdateAction',
@@ -12,16 +13,9 @@ export default new Action({
   model: Campaign,
 
   async handle(request: RequestInstance) {
-    await request.validate()
-    const id = Number(request.getParam('id'))
-    const campaign = await Campaign.find(id)
-    if (!campaign)
-      return response.json({ message: 'Campaign not found.' }, 404)
-
-    const currentStatus = String(campaign.get('status') || '')
-    if (['sending', 'sent'].includes(currentStatus))
-      return response.json({ message: 'Campaigns that entered delivery cannot be edited.' }, 409)
-
+    const id = marketingRecordId(request)
+    if (!id)
+      return response.json({ message: 'A valid campaign id is required.' }, 400)
     const data = campaignWriteData(
       await request.all(),
       String((config as any).commerce?.currency || 'USD').toUpperCase(),
@@ -32,7 +26,20 @@ export default new Action({
     if (['sending', 'sent'].includes(data.status))
       return response.json({ message: 'Campaign delivery status is managed by the send pipeline.' }, 422)
 
-    await campaign.update(data)
-    return response.json({ id })
+    try {
+      const campaign = await Campaign.find(id)
+      if (!campaign)
+        return response.json({ message: 'Campaign not found.' }, 404)
+
+      const currentStatus = String(campaign.get('status') || '')
+      if (['sending', 'sent'].includes(currentStatus))
+        return response.json({ message: 'Campaigns that entered delivery cannot be edited.' }, 409)
+
+      await campaign.update(data)
+      return response.json({ id })
+    }
+    catch (error) {
+      return marketingModelError(error, 'Campaign could not be updated.', 'CampaignUpdateAction')
+    }
   },
 })

package/app/Actions/Dashboard/Marketing/ListDestroyAction.ts

@@ -3,6 +3,7 @@ import { Action } from '@stacksjs/actions'
 import { db } from '@stacksjs/database'
 import { EmailList } from '@stacksjs/orm'
 import { response } from '@stacksjs/router'
+import { marketingModelError, marketingRecordId } from './marketing-response'
 
 export default new Action({
   name: 'MarketingListDestroyAction',
@@ -10,32 +11,40 @@ export default new Action({
   method: 'DELETE',
 
   async handle(request: RequestInstance) {
-    const id = Number(request.getParam('id'))
-    const list = await EmailList.find(id)
-    if (!list)
-      return response.json({ message: 'Email list not found.' }, 404)
+    const id = marketingRecordId(request)
+    if (!id)
+      return response.json({ message: 'A valid email list id is required.' }, 400)
 
-    const [membership, campaign] = await Promise.all([
-      db
-        .selectFrom('email_list_subscribers')
-        .select(db.fn.count('id').as('count'))
-        .where('email_list_id', '=', id)
-        .executeTakeFirst(),
-      db
-        .selectFrom('campaigns')
-        .select(db.fn.count('id').as('count'))
-        .where('email_list_id', '=', id)
-        .executeTakeFirst(),
-    ])
-    const membershipCount = Number(membership?.count || 0)
-    const campaignCount = Number(campaign?.count || 0)
-    if (membershipCount > 0 || campaignCount > 0) {
-      return response.json({
-        message: 'Archive this list instead. Lists with memberships or campaigns cannot be deleted.',
-      }, 409)
-    }
+    try {
+      const list = await EmailList.find(id)
+      if (!list)
+        return response.json({ message: 'Email list not found.' }, 404)
+
+      const [membership, campaign] = await Promise.all([
+        db
+          .selectFrom('email_list_subscribers')
+          .select(db.fn.count('id').as('count'))
+          .where('email_list_id', '=', id)
+          .executeTakeFirst(),
+        db
+          .selectFrom('campaigns')
+          .select(db.fn.count('id').as('count'))
+          .where('email_list_id', '=', id)
+          .executeTakeFirst(),
+      ])
+      const membershipCount = Number(membership?.count || 0)
+      const campaignCount = Number(campaign?.count || 0)
+      if (membershipCount > 0 || campaignCount > 0) {
+        return response.json({
+          message: 'Archive this list instead. Lists with memberships or campaigns cannot be deleted.',
+        }, 409)
+      }
 
-    await list.delete()
-    return response.noContent()
+      await list.delete()
+      return response.noContent()
+    }
+    catch (error) {
+      return marketingModelError(error, 'Email list could not be deleted.', 'ListDestroyAction')
+    }
   },
 })

package/app/Actions/Dashboard/Marketing/ListIndexAction.ts

@@ -1,6 +1,7 @@
 import { Action } from '@stacksjs/actions'
 import { db } from '@stacksjs/database'
 import { EmailList } from '@stacksjs/orm'
+import { dashboardOperationalError } from '../dashboard-response'
 import { normalizeMarketingLists } from './marketing-list-records'
 
 export default new Action({
@@ -15,32 +16,37 @@ export default new Action({
       .slice(0, 19)
       .replace('T', ' ')
 
-    const [lists, membershipRows, newMembershipRows, campaignRows] = await Promise.all([
-      EmailList.orderBy('name', 'asc').get(),
-      db
-        .selectFrom('email_list_subscribers')
-        .select(['email_list_id', 'status', db.fn.count('id').as('count')])
-        .groupBy(['email_list_id', 'status'])
-        .execute(),
-      db
-        .selectFrom('email_list_subscribers')
-        .select(['email_list_id', db.fn.count('id').as('count')])
-        .where('status', '=', 'subscribed')
-        .where('subscribed_at', '>=', weekStart)
-        .groupBy('email_list_id')
-        .execute(),
-      db
-        .selectFrom('campaigns')
-        .select([
-          'email_list_id',
-          db.fn.count('id').as('count'),
-          db.fn.max('sent_at').as('last_sent_at'),
-        ])
-        .whereNotNull('email_list_id')
-        .groupBy('email_list_id')
-        .execute(),
-    ])
+    try {
+      const [lists, membershipRows, newMembershipRows, campaignRows] = await Promise.all([
+        EmailList.orderBy('name', 'asc').get(),
+        db
+          .selectFrom('email_list_subscribers')
+          .select(['email_list_id', 'status', db.fn.count('id').as('count')])
+          .groupBy(['email_list_id', 'status'])
+          .execute(),
+        db
+          .selectFrom('email_list_subscribers')
+          .select(['email_list_id', db.fn.count('id').as('count')])
+          .where('status', '=', 'subscribed')
+          .where('subscribed_at', '>=', weekStart)
+          .groupBy('email_list_id')
+          .execute(),
+        db
+          .selectFrom('campaigns')
+          .select([
+            'email_list_id',
+            db.fn.count('id').as('count'),
+            db.fn.max('sent_at').as('last_sent_at'),
+          ])
+          .whereNotNull('email_list_id')
+          .groupBy('email_list_id')
+          .execute(),
+      ])
 
-    return normalizeMarketingLists(lists, membershipRows, newMembershipRows, campaignRows)
+      return normalizeMarketingLists(lists, membershipRows, newMembershipRows, campaignRows)
+    }
+    catch (error) {
+      return dashboardOperationalError(error, 'Email lists could not be loaded.', 'ListIndexAction')
+    }
   },
 })