wiki-plugin-salon 0.0.2 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki-plugin-salon",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Federated Wiki plugin — community gathering space with self-registration and plugin event feeds",
   "keywords": ["wiki", "plugin", "salon", "community", "planet-nine"],
   "author": "Planet Nine",
@@ -8,6 +8,6 @@
   "type": "commonjs",
   "main": "index.js",
   "dependencies": {
-    "nodemailer": "^6.9.0"
+    "node-fetch": "^2.6.1"
   }
 }

package/server/server.js

@@ -4,6 +4,7 @@
 const fs     = require('fs');
 const path   = require('path');
 const crypto = require('crypto');
+const fetch  = require('node-fetch');
 
 // ── Storage paths ─────────────────────────────────────────────────────────────
 
@@ -93,14 +94,21 @@ function buildEventEmail(config, event, detail) {
 
 // ── Email ─────────────────────────────────────────────────────────────────────
 
-function createTransporter(config) {
-  const nodemailer = require('nodemailer');
-  return nodemailer.createTransport({
-    host: config.minnieHost || 'localhost',
-    port: parseInt(config.minniePort) || 2525,
-    secure: false,
-    tls: { rejectUnauthorized: false }
+function getMinnieUrl(config) {
+  const base = config.allyabaseUrl ||
+    (config.joanUrl ? config.joanUrl.replace(/\/plugin\/allyabase\/joan$/, '') : '');
+  return base ? base.replace(/\/$/, '') + '/plugin/allyabase/minnie' : null;
+}
+
+async function sendViaMinnie(minnieUrl, { from, to, subject, text }) {
+  const resp = await fetch(`${minnieUrl}/send`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ from, to, subject, text }),
+    timeout: 10000
   });
+  if (!resp.ok) throw new Error(`Minnie /send failed: ${resp.status}`);
+  return resp.json();
 }
 
 async function notifyMembers(config, subject, text) {
@@ -108,12 +116,17 @@ async function notifyMembers(config, subject, text) {
   const recipients = Object.values(tenants).filter(t => t.status === 'active' && t.email);
   if (recipients.length === 0) return;
 
-  const transporter = createTransporter(config);
-  const from = `"${config.title}" <${config.fromEmail || 'salon@planetnine.app'}>`;
+  const minnieUrl = getMinnieUrl(config);
+  if (!minnieUrl) {
+    console.warn('salon: no Minnie URL configured — skipping email notifications');
+    return;
+  }
+
+  const from = config.fromEmail || 'salon@planetnine.app';
 
   for (const tenant of recipients) {
     try {
-      await transporter.sendMail({ from, to: tenant.email, subject, text });
+      await sendViaMinnie(minnieUrl, { from, to: tenant.email, subject, text });
     } catch (err) {
       console.error(`salon: email failed for ${tenant.email}:`, err.message);
     }
@@ -632,15 +645,12 @@ function generateAdminPage(config, tenants) {
           <label>From address</label>
           <input name="fromEmail" value="${esc(config.fromEmail || 'salon@planetnine.app')}" placeholder="salon@planetnine.app">
 
-          <label>Minnie host</label>
-          <input name="minnieHost" value="${esc(String(config.minnieHost || 'localhost'))}" placeholder="localhost">
-
-          <label>Minnie port</label>
-          <input name="minniePort" type="number" value="${esc(String(config.minniePort || 2525))}" placeholder="2525">
-
           <label>Allyabase URL</label>
           <input name="allyabaseUrl" value="${esc(config.allyabaseUrl || (config.joanUrl ? config.joanUrl.replace(/\/plugin\/allyabase\/joan$/, '') : ''))}" placeholder="https://dev.allyabase.com">
-          <div class="form-hint">Joan OTP codes are sent via <code>${esc(config.joanUrl || 'https://dev.allyabase.com/plugin/allyabase/joan')}</code></div>
+          <div class="form-hint">
+            Emails sent via <code>${esc((config.allyabaseUrl || (config.joanUrl ? config.joanUrl.replace(/\/plugin\/allyabase\/joan$/, '') : 'https://dev.allyabase.com')) + '/plugin/allyabase/minnie')}</code><br>
+            OTP codes sent via <code>${esc(config.joanUrl || 'https://dev.allyabase.com/plugin/allyabase/joan')}</code>
+          </div>
 
           <div style="margin-top:16px;">
             <button type="submit" class="btn btn-primary btn-sm">Save Settings</button>
@@ -1166,14 +1176,12 @@ function startServer(params) {
 
   app.post('/plugin/salon/config', owner, json, (req, res) => {
     const config = loadConfig();
-    const { registrationMode, title, description, fromEmail, minnieHost, minniePort, joanUrl, allyabaseUrl } = req.body;
+    const { registrationMode, title, description, fromEmail, joanUrl, allyabaseUrl } = req.body;
     const modes = ['open', 'closed', 'grant'];
     if (registrationMode && modes.includes(registrationMode)) config.registrationMode = registrationMode;
     if (title && title.trim()) config.title = title.trim();
     if (description !== undefined) config.description = description.trim();
     if (fromEmail   !== undefined) config.fromEmail   = fromEmail.trim();
-    if (minnieHost  !== undefined) config.minnieHost  = minnieHost.trim();
-    if (minniePort  !== undefined) config.minniePort  = parseInt(minniePort) || 2525;
     if (joanUrl     !== undefined) config.joanUrl     = joanUrl.trim();
     if (allyabaseUrl !== undefined && allyabaseUrl.trim()) {
       config.allyabaseUrl = allyabaseUrl.trim().replace(/\/$/, '');
@@ -1427,16 +1435,21 @@ function startServer(params) {
     const recipients = Object.values(tenants).filter(t => t.status === 'active' && t.email);
 
     if (recipients.length === 0) {
-      return res.json({ success: true, sent: 0 });
+      return res.json({ success: true, sent: 0, warning: 'No active members with email addresses found' });
+    }
+
+    const minnieUrl = getMinnieUrl(config);
+    if (!minnieUrl) {
+      return res.status(503).json({ error: 'Email not configured — save your Allyabase URL in settings first' });
     }
 
-    const transporter = createTransporter(config);
-    const from = `"${config.title}" <${config.fromEmail || 'salon@planetnine.app'}>`;
+    const from = config.fromEmail || 'salon@planetnine.app';
     let sent = 0;
+    const errors = [];
 
     for (const tenant of recipients) {
       try {
-        await transporter.sendMail({
+        await sendViaMinnie(minnieUrl, {
           from,
           to: tenant.email,
           subject: subject.slice(0, 200),
@@ -1445,10 +1458,11 @@ function startServer(params) {
         sent++;
       } catch (err) {
         console.error(`salon: announce email failed for ${tenant.email}:`, err.message);
+        errors.push(tenant.email);
       }
     }
 
-    res.json({ success: true, sent });
+    res.json({ success: true, sent, ...(errors.length && { errors }) });
   });
 
   // ── Freyja federation page ──────────────────────────────────────────────────