fluxmail 0.9.0 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/accounts/googleAuth.d.ts +4 -2
- package/dist/accounts/googleAuth.d.ts.map +1 -1
- package/dist/accounts/googleAuth.js +20 -85
- package/dist/accounts/googleAuth.js.map +1 -1
- package/dist/accounts/microsoftAuth.d.ts +2 -1
- package/dist/accounts/microsoftAuth.d.ts.map +1 -1
- package/dist/accounts/microsoftAuth.js +16 -80
- package/dist/accounts/microsoftAuth.js.map +1 -1
- package/dist/accounts/oauthCallback.d.ts +52 -0
- package/dist/accounts/oauthCallback.d.ts.map +1 -0
- package/dist/accounts/oauthCallback.js +237 -0
- package/dist/accounts/oauthCallback.js.map +1 -0
- package/dist/accounts/registry.d.ts.map +1 -1
- package/dist/accounts/registry.js +12 -5
- package/dist/accounts/registry.js.map +1 -1
- package/dist/accounts/telemetry.d.ts +6 -0
- package/dist/accounts/telemetry.d.ts.map +1 -1
- package/dist/accounts/telemetry.js +19 -0
- package/dist/accounts/telemetry.js.map +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +114 -36
- package/dist/cli.js.map +1 -1
- package/dist/cliInstances.d.ts +5 -2
- package/dist/cliInstances.d.ts.map +1 -1
- package/dist/cliInstances.js +74 -22
- package/dist/cliInstances.js.map +1 -1
- package/dist/cliMail.d.ts +2 -0
- package/dist/cliMail.d.ts.map +1 -1
- package/dist/cliMail.js +113 -19
- package/dist/cliMail.js.map +1 -1
- package/dist/cliOutput.d.ts +9 -0
- package/dist/cliOutput.d.ts.map +1 -0
- package/dist/cliOutput.js +76 -0
- package/dist/cliOutput.js.map +1 -0
- package/dist/context.js +1 -1
- package/dist/context.js.map +1 -1
- package/dist/http/admin.d.ts.map +1 -1
- package/dist/http/admin.js +2 -0
- package/dist/http/admin.js.map +1 -1
- package/dist/http/app.d.ts.map +1 -1
- package/dist/http/app.js +4 -0
- package/dist/http/app.js.map +1 -1
- package/dist/http/identity.d.ts.map +1 -1
- package/dist/http/identity.js +2 -0
- package/dist/http/identity.js.map +1 -1
- package/dist/http/rest.d.ts.map +1 -1
- package/dist/http/rest.js +270 -48
- package/dist/http/rest.js.map +1 -1
- package/dist/licensing/entitlements.d.ts +23 -5
- package/dist/licensing/entitlements.d.ts.map +1 -1
- package/dist/licensing/entitlements.js +101 -22
- package/dist/licensing/entitlements.js.map +1 -1
- package/dist/licensing/lease.d.ts +1 -1
- package/dist/licensing/lease.d.ts.map +1 -1
- package/dist/licensing/refresher.d.ts.map +1 -1
- package/dist/licensing/refresher.js +5 -2
- package/dist/licensing/refresher.js.map +1 -1
- package/dist/mcp/buildServer.d.ts.map +1 -1
- package/dist/mcp/buildServer.js +236 -78
- package/dist/mcp/buildServer.js.map +1 -1
- package/dist/mcp/outputSchemas.d.ts +2923 -0
- package/dist/mcp/outputSchemas.d.ts.map +1 -0
- package/dist/mcp/outputSchemas.js +108 -0
- package/dist/mcp/outputSchemas.js.map +1 -0
- package/dist/scheduler/sendScheduler.d.ts +2 -0
- package/dist/scheduler/sendScheduler.d.ts.map +1 -1
- package/dist/scheduler/sendScheduler.js +13 -3
- package/dist/scheduler/sendScheduler.js.map +1 -1
- package/dist/service/deliveryCoordinator.d.ts +45 -0
- package/dist/service/deliveryCoordinator.d.ts.map +1 -0
- package/dist/service/deliveryCoordinator.js +296 -0
- package/dist/service/deliveryCoordinator.js.map +1 -0
- package/dist/service/emailService.d.ts +48 -5
- package/dist/service/emailService.d.ts.map +1 -1
- package/dist/service/emailService.js +258 -37
- package/dist/service/emailService.js.map +1 -1
- package/dist/service/publicErrors.d.ts +12 -0
- package/dist/service/publicErrors.d.ts.map +1 -0
- package/dist/service/publicErrors.js +41 -0
- package/dist/service/publicErrors.js.map +1 -0
- package/dist/service/searchCursor.d.ts +2 -0
- package/dist/service/searchCursor.d.ts.map +1 -1
- package/dist/service/searchCursor.js +6 -2
- package/dist/service/searchCursor.js.map +1 -1
- package/dist/storage/db.d.ts +252 -2
- package/dist/storage/db.d.ts.map +1 -1
- package/dist/storage/db.js +57 -1
- package/dist/storage/db.js.map +1 -1
- package/dist/storage/members.d.ts.map +1 -1
- package/dist/storage/members.js +3 -1
- package/dist/storage/members.js.map +1 -1
- package/dist/storage/restIdempotency.d.ts +6 -0
- package/dist/storage/restIdempotency.d.ts.map +1 -1
- package/dist/storage/restIdempotency.js +8 -0
- package/dist/storage/restIdempotency.js.map +1 -1
- package/dist/storage/scheduledSends.d.ts +2 -1
- package/dist/storage/scheduledSends.d.ts.map +1 -1
- package/dist/storage/scheduledSends.js +6 -0
- package/dist/storage/scheduledSends.js.map +1 -1
- package/package.json +5 -5
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"outputSchemas.d.ts","sourceRoot":"","sources":["../../src/mcp/outputSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAiDxB,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2DhB,CAAC"}
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
const address = z.object({ email: z.string(), name: z.string().optional() }).passthrough();
|
|
3
|
+
const attachment = z
|
|
4
|
+
.object({ id: z.string(), filename: z.string(), mimeType: z.string(), sizeBytes: z.number() })
|
|
5
|
+
.passthrough();
|
|
6
|
+
const message = z
|
|
7
|
+
.object({
|
|
8
|
+
id: z.string(),
|
|
9
|
+
threadId: z.string(),
|
|
10
|
+
accountId: z.string(),
|
|
11
|
+
to: z.array(address),
|
|
12
|
+
subject: z.string(),
|
|
13
|
+
date: z.string(),
|
|
14
|
+
flags: z.object({ read: z.boolean(), starred: z.boolean(), draft: z.boolean() }).passthrough(),
|
|
15
|
+
body: z.object({ text: z.string().optional(), html: z.string().optional() }).optional(),
|
|
16
|
+
bodyTruncation: z
|
|
17
|
+
.record(z.string(), z.object({ totalChars: z.number(), nextOffset: z.number().optional() }))
|
|
18
|
+
.optional(),
|
|
19
|
+
attachments: z.array(attachment).optional(),
|
|
20
|
+
})
|
|
21
|
+
.passthrough();
|
|
22
|
+
const account = z.object({ id: z.string(), provider: z.string(), email: z.string(), status: z.string() }).passthrough();
|
|
23
|
+
const page = z
|
|
24
|
+
.object({ items: z.array(message), exhausted: z.boolean(), nextPageToken: z.string().optional() })
|
|
25
|
+
.passthrough();
|
|
26
|
+
const delivery = z
|
|
27
|
+
.object({
|
|
28
|
+
operationId: z.string(),
|
|
29
|
+
accountId: z.string(),
|
|
30
|
+
kind: z.string(),
|
|
31
|
+
status: z.string(),
|
|
32
|
+
result: z.object({ id: z.string(), threadId: z.string() }).passthrough().optional(),
|
|
33
|
+
error: z.object({ code: z.string() }).optional(),
|
|
34
|
+
scheduleId: z.string().optional(),
|
|
35
|
+
})
|
|
36
|
+
.passthrough();
|
|
37
|
+
const schedule = z
|
|
38
|
+
.object({ scheduleId: z.string(), accountId: z.string(), draftId: z.string(), status: z.string() })
|
|
39
|
+
.passthrough();
|
|
40
|
+
const modify = z
|
|
41
|
+
.object({
|
|
42
|
+
action: z.string(),
|
|
43
|
+
succeededIds: z.array(z.string()),
|
|
44
|
+
failed: z.array(z.object({ messageId: z.string(), code: z.string() })),
|
|
45
|
+
uncertainIds: z.array(z.string()),
|
|
46
|
+
})
|
|
47
|
+
.passthrough();
|
|
48
|
+
export const outputSchemas = {
|
|
49
|
+
list_accounts: { data: z.array(account) },
|
|
50
|
+
get_status: { data: z.object({ accounts: z.array(account), providersAvailable: z.array(z.string()) }).passthrough() },
|
|
51
|
+
list_folders: { data: z.array(z.object({ id: z.string(), name: z.string() }).passthrough()) },
|
|
52
|
+
list_labels: { data: z.array(z.object({ id: z.string(), name: z.string() }).passthrough()) },
|
|
53
|
+
list_send_as: {
|
|
54
|
+
data: z.array(z.object({ email: z.string(), isPrimary: z.boolean(), source: z.string() }).passthrough()),
|
|
55
|
+
},
|
|
56
|
+
list_emails: { data: page },
|
|
57
|
+
search_emails: { data: page },
|
|
58
|
+
search_emails_batch: {
|
|
59
|
+
data: z
|
|
60
|
+
.object({ groups: z.array(z.object({ accountId: z.string() }).passthrough()), exhausted: z.boolean() })
|
|
61
|
+
.passthrough(),
|
|
62
|
+
},
|
|
63
|
+
get_email: { data: message },
|
|
64
|
+
get_email_body: {
|
|
65
|
+
data: z.object({
|
|
66
|
+
format: z.string(),
|
|
67
|
+
text: z.string(),
|
|
68
|
+
offset: z.number(),
|
|
69
|
+
totalChars: z.number(),
|
|
70
|
+
nextOffset: z.number().optional(),
|
|
71
|
+
}),
|
|
72
|
+
},
|
|
73
|
+
get_thread: {
|
|
74
|
+
data: z.object({
|
|
75
|
+
id: z.string(),
|
|
76
|
+
subject: z.string(),
|
|
77
|
+
messages: z.array(message),
|
|
78
|
+
nextPageToken: z.string().optional(),
|
|
79
|
+
}),
|
|
80
|
+
},
|
|
81
|
+
get_draft: { data: message },
|
|
82
|
+
create_draft: { data: message },
|
|
83
|
+
update_draft: { data: message },
|
|
84
|
+
delete_draft: { data: z.object({ deleted: z.string() }) },
|
|
85
|
+
preview_send: {
|
|
86
|
+
data: z.object({
|
|
87
|
+
accountId: z.string(),
|
|
88
|
+
from: z.string(),
|
|
89
|
+
to: z.array(address),
|
|
90
|
+
cc: z.array(address),
|
|
91
|
+
bcc: z.array(address),
|
|
92
|
+
subject: z.string(),
|
|
93
|
+
attachments: z.array(z.object({ filename: z.string(), mimeType: z.string(), sizeBytes: z.number() })),
|
|
94
|
+
bodyTextChars: z.number(),
|
|
95
|
+
bodyHtmlChars: z.number(),
|
|
96
|
+
}),
|
|
97
|
+
},
|
|
98
|
+
send_email: { data: delivery },
|
|
99
|
+
get_delivery_operation: { data: delivery },
|
|
100
|
+
list_scheduled_emails: { data: z.array(schedule) },
|
|
101
|
+
cancel_scheduled_email: {
|
|
102
|
+
data: z.object({ scheduleId: z.string(), draftId: z.string(), draftKept: z.literal(true) }),
|
|
103
|
+
},
|
|
104
|
+
forward_email: { data: delivery },
|
|
105
|
+
modify_emails: { data: modify },
|
|
106
|
+
download_attachment: { data: attachment },
|
|
107
|
+
};
|
|
108
|
+
//# sourceMappingURL=outputSchemas.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"outputSchemas.js","sourceRoot":"","sources":["../../src/mcp/outputSchemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type SendResult } from '@fluxmail/core';
|
|
2
|
+
import type { DeliveryOperation } from '../service/deliveryCoordinator.js';
|
|
2
3
|
import type { FluxmailDb } from '../storage/db.js';
|
|
3
4
|
import { type Logger } from '../logging.js';
|
|
4
5
|
/** The slice of EmailService the scheduler needs. */
|
|
@@ -6,6 +7,7 @@ export interface ScheduledSender {
|
|
|
6
7
|
send(accountId: string | undefined, input: {
|
|
7
8
|
draftId: string;
|
|
8
9
|
}): Promise<SendResult>;
|
|
10
|
+
deliverScheduled?(accountId: string, draftId: string, scheduleId: string): Promise<DeliveryOperation>;
|
|
9
11
|
/** Throws while a lapsed license leaves the instance over the plan quota. */
|
|
10
12
|
enforceQuota(): string | undefined;
|
|
11
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendScheduler.d.ts","sourceRoot":"","sources":["../../src/scheduler/sendScheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAc,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"sendScheduler.d.ts","sourceRoot":"","sources":["../../src/scheduler/sendScheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAc,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAaxD,qDAAqD;AACrD,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACrF,gBAAgB,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACtG,6EAA6E;IAC7E,YAAY,IAAI,MAAM,GAAG,SAAS,CAAC;CACpC;AAUD;;;;GAIG;AACH,qBAAa,aAAa;IAWtB,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAZ1B,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,KAAK,CAAS;IACtB,+FAA+F;IAC/F,OAAO,CAAC,OAAO,CAA6D;IAC5E,wFAAwF;IACxF,OAAO,CAAC,cAAc,CAAK;gBAGR,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,eAAe,EACxB,MAAM,CAAC,EAAE,MAAM,YAAA;IAGlC,sFAAsF;IACtF,KAAK,IAAI,IAAI;IAKb,IAAI,IAAI,IAAI;IAMZ,qEAAqE;IACrE,IAAI,IAAI,IAAI;YAIE,IAAI;YAwCJ,IAAI;IA8ClB,OAAO,CAAC,GAAG;CAaZ"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { isEmailError } from '@fluxmail/core';
|
|
2
2
|
import { logFailure } from '../logging.js';
|
|
3
|
-
import { claimScheduledSend, completeClaim, failClaim, holdPending, listActive, listClaimable, retryClaim, } from '../storage/scheduledSends.js';
|
|
3
|
+
import { claimScheduledSend, completeClaim, failClaim, holdPending, listActive, listClaimable, retryClaim, uncertainClaim, } from '../storage/scheduledSends.js';
|
|
4
4
|
/** Re-check at least this often while anything is pending (heals clock jumps and laptop sleep). */
|
|
5
5
|
const MAX_ARM_MS = 15 * 60_000;
|
|
6
6
|
const BASE_BACKOFF_MS = 30_000;
|
|
@@ -97,8 +97,18 @@ export class SendScheduler {
|
|
|
97
97
|
return;
|
|
98
98
|
}
|
|
99
99
|
try {
|
|
100
|
-
const
|
|
101
|
-
|
|
100
|
+
const operation = this.service.deliverScheduled
|
|
101
|
+
? await this.service.deliverScheduled(row.accountId, row.draftId, row.id)
|
|
102
|
+
: { status: 'succeeded', result: await this.service.send(row.accountId, { draftId: row.draftId }) };
|
|
103
|
+
if (operation.status === 'succeeded' && operation.result) {
|
|
104
|
+
completeClaim(this.db, row.id, claim.token, operation.result);
|
|
105
|
+
}
|
|
106
|
+
else if (operation.status === 'failed') {
|
|
107
|
+
failClaim(this.db, row.id, claim.token, operation.error?.code ?? 'Delivery failed.');
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
uncertainClaim(this.db, row.id, claim.token, 'Delivery outcome is uncertain. Check Sent before sending again.');
|
|
111
|
+
}
|
|
102
112
|
this.backoff.delete(row.id);
|
|
103
113
|
}
|
|
104
114
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendScheduler.js","sourceRoot":"","sources":["../../src/scheduler/sendScheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAmB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"sendScheduler.js","sourceRoot":"","sources":["../../src/scheduler/sendScheduler.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { type SendResult } from '@fluxmail/core';
|
|
2
|
+
import { type FluxmailDb } from '../storage/db.js';
|
|
3
|
+
export type DeliveryKind = 'send' | 'forward' | 'scheduled';
|
|
4
|
+
export type DeliveryStatus = 'queued' | 'sending' | 'succeeded' | 'failed' | 'uncertain';
|
|
5
|
+
export interface DeliveryOperation {
|
|
6
|
+
operationId: string;
|
|
7
|
+
accountId: string;
|
|
8
|
+
kind: DeliveryKind;
|
|
9
|
+
status: DeliveryStatus;
|
|
10
|
+
result?: SendResult;
|
|
11
|
+
error?: {
|
|
12
|
+
code: string;
|
|
13
|
+
};
|
|
14
|
+
scheduleId?: string;
|
|
15
|
+
}
|
|
16
|
+
export declare function isDefiniteDeliveryFailure(error: unknown): boolean;
|
|
17
|
+
export declare class DeliveryCoordinator {
|
|
18
|
+
private readonly db;
|
|
19
|
+
constructor(db: FluxmailDb);
|
|
20
|
+
get(principalId: string, memberId: string, accountId: string, operationId: string): DeliveryOperation;
|
|
21
|
+
findScheduled(accountId: string, scheduleId: string): DeliveryOperation | undefined;
|
|
22
|
+
cancelScheduled(accountId: string, scheduleId: string): void;
|
|
23
|
+
queueScheduled(accountId: string, scheduleId: string, draftId: string): DeliveryOperation;
|
|
24
|
+
schedule(input: {
|
|
25
|
+
principalId: string;
|
|
26
|
+
memberId: string;
|
|
27
|
+
accountId: string;
|
|
28
|
+
key: string;
|
|
29
|
+
request: unknown;
|
|
30
|
+
}, create: () => Promise<{
|
|
31
|
+
scheduleId: string;
|
|
32
|
+
}>): Promise<DeliveryOperation>;
|
|
33
|
+
fireScheduled(accountId: string, draftId: string, scheduleId: string, preflight: () => Promise<void>, deliver: () => Promise<SendResult>): Promise<DeliveryOperation>;
|
|
34
|
+
run(input: {
|
|
35
|
+
principalId: string;
|
|
36
|
+
memberId: string;
|
|
37
|
+
accountId: string;
|
|
38
|
+
key: string;
|
|
39
|
+
kind: DeliveryKind;
|
|
40
|
+
request: unknown;
|
|
41
|
+
scheduleId?: string;
|
|
42
|
+
}, deliver: () => Promise<SendResult>): Promise<DeliveryOperation>;
|
|
43
|
+
private finish;
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=deliveryCoordinator.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deliveryCoordinator.d.ts","sourceRoot":"","sources":["../../src/service/deliveryCoordinator.ts"],"names":[],"mappings":"AAEA,OAAO,EAA4B,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGvE,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,SAAS,GAAG,WAAW,CAAC;AAC5D,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,WAAW,CAAC;AAEzF,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,YAAY,CAAC;IACnB,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA2BD,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAajE;AASD,qBAAa,mBAAmB;IAClB,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,UAAU;IAE3C,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,iBAAiB;IAoBrG,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAKnF,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAU5D,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,iBAAiB;IAuBnF,QAAQ,CACZ,KAAK,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,EAClG,MAAM,EAAE,MAAM,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,GAC5C,OAAO,CAAC,iBAAiB,CAAC;IA8DvB,aAAa,CACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAC9B,OAAO,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,GACjC,OAAO,CAAC,iBAAiB,CAAC;IAuCvB,GAAG,CACP,KAAK,EAAE;QACL,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,YAAY,CAAC;QACnB,OAAO,EAAE,OAAO,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,EACD,OAAO,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,GACjC,OAAO,CAAC,iBAAiB,CAAC;YAqDf,MAAM;CAmDrB"}
|
|
@@ -0,0 +1,296 @@
|
|
|
1
|
+
import { createHash, randomBytes } from 'node:crypto';
|
|
2
|
+
import { and, eq } from 'drizzle-orm';
|
|
3
|
+
import { EmailError, isEmailError } from '@fluxmail/core';
|
|
4
|
+
import { deliveryOperations } from '../storage/db.js';
|
|
5
|
+
import { ClientInputError } from './publicErrors.js';
|
|
6
|
+
function canonical(value) {
|
|
7
|
+
if (Array.isArray(value))
|
|
8
|
+
return `[${value.map(canonical).join(',')}]`;
|
|
9
|
+
if (value && typeof value === 'object') {
|
|
10
|
+
return `{${Object.entries(value)
|
|
11
|
+
.sort(([a], [b]) => a.localeCompare(b))
|
|
12
|
+
.map(([key, item]) => `${JSON.stringify(key)}:${canonical(item)}`)
|
|
13
|
+
.join(',')}}`;
|
|
14
|
+
}
|
|
15
|
+
return JSON.stringify(value);
|
|
16
|
+
}
|
|
17
|
+
function fromRow(row) {
|
|
18
|
+
return {
|
|
19
|
+
operationId: row.id,
|
|
20
|
+
accountId: row.accountId,
|
|
21
|
+
kind: row.kind,
|
|
22
|
+
status: row.status,
|
|
23
|
+
...(row.resultJson ? { result: JSON.parse(row.resultJson) } : {}),
|
|
24
|
+
...(row.errorCode ? { error: { code: row.errorCode } } : {}),
|
|
25
|
+
...(row.scheduleId ? { scheduleId: row.scheduleId } : {}),
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
export function isDefiniteDeliveryFailure(error) {
|
|
29
|
+
return (isEmailError(error) &&
|
|
30
|
+
[
|
|
31
|
+
'invalid_request',
|
|
32
|
+
'not_found',
|
|
33
|
+
'permission_denied',
|
|
34
|
+
'unsupported_capability',
|
|
35
|
+
'auth_expired',
|
|
36
|
+
'rate_limited',
|
|
37
|
+
'entitlement_exceeded',
|
|
38
|
+
].includes(error.code));
|
|
39
|
+
}
|
|
40
|
+
function isPermanentScheduledPreflightFailure(error) {
|
|
41
|
+
return (isEmailError(error) &&
|
|
42
|
+
['invalid_request', 'not_found', 'permission_denied', 'unsupported_capability'].includes(error.code));
|
|
43
|
+
}
|
|
44
|
+
export class DeliveryCoordinator {
|
|
45
|
+
db;
|
|
46
|
+
constructor(db) {
|
|
47
|
+
this.db = db;
|
|
48
|
+
}
|
|
49
|
+
get(principalId, memberId, accountId, operationId) {
|
|
50
|
+
const row = this.db.select().from(deliveryOperations).where(eq(deliveryOperations.id, operationId)).get();
|
|
51
|
+
if (!row ||
|
|
52
|
+
row.accountId !== accountId ||
|
|
53
|
+
(row.kind !== 'scheduled' && row.principalId !== principalId && row.memberId !== memberId)) {
|
|
54
|
+
throw new EmailError('not_found', 'Delivery operation not found.');
|
|
55
|
+
}
|
|
56
|
+
if (row.status === 'sending' && Date.now() - row.updatedAt > 5 * 60_000) {
|
|
57
|
+
this.db
|
|
58
|
+
.update(deliveryOperations)
|
|
59
|
+
.set({ status: 'uncertain', updatedAt: Date.now() })
|
|
60
|
+
.where(and(eq(deliveryOperations.id, row.id), eq(deliveryOperations.status, 'sending')))
|
|
61
|
+
.run();
|
|
62
|
+
return fromRow(this.db.select().from(deliveryOperations).where(eq(deliveryOperations.id, row.id)).get());
|
|
63
|
+
}
|
|
64
|
+
return fromRow(row);
|
|
65
|
+
}
|
|
66
|
+
findScheduled(accountId, scheduleId) {
|
|
67
|
+
const row = this.db.select().from(deliveryOperations).where(eq(deliveryOperations.scheduleId, scheduleId)).get();
|
|
68
|
+
return row?.accountId === accountId ? fromRow(row) : undefined;
|
|
69
|
+
}
|
|
70
|
+
cancelScheduled(accountId, scheduleId) {
|
|
71
|
+
const operation = this.findScheduled(accountId, scheduleId);
|
|
72
|
+
if (!operation)
|
|
73
|
+
return;
|
|
74
|
+
this.db
|
|
75
|
+
.update(deliveryOperations)
|
|
76
|
+
.set({ status: 'failed', errorCode: 'canceled', updatedAt: Date.now() })
|
|
77
|
+
.where(and(eq(deliveryOperations.id, operation.operationId), eq(deliveryOperations.status, 'queued')))
|
|
78
|
+
.run();
|
|
79
|
+
}
|
|
80
|
+
queueScheduled(accountId, scheduleId, draftId) {
|
|
81
|
+
const now = Date.now();
|
|
82
|
+
const id = `dop_${randomBytes(12).toString('hex')}`;
|
|
83
|
+
this.db
|
|
84
|
+
.insert(deliveryOperations)
|
|
85
|
+
.values({
|
|
86
|
+
id,
|
|
87
|
+
principalId: 'scheduler',
|
|
88
|
+
idempotencyKey: scheduleId,
|
|
89
|
+
requestHash: createHash('sha256')
|
|
90
|
+
.update(canonical({ accountId, kind: 'scheduled', request: { draftId } }))
|
|
91
|
+
.digest('hex'),
|
|
92
|
+
accountId,
|
|
93
|
+
kind: 'scheduled',
|
|
94
|
+
status: 'queued',
|
|
95
|
+
scheduleId,
|
|
96
|
+
createdAt: now,
|
|
97
|
+
updatedAt: now,
|
|
98
|
+
})
|
|
99
|
+
.run();
|
|
100
|
+
return { operationId: id, accountId, kind: 'scheduled', status: 'queued', scheduleId };
|
|
101
|
+
}
|
|
102
|
+
async schedule(input, create) {
|
|
103
|
+
if (!/^[\x21-\x7e]{1,255}$/.test(input.key)) {
|
|
104
|
+
throw new ClientInputError('invalid_request', 'An idempotency key of 1 to 255 printable characters without spaces is required.');
|
|
105
|
+
}
|
|
106
|
+
const hash = createHash('sha256')
|
|
107
|
+
.update(canonical({ accountId: input.accountId, kind: 'scheduled', request: input.request }))
|
|
108
|
+
.digest('hex');
|
|
109
|
+
const id = `dop_${randomBytes(12).toString('hex')}`;
|
|
110
|
+
const now = Date.now();
|
|
111
|
+
const inserted = this.db
|
|
112
|
+
.insert(deliveryOperations)
|
|
113
|
+
.values({
|
|
114
|
+
id,
|
|
115
|
+
principalId: input.principalId,
|
|
116
|
+
memberId: input.memberId,
|
|
117
|
+
idempotencyKey: input.key,
|
|
118
|
+
requestHash: hash,
|
|
119
|
+
accountId: input.accountId,
|
|
120
|
+
kind: 'scheduled',
|
|
121
|
+
status: 'sending',
|
|
122
|
+
createdAt: now,
|
|
123
|
+
updatedAt: now,
|
|
124
|
+
})
|
|
125
|
+
.onConflictDoNothing()
|
|
126
|
+
.run();
|
|
127
|
+
if (inserted.changes === 0) {
|
|
128
|
+
const existing = this.db
|
|
129
|
+
.select()
|
|
130
|
+
.from(deliveryOperations)
|
|
131
|
+
.where(and(eq(deliveryOperations.principalId, input.principalId), eq(deliveryOperations.idempotencyKey, input.key)))
|
|
132
|
+
.get();
|
|
133
|
+
if (!existing || existing.requestHash !== hash) {
|
|
134
|
+
throw new EmailError('idempotency_conflict', 'This idempotency key was used for a different delivery request.');
|
|
135
|
+
}
|
|
136
|
+
return this.get(input.principalId, input.memberId, input.accountId, existing.id);
|
|
137
|
+
}
|
|
138
|
+
try {
|
|
139
|
+
const scheduled = await create();
|
|
140
|
+
this.db
|
|
141
|
+
.update(deliveryOperations)
|
|
142
|
+
.set({ status: 'queued', scheduleId: scheduled.scheduleId, updatedAt: Date.now() })
|
|
143
|
+
.where(eq(deliveryOperations.id, id))
|
|
144
|
+
.run();
|
|
145
|
+
}
|
|
146
|
+
catch (error) {
|
|
147
|
+
this.db
|
|
148
|
+
.update(deliveryOperations)
|
|
149
|
+
.set({
|
|
150
|
+
status: isDefiniteDeliveryFailure(error) ? 'failed' : 'uncertain',
|
|
151
|
+
errorCode: isEmailError(error) ? error.code : 'internal',
|
|
152
|
+
updatedAt: Date.now(),
|
|
153
|
+
})
|
|
154
|
+
.where(eq(deliveryOperations.id, id))
|
|
155
|
+
.run();
|
|
156
|
+
}
|
|
157
|
+
return fromRow(this.db.select().from(deliveryOperations).where(eq(deliveryOperations.id, id)).get());
|
|
158
|
+
}
|
|
159
|
+
async fireScheduled(accountId, draftId, scheduleId, preflight, deliver) {
|
|
160
|
+
let row = this.db.select().from(deliveryOperations).where(eq(deliveryOperations.scheduleId, scheduleId)).get();
|
|
161
|
+
if (!row) {
|
|
162
|
+
this.queueScheduled(accountId, scheduleId, draftId);
|
|
163
|
+
row = this.db.select().from(deliveryOperations).where(eq(deliveryOperations.scheduleId, scheduleId)).get();
|
|
164
|
+
}
|
|
165
|
+
if (!row || row.accountId !== accountId)
|
|
166
|
+
throw new EmailError('not_found', 'Scheduled delivery operation not found.');
|
|
167
|
+
if (row.status === 'sending') {
|
|
168
|
+
this.db
|
|
169
|
+
.update(deliveryOperations)
|
|
170
|
+
.set({ status: 'uncertain', updatedAt: Date.now() })
|
|
171
|
+
.where(eq(deliveryOperations.id, row.id))
|
|
172
|
+
.run();
|
|
173
|
+
return fromRow(this.db.select().from(deliveryOperations).where(eq(deliveryOperations.id, row.id)).get());
|
|
174
|
+
}
|
|
175
|
+
if (row.status !== 'queued')
|
|
176
|
+
return fromRow(row);
|
|
177
|
+
try {
|
|
178
|
+
await preflight();
|
|
179
|
+
}
|
|
180
|
+
catch (error) {
|
|
181
|
+
if (isPermanentScheduledPreflightFailure(error) && isEmailError(error)) {
|
|
182
|
+
this.db
|
|
183
|
+
.update(deliveryOperations)
|
|
184
|
+
.set({ status: 'failed', errorCode: error.code, updatedAt: Date.now() })
|
|
185
|
+
.where(and(eq(deliveryOperations.id, row.id), eq(deliveryOperations.status, 'queued')))
|
|
186
|
+
.run();
|
|
187
|
+
}
|
|
188
|
+
throw error;
|
|
189
|
+
}
|
|
190
|
+
const claimed = this.db
|
|
191
|
+
.update(deliveryOperations)
|
|
192
|
+
.set({ status: 'sending', updatedAt: Date.now() })
|
|
193
|
+
.where(and(eq(deliveryOperations.id, row.id), eq(deliveryOperations.status, 'queued')))
|
|
194
|
+
.run();
|
|
195
|
+
return claimed.changes === 1
|
|
196
|
+
? this.finish(row.id, deliver, true)
|
|
197
|
+
: fromRow(this.db.select().from(deliveryOperations).where(eq(deliveryOperations.id, row.id)).get());
|
|
198
|
+
}
|
|
199
|
+
async run(input, deliver) {
|
|
200
|
+
if (!/^[\x21-\x7e]{1,255}$/.test(input.key)) {
|
|
201
|
+
throw new ClientInputError('invalid_request', 'An idempotency key of 1 to 255 printable characters without spaces is required.');
|
|
202
|
+
}
|
|
203
|
+
const hash = createHash('sha256')
|
|
204
|
+
.update(canonical({ accountId: input.accountId, kind: input.kind, request: input.request }))
|
|
205
|
+
.digest('hex');
|
|
206
|
+
const now = Date.now();
|
|
207
|
+
const id = `dop_${randomBytes(12).toString('hex')}`;
|
|
208
|
+
const inserted = this.db
|
|
209
|
+
.insert(deliveryOperations)
|
|
210
|
+
.values({
|
|
211
|
+
id,
|
|
212
|
+
principalId: input.principalId,
|
|
213
|
+
memberId: input.memberId,
|
|
214
|
+
idempotencyKey: input.key,
|
|
215
|
+
requestHash: hash,
|
|
216
|
+
accountId: input.accountId,
|
|
217
|
+
kind: input.kind,
|
|
218
|
+
status: 'sending',
|
|
219
|
+
createdAt: now,
|
|
220
|
+
updatedAt: now,
|
|
221
|
+
...(input.scheduleId ? { scheduleId: input.scheduleId } : {}),
|
|
222
|
+
})
|
|
223
|
+
.onConflictDoNothing()
|
|
224
|
+
.run();
|
|
225
|
+
if (inserted.changes === 0) {
|
|
226
|
+
const existing = this.db
|
|
227
|
+
.select()
|
|
228
|
+
.from(deliveryOperations)
|
|
229
|
+
.where(and(eq(deliveryOperations.principalId, input.principalId), eq(deliveryOperations.idempotencyKey, input.key)))
|
|
230
|
+
.get();
|
|
231
|
+
if (!existing || existing.requestHash !== hash) {
|
|
232
|
+
throw new EmailError('idempotency_conflict', 'This idempotency key was used for a different delivery request.');
|
|
233
|
+
}
|
|
234
|
+
if (existing.status === 'queued' && input.kind === 'scheduled') {
|
|
235
|
+
const claimed = this.db
|
|
236
|
+
.update(deliveryOperations)
|
|
237
|
+
.set({ status: 'sending', updatedAt: Date.now() })
|
|
238
|
+
.where(and(eq(deliveryOperations.id, existing.id), eq(deliveryOperations.status, 'queued')))
|
|
239
|
+
.run();
|
|
240
|
+
if (claimed.changes === 1)
|
|
241
|
+
return this.finish(existing.id, deliver);
|
|
242
|
+
}
|
|
243
|
+
return this.get(input.principalId, input.memberId, input.accountId, existing.id);
|
|
244
|
+
}
|
|
245
|
+
return this.finish(id, deliver);
|
|
246
|
+
}
|
|
247
|
+
async finish(id, deliver, retryConfirmedRejection = false) {
|
|
248
|
+
const heartbeat = setInterval(() => {
|
|
249
|
+
try {
|
|
250
|
+
this.db
|
|
251
|
+
.update(deliveryOperations)
|
|
252
|
+
.set({ updatedAt: Date.now() })
|
|
253
|
+
.where(and(eq(deliveryOperations.id, id), eq(deliveryOperations.status, 'sending')))
|
|
254
|
+
.run();
|
|
255
|
+
}
|
|
256
|
+
catch {
|
|
257
|
+
// A failed heartbeat must not start another delivery.
|
|
258
|
+
}
|
|
259
|
+
}, 60_000);
|
|
260
|
+
heartbeat.unref();
|
|
261
|
+
try {
|
|
262
|
+
const result = await deliver();
|
|
263
|
+
this.db
|
|
264
|
+
.update(deliveryOperations)
|
|
265
|
+
.set({ status: 'succeeded', resultJson: JSON.stringify(result), updatedAt: Date.now() })
|
|
266
|
+
.where(eq(deliveryOperations.id, id))
|
|
267
|
+
.run();
|
|
268
|
+
}
|
|
269
|
+
catch (error) {
|
|
270
|
+
if (retryConfirmedRejection &&
|
|
271
|
+
isEmailError(error) &&
|
|
272
|
+
['auth_expired', 'rate_limited', 'entitlement_exceeded'].includes(error.code)) {
|
|
273
|
+
this.db
|
|
274
|
+
.update(deliveryOperations)
|
|
275
|
+
.set({ status: 'queued', updatedAt: Date.now() })
|
|
276
|
+
.where(and(eq(deliveryOperations.id, id), eq(deliveryOperations.status, 'sending')))
|
|
277
|
+
.run();
|
|
278
|
+
throw error;
|
|
279
|
+
}
|
|
280
|
+
this.db
|
|
281
|
+
.update(deliveryOperations)
|
|
282
|
+
.set({
|
|
283
|
+
status: isDefiniteDeliveryFailure(error) ? 'failed' : 'uncertain',
|
|
284
|
+
errorCode: isEmailError(error) ? error.code : 'internal',
|
|
285
|
+
updatedAt: Date.now(),
|
|
286
|
+
})
|
|
287
|
+
.where(eq(deliveryOperations.id, id))
|
|
288
|
+
.run();
|
|
289
|
+
}
|
|
290
|
+
finally {
|
|
291
|
+
clearInterval(heartbeat);
|
|
292
|
+
}
|
|
293
|
+
return fromRow(this.db.select().from(deliveryOperations).where(eq(deliveryOperations.id, id)).get());
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
//# sourceMappingURL=deliveryCoordinator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deliveryCoordinator.js","sourceRoot":"","sources":["../../src/service/deliveryCoordinator.ts"],"names":[],"mappings":"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"}
|