fluxmail 0.12.0 → 0.14.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/registry.d.ts +1 -0
- package/dist/accounts/registry.d.ts.map +1 -1
- package/dist/accounts/registry.js +7 -3
- package/dist/accounts/registry.js.map +1 -1
- package/dist/accounts/telemetry.d.ts +6 -1
- package/dist/accounts/telemetry.d.ts.map +1 -1
- package/dist/accounts/telemetry.js +17 -0
- package/dist/accounts/telemetry.js.map +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +206 -40
- package/dist/cli.js.map +1 -1
- package/dist/cliInstances.d.ts +6 -4
- package/dist/cliInstances.d.ts.map +1 -1
- package/dist/cliInstances.js +38 -17
- package/dist/cliInstances.js.map +1 -1
- package/dist/cliMail.d.ts.map +1 -1
- package/dist/cliMail.js +1 -1
- package/dist/cliMail.js.map +1 -1
- package/dist/cliStartupDiagnostics.d.ts +12 -0
- package/dist/cliStartupDiagnostics.d.ts.map +1 -0
- package/dist/cliStartupDiagnostics.js +47 -0
- package/dist/cliStartupDiagnostics.js.map +1 -0
- package/dist/context.d.ts +1 -1
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js +15 -16
- package/dist/context.js.map +1 -1
- package/dist/http/app.d.ts.map +1 -1
- package/dist/http/app.js +26 -7
- package/dist/http/app.js.map +1 -1
- package/dist/http/identity.d.ts.map +1 -1
- package/dist/http/identity.js +65 -10
- package/dist/http/identity.js.map +1 -1
- package/dist/http/rest.d.ts.map +1 -1
- package/dist/http/rest.js +30 -8
- package/dist/http/rest.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/licensing/refresher.d.ts +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/lifecycle.d.ts +28 -0
- package/dist/lifecycle.d.ts.map +1 -0
- package/dist/lifecycle.js +115 -0
- package/dist/lifecycle.js.map +1 -0
- package/dist/mcp/attachmentContent.d.ts +32 -0
- package/dist/mcp/attachmentContent.d.ts.map +1 -0
- package/dist/mcp/attachmentContent.js +155 -0
- package/dist/mcp/attachmentContent.js.map +1 -0
- package/dist/mcp/buildServer.d.ts +3 -1
- package/dist/mcp/buildServer.d.ts.map +1 -1
- package/dist/mcp/buildServer.js +132 -51
- package/dist/mcp/buildServer.js.map +1 -1
- package/dist/mcp/pdfTextWorker.d.ts +2 -0
- package/dist/mcp/pdfTextWorker.d.ts.map +1 -0
- package/dist/mcp/pdfTextWorker.js +39 -0
- package/dist/mcp/pdfTextWorker.js.map +1 -0
- package/dist/permissions.d.ts +19 -0
- package/dist/permissions.d.ts.map +1 -1
- package/dist/permissions.js +42 -2
- package/dist/permissions.js.map +1 -1
- package/dist/scheduler/sendScheduler.d.ts +8 -15
- package/dist/scheduler/sendScheduler.d.ts.map +1 -1
- package/dist/scheduler/sendScheduler.js +96 -69
- package/dist/scheduler/sendScheduler.js.map +1 -1
- package/dist/service/deliveryCoordinator.d.ts +1 -1
- package/dist/service/deliveryCoordinator.d.ts.map +1 -1
- package/dist/service/deliveryCoordinator.js +3 -1
- package/dist/service/deliveryCoordinator.js.map +1 -1
- package/dist/service/emailService.d.ts +2 -1
- package/dist/service/emailService.d.ts.map +1 -1
- package/dist/service/emailService.js +8 -3
- package/dist/service/emailService.js.map +1 -1
- package/dist/service/publicErrors.d.ts +4 -0
- package/dist/service/publicErrors.d.ts.map +1 -1
- package/dist/service/publicErrors.js +10 -1
- package/dist/service/publicErrors.js.map +1 -1
- package/dist/storage/apiKeys.d.ts.map +1 -1
- package/dist/storage/apiKeys.js +2 -2
- package/dist/storage/apiKeys.js.map +1 -1
- package/dist/storage/db.d.ts +19 -2
- package/dist/storage/db.d.ts.map +1 -1
- package/dist/storage/db.js +6 -1
- package/dist/storage/db.js.map +1 -1
- package/dist/storage/scheduledSends.d.ts +6 -1
- package/dist/storage/scheduledSends.d.ts.map +1 -1
- package/dist/storage/scheduledSends.js +36 -19
- package/dist/storage/scheduledSends.js.map +1 -1
- package/package.json +11 -9
- package/pdf-cmaps/78-EUC-H.bcmap +0 -0
- package/pdf-cmaps/78-EUC-V.bcmap +0 -0
- package/pdf-cmaps/78-H.bcmap +0 -0
- package/pdf-cmaps/78-RKSJ-H.bcmap +0 -0
- package/pdf-cmaps/78-RKSJ-V.bcmap +0 -0
- package/pdf-cmaps/78-V.bcmap +0 -0
- package/pdf-cmaps/78ms-RKSJ-H.bcmap +0 -0
- package/pdf-cmaps/78ms-RKSJ-V.bcmap +0 -0
- package/pdf-cmaps/83pv-RKSJ-H.bcmap +0 -0
- package/pdf-cmaps/90ms-RKSJ-H.bcmap +0 -0
- package/pdf-cmaps/90ms-RKSJ-V.bcmap +0 -0
- package/pdf-cmaps/90msp-RKSJ-H.bcmap +0 -0
- package/pdf-cmaps/90msp-RKSJ-V.bcmap +0 -0
- package/pdf-cmaps/90pv-RKSJ-H.bcmap +0 -0
- package/pdf-cmaps/90pv-RKSJ-V.bcmap +0 -0
- package/pdf-cmaps/Add-H.bcmap +0 -0
- package/pdf-cmaps/Add-RKSJ-H.bcmap +0 -0
- package/pdf-cmaps/Add-RKSJ-V.bcmap +0 -0
- package/pdf-cmaps/Add-V.bcmap +0 -0
- package/pdf-cmaps/Adobe-CNS1-0.bcmap +0 -0
- package/pdf-cmaps/Adobe-CNS1-1.bcmap +0 -0
- package/pdf-cmaps/Adobe-CNS1-2.bcmap +0 -0
- package/pdf-cmaps/Adobe-CNS1-3.bcmap +0 -0
- package/pdf-cmaps/Adobe-CNS1-4.bcmap +0 -0
- package/pdf-cmaps/Adobe-CNS1-5.bcmap +0 -0
- package/pdf-cmaps/Adobe-CNS1-6.bcmap +0 -0
- package/pdf-cmaps/Adobe-CNS1-UCS2.bcmap +0 -0
- package/pdf-cmaps/Adobe-GB1-0.bcmap +0 -0
- package/pdf-cmaps/Adobe-GB1-1.bcmap +0 -0
- package/pdf-cmaps/Adobe-GB1-2.bcmap +0 -0
- package/pdf-cmaps/Adobe-GB1-3.bcmap +0 -0
- package/pdf-cmaps/Adobe-GB1-4.bcmap +0 -0
- package/pdf-cmaps/Adobe-GB1-5.bcmap +0 -0
- package/pdf-cmaps/Adobe-GB1-UCS2.bcmap +0 -0
- package/pdf-cmaps/Adobe-Japan1-0.bcmap +0 -0
- package/pdf-cmaps/Adobe-Japan1-1.bcmap +0 -0
- package/pdf-cmaps/Adobe-Japan1-2.bcmap +0 -0
- package/pdf-cmaps/Adobe-Japan1-3.bcmap +0 -0
- package/pdf-cmaps/Adobe-Japan1-4.bcmap +0 -0
- package/pdf-cmaps/Adobe-Japan1-5.bcmap +0 -0
- package/pdf-cmaps/Adobe-Japan1-6.bcmap +0 -0
- package/pdf-cmaps/Adobe-Japan1-UCS2.bcmap +0 -0
- package/pdf-cmaps/Adobe-Korea1-0.bcmap +0 -0
- package/pdf-cmaps/Adobe-Korea1-1.bcmap +0 -0
- package/pdf-cmaps/Adobe-Korea1-2.bcmap +0 -0
- package/pdf-cmaps/Adobe-Korea1-UCS2.bcmap +0 -0
- package/pdf-cmaps/B5-H.bcmap +0 -0
- package/pdf-cmaps/B5-V.bcmap +0 -0
- package/pdf-cmaps/B5pc-H.bcmap +0 -0
- package/pdf-cmaps/B5pc-V.bcmap +0 -0
- package/pdf-cmaps/CNS-EUC-H.bcmap +0 -0
- package/pdf-cmaps/CNS-EUC-V.bcmap +0 -0
- package/pdf-cmaps/CNS1-H.bcmap +0 -0
- package/pdf-cmaps/CNS1-V.bcmap +0 -0
- package/pdf-cmaps/CNS2-H.bcmap +0 -0
- package/pdf-cmaps/CNS2-V.bcmap +3 -0
- package/pdf-cmaps/ETHK-B5-H.bcmap +0 -0
- package/pdf-cmaps/ETHK-B5-V.bcmap +0 -0
- package/pdf-cmaps/ETen-B5-H.bcmap +0 -0
- package/pdf-cmaps/ETen-B5-V.bcmap +0 -0
- package/pdf-cmaps/ETenms-B5-H.bcmap +3 -0
- package/pdf-cmaps/ETenms-B5-V.bcmap +0 -0
- package/pdf-cmaps/EUC-H.bcmap +0 -0
- package/pdf-cmaps/EUC-V.bcmap +0 -0
- package/pdf-cmaps/Ext-H.bcmap +0 -0
- package/pdf-cmaps/Ext-RKSJ-H.bcmap +0 -0
- package/pdf-cmaps/Ext-RKSJ-V.bcmap +0 -0
- package/pdf-cmaps/Ext-V.bcmap +0 -0
- package/pdf-cmaps/GB-EUC-H.bcmap +0 -0
- package/pdf-cmaps/GB-EUC-V.bcmap +0 -0
- package/pdf-cmaps/GB-H.bcmap +4 -0
- package/pdf-cmaps/GB-V.bcmap +0 -0
- package/pdf-cmaps/GBK-EUC-H.bcmap +0 -0
- package/pdf-cmaps/GBK-EUC-V.bcmap +0 -0
- package/pdf-cmaps/GBK2K-H.bcmap +0 -0
- package/pdf-cmaps/GBK2K-V.bcmap +0 -0
- package/pdf-cmaps/GBKp-EUC-H.bcmap +0 -0
- package/pdf-cmaps/GBKp-EUC-V.bcmap +0 -0
- package/pdf-cmaps/GBT-EUC-H.bcmap +0 -0
- package/pdf-cmaps/GBT-EUC-V.bcmap +0 -0
- package/pdf-cmaps/GBT-H.bcmap +0 -0
- package/pdf-cmaps/GBT-V.bcmap +0 -0
- package/pdf-cmaps/GBTpc-EUC-H.bcmap +0 -0
- package/pdf-cmaps/GBTpc-EUC-V.bcmap +0 -0
- package/pdf-cmaps/GBpc-EUC-H.bcmap +0 -0
- package/pdf-cmaps/GBpc-EUC-V.bcmap +0 -0
- package/pdf-cmaps/H.bcmap +0 -0
- package/pdf-cmaps/HKdla-B5-H.bcmap +0 -0
- package/pdf-cmaps/HKdla-B5-V.bcmap +0 -0
- package/pdf-cmaps/HKdlb-B5-H.bcmap +0 -0
- package/pdf-cmaps/HKdlb-B5-V.bcmap +0 -0
- package/pdf-cmaps/HKgccs-B5-H.bcmap +0 -0
- package/pdf-cmaps/HKgccs-B5-V.bcmap +0 -0
- package/pdf-cmaps/HKm314-B5-H.bcmap +0 -0
- package/pdf-cmaps/HKm314-B5-V.bcmap +0 -0
- package/pdf-cmaps/HKm471-B5-H.bcmap +0 -0
- package/pdf-cmaps/HKm471-B5-V.bcmap +0 -0
- package/pdf-cmaps/HKscs-B5-H.bcmap +0 -0
- package/pdf-cmaps/HKscs-B5-V.bcmap +0 -0
- package/pdf-cmaps/Hankaku.bcmap +0 -0
- package/pdf-cmaps/Hiragana.bcmap +0 -0
- package/pdf-cmaps/KSC-EUC-H.bcmap +0 -0
- package/pdf-cmaps/KSC-EUC-V.bcmap +0 -0
- package/pdf-cmaps/KSC-H.bcmap +0 -0
- package/pdf-cmaps/KSC-Johab-H.bcmap +0 -0
- package/pdf-cmaps/KSC-Johab-V.bcmap +0 -0
- package/pdf-cmaps/KSC-V.bcmap +0 -0
- package/pdf-cmaps/KSCms-UHC-H.bcmap +0 -0
- package/pdf-cmaps/KSCms-UHC-HW-H.bcmap +0 -0
- package/pdf-cmaps/KSCms-UHC-HW-V.bcmap +0 -0
- package/pdf-cmaps/KSCms-UHC-V.bcmap +0 -0
- package/pdf-cmaps/KSCpc-EUC-H.bcmap +0 -0
- package/pdf-cmaps/KSCpc-EUC-V.bcmap +0 -0
- package/pdf-cmaps/Katakana.bcmap +0 -0
- package/pdf-cmaps/LICENSE +36 -0
- package/pdf-cmaps/NWP-H.bcmap +0 -0
- package/pdf-cmaps/NWP-V.bcmap +0 -0
- package/pdf-cmaps/RKSJ-H.bcmap +0 -0
- package/pdf-cmaps/RKSJ-V.bcmap +0 -0
- package/pdf-cmaps/Roman.bcmap +0 -0
- package/pdf-cmaps/UniCNS-UCS2-H.bcmap +0 -0
- package/pdf-cmaps/UniCNS-UCS2-V.bcmap +0 -0
- package/pdf-cmaps/UniCNS-UTF16-H.bcmap +0 -0
- package/pdf-cmaps/UniCNS-UTF16-V.bcmap +0 -0
- package/pdf-cmaps/UniCNS-UTF32-H.bcmap +0 -0
- package/pdf-cmaps/UniCNS-UTF32-V.bcmap +0 -0
- package/pdf-cmaps/UniCNS-UTF8-H.bcmap +0 -0
- package/pdf-cmaps/UniCNS-UTF8-V.bcmap +0 -0
- package/pdf-cmaps/UniGB-UCS2-H.bcmap +0 -0
- package/pdf-cmaps/UniGB-UCS2-V.bcmap +0 -0
- package/pdf-cmaps/UniGB-UTF16-H.bcmap +0 -0
- package/pdf-cmaps/UniGB-UTF16-V.bcmap +0 -0
- package/pdf-cmaps/UniGB-UTF32-H.bcmap +0 -0
- package/pdf-cmaps/UniGB-UTF32-V.bcmap +0 -0
- package/pdf-cmaps/UniGB-UTF8-H.bcmap +0 -0
- package/pdf-cmaps/UniGB-UTF8-V.bcmap +0 -0
- package/pdf-cmaps/UniJIS-UCS2-H.bcmap +0 -0
- package/pdf-cmaps/UniJIS-UCS2-HW-H.bcmap +0 -0
- package/pdf-cmaps/UniJIS-UCS2-HW-V.bcmap +0 -0
- package/pdf-cmaps/UniJIS-UCS2-V.bcmap +0 -0
- package/pdf-cmaps/UniJIS-UTF16-H.bcmap +0 -0
- package/pdf-cmaps/UniJIS-UTF16-V.bcmap +0 -0
- package/pdf-cmaps/UniJIS-UTF32-H.bcmap +0 -0
- package/pdf-cmaps/UniJIS-UTF32-V.bcmap +0 -0
- package/pdf-cmaps/UniJIS-UTF8-H.bcmap +0 -0
- package/pdf-cmaps/UniJIS-UTF8-V.bcmap +0 -0
- package/pdf-cmaps/UniJIS2004-UTF16-H.bcmap +0 -0
- package/pdf-cmaps/UniJIS2004-UTF16-V.bcmap +0 -0
- package/pdf-cmaps/UniJIS2004-UTF32-H.bcmap +0 -0
- package/pdf-cmaps/UniJIS2004-UTF32-V.bcmap +0 -0
- package/pdf-cmaps/UniJIS2004-UTF8-H.bcmap +0 -0
- package/pdf-cmaps/UniJIS2004-UTF8-V.bcmap +0 -0
- package/pdf-cmaps/UniJISPro-UCS2-HW-V.bcmap +0 -0
- package/pdf-cmaps/UniJISPro-UCS2-V.bcmap +0 -0
- package/pdf-cmaps/UniJISPro-UTF8-V.bcmap +0 -0
- package/pdf-cmaps/UniJISX0213-UTF32-H.bcmap +0 -0
- package/pdf-cmaps/UniJISX0213-UTF32-V.bcmap +0 -0
- package/pdf-cmaps/UniJISX02132004-UTF32-H.bcmap +0 -0
- package/pdf-cmaps/UniJISX02132004-UTF32-V.bcmap +0 -0
- package/pdf-cmaps/UniKS-UCS2-H.bcmap +0 -0
- package/pdf-cmaps/UniKS-UCS2-V.bcmap +0 -0
- package/pdf-cmaps/UniKS-UTF16-H.bcmap +0 -0
- package/pdf-cmaps/UniKS-UTF16-V.bcmap +0 -0
- package/pdf-cmaps/UniKS-UTF32-H.bcmap +0 -0
- package/pdf-cmaps/UniKS-UTF32-V.bcmap +0 -0
- package/pdf-cmaps/UniKS-UTF8-H.bcmap +0 -0
- package/pdf-cmaps/UniKS-UTF8-V.bcmap +0 -0
- package/pdf-cmaps/V.bcmap +0 -0
- package/pdf-cmaps/WP-Symbol.bcmap +0 -0
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { parentPort, workerData } from 'node:worker_threads';
|
|
2
|
+
import { getDocumentProxy } from 'unpdf';
|
|
3
|
+
// Runs in its own thread with a heap limit so a hostile PDF cannot exhaust the
|
|
4
|
+
// server. Pages are read one at a time and only whole pages are returned, unless
|
|
5
|
+
// the first page alone exceeds the character budget.
|
|
6
|
+
const { bytes, cMapDirectory, firstPage, lastPage, maxPages, maxChars } = workerData;
|
|
7
|
+
// pdf.js reads CMaps from a filesystem path in Node; a file:// URL does not load.
|
|
8
|
+
const pdf = await getDocumentProxy(bytes, { verbosity: 0, cMapUrl: cMapDirectory, cMapPacked: true });
|
|
9
|
+
const end = Math.min(lastPage, pdf.numPages, firstPage + maxPages - 1);
|
|
10
|
+
const pages = [];
|
|
11
|
+
let chars = 0;
|
|
12
|
+
let cut = false;
|
|
13
|
+
for (let number = firstPage; number <= end; number++) {
|
|
14
|
+
const page = await pdf.getPage(number);
|
|
15
|
+
const content = await page.getTextContent();
|
|
16
|
+
const text = content.items
|
|
17
|
+
.map((item) => ('str' in item ? item.str + (item.hasEOL ? '\n' : '') : ''))
|
|
18
|
+
.join('')
|
|
19
|
+
.trim();
|
|
20
|
+
page.cleanup();
|
|
21
|
+
if (chars + text.length > maxChars) {
|
|
22
|
+
if (pages.length === 0) {
|
|
23
|
+
pages.push(text.slice(0, maxChars));
|
|
24
|
+
cut = true;
|
|
25
|
+
}
|
|
26
|
+
break;
|
|
27
|
+
}
|
|
28
|
+
pages.push(text);
|
|
29
|
+
chars += text.length + 2;
|
|
30
|
+
}
|
|
31
|
+
parentPort.postMessage({
|
|
32
|
+
text: pages.join('\n\n'),
|
|
33
|
+
firstPage,
|
|
34
|
+
lastPage: firstPage + pages.length - 1,
|
|
35
|
+
totalPages: pdf.numPages,
|
|
36
|
+
cut,
|
|
37
|
+
});
|
|
38
|
+
await pdf.loadingTask.destroy();
|
|
39
|
+
//# sourceMappingURL=pdfTextWorker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pdfTextWorker.js","sourceRoot":"","sources":["../../src/mcp/pdfTextWorker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAEzC,+EAA+E;AAC/E,iFAAiF;AACjF,qDAAqD;AACrD,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,UAOzE,CAAC;AACF,kFAAkF;AAClF,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;AACtG,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,SAAS,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC;AACvE,MAAM,KAAK,GAAa,EAAE,CAAC;AAC3B,IAAI,KAAK,GAAG,CAAC,CAAC;AACd,IAAI,GAAG,GAAG,KAAK,CAAC;AAChB,KAAK,IAAI,MAAM,GAAG,SAAS,EAAE,MAAM,IAAI,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC;IACrD,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;IAC5C,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK;SACvB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAC1E,IAAI,CAAC,EAAE,CAAC;SACR,IAAI,EAAE,CAAC;IACV,IAAI,CAAC,OAAO,EAAE,CAAC;IACf,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,GAAG,QAAQ,EAAE,CAAC;QACnC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;YACpC,GAAG,GAAG,IAAI,CAAC;QACb,CAAC;QACD,MAAM;IACR,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,KAAK,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;AAC3B,CAAC;AACD,UAAW,CAAC,WAAW,CAAC;IACtB,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;IACxB,SAAS;IACT,QAAQ,EAAE,SAAS,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC;IACtC,UAAU,EAAE,GAAG,CAAC,QAAQ;IACxB,GAAG;CACJ,CAAC,CAAC;AACH,MAAM,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC"}
|
package/dist/permissions.d.ts
CHANGED
|
@@ -15,6 +15,11 @@ export interface PermissionPolicy {
|
|
|
15
15
|
supplementalCapabilities: AdminCapability[];
|
|
16
16
|
}
|
|
17
17
|
export declare const FULL_PERMISSION_POLICY: PermissionPolicy;
|
|
18
|
+
/** Every email capability, including permanent deletion. */
|
|
19
|
+
export declare const ALL_MAIL_PERMISSION_POLICY: PermissionPolicy;
|
|
20
|
+
/** Profile for stdio connections and API keys created without permission options. */
|
|
21
|
+
export declare const DEFAULT_PERMISSION_PROFILE: NamedPermissionProfile;
|
|
22
|
+
export declare const DEFAULT_PERMISSION_POLICY: PermissionPolicy;
|
|
18
23
|
export declare function isNamedPermissionProfile(value: string): value is NamedPermissionProfile;
|
|
19
24
|
export declare function isMcpCapability(value: string): value is McpCapability;
|
|
20
25
|
export declare function isAdminCapability(value: string): value is AdminCapability;
|
|
@@ -27,4 +32,18 @@ export declare function deserializePermissionPolicy(profile: string, customCapab
|
|
|
27
32
|
export declare function serializeCustomCapabilities(policy: PermissionPolicy): string | null;
|
|
28
33
|
export declare function serializeSupplementalCapabilities(policy: PermissionPolicy): string;
|
|
29
34
|
export declare function hasCapability(policy: PermissionPolicy, capability: Capability): boolean;
|
|
35
|
+
/**
|
|
36
|
+
* CLI options using the smallest named profile that covers the current and requested mail capabilities,
|
|
37
|
+
* with permanent deletion granted separately. Custom policies keep a complete, explicit --allow list.
|
|
38
|
+
*/
|
|
39
|
+
export declare function permissionOptionsGranting(policy: PermissionPolicy, missing: readonly Capability[]): string;
|
|
40
|
+
/** Where a connection's permissions come from, which decides how to change them. */
|
|
41
|
+
export type PermissionSource = {
|
|
42
|
+
kind: 'stdio';
|
|
43
|
+
} | {
|
|
44
|
+
kind: 'api_key';
|
|
45
|
+
keyId: string;
|
|
46
|
+
};
|
|
47
|
+
/** Instructions for adding the missing capabilities to a connection. */
|
|
48
|
+
export declare function enableCapabilitiesInstructions(policy: PermissionPolicy, missing: readonly Capability[], source: PermissionSource | undefined): string;
|
|
30
49
|
//# sourceMappingURL=permissions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,kGAOnB,CAAC;AAEX,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE9D,eAAO,MAAM,kBAAkB,gGAMrB,CAAC;AACX,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC;AAClE,MAAM,MAAM,UAAU,GAAG,aAAa,GAAG,eAAe,CAAC;AAEzD,eAAO,MAAM,2BAA2B,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,CAQrE,CAAC;AAEF,eAAO,MAAM,yBAAyB,8CAA+C,CAAC;AACtF,MAAM,MAAM,sBAAsB,GAAG,CAAC,OAAO,yBAAyB,CAAC,CAAC,MAAM,CAAC,CAAC;AAChF,MAAM,MAAM,iBAAiB,GAAG,sBAAsB,GAAG,QAAQ,CAAC;AAElE,eAAO,MAAM,+BAA+B,EAAE,MAAM,CAAC,sBAAsB,EAAE,MAAM,CAIlF,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,iBAAiB,CAAC;IAC3B,YAAY,EAAE,UAAU,EAAE,CAAC;IAC3B,4FAA4F;IAC5F,wBAAwB,EAAE,eAAe,EAAE,CAAC;CAC7C;
|
|
1
|
+
{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":"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"}
|
package/dist/permissions.js
CHANGED
|
@@ -25,7 +25,7 @@ export const NAMED_PERMISSION_PROFILES = ['read-only', 'read-write', 'full'];
|
|
|
25
25
|
export const PERMISSION_PROFILE_DESCRIPTIONS = {
|
|
26
26
|
'read-only': 'Read and search mail, inspect folders, labels, and scheduled sends, and download attachments.',
|
|
27
27
|
'read-write': 'Read mail, manage drafts, organize messages, and move messages to or from Trash.',
|
|
28
|
-
full: 'Use every Fluxmail email capability, including sending mail
|
|
28
|
+
full: 'Use every Fluxmail email capability except permanent deletion, including sending mail.',
|
|
29
29
|
};
|
|
30
30
|
const CAPABILITY_SET = new Set(MCP_CAPABILITIES);
|
|
31
31
|
const ADMIN_CAPABILITY_SET = new Set(ADMIN_CAPABILITIES);
|
|
@@ -34,9 +34,15 @@ const PROFILE_SET = new Set(NAMED_PERMISSION_PROFILES);
|
|
|
34
34
|
const PROFILE_CAPABILITIES = {
|
|
35
35
|
'read-only': ['mail.read'],
|
|
36
36
|
'read-write': ['mail.read', 'mail.drafts', 'mail.organize', 'mail.trash'],
|
|
37
|
-
|
|
37
|
+
// Permanent deletion is never part of a named profile; it must be allowed explicitly.
|
|
38
|
+
full: MCP_CAPABILITIES.filter((capability) => capability !== 'mail.delete'),
|
|
38
39
|
};
|
|
39
40
|
export const FULL_PERMISSION_POLICY = permissionPolicyForProfile('full');
|
|
41
|
+
/** Every email capability, including permanent deletion. */
|
|
42
|
+
export const ALL_MAIL_PERMISSION_POLICY = customPermissionPolicy(MCP_CAPABILITIES);
|
|
43
|
+
/** Profile for stdio connections and API keys created without permission options. */
|
|
44
|
+
export const DEFAULT_PERMISSION_PROFILE = 'read-only';
|
|
45
|
+
export const DEFAULT_PERMISSION_POLICY = permissionPolicyForProfile(DEFAULT_PERMISSION_PROFILE);
|
|
40
46
|
export function isNamedPermissionProfile(value) {
|
|
41
47
|
return PROFILE_SET.has(value);
|
|
42
48
|
}
|
|
@@ -122,4 +128,38 @@ export function serializeSupplementalCapabilities(policy) {
|
|
|
122
128
|
export function hasCapability(policy, capability) {
|
|
123
129
|
return policy.capabilities.includes(capability);
|
|
124
130
|
}
|
|
131
|
+
/**
|
|
132
|
+
* CLI options using the smallest named profile that covers the current and requested mail capabilities,
|
|
133
|
+
* with permanent deletion granted separately. Custom policies keep a complete, explicit --allow list.
|
|
134
|
+
*/
|
|
135
|
+
export function permissionOptionsGranting(policy, missing) {
|
|
136
|
+
const needed = new Set([...policy.capabilities, ...missing]);
|
|
137
|
+
const profileCapabilities = MCP_CAPABILITIES.filter((capability) => capability !== 'mail.delete' && needed.has(capability));
|
|
138
|
+
const profile = policy.profile === 'custom'
|
|
139
|
+
? undefined
|
|
140
|
+
: NAMED_PERMISSION_PROFILES.find((name) => profileCapabilities.every((capability) => PROFILE_CAPABILITIES[name].includes(capability)));
|
|
141
|
+
if (!profile) {
|
|
142
|
+
return [...MCP_CAPABILITIES, ...ADMIN_CAPABILITIES]
|
|
143
|
+
.filter((capability) => needed.has(capability))
|
|
144
|
+
.map((capability) => `--allow ${capability}`)
|
|
145
|
+
.join(' ');
|
|
146
|
+
}
|
|
147
|
+
const extra = MCP_CAPABILITIES.filter((capability) => needed.has(capability) && !PROFILE_CAPABILITIES[profile].includes(capability));
|
|
148
|
+
const admin = ADMIN_CAPABILITIES.filter((capability) => needed.has(capability));
|
|
149
|
+
return [
|
|
150
|
+
`--profile ${profile}`,
|
|
151
|
+
...extra.map((capability) => `--allow ${capability}`),
|
|
152
|
+
...admin.map((capability) => `--admin ${capability}`),
|
|
153
|
+
].join(' ');
|
|
154
|
+
}
|
|
155
|
+
/** Instructions for adding the missing capabilities to a connection. */
|
|
156
|
+
export function enableCapabilitiesInstructions(policy, missing, source) {
|
|
157
|
+
if (!source)
|
|
158
|
+
return 'To enable it, change the Fluxmail permissions for this connection.';
|
|
159
|
+
const options = permissionOptionsGranting(policy, missing);
|
|
160
|
+
return source.kind === 'stdio'
|
|
161
|
+
? `To enable it, start "fluxmail stdio ${options}" in the MCP client configuration, ` +
|
|
162
|
+
'replacing any existing --profile or --allow options, then restart the client.'
|
|
163
|
+
: `To enable it, an administrator can run "fluxmail apikey permissions ${source.keyId} ${options}".`;
|
|
164
|
+
}
|
|
125
165
|
//# sourceMappingURL=permissions.js.map
|
package/dist/permissions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,WAAW;IACX,aAAa;IACb,eAAe;IACf,YAAY;IACZ,aAAa;IACb,WAAW;CACH,CAAC;AAIX,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,gBAAgB;IAChB,eAAe;IACf,gBAAgB;IAChB,eAAe;IACf,aAAa;CACL,CAAC;AAIX,MAAM,CAAC,MAAM,2BAA2B,GAAkC;IACxE,WAAW,EACT,iIAAiI;IACnI,aAAa,EAAE,4DAA4D;IAC3E,eAAe,EAAE,oFAAoF;IACrG,YAAY,EAAE,iCAAiC;IAC/C,aAAa,EAAE,8BAA8B;IAC7C,WAAW,EAAE,4BAA4B;CAC1C,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,WAAW,EAAE,YAAY,EAAE,MAAM,CAAU,CAAC;AAItF,MAAM,CAAC,MAAM,+BAA+B,GAA2C;IACrF,WAAW,EAAE,+FAA+F;IAC5G,YAAY,EAAE,kFAAkF;IAChG,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,38 +2,31 @@ import { type SendResult } from '@fluxmail/core';
|
|
|
2
2
|
import type { DeliveryOperation } from '../service/deliveryCoordinator.js';
|
|
3
3
|
import type { FluxmailDb } from '../storage/db.js';
|
|
4
4
|
import { type Logger } from '../logging.js';
|
|
5
|
-
/** The slice of EmailService the scheduler needs. */
|
|
6
5
|
export interface ScheduledSender {
|
|
7
6
|
send(accountId: string | undefined, input: {
|
|
8
7
|
draftId: string;
|
|
9
8
|
}): Promise<SendResult>;
|
|
10
|
-
deliverScheduled?(accountId: string, draftId: string, scheduleId: string): Promise<DeliveryOperation>;
|
|
9
|
+
deliverScheduled?(accountId: string, draftId: string, scheduleId: string, ownsClaim: () => boolean): Promise<DeliveryOperation>;
|
|
11
10
|
/** Throws while a lapsed license leaves the instance over the plan quota. */
|
|
12
11
|
enforceQuota(): string | undefined;
|
|
13
12
|
}
|
|
14
|
-
/**
|
|
15
|
-
* Fires scheduled sends when their time comes. Owned by the long-lived
|
|
16
|
-
* processes (serve/stdio); one-shot CLI commands construct it but never
|
|
17
|
-
* start() it. Database claims allow multiple schedulers to share a store.
|
|
18
|
-
*/
|
|
13
|
+
/** Instance-wide delivery worker, explicitly started by serve or scheduled run. */
|
|
19
14
|
export declare class SendScheduler {
|
|
20
15
|
private readonly db;
|
|
21
16
|
private readonly service;
|
|
22
17
|
private readonly logger?;
|
|
23
|
-
private timer
|
|
18
|
+
private timer?;
|
|
24
19
|
private running;
|
|
25
|
-
private
|
|
20
|
+
private active?;
|
|
26
21
|
private rerun;
|
|
27
|
-
/** Retry gates for transient failures; in-memory only (a restart just retries immediately). */
|
|
28
|
-
private backoff;
|
|
29
|
-
/** While over the plan quota, due sends are held and re-checked no sooner than this. */
|
|
30
22
|
private quotaHoldUntil;
|
|
31
23
|
constructor(db: FluxmailDb, service: ScheduledSender, logger?: Logger | undefined);
|
|
32
|
-
/** Starts the loop; immediately fires anything past due (catch-up after downtime). */
|
|
33
24
|
start(): void;
|
|
34
|
-
|
|
35
|
-
|
|
25
|
+
/** Disable discovery immediately, then wait for the active delivery to record its outcome. */
|
|
26
|
+
stop(): Promise<void>;
|
|
36
27
|
wake(): void;
|
|
28
|
+
/** Only a successful license refresh may shorten a quota hold. */
|
|
29
|
+
licenseRefreshed(): void;
|
|
37
30
|
private tick;
|
|
38
31
|
private fire;
|
|
39
32
|
private arm;
|
|
@@ -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,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,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;AAcxD,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,CACf,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,OAAO,GACvB,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC9B,6EAA6E;IAC7E,YAAY,IAAI,MAAM,GAAG,SAAS,CAAC;CACpC;AAQD,mFAAmF;AACnF,qBAAa,aAAa;IAQtB,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAT1B,OAAO,CAAC,KAAK,CAAC,CAAiB;IAC/B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAC,CAAgB;IAC/B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,cAAc,CAAK;gBAGR,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,eAAe,EACxB,MAAM,CAAC,EAAE,MAAM,YAAA;IAGlC,KAAK,IAAI,IAAI;IAMb,8FAA8F;IACxF,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ3B,IAAI,IAAI,IAAI;IAqBZ,kEAAkE;IAClE,gBAAgB,IAAI,IAAI;YAKV,IAAI;YA2BJ,IAAI;IAoDlB,OAAO,CAAC,GAAG;CAgBZ"}
|
|
@@ -1,105 +1,134 @@
|
|
|
1
1
|
import { isEmailError } from '@fluxmail/core';
|
|
2
2
|
import { logFailure } from '../logging.js';
|
|
3
|
-
import { claimScheduledSend, completeClaim, failClaim, holdPending, listActive, listClaimable, retryClaim, uncertainClaim, } from '../storage/scheduledSends.js';
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
const BASE_BACKOFF_MS = 30_000;
|
|
3
|
+
import { claimScheduledSend, completeClaim, failClaim, holdPending, listActive, listClaimable, renewClaim, retryClaim, uncertainClaim, } from '../storage/scheduledSends.js';
|
|
4
|
+
const POLL_MS = 1_000;
|
|
5
|
+
const QUOTA_RECHECK_MS = 15 * 60_000;
|
|
7
6
|
const CLAIM_LEASE_MS = 5 * 60_000;
|
|
8
|
-
|
|
7
|
+
const CLAIM_RENEW_MS = 60_000;
|
|
9
8
|
const PERMANENT_CODES = new Set(['not_found', 'invalid_request', 'permission_denied', 'unsupported_capability']);
|
|
10
|
-
/**
|
|
11
|
-
* Fires scheduled sends when their time comes. Owned by the long-lived
|
|
12
|
-
* processes (serve/stdio); one-shot CLI commands construct it but never
|
|
13
|
-
* start() it. Database claims allow multiple schedulers to share a store.
|
|
14
|
-
*/
|
|
9
|
+
/** Instance-wide delivery worker, explicitly started by serve or scheduled run. */
|
|
15
10
|
export class SendScheduler {
|
|
16
11
|
db;
|
|
17
12
|
service;
|
|
18
13
|
logger;
|
|
19
14
|
timer;
|
|
20
15
|
running = false;
|
|
21
|
-
|
|
16
|
+
active;
|
|
22
17
|
rerun = false;
|
|
23
|
-
/** Retry gates for transient failures; in-memory only (a restart just retries immediately). */
|
|
24
|
-
backoff = new Map();
|
|
25
|
-
/** While over the plan quota, due sends are held and re-checked no sooner than this. */
|
|
26
18
|
quotaHoldUntil = 0;
|
|
27
19
|
constructor(db, service, logger) {
|
|
28
20
|
this.db = db;
|
|
29
21
|
this.service = service;
|
|
30
22
|
this.logger = logger;
|
|
31
23
|
}
|
|
32
|
-
/** Starts the loop; immediately fires anything past due (catch-up after downtime). */
|
|
33
24
|
start() {
|
|
25
|
+
if (this.running)
|
|
26
|
+
return;
|
|
34
27
|
this.running = true;
|
|
35
|
-
|
|
28
|
+
this.wake();
|
|
36
29
|
}
|
|
37
|
-
|
|
30
|
+
/** Disable discovery immediately, then wait for the active delivery to record its outcome. */
|
|
31
|
+
async stop() {
|
|
38
32
|
this.running = false;
|
|
33
|
+
this.rerun = false;
|
|
39
34
|
if (this.timer)
|
|
40
35
|
clearTimeout(this.timer);
|
|
41
36
|
this.timer = undefined;
|
|
37
|
+
await this.active;
|
|
42
38
|
}
|
|
43
|
-
/** Poke after any schedule change (new, canceled, or sent early). */
|
|
44
39
|
wake() {
|
|
45
|
-
if (this.running)
|
|
46
|
-
void this.tick();
|
|
47
|
-
}
|
|
48
|
-
async tick() {
|
|
49
40
|
if (!this.running)
|
|
50
41
|
return;
|
|
51
|
-
if (this.
|
|
42
|
+
if (this.timer)
|
|
43
|
+
clearTimeout(this.timer);
|
|
44
|
+
this.timer = undefined;
|
|
45
|
+
if (this.active) {
|
|
52
46
|
this.rerun = true;
|
|
53
47
|
return;
|
|
54
48
|
}
|
|
55
|
-
|
|
49
|
+
// Defer tick so active is assigned before any synchronous quota check can wake us.
|
|
50
|
+
this.active = Promise.resolve()
|
|
51
|
+
.then(() => this.tick())
|
|
52
|
+
.finally(() => {
|
|
53
|
+
this.active = undefined;
|
|
54
|
+
if (!this.running)
|
|
55
|
+
return;
|
|
56
|
+
if (this.rerun) {
|
|
57
|
+
this.rerun = false;
|
|
58
|
+
this.wake();
|
|
59
|
+
}
|
|
60
|
+
else
|
|
61
|
+
this.arm();
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
/** Only a successful license refresh may shorten a quota hold. */
|
|
65
|
+
licenseRefreshed() {
|
|
66
|
+
this.quotaHoldUntil = 0;
|
|
67
|
+
this.wake();
|
|
68
|
+
}
|
|
69
|
+
async tick() {
|
|
70
|
+
if (!this.running)
|
|
71
|
+
return;
|
|
56
72
|
try {
|
|
57
73
|
const now = Date.now();
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
74
|
+
if (now < this.quotaHoldUntil)
|
|
75
|
+
return;
|
|
76
|
+
const due = listClaimable(this.db, now).sort((a, b) => a.sendAt - b.sendAt);
|
|
61
77
|
if (due.length) {
|
|
62
78
|
try {
|
|
63
79
|
this.service.enforceQuota();
|
|
64
80
|
this.quotaHoldUntil = 0;
|
|
65
81
|
}
|
|
66
82
|
catch (err) {
|
|
67
|
-
|
|
68
|
-
// attempt consumed) and re-check later; they fire once the license
|
|
69
|
-
// is renewed or usage is trimmed to fit the plan.
|
|
70
|
-
this.quotaHoldUntil = now + MAX_ARM_MS;
|
|
83
|
+
this.quotaHoldUntil = now + QUOTA_RECHECK_MS;
|
|
71
84
|
const message = err instanceof Error ? err.message : String(err);
|
|
72
85
|
logFailure(this.logger, 'scheduler.quota_held', err, { details: { pending_count: due.length } });
|
|
73
86
|
for (const row of due)
|
|
74
87
|
holdPending(this.db, row.id, message);
|
|
75
|
-
|
|
88
|
+
return;
|
|
76
89
|
}
|
|
77
90
|
}
|
|
78
|
-
for (const row of due)
|
|
91
|
+
for (const row of due) {
|
|
92
|
+
if (!this.running)
|
|
93
|
+
break;
|
|
79
94
|
await this.fire(row);
|
|
95
|
+
}
|
|
80
96
|
}
|
|
81
97
|
catch (err) {
|
|
82
98
|
logFailure(this.logger, 'scheduler.tick_failed', err);
|
|
83
99
|
}
|
|
84
|
-
finally {
|
|
85
|
-
this.processing = false;
|
|
86
|
-
}
|
|
87
|
-
if (this.rerun) {
|
|
88
|
-
this.rerun = false;
|
|
89
|
-
return void this.tick();
|
|
90
|
-
}
|
|
91
|
-
this.arm();
|
|
92
100
|
}
|
|
93
101
|
async fire(row) {
|
|
94
102
|
const claim = claimScheduledSend(this.db, row.id, Date.now(), CLAIM_LEASE_MS);
|
|
95
|
-
if (!claim)
|
|
96
|
-
this.backoff.delete(row.id);
|
|
103
|
+
if (!claim)
|
|
97
104
|
return;
|
|
98
|
-
|
|
105
|
+
let lostOwnership = false;
|
|
106
|
+
const ownsClaim = () => {
|
|
107
|
+
if (lostOwnership)
|
|
108
|
+
return false;
|
|
109
|
+
try {
|
|
110
|
+
if (renewClaim(this.db, row.id, claim.token, Date.now(), CLAIM_LEASE_MS))
|
|
111
|
+
return true;
|
|
112
|
+
}
|
|
113
|
+
catch (err) {
|
|
114
|
+
logFailure(this.logger, 'scheduler.claim_renewal_failed', err);
|
|
115
|
+
}
|
|
116
|
+
lostOwnership = true;
|
|
117
|
+
return false;
|
|
118
|
+
};
|
|
119
|
+
const heartbeat = setInterval(ownsClaim, CLAIM_RENEW_MS);
|
|
120
|
+
heartbeat.unref();
|
|
99
121
|
try {
|
|
122
|
+
if (!ownsClaim())
|
|
123
|
+
return;
|
|
100
124
|
const operation = this.service.deliverScheduled
|
|
101
|
-
? await this.service.deliverScheduled(row.accountId, row.draftId, row.id)
|
|
102
|
-
: {
|
|
125
|
+
? await this.service.deliverScheduled(claim.row.accountId, claim.row.draftId, row.id, ownsClaim)
|
|
126
|
+
: {
|
|
127
|
+
status: 'succeeded',
|
|
128
|
+
result: await this.service.send(claim.row.accountId, { draftId: claim.row.draftId }),
|
|
129
|
+
};
|
|
130
|
+
if (lostOwnership && operation.status === 'queued')
|
|
131
|
+
return;
|
|
103
132
|
if (operation.status === 'succeeded' && operation.result) {
|
|
104
133
|
completeClaim(this.db, row.id, claim.token, operation.result);
|
|
105
134
|
}
|
|
@@ -109,41 +138,39 @@ export class SendScheduler {
|
|
|
109
138
|
else {
|
|
110
139
|
uncertainClaim(this.db, row.id, claim.token, 'Delivery outcome is uncertain. Check Sent before sending again.');
|
|
111
140
|
}
|
|
112
|
-
this.backoff.delete(row.id);
|
|
113
141
|
}
|
|
114
142
|
catch (err) {
|
|
115
143
|
const message = err instanceof Error ? err.message : String(err);
|
|
116
144
|
if (isEmailError(err) && PERMANENT_CODES.has(err.code)) {
|
|
117
|
-
this.logger?.warn('scheduler.send_failed', message, err, {
|
|
118
|
-
details: { permanent: true },
|
|
119
|
-
});
|
|
145
|
+
this.logger?.warn('scheduler.send_failed', message, err, { details: { permanent: true } });
|
|
120
146
|
failClaim(this.db, row.id, claim.token, err.code === 'not_found' ? 'Draft no longer exists: it was sent or deleted outside Fluxmail' : message);
|
|
121
|
-
this.backoff.delete(row.id);
|
|
122
147
|
}
|
|
123
148
|
else {
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
logFailure(this.logger, 'scheduler.send_retry', err, {
|
|
128
|
-
details: { attempt, permanent: false },
|
|
129
|
-
});
|
|
130
|
-
this.backoff.set(row.id, {
|
|
131
|
-
attempt,
|
|
132
|
-
notBefore: Date.now() + Math.min(BASE_BACKOFF_MS * 2 ** (attempt - 1), MAX_ARM_MS),
|
|
133
|
-
});
|
|
149
|
+
const attempt = retryClaim(this.db, row.id, claim.token, message);
|
|
150
|
+
if (attempt !== undefined)
|
|
151
|
+
logFailure(this.logger, 'scheduler.send_retry', err, { details: { attempt, permanent: false } });
|
|
134
152
|
}
|
|
135
153
|
}
|
|
154
|
+
finally {
|
|
155
|
+
clearInterval(heartbeat);
|
|
156
|
+
}
|
|
136
157
|
}
|
|
137
158
|
arm() {
|
|
138
|
-
if (this.
|
|
139
|
-
clearTimeout(this.timer);
|
|
140
|
-
this.timer = undefined;
|
|
141
|
-
const pending = listActive(this.db);
|
|
142
|
-
if (!pending.length)
|
|
159
|
+
if (!this.running)
|
|
143
160
|
return;
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
161
|
+
let delay = POLL_MS;
|
|
162
|
+
try {
|
|
163
|
+
const now = Date.now();
|
|
164
|
+
const pending = listActive(this.db);
|
|
165
|
+
if (pending.length && now >= this.quotaHoldUntil) {
|
|
166
|
+
const next = Math.min(...pending.map((r) => Math.max(r.sendAt, r.nextAttemptAt, r.claimUntil ?? 0)));
|
|
167
|
+
delay = Math.min(POLL_MS, Math.max(next - now, 1));
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
catch (err) {
|
|
171
|
+
logFailure(this.logger, 'scheduler.poll_failed', err);
|
|
172
|
+
}
|
|
173
|
+
this.timer = setTimeout(() => this.wake(), delay);
|
|
147
174
|
this.timer.unref();
|
|
148
175
|
}
|
|
149
176
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendScheduler.js","sourceRoot":"","sources":["../../src/scheduler/sendScheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAmB,MAAM,gBAAgB,CAAC;AAG/D,OAAO,EAAE,UAAU,EAAe,MAAM,eAAe,CAAC;AACxD,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,SAAS,EACT,WAAW,EACX,UAAU,EACV,aAAa,EACb,UAAU,EACV,cAAc,GAEf,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"sendScheduler.js","sourceRoot":"","sources":["../../src/scheduler/sendScheduler.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ export declare class DeliveryCoordinator {
|
|
|
30
30
|
}, create: () => Promise<{
|
|
31
31
|
scheduleId: string;
|
|
32
32
|
}>): Promise<DeliveryOperation>;
|
|
33
|
-
fireScheduled(accountId: string, draftId: string, scheduleId: string, preflight: () => Promise<void>, deliver: () => Promise<SendResult
|
|
33
|
+
fireScheduled(accountId: string, draftId: string, scheduleId: string, preflight: () => Promise<void>, deliver: () => Promise<SendResult>, ownsClaim?: () => boolean): Promise<DeliveryOperation>;
|
|
34
34
|
run(input: {
|
|
35
35
|
principalId: string;
|
|
36
36
|
memberId: string;
|
|
@@ -1 +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,
|
|
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,EAClC,SAAS,GAAE,MAAM,OAAoB,GACpC,OAAO,CAAC,iBAAiB,CAAC;IAwCvB,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"}
|
|
@@ -156,7 +156,7 @@ export class DeliveryCoordinator {
|
|
|
156
156
|
}
|
|
157
157
|
return fromRow(this.db.select().from(deliveryOperations).where(eq(deliveryOperations.id, id)).get());
|
|
158
158
|
}
|
|
159
|
-
async fireScheduled(accountId, draftId, scheduleId, preflight, deliver) {
|
|
159
|
+
async fireScheduled(accountId, draftId, scheduleId, preflight, deliver, ownsClaim = () => true) {
|
|
160
160
|
let row = this.db.select().from(deliveryOperations).where(eq(deliveryOperations.scheduleId, scheduleId)).get();
|
|
161
161
|
if (!row) {
|
|
162
162
|
this.queueScheduled(accountId, scheduleId, draftId);
|
|
@@ -187,6 +187,8 @@ export class DeliveryCoordinator {
|
|
|
187
187
|
}
|
|
188
188
|
throw error;
|
|
189
189
|
}
|
|
190
|
+
if (!ownsClaim())
|
|
191
|
+
return fromRow(row);
|
|
190
192
|
const claimed = this.db
|
|
191
193
|
.update(deliveryOperations)
|
|
192
194
|
.set({ status: 'sending', updatedAt: Date.now() })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliveryCoordinator.js","sourceRoot":"","sources":["../../src/service/deliveryCoordinator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"deliveryCoordinator.js","sourceRoot":"","sources":["../../src/service/deliveryCoordinator.ts"],"names":[],"mappings":"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"}
|