From e3176301f89b851f5377e8372c9088a76eb27b23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A7=89?= <huan0016@gmail.com>
Date: Mon, 2 Oct 2023 04:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=88=B0=E5=8D=95=E4=B8=AA?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=E9=98=B2=E6=AD=A2=E6=8E=A5=E6=94=B6=E5=88=B0?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=88=86=E7=89=87=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md         |  2 ++
 public/client.js  |  3 ---
 public/index.html | 15 +++++++++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 68566c2..3899879 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@ webrtc 实现的 p2p 信道
 
 - [x] P2P通信
 - [x] 音乐播放
+  - [x] 请求到单个目标防止接收到重复分片数据
+    - [x] 主机记录各自曲目列表以供查询
 - [ ] 集群分发
 - [ ] 下载加速
 - [ ] 即时通讯
diff --git a/public/client.js b/public/client.js
index 0297556..5508c28 100644
--- a/public/client.js
+++ b/public/client.js
@@ -153,7 +153,6 @@ export default class ClientList {
     }
     // 通过指定通道发送数据(单播)
     sendto(id, name, data) {
-        //console.log('发送数据:', data, '到通道:', name, '到客户端:', id)
         const client = this.clientlist.find(client => client.id === id)
         if (!client) {
             console.log('客户端不存在:', id)
@@ -169,9 +168,7 @@ export default class ClientList {
     }
     // 通过指定通道发送数据(广播)
     send(name, data) {
-        //console.log('广播数据:', data, '到通道:', name, '到所有客户端')
         this.clientlist.forEach(client => {
-            //console.log('发送数据到客户端:', client.id, client.name, '通道:', name, '数据:', data)
             client.channels.filter(ch => ch.label === name).forEach(async ch => {
                 // 等待 datachannel 打开(临时解决方案)
                 while (ch.readyState !== 'open') {
diff --git a/public/index.html b/public/index.html
index a1a6b11..4dd7559 100644
--- a/public/index.html
+++ b/public/index.html
@@ -87,7 +87,13 @@
                             }
                         }
                     })
-                    clientList.send('base', JSON.stringify({ type: 'get_music_data', id: item.id, channel: `music-data-${item.id}` }))
+                    console.log('TODO: 重复请求改为指向目标主机(需要主机各自保存列表/收到列表时)')
+                    const client = clientList.clientlist.find(client => {
+                        return client.musicList.find(x => x.id === item.id)
+                    })
+                    clientList.sendto(client.id, 'base', JSON.stringify({
+                        type: 'get_music_data', id: item.id, channel: `music-data-${item.id}`
+                    }))
                 })
             }
         })
@@ -124,12 +130,9 @@
                 }
                 if (type === 'set_music_list') {
                     console.log(client.name, '发来音乐列表:', `x${JSON.parse(event.data).list.length}`)
-                    // 将音乐列表添加到本地
+                    console.log('将列表保存到本机记录:', client)
+                    client.musicList = list
                     list.forEach(item => musicList.add(item))
-                    //const ids = musicList.list.map(item => item.id)
-                    //list.filter(item => !ids.includes(item.id)).forEach(item => {
-                    //    musicList.add(item)
-                    //})
                     return
                 }
                 if (type === 'get_music_data') {