updates

Author: michelle0927

components/slack/actions/delete-file/delete-file.mjs

@@ -8,10 +8,19 @@ export default {
   type: "action",
   props: {
     slack,
+    conversation: {
+      propDefinition: [
+        slack,
+        "conversation",
+      ],
+    },
     file: {
       propDefinition: [
         slack,
         "file",
+        (c) => ({
+          channel: c.conversation,
+        }),
       ],
     },
   },

components/slack/actions/get-file/get-file.mjs

@@ -8,10 +8,19 @@ export default {
   type: "action",
   props: {
     slack,
+    conversation: {
+      propDefinition: [
+        slack,
+        "conversation",
+      ],
+    },
     file: {
       propDefinition: [
         slack,
         "file",
+        (c) => ({
+          channel: c.conversation,
+        }),
       ],
     },
   },

components/slack/actions/invite-user-to-channel/invite-user-to-channel.mjs

@@ -22,11 +22,19 @@ export default {
     },
   },
   async run({ $ }) {
-    const response = await this.slack.inviteToConversation({
-      channel: this.conversation,
-      users: this.user,
-    });
-    $.export("$summary", `Successfully invited user ${this.user} to channel with ID ${this.conversation}`);
-    return response;
+    try {
+      const response = await this.slack.inviteToConversation({
+        channel: this.conversation,
+        users: this.user,
+      });
+      $.export("$summary", `Successfully invited user ${this.user} to channel with ID ${this.conversation}`);
+      return response;
+    } catch (error) {
+      if (error.includes("already_in_channel")) {
+        $.export("$summary", `The user ${this.user} is already in the channel`);
+        return;
+      }
+      throw error;
+    }
   },
 };

components/slack/actions/kick-user/kick-user.mjs

@@ -33,11 +33,19 @@ export default {
     },
   },
   async run({ $ }) {
-    const response = await this.slack.kickUserFromConversation({
-      channel: this.conversation,
-      user: this.user,
-    });
-    $.export("$summary", `Successfully kicked user ${this.user} from channel with ID ${this.conversation}`);
-    return response;
+    try {
+      const response = await this.slack.kickUserFromConversation({
+        channel: this.conversation,
+        user: this.user,
+      });
+      $.export("$summary", `Successfully kicked user ${this.user} from channel with ID ${this.conversation}`);
+      return response;
+    } catch (error) {
+      if (error.includes("not_in_channel")) {
+        $.export("$summary", `The user ${this.user} is not in the channel`);
+        return;
+      }
+      throw error;
+    }
   },
 };

components/slack/actions/upload-file/upload-file.mjs

@@ -1,11 +1,14 @@
-import { ConfigurationError } from "@pipedream/platform";
+import {
+  ConfigurationError, axios,
+} from "@pipedream/platform";
 import fs from "fs";
+import FormData from "form-data";
 import slack from "../../slack.app.mjs";
 
 export default {
   key: "slack-upload-file",
   name: "Upload File",
-  description: "Upload a file. [See the documentation](https://api.slack.com/methods/files.upload)",
+  description: "Upload a file. [See the documentation](https://api.slack.com/messaging/files#uploading_files)",
   version: "0.0.27",
   type: "action",
   props: {
@@ -35,13 +38,54 @@ export default {
     if (!fs.existsSync(this.content)) {
       throw new ConfigurationError(`\`${this.content}\` not found, a valid \`/tmp\` path is needed`);
     }
-    const response = await this.slack.uploadFile({
-      file: fs.createReadStream(this.content),
+
+    const filename = this.content.split("/").pop();
+
+    // Get an upload URL from Slack
+    const getUploadUrlResponse = await this.slack.getUploadUrl({
+      filename,
+      length: fs.statSync(this.content).size,
+    });
+
+    if (!getUploadUrlResponse.ok) {
+      throw new ConfigurationError(`Error getting upload URL: ${JSON.stringify(getUploadUrlResponse)}`);
+    }
+
+    const {
+      upload_url: uploadUrl, file_id: fileId,
+    } = getUploadUrlResponse;
+
+    // Upload the file to the provided URL
+    const formData = new FormData();
+    formData.append("file", fs.createReadStream(this.content));
+    formData.append("filename", filename);
+
+    await axios($, {
+      url: uploadUrl,
+      data: formData,
+      method: "POST",
+      headers: {
+        ...formData.getHeaders(),
+        Authorization: `Bearer ${this.slack.getToken()}`,
+      },
+    });
+
+    // Complete the file upload process in Slack
+    const completeUploadResponse = await this.slack.completeUpload({
       channel_id: this.conversation,
       initial_comment: this.initialComment,
-      filename: this.content.split("/").pop(),
+      files: [
+        {
+          id: fileId,
+        },
+      ],
     });
+
+    if (!completeUploadResponse.ok) {
+      throw new Error(`Error completing upload: ${JSON.stringify(completeUploadResponse)}`);
+    }
+
     $.export("$summary", "Successfully uploaded file");
-    return response;
+    return completeUploadResponse;
   },
 };

components/slack/package.json

@@ -15,6 +15,6 @@
   },
   "dependencies": {
     "@pipedream/platform": "^3.0.0",
-    "@slack/web-api": "^7.0.4"
+    "@slack/web-api": "^7.9.0"
   }
 }

components/slack/slack.app.mjs

@@ -483,7 +483,7 @@ export default {
       const sdk = props.reduce((reduction, prop) =>
         reduction[prop], this.sdk());
 
-      const response = await this._withRetries(() => sdk(args, throwRateLimitError));
+      const response = await this._withRetries(() => sdk(args), throwRateLimitError);
 
       if (!response.ok) {
         console.log(`Error in response with method ${method}`, response.error);
@@ -494,23 +494,22 @@ export default {
     async _withRetries(apiCall, throwRateLimitError = false) {
       const retryOpts = {
         retries: 3,
-        factor: 2,
-        minTimeout: 3000,
+        minTimeout: 30000,
       };
       return retry(async (bail) => {
         try {
           return await apiCall();
         } catch (error) {
           const statusCode = get(error, "code");
-          if (statusCode === 429) {
+          if (statusCode === "slack_webapi_rate_limited_error") {
             if (throwRateLimitError) {
               bail(`Rate limit exceeded. ${error}`);
             } else {
               console.log(`Rate limit exceeded. Will retry in ${retryOpts.minTimeout / 1000} seconds`);
+              throw error;
             }
-          } else {
-            throw error;
           }
+          bail(`${error}`);
         }
       }, retryOpts);
     },
@@ -799,7 +798,7 @@ export default {
       });
     },
     listFiles(args = {}) {
-      args.limit ||= constants.LIMIT;
+      args.count ||= constants.LIMIT;
       return this.makeRequest({
         method: "files.list",
         ...args,
@@ -938,9 +937,15 @@ export default {
         ...args,
       });
     },
-    uploadFile(args = {}) {
+    getUploadUrl(args = {}) {
+      return this.makeRequest({
+        method: "files.getUploadURLExternal",
+        ...args,
+      });
+    },
+    completeUpload(args = {}) {
       return this.makeRequest({
-        method: "filesUploadV2",
+        method: "files.completeUploadExternal",
         ...args,
       });
     },