@xmoxmo/bncr 0.2.2 → 0.2.4

package/src/core/status.ts

@@ -75,20 +75,12 @@ export function buildIntegratedDiagnostics(input: RuntimeStatusInput): BncrDiagn
 export function buildStatusHeadlineFromRuntime(input: RuntimeStatusInput): string {
   const diag = buildIntegratedDiagnostics(input);
   const h = diag.health;
-  const r = diag.regression;
-
   const parts = [
-    r.ok ? 'diag:ok' : 'diag:warn',
+    input.connected ? 'linked' : 'status',
     `p:${h.pending}`,
     `d:${h.deadLetter}`,
     `c:${h.activeConnections}`,
   ];
-
-  if (!r.ok) {
-    if (r.invalidOutboxSessionKeys > 0) parts.push(`invalid:${r.invalidOutboxSessionKeys}`);
-    if (r.legacyAccountResidue > 0) parts.push(`legacy:${r.legacyAccountResidue}`);
-  }
-
   return parts.join(' ');
 }
 
@@ -128,6 +120,7 @@ export function buildStatusMetaFromRuntime(input: RuntimeStatusInput) {
 }
 
 export function buildAccountRuntimeSnapshot(input: RuntimeStatusInput) {
+  const meta = buildStatusMetaFromRuntime(input);
   return {
     accountId: input.accountId,
     running: input.running ?? true,
@@ -138,7 +131,14 @@ export function buildAccountRuntimeSnapshot(input: RuntimeStatusInput) {
     lastOutboundAt: input.lastOutboundAt || null,
     mode: input.connected ? 'linked' : 'configured',
     lastError: input.lastError ?? null,
-    meta: buildStatusMetaFromRuntime(input),
+    pending: input.pending,
+    deadLetter: input.deadLetter,
+    lastSessionKey: input.lastSession?.sessionKey || null,
+    lastSessionScope: input.lastSession?.scope || null,
+    lastSessionAt: input.lastSession?.updatedAt || null,
+    lastActivityAt: input.lastActivityAt || null,
+    diagnostics: meta.diagnostics,
+    meta,
   };
 }
 

package/src/core/types.ts

@@ -26,7 +26,21 @@ export type OutboxEntry = {
   accountId: string;
   sessionKey: string;
   route: BncrRoute;
-  payload: Record<string, unknown>;
+  payload: Record<string, unknown> & {
+    _meta?: {
+      kind?: 'message' | 'file-transfer';
+      retryCount?: number;
+      nextAttemptAt?: number;
+      mediaUrl?: string;
+      mediaLocalRoots?: string[];
+      text?: string;
+      asVoice?: boolean;
+      audioAsVoice?: boolean;
+      replyToId?: string;
+      finalEvent?: string;
+      [key: string]: unknown;
+    };
+  };
   createdAt: number;
   retryCount: number;
   nextAttemptAt: number;
@@ -35,6 +49,9 @@ export type OutboxEntry = {
   lastPushAt?: number;
   lastPushConnId?: string;
   lastPushClientId?: string;
+  routeAttemptConnIds?: string[];
+  routeAttemptRound?: number;
+  fastReroutePending?: boolean;
 };
 
 export type BncrDiagnosticsSummary = {

package/src/messaging/outbound/build-send-action.ts

@@ -0,0 +1,115 @@
+import { randomUUID } from 'node:crypto';
+
+type MinimalBncrSendInput = {
+  channel?: string;
+  action?: string;
+  idempotencyKey?: string;
+  accountId?: string;
+  to?: string;
+  message?: string;
+  caption?: string;
+  path?: string;
+  media?: string;
+  filePath?: string;
+  mediaUrl?: string;
+  asVoice?: boolean;
+  audioAsVoice?: boolean;
+  params?: Record<string, unknown>;
+};
+
+type BuiltBncrMessageAction = {
+  channel: string;
+  action: string;
+  idempotencyKey: string;
+  accountId?: string;
+  params: Record<string, unknown>;
+};
+
+function asString(v: unknown, fallback = ''): string {
+  if (typeof v === 'string') return v;
+  if (v == null) return fallback;
+  return String(v);
+}
+
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+function pickFirstString(...values: unknown[]): string | undefined {
+  for (const value of values) {
+    if (typeof value !== 'string') continue;
+    if (value.length === 0) return '';
+    return value;
+  }
+  return undefined;
+}
+
+function pickFirstBoolean(...values: unknown[]): boolean | undefined {
+  for (const value of values) {
+    if (typeof value === 'boolean') return value;
+  }
+  return undefined;
+}
+
+export function buildBncrMessageAction(input: MinimalBncrSendInput): BuiltBncrMessageAction {
+  const paramsObj = isPlainObject(input.params) ? input.params : {};
+
+  const channel = asString(input.channel || 'bncr').trim() || 'bncr';
+  const action = asString(input.action || 'send').trim() || 'send';
+  const idempotencyKey =
+    asString(input.idempotencyKey || '').trim() || `bncr-${randomUUID()}`;
+  const accountId =
+    asString(pickFirstString(paramsObj.accountId, input.accountId) || '').trim() || undefined;
+
+  const to = asString(pickFirstString(paramsObj.to, input.to) || '').trim();
+  if (!to) throw new Error('bncr send requires to');
+
+  const mediaPath = pickFirstString(
+    paramsObj.media,
+    paramsObj.path,
+    paramsObj.filePath,
+    paramsObj.mediaUrl,
+    input.media,
+    input.path,
+    input.filePath,
+    input.mediaUrl,
+  );
+
+  const message = pickFirstString(paramsObj.message, input.message) ?? '';
+  const explicitCaption = pickFirstString(paramsObj.caption, input.caption) ?? '';
+  const asVoice = pickFirstBoolean(paramsObj.asVoice, input.asVoice);
+  const audioAsVoice = pickFirstBoolean(paramsObj.audioAsVoice, input.audioAsVoice);
+
+  if ((asVoice === true || audioAsVoice === true) && !mediaPath) {
+    throw new Error('bncr voice send requires media path');
+  }
+
+  const normalizedParams: Record<string, unknown> = {
+    ...paramsObj,
+    to,
+  };
+
+  if (mediaPath) {
+    normalizedParams.path = mediaPath;
+    const finalCaption = explicitCaption || message;
+    if (finalCaption) normalizedParams.caption = finalCaption;
+    delete normalizedParams.message;
+  } else {
+    const finalMessage = message || explicitCaption;
+    if (!finalMessage.trim()) throw new Error('bncr send requires message or media');
+    normalizedParams.message = finalMessage;
+    delete normalizedParams.caption;
+  }
+
+  if (asVoice === true) normalizedParams.asVoice = true;
+  if (audioAsVoice === true) normalizedParams.audioAsVoice = true;
+  if (accountId) normalizedParams.accountId = accountId;
+
+  return {
+    channel,
+    action,
+    idempotencyKey,
+    ...(accountId ? { accountId } : {}),
+    params: normalizedParams,
+  };
+}

package/src/messaging/outbound/send.ts

@@ -51,6 +51,7 @@ export async function sendBncrMedia(params: {
   to: string;
   text?: string;
   mediaUrl?: string;
+  mediaUrls?: string[];
   asVoice?: boolean;
   audioAsVoice?: boolean;
   replyToId?: string;
@@ -86,6 +87,7 @@ export async function sendBncrMedia(params: {
     payload: {
       text: params.text || '',
       mediaUrl: params.mediaUrl || '',
+      mediaUrls: params.mediaUrls?.length ? params.mediaUrls : undefined,
       asVoice: params.asVoice === true ? true : undefined,
       audioAsVoice: params.audioAsVoice === true ? true : undefined,
       replyToId: params.replyToId,