aicq-openclaw-plugin 1.0.5 → 1.0.6

package/dist/index.js

@@ -10114,14 +10114,37 @@ function createToastContainer() {
   return c;
 }
 
-// \u2500\u2500 API \u2500\u2500
+// \u2500\u2500 API with timeout \u2500\u2500
 async function api(path, opts = {}) {
+  const timeout = (opts._timeout || 8000);
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeout);
   try {
-    const res = await fetch(API + path, { headers: { 'Content-Type': 'application/json', ...opts.headers }, ...opts });
+    const res = await fetch(API + path, { headers: { 'Content-Type': 'application/json', ...opts.headers }, ...opts, signal: controller.signal });
+    clearTimeout(timer);
     const data = await res.json();
     if (!res.ok && !data.error) data.error = 'HTTP ' + res.status;
     return data;
-  } catch (e) { return { error: e.message }; }
+  } catch (e) {
+    clearTimeout(timer);
+    const msg = e.name === 'AbortError' ? 'Request timed out (' + (timeout/1000) + 's)' : e.message;
+    return { error: msg };
+  }
+}
+
+// Safe helper: run promise, never throw, return { data, error }
+async function safeApi(path, opts) {
+  try {
+    const data = await api(path, opts);
+    return { data, error: data.error || null };
+  } catch (e) {
+    return { data: null, error: e.message || 'Unknown error' };
+  }
+}
+
+// Render an inline error block
+function errorBlock(title, msg) {
+  return '<div class="card" style="border-color:var(--danger)"><div style="display:flex;align-items:center;gap:10px"><span style="font-size:20px">\u26A0\uFE0F</span><div><div style="font-weight:600;color:var(--danger)">' + escHtml(title) + '</div><div style="font-size:12px;color:var(--text3);margin-top:2px">' + escHtml(msg) + '</div></div></div></div>';
 }
 
 // \u2500\u2500 Utilities \u2500\u2500
@@ -10174,14 +10197,49 @@ function loadPage(page) {
 async function loadDashboard() {
   const el = $('#dashboard-content');
   html(el, '<div class="loading-mask"><div class="spinner"></div>Loading dashboard...</div>');
-  const [status, friends, identity] = await Promise.all([api('/status'), api('/friends'), api('/identity')]);
-  if (status.error) { html(el, '<div class="empty"><div class="icon">\u26A0\uFE0F</div><p>Failed to connect to AICQ plugin</p></div>'); return; }
+
+  // Load local data first (status + identity), then remote (friends) \u2014 each independent
+  const [statusRes, identityRes] = await Promise.all([safeApi('/status'), safeApi('/identity')]);
+  const status = statusRes.data || {};
+  const identity = identityRes.data || {};
+
+  // Friends is remote \u2014 load independently, don't block
+  const friendsRes = await safeApi('/friends', { _timeout: 10000 });
+  const friendList = (friendsRes.data?.friends) || [];
+  const friendsError = friendsRes.error;
+
   const connCls = status.connected ? 'dot-ok' : 'dot-err';
   const connText = status.connected ? 'Connected' : 'Disconnected';
-  const friendList = friends.friends || [];
   const aiFriends = friendList.filter(f => f.friendType === 'ai').length;
   const humanFriends = friendList.filter(f => f.friendType !== 'ai').length;
 
+  // Update header status dot
+  const hDot = $('#header-dot');
+  if (hDot) hDot.className = 'dot ' + (status.connected ? 'dot-ok' : 'dot-err');
+  const hTxt = $('#header-status');
+  if (hTxt) hTxt.textContent = status.connected ? 'Connected' : 'Disconnected';
+
+  // Build friends section
+  let friendsSection = '';
+  if (friendsError) {
+    friendsSection = '<div class="card"><div class="card-header"><div class="card-title">\u{1F4CB} Friends</div><button class="btn btn-sm btn-ghost" onclick="navigate('friends')">View All \u2192</button></div>' + errorBlock('Friend List Unavailable', friendsError + ' \u2014 Remote AICQ server may be unreachable. <button class="btn btn-sm btn-default" style="margin-top:8px" onclick="loadDashboard()">\u{1F504} Retry</button>') + '</div>';
+  } else {
+    friendsSection = '<div class="card"><div class="card-header"><div class="card-title">\u{1F4CB} Recent Friends</div><button class="btn btn-sm btn-ghost" onclick="navigate('friends')">View All \u2192</button></div>' + renderMiniFriendList(friendList.slice(0, 5)) + '</div>';
+  }
+
+  // Build identity section
+  let identitySection = '';
+  if (identityRes.error) {
+    identitySection = errorBlock('Identity Unavailable', identityRes.error);
+  } else {
+    identitySection = \\\`
+      <div class="detail-row"><div class="detail-key">Agent ID</div><div class="detail-val mono" style="cursor:pointer" onclick="copyText('\${escHtml(identity.agentId || '')}')">\${escHtml(identity.agentId || '\u2014')} \u{1F4CB}</div></div>
+      <div class="detail-row"><div class="detail-key">Fingerprint</div><div class="detail-val mono">\${escHtml(identity.publicKeyFingerprint || '\u2014')}</div></div>
+      <div class="detail-row"><div class="detail-key">Server URL</div><div class="detail-val mono" style="cursor:pointer" onclick="copyText('\${escHtml(identity.serverUrl || '')}')">\${escHtml(identity.serverUrl || '\u2014')} \u{1F4CB}</div></div>
+      <div class="detail-row"><div class="detail-key">Connection</div><div class="detail-val"><span class="badge badge-\${identity.connected ? 'ok' : 'danger'}">\${identity.connected ? 'Online' : 'Offline'}</span></div></div>
+    \\\`;
+  }
+
   html(el, \\\`
     <div class="stats-grid">
       <div class="stat-card">
@@ -10190,13 +10248,13 @@ async function loadDashboard() {
         <div class="stat-value" style="font-size:16px;display:flex;align-items:center;gap:8px">
           <span class="dot \${connCls}"></span> \${connText}
         </div>
-        <div class="stat-sub">\${escHtml(status.serverUrl)}</div>
+        <div class="stat-sub">\${escHtml(status.serverUrl || '\u2014')}</div>
       </div>
       <div class="stat-card">
         <div class="stat-icon" style="background:var(--ok-bg)">\u{1F465}</div>
         <div class="stat-label">Total Friends</div>
-        <div class="stat-value">\${friendList.length}</div>
-        <div class="stat-sub">\${aiFriends} AI \xB7 \${humanFriends} Human</div>
+        <div class="stat-value">\${friendsError ? '\u2014' : friendList.length}</div>
+        <div class="stat-sub">\${friendsError ? 'unavailable' : aiFriends + ' AI \xB7 ' + humanFriends + ' Human'}</div>
       </div>
       <div class="stat-card">
         <div class="stat-icon" style="background:var(--info-bg)">\u{1F517}</div>
@@ -10207,21 +10265,15 @@ async function loadDashboard() {
       <div class="stat-card">
         <div class="stat-icon" style="background:var(--warn-bg)">\u{1F511}</div>
         <div class="stat-label">Agent ID</div>
-        <div class="stat-value mono" style="font-size:13px">\${escHtml(status.agentId)}</div>
-        <div class="stat-sub">Fingerprint: \${escHtml(status.fingerprint)}</div>
+        <div class="stat-value mono" style="font-size:13px">\${escHtml(status.agentId || '\u2014')}</div>
+        <div class="stat-sub">Fingerprint: \${escHtml(status.fingerprint || '\u2014')}</div>
       </div>
     </div>
     <div style="display:grid;grid-template-columns:1fr 1fr;gap:16px">
-      <div class="card">
-        <div class="card-header"><div class="card-title">\u{1F4CB} Recent Friends</div><button class="btn btn-sm btn-ghost" onclick="navigate('friends')">View All \u2192</button></div>
-        \${renderMiniFriendList(friendList.slice(0, 5))}
-      </div>
+      \${friendsSection}
       <div class="card">
         <div class="card-header"><div class="card-title">\u{1F916} Identity Info</div></div>
-        <div class="detail-row"><div class="detail-key">Agent ID</div><div class="detail-val mono" style="cursor:pointer" onclick="copyText('\${identity.agentId}')">\${escHtml(identity.agentId)} \u{1F4CB}</div></div>
-        <div class="detail-row"><div class="detail-key">Fingerprint</div><div class="detail-val mono">\${escHtml(identity.publicKeyFingerprint)}</div></div>
-        <div class="detail-row"><div class="detail-key">Server URL</div><div class="detail-val mono" style="cursor:pointer" onclick="copyText('\${identity.serverUrl}')">\${escHtml(identity.serverUrl)} \u{1F4CB}</div></div>
-        <div class="detail-row"><div class="detail-key">Connection</div><div class="detail-val"><span class="badge badge-\${identity.connected ? 'ok' : 'danger'}">\${identity.connected ? 'Online' : 'Offline'}</span></div></div>
+        \${identitySection}
       </div>
     </div>
   \\\`);
@@ -10332,12 +10384,17 @@ let friendsFilter = 'all';
 async function loadFriends() {
   const el = $('#friends-content');
   html(el, '<div class="loading-mask"><div class="spinner"></div>Loading friends...</div>');
-  const [friends, requests, sessions] = await Promise.all([api('/friends'), api('/friends/requests'), api('/sessions')]);
 
-  // Sub-tabs
-  const friendCount = (friends.friends || []).length;
-  const reqCount = (requests.requests || []).length;
-  const sessCount = (sessions.sessions || []).length;
+  // Load all three independently \u2014 any can fail without blocking others
+  const [friendsRes, requestsRes, sessionsRes] = await Promise.all([
+    safeApi('/friends', { _timeout: 10000 }),
+    safeApi('/friends/requests', { _timeout: 10000 }),
+    safeApi('/sessions', { _timeout: 5000 }),
+  ]);
+
+  const friendCount = (friendsRes.data?.friends || []).length;
+  const reqCount = (requestsRes.data?.requests || []).length;
+  const sessCount = (sessionsRes.data?.sessions || []).length;
 
   html('#friends-tabs', \\\`
     <button class="filter-btn \${friendsSubTab==='friends'?'active':''}" onclick="friendsSubTab='friends';loadFriends()">\u{1F465} Friends (<span id="fc">\${friendCount}</span>)</button>
@@ -10345,13 +10402,29 @@ async function loadFriends() {
     <button class="filter-btn \${friendsSubTab==='sessions'?'active':''}" onclick="friendsSubTab='sessions';loadFriends()">\u{1F517} Sessions (<span id="sc">\${sessCount}</span>)</button>
   \\\`);
 
-  window._friendsData = friends;
-  window._requestsData = requests;
-  window._sessionsData = sessions;
+  window._friendsData = friendsRes.data || {};
+  window._requestsData = requestsRes.data || {};
+  window._sessionsData = sessionsRes.data || {};
 
-  if (friendsSubTab === 'friends') renderFriendsList(friends.friends || []);
-  else if (friendsSubTab === 'requests') renderRequestsList(requests.requests || []);
-  else renderSessionsList(sessions.sessions || []);
+  if (friendsSubTab === 'friends') {
+    if (friendsRes.error) {
+      html(el, '<div class="toolbar"><button class="btn btn-sm btn-default" onclick="loadFriends()">\u{1F504} Retry</button></div>' + errorBlock('Cannot Load Friends', friendsRes.error + ' \u2014 AICQ remote server is unreachable. Check your network or server status.'));
+    } else {
+      renderFriendsList(friendsRes.data.friends || []);
+    }
+  } else if (friendsSubTab === 'requests') {
+    if (requestsRes.error) {
+      html(el, '<div class="toolbar"><button class="btn btn-sm btn-default" onclick="loadFriends()">\u{1F504} Retry</button></div>' + errorBlock('Cannot Load Requests', requestsRes.error));
+    } else {
+      renderRequestsList(requestsRes.data.requests || []);
+    }
+  } else {
+    if (sessionsRes.error) {
+      html(el, '<div class="toolbar"><button class="btn btn-sm btn-default" onclick="loadFriends()">\u{1F504} Retry</button></div>' + errorBlock('Cannot Load Sessions', sessionsRes.error));
+    } else {
+      renderSessionsList(sessionsRes.data.sessions || []);
+    }
+  }
 }
 window.friendsSubTab = 'friends';
 
@@ -10610,41 +10683,66 @@ async function saveModelConfig() {
 async function loadSettings() {
   const el = $('#settings-content');
   html(el, '<div class="loading-mask"><div class="spinner"></div>Loading settings...</div>');
-  const [status, identity, config] = await Promise.all([api('/status'), api('/identity'), api('/config')]);
+  const [statusRes, identityRes, configRes] = await Promise.all([safeApi('/status'), safeApi('/identity'), safeApi('/config')]);
 
-  if (config.error) {
-    html(el, '<div class="empty"><div class="icon">\u26A0\uFE0F</div><p>' + escHtml(config.error) + '</p></div>');
-    return;
-  }
+  let out = '<p class="section-desc">AICQ plugin runtime configuration and system information.</p>';
 
-  html(el, \\\`
-    <p class="section-desc">AICQ plugin runtime configuration and system information.</p>
+  // Connection section
+  if (statusRes.error) {
+    out += errorBlock('Connection Status Unavailable', statusRes.error);
+  } else {
+    const s = statusRes.data;
+    out += \\\`
+      <div class="card">
+        <div class="card-header"><div class="card-title">\u{1F50C} Connection Settings</div></div>
+        <div class="detail-row"><div class="detail-key">Server URL</div><div class="detail-val mono" style="cursor:pointer" onclick="copyText('\${escHtml(s.serverUrl)}')">\${escHtml(s.serverUrl)} \u{1F4CB}</div></div>
+        <div class="detail-row"><div class="detail-key">WebSocket Status</div><div class="detail-val"><span class="badge badge-\${s.connected ? 'ok' : 'danger'}">\${s.connected ? 'Connected' : 'Disconnected'}</span></div></div>
+      </div>
+    \\\`;
+  }
 
-    <div class="card">
-      <div class="card-header"><div class="card-title">\u{1F50C} Connection Settings</div></div>
-      <div class="detail-row"><div class="detail-key">Server URL</div><div class="detail-val mono" style="cursor:pointer" onclick="copyText('\${escHtml(status.serverUrl)}')">\${escHtml(status.serverUrl)} \u{1F4CB}</div></div>
-      <div class="detail-row"><div class="detail-key">WebSocket Status</div><div class="detail-val"><span class="badge badge-\${status.connected ? 'ok' : 'danger'}">\${status.connected ? 'Connected' : 'Disconnected'}</span></div></div>
-    </div>
+  // Identity section
+  if (identityRes.error) {
+    out += errorBlock('Agent Identity Unavailable', identityRes.error);
+  } else {
+    const i = identityRes.data;
+    out += \\\`
+      <div class="card">
+        <div class="card-header"><div class="card-title">\u{1F916} Agent Identity</div></div>
+        <div class="detail-row"><div class="detail-key">Agent ID</div><div class="detail-val mono" style="cursor:pointer" onclick="copyText('\${escHtml(i.agentId)}')">\${escHtml(i.agentId)} \u{1F4CB}</div></div>
+        <div class="detail-row"><div class="detail-key">Public Key Fingerprint</div><div class="detail-val mono">\${escHtml(i.publicKeyFingerprint)}</div></div>
+      </div>
+    \\\`;
+  }
 
-    <div class="card">
-      <div class="card-header"><div class="card-title">\u{1F916} Agent Identity</div></div>
-      <div class="detail-row"><div class="detail-key">Agent ID</div><div class="detail-val mono" style="cursor:pointer" onclick="copyText('\${escHtml(identity.agentId)}')">\${escHtml(identity.agentId)} \u{1F4CB}</div></div>
-      <div class="detail-row"><div class="detail-key">Public Key Fingerprint</div><div class="detail-val mono">\${escHtml(identity.publicKeyFingerprint)}</div></div>
-    </div>
+  // Config file section
+  if (configRes.error) {
+    out += errorBlock('Config File Not Found', configRes.error);
+  } else {
+    const c = configRes.data;
+    out += \\\`
+      <div class="card">
+        <div class="card-header"><div class="card-title">\u{1F4C1} Config File</div></div>
+        <div class="detail-row"><div class="detail-key">Source</div><div class="detail-val" style="cursor:pointer" onclick="copyText('\${escHtml(c.configPath || '')}')">\${escHtml(c.configPath || 'Not found')} \u{1F4CB}</div></div>
+        <div class="detail-row"><div class="detail-key">Config Size</div><div class="detail-val">\${c.configSize || 0} bytes</div></div>
+      </div>
+    \\\`;
+  }
 
-    <div class="card">
-      <div class="card-header"><div class="card-title">\u{1F4C1} Config File</div></div>
-      <div class="detail-row"><div class="detail-key">Source</div><div class="detail-val" style="cursor:pointer" onclick="copyText('\${escHtml(config.configPath || '')}')">\${escHtml(config.configPath || 'Not found')} \u{1F4CB}</div></div>
-      <div class="detail-row"><div class="detail-key">Config Size</div><div class="detail-val">\${config.configSize || 0} bytes</div></div>
-    </div>
+  // Statistics section
+  if (!statusRes.error) {
+    const s = statusRes.data;
+    out += \\\`
+      <div class="card">
+        <div class="card-header"><div class="card-title">\u{1F4CA} Statistics</div></div>
+        <div class="detail-row"><div class="detail-key">Friends Count</div><div class="detail-val">\${s.friendCount || 0}</div></div>
+        <div class="detail-row"><div class="detail-key">Active Sessions</div><div class="detail-val">\${s.sessionCount || 0}</div></div>
+        <div class="detail-row"><div class="detail-key">Plugin Version</div><div class="detail-val">1.0.5</div></div>
+      </div>
+    \\\`;
+  }
 
-    <div class="card">
-      <div class="card-header"><div class="card-title">\u{1F4CA} Statistics</div></div>
-      <div class="detail-row"><div class="detail-key">Friends Count</div><div class="detail-val">\${status.friendCount || 0}</div></div>
-      <div class="detail-row"><div class="detail-key">Active Sessions</div><div class="detail-val">\${status.sessionCount || 0}</div></div>
-      <div class="detail-row"><div class="detail-key">Plugin Version</div><div class="detail-val">1.0.4</div></div>
-    </div>
-  \\\`);
+  html(el, out);
 }
 
 // \u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aicq-openclaw-plugin",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "AICQ OpenClaw plugin - end-to-end encrypted P2P chat for AI agents",
   "main": "dist/index.js",
   "type": "module",