@fabriktor/fx 0.0.55 → 0.0.56

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

@@ -1,5 +1,5 @@
 import type { ChatOperator, UsersOperator, WSCloseHandler, WSConnection, WSErrorHandler, WSMessageHandler } from "@fabriktor/client";
-import type { Chat, ChatRoom, ChatRoomMember, User } from "@fabriktor/schema";
+import { type Chat, type ChatRoom, type ChatRoomMember, type User } from "@fabriktor/schema";
 import { type SearchPage } from "../core/search.js";
 type ChatInsertOptions = Parameters<ChatOperator["insertOneChat"]>[0];
 type ChatReplaceOptions = Parameters<ChatOperator["replaceOneChat"]>[0];
@@ -59,6 +59,9 @@ export type SearchChatRoomMembersPage = SearchPage<ChatRoomMember>;
 export type ChatRoomMembersOptions = {
     chat_room_id: string;
 };
+export type ChatRoomsOptions = {
+    ids: string[];
+};
 export type MyChatRoomMembersOptions = {
     owner_id: string;
 };
@@ -100,6 +103,7 @@ export type ChatRoomSession = {
 export type GlobalChatRoomsSession = {
     chat_rooms_ws: WSConnection;
     members: ChatRoomMember[];
+    rooms: ChatRoom[];
     closeNormal(reason?: string): void;
     closeLeavingPage(reason?: string): void;
 };
@@ -113,6 +117,7 @@ export interface ChatFXOperator {
     nextLatestChats(opts: NextLatestChatsOptions): Promise<LatestChatsPage>;
     searchChatRoomMembers(opts: SearchChatRoomMembersOptions): Promise<SearchChatRoomMembersPage>;
     chatRoomMembers(opts: ChatRoomMembersOptions): Promise<ChatRoomMember[]>;
+    chatRooms(opts: ChatRoomsOptions): Promise<ChatRoom[]>;
     myChatRoomMembers(opts: MyChatRoomMembersOptions): Promise<ChatRoomMember[]>;
     chatRoomParticipants(opts: ChatRoomParticipantsOptions): Promise<ChatRoomParticipantsByRoom>;
     openChatRoom(opts: OpenChatRoomOptions): Promise<ChatRoomSession>;
@@ -132,6 +137,7 @@ export declare class ChatFX implements ChatFXOperator {
     nextLatestChats(opts: NextLatestChatsOptions): Promise<LatestChatsPage>;
     searchChatRoomMembers(opts: SearchChatRoomMembersOptions): Promise<SearchChatRoomMembersPage>;
     chatRoomMembers(opts: ChatRoomMembersOptions): Promise<ChatRoomMember[]>;
+    chatRooms(opts: ChatRoomsOptions): Promise<ChatRoom[]>;
     myChatRoomMembers(opts: MyChatRoomMembersOptions): Promise<ChatRoomMember[]>;
     chatRoomParticipants(opts: ChatRoomParticipantsOptions): Promise<ChatRoomParticipantsByRoom>;
     openChatRoom(opts: OpenChatRoomOptions): Promise<ChatRoomSession>;
@@ -139,6 +145,7 @@ export declare class ChatFX implements ChatFXOperator {
     reactUploadedChat(opts: ReactUploadedChatOptions): Promise<void>;
     private openChatRoomConnections;
     private openGlobalChatRoomsConnection;
+    private allChatRoomMembers;
     private findUser;
     private findChat;
 }

package/dist/src/chat/chat.js

@@ -3,10 +3,12 @@
 // Licensed under the Apache License, Version 2.0 (the "License"); you may
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+import { IDKey, } from "@fabriktor/schema";
 import { errRequired, errResolveFailed, errValidation } from "../core/err.js";
 import { requiredOperationID } from "../core/id.js";
 import { normalizeSearchPage, normalizeSearchPerPage, normalizeSearchQuery, runSearch, } from "../core/search.js";
 const closeCodeNormal = 1000;
+const closeCodeLeavingPage = 1001;
 const wsRefreshMilliseconds = 40 * 60 * 1000;
 const wsRefreshRetryMilliseconds = 30 * 1000;
 const resourceChat = "chat";
@@ -112,6 +114,18 @@ export class ChatFX {
         });
         return out.value ?? [];
     }
+    async chatRooms(opts) {
+        const ids = [...new Set(opts.ids.map((id) => id.trim()))].filter((id) => id !== "");
+        if (ids.length === 0) {
+            return [];
+        }
+        const out = await this.chat.queryChatRooms({
+            query: {
+                [IDKey]: ids,
+            },
+        });
+        return out.value ?? [];
+    }
     async myChatRoomMembers(opts) {
         const out = await this.chat.queryChatRoomMembers({
             query: {
@@ -124,35 +138,22 @@ 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 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 entries = await Promise.all(roomIDs.map(async (chatRoomID) => [chatRoomID, await this.allChatRoomMembers(chatRoomID)]));
+        const ownerIDs = [
+            ...new Set(entries.flatMap(([, members]) => 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(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] : [];
-                    }),
-                },
-            ];
-        }));
+        return Object.fromEntries(entries.map(([chatRoomID, members]) => [
+            chatRoomID,
+            {
+                members,
+                users: members.flatMap((member) => {
+                    const user = usersByID.get(member.owner_id);
+                    return user ? [user] : [];
+                }),
+            },
+        ]));
     }
     async openChatRoom(opts) {
         const latest = await this.latestChats({
@@ -218,7 +219,7 @@ export class ChatFX {
                 closeSession(closeCodeNormal, reason);
             },
             closeLeavingPage(reason) {
-                closeSession(closeCodeNormal, reason);
+                closeSession(closeCodeLeavingPage, reason);
             },
         };
     }
@@ -226,6 +227,9 @@ export class ChatFX {
         const members = await this.myChatRoomMembers({
             owner_id: opts.owner_id,
         });
+        const rooms = await this.chatRooms({
+            ids: members.map((member) => member.chat_room_id),
+        });
         const fx = this;
         let current = await fx.openGlobalChatRoomsConnection(opts);
         let refresh_timer = null;
@@ -275,6 +279,7 @@ export class ChatFX {
         }
         return {
             members,
+            rooms,
             get chat_rooms_ws() {
                 return current.chat_rooms_ws;
             },
@@ -282,7 +287,7 @@ export class ChatFX {
                 closeSession(closeCodeNormal, reason);
             },
             closeLeavingPage(reason) {
-                closeSession(closeCodeNormal, reason);
+                closeSession(closeCodeLeavingPage, reason);
             },
         };
     }
@@ -415,6 +420,21 @@ export class ChatFX {
             },
         };
     }
+    async allChatRoomMembers(chatRoomID) {
+        const out = [];
+        let page = 1;
+        for (;;) {
+            const next = await this.searchChatRoomMembers({
+                chat_room_id: chatRoomID,
+                page,
+            });
+            out.push(...next.results);
+            if (next.done) {
+                return out;
+            }
+            page = next.next_page;
+        }
+    }
     async findUser(id) {
         const out = await this.users.findOneUser({ id });
         const user = out.value;
@@ -456,7 +476,7 @@ function latestChatsPage(opts) {
         last_page: opts.raw.last_page,
         has_more: opts.raw.has_more,
         next_cursor: {
-            chat_room_id: opts.raw.results[0]?.chat_room_id ?? opts.chat_room_id,
+            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.55",
+  "version": "0.0.56",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {
@@ -17,7 +17,7 @@
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@fabriktor/client": "0.0.53",
+    "@fabriktor/client": "0.0.54",
     "@fabriktor/schema": "0.0.34"
   }
 }