➖remove user online status

tdrive/backend/node/config/default.json

@@ -255,7 +255,6 @@
     "counter",
     "statistics",
     "cron",
-    "online",
     "email-pusher",
     "documents",
     "applications",

tdrive/backend/node/src/core/platform/services/realtime/services/room-manager.ts

@@ -80,7 +80,6 @@ export default class RoomManager implements RealtimeRoomManager {
     try {
       //Public rooms we just check the user is logged in
       if (
-        joinEvent.name.startsWith("/users/online") || //User online room
         joinEvent.name.startsWith("/users/") || //User update room
         joinEvent.name === "/ping"
       ) {

tdrive/backend/node/src/services/global-resolver.ts

@@ -25,7 +25,6 @@ import { ConsoleServiceImpl } from "./console/service";
 import { DocumentsService } from "./documents/services";
 import { DocumentsEngine } from "./documents/services/engine";
 import { FileServiceImpl } from "./files/services";
-import OnlineServiceImpl from "./online/service";
 import { PreviewProcessService } from "./previews/services/files/processing/service";
 import { StatisticsServiceImpl } from "./statistics/service";
 import { TagsService } from "./tags/services/tags";
@@ -68,7 +67,6 @@ type TdriveServices = {
     hooks: ApplicationHooksService;
   };
   files: FileServiceImpl;
-  online: OnlineServiceImpl;
   documents: {
     documents: DocumentsService;
     engine: DocumentsEngine;
@@ -132,7 +130,6 @@ class GlobalResolver {
         hooks: await new ApplicationHooksService().init(),
       },
       files: await new FileServiceImpl().init(),
-      online: await new OnlineServiceImpl().init(),
       documents: {
         documents: await new DocumentsService().init(),
         engine: await new DocumentsEngine().init(),

tdrive/backend/node/src/services/online/api.ts

@@ -1,25 +0,0 @@
-import { TdriveServiceProvider } from "../../core/platform/framework";
-import UserOnline, { UserOnlinePrimaryKey } from "./entities/user-online";
-
-export type OnlineEvent = {
-  company_id: string;
-  user_id: string;
-  is_online: boolean;
-};
-
-export type UsersOnlineMessage = Array<OnlineEvent>;
-
-export type OnlineGetRequest = {
-  /* Array of ids to get status */
-  data: Array<string>;
-};
-
-export type OnlineGetResponse = {
-  data: Array<[string, boolean]>;
-};
-
-export interface OnlineServiceAPI extends TdriveServiceProvider {
-  isOnline(userId: string): Promise<boolean>;
-  setLastSeenOnline(userIds: Array<string>, lastSeen: number, is_connected: boolean): Promise<void>;
-  get(userId: UserOnlinePrimaryKey): Promise<UserOnline>;
-}

tdrive/backend/node/src/services/online/constants.ts

@@ -1,2 +0,0 @@
-export const DISCONNECTED_DELAY = 900000;
-export const ONLINE_TOPIC = "user:online";

tdrive/backend/node/src/services/online/entities/user-online.ts

@@ -1,32 +0,0 @@
-import { Type } from "class-transformer";
-import { merge } from "lodash";
-import { Column, Entity } from "../../../core/platform/services/database/services/orm/decorators";
-
-export const TYPE = "user_online";
-
-@Entity(TYPE, {
-  primaryKey: ["user_id"],
-  type: TYPE,
-})
-export default class UserOnline {
-  @Type(() => String)
-  @Column("user_id", "timeuuid", { generator: "timeuuid" })
-  user_id: string;
-
-  @Type(() => Boolean)
-  @Column("is_connected", "boolean")
-  is_connected: boolean;
-
-  /**
-   * Save the date the user has been seen connected
-   */
-  @Type(() => Number)
-  @Column("last_seen", "number")
-  last_seen: number;
-}
-
-export type UserOnlinePrimaryKey = { user_id: string };
-
-export function getInstance(element: Partial<UserOnline>): UserOnline {
-  return merge(new UserOnline(), element);
-}

tdrive/backend/node/src/services/online/index.ts

@@ -1,15 +0,0 @@
-import { Prefix, TdriveService } from "../../core/platform/framework";
-
-@Prefix("/internal/services/online/v1")
-export default class OnlineService extends TdriveService<undefined> {
-  version = "1";
-  name = "online";
-
-  api(): undefined {
-    return undefined;
-  }
-
-  public async doInit(): Promise<this> {
-    return this;
-  }
-}

tdrive/backend/node/src/services/online/pubsub/index.ts

@@ -1,29 +0,0 @@
-import { getLogger, Initializable, TdriveLogger } from "../../../core/platform/framework";
-import { UsersOnlineMessage } from "../api";
-import { ONLINE_TOPIC } from "../constants";
-import { UserOnlineProcessor } from "./processor";
-import gr from "../../global-resolver";
-
-export class OnlinePubsubService implements Initializable {
-  private logger: TdriveLogger;
-  constructor() {
-    this.logger = getLogger("online.pubsub.OnlinePubsubService");
-  }
-
-  async init(): Promise<this> {
-    gr.platformServices.messageQueue.processor.addHandler(new UserOnlineProcessor());
-    return this;
-  }
-
-  async broadcastOnline(online: UsersOnlineMessage = []): Promise<void> {
-    if (!online.length) {
-      return;
-    }
-
-    this.logger.debug(`Publishing online users ${online.map(u => u.user_id).join(",")}`);
-
-    return gr.platformServices.messageQueue.publish<UsersOnlineMessage>(ONLINE_TOPIC, {
-      data: online,
-    });
-  }
-}

tdrive/backend/node/src/services/online/pubsub/processor.ts

@@ -1,52 +0,0 @@
-import _ from "lodash";
-import { getLogger, TdriveLogger } from "../../../core/platform/framework";
-import { MessageQueueHandler } from "../../../core/platform/services/message-queue/api";
-import { websocketEventBus } from "../../../core/platform/services/realtime/bus";
-import {
-  RealtimeEntityActionType,
-  ResourcePath,
-} from "../../../core/platform/services/realtime/types";
-import { UsersOnlineMessage } from "../api";
-import { ONLINE_TOPIC } from "../constants";
-
-export class UserOnlineProcessor implements MessageQueueHandler<UsersOnlineMessage, void> {
-  private logger: TdriveLogger;
-  readonly topics = {
-    in: ONLINE_TOPIC,
-  };
-
-  readonly options = {
-    unique: false,
-    ack: true,
-  };
-
-  readonly name = "UserOnlineProcessor";
-
-  constructor() {
-    this.logger = getLogger(`online.pubsub.${this.name}`);
-  }
-
-  validate(message: UsersOnlineMessage): boolean {
-    return !!(message && message.length);
-  }
-
-  async process(message: UsersOnlineMessage): Promise<void> {
-    this.logger.debug(
-      `Pushing user online status for users ${message.map(u => u.user_id).join(",")}`,
-    );
-
-    const grouped_data = _.groupBy(message, "company_id");
-
-    Object.values(grouped_data).forEach((messagePerCompany: UsersOnlineMessage) => {
-      websocketEventBus.publish(RealtimeEntityActionType.Event, {
-        type: "user:online",
-        room: ResourcePath.get(`/users/online/${messagePerCompany[0].company_id}`),
-        entity: { online: messagePerCompany },
-        resourcePath: null,
-        result: null,
-      });
-    });
-
-    return;
-  }
-}

tdrive/backend/node/src/services/online/service/index.ts

@@ -1,174 +0,0 @@
-import Repository from "../../../core/platform/services/database/services/orm/repository/repository";
-
-import { OnlineGetRequest, OnlineGetResponse, OnlineServiceAPI } from "../api";
-import { OnlinePubsubService } from "../pubsub";
-import { DISCONNECTED_DELAY } from "../constants";
-import UserOnline, {
-  getInstance,
-  TYPE as ONLINE_TYPE,
-  UserOnlinePrimaryKey,
-} from "../entities/user-online";
-import gr from "../../global-resolver";
-import { getLogger, TdriveLogger, TdriveServiceProvider } from "../../../core/platform/framework";
-import { getUserRoom } from "../../../services/user/realtime";
-import User from "../../../services/user/entities/user";
-import { WebsocketUserEvent } from "../../../core/platform/services/websocket/types";
-import { ExecutionContext } from "../../../core/platform/framework/api/crud-service";
-
-export default class OnlineServiceImpl implements TdriveServiceProvider {
-  version = "1";
-  service: OnlineServiceAPI;
-  private pubsubService: OnlinePubsubService;
-  onlineRepository: Repository<UserOnline>;
-  private logger: TdriveLogger;
-
-  constructor() {
-    this.logger = getLogger("online.service");
-  }
-
-  public async init(): Promise<this> {
-    this.onlineRepository = await gr.database.getRepository(ONLINE_TYPE, UserOnline);
-
-    this.pubsubService = new OnlinePubsubService();
-
-    await this.pubsubService.init();
-
-    gr.platformServices.websocket.onUserConnected(async event => {
-      const user: User = await gr.services.users.get({
-        id: event.user.id,
-      });
-
-      const companies = user?.cache?.companies;
-
-      this.logger.info("User connected", event.user.id);
-      // save the last connection date
-      this.setLastSeenOnline([event.user.id], Date.now(), true);
-      // broadcast to global pubsub so that everyone can publish to websockets
-      this.broadcastOnline(event, companies);
-
-      event.socket.on(
-        "online:get",
-        async (request: OnlineGetRequest, ack: (response: OnlineGetResponse) => void) => {
-          this.logger.debug(`Got an online:get request for ${(request.data || []).length} users`);
-          ack({ data: await this.getOnlineStatuses(request.data) });
-        },
-      );
-
-      event.socket.on(
-        "online:set",
-        async (request: OnlineGetRequest, ack: () => void): Promise<void> => {
-          this.logger.debug(`Got an online:set request for ${(request.data || []).length} users`);
-
-          this.broadcastOnline(event, companies);
-          this.setLastSeenOnline([event.user.id], Date.now(), true);
-          ack();
-        },
-      );
-    });
-
-    gr.platformServices.websocket.onUserDisconnected(async event => {
-      this.logger.info("User disconnected", event.user.id);
-      // Since the user can be connected on several nodes, we cannot directly set it status to offline
-      const room = getUserRoom(event.user.id);
-      const userSockets = await event.socket.in(room).allSockets();
-
-      if (userSockets.size === 0) {
-        this.pubsubService.broadcastOnline([
-          {
-            company_id: "toBeFetched",
-            user_id: event.user.id,
-            is_online: false,
-          },
-        ]);
-        this.setLastSeenOnline([event.user.id], Date.now(), false);
-      }
-    });
-
-    return this;
-  }
-
-  private async getOnlineStatuses(ids: Array<string>): Promise<Array<[string, boolean]>> {
-    console.log("socket getOnlineStatuses", ids);
-    return this.areOnline(ids);
-  }
-
-  async setLastSeenOnline(
-    userIds: Array<string> = [],
-    date: number,
-    is_connected: boolean,
-  ): Promise<void> {
-    this.logger.debug(`setLastSeenOnline ${userIds.join(",")}`);
-    if (!userIds.length) {
-      return;
-    }
-    const last_seen = date || Date.now();
-    const uniqueIds = new Set<string>(userIds);
-    this.logger.info(`Update last active state for users ${userIds.join(",")}`);
-    const onlineUsers: UserOnline[] = Array.from(uniqueIds.values()).map(user_id =>
-      getInstance({ user_id, last_seen, is_connected }),
-    );
-    await this.onlineRepository.saveAll(onlineUsers);
-
-    //Send websocket event
-    onlineUsers.forEach(u => {
-      gr.services.users.publishPublicUserRealtime(u.user_id);
-    });
-  }
-
-  async isOnline(userId: string, context?: ExecutionContext): Promise<boolean> {
-    const user = await this.onlineRepository.findOne({ user_id: userId }, {}, context);
-
-    if (!user) {
-      return false;
-    }
-
-    return Date.now() - user.last_seen < DISCONNECTED_DELAY;
-  }
-
-  private async areOnline(
-    ids: Array<string> = [],
-    context?: ExecutionContext,
-  ): Promise<Array<[string, boolean]>> {
-    const users = [];
-    //This foreach is needed for $in operators https://github.com/linagora/Tdrive/issues/1246
-    for (let i = 0; i < ids.length; i += 100) {
-      users.push(
-        ...(
-          await this.onlineRepository.find(
-            {},
-            { $in: [["user_id", ids.slice(i, i + 100)]] },
-            context,
-          )
-        ).getEntities(),
-      );
-    }
-
-    return users.map(user => [
-      user.user_id,
-      this.isStillConnected(user.last_seen, user.is_connected),
-    ]);
-  }
-
-  /**
-   * let's say that a user is connected when its last connection is more than some delay ago
-   */
-  private isStillConnected(date: number, is_connected: boolean): boolean {
-    return Date.now() - date < DISCONNECTED_DELAY && is_connected;
-  }
-
-  private broadcastOnline(event: WebsocketUserEvent, companies: Array<string>): void {
-    (companies || []).forEach(company => {
-      this.pubsubService.broadcastOnline([
-        {
-          company_id: company,
-          user_id: event.user.id,
-          is_online: true,
-        },
-      ]);
-    });
-  }
-
-  async get(pk: UserOnlinePrimaryKey): Promise<UserOnline> {
-    return await this.onlineRepository.findOne(pk);
-  }
-}

tdrive/backend/node/src/utils/users.ts

@@ -35,18 +35,6 @@ export async function formatUser(
     cache: { companies: user.cache?.companies || [] },
   } as UserObject;
 
-  const userOnline = await gr.services.online.get({ user_id: user.id });
-  if (userOnline) {
-    const { last_seen, is_connected } = userOnline;
-
-    resUser = {
-      ...resUser,
-      last_seen,
-      is_connected,
-      last_activity: last_seen,
-    };
-  }
-
   if (options?.includeCompanies) {
     const userCompanies = await gr.services.users.getUserCompanies({ id: user.id });
 

tdrive/frontend/src/app/components/member/user-parts.tsx

@@ -20,7 +20,6 @@ export type UserPartsType = {
 type PropsType = {
   usersIds: string[];
   keepMyself?: boolean;
-  displayOnline?: boolean;
   max?: number;
   size?: number;
 };
@@ -48,7 +47,7 @@ export const getUserParts = (props: PropsType): UserPartsType => {
 
   if (channelMembers?.length === 1) {
     const avatarSrc = users[0]?.id ? (
-      <UserIcon user={users[0]} withStatus={props.displayOnline} size={avatarSize} />
+      <UserIcon user={users[0]} size={avatarSize} />
     ) : (
       UserService.getThumbnail(users[0])
     );

tdrive/frontend/src/app/components/online-user-status/online-user-status.scss

@@ -1,30 +0,0 @@
-.online_user_status {
-  width: 8px;
-  height: 8px;
-  border-radius: 50%;
-  background: var(--grey-dark);
-  border: 1px solid var(--grey-background);
-
-  &.online {
-    background: var(--green);
-  }
-
-  &.offline {
-    background: var(--red);
-  }
-
-  &.small {
-    width: 6px;
-    height: 6px;
-  }
-
-  &.medium {
-    width: 8px;
-    height: 8px;
-  }
-
-  &.big {
-    width: 12px;
-    height: 12px;
-  }
-}

tdrive/frontend/src/app/components/online-user-status/online-user-status.tsx

@@ -1,47 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-use-before-define
-import React, { Suspense } from 'react';
-import classNames from 'classnames';
-
-import { UserType } from '@features/users/types/user';
-import { useOnlineUser } from '@features/users/hooks/use-online-user';
-
-import './online-user-status.scss';
-import { useUser } from '@features/users/hooks/use-user';
-
-type PropsType = {
-  user: UserType;
-  size?: 'small' | 'medium' | 'big';
-};
-
-const WrappedUserStatus = ({ user: _user, size = 'medium' }: PropsType): JSX.Element => {
-  const user = useUser(_user.id || '');
-  const userOnlineStatus = useOnlineUser(_user.id as string);
-  //const lastSeen = userOnlineStatus?.lastSeen || user.last_seen;
-  const online =
-    (userOnlineStatus && userOnlineStatus.connected) ||
-    (!userOnlineStatus?.lastSeen &&
-      user?.is_connected &&
-      (user?.last_seen || 0) > Date.now() - 10 * 60 * 1000);
-
-  return (
-    <div
-      className={classNames('online_user_status ' + user?.last_seen + ' ', {
-        online: !!online,
-        offline: !online,
-        small: size === 'small',
-        medium: size === 'medium',
-        big: size === 'big',
-      })}
-    />
-  );
-};
-
-const UserOnlineStatus = (props: PropsType): JSX.Element => {
-  return (
-    <Suspense fallback={<></>}>
-      <WrappedUserStatus {...props} />
-    </Suspense>
-  );
-};
-
-export default UserOnlineStatus;

tdrive/frontend/src/app/components/user/user.jsx

@@ -2,7 +2,6 @@
 import React, { Component } from 'react';
 
 import UserService from '@features/users/services/current-user-service';
-import UserOnlineStatus from '../online-user-status/online-user-status';
 
 import './user.scss';
 
@@ -28,18 +27,6 @@ export default class User extends Component {
           height: this.props.size,
         }}
       >
-        {this.props.withStatus && (
-          <UserOnlineStatus
-            user={user}
-            notifications_disabled={notifications_disabled}
-            size={
-              (this.props.small ? 'small' : undefined) ||
-              (this.props.medium ? 'medium' : undefined) ||
-              (this.props.big ? 'big' : undefined) ||
-              'medium'
-            }
-          />
-        )}
       </div>
     );
   }

tdrive/frontend/src/app/features/users/hooks/use-online-user.ts

@@ -1,38 +0,0 @@
-import { useEffect } from 'react';
-import { useRecoilCallback, useRecoilValue } from 'recoil';
-
-import { OnlineUserStateFamily, OnlineUserType } from '../state/atoms/online-users';
-//TODO refactor it in the notification feature
-
-// import { OnlineUserRealtimeAPI } from '../api/online-user-realtime-api-client';
-// import WebSocketFactory from '../../global/services/websocket-factory-service';
-
-export const useOnlineUser = (id: string): OnlineUserType => {
-
-  // const OnlineAPI = OnlineUserRealtimeAPI(WebSocketFactory.get());
-
-  // const updateUser = useRecoilCallback(
-  //   ({ set, snapshot }) =>
-  //     (status: { id: string; connected: boolean }) => {
-  //       const current = snapshot.getLoadable(OnlineUserStateFamily(status.id)).contents;
-  //       set(OnlineUserStateFamily(status.id), {
-  //         ...status,
-  //         lastSeen: status.connected ? Date.now() : current.lastSeen,
-  //         initialized: true,
-  //       });
-  //     },
-  //   [],
-  // );
-
-  const state = useRecoilValue(OnlineUserStateFamily(id));
-
-  useEffect(() => {
-    if (state && !state.initialized) {
-      // OnlineAPI.getUserStatus(id).then(status => {
-      //   updateUser({ id: status[0], connected: status[1] });
-      // });
-    }
-  }, [state, id]);
-
-  return state;
-};

tdrive/frontend/src/app/features/users/state/atoms/online-users.ts

@@ -1,65 +0,0 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { atom, DefaultValue, selector, selectorFamily } from 'recoil';
-
-import { UserType } from '@features/users/types/user';
-import { CurrentUserState } from './current-user';
-
-export type OnlineUserType = Pick<UserType, 'id' | 'connected'> & {
-  lastSeen: number;
-  initialized: boolean;
-};
-
-const CurrentUserStatus = selector<OnlineUserType[]>({
-  key: 'CurrentUserStatus',
-  get: ({ get }) => {
-    const currentUser = get(CurrentUserState);
-
-    return currentUser
-      ? [{ id: currentUser.id!, connected: true, lastSeen: Date.now(), initialized: true }]
-      : [];
-  },
-});
-
-export const OnlineUsersState = atom<OnlineUserType[]>({
-  key: 'OnlineUsersState',
-  default: CurrentUserStatus,
-});
-
-export const CountOnlineUsers = selector<number>({
-  key: 'CountOnlineUsers',
-  get: ({ get }) => get(OnlineUsersState).filter(u => u.connected).length,
-});
-
-export const OnlineUserStateFamily = selectorFamily<OnlineUserType, string>({
-  key: 'OnlineUserState',
-  get:
-    userId =>
-    ({ get }) => {
-      return (
-        get(OnlineUsersState).find(u => u.id === userId) || {
-          id: userId,
-          connected: false,
-          lastSeen: 0,
-          initialized: false,
-        }
-      );
-    },
-  set:
-    userId =>
-    ({ set }, newValue) => {
-      if (!(newValue instanceof DefaultValue)) {
-        const newStatus: OnlineUserType = {
-          ...(newValue as unknown as OnlineUserType),
-          ...{ id: userId },
-        };
-
-        set(OnlineUsersState, previousStatus => {
-          const index = previousStatus.findIndex(e => e.id === userId);
-
-          return index === -1
-            ? [...previousStatus, newStatus]
-            : [...previousStatus.slice(0, index), newStatus, ...previousStatus.slice(index + 1)];
-        });
-      }
-    },
-});