@decentnetwork/beagle 0.1.103 → 0.1.104

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
- window.__DK_UI_VERSION="0.1.103";
1
+ window.__DK_UI_VERSION="0.1.104";
2
2
  "use strict";
3
3
  (() => {
4
4
  // packages/beagle-ui/dist/beagle-ui.js
@@ -411,10 +411,13 @@ window.__DK_UI_VERSION="0.1.103";
411
411
  // Pass the real state through. Collapsing everything that was not
412
412
  // 'queued' to 'read' meant a message still in flight — or one that
413
413
  // never went out at all — rendered as delivered.
414
- status: m.dir === "out" ? m.status === "queued" || m.status === "sending" || m.status === "failed" ? m.status : "read" : void 0,
414
+ status: m.dir === "out" ? m.status === "queued" || m.status === "sending" || m.status === "failed" || m.status === "sent" ? m.status : "read" : void 0,
415
415
  error: m.error,
416
+ // false = went to a live session but nobody acknowledged it (one tick).
417
+ // Dropped here before, so that state could never render.
418
+ confirmed: m.confirmed,
416
419
  // Delivery path: "online" = live session, "offline" = express relay.
417
- // Incoming messages carry this; the bubble colors them differently.
420
+ // Both directions carry it now; the bubble labels them the same way.
418
421
  via: m.via,
419
422
  // Brief 30: a validated component form, already whitelisted host-side.
420
423
  // Passed through untouched — the renderer treats every string as text,
@@ -1568,14 +1571,14 @@ window.__DK_UI_VERSION="0.1.103";
1568
1571
  letterSpacing: -0.1,
1569
1572
  wordBreak: "break-word"
1570
1573
  } }, /* @__PURE__ */ React.createElement(MarkdownText, { text: read.text, onNameCard })));
1571
- })(), read.form && /* @__PURE__ */ React.createElement("div", { style: { marginTop: 6 } }, /* @__PURE__ */ React.createElement(DkChatForm, { form: read.form, submitted, peer, onSubmit: onFormSubmit })), /* @__PURE__ */ React.createElement("div", { style: { display: "flex", alignItems: "center", gap: 4, margin: "3px 3px 0" } }, /* @__PURE__ */ React.createElement("span", { style: { fontFamily: "var(--mono)", fontSize: 10, color: "var(--faint)" } }, m.time), !mine && m.via && /* @__PURE__ */ React.createElement(
1572
- "span",
1573
- {
1574
- title: m.via === "offline" ? "delivered via express relay (offline)" : "delivered over a live session (online)",
1575
- style: { fontFamily: "var(--mono)", fontSize: 9, color: m.via === "offline" ? "#f59e0b" : "var(--faint)" }
1576
- },
1577
- m.via === "offline" ? "\u79BB\u7EBF" : "\u5728\u7EBF"
1578
- ), !selMode && m.id && /* @__PURE__ */ React.createElement(
1574
+ })(), read.form && /* @__PURE__ */ React.createElement("div", { style: { marginTop: 6 } }, /* @__PURE__ */ React.createElement(DkChatForm, { form: read.form, submitted, peer, onSubmit: onFormSubmit })), /* @__PURE__ */ React.createElement("div", { style: { display: "flex", alignItems: "center", gap: 4, margin: "3px 3px 0" } }, /* @__PURE__ */ React.createElement("span", { style: { fontFamily: "var(--mono)", fontSize: 10, color: "var(--faint)" } }, m.time), (() => {
1575
+ const sentDone = mine && m.status && m.status !== "queued" && m.status !== "sending" && m.status !== "failed";
1576
+ const via = !mine ? m.via : sentDone ? m.via === "offline" ? "offline" : "online" : null;
1577
+ if (!via)
1578
+ return null;
1579
+ const title = mine ? via === "offline" ? T.viaOutOffline || "posted to the offline relay \u2014 they get it when they come online" : T.viaOutOnline || "sent over a live session (online)" : via === "offline" ? "delivered via express relay (offline)" : "delivered over a live session (online)";
1580
+ return /* @__PURE__ */ React.createElement("span", { title, style: { fontFamily: "var(--mono)", fontSize: 9, color: via === "offline" ? "#f59e0b" : "var(--faint)" } }, via === "offline" ? "\u79BB\u7EBF" : "\u5728\u7EBF");
1581
+ })(), !selMode && m.id && /* @__PURE__ */ React.createElement(
1579
1582
  "button",
1580
1583
  {
1581
1584
  title: T.delete || "delete",
@@ -1610,7 +1613,7 @@ window.__DK_UI_VERSION="0.1.103";
1610
1613
  },
1611
1614
  /* @__PURE__ */ React.createElement(Icon, { name: "clock", size: 11, stroke: 2.2, color: "var(--faint)" }),
1612
1615
  /* @__PURE__ */ React.createElement("span", { style: { fontFamily: "var(--mono)", fontSize: 10, color: "var(--faint)" } }, m.status === "sending" ? T.sendingMsg || "sending" : T.queued || "queued")
1613
- ) : mine && m.status === "sent" && m.confirmed === false ? /* @__PURE__ */ React.createElement(Icon, { name: "check", size: 12, stroke: 2.2, color: "var(--faint)", title: T.sentUnconfirmed || "sent \u2014 not confirmed by the peer" }) : mine && m.status && /* @__PURE__ */ React.createElement(Icon, { name: "checkCheck", size: 12, stroke: 2.2, color: m.status === "read" ? "var(--accent)" : "var(--faint)" })))
1616
+ ) : mine && m.via === "offline" && m.status !== "queued" && m.status !== "sending" ? /* @__PURE__ */ React.createElement(Icon, { name: "check", size: 12, stroke: 2.2, color: "#f59e0b", title: T.viaOutOffline || "posted to the offline relay \u2014 they get it when they come online" }) : mine && m.status === "sent" && m.confirmed === false ? /* @__PURE__ */ React.createElement(Icon, { name: "check", size: 12, stroke: 2.2, color: "var(--faint)", title: T.sentUnconfirmed || "sent \u2014 not confirmed by the peer" }) : mine && m.status && /* @__PURE__ */ React.createElement(Icon, { name: "checkCheck", size: 12, stroke: 2.2, color: m.status === "read" ? "var(--accent)" : "var(--faint)" })))
1614
1617
  );
1615
1618
  }
1616
1619
  function Conversation({ T, peer, lang, peers, onOpenChat, thread: threadProp, onSend, onSendFile, onSendRtcFile, onAlias, onRemove, onOpenNet, onCall, onReloadThread, muted, onToggleMute, phone, onBack }) {
@@ -4960,6 +4963,8 @@ ${peer.address}`
4960
4963
  updTitle: "Update available",
4961
4964
  updLater: "Later",
4962
4965
  brandAbout: "What is Beagle?",
4966
+ viaOutOffline: "posted to the offline relay \u2014 they get it when they come online",
4967
+ viaOutOnline: "sent over a live session (online)",
4963
4968
  updNow: "Update now",
4964
4969
  updRestart: "Restart",
4965
4970
  updBusy: "Updating\u2026 (about a minute)",
@@ -5150,6 +5155,8 @@ ${peer.address}`
5150
5155
  updTitle: "\u53D1\u73B0\u65B0\u7248\u672C",
5151
5156
  updLater: "\u7A0D\u540E",
5152
5157
  brandAbout: "Beagle \u662F\u4EC0\u4E48?",
5158
+ viaOutOffline: "\u5DF2\u5B58\u5230\u79BB\u7EBF\u4E2D\u8F6C\u2014\u2014\u5BF9\u65B9\u4E0A\u7EBF\u540E\u6536\u5230",
5159
+ viaOutOnline: "\u5728\u7EBF\u76F4\u63A5\u9001\u8FBE",
5153
5160
  updNow: "\u7ACB\u5373\u66F4\u65B0",
5154
5161
  updRestart: "\u91CD\u542F",
5155
5162
  updBusy: "\u66F4\u65B0\u4E2D\u2026(\u7EA6\u4E00\u5206\u949F)",
@@ -597,6 +597,9 @@ export class EmbeddedHost {
597
597
  // unconfirmed message is how a phone ends up with two copies.
598
598
  const r = await this.#node.sendText(uid, text);
599
599
  this.#messages.setStatus(uid, msg.id, "sent", !r || r.delivery === "acked");
600
+ // Same field incoming messages carry, so the bubble can say which
601
+ // road it took: a relay post is waiting for them, not with them.
602
+ this.#messages.setVia(uid, msg.id, r && r.delivery === "offline" ? "offline" : "online");
600
603
  }
601
604
  catch (e) {
602
605
  // Offline peer or failed delivery: same recovery either way —
@@ -13,6 +13,9 @@ export declare const DAEMON_GRACE_MS: number;
13
13
  * Only a streak of misses that also spans real time is believed. */
14
14
  export declare const DAEMON_MISS_STREAK = 3;
15
15
  export declare const DAEMON_MISS_WINDOW_MS = 5000;
16
+ /** Is the process named in <dataDir>/daemon.pid still there? A root daemon
17
+ * answers signal 0 with EPERM, which still proves it exists. */
18
+ export declare function daemonPidAlive(dataDir: string): boolean;
16
19
  export interface SwitchableHostOptions {
17
20
  dataDir: string;
18
21
  /** Build a fresh embedded host. Called on first start and on every fallback,
@@ -30,6 +33,8 @@ export interface SwitchableHostOptions {
30
33
  graceMs?: number;
31
34
  /** Liveness probe, injectable for tests. Defaults to a real connect. */
32
35
  probe?: (dataDir: string) => Promise<boolean>;
36
+ /** Test seam: does the daemon's process exist? Default reads <dataDir>/daemon.pid. */
37
+ pidAlive?: (dataDir: string) => boolean;
33
38
  }
34
39
  /**
35
40
  * A PeerHost whose backend can change under it.
@@ -13,6 +13,8 @@
13
13
  // `releasing` is the honest name for the middle state: our peer is down and the
14
14
  // daemon is not up yet, so messaging is offline and the UI must say so. Hiding
15
15
  // that gap would make dropped messages look like a network fault.
16
+ import { readFileSync } from "node:fs";
17
+ import { join } from "node:path";
16
18
  import { probeDaemon } from "./ipc.js";
17
19
  import { Logger } from "./logger.js";
18
20
  /** How often we look for the daemon socket appearing or vanishing. */
@@ -30,6 +32,26 @@ export const DAEMON_GRACE_MS = 60 * 1000;
30
32
  * Only a streak of misses that also spans real time is believed. */
31
33
  export const DAEMON_MISS_STREAK = 3;
32
34
  export const DAEMON_MISS_WINDOW_MS = 5000;
35
+ /** Is the process named in <dataDir>/daemon.pid still there? A root daemon
36
+ * answers signal 0 with EPERM, which still proves it exists. */
37
+ export function daemonPidAlive(dataDir) {
38
+ let pid = 0;
39
+ try {
40
+ pid = Number(readFileSync(join(dataDir, "daemon.pid"), "utf-8").trim());
41
+ }
42
+ catch {
43
+ return false;
44
+ }
45
+ if (!Number.isInteger(pid) || pid <= 1)
46
+ return false;
47
+ try {
48
+ process.kill(pid, 0);
49
+ return true;
50
+ }
51
+ catch (err) {
52
+ return err.code === "EPERM";
53
+ }
54
+ }
33
55
  /**
34
56
  * A PeerHost whose backend can change under it.
35
57
  *
@@ -49,12 +71,14 @@ export class SwitchablePeerHost {
49
71
  * grace period; reset the moment it answers again. */
50
72
  #daemonMissingSince = 0;
51
73
  #probe;
74
+ #pidAlive;
52
75
  constructor(initial, opts) {
53
76
  this.#inner = initial;
54
77
  this.#state = initial.kind === "daemon" ? "daemon" : "embedded";
55
78
  this.#opts = opts;
56
79
  this.#log = opts.log ?? new Logger({ prefix: "LAN" });
57
80
  this.#probe = opts.probe ?? ((dir) => probeDaemon(dir));
81
+ this.#pidAlive = opts.pidAlive ?? daemonPidAlive;
58
82
  this.#watch();
59
83
  }
60
84
  get kind() {
@@ -144,6 +168,8 @@ export class SwitchablePeerHost {
144
168
  }
145
169
  /** Consecutive missed probes; 0 the moment the daemon answers. */
146
170
  #missStreak = 0;
171
+ /** One "not answering but alive" line per stall, not one per tick. */
172
+ #stallLogged = false;
147
173
  /** A probe can take its full 2 s timeout against a 1.5 s watch interval.
148
174
  * Overlapping ticks would each act on the other's half-made decision. */
149
175
  #ticking = false;
@@ -161,6 +187,10 @@ export class SwitchablePeerHost {
161
187
  async #step() {
162
188
  const daemonUp = await this.#probe(this.#opts.dataDir);
163
189
  if (daemonUp) {
190
+ if (this.#stallLogged && this.#daemonMissingSince) {
191
+ this.#log.info(`the daemon answers again after ${((Date.now() - this.#daemonMissingSince) / 1000).toFixed(1)} s`);
192
+ }
193
+ this.#stallLogged = false;
164
194
  this.#daemonMissingSince = 0;
165
195
  this.#missStreak = 0;
166
196
  }
@@ -189,6 +219,19 @@ export class SwitchablePeerHost {
189
219
  const missedMs = Date.now() - this.#daemonMissingSince;
190
220
  if (this.#missStreak < DAEMON_MISS_STREAK || missedMs < DAEMON_MISS_WINDOW_MS)
191
221
  return;
222
+ // Not answering is not gone. On 2026-09-18 mac-dev's daemon (pid
223
+ // unchanged for 19 h) refused every connect for ~20 s at a time while
224
+ // it was busy, and each stretch emptied the friend list. While its
225
+ // process exists it is stalled, and it will answer again; only a
226
+ // dead pid is an absence. Say so once per stall, then keep serving.
227
+ if (this.#pidAlive(this.#opts.dataDir)) {
228
+ if (!this.#stallLogged) {
229
+ this.#stallLogged = true;
230
+ this.#log.info(`the daemon is not answering (${this.#missStreak} probes over ${(missedMs / 1000).toFixed(1)} s) ` +
231
+ `but its process is alive — treating it as busy, not gone`);
232
+ }
233
+ return;
234
+ }
192
235
  this.#log.info(`the daemon went away — waiting for it to come back (forced daemon backend; ` +
193
236
  `${this.#missStreak} probes missed over ${(missedMs / 1000).toFixed(1)} s)`);
194
237
  const old = this.#inner;
@@ -70,6 +70,9 @@ export declare class MessageStore {
70
70
  * resent; the flag is what the UI reads to stop over-claiming.
71
71
  */
72
72
  setStatus(peer: string, id: string, status?: "sending" | "queued" | "sent" | "failed", confirmed?: boolean): boolean;
73
+ /** Record how an outgoing text travelled: "online" over a live session,
74
+ * "offline" posted to the express relay for the peer to collect. */
75
+ setVia(peer: string, id: string, via: "online" | "offline"): boolean;
73
76
  /** Has this peer ever sent us anything? Used as proof-of-friendship for
74
77
  * records that predate the SDK's acceptedAt bookkeeping — a message can
75
78
  * only arrive over an established session. */
@@ -86,6 +86,16 @@ export class MessageStore {
86
86
  this.scheduleSave();
87
87
  return true;
88
88
  }
89
+ /** Record how an outgoing text travelled: "online" over a live session,
90
+ * "offline" posted to the express relay for the peer to collect. */
91
+ setVia(peer, id, via) {
92
+ const msg = this.byPeer.get(peer)?.find((m) => m.id === id);
93
+ if (!msg || msg.file)
94
+ return false;
95
+ msg.via = via;
96
+ this.scheduleSave();
97
+ return true;
98
+ }
89
99
  /** Has this peer ever sent us anything? Used as proof-of-friendship for
90
100
  * records that predate the SDK's acceptedAt bookkeeping — a message can
91
101
  * only arrive over an established session. */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@decentnetwork/beagle",
3
- "version": "0.1.103",
3
+ "version": "0.1.104",
4
4
  "description": "Beagle — P2P chat, file transfer and calls for regular users, on the Decent Network. No admin privilege required.",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
@@ -35,7 +35,7 @@
35
35
  "yargs": "^17.7.2"
36
36
  },
37
37
  "devDependencies": {
38
- "@decentnetwork/beagle-ui": "^0.2.18",
38
+ "@decentnetwork/beagle-ui": "^0.2.19",
39
39
  "@types/js-yaml": "^4.0.9",
40
40
  "@types/node": "^20.11.0",
41
41
  "@types/yargs": "^17.0.32",