@fabriktor/fx 0.0.44 → 0.0.46

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

@@ -1,5 +1,5 @@
-import type { ChatOperator, WSCloseHandler, WSConnection, WSErrorHandler, WSMessageHandler } from "@fabriktor/client";
-import type { Chat, ChatRoom, ChatRoomMember } from "@fabriktor/schema";
+import type { ChatOperator, UsersOperator, WSCloseHandler, WSConnection, WSErrorHandler, WSMessageHandler } from "@fabriktor/client";
+import type { Chat, ChatRoom, ChatRoomMember, User } from "@fabriktor/schema";
 import { type SearchPage } from "../core/search.js";
 type ChatInsertOptions = Parameters<ChatOperator["insertOneChat"]>[0];
 type ChatReplaceOptions = Parameters<ChatOperator["replaceOneChat"]>[0];
@@ -10,6 +10,7 @@ export type MarkChatObjectsUploadedOptions = {
 export type ReactChatOptions = Parameters<ChatOperator["reactChat"]>[0];
 export type ChatFXOptions = {
     chat: ChatOperator;
+    users: UsersOperator;
 };
 type SearchChatsScope = {
     chat_room_id: string;
@@ -60,6 +61,13 @@ export type ChatRoomMembersOptions = {
 export type MyChatRoomMembersOptions = {
     owner_id: string;
 };
+export type ChatRoomParticipantsOptions = {
+    chat_room_ids: string[];
+};
+export type ChatRoomParticipants = {
+    members: ChatRoomMember[];
+    users: User[];
+};
 export type OpenChatRoomOptions = {
     owner_id: string;
     chat_room_id: string;
@@ -102,12 +110,14 @@ export interface ChatFXOperator {
     searchChatRoomMembers(opts: SearchChatRoomMembersOptions): Promise<SearchChatRoomMembersPage>;
     chatRoomMembers(opts: ChatRoomMembersOptions): Promise<ChatRoomMember[]>;
     myChatRoomMembers(opts: MyChatRoomMembersOptions): Promise<ChatRoomMember[]>;
+    chatRoomParticipants(opts: ChatRoomParticipantsOptions): Promise<ChatRoomParticipants>;
     openChatRoom(opts: OpenChatRoomOptions): Promise<ChatRoomSession>;
     openGlobalChatRooms(opts: OpenGlobalChatRoomsOptions): Promise<GlobalChatRoomsSession>;
     reactUploadedChat(opts: ReactUploadedChatOptions): Promise<void>;
 }
 export declare class ChatFX implements ChatFXOperator {
     private chat;
+    private users;
     constructor(opts: ChatFXOptions);
     createChat(opts: CreateChatOptions): Promise<Chat>;
     markChatObjectsUploaded(opts: MarkChatObjectsUploadedOptions): Promise<Chat>;
@@ -118,6 +128,7 @@ export declare class ChatFX implements ChatFXOperator {
     searchChatRoomMembers(opts: SearchChatRoomMembersOptions): Promise<SearchChatRoomMembersPage>;
     chatRoomMembers(opts: ChatRoomMembersOptions): Promise<ChatRoomMember[]>;
     myChatRoomMembers(opts: MyChatRoomMembersOptions): Promise<ChatRoomMember[]>;
+    chatRoomParticipants(opts: ChatRoomParticipantsOptions): Promise<ChatRoomParticipants>;
     openChatRoom(opts: OpenChatRoomOptions): Promise<ChatRoomSession>;
     openGlobalChatRooms(opts: OpenGlobalChatRoomsOptions): Promise<GlobalChatRoomsSession>;
     reactUploadedChat(opts: ReactUploadedChatOptions): Promise<void>;

package/dist/src/chat/chat.js

@@ -16,8 +16,10 @@ const msgSearchQueryRequired = "Search query is required.";
 const msgChatObjectsUploading = "Cannot react to a chat while objects are still uploading.";
 export class ChatFX {
     chat;
+    users;
     constructor(opts) {
         this.chat = opts.chat;
+        this.users = opts.users;
     }
     async createChat(opts) {
         const out = await this.chat.insertOneChat(opts);
@@ -111,6 +113,29 @@ export class ChatFX {
         });
         return out.value ?? [];
     }
+    async chatRoomParticipants(opts) {
+        const chat_room_ids = normalizeIDs(opts.chat_room_ids);
+        if (chat_room_ids.length === 0) {
+            return { members: [], users: [] };
+        }
+        const memberGroups = await Promise.all(chat_room_ids.map((chat_room_id) => this.chatRoomMembers({
+            chat_room_id,
+        })));
+        const members = uniqueChatRoomMembers(memberGroups.flat());
+        const owner_ids = normalizeIDs(members.map((member) => member.owner_id));
+        if (owner_ids.length === 0) {
+            return { members, users: [] };
+        }
+        const out = await this.users.queryUsers({
+            query: {
+                id: owner_ids,
+            },
+        });
+        return {
+            members,
+            users: out.value ?? [],
+        };
+    }
     async openChatRoom(opts) {
         const latest = await this.latestChats({
             chat_room_id: opts.chat_room_id,
@@ -389,6 +414,12 @@ export class ChatFX {
 export function newChatFX(opts) {
     return new ChatFX(opts);
 }
+function normalizeIDs(ids) {
+    return [...new Set(ids.map((id) => id.trim()).filter((id) => id !== ""))];
+}
+function uniqueChatRoomMembers(members) {
+    return [...new Map(members.map((member) => [member.id, member])).values()];
+}
 function latestChatsPage(opts) {
     return {
         chats: opts.raw.results,

package/dist/src/fx.js

@@ -53,6 +53,7 @@ export class FX {
         });
         this.chat = newChatFX({
             chat: opts.chat,
+            users: opts.users,
         });
         this.contacts = newContactsFX({
             contacts: opts.contacts,

package/dist/src/users/users.d.ts

@@ -1,7 +1,11 @@
-import type { OperationResultOf, TmpPhonesOperator, TmpUsernamesOperator, UsernameVerification, UsersOperator } from "@fabriktor/client";
+import type { GetByUIDOptions, OperationResultOf, TmpPhonesOperator, TmpUsernamesOperator, UsernameVerification, UsersOperator } from "@fabriktor/client";
+import type { User } from "@fabriktor/schema";
+import { type RunSearchOptions, type SearchPage } from "../core/search.js";
 export type ResolveUsernameOptions = Parameters<UsersOperator["resolveUsername"]>[0];
 export type VerifyUsernameOptions = Parameters<TmpUsernamesOperator["verify"]>[0];
 export type GenerateUsernamesOptions = VerifyUsernameOptions;
+export type SearchUsersOptions = GetByUIDOptions & Omit<RunSearchOptions<User>, "search">;
+export type SearchUsersPage = SearchPage<User>;
 export type SendPhoneCodeOptions = Parameters<TmpPhonesOperator["send"]>[0];
 export type VerifyPhoneCodeOptions = Parameters<TmpPhonesOperator["verify"]>[0];
 export type UsersFXOptions = {
@@ -10,6 +14,7 @@ export type UsersFXOptions = {
     tmp_phones: TmpPhonesOperator;
 };
 export interface UsersFXOperator {
+    searchUsers(opts: SearchUsersOptions): Promise<SearchUsersPage>;
     resolveUsername(opts: ResolveUsernameOptions): Promise<string>;
     verifyUsername(opts: VerifyUsernameOptions): Promise<OperationResultOf<UsernameVerification>>;
     generateUsernames(opts: GenerateUsernamesOptions): Promise<OperationResultOf<UsernameVerification>>;
@@ -21,6 +26,7 @@ export declare class UsersFX implements UsersFXOperator {
     private tmp_usernames;
     private tmp_phones;
     constructor(opts: UsersFXOptions);
+    searchUsers(opts: SearchUsersOptions): Promise<SearchUsersPage>;
     resolveUsername(opts: ResolveUsernameOptions): Promise<string>;
     verifyUsername(opts: VerifyUsernameOptions): Promise<OperationResultOf<UsernameVerification>>;
     generateUsernames(opts: GenerateUsernamesOptions): Promise<OperationResultOf<UsernameVerification>>;

package/dist/src/users/users.js

@@ -4,6 +4,7 @@
 // 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 { errRequired, errResolveFailed, errValidation, } from "../core/err.js";
+import { runSearch, } from "../core/search.js";
 import { normalizePhone, normalizePhoneCode, validatePhone, validatePhoneCode, } from "./phone.js";
 import { normalizeUsername, validateUsernameFormat } from "./username.js";
 const msgUnableToResolveUsername = "Unable to resolve username.";
@@ -19,6 +20,16 @@ export class UsersFX {
         this.tmp_usernames = opts.tmp_usernames;
         this.tmp_phones = opts.tmp_phones;
     }
+    async searchUsers(opts) {
+        const { uid, ...searchOpts } = opts;
+        return await runSearch({
+            ...searchOpts,
+            search: async (opts) => await this.users.searchManyUsers({
+                ...opts,
+                uid,
+            }),
+        });
+    }
     async resolveUsername(opts) {
         const username = normalizeUsername(opts.username);
         const out = await this.users.resolveUsername({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/fx",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {