added(server): onJoinCall and onLeaveCall wss event listeners.

apps/nova/src/components/CurrentLessons/Content.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { UsePaginateResult } from "@/types/query";
 import { Element, ILesson, IUser, Void } from "@litespace/types";
-import { UpcomingLessonCard } from "@litespace/luna/UpcomingLessonCard";
+import { LessonCard } from "@litespace/luna/LessonCard";
 import { asFullAssetUrl } from "@litespace/luna/backend";
 
 type Lessons = ILesson.FindUserLessonsApiResponse["list"];
@@ -23,23 +23,32 @@ export const Content: React.FC<ContentProps> = ({ query }) => {
         const tutor = item.members.find(
           (member) => member.role === IUser.Role.Tutor
         );
-        if (!tutor) return;
+
+        const student = item.members.find(
+          (member) => member.role === IUser.Role.Student
+        );
+
+        if (!tutor || !student) return;
 
         return (
-          <UpcomingLessonCard
+          <LessonCard
             key={item.lesson.id}
             start={item.lesson.start}
             duration={item.lesson.duration}
             onJoin={() => console.log("join")}
             onCancel={() => console.log("canceled")}
             onRebook={() => console.log("rebook")}
-            canceled={!!item.lesson.canceledBy}
+            canceled={
+              item.lesson.canceledBy === tutor.userId
+                ? "tutor"
+                : item.lesson.canceledBy === student?.userId
+                ? "student"
+                : null
+            }
             tutor={{
               id: tutor.userId,
               name: tutor.name,
               image: tutor.image ? asFullAssetUrl(tutor.image) : undefined,
-              rating: 3,
-              studentCount: 100,
             }}
           />
         );

apps/nova/src/components/UpcomingLessons/Content.tsx

@@ -16,11 +16,7 @@ export const Content: React.FC<ContentProps> = ({ query }) => {
   const canceled = useCallback(
     (item: Lessons[0], tutor: ILesson.PopuldatedMember) => {
       if (!item.lesson.canceledBy && !item.lesson.canceledBy) return null;
-      if (
-        item.lesson.canceledBy === tutor.userId ||
-        item.call.canceledBy === tutor.userId
-      )
-        return "tutor";
+      if (item.lesson.canceledBy === tutor.userId) return "tutor";
       return "student";
     },
     []
@@ -51,8 +47,8 @@ export const Content: React.FC<ContentProps> = ({ query }) => {
         return (
           <LessonCard
             key={item.lesson.id}
-            start={item.call.start}
-            duration={item.call.duration}
+            start={item.lesson.start}
+            duration={item.lesson.duration}
             onJoin={() => console.log("join")}
             onCancel={() => console.log("canceled")}
             onRebook={() => console.log("rebook")}

packages/luna/package.json

@@ -64,7 +64,6 @@
     "./utils": "./dist/components/utils/index.js",
     "./VideoPlayer": "./dist/components/VideoPlayer/index.js",
     "./WeekdayPicker": "./dist/components/WeekdayPicker/index.js",
-    "./UpcomingLessonCard": "./dist/components/Lessons/UpcomingLessonCard.jsx",
     "./hooks/intl": "./dist/hooks/intl.js",
     "./hooks/validation": "./dist/hooks/validation.js",
     "./hooks/duration": "./dist/hooks/duration.js",

packages/models/src/calls.ts

@@ -35,14 +35,17 @@ export class Calls {
   }
 
   async addMember({
-    call,
-    user,
+    callId,
+    userId,
     tx,
-  }: WithOptionalTx<{ call: number; user: number }>): Promise<ICall.Member> {
+  }: WithOptionalTx<{
+    callId: number;
+    userId: number;
+  }>): Promise<ICall.Member> {
     const rows = await this.builder(tx)
       .members.insert({
-        call_id: call,
-        user_id: user,
+        call_id: callId,
+        user_id: userId,
       })
       .returning("*");
 
@@ -52,13 +55,13 @@ export class Calls {
   }
 
   async removeMember({
-    call,
-    user,
+    callId,
+    userId,
     tx,
-  }: WithOptionalTx<{ user: number; call: number }>): Promise<void> {
+  }: WithOptionalTx<{ userId: number; callId: number }>): Promise<void> {
     await this.builder(tx)
-      .members.where(this.columns.members("call_id"), call)
-      .andWhere(this.columns.members("user_id"), user)
+      .members.where(this.columns.members("call_id"), callId)
+      .andWhere(this.columns.members("user_id"), userId)
       .delete();
   }
 

packages/models/tests/calls.test.ts

@@ -27,8 +27,8 @@ describe(nameof(Calls), () => {
       expect(await calls.findCallMembers([call.id])).to.be.of.length(0);
 
       const member = await calls.addMember({
-        call: call.id,
-        user: tutor.id,
+        callId: call.id,
+        userId: tutor.id,
       });
       expect(await calls.findCallMembers([call.id])).to.be.of.length(1);
       expect(member.callId).to.be.eq(call.id);
@@ -44,15 +44,15 @@ describe(nameof(Calls), () => {
       expect(await calls.findCallMembers([call.id])).to.be.of.length(0);
 
       await calls.addMember({
-        call: call.id,
-        user: tutor.id,
+        callId: call.id,
+        userId: tutor.id,
       });
 
       expect(await calls.findCallMembers([call.id])).to.be.of.length(1);
 
       await calls.removeMember({
-        call: call.id,
-        user: tutor.id,
+        callId: call.id,
+        userId: tutor.id,
       });
 
       expect(await calls.findCallMembers([call.id])).to.be.of.length(0);

packages/models/tsconfig.json

@@ -1,17 +1,17 @@
 {
   "compilerOptions": {
-    "target": "ESNext",
+    "target": "es6",
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "baseUrl": "./",
     "skipLibCheck": true,
-    "module": "NodeNext",
+    "module": "nodenext",
     "declaration": true,
     "declarationDir": "types",
     "sourceMap": true,
     "outDir": "dist",
-    "moduleResolution": "NodeNext",
+    "moduleResolution": "nodenext",
     "allowSyntheticDefaultImports": true,
     "emitDeclarationOnly": true,
     "resolveJsonModule": true,

packages/types/src/call.ts

@@ -73,3 +73,5 @@ export type FindUserCallsApiResponse = {
   calls: Self[];
   members: Record<string, PopuldatedMember[]>;
 };
+
+export type Type = "lesson" | "interview";

packages/types/src/wss.ts

@@ -1,4 +1,4 @@
-import { IMessage, IRule, ITutor, IUser, Server } from "@/index";
+import { IMessage, IRule, ITutor, Server, ICall } from "@/index";
 
 /**
  * Events emitted by the client
@@ -9,6 +9,8 @@ export enum ClientEvent {
   UpdateMessage = "UpdateMessage",
   DeleteMessage = "DeleteMessage",
   MarkAsRead = "MarkAsRead",
+  JoinCall = "JoinCall",
+  LeaveCall = "LeaveCall",
   /**
    * @deprecated
    */
@@ -29,23 +31,37 @@ export enum ServerEvent {
   RoomMessageUpdated = "RoomMessageUpdated",
   RoomMessageDeleted = "RoomMessageDeleted",
   JoinedRooms = "JoinedRooms",
+
   MessageRead = "MessageRead",
+
+  MemberJoinedCall = "MemberJoinedCallId",
+  MemberLeftCall = "MemberLeftCallId",
+
+  /**
+   * @deprecated
+   */
   UserJoinedCall = "UserJoinedCall",
   UserSharedScreen = "UserSharedScreen",
   UserStatusChanged = "UserStatusChanged",
+  UserTyping = "UserTyping",
+
   CameraToggled = "CameraToggle",
   MicToggled = "MicToggled",
+
   TutorsCacheUpdated = "TutorsCacheUpdated",
+  TutorUpdated = "TutorUpdated",
+
   LessonBooked = "LessonBooked",
   LessonCanceled = "LessonCanceled",
-  TutorUpdated = "TutorUpdated",
+
   RuleDeleted = "RuleDeleted",
   RuleUpdated = "RuleUpdated",
   RuleCreated = "RuleCreated",
+
   InvoiceUpdated = "InvoiceUpdated",
   InvoiceDeleted = "InvoiceDeleted",
+
   ServerStats = "ServerStats",
-  UserTyping = "UserTyping",
 }
 
 export enum Room {
@@ -68,6 +84,11 @@ export type ClientEventsMap = {
   [ClientEvent.ToggleCamera]: EventCallback<{ call: number; camera: boolean }>;
   [ClientEvent.ToggleMic]: EventCallback<{ call: number; mic: boolean }>;
   [ClientEvent.UserTyping]: EventCallback<{ roomId: number }>;
+  [ClientEvent.JoinCall]: EventCallback<{
+    callId: number;
+    type: ICall.Type;
+  }>;
+  [ClientEvent.LeaveCall]: EventCallback<{ callId: number }>;
 };
 
 /**
@@ -80,7 +101,12 @@ export type ServerEventsMap = {
     roomId: number;
     messageId: number;
   }>;
+
   [ServerEvent.UserJoinedCall]: EventCallback<{ peerId: string }>;
+
+  [ServerEvent.MemberJoinedCall]: EventCallback<{ userId: number }>;
+  [ServerEvent.MemberLeftCall]: EventCallback<{ userId: number }>;
+
   [ServerEvent.CameraToggled]: EventCallback<{ user: number; camera: boolean }>;
   [ServerEvent.MicToggled]: EventCallback<{ user: number; mic: boolean }>;
   [ServerEvent.MessageRead]: EventCallback<{ messageId: number }>;

services/server/fixtures/wss.ts

@@ -16,6 +16,14 @@ export class ClientSocket {
     this.client.emit(Wss.ClientEvent.UserTyping, { roomId });
   }
 
+  joinCall(callId: number) {
+    this.client.emit(Wss.ClientEvent.JoinCall, { callId });
+  }
+
+  leaveCall(callId: number) {
+    this.client.emit(Wss.ClientEvent.LeaveCall, { callId });
+  }
+
   /**
    * Wait for event.
    *