@solongate/proxy 0.81.53 → 0.81.54

package/dist/index.js

@@ -10062,13 +10062,6 @@ import { Box as Box7, Text as Text7, useInput as useInput6 } from "ink";
 import TextInput5 from "ink-text-input";
 import { useEffect as useEffect6, useRef as useRef3, useState as useState7 } from "react";
 import { Fragment as Fragment5, jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
-function alertBodyFor(channel) {
-  const c2 = channel.trim();
-  const base = { name: "dataroom alert", threshold: 5, windowSeconds: 60, signal: "any" };
-  if (/^https?:\/\//i.test(c2)) return { ...base, slackUrl: c2 };
-  if (c2.includes("@")) return { ...base, emails: [c2] };
-  return { ...base, telegram: [c2] };
-}
 function SettingsPanel({
   active: active2,
   focused,
@@ -10103,8 +10096,9 @@ function SettingsPanel({
   const whQ = useLoader(() => listAccounts().length ? api.settings.getWebhooks() : Promise.resolve(null));
   const alertQ = useLoader(() => listAccounts().length ? api.settings.getAlerts() : Promise.resolve(null));
   const local = localQ.data;
-  const webhooks = whQ.data?.webhooks ?? [];
-  const alerts = alertQ.data?.rules ?? [];
+  const [hidden, setHidden] = useState7(/* @__PURE__ */ new Set());
+  const webhooks = (whQ.data?.webhooks ?? []).filter((w) => !hidden.has("wh:" + w.id));
+  const alerts = (alertQ.data?.rules ?? []).filter((r) => !hidden.has("alert:" + r.id));
   const rowsAll = [
     ...accounts.map((acc) => ({ kind: "acct", acc })),
     { kind: "acct-add" },
@@ -10115,7 +10109,8 @@ function SettingsPanel({
       ...webhooks.map((wh) => ({ kind: "wh", wh })),
       { kind: "wh-add" },
       ...alerts.map((rule) => ({ kind: "alert", rule })),
-      { kind: "alert-add" }
+      { kind: "alert-add-email" },
+      { kind: "alert-add-tg" }
     ]
   ];
   const selClamped = Math.min(sel, rowsAll.length - 1);
@@ -10200,9 +10195,12 @@ function SettingsPanel({
       setEditing("wh-url");
     } else if (r.kind === "alert") {
       run12(r.rule.enabled ? "alert disabled" : "alert enabled", () => api.settings.setAlertEnabled(r.rule.id, !r.rule.enabled), alertQ.reload);
+    } else if (r.kind === "alert-add-email") {
+      setInput("");
+      setEditing("alert-email");
     } else {
       setInput("");
-      setEditing("alert-channel");
+      setEditing("alert-tg");
     }
   };
   const submitInput = () => {
@@ -10215,9 +10213,20 @@ function SettingsPanel({
     } else if (which === "wh-url") {
       if (!v) return;
       run12("webhook added", () => api.settings.createWebhook({ url: v, events: "denials" }), whQ.reload);
-    } else if (which === "alert-channel") {
+    } else if (which === "alert-email") {
+      if (!v) return;
+      if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(v)) {
+        setMsg({ text: "\u2717 that does not look like an e-mail address", level: "bad" });
+        return;
+      }
+      run12("email alert added", () => api.settings.createAlert({ ...ALERT_BASE, emails: [v] }), alertQ.reload);
+    } else if (which === "alert-tg") {
       if (!v) return;
-      run12("alert rule added", () => api.settings.createAlert(alertBodyFor(v)), alertQ.reload);
+      if (!/^-?\d{5,}$/.test(v)) {
+        setMsg({ text: "\u2717 a telegram chat id is a number \u2014 get yours from @userinfobot", level: "bad" });
+        return;
+      }
+      run12("telegram alert added", () => api.settings.createAlert({ ...ALERT_BASE, telegram: [v] }), alertQ.reload);
     }
   };
   useInput6(
@@ -10260,9 +10269,9 @@ function SettingsPanel({
         if (cur.kind === "wh" || cur.kind === "wh-add") {
           setInput("");
           setEditing("wh-url");
-        } else if (cur.kind === "alert" || cur.kind === "alert-add") {
+        } else if (cur.kind === "alert" || cur.kind === "alert-add-email" || cur.kind === "alert-add-tg") {
           setInput("");
-          setEditing("alert-channel");
+          setEditing("alert-email");
         }
       } else if (inp === "d" && (cur.kind === "wh" || cur.kind === "alert")) {
         const k = keyOf(cur);
@@ -10272,8 +10281,13 @@ function SettingsPanel({
           return;
         }
         setConfirmDel(null);
-        if (cur.kind === "wh") run12("webhook deleted", () => api.settings.deleteWebhook(cur.wh.id), whQ.reload);
-        else run12("alert deleted", () => api.settings.deleteAlert(cur.rule.id), alertQ.reload);
+        if (cur.kind === "wh") {
+          const id = cur.wh.id;
+          run12("webhook deleted", () => api.settings.deleteWebhook(id).then(() => setHidden((h) => new Set(h).add("wh:" + id))), whQ.reload);
+        } else {
+          const id = cur.rule.id;
+          run12("alert deleted", () => api.settings.deleteAlert(id).then(() => setHidden((h) => new Set(h).add("alert:" + id))), alertQ.reload);
+        }
       } else if (inp === "r") reloadAll();
     },
     { isActive: focused && !editing }
@@ -10302,7 +10316,7 @@ function SettingsPanel({
   const error = locked ? null : localQ.error ?? whQ.error ?? alertQ.error;
   const mark = (r) => keyOf(r) === keyOf(cur) && focused ? "\u25B8 " : "  ";
   const onOff = (on) => on ? /* @__PURE__ */ jsx7(Text7, { color: theme.ok, children: "on " }) : /* @__PURE__ */ jsx7(Text7, { color: theme.dim, children: "off" });
-  const chanOf = (rule) => [...(rule.slackUrls ?? []).map((u) => "slack " + u), ...rule.emails ?? [], ...(rule.telegram ?? []).map((t) => "tg " + t)].join(", ") || "\u2014";
+  const chanOf = (rule) => [...rule.emails ?? [], ...(rule.telegram ?? []).map((t) => "tg " + t)].join(", ") || "\u2014";
   const listBudget = Math.max(4, rows - 10);
   const start = Math.min(Math.max(0, selClamped - Math.floor(listBudget / 2)), Math.max(0, rowsAll.length - listBudget));
   const inWindow = (r) => {
@@ -10312,7 +10326,7 @@ function SettingsPanel({
   return /* @__PURE__ */ jsx7(DataView, { loading, error, children: /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx7(Text7, { color: theme.dim, children: focused ? "\u2191\u2193 move \xB7 enter/m act \xB7 t test webhook \xB7 n add account \xB7 e events \xB7 d delete \xB7 r refresh" : "press \u2192 to configure" }),
     editing ? /* @__PURE__ */ jsxs7(Box7, { children: [
-      /* @__PURE__ */ jsx7(Text7, { color: theme.warn, children: editing === "path" ? "local log path: " : editing === "wh-url" ? "webhook url: " : "channel (slack url / email / telegram id): " }),
+      /* @__PURE__ */ jsx7(Text7, { color: theme.warn, children: editing === "path" ? "local log path: " : editing === "wh-url" ? "webhook url: " : editing === "alert-email" ? "e-mail address: " : "telegram chat id (from @userinfobot): " }),
       /* @__PURE__ */ jsx7(TextInput5, { value: input, onChange: setInput, onSubmit: submitInput })
     ] }) : msg ? /* @__PURE__ */ jsx7(Text7, { color: msg.level === "bad" ? theme.bad : theme.ok, children: truncate2(msg.text, cols) }) : login?.msg ? /* @__PURE__ */ jsx7(Text7, { color: login.phase === "error" ? theme.bad : theme.ok, children: login.msg }) : /* @__PURE__ */ jsx7(Text7, { children: " " }),
     /* @__PURE__ */ jsxs7(Box7, { marginTop: 1, flexDirection: "column", children: [
@@ -10405,15 +10419,19 @@ function SettingsPanel({
           /* @__PURE__ */ jsx7(Text7, { children: `\u2265${rule.threshold}/${rule.windowSeconds}s ` }),
           /* @__PURE__ */ jsx7(Text7, { color: theme.accent, children: truncate2(chanOf(rule), cols - 26) })
         ] }, rule.id)),
-        inWindow({ kind: "alert-add" }) ? /* @__PURE__ */ jsxs7(Text7, { children: [
-          /* @__PURE__ */ jsx7(Text7, { color: cur.kind === "alert-add" && focused ? theme.accentBright : theme.dim, children: mark({ kind: "alert-add" }) }),
-          /* @__PURE__ */ jsx7(Text7, { color: theme.dim, children: "+ add alert (enter \u2014 one channel: slack url, email or telegram chat id)" })
+        inWindow({ kind: "alert-add-email" }) ? /* @__PURE__ */ jsxs7(Text7, { children: [
+          /* @__PURE__ */ jsx7(Text7, { color: cur.kind === "alert-add-email" && focused ? theme.accentBright : theme.dim, children: mark({ kind: "alert-add-email" }) }),
+          /* @__PURE__ */ jsx7(Text7, { color: theme.dim, children: "+ add email alert (enter)" })
+        ] }) : null,
+        inWindow({ kind: "alert-add-tg" }) ? /* @__PURE__ */ jsxs7(Text7, { children: [
+          /* @__PURE__ */ jsx7(Text7, { color: cur.kind === "alert-add-tg" && focused ? theme.accentBright : theme.dim, children: mark({ kind: "alert-add-tg" }) }),
+          /* @__PURE__ */ jsx7(Text7, { color: theme.dim, children: "+ add telegram alert (enter \u2014 numeric chat id, get it from @userinfobot)" })
         ] }) : null
       ] })
     ] })
   ] }) });
 }
-var EVENTS, SPIN2, acctLabel;
+var EVENTS, SPIN2, ALERT_BASE, acctLabel;
 var init_Settings = __esm({
   "src/tui/panels/Settings.tsx"() {
     "use strict";
@@ -10426,6 +10444,7 @@ var init_Settings = __esm({
     init_theme();
     EVENTS = ["denials", "allowed", "all"];
     SPIN2 = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+    ALERT_BASE = { name: "dataroom alert", threshold: 5, windowSeconds: 60, signal: "any" };
     acctLabel = (a) => a.email || a.user || "account \u2026" + a.apiKey.slice(-4);
   }
 });

package/dist/tui/index.js

@@ -3175,13 +3175,7 @@ function stopLogsServerDaemon() {
 import { Fragment as Fragment5, jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
 var EVENTS = ["denials", "allowed", "all"];
 var SPIN2 = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
-function alertBodyFor(channel) {
-  const c2 = channel.trim();
-  const base = { name: "dataroom alert", threshold: 5, windowSeconds: 60, signal: "any" };
-  if (/^https?:\/\//i.test(c2)) return { ...base, slackUrl: c2 };
-  if (c2.includes("@")) return { ...base, emails: [c2] };
-  return { ...base, telegram: [c2] };
-}
+var ALERT_BASE = { name: "dataroom alert", threshold: 5, windowSeconds: 60, signal: "any" };
 var acctLabel = (a) => a.email || a.user || "account \u2026" + a.apiKey.slice(-4);
 function SettingsPanel({
   active: active2,
@@ -3217,8 +3211,9 @@ function SettingsPanel({
   const whQ = useLoader(() => listAccounts().length ? api.settings.getWebhooks() : Promise.resolve(null));
   const alertQ = useLoader(() => listAccounts().length ? api.settings.getAlerts() : Promise.resolve(null));
   const local = localQ.data;
-  const webhooks = whQ.data?.webhooks ?? [];
-  const alerts = alertQ.data?.rules ?? [];
+  const [hidden, setHidden] = useState7(/* @__PURE__ */ new Set());
+  const webhooks = (whQ.data?.webhooks ?? []).filter((w) => !hidden.has("wh:" + w.id));
+  const alerts = (alertQ.data?.rules ?? []).filter((r) => !hidden.has("alert:" + r.id));
   const rowsAll = [
     ...accounts.map((acc) => ({ kind: "acct", acc })),
     { kind: "acct-add" },
@@ -3229,7 +3224,8 @@ function SettingsPanel({
       ...webhooks.map((wh) => ({ kind: "wh", wh })),
       { kind: "wh-add" },
       ...alerts.map((rule) => ({ kind: "alert", rule })),
-      { kind: "alert-add" }
+      { kind: "alert-add-email" },
+      { kind: "alert-add-tg" }
     ]
   ];
   const selClamped = Math.min(sel, rowsAll.length - 1);
@@ -3314,9 +3310,12 @@ function SettingsPanel({
       setEditing("wh-url");
     } else if (r.kind === "alert") {
       run(r.rule.enabled ? "alert disabled" : "alert enabled", () => api.settings.setAlertEnabled(r.rule.id, !r.rule.enabled), alertQ.reload);
+    } else if (r.kind === "alert-add-email") {
+      setInput("");
+      setEditing("alert-email");
     } else {
       setInput("");
-      setEditing("alert-channel");
+      setEditing("alert-tg");
     }
   };
   const submitInput = () => {
@@ -3329,9 +3328,20 @@ function SettingsPanel({
     } else if (which === "wh-url") {
       if (!v) return;
       run("webhook added", () => api.settings.createWebhook({ url: v, events: "denials" }), whQ.reload);
-    } else if (which === "alert-channel") {
+    } else if (which === "alert-email") {
+      if (!v) return;
+      if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(v)) {
+        setMsg({ text: "\u2717 that does not look like an e-mail address", level: "bad" });
+        return;
+      }
+      run("email alert added", () => api.settings.createAlert({ ...ALERT_BASE, emails: [v] }), alertQ.reload);
+    } else if (which === "alert-tg") {
       if (!v) return;
-      run("alert rule added", () => api.settings.createAlert(alertBodyFor(v)), alertQ.reload);
+      if (!/^-?\d{5,}$/.test(v)) {
+        setMsg({ text: "\u2717 a telegram chat id is a number \u2014 get yours from @userinfobot", level: "bad" });
+        return;
+      }
+      run("telegram alert added", () => api.settings.createAlert({ ...ALERT_BASE, telegram: [v] }), alertQ.reload);
     }
   };
   useInput6(
@@ -3374,9 +3384,9 @@ function SettingsPanel({
         if (cur.kind === "wh" || cur.kind === "wh-add") {
           setInput("");
           setEditing("wh-url");
-        } else if (cur.kind === "alert" || cur.kind === "alert-add") {
+        } else if (cur.kind === "alert" || cur.kind === "alert-add-email" || cur.kind === "alert-add-tg") {
           setInput("");
-          setEditing("alert-channel");
+          setEditing("alert-email");
         }
       } else if (inp === "d" && (cur.kind === "wh" || cur.kind === "alert")) {
         const k = keyOf(cur);
@@ -3386,8 +3396,13 @@ function SettingsPanel({
           return;
         }
         setConfirmDel(null);
-        if (cur.kind === "wh") run("webhook deleted", () => api.settings.deleteWebhook(cur.wh.id), whQ.reload);
-        else run("alert deleted", () => api.settings.deleteAlert(cur.rule.id), alertQ.reload);
+        if (cur.kind === "wh") {
+          const id = cur.wh.id;
+          run("webhook deleted", () => api.settings.deleteWebhook(id).then(() => setHidden((h) => new Set(h).add("wh:" + id))), whQ.reload);
+        } else {
+          const id = cur.rule.id;
+          run("alert deleted", () => api.settings.deleteAlert(id).then(() => setHidden((h) => new Set(h).add("alert:" + id))), alertQ.reload);
+        }
       } else if (inp === "r") reloadAll();
     },
     { isActive: focused && !editing }
@@ -3416,7 +3431,7 @@ function SettingsPanel({
   const error = locked ? null : localQ.error ?? whQ.error ?? alertQ.error;
   const mark = (r) => keyOf(r) === keyOf(cur) && focused ? "\u25B8 " : "  ";
   const onOff = (on) => on ? /* @__PURE__ */ jsx7(Text7, { color: theme.ok, children: "on " }) : /* @__PURE__ */ jsx7(Text7, { color: theme.dim, children: "off" });
-  const chanOf = (rule) => [...(rule.slackUrls ?? []).map((u) => "slack " + u), ...rule.emails ?? [], ...(rule.telegram ?? []).map((t) => "tg " + t)].join(", ") || "\u2014";
+  const chanOf = (rule) => [...rule.emails ?? [], ...(rule.telegram ?? []).map((t) => "tg " + t)].join(", ") || "\u2014";
   const listBudget = Math.max(4, rows - 10);
   const start = Math.min(Math.max(0, selClamped - Math.floor(listBudget / 2)), Math.max(0, rowsAll.length - listBudget));
   const inWindow = (r) => {
@@ -3426,7 +3441,7 @@ function SettingsPanel({
   return /* @__PURE__ */ jsx7(DataView, { loading, error, children: /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx7(Text7, { color: theme.dim, children: focused ? "\u2191\u2193 move \xB7 enter/m act \xB7 t test webhook \xB7 n add account \xB7 e events \xB7 d delete \xB7 r refresh" : "press \u2192 to configure" }),
     editing ? /* @__PURE__ */ jsxs7(Box7, { children: [
-      /* @__PURE__ */ jsx7(Text7, { color: theme.warn, children: editing === "path" ? "local log path: " : editing === "wh-url" ? "webhook url: " : "channel (slack url / email / telegram id): " }),
+      /* @__PURE__ */ jsx7(Text7, { color: theme.warn, children: editing === "path" ? "local log path: " : editing === "wh-url" ? "webhook url: " : editing === "alert-email" ? "e-mail address: " : "telegram chat id (from @userinfobot): " }),
       /* @__PURE__ */ jsx7(TextInput5, { value: input, onChange: setInput, onSubmit: submitInput })
     ] }) : msg ? /* @__PURE__ */ jsx7(Text7, { color: msg.level === "bad" ? theme.bad : theme.ok, children: truncate(msg.text, cols) }) : login?.msg ? /* @__PURE__ */ jsx7(Text7, { color: login.phase === "error" ? theme.bad : theme.ok, children: login.msg }) : /* @__PURE__ */ jsx7(Text7, { children: " " }),
     /* @__PURE__ */ jsxs7(Box7, { marginTop: 1, flexDirection: "column", children: [
@@ -3519,9 +3534,13 @@ function SettingsPanel({
           /* @__PURE__ */ jsx7(Text7, { children: `\u2265${rule.threshold}/${rule.windowSeconds}s ` }),
           /* @__PURE__ */ jsx7(Text7, { color: theme.accent, children: truncate(chanOf(rule), cols - 26) })
         ] }, rule.id)),
-        inWindow({ kind: "alert-add" }) ? /* @__PURE__ */ jsxs7(Text7, { children: [
-          /* @__PURE__ */ jsx7(Text7, { color: cur.kind === "alert-add" && focused ? theme.accentBright : theme.dim, children: mark({ kind: "alert-add" }) }),
-          /* @__PURE__ */ jsx7(Text7, { color: theme.dim, children: "+ add alert (enter \u2014 one channel: slack url, email or telegram chat id)" })
+        inWindow({ kind: "alert-add-email" }) ? /* @__PURE__ */ jsxs7(Text7, { children: [
+          /* @__PURE__ */ jsx7(Text7, { color: cur.kind === "alert-add-email" && focused ? theme.accentBright : theme.dim, children: mark({ kind: "alert-add-email" }) }),
+          /* @__PURE__ */ jsx7(Text7, { color: theme.dim, children: "+ add email alert (enter)" })
+        ] }) : null,
+        inWindow({ kind: "alert-add-tg" }) ? /* @__PURE__ */ jsxs7(Text7, { children: [
+          /* @__PURE__ */ jsx7(Text7, { color: cur.kind === "alert-add-tg" && focused ? theme.accentBright : theme.dim, children: mark({ kind: "alert-add-tg" }) }),
+          /* @__PURE__ */ jsx7(Text7, { color: theme.dim, children: "+ add telegram alert (enter \u2014 numeric chat id, get it from @userinfobot)" })
         ] }) : null
       ] })
     ] })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solongate/proxy",
-  "version": "0.81.53",
+  "version": "0.81.54",
   "description": "AI tool security proxy: protect any AI tool server with customizable policies, path/command constraints, rate limiting, and audit logging. No code changes required.",
   "type": "module",
   "bin": {