@decentnetwork/lan 0.1.87 → 0.1.89

package/dist/carrier/peer-manager.d.ts

@@ -13,6 +13,9 @@ export interface PeerManagerOptions {
     expressNodes?: BootstrapNode[];
     /** Use express only for friend-request bootstrap, never for data-plane sendText. */
     expressControlPlaneOnly?: boolean;
+    /** Display name advertised to friends (this node's name, so friend lists show
+     *  "cn"/"tokyo"/"mac-dev" instead of the generic "@decentnetwork/peer"). */
+    nickname?: string;
 }
 export declare class PeerManager extends EventEmitter {
     private peer;

package/dist/carrier/peer-manager.js

@@ -26,6 +26,7 @@ export class PeerManager extends EventEmitter {
             bootstrapNodes: opts.bootstrapNodes,
             expressNodes: opts.expressNodes,
             expressControlPlaneOnly: opts.expressControlPlaneOnly,
+            nickname: opts.nickname,
             // Register our IP channel (163) as the SDK's bulk-data stream so it
             // rides a single transport instead of fanning out over UDP + relay +
             // TCP relay (which delivered 3-4 duplicates of every IP packet).

package/dist/daemon/server.js

@@ -181,6 +181,9 @@ export class DaemonServer {
                 bootstrapNodes: this.config.carrier.bootstrapNodes,
                 expressNodes: this.config.carrier.expressNodes ?? [],
                 expressControlPlaneOnly: true,
+                // Advertise this node's name so friends see "cn"/"tokyo"/"mac-dev"
+                // instead of the generic "@decentnetwork/peer".
+                nickname: this.config.node.name,
             });
             await this.peerManager.start();
             this.logger.info(`Identity: ${this.peerManager.getAddress()}`);
@@ -235,10 +238,13 @@ export class DaemonServer {
                         const uid = f.carrierId ?? f.pubkey ?? "";
                         const meta = this.friendMeta?.get(uid);
                         const lastMsg = last.get(uid);
+                        // The build-default nickname is useless (every node sends it) —
+                        // treat it as no-name so the UI falls back to alias/userid.
+                        const realName = f.name && f.name !== "@decentnetwork/peer" ? f.name : undefined;
                         return {
                             userid: uid,
                             alias: meta?.alias,
-                            name: meta?.alias || f.name || uid,
+                            name: meta?.alias || realName || uid,
                             status: f.status,
                             lastSeen: f.lastSeen,
                             pinned: meta?.pinned ?? false,

package/dist/ui/server.js

@@ -62,8 +62,22 @@ export function startFriendUi(opts) {
                 sendJson(res, 200, { me, friends, pending: pend });
                 return;
             }
+            // Rich friend list (alias / status / unread / last message). Falls back
+            // to the diag-derived list on older daemons that lack the op.
+            if (req.method === "GET" && url === "/api/friends-list") {
+                const r = await opts.call({ op: "friends-list" });
+                if (r.ok) {
+                    sendJson(res, 200, r.data ?? { friends: [] });
+                    return;
+                }
+                const diag = await opts.call({ op: "diag" });
+                const friends = diag.ok ? (diag.data?.friends ?? []) : [];
+                sendJson(res, 200, { friends });
+                return;
+            }
             if (req.method === "GET" && url === "/api/chat-history") {
-                const r = await opts.call({ op: "chat-history" });
+                const peer = new URL(req.url || "/", "http://x").searchParams.get("peer") || undefined;
+                const r = await opts.call({ op: "chat-history", userid: peer });
                 sendJson(res, 200, r.ok ? (r.data ?? { chats: {} }) : { chats: {} });
                 return;
             }
@@ -73,6 +87,24 @@ export function startFriendUi(opts) {
                 sendJson(res, r.ok ? 200 : 400, r);
                 return;
             }
+            if (req.method === "POST" && url === "/api/chat-mark-read") {
+                const { userid } = await readBody(req);
+                const r = await opts.call({ op: "chat-mark-read", userid });
+                sendJson(res, r.ok ? 200 : 400, r);
+                return;
+            }
+            if (req.method === "POST" && url === "/api/friend-remove") {
+                const { userid } = await readBody(req);
+                const r = await opts.call({ op: "friend-remove", userid });
+                sendJson(res, r.ok ? 200 : 400, r);
+                return;
+            }
+            if (req.method === "POST" && url === "/api/friend-alias") {
+                const { userid, alias } = await readBody(req);
+                const r = await opts.call({ op: "friend-set-alias", userid, alias });
+                sendJson(res, r.ok ? 200 : 400, r);
+                return;
+            }
             if (req.method === "GET" && url === "/api/routes") {
                 let routes = { regions: [], default: "direct" };
                 if (existsSync(opts.routesPath)) {
@@ -205,13 +237,19 @@ function toast(msg){ const t=document.getElementById('toast'); t.textContent=msg
 
 async function api(path, body){ const r = await fetch(path, body?{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify(body)}:{}); return r.json(); }
 
-window.friendsById = {};
+window.friendsById = {}; window.me = {};
 async function refresh(){
-  let s; try { s = await api('/api/state'); } catch(e){ return; }
-  const pend = s.pending || [], fr = s.friends || [], me = s.me || {};
-  document.getElementById('me').textContent = me.ip
-    ? ('My IP: ' + me.ip + (me.userid ? ' · ' + short(me.userid) : ''))
-    : (me.userid ? ('userid: ' + short(me.userid) + ' · lan/TUN not up') : 'daemon: no identity');
+  let s, fl;
+  try { [s, fl] = await Promise.all([api('/api/state'), api('/api/friends-list')]); } catch(e){ return; }
+  const pend = s.pending || [], me = s.me || {};
+  const fr = (fl && fl.friends) || s.friends || [];
+  window.me = me;
+  const idStr = me.address || me.userid || '';
+  document.getElementById('me').innerHTML =
+    (me.ip ? ('My IP: <b>' + esc(me.ip) + '</b> · ') : (me.userid ? '' : 'daemon: no identity '))
+    + (me.userid ? ('<span title="'+esc(me.userid)+'">'+esc(short(me.userid))+'</span> ') : '')
+    + (idStr ? '<button onclick="copyId()" style="padding:.1rem .5rem;font-size:.75rem">copy my address</button>' : '')
+    + (me.userid && !me.installed ? ' · <span style="color:#e67e22">lan/TUN not up</span>' : '');
   fr.forEach(f => { window.friendsById[f.userid||f.carrierId] = f; });
   document.getElementById('pcount').textContent = pend.length ? '('+pend.length+')' : '';
   document.getElementById('fcount').textContent = fr.length ? '('+fr.length+')' : '';
@@ -222,13 +260,39 @@ async function refresh(){
       <button class="accept" onclick="act('accept','\${esc(p.userid)}')">Accept</button>
       <button class="reject" onclick="act('reject','\${esc(p.userid)}')">Reject</button>
     </div>\`).join('') : '<div class="empty">No pending requests.</div>';
-  document.getElementById('friends').innerHTML = fr.length ? fr.map(f => \`
-    <div class="row" style="cursor:pointer" onclick="openChat('\${esc(f.userid||f.carrierId)}')" title="open chat">
-      <span class="dot \${esc(f.status||'offline')}"></span>
-      <div class="meta"><div class="name">\${esc(f.name || 'unnamed')}</div>
-        <div class="sub">\${esc(f.status||'')} · \${esc(short(f.userid||f.carrierId))}\${f.virtualIp? ' · '+esc(f.virtualIp):''}</div></div>
-    </div>\`).join('') : '<div class="empty">No friends yet.</div>';
+  document.getElementById('friends').innerHTML = fr.length ? fr.map(f => {
+    const uid = f.userid||f.carrierId;
+    const nm = friendName(f, uid);
+    const lm = f.lastMessage;
+    const preview = lm ? ((lm.dir==='out'?'You: ':'') + lm.text) : (f.status||'offline');
+    const badge = f.unread ? '<span style="background:#e74c3c;color:#fff;border-radius:10px;padding:0 .45rem;font-size:.7rem;margin-left:.4rem">'+f.unread+'</span>' : '';
+    return \`<div class="row" style="cursor:pointer" onclick="openChat('\${esc(uid)}')" title="open chat">
+      \${avatar(uid, nm, f.status)}
+      <div class="meta"><div class="name">\${esc(nm)}\${badge}</div>
+        <div class="sub"><span class="dot \${esc(f.status||'offline')}" style="display:inline-block;vertical-align:middle"></span> \${esc(preview)}</div></div>
+      <button onclick="event.stopPropagation();editAlias('\${esc(uid)}')" title="rename" style="padding:.2rem .55rem">✎</button>
+      <button class="reject" onclick="event.stopPropagation();delFriend('\${esc(uid)}')" title="remove friend" style="padding:.2rem .55rem">×</button>
+    </div>\`;
+  }).join('') : '<div class="empty">No friends yet.</div>';
+}
+// The build default "@decentnetwork/peer" is useless (every node sends it) —
+// treat it as no-name and fall back to alias / short userid.
+function friendName(f, uid){
+  const n = f.alias || (f.name && f.name !== '@decentnetwork/peer' ? f.name : '');
+  return n || short(uid);
+}
+// Deterministic colored-initial avatar from the userid (no protocol/avatar
+// exchange needed yet — same userid always gets the same color + letter).
+function avatar(uid, nm, status){
+  const colors=['#e74c3c','#e67e22','#f39c12','#16a085','#27ae60','#2980b9','#8e44ad','#2c3e50','#d35400','#c0392b'];
+  let h=0; for(let i=0;i<String(uid).length;i++) h=(h*31+uid.charCodeAt(i))>>>0;
+  const c=colors[h%colors.length];
+  const ch=((nm||'?').trim().charAt(0)||'?').toUpperCase();
+  return '<span style="display:inline-flex;width:2rem;height:2rem;border-radius:50%;background:'+c+';color:#fff;align-items:center;justify-content:center;font-weight:700;flex:0 0 auto">'+esc(ch)+'</span>';
 }
+function copyId(){ const id=(window.me&&(window.me.address||window.me.userid))||''; if(id&&navigator.clipboard){ navigator.clipboard.writeText(id); toast('Your address copied — share it so others can add you'); } }
+async function delFriend(uid){ if(!confirm('Remove this friend and your messages with them?')) return; const r=await api('/api/friend-remove',{userid:uid}); toast(r.ok?'Removed':(r.error||'failed')); if(chatWith===uid) closeChat(); refresh(); }
+async function editAlias(uid){ const cur=(window.friendsById[uid]||{}).alias||''; const a=prompt('Local name for this friend (empty to clear):', cur); if(a===null) return; const r=await api('/api/friend-alias',{userid:uid,alias:a}); toast(r.ok?'Saved':(r.error||'failed')); refresh(); }
 async function act(kind, userid){ const r = await api('/api/'+kind, {userid}); toast(r.ok? (kind==='accept'?'Accepted':'Rejected') : (r.error||'failed')); refresh(); }
 async function addFriend(){ const a=document.getElementById('addr'); const v=a.value.trim(); if(!v) return; const r=await api('/api/add',{address:v}); toast(r.ok?'Friend-request sent':(r.error||'failed')); if(r.ok) a.value=''; refresh(); }
 document.getElementById('addr').addEventListener('keydown', e=>{ if(e.key==='Enter') addFriend(); });
@@ -237,9 +301,10 @@ let chatWith = null, chatTimer = null;
 async function openChat(userid){
   chatWith = userid;
   const f = window.friendsById[userid] || {};
-  document.getElementById('chatName').textContent = f.name || 'unnamed';
+  document.getElementById('chatName').textContent = friendName(f, userid);
   document.getElementById('chatSub').textContent = (f.status||'') + ' · ' + short(userid);
   document.getElementById('chat').style.display = 'block';
+  api('/api/chat-mark-read', {userid});   // clears the unread badge
   await renderChat();
   clearInterval(chatTimer); chatTimer = setInterval(renderChat, 2000);
   document.getElementById('chatInput').focus();
@@ -247,7 +312,7 @@ async function openChat(userid){
 function closeChat(){ chatWith = null; clearInterval(chatTimer); document.getElementById('chat').style.display='none'; refresh(); }
 async function renderChat(){
   if(!chatWith) return;
-  let h; try { h = await api('/api/chat-history'); } catch(e){ return; }
+  let h; try { h = await api('/api/chat-history?peer='+encodeURIComponent(chatWith)); } catch(e){ return; }
   const msgs = (h.chats && h.chats[chatWith]) || [];
   const log = document.getElementById('chatLog');
   log.innerHTML = msgs.length ? msgs.map(m => \`<div style="align-self:\${m.dir==='out'?'flex-end':'flex-start'};max-width:75%;padding:.4rem .7rem;border-radius:12px;background:\${m.dir==='out'?'#3478f6':'#8883'};color:\${m.dir==='out'?'#fff':'inherit'}">\${esc(m.text)}</div>\`).join('') : '<div class="empty">No messages yet — say hi.</div>';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/lan",
-  "version": "0.1.87",
+  "version": "0.1.89",
   "description": "Private virtual LAN for self-hosted services and AI agents, built on Elastos Carrier. NAT-traversal, name service, ACL, all over a peer-to-peer mesh — no public IP required.",
   "type": "module",
   "main": "./dist/index.js",
@@ -58,7 +58,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.json",
+    "build": "tsc -p tsconfig.json && chmod +x dist/cli/index.js",
     "build:helper": "cd helper/tun-helper && go build -o ../../bin/tun-helper-$(go env GOOS)-$(go env GOARCH) .",
     "build:helper:linux-amd64": "cd helper/tun-helper && GOOS=linux GOARCH=amd64 go build -o ../../bin/tun-helper-linux-amd64 .",
     "build:helper:linux-arm64": "cd helper/tun-helper && GOOS=linux GOARCH=arm64 go build -o ../../bin/tun-helper-linux-arm64 .",
@@ -77,7 +77,7 @@
   },
   "dependencies": {
     "@decentnetwork/dora": "^0.1.6",
-    "@decentnetwork/peer": "^0.1.39",
+    "@decentnetwork/peer": "^0.1.40",
     "js-yaml": "^4.1.0",
     "yargs": "^17.7.2"
   },