@meith/notifications 0.31.0 → 0.33.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meith/notifications",
-  "version": "0.31.0",
+  "version": "0.33.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -19,8 +19,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@meith/core": "0.31.0",
-    "@meith/i18n": "0.31.0",
-    "@meith/mail": "0.31.0"
+    "@meith/core": "0.33.0",
+    "@meith/i18n": "0.33.0",
+    "@meith/mail": "0.33.0"
   }
 }

package/src/deliver-push.ts

@@ -7,6 +7,25 @@ import type { NotificationRepository } from './types'
 
 const BODY_LIMIT = 300
 
+export const PUSH_DELIVERY_CONCURRENCY = 4
+
+async function mapBounded<T, R>(
+  items: readonly T[],
+  limit: number,
+  run: (item: T) => Promise<R>,
+): Promise<R[]> {
+  const results = new Array<R>(items.length)
+  let next = 0
+  const workers = Array.from({ length: Math.min(limit, items.length) }, async () => {
+    while (next < items.length) {
+      const index = next++
+      results[index] = await run(items[index]!)
+    }
+  })
+  await Promise.all(workers)
+  return results
+}
+
 export interface PushDeliveryResult {
   readonly outcome: DeliveryOutcome
   readonly sent: number
@@ -47,6 +66,7 @@ export async function deliverNotificationPush(deps: {
   readonly translatorForLocale?: NotificationTranslatorResolver
   readonly now?: () => Date
   readonly send?: typeof sendWebPush
+  readonly signal?: AbortSignal
 }): Promise<PushDeliveryResult> {
   const nothing = { sent: 0, pruned: 0, failed: 0 }
 
@@ -73,12 +93,8 @@ export async function deliverNotificationPush(deps: {
     badge: await deps.notifications.unreadCount(deliverable.recipient.userId),
   })
 
-  let sent = 0
-  let pruned = 0
-  let failed = 0
-
-  for (const subscription of subscriptions) {
-    const result = await send({
+  const outcomes = await mapBounded(subscriptions, PUSH_DELIVERY_CONCURRENCY, (subscription) =>
+    send({
       subscription: {
         endpoint: subscription.endpoint,
         p256dh: subscription.p256dh,
@@ -87,7 +103,16 @@ export async function deliverNotificationPush(deps: {
       payload,
       vapid: deps.vapid,
       now: now(),
-    })
+      ...(deps.signal === undefined ? {} : { signal: deps.signal }),
+    }),
+  )
+
+  let sent = 0
+  let pruned = 0
+  let failed = 0
+
+  for (const [index, subscription] of subscriptions.entries()) {
+    const result = outcomes[index]!
 
     if (result.outcome === 'sent') {
       sent += 1

package/src/kinds.ts

@@ -70,6 +70,20 @@ export const NOTIFICATION_KINDS = [
     pushByDefault: false,
     pushConfigurable: true,
   },
+  {
+    id: 'board.digest',
+    titleKey: 'notification.board.digest.title',
+    descriptionKey: 'notification.board.digest.description',
+    title: 'A recap of what you missed on the board',
+    description:
+      'Sent only after you have been away a while, listing the busiest threads since ' +
+      'your last visit. Off by default — nobody gets this without asking for it.',
+    audience: 'member',
+    emailByDefault: false,
+    emailConfigurable: true,
+    pushByDefault: false,
+    pushConfigurable: true,
+  },
   {
     id: 'post.mentioned',
     titleKey: 'notification.post.mentioned.title',

package/src/push.ts

@@ -9,6 +9,8 @@ export const PUSH_RECORD_SIZE = 4096
 
 export const PUSH_REQUEST_TIMEOUT_MS = 10_000
 
+export const PUSH_MAX_RESPONSE_BYTES = 8_192
+
 export const PUSH_TTL_SECONDS = 86_400
 
 const VAPID_EXPIRY_SECONDS = 12 * 60 * 60
@@ -199,6 +201,8 @@ const guardedPushFetch: typeof fetch = (async (url: string, init: RequestInit) =
     body: init.body as Uint8Array,
     timeoutMs: PUSH_REQUEST_TIMEOUT_MS,
     allowPrivateHosts,
+    maxResponseBytes: PUSH_MAX_RESPONSE_BYTES,
+    ...(init.signal ? { signal: init.signal } : {}),
   })
   return { status } as Response
 }) as unknown as typeof fetch
@@ -210,6 +214,7 @@ export async function sendWebPush(input: {
   readonly ttlSeconds?: number
   readonly now?: Date
   readonly fetchImpl?: typeof fetch
+  readonly signal?: AbortSignal
 }): Promise<PushSendResult> {
   const doFetch = input.fetchImpl ?? guardedPushFetch
 
@@ -238,7 +243,10 @@ export async function sendWebPush(input: {
       },
       body: bytes(encrypted.body),
       redirect: 'manual',
-      signal: AbortSignal.timeout(PUSH_REQUEST_TIMEOUT_MS),
+      signal:
+        input.signal === undefined
+          ? AbortSignal.timeout(PUSH_REQUEST_TIMEOUT_MS)
+          : AbortSignal.any([input.signal, AbortSignal.timeout(PUSH_REQUEST_TIMEOUT_MS)]),
     })
 
     const outcome = pushOutcomeFor(response.status)

package/src/render.ts

@@ -80,6 +80,11 @@ const DIGEST_CADENCE_KEYS = {
   weekly: 'notification.render.digest.weekly',
 } as const
 
+const BOARD_DIGEST_CADENCE_KEYS = {
+  weekly: 'notification.render.digest.weekly',
+  monthly: 'notification.render.boardDigest.monthly',
+} as const
+
 const TEMPLATES: Readonly<
   Record<string, (data: NotificationData, t: Translator) => { subject: string; body: string }>
 > = {
@@ -167,6 +172,29 @@ const TEMPLATES: Readonly<
     }
   },
 
+  'board.digest': (data, t) => {
+    const cadence = str(data, 'cadence') === 'monthly' ? 'monthly' : 'weekly'
+    const threadCount = num(data, 'threadCount')
+    const more = num(data, 'more')
+
+    const lines = objects(data, 'threads').map((entry) =>
+      t.t('notification.render.boardDigest.entry', {
+        title: str(entry, 'title', t.t('notification.render.digest.fallbackTitle')),
+        forum: str(entry, 'forumTitle', t.t('notification.render.boardDigest.forumFallback')),
+      }),
+    )
+
+    if (more > 0) lines.push(t.t('notification.render.digest.more', { count: more }))
+
+    return {
+      subject: t.t('notification.render.boardDigest.subject', {
+        cadence: t.t(BOARD_DIGEST_CADENCE_KEYS[cadence]),
+        threads: threadCount,
+      }),
+      body: lines.join('\n'),
+    }
+  },
+
   'post.mentioned': (data, t) => {
     const by = str(data, 'byUsername', t.t('notification.render.somebody'))
     const title = str(data, 'threadTitle', t.t('notification.render.threadFallback'))