@fabriktor/fx 0.0.53 → 0.0.55

package/dist/src/chat/chat.d.ts

@@ -4,6 +4,7 @@ import { type SearchPage } from "../core/search.js";
 type ChatInsertOptions = Parameters<ChatOperator["insertOneChat"]>[0];
 type ChatReplaceOptions = Parameters<ChatOperator["replaceOneChat"]>[0];
 export type CreateChatOptions = ChatInsertOptions;
+export type EnsureChatRoomOptions = Parameters<ChatOperator["ensureChatRoom"]>[0];
 export type MarkChatObjectsUploadedOptions = {
     id: ChatReplaceOptions["id"];
 };
@@ -104,6 +105,7 @@ export type GlobalChatRoomsSession = {
 };
 export interface ChatFXOperator {
     createChat(opts: CreateChatOptions): Promise<Chat>;
+    ensureChatRoom(opts: EnsureChatRoomOptions): Promise<string>;
     markChatObjectsUploaded(opts: MarkChatObjectsUploadedOptions): Promise<Chat>;
     searchChats(opts: SearchChatsOptions): Promise<SearchChatsPage>;
     newLatestChatsCursor(opts: LatestChatsOptions): LatestChatsCursor;
@@ -122,6 +124,7 @@ export declare class ChatFX implements ChatFXOperator {
     private users;
     constructor(opts: ChatFXOptions);
     createChat(opts: CreateChatOptions): Promise<Chat>;
+    ensureChatRoom(opts: EnsureChatRoomOptions): Promise<string>;
     markChatObjectsUploaded(opts: MarkChatObjectsUploadedOptions): Promise<Chat>;
     searchChats(opts: SearchChatsOptions): Promise<SearchChatsPage>;
     newLatestChatsCursor(opts: LatestChatsOptions): LatestChatsCursor;

package/dist/src/chat/chat.js

@@ -12,6 +12,7 @@ const wsRefreshRetryMilliseconds = 30 * 1000;
 const resourceChat = "chat";
 const resourceUser = "user";
 const msgCreatedChatIDMissing = "Created chat response did not contain an ID.";
+const msgEnsuredChatRoomIDMissing = "Ensured chat room response did not contain an ID.";
 const msgChatMissing = "Chat could not be resolved after the mutation.";
 const msgSearchQueryRequired = "Search query is required.";
 const msgChatObjectsUploading = "Cannot react to a chat while objects are still uploading.";
@@ -28,6 +29,10 @@ export class ChatFX {
         const id = requiredOperationID(out, msgCreatedChatIDMissing);
         return await this.findChat(id);
     }
+    async ensureChatRoom(opts) {
+        const out = await this.chat.ensureChatRoom(opts);
+        return requiredOperationID(out, msgEnsuredChatRoomIDMissing);
+    }
     async markChatObjectsUploaded(opts) {
         await this.chat.replaceOneChat({
             id: opts.id,
@@ -119,31 +124,35 @@ export class ChatFX {
         const roomIDs = [
             ...new Set(opts.chat_room_ids.map((id) => id.trim())),
         ].filter((id) => id !== "");
+        if (roomIDs.length === 0) {
+            return {};
+        }
         const result = await this.chat.queryChatRoomMembers({
             query: {
                 chat_room_id: roomIDs,
             },
         });
-        const allMembers = result.value ?? [];
-        const entries = roomIDs.map((chatRoomID) => [
-            chatRoomID,
-            allMembers.filter((member) => member.chat_room_id === chatRoomID),
-        ]);
-        const ownerIDs = [
-            ...new Set(entries.flatMap(([, members]) => members.map((member) => member.owner_id))),
-        ];
+        const members = result.value ?? [];
+        const membersByRoom = new Map(roomIDs.map((id) => [id, []]));
+        for (const member of members) {
+            membersByRoom.get(member.chat_room_id)?.push(member);
+        }
+        const ownerIDs = [...new Set(members.map((member) => member.owner_id))];
         const userResults = await Promise.allSettled(ownerIDs.map(async (id) => [id, await this.findUser(id)]));
         const usersByID = new Map(userResults.flatMap((result) => result.status === "fulfilled" ? [result.value] : []));
-        return Object.fromEntries(entries.map(([chatRoomID, members]) => [
-            chatRoomID,
-            {
-                members,
-                users: members.flatMap((member) => {
-                    const user = usersByID.get(member.owner_id);
-                    return user ? [user] : [];
-                }),
-            },
-        ]));
+        return Object.fromEntries(roomIDs.map((chatRoomID) => {
+            const roomMembers = membersByRoom.get(chatRoomID) ?? [];
+            return [
+                chatRoomID,
+                {
+                    members: roomMembers,
+                    users: roomMembers.flatMap((member) => {
+                        const user = usersByID.get(member.owner_id);
+                        return user ? [user] : [];
+                    }),
+                },
+            ];
+        }));
     }
     async openChatRoom(opts) {
         const latest = await this.latestChats({
@@ -447,7 +456,7 @@ function latestChatsPage(opts) {
         last_page: opts.raw.last_page,
         has_more: opts.raw.has_more,
         next_cursor: {
-            chat_room_id: opts.chat_room_id,
+            chat_room_id: opts.raw.results[0]?.chat_room_id ?? opts.chat_room_id,
             next_page: opts.raw.next_page,
             per_page: opts.raw.per_page,
             done: opts.raw.done,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/fx",
-  "version": "0.0.53",
+  "version": "0.0.55",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {
@@ -17,7 +17,7 @@
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@fabriktor/client": "0.0.52",
+    "@fabriktor/client": "0.0.53",
     "@fabriktor/schema": "0.0.34"
   }
 }