@remit/backend 0.0.144 → 0.0.145

package/dist/src/service/organize.js

@@ -154,25 +154,17 @@ export const buildOrganizeMatchDeps = (client) => ({
  * {@link PlacementMoveService} over the shared message-management queue. A move
  * commits locally (marker + ThreadMessage + Message row) and enqueues a
  * `PLACEMENT_MOVE_PUSH` for the reconciler; its marker state engine makes a
- * redelivered job idempotent (mirrors #1297). Returns `undefined` when no
- * message-management queue is wired — the same gate body sync uses to keep the
- * move path off — so a move requested in that environment is counted as failed
- * rather than silently dropped (see {@link applyOrganize}).
+ * redelivered job idempotent (mirrors #1297).
  */
-export const buildOrganizeMoveService = (client) => {
-    const queueUrl = process.env.SQS_QUEUE_URL_MESSAGE_MGMT;
-    if (!queueUrl)
-        return undefined;
-    return new PlacementMoveService({
-        messageService: client.message,
-        threadMessageService: client.threadMessage,
-        markerService: client.placementMove,
-        addressService: client.address,
-        mailboxSpecialUseService: client.mailboxSpecialUse,
-        mailboxService: client.mailbox,
-        sqsQueueUrl: queueUrl,
-    });
-};
+export const buildOrganizeMoveService = (client) => new PlacementMoveService({
+    messageService: client.message,
+    threadMessageService: client.threadMessage,
+    markerService: client.placementMove,
+    addressService: client.address,
+    mailboxSpecialUseService: client.mailboxSpecialUse,
+    mailboxService: client.mailbox,
+    queue: client.queues.messageManagement,
+});
 /**
  * Apply the back-apply action to every matched message, reusing the index-time
  * apply plumbing: an idempotent MessageLabel upsert (additive) with
@@ -195,12 +187,6 @@ export const applyOrganize = async (deps, accountConfigId, messageIds, predicate
     const applyMove = predicate.actionMailboxId !== NO_ACTION && predicate.actionMailboxId !== "";
     const applyToMessage = async (messageId) => {
         if (applyMove) {
-            if (!moveService) {
-                // An exclusive move was requested but this caller wired no move
-                // service. Never silently pretend it applied — surface it as a
-                // failed message so the job's failedCount reflects reality.
-                throw new Error("Organize move action requested but no move service is wired");
-            }
             const message = await client.message.get(messageId);
             const accountId = await client.mailbox.resolveAccountId(message.mailboxId);
             if (!accountId) {
@@ -324,9 +310,6 @@ export const backApplyFilter = async (deps, accountConfigId, filterId) => {
         mailboxService: client.mailbox,
         placementMoveService: moveService,
     });
-    if (!config) {
-        throw new Error("Filter back-apply needs the message-management queue to move mail");
-    }
     const pipeline = new FilterPipeline(config, logger);
     const mailboxIds = await inboxMailboxIds(client, accountConfigId);
     const nothing = {

package/dist/src/service/queues.d.ts

@@ -0,0 +1,12 @@
+import type { AccountFanoutEvent, FifoQueueProducer, QueueProducer } from "@remit/data-ports";
+import type { FlagPushEvent, MailboxManagementEvent, MessageMoveQueueEvent, PlacementMovePushEvent, SendMessageEvent, SyncMessageBodyEvent } from "@remit/mailbox-service";
+import type { SyncMailboxesEvent } from "./trigger-sync.js";
+export type SyncQueueEvent = SyncMailboxesEvent | FlagPushEvent | MailboxManagementEvent | MessageMoveQueueEvent;
+export interface RemitClientQueues {
+    sync: FifoQueueProducer<SyncQueueEvent>;
+    accountFanout: QueueProducer<AccountFanoutEvent>;
+    smtp: FifoQueueProducer<SendMessageEvent>;
+    messageManagement: QueueProducer<PlacementMovePushEvent>;
+    body: QueueProducer<SyncMessageBodyEvent>;
+}
+export type QueueName = keyof RemitClientQueues;

package/dist/src/service/queues.js

@@ -0,0 +1 @@
+export {};

package/dist/src/service/shared-deps.d.ts

@@ -0,0 +1,6 @@
+import type { RemitClientSharedDeps } from "./create-remit-client.js";
+import type { QueueName, RemitClientQueues } from "./queues.js";
+export type SqsQueueUrls = Record<QueueName, string>;
+export declare const sqsQueueUrlsFromEnv: () => SqsQueueUrls;
+export declare const sqsQueues: (urls: SqsQueueUrls) => RemitClientQueues;
+export declare const buildSharedDeps: (queues: RemitClientQueues) => RemitClientSharedDeps;

package/dist/src/service/shared-deps.js

@@ -0,0 +1,24 @@
+import { createCachedDataKeyProvider, createSecretsService, } from "@remit/secrets-service";
+import { createKmsDataKeyProvider, FAKE_KMS_KEY_ID, } from "@remit/secrets-service/kms";
+import { createQueueProducer } from "@remit/sqs-client/producer";
+import { createStorageService } from "@remit/storage-service/s3";
+import { env } from "expect-env";
+export const sqsQueueUrlsFromEnv = () => ({
+    sync: env.SQS_QUEUE_URL,
+    accountFanout: env.SQS_QUEUE_URL_ACCOUNT_FANOUT,
+    smtp: env.SQS_QUEUE_URL_SMTP,
+    messageManagement: env.SQS_QUEUE_URL_MESSAGE_MGMT,
+    body: env.SQS_QUEUE_URL_BODY,
+});
+export const sqsQueues = (urls) => ({
+    sync: createQueueProducer({ queueUrl: urls.sync }),
+    accountFanout: createQueueProducer({ queueUrl: urls.accountFanout }),
+    smtp: createQueueProducer({ queueUrl: urls.smtp }),
+    messageManagement: createQueueProducer({ queueUrl: urls.messageManagement }),
+    body: createQueueProducer({ queueUrl: urls.body }),
+});
+export const buildSharedDeps = (queues) => ({
+    storage: createStorageService(),
+    secrets: createSecretsService(createCachedDataKeyProvider(createKmsDataKeyProvider(process.env.KMS_KEY_ID ?? FAKE_KMS_KEY_ID))),
+    queues,
+});

package/dist/src/service/trigger-sync.d.ts

@@ -1,7 +1,13 @@
-import { SendMessageCommand, type SQSClient } from "@aws-sdk/client-sqs";
+import type { FifoQueueMessage, FifoQueueProducer } from "@remit/data-ports";
+export interface SyncMailboxesEvent {
+    type: "SYNC_MAILBOXES";
+    eventId: string;
+    timestamp: number;
+    accountId: string;
+    explicitRequest?: boolean;
+}
 interface TriggerAccountSyncInput {
-    sqsClient: SQSClient;
-    queueUrl: string;
+    queue: FifoQueueProducer<SyncMailboxesEvent>;
     accountId: string;
     /**
      * Set by POST /sync, whose callers ask for a sync of one named account: the
@@ -21,7 +27,7 @@ interface TriggerAccountSyncInput {
      */
     explicitRequest?: boolean;
     /**
-     * Override the FIFO `MessageDeduplicationId`. Defaults to the event's own
+     * Override the queue deduplication id. Defaults to the event's own
      * id, so the queue suppresses a re-send of one event and nothing else —
      * every manual call site (POST /sync, OAuth connect, config load,
      * pull-to-refresh, the client's online-poll) always enqueues. A shared,
@@ -44,7 +50,7 @@ interface TriggerAccountSyncInput {
  * retried Lambda) — see `dedupId` above.
  */
 export declare const buildScheduledSyncDedupId: (accountId: string, now: number, bucketMs: number) => string;
-export declare const buildSyncMailboxesCommand: (input: Omit<TriggerAccountSyncInput, "sqsClient">) => SendMessageCommand;
+export declare const buildSyncMailboxesMessage: (input: Omit<TriggerAccountSyncInput, "queue">) => FifoQueueMessage<SyncMailboxesEvent>;
 export declare const triggerAccountSync: (input: TriggerAccountSyncInput) => Promise<{
     eventId: string;
 }>;

package/dist/src/service/trigger-sync.js

@@ -1,6 +1,4 @@
 import { randomUUID } from "node:crypto";
-import { SendMessageCommand } from "@aws-sdk/client-sqs";
-const isFifoQueue = (queueUrl) => queueUrl.endsWith(".fifo");
 /**
  * Build the scheduler's own dedup namespace, bucketed by tick interval so
  * consecutive ticks each get a fresh id (never colliding with each other)
@@ -11,8 +9,8 @@ export const buildScheduledSyncDedupId = (accountId, now, bucketMs) => {
     const bucket = Math.floor(now / bucketMs);
     return `SYNC_MAILBOXES:scheduled:${accountId}:${bucket}`;
 };
-export const buildSyncMailboxesCommand = (input) => {
-    const { queueUrl, accountId, dedupId, explicitRequest } = input;
+export const buildSyncMailboxesMessage = (input) => {
+    const { accountId, dedupId, explicitRequest } = input;
     const event = {
         type: "SYNC_MAILBOXES",
         eventId: randomUUID(),
@@ -20,20 +18,14 @@ export const buildSyncMailboxesCommand = (input) => {
         accountId,
         ...(explicitRequest && { explicitRequest }),
     };
-    const useFifo = isFifoQueue(queueUrl);
-    return new SendMessageCommand({
-        QueueUrl: queueUrl,
-        MessageBody: JSON.stringify(event),
-        ...(useFifo && {
-            MessageGroupId: accountId,
-            MessageDeduplicationId: dedupId ?? event.eventId,
-        }),
-    });
+    return {
+        body: event,
+        groupId: accountId,
+        deduplicationId: dedupId ?? event.eventId,
+    };
 };
 export const triggerAccountSync = async (input) => {
-    const command = buildSyncMailboxesCommand(input);
-    await input.sqsClient.send(command);
-    const body = command.input.MessageBody ?? "{}";
-    const parsed = JSON.parse(body);
-    return { eventId: parsed.eventId };
+    const message = buildSyncMailboxesMessage(input);
+    await input.queue.send(message);
+    return { eventId: message.body.eventId };
 };

package/dist/src/types.d.ts

@@ -1,4 +1,7 @@
 import type { Context } from "openapi-backend";
+import type { ApiConfig } from "./config/api-config.js";
+import type { RemitClient } from "./service/create-remit-client.js";
+import type { QueueName } from "./service/queues.js";
 type MatchPrefix<Prefix extends string, S extends string> = S extends `${Prefix}${infer _}` ? S : never;
 export type OperationIds = "MeOperations_deleteMe" | "MeOperations_listVipSuggestions" | "MeOperations_createExport" | "MeOperations_getExport" | "MeOperations_listQuarantine" | "ConfigOperations_getConfig" | "ConfigOperations_exportConfig" | "ConfigOperations_importConfig" | "SystemOperations_getSystemUpdate" | "SystemOperations_applySystemUpdate" | "AccountOperations_createAccount" | "AccountOperations_testConnection" | "AccountDetailOperations_updateAccount" | "AccountDetailOperations_deleteAccount" | "MicrosoftOAuthOperations_microsoftOAuthStart" | "MicrosoftOAuthOperations_microsoftOAuthCallback" | "MailboxOperations_listMailboxes" | "MailboxOperations_createMailbox" | "MailboxDetailOperations_getMailbox" | "MailboxDetailOperations_renameMailbox" | "MailboxDetailOperations_deleteMailbox" | "FolderRoleOperations_appointFolderRole" | "FilterOperations_listFilters" | "FilterOperations_createFilter" | "FilterDetailOperations_getFilter" | "FilterDetailOperations_updateFilter" | "FilterDetailOperations_deleteFilter" | "LabelOperations_listLabels" | "LabelOperations_createLabel" | "LabelDetailOperations_getLabel" | "LabelDetailOperations_updateLabel" | "LabelDetailOperations_deleteLabel" | "OrganizeOperations_createOrganizeJob" | "OrganizeOperations_previewOrganize" | "OrganizeJobDetailOperations_getOrganizeJob" | "SyncOperations_triggerSync" | "SyncOperations_getSyncStatus" | "ThreadDetailOperations_listThreadMessages" | "UnifiedThreadOperations_listAllThreads" | "ThreadOperations_listThreads" | "ThreadOperations_searchThreads" | "MessageOperations_describeMessage" | "MessageOperations_getRawMessage" | "MessageOperations_updateMessageFlags" | "MessageBulkOperations_deleteMessages" | "MessageBulkOperations_moveMessages" | "MessageBulkOperations_updateFlags" | "MessageBulkOperations_copyMessages" | "MessageBulkOperations_updateMessageLabels" | "MessageBulkOperations_reportSpam" | "MessageBulkOperations_notSpam" | "CalendarOperations_listCalendars" | "CalendarOperations_createCalendar" | "CalendarDetailOperations_getCalendar" | "CalendarDetailOperations_updateCalendar" | "CalendarDetailOperations_deleteCalendar" | "CalendarDetailOperations_getCalendarFeed" | "CalendarDetailOperations_putCalendarFeed" | "CalendarDetailOperations_revokeCalendarFeed" | "CalendarFeedOperations_getCalendarFeedIcal" | "CalendarEventOperations_listCalendarEvents" | "CalendarEventOperations_createCalendarEvent" | "CalendarEventDetailOperations_getCalendarEvent" | "CalendarEventDetailOperations_updateCalendarEvent" | "CalendarEventDetailOperations_deleteCalendarEvent" | "CalendarFreeBusyOperations_listCalendarFreeBusy" | "TrashOperations_emptyTrash" | "OutboxOperations_createOutboxMessage" | "OutboxOperations_listOutboxMessages" | "OutboxDetailOperations_getOutboxMessage" | "OutboxDetailOperations_updateOutboxMessage" | "OutboxDetailOperations_deleteOutboxMessage" | "OutboxDetailOperations_sendOutboxMessage" | "OutboxDetailOperations_mintOutboxAttachment" | "OutboxAttachmentOperations_completeOutboxAttachment" | "AddressOperations_searchAddresses" | "AddressDetailOperations_updateAddress" | "CalendarSuggestionOperations_listCalendarSuggestions" | "MessageCalendarSuggestionOperations_listMessageCalendarSuggestions" | "CalendarSuggestionActionOperations_acceptCalendarSuggestion" | "CalendarSuggestionActionOperations_declineCalendarSuggestion" | "CalendarSuggestionActionOperations_dismissCalendarSuggestion" | "CalendarSuggestionActionOperations_reopenCalendarSuggestion";
 export type MeOperationIds = MatchPrefix<"MeOperations_", OperationIds>;
@@ -45,5 +48,25 @@ export type CalendarSuggestionOperationIds = MatchPrefix<"CalendarSuggestionOper
 export type MessageCalendarSuggestionOperationIds = MatchPrefix<"MessageCalendarSuggestionOperations_", OperationIds>;
 export type CalendarSuggestionActionOperationIds = MatchPrefix<"CalendarSuggestionActionOperations_", OperationIds>;
 type HandlerResponse = Record<string, any>;
-export type OperationHandler<_T extends OperationIds = OperationIds> = (context: Context) => Promise<HandlerResponse>;
+export interface UserIdentity {
+    kind: "user";
+    accountConfigId: string;
+    sub: string;
+    email: string;
+}
+export type HandlerIdentity = {
+    kind: "anonymous";
+} | UserIdentity;
+export interface HandlerContext<K extends QueueName = never> {
+    client: RemitClient<K>;
+    identity: UserIdentity;
+    config: ApiConfig;
+}
+export interface PublicHandlerContext<K extends QueueName = never> {
+    client: RemitClient<K>;
+    config: ApiConfig;
+}
+export type PublicOperationIds = "MicrosoftOAuthOperations_microsoftOAuthCallback" | "CalendarFeedOperations_getCalendarFeedIcal";
+export type OperationHandler<_T extends OperationIds = OperationIds, K extends QueueName = never> = (context: Context, ctx: HandlerContext<K>) => Promise<HandlerResponse>;
+export type PublicOperationHandler<K extends QueueName = never> = (context: Context, ctx: PublicHandlerContext<K>) => Promise<HandlerResponse>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remit/backend",
-	"version": "0.0.144",
+	"version": "0.0.145",
 	"description": "Remit Mail Inspector API backend",
 	"license": "MIT",
 	"author": "",
@@ -15,6 +15,10 @@
 			"types": "./dist/src/api.d.ts",
 			"default": "./dist/src/api.js"
 		},
+		"./serve": {
+			"types": "./dist/src/serve.d.ts",
+			"default": "./dist/src/serve.js"
+		},
 		"./client": {
 			"types": "./dist/src/service/data-client.d.ts",
 			"default": "./dist/src/service/data-client.js"
@@ -23,6 +27,14 @@
 			"types": "./dist/src/service/create-remit-client.d.ts",
 			"default": "./dist/src/service/create-remit-client.js"
 		},
+		"./shared-deps": {
+			"types": "./dist/src/service/shared-deps.d.ts",
+			"default": "./dist/src/service/shared-deps.js"
+		},
+		"./compose-sqlite": {
+			"types": "./dist/src/service/compose-sqlite.d.ts",
+			"default": "./dist/src/service/compose-sqlite.js"
+		},
 		"./folder-role-appointments": {
 			"types": "./dist/src/handlers/folder-role-appointments.d.ts",
 			"default": "./dist/src/handlers/folder-role-appointments.js"
@@ -89,16 +101,16 @@
 		"@remit/auth-service": "*",
 		"@remit/drizzle-service": "*",
 		"@remit/sqs-client": "*",
-		"@aws-sdk/client-secrets-manager": "*",
-		"@aws-sdk/client-sqs": "*",
+		"@aws-sdk/client-secrets-manager": "^3.1090.0",
 		"better-sqlite3": "^12.11.1",
-		"expect-env": "*",
-		"openapi-backend": "*",
-		"p-map": "*",
-		"@types/aws-lambda": "*",
+		"expect-env": "^1.0.1",
+		"openapi-backend": "^5.18.0",
+		"p-map": "^2.1.0",
+		"@types/aws-lambda": "^8.10.162",
 		"@types/better-sqlite3": "^7.6.13",
 		"@remit/logger": "*",
-		"@remit/api-openapi-spec": "*"
+		"@remit/api-openapi-spec": "*",
+		"zod": "^3.25.0"
 	},
 	"publishConfig": {
 		"access": "public"

package/dist/src/data-backend.d.ts

@@ -1,12 +0,0 @@
-/**
- * The self-host SQL backend (RFC 034/035/036), as opposed to the AWS DynamoDB
- * path.
- */
-export declare const isSelfHostSqlBackend: () => boolean;
-/**
- * The self-host SQL backend authenticates requests and signs content URLs with
- * a better-auth RS256 JWT verified at the edge and re-verified in-process, no
- * Cognito authorizer. DynamoDB is the AWS path (Cognito claims, Lambda@Edge
- * content guard) and is deliberately excluded.
- */
-export declare const usesBetterAuthJwt: () => boolean;

package/dist/src/data-backend.js

@@ -1,12 +0,0 @@
-/**
- * The self-host SQL backend (RFC 034/035/036), as opposed to the AWS DynamoDB
- * path.
- */
-export const isSelfHostSqlBackend = () => process.env.DATA_BACKEND === "sqlite";
-/**
- * The self-host SQL backend authenticates requests and signs content URLs with
- * a better-auth RS256 JWT verified at the edge and re-verified in-process, no
- * Cognito authorizer. DynamoDB is the AWS path (Cognito claims, Lambda@Edge
- * content guard) and is deliberately excluded.
- */
-export const usesBetterAuthJwt = () => isSelfHostSqlBackend();

package/dist/src/request-context.d.ts

@@ -1,9 +0,0 @@
-interface RequestContext {
-    origin?: string;
-    correlationId?: string;
-}
-export declare const runWithRequestContext: <T>(ctx: RequestContext, fn: () => T) => T;
-export declare const getRequestOrigin: () => string | undefined;
-export declare const getRequestCorrelationId: () => string | undefined;
-export declare const resolveAllowedOrigin: (origin: string | undefined) => string;
-export {};

package/dist/src/request-context.js

@@ -1,22 +0,0 @@
-import { AsyncLocalStorage } from "node:async_hooks";
-const storage = new AsyncLocalStorage();
-export const runWithRequestContext = (ctx, fn) => storage.run(ctx, fn);
-export const getRequestOrigin = () => storage.getStore()?.origin;
-export const getRequestCorrelationId = () => storage.getStore()?.correlationId;
-const parseAllowedOrigins = () => {
-    const raw = process.env.CORS_ALLOWED_ORIGINS;
-    if (!raw)
-        return [];
-    return raw
-        .split(",")
-        .map((s) => s.trim())
-        .filter((s) => s.length > 0);
-};
-export const resolveAllowedOrigin = (origin) => {
-    const allowed = parseAllowedOrigins();
-    if (allowed.length === 0)
-        return "*";
-    if (origin && allowed.includes(origin))
-        return origin;
-    return allowed[0];
-};

package/dist/src/service/sqs.d.ts

@@ -1 +0,0 @@
-export declare const sqsClient: import("@aws-sdk/client-sqs").SQSClient;

package/dist/src/service/sqs.js

@@ -1,3 +0,0 @@
-import { createQueueProducer } from "@remit/sqs-client/producer";
-import { env } from "expect-env";
-export const sqsClient = createQueueProducer({ queueUrl: env.SQS_QUEUE_URL });