omni-notify-mcp 1.3.4 → 1.3.6

package/dist/ui/server.js

@@ -28,7 +28,7 @@ function defaultConfig() {
         whatsapp: { enabled: false, instanceId: "", apiToken: "", phone: "" },
         sms: { enabled: false, accountSid: "", authToken: "", from: "", to: "" },
         email: { enabled: false, to: "" },
-        ntfy: { enabled: false, topic: "", serverUrl: "https://ntfy.sh", token: "" },
+        ntfy: { enabled: false, topic: "", serverUrl: "" },
         discord: { enabled: false, webhookUrl: "", username: "Claude Notify" },
         slack: { enabled: false, webhookUrl: "" },
         teams: { enabled: false, webhookUrl: "" },
@@ -105,8 +105,6 @@ function maskSecrets(config) {
         c.telegram.token = MASKED;
     if (c.whatsapp?.apiToken)
         c.whatsapp.apiToken = MASKED;
-    if (c.ntfy?.token)
-        c.ntfy.token = MASKED;
     if (c.discord?.webhookUrl)
         c.discord.webhookUrl = MASKED;
     if (c.slack?.webhookUrl)
@@ -137,7 +135,6 @@ function mergePreservingSecrets(existing, update) {
     guard(["sms", "authToken"]);
     guard(["telegram", "token"]);
     guard(["whatsapp", "apiToken"]);
-    guard(["ntfy", "token"]);
     guard(["discord", "webhookUrl"]);
     guard(["slack", "webhookUrl"]);
     guard(["teams", "webhookUrl"]);
@@ -146,6 +143,100 @@ function mergePreservingSecrets(existing, update) {
 const app = express();
 app.use(express.json());
 app.use(express.static(PUBLIC_DIR));
+const ntfySubscribers = new Map();
+function ntfyFanout(topic, message, title, priority, tags) {
+    const subs = ntfySubscribers.get(topic);
+    if (!subs || subs.size === 0)
+        return;
+    const id = Date.now();
+    const event = [
+        `id: ${id}`,
+        `event: message`,
+        `data: ${JSON.stringify({ id: String(id), time: Math.floor(id / 1000), event: "message", topic, title, message, priority, tags: tags ? tags.split(",") : [] })}`,
+        "",
+        "",
+    ].join("\n");
+    for (const sub of subs) {
+        try {
+            sub.res.write(event);
+        }
+        catch {
+            subs.delete(sub);
+        }
+    }
+}
+// SSE subscribe — ntfy app connects here
+app.get("/ntfy/:topic/sse", (req, res) => {
+    const { topic } = req.params;
+    res.setHeader("Content-Type", "text/event-stream");
+    res.setHeader("Cache-Control", "no-cache");
+    res.setHeader("Connection", "keep-alive");
+    res.setHeader("X-Accel-Buffering", "no");
+    res.flushHeaders();
+    res.write(`: connected to omni-notify-mcp ntfy\n\n`);
+    const sub = { res, topic };
+    if (!ntfySubscribers.has(topic))
+        ntfySubscribers.set(topic, new Set());
+    ntfySubscribers.get(topic).add(sub);
+    const keepalive = setInterval(() => { try {
+        res.write(": keepalive\n\n");
+    }
+    catch {
+        clearInterval(keepalive);
+    } }, 30_000);
+    req.on("close", () => {
+        clearInterval(keepalive);
+        ntfySubscribers.get(topic)?.delete(sub);
+    });
+});
+// Also support ntfy's JSON stream endpoint
+app.get("/ntfy/:topic/json", (req, res) => {
+    const { topic } = req.params;
+    res.setHeader("Content-Type", "application/x-ndjson");
+    res.setHeader("Cache-Control", "no-cache");
+    res.setHeader("Connection", "keep-alive");
+    res.flushHeaders();
+    const sub = { res, topic };
+    if (!ntfySubscribers.has(topic))
+        ntfySubscribers.set(topic, new Set());
+    ntfySubscribers.get(topic).add(sub);
+    const keepalive = setInterval(() => {
+        try {
+            res.write(JSON.stringify({ event: "keepalive", time: Math.floor(Date.now() / 1000) }) + "\n");
+        }
+        catch {
+            clearInterval(keepalive);
+        }
+    }, 30_000);
+    req.on("close", () => {
+        clearInterval(keepalive);
+        ntfySubscribers.get(topic)?.delete(sub);
+    });
+});
+// Publish endpoint — ntfy protocol POST
+app.put("/ntfy/:topic", express.text({ type: "*/*" }), (req, res) => {
+    const { topic } = req.params;
+    const message = typeof req.body === "string" ? req.body : "";
+    const title = decodeURIComponent(req.headers["title"] || req.headers["x-title"] || "Claude Notify");
+    const priority = parseInt((req.headers["priority"] || req.headers["x-priority"] || "3")) || 3;
+    const tags = (req.headers["tags"] || req.headers["x-tags"] || "");
+    ntfyFanout(topic, message, title, priority, tags);
+    res.json({ id: String(Date.now()), time: Math.floor(Date.now() / 1000), event: "message", topic, title, message, priority });
+});
+app.post("/ntfy/:topic", express.text({ type: "*/*" }), (req, res) => {
+    const { topic } = req.params;
+    const message = typeof req.body === "string" ? req.body : "";
+    const title = decodeURIComponent(req.headers["title"] || req.headers["x-title"] || "Claude Notify");
+    const priority = parseInt((req.headers["priority"] || req.headers["x-priority"] || "3")) || 3;
+    const tags = (req.headers["tags"] || req.headers["x-tags"] || "");
+    ntfyFanout(topic, message, title, priority, tags);
+    res.json({ id: String(Date.now()), time: Math.floor(Date.now() / 1000), event: "message", topic, title, message, priority });
+});
+// Subscriber count endpoint (for badge)
+app.get("/ntfy/:topic/subscribers", (req, res) => {
+    const count = ntfySubscribers.get(req.params.topic)?.size ?? 0;
+    res.json({ topic: req.params.topic, subscribers: count });
+});
 // ── Config API ────────────────────────────────────────────────────────────────
 app.get("/api/config", (_req, res) => {
     res.json(maskSecrets(loadConfig()));
@@ -393,16 +484,13 @@ app.post("/api/test/ntfy", async (_req, res) => {
         return;
     }
     try {
-        const base = (ntfy.serverUrl ?? "https://ntfy.sh").replace(/\/$/, "");
-        const headers = {
-            "Content-Type": "text/plain; charset=utf-8", "Title": encodeURIComponent("Claude Notify - test"), "Priority": "3", "Tags": "white_check_mark",
-        };
-        if (ntfy.token)
-            headers["Authorization"] = `Bearer ${ntfy.token}`;
-        const r = await fetch(`${base}/${encodeURIComponent(ntfy.topic)}`, { method: "POST", headers, body: Buffer.from("Test from Claude Notify - ntfy is working!", "utf8") });
-        if (!r.ok)
-            throw new Error(`ntfy ${r.status}: ${await r.text()}`);
-        res.json({ ok: true, message: `ntfy notification sent to topic '${ntfy.topic}'` });
+        const subs = ntfySubscribers.get(ntfy.topic)?.size ?? 0;
+        if (subs === 0) {
+            res.status(400).json({ error: `No subscribers on topic '${ntfy.topic}'. Open the ntfy app and subscribe to this topic first.` });
+            return;
+        }
+        ntfyFanout(ntfy.topic, "Test from Claude Notify - ntfy is working!", "Claude Notify - test", 3, "white_check_mark");
+        res.json({ ok: true, message: `ntfy notification sent to ${subs} subscriber(s) on topic '${ntfy.topic}'` });
     }
     catch (err) {
         res.status(500).json({ error: String(err) });
@@ -808,26 +896,17 @@ async function sendNotification(message, priority, client) {
                 to: email.to, subject: "Claude Notify", text: message });
         });
     }
-    // ntfy
+    // ntfy (built-in server — direct fanout, no external fetch)
     if (!desktopOnlyMode) {
         const ntfy = cfg.ntfy ?? {};
         if (ntfy.enabled && ntfy.topic) {
             await send("ntfy", async () => {
-                const base = (ntfy.serverUrl ?? "https://ntfy.sh").replace(/\/$/, "");
                 const priorityMap = { low: 2, normal: 3, high: 5 };
-                const headers = {
-                    "Content-Type": "text/plain; charset=utf-8",
-                    "Title": encodeURIComponent("Claude Notify"),
-                    "Priority": String(priorityMap[priority] ?? 3),
-                    "Tags": priority === "high" ? "rotating_light" : "bell",
-                };
-                if (ntfy.token)
-                    headers["Authorization"] = `Bearer ${ntfy.token}`;
-                const r = await fetch(`${base}/${encodeURIComponent(ntfy.topic)}`, {
-                    method: "POST", headers, body: Buffer.from(message, "utf8"),
-                });
-                if (!r.ok)
-                    throw new Error(`ntfy ${r.status}: ${await r.text()}`);
+                const tags = priority === "high" ? "rotating_light" : "bell";
+                const subs = ntfySubscribers.get(ntfy.topic)?.size ?? 0;
+                if (subs === 0)
+                    throw new Error(`ntfy: no subscribers on topic '${ntfy.topic}' — is the app connected?`);
+                ntfyFanout(ntfy.topic, message, "Claude Notify", priorityMap[priority] ?? 3, tags);
             });
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omni-notify-mcp",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "description": "An MCP server that lets AI agents (Claude, Cursor, etc.) reach you on any channel — desktop, Telegram, SMS, email — with two-way ask/reply, real-time inbox push, Do Not Disturb, idle gating, multi-session routing, and a one-page web UI for setup. Zero config code; configure once, agents call notify/ask.",
   "main": "dist/index.js",
   "type": "module",

package/ui/public/app.js

@@ -82,8 +82,8 @@ function populateForm() {
   const ntfy = config.ntfy ?? {};
   $("ntfy-enabled").checked = !!ntfy.enabled;
   $("ntfy-topic").value = ntfy.topic ?? "";
-  $("ntfy-server").value = ntfy.serverUrl ?? "https://ntfy.sh";
-  $("ntfy-token").value = ntfy.token ?? "";
+  const defaultUrl = `${location.protocol}//${location.hostname}:${location.port || (location.protocol === 'https:' ? 443 : 80)}`;
+  $("ntfy-server-url").value = ntfy.serverUrl || defaultUrl;
 
   // Discord
   const dc = config.discord ?? {};
@@ -159,8 +159,18 @@ function updateBadges() {
     sms.enabled && smsReady ? "Configured" : smsReady ? "Disabled" : sms.accountSid ? "Incomplete" : "Not configured");
 
   const ntfyC = config.ntfy ?? {};
-  setBadge("ntfy", ntfyC.enabled && ntfyC.topic ? "ok" : ntfyC.topic ? "warn" : "idle",
-    ntfyC.enabled && ntfyC.topic ? "Configured" : ntfyC.topic ? "Disabled" : "Not configured");
+  if (ntfyC.topic) {
+    fetch(`/ntfy/${encodeURIComponent(ntfyC.topic)}/subscribers`).then(r => r.json()).then(d => {
+      const count = d.subscribers ?? 0;
+      if (ntfyC.enabled) {
+        setBadge("ntfy", count > 0 ? "ok" : "warn", count > 0 ? `${count} subscriber${count===1?"":"s"}` : "No subscribers");
+      } else {
+        setBadge("ntfy", "idle", count > 0 ? `Disabled (${count} connected)` : "Disabled");
+      }
+    }).catch(() => setBadge("ntfy", ntfyC.enabled ? "warn" : "idle", ntfyC.enabled ? "Configured" : "Disabled"));
+  } else {
+    setBadge("ntfy", "idle", "Not configured");
+  }
 
   const dcC = config.discord ?? {};
   setBadge("discord", dcC.enabled && dcC.webhookUrl ? "ok" : dcC.webhookUrl ? "warn" : "idle",
@@ -349,9 +359,14 @@ async function saveSms() {
 }
 
 async function saveNtfy() {
-  await patch({ ntfy: { enabled: $("ntfy-enabled").checked, topic: $("ntfy-topic").value.trim(), serverUrl: $("ntfy-server").value.trim() || "https://ntfy.sh", token: $("ntfy-token").value.trim() } });
+  await patch({ ntfy: { enabled: $("ntfy-enabled").checked, topic: $("ntfy-topic").value.trim(), serverUrl: $("ntfy-server-url").value.trim() } });
   clearDirty("ntfy");
 }
+
+function copyNtfyUrl() {
+  const url = $("ntfy-server-url").value.trim();
+  navigator.clipboard.writeText(url).then(() => toast("Server URL copied!", "ok")).catch(() => toast("Copy failed", "error"));
+}
 async function saveDiscord() {
   await patch({ discord: { enabled: $("discord-enabled").checked, webhookUrl: $("discord-webhook").value.trim(), username: $("discord-username").value.trim() || "Claude Notify" } });
   clearDirty("discord");

package/ui/public/index.html

@@ -226,17 +226,23 @@
             <button class="btn btn-sm btn-ghost" onclick="testChannel('ntfy')">Test</button>
           </div>
           <details class="guide">
-            <summary>Set up ntfy (1 min, free, no account needed)</summary>
+            <summary>Set up ntfy (1 min, free, fully private)</summary>
             <ol>
               <li>Install the <a href="https://ntfy.sh" target="_blank">ntfy app</a> on your phone</li>
-              <li>Pick any topic name (e.g. <code>my-claude-alerts-abc123</code>) — keep it secret, it's your auth</li>
-              <li>Subscribe to that topic in the app</li>
-              <li>Paste the topic below and save</li>
+              <li>In the app: tap <b>+</b> → <b>Use another server</b> → enter the Server URL shown below</li>
+              <li>Pick a topic name and subscribe</li>
+              <li>Paste the same topic below and save</li>
             </ol>
           </details>
-          <div class="fg"><label>Topic</label><input type="text" id="ntfy-topic" placeholder="my-claude-alerts-abc123" oninput="markDirty('ntfy')"></div>
-          <div class="fg"><label>Server URL</label><input type="text" id="ntfy-server" placeholder="https://ntfy.sh" oninput="markDirty('ntfy')"><span class="hint">Leave default for ntfy.sh, or your self-hosted URL</span></div>
-          <div class="fg"><label>Token (optional)</label><input type="password" id="ntfy-token" placeholder="tk_…" oninput="markDirty('ntfy')"><span class="hint">Only needed for private self-hosted servers</span></div>
+          <div class="fg">
+            <label>Server URL (for ntfy app)</label>
+            <div style="display:flex;gap:6px">
+              <input type="text" id="ntfy-server-url" placeholder="http://73.223.191.86:3737" oninput="markDirty('ntfy')" style="flex:1;font-family:monospace;font-size:12px">
+              <button class="btn btn-sm btn-ghost" onclick="copyNtfyUrl()">Copy</button>
+            </div>
+            <span class="hint">Paste into the ntfy app under "Use another server". Use your public IP if accessing remotely.</span>
+          </div>
+          <div class="fg"><label>Topic</label><input type="text" id="ntfy-topic" placeholder="Claude_Alerts" oninput="markDirty('ntfy')"></div>
         </div>
       </div>