@nka212bg/backend-utils 0.1.46 → 0.1.48

package/mailSmsTools/index.js

@@ -10,25 +10,53 @@ const emailListFilePath = `${__basedir}/state/useremailList.json`;
 
 let EMAILS_LIST = existsSync(emailListFilePath) ? JSON.parse(readFileSync(emailListFilePath, "utf8") || "{}") : {};
 
-const 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,
-    },
-});
+// 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 = email_content.substring(0, 25) + "... ";
+    if (!subject || subject === "") subject = content.substring(0, 25) + "... ";
 
-    const emailArray = strToEmailsArray(email || process.env.SMTP_USER);
+    const baseUrl = config.baseUrl || process.env.BASE_URL;
+    const smtpUser = config.smtp.auth?.user || process.env.SMTP_USER;
+    logoUrl ||= config.logoUrl || `${baseUrl}/logo_black.png`;
+
+    const emailArray = strToEmailsArray(email || smtpUser);
     if (!emailArray.length) {
         return { error: "missing_email" };
         //
@@ -63,13 +91,13 @@ exports.sendEmail = async ({ email, content, subject, attachments, unsubscribe,
                     <tbody>
                         <tr>
                             <td style="padding-bottom: 6px">
-                                <img src="${logoUrl || `${process.env.BASE_URL}/logo_black.png`}" style="height: 36px; background-size: contain; background-repeat: no-repeat" />
+                                <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="${process.env.BASE_URL}" target="_blank" style="text-decoration: none; color: gray; font-size: 12px">${new Date().getFullYear()} ${process.env.BASE_URL}</a>
+                                <a href="${baseUrl}" target="_blank" style="text-decoration: none; color: gray; font-size: 12px">${new Date().getFullYear()} ${baseUrl}</a>
                             </td>
                         </tr>
                     </tbody>
@@ -77,7 +105,7 @@ exports.sendEmail = async ({ email, content, subject, attachments, unsubscribe,
             </div>`;
 
             const mailOptions = {
-                from: process.env.SMTP_USER,
+                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,
@@ -85,7 +113,7 @@ exports.sendEmail = async ({ email, content, subject, attachments, unsubscribe,
                 attachments,
             };
 
-            mailTransport.sendMail(mailOptions, (error, info) => {
+            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 });
@@ -95,11 +123,10 @@ exports.sendEmail = async ({ email, content, subject, attachments, unsubscribe,
 };
 
 /* -------------------- SMS -------------------- */
-let twilio;
-exports.sendSMS = async ({ phones, content, sender = process.env.TWILIO_SENDER } = {}) => {
+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")(process.env.TWILIO_ACCOUNT_SID, process.env.TWILIO_AUTH_TOKEN);
+    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 = [];

package/package.json

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

package/session.js

@@ -88,7 +88,7 @@ exports.serverState = new Proxy(
         },
 
         // SET / UPDATE / DELETE
-        // serverState["abc123"] = {name: 'alice'}; // create (stamps expirePeriod/expireTime/uuid)
+        // serverState["abc123"] = {name: 'alice'}; // create (stamps expirePeriod/expireTime/uid)
         // serverState["abc123"] = {name: 'alice2'}; // update (merges into existing)
         // serverState["abc123"] = null; // delete, cookie-expiry trick
         // serverState["name=alice"] = {name: 'john'}; // bulk update, merges into every entry where name == "alice"
@@ -123,7 +123,7 @@ exports.serverState = new Proxy(
 
             fields.expirePeriod ||= 60000 * 60 * 24 * 7; // 7 days
             fields.expireTime = now + fields.expirePeriod;
-            fields.uuid = createToken({ type: "date" });
+            fields.uid = createToken({ type: "date" });
 
             STATE[token] = fields;
             return { ...fields };
@@ -154,7 +154,7 @@ exports.session = {
 
         if (!payload.expirePeriod) payload.expirePeriod = 60000 * 60 * 24 * 7; // 7days
         payload.expireTime = now + payload.expirePeriod;
-        payload.uuid = createToken({ type: "date" });
+        payload.uid = createToken({ type: "date" });
 
         SESSION[token] = payload;
         return { ...payload, expireIn: payload.expirePeriod + 60000 };