README.md

@@ -14,7 +14,7 @@ Some features:
 
 ```yaml
 - name: Send mail
-  uses: dawidd6/action-send-mail@v4
+  uses: dawidd6/action-send-mail@v3
   with:
     # Specify connection via URL (replaces server_address, server_port, secure,
     # username and password)

main.js

@@ -16,7 +16,7 @@ function getText(textOrFile, convertMarkdown) {
 
     // Convert Markdown to HTML
     if (convertMarkdown) {
-        const converter = new showdown.Converter({tables: true})
+        const converter = new showdown.Converter()
         text = converter.makeHtml(text)
     }
 
@@ -37,12 +37,6 @@ 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")
@@ -124,43 +118,20 @@ async function main() {
             debug: nodemailerdebug,
         })
 
-        var i = 1;
+        const info = await transport.sendMail({
-        while (true) {
+            from: getFrom(from, username),
-            try {
+            to: to,
-                const info = await transport.sendMail({
+            subject: getText(subject, false),
-                    from: getFrom(from, username),
+            cc: cc ? cc : undefined,
-                    to: to,
+            bcc: bcc ? bcc : undefined,
-                    subject: getText(subject, false),
+            replyTo: replyTo ? replyTo : undefined,
-                    cc: cc ? cc : undefined,
+            inReplyTo: inReplyTo ? inReplyTo : undefined,
-                    bcc: bcc ? bcc : undefined,
+            references: inReplyTo ? inReplyTo : undefined,
-                    replyTo: replyTo ? replyTo : undefined,
+            text: body ? getText(body, false) : undefined,
-                    inReplyTo: inReplyTo ? inReplyTo : undefined,
+            html: htmlBody ? getText(htmlBody, convertMarkdown) : undefined,
-                    references: inReplyTo ? inReplyTo : undefined,
+            priority: priority ? priority : undefined,
-                    text: body ? getText(body, false) : undefined,
+            attachments: attachments ? (await getAttachments(attachments)) : 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,27 +6,19 @@
     "": {
       "name": "action-send-mail",
       "dependencies": {
-        "@actions/core": "^1.11.1",
+        "@actions/core": "^1.10.1",
         "@actions/glob": "^0.4.0",
-        "nodemailer": "^6.10.0",
+        "nodemailer": "^6.9.8",
         "showdown": "^1.9.1"
       }
     },
     "node_modules/@actions/core": {
-      "version": "1.11.1",
+      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.1.tgz",
-      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
+      "integrity": "sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==",
       "dependencies": {
-        "@actions/exec": "^1.1.1",
+        "@actions/http-client": "^2.0.1",
-        "@actions/http-client": "^2.0.1"
+        "uuid": "^8.3.2"
-      }
-    },
-    "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": {
@@ -46,11 +38,6 @@
         "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",
@@ -184,10 +171,9 @@
       }
     },
     "node_modules/nodemailer": {
-      "version": "6.10.0",
+      "version": "6.9.8",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.0.tgz",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.8.tgz",
-      "integrity": "sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA==",
+      "integrity": "sha512-cfrYUk16e67Ks051i4CntM9kshRYei1/o/Gi8K1d+R34OIs21xdFnW7Pt7EucmVKA0LKtqUGNcjMZ7ehjl49mQ==",
-      "license": "MIT-0",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -294,6 +280,14 @@
         "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",
@@ -347,20 +341,12 @@
   },
   "dependencies": {
     "@actions/core": {
-      "version": "1.11.1",
+      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.1.tgz",
-      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
+      "integrity": "sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==",
       "requires": {
-        "@actions/exec": "^1.1.1",
+        "@actions/http-client": "^2.0.1",
-        "@actions/http-client": "^2.0.1"
+        "uuid": "^8.3.2"
-      }
-    },
-    "@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": {
@@ -380,11 +366,6 @@
         "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",
@@ -491,9 +472,9 @@
       }
     },
     "nodemailer": {
-      "version": "6.10.0",
+      "version": "6.9.8",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.0.tgz",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.8.tgz",
-      "integrity": "sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA=="
+      "integrity": "sha512-cfrYUk16e67Ks051i4CntM9kshRYei1/o/Gi8K1d+R34OIs21xdFnW7Pt7EucmVKA0LKtqUGNcjMZ7ehjl49mQ=="
     },
     "p-limit": {
       "version": "2.3.0",
@@ -567,6 +548,11 @@
       "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.11.1",
+    "@actions/core": "^1.10.1",
     "@actions/glob": "^0.4.0",
-    "nodemailer": "^6.10.0",
+    "nodemailer": "^6.9.8",
     "showdown": "^1.9.1"
   }
 }