removed: deprecated or no more necessary code has been removed.

apps/nova/src/components/TutorOnboardingSteps/Interview/index.tsx

@@ -3,10 +3,11 @@ import React, { useMemo } from "react";
 import { marked } from "marked";
 import markdown from "@/markdown/tutorOnboarding/interview.md?raw";
 import RawHtml from "@/components/TutorOnboardingSteps/RawHtml";
+import { FindPagedInterviewsProps } from "@/types/props";
 // import ScheduledInterview from "@/components/TutorOnboardingSteps/Interview/ScheduledInterview";
 
 const Interview: React.FC<{
-  interviews: IInterview.FindPagedInterviewsProps;
+  interviews: FindPagedInterviewsProps;
   current: Element<IInterview.FindInterviewsApiResponse["list"]> | null;
 }> = ({ current }) => {
   // const onScheduleSuccess = useCallback(() => {

apps/nova/src/components/TutorOnboardingSteps/index.tsx

@@ -3,10 +3,11 @@ import React from "react";
 import Interview from "@/components/TutorOnboardingSteps/Interview";
 import MediaShot from "@/components/TutorOnboardingSteps/MediaShot";
 import { Element, IInterview } from "@litespace/types";
+import { FindPagedInterviewsProps } from "@/types/props";
 
 const TutorOnboardingSteps: React.FC<{
   step: number;
-  interviews: IInterview.FindPagedInterviewsProps;
+  interviews: FindPagedInterviewsProps;
   current: Element<IInterview.FindInterviewsApiResponse["list"]> | null;
 }> = ({ step, interviews, current }) => {
   if (step === TutorOnboardingStep.Interview)

apps/nova/src/pages/Call.tsx

@@ -16,12 +16,11 @@ import cn from "classnames";
 // import Messages from "@/components/Chat/Messages";
 import { orNull, orUndefined } from "@litespace/sol/utils";
 import {
-  useSessionMembers,
-  // useCall,
+  //useSessionMembers,
+  //usePeerIds,
   useSessionV2,
   useFindSessionRoomById,
   useFullScreen,
-  usePeerIds,
 } from "@litespace/headless/sessions";
 import { useDisplayRecorder } from "@litespace/headless/recorder";
 import { isGhost } from "@/lib/ghost";
@@ -56,8 +55,8 @@ const Call: React.FC = () => {
     return callRoom.data.members.find((member) => member.id !== user?.id);
   }, [callRoom.data, user?.id]);
 
-  const members = useSessionMembers(sessionId);
-  useEffect(() => console.log("In App members: ", members), [members]);
+  //const members = useSessionMembers(sessionId);
+  //useEffect(() => console.log("In App members: ", members), [members]);
 
   // const messages = useMemo(
   //   () =>
@@ -118,6 +117,7 @@ const Call: React.FC = () => {
 
   const fullScreen = useFullScreen<HTMLDivElement>();
 
+  /*
   const peers = usePeerIds(
     useMemo(
       () => ({
@@ -130,6 +130,7 @@ const Call: React.FC = () => {
       [sessionId, mateInfo?.id, user?.role]
     )
   );
+  */
 
   const onCloseSession = useCallback(() => {
     // peers.ghost.refetch();
@@ -150,12 +151,12 @@ const Call: React.FC = () => {
     useMemo(
       () => ({
         isGhost,
-        ghostPeerId: orNull(peers.ghost.data),
-        tutorPeerId: orNull(peers.tutor.data),
+        ghostPeerId: orNull("ghost"), // TODO: pass peers.ghost.data
+        tutorPeerId: orNull("ghost"), // TODO: pass peers.tutor.data
         userId: orNull(user?.id),
         onCloseSession,
       }),
-      [onCloseSession, peers.ghost.data, peers.tutor.data, user?.id]
+      [onCloseSession, user?.id]
     )
   );
 
@@ -302,12 +303,14 @@ const Call: React.FC = () => {
               /*
                * TODO: replace this by members views
                */
+              /*
               <div>
                 <h1>Joined members</h1>
                 {members.map((m) => (
                   <label className="mx-1">-{m}-</label>
                 ))}
               </div>
+              */
             }
 
             {/* <Button

apps/nova/src/types/index.ts

@@ -1 +1,2 @@
 export * as User from "@/types/user";
+export * as Props from "@/types/props";

apps/nova/src/types/props.ts

@@ -0,0 +1,24 @@
+import { IInterview, ISession, Paginated } from "@litespace/types";
+import { InfiniteData, UseInfiniteQueryResult } from "@tanstack/react-query";
+
+export type FindPagedInterviewsProps = {
+  query: UseInfiniteQueryResult<
+    InfiniteData<
+      Paginated<{
+        interview: IInterview.Self;
+        session: ISession.Self;
+        members: ISession.PopuldatedMember[];
+      }>,
+      unknown
+    >,
+    Error
+  >;
+  list:
+    | {
+        interview: IInterview.Self;
+        session: ISession.Self;
+        members: ISession.PopuldatedMember[];
+      }[]
+    | null;
+  more: () => void;
+};

packages/atlas/src/atlas.ts

@@ -1,7 +1,6 @@
 import { User } from "@/user";
 import { Auth } from "@/auth";
 import { Backend } from "@litespace/types";
-import { Session } from "@/session";
 import { Plan } from "@/plan";
 import { Coupon } from "@/coupon";
 import { Invite } from "@/invite";
@@ -18,12 +17,10 @@ import { Invoice } from "@/invoice";
 import { Topic } from "@/topic";
 import { AuthToken } from "@/client";
 import { Cache } from "@/cache";
-import { Peer } from "@/peer";
 
 export class Atlas {
   public readonly user: User;
   public readonly auth: Auth;
-  public readonly session: Session;
   public readonly plan: Plan;
   public readonly coupon: Coupon;
   public readonly invite: Invite;
@@ -39,12 +36,10 @@ export class Atlas {
   public readonly invoice: Invoice;
   public readonly cache: Cache;
   public readonly topic: Topic;
-  public readonly peer: Peer;
 
   constructor(backend: Backend, token: AuthToken | null) {
     this.user = new User(backend, token);
     this.auth = new Auth(backend, token);
-    this.session = new Session(backend, token);
     this.plan = new Plan(backend, token);
     this.coupon = new Coupon(backend, token);
     this.invite = new Invite(backend, token);
@@ -60,6 +55,5 @@ export class Atlas {
     this.invoice = new Invoice(backend, token);
     this.cache = new Cache(backend, token);
     this.topic = new Topic(backend, token);
-    this.peer = new Peer(backend, token);
   }
 }

packages/headless/src/sessions.ts

@@ -1,4 +1,4 @@
-import { ISession, IPeer, IRoom, IUser, Void, Wss } from "@litespace/types";
+import { ISession, IRoom, Void, Wss } from "@litespace/types";
 import { useQuery, UseQueryResult } from "@tanstack/react-query";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useAtlas } from "@/atlas/index";
@@ -7,9 +7,7 @@ import { useSocket } from "@/socket";
 import { usePeer } from "@/peer";
 import { MediaConnection } from "peerjs";
 import { orUndefined } from "@litespace/sol/utils";
-import { QueryKey } from "@/constants";
 import zod from "zod";
-import { ServerEvent, ServerEventsMap } from "@litespace/types/dist/esm/wss";
 
 declare module "peerjs" {
   export interface CallOption {
@@ -364,9 +362,7 @@ export function useSession({
         // call.on("stream", setMateMediaStream);
         call.on("stream", (stream: MediaStream) => addStream(call, stream));
         call.on("close", () => onMediaConnectionClose(call));
-      }, 3000);
-    },
-    [
+      }, 3000); }, [
       onMediaConnectionClose,
       addMediaConnection,
       addStream,
@@ -680,62 +676,6 @@ export function useCallEvents(
   };
 }
 
-// todo: move to peer.ts
-export function useFindPeerId(payload?: IPeer.FindPeerIdApiQuery) {
-  const atlas = useAtlas();
-
-  const findPeerId = useCallback(async () => {
-    if (!payload) return null;
-    const result = await atlas.peer.findPeerId(payload);
-    if (result.peer === null) throw new Error("Peer not found");
-    return result.peer;
-  }, [atlas.peer, payload]);
-
-  return useQuery({
-    queryFn: findPeerId,
-    queryKey: [QueryKey.FindPeerId, payload],
-    retryDelay: (attempt) => {
-      if (attempt <= 10) return 2_000;
-      return Math.min(1_000 * 2 ** attempt, 30_000);
-    },
-    enabled: !!payload,
-  });
-}
-
-export function usePeerIds({
-  isGhost,
-  sessionId,
-  role,
-  mateUserId,
-  disableGhost = false,
-}: {
-  isGhost: boolean;
-  sessionId: string | null;
-  role: IUser.Role | null;
-  mateUserId: number | null;
-  disableGhost?: boolean;
-}) {
-  const findGhostPeerIdQuery = useMemo(():
-    | IPeer.FindPeerIdApiQuery
-    | undefined => {
-    if (isGhost || !sessionId || disableGhost) return;
-    return { type: IPeer.PeerType.Ghost, session: sessionId };
-  }, [sessionId, disableGhost, isGhost]);
-
-  const findTutorPeerIdQuery = useMemo(():
-    | IPeer.FindPeerIdApiQuery
-    | undefined => {
-    const allowed =
-      role === IUser.Role.Student || role === IUser.Role.TutorManager;
-    if (isGhost || !mateUserId || !allowed) return;
-    return { type: IPeer.PeerType.Tutor, tutor: mateUserId };
-  }, [isGhost, mateUserId, role]);
-
-  const ghostPeerId = useFindPeerId(findGhostPeerIdQuery);
-  const tutorPeerId = useFindPeerId(findTutorPeerIdQuery);
-  return { ghost: ghostPeerId, tutor: tutorPeerId };
-}
-
 const ghostCallMetadata = zod.object({
   userId: zod.number().positive().int(),
   screen: zod.boolean(),
@@ -1007,88 +947,3 @@ export function useFullScreen<T extends Element>() {
     exit,
   };
 }
-
-/*
- * Send an HTTP request to retrieve the current members of a call
- */
-export function useFindSessionMembers(
-  sessionId: string | null
-): UseQueryResult<ISession.FindSessionMembersApiResponse | null, Error> {
-  const atlas = useAtlas();
-
-  const findCallMembers = useCallback(async () => {
-    if (!sessionId) return null;
-    return await atlas.session.findSessionMembers(sessionId);
-  }, [atlas.session, sessionId]);
-
-  return useQuery({
-    queryFn: findCallMembers,
-    queryKey: [QueryKey.FindCallMembers],
-  });
-}
-
-// a shorthand for some ServerEvent Callback type
-type CallEventsCallback = ServerEventsMap[ServerEvent.MemberJoinedSession];
-
-/*
- * Real-time call members state.
- */
-export function useSessionMembers(
-  sessionId: ISession.Id | null
-): number[] {
-  const [members, setMembers] = useState<number[]>([]);
-
-  const socket = useSocket();
-
-  // get the initial list by an http request
-  const query = useFindSessionMembers(sessionId);
-
-  useEffect(() => {
-    if (query.data && query.isFetching && query.isError) setMembers(query.data);
-  }, [query.data, query.isError, query.isFetching]);
-
-  // define WSS events callbacks
-  const onMemberJoinWssCallback: CallEventsCallback = useCallback((payload) => {
-    setMembers((prev) => [...prev, payload.userId]);
-  }, []);
-
-  const onMemberLeaveWssCallback: CallEventsCallback = useCallback(
-    (payload) => {
-      setMembers((prev) => prev.filter((id) => id !== payload.userId));
-    },
-    []
-  );
-
-  // define react callbacks
-  const joinSession = useCallback(() => {
-    if (!socket || !sessionId) return;
-    socket.emit(Wss.ClientEvent.JoinSession, { sessionId });
-  }, [socket, sessionId]);
-
-  const leaveSession = useCallback(() => {
-    if (!socket || !sessionId) return;
-    socket.emit(Wss.ClientEvent.LeaveSession, { sessionId });
-  }, [socket, sessionId]);
-
-  useEffect(() => {
-    // listen to wss events to modify members list accordingly
-    if (!socket) return;
-    socket.on(Wss.ServerEvent.MemberJoinedSession, onMemberJoinWssCallback);
-    socket.on(Wss.ServerEvent.MemberLeftSession, onMemberLeaveWssCallback);
-    joinSession();
-    return () => {
-      socket.off(Wss.ServerEvent.MemberJoinedSession);
-      socket.off(Wss.ServerEvent.MemberLeftSession);
-      leaveSession();
-    };
-  }, [
-    sessionId,
-    socket,
-    joinSession,
-    leaveSession,
-    onMemberLeaveWssCallback,
-    onMemberJoinWssCallback,
-  ]);
-
-  return members;
-}

packages/types/src/index.ts

@@ -23,7 +23,6 @@ export * as IInvoice from "@/invoice";
 export * as IAsset from "@/asset";
 export * as ITopic from "@/topic";
 export * as Server from "@/server";
-export * as IPeer from "@/peer";
 export * from "@/api";
 export * from "@/utils";
 export * from "@/api";