@decentnetwork/beagle 0.1.35 → 0.1.37

package/dist/desktop/app.js

@@ -1,4 +1,4 @@
-window.__DK_UI_VERSION="0.1.34";
+window.__DK_UI_VERSION="0.1.36";
 const ICON_PATHS = {
   // ---- tab bar (the four must feel like one set) ----
   users: '<path d="M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M22 21v-2a4 4 0 0 0-3-3.87"/><path d="M16 3.13a4 4 0 0 1 0 7.75"/>',
@@ -1622,7 +1622,7 @@ function DkGroupSender({ grp, T, avatar }) {
       title: grp.sender,
       style: { display: "inline-flex", alignItems: "center", gap: 5, background: "none", border: "none", padding: 0, cursor: "pointer" }
     },
-    avatar ? /* @__PURE__ */ React.createElement(DkIdenticon, { seed, size: 24, radius: 6 }) : /* @__PURE__ */ React.createElement("span", { style: { fontFamily: "var(--mono)", fontSize: 10.5, color: "var(--faint)" } }, grp.sender)
+    avatar ? /* @__PURE__ */ React.createElement(DkEnsAvatar, { userid: grp.senderId, fallbackSeed: seed, size: 24, radius: 6 }) : /* @__PURE__ */ React.createElement("span", { style: { fontFamily: "var(--mono)", fontSize: 10.5, color: "var(--faint)" } }, grp.sender)
   ), open && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("span", { onClick: () => setOpen(false), style: { position: "fixed", inset: 0, zIndex: 40 } }), /* @__PURE__ */ React.createElement("span", { style: {
     position: "absolute",
     left: 0,
@@ -1637,7 +1637,7 @@ function DkGroupSender({ grp, T, avatar }) {
     display: "flex",
     flexDirection: "column",
     gap: 8
-  } }, /* @__PURE__ */ React.createElement("span", { style: { display: "flex", alignItems: "center", gap: 8 } }, /* @__PURE__ */ React.createElement(DkIdenticon, { seed, size: 34, radius: 8 }), /* @__PURE__ */ React.createElement("span", { style: { fontFamily: "var(--mono)", fontSize: 12.5, fontWeight: 700, color: "var(--text)", wordBreak: "break-all" } }, grp.sender)), grp.senderId ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Mono, { size: 10.5, dim: true, copy: grp.senderId, title: grp.senderId }, shortKey(grp.senderId, 12, 8)), /* @__PURE__ */ React.createElement(
+  } }, /* @__PURE__ */ React.createElement("span", { style: { display: "flex", alignItems: "center", gap: 8 } }, /* @__PURE__ */ React.createElement(DkEnsAvatar, { userid: grp.senderId, fallbackSeed: seed, size: 34, radius: 8 }), /* @__PURE__ */ React.createElement("span", { style: { fontFamily: "var(--mono)", fontSize: 12.5, fontWeight: 700, color: "var(--text)", wordBreak: "break-all" } }, grp.sender)), grp.senderId ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Mono, { size: 10.5, dim: true, copy: grp.senderId, title: grp.senderId }, shortKey(grp.senderId, 12, 8)), /* @__PURE__ */ React.createElement(
     "button",
     {
       onClick: addFriend,
@@ -2874,6 +2874,39 @@ function DkPunkAvatar({ id, size, radius, fallbackSeed }) {
     }
   );
 }
+const dkEnsAvCache = /* @__PURE__ */ new Map();
+function DkEnsAvatar({ userid, fallbackSeed, size, radius }) {
+  const [pub, setPub] = React.useState(() => userid && dkEnsAvCache.has(userid) ? dkEnsAvCache.get(userid) : void 0);
+  React.useEffect(() => {
+    let dead = false;
+    if (!userid) {
+      setPub(null);
+      return void 0;
+    }
+    if (dkEnsAvCache.has(userid)) {
+      setPub(dkEnsAvCache.get(userid));
+      return void 0;
+    }
+    fetch(`/api/ens-profile?userid=${encodeURIComponent(userid)}`).then((r) => r.json()).then((d) => {
+      var _a;
+      const v = d.ok && d.profile ? { avatarUrl: d.profile.avatarUrl || null, punkId: (_a = d.profile.punkId) != null ? _a : null } : null;
+      dkEnsAvCache.set(userid, v);
+      if (!dead)
+        setPub(v);
+    }).catch(() => {
+      if (!dead)
+        setPub(null);
+    });
+    return () => {
+      dead = true;
+    };
+  }, [userid]);
+  if (pub && pub.avatarUrl)
+    return /* @__PURE__ */ React.createElement(DkImgAvatar, { url: pub.avatarUrl, seed: fallbackSeed || userid, size, radius });
+  if (pub && pub.punkId != null)
+    return /* @__PURE__ */ React.createElement(DkPunkAvatar, { id: pub.punkId, size, radius, fallbackSeed: fallbackSeed || userid });
+  return /* @__PURE__ */ React.createElement(DkIdenticon, { seed: fallbackSeed || userid || "x", size, radius });
+}
 function DkPunkPicker({ T, onPick, onClose }) {
   const TYPES = ["any", "female", "male", "zombie", "ape", "alien"];
   const tLabel = (t) => T && T["pt_" + t] || t;
@@ -3211,7 +3244,7 @@ function ProfileTab({ T, me, onEdit }) {
     setEditing(false);
   } }));
 }
-Object.assign(window, { ProfileTab, DkPunkAvatar, DkPublicProfile });
+Object.assign(window, { ProfileTab, DkPunkAvatar, DkEnsAvatar, DkPublicProfile });
 function DkDirAvatar({ p, size }) {
   const [broken, setBroken] = React.useState(false);
   if (p.punkId != null && !(p.avatar && !broken)) {
@@ -3795,6 +3828,14 @@ function useCallController(selfId, onCallLog) {
         return;
       }
       engine.on("incomingCall", (info) => {
+        const claimedAt = claimedCalls.current.get(String(info.callId).toLowerCase());
+        if (claimedAt && Date.now() - claimedAt < 5 * 6e4) {
+          try {
+            engine.discard && engine.discard(info.callId);
+          } catch (e) {
+          }
+          return;
+        }
         setIncoming(info);
         if (onCallLogRef.current)
           onCallLogRef.current(info.peerId, !!info.video, "incoming");
@@ -3860,6 +3901,7 @@ function useCallController(selfId, onCallLog) {
   }, [active]);
   const claimTabId = React.useRef(Math.random().toString(36).slice(2));
   const claimBus = React.useRef(null);
+  const claimedCalls = React.useRef(/* @__PURE__ */ new Map());
   React.useEffect(() => {
     let ch = null;
     try {
@@ -3872,9 +3914,16 @@ function useCallController(selfId, onCallLog) {
       const m = ev.data || {};
       if (!m || m.tabId === claimTabId.current || m.type !== "claimed")
         return;
+      if (m.callId)
+        claimedCalls.current.set(String(m.callId).toLowerCase(), Date.now());
       const inc = incomingRef.current;
-      if (inc && (inc.callId === m.callId || inc.peerId === m.peerId))
+      if (inc && (inc.callId === m.callId || inc.peerId === m.peerId)) {
         setIncoming(null);
+        try {
+          engineRef.current && engineRef.current.discard && engineRef.current.discard(inc.callId);
+        } catch (e) {
+        }
+      }
     };
     return () => {
       try {
@@ -4664,7 +4713,7 @@ function DkApp() {
   }, [refreshBackend]);
   React.useEffect(() => {
     const mine = window.__DK_UI_VERSION;
-    const served = me && me.lanVer;
+    const served = me && me.beagleVer;
     if (!mine || !served || mine === served)
       return;
     const key = "dk-reloaded-for-" + served;
@@ -4672,7 +4721,7 @@ function DkApp() {
       return;
     sessionStorage.setItem(key, "1");
     window.location.reload();
-  }, [me && me.lanVer]);
+  }, [me && me.beagleVer]);
   const peers = data.peers;
   const [pendingAddr, setPendingAddr] = React.useState(() => dkParseDeepLinkAddress());
   React.useEffect(() => {

package/dist/desktop/vendor/peer-webrtc.js

@@ -402,6 +402,16 @@ var PeerWebRTC = (() => {
       var _a;
       return !!((_a = __privateGet(this, _sessions).get(__privateMethod(this, _normId, normId_fn).call(this, callId))) == null ? void 0 : _a.screenStream);
     }
+    /** Silently drop a call WITHOUT signaling the peer — for a tab that lost
+     *  the cross-tab answer race: another tab owns the call now, so sending
+     *  reject/bye from this one would kill the live call. Local cleanup only. */
+    discard(callId) {
+      const session = __privateGet(this, _sessions).get(__privateMethod(this, _normId, normId_fn).call(this, callId));
+      if (!session)
+        return;
+      __privateMethod(this, _log, log_fn).call(this, `discarding call ${callId} (claimed elsewhere)`);
+      __privateMethod(this, _cleanup, cleanup_fn).call(this, session, "close");
+    }
     /** Tear down every call (e.g. on app shutdown). */
     dispose() {
       for (const session of [...__privateGet(this, _sessions).values()]) {

package/dist/server.js

@@ -1406,6 +1406,11 @@ export function startBeagleServer(opts) {
                     autoAccept: typeof node.autoAccept === "boolean" ? node.autoAccept : null,
                     avatarUrl: ensPub.get(identity.userid ?? "")?.avatarUrl ?? null,
                     punkId: ensPub.get(identity.userid ?? "")?.punkId ?? null,
+                    // The UI compares this against its baked-in __DK_UI_VERSION and
+                    // reloads itself when they differ — an open tab otherwise runs a
+                    // stale bundle forever after a beagle update (multi-tab call fixes
+                    // "didn't work" purely because old tabs never picked them up).
+                    beagleVer: beagleVersion(),
                 };
                 const fl = (flist.ok ? (flist.data?.friends ?? []) : []);
                 const peers = fl.map((f) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decentnetwork/beagle",
-  "version": "0.1.35",
+  "version": "0.1.37",
   "description": "Beagle — P2P chat, file transfer and calls for regular users, on the Decent Network. No admin privilege required.",
   "type": "module",
   "main": "./dist/index.js",
@@ -28,7 +28,7 @@
     "@decentnetwork/chat-components": "^0.1.3",
     "@decentnetwork/lan": "^0.1.256",
     "@decentnetwork/peer": "^0.1.138",
-    "@decentnetwork/peer-webrtc": "^0.2.13",
+    "@decentnetwork/peer-webrtc": "^0.2.14",
     "js-yaml": "^4.1.0",
     "yargs": "^17.7.2"
   },