@botpress/webchat 0.2.4 → 0.2.5

package/dist/core/api.d.ts

@@ -5,10 +5,9 @@ import { BotInfo, uuid } from '../typings';
 import BpSocket from './socket';
 export default class WebchatApi {
     private socket;
-    private axios;
-    private axiosConfig;
     constructor(socket: BpSocket);
     fetchBotInfo(mediaFileServiceUrl: string): Promise<BotInfo | undefined>;
+    listCurrentConversationMessages(limit?: number): Promise<Message[]>;
     fetchConversations(): Promise<RecentConversation[]>;
     fetchConversation(conversationId: uuid): Promise<{
         messages: Message[];

package/dist/core/api.js

@@ -29,6 +29,11 @@ class WebchatApi {
             }
         });
     }
+    listCurrentConversationMessages(limit) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.socket.socket.listMessages(limit);
+        });
+    }
     fetchConversations() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -37,7 +42,7 @@ class WebchatApi {
                 for (const conversation of conversations) {
                     const limit = 1;
                     yield this.socket.socket.switchConversation(conversation.id);
-                    const lastMessages = yield this.socket.socket.listMessages(limit);
+                    const lastMessages = yield this.listCurrentConversationMessages(limit);
                     if (lastMessages.length >= limit) {
                         conversation.lastMessage = lastMessages[0];
                     }
@@ -125,7 +130,6 @@ class WebchatApi {
             data.append('file', file);
             data.append('conversationId', conversationId);
             data.append('payload', payload);
-            return this.axios.post('/messages/files', data, this.axiosConfig);
         });
     }
     // TODO: Fix this

package/dist/index.d.ts

@@ -7,7 +7,7 @@ interface State {
     store: RootStore;
 }
 interface Props {
-    config: Config;
+    config?: Config;
     fullscreen?: boolean;
 }
 export declare class ExposedWebChat extends React.Component<Props, State> {

package/dist/index.js

@@ -30,12 +30,7 @@ exports.Fullscreen = Fullscreen;
 class ExposedWebChat extends react_1.default.Component {
     constructor(props) {
         super(props);
-        const { clientId, encryptionKey, useSessionStorage } = props.config;
-        window.BP_STORAGE = new storage_1.default({
-            clientId,
-            encryptionKey,
-            useSessionStorage
-        });
+        window.BP_STORAGE = new storage_1.default(props.config);
         this.state = {
             store: new store_1.RootStore({ fullscreen: props.fullscreen }, props.config)
         };
@@ -44,9 +39,8 @@ class ExposedWebChat extends react_1.default.Component {
         const store = this.state.store;
         const { botUILanguage: locale } = store;
         return (react_1.default.createElement(mobx_react_1.Provider, { store: store },
-            react_1.default.createElement(react_intl_1.IntlProvider, { locale: locale, messages: translations_1.translations[locale], defaultLocale: translations_1.defaultLocale },
-                react_1.default.createElement(react_1.default.Fragment, null,
-                    react_1.default.createElement(main_1.default, Object.assign({ store: store }, this.props))))));
+            react_1.default.createElement(react_intl_1.IntlProvider, { locale: locale, messages: translations_1.translations[locale || translations_1.defaultLocale], defaultLocale: translations_1.defaultLocale },
+                react_1.default.createElement(main_1.default, Object.assign({ store: store }, this.props)))));
     }
 }
 exports.ExposedWebChat = ExposedWebChat;

package/dist/store/index.d.ts

@@ -24,7 +24,7 @@ declare class RootStore {
     delayedMessages: QueuedMessage[];
     constructor(options: {
         fullscreen: boolean;
-    }, config: Config);
+    }, config?: Config);
     setIntlProvider(provider: IntlShape): void;
     setSocket(socket: BpSocket): void;
     get isConversationStarted(): boolean;

package/dist/store/index.js

@@ -37,7 +37,9 @@ class RootStore {
         this.delayedMessages = [];
         this.composer = new composer_1.default(this);
         this.view = new view_1.default(this, options.fullscreen);
-        this.updateConfig(config);
+        if (config) {
+            this.updateConfig(config);
+        }
         this.botUILanguage = (0, translations_1.getUserLocale)();
     }
     setIntlProvider(provider) {
@@ -51,8 +53,8 @@ class RootStore {
         return !!((_a = this.currentConversation) === null || _a === void 0 ? void 0 : _a.messages.length);
     }
     get botName() {
-        var _a;
-        return this.config.botName || ((_a = this.botInfo) === null || _a === void 0 ? void 0 : _a.name) || 'Bot';
+        var _a, _b;
+        return ((_a = this.config) === null || _a === void 0 ? void 0 : _a.botName) || ((_b = this.botInfo) === null || _b === void 0 ? void 0 : _b.name) || 'Bot';
     }
     get hasBotInfoDescription() {
         var _a;
@@ -297,8 +299,20 @@ class RootStore {
                     return;
                 }
                 let info = `Conversation Id: ${conversation.id}\nCreated on: ${formatDate(conversation.createdOn)}\nUser: ${conversation.userId}\n-----------------`;
-                for (const message of (0, orderBy_1.default)(conversation.messages, 'sentOn', 'desc')) {
-                    info += `\n[${formatDate(message.sentOn)}] ${message.authorId ? 'User' : this.config.botId || 'Bot'}: ${message.payload.text}`;
+                const messages = yield this.api.listCurrentConversationMessages(500);
+                for (const message of (0, orderBy_1.default)(messages, 'sentOn', 'desc')) {
+                    const payload = message.payload;
+                    if (payload.type === 'session_reset') {
+                        continue;
+                    }
+                    info += `\n[${formatDate(message.sentOn)}] ${message.authorId ? 'User' : this.config.botId || 'Bot'}: Event (${payload.type}): ${payload.text ||
+                        payload.audio ||
+                        payload.image ||
+                        payload.video ||
+                        payload.file ||
+                        payload.message ||
+                        payload.title ||
+                        ''}`;
                 }
                 const blobFile = new Blob([info]);
                 (0, utils_1.downloadFile)(`conversation-${conversation.id}`, blobFile);

package/dist/utils/storage.d.ts

@@ -1,11 +1,10 @@
 import { Config } from '../typings';
-export declare type StorageConfig = Pick<Config, 'clientId' | 'encryptionKey' | 'useSessionStorage'>;
 export declare class BPStorage {
-    private _config;
+    private _config?;
     private _storage;
-    constructor(config: StorageConfig);
-    get config(): Partial<StorageConfig>;
-    set config(config: Partial<StorageConfig>);
+    constructor(config?: Config);
+    get config(): Config | undefined;
+    set config(config: Config | undefined);
     private serialize;
     private deserialize;
     private getStorageKey;

package/dist/utils/storage.js

@@ -11,7 +11,7 @@ const js_cookie_1 = __importDefault(require("js-cookie"));
 class BPStorage {
     constructor(config) {
         this.serialize = (value) => {
-            var _a;
+            var _a, _b;
             if (value === null || value === undefined) {
                 throw new Error('[Storage] Cannot store null or undefined values');
             }
@@ -23,47 +23,48 @@ class BPStorage {
                 else {
                     str = JSON.stringify(value);
                 }
-                if ((_a = this.config.encryptionKey) === null || _a === void 0 ? void 0 : _a.length) {
+                if ((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.encryptionKey) === null || _b === void 0 ? void 0 : _b.length) {
                     str = aes_1.default.encrypt(str, this.config.encryptionKey).toString();
                 }
                 return str;
             }
-            catch (_b) {
+            catch (_c) {
                 console.error('[Storage] Error parsing value', value);
                 return '';
             }
         };
         this.deserialize = (strValue) => {
-            var _a;
+            var _a, _b;
             if (strValue === null || strValue === undefined) {
                 return undefined;
             }
             try {
-                if ((_a = this.config.encryptionKey) === null || _a === void 0 ? void 0 : _a.length) {
+                if ((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.encryptionKey) === null || _b === void 0 ? void 0 : _b.length) {
                     strValue = aes_1.default.decrypt(strValue, this.config.encryptionKey).toString(enc_utf8_1.default);
                 }
                 return JSON.parse(strValue);
             }
-            catch (_b) {
+            catch (_c) {
                 return undefined;
             }
         };
         this.getStorageKey = (key) => {
-            var _a, _b;
+            var _a, _b, _c;
             const rawKey = `bp-chat-${key}`;
             if ((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.encryptionKey) === null || _b === void 0 ? void 0 : _b.length) {
                 return `${rawKey}-${(0, sha256_1.default)(`${this.config.clientId}-${this.config.encryptionKey}`).toString()}`;
             }
             else {
-                return `${rawKey}-${this.config.clientId}`;
+                return `${rawKey}-${(_c = this.config) === null || _c === void 0 ? void 0 : _c.clientId}`;
             }
         };
         this.getDriver = () => {
+            var _a;
             if (this._storage) {
                 return this._storage;
             }
             try {
-                const storage = this.config.useSessionStorage === true && typeof sessionStorage !== 'undefined' ? sessionStorage : localStorage;
+                const storage = ((_a = this.config) === null || _a === void 0 ? void 0 : _a.useSessionStorage) === true && typeof sessionStorage !== 'undefined' ? sessionStorage : localStorage;
                 const tempKey = '__storage_test__';
                 storage.setItem(tempKey, tempKey);
                 storage.removeItem(tempKey);
@@ -73,15 +74,20 @@ class BPStorage {
                 return (this._storage = 'cookie');
             }
         };
-        this._config = config;
+        if (config) {
+            this._config = config;
+        }
     }
     get config() {
         return this._config;
     }
     set config(config) {
-        this._config = Object.assign(Object.assign({}, this._config), config);
+        this._config = config;
     }
     set(key, value) {
+        if (!this.config) {
+            return;
+        }
         try {
             const driver = this.getDriver();
             driver !== 'cookie'
@@ -93,6 +99,9 @@ class BPStorage {
         }
     }
     get(key) {
+        if (!this.config) {
+            return;
+        }
         try {
             const driver = this.getDriver();
             return driver !== 'cookie'
@@ -104,6 +113,9 @@ class BPStorage {
         }
     }
     del(key) {
+        if (!this.config) {
+            return;
+        }
         try {
             const driver = this.getDriver();
             driver !== 'cookie' ? driver.removeItem(this.getStorageKey(key)) : js_cookie_1.default.remove(this.getStorageKey(key));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/webchat",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "source": "src/index.tsx",