@viewberapp/chat 0.0.21 → 0.0.24

package/dist/API.d.ts

@@ -0,0 +1,43 @@
+import { AxiosInstance } from "axios";
+import ChatError from "./ChatError";
+import Message from './Message';
+export interface ConstructApiParams {
+    axios: AxiosInstance;
+    jwtToken?: string;
+    getChatMessagesRoute: (chatId: number) => string;
+    getChatStoreMessageRoute: (chatId: number) => string;
+    getChatForAppointmentRoute: (appointmentId: number) => string;
+}
+export declare type StoreMessageReturnValue = {
+    message: Message;
+    error?: undefined;
+} | {
+    message?: undefined;
+    error: ChatError;
+};
+export declare type GetLatestMessagesReturnValue = {
+    messages: Message[];
+    error?: undefined;
+} | {
+    messages?: undefined;
+    error: ChatError;
+};
+export declare type GetChatIdFromAppointmentIdReturnValue = {
+    chatId: number;
+    error?: undefined;
+} | {
+    chatId?: undefined;
+    error: ChatError;
+};
+export default class API {
+    private axios;
+    private jwtToken?;
+    private getChatMessagesRoute;
+    private getChatStoreMessageRoute;
+    private getChatForAppointmentRoute;
+    constructor(params: ConstructApiParams);
+    storeMessage: (chatId: number, message: string) => Promise<StoreMessageReturnValue>;
+    getLatestMessages: (chatId: number) => Promise<GetLatestMessagesReturnValue>;
+    getChatIdFromAppointmentId: (appointmentId: number) => Promise<GetChatIdFromAppointmentIdReturnValue>;
+    private constructHeaders;
+}

package/dist/API.js

@@ -0,0 +1,81 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const axios_1 = __importDefault(require("axios"));
+const Message_1 = __importDefault(require("./Message"));
+class API {
+    constructor(params) {
+        this.storeMessage = (chatId, message) => new Promise((resolve, reject) => {
+            this.axios.post(this.getChatStoreMessageRoute(chatId), { message }, {
+                headers: this.constructHeaders(),
+            }).then(response => {
+                resolve({
+                    message: new Message_1.default({
+                        id: response.data.id,
+                        chatId: response.data.chat_id,
+                        message: response.data.message,
+                        senderId: response.data.sender_id,
+                        sender: response.data.sender,
+                        isAdminMessage: response.data.is_admin_message
+                    })
+                });
+            }).catch(err => {
+                var _a;
+                if (axios_1.default.isAxiosError(err) && ((_a = err.response) === null || _a === void 0 ? void 0 : _a.status) === 403) {
+                    resolve({ error: { code: 'unauthorized' } });
+                }
+                resolve({ error: { code: 'error' } });
+            });
+        });
+        this.getLatestMessages = (chatId) => new Promise((resolve, reject) => {
+            this.axios.get(this.getChatMessagesRoute(chatId), {
+                headers: this.constructHeaders(),
+            }).then(response => {
+                resolve({
+                    messages: response.data.data.map((m) => new Message_1.default({
+                        id: m.id,
+                        chatId: m.chat_id,
+                        message: m.message,
+                        senderId: m.sender_id,
+                        sender: m.sender,
+                        isAdminMessage: m.is_admin_message
+                    }))
+                });
+            }).catch(err => {
+                var _a;
+                if (axios_1.default.isAxiosError(err) && ((_a = err.response) === null || _a === void 0 ? void 0 : _a.status) === 403) {
+                    resolve({ error: { code: 'unauthorized' } });
+                }
+                resolve({ error: { code: 'error' } });
+            });
+        });
+        this.getChatIdFromAppointmentId = (appointmentId) => new Promise((resolve, reject) => {
+            this.axios.get(this.getChatForAppointmentRoute(appointmentId), {
+                headers: this.constructHeaders()
+            }).then(response => {
+                resolve({ chatId: response.data.data.id });
+            }).catch(err => {
+                var _a;
+                if (axios_1.default.isAxiosError(err) && ((_a = err.response) === null || _a === void 0 ? void 0 : _a.status) === 403) {
+                    resolve({ error: { code: 'unauthorized' } });
+                }
+                resolve({ error: { code: 'error' } });
+            });
+        });
+        this.constructHeaders = () => {
+            if (this.jwtToken) {
+                return { 'Authorization': `Bearer ${this.jwtToken}` };
+            }
+            return undefined;
+        };
+        this.axios = params.axios;
+        this.jwtToken = params.jwtToken;
+        this.getChatMessagesRoute = params.getChatMessagesRoute;
+        this.getChatStoreMessageRoute = params.getChatStoreMessageRoute;
+        this.getChatForAppointmentRoute = params.getChatForAppointmentRoute;
+    }
+}
+exports.default = API;
+//# sourceMappingURL=API.js.map

package/dist/API.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"API.js","sourceRoot":"","sources":["../src/API.ts"],"names":[],"mappings":"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"}

package/dist/CachedChat.d.ts

@@ -1,32 +1,34 @@
-import { AxiosInstance } from "axios";
 import { PresenceChannel } from "laravel-echo";
-import { ChatOptions } from "./Chat";
+import API from "./API";
 import ChatSubscription from "./ChatSubscription";
 import { Logger } from "./Logger";
+import Message from "./Message";
+import PendingMessage from "./PendingMessage";
 export interface CachedChatParams {
     id: number;
-    jwtToken?: string;
-    axios: AxiosInstance;
+    api: API;
     channel: PresenceChannel;
     logger: Logger;
-    getChatStoreMessageRoute: ChatOptions['getChatStoreMessageRoute'];
     leave: () => void;
 }
+export declare type Messages = (Message | PendingMessage)[];
 export default class CachedChat {
     private id;
-    private jwtToken;
-    private axios;
+    private api;
     private messages;
     private subscriptions;
     private channel;
     private logger;
-    private getChatStoreMessageRoute;
     private _leave;
-    constructor({ id, jwtToken, axios, channel, logger, getChatStoreMessageRoute, leave }: CachedChatParams);
-    sendMessage(message: string): Promise<any>;
+    constructor({ id, api, channel, logger, leave }: CachedChatParams);
+    sendMessage(message: string): Promise<void>;
+    getLatestMessages(): void;
+    addMessage(message: Message | PendingMessage): void;
+    private replacePendingMessage;
     addSubscription(subscription: ChatSubscription): void;
     cancelSubscription(subscription: ChatSubscription): void;
     cancelAllSubscriptions(): void;
+    private fireMessagesEventOnEachActiveSubscription;
     leave(): void;
     cancelAllSubscriptionsAndLeave(): void;
 }

package/dist/CachedChat.js

@@ -1,48 +1,72 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const Message_1 = __importStar(require("./Message"));
+const PendingMessage_1 = __importDefault(require("./PendingMessage"));
 class CachedChat {
-    constructor({ id, jwtToken, axios, channel, logger, getChatStoreMessageRoute, leave }) {
+    constructor({ id, api, channel, logger, leave }) {
         this.id = id;
-        this.jwtToken = jwtToken;
-        this.axios = axios;
+        this.api = api;
         this.messages = [];
         this.subscriptions = [];
         this.channel = channel;
         this.logger = logger;
-        this.getChatStoreMessageRoute = getChatStoreMessageRoute;
         this._leave = leave;
         channel
             .here((users) => {
             console.log('Cached here', users);
             this.subscriptions.forEach((subscription) => {
-                if (subscription.getStatus() === 'active') {
-                    subscription.event('onHere', users);
-                }
+                subscription.fireEventIfActive('here', users);
             });
         })
             .joining((user) => {
             console.log('Cached joining', user);
             this.subscriptions.forEach((subscription) => {
-                if (subscription.getStatus() === 'active') {
-                    subscription.event('onUserJoining', user);
-                }
+                subscription.fireEventIfActive('userJoining', user);
             });
         })
             .leaving((user) => {
             console.log('Cached leaving', user);
             this.subscriptions.forEach((subscription) => {
-                if (subscription.getStatus() === 'active') {
-                    subscription.event('onUserLeaving', user);
-                }
+                subscription.fireEventIfActive('userLeaving', user);
             });
         })
             .listen('.chat.message.created', (event) => {
-            console.log('Cached .chat.message.created', event);
-            this.subscriptions.forEach((subscription) => {
-                if (subscription.getStatus() === 'active') {
-                    subscription.event('onMessage', event);
-                }
-            });
+            console.log('.chat.message.created', event);
+            this.addMessage(new Message_1.default({
+                id: event.id,
+                chatId: event.chat_id,
+                message: event.message,
+                senderId: event.sender_id,
+                sender: event.sender,
+                isAdminMessage: event.isAdminMessage
+            }));
+            this.fireMessagesEventOnEachActiveSubscription();
         })
             .error((error) => {
             console.error(error);
@@ -50,21 +74,64 @@ class CachedChat {
     }
     sendMessage(message) {
         return new Promise((resolve, reject) => {
-            this.axios.post(this.getChatStoreMessageRoute(this.id), {
-                message
-            }, {
-                headers: this.jwtToken
-                    ? { 'Authorization': `Bearer ${this.jwtToken}` }
-                    : undefined,
-            }).then(response => {
-                console.log(response);
-                resolve(response);
+            const pendingMessage = new PendingMessage_1.default({
+                message,
+                status: 'pending'
+            });
+            this.addMessage(pendingMessage);
+            this.fireMessagesEventOnEachActiveSubscription();
+            this.api.storeMessage(this.id, message).then(({ message, error }) => {
+                if (error) {
+                    return;
+                }
+                this.replacePendingMessage(pendingMessage, message);
+                this.fireMessagesEventOnEachActiveSubscription();
             }).catch(err => {
                 this.logger.error(err);
-                reject(err);
             });
         });
     }
+    getLatestMessages() {
+        this.api.getLatestMessages(this.id).then(({ messages, error }) => {
+            if (messages) {
+                messages.forEach(m => this.addMessage(m));
+                this.fireMessagesEventOnEachActiveSubscription();
+            }
+        }).catch(err => {
+            this.logger.error(err);
+        });
+    }
+    addMessage(message) {
+        if (message instanceof PendingMessage_1.default) {
+            this.messages.push(message);
+            return;
+        }
+        let index = -1;
+        for (let i = this.messages.length; i >= 0; i--) {
+            if ((0, Message_1.isMessageThen)(this.messages[i], m => m.id < message.id)) {
+                index = i;
+            }
+            if ((0, Message_1.isMessageThen)(this.messages[i], m => m.id === message.id)) {
+                return;
+            }
+        }
+        if (index === -1) {
+            this.messages.unshift(message);
+            this.messages = this.messages.concat([]);
+        }
+        else {
+            this.messages.splice(index, 0, message);
+            this.messages = this.messages.concat([]);
+        }
+    }
+    replacePendingMessage(pendingMessage, message) {
+        this.messages = this.messages.map((m) => {
+            if (m === pendingMessage) {
+                return message;
+            }
+            return m;
+        });
+    }
     addSubscription(subscription) {
         this.subscriptions.push(subscription);
     }
@@ -76,6 +143,11 @@ class CachedChat {
             this.cancelSubscription(subscription);
         });
     }
+    fireMessagesEventOnEachActiveSubscription() {
+        this.subscriptions.forEach((subscription) => {
+            subscription.fireEventIfActive('messages', this.messages);
+        });
+    }
     leave() {
         this._leave();
     }

package/dist/CachedChat.js.map

@@ -1 +1 @@
-{"version":3,"file":"CachedChat.js","sourceRoot":"","sources":["../src/CachedChat.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CachedChat.js","sourceRoot":"","sources":["../src/CachedChat.ts"],"names":[],"mappings":"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"}

package/dist/Chat.d.ts

@@ -1,11 +1,12 @@
 import Echo from "laravel-echo";
-import { Logger } from "./Logger";
+import ChatError from "./ChatError";
 import CachedChat from "./CachedChat";
 import { AxiosInstance } from 'axios';
+import { Logger } from "./Logger";
 import ChatSubscription from "./ChatSubscription";
 export interface ChatOptions {
     echo: Echo;
-    axios?: AxiosInstance;
+    axios: AxiosInstance;
     logger?: Logger;
     jwtToken?: string;
     constructPusher: (config: ConstructPusherConfig) => any;
@@ -26,30 +27,6 @@ export declare type GetReturnValue = {
     subscription?: undefined;
     error: ChatError;
 };
-export interface GetLatestChatMessagesOptions {
-    headers?: {
-        [index: string]: string | undefined;
-    };
-}
-export declare type GetLatestChatMessagesReturnValue = {
-    messages: any[];
-    error?: undefined;
-} | {
-    messages?: undefined;
-    error: ChatError;
-};
-export interface GetChatIdFromAppointmentIdOptions {
-    headers?: {
-        [index: string]: string | undefined;
-    };
-}
-export declare type GetChatIdFromAppointmentIdReturnValue = {
-    chatId: number;
-    error?: undefined;
-} | {
-    chatId?: undefined;
-    error: ChatError;
-};
 export declare type GetChatReturnValue = {
     chat: CachedChat;
     error?: undefined;
@@ -57,10 +34,6 @@ export declare type GetChatReturnValue = {
     chat?: undefined;
     error: ChatError;
 };
-export interface ChatError {
-    code: ChatErrorCode;
-}
-export declare type ChatErrorCode = 'error' | 'unauthorized' | 'chat_not_initialized' | 'echo_is_not_defined';
 declare const Chat: {
     init: (_options: ChatOptions) => void;
     isInitialized: () => boolean;

package/dist/Chat.js

@@ -13,14 +13,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const laravel_echo_1 = __importDefault(require("laravel-echo"));
-const Logger_1 = require("./Logger");
+const API_1 = __importDefault(require("./API"));
 const CachedChat_1 = __importDefault(require("./CachedChat"));
-const axios_1 = __importDefault(require("axios"));
+const Logger_1 = require("./Logger");
 const ChatSubscription_1 = __importDefault(require("./ChatSubscription"));
 const Chat = (function () {
     let initialized = false;
     let echo;
-    let axios;
+    let api;
     let logger;
     let options;
     const chats = {};
@@ -37,7 +37,13 @@ const Chat = (function () {
                 jwtToken: options.jwtToken
             })
         });
-        axios = options.axios || axios_1.default.create();
+        api = new API_1.default({
+            axios: options.axios,
+            jwtToken: options.jwtToken,
+            getChatMessagesRoute: options.getChatMessagesRoute,
+            getChatStoreMessageRoute: options.getChatStoreMessageRoute,
+            getChatForAppointmentRoute: options.getChatForAppointmentRoute
+        });
         logger = options.logger || new Logger_1.ConsoleLogger;
     };
     const isInitialized = () => {
@@ -54,103 +60,47 @@ const Chat = (function () {
                 jwtToken: options.jwtToken
             })
         });
+        api = new API_1.default({
+            axios: options.axios,
+            jwtToken: options.jwtToken,
+            getChatMessagesRoute: options.getChatMessagesRoute,
+            getChatStoreMessageRoute: options.getChatStoreMessageRoute,
+            getChatForAppointmentRoute: options.getChatForAppointmentRoute
+        });
     };
     const logout = () => {
+        if (typeof echo === 'undefined') {
+            return;
+        }
+        const _echo = echo;
+        echo = undefined;
         for (const chatId in chats) {
             if (Object.prototype.hasOwnProperty.call(chats, chatId)) {
                 chats[chatId].cancelAllSubscriptionsAndLeave();
                 delete chats[chatId];
             }
         }
-        if (typeof echo !== 'undefined') {
-            echo.disconnect();
-            echo = undefined;
-        }
+        _echo.disconnect();
     };
     const get = (id) => __awaiter(this, void 0, void 0, function* () {
-        const { chat, error: getChatError } = getChat(id);
-        if (getChatError) {
-            return { error: getChatError };
-        }
-        let { messages, error: getLatestChatMessagesError } = yield getLatestChatMessages(id, {
-            headers: options.jwtToken
-                ? { 'Authorization': `Bearer ${options.jwtToken}` }
-                : undefined
-        });
-        console.log('MESSAGES', messages);
-        if (getLatestChatMessagesError) {
-            return { error: getLatestChatMessagesError };
+        const { chat, error } = getChat(id);
+        if (error) {
+            return { error };
         }
         const subscription = new ChatSubscription_1.default(chat, {
             status: 'active'
         });
         chat.addSubscription(subscription);
+        chat.getLatestMessages();
         return { subscription };
     });
     const appointment = (appointmentId) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        let chatId;
-        try {
-            const result = yield getChatIdFromAppointmentId(appointmentId);
-            if (result.error) {
-                return { error: result.error };
-            }
-            chatId = result.chatId;
-        }
-        catch (error) {
-            if (!(error instanceof Error)) {
-                throw error;
-            }
-            logger.error(error);
-            if (axios_1.default.isAxiosError(error) && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 403) {
-                return { error: { code: 'unauthorized' } };
-            }
-            return { error: { code: 'error' } };
+        const { chatId, error } = yield api.getChatIdFromAppointmentId(appointmentId);
+        if (error) {
+            return { error };
         }
         return yield get(chatId);
     });
-    const getLatestChatMessages = (id, opts) => __awaiter(this, void 0, void 0, function* () {
-        var _b;
-        try {
-            const response = yield axios.get(options.getChatMessagesRoute(id), {
-                headers: options.jwtToken
-                    ? { 'Authorization': `Bearer ${options.jwtToken}` }
-                    : undefined
-            });
-            return { messages: response.data.data };
-        }
-        catch (error) {
-            if (!(error instanceof Error)) {
-                throw error;
-            }
-            logger.error(error);
-            if (axios_1.default.isAxiosError(error) && ((_b = error.response) === null || _b === void 0 ? void 0 : _b.status) === 403) {
-                return { error: { code: 'unauthorized' } };
-            }
-            return { error: { code: 'error' } };
-        }
-    });
-    const getChatIdFromAppointmentId = (appointmentId, opts) => __awaiter(this, void 0, void 0, function* () {
-        var _c;
-        try {
-            const response = yield axios.get(options.getChatForAppointmentRoute(appointmentId), {
-                headers: options.jwtToken
-                    ? { 'Authorization': `Bearer ${options.jwtToken}` }
-                    : undefined
-            });
-            return { chatId: response.data.data.id };
-        }
-        catch (error) {
-            if (!(error instanceof Error)) {
-                throw error;
-            }
-            logger.error(error);
-            if (axios_1.default.isAxiosError(error) && ((_c = error.response) === null || _c === void 0 ? void 0 : _c.status) === 403) {
-                return { error: { code: 'unauthorized' } };
-            }
-            return { error: { code: 'error' } };
-        }
-    });
     const getChat = (chatId) => {
         if (!echo) {
             return { error: {
@@ -160,11 +110,9 @@ const Chat = (function () {
         if (!(chatId.toString() in chats)) {
             chats[chatId] = new CachedChat_1.default({
                 id: chatId,
-                jwtToken: options.jwtToken,
-                axios,
+                api,
                 channel: echo.join(getChannelName(chatId)),
                 logger,
-                getChatStoreMessageRoute: options.getChatStoreMessageRoute,
                 leave: () => echo === null || echo === void 0 ? void 0 : echo.leave(getChannelName(chatId))
             });
         }

package/dist/Chat.js.map

@@ -1 +1 @@
-{"version":3,"file":"Chat.js","sourceRoot":"","sources":["../src/Chat.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Chat.js","sourceRoot":"","sources":["../src/Chat.ts"],"names":[],"mappings":"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"}

package/dist/ChatError.d.ts

@@ -0,0 +1,3 @@
+export default interface ChatError {
+    code: ('error' | 'unauthorized' | 'chat_not_initialized' | 'echo_is_not_defined');
+}

package/dist/ChatError.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=ChatError.js.map

package/dist/ChatError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ChatError.js","sourceRoot":"","sources":["../src/ChatError.ts"],"names":[],"mappings":""}

package/dist/ChatSubscription.d.ts

@@ -1,14 +1,14 @@
-import CachedChat from "./CachedChat";
+import CachedChat, { Messages } from "./CachedChat";
 export declare type ChatSubscriptionStatus = 'active' | 'cancelled';
 export interface ChatSubscriptionOptions {
     status: ChatSubscriptionStatus;
 }
 export interface ChatSubscriptionEventHandlers {
-    onMessage?: (event: any) => void;
-    onHere?: (event: any) => void;
-    onUserJoining?: (event: any) => void;
-    onUserLeaving?: (event: any) => void;
-    onStatusChange?: (status: ChatSubscriptionStatus) => void;
+    messages?: (messages: Messages) => void;
+    here?: (event: any) => void;
+    userJoining?: (event: any) => void;
+    userLeaving?: (event: any) => void;
+    statusChange?: (status: ChatSubscriptionStatus) => void;
 }
 export default class ChatSubscription {
     private chat;
@@ -18,11 +18,8 @@ export default class ChatSubscription {
     getStatus(): ChatSubscriptionStatus;
     setStatus(status: ChatSubscriptionStatus): void;
     sendMessage(message: string): Promise<any>;
-    onMessage(handler: ChatSubscriptionEventHandlers['onMessage']): this;
-    onHere(handler: ChatSubscriptionEventHandlers['onHere']): this;
-    onUserJoining(handler: ChatSubscriptionEventHandlers['onUserJoining']): this;
-    onUserLeaving(handler: ChatSubscriptionEventHandlers['onUserLeaving']): this;
-    onStatusChange(handler: ChatSubscriptionEventHandlers['onStatusChange']): this;
-    event(name: keyof ChatSubscriptionEventHandlers, data: any): void;
+    on<Event extends keyof ChatSubscriptionEventHandlers>(event: Event, handler: ChatSubscriptionEventHandlers[Event]): this;
+    fireEvent(name: keyof ChatSubscriptionEventHandlers, data: any): void;
+    fireEventIfActive(name: keyof ChatSubscriptionEventHandlers, data: any): void;
     cancel(): void;
 }

package/dist/ChatSubscription.js

@@ -15,30 +15,19 @@ class ChatSubscription {
     sendMessage(message) {
         return this.chat.sendMessage(message);
     }
-    onMessage(handler) {
-        this.eventHandlers.onMessage = handler;
+    on(event, handler) {
+        this.eventHandlers[event] = handler;
         return this;
     }
-    onHere(handler) {
-        this.eventHandlers.onHere = handler;
-        return this;
-    }
-    onUserJoining(handler) {
-        this.eventHandlers.onUserJoining = handler;
-        return this;
-    }
-    onUserLeaving(handler) {
-        this.eventHandlers.onUserLeaving = handler;
-        return this;
-    }
-    onStatusChange(handler) {
-        this.eventHandlers.onStatusChange = handler;
-        return this;
-    }
-    event(name, data) {
+    fireEvent(name, data) {
         var _a, _b;
         (_b = (_a = this.eventHandlers)[name]) === null || _b === void 0 ? void 0 : _b.call(_a, data);
     }
+    fireEventIfActive(name, data) {
+        if (this.status === 'active') {
+            this.fireEvent(name, data);
+        }
+    }
     cancel() {
         this.chat.cancelSubscription(this);
     }

package/dist/ChatSubscription.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChatSubscription.js","sourceRoot":"","sources":["../src/ChatSubscription.ts"],"names":[],"mappings":";;AAkBA,MAAqB,gBAAgB;IAKjC,YAAY,IAAgB,EAAE,OAAgC;QAC1D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;IAC5B,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,SAAS,CAAC,MAA8B;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,WAAW,CAAC,OAAe;QACvB,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,SAAS,CAAC,OAAmD;QACzD,IAAI,CAAC,aAAa,CAAC,SAAS,GAAG,OAAO,CAAC;QACvC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,OAAgD;QACnD,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,OAAO,CAAC;QACpC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,aAAa,CAAC,OAAuD;QACjE,IAAI,CAAC,aAAa,CAAC,aAAa,GAAG,OAAO,CAAC;QAC3C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,aAAa,CAAC,OAAuD;QACjE,IAAI,CAAC,aAAa,CAAC,aAAa,GAAG,OAAO,CAAC;QAC3C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,cAAc,CAAC,OAAwD;QACnE,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,OAAO,CAAC;QAC5C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,IAAyC,EAAE,IAAS;;QACtD,MAAA,MAAA,IAAI,CAAC,aAAa,EAAC,IAAI,CAAC,mDAAG,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,MAAM;QACF,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;CACJ;AAvDD,mCAuDC"}
+{"version":3,"file":"ChatSubscription.js","sourceRoot":"","sources":["../src/ChatSubscription.ts"],"names":[],"mappings":";;AAkBA,MAAqB,gBAAgB;IAKjC,YAAY,IAAgB,EAAE,OAAgC;QAC1D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;IAC5B,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,SAAS,CAAC,MAA8B;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,WAAW,CAAC,OAAe;QACvB,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,EAAE,CAAoD,KAAY,EAAE,OAA6C;QAC7G,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;QACpC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,SAAS,CAAC,IAAyC,EAAE,IAAS;;QAC1D,MAAA,MAAA,IAAI,CAAC,aAAa,EAAC,IAAI,CAAC,mDAAG,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,iBAAiB,CAAC,IAAyC,EAAE,IAAS;QAClE,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE;YAC1B,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAC9B;IACL,CAAC;IAED,MAAM;QACF,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;CACJ;AAzCD,mCAyCC"}

package/dist/Message.d.ts

@@ -0,0 +1,22 @@
+export interface Sender {
+    first_name: string;
+}
+export default class Message {
+    readonly id: number;
+    readonly chatId: number;
+    readonly message: string;
+    readonly senderId: number;
+    readonly sender: Sender;
+    readonly isAdminMessage: boolean;
+    constructor({ id, chatId, message, senderId, sender, isAdminMessage }: {
+        id: number;
+        chatId: number;
+        message: string;
+        senderId: number;
+        sender: Sender;
+        isAdminMessage: boolean;
+    });
+    get isPendingMessage(): boolean;
+}
+export declare const isMessage: (m: unknown) => m is Message;
+export declare const isMessageThen: (m: unknown, then: (m: Message) => boolean) => boolean;

package/dist/Message.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isMessageThen = exports.isMessage = void 0;
+class Message {
+    constructor({ id, chatId, message, senderId, sender, isAdminMessage }) {
+        this.id = id;
+        this.chatId = chatId;
+        this.message = message;
+        this.senderId = senderId;
+        this.sender = sender;
+        this.isAdminMessage = isAdminMessage;
+    }
+    get isPendingMessage() {
+        return false;
+    }
+}
+exports.default = Message;
+const isMessage = (m) => {
+    return m instanceof Message;
+};
+exports.isMessage = isMessage;
+const isMessageThen = (m, then) => {
+    if ((0, exports.isMessage)(m)) {
+        return then(m);
+    }
+    return false;
+};
+exports.isMessageThen = isMessageThen;
+//# sourceMappingURL=Message.js.map

package/dist/Message.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Message.js","sourceRoot":"","sources":["../src/Message.ts"],"names":[],"mappings":";;;AAIA,MAAqB,OAAO;IAQxB,YAAY,EACR,EAAE,EACF,MAAM,EACN,OAAO,EACP,QAAQ,EACR,MAAM,EACN,cAAc,EAQjB;QACG,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACzC,CAAC;IAED,IAAW,gBAAgB;QACvB,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AAlCD,0BAkCC;AAEM,MAAM,SAAS,GAAG,CAAC,CAAU,EAAgB,EAAE;IAClD,OAAO,CAAC,YAAY,OAAO,CAAC;AAChC,CAAC,CAAA;AAFY,QAAA,SAAS,aAErB;AAEM,MAAM,aAAa,GAAG,CAAC,CAAU,EAAE,IAA6B,EAAW,EAAE;IAChF,IAAI,IAAA,iBAAS,EAAC,CAAC,CAAC,EAAE;QACd,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;KAClB;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAA;AALY,QAAA,aAAa,iBAKzB"}

package/dist/PendingMessage.d.ts

@@ -0,0 +1,10 @@
+export default class PendingMessage {
+    readonly message: string;
+    status: 'pending' | 'failed';
+    constructor({ message, status }: {
+        message: string;
+        status: PendingMessageStatus;
+    });
+    get isPendingMessage(): boolean;
+}
+export declare type PendingMessageStatus = 'pending' | 'failed';

package/dist/PendingMessage.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class PendingMessage {
+    constructor({ message, status }) {
+        this.message = message;
+        this.status = status;
+    }
+    get isPendingMessage() {
+        return true;
+    }
+}
+exports.default = PendingMessage;
+//# sourceMappingURL=PendingMessage.js.map

package/dist/PendingMessage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PendingMessage.js","sourceRoot":"","sources":["../src/PendingMessage.ts"],"names":[],"mappings":";;AAKA,MAAqB,cAAc;IAI/B,YAAY,EAAE,OAAO,EAAE,MAAM,EAAqD;QAC9E,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,IAAW,gBAAgB;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAZD,iCAYC"}

package/dist/react/useChat.d.ts

@@ -1,8 +1,9 @@
+import { Messages } from '../CachedChat';
 export interface UseChatOptions {
     idType?: 'appointment';
 }
 export interface UseChatReturnValue {
-    messages: any[];
+    messages: Messages;
     sendMessage: (message: string) => Promise<any> | void;
 }
 declare const useChat: (id: number, { idType }: UseChatOptions) => UseChatReturnValue;

package/dist/react/useChat.js

@@ -17,14 +17,16 @@ const useChat = (id, { idType }) => {
     const handleUserLeaving = (user) => {
         console.log('handleUserLeaving', user);
     };
-    const handleMessage = (event) => {
-        console.log('handleMessage', event);
+    const handleMessages = (messages) => {
+        setMessages(messages);
     };
     const handleStatusChange = (status) => {
         console.log('status change', status);
     };
     (0, react_1.useEffect)(() => {
-        const method = idType === 'appointment' ? 'appointment' : 'get';
+        const method = idType === 'appointment'
+            ? 'appointment'
+            : 'get';
         Chat_1.default[method](id).then(({ subscription, error }) => {
             if (error) {
                 console.log('ERROR', error);
@@ -37,7 +39,7 @@ const useChat = (id, { idType }) => {
     }, []);
     (0, react_1.useEffect)(() => {
         var _a, _b, _c, _d;
-        (_d = (_c = (_b = (_a = subscription === null || subscription === void 0 ? void 0 : subscription.onHere(handleHere)) === null || _a === void 0 ? void 0 : _a.onUserJoining(handleUserJoining)) === null || _b === void 0 ? void 0 : _b.onUserLeaving(handleUserLeaving)) === null || _c === void 0 ? void 0 : _c.onMessage(handleMessage)) === null || _d === void 0 ? void 0 : _d.onStatusChange(handleStatusChange);
+        (_d = (_c = (_b = (_a = subscription === null || subscription === void 0 ? void 0 : subscription.on('here', handleHere)) === null || _a === void 0 ? void 0 : _a.on('userJoining', handleUserJoining)) === null || _b === void 0 ? void 0 : _b.on('userLeaving', handleUserLeaving)) === null || _c === void 0 ? void 0 : _c.on('messages', handleMessages)) === null || _d === void 0 ? void 0 : _d.on('statusChange', handleStatusChange);
         return () => {
             subscription === null || subscription === void 0 ? void 0 : subscription.cancel();
         };

package/dist/react/useChat.js.map

@@ -1 +1 @@
-{"version":3,"file":"useChat.js","sourceRoot":"","sources":["../../src/react/useChat.ts"],"names":[],"mappings":";;;;;AAAA,mDAA2B;AAC3B,iCAA0C;AAY1C,MAAM,OAAO,GAAG,CAAC,EAAU,EAAE,EAAE,MAAM,EAAkB,EAAsB,EAAE;IAC3E,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,GAA8B,CAAC;IAC/E,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAQ,EAAE,CAAC,CAAC;IAEpD,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE;QAC9B,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IACrC,CAAC,CAAA;IAED,MAAM,iBAAiB,GAAG,CAAC,IAAS,EAAE,EAAE;QACpC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC,CAAA;IAED,MAAM,iBAAiB,GAAG,CAAC,IAAS,EAAE,EAAE;QACpC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC,CAAA;IAED,MAAM,aAAa,GAAG,CAAC,KAAU,EAAE,EAAE;QACjC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC,CAAA;IAED,MAAM,kBAAkB,GAAG,CAAC,MAA8B,EAAE,EAAE;QAC1D,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IACzC,CAAC,CAAA;IAED,IAAA,iBAAS,EAAC,GAAG,EAAE;QACX,MAAM,MAAM,GAAG,MAAM,KAAK,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC;QAChE,cAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,EAAC,YAAY,EAAE,KAAK,EAAC,EAAE,EAAE;YAC5C,IAAI,KAAK,EAAE;gBAEP,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBAC5B,OAAO;aACV;YACD,eAAe,CAAC,YAAY,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;YAClB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAC3B,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAA,iBAAS,EAAC,GAAG,EAAE;;QACX,MAAA,MAAA,MAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CACN,MAAM,CAAC,UAAU,CAAC,0CAClB,aAAa,CAAC,iBAAiB,CAAC,0CAChC,aAAa,CAAC,iBAAiB,CAAC,0CAChC,SAAS,CAAC,aAAa,CAAC,0CACxB,cAAc,CAAC,kBAAkB,CAAC,CAAA;QAExC,OAAO,GAAG,EAAE;YACR,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,EAAE,CAAC;QAC3B,CAAC,CAAA;IACL,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,OAAO;QACH,QAAQ;QACR,WAAW,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,WAAW,CAAC,OAAO,CAAC;KACvE,CAAA;AACL,CAAC,CAAA;AAED,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"useChat.js","sourceRoot":"","sources":["../../src/react/useChat.ts"],"names":[],"mappings":";;;;;AAAA,mDAA2B;AAC3B,iCAA0C;AAa1C,MAAM,OAAO,GAAG,CAAC,EAAU,EAAE,EAAE,MAAM,EAAkB,EAAsB,EAAE;IAC3E,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,GAA8B,CAAC;IAC/E,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAW,EAAE,CAAC,CAAC;IAEvD,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE;QAC9B,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IACrC,CAAC,CAAA;IAED,MAAM,iBAAiB,GAAG,CAAC,IAAS,EAAE,EAAE;QACpC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC,CAAA;IAED,MAAM,iBAAiB,GAAG,CAAC,IAAS,EAAE,EAAE;QACpC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC,CAAA;IAED,MAAM,cAAc,GAAG,CAAC,QAAkB,EAAE,EAAE;QAC1C,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC1B,CAAC,CAAA;IAED,MAAM,kBAAkB,GAAG,CAAC,MAA8B,EAAE,EAAE;QAC1D,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IACzC,CAAC,CAAA;IAED,IAAA,iBAAS,EAAC,GAAG,EAAE;QACX,MAAM,MAAM,GAAG,MAAM,KAAK,aAAa;YACnC,CAAC,CAAC,aAAa;YACf,CAAC,CAAC,KAAK,CAAC;QACZ,cAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,EAAC,YAAY,EAAE,KAAK,EAAC,EAAE,EAAE;YAC5C,IAAI,KAAK,EAAE;gBAEP,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBAC5B,OAAO;aACV;YACD,eAAe,CAAC,YAAY,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;YAClB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAC3B,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAA,iBAAS,EAAC,GAAG,EAAE;;QACX,MAAA,MAAA,MAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CACN,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,0CACtB,EAAE,CAAC,aAAa,EAAE,iBAAiB,CAAC,0CACpC,EAAE,CAAC,aAAa,EAAE,iBAAiB,CAAC,0CACpC,EAAE,CAAC,UAAU,EAAE,cAAc,CAAC,0CAC9B,EAAE,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;QAE5C,OAAO,GAAG,EAAE;YACR,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,EAAE,CAAC;QAC3B,CAAC,CAAA;IACL,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,OAAO;QACH,QAAQ;QACR,WAAW,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,WAAW,CAAC,OAAO,CAAC;KACvE,CAAA;AACL,CAAC,CAAA;AAED,kBAAe,OAAO,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viewberapp/chat",
-  "version": "0.0.21",
+  "version": "0.0.24",
   "description": "Viewber chat",
   "author": "Jacob <jacob.chen@viewber.co.uk>",
   "homepage": "https://bitbucket.org/ezadr/viewberjs#readme",
@@ -39,5 +39,5 @@
     "react": "^16.14.0",
     "rollbar": "^2.25.0"
   },
-  "gitHead": "07dd17a53b90d872eb48561da34f9a15eac041b8"
+  "gitHead": "3ef800ca3530449f36fe93a6aaf4cfca5d853224"
 }