@stamhoofd/email 2.1.3 → 2.3.0

package/dist/classes/Email.d.ts

@@ -0,0 +1,55 @@
+/// <reference types="node" />
+import Mail from 'nodemailer/lib/mailer';
+import { I18n } from "@stamhoofd/backend-i18n";
+export type EmailInterfaceRecipient = {
+    name?: string | null;
+    email: string;
+};
+export type EmailInterfaceBase = {
+    to: string | EmailInterfaceRecipient[];
+    bcc?: string;
+    replyTo?: string;
+    subject: string;
+    text?: string;
+    html?: string;
+    attachments?: {
+        filename: string;
+        path?: string;
+        href?: string;
+        content?: string | Buffer;
+        contentType?: string;
+    }[];
+    retryCount?: number;
+    type?: "transactional" | "broadcast";
+    headers?: Record<string, string> | null;
+};
+export type EmailInterface = EmailInterfaceBase & {
+    from: string;
+};
+export type EmailBuilder = () => EmailInterface | undefined;
+declare class EmailStatic {
+    transporter: Mail;
+    transactionalTransporter: Mail;
+    rps: number;
+    currentQueue: EmailBuilder[];
+    sending: boolean;
+    setupIfNeeded(): void;
+    private sendNextIfNeeded;
+    parseTo(to: string | EmailInterfaceRecipient[]): EmailInterfaceRecipient[];
+    /**
+     * Get the raw email
+     */
+    parseEmailStr(emailStr: string): string[];
+    private doSend;
+    getInternalEmailFor(i18n: I18n): string;
+    getPersonalEmailFor(i18n: I18n): string;
+    /**
+     * Send an internal e-mail (from stamhoofd)
+     */
+    sendInternal(data: EmailInterfaceBase, i18n: I18n): void;
+    send(data: EmailInterface): void;
+    schedule(builder: EmailBuilder): void;
+}
+export declare const Email: EmailStatic;
+export {};
+//# sourceMappingURL=Email.d.ts.map

package/dist/classes/Email.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Email.d.ts","sourceRoot":"","sources":["../../src/classes/Email.ts"],"names":[],"mappings":";AAEA,OAAO,IAAI,MAAM,uBAAuB,CAAC;AAIzC,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAA;AAE9C,MAAM,MAAM,uBAAuB,GAAG;IAClC,IAAI,CAAC,EAAE,MAAM,GAAC,IAAI,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACjB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC7B,EAAE,EAAE,MAAM,GAAC,uBAAuB,EAAE,CAAC;IACrC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,GAAC,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAClH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,eAAe,GAAG,WAAW,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAC,IAAI,CAAA;CACxC,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,kBAAkB,GAAG;IAC9C,IAAI,EAAE,MAAM,CAAC;CAChB,CAAA;AAGD,MAAM,MAAM,YAAY,GAAG,MAAM,cAAc,GAAG,SAAS,CAAA;AAE3D,cAAM,WAAW;IACb,WAAW,EAAE,IAAI,CAAC;IAClB,wBAAwB,EAAE,IAAI,CAAC;IAC/B,GAAG,SAAK;IAER,YAAY,EAAE,YAAY,EAAE,CAAK;IACjC,OAAO,UAAQ;IAEf,aAAa;IAkDb,OAAO,CAAC,gBAAgB;IA2BxB,OAAO,CAAC,EAAE,EAAE,MAAM,GAAC,uBAAuB,EAAE,GAAG,uBAAuB,EAAE;IASxE;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE;YAkF3B,MAAM;IA2HpB,mBAAmB,CAAC,IAAI,EAAE,IAAI;IAI9B,mBAAmB,CAAC,IAAI,EAAE,IAAI;IAI9B;;OAEG;IACH,YAAY,CAAC,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,IAAI;IAKjD,IAAI,CAAC,IAAI,EAAE,cAAc;IAgBzB,QAAQ,CAAC,OAAO,EAAE,YAAY;CAIjC;AAED,eAAO,MAAM,KAAK,aAAoB,CAAC"}

package/dist/classes/Email.js

@@ -0,0 +1,309 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Email = void 0;
+const tslib_1 = require("tslib");
+const utility_1 = require("@stamhoofd/utility");
+const nodemailer_1 = tslib_1.__importDefault(require("nodemailer"));
+const EmailAddress_1 = require("../models/EmailAddress");
+const html_to_text_1 = tslib_1.__importDefault(require("html-to-text"));
+const utility_2 = require("@stamhoofd/utility");
+const backend_i18n_1 = require("@stamhoofd/backend-i18n");
+class EmailStatic {
+    constructor() {
+        this.rps = 14;
+        this.currentQueue = [];
+        this.sending = false;
+    }
+    setupIfNeeded() {
+        if (this.transporter) {
+            return;
+        }
+        if (!STAMHOOFD.SMTP_HOST || !STAMHOOFD.SMTP_PORT) {
+            throw new Error("Missing environment variables to send emails");
+            return;
+        }
+        // create reusable transporter object using the default SMTP transport
+        this.transporter = nodemailer_1.default.createTransport({
+            pool: true,
+            host: STAMHOOFD.SMTP_HOST,
+            port: STAMHOOFD.SMTP_PORT,
+            auth: {
+                user: STAMHOOFD.SMTP_USERNAME, // generated ethereal user
+                pass: STAMHOOFD.SMTP_PASSWORD // generated ethereal password
+            }
+        });
+        // create reusable transporter object using the default SMTP transport
+        this.transactionalTransporter = nodemailer_1.default.createTransport({
+            pool: true,
+            host: STAMHOOFD.TRANSACTIONAL_SMTP_HOST,
+            port: STAMHOOFD.TRANSACTIONAL_SMTP_PORT,
+            auth: {
+                user: STAMHOOFD.TRANSACTIONAL_SMTP_USERNAME, // generated ethereal user
+                pass: STAMHOOFD.TRANSACTIONAL_SMTP_PASSWORD // generated ethereal password
+            }
+        });
+        // verify connection configuration
+        this.transporter.verify((error) => {
+            if (error) {
+                console.error("SMTP server not working", error);
+            }
+            else {
+                console.log("SMTP server is ready to take our messages");
+            }
+        });
+        // verify connection configuration
+        this.transactionalTransporter.verify((error) => {
+            if (error) {
+                console.error("Transactinoal SMTP server not working", error);
+            }
+            else {
+                console.log("Transactinoal SMTP server is ready to take our messages");
+            }
+        });
+    }
+    sendNextIfNeeded() {
+        if (!this.sending) {
+            if (this.currentQueue.length == 0) {
+                console.log("mail queue is empty");
+                return;
+            }
+            let next = this.currentQueue[0]();
+            while (next === undefined) {
+                this.currentQueue.shift();
+                if (this.currentQueue.length == 0) {
+                    console.log("mail queue is empty");
+                    return;
+                }
+                next = this.currentQueue[0]();
+            }
+            this.sending = true;
+            this.doSend(next).catch(e => {
+                console.error(e);
+            }).finally(() => {
+                this.sending = false;
+                this.sendNextIfNeeded();
+            });
+        }
+    }
+    parseTo(to) {
+        if (typeof to === "string") {
+            return this.parseEmailStr(to).map(email => ({ email }));
+        }
+        // Filter invalid email addresses
+        return to.filter(r => utility_1.DataValidator.isEmailValid(r.email));
+    }
+    /**
+     * Get the raw email
+     */
+    parseEmailStr(emailStr) {
+        let insideQuote = false;
+        let escaped = false;
+        let inAddr = false;
+        let email = "";
+        let didFindAddr = false;
+        let cleanedStr = "";
+        const addresses = [];
+        function endAddress() {
+            let m;
+            if (didFindAddr) {
+                m = email.trim();
+            }
+            else {
+                m = cleanedStr.trim();
+            }
+            if (utility_1.DataValidator.isEmailValid(m)) {
+                addresses.push(m);
+            }
+            didFindAddr = false;
+            email = "";
+            inAddr = false;
+            insideQuote = false;
+            escaped = false;
+            cleanedStr = "";
+        }
+        // eslint-disable-next-line @typescript-eslint/prefer-for-of
+        for (let index = 0; index < emailStr.length; index++) {
+            const shouldEscape = escaped;
+            if (escaped) {
+                escaped = false;
+            }
+            const character = emailStr[index];
+            if (insideQuote) {
+                if (character === "\\") {
+                    escaped = true;
+                    continue;
+                }
+            }
+            if (!shouldEscape) {
+                if (character === "\"") {
+                    if (insideQuote) {
+                        insideQuote = false;
+                        continue;
+                    }
+                    insideQuote = true;
+                    continue;
+                }
+                if (!insideQuote) {
+                    if (character === "<") {
+                        inAddr = true;
+                        continue;
+                    }
+                    if (character === ">") {
+                        inAddr = false;
+                        didFindAddr = true;
+                        continue;
+                    }
+                    if (character === ",") {
+                        // End previous address
+                        endAddress();
+                        continue;
+                    }
+                }
+            }
+            if (inAddr) {
+                email += character;
+            }
+            cleanedStr += character;
+        }
+        endAddress();
+        return addresses;
+    }
+    async doSend(data) {
+        var _a, _b;
+        if (STAMHOOFD.environment === 'test') {
+            // Do not send any emails
+            return;
+        }
+        // Check if this email is not marked as spam
+        // Filter recipients if bounced or spam
+        let recipients = this.parseTo(data.to);
+        if (recipients.length === 0) {
+            // Invalid string
+            console.warn("Invalid e-mail string: '" + data.to + "'. E-mail skipped");
+            return;
+        }
+        // Check spam and bounces
+        recipients = await EmailAddress_1.EmailAddress.filterSendTo(recipients);
+        if (recipients.length === 0) {
+            // Invalid string
+            console.warn("Filtered all emails due hard bounce or spam '" + data.to + "'. E-mail skipped");
+            return;
+        }
+        // Filter by environment
+        if (STAMHOOFD.environment === 'staging') {
+            recipients = recipients.filter(mail => !mail.email.includes("geen-email"));
+        }
+        if (STAMHOOFD.environment === 'development') {
+            recipients = recipients.filter(mail => mail.email.endsWith("@stamhoofd.be") || mail.email.endsWith("@bounce-testing.postmarkapp.com"));
+        }
+        if (recipients.length === 0) {
+            // Invalid string
+            console.warn("Filtered all emails due to environment filter '" + data.to + "'. E-mail skipped");
+            return;
+        }
+        // Rebuild to
+        const to = recipients.map((recipient) => {
+            if (!recipient.name) {
+                return recipient.email;
+            }
+            const cleanedName = utility_1.Formatter.emailSenderName(recipient.name);
+            if (cleanedName.length < 2) {
+                return recipient.email;
+            }
+            return '"' + cleanedName + '" <' + recipient.email + '>';
+        }).join(", ");
+        this.setupIfNeeded();
+        // send mail with defined transport object
+        const mail = {
+            from: data.from, // sender address
+            bcc: (STAMHOOFD.environment === "production" || !data.bcc) ? data.bcc : "simon@stamhoofd.be",
+            replyTo: data.replyTo,
+            to,
+            subject: data.subject, // Subject line
+            text: data.text, // plain text body
+        };
+        if (data.attachments) {
+            mail.attachments = data.attachments;
+        }
+        if (data.headers) {
+            mail.headers = data.headers;
+        }
+        if (data.html) {
+            mail.html = data.html;
+            if (!data.text) {
+                mail.text = html_to_text_1.default.fromString(data.html, {
+                    wordwrap: null,
+                    unorderedListItemPrefix: " - "
+                });
+            }
+        }
+        try {
+            if (!data.from.includes('@stamhoofd.be') && !data.from.includes('@stamhoofd.nl')) {
+                // Not supported
+                data.type = 'broadcast';
+            }
+            const transporter = (data.type === "transactional") ? this.transactionalTransporter : this.transporter;
+            const info = await transporter.sendMail(mail);
+            console.log("Message sent:", to, data.subject, info.messageId, data.type);
+        }
+        catch (e) {
+            console.error("Failed to send e-mail:");
+            console.error(e);
+            console.error(mail);
+            if (STAMHOOFD.environment === 'development') {
+                return;
+            }
+            // Sleep 1 second to give servers some time to fix possible rate limits
+            await (0, utility_2.sleep)(1000);
+            // Reschedule twice (at maximum) to fix temporary connection issues
+            data.retryCount = ((_a = data.retryCount) !== null && _a !== void 0 ? _a : 0) + 1;
+            if (data.retryCount <= 2) {
+                this.send(data);
+            }
+            else {
+                // Email address is not verified.
+                if (!data.from.includes("hallo@stamhoofd.be")) {
+                    this.sendInternal({
+                        to: "hallo@stamhoofd.be",
+                        subject: "E-mail kon niet worden verzonden",
+                        text: "Een e-mail vanaf " + data.from + " kon niet worden verstuurd aan " + mail.to + ": \n\n" + e + "\n\n" + ((_b = mail.text) !== null && _b !== void 0 ? _b : ""),
+                        type: (data.type === "transactional") ? "broadcast" : "transactional"
+                    }, new backend_i18n_1.I18n("nl", "BE"));
+                }
+            }
+        }
+    }
+    getInternalEmailFor(i18n) {
+        return '"Stamhoofd" <' + (i18n.$t("shared.emails.general")) + '>';
+    }
+    getPersonalEmailFor(i18n) {
+        return '"Simon Backx" <' + (i18n.$t("shared.emails.personal")) + '>';
+    }
+    /**
+     * Send an internal e-mail (from stamhoofd)
+     */
+    sendInternal(data, i18n) {
+        const mail = Object.assign(data, { from: this.getInternalEmailFor(i18n) });
+        this.send(mail);
+    }
+    send(data) {
+        if (STAMHOOFD.environment === 'test') {
+            // Do not send any emails
+            return;
+        }
+        let didSend = false;
+        this.schedule(() => {
+            if (didSend) {
+                return undefined;
+            }
+            didSend = true;
+            return data;
+        });
+    }
+    schedule(builder) {
+        this.currentQueue.push(builder);
+        this.sendNextIfNeeded();
+    }
+}
+exports.Email = new EmailStatic();
+//# sourceMappingURL=Email.js.map

package/dist/classes/Email.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Email.js","sourceRoot":"","sources":["../../src/classes/Email.ts"],"names":[],"mappings":"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"}

package/dist/classes/Email.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=Email.test.d.ts.map

package/dist/classes/Email.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Email.test.d.ts","sourceRoot":"","sources":["../../src/classes/Email.test.ts"],"names":[],"mappings":""}

package/dist/classes/Email.test.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Email_1 = require("./Email");
+describe("Email", () => {
+    it("should parse e-mail strings correctly", () => {
+        expect(Email_1.Email.parseEmailStr('"My crazy name" <hallo@stamhoofd.be>')).toEqual(["hallo@stamhoofd.be"]);
+        expect(Email_1.Email.parseEmailStr('hallo@stamhoofd.be')).toEqual(["hallo@stamhoofd.be"]);
+        expect(Email_1.Email.parseEmailStr('hallo@stamhoofd.be ')).toEqual(["hallo@stamhoofd.be"]);
+        expect(Email_1.Email.parseEmailStr('"hallo@stamhoofd.be"')).toEqual(["hallo@stamhoofd.be"]);
+        expect(Email_1.Email.parseEmailStr('<"hallo@stamhoofd.be">')).toEqual(["hallo@stamhoofd.be"]);
+        expect(Email_1.Email.parseEmailStr('Gekke naam <"hallo@stamhoofd.be">')).toEqual(["hallo@stamhoofd.be"]);
+        expect(Email_1.Email.parseEmailStr('<"hallo@stam\\"hoofd.be">')).toEqual([]);
+        expect(Email_1.Email.parseEmailStr('<"hallo@stam,hoofd.be">')).toEqual([]);
+        expect(Email_1.Email.parseEmailStr('<hallo@stam,hoofd.be>')).toEqual([]);
+        expect(Email_1.Email.parseEmailStr('"Hallo <dit is een test>" <hallo@stamhoofd.be>')).toEqual(["hallo@stamhoofd.be"]);
+        expect(Email_1.Email.parseEmailStr('"Hallo 👋🏽" <hallo@stamhoofd.be>')).toEqual(["hallo@stamhoofd.be"]);
+        expect(Email_1.Email.parseEmailStr('Hallo <hallo@stam.hoofd.be>')).toEqual(["hallo@stam.hoofd.be"]);
+        expect(Email_1.Email.parseEmailStr('Hallo <hallo@stam.hoofd.be')).toEqual([]);
+        expect(Email_1.Email.parseEmailStr('"Hallo <dit is \\" een test>" <hallo@stamhoofd.be>')).toEqual(["hallo@stamhoofd.be"]);
+        expect(Email_1.Email.parseEmailStr('"Hallo <dit is \\" een test佐>" <hallo@stamhoofd.be>')).toEqual(["hallo@stamhoofd.be"]);
+        expect(Email_1.Email.parseEmailStr('"Voornaam \'l Achternaam, en nog iets" <jwz@netscape.com>')).toEqual(["jwz@netscape.com"]);
+        expect(Email_1.Email.parseEmailStr('"Voornaam \'l Achternaam, en nog iets" <jwz@netscape.com>, "My crazy name" <hallo@stamhoofd.be>')).toEqual(["jwz@netscape.com", "hallo@stamhoofd.be"]);
+        expect(Email_1.Email.parseEmailStr('hallo@example.com, test@test.com')).toEqual(["hallo@example.com", "test@test.com"]);
+        expect(Email_1.Email.parseEmailStr('hallo@example.com, invalid, test@test.com')).toEqual(["hallo@example.com", "test@test.com"]);
+    });
+});
+//# sourceMappingURL=Email.test.js.map

package/dist/classes/Email.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Email.test.js","sourceRoot":"","sources":["../../src/classes/Email.test.ts"],"names":[],"mappings":";;AAAA,mCAA+B;AAE/B,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACnB,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC7C,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,sCAAsC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAA;QACnG,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAA;QACjF,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAA;QAClF,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAA;QACnF,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAA;QACrF,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,mCAAmC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAA;QAChG,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,2BAA2B,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QACpE,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,yBAAyB,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAClE,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAChE,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,gDAAgD,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAA;QAC7G,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,mCAAmC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAA;QAChG,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,6BAA6B,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAA;QAC3F,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAErE,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,oDAAoD,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAA;QACjH,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,qDAAqD,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAA;QAElH,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,2DAA2D,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAA;QACtH,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,iGAAiG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,CAAC,CAAA;QAElL,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,kCAAkC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC,CAAA;QAC/G,MAAM,CAAC,aAAK,CAAC,aAAa,CAAC,2CAA2C,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC,CAAA;IAC5H,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}

package/dist/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./models/EmailAddress";
+export * from "./classes/Email";
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,iBAAiB,CAAA"}

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,gEAAqC;AACrC,0DAA+B"}

package/dist/migrations/1603433451-email-addresses.sql

@@ -0,0 +1,14 @@
+CREATE TABLE `email_addresses` (
+  `id` varchar(36) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL,
+  `email` varchar(255) DEFAULT NULL,
+  `organizationId` varchar(36) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL,
+  `markedAsSpam` tinyint(1) DEFAULT NULL,
+  `hardBounce` tinyint(1) DEFAULT NULL,
+  `unsubscribedMarketing` tinyint(1) DEFAULT NULL,
+  `unsubscribedAll` tinyint(1) DEFAULT NULL,
+  `token` varchar(255) CHARACTER SET ascii COLLATE ascii_general_ci DEFAULT NULL,
+  `createdAt` datetime NOT NULL,
+  `updatedAt` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `email` (`email`,`organizationId`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

package/dist/migrations/1720080975-convert-charset.sql

@@ -0,0 +1,5 @@
+set foreign_key_checks=0; 
+ALTER TABLE `email_addresses` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `email_addresses` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER DATABASE CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+set foreign_key_checks=1; 

package/dist/models/EmailAddress.d.ts

@@ -0,0 +1,23 @@
+import { Model } from '@simonbackx/simple-database';
+import { EmailInterfaceRecipient } from '../classes/Email';
+export declare class EmailAddress extends Model {
+    static table: string;
+    id: string;
+    organizationId: string | null;
+    email: string;
+    markedAsSpam: boolean;
+    hardBounce: boolean;
+    unsubscribedMarketing: boolean;
+    unsubscribedAll: boolean;
+    token: string | null;
+    /**
+     * createdAt behaves more like createdAt for Challenge. Since every save is considered to have a new challenge
+     */
+    createdAt: Date;
+    updatedAt: Date;
+    static getOrCreate(email: string, organizationId: string | null): Promise<EmailAddress>;
+    static getByEmails(emails: string[], organizationId: string | null): Promise<EmailAddress[]>;
+    static getByEmail(email: string, organizationId: string | null): Promise<EmailAddress | undefined>;
+    static filterSendTo(recipients: EmailInterfaceRecipient[]): Promise<EmailInterfaceRecipient[]>;
+}
+//# sourceMappingURL=EmailAddress.d.ts.map

package/dist/models/EmailAddress.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EmailAddress.d.ts","sourceRoot":"","sources":["../../src/models/EmailAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAItE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAc3D,qBAAa,YAAa,SAAQ,KAAK;IACnC,MAAM,CAAC,KAAK,SAAqB;IAOjC,EAAE,EAAG,MAAM,CAAC;IAGZ,cAAc,EAAE,MAAM,GAAG,IAAI,CAAQ;IAIrC,KAAK,EAAE,MAAM,CAAC;IAGd,YAAY,UAAS;IAGrB,UAAU,UAAS;IAGnB,qBAAqB,UAAS;IAG9B,eAAe,UAAS;IAGxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;OAEG;IAQH,SAAS,EAAE,IAAI,CAAA;IASf,SAAS,EAAE,IAAI,CAAA;WAEF,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC;WAoBhF,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;WA6BrF,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;WAK3F,YAAY,CAAC,UAAU,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;CAkBvG"}

package/dist/models/EmailAddress.js

@@ -0,0 +1,127 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EmailAddress = void 0;
+const tslib_1 = require("tslib");
+const simple_database_1 = require("@simonbackx/simple-database");
+const crypto_1 = tslib_1.__importDefault(require("crypto"));
+const uuid_1 = require("uuid");
+const queues_1 = require("@stamhoofd/queues");
+async function randomBytes(size) {
+    return new Promise((resolve, reject) => {
+        crypto_1.default.randomBytes(size, (err, buf) => {
+            if (err) {
+                reject(err);
+                return;
+            }
+            resolve(buf);
+        });
+    });
+}
+class EmailAddress extends simple_database_1.Model {
+    constructor() {
+        super(...arguments);
+        this.organizationId = null;
+        this.markedAsSpam = false;
+        this.hardBounce = false;
+        this.unsubscribedMarketing = false;
+        this.unsubscribedAll = false;
+    }
+    static async getOrCreate(email, organizationId) {
+        // Prevent race conditions when checking the same email address at the same time, and creating a new one
+        return await queues_1.QueueHandler.schedule("email-address/create-" + email + '-' + organizationId, async () => {
+            const existing = await this.getByEmail(email, organizationId);
+            if (existing) {
+                return existing;
+            }
+            const n = new EmailAddress();
+            n.organizationId = organizationId;
+            n.email = email;
+            n.token = (await randomBytes(64)).toString("base64").toUpperCase();
+            await n.save();
+            return n;
+        });
+    }
+    // Methods
+    static async getByEmails(emails, organizationId) {
+        if (emails.length > 30) {
+            // Normally an organization will never have so much bounces, so we'll request all emails and filter in them
+            const all = await this.where({ organizationId }, { limit: 1000 });
+            return all.filter(e => emails.includes(e.email));
+        }
+        if (emails.length == 0) {
+            return [];
+        }
+        if (organizationId === null) {
+            const [rows] = await simple_database_1.Database.select(`SELECT ${this.getDefaultSelect()} FROM ${this.table} WHERE \`email\` IN (?) AND \`organizationId\` is NULL`, [emails]);
+            return this.fromRows(rows, this.table);
+        }
+        const [rows] = await simple_database_1.Database.select(`SELECT ${this.getDefaultSelect()} FROM ${this.table} WHERE \`email\` IN (?) AND \`organizationId\` = ?`, [emails, organizationId]);
+        return this.fromRows(rows, this.table);
+    }
+    // Methods
+    static async getByEmail(email, organizationId) {
+        return (await this.where({ email, organizationId }, { limit: 1 }))[0];
+    }
+    // Methods
+    static async filterSendTo(recipients) {
+        if (recipients.length == 0) {
+            return [];
+        }
+        const emails = recipients.map(r => r.email);
+        const [results] = await simple_database_1.Database.select(`SELECT email FROM ${this.table} WHERE \`email\` IN (?) AND (\`hardBounce\` = 1 OR \`markedAsSpam\` = 1)`, [emails]);
+        const remove = results.map(r => r[this.table]['email']);
+        if (remove.length == 0) {
+            return recipients;
+        }
+        return recipients.filter(r => !remove.includes(r.email));
+    }
+}
+exports.EmailAddress = EmailAddress;
+EmailAddress.table = "email_addresses";
+tslib_1.__decorate([
+    (0, simple_database_1.column)({
+        primary: true, type: "string", beforeSave(value) {
+            return value !== null && value !== void 0 ? value : (0, uuid_1.v4)();
+        }
+    })
+], EmailAddress.prototype, "id", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: "string", nullable: true })
+], EmailAddress.prototype, "organizationId", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: "string" })
+], EmailAddress.prototype, "email", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: "boolean" })
+], EmailAddress.prototype, "markedAsSpam", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: "boolean" })
+], EmailAddress.prototype, "hardBounce", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: "boolean" })
+], EmailAddress.prototype, "unsubscribedMarketing", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: "boolean" })
+], EmailAddress.prototype, "unsubscribedAll", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: "string", nullable: true })
+], EmailAddress.prototype, "token", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({
+        type: "datetime", beforeSave() {
+            const date = new Date();
+            date.setMilliseconds(0);
+            return date;
+        }
+    })
+], EmailAddress.prototype, "createdAt", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({
+        type: "datetime", beforeSave() {
+            const date = new Date();
+            date.setMilliseconds(0);
+            return date;
+        }
+    })
+], EmailAddress.prototype, "updatedAt", void 0);
+//# sourceMappingURL=EmailAddress.js.map

package/dist/models/EmailAddress.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EmailAddress.js","sourceRoot":"","sources":["../../src/models/EmailAddress.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,12 +1,13 @@
 {
     "name": "@stamhoofd/email",
-    "version": "2.1.3",
+    "version": "2.3.0",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "license": "UNLICENCED",
     "sideEffects": false,
     "files": [
-        "src"
+        "src",
+        "dist"
     ],
     "scripts": {
         "build": "tsc -b && mkdir -p ./dist/migrations && cp ./src/migrations/*.sql ./dist/migrations",
@@ -22,5 +23,5 @@
         "html-to-text": "^8.1.0",
         "nodemailer": "6.9.13"
     },
-    "gitHead": "b5773c547dceaae52b9c2a098b222417fcd42e4f"
+    "gitHead": "558516ab829f9a35ded06b8982991b1445a22c2c"
 }

package/src/migrations/1720080975-convert-charset.sql

@@ -0,0 +1,5 @@
+set foreign_key_checks=0; 
+ALTER TABLE `email_addresses` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER TABLE `email_addresses` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+ALTER DATABASE CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+set foreign_key_checks=1;