@nka212bg/backend-utils 0.1.6 → 0.1.8

package/mailSmsTools/index.js

@@ -1,4 +1,5 @@
 const { existsSync, readFileSync, writeFileSync } = require("fs");
+const { strToEmailsArray, handlebars } = require("../misc");
 const { location } = require("../location");
 
 const nodemailer = require("nodemailer");
@@ -21,11 +22,11 @@ const mailTransport = nodemailer.createTransport({
     },
 });
 
-exports.sendEmail = async ({ email, content, subject, attachments, unsubscribe, userIp } = {}) => {
+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) + "... ";
 
-    const emailArray = this.strToEmailsArray(email || process.env.SMTP_USER);
+    const emailArray = strToEmailsArray(email || process.env.SMTP_USER);
     if (!emailArray.length) {
         return { error: "missing_email" };
         //
@@ -54,9 +55,29 @@ exports.sendEmail = async ({ email, content, subject, attachments, unsubscribe,
                 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 || `${process.env.BASE_URL}/logo_black.png`}" 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>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>`;
+
             const mailOptions = {
                 from: process.env.SMTP_USER,
-                html: this.handlebars({ template: defaultTemplate, content, subject, logoUrl: `${process.env.BASE_URL}/logo_black.png` }),
+                // html: handlebars({ template: defaultTemplate, content, subject, logoUrl: `${process.env.BASE_URL}/logo_black.png` }),
+                html,
                 subject,
                 to: e,
                 attachments,
@@ -138,25 +159,3 @@ exports.subscriptionState = {
         if (change) writeFileSync(emailListFilePath, JSON.stringify(EMAILS_LIST));
     },
 };
-
-//HELPERS
-exports.strToEmailsArray = (emailString) => {
-    try {
-        emailString = JSON.stringify(emailString);
-    } catch {}
-
-    return [...new Set(((emailString + "").match(/((?=\w)[^ \?'<>"\n\t]+)@(\w[^ \?'<>"\n\t]+)/gi) || []).map((e) => e.trim().toLowerCase()))].sort();
-};
-
-exports.handlebars = ({ template, ...params } = {}) => {
-    const placeholders = template.match(/(\{\{)(.*?)(\}\})/g);
-
-    for (const p in params) {
-        const placeholder = placeholders.find((e) => e.includes(p));
-        if (!placeholder) continue;
-
-        template = template.replace(RegExp(placeholder, "g"), params[p]);
-    }
-
-    return template;
-};

package/misc.js

@@ -462,3 +462,31 @@ exports.urlMetadata = async ({ url }) => {
         return { error: String(error) };
     }
 };
+
+exports.strToEmailsArray = (emailString) => {
+    try {
+        emailString = JSON.stringify(emailString);
+    } catch {}
+
+    // return [...new Set(((emailString + "").match(/((?=\w)[^ \?'<>"\n\t]+)@(\w[^ \?'<>"\n\t]+)/gi) || []).map((e) => e.trim().toLowerCase()))].sort();
+    return [
+        ...new Set(
+            String(emailString)
+                .toLowerCase()
+                .match(/\w[\w\.-]+\w@\w+((\.\w+){1,})+\w+/gi)
+        ),
+    ].sort();
+};
+
+exports.handlebars = ({ template, ...params } = {}) => {
+    const placeholders = template.match(/(\{\{)(.*?)(\}\})/g);
+
+    for (const p in params) {
+        const placeholder = placeholders.find((e) => e.includes(p));
+        if (!placeholder) continue;
+
+        template = template.replace(RegExp(placeholder, "g"), params[p]);
+    }
+
+    return template;
+};

package/package.json

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