@corva/chat-core 0.1.6 → 0.1.8

package/dist/index.d.ts

@@ -1175,6 +1175,7 @@ interface CorvaRevoltAuthResponse {
     revolt_channel_id: string;
     revolt_channel_server_id?: string;
     revolt_channel_company_id?: number;
+    revolt_channel_joined?: boolean;
     revolt_chat_channels?: AssetChatChannel[];
     chat_used?: boolean | null;
 }
@@ -1246,8 +1247,11 @@ interface AssetChatSession {
     channelId: string;
     serverId: string | null;
     companyId: number | null;
+    joined: boolean;
 }
-declare function getAssetChatSession(assetId: string, assetType: ChatAssetType): Promise<AssetChatSession>;
+declare function getAssetChatSession(assetId: string, assetType: ChatAssetType, { join }?: {
+    join?: boolean;
+}): Promise<AssetChatSession>;
 declare function getAssetChatChannel(assetId: string, assetType: ChatAssetType): Promise<string>;
 
 type StoredCorvaUser = CorvaUser | CorvaAPIUser;
@@ -1517,6 +1521,12 @@ interface UIStore {
 declare const uiStore: zustand_vanilla.StoreApi<UIStore>;
 declare const resetUIStore: () => void;
 
+interface JoinRequired {
+    assetId: string;
+    assetType: ChatAssetType;
+    companyId: number | null;
+    companyName: string | null;
+}
 type LockedAsset = ChatAsset & {
     type: ChatAssetType;
 };
@@ -1527,6 +1537,7 @@ interface AssetStore {
     currentAssetStatus: string | null;
     assetChatId: string | null;
     assetChatError: string | null;
+    joinRequired: JoinRequired | null;
     knownAssetChatIds: Set<string>;
     panelSyncedAssetId: string | null;
     isAssetLocked: boolean;
@@ -1534,6 +1545,7 @@ interface AssetStore {
     isAssetSwitching: boolean;
     setAssetContext: (assetId: string, assetType: ChatAssetType, assetName?: string, assetStatus?: string, skipAutoSelect?: boolean) => Promise<void>;
     clearAssetContext: () => void;
+    joinAssetChat: () => Promise<void>;
     ensureAssetChatSubscription: () => Promise<Subscription | null>;
     toggleAssetLock: () => void;
     relockToAsset: (assetId: string, assetType: ChatAssetType, assetName: string) => Promise<void>;
@@ -1722,4 +1734,4 @@ declare const createSocketEventHandlers: (config: SocketEventHandlersConfig) =>
 
 declare const installUnreadWatcher: () => void;
 
-export { ALERT_SEVERITY, ASSET_API_FIELDS, ASSET_CHAT_PREFIXES, ASSET_NOUN, type AckScheduler, type AlertData, type AlertSeverity, type AlertWirePayload, type AppCommentAttachment, type AppCommentData, type AppCommentWirePayload, type AppStateAdapter, type AskCorvaData, type AskCorvaWirePayload, type AssetChatChannel, type AssetChatSession, type AssetStore, type Attachment, type AuthStore, CHANNEL_NAME_MAX_LENGTH, CHANNEL_TYPES, CORVA_MESSAGE_TYPES, CORVA_SYS_PREFIX, type ChannelAsset, type ChannelContentFilter, type ChannelContentFilterStore, type ChannelContentFilters, type ChannelNameValidation, type ChannelNotificationPreference, type ChannelNotificationSetting, type ChannelUnread, type ChatAsset, type ChatAssetIdentity, type ChatAssetType, type ChatDates, type ChatHost, type ChatNotifier, type ChatPlatform, type CorvaAPIUser, type CorvaApiAdapter, type CorvaRevoltAuthResponse, type CorvaSystemMessage, type CorvaUser, type CorvaUserService, DATE_SEPARATOR_LABELS, DEFAULT_CHANNEL_CONTENT_FILTER, DEFAULT_CHANNEL_CONTENT_FILTERS, DEFAULT_CHANNEL_PREFERENCE, DEFAULT_FAVORITE_ROOMS_SETTINGS, DEFAULT_HIDDEN_ROOMS_SETTINGS, DEFAULT_NOTIFICATION_PREFERENCES, DEFAULT_NOTIFICATION_SETTINGS, DEFAULT_ROOM_LIST_ORDER, DIRECT_MESSAGE_PLACEHOLDER, type ExternalChannel, type FavoriteRoomsSettings, type FavoriteRoomsStore, type FeedItemData, type FeedWirePayload, type FileAttachment, type FilterEntityWindow, type ForwardWirePayload, type ForwardedFrom, GENERAL_CHAT_NAME, type HiddenRoomsSettings, type HttpClient, type HttpClientConfig, HttpError, type HttpRequestInit, type HttpResponseLike, type KeyValueStorage, type LocatorContext, type LoginCredentials, MAX_ATTACHMENT_SIZE_BYTES, MAX_ATTACHMENT_SIZE_MB, MAX_NAVIGATION_HISTORY, MENTION_REPLACE_PATTERN, MENTION_SPLIT_PATTERN, MUTE_PRESET_OPTIONS, type MemberStore, type Message, type MessageCache, type MessageFormData, type MessageStore, NOTIFICATION_DESTINATIONS, NOTIFICATION_SETTING_ALL, NOTIFICATION_SETTING_MENTIONS, NOTIFICATION_SETTING_NOTHING, type NavigationEntry, type NavigationHistoryStore, type NotificationDestination, type NotificationPreferences, type NotificationSettings, type NotificationStore, PAUSE_INDEFINITELY, PAUSE_PRESETS, PAUSE_PRESET_OPTIONS, type PausePreset, type PausePresetOption, REVOLT_SYSTEM_USER_ID, ROOM_LIST_ORDER, type ReadyChannelData, type RevoltAPIInstance, type RevoltChannel, type RevoltIncomingMessagePayload, type RevoltLoginResponse, type RevoltMessage, type RevoltMessageResponse, type RevoltSocketConfig, type RevoltSocketEventHandlers, type RevoltSocketInstance, type RevoltUploadResponse, type RevoltUserResponse, type Room, type RoomListOrder, type RoomStore, type RoomType, SESSION_STORAGE_KEY, SIDEBAR_SECTIONS, SIDEBAR_TABS, SOFT_DELETE_MARKER, SYSTEM_MESSAGE_TEXTS, type SaveSessionParams, type SelectableAssetType, type SessionData, SessionManager, type SharedFile, type SharedRefs, type SidebarSectionKey, type SidebarTabKey, type SocketCloseEventLike, type SocketEventHandlersConfig, type StoredChannelPreference, type Subscription, type TracesViewportRequest, type TypingManager, type UIStore, type UploadAndSendResult, type UploadFile, type UploadedFile, type User, type UserStatus, type ViewportDeepLink, type ViewportIndexCurve, type ViewportMode, WEBSOCKET_CONNECTING, WEBSOCKET_OPEN, type WebSocketLike, type WireSeverity, addMessage, addOrUpdateSubscription, alertMessageAsText, assetStore, authStore, buildAppCommentMessageContent, buildAskCorvaMessageContent, buildFinalMessage, buildForwardMessageContent, buildGroupChannelName, canDeleteMessage, canEditMessage, channelContentFilterStore, channelToAsset, chatToastStore, clearLastOpenedRoom, compareByActivity, compareByName, compareByRecencyDesc, configureChat, configureChatStorage, createAckScheduler, createCorvaUserService, createDMSubscription, createGroupSubscription, createHttpClient, createLatestWinsQueue, createMemoryStorage, createMessageCache, createRevoltAPI, createRevoltSocket, createRoomTaskQueue, createSocketEventHandlers, createSoftDeletedMessage, createTypingManager, deriveAllowedChatAsset, enrichWithCorvaData, ensureChatSession, extractTimestampFromULID, failOptimisticMessage, favoriteRoomsStore, findGeneralRoom, formatAssetChatName, getAppCommentAttachments, getAssetChatChannel, getAssetChatSession, getAssetTypeFromDisplayName, getChatHost, getChatStorage, getCorvaUserFields, getExternalChannel, getLastOpenedRoom, getMessageTimestamp, getPauseUntil, getReactionCount, getRoomDisplayName, getSystemMessageWithCorvaNames, getUserDisplayName, getUserSecondaryText, handleUnauthorized, hasReactions, hasUserReacted, initChat, installUnreadWatcher, isAlertMessage, isAppCommentMessage, isAskCorvaMessage, isChannelMuted, isChatAssetTypeAllowed, isChatStorageConfigured, isCurrentRoomSelection, isDeepEqual, isDefaultChannelPreference, isDisallowedAssetChatRoom, isDmGroup, isExternalServerChannel, isForwardedMessage, isGeneralRoom, isNotificationsPaused, isPauseActive, isSoftDeletedMessage, isSystemMessage, isUnread, isUserOnline, isValidPausePreset, isVisibleUnread, keepChatUsed, loadUntilFound, memberStore, messageStore, navigationHistoryStore, notificationStore, onChatStorageConfigured, parseCorvaSystemMessage, prepareRoomSelection, removeMessageFromList, removeSubscription, resetAssetStore, resetAuthStore, resetChannelContentFilterStore, resetChatAssetPermissionsSnapshot, resetChatHost, resetFavoriteRoomsStore, resetMemberStore, resetMessageStore, resetNavigationHistoryStore, resetNotificationStore, resetRoomStore, resetUIStore, roomStore, saveLastChatActivity, saveLastOpenedRoom, searchMessages, searchRooms, searchUsers, selectCanGoBack, selectCanGoForward, setAllowedChatAssetTypes, settleOptimisticMessage, sharedRefs, sortChannels, sortDMs, sortMessagesByTime, sortUsersByStatus, stripPlatformMentions, uiStore, updateMessageInList, uploadAndSend, validateChannelName, waitForNextPaint, wasRecentlyActive, withChannelPreferenceDefaults };
+export { ALERT_SEVERITY, ASSET_API_FIELDS, ASSET_CHAT_PREFIXES, ASSET_NOUN, type AckScheduler, type AlertData, type AlertSeverity, type AlertWirePayload, type AppCommentAttachment, type AppCommentData, type AppCommentWirePayload, type AppStateAdapter, type AskCorvaData, type AskCorvaWirePayload, type AssetChatChannel, type AssetChatSession, type AssetStore, type Attachment, type AuthStore, CHANNEL_NAME_MAX_LENGTH, CHANNEL_TYPES, CORVA_MESSAGE_TYPES, CORVA_SYS_PREFIX, type ChannelAsset, type ChannelContentFilter, type ChannelContentFilterStore, type ChannelContentFilters, type ChannelNameValidation, type ChannelNotificationPreference, type ChannelNotificationSetting, type ChannelUnread, type ChatAsset, type ChatAssetIdentity, type ChatAssetType, type ChatDates, type ChatHost, type ChatNotifier, type ChatPlatform, type CorvaAPIUser, type CorvaApiAdapter, type CorvaRevoltAuthResponse, type CorvaSystemMessage, type CorvaUser, type CorvaUserService, DATE_SEPARATOR_LABELS, DEFAULT_CHANNEL_CONTENT_FILTER, DEFAULT_CHANNEL_CONTENT_FILTERS, DEFAULT_CHANNEL_PREFERENCE, DEFAULT_FAVORITE_ROOMS_SETTINGS, DEFAULT_HIDDEN_ROOMS_SETTINGS, DEFAULT_NOTIFICATION_PREFERENCES, DEFAULT_NOTIFICATION_SETTINGS, DEFAULT_ROOM_LIST_ORDER, DIRECT_MESSAGE_PLACEHOLDER, type ExternalChannel, type FavoriteRoomsSettings, type FavoriteRoomsStore, type FeedItemData, type FeedWirePayload, type FileAttachment, type FilterEntityWindow, type ForwardWirePayload, type ForwardedFrom, GENERAL_CHAT_NAME, type HiddenRoomsSettings, type HttpClient, type HttpClientConfig, HttpError, type HttpRequestInit, type HttpResponseLike, type JoinRequired, type KeyValueStorage, type LocatorContext, type LoginCredentials, MAX_ATTACHMENT_SIZE_BYTES, MAX_ATTACHMENT_SIZE_MB, MAX_NAVIGATION_HISTORY, MENTION_REPLACE_PATTERN, MENTION_SPLIT_PATTERN, MUTE_PRESET_OPTIONS, type MemberStore, type Message, type MessageCache, type MessageFormData, type MessageStore, NOTIFICATION_DESTINATIONS, NOTIFICATION_SETTING_ALL, NOTIFICATION_SETTING_MENTIONS, NOTIFICATION_SETTING_NOTHING, type NavigationEntry, type NavigationHistoryStore, type NotificationDestination, type NotificationPreferences, type NotificationSettings, type NotificationStore, PAUSE_INDEFINITELY, PAUSE_PRESETS, PAUSE_PRESET_OPTIONS, type PausePreset, type PausePresetOption, REVOLT_SYSTEM_USER_ID, ROOM_LIST_ORDER, type ReadyChannelData, type RevoltAPIInstance, type RevoltChannel, type RevoltIncomingMessagePayload, type RevoltLoginResponse, type RevoltMessage, type RevoltMessageResponse, type RevoltSocketConfig, type RevoltSocketEventHandlers, type RevoltSocketInstance, type RevoltUploadResponse, type RevoltUserResponse, type Room, type RoomListOrder, type RoomStore, type RoomType, SESSION_STORAGE_KEY, SIDEBAR_SECTIONS, SIDEBAR_TABS, SOFT_DELETE_MARKER, SYSTEM_MESSAGE_TEXTS, type SaveSessionParams, type SelectableAssetType, type SessionData, SessionManager, type SharedFile, type SharedRefs, type SidebarSectionKey, type SidebarTabKey, type SocketCloseEventLike, type SocketEventHandlersConfig, type StoredChannelPreference, type Subscription, type TracesViewportRequest, type TypingManager, type UIStore, type UploadAndSendResult, type UploadFile, type UploadedFile, type User, type UserStatus, type ViewportDeepLink, type ViewportIndexCurve, type ViewportMode, WEBSOCKET_CONNECTING, WEBSOCKET_OPEN, type WebSocketLike, type WireSeverity, addMessage, addOrUpdateSubscription, alertMessageAsText, assetStore, authStore, buildAppCommentMessageContent, buildAskCorvaMessageContent, buildFinalMessage, buildForwardMessageContent, buildGroupChannelName, canDeleteMessage, canEditMessage, channelContentFilterStore, channelToAsset, chatToastStore, clearLastOpenedRoom, compareByActivity, compareByName, compareByRecencyDesc, configureChat, configureChatStorage, createAckScheduler, createCorvaUserService, createDMSubscription, createGroupSubscription, createHttpClient, createLatestWinsQueue, createMemoryStorage, createMessageCache, createRevoltAPI, createRevoltSocket, createRoomTaskQueue, createSocketEventHandlers, createSoftDeletedMessage, createTypingManager, deriveAllowedChatAsset, enrichWithCorvaData, ensureChatSession, extractTimestampFromULID, failOptimisticMessage, favoriteRoomsStore, findGeneralRoom, formatAssetChatName, getAppCommentAttachments, getAssetChatChannel, getAssetChatSession, getAssetTypeFromDisplayName, getChatHost, getChatStorage, getCorvaUserFields, getExternalChannel, getLastOpenedRoom, getMessageTimestamp, getPauseUntil, getReactionCount, getRoomDisplayName, getSystemMessageWithCorvaNames, getUserDisplayName, getUserSecondaryText, handleUnauthorized, hasReactions, hasUserReacted, initChat, installUnreadWatcher, isAlertMessage, isAppCommentMessage, isAskCorvaMessage, isChannelMuted, isChatAssetTypeAllowed, isChatStorageConfigured, isCurrentRoomSelection, isDeepEqual, isDefaultChannelPreference, isDisallowedAssetChatRoom, isDmGroup, isExternalServerChannel, isForwardedMessage, isGeneralRoom, isNotificationsPaused, isPauseActive, isSoftDeletedMessage, isSystemMessage, isUnread, isUserOnline, isValidPausePreset, isVisibleUnread, keepChatUsed, loadUntilFound, memberStore, messageStore, navigationHistoryStore, notificationStore, onChatStorageConfigured, parseCorvaSystemMessage, prepareRoomSelection, removeMessageFromList, removeSubscription, resetAssetStore, resetAuthStore, resetChannelContentFilterStore, resetChatAssetPermissionsSnapshot, resetChatHost, resetFavoriteRoomsStore, resetMemberStore, resetMessageStore, resetNavigationHistoryStore, resetNotificationStore, resetRoomStore, resetUIStore, roomStore, saveLastChatActivity, saveLastOpenedRoom, searchMessages, searchRooms, searchUsers, selectCanGoBack, selectCanGoForward, setAllowedChatAssetTypes, settleOptimisticMessage, sharedRefs, sortChannels, sortDMs, sortMessagesByTime, sortUsersByStatus, stripPlatformMentions, uiStore, updateMessageInList, uploadAndSend, validateChannelName, waitForNextPaint, wasRecentlyActive, withChannelPreferenceDefaults };

package/dist/index.js

@@ -2988,11 +2988,11 @@ var ASSET_ID_PARAM = {
   frac_fleet: "frac_fleet_id",
   intervention_unit: "intervention_unit_id"
 };
-async function getAssetChatSession(assetId, assetType) {
+async function getAssetChatSession(assetId, assetType, { join = false } = {}) {
   if (!assetId || Number.isNaN(Number(assetId))) {
     throw new Error("Asset ID is required");
   }
-  const body = { [ASSET_ID_PARAM[assetType]]: Number(assetId) };
+  const body = { [ASSET_ID_PARAM[assetType]]: Number(assetId), ...join && { join: true } };
   const response = await getChatHost().corvaApi.post(
     "/v2/integration/revolt_chat_sessions",
     body
@@ -3003,7 +3003,8 @@ async function getAssetChatSession(assetId, assetType) {
   return {
     channelId: response.revolt_channel_id,
     serverId: response.revolt_channel_server_id ?? null,
-    companyId: response.revolt_channel_company_id ?? null
+    companyId: response.revolt_channel_company_id ?? null,
+    joined: response.revolt_channel_joined ?? true
   };
 }
 async function getAssetChatChannel(assetId, assetType) {
@@ -3598,6 +3599,75 @@ var resetMemberStore = () => {
   invalidateVisibleUsers();
   memberStore.setState(getInitialState());
 };
+
+// src/store/services/externalChatJoin.ts
+var ASSET_RESOURCE = {
+  rig: "rigs",
+  frac_fleet: "frac_fleets",
+  intervention_unit: "intervention_units"
+};
+var ownerRequests = /* @__PURE__ */ new Map();
+async function fetchAssetOwnerCompany(assetId, assetType) {
+  const response = await getChatHost().corvaApi.get(
+    `/v2/${ASSET_RESOURCE[assetType]}/${assetId}`,
+    { fields: [`${assetType}.company`, "company.name"], include: "company" }
+  );
+  const companyId = Number(response?.data?.relationships?.company?.data?.id);
+  if (!Number.isFinite(companyId)) throw new Error("Asset company is missing");
+  const company = response?.included?.find(
+    (item) => item.type === "company" && Number(item.id) === companyId
+  );
+  return { id: companyId, name: company?.attributes?.name ?? null };
+}
+function getAssetOwnerCompany(assetId, assetType) {
+  const key = `${assetType}:${assetId}`;
+  const cached = ownerRequests.get(key);
+  if (cached) return cached;
+  const request = fetchAssetOwnerCompany(assetId, assetType);
+  request.catch(() => ownerRequests.delete(key));
+  ownerRequests.set(key, request);
+  return request;
+}
+function resetAssetOwnerCompanies() {
+  ownerRequests.clear();
+}
+
+// src/store/stores/assetStore.ts
+var joinApprovedAssets = /* @__PURE__ */ new Set();
+var assetKey = (assetType, assetId) => `${assetType}:${assetId}`;
+var isJoinUnderway = (assetType, assetId) => joinApprovedAssets.has(assetKey(assetType, assetId)) || assetStore.getState().currentAssetId === assetId && !!assetStore.getState().assetChatId;
+async function toJoinRequired(assetId, assetType, session) {
+  const owner = await getAssetOwnerCompany(assetId, assetType).catch(() => null);
+  return {
+    assetId,
+    assetType,
+    companyId: session.companyId ?? owner?.id ?? null,
+    companyName: owner?.name ?? null
+  };
+}
+async function fetchJoinedAssetChatId(assetId, assetType) {
+  let session;
+  try {
+    session = await getAssetChatSession(assetId, assetType);
+  } catch (e) {
+    console.error("Failed to fetch asset chat channel:", e);
+    return null;
+  }
+  if (!session.joined) {
+    const joinRequired = await toJoinRequired(assetId, assetType, session);
+    const isCurrent = assetStore.getState().currentAssetId === assetId;
+    if (isCurrent && !isJoinUnderway(assetType, assetId)) assetStore.setState({ joinRequired });
+    return null;
+  }
+  const chatId = session.channelId;
+  registerChannelServer(session);
+  registerAssetChatChannel(chatId, assetId, assetType);
+  assetStore.setState((state) => ({
+    assetChatId: chatId,
+    knownAssetChatIds: new Set(Array.from(state.knownAssetChatIds).concat(chatId))
+  }));
+  return chatId;
+}
 var registerAssetChatChannel = (channelId, assetId, assetType) => {
   const id = Number(assetId);
   if (!Number.isFinite(id)) return;
@@ -3636,6 +3706,7 @@ var getInitialState2 = () => ({
   currentAssetStatus: null,
   assetChatId: null,
   assetChatError: null,
+  joinRequired: null,
   knownAssetChatIds: /* @__PURE__ */ new Set(),
   panelSyncedAssetId: null,
   isAssetLocked: false,
@@ -3648,7 +3719,9 @@ var assetStore = createStore()((set, get) => ({
   setAssetContext: async (assetId, assetType, assetName, assetStatus, skipAutoSelect) => {
     const currentState = get();
     const isSameAsset = currentState.currentAssetId === assetId;
-    if (isSameAsset && (currentState.assetChatId || currentState.assetChatError)) return;
+    if (isSameAsset && (currentState.assetChatId || currentState.assetChatError || currentState.joinRequired)) {
+      return;
+    }
     const isAssetChanging = !isSameAsset;
     uiStore.setState({ isLoading: true });
     set({
@@ -3657,18 +3730,29 @@ var assetStore = createStore()((set, get) => ({
       currentAssetName: assetName || assetId,
       currentAssetStatus: assetStatus ?? null,
       assetChatError: null,
+      joinRequired: null,
       ...isSameAsset ? {} : { assetChatId: null },
       ...isAssetChanging && { isAssetSwitching: true }
     });
     const isStale = () => get().currentAssetId !== assetId;
     try {
-      const session = await getAssetChatSession(assetId, assetType);
+      const join = joinApprovedAssets.has(assetKey(assetType, assetId));
+      const session = await getAssetChatSession(assetId, assetType, { join });
       if (isStale()) return;
+      if (!session.joined) {
+        if (join) throw new Error("Could not join this chat");
+        const joinRequired = await toJoinRequired(assetId, assetType, session);
+        if (isStale() || isJoinUnderway(assetType, assetId)) return;
+        set({ joinRequired });
+        uiStore.setState({ isLoading: false });
+        return;
+      }
       const chatId = session.channelId;
       registerChannelServer(session);
       registerAssetChatChannel(chatId, assetId, assetType);
       set({
         assetChatId: chatId,
+        joinRequired: null,
         knownAssetChatIds: new Set(Array.from(currentState.knownAssetChatIds).concat(chatId))
       });
       uiStore.setState({ isLoading: false });
@@ -3698,7 +3782,8 @@ var assetStore = createStore()((set, get) => ({
       assetChatId: null,
       panelSyncedAssetId: null,
       lockedAsset: null,
-      assetChatError: null
+      assetChatError: null,
+      joinRequired: null
     });
     if (currentUser && previousAssetChatId && roomStore.getState().currentRoom?._id === previousAssetChatId) {
       const generalChat = findGeneralRoom(roomStore.getState().subscriptions);
@@ -3707,30 +3792,35 @@ var assetStore = createStore()((set, get) => ({
       }
     }
   },
+  joinAssetChat: async () => {
+    const { joinRequired } = get();
+    if (!joinRequired) return;
+    const approvalKey = assetKey(joinRequired.assetType, joinRequired.assetId);
+    joinApprovedAssets.add(approvalKey);
+    set({ joinRequired: null });
+    const { currentAssetName, currentAssetStatus } = get();
+    try {
+      await get().setAssetContext(
+        joinRequired.assetId,
+        joinRequired.assetType,
+        currentAssetName ?? void 0,
+        currentAssetStatus ?? void 0
+      );
+    } finally {
+      joinApprovedAssets.delete(approvalKey);
+    }
+  },
   ensureAssetChatSubscription: async () => {
-    const { currentAssetId, currentAssetType } = get();
+    const { currentAssetId, currentAssetType, joinRequired: pendingJoin } = get();
     if (!currentAssetId || !currentAssetType) return null;
     if (!isChatAssetTypeAllowed(currentAssetType)) return null;
+    if (pendingJoin?.assetId === currentAssetId) return null;
     const cached = inFlightByAsset.get(currentAssetId);
     if (cached) return cached;
     const promise = (async () => {
       try {
-        let chatId = get().assetChatId;
-        if (!chatId) {
-          try {
-            const session = await getAssetChatSession(currentAssetId, currentAssetType);
-            chatId = session.channelId;
-            registerChannelServer(session);
-            registerAssetChatChannel(chatId, currentAssetId, currentAssetType);
-            set({
-              assetChatId: chatId,
-              knownAssetChatIds: new Set(Array.from(get().knownAssetChatIds).concat(chatId))
-            });
-          } catch (e) {
-            console.error("Failed to fetch asset chat channel:", e);
-            return null;
-          }
-        }
+        const chatId = get().assetChatId ?? await fetchJoinedAssetChatId(currentAssetId, currentAssetType);
+        if (!chatId) return null;
         const existing = roomStore.getState().subscriptions.find((s) => s.rid === chatId);
         if (existing) return existing;
         const { api } = sharedRefs;
@@ -4685,6 +4775,7 @@ var authStore = createStore()((set, get) => ({
     getChatHost().notifier?.onLogout?.();
     resetRoomStore();
     resetAssetStore();
+    resetAssetOwnerCompanies();
     resetMessageStore();
     resetChatAssetPermissionsSnapshot();
     resetUIStore();