@botpress/webchat-client 0.7.0 → 0.7.2

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @botpress/webchat-client@0.7.0 build /home/runner/work/genisys/genisys/packages/webchat-client
+> @botpress/webchat-client@0.7.2 build /home/runner/work/genisys/genisys/packages/webchat-client
 > openapi-ts && vite build
 
 ⏳ Generating from raw OpenAPI specification
@@ -18,12 +18,12 @@ computing gzip size...
 dist/webchat-client7.js    0.45 kB │ gzip: 0.26 kB
 dist/webchat-client9.js    2.66 kB │ gzip: 1.17 kB
 dist/webchat-client3.js    3.50 kB │ gzip: 0.60 kB
-dist/webchat-client2.js    5.86 kB │ gzip: 1.64 kB
+dist/webchat-client2.js    5.97 kB │ gzip: 1.69 kB
 dist/webchat-client10.js   8.58 kB │ gzip: 2.91 kB
 dist/webchat-client5.js   10.93 kB │ gzip: 3.47 kB
 [vite:dts] Start rollup declaration files...
 Analysis will use the bundled TypeScript version 5.8.2
 *** The target project appears to use TypeScript 5.9.3 which is newer than the bundled compiler engine; consider upgrading API Extractor.
-[vite:dts] Declaration files built in 5969ms.
+[vite:dts] Declaration files built in 6001ms.
 
-✓ built in 6.27s
+✓ built in 6.31s

package/dist/webchat-client2.js

@@ -1,86 +1,88 @@
-import { createUser as k, generateUserKey as b, sendPerfMetrics as F, removeMessageFeedback as S, addMessageFeedback as T, getEvent as R, createEvent as w, deleteUser as I, updateUser as K, getUser as _, createFile as q, deleteMessage as N, getMessage as z, updateMessage as A, createMessage as J, listParticipants as j, getParticipant as D, removeParticipant as V, addParticipant as X, listConversationMessages as Y, listConversations as B, deleteConversation as G, getConversation as H, createConversation as O } from "./webchat-client3.js";
+import { createUser as T, generateUserKey as C, sendPerfMetrics as L, removeMessageFeedback as F, addMessageFeedback as I, getEvent as S, createEvent as K, deleteUser as R, updateUser as w, getUser as _, createFile as q, deleteMessage as N, getMessage as z, updateMessage as A, createMessage as J, listParticipants as j, getParticipant as D, removeParticipant as V, addParticipant as X, listConversationMessages as Y, listConversations as B, deleteConversation as G, getConversation as H, createConversation as O } from "./webchat-client3.js";
 import { client as l } from "./webchat-client4.js";
 import { EventSource as Q } from "./webchat-client5.js";
-import { throwErrorInterceptor as C } from "./webchat-client6.js";
+import { throwErrorInterceptor as b } from "./webchat-client6.js";
 import { createEventEmitter as $ } from "./webchat-client7.js";
-const r = (a) => a.data, M = 10, P = 3e3, W = "60000", v = {
+const r = (a) => a.data, M = 10, P = 3e3, W = "60000", U = {
   throwOnError: !0
 }, ne = async ({
   clientId: a,
-  apiUrl: c,
-  adminSecret: d,
+  apiUrl: h,
+  adminSecret: c,
   customHeaders: o,
-  ...h
+  ...d
 }) => {
-  const t = `${c || l.getConfig().baseUrl}/${a}`;
-  l.interceptors.response._fns.length === 0 && l.interceptors.response.use(C);
+  const t = `${h || l.getConfig().baseUrl}/${a}`;
+  l.interceptors.response._fns.length === 0 && l.interceptors.response.use(b);
   const i = {
-    ...v,
+    ...U,
     baseUrl: t
   }, s = {
-    ...d ? { "x-admin-secret": d } : {},
+    ...c ? { "x-admin-secret": c } : {},
     ...o
   };
-  return k({
+  return T({
     ...i,
     headers: Object.keys(s).length > 0 ? s : void 0,
-    body: h
+    body: d
   }).then(r);
 }, ae = ({
   conversationId: a,
-  userToken: c,
-  clientId: d,
+  userToken: h,
+  clientId: c,
   apiUrl: o,
-  adminSecret: h
+  adminSecret: d
 }) => {
   let t = 0, i = null;
-  const s = $(), m = () => {
+  const s = $();
+  let f = a, e = h;
+  const n = () => {
     i && i.close();
-    const n = `${`${o || l.getConfig().baseUrl}/${d}`}/initialize${a ? `?conversationId=${a}` : ""}`, g = {
-      ...h ? { "x-admin-secret": h } : {},
-      ...c ? { "x-user-key": c } : {}
+    const v = `${`${o || l.getConfig().baseUrl}/${c}`}/initialize${f ? `?conversationId=${f}` : ""}`, m = {
+      ...d ? { "x-admin-secret": d } : {},
+      ...e ? { "x-user-key": e } : {}
     };
-    i = L(n, g), i.addEventListener("open", () => s.emit("open")), i.addEventListener("error", (p) => {
-      t < M ? (t++, setTimeout(() => m(), P)) : s.emit("error", p);
-    }), i.addEventListener("message", (p) => {
-      const u = x(p.data);
-      s.emit(u.type, u.data);
+    i = x(v, m), i.addEventListener("open", () => s.emit("open")), i.addEventListener("error", (u) => {
+      t < M ? (t++, setTimeout(() => n(), P)) : s.emit("error", u);
+    }), i.addEventListener("message", (u) => {
+      const g = k(u.data);
+      g.type === "init" && (f = g.data.conversation.id ?? f, e = g.data.user.userKey ?? e), s.emit(g.type, g.data);
     });
   };
-  return m(), s.on;
+  return n(), s.on;
 }, oe = async ({
   adminSecret: a,
-  expiresAt: c,
-  userId: d,
+  expiresAt: h,
+  userId: c,
   apiUrl: o,
-  clientId: h
+  clientId: d
 }) => {
-  const t = { "x-admin-secret": a }, i = `${o || l.getConfig().baseUrl}/${h}`, s = {
-    ...v,
+  const t = { "x-admin-secret": a }, i = `${o || l.getConfig().baseUrl}/${d}`, s = {
+    ...U,
     baseUrl: i
   };
-  return b({ ...s, headers: t, body: { id: d, expiresAt: c } }).then(r);
-}, ie = async (a, c, d, o) => {
-  const h = `${d || l.getConfig().baseUrl}/${a}`, t = {
-    ...v,
-    baseUrl: h
+  return C({ ...s, headers: t, body: { id: c, expiresAt: h } }).then(r);
+}, ie = async (a, h, c, o) => {
+  const d = `${c || l.getConfig().baseUrl}/${a}`, t = {
+    ...U,
+    baseUrl: d
   };
-  return F({ ...t, body: c, headers: o }).then(r);
+  return L({ ...t, body: h, headers: o }).then(r);
 }, ce = ({
   userKey: a,
-  clientId: c,
-  apiUrl: d,
+  clientId: h,
+  apiUrl: c,
   customHeaders: o,
-  advancedOptions: h
+  advancedOptions: d
 }) => {
   const t = {
     "x-user-key": a,
     ...o
-  }, i = `${d || l.getConfig().baseUrl}/${c}`, s = {
-    ...v,
+  }, i = `${c || l.getConfig().baseUrl}/${h}`, s = {
+    ...U,
     baseUrl: i
   };
-  return l.interceptors.response._fns.length === 0 && l.interceptors.response.use(C), {
+  return l.interceptors.response._fns.length === 0 && l.interceptors.response.use(b), {
     createConversation: () => O({ ...s, headers: t, body: {} }).then(r),
     getConversation: ({ conversationId: e }) => H({ ...s, headers: t, path: { id: e } }).then(r),
     deleteConversation: ({ conversationId: e }) => G({ ...s, headers: t, path: { id: e } }).then(r),
@@ -101,40 +103,40 @@ const r = (a) => a.data, M = 10, P = 3e3, W = "60000", v = {
     deleteMessage: ({ messageId: e }) => N({ ...s, headers: t, path: { id: e } }).then(r),
     createFile: (e) => q({ ...s, headers: t, body: e }).then(r),
     getUser: () => _({ ...s, headers: t }).then(r),
-    updateUser: (e) => K({ ...s, headers: t, body: e }).then(r),
-    deleteUser: () => I({ ...s, headers: t }).then(r),
-    createEvent: (e) => w({ ...s, headers: t, body: e }).then(r),
-    getEvent: ({ eventId: e }) => R({ ...s, headers: t, path: { id: e } }).then(r),
-    addMessageFeedback: ({ messageId: e, ...n }) => T({ ...s, headers: t, path: { id: e }, body: n }).then(r),
-    removeMessageFeedback: ({ messageId: e }) => S({ ...s, headers: t, path: { id: e } }).then(r),
-    generateUserKey: ({ adminSecret: e, ...n }) => b({ ...s, headers: { "x-admin-secret": e }, body: n }).then(r),
+    updateUser: (e) => w({ ...s, headers: t, body: e }).then(r),
+    deleteUser: () => R({ ...s, headers: t }).then(r),
+    createEvent: (e) => K({ ...s, headers: t, body: e }).then(r),
+    getEvent: ({ eventId: e }) => S({ ...s, headers: t, path: { id: e } }).then(r),
+    addMessageFeedback: ({ messageId: e, ...n }) => I({ ...s, headers: t, path: { id: e }, body: n }).then(r),
+    removeMessageFeedback: ({ messageId: e }) => F({ ...s, headers: t, path: { id: e } }).then(r),
+    generateUserKey: ({ adminSecret: e, ...n }) => C({ ...s, headers: { "x-admin-secret": e }, body: n }).then(r),
     listenConversation: ({ conversationId: e }) => {
-      let n = 0, g = null;
-      const p = $(), u = () => {
-        g && g.close();
-        const U = `${i}/conversations/${e}/listen`, E = h == null ? void 0 : h.eventSource;
-        g = E ? E({ url: U, headers: t }) : L(U, t), g.addEventListener("open", () => p.emit("open")), g.addEventListener("error", (f) => {
-          n < M ? (n++, setTimeout(() => u(), P)) : p.emit("error", f);
-        }), g.addEventListener("message", (f) => {
-          const y = x(f.data);
-          p.emit(y.type, y.data);
+      let n = 0, p = null;
+      const v = $(), m = () => {
+        p && p.close();
+        const u = `${i}/conversations/${e}/listen`, g = d == null ? void 0 : d.eventSource;
+        p = g ? g({ url: u, headers: t }) : x(u, t), p.addEventListener("open", () => v.emit("open")), p.addEventListener("error", (E) => {
+          n < M ? (n++, setTimeout(() => m(), P)) : v.emit("error", E);
+        }), p.addEventListener("message", (E) => {
+          const y = k(E.data);
+          v.emit(y.type, y.data);
         });
       };
-      return u(), p.on;
+      return m(), v.on;
     }
   };
-}, x = (a) => {
+}, k = (a) => {
   try {
     return JSON.parse(a);
   } catch {
     return a;
   }
-}, L = (a, c) => new Q(a, {
-  fetch: (d, o) => fetch(d, {
+}, x = (a, h) => new Q(a, {
+  fetch: (c, o) => fetch(c, {
     ...o,
     headers: {
       ...o == null ? void 0 : o.headers,
-      ...c,
+      ...h,
       timeout: W
     }
   })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/webchat-client",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "",
   "main": "src/index.ts",
   "type": "module",

package/src/client/client.ts

@@ -142,6 +142,8 @@ export const initialize = ({
   let retryCount = 0
   let eventSource: EventSourceLike | null = null
   const eventEmitter = createEventEmitter<EventMap>()
+  let resolvedConversationId = conversationId
+  let resolvedUserToken = userToken
 
   const connect = () => {
     if (eventSource) {
@@ -149,11 +151,11 @@ export const initialize = ({
     }
 
     const baseUrl = `${apiUrl || baseClient.getConfig().baseUrl}/${clientId}`
-    const url = `${baseUrl}/initialize${conversationId ? `?conversationId=${conversationId}` : ''}`
+    const url = `${baseUrl}/initialize${resolvedConversationId ? `?conversationId=${resolvedConversationId}` : ''}`
 
     const headers = {
       ...(adminSecret ? { 'x-admin-secret': adminSecret } : {}),
-      ...(userToken ? { 'x-user-key': userToken } : {}),
+      ...(resolvedUserToken ? { 'x-user-key': resolvedUserToken } : {}),
     }
 
     eventSource = createNewEventSource(url, headers)
@@ -169,9 +171,18 @@ export const initialize = ({
     })
     eventSource.addEventListener('message', (ev) => {
       const event = safeJsonParse(ev.data) as Signal
+
+      // Save the Conversation ID and User Token from the init event so that internal
+      // retries reconnect as the same user to the same conversation.
+      if (event.type === 'init') {
+        resolvedConversationId = event.data.conversation.id ?? resolvedConversationId
+        resolvedUserToken = event.data.user.userKey ?? resolvedUserToken
+      }
+
       eventEmitter.emit(event.type, event.data)
     })
   }
+
   connect()
   return eventEmitter.on
 }