@xmoxmo/bncr 0.2.5 → 0.2.7

package/src/core/connection-reachability.ts

@@ -1,13 +1,23 @@
 import type { BncrConnection, OutboxEntry } from './types.ts';
 
+function finiteNumberOr(value: unknown, fallback: number): number {
+  const n = Number(value);
+  return Number.isFinite(n) ? n : fallback;
+}
+
 export function hasRecentInboundReachability(args: {
   now: number;
   windowMs: number;
   lastInboundAt: number;
   lastActivityAt: number;
 }) {
-  const lastReachableAt = Math.max(args.lastInboundAt, args.lastActivityAt);
-  return lastReachableAt > 0 && args.now - lastReachableAt <= args.windowMs;
+  const nowMs = finiteNumberOr(args.now, 0);
+  const windowMs = finiteNumberOr(args.windowMs, 0);
+  const lastReachableAt = Math.max(
+    finiteNumberOr(args.lastInboundAt, 0),
+    finiteNumberOr(args.lastActivityAt, 0),
+  );
+  return nowMs > 0 && windowMs > 0 && lastReachableAt > 0 && nowMs - lastReachableAt <= windowMs;
 }
 
 export function resolveRecentInboundConnIds(args: {
@@ -20,10 +30,16 @@ export function resolveRecentInboundConnIds(args: {
   const connIds = new Set<string>();
   if (!args.recentInboundReachable) return connIds;
 
+  const nowMs = finiteNumberOr(args.now, 0);
+  const connectTtlMs = finiteNumberOr(args.connectTtlMs, 0);
+  if (!nowMs || !connectTtlMs) return connIds;
+
   for (const c of args.connections) {
     if (c.accountId !== args.accountId) continue;
     if (!c.connId) continue;
-    if (args.now - c.lastSeenAt > args.connectTtlMs * 2) continue;
+    const lastSeenAt = finiteNumberOr(c.lastSeenAt, 0);
+    if (!lastSeenAt) continue;
+    if (nowMs - lastSeenAt > connectTtlMs * 2) continue;
     connIds.add(c.connId);
   }
 
@@ -60,11 +76,16 @@ export function hasAlternativeLiveConnection(args: {
 }) {
   const currentConn = String(args.currentConnId || '').trim();
   const currentClient = String(args.currentClientId || '').trim() || undefined;
+  const nowMs = finiteNumberOr(args.now, 0);
+  const connectTtlMs = finiteNumberOr(args.connectTtlMs, 0);
+  if (!nowMs || !connectTtlMs) return false;
 
   for (const conn of args.connections) {
     if (conn.accountId !== args.accountId) continue;
     if (!conn.connId) continue;
-    if (args.now - conn.lastSeenAt > args.connectTtlMs) continue;
+    const lastSeenAt = finiteNumberOr(conn.lastSeenAt, 0);
+    if (!lastSeenAt) continue;
+    if (nowMs - lastSeenAt > connectTtlMs) continue;
     const sameConn = !!currentConn && conn.connId === currentConn;
     const sameClient = !currentConn && !!currentClient && conn.clientId === currentClient;
     if (sameConn || sameClient) continue;
@@ -93,27 +114,33 @@ export function getRevalidatedAttemptReason(args: {
   const targetConnId = String(args.connId || '').trim();
   if (!targetConnId) return null;
 
-  const lastAttemptAt = Number(args.entry.lastAttemptAt || 0);
+  const nowMs = finiteNumberOr(args.now, 0);
+  const connectTtlMs = finiteNumberOr(args.connectTtlMs, 0);
+  if (!nowMs || !connectTtlMs) return null;
+
+  const lastAttemptAt = finiteNumberOr(args.entry.lastAttemptAt, 0);
   for (const rawConn of args.connections) {
     const conn = rawConn as ReachableConnection;
     if (conn.accountId !== args.accountId) continue;
     if (conn.connId !== targetConnId) continue;
-    if (args.now - conn.lastSeenAt > args.connectTtlMs) continue;
+    const lastSeenAt = finiteNumberOr(conn.lastSeenAt, 0);
+    if (!lastSeenAt) continue;
+    if (nowMs - lastSeenAt > connectTtlMs) continue;
     if (conn.inboundOnly === true) continue;
 
-    const preferredForOutboundUntil = Number(conn.preferredForOutboundUntil || 0);
-    const outboundReadyUntil = Number(conn.outboundReadyUntil || 0);
-    const lastAckOkAt = Number(conn.lastAckOkAt || 0);
-    const lastPushTimeoutAt = Number(conn.lastPushTimeoutAt || 0);
+    const preferredForOutboundUntil = finiteNumberOr(conn.preferredForOutboundUntil, 0);
+    const outboundReadyUntil = finiteNumberOr(conn.outboundReadyUntil, 0);
+    const lastAckOkAt = finiteNumberOr(conn.lastAckOkAt, 0);
+    const lastPushTimeoutAt = finiteNumberOr(conn.lastPushTimeoutAt, 0);
 
-    const revalidatedByPreferred = preferredForOutboundUntil > args.now;
-    const revalidatedByReady = outboundReadyUntil > args.now;
+    const revalidatedByPreferred = preferredForOutboundUntil > nowMs;
+    const revalidatedByReady = outboundReadyUntil > nowMs;
     const revalidatedByAck = lastAckOkAt > 0 && lastAckOkAt > lastAttemptAt;
     const revalidatedByFreshReachability =
       args.recentInboundReachable &&
       lastPushTimeoutAt > 0 &&
       lastPushTimeoutAt <= lastAttemptAt &&
-      conn.lastSeenAt > lastPushTimeoutAt;
+      lastSeenAt > lastPushTimeoutAt;
 
     if (!revalidatedByPreferred && !revalidatedByReady && !revalidatedByAck && !revalidatedByFreshReachability) {
       return null;
@@ -132,7 +159,7 @@ export function getRevalidatedAttemptReason(args: {
       lastPushTimeoutAt: lastPushTimeoutAt || null,
       outboundReadyUntil: outboundReadyUntil || null,
       preferredForOutboundUntil: preferredForOutboundUntil || null,
-      lastSeenAt: conn.lastSeenAt,
+      lastSeenAt,
       recentInboundReachable: args.recentInboundReachable,
     };
   }

package/src/core/diagnostics.ts

@@ -1,6 +1,11 @@
 import { buildBncrPermissionSummary } from './permissions.ts';
 import { probeBncrAccount } from './probe.ts';
 
+function finiteNumberOr(value: unknown, fallback: number): number {
+  const n = Number(value);
+  return Number.isFinite(n) ? n : fallback;
+}
+
 type DiagnosticsPayloadArgs = {
   cfg: any;
   channelId: string;
@@ -21,8 +26,8 @@ export function buildDiagnosticsPayload(args: DiagnosticsPayloadArgs) {
   const probe = probeBncrAccount({
     accountId: args.accountId,
     connected: Boolean(args.runtime?.connected),
-    pending: Number(args.runtime?.meta?.pending ?? 0),
-    deadLetter: Number(args.runtime?.meta?.deadLetter ?? 0),
+    pending: finiteNumberOr(args.runtime?.meta?.pending, 0),
+    deadLetter: finiteNumberOr(args.runtime?.meta?.deadLetter, 0),
     activeConnections: args.activeConnections,
     invalidOutboxSessionKeys: args.invalidOutboxSessionKeys,
     legacyAccountResidue: args.legacyAccountResidue,

package/src/core/downlink-health.ts

@@ -1,5 +1,10 @@
 import type { OutboxEntry } from './types.ts';
 
+function finiteNumberOr(value: unknown, fallback: number): number {
+  const n = Number(value);
+  return Number.isFinite(n) ? n : fallback;
+}
+
 type DownlinkHealthInput = {
   accountId: string;
   now: number;
@@ -17,13 +22,13 @@ export function buildDownlinkHealth(input: DownlinkHealthInput) {
   const pending = Array.from(input.outboxEntries).filter((v) => v.accountId === input.accountId);
   const pendingCount = pending.length;
   const oldestPendingCreatedAt = pending.length
-    ? Math.min(...pending.map((entry) => Number(entry.createdAt || input.now)))
+    ? Math.min(...pending.map((entry) => finiteNumberOr(entry.createdAt, input.now)))
     : null;
   const oldestPendingAgeMs = oldestPendingCreatedAt
     ? Math.max(0, input.now - oldestPendingCreatedAt)
     : 0;
   const lastSignalAt =
-    Math.max(Number(input.lastInboundAt || 0), Number(input.lastActivityAt || 0)) || null;
+    Math.max(finiteNumberOr(input.lastInboundAt, 0), finiteNumberOr(input.lastActivityAt, 0)) || null;
   const inboundHealthy = !!lastSignalAt && input.now - lastSignalAt <= 5 * 60 * 1000;
   const ackRecentlyHealthy =
     !!input.lastAckOkAt && input.now - input.lastAckOkAt <= 5 * 60 * 1000;

package/src/core/outbox-entry-builders.ts

@@ -1,3 +1,4 @@
+import { normalizeOutboundReplyToId } from '../messaging/outbound/reply-target-policy.ts';
 import type { BncrRoute, OutboxEntry } from './types.ts';
 
 export function buildFileTransferOutboxEntry(args: {
@@ -34,7 +35,7 @@ export function buildFileTransferOutboxEntry(args: {
         asVoice: args.asVoice === true,
         audioAsVoice: args.audioAsVoice === true,
         finalEvent: args.pushEvent,
-        replyToId: args.replyToId,
+        replyToId: normalizeOutboundReplyToId({ kind: args.kind, replyToId: args.replyToId }) || undefined,
         messageKind: args.kind,
       },
     },
@@ -63,7 +64,7 @@ export function buildTextOutboxEntry(args: {
     messageId,
     idempotencyKey: messageId,
     sessionKey: args.sessionKey,
-    replyToId: args.normalizeReplyToId(args.replyToId) || undefined,
+    replyToId: normalizeOutboundReplyToId({ kind: args.kind, replyToId: args.replyToId }) || undefined,
     message: {
       platform: args.route.platform,
       groupId: args.route.groupId,

package/src/core/policy.ts

@@ -25,3 +25,12 @@ export function resolveBncrChannelPolicy(channelCfg: any) {
     requireMention: asBoolean(channelCfg?.requireMention, false),
   };
 }
+
+export function resolveBncrConfigWarnings(channelCfg: any): string[] {
+  const policy = resolveBncrChannelPolicy(channelCfg || {});
+  const warnings: string[] = [];
+  if (policy.requireMention) {
+    warnings.push('requireMention configured but not enforced yet');
+  }
+  return warnings;
+}

package/src/core/register-trace.ts

@@ -1,5 +1,10 @@
 const DEFAULT_REGISTER_WARMUP_WINDOW_MS = 30_000;
 
+function finiteNumberOr(value: unknown, fallback: number): number {
+  const n = Number(value);
+  return Number.isFinite(n) ? n : fallback;
+}
+
 export type RegisterTraceEntry = {
   ts: number;
   bridgeId: string;
@@ -70,7 +75,7 @@ export function buildRegisterTraceSummary(args: {
 }): RegisterTraceSummary {
   const warmupWindowMs = Math.max(
     0,
-    Number(args.warmupWindowMs ?? DEFAULT_REGISTER_WARMUP_WINDOW_MS) || 0,
+    finiteNumberOr(args.warmupWindowMs, DEFAULT_REGISTER_WARMUP_WINDOW_MS),
   );
   const buckets: Record<string, number> = {};
   let warmupCount = 0;

package/src/core/status.ts

@@ -30,6 +30,11 @@ function now() {
   return Date.now();
 }
 
+function finiteNumberOr(value: unknown, fallback: number): number {
+  const n = Number(value);
+  return Number.isFinite(n) ? n : fallback;
+}
+
 function fmtAgo(ts?: number | null): string {
   if (!ts || !Number.isFinite(ts) || ts <= 0) return '-';
   const diff = Math.max(0, now() - ts);
@@ -151,8 +156,8 @@ export function buildAccountStatusSnapshot(input: {
   const rt = input.runtime || {};
   const meta = rt?.meta || {};
 
-  const pending = Number(rt?.pending ?? meta.pending ?? 0);
-  const deadLetter = Number(rt?.deadLetter ?? meta.deadLetter ?? 0);
+  const pending = finiteNumberOr(rt?.pending ?? meta.pending, 0);
+  const deadLetter = finiteNumberOr(rt?.deadLetter ?? meta.deadLetter, 0);
   const lastSessionKey = rt?.lastSessionKey ?? meta.lastSessionKey ?? null;
   const lastSessionScope = rt?.lastSessionScope ?? meta.lastSessionScope ?? null;
   const lastSessionAt = rt?.lastSessionAt ?? meta.lastSessionAt ?? null;

package/src/core/targets.ts

@@ -51,8 +51,17 @@ function parseRouteFromStandardDisplayScope(scope: string): BncrRoute | null {
   return null;
 }
 
-export function parseRouteFromDisplayScope(scope: string): BncrRoute | null {
+function normalizeDisplayScopePrefix(scope: string): string {
   const raw = asString(scope).trim();
+  if (!raw) return '';
+  if (raw.startsWith('Bncr:')) return raw;
+  if (/^bncr[:-]/i.test(raw)) return raw;
+  if (!parseRouteFromStandardDisplayScope(raw)) return raw;
+  return `Bncr:${raw}`;
+}
+
+export function parseRouteFromDisplayScope(scope: string): BncrRoute | null {
+  const raw = normalizeDisplayScopePrefix(scope);
   if (!raw) return null;
 
   const payload = raw.match(/^Bncr:(.+)$/)?.[1];

package/src/core/types.ts

@@ -52,6 +52,7 @@ export type OutboxEntry = {
   routeAttemptConnIds?: string[];
   routeAttemptRound?: number;
   fastReroutePending?: boolean;
+  awaitingRetryPush?: boolean;
 };
 
 export type BncrDiagnosticsSummary = {