@circuitwall/jarela 2.3.0 → 2.5.0

package/.next/standalone/.next/server/chunks/{2350.js → 3272.js}

@@ -1,9 +1,9 @@
 "use strict";
-exports.id = 2350;
-exports.ids = [2350];
+exports.id = 3272;
+exports.ids = [3272];
 exports.modules = {
 
-/***/ 32350:
+/***/ 63272:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 
@@ -144,12 +144,16 @@ function bumpRouteLastSeenTs(bridgeId, remoteJid, ts) {
     if (!Number.isFinite(ts) || ts <= 0) return;
     (0,db/* getDb */.L)().prepare("UPDATE bridge_routes SET last_seen_ts=? WHERE bridge_id=? AND remote_jid=? AND (last_seen_ts IS NULL OR last_seen_ts < ?)").run(ts, bridgeId, remoteJid, ts);
 }
-// Snapshot the highest watermark across every route on a bridge. The
-// adapter uses this on reconnect to short-circuit very-old appends before
-// it has loaded individual route rows.
-function getMaxRouteLastSeenTs(bridgeId) {
-    const row = (0,db/* getDb */.L)().prepare("SELECT MAX(last_seen_ts) AS m FROM bridge_routes WHERE bridge_id=?").get(bridgeId);
-    return row?.m ?? 0;
+// Per-chat watermarks for every explicitly routed chat on a bridge, loaded
+// once per upsert batch. Each chat is gated only by its own progress: a
+// bridge-wide maximum would drop chat B's offline backlog as soon as a newer
+// message from chat A had been delivered.
+function getRouteLastSeenTsMap(bridgeId) {
+    const rows = (0,db/* getDb */.L)().prepare("SELECT remote_jid, last_seen_ts FROM bridge_routes WHERE bridge_id=? AND last_seen_ts IS NOT NULL").all(bridgeId);
+    return new Map(rows.map((r)=>[
+            r.remote_jid,
+            r.last_seen_ts
+        ]));
 }
 // ---------------------------------------------------------------------------
 // Ignore-list CRUD (per-bridge chat blocklist)
@@ -302,6 +306,7 @@ var automation_activity = __webpack_require__(21783);
             role: msg.role,
             sender_id: senderJid,
             sender_name: senderName,
+            chat_link: adapter.chatLink?.(msg.remote_jid) ?? null,
             text: msg.text,
             silent,
             event: msg.event
@@ -615,6 +620,26 @@ function safeBridgeId(id) {
     return baseDir();
 }
 
+;// ./lib/bridges/whatsapp-link.ts
+/**
+ * WhatsApp click-to-chat link for a Baileys JID.
+ *
+ * WhatsApp has no permalink to a group or to a single message, so only 1:1
+ * chats with a phone-number JID get a link: `https://wa.me/<digits>` opens
+ * that chat in the WhatsApp app or WhatsApp Web. `@lid` ids hide the phone
+ * number, and groups, channels and broadcasts have no public chat URL.
+ */ // E.164 numbers are at most 15 digits; the shortest real ones are 7–8.
+const E164_DIGITS = /^[1-9]\d{6,14}$/;
+function whatsappChatLink(jid) {
+    if (!jid) return null;
+    const at = jid.lastIndexOf("@");
+    if (at < 0) return null;
+    const host = jid.slice(at + 1);
+    if (host !== "s.whatsapp.net" && host !== "c.us") return null;
+    const digits = jid.slice(0, at).split(":")[0];
+    return E164_DIGITS.test(digits) ? `https://wa.me/${digits}` : null;
+}
+
 // EXTERNAL MODULE: ./lib/utils/error.ts
 var error = __webpack_require__(4379);
 ;// ./lib/bridges/whatsapp.ts
@@ -647,6 +672,7 @@ var error = __webpack_require__(4379);
 
 
 
+
 class WhatsAppBridgeAdapter {
     static{
         this.SENT_IDS_MAX = 500;
@@ -870,10 +896,10 @@ class WhatsAppBridgeAdapter {
             // adapter should re-deliver to agents) and the legacy
             // `replace`/`update` events that arrive via messages.update.
             if (payload.type !== "notify" && payload.type !== "append") return;
-            // On a fresh adapter boot the watermark is whatever the last run
-            // persisted. Read it once per batch (cheap SQLite call) so we can
-            // hard-reject very old appends without doing any per-message work.
-            const watermark = payload.type === "append" ? getMaxRouteLastSeenTs(this.bridge_id) : 0;
+            // On a fresh adapter boot the watermarks are whatever the last run
+            // persisted. Read them once per batch (one cheap SQLite call) so old
+            // appends are rejected without per-message queries.
+            const watermarks = payload.type === "append" ? getRouteLastSeenTsMap(this.bridge_id) : null;
             for (const raw of payload.messages ?? []){
                 const m = raw;
                 if (!m.key?.remoteJid) continue;
@@ -900,18 +926,20 @@ class WhatsAppBridgeAdapter {
                 // "real" the moment we see any message from it, even one whose
                 // body we end up unable to represent (e.g. reactions, polls).
                 const ts = typeof m.messageTimestamp === "number" ? m.messageTimestamp * 1000 : (m.messageTimestamp?.low ?? 0) * 1000 || Date.now();
-                // Watermark gate: on `append` batches, skip anything strictly
-                // older than the highest per-route watermark we've persisted. This
-                // prevents the server's reconnect replay from re-delivering
-                // messages we already routed in a previous process lifetime.
-                // `notify` events skip this check — they're live and may legitimately
-                // arrive in any order relative to the cross-route max.
-                if (payload.type === "append" && watermark > 0 && ts > 0 && ts <= watermark) {
+                // Watermark gate: on `append` batches, skip anything at or below
+                // this chat's own persisted watermark. This prevents the server's
+                // reconnect replay from re-delivering messages we already routed in
+                // a previous process lifetime. `notify` events skip this check —
+                // they're live and may legitimately arrive out of order.
+                const watermark = watermarks?.get(remote_jid) ?? 0;
+                if (watermark > 0 && ts > 0 && ts <= watermark) {
                     continue;
                 }
-                // In groups, pushName is typically the participant's display name,
-                // not the group subject. Avoid poisoning the group chat label.
-                this.observeChat(remote_jid, is_group ? null : m.pushName ?? null, ts);
+                // pushName names the *sender*: in groups that's a participant, and on
+                // fromMe messages it's the user's own name. Only a counterpart's
+                // pushName in a 1:1 chat is a valid label for the chat itself.
+                const chatPushName = is_group || m.key.fromMe ? null : m.pushName ?? null;
+                this.observeChat(remote_jid, chatPushName, ts);
                 // Unwrap protocol envelopes (view-once, ephemeral, etc.) so we can
                 // see the underlying payload uniformly, then turn it into a text
                 // body + ContentPart attachments the agent can consume.
@@ -929,7 +957,7 @@ class WhatsAppBridgeAdapter {
                 // chats it's undefined — the sender == remote_jid. Normalize so the
                 // dispatcher gets a routable user JID, not the legacy @c.us form.
                 const participant_jid = is_group && m.key.participant ? normalizeUserJid(m.key.participant) : null;
-                const chat_name = this.chats.get(remote_jid)?.name ?? m.pushName ?? null;
+                const chat_name = this.chats.get(remote_jid)?.name ?? chatPushName;
                 const sender = resolveWhatsAppSender({
                     fromMe: m.key.fromMe === true,
                     isGroup: is_group,
@@ -987,7 +1015,11 @@ class WhatsAppBridgeAdapter {
                 const ct = raw;
                 const chatJid = pickContactChatJid(ct);
                 if (!chatJid) continue;
-                const name = ct.name ?? ct.verifiedName ?? ct.notify ?? null;
+                const name = [
+                    ct.name,
+                    ct.verifiedName,
+                    ct.notify
+                ].find((n)=>n?.trim()) ?? null;
                 this.observeChat(chatJid, name, null);
             }
         });
@@ -1012,7 +1044,11 @@ class WhatsAppBridgeAdapter {
             for (const ct of list){
                 const chatJid = pickContactChatJid(ct);
                 if (!chatJid) continue;
-                this.observeChat(chatJid, ct.name ?? ct.verifiedName ?? ct.notify ?? null, null);
+                this.observeChat(chatJid, [
+                    ct.name,
+                    ct.verifiedName,
+                    ct.notify
+                ].find((n)=>n?.trim()) ?? null, null);
             }
         });
         // Group profile/settings updates (subject/description/permissions/etc.).
@@ -1121,6 +1157,9 @@ class WhatsAppBridgeAdapter {
             error: null
         });
     }
+    chatLink(remote_jid) {
+        return whatsappChatLink(remote_jid);
+    }
     async sendText(remote_jid, text) {
         // Hard guard: refuse to send to any chat whose route is in silent_mode.
         // The dispatcher already short-circuits before calling sendText, but
@@ -1377,7 +1416,10 @@ class WhatsAppBridgeAdapter {
                 });
                 attachments.push(ref);
                 const sizeKb = Math.max(1, Math.round(buf.length / 1024));
-                text = (text ? text + "\n" : "") + `[Attached ${label}: ${filename} (${mime}, ${sizeKb} KB); retained as a Jarela file reference.]`;
+                // Sender-supplied document names can carry newlines or brackets;
+                // describe the attachment by the store's sanitized name.
+                const shownName = oneLine("filename" in ref && ref.filename || filename);
+                text = (text ? text + "\n" : "") + `[Attached ${label}: ${shownName} (${mime}, ${sizeKb} KB); retained as a Jarela file reference.]`;
             } catch (err) {
                 const m = (0,error/* errorMessage */.g)(err);
                 console.warn(`[bridge ${this.bridge_id}] failed to spill ${label} from ${remote_jid}: ${m}`);
@@ -1432,8 +1474,8 @@ class WhatsAppBridgeAdapter {
                 `lat=${degreesLatitude ?? "?"}`,
                 `lng=${degreesLongitude ?? "?"}`
             ];
-            if (name) parts.push(`name="${name}"`);
-            if (address) parts.push(`address="${address}"`);
+            if (name) parts.push(`name=${JSON.stringify(oneLine(name))}`);
+            if (address) parts.push(`address=${JSON.stringify(oneLine(address))}`);
             text = (text ? text + "\n" : "") + `[location: ${parts.join(" ")}]`;
         }
         if (inner.liveLocationMessage) {
@@ -1441,12 +1483,12 @@ class WhatsAppBridgeAdapter {
             text = (text ? text + "\n" : "") + `[live-location: lat=${degreesLatitude ?? "?"} lng=${degreesLongitude ?? "?"}]`;
         }
         if (inner.contactMessage) {
-            const name = inner.contactMessage.displayName ?? "unknown";
-            const vcard = inner.contactMessage.vcard ?? "";
+            const name = oneLine(inner.contactMessage.displayName ?? "") || "unknown";
+            const vcard = stripVcardBinary(inner.contactMessage.vcard ?? "");
             text = (text ? text + "\n" : "") + `[contact: ${name}]\n${vcard}`;
         }
         if (inner.contactsArrayMessage) {
-            const names = (inner.contactsArrayMessage.contacts ?? []).map((c)=>c?.displayName ?? "unknown").join(", ");
+            const names = (inner.contactsArrayMessage.contacts ?? []).map((c)=>oneLine(c?.displayName ?? "") || "unknown").join(", ");
             text = (text ? text + "\n" : "") + `[contacts: ${names}]`;
         }
         return {
@@ -1458,8 +1500,9 @@ class WhatsAppBridgeAdapter {
         if (!remote_jid) return;
         const existing = this.chats.get(remote_jid);
         // Prefer the most recently-observed name (group subjects rename; users
-        // change push names). Don't overwrite a known name with null.
-        const nextName = name ?? existing?.name ?? null;
+        // change push names). Don't overwrite a known name with a missing or
+        // blank one.
+        const nextName = name?.trim() || existing?.name || null;
         const nextTs = ts && (!existing?.last_message_at || ts > existing.last_message_at) ? ts : existing?.last_message_at ?? null;
         this.chats.set(remote_jid, {
             remote_jid,
@@ -1476,6 +1519,27 @@ class WhatsAppBridgeAdapter {
         return this.currentStatus;
     }
 }
+function oneLine(value) {
+    return value.replace(/[\s\u0085\u2028\u2029]+/g, " ").trim();
+}
+/**
+ * Phones embed contact photos and logos as base64 vCard properties, often
+ * tens of KB of noise in the agent's context. Drop those properties,
+ * including their folded continuation lines (RFC 6350 §3.2), and keep the
+ * readable fields.
+ */ function stripVcardBinary(vcard) {
+    const out = [];
+    let skipping = false;
+    for (const line of vcard.split(/\r\n|\r|\n/)){
+        if (/^[ \t]/.test(line)) {
+            if (!skipping) out.push(line);
+            continue;
+        }
+        skipping = /^(?:[\w-]+\.)?(?:PHOTO|LOGO|SOUND|KEY)[;:]/i.test(line);
+        if (!skipping) out.push(line);
+    }
+    return out.join("\n").trim();
+}
 // Minimal pino-compatible silent logger. Baileys uses `logger.child()`
 // chaining internally, so we return ourselves for every child call.
 function makeSilentLogger() {
@@ -1589,6 +1653,9 @@ function sanitizeMediaType(raw, kind, fallback) {
     return primary;
 }
 function resolveWhatsAppSender(input) {
+    // Platforms send blank display names ("" or whitespace) for contacts that
+    // never set one; treat those as missing so the fallbacks still apply.
+    const named = (...names)=>names.find((n)=>!!n && n.trim().length > 0)?.trim();
     if (input.fromMe) {
         return {
             senderJid: input.selfJid ?? "me",
@@ -1599,12 +1666,12 @@ function resolveWhatsAppSender(input) {
         const senderJid = input.participantJid ?? input.remoteJid;
         return {
             senderJid,
-            senderName: input.participantName ?? input.pushName ?? senderJid
+            senderName: named(input.participantName, input.pushName) ?? senderJid
         };
     }
     return {
         senderJid: input.remoteJid,
-        senderName: input.pushName ?? input.chatName ?? input.remoteJid
+        senderName: named(input.pushName, input.chatName) ?? input.remoteJid
     };
 }
 /**
@@ -1887,4 +1954,4 @@ async function stopAllBridges() {
 
 };
 ;
-//# sourceMappingURL=2350.js.map
+//# sourceMappingURL=3272.js.map