LaniakeaSupercluster/webrtc
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

日志分级

Browse Source
This commit is contained in:
觉 2023-10-05 03:59:32 +08:00
parent 10e46714b0
commit a8603e16a3
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
public/client.js
View File

@ -113,9 +113,9 @@ export default class ClientList {
return { webrtc, channels } return { webrtc, channels }
} }
if (data.type === 'list') { if (data.type === 'list') {
//console.log('取得在线对端列表:', data) console.debug('取得在线对端列表:', data)
const { webrtc, channels } = await webrtc_init() const { webrtc, channels } = await webrtc_init()
//console.log('发送给对方 offer') console.debug('发送给对方 offer')
const offer = await webrtc.createOffer() const offer = await webrtc.createOffer()
await webrtc.setLocalDescription(offer) await webrtc.setLocalDescription(offer)
this.clientlist.push({ id: data.id, name: data.name, webrtc, channels }) this.clientlist.push({ id: data.id, name: data.name, webrtc, channels })
@ -124,18 +124,18 @@ export default class ClientList {
return return
} }
if (data.type === 'push') { if (data.type === 'push') {
//console.log('新上线客户端:', data) console.debug('新上线客户端:', data)
return this.add(data) return this.add(data)
} }
if (data.type === 'pull') { if (data.type === 'pull') {
//console.log('移除客户端:', data) console.debug('移除客户端:', data)
return this.exit(data) return this.exit(data)
} }
if (data.type === 'offer') { if (data.type === 'offer') {
//console.log('收到对方 offer', data) console.debug('收到对方 offer', data)
const { webrtc, channels } = await webrtc_init() const { webrtc, channels } = await webrtc_init()
this.clientlist.push({ id: data.id, name: data.name, webrtc, channels }) this.clientlist.push({ id: data.id, name: data.name, webrtc, channels })
//console.log('发送给对方 answer') console.debug('发送给对方 answer')
await webrtc.setRemoteDescription(data.offer) await webrtc.setRemoteDescription(data.offer)
const answer = await webrtc.createAnswer() const answer = await webrtc.createAnswer()
await webrtc.setLocalDescription(answer) await webrtc.setLocalDescription(answer)
@ -143,18 +143,18 @@ export default class ClientList {
return return
} }
if (data.type === 'answer') { if (data.type === 'answer') {
//console.log('收到对方 answer', data) console.debug('收到对方 answer', data)
const webrtc = this.clientlist.find(client => client.id === data.id).webrtc const webrtc = this.clientlist.find(client => client.id === data.id).webrtc
await webrtc.setRemoteDescription(data.answer) await webrtc.setRemoteDescription(data.answer)
return return
} }
if (data.type === 'candidate') { 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 const webrtc = this.clientlist.find(client => client.id === data.id).webrtc
await webrtc.addIceCandidate(data.candidate) await webrtc.addIceCandidate(data.candidate)
return return
} }
console.log('收到未知数据:', data) console.error('收到未知数据:', data)
} }
websocket.onclose = async event => { websocket.onclose = async event => {
console.log('WebSocket 断线重连...') console.log('WebSocket 断线重连...')
@ -210,13 +210,13 @@ export default class ClientList {
} }
getAvatar(id) { } getAvatar(id) { }
setAvatar(user) { setAvatar(user) {
console.log('更新avatar', user) console.info('更新avatar', user)
document.getElementById(user.id).querySelector('img').src = user.avatar document.getElementById(user.id).querySelector('img').src = user.avatar
this.clientlist.find(client => client.id === user.id).avatar = user.avatar this.clientlist.find(client => client.id === user.id).avatar = user.avatar
} }
exit(item) { exit(item) {
const client = this.clientlist.find(client => client.id === item.id) 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.clientlist = this.clientlist.filter(client => client.id !== item.id)
this.element.removeChild(document.getElementById(item.id)) this.element.removeChild(document.getElementById(item.id))
this.event.onexit(client) this.event.onexit(client)

29
public/index.html
View File

@ -91,27 +91,27 @@
} }
}, },
onban: item => { onban: item => {
console.log('禁止音乐', item.name) console.info('禁止音乐', item.name)
}, },
onunban: item => { onunban: item => {
console.log('解禁音乐', item.name) console.info('解禁音乐', item.name)
}, },
onremove: item => { onremove: item => {
console.log('移除音乐', item.name) console.info('移除音乐', item.name)
database.delete(item.id) database.delete(item.id)
}, },
onadd: (item, list) => { onadd: (item, list) => {
console.log('添加音乐', item.name) console.info('添加音乐', item.name)
}, },
onupdate: item => { onupdate: item => {
console.log('更新音乐', item.name) console.info('更新音乐', item.name)
database.put(item) database.put(item)
}, },
onerror: error => { onerror: error => {
console.log('音乐列表错误', error) console.error('音乐列表错误', error)
}, },
onload: async item => { onload: async item => {
console.log('加载音乐', item) console.info('加载音乐', item)
return await new Promise((resolve) => { return await new Promise((resolve) => {
var buffer = new ArrayBuffer(0) // 接收音乐数据 var buffer = new ArrayBuffer(0) // 接收音乐数据
var count = 0 // 接收分片计数 var count = 0 // 接收分片计数
@ -133,7 +133,7 @@
const client = clientList.clientlist.find(client => { const client = clientList.clientlist.find(client => {
return client.musicList.find(x => x.id === item.id) 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) const c = Math.ceil(item.size / CHUNK_SIZE)
console.log('需要接收', c, '个分片') console.log('需要接收', c, '个分片')
@ -148,11 +148,9 @@
// 只有一个基本信道, 用于交换和调度信息 // 只有一个基本信道, 用于交换和调度信息
clientList.setChannel('base', { clientList.setChannel('base', {
onopen: async event => { onopen: async event => {
console.log('打开信道', event.target.label) console.debug('打开信道', event.target.label, '广播请求音乐列表和身份信息')
// 要求对方发送音乐列表 clientList.send('base', JSON.stringify({ type: 'get_music_list' })) // 要求对方发送音乐列表
clientList.send('base', JSON.stringify({ type: 'get_music_list' })) clientList.send('base', JSON.stringify({ type: 'get_user_profile' })) // 要求对方发送身份信息
// 要求对方发送身份信息
clientList.send('base', JSON.stringify({ type: 'get_user_profile' }))
}, },
onmessage: async (event, client) => { onmessage: async (event, client) => {
const data = JSON.parse(event.data) const data = JSON.parse(event.data)
@ -186,7 +184,6 @@
} }
if (data.type === 'set_music_list') { if (data.type === 'set_music_list') {
console.log(client.name, '发来音乐列表:', `x${JSON.parse(event.data).list.length}`) console.log(client.name, '发来音乐列表:', `x${JSON.parse(event.data).list.length}`)
console.log('将列表保存到本机记录:', client)
client.musicList = data.list client.musicList = data.list
client.musicList.forEach(music => musicList.add(music)) client.musicList.forEach(music => musicList.add(music))
return return
@ -223,8 +220,8 @@
onclose: event => { onclose: event => {
console.log('关闭信道', event.target.label) console.log('关闭信道', event.target.label)
}, },
onerror: error => { onerror: event => {
console.log('信道错误', error) console.error('信道错误', event.target.label, event.error)
} }
}) })