@novacraft-engineering/mailbox 0.4.27 → 0.4.29

package/lib/receive.ts

@@ -2,8 +2,9 @@ import { BRAND, ADDRESS_DOMAINS } from '@/lib/brand'
 import { sendPush } from '@/lib/push'
 import { stripOwnPixel } from '@/lib/email-html'
 import { FORWARDING_ENABLED, FORWARD_RECIPIENTS, MAIL_DOMAIN } from '@/lib/dev-auth'
-import { ADDRESS_ALIASES, appendInbound, isDmarcAggregateReport, judgeMessage, noteSender, senderStanding, senderDomainOf, getAccountByAddress, inboundExists, recordContact, recordSentMeta, repairInbound } from '@/lib/mailbox'
-import { sendMail } from '@/lib/mail-provider'
+import { ADDRESS_ALIASES, appendInbound, classifyAddressed, isDmarcAggregateReport, judgeMessage, noteSender, senderStanding, senderDomainOf, getAccountByAddress, inboundExists, inboxFiltersFor, recordContact, recordSentMessage, recordSentMeta, repairInbound } from '@/lib/mailbox'
+import { matchesInboxFilters } from '@/lib/inbox-filters'
+import { archiveAddress, sendMail } from '@/lib/mail-provider'
 
 /**
  * Where the receiving API lives. The Resend SDK reads RESEND_BASE_URL for sending, so a
@@ -379,11 +380,29 @@ export async function ingestReceived(
     return { owner: inbound.owner, subject: inbound.subject, from: inbound.from }
   }
 
+  if (isArchiveCopy(inbound.owner, inbound.to, inbound.cc)) {
+    await recordSentMessage({
+      id: emailId,
+      from: inbound.from,
+      to: inbound.to,
+      cc: inbound.cc,
+      bcc: inbound.bcc,
+      replyTo: inbound.replyTo,
+      subject: inbound.subject,
+      html: inbound.html,
+      text: inbound.text,
+      createdAt: inbound.receivedAt,
+      attachments: inbound.attachments,
+    })
+    await recordSentMeta(emailId, inbound.owner, true)
+    return { owner: inbound.owner, subject: inbound.subject, from: inbound.from }
+  }
+
   await appendInbound(inbound)
   await noteSender(owner, senderDomain, 'received').catch(() => {})
   const sender = parseSender(inbound.from)
   await recordContact(sender.email, sender.name)
-  if (!isDmarcAggregateReport(inbound.subject)) {
+  if (!isDmarcAggregateReport(inbound.subject) && !(await filteredOut(inbound))) {
     await sendPush(inbound.owner, {
       title: sender.name || sender.email || 'New mail',
       body: inbound.subject,
@@ -411,6 +430,19 @@ export async function ingestReceived(
   return { owner: inbound.owner, subject: inbound.subject, from: inbound.from }
 }
 
+async function filteredOut(inbound: { owner: string | null; from: string; subject: string; text: string | null }): Promise<boolean> {
+  const login = inbound.owner ? (await getAccountByAddress(inbound.owner).catch(() => null))?.email : null
+  if (!login) return false
+  const filters = await inboxFiltersFor(login).catch(() => [])
+  return matchesInboxFilters(filters, { senders: [inbound.from], subject: inbound.subject, text: inbound.text })
+}
+
+/** A copy of our own outgoing mail, BCC'd to the archive seat: it belongs in that seat's Sent, not its inbox. */
+export function isArchiveCopy(owner: string | null | undefined, to: string[], cc: string[]): boolean {
+  const archive = archiveAddress()
+  return Boolean(archive) && (owner ?? '').trim().toLowerCase() === archive && classifyAddressed(owner, to, cc) === 'other'
+}
+
 export type ReceivedSummary = { id: string; from: string; to: string[]; subject: string; createdAt: string }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@novacraft-engineering/mailbox",
-  "version": "0.4.27",
+  "version": "0.4.29",
   "description": "A shared webmail app: one codebase, one deployment per mailbox. Threads, a rich composer with signatures, attachments on S3-compatible storage, sharing links, full-text search, web push and PWA install.",
   "keywords": [
     "webmail",