@decentnetwork/lan 0.1.222 → 0.1.224

package/dist/ui/desktop/app.js

@@ -1547,9 +1547,11 @@ 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 });
-    Promise.resolve(sender(file)).then((r) => {
+    setSending({ name: file.name, via: mode, pct: 0 });
+    const onProgress = (p) => setSending((s) => s && s.name === file.name ? { ...s, pct: p && p.pct } : 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");
     }).finally(() => {
       setSending(null);
       requestAnimationFrame(scrollToBottom);
@@ -1633,7 +1635,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), /* @__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.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(
       "input",
       {
         ref: fileRef,
@@ -1897,15 +1899,43 @@ function dkWaitForOpen(dc, timeoutMs, describeState) {
 }
 function dkWaitBufferedLow(dc, highWater) {
   if (dc.bufferedAmount < highWater) return Promise.resolve();
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
     const prev = dc.bufferedAmountLowThreshold;
     dc.bufferedAmountLowThreshold = Math.floor(highWater / 2);
+    let poll = null;
+    let timer = null;
     const done = () => {
+      cleanup();
+      resolve();
+    };
+    const cleanup = () => {
+      if (poll) clearInterval(poll);
+      if (timer) clearTimeout(timer);
       dc.removeEventListener("bufferedamountlow", done);
+      dc.removeEventListener("close", onClose);
+      dc.removeEventListener("error", onError);
       dc.bufferedAmountLowThreshold = prev;
-      resolve();
+    };
+    const check = () => {
+      if (dc.readyState !== "open") return onClose();
+      if (dc.bufferedAmount < highWater) done();
+    };
+    const onClose = () => {
+      cleanup();
+      reject(new Error("WebRTC data channel closed while draining"));
+    };
+    const onError = () => {
+      cleanup();
+      reject(new Error("WebRTC data channel failed while draining"));
     };
     dc.addEventListener("bufferedamountlow", done);
+    dc.addEventListener("close", onClose);
+    dc.addEventListener("error", onError);
+    poll = setInterval(check, 250);
+    timer = setTimeout(() => {
+      cleanup();
+      reject(new Error("WebRTC data channel drain timed out buffered=" + dc.bufferedAmount));
+    }, 3e4);
   });
 }
 function dkFileDownload(blob, name) {
@@ -1978,7 +2008,10 @@ function useRtcFileController(selfId, onReceivedText) {
       let sess = peersRef.current.get(fileId);
       try {
         if (env.type === "offer") {
-          if (sess) cleanup(fileId);
+          if (sess && sess.pc && sess.pc.signalingState !== "closed") {
+            console.warn("[file-rtc] duplicate offer ignored for " + fileId);
+            return;
+          }
           const pc = new RTCPeerConnection({ iceServers: CALL_ICE_SERVERS });
           pc.oniceconnectionstatechange = () => console.warn("[file-rtc] receiver ice=" + pc.iceConnectionState + " conn=" + pc.connectionState);
           pc.onconnectionstatechange = () => console.warn("[file-rtc] receiver conn=" + pc.connectionState + " ice=" + pc.iceConnectionState);
@@ -2002,6 +2035,10 @@ function useRtcFileController(selfId, onReceivedText) {
           await pc.setLocalDescription(answer);
           await sendSignal(peerId, fileId, "answer", { sdp: answer.sdp });
         } else if (env.type === "answer" && sess) {
+          if (sess.pc.signalingState !== "have-local-offer") {
+            console.warn("[file-rtc] stale answer ignored for " + fileId + " state=" + sess.pc.signalingState);
+            return;
+          }
           await sess.pc.setRemoteDescription({ type: "answer", sdp: env.sdp });
           if (sess.pendingCandidates) {
             for (const c of sess.pendingCandidates.splice(0)) {
@@ -2106,10 +2143,12 @@ function useRtcFileController(selfId, onReceivedText) {
 function RtcFileInbox({ T, peers, ctl }) {
   const items = ctl && ctl.incoming || [];
   if (!items.length) return null;
-  return /* @__PURE__ */ React.createElement("div", { style: { position: "fixed", right: 18, bottom: 18, zIndex: 90, width: 360, display: "flex", flexDirection: "column", gap: 10 } }, items.map((it) => {
+  const closeLabel = T && T.receivedClose || "Close";
+  const downloadLabel = T && T.downloadFile || "Download";
+  return /* @__PURE__ */ React.createElement("div", { style: { position: "fixed", right: 72, bottom: 18, zIndex: 90, width: 360, maxWidth: "calc(100vw - 96px)", display: "flex", flexDirection: "column", gap: 10 } }, items.map((it) => {
     const peer = (peers || []).find((p) => p.id === it.peerId || p.userId === it.peerId) || {};
     const who = peer.alias || peer.name || shortKey(it.peerId, 8, 5);
-    return /* @__PURE__ */ React.createElement("div", { key: it.id, style: { border: "1px solid var(--line)", background: "var(--panel)", borderRadius: 12, padding: 12, boxShadow: "0 14px 40px rgba(0,0,0,0.35)" } }, /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--mono)", fontSize: 12, color: "var(--faint)", marginBottom: 6 } }, T && T.receivedFile || "Received file", " \xB7 ", who), /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 13, fontWeight: 700, color: "var(--text)", overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" } }, it.name), /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--mono)", fontSize: 11, color: "var(--faint)", marginTop: 3 } }, dkFileSize(it.size)), /* @__PURE__ */ React.createElement("div", { style: { display: "flex", justifyContent: "flex-end", gap: 8, marginTop: 10 } }, /* @__PURE__ */ React.createElement("button", { onClick: () => ctl.dismissIncoming(it.id), style: { height: 30, borderRadius: 8, border: "1px solid var(--line)", background: "transparent", color: "var(--dim)", cursor: "pointer" } }, T && T.cancel || "Close"), /* @__PURE__ */ React.createElement("a", { href: it.url, download: it.name, onClick: () => setTimeout(() => ctl.dismissIncoming(it.id), 500), style: { height: 30, borderRadius: 8, padding: "6px 10px", background: "var(--accent)", color: "#fff", textDecoration: "none", fontFamily: "var(--mono)", fontSize: 12 } }, T && T.open || "Download")));
+    return /* @__PURE__ */ React.createElement("div", { key: it.id, style: { border: "1px solid var(--line)", background: "var(--panel)", borderRadius: 12, padding: 12, boxShadow: "0 14px 40px rgba(0,0,0,0.35)" } }, /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--mono)", fontSize: 12, color: "var(--faint)", marginBottom: 6 } }, T && T.receivedFile || "Received file", " \xB7 ", who), /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--ui)", fontSize: 13, fontWeight: 700, color: "var(--text)", overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" } }, it.name), /* @__PURE__ */ React.createElement("div", { style: { fontFamily: "var(--mono)", fontSize: 11, color: "var(--faint)", marginTop: 3 } }, dkFileSize(it.size)), /* @__PURE__ */ React.createElement("div", { style: { display: "flex", justifyContent: "flex-end", gap: 8, marginTop: 10, paddingRight: 2 } }, /* @__PURE__ */ React.createElement("button", { onClick: () => ctl.dismissIncoming(it.id), style: { height: 30, minWidth: 58, borderRadius: 8, border: "1px solid var(--line)", background: "transparent", color: "var(--dim)", cursor: "pointer" } }, closeLabel), /* @__PURE__ */ React.createElement("a", { href: it.url, download: it.name, onClick: () => setTimeout(() => ctl.dismissIncoming(it.id), 500), style: { height: 30, minWidth: 76, textAlign: "center", borderRadius: 8, padding: "6px 10px", background: "var(--accent)", color: "#fff", textDecoration: "none", fontFamily: "var(--mono)", fontSize: 12 } }, downloadLabel)));
   }));
 }
 Object.assign(window, { useRtcFileController, RtcFileInbox });
@@ -2444,6 +2483,8 @@ const STR = {
     block: "Block peer",
     remove: "Remove friend",
     receivedFile: "Received file",
+    receivedClose: "Close",
+    downloadFile: "Download",
     attach: "Attach file",
     message: "Message",
     send: "Send",
@@ -2536,6 +2577,8 @@ const STR = {
     block: "\u62C9\u9ED1",
     remove: "\u5220\u9664\u597D\u53CB",
     receivedFile: "\u6536\u5230\u6587\u4EF6",
+    receivedClose: "\u5173\u95ED",
+    downloadFile: "\u4E0B\u8F7D",
     attach: "\u9644\u4EF6",
     message: "\u6D88\u606F",
     send: "\u53D1\u9001",
@@ -2675,9 +2718,9 @@ function DkApp() {
     if (!activeId || !text || !text.trim()) return;
     dkApi.send(activeId, text.trim()).then(() => data.loadThread(activeId)).then(data.refresh);
   };
-  const onSendFile = (file) => {
+  const onSendFile = (file, onProgress) => {
     if (!activeId || !file) return Promise.resolve({ ok: false });
-    return rtcFileCtl.sendFile(activeId, file).then((r) => {
+    return rtcFileCtl.sendFile(activeId, file, onProgress).then((r) => {
       if (r && r.ok && r.via === "webrtc") {
         return dkApi.send(activeId, (t.lang === "zh" ? "\u5DF2\u901A\u8FC7 WebRTC \u53D1\u9001\u6587\u4EF6: " : "sent file via WebRTC: ") + file.name).then(() => ({ ok: true, via: "webrtc" }));
       }
@@ -2688,9 +2731,9 @@ function DkApp() {
       return r;
     });
   };
-  const onSendRtcFile = (file) => {
+  const onSendRtcFile = (file, onProgress) => {
     if (!activeId || !file) return Promise.resolve({ ok: false, error: "no active peer or file" });
-    return rtcFileCtl.sendFile(activeId, file).then((r) => {
+    return rtcFileCtl.sendFile(activeId, file, onProgress).then((r) => {
       if (r && r.ok && r.via === "webrtc") {
         return dkApi.send(activeId, (t.lang === "zh" ? "\u5DF2\u901A\u8FC7 WebRTC \u53D1\u9001\u6587\u4EF6: " : "sent file via WebRTC: ") + file.name).then(() => ({ ok: true, via: "webrtc" }));
       }

package/package.json

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