@botpress/webchat-client 0.4.0 → 0.6.0

package/dist/webchat-client2.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/webchat-client",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "",
   "main": "src/index.ts",
   "type": "module",
@@ -30,7 +30,7 @@
     "eventsource": "^3.0.6"
   },
   "devDependencies": {
-    "@bpinternal/webchat-http-client": "0.8.0",
+    "@bpinternal/webchat-http-client": "0.10.0",
     "@hey-api/client-fetch": "^0.10.0",
     "@hey-api/openapi-ts": "^0.66.4",
     "@repo/eslint-config": "workspace:*",
@@ -40,6 +40,6 @@
     "glob": "^11.0.1",
     "rollup-plugin-tree-shakeable": "^1.0.3",
     "vite": "^5.4.8",
-    "vite-plugin-dts": "^3.5.4"
+    "vite-plugin-dts": "^4.5.4"
   }
 }

package/src/client/client.ts

@@ -6,6 +6,11 @@ import type { Signal } from './types/signals'
 import { throwErrorInterceptor } from './interceptor'
 import { createEventEmitter, EventEmitter } from './emitter'
 
+interface EventSourceLike {
+  close(): void
+  addEventListener(event: string, handler: (event: any) => void): void
+}
+
 type ConversationIdParam = {
   conversationId: string
 }
@@ -65,7 +70,7 @@ export type Client = {
   deleteMessage: (params: MessageIdParam) => Promise<ClientTypes.DeleteMessageResponse>
   createFile: (params: ClientTypes.CreateFileBody) => Promise<ClientTypes.CreateFileResponse>
   getUser: () => Promise<ClientTypes.GetUserResponse>
-  updateUser: (params: ClientTypes.CreateUserBody) => Promise<ClientTypes.UpdateUserResponse>
+  updateUser: (params: ClientTypes.UpdateUserBody) => Promise<ClientTypes.UpdateUserResponse>
   deleteUser: (params: UserIdParam) => Promise<ClientTypes.DeleteUserResponse>
   createEvent: (params: ClientTypes.CreateEventBody) => Promise<ClientTypes.CreateEventResponse>
   getEvent: (params: EventIdParam) => Promise<ClientTypes.GetEventResponse>
@@ -135,7 +140,7 @@ export const initialize = ({
   adminSecret?: string
 }) => {
   let retryCount = 0
-  let eventSource: EventSource | null = null
+  let eventSource: EventSourceLike | null = null
   const eventEmitter = createEventEmitter<EventMap>()
 
   const connect = () => {
@@ -153,19 +158,19 @@ export const initialize = ({
 
     eventSource = createNewEventSource(url, headers)
 
-    eventSource.onopen = () => eventEmitter.emit('open')
-    eventSource.onerror = (err) => {
+    eventSource.addEventListener('open', () => eventEmitter.emit('open'))
+    eventSource.addEventListener('error', (err) => {
       if (retryCount < MAX_RETRIES) {
         retryCount++
         setTimeout(() => connect(), RETRY_INTERVAL)
       } else {
         eventEmitter.emit('error', err)
       }
-    }
-    eventSource.onmessage = (ev) => {
+    })
+    eventSource.addEventListener('message', (ev) => {
       const event = safeJsonParse(ev.data) as Signal
       eventEmitter.emit(event.type, event.data)
-    }
+    })
   }
   connect()
   return eventEmitter.on
@@ -213,11 +218,15 @@ export const createClient = ({
   clientId,
   apiUrl,
   customHeaders,
+  advancedOptions,
 }: {
   userKey: string
   clientId: string
   apiUrl?: string
   customHeaders?: Record<string, string>
+  advancedOptions?: {
+    eventSource?: (params: { url: string; headers: Record<string, string> }) => EventSourceLike
+  }
 }): Client => {
   const headers = {
     'x-user-key': userKey,
@@ -282,7 +291,7 @@ export const createClient = ({
       sdk.generateUserKey({ ...configs, headers: { 'x-admin-secret': adminSecret }, body }).then(extractData),
     listenConversation: ({ conversationId }) => {
       let retryCount = 0
-      let eventSource: EventSource | null = null
+      let eventSource: EventSourceLike | null = null
       const eventEmitter = createEventEmitter<EventMap>()
 
       const connect = () => {
@@ -292,21 +301,22 @@ export const createClient = ({
 
         const url = `${baseUrl}/conversations/${conversationId}/listen`
 
-        eventSource = createNewEventSource(url, headers)
+        const providedEventSource = advancedOptions?.eventSource
+        eventSource = providedEventSource ? providedEventSource({ url, headers }) : createNewEventSource(url, headers)
 
-        eventSource.onopen = () => eventEmitter.emit('open')
-        eventSource.onerror = (err) => {
+        eventSource.addEventListener('open', () => eventEmitter.emit('open'))
+        eventSource.addEventListener('error', (err) => {
           if (retryCount < MAX_RETRIES) {
             retryCount++
             setTimeout(() => connect(), RETRY_INTERVAL)
           } else {
             eventEmitter.emit('error', err)
           }
-        }
-        eventSource.onmessage = (ev) => {
+        })
+        eventSource.addEventListener('message', (ev) => {
           const event = safeJsonParse(ev.data) as Signal
           eventEmitter.emit(event.type, event.data)
-        }
+        })
       }
       connect()
       return eventEmitter.on
@@ -324,7 +334,7 @@ const safeJsonParse = (data: any) => {
   }
 }
 
-const createNewEventSource = (url: string, headers: Record<string, string>) => {
+const createNewEventSource = (url: string, headers: Record<string, string>): EventSourceLike => {
   return new EventSource(url, {
     fetch: (input, init) =>
       fetch(input, {