part of async-labs#23

msahin12 · May 1, 2019 · 6a6cc28 · 6a6cc28
1 parent d603087
commit 6a6cc28
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 24 deletions.
diff --git a/api/package.json b/api/package.json
@@ -26,7 +26,6 @@
   "dependencies": {
     "@types/mongoose": "5.3.23",
     "@types/node": "11.11.6",
-    "@types/socket.io": "^2.1.2",
     "aws-sdk": "2.428.0",
     "compression": "1.7.4",
     "connect-mongo": "2.0.3",
@@ -57,6 +56,7 @@
     "@types/handlebars": "4.1.0",
     "@types/lodash": "4.14.123",
     "@types/passport": "1.0.0",
+    "@types/socket.io": "^2.1.2",
     "@types/stripe": "6.25.6",
     "husky": "1.3.1",
     "jest": "24.5.0",

diff --git a/api/server/api/team-member.ts b/api/server/api/team-member.ts
@@ -205,6 +205,8 @@ router.post('/posts/edit', async (req, res, next) => {
 
     postEdited({ socketId, post: updatedPost });
 
+    // console.log(socketId);
+
     res.json({ done: 1 });
   } catch (err) {
     next(err);

diff --git a/api/server/app.ts b/api/server/app.ts
@@ -80,7 +80,7 @@ auth({ server, ROOT_URL });
 api(server);
 
 const http = new httpModule.Server(server);
-realtime({ http, origin: PRODUCTION_URL_APP, sessionMiddleware });
+realtime({ http, origin: dev ? 'http://localhost:3000' : PRODUCTION_URL_APP, sessionMiddleware });
 
 server.get('/uploaded-file', async (req, res) => {
   if (!req.user) {

diff --git a/api/server/realtime.ts b/api/server/realtime.ts
@@ -23,6 +23,7 @@ function getSocket(socketId?: string) {
 }
 
 function setup({ http, origin, sessionMiddleware }) {
+
   if (io === null) {
     io = socketio(http, {
       origins: `${origin}:443`,
@@ -51,6 +52,16 @@ function setup({ http, origin, sessionMiddleware }) {
 
         socket.join(`user-${userId}`);
 
+        socket.on('joinTeam', teamId => {
+          logger.debug(`    joinTeam ${teamId}`);
+          socket.join(`team-${teamId}`);
+        });
+
+        socket.on('leaveTeam', teamId => {
+          logger.debug(`** leaveTeam ${teamId}`);
+          socket.leave(`team-${teamId}`);
+        });
+
         socket.on('joinDiscussion', discussionId => {
           logger.debug(`    joinDiscussion ${discussionId}`);
           socket.join(`discussion-${discussionId}`);

diff --git a/app/lib/store/discussion.ts b/app/lib/store/discussion.ts
@@ -131,7 +131,6 @@ class Discussion {
   }
 
   public async addPost(content: string): Promise<Post> {
-
     console.log(this.store.socket);
     console.log(this.store.socket.id);
 

diff --git a/app/lib/store/index.ts b/app/lib/store/index.ts
@@ -145,8 +145,9 @@ class Store {
     for (const team of this.teams) {
       if (team.slug === slug) {
         found = true;
-        team.loadInitialMembers().catch(err => console.log(err));
         this.currentTeam = team;
+        team.joinSocketRoom();
+        this.loadCurrentTeamData();
         break;
       }
     }
@@ -183,7 +184,7 @@ class Store {
     this.teams.remove(team);
   }
 
-  private setCurrentUser(user, isLoadTeam: boolean, selectedTeamSlug: string) {
+  private async setCurrentUser(user, isLoadTeam: boolean, selectedTeamSlug: string) {
     if (user) {
       this.currentUser = new User({ store: this, ...user });
 
@@ -242,9 +243,6 @@ decorate(Store, {
   isLoggingIn: observable,
 
   changeCurrentUrl: action,
-  setCurrentUser: action,
-  changeUserState: action,
-  setTeams: action,
   addTeam: action,
   loadTeams: action,
   setCurrentTeam: action,

diff --git a/app/lib/store/post.ts b/app/lib/store/post.ts
@@ -35,7 +35,6 @@ export class Post {
   }
 
   public async edit(data) {
-    console.log(this.store.socket);
     console.log(this.store.socket.id);
 
     try {

diff --git a/app/lib/store/team.ts b/app/lib/store/team.ts
@@ -362,33 +362,26 @@ class Team {
 
   public leaveSocketRoom() {
     if (this.store.socket) {
-      this.store.socket.off('discussionEvent', this.handleDiscussionRealtimeEvent);
+      console.log('leaving socket team room', this.name);
+      this.store.socket.emit('leaveTeam', this._id);
+
+      this.discussion.leaveSocketRoom();
     }
   }
 
   public joinSocketRoom() {
     if (this.store.socket) {
-      this.store.socket.on('discussionEvent', this.handleDiscussionRealtimeEvent);
+      console.log('joining socket team room', this.name);
+      this.store.socket.emit('joinTeam', this._id);
+
+      this.discussion.joinSocketRoom();
     }
   }
 
   public changeLocalCache(data) {
     this.name = data.name;
     this.memberIds.replace(data.memberIds || []);
   }
-
-  private handleDiscussionRealtimeEvent = data => {
-    console.log('discussion realtime event', data);
-    const { action: actionName } = data;
-
-    if (actionName === 'added') {
-      this.addDiscussionToLocalCache(data.discussion);
-    } else if (actionName === 'edited') {
-      this.editDiscussionFromLocalCache(data.discussion);
-    } else if (actionName === 'deleted') {
-      this.removeDiscussionFromLocalCache(data.id);
-    }
-  };
 }
 
 decorate(Team, {

diff --git a/app/pages/discussion.tsx b/app/pages/discussion.tsx
@@ -34,6 +34,11 @@ class DiscussionComp extends React.Component<Props> {
     this.props.store.socket.on('reconnect', this.handleSocketReconnect);
 
     this.changeDiscussion();
+
+    const discussion = this.getDiscussion(this.props.discussionSlug);
+    if (discussion) {
+      discussion.joinSocketRoom();
+    }
   }
 
   public componentDidUpdate(prevProps: Props) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -131,7 +131,6 @@ class Discussion { @@
       }
       public async addPost(content: string): Promise<Post> {
         console.log(this.store.socket);
         console.log(this.store.socket.id);
@@ Expand Down @@