@fdcn/sourcefed 0.3.2 → 0.3.5

package/dist/{chunk-QPDTUNFA.js → chunk-X3BZSHKZ.js}

@@ -11034,7 +11034,7 @@ function parseSlackReadResult(result, cursorRaw, location = "thread") {
     messageIds: previous.messageIds ?? [],
     latestTs: previous.latestTs
   };
-  const users = new Map((result.users ?? []).map((user) => [user.id, user.real_name ?? user.name ?? user.id ?? "someone"]));
+  const users2 = new Map((result.users ?? []).map((user) => [user.id, user.real_name ?? user.name ?? user.id ?? "someone"]));
   const messages = (result.messages ?? []).filter((message) => message.ts);
   const freshMessages = messages.filter((message) => {
     if (cursor.messageIds.includes(message.ts)) return false;
@@ -11046,7 +11046,7 @@ function parseSlackReadResult(result, cursorRaw, location = "thread") {
     events = freshMessages.map((message) => {
       let text = "[message without text]";
       if (message.text?.trim()) text = message.text.trim();
-      let author = users.get(message.user);
+      let author = users2.get(message.user);
       if (!author) author = message.user;
       if (!author) author = "someone";
       return {
@@ -11069,10 +11069,9 @@ function parseSlackReadResult(result, cursorRaw, location = "thread") {
   return { events, cursor };
 }
 var SLACK_API = "https://slack.com/api";
-var warnedMissingToken2 = false;
-function slackToken() {
-  return process.env.SOURCEFED_SLACK_TOKEN;
-}
+var USERS_TTL_MS = 60 * 60 * 1e3;
+var users;
+var refreshing;
 async function fetchSlackThread(channelId, threadTs) {
   return fetchSlackMessages("conversations.replies", { channel: channelId, ts: threadTs, inclusive: "false" });
 }
@@ -11082,61 +11081,57 @@ async function fetchSlackDm(channelId) {
 async function fetchSlackMessages(method, params) {
   const messages = [];
   let cursor = "";
-  let received = false;
   do {
-    const page = await slackApi(method, {
-      ...params,
-      limit: "1000",
-      ...cursor ? { cursor } : {}
-    });
-    if (!page) break;
-    received = true;
-    if (Array.isArray(page.messages)) messages.push(...page.messages);
-    cursor = page.response_metadata?.next_cursor ?? "";
+    const page = await slackApi(method, { ...params, limit: "1000", ...cursor ? { cursor } : {} });
+    if (!page.ok) {
+      if (messages.length > 0) break;
+      throw new Error(`slack ${method} failed: ${page.error}`);
+    }
+    if (Array.isArray(page.result.messages)) messages.push(...page.result.messages);
+    cursor = page.result.response_metadata?.next_cursor ?? "";
     if (messages.length >= 1e4) break;
   } while (cursor);
-  if (!received) return void 0;
-  const users = [];
-  let usersCursor = "";
+  return { messages, users: await slackUsers() };
+}
+async function slackUsers() {
+  if (users && Date.now() - users.fetchedAt < USERS_TTL_MS) return users.list;
+  refreshing ??= refreshUsers().finally(() => {
+    refreshing = void 0;
+  });
+  return refreshing;
+}
+async function refreshUsers() {
+  const list = [];
+  let cursor = "";
   do {
-    const page = await slackApi("users.list", { limit: "200", ...usersCursor ? { cursor: usersCursor } : {} });
-    if (!page) break;
-    if (Array.isArray(page.members)) {
-      users.push(...page.members.map((member) => ({
-        id: member.id,
-        name: member.name,
-        real_name: member.real_name
-      })));
-    }
-    usersCursor = page.response_metadata?.next_cursor ?? "";
-  } while (usersCursor);
-  return { messages, users };
+    const page = await slackApi("users.list", { limit: "200", ...cursor ? { cursor } : {} });
+    if (!page.ok) return users?.list ?? list;
+    if (Array.isArray(page.result.members)) {
+      list.push(...page.result.members.map((member) => ({ id: member.id, name: member.name, real_name: member.real_name })));
+    }
+    cursor = page.result.response_metadata?.next_cursor ?? "";
+  } while (cursor);
+  users = { list, fetchedAt: Date.now() };
+  return list;
 }
 async function slackApi(method, params) {
-  const token = slackToken();
-  if (!token) {
-    if (!warnedMissingToken2) {
-      warnedMissingToken2 = true;
-      console.warn("[sourcefed] SOURCEFED_SLACK_TOKEN is not set; Slack monitors will not poll");
-    }
-    return void 0;
-  }
+  const token = process.env.SOURCEFED_SLACK_TOKEN;
+  if (!token) return { ok: false, error: "SOURCEFED_SLACK_TOKEN is not set" };
   try {
     const response = await fetch(`${SLACK_API}/${method}`, {
       method: "POST",
       headers: { authorization: `Bearer ${token}`, "content-type": "application/x-www-form-urlencoded" },
       body: new URLSearchParams(params)
     });
-    const result = await response.json();
-    if (!response.ok || result?.ok !== true) return void 0;
-    return result;
-  } catch {
-    return void 0;
+    const result = await response.json().catch(() => void 0);
+    if (response.ok && result?.ok === true) return { ok: true, result };
+    return { ok: false, error: result?.error ?? `HTTP ${response.status}` };
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : String(error) };
   }
 }
 async function pollSlack(source, cursorRaw) {
   const result = source.threadTs ? await fetchSlackThread(source.channelId, source.threadTs) : await fetchSlackDm(source.channelId);
-  if (!result) throw new Error("slack API request failed; check SOURCEFED_SLACK_TOKEN");
   const parsed = parseSlackReadResult(result, cursorRaw, source.threadTs ? "thread" : "DM");
   return { ...parsed, terminal: false };
 }
@@ -11595,6 +11590,18 @@ var SourcefedDaemon = class {
     const monitors = (await this.service.list()).filter((monitor) => sameTarget(monitor.target, target));
     return { ok: true, monitors: monitors.map(monitorView) };
   }
+  /**
+   * Every target of `kind` with an enabled monitor, so a host that restarts can
+   * resubscribe the sessions whose monitors outlived it.
+   */
+  async listTargets(kind) {
+    const targets = /* @__PURE__ */ new Map();
+    for (const monitor of await this.service.list()) {
+      if (!monitor.enabled || monitor.target.kind !== kind) continue;
+      targets.set(targetKey(monitor.target), { kind: monitor.target.kind, id: monitor.target.id });
+    }
+    return [...targets.values()];
+  }
   async getMonitor(target, id) {
     const monitor = await ownedMonitor(this.service, id, target);
     if (!monitor) return { ok: false, error: `monitor ${id} was not found for this target` };
@@ -11961,6 +11968,9 @@ async function dispatchDaemonRequest(daemon, method, params) {
       return daemon.createMonitor(createTarget(params), createCreateInput(params));
     case "monitor.list":
       return daemon.listMonitors(createTarget(params));
+    case "monitor.targets":
+      if (typeof params.kind !== "string" || !params.kind) throw new Error("monitor.targets requires params.kind");
+      return { targets: await daemon.listTargets(params.kind) };
     case "monitor.status":
       return daemon.getMonitor(createTarget(params), String(params.id));
     case "monitor.stop":

package/dist/cli.js

@@ -11040,7 +11040,7 @@ function parseSlackReadResult(result, cursorRaw, location = "thread") {
     messageIds: previous.messageIds ?? [],
     latestTs: previous.latestTs
   };
-  const users = new Map((result.users ?? []).map((user) => [user.id, user.real_name ?? user.name ?? user.id ?? "someone"]));
+  const users22 = new Map((result.users ?? []).map((user) => [user.id, user.real_name ?? user.name ?? user.id ?? "someone"]));
   const messages = (result.messages ?? []).filter((message) => message.ts);
   const freshMessages = messages.filter((message) => {
     if (cursor.messageIds.includes(message.ts)) return false;
@@ -11052,7 +11052,7 @@ function parseSlackReadResult(result, cursorRaw, location = "thread") {
     events2 = freshMessages.map((message) => {
       let text = "[message without text]";
       if (message.text?.trim()) text = message.text.trim();
-      let author = users.get(message.user);
+      let author = users22.get(message.user);
       if (!author) author = message.user;
       if (!author) author = "someone";
       return {
@@ -11075,10 +11075,9 @@ function parseSlackReadResult(result, cursorRaw, location = "thread") {
   return { events: events2, cursor };
 }
 var SLACK_API = "https://slack.com/api";
-var warnedMissingToken2 = false;
-function slackToken() {
-  return process.env.SOURCEFED_SLACK_TOKEN;
-}
+var USERS_TTL_MS = 60 * 60 * 1e3;
+var users;
+var refreshing;
 async function fetchSlackThread(channelId, threadTs) {
   return fetchSlackMessages("conversations.replies", { channel: channelId, ts: threadTs, inclusive: "false" });
 }
@@ -11088,61 +11087,57 @@ async function fetchSlackDm(channelId) {
 async function fetchSlackMessages(method, params) {
   const messages = [];
   let cursor = "";
-  let received = false;
   do {
-    const page = await slackApi(method, {
-      ...params,
-      limit: "1000",
-      ...cursor ? { cursor } : {}
-    });
-    if (!page) break;
-    received = true;
-    if (Array.isArray(page.messages)) messages.push(...page.messages);
-    cursor = page.response_metadata?.next_cursor ?? "";
+    const page = await slackApi(method, { ...params, limit: "1000", ...cursor ? { cursor } : {} });
+    if (!page.ok) {
+      if (messages.length > 0) break;
+      throw new Error(`slack ${method} failed: ${page.error}`);
+    }
+    if (Array.isArray(page.result.messages)) messages.push(...page.result.messages);
+    cursor = page.result.response_metadata?.next_cursor ?? "";
     if (messages.length >= 1e4) break;
   } while (cursor);
-  if (!received) return void 0;
-  const users = [];
-  let usersCursor = "";
+  return { messages, users: await slackUsers() };
+}
+async function slackUsers() {
+  if (users && Date.now() - users.fetchedAt < USERS_TTL_MS) return users.list;
+  refreshing ??= refreshUsers().finally(() => {
+    refreshing = void 0;
+  });
+  return refreshing;
+}
+async function refreshUsers() {
+  const list2 = [];
+  let cursor = "";
   do {
-    const page = await slackApi("users.list", { limit: "200", ...usersCursor ? { cursor: usersCursor } : {} });
-    if (!page) break;
-    if (Array.isArray(page.members)) {
-      users.push(...page.members.map((member) => ({
-        id: member.id,
-        name: member.name,
-        real_name: member.real_name
-      })));
-    }
-    usersCursor = page.response_metadata?.next_cursor ?? "";
-  } while (usersCursor);
-  return { messages, users };
+    const page = await slackApi("users.list", { limit: "200", ...cursor ? { cursor } : {} });
+    if (!page.ok) return users?.list ?? list2;
+    if (Array.isArray(page.result.members)) {
+      list2.push(...page.result.members.map((member) => ({ id: member.id, name: member.name, real_name: member.real_name })));
+    }
+    cursor = page.result.response_metadata?.next_cursor ?? "";
+  } while (cursor);
+  users = { list: list2, fetchedAt: Date.now() };
+  return list2;
 }
 async function slackApi(method, params) {
-  const token = slackToken();
-  if (!token) {
-    if (!warnedMissingToken2) {
-      warnedMissingToken2 = true;
-      console.warn("[sourcefed] SOURCEFED_SLACK_TOKEN is not set; Slack monitors will not poll");
-    }
-    return void 0;
-  }
+  const token = process.env.SOURCEFED_SLACK_TOKEN;
+  if (!token) return { ok: false, error: "SOURCEFED_SLACK_TOKEN is not set" };
   try {
     const response = await fetch(`${SLACK_API}/${method}`, {
       method: "POST",
       headers: { authorization: `Bearer ${token}`, "content-type": "application/x-www-form-urlencoded" },
       body: new URLSearchParams(params)
     });
-    const result = await response.json();
-    if (!response.ok || result?.ok !== true) return void 0;
-    return result;
-  } catch {
-    return void 0;
+    const result = await response.json().catch(() => void 0);
+    if (response.ok && result?.ok === true) return { ok: true, result };
+    return { ok: false, error: result?.error ?? `HTTP ${response.status}` };
+  } catch (error2) {
+    return { ok: false, error: error2 instanceof Error ? error2.message : String(error2) };
   }
 }
 async function pollSlack(source, cursorRaw) {
   const result = source.threadTs ? await fetchSlackThread(source.channelId, source.threadTs) : await fetchSlackDm(source.channelId);
-  if (!result) throw new Error("slack API request failed; check SOURCEFED_SLACK_TOKEN");
   const parsed = parseSlackReadResult(result, cursorRaw, source.threadTs ? "thread" : "DM");
   return { ...parsed, terminal: false };
 }
@@ -11518,6 +11513,18 @@ var SourcefedDaemon = class {
     const monitors = (await this.service.list()).filter((monitor) => sameTarget(monitor.target, target));
     return { ok: true, monitors: monitors.map(monitorView) };
   }
+  /**
+   * Every target of `kind` with an enabled monitor, so a host that restarts can
+   * resubscribe the sessions whose monitors outlived it.
+   */
+  async listTargets(kind) {
+    const targets = /* @__PURE__ */ new Map();
+    for (const monitor of await this.service.list()) {
+      if (!monitor.enabled || monitor.target.kind !== kind) continue;
+      targets.set(targetKey(monitor.target), { kind: monitor.target.kind, id: monitor.target.id });
+    }
+    return [...targets.values()];
+  }
   async getMonitor(target, id) {
     const monitor = await ownedMonitor(this.service, id, target);
     if (!monitor) return { ok: false, error: `monitor ${id} was not found for this target` };
@@ -11884,6 +11891,9 @@ async function dispatchDaemonRequest(daemon, method, params) {
       return daemon.createMonitor(createTarget(params), createCreateInput(params));
     case "monitor.list":
       return daemon.listMonitors(createTarget(params));
+    case "monitor.targets":
+      if (typeof params.kind !== "string" || !params.kind) throw new Error("monitor.targets requires params.kind");
+      return { targets: await daemon.listTargets(params.kind) };
     case "monitor.status":
       return daemon.getMonitor(createTarget(params), String(params.id));
     case "monitor.stop":
@@ -12002,6 +12012,9 @@ function flag(args, name) {
   const index = args.indexOf(`--${name}`);
   return index >= 0 ? args[index + 1] : void 0;
 }
+function flags(args, name) {
+  return args.flatMap((arg, index) => arg === `--${name}` && index + 1 < args.length ? [args[index + 1]] : []);
+}
 
 // packages/cli/src/utils/net.ts
 function isLoopback(hostname) {
@@ -27008,7 +27021,7 @@ var require_core$3 = /* @__PURE__ */ __commonJSMin(((exports) => {
   const util_1 = require_util();
   const $dataRefSchema = require_data();
   const uri_1 = require_uri();
-  const defaultRegExp = (str, flags) => new RegExp(str, flags);
+  const defaultRegExp = (str, flags2) => new RegExp(str, flags2);
   defaultRegExp.code = "new RegExp";
   const META_IGNORE_OPTIONS = [
     "removeAdditional",
@@ -41681,7 +41694,7 @@ function emptyGithubCursor2() {
     prState: ""
   };
 }
-var warnedMissingToken3 = false;
+var warnedMissingToken2 = false;
 async function pollGithub2(repo, prNumber, cursorRaw) {
   const parsedCursor = /* @__PURE__ */ safeParse2222(GithubCursorSchema2, cursorRaw);
   let cursor = emptyGithubCursor2();
@@ -41689,8 +41702,8 @@ async function pollGithub2(repo, prNumber, cursorRaw) {
   const events2 = [];
   const ref = `#${prNumber}`;
   if (!githubToken2()) {
-    if (!warnedMissingToken3) {
-      warnedMissingToken3 = true;
+    if (!warnedMissingToken2) {
+      warnedMissingToken2 = true;
       console.warn("[sourcefed] GH_TOKEN or GITHUB_TOKEN is not set; GitHub monitors will not poll");
     }
     return { events: events2, cursor, terminal: false };
@@ -43553,7 +43566,7 @@ function parseSlackReadResult2(result, cursorRaw, location = "thread") {
     messageIds: previous.messageIds ?? [],
     latestTs: previous.latestTs
   };
-  const users = new Map((result.users ?? []).map((user) => [user.id, user.real_name ?? user.name ?? user.id ?? "someone"]));
+  const users22 = new Map((result.users ?? []).map((user) => [user.id, user.real_name ?? user.name ?? user.id ?? "someone"]));
   const messages = (result.messages ?? []).filter((message) => message.ts);
   const freshMessages = messages.filter((message) => {
     if (cursor.messageIds.includes(message.ts)) return false;
@@ -43565,7 +43578,7 @@ function parseSlackReadResult2(result, cursorRaw, location = "thread") {
     events2 = freshMessages.map((message) => {
       let text = "[message without text]";
       if (message.text?.trim()) text = message.text.trim();
-      let author = users.get(message.user);
+      let author = users22.get(message.user);
       if (!author) author = message.user;
       if (!author) author = "someone";
       return {
@@ -43588,10 +43601,9 @@ function parseSlackReadResult2(result, cursorRaw, location = "thread") {
   return { events: events2, cursor };
 }
 var SLACK_API2 = "https://slack.com/api";
-var warnedMissingToken22 = false;
-function slackToken2() {
-  return process.env.SOURCEFED_SLACK_TOKEN;
-}
+var USERS_TTL_MS2 = 60 * 60 * 1e3;
+var users2;
+var refreshing2;
 async function fetchSlackThread2(channelId, threadTs) {
   return fetchSlackMessages2("conversations.replies", { channel: channelId, ts: threadTs, inclusive: "false" });
 }
@@ -43601,61 +43613,57 @@ async function fetchSlackDm2(channelId) {
 async function fetchSlackMessages2(method, params) {
   const messages = [];
   let cursor = "";
-  let received = false;
   do {
-    const page = await slackApi2(method, {
-      ...params,
-      limit: "1000",
-      ...cursor ? { cursor } : {}
-    });
-    if (!page) break;
-    received = true;
-    if (Array.isArray(page.messages)) messages.push(...page.messages);
-    cursor = page.response_metadata?.next_cursor ?? "";
+    const page = await slackApi2(method, { ...params, limit: "1000", ...cursor ? { cursor } : {} });
+    if (!page.ok) {
+      if (messages.length > 0) break;
+      throw new Error(`slack ${method} failed: ${page.error}`);
+    }
+    if (Array.isArray(page.result.messages)) messages.push(...page.result.messages);
+    cursor = page.result.response_metadata?.next_cursor ?? "";
     if (messages.length >= 1e4) break;
   } while (cursor);
-  if (!received) return void 0;
-  const users = [];
-  let usersCursor = "";
+  return { messages, users: await slackUsers2() };
+}
+async function slackUsers2() {
+  if (users2 && Date.now() - users2.fetchedAt < USERS_TTL_MS2) return users2.list;
+  refreshing2 ??= refreshUsers2().finally(() => {
+    refreshing2 = void 0;
+  });
+  return refreshing2;
+}
+async function refreshUsers2() {
+  const list2 = [];
+  let cursor = "";
   do {
-    const page = await slackApi2("users.list", { limit: "200", ...usersCursor ? { cursor: usersCursor } : {} });
-    if (!page) break;
-    if (Array.isArray(page.members)) {
-      users.push(...page.members.map((member) => ({
-        id: member.id,
-        name: member.name,
-        real_name: member.real_name
-      })));
-    }
-    usersCursor = page.response_metadata?.next_cursor ?? "";
-  } while (usersCursor);
-  return { messages, users };
+    const page = await slackApi2("users.list", { limit: "200", ...cursor ? { cursor } : {} });
+    if (!page.ok) return users2?.list ?? list2;
+    if (Array.isArray(page.result.members)) {
+      list2.push(...page.result.members.map((member) => ({ id: member.id, name: member.name, real_name: member.real_name })));
+    }
+    cursor = page.result.response_metadata?.next_cursor ?? "";
+  } while (cursor);
+  users2 = { list: list2, fetchedAt: Date.now() };
+  return list2;
 }
 async function slackApi2(method, params) {
-  const token = slackToken2();
-  if (!token) {
-    if (!warnedMissingToken22) {
-      warnedMissingToken22 = true;
-      console.warn("[sourcefed] SOURCEFED_SLACK_TOKEN is not set; Slack monitors will not poll");
-    }
-    return void 0;
-  }
+  const token = process.env.SOURCEFED_SLACK_TOKEN;
+  if (!token) return { ok: false, error: "SOURCEFED_SLACK_TOKEN is not set" };
   try {
     const response = await fetch(`${SLACK_API2}/${method}`, {
       method: "POST",
       headers: { authorization: `Bearer ${token}`, "content-type": "application/x-www-form-urlencoded" },
       body: new URLSearchParams(params)
     });
-    const result = await response.json();
-    if (!response.ok || result?.ok !== true) return void 0;
-    return result;
-  } catch {
-    return void 0;
+    const result = await response.json().catch(() => void 0);
+    if (response.ok && result?.ok === true) return { ok: true, result };
+    return { ok: false, error: result?.error ?? `HTTP ${response.status}` };
+  } catch (error2) {
+    return { ok: false, error: error2 instanceof Error ? error2.message : String(error2) };
   }
 }
 async function pollSlack2(source, cursorRaw) {
   const result = source.threadTs ? await fetchSlackThread2(source.channelId, source.threadTs) : await fetchSlackDm2(source.channelId);
-  if (!result) throw new Error("slack API request failed; check SOURCEFED_SLACK_TOKEN");
   const parsed = parseSlackReadResult2(result, cursorRaw, source.threadTs ? "thread" : "DM");
   return { ...parsed, terminal: false };
 }
@@ -44043,8 +44051,8 @@ function dim(text) {
 
 // packages/cli/src/commands/monitor/ack.ts
 async function ack(context) {
-  const eventIDs = (flag(context.args, "event-id") ?? "").split(",").filter(Boolean);
-  if (eventIDs.length === 0) throw new Error("ack requires --event-id <id>[,<id>...]");
+  const eventIDs = flags(context.args, "event-id").filter(Boolean);
+  if (eventIDs.length === 0) throw new Error("ack requires --event-id <id> (repeat it for several events)");
   printResult(await context.client.request("monitor.ack", { target: context.target, eventIDs }));
 }