fix: save multiple consumers in a peer

woody146 · Jun 19, 2023 · 97e2031 · 97e2031
1 parent b753f28
commit 97e2031
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -235,8 +235,12 @@ npm run dev
     </tr>
     <tr>
       <td>POST</td>
-      <td>/consumer_peers/:peerId/resume<br /><i>make peer resume after connected</i></td>
-      <td></td>
+      <td>/consumer_peers/:peerId/resume<br /><i>make consumer resume after connected</i></td>
+      <td>
+        <ul>
+         <li>consumerId: string</li>
+        </ul>
+      </td>
       <td></td>
     </tr>
     <tr>

diff --git a/examples/rooms/src/components/Consumer.tsx b/examples/rooms/src/components/Consumer.tsx
@@ -37,6 +37,7 @@ export function Consumer({
         fetchApi({
           path: `/api/consumer_peers/${transport.id}/resume`,
           method: 'POST',
+          data: { consumerId: id },
         });
       }
     };

diff --git a/src/entities/media.peer.ts b/src/entities/media.peer.ts
@@ -39,8 +39,8 @@ export class MediaPeer extends BaseEntity {
   @Column('uuid', { nullable: true })
   producerId?: string;
 
-  @Column('uuid', { nullable: true })
-  consumerId?: string;
+  @Column({ type: 'jsonb', default: {} })
+  consumers!: any;
 
   @Column('text')
   type!: string; // consumer | producer

diff --git a/src/services/peer.ts b/src/services/peer.ts
@@ -153,7 +153,7 @@ export class PeerService extends BaseService {
     id: string;
   }> {
     const peer = await this.get({ peerId: data.peerId });
-    if (peer.type === constants.CONSUMER) {
+    if (peer.type === constants.CONSUMER && !peer.consumers[data.producerId]) {
       await this.createService(RouterService).checkToPipe({
         routerId: peer.routerId,
         producerId: data.producerId,
@@ -172,8 +172,7 @@ export class PeerService extends BaseService {
         },
       });
 
-      peer.consumerId = result.id;
-      peer.producerId = data.producerId;
+      peer.consumers[data.producerId] = result.id;
       await this.dataSource.getRepository(MediaPeer).save(peer);
       return result;
     }
@@ -216,17 +215,18 @@ export class PeerService extends BaseService {
     throw new ServiceError(400, 'Invalid type peer');
   }
 
-  async resume(data: { peerId: string }) {
+  async resume(data: { peerId: string; consumerId: string }) {
     const peer = await this.get({ peerId: data.peerId });
-    if (peer.consumerId && peer.type === constants.CONSUMER) {
+    if (
+      peer.type === constants.CONSUMER &&
+      Object.values(peer.consumers).includes(data.consumerId)
+    ) {
       await fetchApi({
         host: peer.worker.internalHost,
         port: peer.worker.apiPort,
         path: '/consumers/:consumerId/resume',
         method: 'POST',
-        data: {
-          consumerId: peer.consumerId,
-        },
+        data: { consumerId: data.consumerId },
       });
       return {};
     }