From fb6276522c074682b32df1d52c4e00263ad07e1f Mon Sep 17 00:00:00 2001 From: NAKAI Ryosuke Date: Tue, 17 Mar 2020 12:02:38 +0900 Subject: [PATCH 01/19] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index a1f1f29..40f3265 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,6 +14,7 @@ ## 2020.1.2 - [FIX] 依存ライブラリを最新にする + - @voluntas ## 2020.1.1 From 29e82b27963dbc1069855b6f03fd8ab37a16e5e2 Mon Sep 17 00:00:00 2001 From: Yuki Nagae Date: Sun, 22 Mar 2020 00:55:07 +0900 Subject: [PATCH 02/19] =?UTF-8?q?=E3=80=8C=E5=8F=8C=E6=96=B9=E5=90=91?= =?UTF-8?q?=E9=80=81=E5=8F=97=E4=BF=A1=E6=8E=A5=E7=B6=9A=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=80=8D=E3=81=AE=E3=82=B5=E3=83=B3=E3=83=97=E3=83=AB=E3=81=AE?= =?UTF-8?q?=E5=A4=89=E6=95=B0=E3=81=AE=E8=AA=A4=E3=82=8A=EF=BC=88=E3=81=8A?= =?UTF-8?q?=E3=81=9D=E3=82=89=E3=81=8Ftypo=EF=BC=89=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 673d37a..01ece45 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ const startConn = async () => { conn.on('addstream', (e) => { document.querySelector('#remote-video').srcObject = e.stream; }); - document.querySelector('#local-video').srcObject = stream; + document.querySelector('#local-video').srcObject = mediaStream; }; startConn(); ``` From 56ae9cfea648566b886ff54f0e6c81b53df13560 Mon Sep 17 00:00:00 2001 From: voluntas Date: Mon, 23 Mar 2020 12:01:52 +0900 Subject: [PATCH 03/19] =?UTF-8?q?Discord=20=E3=81=AE=E6=96=B9=E9=87=9D?= =?UTF-8?q?=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E6=98=8E=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 01ece45..1101c2a 100644 --- a/README.md +++ b/README.md @@ -157,6 +157,6 @@ Ayame Web SDK はオープンソースソフトウェアですが、開発につ ## Discord -ベストエフォートで運用しています。 +アドバイスはしますが、サポートはしません。 https://discord.gg/mDesh2E From e307c56ce3e954f8c84d20efd6aedb484a8b7415 Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Tue, 24 Mar 2020 11:04:49 +0900 Subject: [PATCH 04/19] =?UTF-8?q?url=20=E3=81=AE=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=202020.1.2=20=E3=81=AB?= =?UTF-8?q?=E4=B8=8A=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1101c2a..7d43aff 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ https://openayame.github.io/ayame-web-sdk/index.html 以下のURL を ``` - + ``` のように指定すると、npm などを経由せず簡単に Ayame を利用することができます。 @@ -38,13 +38,13 @@ https://openayame.github.io/ayame-web-sdk/index.html ### unpkg ``` -https://unpkg.com/@open-ayame/ayame-web-sdk@2020.1.1/dist/ayame.min.js +https://unpkg.com/@open-ayame/ayame-web-sdk@2020.1.2/dist/ayame.min.js ``` ### jsdelivr ``` -https://cdn.jsdelivr.net/npm/@open-ayame/ayame-web-sdk@2020.1.1/dist/ayame.min.js +https://cdn.jsdelivr.net/npm/@open-ayame/ayame-web-sdk@2020.1.2/dist/ayame.min.js ``` ### 双方向送受信接続する From a2e9a1ee2a4f59351e7918ef40980a7241a9f324 Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Wed, 1 Apr 2020 16:23:17 +0900 Subject: [PATCH 05/19] =?UTF-8?q?-=20addDataChannel=20=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=81=99=E3=82=8B=20-=20sendData=20=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=81=99=E3=82=8B=20-=20createDataChannel=20=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=81=99=E3=82=8B=20-=20on('data')=20?= =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B=20-=20on('datacha?= =?UTF-8?q?nnel')=20=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/connection/base.ts | 47 +++++++++++++++++++++-------------------- src/connection/index.ts | 22 ++++--------------- 2 files changed, 28 insertions(+), 41 deletions(-) diff --git a/src/connection/base.ts b/src/connection/base.ts index 25aa6f7..a596923 100644 --- a/src/connection/base.ts +++ b/src/connection/base.ts @@ -88,7 +88,7 @@ class ConnectionBase { addstream: () => {}, removestream: () => {}, bye: () => {}, - data: () => {} + datachannel: () => {} }; } @@ -294,33 +294,34 @@ class ConnectionBase { } } - async _addDataChannel(label: string, options: RTCDataChannelInit | undefined): Promise { - return new Promise((resolve, reject) => { + async _createDataChannel(label: string, options: RTCDataChannelInit | undefined): Promise { + return new Promise((resolve, reject) => { if (!this._pc) return reject('PeerConnection Does Not Ready'); if (this._isOffer) return reject('PeerConnection Has Local Offer'); let dataChannel = this._findDataChannel(label); if (dataChannel) { return reject('DataChannel Already Exists!'); } - dataChannel = this._pc.createDataChannel(label, options); - dataChannel.onclose = (event: Record) => { - this._traceLog('datachannel onclosed=>', event); - this._dataChannels = this._dataChannels.filter(dataChannel => dataChannel.label != label); - }; - dataChannel.onerror = (event: Record) => { - this._traceLog('datachannel onerror=>', event); - this._dataChannels = this._dataChannels.filter(dataChannel => dataChannel.label != label); - }; - dataChannel.onmessage = (event: any) => { - this._traceLog('datachannel onmessage=>', event.data); - event.label = label; - this._callbacks.data(event); - }; - dataChannel.onopen = (event: Record) => { - this._traceLog('datachannel onopen=>', event); - }; - this._dataChannels.push(dataChannel); - return resolve(); + if (this._isExistUser) { + dataChannel = this._pc.createDataChannel(label, options); + dataChannel.onclose = (event: Record) => { + this._traceLog('datachannel onclosed=>', event); + this._dataChannels = this._dataChannels.filter(dataChannel => dataChannel.label != label); + }; + dataChannel.onerror = (event: Record) => { + this._traceLog('datachannel onerror=>', event); + this._dataChannels = this._dataChannels.filter(dataChannel => dataChannel.label != label); + }; + dataChannel.onmessage = (event: any) => { + this._traceLog('datachannel onmessage=>', event.data); + event.label = label; + }; + dataChannel.onopen = (event: Record) => { + this._traceLog('datachannel onopen=>', event); + }; + this._dataChannels.push(dataChannel); + return resolve(dataChannel); + } }); } @@ -343,7 +344,6 @@ class ConnectionBase { dataChannel.onmessage = (event: any) => { this._traceLog('datachannel onmessage=>', event.data); event.label = label; - this._callbacks.data(event); }; if (!this._findDataChannel(label)) { this._dataChannels.push(event.channel); @@ -356,6 +356,7 @@ class ConnectionBase { } }); } + this._callbacks.datachannel(dataChannel); } async _sendOffer() { diff --git a/src/connection/index.ts b/src/connection/index.ts index 1ad7f68..660ce8b 100644 --- a/src/connection/index.ts +++ b/src/connection/index.ts @@ -47,12 +47,13 @@ class Connection extends ConnectionBase { } /** - * @desc Datachannel を追加します。 + * @desc Datachannel を作成します。 * @param {string} label - dataChannel の label * @param {RTCDataChannelInit|undefined} [options=undefined] - dataChannel の init オプション + * @return {RTCDataChannel} dataChannel */ - public async addDataChannel(label: string, options: RTCDataChannelInit | undefined = undefined): Promise { - await this._addDataChannel(label, options); + public async createDataChannel(label: string, options: RTCDataChannelInit | undefined = undefined): Promise { + return await this._createDataChannel(label, options); } /** @@ -69,21 +70,6 @@ class Connection extends ConnectionBase { } } - /** - * @desc Datachannel でデータを送信します。 - * @param {any} params - 送信するデータ - * @param {string} [label='dataChannel'] - 指定する dataChannel の label - */ - public sendData(params: any, label = 'dataChannel'): void { - this._traceLog('datachannel sendData=>', params); - const dataChannel = this._findDataChannel(label); - if (dataChannel && dataChannel.readyState === 'open') { - dataChannel.send(params); - } else { - throw new Error('datachannel is not open'); - } - } - /** * @desc PeerConnection 接続を切断します。 */ From 4f27c3fb60eade7b73ef85b0874eb10f8f3431fa Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Wed, 1 Apr 2020 16:35:36 +0900 Subject: [PATCH 06/19] =?UTF-8?q?createDataChannel,=20on('datachannel')=20?= =?UTF-8?q?=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=97=E3=81=9F=E6=9B=B8=E3=81=8D?= =?UTF-8?q?=E6=96=B9=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/datachannel.html | 27 ++++++++++++++----- test/multi_datachannel.html | 54 +++++++++++++++++++++++++++---------- 2 files changed, 60 insertions(+), 21 deletions(-) diff --git a/test/datachannel.html b/test/datachannel.html index eaf5e43..a5d8f40 100644 --- a/test/datachannel.html +++ b/test/datachannel.html @@ -27,24 +27,37 @@ let conn = null; const options = Ayame.defaultOptions; options.clientId = clientId ? clientId : options.clientId; - const channel = 'dataChannel'; + const label = 'dataChannel'; + let dataChannel = null; const startConn = async () => { conn = Ayame.connection(signalingUrl, roomId, options, true); - conn.on('open', (e) => { - conn.addDataChannel(channel); + conn.on('open', async (e) => { + dataChannel = await conn.createDataChannel(label); + if (dataChannel) { + dataChannel.onmessage = onMessage; + } }); - conn.on('data', (e) => { - messages = messages ? (messages + '\n' + e.data) : e.data; - document.querySelector("#messages").value = messages; + conn.on('datachannel', (channel) => { + if (!dataChannel) { + dataChannel = channel; + dataChannel.onmessage = onMessage; + } }); await conn.connect(null); }; const sendData = () => { const data = document.querySelector("#sendDataInput").value; - conn.sendData(data); + if (dataChannel && dataChannel.readyState === 'open') { + dataChannel.send(data); + } }; document.querySelector("#roomIdInput").value = roomId; document.querySelector("#clientIdInput").value = options.clientId; + + function onMessage(e) { + messages = messages ? (messages + '\n' + e.data) : e.data; + document.querySelector("#messages").value = messages; + } diff --git a/test/multi_datachannel.html b/test/multi_datachannel.html index ae1fc45..85a308f 100644 --- a/test/multi_datachannel.html +++ b/test/multi_datachannel.html @@ -39,21 +39,34 @@ const options = Ayame.defaultOptions; let messagesA = null; let messagesB = null; - const channel = 'dataChannel'; - const anotherChannel = 'anotherChannel'; + const label = 'dataChannel'; + const anotherLabel = 'anotherChannel'; options.clientId = clientId ? clientId : options.clientId; conn = Ayame.connection(signalingUrl, roomId, options, true); - conn.on('open', (e) => { - conn.addDataChannel(channel); - conn.addDataChannel(anotherChannel); + let dataChannel = null; + let anotherDataChannel = null; + conn.on('open', async (e) => { + dataChannel = await conn.createDataChannel(label); + if (dataChannel) { + dataChannel.onmessage = onMessageA; + } + anotherDataChannel = await conn.createDataChannel(anotherLabel); + if (anotherDataChannel) { + anotherDataChannel.onmessage = onMessageB; + } }); - conn.on('data', (e) => { - if (e.label == anotherChannel) { - messagesB = messagesB ? (messagesB + '\n' + e.data) : e.data; - document.querySelector("#messagesB").value = messagesB; - } else { - messagesA = messagesA ? (messagesA + '\n' + e.data) : e.data; - document.querySelector("#messagesA").value = messagesA; + conn.on('datachannel', (channel) => { + console.log('=== datachannel ==='); + if (channel.label === label) { + if (!dataChannel) { + dataChannel = channel; + dataChannel.onmessage = onMessageA; + } + } else if (channel.label === anotherLabel) { + if (!anotherDataChannel) { + anotherDataChannel = channel; + anotherDataChannel.onmessage = onMessageB; + } } }); const startConn = async () => { @@ -61,14 +74,27 @@ }; const sendDataA = () => { const data = document.querySelector("#sendDataInputA").value; - conn.sendData(data); + if (dataChannel && dataChannel.readyState === 'open') { + dataChannel.send(data); + } }; const sendDataB = () => { const data = document.querySelector("#sendDataInputB").value; - conn.sendData(data, anotherChannel); + if (anotherDataChannel && anotherDataChannel.readyState === 'open') { + anotherDataChannel.send(data); + } }; document.querySelector("#roomIdInput").value = roomId; document.querySelector("#clientIdInput").value = options.clientId; + + function onMessageA(e) { + messagesA = messagesA ? (messagesA + '\n' + e.data) : e.data; + document.querySelector("#messagesA").value = messagesA; + } + function onMessageB(e) { + messagesB = messagesB ? (messagesB + '\n' + e.data) : e.data; + document.querySelector("#messagesB").value = messagesB; + } From 75fe659b1761ea3ef5b1d8cd7aa72a65a73b7e3a Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Wed, 1 Apr 2020 17:27:11 +0900 Subject: [PATCH 07/19] =?UTF-8?q?lint=20=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/connection/index.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/connection/index.ts b/src/connection/index.ts index 660ce8b..97b6c73 100644 --- a/src/connection/index.ts +++ b/src/connection/index.ts @@ -52,7 +52,10 @@ class Connection extends ConnectionBase { * @param {RTCDataChannelInit|undefined} [options=undefined] - dataChannel の init オプション * @return {RTCDataChannel} dataChannel */ - public async createDataChannel(label: string, options: RTCDataChannelInit | undefined = undefined): Promise { + public async createDataChannel( + label: string, + options: RTCDataChannelInit | undefined = undefined + ): Promise { return await this._createDataChannel(label, options); } From f46cb22a58af920b3b18618a399d91f7c1b987e3 Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Thu, 2 Apr 2020 12:44:43 +0900 Subject: [PATCH 08/19] =?UTF-8?q?isExistUser=20=E3=81=8C=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E3=81=99=E3=82=8B=E5=89=8D=E6=8F=90=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/connection/base.ts | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/connection/base.ts b/src/connection/base.ts index a596923..e7f29c4 100644 --- a/src/connection/base.ts +++ b/src/connection/base.ts @@ -155,18 +155,11 @@ class ConnectionBase { this._traceLog('iceServers=>', message.iceServers); this._pcConfig.iceServers = message.iceServers; } - if (message.isExistUser === undefined) { - if (!this._pc) { - this._createPeerConnection(); - } + this._traceLog('isExistUser=>', message.isExistUser); + this._isExistUser = message.isExistUser; + this._createPeerConnection(); + if (this._isExistUser === true) { await this._sendOffer(); - } else { - this._traceLog('isExistUser=>', message.isExistUser); - this._isExistUser = message.isExistUser; - this._createPeerConnection(); - if (this._isExistUser === true) { - await this._sendOffer(); - } } return resolve(); } else if (message.type === 'reject') { From 912da705bd75c6b69e6eef1a04cf0a2fcbd5b717 Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Thu, 2 Apr 2020 12:52:44 +0900 Subject: [PATCH 09/19] =?UTF-8?q?=E5=88=87=E6=96=AD=E6=99=82=E3=81=AB?= =?UTF-8?q?=E3=81=AF=20dataChannel=20=E3=82=92=20null=20=E3=81=AB=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/datachannel.html | 3 +++ test/multi_datachannel.html | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/test/datachannel.html b/test/datachannel.html index a5d8f40..692df34 100644 --- a/test/datachannel.html +++ b/test/datachannel.html @@ -43,6 +43,9 @@ dataChannel.onmessage = onMessage; } }); + conn.on('disconnect', () => { + dataChannel = null; + }); await conn.connect(null); }; const sendData = () => { diff --git a/test/multi_datachannel.html b/test/multi_datachannel.html index 85a308f..07ae05b 100644 --- a/test/multi_datachannel.html +++ b/test/multi_datachannel.html @@ -56,7 +56,6 @@ } }); conn.on('datachannel', (channel) => { - console.log('=== datachannel ==='); if (channel.label === label) { if (!dataChannel) { dataChannel = channel; @@ -69,6 +68,10 @@ } } }); + conn.on('disconnect', () => { + dataChannel = null; + anotherDataChannel = null; + }); const startConn = async () => { await conn.connect(null); }; From 81ea0b75c36c57ccdcc80c3023f7802296c63099 Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Thu, 2 Apr 2020 16:19:13 +0900 Subject: [PATCH 10/19] =?UTF-8?q?null=20=E3=82=92=E8=A8=B1=E5=AE=B9?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/connection/base.ts | 5 +++-- src/connection/index.ts | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/connection/base.ts b/src/connection/base.ts index e7f29c4..de18332 100644 --- a/src/connection/base.ts +++ b/src/connection/base.ts @@ -287,8 +287,8 @@ class ConnectionBase { } } - async _createDataChannel(label: string, options: RTCDataChannelInit | undefined): Promise { - return new Promise((resolve, reject) => { + async _createDataChannel(label: string, options: RTCDataChannelInit | undefined): Promise { + return new Promise((resolve, reject) => { if (!this._pc) return reject('PeerConnection Does Not Ready'); if (this._isOffer) return reject('PeerConnection Has Local Offer'); let dataChannel = this._findDataChannel(label); @@ -315,6 +315,7 @@ class ConnectionBase { this._dataChannels.push(dataChannel); return resolve(dataChannel); } + return resolve(null); }); } diff --git a/src/connection/index.ts b/src/connection/index.ts index 97b6c73..8ee5ef1 100644 --- a/src/connection/index.ts +++ b/src/connection/index.ts @@ -50,12 +50,12 @@ class Connection extends ConnectionBase { * @desc Datachannel を作成します。 * @param {string} label - dataChannel の label * @param {RTCDataChannelInit|undefined} [options=undefined] - dataChannel の init オプション - * @return {RTCDataChannel} dataChannel + * @return {RTCDataChannel|null} 生成されたデータチャネル */ public async createDataChannel( label: string, options: RTCDataChannelInit | undefined = undefined - ): Promise { + ): Promise { return await this._createDataChannel(label, options); } From 0aa4a2be97fb5885ad3581966a815de43cde008a Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Thu, 2 Apr 2020 16:20:10 +0900 Subject: [PATCH 11/19] =?UTF-8?q?on(disconnect)=20=E6=99=82=E3=81=AE?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/multi_datachannel.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/multi_datachannel.html b/test/multi_datachannel.html index 07ae05b..4e6ccd1 100644 --- a/test/multi_datachannel.html +++ b/test/multi_datachannel.html @@ -68,10 +68,6 @@ } } }); - conn.on('disconnect', () => { - dataChannel = null; - anotherDataChannel = null; - }); const startConn = async () => { await conn.connect(null); }; From 3d34a548a2b8d9a614bf0da9c6360272a933b1ad Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Thu, 2 Apr 2020 16:57:28 +0900 Subject: [PATCH 12/19] =?UTF-8?q?sendData=20=E3=82=92=E3=81=BE=E3=81=A8?= =?UTF-8?q?=E3=82=81=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/multi_datachannel.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/multi_datachannel.html b/test/multi_datachannel.html index 4e6ccd1..e8ec3f4 100644 --- a/test/multi_datachannel.html +++ b/test/multi_datachannel.html @@ -72,16 +72,10 @@ await conn.connect(null); }; const sendDataA = () => { - const data = document.querySelector("#sendDataInputA").value; - if (dataChannel && dataChannel.readyState === 'open') { - dataChannel.send(data); - } + sendData("#sendDataInputA", dataChannel) }; const sendDataB = () => { - const data = document.querySelector("#sendDataInputB").value; - if (anotherDataChannel && anotherDataChannel.readyState === 'open') { - anotherDataChannel.send(data); - } + sendData("#sendDataInputB", anotherDataChannel) }; document.querySelector("#roomIdInput").value = roomId; document.querySelector("#clientIdInput").value = options.clientId; @@ -94,6 +88,12 @@ messagesB = messagesB ? (messagesB + '\n' + e.data) : e.data; document.querySelector("#messagesB").value = messagesB; } + function sendData(id, channel) { + const data = document.querySelector(id).value; + if (channel && channel.readyState === 'open') { + channel.send(data); + } + } From 152f42cb8db37db55585c33d800ff3fc5a8a2945 Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Fri, 3 Apr 2020 12:35:54 +0900 Subject: [PATCH 13/19] =?UTF-8?q?Revert=20"on(disconnect)=20=E6=99=82?= =?UTF-8?q?=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E5=89=8A=E9=99=A4=E3=81=99?= =?UTF-8?q?=E3=82=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 0aa4a2be97fb5885ad3581966a815de43cde008a. --- test/multi_datachannel.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/multi_datachannel.html b/test/multi_datachannel.html index e8ec3f4..7c261d7 100644 --- a/test/multi_datachannel.html +++ b/test/multi_datachannel.html @@ -68,6 +68,10 @@ } } }); + conn.on('disconnect', () => { + dataChannel = null; + anotherDataChannel = null; + }); const startConn = async () => { await conn.connect(null); }; From 3ff339515a9d752f3d8cdbce93db0339cae4ad97 Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Fri, 3 Apr 2020 15:23:37 +0900 Subject: [PATCH 14/19] =?UTF-8?q?bye=20=E5=8F=97=E4=BF=A1=E3=81=AE?= =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=9F=E3=83=B3=E3=82=B0=E3=81=A7=E3=81=AF?= =?UTF-8?q?=E5=88=87=E6=96=AD=E3=81=9B=E3=81=9A=E3=81=AB=20websocket=20?= =?UTF-8?q?=E3=81=AE=E5=88=87=E6=96=AD=E3=82=92=E5=BE=85=E3=81=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/connection/base.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/connection/base.ts b/src/connection/base.ts index de18332..15f320f 100644 --- a/src/connection/base.ts +++ b/src/connection/base.ts @@ -147,7 +147,6 @@ class ConnectionBase { this._sendWs({ type: 'pong' }); } else if (message.type === 'bye') { this._callbacks.bye(event); - await this._disconnect(); return resolve(); } else if (message.type === 'accept') { this.authzMetadata = message.authzMetadata; From 4be70b6c8e3cc7d826913d65f6e0517f39ffc9bf Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Fri, 3 Apr 2020 16:29:38 +0900 Subject: [PATCH 15/19] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 40f3265..803177d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,21 @@ ## develop +- [CHANGE] addDataChannel, sendData を削除する + - @Hexa +- [CHANGE] on('data') コールバックを削除する + - @Hexa +- [ADD] createDataChannel を追加する + - @Hexa +- [ADD] on('datachannel') コールバックを追加する + - @Hexa +- [FIX] offer 側の場合のみ RTCDataChannel オブジェクトを作成するように修正する + - @Hexa +- [CHANGE] Ayame が isExistUser を送ってくる場合のみ接続できるようにする + - @Hexa +- [FIX] bye 受信時に on('disconnect') コールバックが発火するように修正する + - @Hexa + ## 2020.1.2 - [FIX] 依存ライブラリを最新にする From db0fdb53884377edfeddbe2384789be9669d0d71 Mon Sep 17 00:00:00 2001 From: Yoshida Hiroshi Date: Fri, 3 Apr 2020 17:00:21 +0900 Subject: [PATCH 16/19] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 803177d..e7fec4a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -23,7 +23,7 @@ - @Hexa - [CHANGE] Ayame が isExistUser を送ってくる場合のみ接続できるようにする - @Hexa -- [FIX] bye 受信時に on('disconnect') コールバックが発火するように修正する +- [FIX] bye を受信した場合にも on('disconnect') コールバックが発火するように修正する - @Hexa ## 2020.1.2 From 6cc10b83d441ede8f293b2f174c38dc0fd0664b2 Mon Sep 17 00:00:00 2001 From: NAKAI Ryosuke Date: Fri, 3 Apr 2020 22:21:41 +0900 Subject: [PATCH 17/19] yarn upgrade --- package.json | 2 +- yarn.lock | 202 +++++++++++++++++++++++++++++---------------------- 2 files changed, 117 insertions(+), 87 deletions(-) diff --git a/package.json b/package.json index 66fad89..77ef617 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@open-ayame/ayame-web-sdk", - "version": "2020.1.2", + "version": "2020.2", "description": "Web SDK for WebRTC Signaling Server Ayame", "main": "dist/ayame.min.js", "scripts": { diff --git a/yarn.lock b/yarn.lock index 3db8c17..d7e45af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,13 +9,18 @@ dependencies: "@babel/highlight" "^7.8.3" +"@babel/helper-validator-identifier@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed" + integrity sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw== + "@babel/highlight@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797" - integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg== + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079" + integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ== dependencies: + "@babel/helper-validator-identifier" "^7.9.0" chalk "^2.0.0" - esutils "^2.0.2" js-tokens "^4.0.0" "@types/color-name@^1.1.1": @@ -29,9 +34,9 @@ integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag== "@types/estree@*": - version "0.0.42" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.42.tgz#8d0c1f480339efedb3e46070e22dd63e0430dd11" - integrity sha512-K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ== + version "0.0.44" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.44.tgz#980cc5a29a3ef3bea6ff1f7d021047d7ea575e21" + integrity sha512-iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g== "@types/json-schema@^7.0.3": version "7.0.4" @@ -39,14 +44,14 @@ integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA== "@types/node@*": - version "13.9.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.1.tgz#96f606f8cd67fb018847d9b61e93997dabdefc72" - integrity sha512-E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ== + version "13.11.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.0.tgz#390ea202539c61c8fa6ba4428b57e05bc36dc47b" + integrity sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ== "@types/node@^12.12.14": - version "12.12.30" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.30.tgz#3501e6f09b954de9c404671cefdbcc5d9d7c45f6" - integrity sha512-sz9MF/zk6qVr3pAnM0BSQvYIBK44tS75QC5N+VbWSE4DjCV/pJ+UzCW/F+vVnl7TkOPcuwQureKNtSSwjBTaMg== + version "12.12.34" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.34.tgz#0a5d6ae5d22612f0cf5f10320e1fc5d2a745dcb8" + integrity sha512-BneGN0J9ke24lBRn44hVHNeDlrXRYF+VRp0HbSUNnEZahXGAysHZIqnf/hER6aabdBgzM4YOV4jrR8gj4Zfi0g== "@types/resolve@0.0.8": version "0.0.8" @@ -61,39 +66,39 @@ integrity sha512-ep/e+p2uUKV1h96GBgRhwomrBch/bPDHPOKbCHODLGRUDuuKe2s7sErlFVKw+5BYUzvpxSmUNqoadaZ44MePoQ== "@typescript-eslint/eslint-plugin@^2.9.0": - version "2.24.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.24.0.tgz#a86cf618c965a462cddf3601f594544b134d6d68" - integrity sha512-wJRBeaMeT7RLQ27UQkDFOu25MqFOBus8PtOa9KaT5ZuxC1kAsd7JEHqWt4YXuY9eancX0GK9C68i5OROnlIzBA== + version "2.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.26.0.tgz#04c96560c8981421e5a9caad8394192363cc423f" + integrity sha512-4yUnLv40bzfzsXcTAtZyTjbiGUXMrcIJcIMioI22tSOyAxpdXiZ4r7YQUU8Jj6XXrLz9d5aMHPQf5JFR7h27Nw== dependencies: - "@typescript-eslint/experimental-utils" "2.24.0" - eslint-utils "^1.4.3" + "@typescript-eslint/experimental-utils" "2.26.0" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@2.24.0": - version "2.24.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.24.0.tgz#a5cb2ed89fedf8b59638dc83484eb0c8c35e1143" - integrity sha512-DXrwuXTdVh3ycNCMYmWhUzn/gfqu9N0VzNnahjiDJvcyhfBy4gb59ncVZVxdp5XzBC77dCncu0daQgOkbvPwBw== +"@typescript-eslint/experimental-utils@2.26.0": + version "2.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.26.0.tgz#063390c404d9980767d76274df386c0aa675d91d" + integrity sha512-RELVoH5EYd+JlGprEyojUv9HeKcZqF7nZUGSblyAw1FwOGNnmQIU8kxJ69fttQvEwCsX5D6ECJT8GTozxrDKVQ== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.24.0" + "@typescript-eslint/typescript-estree" "2.26.0" eslint-scope "^5.0.0" + eslint-utils "^2.0.0" "@typescript-eslint/parser@^2.9.0": - version "2.24.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.24.0.tgz#2cf0eae6e6dd44d162486ad949c126b887f11eb8" - integrity sha512-H2Y7uacwSSg8IbVxdYExSI3T7uM1DzmOn2COGtCahCC3g8YtM1xYAPi2MAHyfPs61VKxP/J/UiSctcRgw4G8aw== + version "2.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.26.0.tgz#385463615818b33acb72a25b39c03579df93d76f" + integrity sha512-+Xj5fucDtdKEVGSh9353wcnseMRkPpEAOY96EEenN7kJVrLqy/EVwtIh3mxcUz8lsFXW1mT5nN5vvEam/a5HiQ== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.24.0" - "@typescript-eslint/typescript-estree" "2.24.0" + "@typescript-eslint/experimental-utils" "2.26.0" + "@typescript-eslint/typescript-estree" "2.26.0" eslint-visitor-keys "^1.1.0" -"@typescript-eslint/typescript-estree@2.24.0": - version "2.24.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.24.0.tgz#38bbc8bb479790d2f324797ffbcdb346d897c62a" - integrity sha512-RJ0yMe5owMSix55qX7Mi9V6z2FDuuDpN6eR5fzRJrp+8in9UF41IGNQHbg5aMK4/PjVaEQksLvz0IA8n+Mr/FA== +"@typescript-eslint/typescript-estree@2.26.0": + version "2.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.26.0.tgz#d8132cf1ee8a72234f996519a47d8a9118b57d56" + integrity sha512-3x4SyZCLB4zsKsjuhxDLeVJN6W29VwBnYpCsZ7vIdPel9ZqLfIZJgJXO47MNUkurGpQuIBALdPQKtsSnWpE1Yg== dependencies: debug "^4.1.1" eslint-visitor-keys "^1.1.0" @@ -765,10 +770,10 @@ error-ex@^1.2.0: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.0, es-abstract@^1.17.0-next.1: - version "1.17.4" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184" - integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ== +es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.5: + version "1.17.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" + integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg== dependencies: es-to-primitive "^1.2.1" function-bind "^1.1.1" @@ -934,9 +939,9 @@ esdoc@^1.1.0: taffydb "2.7.3" eslint-config-prettier@^6.7.0: - version "6.10.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.0.tgz#7b15e303bf9c956875c948f6b21500e48ded6a7f" - integrity sha512-AtndijGte1rPILInUdHjvKEGbIV06NuvPrqlIEaEaWtbtvJh464mDeyGMdZEQMsGvC0ZVkiex1fSNcC4HAbRGg== + version "6.10.1" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.1.tgz#129ef9ec575d5ddc0e269667bf09defcd898642a" + integrity sha512-svTy6zh1ecQojvpbJSgH3aei/Rt7C6i090l5f2WQ4aB05lYHeZIR1qL4wZyyILTbtmnbHP5Yn8MrsOJMGa8RkQ== dependencies: get-stdin "^6.0.0" @@ -949,17 +954,17 @@ eslint-import-resolver-node@^0.3.2: resolve "^1.13.1" eslint-module-utils@^2.4.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz#7878f7504824e1b857dd2505b59a8e5eda26a708" - integrity sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q== + version "2.6.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" + integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== dependencies: debug "^2.6.9" pkg-dir "^2.0.0" eslint-plugin-import@^2.18.2: - version "2.20.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3" - integrity sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw== + version "2.20.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz#91fc3807ce08be4837141272c8b99073906e588d" + integrity sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg== dependencies: array-includes "^3.0.3" array.prototype.flat "^1.2.1" @@ -996,6 +1001,13 @@ eslint-utils@^1.4.3: dependencies: eslint-visitor-keys "^1.1.0" +eslint-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd" + integrity sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA== + dependencies: + eslint-visitor-keys "^1.1.0" + eslint-visitor-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" @@ -1059,11 +1071,11 @@ esprima@^4.0.0, esprima@^4.0.1: integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== esquery@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz#c5c0b66f383e7656404f86b31334d72524eddb48" - integrity sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q== + version "1.2.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.2.0.tgz#a010a519c0288f2530b3404124bfb5f02e9797fe" + integrity sha512-weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q== dependencies: - estraverse "^4.0.0" + estraverse "^5.0.0" esrecurse@^4.1.0: version "4.2.1" @@ -1072,11 +1084,16 @@ esrecurse@^4.1.0: dependencies: estraverse "^4.1.0" -estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== +estraverse@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.0.0.tgz#ac81750b482c11cca26e4b07e83ed8f75fbcdc22" + integrity sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A== + estree-walker@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362" @@ -1201,9 +1218,9 @@ flat-cache@^2.0.1: write "1.0.3" flatted@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08" - integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" + integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== forever-agent@~0.6.1: version "0.6.1" @@ -1291,9 +1308,9 @@ gh-pages@^2.1.1: globby "^6.1.0" glob-parent@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2" - integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw== + version "5.1.1" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" + integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== dependencies: is-glob "^4.0.1" @@ -1851,27 +1868,22 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - minimist@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= -minimist@^1.1.0: +minimist@^1.1.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= + version "0.5.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512" + integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw== dependencies: - minimist "0.0.8" + minimist "^1.2.5" ms@2.0.0: version "2.0.0" @@ -2161,9 +2173,9 @@ progress@^2.0.0: integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== psl@^1.1.28: - version "1.7.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c" - integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ== + version "1.8.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== punycode@^2.1.0, punycode@^2.1.1: version "2.1.1" @@ -2372,9 +2384,9 @@ run-async@^2.4.0: is-promise "^2.1.0" rxjs@^6.5.3: - version "6.5.4" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" - integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q== + version "6.5.5" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec" + integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ== dependencies: tslib "^1.9.0" @@ -2421,9 +2433,9 @@ shebang-regex@^1.0.0: integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== slice-ansi@^2.1.0: version "2.1.0" @@ -2528,21 +2540,39 @@ string-width@^4.1.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string.prototype.trimend@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz#ee497fd29768646d84be2c9b819e292439614373" + integrity sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string.prototype.trimleft@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" - integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== + version "2.1.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc" + integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw== dependencies: define-properties "^1.1.3" - function-bind "^1.1.1" + es-abstract "^1.17.5" + string.prototype.trimstart "^1.0.0" string.prototype.trimright@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" - integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g== + version "2.1.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3" + integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg== dependencies: define-properties "^1.1.3" - function-bind "^1.1.1" + es-abstract "^1.17.5" + string.prototype.trimend "^1.0.0" + +string.prototype.trimstart@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz#afe596a7ce9de905496919406c9734845f01a2f2" + integrity sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" string_decoder@^1.1.1: version "1.3.0" @@ -2651,9 +2681,9 @@ taffydb@2.7.3: integrity sha1-KtNxaWKUmPylvIQkMJbTzeDsOjQ= terser@^4.6.2: - version "4.6.6" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.6.tgz#da2382e6cafbdf86205e82fb9a115bd664d54863" - integrity sha512-4lYPyeNmstjIIESr/ysHg2vUPRGf2tzF9z2yYwnowXVuVzLEamPN1Gfrz7f8I9uEPuHcbFlW4PLIAsJoxXyJ1g== + version "4.6.10" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.10.tgz#90f5bd069ff456ddbc9503b18e52f9c493d3b7c2" + integrity sha512-qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA== dependencies: commander "^2.20.0" source-map "~0.6.1" From beb9a9de1b9fd2a32d8398fb7a4fb7b3685d79dc Mon Sep 17 00:00:00 2001 From: NAKAI Ryosuke Date: Fri, 3 Apr 2020 22:21:52 +0900 Subject: [PATCH 18/19] =?UTF-8?q?2020.2=20=E3=81=AB=E4=B8=8A=E3=81=92?= =?UTF-8?q?=E3=82=8B=E6=BA=96=E5=82=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index e7fec4a..45befb1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,8 @@ ## develop +## 2020.2 + - [CHANGE] addDataChannel, sendData を削除する - @Hexa - [CHANGE] on('data') コールバックを削除する From 892884d833db8bc58f2d2e083e393bdbe7a0c7d1 Mon Sep 17 00:00:00 2001 From: NAKAI Ryosuke Date: Fri, 3 Apr 2020 22:32:52 +0900 Subject: [PATCH 19/19] =?UTF-8?q?=E6=B3=A8=E6=84=8F=E6=9B=B8=E3=81=8D?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 45befb1..d9c4f70 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,6 +13,8 @@ ## 2020.2 +**DataChannel 関連で下位互換性がなくなっていますので注意してください** + - [CHANGE] addDataChannel, sendData を削除する - @Hexa - [CHANGE] on('data') コールバックを削除する