Exports messages that were not delivered (#2394)

* exports messages that were not delivered

* export non-modified user prop values

* add common append pipedream text method

* refactor only include attributes in params passed to methods

Co-authored-by: js07

Author: andrewjschuang

components/discord_webhook/actions/send-message-advanced/send-message-advanced.mjs

@@ -5,7 +5,7 @@ export default {
   key: "discord_webhook-send-message-advanced",
   name: "Send Message (Advanced)",
   description: "Send a simple or structured message (using embeds) to a Discord channel",
-  version: "0.2.1",
+  version: "0.3.0",
   type: "action",
   props: {
     ...common.props,
@@ -23,7 +23,7 @@ export default {
       ],
     },
   },
-  async run() {
+  async run({ $ }) {
     const {
       message,
       avatarURL,
@@ -37,22 +37,22 @@ export default {
       throw new Error("This action requires at least 1 message OR embeds object. Please enter one or the other above.");
     }
 
-    let content = message ?? "";
-
-    if (includeSentViaPipedream) {
-      if (typeof content !== "string") {
-        content = JSON.stringify(content);
-      }
-      content += `\n\n${this.getSentViaPipedreamText()}`;
+    try {
+      // No interesting data is returned from Discord
+      await this.discordWebhook.sendMessage({
+        avatarURL,
+        threadID,
+        username,
+        embeds,
+        content: includeSentViaPipedream
+          ? this.appendPipedreamText(message ?? "")
+          : message,
+      });
+      $.export("$summary", "Message sent successfully");
+    } catch (err) {
+      const unsentMessage = this.getUserInputProps();
+      $.export("unsent", unsentMessage);
+      throw err;
     }
-
-    // No interesting data is returned from Discord
-    await this.discordWebhook.sendMessage({
-      avatarURL,
-      embeds,
-      content,
-      threadID,
-      username,
-    });
   },
 };

components/discord_webhook/actions/send-message-common.mjs

@@ -39,6 +39,24 @@ export default {
     },
   },
   methods: {
+    getUserInputProps(omit = [
+      "discordWebhook",
+    ]) {
+      return Object.keys(this)
+        .filter((k) => typeof this[k] !== "function" && !omit.includes(k))
+        .reduce((props, key) => {
+          props[key] = this[key];
+          return props;
+        }, {});
+    },
+    appendPipedreamText(message) {
+      let content = message;
+      if (typeof content !== "string") {
+        content = JSON.stringify(content);
+      }
+      content += `\n\n${this.getSentViaPipedreamText()}`;
+      return content;
+    },
     getSentViaPipedreamText() {
       const workflowId = process.env.PIPEDREAM_WORKFLOW_ID;
       // The link text is a URL without a protocol for consistency with the "Send via link" text in

components/discord_webhook/actions/send-message-with-file/send-message-with-file.mjs

@@ -7,7 +7,7 @@ export default {
   key: "discord_webhook-send-message-with-file",
   name: "Send Message With File",
   description: "Post a message with an attached file",
-  version: "0.1.1",
+  version: "0.2.0",
   type: "action",
   props: {
     ...common.props,
@@ -48,8 +48,6 @@ export default {
       throw new Error("This action requires either File URL or File Path. Please enter one or the other above.");
     }
 
-    let content = message ?? "";
-
     const file = fileUrl
       ? (await axios({
         method: "get",
@@ -58,24 +56,22 @@ export default {
       })).data
       : fs.createReadStream(filePath);
 
-    if (includeSentViaPipedream) {
-      if (typeof content !== "string") {
-        content = JSON.stringify(content);
-      }
-      content += `\n\n${this.getSentViaPipedreamText()}`;
+    try {
+      // No interesting data is returned from Discord
+      await this.discordWebhook.sendMessageWithFile({
+        avatarURL,
+        threadID,
+        username,
+        file,
+        content: includeSentViaPipedream
+          ? this.appendPipedreamText(message ?? "")
+          : message,
+      });
+      $.export("$summary", "Message sent successfully");
+    } catch (err) {
+      const unsentMessage = this.getUserInputProps();
+      $.export("unsent", unsentMessage);
+      throw err;
     }
-
-    // No interesting data is returned from Discord
-    const resp = await this.discordWebhook.sendMessageWithFile({
-      content,
-      avatarURL,
-      threadID,
-      username,
-      file,
-    });
-
-    $.export("$summary", "Message sent successfully");
-
-    return resp;
   },
 };

components/discord_webhook/actions/send-message/send-message.mjs

@@ -5,12 +5,12 @@ export default {
   key: "discord_webhook-send-message",
   name: "Send Message",
   description: "Send a simple message to a Discord channel",
-  version: "0.2.1",
+  version: "0.3.0",
   type: "action",
   props: {
     ...common.props,
   },
-  async run() {
+  async run({ $ }) {
     const {
       message,
       avatarURL,
@@ -19,21 +19,21 @@ export default {
       includeSentViaPipedream,
     } = this;
 
-    let content = message;
-
-    if (includeSentViaPipedream) {
-      if (typeof content !== "string") {
-        content = JSON.stringify(content);
-      }
-      content += `\n\n${this.getSentViaPipedreamText()}`;
+    try {
+      // No interesting data is returned from Discord
+      await this.discordWebhook.sendMessage({
+        avatarURL,
+        threadID,
+        username,
+        content: includeSentViaPipedream
+          ? this.appendPipedreamText(message)
+          : message,
+      });
+      $.export("$summary", "Message sent successfully");
+    } catch (err) {
+      const unsentMessage = this.getUserInputProps();
+      $.export("unsent", unsentMessage);
+      throw err;
     }
-
-    // No interesting data is returned from Discord
-    await this.discordWebhook.sendMessage({
-      avatarURL,
-      content,
-      threadID,
-      username,
-    });
   },
 };