@xmoxmo/bncr 0.5.5 → 0.5.7

package/src/core/outbox-file-transfer-prep.ts

@@ -1,26 +1,29 @@
 import type { BncrConnection, OutboxEntry } from './types.ts';
 
-export function prepareFileTransferRouteSelection(args: {
+type PushRouteSelectionArgs<C> = {
   entry: OutboxEntry;
   owner: BncrConnection | null;
   resolvePushConnIds: (accountId: string) => Iterable<string>;
   resolveRecentInboundConnIds: (accountId: string) => Iterable<string>;
   hasRecentInboundReachability: (accountId: string) => boolean;
   isRevalidatedAttemptedConn: (connId: string) => boolean;
-  selectOutboxFileTransferRouteCandidates: (args: {
+  selectRouteCandidates: (args: {
     routeCandidates: Iterable<string>;
     attemptedConnIds: string[];
     recentInboundConnIds: Iterable<string>;
     ownerConnId?: string;
     recentInboundReachable: boolean;
     isRevalidatedAttemptedConn: (connId: string) => boolean;
-  }) => { connIds: Iterable<string>; recentInboundReachable: boolean; routeReason: string };
-}) {
+  }) => C;
+};
+
+/** Shared route selection prep for both text and file push flows. */
+export function prepareRouteSelection<C>(args: PushRouteSelectionArgs<C>): C {
   const attemptedConnIds = Array.isArray(args.entry.routeAttemptConnIds)
     ? args.entry.routeAttemptConnIds.filter((v): v is string => typeof v === 'string' && !!v)
     : [];
 
-  return args.selectOutboxFileTransferRouteCandidates({
+  return args.selectRouteCandidates({
     routeCandidates: args.resolvePushConnIds(args.entry.accountId),
     attemptedConnIds,
     recentInboundConnIds: args.resolveRecentInboundConnIds(args.entry.accountId),

package/src/core/outbox-file-transfer-success.ts

@@ -1,3 +1,8 @@
+/*
+ * Intentionally separate from outbox-text-push-success.ts.
+ * File transfer success uses kind:'file-transfer' tag and different
+ * argument shapes (owner vs connId). Separate callers, separate files.
+ */
 import { buildPushBroadcastPayload, buildPushRouteSelectArgs } from './outbox-push-args.ts';
 import type { BncrConnection, OutboxEntry } from './types.ts';
 

package/src/core/outbox-queue.ts

@@ -50,13 +50,7 @@ export function collectDueOutboxEntries(args: {
       nextAttemptAt: args.now + args.backoffMs(nextAttempt),
     };
     updatedEntries.push(updatedEntry);
-    duePayloads.push({
-      ...updatedEntry.payload,
-      _meta: {
-        retryCount: updatedEntry.retryCount,
-        nextAttemptAt: updatedEntry.nextAttemptAt,
-      },
-    });
+    duePayloads.push(updatedEntry.payload);
 
     if (duePayloads.length >= args.maxBatch) break;
   }

package/src/core/outbox-summary.ts

@@ -1,23 +1,16 @@
 import type { OutboxEntry } from './types.ts';
 
-type OutboxSummaryMeta = {
-  kind?: string;
-  asVoice?: boolean;
-  audioAsVoice?: boolean;
-  type?: unknown;
-  mediaUrl?: unknown;
-  text?: unknown;
-};
-
 type OutboxSummaryMessage = {
   type?: unknown;
   msg?: unknown;
+  mediaUrl?: unknown;
+  audioAsVoice?: boolean;
+  asVoice?: boolean;
 };
 
 type OutboxSummaryPayload = {
   type?: unknown;
   message?: OutboxSummaryMessage;
-  _meta?: OutboxSummaryMeta;
 };
 
 function inferMediaTypeFromUrl(raw: string): 'image' | 'video' | 'audio' | 'file' {
@@ -47,27 +40,22 @@ function summarizeOutboxType(
 ) {
   const directType = asString(msg.type || '');
   if (directType) return directType;
-
-  const meta = payload?._meta || {};
-  if (meta.kind === 'file-transfer') {
-    if (meta.asVoice === true || meta.audioAsVoice === true) return 'voice';
-    const hintedType = asString(meta.type || '').trim();
-    if (hintedType) return hintedType;
-    return inferMediaTypeFromUrl(asString(meta.mediaUrl || ''));
+  // Infer type from mediaUrl when no direct type is set
+  const mediaUrl = asString(msg.mediaUrl || '');
+  if (mediaUrl) {
+    if (msg.audioAsVoice === true || msg.asVoice === true) return 'voice';
+    const inferred = inferMediaTypeFromUrl(mediaUrl);
+    if (inferred) return inferred;
   }
-
   return asString(payload?.type || 'unknown');
 }
 
-function summarizeOutboxText(
-  payload: OutboxSummaryPayload,
-  msg: OutboxSummaryMessage,
-  asString: (value: unknown) => string,
-) {
-  const text = asString(msg.msg || payload?._meta?.text || '').trim();
+function summarizeOutboxText(msg: OutboxSummaryMessage, asString: (value: unknown) => string) {
+  const text = asString(msg.msg || '').trim();
   if (text) return text;
-  const meta = payload?._meta || {};
-  if (meta.kind === 'file-transfer') return filenameFromUrl(asString(meta.mediaUrl || ''));
+  // Fall back to filename from mediaUrl when no caption is set
+  const mediaUrl = asString(msg.mediaUrl || '');
+  if (mediaUrl) return filenameFromUrl(mediaUrl);
   return '';
 }
 
@@ -80,7 +68,7 @@ export function summarizeOutboxEntry(args: {
   const payload = args.entry.payload as OutboxSummaryPayload;
   const msg = payload?.message || {};
   const type = summarizeOutboxType(payload, msg, args.asString);
-  const text = summarizeOutboxText(payload, msg, args.asString);
+  const text = summarizeOutboxText(msg, args.asString);
   const preview = args.summarizeTextPreview(text);
   return [type, args.formatDisplayScope(args.entry.route), preview].join('|');
 }

package/src/core/outbox-text-push-prep.ts

@@ -1,36 +1 @@
-import type { BncrConnection, OutboxEntry } from './types.ts';
-
-export function prepareTextPushRouteSelection(args: {
-  entry: OutboxEntry;
-  owner: BncrConnection | null;
-  resolvePushConnIds: (accountId: string) => Iterable<string>;
-  resolveRecentInboundConnIds: (accountId: string) => Iterable<string>;
-  hasRecentInboundReachability: (accountId: string) => boolean;
-  isRevalidatedAttemptedConn: (connId: string) => boolean;
-  selectOutboxRouteCandidates: (args: {
-    routeCandidates: Iterable<string>;
-    attemptedConnIds: string[];
-    recentInboundConnIds: Iterable<string>;
-    ownerConnId?: string;
-    recentInboundReachable: boolean;
-    isRevalidatedAttemptedConn: (connId: string) => boolean;
-  }) => {
-    connIds: Iterable<string>;
-    recentInboundReachable: boolean;
-    routeReason: string;
-    ownerConnId?: string;
-  };
-}) {
-  const attemptedConnIds = Array.isArray(args.entry.routeAttemptConnIds)
-    ? args.entry.routeAttemptConnIds.filter((v): v is string => typeof v === 'string' && !!v)
-    : [];
-
-  return args.selectOutboxRouteCandidates({
-    routeCandidates: args.resolvePushConnIds(args.entry.accountId),
-    attemptedConnIds,
-    recentInboundConnIds: args.resolveRecentInboundConnIds(args.entry.accountId),
-    ownerConnId: args.owner?.connId,
-    recentInboundReachable: args.hasRecentInboundReachability(args.entry.accountId),
-    isRevalidatedAttemptedConn: args.isRevalidatedAttemptedConn,
-  });
-}
+export { prepareRouteSelection as prepareTextPushRouteSelection } from './outbox-file-transfer-prep.ts';

package/src/core/permissions.ts

@@ -1,8 +1,4 @@
-function asString(v: unknown, fallback = ''): string {
-  if (typeof v === 'string') return v;
-  if (v == null) return fallback;
-  return String(v);
-}
+import { asString } from '../core/value-sanitize.ts';
 
 type BncrElevatedConfigRoot = {
   tools?: {
@@ -14,21 +10,18 @@ type BncrElevatedConfigRoot = {
     };
   };
 };
-
 export function getBncrElevatedConfig(rootCfg: BncrElevatedConfigRoot | null | undefined) {
   const elevated = rootCfg?.tools?.elevated || {};
   const allowFrom = elevated?.allowFrom || {};
   const bncrRules = Array.isArray(allowFrom?.bncr)
     ? allowFrom.bncr.map((x: unknown) => asString(x).trim()).filter(Boolean)
     : [];
-
   return {
     enabled: elevated?.enabled === true,
     bncrAllowed: bncrRules.length > 0,
     bncrRules,
   };
 }
-
 export function buildBncrPermissionSummary(rootCfg: BncrElevatedConfigRoot | null | undefined) {
   const elevated = getBncrElevatedConfig(rootCfg);
   return {
@@ -40,5 +33,4 @@ export function buildBncrPermissionSummary(rootCfg: BncrElevatedConfigRoot | nul
       : 'bncr elevated not explicitly allowed',
   };
 }
-
 export type BncrPermissionSummary = ReturnType<typeof buildBncrPermissionSummary>;

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

@@ -1,22 +1,12 @@
 import { normalizeAccountId } from './accounts.ts';
 import { normalizeStoredSessionKey, parseRouteLike } from './targets.ts';
 import type { OutboxEntry } from './types.ts';
+import { asString, finiteNumberOr } from './value-sanitize.ts';
 
 type PersistedOutboxEntryInput = Partial<OutboxEntry> & {
   payload?: Record<string, unknown>;
 };
 
-function asString(v: unknown, fallback = ''): string {
-  if (typeof v === 'string') return v;
-  if (v == null) return fallback;
-  return String(v);
-}
-
-function finiteNumberOr(value: unknown, fallback: number): number {
-  const n = Number(value);
-  return Number.isFinite(n) ? n : fallback;
-}
-
 function optionalFiniteNumber(value: unknown): number | undefined {
   if (value == null || value === '') return undefined;
   const n = Number(value);
@@ -43,6 +33,59 @@ export function normalizePersistedOutboxEntry(args: {
   payload.groupId = route.groupId;
   payload.userId = route.userId;
 
+  // Migrate old _meta format entries to the new message format.
+  // Old entries persisted before the _meta→message refactor carry media
+  // metadata in payload._meta.  New code reads from payload.message.
+  const oldMeta = payload._meta as Record<string, unknown> | undefined;
+  if (oldMeta && !payload.message) {
+    const oldKind = asString(oldMeta.kind);
+    if (oldKind === 'file-transfer') {
+      // Move replyToId from _meta to payload top level
+      const replyToId = asString(oldMeta.replyToId || '').trim() || undefined;
+      if (replyToId) payload.replyToId = replyToId;
+
+      // Build new message object from old _meta fields
+      const msg: Record<string, unknown> = {
+        type: (oldMeta.type as string) || 'file',
+        msg: oldMeta.text || '',
+        mediaUrl: oldMeta.mediaUrl,
+        mediaLocalRoots: oldMeta.mediaLocalRoots,
+        asVoice: oldMeta.asVoice === true,
+        audioAsVoice: oldMeta.audioAsVoice === true,
+        downloadMedia: oldMeta.downloadMedia === true,
+        kind: oldMeta.messageKind,
+        transferMode: 'media',
+        path: '',
+        base64: '',
+        fileName: '',
+      };
+      // Strip consumed _meta keys, pass through remaining as extra
+      const consumed = new Set([
+        'kind',
+        'mediaUrl',
+        'mediaLocalRoots',
+        'text',
+        'asVoice',
+        'audioAsVoice',
+        'replyToId',
+        'finalEvent',
+        'type',
+        'downloadMedia',
+        'messageKind',
+        'retryCount',
+        'nextAttemptAt',
+      ]);
+      for (const [key, value] of Object.entries(oldMeta)) {
+        if (!consumed.has(key)) {
+          msg[key] = value;
+        }
+      }
+      payload.message = msg;
+    }
+    // Remove old _meta after migration
+    delete payload._meta;
+  }
+
   return {
     ...entry,
     messageId: asString(entry.messageId).trim(),

package/src/core/policy.ts

@@ -1,8 +1,4 @@
-function asString(v: unknown, fallback = ''): string {
-  if (typeof v === 'string') return v;
-  if (v == null) return fallback;
-  return String(v);
-}
+import { asBoolean, asString } from './value-sanitize.ts';
 
 export type BncrChannelPolicyConfig = {
   enabled?: boolean;
@@ -21,12 +17,6 @@ function asList(v: unknown): string[] {
   return v.map((x) => asString(x).trim()).filter(Boolean);
 }
 
-function asBoolean(v: unknown, fallback = false): boolean {
-  if (typeof v === 'boolean') return v;
-  if (v == null) return fallback;
-  return String(v).trim().toLowerCase() === 'true';
-}
-
 function normalizeDmPolicy(value: unknown): BncrDmPolicy {
   const normalized = asString(value || 'open')
     .trim()

package/src/core/register-trace.ts

@@ -1,9 +1,6 @@
-const DEFAULT_REGISTER_WARMUP_WINDOW_MS = 30_000;
+import { finiteNumberOr } from './value-sanitize.ts';
 
-function finiteNumberOr(value: unknown, fallback: number): number {
-  const n = Number(value);
-  return Number.isFinite(n) ? n : fallback;
-}
+const DEFAULT_REGISTER_WARMUP_WINDOW_MS = 30_000;
 
 export type RegisterTraceEntry = {
   ts: number;

package/src/core/status-meta.ts

@@ -1,4 +1,5 @@
 import type { PendingAdmission } from './types.ts';
+import { finiteNumberOrNull, now } from './value-sanitize.ts';
 
 type RuntimeStatusMetaDisplayInput = {
   pendingAdmissions?: PendingAdmission[];
@@ -8,15 +9,6 @@ type RuntimeStatusMetaDisplayInput = {
   lastOutboundAt?: number | null;
 };
 
-function now() {
-  return Date.now();
-}
-
-function finiteNumberOrNull(value: unknown): number | null {
-  const n = Number(value);
-  return Number.isFinite(n) ? n : null;
-}
-
 function formatPendingAdmissionScope(route: unknown): string | null {
   if (!route || typeof route !== 'object') return null;
   const record = route as Record<string, unknown>;

package/src/core/status.ts

@@ -2,6 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { buildRuntimeStatusMetaDisplay } from './status-meta.ts';
 import type { BncrDiagnosticsSummary, BncrRuntimeLastSession, PendingAdmission } from './types.ts';
+import { finiteNumberOr, nonNegativeFiniteNumberOr, now } from './value-sanitize.ts';
 
 type RuntimeStatusInput = {
   accountId: string;
@@ -27,19 +28,6 @@ type RuntimeStatusInput = {
   channelRoot?: string;
 };
 
-function now() {
-  return Date.now();
-}
-
-function finiteNumberOr(value: unknown, fallback: number): number {
-  const n = Number(value);
-  return Number.isFinite(n) ? n : fallback;
-}
-
-function nonNegativeFiniteNumberOr(value: unknown, fallback: number): number {
-  return Math.max(0, finiteNumberOr(value, fallback));
-}
-
 export function buildIntegratedDiagnostics(input: RuntimeStatusInput): BncrDiagnosticsSummary {
   const root = input.channelRoot || path.join(process.cwd(), 'plugins', 'bncr');
   const pluginIndexExists = fs.existsSync(path.join(root, 'index.ts'));
@@ -230,11 +218,3 @@ export function buildAccountStatusSnapshot(input: {
     diagnostics,
   };
 }
-
-export function buildChannelSummaryFromRuntime(input: RuntimeStatusInput) {
-  const headline = buildStatusHeadlineFromRuntime(input);
-  return {
-    linked: input.connected,
-    self: { e164: headline },
-  };
-}