Enable the Showdown option to support tables (#220)

* Add support for table rendering

main.js

@@ -16,7 +16,7 @@ function getText(textOrFile, convertMarkdown) {
 
     // Convert Markdown to HTML
     if (convertMarkdown) {
-        const converter = new showdown.Converter()
+        const converter = new showdown.Converter({tables: true})
         text = converter.makeHtml(text)
     }
 
@@ -37,6 +37,12 @@ async function getAttachments(attachments) {
     return files.map(f => ({ filename: path.basename(f), path: f, cid: f.replace(/^.*[\\\/]/, '')}))
 }
 
+function sleep(ms) {
+    return new Promise((resolve) => {
+       setTimeout(resolve, ms);
+    });
+}
+
 async function main() {
     try {
         let serverAddress = core.getInput("server_address")
@@ -118,20 +124,43 @@ async function main() {
             debug: nodemailerdebug,
         })
 
-        const info = await transport.sendMail({
-            from: getFrom(from, username),
-            to: to,
-            subject: getText(subject, false),
-            cc: cc ? cc : undefined,
-            bcc: bcc ? bcc : undefined,
-            replyTo: replyTo ? replyTo : undefined,
-            inReplyTo: inReplyTo ? inReplyTo : undefined,
-            references: inReplyTo ? inReplyTo : undefined,
-            text: body ? getText(body, false) : undefined,
-            html: htmlBody ? getText(htmlBody, convertMarkdown) : undefined,
-            priority: priority ? priority : undefined,
-            attachments: attachments ? (await getAttachments(attachments)) : undefined,
-        })
+        var i = 1;
+        while (true) {
+            try {
+                const info = await transport.sendMail({
+                    from: getFrom(from, username),
+                    to: to,
+                    subject: getText(subject, false),
+                    cc: cc ? cc : undefined,
+                    bcc: bcc ? bcc : undefined,
+                    replyTo: replyTo ? replyTo : undefined,
+                    inReplyTo: inReplyTo ? inReplyTo : undefined,
+                    references: inReplyTo ? inReplyTo : undefined,
+                    text: body ? getText(body, false) : undefined,
+                    html: htmlBody ? getText(htmlBody, convertMarkdown) : undefined,
+                    priority: priority ? priority : undefined,
+                    attachments: attachments ? (await getAttachments(attachments)) : undefined,
+                });
+                break;
+            } catch (error) {
+                if (!error.message.includes("Try again later,")) {
+                    core.setFailed(error.message)
+                    break;
+                }
+                if (i > 10) {
+                    core.setFailed(error.message)
+                    break;
+                }
+                console.log("Received: " + error.message);
+                if (i < 2) {
+                    console.log("Trying again in a minute...");
+                } else {
+                    console.log("Trying again in " + i + " minutes...");
+                }
+                await sleep(i * 60000);
+                i++;
+            }
+        }
     } catch (error) {
         core.setFailed(error.message)
     }

package-lock.json

@@ -6,19 +6,27 @@
     "": {
       "name": "action-send-mail",
       "dependencies": {
-        "@actions/core": "^1.10.1",
+        "@actions/core": "^1.11.1",
         "@actions/glob": "^0.4.0",
-        "nodemailer": "^6.9.8",
+        "nodemailer": "^6.9.16",
         "showdown": "^1.9.1"
       }
     },
     "node_modules/@actions/core": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.1.tgz",
-      "integrity": "sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
+      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
       "dependencies": {
-        "@actions/http-client": "^2.0.1",
-        "uuid": "^8.3.2"
+        "@actions/exec": "^1.1.1",
+        "@actions/http-client": "^2.0.1"
+      }
+    },
+    "node_modules/@actions/exec": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
+      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
+      "dependencies": {
+        "@actions/io": "^1.0.1"
       }
     },
     "node_modules/@actions/glob": {
@@ -38,6 +46,11 @@
         "tunnel": "^0.0.6"
       }
     },
+    "node_modules/@actions/io": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz",
+      "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q=="
+    },
     "node_modules/ansi-regex": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
@@ -171,9 +184,9 @@
       }
     },
     "node_modules/nodemailer": {
-      "version": "6.9.8",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.8.tgz",
-      "integrity": "sha512-cfrYUk16e67Ks051i4CntM9kshRYei1/o/Gi8K1d+R34OIs21xdFnW7Pt7EucmVKA0LKtqUGNcjMZ7ehjl49mQ==",
+      "version": "6.9.16",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.16.tgz",
+      "integrity": "sha512-psAuZdTIRN08HKVd/E8ObdV6NO7NTBY3KsC30F7M4H1OnmLCUNaS56FpYxyb26zWLSyYF9Ozch9KYHhHegsiOQ==",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -280,14 +293,6 @@
         "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
       }
     },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
     "node_modules/which-module": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
@@ -341,12 +346,20 @@
   },
   "dependencies": {
     "@actions/core": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.1.tgz",
-      "integrity": "sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
+      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
       "requires": {
-        "@actions/http-client": "^2.0.1",
-        "uuid": "^8.3.2"
+        "@actions/exec": "^1.1.1",
+        "@actions/http-client": "^2.0.1"
+      }
+    },
+    "@actions/exec": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
+      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
+      "requires": {
+        "@actions/io": "^1.0.1"
       }
     },
     "@actions/glob": {
@@ -366,6 +379,11 @@
         "tunnel": "^0.0.6"
       }
     },
+    "@actions/io": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz",
+      "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q=="
+    },
     "ansi-regex": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
@@ -472,9 +490,9 @@
       }
     },
     "nodemailer": {
-      "version": "6.9.8",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.8.tgz",
-      "integrity": "sha512-cfrYUk16e67Ks051i4CntM9kshRYei1/o/Gi8K1d+R34OIs21xdFnW7Pt7EucmVKA0LKtqUGNcjMZ7ehjl49mQ=="
+      "version": "6.9.16",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.16.tgz",
+      "integrity": "sha512-psAuZdTIRN08HKVd/E8ObdV6NO7NTBY3KsC30F7M4H1OnmLCUNaS56FpYxyb26zWLSyYF9Ozch9KYHhHegsiOQ=="
     },
     "p-limit": {
       "version": "2.3.0",
@@ -548,11 +566,6 @@
       "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
       "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
     },
-    "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-    },
     "which-module": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",

package.json

@@ -2,9 +2,9 @@
   "name": "action-send-mail",
   "main": "main.js",
   "dependencies": {
-    "@actions/core": "^1.10.1",
+    "@actions/core": "^1.11.1",
     "@actions/glob": "^0.4.0",
-    "nodemailer": "^6.9.8",
+    "nodemailer": "^6.9.16",
     "showdown": "^1.9.1"
   }
 }