@nka212bg/backend-utils 0.1.49 → 0.1.51

package/mailSmsTools/index.js

@@ -10,150 +10,11 @@ const emailListFilePath = `${__basedir}/state/useremailList.json`;
 
 let EMAILS_LIST = existsSync(emailListFilePath) ? JSON.parse(readFileSync(emailListFilePath, "utf8") || "{}") : {};
 
-// set via require(".../mailSmsTools")({ ... }), empty values fall back to process.env
-const config = {
-    name: "", // "From" display name
-    logoUrl: "",
-    baseUrl: "",
-    smtp: {}, // nodemailer transport options, override the env defaults
-    twilio: {}, // { accountSid, authToken, sender }
-};
-let mailTransport;
-let twilio;
-
-// callable with options, named exports still work:
-// const { sendEmail } = require(".../mailSmsTools")({ name, logoUrl, baseUrl, smtp, twilio });
-// const { sendEmail } = require(".../mailSmsTools");
-module.exports = Object.assign((options = {}) => {
-    Object.assign(config, options);
-    mailTransport = twilio = null; // recreate with the new options on next send
-    return module.exports;
-}, exports);
-
-// created on first send, so the config is already applied
-const nodemailerTransport = () =>
-    (mailTransport ??= nodemailer.createTransport({
-        pool: true,
-        maxMessages: Infinity,
-        maxConnections: 20,
-
-        host: process.env.SMTP_HOST,
-        port: parseInt(process.env.SMTP_PORT),
-        secure: true, // true for 465, false for other ports
-        auth: {
-            user: process.env.SMTP_USER,
-            pass: process.env.SMTP_PASS,
-        },
-        ...config.smtp,
-    }));
-
-/* -------------------- EMAIL -------------------- */
-exports.sendEmail = async ({ email, content, subject, attachments, unsubscribe, userIp, logoUrl } = {}) => {
-    if (!content) return { error: "missing_content" };
-    if (!subject || subject === "") subject = content.substring(0, 25) + "... ";
-
-    const baseUrl = config.baseUrl || process.env.BASE_URL;
-    const smtpUser = config.smtp.auth?.user || process.env.SMTP_USER;
-    logoUrl ||= config.logoUrl;
-
-    const emailArray = strToEmailsArray(email || smtpUser);
-    if (!emailArray.length) {
-        return { error: "missing_email" };
-        //
-    } else if (userIp && emailArray.length === 1) {
-        let userlocation = `User IP: ${userIp}`;
-
-        const { error: locationError, data: locationData } = location({ ip: userIp });
-
-        if (!locationError) {
-            userlocation += `<br>Location: ${locationData.city} ${locationData.country_name} <a href="https://www.google.com/maps/@${locationData.coordinates.latitude},${locationData.coordinates.longitude},15z" target="_blank">see in map</a>`;
-        }
-
-        content += `<br/><br/>${userlocation}<br/><br/>`;
-    }
-
-    return new Promise((resolve, reject) => {
-        const emailListEmails = [];
-        const successEmails = [];
-        const errorEmails = [];
-
-        emailArray.forEach((e, i) => {
-            if (unsubscribe && e in EMAILS_LIST && EMAILS_LIST[e] == -1) {
-                emailListEmails.push(e);
-
-                if (i + 1 >= emailArray.length) resolve({ error: errorEmails.length ? errorEmails : null, emailList: emailListEmails.length ? emailListEmails : null, data: successEmails });
-                return;
-            }
-
-            const html = `
-            <div style="padding: 20px">
-                <table border="0" cellpadding="0" cellspacing="0" width="100%" role="presentation" style="margin: 0; max-width: 500px; padding: 0; font-family: system-ui; font-size: 14px; background-color: transparent">
-                    <tbody>
-                        <tr>
-                            <td style="padding-bottom: 6px">
-                                <img src="${logoUrl}" style="height: 36px; background-size: contain; background-repeat: no-repeat" />
-                            </td>
-                        </tr>
-                        <tr><td style="padding-bottom: 20px">${content}</td></tr>
-                        <tr>
-                            <td>
-                                <a href="${baseUrl}" target="_blank" style="text-decoration: none; color: gray; font-size: 12px">${new Date().getFullYear()} ${baseUrl}</a>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>`;
-
-            const mailOptions = {
-                from: config.name ? { name: config.name, address: smtpUser } : smtpUser,
-                // html: handlebars({ template: defaultTemplate, content, subject, logoUrl: `${process.env.BASE_URL}/logo_black.png` }),
-                html,
-                subject,
-                to: e,
-                attachments,
-            };
-
-            nodemailerTransport().sendMail(mailOptions, (error, info) => {
-                error ? errorEmails.push(error) : successEmails.push(info);
-
-                if (i + 1 >= emailArray.length) resolve({ error: errorEmails.length ? errorEmails : null, emailList: emailListEmails.length ? emailListEmails : null, data: successEmails });
-            });
-        });
-    });
-};
-
-/* -------------------- SMS -------------------- */
-exports.sendSMS = async ({ phones, content, sender = config.twilio.sender || process.env.TWILIO_SENDER } = {}) => {
-    if (!phones) return { error: "missing_phones" };
-    if (!content) return { error: "missing_content" };
-    if (!twilio) twilio = require("twilio")(config.twilio.accountSid || process.env.TWILIO_ACCOUNT_SID, config.twilio.authToken || process.env.TWILIO_AUTH_TOKEN);
-
-    return new Promise((resolve, reject) => {
-        const errorPhones = [];
-        const successPhones = [];
-
-        if (!Array.isArray(phones)) phones = [phones.toString()];
-        phones.forEach((e, i) => {
-            twilio.messages
-                .create({
-                    body: content,
-                    from: sender,
-                    to: e,
-                })
-                .then((message) => {
-                    successPhones.push(message);
-                    if (i >= phones.length - 1) setTimeout(() => resolve({ error: errorPhones.length ? errorPhones : null, data: successPhones }), i * 50);
-                })
-                .catch((error) => {
-                    errorPhones.push(error);
-                    if (i >= phones.length - 1) setTimeout(() => resolve({ error: errorPhones, data: successPhones }), i * 50);
-                });
-        });
-    });
-};
+const val = (v) => (typeof v == "function" ? v() : v);
 
 // -------- unsubscribe users --------
-exports.subscriptionState = {
+// shared by all instances, it's one file on disk
+const subscriptionState = {
     is(email) {
         return EMAILS_LIST[email];
     },
@@ -188,3 +49,183 @@ exports.subscriptionState = {
         if (change) writeFileSync(emailListFilePath, JSON.stringify(EMAILS_LIST));
     },
 };
+
+// every call creates a separate instance with its own config and transports:
+// const { sendEmail } = require(".../mailSmsTools")({ name, logoUrl, baseUrl, smtp, twilio });
+// const { sendEmail } = require(".../mailSmsTools"); // default instance, env config only
+//
+// empty values fall back to process.env
+// name, logoUrl, baseUrl, smtp, twilio can also be functions, resolved on each send (e.g. baseUrl: () => __baseUrl)
+const createInstance = (options = {}) => {
+    const config = {
+        name: "", // "From" display name
+        logoUrl: "",
+        baseUrl: "",
+        smtp: {}, // nodemailer transport options, override the env defaults
+        twilio: {}, // { accountSid, authToken, sender }
+        ...options,
+    };
+    let mailTransport, mailTransportKey;
+    let twilioClient, twilioClientKey;
+
+    // created on first send, rebuilt only when the smtp options change
+    const nodemailerTransport = (smtp) => {
+        const key = JSON.stringify(smtp);
+        if (mailTransport && key == mailTransportKey) return mailTransport;
+
+        mailTransport?.close();
+        mailTransportKey = key;
+
+        return (mailTransport = nodemailer.createTransport({
+            pool: true,
+            maxMessages: Infinity,
+            maxConnections: 20,
+
+            host: process.env.SMTP_HOST,
+            port: parseInt(process.env.SMTP_PORT),
+            secure: true, // true for 465, false for other ports
+            auth: {
+                user: process.env.SMTP_USER,
+                pass: process.env.SMTP_PASS,
+            },
+            ...smtp,
+        }));
+    };
+
+    // created on first send, rebuilt only when the credentials change
+    const twilioTransport = (twilio) => {
+        const accountSid = twilio.accountSid || process.env.TWILIO_ACCOUNT_SID;
+        const authToken = twilio.authToken || process.env.TWILIO_AUTH_TOKEN;
+
+        const key = `${accountSid}:${authToken}`;
+        if (twilioClient && key == twilioClientKey) return twilioClient;
+
+        twilioClientKey = key;
+        return (twilioClient = require("twilio")(accountSid, authToken));
+    };
+
+    return {
+        subscriptionState,
+
+        /* -------------------- EMAIL -------------------- */
+        async sendEmail({ email, content, subject, attachments, unsubscribe, userIp, logoUrl } = {}) {
+            if (!content) return { error: "missing_content" };
+            if (!subject || subject === "") subject = content.substring(0, 25) + "... ";
+
+            const name = val(config.name);
+            const baseUrl = val(config.baseUrl) || process.env.BASE_URL;
+            const smtp = val(config.smtp) || {};
+            const smtpUser = smtp.auth?.user || process.env.SMTP_USER;
+            logoUrl ||= val(config.logoUrl);
+
+            const emailArray = strToEmailsArray(email || smtpUser);
+            if (!emailArray.length) {
+                return { error: "missing_email" };
+                //
+            } else if (userIp && emailArray.length === 1) {
+                let userlocation = `User IP: ${userIp}`;
+
+                const { error: locationError, data: locationData } = location({ ip: userIp });
+
+                if (!locationError) {
+                    userlocation += `<br>Location: ${locationData.city} ${locationData.country_name} <a href="https://www.google.com/maps/@${locationData.coordinates.latitude},${locationData.coordinates.longitude},15z" target="_blank">see in map</a>`;
+                }
+
+                content += `<br/><br/>${userlocation}<br/><br/>`;
+            }
+
+            return new Promise((resolve, reject) => {
+                const emailListEmails = [];
+                const successEmails = [];
+                const errorEmails = [];
+
+                emailArray.forEach((e, i) => {
+                    if (unsubscribe && e in EMAILS_LIST && EMAILS_LIST[e] == -1) {
+                        emailListEmails.push(e);
+
+                        if (i + 1 >= emailArray.length) resolve({ error: errorEmails.length ? errorEmails : null, emailList: emailListEmails.length ? emailListEmails : null, data: successEmails });
+                        return;
+                    }
+
+                    const html = `
+                    <div style="padding: 20px">
+                        <table border="0" cellpadding="0" cellspacing="0" width="100%" role="presentation" style="margin: 0; max-width: 500px; padding: 0; font-family: system-ui; font-size: 14px; background-color: transparent">
+                            <tbody>
+                                ${
+                                    !logoUrl
+                                        ? ""
+                                        : `<tr>
+                                                <td style="padding-bottom: 6px">
+                                                    <img src="${logoUrl}" style="height: 36px; background-size: contain; background-repeat: no-repeat" />
+                                                </td>
+                                            </tr>`
+                                }
+                                <tr><td style="padding-bottom: 20px">${content}</td></tr>                                
+                                ${
+                                    !baseUrl
+                                        ? ""
+                                        : `<tr>
+                                                <td>
+                                                    <a href="${baseUrl}" target="_blank" style="text-decoration: none; color: gray; font-size: 12px">${new Date().getFullYear()} ${name || ""}</a>
+                                                </td>
+                                            </tr>`
+                                }
+                            </tbody>
+                        </table>
+                    </div>`;
+
+                    const mailOptions = {
+                        from: name ? { name, address: smtpUser } : smtpUser,
+                        // html: handlebars({ template: defaultTemplate, content, subject, logoUrl: `${process.env.BASE_URL}/logo_black.png` }),
+                        html,
+                        subject,
+                        to: e,
+                        attachments,
+                    };
+
+                    nodemailerTransport(smtp).sendMail(mailOptions, (error, info) => {
+                        error ? errorEmails.push(error) : successEmails.push(info);
+
+                        if (i + 1 >= emailArray.length) resolve({ error: errorEmails.length ? errorEmails : null, emailList: emailListEmails.length ? emailListEmails : null, data: successEmails });
+                    });
+                });
+            });
+        },
+
+        /* -------------------- SMS -------------------- */
+        async sendSMS({ phones, content, sender } = {}) {
+            if (!phones) return { error: "missing_phones" };
+            if (!content) return { error: "missing_content" };
+
+            const twilio = val(config.twilio) || {};
+            sender ||= twilio.sender || process.env.TWILIO_SENDER;
+            const client = twilioTransport(twilio);
+
+            return new Promise((resolve, reject) => {
+                const errorPhones = [];
+                const successPhones = [];
+
+                if (!Array.isArray(phones)) phones = [phones.toString()];
+                phones.forEach((e, i) => {
+                    client.messages
+                        .create({
+                            body: content,
+                            from: sender,
+                            to: e,
+                        })
+                        .then((message) => {
+                            successPhones.push(message);
+                            if (i >= phones.length - 1) setTimeout(() => resolve({ error: errorPhones.length ? errorPhones : null, data: successPhones }), i * 50);
+                        })
+                        .catch((error) => {
+                            errorPhones.push(error);
+                            if (i >= phones.length - 1) setTimeout(() => resolve({ error: errorPhones, data: successPhones }), i * 50);
+                        });
+                });
+            });
+        },
+    };
+};
+
+// callable for a configured instance, plain require gives the default one
+module.exports = Object.assign(createInstance, createInstance());

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@nka212bg/backend-utils",
     "author": "nka212bg",
-    "version": "0.1.49",
+    "version": "0.1.51",
     "main": "index.js",
     "dependencies": {
         "@maxmind/geoip2-node": "^5.0.0",