@credal/actions 0.2.110 → 0.2.112

package/dist/actions/providers/slackUser/searchSlack.d.ts

@@ -4,13 +4,14 @@ export interface SlackSearchMessage {
     channelId: string;
     ts: string;
     text?: string;
-    userId?: string;
+    userEmail?: string;
     permalink?: string;
     /** If thread: full thread (root first). If not thread: small context window around the hit. */
     context?: Array<{
         ts: string;
         text?: string;
-        userId?: string;
+        userEmail?: string;
+        userName?: string;
     }>;
 }
 declare const searchSlack: slackUserSearchSlackFunction;

package/dist/actions/providers/slackUser/searchSlack.js

@@ -9,6 +9,37 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { WebClient } from "@slack/web-api";
 import { MISSING_AUTH_TOKEN } from "../../util/missingAuthConstants.js";
+import pLimit from "p-limit";
+const HIT_ENRICH_POOL = 10;
+const limitHit = pLimit(HIT_ENRICH_POOL);
+class SlackUserCache {
+    constructor(client) {
+        this.client = client;
+        this.cache = new Map();
+        this.client = client;
+    }
+    get(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            const result = this.cache.get(id);
+            if (result)
+                return result;
+            const res = yield this.client.users.info({ user: id });
+            const u = {
+                name: (_e = (_c = (_b = (_a = res.user) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.display_name) !== null && _c !== void 0 ? _c : (_d = res.user) === null || _d === void 0 ? void 0 : _d.real_name) !== null && _e !== void 0 ? _e : "",
+                email: (_h = (_g = (_f = res.user) === null || _f === void 0 ? void 0 : _f.profile) === null || _g === void 0 ? void 0 : _g.email) !== null && _h !== void 0 ? _h : "",
+            };
+            if (res.user && id && res.user.name) {
+                this.cache.set(id, u);
+                return u;
+            }
+            return undefined;
+        });
+    }
+    set(id, { email, name }) {
+        this.cache.set(id, { email, name });
+    }
+}
 /* ===================== Helpers ===================== */
 function normalizeChannelOperand(ch) {
     const s = ch.trim();
@@ -30,19 +61,27 @@ function timeFilter(range) {
             return "";
     }
 }
-function lookupUserIdsByEmail(client, emails) {
+function lookupUserIdsByEmail(client, emails, slackUserCache) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const ids = [];
-        for (const raw of emails) {
+        const tasks = emails.map((raw) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const email = raw.trim();
             if (!email)
-                continue;
+                return null;
             const res = yield client.users.lookupByEmail({ email });
             const id = (_a = res.user) === null || _a === void 0 ? void 0 : _a.id;
+            if (res.user && id && res.user.name) {
+                slackUserCache.set(id, { email, name: res.user.name });
+            }
             if (id)
-                ids.push(id);
-        }
+                return id;
+            return null;
+        }));
+        const settled = yield Promise.allSettled(tasks);
+        for (const r of settled)
+            if (r.status === "fulfilled" && r.value)
+                ids.push(r.value);
         return ids;
     });
 }
@@ -119,22 +158,27 @@ function fetchContextWindow(client, channel, ts) {
 }
 /* ===================== Main Export ===================== */
 const searchSlack = (_a) => __awaiter(void 0, [_a], void 0, function* ({ params, authParams, }) {
-    var _b, _c, _d, _e, _f, _g;
+    var _b, _c;
     if (!authParams.authToken) {
         throw new Error(MISSING_AUTH_TOKEN);
     }
     const client = new WebClient(authParams.authToken);
+    const slackUserCache = new SlackUserCache(client);
     const { emails, channel, topic, timeRange, limit } = params;
     const parts = [];
     if (emails === null || emails === void 0 ? void 0 : emails.length) {
-        const userIds = yield lookupUserIdsByEmail(client, emails);
-        if (userIds.length === 0)
+        const userIds = yield lookupUserIdsByEmail(client, emails, slackUserCache);
+        const { user_id: myUserId } = yield client.auth.test();
+        if (!myUserId)
+            throw new Error("Failed to get my user ID.");
+        const userIdsWithoutMe = userIds.filter(id => id !== myUserId);
+        if (userIdsWithoutMe.length === 0)
             throw new Error("No users resolved from emails.");
-        if (userIds.length == 1) {
-            parts.push(`in:<@${userIds[0]}>`);
+        if (userIdsWithoutMe.length == 1) {
+            parts.push(`in:<@${userIdsWithoutMe[0]}>`);
         }
         else {
-            const convoName = yield getMPIMName(client, userIds);
+            const convoName = yield getMPIMName(client, userIdsWithoutMe);
             parts.push(`in:${convoName}`);
         }
     }
@@ -152,67 +196,103 @@ const searchSlack = (_a) => __awaiter(void 0, [_a], void 0, function* ({ params,
     const count = Math.max(1, Math.min(100, limit));
     const searchRes = yield client.search.messages({ query, count, highlight: true });
     const matches = (_c = (_b = searchRes.messages) === null || _b === void 0 ? void 0 : _b.matches) !== null && _c !== void 0 ? _c : [];
-    const hits = matches.slice(0, limit).map(m => {
-        var _a, _b;
-        return ({
+    const hitsPromises = matches.slice(0, limit).map((m) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
+        const user = m.user ? yield slackUserCache.get(m.user) : undefined;
+        return {
             channelId: ((_a = m.channel) === null || _a === void 0 ? void 0 : _a.id) || ((_b = m.channel) === null || _b === void 0 ? void 0 : _b.name) || "",
             ts: m.ts,
             text: m.text,
-            userId: m.user,
-        });
-    });
-    const results = [];
-    for (const h of hits) {
+            userEmail: (_c = user === null || user === void 0 ? void 0 : user.email) !== null && _c !== void 0 ? _c : undefined,
+            userName: (_d = user === null || user === void 0 ? void 0 : user.name) !== null && _d !== void 0 ? _d : undefined,
+        };
+    }));
+    const hits = yield Promise.all(hitsPromises);
+    const tasks = hits.map(h => limitHit(() => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f;
         if (!h.ts)
-            continue;
+            return null;
         try {
             const anchor = yield fetchOneMessage(client, h.channelId, h.ts);
             const rootTs = (anchor === null || anchor === void 0 ? void 0 : anchor.thread_ts) || h.ts;
             if (anchor === null || anchor === void 0 ? void 0 : anchor.thread_ts) {
-                const thread = yield fetchThread(client, h.channelId, rootTs);
-                const normalizedThreads = [];
-                for (const t of thread) {
-                    if (!t.ts)
-                        continue;
-                    normalizedThreads.push({ ts: t.ts, text: t.text, userId: t.user });
-                }
-                results.push({
+                // thread: fetch thread + permalink concurrently
+                const [thread, permalink] = yield Promise.all([
+                    fetchThread(client, h.channelId, rootTs),
+                    getPermalink(client, h.channelId, rootTs),
+                ]);
+                const contextPromises = thread
+                    .filter(t => t.ts)
+                    .map((t) => __awaiter(void 0, void 0, void 0, function* () {
+                    var _a, _b;
+                    const user = t.user ? yield slackUserCache.get(t.user) : undefined;
+                    return {
+                        ts: t.ts,
+                        text: t.text,
+                        userEmail: (_a = user === null || user === void 0 ? void 0 : user.email) !== null && _a !== void 0 ? _a : undefined,
+                        userName: (_b = user === null || user === void 0 ? void 0 : user.name) !== null && _b !== void 0 ? _b : undefined,
+                    };
+                }));
+                const context = yield Promise.all(contextPromises);
+                const user = anchor.user ? yield slackUserCache.get(anchor.user) : undefined;
+                return {
                     channelId: h.channelId,
                     ts: rootTs,
-                    text: (_d = anchor.text) !== null && _d !== void 0 ? _d : h.text,
-                    userId: (_e = anchor.user) !== null && _e !== void 0 ? _e : h.userId,
-                    context: normalizedThreads,
-                    permalink: yield getPermalink(client, h.channelId, rootTs),
-                });
+                    text: (_a = anchor.text) !== null && _a !== void 0 ? _a : h.text,
+                    userEmail: (_b = user === null || user === void 0 ? void 0 : user.email) !== null && _b !== void 0 ? _b : h.userEmail,
+                    userName: (_c = user === null || user === void 0 ? void 0 : user.name) !== null && _c !== void 0 ? _c : h.userName,
+                    context,
+                    permalink,
+                };
             }
             else {
-                const ctx = yield fetchContextWindow(client, h.channelId, h.ts);
-                const normalizedThreads = [];
-                for (const t of ctx) {
-                    if (!t.ts)
-                        continue;
-                    normalizedThreads.push({ ts: t.ts, text: t.text, userId: t.user });
-                }
-                results.push({
+                // not a thread: fetch context window + permalink concurrently
+                const [ctx, permalink] = yield Promise.all([
+                    fetchContextWindow(client, h.channelId, h.ts),
+                    getPermalink(client, h.channelId, h.ts),
+                ]);
+                const contextPromises = ctx
+                    .filter(t => t.ts)
+                    .map((t) => __awaiter(void 0, void 0, void 0, function* () {
+                    var _a, _b;
+                    const user = t.user ? yield slackUserCache.get(t.user) : undefined;
+                    return {
+                        ts: t.ts,
+                        text: t.text,
+                        userEmail: (_a = user === null || user === void 0 ? void 0 : user.email) !== null && _a !== void 0 ? _a : undefined,
+                        userName: (_b = user === null || user === void 0 ? void 0 : user.name) !== null && _b !== void 0 ? _b : undefined,
+                    };
+                }));
+                const context = yield Promise.all(contextPromises);
+                const user = (anchor === null || anchor === void 0 ? void 0 : anchor.user) ? yield slackUserCache.get(anchor.user) : undefined;
+                return {
                     channelId: h.channelId,
                     ts: h.ts,
-                    text: (_f = anchor === null || anchor === void 0 ? void 0 : anchor.text) !== null && _f !== void 0 ? _f : h.text,
-                    userId: (_g = anchor === null || anchor === void 0 ? void 0 : anchor.user) !== null && _g !== void 0 ? _g : h.userId,
-                    context: normalizedThreads,
-                    permalink: yield getPermalink(client, h.channelId, h.ts),
-                });
+                    text: (_d = anchor === null || anchor === void 0 ? void 0 : anchor.text) !== null && _d !== void 0 ? _d : h.text,
+                    userEmail: (_e = user === null || user === void 0 ? void 0 : user.email) !== null && _e !== void 0 ? _e : h.userEmail,
+                    userName: (_f = user === null || user === void 0 ? void 0 : user.name) !== null && _f !== void 0 ? _f : h.userName,
+                    context,
+                    permalink,
+                };
             }
         }
-        catch (_h) {
-            results.push({
+        catch (_g) {
+            // fallback minimal object; still in parallel
+            return {
                 channelId: h.channelId,
                 ts: h.ts,
                 text: h.text,
-                userId: h.userId,
+                userEmail: h.userEmail,
+                userName: h.userName,
                 permalink: yield getPermalink(client, h.channelId, h.ts),
-            });
+            };
         }
-    }
+    })));
+    const settled = yield Promise.allSettled(tasks);
+    const results = [];
+    for (const r of settled)
+        if (r.status === "fulfilled" && r.value)
+            results.push(r.value);
     results.sort((a, b) => Number(b.ts) - Number(a.ts));
     return { query, results };
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@credal/actions",
-  "version": "0.2.110",
+  "version": "0.2.112",
   "type": "module",
   "description": "AI Actions by Credal AI",
   "sideEffects": false,
@@ -66,6 +66,7 @@
     "mammoth": "^1.4.27",
     "mongodb": "^6.13.1",
     "node-forge": "^1.3.1",
+    "p-limit": "^7.1.1",
     "pdf2json": "^3.1.6",
     "resend": "^4.7.0",
     "snowflake-sdk": "^2.0.2",