diff --git a/public/client.js b/public/client.js index 08c8930..e8d3221 100644 --- a/public/client.js +++ b/public/client.js @@ -113,9 +113,9 @@ export default class ClientList { return { webrtc, channels } } if (data.type === 'list') { - //console.log('取得在线对端列表:', data) + console.debug('取得在线对端列表:', data) const { webrtc, channels } = await webrtc_init() - //console.log('发送给对方 offer') + console.debug('发送给对方 offer') const offer = await webrtc.createOffer() await webrtc.setLocalDescription(offer) this.clientlist.push({ id: data.id, name: data.name, webrtc, channels }) @@ -124,18 +124,18 @@ export default class ClientList { return } if (data.type === 'push') { - //console.log('新上线客户端:', data) + console.debug('新上线客户端:', data) return this.add(data) } if (data.type === 'pull') { - //console.log('移除客户端:', data) + console.debug('移除客户端:', data) return this.exit(data) } if (data.type === 'offer') { - //console.log('收到对方 offer', data) + console.debug('收到对方 offer', data) const { webrtc, channels } = await webrtc_init() this.clientlist.push({ id: data.id, name: data.name, webrtc, channels }) - //console.log('发送给对方 answer') + console.debug('发送给对方 answer') await webrtc.setRemoteDescription(data.offer) const answer = await webrtc.createAnswer() await webrtc.setLocalDescription(answer) @@ -143,18 +143,18 @@ export default class ClientList { return } if (data.type === 'answer') { - //console.log('收到对方 answer', data) + console.debug('收到对方 answer', data) const webrtc = this.clientlist.find(client => client.id === data.id).webrtc await webrtc.setRemoteDescription(data.answer) return } if (data.type === 'candidate') { - console.log(data.name, '发来 candidate 候选通道') + console.debug(data.name, '发来 candidate 候选通道') const webrtc = this.clientlist.find(client => client.id === data.id).webrtc await webrtc.addIceCandidate(data.candidate) return } - console.log('收到未知数据:', data) + console.error('收到未知数据:', data) } websocket.onclose = async event => { console.log('WebSocket 断线重连...') @@ -210,13 +210,13 @@ export default class ClientList { } getAvatar(id) { } setAvatar(user) { - console.log('更新avatar', user) + console.info('更新avatar', user) document.getElementById(user.id).querySelector('img').src = user.avatar this.clientlist.find(client => client.id === user.id).avatar = user.avatar } exit(item) { const client = this.clientlist.find(client => client.id === item.id) - if (!client) return console.log('目标用户本不存在') + if (!client) return console.error('目标用户本不存在') this.clientlist = this.clientlist.filter(client => client.id !== item.id) this.element.removeChild(document.getElementById(item.id)) this.event.onexit(client) diff --git a/public/index.html b/public/index.html index cb2b384..070aa90 100644 --- a/public/index.html +++ b/public/index.html @@ -91,27 +91,27 @@ } }, onban: item => { - console.log('禁止音乐', item.name) + console.info('禁止音乐', item.name) }, onunban: item => { - console.log('解禁音乐', item.name) + console.info('解禁音乐', item.name) }, onremove: item => { - console.log('移除音乐', item.name) + console.info('移除音乐', item.name) database.delete(item.id) }, onadd: (item, list) => { - console.log('添加音乐', item.name) + console.info('添加音乐', item.name) }, onupdate: item => { - console.log('更新音乐', item.name) + console.info('更新音乐', item.name) database.put(item) }, onerror: error => { - console.log('音乐列表错误', error) + console.error('音乐列表错误', error) }, onload: async item => { - console.log('加载音乐', item) + console.info('加载音乐', item) return await new Promise((resolve) => { var buffer = new ArrayBuffer(0) // 接收音乐数据 var count = 0 // 接收分片计数 @@ -133,7 +133,7 @@ const client = clientList.clientlist.find(client => { return client.musicList.find(x => x.id === item.id) }) - console.log('向', client.name, '请求音乐数据') + console.info('向', client.name, '请求音乐数据') const c = Math.ceil(item.size / CHUNK_SIZE) console.log('需要接收', c, '个分片') @@ -148,11 +148,9 @@ // 只有一个基本信道, 用于交换和调度信息 clientList.setChannel('base', { onopen: async event => { - console.log('打开信道', event.target.label) - // 要求对方发送音乐列表 - clientList.send('base', JSON.stringify({ type: 'get_music_list' })) - // 要求对方发送身份信息 - clientList.send('base', JSON.stringify({ type: 'get_user_profile' })) + console.debug('打开信道', event.target.label, '广播请求音乐列表和身份信息') + clientList.send('base', JSON.stringify({ type: 'get_music_list' })) // 要求对方发送音乐列表 + clientList.send('base', JSON.stringify({ type: 'get_user_profile' })) // 要求对方发送身份信息 }, onmessage: async (event, client) => { const data = JSON.parse(event.data) @@ -186,7 +184,6 @@ } if (data.type === 'set_music_list') { console.log(client.name, '发来音乐列表:', `x${JSON.parse(event.data).list.length}`) - console.log('将列表保存到本机记录:', client) client.musicList = data.list client.musicList.forEach(music => musicList.add(music)) return @@ -223,8 +220,8 @@ onclose: event => { console.log('关闭信道', event.target.label) }, - onerror: error => { - console.log('信道错误', error) + onerror: event => { + console.error('信道错误', event.target.label, event.error) } })