@chativa/connector-directline 0.7.2 → 0.8.0

package/dist/index.js

@@ -1,12 +1,12 @@
 import { DirectLine as v, ConnectionStatus as l } from "botframework-directlinejs";
-const f = /* @__PURE__ */ Symbol("typing"), k = "application/vnd.microsoft.card.hero", b = "application/vnd.microsoft.card.thumbnail", m = "application/vnd.microsoft.card.adaptive", S = "application/vnd.microsoft.card.signin", H = "application/vnd.microsoft.card.oauth", A = "application/vnd.microsoft.card.receipt", D = "application/vnd.microsoft.card.audio", E = "application/vnd.microsoft.card.video", $ = "application/vnd.microsoft.card.animation", T = "application/vnd.microsoft.card.flex";
-function y(i, t) {
+const f = /* @__PURE__ */ Symbol("typing"), k = "application/vnd.microsoft.card.hero", b = "application/vnd.microsoft.card.thumbnail", m = "application/vnd.microsoft.card.adaptive", H = "application/vnd.microsoft.card.signin", A = "application/vnd.microsoft.card.oauth", D = "application/vnd.microsoft.card.receipt", E = "application/vnd.microsoft.card.audio", $ = "application/vnd.microsoft.card.video", N = "application/vnd.microsoft.card.animation", T = "application/vnd.microsoft.card.flex";
+function g(i, t) {
   if (i.from.id === t) return null;
   if (i.type === "typing") return f;
   if (i.type !== "message") return null;
   const e = i, n = e.id ?? `dl-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`, s = e.timestamp ? new Date(e.timestamp).getTime() : Date.now(), r = e.channelData, o = U(e);
   if (e.attachments && e.attachments.length > 0) {
-    const a = N(e, n, s);
+    const a = L(e, n, s);
     return a && (o.length > 0 && (a.actions = o), r && (a.data.channelData = r)), a;
   }
   return o.length > 0 ? {
@@ -23,21 +23,21 @@ function y(i, t) {
     timestamp: s
   } : null;
 }
-function N(i, t, e) {
+function L(i, t, e) {
   const n = i.attachments, s = i.attachmentLayout, r = [k, b, T, m];
   return n.every((a) => r.includes(a.contentType)) && (n.length > 1 || s === "carousel") ? {
     id: t,
     type: "carousel",
     from: "bot",
     data: {
-      cards: n.map((a) => a.contentType === m ? R(
+      cards: n.map((a) => a.contentType === m ? P(
         a.content
       ) : I(a.content))
     },
     timestamp: e
-  } : L(n[0], i, t, e);
+  } : R(n[0], i, t, e);
 }
-function L(i, t, e, n) {
+function R(i, t, e, n) {
   const s = i.contentType;
   if (s === k || s === b || s === T) {
     const r = i.content;
@@ -51,7 +51,7 @@ function L(i, t, e, n) {
   }
   if (s === m)
     return _(i.content, e, n);
-  if (s === S || s === H) {
+  if (s === H || s === A) {
     const r = i.content;
     return {
       id: e,
@@ -59,14 +59,14 @@ function L(i, t, e, n) {
       from: "bot",
       data: {
         text: r.text ?? "Please sign in",
-        buttons: w(r.buttons)
+        buttons: C(r.buttons)
       },
       timestamp: n
     };
   }
-  if (s === A)
+  if (s === D)
     return O(i.content, e, n);
-  if (s === E) {
+  if (s === $) {
     const r = i.content, o = r.media?.[0]?.url;
     return o ? {
       id: e,
@@ -80,7 +80,7 @@ function L(i, t, e, n) {
       timestamp: n
     } : null;
   }
-  if (s === D) {
+  if (s === E) {
     const r = i.content, o = r.media?.[0]?.url;
     return o ? {
       id: e,
@@ -94,7 +94,7 @@ function L(i, t, e, n) {
       timestamp: n
     } : null;
   }
-  if (s === $) {
+  if (s === N) {
     const r = i.content, o = r.media?.[0]?.url;
     return o ? {
       id: e,
@@ -143,10 +143,10 @@ function I(i) {
     image: i.images?.[0]?.url,
     title: i.title ?? "",
     subtitle: i.subtitle ?? i.text,
-    buttons: w(i.buttons)
+    buttons: C(i.buttons)
   };
 }
-function w(i) {
+function C(i) {
   return !i || i.length === 0 ? [] : i.map((t) => {
     const e = ("title" in t ? t.title : void 0) ?? String(t.value ?? "");
     switch (t.type) {
@@ -192,7 +192,7 @@ function d(i, t, e, n) {
           break;
       }
 }
-function C(i) {
+function w(i) {
   const t = [];
   let e;
   const n = [];
@@ -205,8 +205,8 @@ function C(i) {
     }
   ), Array.isArray(i.actions) && x(i.actions, n), { texts: t, image: e, buttons: n };
 }
-function R(i) {
-  const { texts: t, image: e, buttons: n } = C(i);
+function P(i) {
+  const { texts: t, image: e, buttons: n } = w(i);
   return {
     image: e,
     title: t[0] ?? "",
@@ -216,7 +216,7 @@ function R(i) {
   };
 }
 function _(i, t, e) {
-  const { texts: n, image: s, buttons: r } = C(i), o = i.fallbackText ?? i.speak ?? n.join(`
+  const { texts: n, image: s, buttons: r } = w(i), o = i.fallbackText ?? i.speak ?? n.join(`
 `);
   return s ? {
     id: t,
@@ -272,21 +272,24 @@ function O(i, t, e) {
     timestamp: e
   };
 }
-const g = "chativa_directline_userId", h = "chativa_directline_conversation";
-function P() {
+const y = "chativa_directline_userId", h = "chativa_directline_conversation";
+function S() {
+  return Math.random().toString(36).slice(2, 15) + Math.random().toString(36).slice(2, 15);
+}
+function B() {
   try {
-    const t = localStorage.getItem(g);
+    const t = localStorage.getItem(y);
     if (t) return t;
   } catch {
   }
-  const i = Math.random().toString(36).slice(2, 15) + Math.random().toString(36).slice(2, 15);
+  const i = S();
   try {
-    localStorage.setItem(g, i);
+    localStorage.setItem(y, i);
   } catch {
   }
   return i;
 }
-function B(i) {
+function F(i) {
   try {
     const t = JSON.parse(atob(i.split(".")[1]));
     return typeof t.exp == "number" ? t.exp * 1e3 : null;
@@ -294,7 +297,7 @@ function B(i) {
     return null;
   }
 }
-async function F(i, t) {
+async function j(i, t) {
   const e = await fetch(
     "https://directline.botframework.com/v3/directline/tokens/generate",
     {
@@ -311,7 +314,7 @@ async function F(i, t) {
   const n = await e.json();
   return { token: n.token, conversationId: n.conversationId };
 }
-async function j(i) {
+async function M(i) {
   const t = await fetch(i, { method: "POST" });
   if (!t.ok)
     throw new Error(`Token generator failed: ${t.status}`);
@@ -326,7 +329,7 @@ async function u(i, t) {
     throw new Error(`Token refresh failed: ${n.status}`);
   return await n.json();
 }
-class J {
+class G {
   constructor(t) {
     this.name = "directline", this.addSentToHistory = !0, this.chativaCtx = null, this.messageHandler = null, this.connectHandler = null, this.disconnectHandler = null, this.typingHandler = null, this.messageStatusHandler = null, this.activitySub = null, this.connectionSub = null, this.typingTimeout = null, this.refreshTimer = null, this.pendingIds = [], this.hasConnectedBefore = !1, this.resolveReady = null, this._skipNextJoin = !1, this.options = t;
   }
@@ -362,7 +365,7 @@ class J {
     return Object.keys(this.options.eventHandlers ?? {});
   }
   async connect() {
-    this.userId = this.options.userId ?? P(), this.userName = this.options.userName;
+    this.userId = this.options.userId ?? (this.options.resumeConversation ? B() : S()), this.userName = this.options.userName;
     let t = !1;
     if (this.options.resumeConversation) {
       const n = this.loadPersistedConversation();
@@ -379,14 +382,14 @@ class J {
     }
     if (!t)
       if (this.options.tokenGeneratorUrl) {
-        const n = await j(
+        const n = await M(
           this.options.tokenGeneratorUrl
         );
         this.token = n.token, n.conversationId && (this.conversationId = n.conversationId), n.userId && (this.userId = n.userId);
       } else if (this.options.token)
         this.token = this.options.token;
       else if (this.options.secret) {
-        const n = await F(
+        const n = await j(
           this.options.secret,
           this.userId
         );
@@ -518,7 +521,7 @@ class J {
         });
         continue;
       }
-      const c = y(a, this.userId);
+      const c = g(a, this.userId);
       c !== null && c !== f && o.push(c);
     }
     return {
@@ -567,13 +570,8 @@ class J {
       }
     ), this.activitySub = this.directLine.activity$.subscribe((e) => {
       try {
-        if (e.id && (this.watermark = e.id), !this.conversationId && e.conversation?.id && (this.conversationId = e.conversation.id), e.from.id === this.userId) {
-          if (e.type === "message") {
-            const s = this.pendingIds.shift();
-            s && this.messageStatusHandler?.(s, "read");
-          }
+        if (e.id && (this.watermark = e.id), !this.conversationId && e.conversation?.id && (this.conversationId = e.conversation.id), e.from.id === this.userId)
           return;
-        }
         if (e.type === "event" && e.name) {
           if (e.name === "DisableFeedbackButton" && e.value) {
             const r = e.value;
@@ -586,12 +584,12 @@ class J {
           s && s(this.createEventContext(e));
           return;
         }
-        const n = y(e, this.userId);
+        const n = g(e, this.userId);
         if (n === f) {
           this.handleTyping();
           return;
         }
-        n !== null && (this.clearTypingTimeout(), this.typingHandler?.(!1), this.resolveReady && (this.resolveReady(), this.resolveReady = null), this.messageHandler?.(n), this.options.resumeConversation && this.persistConversation());
+        n !== null && (this.clearTypingTimeout(), this.typingHandler?.(!1), this.resolveReady && (this.resolveReady(), this.resolveReady = null), this.flushPendingToRead(), this.messageHandler?.(n), this.options.resumeConversation && this.persistConversation());
       } catch (n) {
         console.warn(
           "[DirectLineConnector] Activity mapping error:",
@@ -654,6 +652,20 @@ class J {
       data: { ...s.data, feedbackDisabled: !0, feedbackType: e }
     });
   }
+  /**
+   * Mark every still-pending user message as "read" (double-tick).
+   * Called only when an actual bot **message** arrives — typing
+   * indicators, events, and the WebSocket echo of our own activity
+   * do not flush, because none of them are visible "the bot replied"
+   * signals from a user perspective.
+   */
+  flushPendingToRead() {
+    if (!(!this.messageStatusHandler || this.pendingIds.length === 0)) {
+      for (const t of this.pendingIds)
+        this.messageStatusHandler(t, "read");
+      this.pendingIds = [];
+    }
+  }
   handleTyping() {
     if (this.clearTypingTimeout(), this.typingHandler?.(!0), this.options.typingUntilMessage)
       return;
@@ -669,7 +681,7 @@ class J {
   /** Schedule a token refresh 60 seconds before expiry. */
   scheduleTokenRefresh() {
     this.clearRefreshTimer();
-    const t = B(this.token);
+    const t = F(this.token);
     if (!t) return;
     const e = t - Date.now() - 6e4;
     if (e <= 0) {
@@ -750,6 +762,6 @@ class J {
   }
 }
 export {
-  J as DirectLineConnector
+  G as DirectLineConnector
 };
 //# sourceMappingURL=index.js.map