@pipedream/slack 0.4.26 → 0.4.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/slack",
-  "version": "0.4.26",
+  "version": "0.4.27",
   "description": "Pipedream Slack Components",
   "main": "slack.app.mjs",
   "keywords": [

package/sources/common/base.mjs

@@ -1,21 +1,86 @@
 import slack from "../../slack.app.mjs";
+import {
+  NAME_CACHE_MAX_SIZE, NAME_CACHE_TIMEOUT,
+} from "./constants.mjs";
 
 export default {
   props: {
     slack,
-    nameCache: "$.service.db",
+    db: "$.service.db",
   },
   methods: {
-    async maybeCached(key, refreshVal, timeoutMs = 3600000) {
-      let record = this.nameCache.get(key);
+    _getNameCache() {
+      return this.db.get("nameCache") ?? {};
+    },
+    _setNameCache(cacheObj) {
+      this.db.set("nameCache", cacheObj);
+    },
+    _getLastCacheCleanup() {
+      return this.db.get("lastCacheCleanup") ?? 0;
+    },
+    _setLastCacheCleanup(time) {
+      this.db.set("lastCacheCleanup", time);
+    },
+    cleanCache(cacheObj) {
+      console.log("Initiating cache check-up...");
+      const timeout = Date.now() - NAME_CACHE_TIMEOUT;
+
+      const entries = Object.entries(cacheObj);
+      let cleanArr = entries.filter(
+        ([
+          , { ts },
+        ]) => ts > timeout,
+      );
+      const diff = entries.length - cleanArr.length;
+      if (diff) {
+        console.log(`Cleaned up ${diff} outdated cache entries.`);
+      }
+
+      if (cleanArr.length > NAME_CACHE_MAX_SIZE) {
+        console.log(`Reduced the cache from ${cleanArr.length} to ${NAME_CACHE_MAX_SIZE / 2} entries.`);
+        cleanArr = cleanArr.slice(NAME_CACHE_MAX_SIZE / -2);
+      }
+
+      const cleanObj = Object.fromEntries(cleanArr);
+      return cleanObj;
+    },
+    getCache() {
+      let cacheObj = this._getNameCache();
+
+      const lastCacheCleanup = this._getLastCacheCleanup();
+      const time = Date.now();
+
+      const shouldCleanCache = time - lastCacheCleanup > NAME_CACHE_TIMEOUT / 2;
+      if (shouldCleanCache) {
+        cacheObj = this.cleanCache(cacheObj);
+        this._setLastCacheCleanup(time);
+      }
+
+      return [
+        cacheObj,
+        shouldCleanCache,
+      ];
+    },
+    async maybeCached(key, refreshVal) {
+      let [
+        cacheObj,
+        wasUpdated,
+      ] = this.getCache();
+      let record = cacheObj[key];
       const time = Date.now();
-      if (!record || time - record.ts > timeoutMs) {
+      if (!record || time - record.ts > NAME_CACHE_TIMEOUT) {
         record = {
           ts: time,
           val: await refreshVal(),
         };
-        this.nameCache.set(key, record);
+        cacheObj[key] = record;
+        wasUpdated = true;
+      }
+
+      if (wasUpdated) {
+        this._setNameCache(cacheObj);
       }
+
       return record.val;
     },
     async getUserName(id) {
@@ -56,43 +121,35 @@ export default {
           });
           return info.team.name;
         } catch (err) {
-          console.log("Error getting team name, probably need to re-connect the account at pipedream.com/apps", err);
+          console.log(
+            "Error getting team name, probably need to re-connect the account at pipedream.com/apps",
+            err,
+          );
           return id;
         }
       });
     },
-    async getLastMessage({
-      channel, event_ts,
-    }) {
-      return this.maybeCached(`lastMessage:${channel}:${event_ts}`, async () => {
-        const info = await this.slack.sdk().conversations.history({
-          channel,
-          latest: event_ts,
-          limit: 1,
-          inclusive: true,
-        });
-
-        return info;
-      });
-    },
     async getMessage({
-      channel, event_ts,
+      channel, event_ts: ts,
     }) {
-      return await this.maybeCached(`lastMessage:${channel}:${event_ts}`, async () => {
-        const response = await this.slack.sdk().conversations.replies({
-          channel,
-          ts: event_ts,
-          limit: 1,
-        });
+      return await this.maybeCached(
+        `lastMessage:${channel}:${ts}`,
+        async () => {
+          const response = await this.slack.sdk().conversations.replies({
+            channel,
+            ts,
+            limit: 1,
+          });
 
-        if (response.messages.length) {
-          response.messages = [
-            response.messages[0],
-          ];
-        }
+          if (response.messages.length) {
+            response.messages = [
+              response.messages[0],
+            ];
+          }
 
-        return response;
-      });
+          return response;
+        },
+      );
     },
     processEvent(event) {
       return event;
@@ -103,7 +160,8 @@ export default {
 
     if (event) {
       if (!event.client_msg_id) {
-        event.pipedream_msg_id = `pd_${Date.now()}_${Math.random().toString(36)
+        event.pipedream_msg_id = `pd_${Date.now()}_${Math.random()
+          .toString(36)
           .substr(2, 10)}`;
       }
 

package/sources/common/constants.mjs

@@ -46,6 +46,9 @@ const ALLOWED_MESSAGE_IN_CHANNEL_SUBTYPES = [
   SUBTYPE.MESSAGE_REPLIED,
 ];
 
+export const NAME_CACHE_MAX_SIZE = 1000;
+export const NAME_CACHE_TIMEOUT = 3600000;
+
 export default {
   events,
   eventsOptions,

package/sources/new-direct-message/new-direct-message.mjs

@@ -4,7 +4,7 @@ export default {
   ...common,
   key: "slack-new-direct-message",
   name: "New Direct Message (Instant)",
-  version: "1.0.11",
+  version: "1.0.12",
   description: "Emit new event when a message was posted in a direct message channel",
   type: "source",
   dedupe: "unique",

package/sources/new-interaction-event-received/new-interaction-event-received.mjs

@@ -2,7 +2,7 @@ import common from "../common/base.mjs";
 
 export default {
   name: "New Interaction Events",
-  version: "0.0.8",
+  version: "0.0.9",
   key: "slack-new-interaction-event-received",
   description:
     "Emit new events on new Slack [interactivity events](https://api.slack.com/interactivity) sourced from [Block Kit interactive elements](https://api.slack.com/interactivity/components), [Slash commands](https://api.slack.com/interactivity/slash-commands), or [Shortcuts](https://api.slack.com/interactivity/shortcuts).",

package/sources/new-mention/new-mention.mjs

@@ -5,7 +5,7 @@ export default {
   ...common,
   key: "slack-new-mention",
   name: "New Mention (Instant)",
-  version: "1.0.14",
+  version: "1.0.15",
   description: "Emit new event when a username or specific keyword is mentioned in a channel",
   type: "source",
   dedupe: "unique",

package/sources/new-message-in-channels/new-message-in-channels.mjs

@@ -5,7 +5,7 @@ export default {
   ...common,
   key: "slack-new-message-in-channels",
   name: "New Message In Channels (Instant)",
-  version: "1.0.11",
+  version: "1.0.12",
   description: "Emit new event when a new message is posted to one or more channels",
   type: "source",
   dedupe: "unique",

package/sources/new-reaction-added/new-reaction-added.mjs

@@ -4,7 +4,7 @@ export default {
   ...common,
   key: "slack-new-reaction-added",
   name: "New Reaction Added (Instant)",
-  version: "1.1.15",
+  version: "1.1.16",
   description: "Emit new event when a member has added an emoji reaction to a message",
   type: "source",
   dedupe: "unique",

package/sources/new-star-added/new-star-added.mjs

@@ -5,7 +5,7 @@ export default {
   ...common,
   key: "slack-new-star-added",
   name: "New Star Added (Instant)",
-  version: "0.0.16",
+  version: "0.0.17",
   description: "Emit new event when a star is added to an item",
   type: "source",
   dedupe: "unique",