@decentnetwork/lan 0.1.227 → 0.1.229

package/dist/daemon/ipc.d.ts

@@ -44,6 +44,9 @@ export interface IpcHandlers {
     /** Append a local-only chat history entry. Used for browser-local events such
      *  as WebRTC file receive; does not transmit anything to the peer. */
     chatLogLocal: (userid: string, dir: "in" | "out", text: string) => Promise<void>;
+    /** Append a local-only file history entry after the UI server has saved a
+     *  browser-received WebRTC file into downloads/. */
+    fileLogLocal: (userid: string, dir: "in" | "out", name: string, size: number) => Promise<void>;
     /** Return persisted chat history. With `peer`, returns just that thread and
      *  honours `before`/`limit` pagination; without, every thread (legacy shape). */
     chatHistory: (peer?: string, before?: number, limit?: number) => Promise<Record<string, unknown>>;
@@ -118,7 +121,7 @@ export interface IpcHandlers {
     selfRestart: () => Promise<Record<string, unknown>>;
 }
 export interface IpcRequest {
-    op: "friend-request" | "ping" | "diag" | "friends-pending" | "friends-accept" | "friends-reject" | "chat-send" | "chat-log-local" | "chat-history" | "friends-list" | "friend-remove" | "friend-set-alias" | "friends-autoaccept" | "set-profile" | "file-send" | "file-delete" | "file-cancel" | "file-retry" | "chat-mark-read" | "subscribe" | "sign" | "call-signal" | "call-poll" | "proxy-reload" | "proxy-access" | "self-restart";
+    op: "friend-request" | "ping" | "diag" | "friends-pending" | "friends-accept" | "friends-reject" | "chat-send" | "chat-log-local" | "file-log-local" | "chat-history" | "friends-list" | "friend-remove" | "friend-set-alias" | "friends-autoaccept" | "set-profile" | "file-send" | "file-delete" | "file-cancel" | "file-retry" | "chat-mark-read" | "subscribe" | "sign" | "call-signal" | "call-poll" | "proxy-reload" | "proxy-access" | "self-restart";
     address?: string;
     hello?: string;
     userid?: string;
@@ -127,6 +130,7 @@ export interface IpcRequest {
     alias?: string;
     name?: string;
     description?: string;
+    size?: number;
     path?: string;
     before?: number;
     limit?: number;

package/dist/daemon/ipc.js

@@ -202,6 +202,14 @@ export class IpcServer {
                 await this.handlers.chatLogLocal(req.userid, req.dir === "out" ? "out" : "in", req.text ?? "");
                 return;
             }
+            case "file-log-local": {
+                if (!req.userid)
+                    throw new Error("userid is required");
+                if (!req.name)
+                    throw new Error("name is required");
+                await this.handlers.fileLogLocal(req.userid, req.dir === "out" ? "out" : "in", req.name, Math.max(0, req.size ?? 0));
+                return;
+            }
             case "chat-history":
                 return await this.handlers.chatHistory(req.userid, req.before, req.limit);
             case "friends-list":

package/dist/daemon/server.js

@@ -386,6 +386,13 @@ export class DaemonServer {
                         return;
                     this.logChat(userid, dir, text);
                 },
+                fileLogLocal: async (userid, dir, name, size) => {
+                    if (!name)
+                        return;
+                    this.messageStore?.appendFile(userid, dir, { name: sanitizeFileName(name), size });
+                    this.friendMeta?.ensure(userid);
+                    this.ipcEvents.emit("event", { type: "file", userid, dir, name });
+                },
                 chatHistory: async (peer, before, limit) => {
                     return { chats: this.messageStore?.history(peer, { before, limit }) ?? {} };
                 },

package/dist/ui/desktop/app.js

@@ -231,6 +231,22 @@ const dkApi = {
   cancelSend: (userid, ids) => dkPost("/api/file-cancel", { userid, ids }),
   retrySend: (userid, ids) => dkPost("/api/file-retry", { userid, ids }),
   setProfile: (name, description) => dkPost("/api/set-profile", { name, description }),
+  saveWebrtcFile: async (userid, name, blob) => {
+    try {
+      const r = await fetch(
+        "/api/webrtc-file-save?userid=" + encodeURIComponent(userid) + "&name=" + encodeURIComponent(name),
+        { method: "POST", body: blob }
+      );
+      const txt = await r.text();
+      try {
+        return JSON.parse(txt);
+      } catch {
+        return { ok: false, error: (txt || "HTTP " + r.status).slice(0, 120) };
+      }
+    } catch (e) {
+      return { ok: false, error: String(e) };
+    }
+  },
   sendFile: async (userid, file) => {
     try {
       const r = await fetch(
@@ -1190,9 +1206,14 @@ function dkRtcFileFromText(peerId, text) {
   }
   return null;
 }
-function Msg({ m, peer, T, onTheater, onDelete, onCancel, onRetry, selMode, selected, onToggleSel, busy }) {
+function dkCallFromText(text) {
+  const m = /^WebRTC (audio|video) call: (incoming|outgoing)$/.exec(String(text || ""));
+  return m ? { kind: m[1], direction: m[2] } : null;
+}
+function Msg({ m, peer, T, onTheater, onDelete, onCancel, onRetry, onCall, selMode, selected, onToggleSel, busy }) {
   const mine = m.from === "me";
   const rtcFile = !mine && !m.file ? dkRtcFileFromText(peer.userId || peer.id, m.text) : null;
+  const callRec = !m.file ? dkCallFromText(m.text) : null;
   return /* @__PURE__ */ React.createElement(
     "div",
     {
@@ -1222,7 +1243,16 @@ function Msg({ m, peer, T, onTheater, onDelete, onCancel, onRetry, selMode, sele
       justifyContent: "center"
     } }, selected && /* @__PURE__ */ React.createElement(Icon, { name: "check", size: 12, stroke: 3, color: "#fff" })),
     !mine && /* @__PURE__ */ React.createElement(DkAvatar, { peer, size: 24, radius: 6, dot: false }),
-    /* @__PURE__ */ React.createElement("div", { style: { maxWidth: m.file && (m.file.media === "image" || m.file.media === "video") || rtcFile && (rtcFile.media === "image" || rtcFile.media === "video") ? "min(680px, 88%)" : "64%", display: "flex", flexDirection: "column", alignItems: mine ? "flex-end" : "flex-start" } }, rtcFile ? /* @__PURE__ */ React.createElement("div", { style: {
+    /* @__PURE__ */ React.createElement("div", { style: { maxWidth: m.file && (m.file.media === "image" || m.file.media === "video") || rtcFile && (rtcFile.media === "image" || rtcFile.media === "video") ? "min(680px, 88%)" : "64%", display: "flex", flexDirection: "column", alignItems: mine ? "flex-end" : "flex-start" } }, callRec ? /* @__PURE__ */ React.createElement(
+      "button",
+      {
+        onClick: () => onCall && onCall(peer.userId, callRec.kind === "video"),
+        style: { display: "flex", alignItems: "center", gap: 10, padding: "9px 12px", borderRadius: 12, border: "1px solid var(--line)", background: mine ? "var(--bub-me)" : "var(--bub-them)", color: mine ? "#fff" : "var(--text)", cursor: "pointer", fontFamily: "var(--mono)", fontSize: 12.5 }
+      },
+      /* @__PURE__ */ React.createElement(Icon, { name: callRec.kind === "video" ? "video" : "phone", size: 17, stroke: 2, color: mine ? "#fff" : "var(--accent)" }),
+      /* @__PURE__ */ React.createElement("span", null, callRec.direction === "incoming" ? "Incoming" : "Outgoing", " ", callRec.kind, " call"),
+      /* @__PURE__ */ React.createElement("span", { style: { color: mine ? "rgba(255,255,255,0.75)" : "var(--faint)" } }, "\xB7 redial")
+    ) : rtcFile ? /* @__PURE__ */ React.createElement("div", { style: {
       display: "flex",
       flexDirection: "column",
       gap: 6,
@@ -1603,8 +1633,14 @@ function Conversation({ T, peer, lang, thread: threadProp, onSend, onSendFile, o
     if (!files || !files.length || !sender) return;
     const file = files[0];
     followScrollRef.current = true;
-    setSending({ name: file.name, via: mode, pct: 0 });
-    const onProgress = (p) => setSending((s) => s && s.name === file.name ? { ...s, pct: p && p.pct } : s);
+    setSending({ name: file.name, via: mode, pct: 0, sent: 0, size: file.size });
+    const onProgress = (p) => setSending((s) => s && s.name === file.name ? {
+      ...s,
+      pct: p && p.pct,
+      sent: p && p.sent,
+      size: p && p.size || s.size,
+      kbps: p && p.kbps
+    } : s);
     Promise.resolve(sender(file, onProgress)).then((r) => {
       if (r && r.ok === false) window.alert((lang === "zh" ? "\u53D1\u9001\u5931\u8D25: " : "Send failed: ") + (r.error || ""));
       else showFlash("ok", mode === "webrtc" ? lang === "zh" ? "WebRTC \u6587\u4EF6\u53D1\u9001\u5B8C\u6210" : "WebRTC file sent" : lang === "zh" ? "\u6587\u4EF6\u5DF2\u63D0\u4EA4\u53D1\u9001" : "File send started");
@@ -1664,6 +1700,7 @@ function Conversation({ T, peer, lang, thread: threadProp, onSend, onSendFile, o
         onDelete: (id) => doDelete([id]),
         onCancel: doCancel,
         onRetry: doRetry,
+        onCall,
         busy: m.id ? fileBusy[m.id] : void 0,
         selMode,
         selected: sel.has(m.id),
@@ -1691,7 +1728,7 @@ function Conversation({ T, peer, lang, thread: threadProp, onSend, onSendFile, o
         stroke: 2.2,
         color: flash.kind === "err" ? "var(--danger)" : "var(--accent)"
       }
-    ), flash.msg), sending && /* @__PURE__ */ React.createElement("div", { style: { maxWidth: 760, margin: "0 auto 8px", display: "flex", alignItems: "center", gap: 8, fontFamily: "var(--mono)", fontSize: 11.5, color: "var(--faint)" } }, /* @__PURE__ */ React.createElement(Icon, { name: "paperclip", size: 13, stroke: 2, color: "var(--accent)" }), (lang === "zh" ? "\u53D1\u9001\u4E2D: " : "Sending: ") + (sending.via === "webrtc" ? "WebRTC \xB7 " : "") + sending.name + (sending.pct != null ? " \xB7 " + Math.min(100, Math.max(0, sending.pct)).toFixed(1) + "%" : "")), /* @__PURE__ */ React.createElement("div", { style: { maxWidth: 760, margin: "0 auto", display: "flex", alignItems: "center", gap: 10 } }, /* @__PURE__ */ React.createElement(
+    ), flash.msg), sending && /* @__PURE__ */ React.createElement("div", { style: { maxWidth: 760, margin: "0 auto 8px", display: "flex", alignItems: "center", gap: 8, fontFamily: "var(--mono)", fontSize: 11.5, color: "var(--faint)" } }, /* @__PURE__ */ React.createElement(Icon, { name: "paperclip", size: 13, stroke: 2, color: "var(--accent)" }), (lang === "zh" ? "\u53D1\u9001\u4E2D: " : "Sending: ") + (sending.via === "webrtc" ? "WebRTC \xB7 " : "") + sending.name + (sending.size ? " \xB7 " + dkFileSize(sending.sent || 0) + " / " + dkFileSize(sending.size) : "") + (sending.pct != null ? " \xB7 " + Math.min(100, Math.max(0, sending.pct)).toFixed(1) + "%" : "") + (sending.kbps != null ? " \xB7 " + dkSpeed(sending.kbps) : "")), /* @__PURE__ */ React.createElement("div", { style: { maxWidth: 760, margin: "0 auto", display: "flex", alignItems: "center", gap: 10 } }, /* @__PURE__ */ React.createElement(
       "input",
       {
         ref: fileRef,
@@ -2008,13 +2045,13 @@ function dkRememberRtcFile(peerId, fileId, name, size, url) {
   window.__dkRtcFiles.set(peerId + "|" + name + "|" + size, item);
   return item;
 }
-function useRtcFileController(selfId, onReceivedText) {
+function useRtcFileController(selfId, onReceivedFile) {
   const [incoming, setIncoming] = React.useState([]);
   const peersRef = React.useRef(/* @__PURE__ */ new Map());
-  const onReceivedTextRef = React.useRef(onReceivedText);
+  const onReceivedFileRef = React.useRef(onReceivedFile);
   React.useEffect(() => {
-    onReceivedTextRef.current = onReceivedText;
-  }, [onReceivedText]);
+    onReceivedFileRef.current = onReceivedFile;
+  }, [onReceivedFile]);
   React.useEffect(() => {
     if (!selfId || !window.RTCPeerConnection || !window.dkRtcSignalBus) return;
     const bus = dkRtcSignalBus();
@@ -2055,7 +2092,7 @@ function useRtcFileController(selfId, onReceivedText) {
             const dl = dkFileDownload(blob, meta.name || "agentnet-file");
             dkRememberRtcFile(peerId, fileId, dl.name, blob.size, dl.url);
             setIncoming((arr) => [{ id: fileId, peerId, name: dl.name, size: blob.size, url: dl.url }].concat(arr).slice(0, 8));
-            if (onReceivedTextRef.current) onReceivedTextRef.current(peerId, "received file via WebRTC: " + dl.name + " (" + dkFileSize(blob.size) + ")");
+            if (onReceivedFileRef.current) onReceivedFileRef.current(peerId, dl.name, blob);
             cleanup(fileId);
           } else if (msg.type === "cancel") {
             cleanup(fileId);
@@ -2176,16 +2213,36 @@ function useRtcFileController(selfId, onReceivedText) {
       await dkWaitForOpen(dc, DK_FILE_RTC_OPEN_TIMEOUT_MS, () => dkRtcState(pc));
       dc.send(JSON.stringify({ type: "meta", name: file.name, size: file.size, mime: file.type || "application/octet-stream" }));
       let sent = 0;
+      const startedAt = Date.now();
+      let lastProgressAt = 0;
       const highWater = 4 * 1024 * 1024;
+      const reportProgress = (force) => {
+        if (!onProgress) return;
+        const now = Date.now();
+        if (!force && now - lastProgressAt < 250 && sent < file.size) return;
+        lastProgressAt = now;
+        const elapsedMs = Math.max(1, now - startedAt);
+        const kbps = sent / 1024 / (elapsedMs / 1e3);
+        onProgress({
+          sent,
+          size: file.size,
+          pct: file.size ? sent / file.size * 100 : 100,
+          kbps,
+          elapsedMs,
+          via: "webrtc"
+        });
+      };
+      reportProgress(true);
       while (sent < file.size) {
         if (dc.readyState !== "open") throw new Error("WebRTC data channel closed");
         const end = Math.min(file.size, sent + DK_FILE_RTC_CHUNK);
         const buf = await file.slice(sent, end).arrayBuffer();
         dc.send(buf);
         sent = end;
-        if (onProgress) onProgress({ sent, size: file.size, pct: file.size ? sent / file.size * 100 : 100 });
+        reportProgress(false);
         await dkWaitBufferedLow(dc, highWater);
       }
+      reportProgress(true);
       dc.send(JSON.stringify({ type: "done" }));
       await sendSignal("bye", { reason: "done" }).catch(() => {
       });
@@ -2224,13 +2281,17 @@ const CALL_ICE_SERVERS = [
   { urls: "turn:tokyo.fi.chat:3478", username: "allcom", credential: "allcompass" },
   { urls: "turn:tokyo.fi.chat:3478?transport=tcp", username: "allcom", credential: "allcompass" }
 ];
-function useCallController(selfId) {
+function useCallController(selfId, onCallLog) {
   const [incoming, setIncoming] = React.useState(null);
   const [active, setActive] = React.useState(null);
   const [localStream, setLocalStream] = React.useState(null);
   const [remoteStream, setRemoteStream] = React.useState(null);
   const [sharing, setSharing] = React.useState(false);
   const engineRef = React.useRef(null);
+  const onCallLogRef = React.useRef(onCallLog);
+  React.useEffect(() => {
+    onCallLogRef.current = onCallLog;
+  }, [onCallLog]);
   React.useEffect(() => {
     if (!selfId || engineRef.current) return;
     if (!window.PeerWebRTC || !window.RTCPeerConnection) {
@@ -2248,7 +2309,10 @@ function useCallController(selfId) {
       iceServers: CALL_ICE_SERVERS,
       logger: (m) => console.log(m)
     });
-    engine.on("incomingCall", (info) => setIncoming(info));
+    engine.on("incomingCall", (info) => {
+      setIncoming(info);
+      if (onCallLogRef.current) onCallLogRef.current(info.peerId, !!info.video, "incoming");
+    });
     engine.on("stateChanged", (info, state) => setActive((a) => a && a.callId === info.callId ? { ...a, state } : a));
     engine.on("localStream", (id, s) => {
       setLocalStream(s);
@@ -2281,6 +2345,7 @@ function useCallController(selfId) {
       return;
     }
     setActive({ callId: null, peerId, video: !!video, direction: "outgoing", state: "ringing" });
+    if (onCallLogRef.current) onCallLogRef.current(peerId, !!video, "outgoing");
     eng.call(peerId, { audio: true, video: !!video }).then((callId) => setActive((a) => a && a.peerId === peerId && a.callId === null ? { ...a, callId } : a)).catch((e) => {
       setActive((a) => a && a.peerId === peerId ? null : a);
       alert("Could not start call: " + (e && e.message || e));
@@ -2748,10 +2813,21 @@ function DkApp() {
   const T = STR[t.lang] || STR.en;
   const vars = dkTheme(t.theme, t.accent);
   const rowPad = t.density === "comfortable" ? "11px 12px" : "7px 10px";
-  const callCtl = useCallController(me.userId);
+  const callCtl = useCallController(me.userId, (peerId, video, direction) => {
+    const text = `WebRTC ${video ? "video" : "audio"} call: ${direction}`;
+    dkApi.logLocal(peerId, direction === "outgoing" ? "out" : "in", text).then(() => {
+      data.loadThread(peerId);
+      data.refresh();
+    });
+  });
   const onCall = (peerId, video) => callCtl.start(peerId, !!video);
-  const rtcFileCtl = useRtcFileController(me.userId, (peerId, text) => {
-    dkApi.logLocal(peerId, "in", text).then(() => {
+  const rtcFileCtl = useRtcFileController(me.userId, (peerId, name, blob) => {
+    if (!blob) return;
+    dkApi.saveWebrtcFile(peerId, name, blob).then((r) => {
+      if (!r || r.ok === false) {
+        return dkApi.logLocal(peerId, "in", "received file via WebRTC: " + name + " (" + dkFileSize(blob.size) + ")");
+      }
+    }).then(() => {
       data.loadThread(peerId);
       data.refresh();
     });

package/dist/ui/server.js

@@ -346,6 +346,56 @@ export function startFriendUi(opts) {
                 }
                 return;
             }
+            // Persist a file received by browser WebRTC DataChannel. Unlike the
+            // ordinary daemon filetransfer path, the bytes arrive in the browser, so
+            // the browser uploads the completed Blob here; we save it under
+            // downloads/ and ask the daemon to append a normal inbound file chip.
+            if (req.method === "POST" && url === "/api/webrtc-file-save") {
+                if (!opts.downloadsDir) {
+                    sendJson(res, 404, { ok: false, error: "downloads disabled" });
+                    return;
+                }
+                const q = new URL(req.url || "", "http://x").searchParams;
+                const userid = q.get("userid") || "";
+                const rawName = q.get("name") || "agentnet-file";
+                const safe = rawName.replace(/[/\\]/g, "_").slice(0, 200) || "agentnet-file";
+                if (!userid) {
+                    sendJson(res, 400, { ok: false, error: "userid required" });
+                    return;
+                }
+                const fs = await import("node:fs");
+                const fsp = await import("node:fs/promises");
+                await fsp.mkdir(opts.downloadsDir, { recursive: true });
+                let finalName = safe;
+                let finalPath = join(opts.downloadsDir, finalName);
+                const dot = safe.lastIndexOf(".");
+                const base = dot > 0 ? safe.slice(0, dot) : safe;
+                const ext = dot > 0 ? safe.slice(dot) : "";
+                for (let i = 1; existsSync(finalPath); i++) {
+                    finalName = `${base}-${i}${ext}`;
+                    finalPath = join(opts.downloadsDir, finalName);
+                }
+                try {
+                    await new Promise((resolve2, reject) => {
+                        const ws = fs.createWriteStream(finalPath);
+                        req.pipe(ws);
+                        req.on("error", reject);
+                        ws.on("error", reject);
+                        ws.on("finish", () => resolve2());
+                    });
+                    const st = statSync(finalPath);
+                    const r = await opts.call({ op: "file-log-local", userid, dir: "in", name: finalName, size: st.size });
+                    if (!r.ok) {
+                        sendJson(res, 502, r);
+                        return;
+                    }
+                    sendJson(res, 200, { ok: true, name: finalName, size: st.size });
+                }
+                catch (e) {
+                    sendJson(res, 500, { ok: false, error: e instanceof Error ? e.message : String(e) });
+                }
+                return;
+            }
             // Serve a received file by name, from <configDir>/downloads. Used both for
             // download (?dl=1 → attachment) and inline preview/playback (no dl → the
             // right media content-type + inline disposition + HTTP Range so <video>/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/lan",
-  "version": "0.1.227",
+  "version": "0.1.229",
   "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",