@botpress/webchat-client 0.2.0-beta.1 → 0.2.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @botpress/webchat-client@0.2.0-beta.1 build /home/runner/work/genisys/genisys/packages/webchat-client
+> @botpress/webchat-client@0.2.0 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.63 kB │ gzip: 1.15 kB
 dist/webchat-client3.js    3.30 kB │ gzip: 0.58 kB
-dist/webchat-client2.js    4.89 kB │ gzip: 1.36 kB
+dist/webchat-client2.js    4.75 kB │ gzip: 1.31 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.4.2
 *** The target project appears to use TypeScript 5.6.2 which is newer than the bundled compiler engine; consider upgrading API Extractor.
-[vite:dts] Declaration files built in 5685ms.
+[vite:dts] Declaration files built in 5323ms.
 
-✓ built in 6.04s
+✓ built in 5.65s

package/dist/index.d.ts

@@ -195,7 +195,9 @@ export declare type Client = {
     listenConversation: (params: ConversationIdParam) => EventEmitter<Record<Event_3['type'], Event_3['data']>>['on'];
     addMessageFeedback: (params: MessageIdParam & ClientTypes_2.AddMessageFeedbackBody) => Promise<ClientTypes_2.AddMessageFeedbackResponse>;
     removeMessageFeedback: (params: MessageIdParam) => Promise<ClientTypes_2.RemoveMessageFeedbackResponse>;
-    generateUserKey: (params: ClientTypes_2.GenerateUserKeyBody, adminKey?: string) => Promise<ClientTypes_2.GenerateUserKeyResponse>;
+    generateUserKey: (params: ClientTypes_2.GenerateUserKeyBody & {
+        adminKey: string;
+    }) => Promise<ClientTypes_2.GenerateUserKeyResponse>;
 };
 
 declare type Client_2 = Client$1<RequestFn, Config, MethodFn, BuildUrlFn> & {

package/dist/webchat-client2.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/webchat-client",
-  "version": "0.2.0-beta.1",
+  "version": "0.2.0",
   "description": "",
   "main": "src/index.ts",
   "type": "module",
@@ -26,7 +26,7 @@
     "eventsource": "^3.0.6"
   },
   "devDependencies": {
-    "@bpinternal/webchat-http-client": "0.4.0",
+    "@bpinternal/webchat-http-client": "0.4.1",
     "@hey-api/client-fetch": "^0.10.0",
     "@hey-api/openapi-ts": "^0.66.4",
     "@repo/eslint-config": "workspace:*",

package/src/client/client.ts

@@ -68,8 +68,7 @@ export type Client = {
   ) => Promise<ClientTypes.AddMessageFeedbackResponse>
   removeMessageFeedback: (params: MessageIdParam) => Promise<ClientTypes.RemoveMessageFeedbackResponse>
   generateUserKey: (
-    params: ClientTypes.GenerateUserKeyBody,
-    adminKey?: string
+    params: ClientTypes.GenerateUserKeyBody & { adminKey: string }
   ) => Promise<ClientTypes.GenerateUserKeyResponse>
 }
 
@@ -98,13 +97,13 @@ export const createUser = async ({
     baseUrl,
   }
 
-  const res = await sdk.createUser({
-    ...configs,
-    body: {},
-    headers: adminKey ? { 'x-admin-key': adminKey } : undefined,
-  })
-
-  return extractData(res)
+  return sdk
+    .createUser({
+      ...configs,
+      body: {},
+      headers: adminKey ? { 'x-admin-key': adminKey } : undefined,
+    })
+    .then(extractData)
 }
 
 export const generateUserKey = async ({
@@ -121,7 +120,6 @@ export const generateUserKey = async ({
   clientId: string
 }) => {
   const headers = { 'x-admin-key': adminKey }
-  console.log('generateUserKey', userId, expiresAt, headers)
 
   const baseUrl = `${apiUrl || baseClient.getConfig().baseUrl}/${clientId}`
   const configs = {
@@ -199,11 +197,8 @@ export const createClient = ({
       sdk.addMessageFeedback({ ...configs, headers, path: { id: messageId }, body }).then(extractData),
     removeMessageFeedback: ({ messageId }) =>
       sdk.removeMessageFeedback({ ...configs, headers, path: { id: messageId } }).then(extractData),
-    generateUserKey: async (body, adminKey) => {
-      const headers = adminKey ? { 'x-admin-key': adminKey } : undefined
-      console.log('generateUserKey', body, headers)
-      return sdk.generateUserKey({ ...configs, headers, body }).then(extractData)
-    },
+    generateUserKey: ({ adminKey, ...body }) =>
+      sdk.generateUserKey({ ...configs, headers: { 'x-admin-key': adminKey }, body }).then(extractData),
     listenConversation: ({ conversationId }) => {
       const MAX_RETRIES = 10
       const RETRY_INTERVAL = 3000 // ms
@@ -232,11 +227,11 @@ export const createClient = ({
 
         eventSource.onopen = () => eventEmitter.emit('open')
         eventSource.onerror = (err) => {
-          eventEmitter.emit('error', err)
-
           if (retryCount < MAX_RETRIES) {
             retryCount++
             setTimeout(() => connect(), RETRY_INTERVAL)
+          } else {
+            eventEmitter.emit('error', err)
           }
         }
         eventSource.onmessage = (ev) => {