@decentnetwork/lan 0.1.209 → 0.1.210

package/dist/daemon/ipc.d.ts

@@ -80,6 +80,8 @@ export interface IpcHandlers {
     fileDelete: (peer: string, ids: string[]) => Promise<Record<string, unknown>>;
     /** Cancel in-flight sends by chat message id. */
     fileCancel: (peer: string, ids: string[]) => Promise<Record<string, unknown>>;
+    /** Restart incomplete sends from their retained outbox bytes. */
+    fileRetry: (peer: string, ids: string[]) => Promise<Record<string, unknown>>;
     /** Mark a conversation read up to `ts` (defaults to now) — clears unread. */
     chatMarkRead: (userid: string, ts?: number) => Promise<void>;
     /** Send a WebRTC call-signaling payload (RtcSignal JSON) to a friend over the
@@ -113,7 +115,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-history" | "friends-list" | "friend-remove" | "friend-set-alias" | "friends-autoaccept" | "set-profile" | "file-send" | "file-delete" | "file-cancel" | "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-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;

package/dist/daemon/ipc.js

@@ -238,6 +238,11 @@ export class IpcServer {
                     throw new Error("userid is required");
                 return await this.handlers.fileCancel(req.userid, req.ids ?? []);
             }
+            case "file-retry": {
+                if (!req.userid)
+                    throw new Error("userid is required");
+                return await this.handlers.fileRetry(req.userid, req.ids ?? []);
+            }
             case "chat-mark-read": {
                 if (!req.userid)
                     throw new Error("userid is required");

package/dist/daemon/message-store.d.ts

@@ -77,6 +77,8 @@ export declare class MessageStore {
         avgKbps?: number;
         kbps?: number;
     }): boolean;
+    /** Look up one persisted message by its stable UI id. */
+    get(peer: string, id: string): ChatMessage | undefined;
     /** Remove messages by id. Returns the removed ones so the caller can clean up
      *  any on-disk file the chip pointed at. */
     deleteMessages(peer: string, ids: string[]): ChatMessage[];

package/dist/daemon/message-store.js

@@ -91,6 +91,10 @@ export class MessageStore {
         this.scheduleSave();
         return true;
     }
+    /** Look up one persisted message by its stable UI id. */
+    get(peer, id) {
+        return this.byPeer.get(peer)?.find((m) => m.id === id);
+    }
     /** Remove messages by id. Returns the removed ones so the caller can clean up
      *  any on-disk file the chip pointed at. */
     deleteMessages(peer, ids) {

package/dist/daemon/server.js

@@ -497,15 +497,22 @@ export class DaemonServer {
                         this.ipcEvents.emit("event", { type: "chat", userid, dir: "out" });
                         return { inline: true, name, size: data.length };
                     }
-                    const fileId = this.peerManager?.sendFile(userid, new Uint8Array(data), name);
-                    if (!fileId)
-                        throw new Error("No free transfer slot (or friend unknown)");
-                    this.logger.info(`Offering file "${name}" (${data.length}B) to ${userid.slice(0, 8)}`);
                     // Add the "out" chip immediately as STATUS=sending (not "sent" — the
                     // transfer is reliable+acked, so it only flips to "sent" once the
                     // receiver confirms every byte). Progress/complete/cancel events patch
-                    // it. The chip is tracked by fileId so those events can find it.
+                    // it. Retain the bytes until delivery so Cancel/Retry and content-hash
+                    // resume work even though the UI upload temp file is removed.
                     const msg = this.messageStore?.appendFile(userid, "out", { name: sanitizeFileName(name), size: data.length, status: "sending", sent: 0 });
+                    if (!msg)
+                        throw new Error("Could not create file message");
+                    await fs.mkdir(this.outboxDir, { recursive: true });
+                    await fs.writeFile(resolve(this.outboxDir, msg.id), data);
+                    const fileId = this.peerManager?.sendFile(userid, new Uint8Array(data), name);
+                    if (!fileId) {
+                        this.messageStore?.patchFile(userid, msg.id, { status: "failed" });
+                        throw new Error("No free transfer slot (or friend unknown)");
+                    }
+                    this.logger.info(`Offering file "${name}" (${data.length}B) to ${userid.slice(0, 8)}`);
                     if (msg)
                         this.activeSends.set(fileId, { peer: userid, msgId: msg.id });
                     this.friendMeta?.ensure(userid);
@@ -551,6 +558,44 @@ export class DaemonServer {
                     this.logger.info(`Cancelled ${n} send(s) for ${userid.slice(0, 8)}`);
                     return { cancelled: n };
                 },
+                fileRetry: async (userid, ids) => {
+                    const fs = await import("fs/promises");
+                    if (!this.peerManager?.isFriendOnline(userid)) {
+                        throw new Error("Peer is not online yet");
+                    }
+                    let retried = 0;
+                    for (const id of ids) {
+                        const msg = this.messageStore?.get(userid, id);
+                        if (!msg?.file || msg.dir !== "out" || msg.file.status === "sent")
+                            continue;
+                        const bytesPath = resolve(this.outboxDir, id);
+                        let data;
+                        try {
+                            data = await fs.readFile(bytesPath);
+                        }
+                        catch {
+                            throw new Error(`Original bytes are no longer available for ${msg.file.name}`);
+                        }
+                        // Retry also acts as an immediate restart for a stuck 0%/partial
+                        // transfer. Stop the old file-number first; the receiver retains a
+                        // content-hash partial and answers the new offer with its resume ACK.
+                        for (const [fid, active] of [...this.activeSends]) {
+                            if (active.peer !== userid || active.msgId !== id)
+                                continue;
+                            this.peerManager.cancelSend(userid, fid);
+                            this.activeSends.delete(fid);
+                        }
+                        const fileId = this.peerManager.sendFile(userid, new Uint8Array(data), msg.file.name);
+                        if (!fileId)
+                            throw new Error(`No free transfer slot for ${msg.file.name}`);
+                        this.messageStore?.patchFile(userid, id, { status: "sending", sent: 0, kbps: undefined });
+                        this.activeSends.set(fileId, { peer: userid, msgId: id });
+                        retried++;
+                        this.logger.info(`Retrying file "${msg.file.name}" (${data.length}B) to ${userid.slice(0, 8)}`);
+                    }
+                    this.ipcEvents.emit("event", { type: "chat", userid, dir: "out" });
+                    return { retried };
+                },
                 chatMarkRead: async (userid, ts) => {
                     this.friendMeta?.markRead(userid, ts);
                 },
@@ -962,7 +1007,9 @@ export class DaemonServer {
                     // If this was a queued (offline) send and its bytes are still in the
                     // outbox, revert the chip to "queued" so it retries on the next
                     // reconnect instead of dying as "failed". Otherwise mark failed.
-                    const requeue = !!this.outboxDir && existsSync(resolve(this.outboxDir, t.msgId));
+                    const requeue = p.reason !== "no-response" &&
+                        !this.peerManager?.isFriendOnline(t.peer) &&
+                        !!this.outboxDir && existsSync(resolve(this.outboxDir, t.msgId));
                     this.messageStore?.patchFile(t.peer, t.msgId, { status: requeue ? "queued" : "failed", sent: 0 });
                     this.activeSends.delete(p.fileId);
                     this.ipcEvents.emit("event", { type: "chat", userid: t.peer, dir: "out" });

package/dist/ui/desktop/app.js

@@ -227,6 +227,7 @@ const dkApi = {
   markRead: (userid) => dkPost("/api/chat-mark-read", { userid }),
   delFiles: (userid, ids) => dkPost("/api/file-delete", { userid, ids }),
   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 }),
   sendFile: async (userid, file) => {
     try {
@@ -1071,7 +1072,7 @@ const mediaBtnStyle = {
   justifyContent: "center",
   lineHeight: 0
 };
-function Msg({ m, peer, T, onTheater, onDelete, onCancel, selMode, selected, onToggleSel }) {
+function Msg({ m, peer, T, onTheater, onDelete, onCancel, onRetry, selMode, selected, onToggleSel }) {
   const mine = m.from === "me";
   return /* @__PURE__ */ React.createElement(
     "div",
@@ -1181,6 +1182,17 @@ function Msg({ m, peer, T, onTheater, onDelete, onCancel, selMode, selected, onT
               style: { background: "rgba(255,255,255,0.16)", border: "none", borderRadius: 6, cursor: "pointer", padding: 3, marginLeft: 2, display: "inline-flex", flexShrink: 0 }
             },
             /* @__PURE__ */ React.createElement(Icon, { name: "x", size: 13, stroke: 2.4, color: "#fff" })
+          ), m.file.status !== "sent" && m.id && /* @__PURE__ */ React.createElement(
+            "button",
+            {
+              title: T.retry || "retry",
+              onClick: (e) => {
+                e.stopPropagation();
+                onRetry(m.id);
+              },
+              style: { background: "rgba(255,255,255,0.16)", border: "none", borderRadius: 6, cursor: "pointer", padding: 3, marginLeft: 2, display: "inline-flex", flexShrink: 0 }
+            },
+            /* @__PURE__ */ React.createElement(Icon, { name: "refresh", size: 13, stroke: 2.2, color: "#fff" })
           ));
         }
         return /* @__PURE__ */ React.createElement(
@@ -1267,6 +1279,12 @@ function Conversation({ T, peer, lang, thread: threadProp, onSend, onSendFile, o
     if (id) dkApi.cancelSend(peer.userId, [id]).catch(() => {
     });
   };
+  const doRetry = (id) => {
+    if (!id) return;
+    dkApi.retrySend(peer.userId, [id]).then((r) => {
+      if (r && r.ok === false) window.alert((lang === "zh" ? "\u91CD\u8BD5\u5931\u8D25: " : "Retry failed: ") + (r.error || ""));
+    });
+  };
   const doDelete = (ids) => {
     ids = ids.filter(Boolean);
     if (!ids.length) return;
@@ -1352,6 +1370,7 @@ function Conversation({ T, peer, lang, thread: threadProp, onSend, onSendFile, o
         onTheater: setTheater,
         onDelete: (id) => doDelete([id]),
         onCancel: doCancel,
+        onRetry: doRetry,
         selMode,
         selected: sel.has(m.id),
         onToggleSel: toggleSel
@@ -1956,6 +1975,8 @@ const STR = {
     pickPeer: "Select a peer to open the conversation",
     queued: "queued",
     open: "open",
+    retry: "Retry",
+    cancel: "Cancel",
     myIp: "my ip",
     copyAddr: "copy address",
     peersOnline: "peers online",
@@ -2036,6 +2057,8 @@ const STR = {
     pickPeer: "\u9009\u62E9\u4E00\u4F4D\u597D\u53CB\u5F00\u59CB\u4F1A\u8BDD",
     queued: "\u5F85\u53D1\u9001",
     open: "\u6253\u5F00",
+    retry: "\u91CD\u8BD5",
+    cancel: "\u53D6\u6D88",
     myIp: "\u6211\u7684 IP",
     copyAddr: "\u590D\u5236\u5730\u5740",
     peersOnline: "\u5728\u7EBF\u597D\u53CB",

package/dist/ui/server.js

@@ -292,6 +292,19 @@ export function startFriendUi(opts) {
                 sendJson(res, r.ok ? 200 : 502, r.ok ? { ok: true, ...(r.data ?? {}) } : { ok: false, error: r.error });
                 return;
             }
+            // Retry/resume incomplete sends from the daemon's retained outbox copy.
+            if (req.method === "POST" && url === "/api/file-retry") {
+                const body = await readBody(req);
+                const userid = typeof body.userid === "string" ? body.userid : "";
+                const ids = Array.isArray(body.ids) ? body.ids.filter((x) => typeof x === "string") : [];
+                if (!userid || !ids.length) {
+                    sendJson(res, 400, { ok: false, error: "userid and ids required" });
+                    return;
+                }
+                const r = await opts.call({ op: "file-retry", userid, ids });
+                sendJson(res, r.ok ? 200 : 502, r.ok ? { ok: true, ...(r.data ?? {}) } : { ok: false, error: r.error });
+                return;
+            }
             // ── File transfer ──────────────────────────────────────────────────
             // Upload: the browser POSTs raw file bytes with ?userid=&name= in the
             // query. We stream them to a temp file (no in-memory buffering of large

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/lan",
-  "version": "0.1.209",
+  "version": "0.1.210",
   "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",
@@ -84,7 +84,7 @@
   },
   "dependencies": {
     "@decentnetwork/dora": "^0.1.14",
-    "@decentnetwork/peer": "^0.1.103",
+    "@decentnetwork/peer": "^0.1.104",
     "@decentnetwork/peer-webrtc": "^0.2.10",
     "ink": "^5.2.1",
     "js-yaml": "^4.1.0",