bulbul-chat - npm Package Compare versions

Comparing version 2.9.4 to 2.10.0

dist/package.json

 {
     "name": "bulbul-chat",
-    "version": "2.9.4",
+    "version": "2.10.0",
     "description": "",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

dist/src/ChannelStorage.d.ts

 import { ChannelStoragStateType } from './useChannelsData';
-import ChatClient, { ArchivedChannel, BlockedUser, ChatChannel } from './ChatClient';
+import ChatClient, { ArchivedChannel, BlockedUser, ChatChannel, DraftMessage } from './ChatClient';
 declare class ChannelsStorage {
@@ -16,2 +16,3 @@ private eventRegistry;
     private archivedChannels;
+    private draftMessages;
     constructor();
@@ -24,2 +25,3 @@ upsert(channels: ChatChannel[]): void;
         isArchived: boolean;
+        draft: string | undefined;
         id: string;
@@ -57,4 +59,6 @@ externalId: string;
     setArchivedChannels(archivedChannels: ArchivedChannel[], targetChannelId?: string): void;
+    setDraftMessages(draftMessages: DraftMessage[], targetChannelId?: string): void;
+    updateDraftMessage(channelId: string, draft: string | undefined): void;
 }
 export default ChannelsStorage;
 //# sourceMappingURL=ChannelStorage.d.ts.map

dist/src/ChannelStorage.js

@@ -49,2 +49,7 @@ "use strict";
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
@@ -70,2 +75,3 @@ return (mod && mod.__esModule) ? mod : { "default": mod };
         this.archivedChannels = [];
+        this.draftMessages = [];
     }
@@ -102,3 +108,6 @@ ChannelsStorage.prototype.upsert = function (channels) {
             .sort('lastActivityAt', 'desc')
-            .map(function (channel) { return (__assign(__assign({}, channel), { isArchived: _this.archivedChannels.some(function (ac) { return ac.channelId === channel.id; }) })); });
+            .map(function (channel) {
+            var _a;
+            return (__assign(__assign({}, channel), { isArchived: _this.archivedChannels.some(function (ac) { return ac.channelId === channel.id; }), draft: (_a = _this.draftMessages.find(function (dm) { return dm.channelId === channel.id; })) === null || _a === void 0 ? void 0 : _a.draft }));
+        });
     };
@@ -287,2 +296,28 @@ ChannelsStorage.prototype.earliestDate = function () {
     };
+    ChannelsStorage.prototype.setDraftMessages = function (draftMessages, targetChannelId) {
+        this.draftMessages = draftMessages;
+        var channels = this.sortedChannels();
+        this.upsert(channels);
+        this.eventRegistry.emit('update', {
+            channel: channels.find(function (c) { return c.id.toString() === (targetChannelId === null || targetChannelId === void 0 ? void 0 : targetChannelId.toString()); }),
+        });
+    };
+    ChannelsStorage.prototype.updateDraftMessage = function (channelId, draft) {
+        var nDraftMessages = this.draftMessages.filter(function (draftMessage) {
+            return draftMessage.channelId.toString() === channelId.toString();
+        });
+        if (!draft) {
+            return this.setDraftMessages(nDraftMessages);
+        }
+        var draftMessage = this.draftMessages.find(function (draftMessage) {
+            return draftMessage.channelId.toString() === channelId.toString();
+        });
+        if (!draftMessage) {
+            draftMessage = { channelId: channelId, draft: draft };
+        }
+        else {
+            draftMessage.draft = draft;
+        }
+        return this.setDraftMessages(__spreadArray(__spreadArray([], nDraftMessages), [draftMessage]));
+    };
     return ChannelsStorage;
@@ -289,0 +324,0 @@ }());

dist/src/ChatClient.d.ts

@@ -34,2 +34,7 @@ export declare type ChatMessageType = 'plaintext' | 'image' | 'video' | 'audio' | 'document' | 'location' | 'contact' | 'file' | 'url' | 'card';
 };
+export declare type DraftMessage = {
+    userId?: string;
+    channelId: string;
+    draft: string;
+};
 export declare type ChatChannel = {
@@ -52,2 +57,3 @@ id: string;
     isArchived: boolean;
+    draft?: string;
 };
@@ -132,2 +138,6 @@ export declare type ChatChannelUpsert = {
     }) => void): () => void;
+    onUpdateDraft(callback: (data: {
+        channelId: string;
+        draft: string | undefined;
+    }) => void): () => void;
     emitMarkReadUntil(channelId: string, messageId?: string): Promise<void>;
@@ -160,2 +170,4 @@ getUnreadMessageCount(channel: ChatChannel): Promise<ChatChannel>;
     getArchivedChannels(): Promise<ArchivedChannel[]>;
+    updateDraftMessage(channelId: string, draft: string): Promise<any>;
+    getDraftMessages(): Promise<DraftMessage[]>;
     deleteMessage(messageId: string): Promise<any>;
@@ -162,0 +174,0 @@ getStatus(): Promise<{

dist/src/ChatClient.js

@@ -188,2 +188,5 @@ "use strict";
         });
+        this.socket.on('updateDraft', function (data) {
+            _this.eventRegistry.emit('updateDraft', data);
+        });
     };
@@ -260,2 +263,5 @@ ChatClient.prototype.connect = function () {
     };
+    ChatClient.prototype.onUpdateDraft = function (callback) {
+        return this.eventRegistry.on('updateDraft', callback);
+    };
     ChatClient.prototype.emitMarkReadUntil = function (channelId, messageId) {
@@ -547,2 +553,16 @@ return __awaiter(this, void 0, void 0, function () {
     };
+    ChatClient.prototype.updateDraftMessage = function (channelId, draft) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.executeHTTP('PUT', "/api/client/chat/users/drafts/" + channelId, {}, { draft: draft })];
+            });
+        });
+    };
+    ChatClient.prototype.getDraftMessages = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.executeHTTP('GET', '/api/client/chat/users/drafts', {}, {})];
+            });
+        });
+    };
     ChatClient.prototype.deleteMessage = function (messageId) {
@@ -549,0 +569,0 @@ return __awaiter(this, void 0, void 0, function () {

dist/src/ChatService.d.ts

@@ -41,2 +41,3 @@ import ChannelMessageStorage from './ChannelMessageStorage';
     unArchiveChannel(channelId: string): Promise<void>;
+    draftMessage(channelId: string, draft: string): Promise<void>;
     deleteMessage(messageId: string): Promise<any>;
@@ -43,0 +44,0 @@ loadEarlierChannels(): void;

dist/src/ChatService.js

@@ -225,2 +225,6 @@ "use strict";
         });
+        this.chatClient.onUpdateDraft(function (_a) {
+            var channelId = _a.channelId, draft = _a.draft;
+            _this.channelsStorage.updateDraftMessage(channelId, draft);
+        });
     }
@@ -392,3 +396,3 @@ ChatService.getService = function (token, endpoint) {
         var removeOnConnect = this.chatClient.onConnect(function () { return __awaiter(_this, void 0, void 0, function () {
-            var archivedChannels;
+            var archivedChannels, draftMessages;
             return __generator(this, function (_a) {
@@ -400,2 +404,6 @@ switch (_a.label) {
                         this.channelsStorage.setArchivedChannels(archivedChannels);
+                        return [4 /*yield*/, this.chatClient.getDraftMessages()];
+                    case 2:
+                        draftMessages = _a.sent();
+                        this.channelsStorage.setDraftMessages(draftMessages);
                         this.channelsStorage.loadAllLater(this.chatClient);
@@ -635,2 +643,19 @@ return [2 /*return*/];
     };
+    ChatService.prototype.draftMessage = function (channelId, draft) {
+        return __awaiter(this, void 0, void 0, function () {
+            var draftMessages;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.chatClient.updateDraftMessage(channelId, draft)];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, this.chatClient.getDraftMessages()];
+                    case 2:
+                        draftMessages = _a.sent();
+                        this.channelsStorage.setDraftMessages(draftMessages, channelId);
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     ChatService.prototype.deleteMessage = function (messageId) {
@@ -637,0 +662,0 @@ return __awaiter(this, void 0, void 0, function () {

package.json

 {
   "name": "bulbul-chat",
-  "version": "2.9.4",
+  "version": "2.10.0",
   "description": "",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

src/ChannelStorage.ts

@@ -6,2 +6,3 @@ import { ChannelStoragStateType } from './useChannelsData';
   ChatChannel,
+  DraftMessage,
 } from './ChatClient';
@@ -25,2 +26,3 @@ import EventRegistry from './EventRegistry';
   private archivedChannels: ArchivedChannel[];
+  private draftMessages: DraftMessage[];
 
@@ -37,2 +39,3 @@ constructor() {
     this.archivedChannels = [];
+    this.draftMessages = [];
   }
@@ -77,2 +80,4 @@
         ),
+        draft: this.draftMessages.find((dm) => dm.channelId === channel.id)
+          ?.draft,
       }));
@@ -234,4 +239,35 @@ }
   }
+
+  setDraftMessages(draftMessages: DraftMessage[], targetChannelId?: string) {
+    this.draftMessages = draftMessages;
+    const channels = this.sortedChannels();
+    this.upsert(channels);
+    this.eventRegistry.emit('update', {
+      channel: channels.find(
+        (c) => c.id.toString() === targetChannelId?.toString()
+      ),
+    });
+  }
+
+  updateDraftMessage(channelId: string, draft: string | undefined) {
+    const nDraftMessages = this.draftMessages.filter(
+      (draftMessage) =>
+        draftMessage.channelId.toString() === channelId.toString()
+    );
+    if (!draft) {
+      return this.setDraftMessages(nDraftMessages);
+    }
+    let draftMessage = this.draftMessages.find(
+      (draftMessage) =>
+        draftMessage.channelId.toString() === channelId.toString()
+    );
+    if (!draftMessage) {
+      draftMessage = { channelId, draft };
+    } else {
+      draftMessage.draft = draft;
+    }
+    return this.setDraftMessages([...nDraftMessages, draftMessage]);
+  }
 }
 
 export default ChannelsStorage;

src/ChatClient.ts

@@ -55,2 +55,7 @@ import * as qs from 'qs';
 };
+export type DraftMessage = {
+  userId?: string;
+  channelId: string;
+  draft: string;
+};
 
@@ -74,2 +79,3 @@ export type ChatChannel = {
   isArchived: boolean;
+  draft?: string;
 };
@@ -268,2 +274,5 @@
     });
+    this.socket.on('updateDraft', (data: any) => {
+      this.eventRegistry.emit('updateDraft', data);
+    });
   }
@@ -389,2 +398,8 @@
 
+  onUpdateDraft(
+    callback: (data: { channelId: string; draft: string | undefined }) => void
+  ) {
+    return this.eventRegistry.on('updateDraft', callback);
+  }
+
   async emitMarkReadUntil(channelId: string, messageId?: string) {
@@ -664,2 +679,15 @@ this.socket.emit(
 
+  async updateDraftMessage(channelId: string, draft: string) {
+    return this.executeHTTP(
+      'PUT',
+      `/api/client/chat/users/drafts/${channelId}`,
+      {},
+      { draft }
+    );
+  }
+
+  async getDraftMessages(): Promise<DraftMessage[]> {
+    return this.executeHTTP('GET', '/api/client/chat/users/drafts', {}, {});
+  }
+
   async deleteMessage(messageId: string): Promise<any> {
@@ -666,0 +694,0 @@ return this.executeHTTP(

src/ChatService.ts

@@ -190,2 +190,6 @@ import { diffInSeconds } from './utils';
     });
+
+    this.chatClient.onUpdateDraft(({ channelId, draft }) => {
+      this.channelsStorage.updateDraftMessage(channelId, draft);
+    });
   }
@@ -341,2 +345,7 @@
       this.channelsStorage.setArchivedChannels(archivedChannels);
+
+      // update draft messages list with latest
+      const draftMessages = await this.chatClient.getDraftMessages();
+      this.channelsStorage.setDraftMessages(draftMessages);
+
       this.channelsStorage.loadAllLater(this.chatClient);
@@ -519,2 +528,8 @@ });
 
+  async draftMessage(channelId: string, draft: string) {
+    await this.chatClient.updateDraftMessage(channelId, draft);
+    const draftMessages = await this.chatClient.getDraftMessages();
+    this.channelsStorage.setDraftMessages(draftMessages, channelId);
+  }
+
   async deleteMessage(messageId: string) {
@@ -521,0 +536,0 @@ return this.chatClient.deleteMessage(messageId);

No alert changes

Improved metrics

Total package byte prevSize

262787

increased by3.86%

Lines of code

4768

increased by3.63%

No dependency changes