npm - @bobfrankston/mailx - Versions diffs - 1.0.12 → 1.0.14 - Mend

@bobfrankston/mailx 1.0.12 → 1.0.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (172) hide show

package/client/index.html CHANGED Viewed

@@ -13,24 +13,24 @@
 <body>
     <header class="toolbar">
         <div class="toolbar-left">
-            <button class="tb-btn" id="btn-compose" title="Compose">
-                <span class="tb-icon">&#x270F;</span> Compose
+            <button class="tb-btn" id="btn-compose" title="Compose (Ctrl+N)">
+                <span class="tb-icon">✏</span> Compose
             </button>
-            <button class="tb-btn" id="btn-reply" title="Reply" disabled>
-                <span class="tb-icon">&#x21A9;</span>
+            <button class="tb-btn" id="btn-reply" title="Reply (Ctrl+R)" disabled>
+                <span class="tb-icon">↩</span>
             </button>
-            <button class="tb-btn" id="btn-reply-all" title="Reply All" disabled>
-                <span class="tb-icon">&#x21A9;&#x21A9;</span>
+            <button class="tb-btn" id="btn-reply-all" title="Reply All (Ctrl+Shift+R)" disabled>
+                <span class="tb-icon">↩↩</span>
             </button>
             <button class="tb-btn" id="btn-forward" title="Forward" disabled>
-                <span class="tb-icon">&#x2192;</span>
+                <span class="tb-icon">→</span>
             </button>
             <span class="tb-sep"></span>
-            <button class="tb-btn" id="btn-delete" title="Delete" disabled>
-                <span class="tb-icon">&#x1F5D1;</span>
+            <button class="tb-btn" id="btn-delete" title="Delete (Del)" disabled>
+                <span class="tb-icon">🗑</span>
             </button>
             <button class="tb-btn" id="btn-flag" title="Flag" disabled>
-                <span class="tb-icon">&#x2691;</span>
+                <span class="tb-icon">⚑</span>
             </button>
         </div>
         <div class="toolbar-center">
@@ -45,24 +45,37 @@
             <span id="app-version" class="app-version"></span>
         </div>
         <div class="toolbar-right">
-            <search>
-                <input type="search" id="search-input" placeholder="Search..." autocomplete="off">
+            <search class="search-bar">
+                <select id="search-scope" title="Search scope">
+                    <option value="all">All folders</option>
+                    <option value="current">This folder</option>
+                    <option value="server">IMAP server</option>
+                </select>
+                <input type="search" id="search-input" placeholder="Search... (/regex/)" autocomplete="off" title="Search messages. /pattern/ for regex. Qualifiers: from: to: subject:">
             </search>
-            <button class="tb-btn" id="btn-sync" title="Sync">
-                <span class="tb-icon">&#x21BB;</span>
+            <button class="tb-btn" id="btn-sync" title="Sync all folders (F5)">
+                <span class="tb-icon">↻</span> Sync
             </button>
-            <button class="tb-btn" id="btn-restart" title="Restart server + reload">
-                <span class="tb-icon">&#x26A1;</span>
+            <button class="tb-btn" id="btn-restart" title="Restart server and reload page">
+                <span class="tb-icon">⚡</span> Restart
             </button>
         </div>
     </header>
-    <nav class="folder-tree" id="folder-tree">
-        <div class="folder-loading">Loading accounts...</div>
-    </nav>
+    <div class="folder-panel">
+        <div class="ft-filter">
+            <input type="text" id="ft-filter-input" placeholder="Find folder..." autocomplete="off">
+        </div>
+        <nav class="folder-tree" id="folder-tree">
+            <div class="folder-loading">Loading accounts...</div>
+        </nav>
+    </div>
     <main class="main-area">
         <section class="message-list" id="message-list">
+            <div class="ml-filter">
+                <input type="text" id="ml-filter-input" placeholder="Filter..." autocomplete="off">
+            </div>
             <div class="ml-header">
                 <span class="ml-col ml-col-flag"></span>
                 <span class="ml-col ml-col-from" data-sort="from">From</span>
@@ -78,8 +91,17 @@
         <section class="message-viewer" id="message-viewer">
             <div class="mv-header" id="mv-header" hidden>
-                <div class="mv-from"></div>
-                <div class="mv-to"></div>
+                <div class="mv-header-top">
+                    <div class="mv-header-info">
+                        <div class="mv-from"></div>
+                        <div class="mv-to"></div>
+                    </div>
+                    <div class="mv-header-actions">
+                        <button class="mv-action mv-action-primary" id="mv-edit-draft" hidden>Edit & Send</button>
+                        <a class="mv-unsubscribe" id="mv-unsubscribe" hidden>Unsubscribe</a>
+                        <button class="mv-action" id="mv-view-source" title="View source (.eml)" hidden>Source</button>
+                    </div>
+                </div>
                 <div class="mv-subject"></div>
                 <div class="mv-date"></div>
             </div>
@@ -96,5 +118,12 @@
         <span id="status-pending"></span>
         <span id="status-queue">Queue: empty</span>
     </footer>
+    <div id="startup-overlay" class="startup-overlay">
+        <div class="startup-content">
+            <div class="startup-spinner"></div>
+            <div id="startup-status">Connecting to server...</div>
+        </div>
+    </div>
 </body>
 </html>

package/client/lib/api-client.js CHANGED Viewed

@@ -1,8 +1,23 @@
 /**
- * REST + WebSocket client for communicating with mailx-server.
- * All server communication goes through here.
+ * API client — auto-detects IPC (WebView) vs HTTP (browser).
+ * When mailxapi is available (injected by launcher), calls go directly via IPC.
+ * Otherwise falls back to REST/WebSocket.
  */
-/** Generic fetch wrapper */
+const hasIPC = typeof mailxapi !== "undefined" && mailxapi?.isApp;
+// ── HTTP fallback ──
+// Abort controller for message-list requests — cancel stale fetches when folder changes
+let messageListAbort = null;
+export function abortMessageListRequests() {
+    if (messageListAbort) {
+        messageListAbort.abort();
+        messageListAbort = null;
+    }
+}
+function newMessageListSignal() {
+    abortMessageListRequests();
+    messageListAbort = new AbortController();
+    return messageListAbort.signal;
+}
 async function api(path, options) {
     const res = await fetch(`/api${path}`, {
         headers: { "Content-Type": "application/json" },
@@ -14,54 +29,120 @@ async function api(path, options) {
     }
     return res.json();
 }
-// ── REST Methods ──
+// ── API Methods (IPC or HTTP) ──
 export function getAccounts() {
+    if (hasIPC)
+        return mailxapi.getAccounts();
     return api("/accounts");
 }
 export function getFolders(accountId) {
+    if (hasIPC)
+        return mailxapi.getFolders(accountId);
     return api(`/folders/${accountId}`);
 }
 export function getMessages(accountId, folderId, page = 1, pageSize = 50) {
-    return api(`/messages/${accountId}/${folderId}?page=${page}&pageSize=${pageSize}`);
-}
-export function searchMessages(query, page = 1, pageSize = 50) {
-    return api(`/search?q=${encodeURIComponent(query)}&page=${page}&pageSize=${pageSize}`);
+    if (hasIPC)
+        return mailxapi.getMessages(accountId, folderId, page, pageSize);
+    const signal = newMessageListSignal();
+    return api(`/messages/${accountId}/${folderId}?page=${page}&pageSize=${pageSize}`, { signal });
 }
 export function getUnifiedInbox(page = 1, pageSize = 50) {
-    return api(`/messages/unified/inbox?page=${page}&pageSize=${pageSize}`);
+    if (hasIPC)
+        return mailxapi.getUnifiedInbox(page, pageSize);
+    const signal = newMessageListSignal();
+    return api(`/messages/unified/inbox?page=${page}&pageSize=${pageSize}`, { signal });
 }
-export function getMessage(accountId, uid, allowRemote = false) {
-    const q = allowRemote ? "?allowRemote=true" : "";
+export function searchMessages(query, page = 1, pageSize = 50, scope = "all", accountId = "", folderId = 0) {
+    if (hasIPC)
+        return mailxapi.searchMessages(query, page, pageSize);
+    const params = new URLSearchParams({ q: query, page: String(page), pageSize: String(pageSize), scope });
+    if (scope === "current" && accountId) {
+        params.set("accountId", accountId);
+        params.set("folderId", String(folderId));
+    }
+    if (scope === "server" && accountId) {
+        params.set("accountId", accountId);
+        params.set("folderId", String(folderId));
+    }
+    return api(`/search?${params}`);
+}
+export function getMessage(accountId, uid, allowRemote = false, folderId) {
+    if (hasIPC)
+        return mailxapi.getMessage(accountId, uid, allowRemote, folderId);
+    const params = new URLSearchParams();
+    if (allowRemote)
+        params.set("allowRemote", "true");
+    if (folderId != null)
+        params.set("folderId", String(folderId));
+    const q = params.toString() ? `?${params}` : "";
     return api(`/message/${accountId}/${uid}${q}`);
 }
 export function updateFlags(accountId, uid, flags) {
+    if (hasIPC)
+        return mailxapi.updateFlags(accountId, uid, flags);
     return api(`/message/${accountId}/${uid}/flags`, {
         method: "PATCH",
         body: JSON.stringify({ flags })
     });
 }
 export function triggerSync() {
+    if (hasIPC)
+        return mailxapi.syncAll();
     return api("/sync", { method: "POST" });
 }
-let ws;
-const handlers = [];
-export function connectWebSocket() {
-    const protocol = location.protocol === "https:" ? "wss:" : "ws:";
-    ws = new WebSocket(`${protocol}//${location.host}`);
-    ws.onmessage = (ev) => {
-        try {
-            const event = JSON.parse(ev.data);
-            for (const handler of handlers)
-                handler(event);
-        }
-        catch { /* ignore parse errors */ }
-    };
-    ws.onclose = () => {
-        // Reconnect after 3 seconds
-        setTimeout(connectWebSocket, 3000);
-    };
-}
-export function onWsEvent(handler) {
-    handlers.push(handler);
+export function getVersion() {
+    if (hasIPC)
+        return mailxapi.getVersion();
+    return api("/version");
+}
+export function getSyncPending() {
+    if (hasIPC)
+        return mailxapi.getSyncPending();
+    return api("/sync/pending");
+}
+export function searchContacts(query) {
+    if (hasIPC)
+        return mailxapi.searchContacts(query);
+    return api(`/contacts?q=${encodeURIComponent(query)}`);
+}
+export function allowRemoteContent(type, value) {
+    if (hasIPC)
+        return mailxapi.allowRemoteContent(type, value);
+    return api("/settings/allow-remote", {
+        method: "POST",
+        body: JSON.stringify({ type, value })
+    });
+}
+const eventHandlers = [];
+export function onEvent(handler) {
+    eventHandlers.push(handler);
+}
+export function connectEvents() {
+    if (hasIPC) {
+        // IPC events come via mailxapi.onEvent
+        mailxapi.onEvent((event) => {
+            for (const h of eventHandlers)
+                h(event);
+        });
+    }
+    else {
+        // WebSocket for HTTP mode
+        const protocol = location.protocol === "https:" ? "wss:" : "ws:";
+        const ws = new WebSocket(`${protocol}//${location.host}`);
+        ws.onmessage = (ev) => {
+            try {
+                const event = JSON.parse(ev.data);
+                for (const h of eventHandlers)
+                    h(event);
+            }
+            catch { /* ignore */ }
+        };
+        ws.onclose = () => {
+            setTimeout(connectEvents, 3000);
+        };
+    }
 }
+// Legacy exports for backward compatibility
+export const connectWebSocket = connectEvents;
+export const onWsEvent = onEvent;
 //# sourceMappingURL=api-client.js.map

package/client/lib/mailxapi.js ADDED Viewed

@@ -0,0 +1,123 @@
+/**
+ * mailxapi — IPC bridge injected into WebView by the Rust launcher.
+ * Follows the msgapi pattern: callNode → Promise → _mailxapiResolve/Reject.
+ *
+ * When running in a browser (no IPC), this file is not loaded.
+ * api-client.ts auto-detects and falls back to HTTP fetch.
+ */
+(function() {
+    "use strict";
+    var _callbacks = {};
+    var _callbackId = 0;
+    var _eventHandlers = [];
+    function callNode(action, params) {
+        var id = String(++_callbackId);
+        return new Promise(function(resolve, reject) {
+            var timer = setTimeout(function() {
+                delete _callbacks[id];
+                reject(new Error("mailxapi timeout: " + action));
+            }, 30000);
+            _callbacks[id] = { resolve: resolve, reject: reject, timer: timer };
+            var msg = Object.assign({ _action: action, _cbid: id }, params || {});
+            if (window.ipc && window.ipc.postMessage) {
+                window.ipc.postMessage(JSON.stringify(msg));
+            } else {
+                // Fallback: should not happen in WebView
+                clearTimeout(timer);
+                delete _callbacks[id];
+                reject(new Error("No IPC channel available"));
+            }
+        });
+    }
+    // Called by Rust to resolve promises
+    window._mailxapiResolve = function(id, value) {
+        var cb = _callbacks[id];
+        if (!cb) return;
+        delete _callbacks[id];
+        clearTimeout(cb.timer);
+        cb.resolve(value);
+    };
+    // Called by Rust to reject promises
+    window._mailxapiReject = function(id, error) {
+        var cb = _callbacks[id];
+        if (!cb) return;
+        delete _callbacks[id];
+        clearTimeout(cb.timer);
+        cb.reject(new Error(error));
+    };
+    // Called by Rust to push events (new mail, sync progress, etc.)
+    window._mailxapiEvent = function(event) {
+        for (var i = 0; i < _eventHandlers.length; i++) {
+            try { _eventHandlers[i](event); } catch(e) { /* ignore */ }
+        }
+    };
+    window.mailxapi = {
+        isApp: true,
+        platform: "webview2",
+        // Accounts
+        getAccounts: function() { return callNode("getAccounts"); },
+        getFolders: function(accountId) { return callNode("getFolders", { accountId: accountId }); },
+        // Messages
+        getMessages: function(accountId, folderId, page, pageSize) {
+            return callNode("getMessages", { accountId: accountId, folderId: folderId, page: page, pageSize: pageSize });
+        },
+        getUnifiedInbox: function(page, pageSize) {
+            return callNode("getUnifiedInbox", { page: page, pageSize: pageSize });
+        },
+        getMessage: function(accountId, uid, allowRemote) {
+            return callNode("getMessage", { accountId: accountId, uid: uid, allowRemote: allowRemote });
+        },
+        // Actions
+        updateFlags: function(accountId, uid, flags) {
+            return callNode("updateFlags", { accountId: accountId, uid: uid, flags: flags });
+        },
+        deleteMessage: function(accountId, uid) {
+            return callNode("deleteMessage", { accountId: accountId, uid: uid });
+        },
+        undeleteMessage: function(accountId, uid, folderId) {
+            return callNode("undeleteMessage", { accountId: accountId, uid: uid, folderId: folderId });
+        },
+        // Compose
+        sendMessage: function(msg) { return callNode("sendMessage", msg); },
+        saveDraft: function(params) { return callNode("saveDraft", params); },
+        deleteDraft: function(accountId, draftUid) {
+            return callNode("deleteDraft", { accountId: accountId, draftUid: draftUid });
+        },
+        // Search
+        searchMessages: function(query, page, pageSize) {
+            return callNode("searchMessages", { query: query, page: page, pageSize: pageSize });
+        },
+        searchContacts: function(query) {
+            return callNode("searchContacts", { query: query });
+        },
+        // Sync
+        syncAll: function() { return callNode("syncAll"); },
+        getSyncPending: function() { return callNode("getSyncPending"); },
+        // Settings
+        allowRemoteContent: function(type, value) {
+            return callNode("allowRemoteContent", { type: type, value: value });
+        },
+        getSettings: function() { return callNode("getSettings"); },
+        saveSettings: function(data) { return callNode("saveSettingsData", data); },
+        getVersion: function() { return callNode("getVersion"); },
+        // Events
+        onEvent: function(handler) { _eventHandlers.push(handler); },
+    };
+    window.dispatchEvent(new CustomEvent("mailxapiready"));
+})();

package/client/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-client",
-  "version": "1.0.1",
+  "version": "1.0.7",
   "private": true,
   "type": "module",
   "dependencies": {