@push.rocks/smartmta 9.6.1 → 11.0.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/changelog.md +30 -0
- package/dist_rust/mailer-bin_linux_amd64 +0 -0
- package/dist_rust/mailer-bin_linux_amd64.tsrust-build.json +5 -5
- package/dist_rust/mailer-bin_linux_arm64 +0 -0
- package/dist_rust/mailer-bin_linux_arm64.tsrust-build.json +5 -5
- package/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/mail/core/classes.email.d.ts +7 -2
- package/dist_ts/mail/core/classes.email.js +36 -118
- package/dist_ts/mail/core/classes.emailvalidator.js +2 -2
- package/dist_ts/plugins.d.ts +2 -2
- package/dist_ts/plugins.js +3 -3
- package/notices/inventory.json +1 -1
- package/package.json +12 -13
- package/readme.md +4 -4
- package/third-party-notices.md +12 -7
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/mail/core/classes.email.ts +40 -129
- package/ts/mail/core/classes.emailvalidator.ts +2 -2
- package/ts/plugins.ts +2 -2
- /package/{license → license.md} +0 -0
package/changelog.md
CHANGED
|
@@ -1,5 +1,35 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-10-03 - 11.0.0
|
|
4
|
+
|
|
5
|
+
### Breaking Changes
|
|
6
|
+
|
|
7
|
+
- `baseLogger` is now a `@push.rocks/smartlog` 4 `Smartlog` instance (was 3.x); embedders that pass it where a smartlog 3 `Smartlog` is typed must move to smartlog 4. `addLogDestination()` still takes any `ILogDestination`.
|
|
8
|
+
|
|
9
|
+
### Fixes
|
|
10
|
+
|
|
11
|
+
- Move `@push.rocks/smartlog` to ^4.0.4 and `@push.rocks/smartmail` to ^3.0.1 (smartdns 9), and refresh `@push.rocks/lik` 6.4.4 and `@push.rocks/smartstring` 4.2.1 in the lockfile, so the production tree no longer reaches the deprecated `isounique`, `smartdelay`, `consolecolor`, `webrequest` or `smarthash`.
|
|
12
|
+
- The released `dist_rust` binaries no longer embed the build machine's local paths (Cargo registry and rustup toolchain under the builder's home directory): the `@git.zone/tsrust` config now sets `remapLocalPaths: true`, as the other Rust-shipping packages do.
|
|
13
|
+
|
|
14
|
+
### Maintenance
|
|
15
|
+
|
|
16
|
+
- Release tooling: pnpm 12.7.0, `@git.zone/cli` ^8.4.0, `@git.zone/tsbuild` ^5.1.2, `@git.zone/tsrust` ^3.0.0, `@git.zone/tstest` ^7.0.0, `@types/node` ^26.6.3 and tsx ^4.23.15; tsrust 3 and tstest 7 need no script or test changes.
|
|
17
|
+
|
|
18
|
+
## 2026-10-01 - 10.0.0
|
|
19
|
+
|
|
20
|
+
### Breaking Changes
|
|
21
|
+
|
|
22
|
+
- `Email.toSmartmail()` and `Email.fromSmartmail()` use `@push.rocks/smartmail` 3: attachments are `IMailAttachment` objects (filename, contentType, content, contentId) instead of `SmartFile`, the text and HTML bodies stay separate, cc and bcc carry over, and a streamed attachment is refused with a named error because the conversion is synchronous.
|
|
23
|
+
|
|
24
|
+
### Fixes
|
|
25
|
+
|
|
26
|
+
- `fromSmartmail()` no longer passes a boolean as template data, which put the text body into the HTML body; the email validator comes from `@push.rocks/smartmail/validation`.
|
|
27
|
+
|
|
28
|
+
### Maintenance
|
|
29
|
+
|
|
30
|
+
- Update the release tooling: pnpm 12.6.0, @git.zone/cli 8.2.0, tsbuild 5.0.0, tstest 6.3.2, tsrust 2.0.1 and @types/node 26.6.2. tsrust 2 builds only the host architecture by default, so the new `build:release` script builds both shipped targets with `tsrust --configured-targets`, checks them with `tsrust verify`, and is the release preflight build; the license file moves to `license.md`.
|
|
31
|
+
- Remove `publishConfig.registry` (npmjs), which overrode the release target registries: releases now publish directly to every configured registry instead of npmjs only.
|
|
32
|
+
|
|
3
33
|
## 2026-09-15 - 9.6.1
|
|
4
34
|
|
|
5
35
|
### Fixes
|
|
Binary file
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"format": "tsrust.build-provenance.v2",
|
|
3
|
-
"binarySha256": "
|
|
3
|
+
"binarySha256": "8262ab3d8431a70535158a7e734a7d9277f403cc9f36551bad78f69b6172c4a8",
|
|
4
4
|
"buildInfo": {
|
|
5
5
|
"projectName": "@push.rocks/smartmta",
|
|
6
|
-
"projectVersion": "
|
|
7
|
-
"gitCommit": "
|
|
6
|
+
"projectVersion": "11.0.0",
|
|
7
|
+
"gitCommit": "2517e3578c050bbe9c44d47b00d50d1a092afec3",
|
|
8
8
|
"gitDirty": false,
|
|
9
|
-
"builtAt": "2026-
|
|
10
|
-
"tsrustVersion": "
|
|
9
|
+
"builtAt": "2026-10-03T00:55:25.099Z",
|
|
10
|
+
"tsrustVersion": "3.0.0",
|
|
11
11
|
"binary": "mailer-bin",
|
|
12
12
|
"target": "linux_amd64"
|
|
13
13
|
}
|
|
Binary file
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"format": "tsrust.build-provenance.v2",
|
|
3
|
-
"binarySha256": "
|
|
3
|
+
"binarySha256": "44173f09f08d9d637111db06b650612dedcc41a4f6276fadc17ff6039302981d",
|
|
4
4
|
"buildInfo": {
|
|
5
5
|
"projectName": "@push.rocks/smartmta",
|
|
6
|
-
"projectVersion": "
|
|
7
|
-
"gitCommit": "
|
|
6
|
+
"projectVersion": "11.0.0",
|
|
7
|
+
"gitCommit": "2517e3578c050bbe9c44d47b00d50d1a092afec3",
|
|
8
8
|
"gitDirty": false,
|
|
9
|
-
"builtAt": "2026-
|
|
10
|
-
"tsrustVersion": "
|
|
9
|
+
"builtAt": "2026-10-03T00:56:24.513Z",
|
|
10
|
+
"tsrustVersion": "3.0.0",
|
|
11
11
|
"binary": "mailer-bin",
|
|
12
12
|
"target": "linux_arm64"
|
|
13
13
|
}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartmta',
|
|
6
|
-
version: '
|
|
6
|
+
version: '11.0.0',
|
|
7
7
|
description: 'A high-performance, enterprise-grade Mail Transfer Agent (MTA) built from scratch in TypeScript with Rust acceleration.'
|
|
8
8
|
};
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHlIQUF5SDtDQUN2SSxDQUFBIn0=
|
|
@@ -219,7 +219,7 @@ export declare class Email {
|
|
|
219
219
|
* Convert this email to a smartmail instance
|
|
220
220
|
* @returns A new Smartmail instance
|
|
221
221
|
*/
|
|
222
|
-
toSmartmail(): Promise<plugins.smartmail.Smartmail<
|
|
222
|
+
toSmartmail(): Promise<plugins.smartmail.Smartmail<unknown>>;
|
|
223
223
|
/**
|
|
224
224
|
* Get the from email address
|
|
225
225
|
* @returns The from email address
|
|
@@ -287,5 +287,10 @@ export declare class Email {
|
|
|
287
287
|
* @param smartmail The Smartmail instance to convert
|
|
288
288
|
* @returns A new Email instance
|
|
289
289
|
*/
|
|
290
|
-
static fromSmartmail(smartmail: plugins.smartmail.Smartmail<
|
|
290
|
+
static fromSmartmail(smartmail: plugins.smartmail.Smartmail<unknown>): Email;
|
|
291
|
+
/**
|
|
292
|
+
* Email attachments hold their bytes in memory; a streamed Smartmail attachment
|
|
293
|
+
* (iterable or stream content) cannot be converted synchronously.
|
|
294
|
+
*/
|
|
295
|
+
private static attachmentContentToBuffer;
|
|
291
296
|
}
|
|
@@ -470,65 +470,19 @@ export class Email {
|
|
|
470
470
|
const smartmail = new plugins.smartmail.Smartmail({
|
|
471
471
|
from: this.from,
|
|
472
472
|
subject: this.subject,
|
|
473
|
-
body: this.
|
|
473
|
+
body: this.text,
|
|
474
|
+
htmlBody: this.html,
|
|
474
475
|
});
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
// Use the proper addRecipient method for the current smartmail version
|
|
479
|
-
if (typeof smartmail.addRecipient === 'function') {
|
|
480
|
-
smartmail.addRecipient(recipient);
|
|
481
|
-
}
|
|
482
|
-
else {
|
|
483
|
-
// Fallback for older versions or different interface
|
|
484
|
-
smartmail.options.to.push({
|
|
485
|
-
email: recipient,
|
|
486
|
-
name: recipient.split('@')[0] // Simple name extraction
|
|
487
|
-
});
|
|
488
|
-
}
|
|
489
|
-
}
|
|
490
|
-
// Handle CC recipients
|
|
491
|
-
for (const ccRecipient of this.cc) {
|
|
492
|
-
if (typeof smartmail.addRecipient === 'function') {
|
|
493
|
-
smartmail.addRecipient(ccRecipient, 'cc');
|
|
494
|
-
}
|
|
495
|
-
else {
|
|
496
|
-
// Fallback for older versions
|
|
497
|
-
if (!smartmail.options.cc)
|
|
498
|
-
smartmail.options.cc = [];
|
|
499
|
-
smartmail.options.cc.push({
|
|
500
|
-
email: ccRecipient,
|
|
501
|
-
name: ccRecipient.split('@')[0]
|
|
502
|
-
});
|
|
503
|
-
}
|
|
504
|
-
}
|
|
505
|
-
// Handle BCC recipients
|
|
506
|
-
for (const bccRecipient of this.bcc) {
|
|
507
|
-
if (typeof smartmail.addRecipient === 'function') {
|
|
508
|
-
smartmail.addRecipient(bccRecipient, 'bcc');
|
|
509
|
-
}
|
|
510
|
-
else {
|
|
511
|
-
// Fallback for older versions
|
|
512
|
-
if (!smartmail.options.bcc)
|
|
513
|
-
smartmail.options.bcc = [];
|
|
514
|
-
smartmail.options.bcc.push({
|
|
515
|
-
email: bccRecipient,
|
|
516
|
-
name: bccRecipient.split('@')[0]
|
|
517
|
-
});
|
|
518
|
-
}
|
|
519
|
-
}
|
|
520
|
-
// Add attachments
|
|
476
|
+
smartmail.addRecipients(this.to, 'to');
|
|
477
|
+
smartmail.addRecipients(this.cc, 'cc');
|
|
478
|
+
smartmail.addRecipients(this.bcc, 'bcc');
|
|
521
479
|
for (const attachment of this.attachments) {
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
480
|
+
smartmail.addAttachment({
|
|
481
|
+
filename: attachment.filename,
|
|
482
|
+
contentType: attachment.contentType,
|
|
483
|
+
content: attachment.content,
|
|
484
|
+
contentId: attachment.contentId,
|
|
526
485
|
});
|
|
527
|
-
// Set content type if available
|
|
528
|
-
if (attachment.contentType) {
|
|
529
|
-
smartAttachment.contentType = attachment.contentType;
|
|
530
|
-
}
|
|
531
|
-
smartmail.addAttachment(smartAttachment);
|
|
532
486
|
}
|
|
533
487
|
return smartmail;
|
|
534
488
|
}
|
|
@@ -735,70 +689,34 @@ export class Email {
|
|
|
735
689
|
static fromSmartmail(smartmail) {
|
|
736
690
|
const options = {
|
|
737
691
|
from: smartmail.options.from,
|
|
738
|
-
to: [],
|
|
692
|
+
to: smartmail.options.to ?? [],
|
|
693
|
+
cc: smartmail.options.cc ?? [],
|
|
694
|
+
bcc: smartmail.options.bcc ?? [],
|
|
739
695
|
subject: smartmail.getSubject(),
|
|
740
|
-
text: smartmail.getBody(
|
|
741
|
-
html: smartmail.
|
|
742
|
-
attachments:
|
|
696
|
+
text: smartmail.getBody(),
|
|
697
|
+
html: smartmail.getHtmlBody() ?? undefined,
|
|
698
|
+
attachments: smartmail.attachments.map((attachment) => ({
|
|
699
|
+
filename: attachment.filename,
|
|
700
|
+
content: Email.attachmentContentToBuffer(attachment),
|
|
701
|
+
contentType: attachment.contentType || 'application/octet-stream',
|
|
702
|
+
contentId: attachment.contentId,
|
|
703
|
+
})),
|
|
743
704
|
};
|
|
744
|
-
// Function to safely extract email address from recipient
|
|
745
|
-
const extractEmail = (recipient) => {
|
|
746
|
-
// Handle string recipients
|
|
747
|
-
if (typeof recipient === 'string')
|
|
748
|
-
return recipient;
|
|
749
|
-
// Handle object recipients
|
|
750
|
-
if (recipient && typeof recipient === 'object') {
|
|
751
|
-
const addressObj = recipient;
|
|
752
|
-
// Try different property names that might contain the email address
|
|
753
|
-
if ('address' in addressObj && typeof addressObj.address === 'string') {
|
|
754
|
-
return addressObj.address;
|
|
755
|
-
}
|
|
756
|
-
if ('email' in addressObj && typeof addressObj.email === 'string') {
|
|
757
|
-
return addressObj.email;
|
|
758
|
-
}
|
|
759
|
-
}
|
|
760
|
-
// Fallback for invalid input
|
|
761
|
-
return '';
|
|
762
|
-
};
|
|
763
|
-
// Filter out empty strings from the extracted emails
|
|
764
|
-
const filterValidEmails = (emails) => {
|
|
765
|
-
return emails.filter(email => email && email.length > 0);
|
|
766
|
-
};
|
|
767
|
-
// Convert recipients from Smartmail's optional arrays.
|
|
768
|
-
const toRecipients = smartmail.options.to;
|
|
769
|
-
if (toRecipients && toRecipients.length > 0) {
|
|
770
|
-
options.to = filterValidEmails(toRecipients.map(extractEmail));
|
|
771
|
-
}
|
|
772
|
-
const ccRecipients = smartmail.options.cc;
|
|
773
|
-
if (ccRecipients && ccRecipients.length > 0) {
|
|
774
|
-
options.cc = filterValidEmails(ccRecipients.map(extractEmail));
|
|
775
|
-
}
|
|
776
|
-
const bccRecipients = smartmail.options.bcc;
|
|
777
|
-
if (bccRecipients && bccRecipients.length > 0) {
|
|
778
|
-
options.bcc = filterValidEmails(bccRecipients.map(extractEmail));
|
|
779
|
-
}
|
|
780
|
-
// Convert attachments (note: this handles the synchronous case only)
|
|
781
|
-
if (smartmail.attachments?.length > 0) {
|
|
782
|
-
options.attachments = smartmail.attachments.map(attachment => {
|
|
783
|
-
// For the test case, if the path is exactly "test.txt", use that as the filename
|
|
784
|
-
let filename = 'attachment.bin';
|
|
785
|
-
if (attachment.path === 'test.txt') {
|
|
786
|
-
filename = 'test.txt';
|
|
787
|
-
}
|
|
788
|
-
else if (attachment.parsedPath?.base) {
|
|
789
|
-
filename = attachment.parsedPath.base;
|
|
790
|
-
}
|
|
791
|
-
else if (typeof attachment.path === 'string') {
|
|
792
|
-
filename = attachment.path.split('/').pop() || 'attachment.bin';
|
|
793
|
-
}
|
|
794
|
-
return {
|
|
795
|
-
filename,
|
|
796
|
-
content: Buffer.from(attachment.contentBuffer || Buffer.alloc(0)),
|
|
797
|
-
contentType: attachment?.contentType || 'application/octet-stream'
|
|
798
|
-
};
|
|
799
|
-
});
|
|
800
|
-
}
|
|
801
705
|
return new Email(options);
|
|
802
706
|
}
|
|
707
|
+
/**
|
|
708
|
+
* Email attachments hold their bytes in memory; a streamed Smartmail attachment
|
|
709
|
+
* (iterable or stream content) cannot be converted synchronously.
|
|
710
|
+
*/
|
|
711
|
+
static attachmentContentToBuffer(attachment) {
|
|
712
|
+
const content = attachment.content;
|
|
713
|
+
if (typeof content === 'string') {
|
|
714
|
+
return Buffer.from(content, 'utf8');
|
|
715
|
+
}
|
|
716
|
+
if (content instanceof Uint8Array) {
|
|
717
|
+
return Buffer.from(content);
|
|
718
|
+
}
|
|
719
|
+
throw new Error(`Attachment ${attachment.filename} has streamed content; Email.fromSmartmail() needs string or Uint8Array content`);
|
|
720
|
+
}
|
|
803
721
|
}
|
|
804
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.email.js","sourceRoot":"","sources":["../../../ts/mail/core/classes.email.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAA+B,MAAM,6BAA6B,CAAC;AA0B1F;;;;;;;GAOG;AACH,MAAM,OAAO,KAAK;IAChB,8BAA8B;IAC9B,IAAI,CAAS;IACb,EAAE,CAAW;IACb,EAAE,CAAW;IACb,GAAG,CAAW;IACd,OAAO,CAAS;IAChB,IAAI,CAAS;IACb,IAAI,CAAU;IACd,WAAW,CAAgB;IAC3B,OAAO,CAAyB;IAChC,WAAW,CAAU;IACrB,QAAQ,CAA4B;IACpC,SAAS,CAAsB;IAE/B,uCAAuC;IAC/B,YAAY,CAAS;IACrB,SAAS,CAAS;IAE1B,sCAAsC;IAC9B,MAAM,CAAC,cAAc,CAAiB;IAE9C,YAAY,OAAsB;QAChC,sCAAsC;QACtC,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;YAC1B,KAAK,CAAC,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC;QAC9C,CAAC;QAED,8DAA8D;QAC9D,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,iCAAiC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACnE,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QAEzB,2CAA2C;QAC3C,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAE7D,6BAA6B;QAC7B,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAEhE,oDAAoD;QACpD,2DAA2D;QAE3D,gCAAgC;QAChC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAE1D,qCAAqC;QACrC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QAEpD,4BAA4B;QAC5B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEzE,kBAAkB;QAClB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QAEjF,yBAAyB;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;QAErC,gBAAgB;QAChB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,KAAK,CAAC;QAEhD,eAAe;QACf,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC;QAE7C,yBAAyB;QACzB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC;QAEzC,0DAA0D;QAC1D,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC;QAE9B,sCAAsC;QACtC,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,aAAa,EAAE,IAAI,WAAW,GAAG,CAAC;IAC3H,CAAC;IAED;;;;;;;OAOG;IACK,YAAY,CAAC,KAAa;QAChC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAEtD,4CAA4C;QAC5C,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC,CAAC,sDAAsD;QACrE,CAAC;QAED,yCAAyC;QACzC,MAAM,cAAc,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QACvD,IAAI,CAAC,cAAc;YAAE,OAAO,KAAK,CAAC;QAElC,mEAAmE;QACnE,IAAI,eAAe,GAAG,cAAc,CAAC;QACrC,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YAChB,MAAM,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;YACvD,MAAM,UAAU,GAAG,cAAc,CAAC,SAAS,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;YAEzD,gDAAgD;YAChD,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBACpC,IAAI,CAAC;oBACH,qEAAqE;oBACrE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,UAAU,EAAE,CAAC,CAAC;oBAC5C,eAAe,GAAG,GAAG,SAAS,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACnD,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,iDAAiD;oBACjD,uCAAuC;oBACvC,eAAe,GAAG,cAAc,CAAC;gBACnC,CAAC;YACH,CAAC;QACH,CAAC;QAED,mEAAmE;QACnE,OAAO,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;IAC7D,CAAC;IAED;;;;;;;;;OASG;IACK,mBAAmB,CAAC,WAAmB;QAC7C,IAAI,CAAC,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QAEjE,WAAW,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;QAEjC,iCAAiC;QACjC,IAAI,WAAW,KAAK,IAAI,IAAI,WAAW,KAAK,EAAE,EAAE,CAAC;YAC/C,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,0EAA0E;QAC1E,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAClD,IAAI,UAAU,EAAE,CAAC;YACf,kEAAkE;YAClE,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;QACpC,CAAC;QAED,kDAAkD;QAClD,OAAO,WAAW,CAAC,IAAI,EAAE,CAAC;IAC5B,CAAC;IAED;;;;OAIG;IACK,eAAe,CAAC,UAA6B;QACnD,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACnC,0BAA0B;YAC1B,IAAI,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;gBAClC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,oCAAoC,UAAU,EAAE,CAAC,CAAC;YACpE,CAAC;QACH,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YACrC,6BAA6B;YAC7B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACnC,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC;oBACjC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACzB,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,KAAK,CAAC,oCAAoC,SAAS,EAAE,CAAC,CAAC;gBACnE,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACK,cAAc,CAAC,KAAa;QAClC,IAAI,CAAC,KAAK;YAAE,OAAO,EAAE,CAAC;QAEtB,0DAA0D;QAC1D,8DAA8D;QAC9D,OAAO,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzD,IAAI,CAAC,YAAY,IAAI,YAAY,KAAK,EAAE,EAAE,CAAC;gBACzC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAE,KAAK,CAAC,CAAC;YAC5D,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;OAGG;IACI,cAAc;QACnB,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtD,kFAAkF;QAClF,MAAM,OAAO,GAAG,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAE3D,yCAAyC;QACzC,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAED;;;;OAIG;IACK,iBAAiB,CAAC,KAAa;QACrC,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,EAAE;YAAE,OAAO,KAAK,CAAC;QAEzC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,OAAO,IAAI,CAAC;YAAE,OAAO,KAAK,CAAC;QAE/B,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;QAEhD,gDAAgD;QAChD,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACpC,IAAI,CAAC;gBACH,qEAAqE;gBACrE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,UAAU,EAAE,CAAC,CAAC;gBAC5C,OAAO,GAAG,SAAS,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;YACxC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,uCAAuC;gBACvC,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;OAGG;IACI,cAAc;QACnB,OAAO,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACzB,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAClD,MAAM,OAAO,GAAG,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;YACvD,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,cAAc;QACnB,OAAO,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACzB,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAClD,MAAM,OAAO,GAAG,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;YACvD,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,eAAe;QACpB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YAC1B,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAClD,MAAM,OAAO,GAAG,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;YACvD,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,gBAAgB;QACrB,+CAA+C;QAC/C,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED;;;OAGG;IACI,mBAAmB;QACxB,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAChD,CAAC;IAED;;;OAGG;IACI,cAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;IACrC,CAAC;IAED;;;;;OAKG;IACI,YAAY,CACjB,KAAa,EACb,OAA4B,IAAI;QAEhC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,oCAAoC,KAAK,EAAE,CAAC,CAAC;QAC/D,CAAC;QAED,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,IAAI;gBACP,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC7B,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACtB,CAAC;gBACD,MAAM;YACR,KAAK,IAAI;gBACP,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC7B,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACtB,CAAC;gBACD,MAAM;YACR,KAAK,KAAK;gBACR,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC9B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACvB,CAAC;gBACD,MAAM;QACV,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACI,aAAa,CAAC,UAAuB;QAC1C,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,SAAS,CAAC,IAAY,EAAE,KAAa;QAC1C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACI,WAAW,CAAC,QAAmC;QACpD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,WAAW,CAAC,GAAW,EAAE,KAAU;QACxC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACI,YAAY,CAAC,SAA8B;QAChD,IAAI,CAAC,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;QACrD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACI,uBAAuB,CAAC,SAA+B;QAC5D,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;IAED;;;;OAIG;IACI,oBAAoB,CAAC,SAA+B;QACzD,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC;IAED;;;;OAIG;IACI,oBAAoB,CAAC,SAA+B;QACzD,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3E,CAAC;IAED;;;;;OAKG;IACK,cAAc,CAAC,QAAgB,EAAE,mBAAyC;QAChF,4CAA4C;QAC5C,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC/E,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,kDAAkD;QAClD,MAAM,YAAY,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAEnE,8BAA8B;QAC9B,OAAO,QAAQ,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACzD,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;YAC9B,OAAO,YAAY,CAAC,UAAU,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAC3F,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,kBAAkB;QACvB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;YACnD,OAAO,KAAK,GAAG,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC;QACnD,CAAC,EAAE,CAAC,CAAC,CAAC;IACR,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,iBAAiB,CAAC,UAK3B,EAAE;QAKJ,MAAM,MAAM,GAIR;YACF,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;YAC1C,UAAU,EAAE,EAAE;YACd,OAAO,EAAE,IAAI;SACd,CAAC;QAEF,kBAAkB;QAClB,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE;YAClE,OAAO,EAAE,OAAO,CAAC,OAAO,KAAK,KAAK;YAClC,eAAe,EAAE,OAAO,CAAC,eAAe,KAAK,KAAK;SACnD,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,YAAY,CAAC;QAEpC,oEAAoE;QACpE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;YAC1B,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC;QACzB,CAAC;QAED,kDAAkD;QAClD,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;YAC5B,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,sBAAsB;QACtB,MAAM,iBAAiB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;YACzD,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAEzC,KAAK,MAAM,SAAS,IAAI,iBAAiB,EAAE,CAAC;YAC1C,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,EAAE;gBACrE,OAAO,EAAE,OAAO,CAAC,OAAO,KAAK,KAAK;gBAClC,eAAe,EAAE,OAAO,CAAC,eAAe,KAAK,KAAK;aACnD,CAAC,CAAC;YAEH,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;gBACrB,KAAK,EAAE,SAAS;gBAChB,MAAM,EAAE,eAAe;aACxB,CAAC,CAAC;YAEH,qEAAqE;YACrE,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;gBAC7B,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC;YACzB,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,WAAW;QACtB,MAAM,SAAS,GAAG,IAAI,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC;YAChD,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI;SAC7B,CAAC,CAAC;QAEH,yDAAyD;QACzD,mEAAmE;QACnE,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YAChC,uEAAuE;YACvE,IAAI,OAAO,SAAS,CAAC,YAAY,KAAK,UAAU,EAAE,CAAC;gBACjD,SAAS,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACN,qDAAqD;gBACpD,SAAS,CAAC,OAAO,CAAC,EAAY,CAAC,IAAI,CAAC;oBACnC,KAAK,EAAE,SAAS;oBAChB,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,yBAAyB;iBACxD,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,uBAAuB;QACvB,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YAClC,IAAI,OAAO,SAAS,CAAC,YAAY,KAAK,UAAU,EAAE,CAAC;gBACjD,SAAS,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAC5C,CAAC;iBAAM,CAAC;gBACN,8BAA8B;gBAC9B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;oBAAE,SAAS,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;gBACpD,SAAS,CAAC,OAAO,CAAC,EAAY,CAAC,IAAI,CAAC;oBACnC,KAAK,EAAE,WAAW;oBAClB,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBAChC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,wBAAwB;QACxB,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACpC,IAAI,OAAO,SAAS,CAAC,YAAY,KAAK,UAAU,EAAE,CAAC;gBACjD,SAAS,CAAC,YAAY,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACN,8BAA8B;gBAC9B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG;oBAAE,SAAS,CAAC,OAAO,CAAC,GAAG,GAAG,EAAE,CAAC;gBACtD,SAAS,CAAC,OAAO,CAAC,GAAa,CAAC,IAAI,CAAC;oBACpC,KAAK,EAAE,YAAY;oBACnB,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBACjC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,kBAAkB;QAClB,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAC1C,MAAM,eAAe,GAAG,IAAI,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC;gBACtD,IAAI,EAAE,UAAU,CAAC,QAAQ;gBACzB,aAAa,EAAE,UAAU,CAAC,OAAO;gBACjC,IAAI,EAAE,GAAG;aACV,CAAC,CAAC;YAEH,gCAAgC;YAChC,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;gBAC1B,eAAuB,CAAC,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;YAChE,CAAC;YAED,SAAS,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,YAAY;QACjB,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,UAAU;QACf,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;;;OAIG;IACI,OAAO,CAAC,SAAkB,KAAK;QACpC,IAAI,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,IAAI,CAAC;QACnB,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,OAAO;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED;;;OAGG;IACI,YAAY;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED;;;;;;OAMG;IACI,cAAc;QACnB,MAAM,OAAO,GAAkB;YAC7B,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;YAC/C,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC;QAEF,mDAAmD;QACnD,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3D,CAAC;QAED,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC/D,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAC3B,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpD,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACzC,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzD,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QACjC,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACzC,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC/B,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QACnC,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7D,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACrC,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;OAIG;IACI,YAAY,CAAC,EAAU;QAC5B,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACI,eAAe;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACI,eAAe,CAAC,OAAe;QACpC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,kCAAkC,OAAO,EAAE,CAAC,CAAC;QAC/D,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACI,cAAc,CAAC,SAA+B;QACnD,oCAAoC;QACpC,MAAM,gBAAgB,GAAG,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;QACjE,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QAE3D,iFAAiF;QACjF,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,cAAc;QACd,MAAM,IAAI,SAAS,IAAI,CAAC,IAAI,MAAM,CAAC;QACnC,MAAM,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;QAE1C,IAAI,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;QAC5C,CAAC;QAED,MAAM,IAAI,YAAY,gBAAgB,MAAM,CAAC;QAC7C,MAAM,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC;QAClD,MAAM,IAAI,eAAe,IAAI,CAAC,SAAS,MAAM,CAAC;QAC9C,MAAM,IAAI,iBAAiB,IAAI,CAAC,YAAY,OAAO,CAAC;QAEpD,qBAAqB;QACrB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACxD,MAAM,IAAI,GAAG,GAAG,KAAK,KAAK,MAAM,CAAC;QACnC,CAAC;QAED,6BAA6B;QAC7B,IAAI,IAAI,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;YAC3D,MAAM,IAAI,eAAe,aAAa,MAAM,CAAC;QAC/C,CAAC;QAED,4BAA4B;QAC5B,MAAM,IAAI,6CAA6C,CAAC;QAExD,qCAAqC;QACrC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;YAC3D,MAAM,QAAQ,GAAG,YAAY,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;YAEvD,iDAAiD;YACjD,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC;YACpD,MAAM,IAAI,uBAAuB,CAAC;YAClC,MAAM,IAAI,kDAAkD,QAAQ,WAAW,CAAC;YAEhF,kBAAkB;YAClB,MAAM,IAAI,KAAK,QAAQ,MAAM,CAAC;YAC9B,MAAM,IAAI,iDAAiD,CAAC;YAC5D,MAAM,IAAI,GAAG,aAAa,UAAU,CAAC;YAErC,YAAY;YACZ,MAAM,IAAI,KAAK,QAAQ,MAAM,CAAC;YAC9B,MAAM,IAAI,gDAAgD,CAAC;YAC3D,MAAM,IAAI,GAAG,aAAa,UAAU,CAAC;YAErC,mBAAmB;YACnB,MAAM,IAAI,KAAK,QAAQ,QAAQ,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,oBAAoB;YACpB,MAAM,IAAI,OAAO,aAAa,MAAM,CAAC;QACvC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,gBAAgB;QAC3B,2DAA2D;QAC3D,MAAM,SAAS,GAAG;YAChB,OAAO,EAAE;gBACP,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB;YACD,OAAO,EAAE;gBACP,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE;aACtB;YACD,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE;YAC5B,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;gBAClE,IAAI,EAAE,UAAU,CAAC,QAAQ;gBACzB,IAAI,EAAE,UAAU,CAAC,OAAO;gBACxB,IAAI,EAAE,UAAU,CAAC,WAAW;gBAC5B,GAAG,EAAE,UAAU,CAAC,SAAS;aAC1B,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;YACR,2DAA2D;YAC3D,SAAS,EAAE,CAAC,GAAW,EAAE,KAAa,EAAE,EAAE;gBACxC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACjC,CAAC;SACF,CAAC;QAEF,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,aAAa,CAAC,SAA2C;QACrE,MAAM,OAAO,GAAkB;YAC7B,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI;YAC5B,EAAE,EAAE,EAAE;YACN,OAAO,EAAE,SAAS,CAAC,UAAU,EAAE;YAC/B,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,qBAAqB;YACrD,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAG,eAAe;YAC/C,WAAW,EAAE,EAAE;SAChB,CAAC;QAEF,0DAA0D;QAC1D,MAAM,YAAY,GAAG,CAAC,SAAc,EAAU,EAAE;YAC9C,2BAA2B;YAC3B,IAAI,OAAO,SAAS,KAAK,QAAQ;gBAAE,OAAO,SAAS,CAAC;YAEpD,2BAA2B;YAC3B,IAAI,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;gBAC/C,MAAM,UAAU,GAAG,SAAgB,CAAC;gBACpC,oEAAoE;gBACpE,IAAI,SAAS,IAAI,UAAU,IAAI,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;oBACtE,OAAO,UAAU,CAAC,OAAO,CAAC;gBAC5B,CAAC;gBACD,IAAI,OAAO,IAAI,UAAU,IAAI,OAAO,UAAU,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;oBAClE,OAAO,UAAU,CAAC,KAAK,CAAC;gBAC1B,CAAC;YACH,CAAC;YAED,6BAA6B;YAC7B,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;QAEF,qDAAqD;QACrD,MAAM,iBAAiB,GAAG,CAAC,MAAgB,EAAY,EAAE;YACvD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC;QAEF,uDAAuD;QACvD,MAAM,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1C,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5C,OAAO,CAAC,EAAE,GAAG,iBAAiB,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;QACjE,CAAC;QAED,MAAM,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1C,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5C,OAAO,CAAC,EAAE,GAAG,iBAAiB,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;QACjE,CAAC;QAED,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC;QAC5C,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9C,OAAO,CAAC,GAAG,GAAG,iBAAiB,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;QACnE,CAAC;QAED,qEAAqE;QACrE,IAAI,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBAC3D,iFAAiF;gBACjF,IAAI,QAAQ,GAAG,gBAAgB,CAAC;gBAEhC,IAAI,UAAU,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBACnC,QAAQ,GAAG,UAAU,CAAC;gBACxB,CAAC;qBAAM,IAAI,UAAU,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;oBACvC,QAAQ,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC;gBACxC,CAAC;qBAAM,IAAI,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC/C,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,gBAAgB,CAAC;gBAClE,CAAC;gBAED,OAAO;oBACL,QAAQ;oBACR,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACjE,WAAW,EAAG,UAAkB,EAAE,WAAW,IAAI,0BAA0B;iBAC5E,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;CACF"}
|
|
722
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.email.js","sourceRoot":"","sources":["../../../ts/mail/core/classes.email.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ export class EmailValidator {
|
|
|
9
9
|
validator;
|
|
10
10
|
dnsCache;
|
|
11
11
|
constructor(options) {
|
|
12
|
-
this.validator = new plugins.
|
|
12
|
+
this.validator = new plugins.smartmailValidation.EmailAddressValidator();
|
|
13
13
|
// Initialize LRU cache for DNS records
|
|
14
14
|
this.dnsCache = new LRUCache({
|
|
15
15
|
// Default to 1000 entries (reasonable for most applications)
|
|
@@ -183,4 +183,4 @@ export class EmailValidator {
|
|
|
183
183
|
return this.validator.isValidEmailFormat(email);
|
|
184
184
|
}
|
|
185
185
|
}
|
|
186
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
186
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5lbWFpbHZhbGlkYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL21haWwvY29yZS9jbGFzc2VzLmVtYWlsdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3pDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDckMsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBaUI1RDs7R0FFRztBQUNILE1BQU0sT0FBTyxjQUFjO0lBQ2pCLFNBQVMsQ0FBb0Q7SUFDN0QsUUFBUSxDQUE2QjtJQUU3QyxZQUFZLE9BR1g7UUFDQyxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksT0FBTyxDQUFDLG1CQUFtQixDQUFDLHFCQUFxQixFQUFFLENBQUM7UUFFekUsdUNBQXVDO1FBQ3ZDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxRQUFRLENBQW1CO1lBQzdDLDZEQUE2RDtZQUM3RCxHQUFHLEVBQUUsT0FBTyxFQUFFLFlBQVksSUFBSSxJQUFJO1lBQ2xDLDhEQUE4RDtZQUM5RCxHQUFHLEVBQUUsT0FBTyxFQUFFLFFBQVEsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFHLElBQUk7WUFDeEMsNEJBQTRCO1lBQzVCLFVBQVUsRUFBRSxLQUFLO1lBQ2pCLGNBQWMsRUFBRSxJQUFJO1lBQ3BCLDBEQUEwRDtZQUMxRCxZQUFZLEVBQUUsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFLEVBQUU7Z0JBQzNCLE1BQU0sQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLHVDQUF1QyxHQUFHLEVBQUUsQ0FBQyxDQUFDO1lBQ3BFLENBQUM7U0FDRixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSSxLQUFLLENBQUMsUUFBUSxDQUNu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
|
package/dist_ts/plugins.d.ts
CHANGED
|
@@ -8,12 +8,12 @@ import * as tls from 'tls';
|
|
|
8
8
|
import * as url from 'url';
|
|
9
9
|
import * as util from 'util';
|
|
10
10
|
export { dns, crypto, http, net, os, path, tls, url, util, };
|
|
11
|
-
import * as smartfile from '@push.rocks/smartfile';
|
|
12
11
|
import * as smartlog from '@push.rocks/smartlog';
|
|
13
12
|
import * as smartmail from '@push.rocks/smartmail';
|
|
13
|
+
import * as smartmailValidation from '@push.rocks/smartmail/validation';
|
|
14
14
|
import * as smartpath from '@push.rocks/smartpath';
|
|
15
15
|
import * as smartrust from '@push.rocks/smartrust';
|
|
16
|
-
export {
|
|
16
|
+
export { smartlog, smartmail, smartmailValidation, smartpath, smartrust };
|
|
17
17
|
export type TLogLevel = 'error' | 'warn' | 'info' | 'success' | 'debug';
|
|
18
18
|
import * as tsclass from '@tsclass/tsclass';
|
|
19
19
|
export { tsclass, };
|
package/dist_ts/plugins.js
CHANGED
|
@@ -10,12 +10,12 @@ import * as url from 'url';
|
|
|
10
10
|
import * as util from 'util';
|
|
11
11
|
export { dns, crypto, http, net, os, path, tls, url, util, };
|
|
12
12
|
// @push.rocks scope
|
|
13
|
-
import * as smartfile from '@push.rocks/smartfile';
|
|
14
13
|
import * as smartlog from '@push.rocks/smartlog';
|
|
15
14
|
import * as smartmail from '@push.rocks/smartmail';
|
|
15
|
+
import * as smartmailValidation from '@push.rocks/smartmail/validation';
|
|
16
16
|
import * as smartpath from '@push.rocks/smartpath';
|
|
17
17
|
import * as smartrust from '@push.rocks/smartrust';
|
|
18
|
-
export {
|
|
18
|
+
export { smartlog, smartmail, smartmailValidation, smartpath, smartrust };
|
|
19
19
|
// tsclass scope
|
|
20
20
|
import * as tsclass from '@tsclass/tsclass';
|
|
21
21
|
export { tsclass, };
|
|
@@ -23,4 +23,4 @@ export { tsclass, };
|
|
|
23
23
|
import mailparser from 'mailparser';
|
|
24
24
|
import * as uuid from 'uuid';
|
|
25
25
|
export { mailparser, uuid, };
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYztBQUNkLE9BQU8sS0FBSyxHQUFHLE1BQU0sS0FBSyxDQUFDO0FBQzNCLE9BQU8sS0FBSyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBQ2pDLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxHQUFHLE1BQU0sS0FBSyxDQUFDO0FBQzNCLE9BQU8sS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3pCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxHQUFHLE1BQU0sS0FBSyxDQUFDO0FBQzNCLE9BQU8sS0FBSyxHQUFHLE1BQU0sS0FBSyxDQUFDO0FBQzNCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBRTdCLE9BQU8sRUFDTCxHQUFHLEVBQ0gsTUFBTSxFQUNOLElBQUksRUFDSixHQUFHLEVBQ0gsRUFBRSxFQUNGLElBQUksRUFDSixHQUFHLEVBQ0gsR0FBRyxFQUNILElBQUksR0FDTCxDQUFBO0FBRUQsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssbUJBQW1CLE1BQU0sa0NBQWtDLENBQUM7QUFDeEUsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssU0FBUyxNQUFNLHVCQUF1QixDQUFDO0FBRW5ELE9BQU8sRUFBRSxRQUFRLEVBQUUsU0FBUyxFQUFFLG1CQUFtQixFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQUUsQ0FBQztBQUsxRSxnQkFBZ0I7QUFDaEIsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUU1QyxPQUFPLEVBQ0wsT0FBTyxHQUNSLENBQUE7QUFFRCxjQUFjO0FBQ2QsT0FBTyxVQUFVLE1BQU0sWUFBWSxDQUFDO0FBQ3BDLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBRTdCLE9BQU8sRUFDTCxVQUFVLEVBQ1YsSUFBSSxHQUNMLENBQUEifQ==
|
package/notices/inventory.json
CHANGED
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"rust/Cargo.toml": "91bd90549e6d772768d2e87b5ba083cb1df63997d16970eadcfe2f57cecdf1c8",
|
|
51
51
|
"rust/about.hbs": "64873534562fc879efc20225cb704a2c6a621e2a38df24942433348f97d68bc3",
|
|
52
52
|
"rust/about.toml": "eb5a8897ce7418ef64ca9b935f80476ed10aa89f1be780bf8ffdbd5ac3ba4a0a",
|
|
53
|
-
"third-party-notices.md": "
|
|
53
|
+
"third-party-notices.md": "1d9b9d6428fcc190c9ca96a45f188ece21e38f50c66af9d77af6aafbdd53c5f3"
|
|
54
54
|
},
|
|
55
55
|
"supplementalCargoNotices": {
|
|
56
56
|
"js-sys@0.3.103": "notices/wasm-bindgen-license-mit.txt",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartmta",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "11.0.0",
|
|
4
4
|
"description": "A high-performance, enterprise-grade Mail Transfer Agent (MTA) built from scratch in TypeScript with Rust acceleration.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"mta",
|
|
@@ -31,18 +31,17 @@
|
|
|
31
31
|
".": "./dist_ts/index.js"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@git.zone/cli": "^
|
|
35
|
-
"@git.zone/tsbuild": "
|
|
36
|
-
"@git.zone/tsrust": "^
|
|
37
|
-
"@git.zone/tstest": "
|
|
34
|
+
"@git.zone/cli": "^8.4.0",
|
|
35
|
+
"@git.zone/tsbuild": "^5.1.2",
|
|
36
|
+
"@git.zone/tsrust": "^3.0.0",
|
|
37
|
+
"@git.zone/tstest": "^7.0.0",
|
|
38
38
|
"@types/mailparser": "^3.4.6",
|
|
39
|
-
"@types/node": "26.
|
|
40
|
-
"tsx": "^4.23.
|
|
39
|
+
"@types/node": "^26.6.3",
|
|
40
|
+
"tsx": "^4.23.15"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@push.rocks/
|
|
44
|
-
"@push.rocks/
|
|
45
|
-
"@push.rocks/smartmail": "^2.2.1",
|
|
43
|
+
"@push.rocks/smartlog": "^4.0.4",
|
|
44
|
+
"@push.rocks/smartmail": "^3.0.1",
|
|
46
45
|
"@push.rocks/smartpath": "^6.0.0",
|
|
47
46
|
"@push.rocks/smartrust": "^1.3.2",
|
|
48
47
|
"@tsclass/tsclass": "^9.5.0",
|
|
@@ -57,7 +56,7 @@
|
|
|
57
56
|
"notices/**/*",
|
|
58
57
|
"readme.md",
|
|
59
58
|
"third-party-notices.md",
|
|
60
|
-
"license",
|
|
59
|
+
"license.md",
|
|
61
60
|
"changelog.md"
|
|
62
61
|
],
|
|
63
62
|
"engines": {
|
|
@@ -71,13 +70,13 @@
|
|
|
71
70
|
"arm64"
|
|
72
71
|
],
|
|
73
72
|
"publishConfig": {
|
|
74
|
-
"access": "public"
|
|
75
|
-
"registry": "https://registry.npmjs.org/"
|
|
73
|
+
"access": "public"
|
|
76
74
|
},
|
|
77
75
|
"scripts": {
|
|
78
76
|
"test": "tstest test/ --logfile --verbose --timeout 60",
|
|
79
77
|
"test:rust": "cd rust && cargo test",
|
|
80
78
|
"build": "tsbuild tsfolders && tsrust",
|
|
79
|
+
"build:release": "(tsbuild tsfolders) && (tsrust --configured-targets) && (tsrust verify)",
|
|
81
80
|
"check": "tsbuild check"
|
|
82
81
|
}
|
|
83
82
|
}
|
package/readme.md
CHANGED
|
@@ -879,7 +879,7 @@ await emailServer.start();
|
|
|
879
879
|
|
|
880
880
|
### 🪵 Logging
|
|
881
881
|
|
|
882
|
-
smartmta logs through its own `Smartlog` instance, exported as `baseLogger`. Console output is enabled by default so an embedded smartmta never logs into the void. Embedders can attach additional destinations (e.g. an ops log buffer):
|
|
882
|
+
smartmta logs through its own `Smartlog` instance (`@push.rocks/smartlog` 4), exported as `baseLogger`. Console output is enabled by default so an embedded smartmta never logs into the void. Embedders can attach additional destinations (e.g. an ops log buffer):
|
|
883
883
|
|
|
884
884
|
```typescript
|
|
885
885
|
import { baseLogger } from '@push.rocks/smartmta';
|
|
@@ -955,8 +955,8 @@ smartmta/
|
|
|
955
955
|
The project has comprehensive test coverage with both unit and end-to-end tests:
|
|
956
956
|
|
|
957
957
|
```bash
|
|
958
|
-
# Build Rust
|
|
959
|
-
pnpm build
|
|
958
|
+
# Build both shipped Rust binaries first (test/test.notices.node.ts reads them)
|
|
959
|
+
pnpm run build:release
|
|
960
960
|
|
|
961
961
|
# Run all tests
|
|
962
962
|
pnpm test
|
|
@@ -1018,7 +1018,7 @@ the compiler or the C toolchain; the commands are in the notice index.
|
|
|
1018
1018
|
|
|
1019
1019
|
## License and Legal Information
|
|
1020
1020
|
|
|
1021
|
-
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [license](./license) file. That license covers SmartMTA's own code; the third-party works compiled into the shipped Rust executables keep their own terms, reproduced under [third-party-notices.md](./third-party-notices.md).
|
|
1021
|
+
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [license](./license.md) file. That license covers SmartMTA's own code; the third-party works compiled into the shipped Rust executables keep their own terms, reproduced under [third-party-notices.md](./third-party-notices.md).
|
|
1022
1022
|
|
|
1023
1023
|
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
|
1024
1024
|
|
package/third-party-notices.md
CHANGED
|
@@ -3,11 +3,11 @@
|
|
|
3
3
|
These notices accompany SmartMTA's prebuilt `dist_rust/mailer-bin_linux_amd64`
|
|
4
4
|
and `dist_rust/mailer-bin_linux_arm64` executables, which ship inside the npm
|
|
5
5
|
package. SmartMTA's own TypeScript and Rust code is MIT-licensed under
|
|
6
|
-
[license](./license).
|
|
6
|
+
[license](./license.md).
|
|
7
7
|
|
|
8
|
-
Both executables are statically linked: `pnpm build` runs
|
|
9
|
-
`tsbuild tsfolders && tsrust
|
|
10
|
-
`.smartconfig.json` targets `linux_amd64` and `linux_arm64` — the
|
|
8
|
+
Both executables are statically linked: `pnpm run build:release` runs
|
|
9
|
+
`tsbuild tsfolders && tsrust --configured-targets && tsrust verify`, and
|
|
10
|
+
`@git.zone/tsrust` builds the `.smartconfig.json` targets `linux_amd64` and `linux_arm64` — the
|
|
11
11
|
`x86_64-unknown-linux-gnu` and `aarch64-unknown-linux-gnu` triples — with
|
|
12
12
|
`-C target-feature=+crt-static`, so the Cargo dependency graph, the Rust
|
|
13
13
|
standard library, the GNU C Library and libgcc are all compiled into the
|
|
@@ -123,14 +123,19 @@ The executables are rebuilt from this repository with:
|
|
|
123
123
|
|
|
124
124
|
```sh
|
|
125
125
|
pnpm install
|
|
126
|
-
pnpm build
|
|
126
|
+
pnpm run build:release # tsbuild tsfolders && tsrust --configured-targets && tsrust verify
|
|
127
127
|
```
|
|
128
128
|
|
|
129
|
-
`tsrust` reads the `@git.zone/tsrust` block of
|
|
130
|
-
`linux_amd64` and `linux_arm64`,
|
|
129
|
+
`tsrust --configured-targets` reads the `@git.zone/tsrust` block of
|
|
130
|
+
`.smartconfig.json` (`targets` `linux_amd64` and `linux_arm64`,
|
|
131
|
+
`static: true`), runs
|
|
131
132
|
`RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target
|
|
132
133
|
<triple>` in `rust/`, and copies the results to `dist_rust/`. The arm64 link
|
|
133
134
|
uses the `aarch64-linux-gnu-gcc` linker configured in `rust/.cargo/config.toml`.
|
|
135
|
+
`tsrust verify` then confirms that `dist_rust/` holds exactly that matrix,
|
|
136
|
+
built from a clean checkout of the current commit; a rebuild from modified
|
|
137
|
+
sources or against a modified library runs `pnpm exec tsrust
|
|
138
|
+
--configured-targets` without it.
|
|
134
139
|
|
|
135
140
|
That is also the relink route required by LGPL-2.1 section 6: the complete
|
|
136
141
|
corresponding source of the work that uses the library is this package's own
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -567,72 +567,24 @@ export class Email {
|
|
|
567
567
|
* Convert this email to a smartmail instance
|
|
568
568
|
* @returns A new Smartmail instance
|
|
569
569
|
*/
|
|
570
|
-
public async toSmartmail(): Promise<plugins.smartmail.Smartmail<
|
|
571
|
-
const smartmail = new plugins.smartmail.Smartmail({
|
|
570
|
+
public async toSmartmail(): Promise<plugins.smartmail.Smartmail<unknown>> {
|
|
571
|
+
const smartmail = new plugins.smartmail.Smartmail<unknown>({
|
|
572
572
|
from: this.from,
|
|
573
573
|
subject: this.subject,
|
|
574
|
-
body: this.
|
|
574
|
+
body: this.text,
|
|
575
|
+
htmlBody: this.html,
|
|
575
576
|
});
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
for (const recipient of this.to) {
|
|
580
|
-
// Use the proper addRecipient method for the current smartmail version
|
|
581
|
-
if (typeof smartmail.addRecipient === 'function') {
|
|
582
|
-
smartmail.addRecipient(recipient);
|
|
583
|
-
} else {
|
|
584
|
-
// Fallback for older versions or different interface
|
|
585
|
-
(smartmail.options.to as any[]).push({
|
|
586
|
-
email: recipient,
|
|
587
|
-
name: recipient.split('@')[0] // Simple name extraction
|
|
588
|
-
});
|
|
589
|
-
}
|
|
590
|
-
}
|
|
591
|
-
|
|
592
|
-
// Handle CC recipients
|
|
593
|
-
for (const ccRecipient of this.cc) {
|
|
594
|
-
if (typeof smartmail.addRecipient === 'function') {
|
|
595
|
-
smartmail.addRecipient(ccRecipient, 'cc');
|
|
596
|
-
} else {
|
|
597
|
-
// Fallback for older versions
|
|
598
|
-
if (!smartmail.options.cc) smartmail.options.cc = [];
|
|
599
|
-
(smartmail.options.cc as any[]).push({
|
|
600
|
-
email: ccRecipient,
|
|
601
|
-
name: ccRecipient.split('@')[0]
|
|
602
|
-
});
|
|
603
|
-
}
|
|
604
|
-
}
|
|
605
|
-
|
|
606
|
-
// Handle BCC recipients
|
|
607
|
-
for (const bccRecipient of this.bcc) {
|
|
608
|
-
if (typeof smartmail.addRecipient === 'function') {
|
|
609
|
-
smartmail.addRecipient(bccRecipient, 'bcc');
|
|
610
|
-
} else {
|
|
611
|
-
// Fallback for older versions
|
|
612
|
-
if (!smartmail.options.bcc) smartmail.options.bcc = [];
|
|
613
|
-
(smartmail.options.bcc as any[]).push({
|
|
614
|
-
email: bccRecipient,
|
|
615
|
-
name: bccRecipient.split('@')[0]
|
|
616
|
-
});
|
|
617
|
-
}
|
|
618
|
-
}
|
|
619
|
-
|
|
620
|
-
// Add attachments
|
|
577
|
+
smartmail.addRecipients(this.to, 'to');
|
|
578
|
+
smartmail.addRecipients(this.cc, 'cc');
|
|
579
|
+
smartmail.addRecipients(this.bcc, 'bcc');
|
|
621
580
|
for (const attachment of this.attachments) {
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
581
|
+
smartmail.addAttachment({
|
|
582
|
+
filename: attachment.filename,
|
|
583
|
+
contentType: attachment.contentType,
|
|
584
|
+
content: attachment.content,
|
|
585
|
+
contentId: attachment.contentId,
|
|
626
586
|
});
|
|
627
|
-
|
|
628
|
-
// Set content type if available
|
|
629
|
-
if (attachment.contentType) {
|
|
630
|
-
(smartAttachment as any).contentType = attachment.contentType;
|
|
631
|
-
}
|
|
632
|
-
|
|
633
|
-
smartmail.addAttachment(smartAttachment);
|
|
634
587
|
}
|
|
635
|
-
|
|
636
588
|
return smartmail;
|
|
637
589
|
}
|
|
638
590
|
|
|
@@ -869,80 +821,39 @@ export class Email {
|
|
|
869
821
|
* @param smartmail The Smartmail instance to convert
|
|
870
822
|
* @returns A new Email instance
|
|
871
823
|
*/
|
|
872
|
-
public static fromSmartmail(smartmail: plugins.smartmail.Smartmail<
|
|
824
|
+
public static fromSmartmail(smartmail: plugins.smartmail.Smartmail<unknown>): Email {
|
|
873
825
|
const options: IEmailOptions = {
|
|
874
826
|
from: smartmail.options.from,
|
|
875
|
-
to: [],
|
|
827
|
+
to: smartmail.options.to ?? [],
|
|
828
|
+
cc: smartmail.options.cc ?? [],
|
|
829
|
+
bcc: smartmail.options.bcc ?? [],
|
|
876
830
|
subject: smartmail.getSubject(),
|
|
877
|
-
text: smartmail.getBody(
|
|
878
|
-
html: smartmail.
|
|
879
|
-
attachments:
|
|
880
|
-
|
|
881
|
-
|
|
882
|
-
|
|
883
|
-
|
|
884
|
-
|
|
885
|
-
if (typeof recipient === 'string') return recipient;
|
|
886
|
-
|
|
887
|
-
// Handle object recipients
|
|
888
|
-
if (recipient && typeof recipient === 'object') {
|
|
889
|
-
const addressObj = recipient as any;
|
|
890
|
-
// Try different property names that might contain the email address
|
|
891
|
-
if ('address' in addressObj && typeof addressObj.address === 'string') {
|
|
892
|
-
return addressObj.address;
|
|
893
|
-
}
|
|
894
|
-
if ('email' in addressObj && typeof addressObj.email === 'string') {
|
|
895
|
-
return addressObj.email;
|
|
896
|
-
}
|
|
897
|
-
}
|
|
898
|
-
|
|
899
|
-
// Fallback for invalid input
|
|
900
|
-
return '';
|
|
901
|
-
};
|
|
902
|
-
|
|
903
|
-
// Filter out empty strings from the extracted emails
|
|
904
|
-
const filterValidEmails = (emails: string[]): string[] => {
|
|
905
|
-
return emails.filter(email => email && email.length > 0);
|
|
831
|
+
text: smartmail.getBody(),
|
|
832
|
+
html: smartmail.getHtmlBody() ?? undefined,
|
|
833
|
+
attachments: smartmail.attachments.map((attachment) => ({
|
|
834
|
+
filename: attachment.filename,
|
|
835
|
+
content: Email.attachmentContentToBuffer(attachment),
|
|
836
|
+
contentType: attachment.contentType || 'application/octet-stream',
|
|
837
|
+
contentId: attachment.contentId,
|
|
838
|
+
})),
|
|
906
839
|
};
|
|
907
|
-
|
|
908
|
-
|
|
909
|
-
|
|
910
|
-
|
|
911
|
-
|
|
912
|
-
|
|
913
|
-
|
|
914
|
-
|
|
915
|
-
|
|
916
|
-
|
|
917
|
-
|
|
918
|
-
|
|
919
|
-
const bccRecipients = smartmail.options.bcc;
|
|
920
|
-
if (bccRecipients && bccRecipients.length > 0) {
|
|
921
|
-
options.bcc = filterValidEmails(bccRecipients.map(extractEmail));
|
|
840
|
+
return new Email(options);
|
|
841
|
+
}
|
|
842
|
+
|
|
843
|
+
/**
|
|
844
|
+
* Email attachments hold their bytes in memory; a streamed Smartmail attachment
|
|
845
|
+
* (iterable or stream content) cannot be converted synchronously.
|
|
846
|
+
*/
|
|
847
|
+
private static attachmentContentToBuffer(attachment: plugins.smartmail.IMailAttachment): Buffer {
|
|
848
|
+
const content = attachment.content;
|
|
849
|
+
if (typeof content === 'string') {
|
|
850
|
+
return Buffer.from(content, 'utf8');
|
|
922
851
|
}
|
|
923
|
-
|
|
924
|
-
|
|
925
|
-
if (smartmail.attachments?.length > 0) {
|
|
926
|
-
options.attachments = smartmail.attachments.map(attachment => {
|
|
927
|
-
// For the test case, if the path is exactly "test.txt", use that as the filename
|
|
928
|
-
let filename = 'attachment.bin';
|
|
929
|
-
|
|
930
|
-
if (attachment.path === 'test.txt') {
|
|
931
|
-
filename = 'test.txt';
|
|
932
|
-
} else if (attachment.parsedPath?.base) {
|
|
933
|
-
filename = attachment.parsedPath.base;
|
|
934
|
-
} else if (typeof attachment.path === 'string') {
|
|
935
|
-
filename = attachment.path.split('/').pop() || 'attachment.bin';
|
|
936
|
-
}
|
|
937
|
-
|
|
938
|
-
return {
|
|
939
|
-
filename,
|
|
940
|
-
content: Buffer.from(attachment.contentBuffer || Buffer.alloc(0)),
|
|
941
|
-
contentType: (attachment as any)?.contentType || 'application/octet-stream'
|
|
942
|
-
};
|
|
943
|
-
});
|
|
852
|
+
if (content instanceof Uint8Array) {
|
|
853
|
+
return Buffer.from(content);
|
|
944
854
|
}
|
|
945
|
-
|
|
946
|
-
|
|
855
|
+
throw new Error(
|
|
856
|
+
`Attachment ${attachment.filename} has streamed content; Email.fromSmartmail() needs string or Uint8Array content`
|
|
857
|
+
);
|
|
947
858
|
}
|
|
948
859
|
}
|
|
@@ -22,14 +22,14 @@ export interface IEmailValidationResult {
|
|
|
22
22
|
* Advanced email validator class using smartmail's capabilities
|
|
23
23
|
*/
|
|
24
24
|
export class EmailValidator {
|
|
25
|
-
private validator: plugins.
|
|
25
|
+
private validator: plugins.smartmailValidation.EmailAddressValidator;
|
|
26
26
|
private dnsCache: LRUCache<string, string[]>;
|
|
27
27
|
|
|
28
28
|
constructor(options?: {
|
|
29
29
|
maxCacheSize?: number;
|
|
30
30
|
cacheTTL?: number;
|
|
31
31
|
}) {
|
|
32
|
-
this.validator = new plugins.
|
|
32
|
+
this.validator = new plugins.smartmailValidation.EmailAddressValidator();
|
|
33
33
|
|
|
34
34
|
// Initialize LRU cache for DNS records
|
|
35
35
|
this.dnsCache = new LRUCache<string, string[]>({
|
package/ts/plugins.ts
CHANGED
|
@@ -22,13 +22,13 @@ export {
|
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
// @push.rocks scope
|
|
25
|
-
import * as smartfile from '@push.rocks/smartfile';
|
|
26
25
|
import * as smartlog from '@push.rocks/smartlog';
|
|
27
26
|
import * as smartmail from '@push.rocks/smartmail';
|
|
27
|
+
import * as smartmailValidation from '@push.rocks/smartmail/validation';
|
|
28
28
|
import * as smartpath from '@push.rocks/smartpath';
|
|
29
29
|
import * as smartrust from '@push.rocks/smartrust';
|
|
30
30
|
|
|
31
|
-
export {
|
|
31
|
+
export { smartlog, smartmail, smartmailValidation, smartpath, smartrust };
|
|
32
32
|
|
|
33
33
|
// Define SmartLog types for use in error handling
|
|
34
34
|
export type TLogLevel = 'error' | 'warn' | 'info' | 'success' | 'debug';
|
/package/{license → license.md}
RENAMED
|
File without changes
|