終了処理を丁寧に

shiguredo · Feb 22, 2024 · 18f17c8 · 18f17c8
1 parent 923bf14
commit 18f17c8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -35,7 +35,7 @@ jobs:
       - run: pnpm install
       - run: pnpm run build
       - run: pnpm exec playwright install ${{ matrix.browser }} --with-deps
-      - run: pnpm exec playwright test --workers=1 --project=${{ matrix.browser }}
+      - run: pnpm exec playwright test --project=${{ matrix.browser }}
         env:
           VITE_SORA_CHANNEL_ID_SUFFIX: _${{ matrix.node }}
       # - uses: actions/upload-artifact@v4

diff --git a/examples/spotlight_recvonly/main.mjs b/examples/spotlight_recvonly/main.mjs
@@ -43,6 +43,7 @@ recvonly.on('track', (event) => {
 recvonly.on('removetrack', (event) => {
   const remoteVideo = document.querySelector(`#remotevideo-${event.target.id}`)
   if (remoteVideo) {
+    remoteVideo.srcObject = null
     document.querySelector('#remote-videos').removeChild(remoteVideo)
   }
 })

diff --git a/examples/spotlight_sendonly/main.mjs b/examples/spotlight_sendonly/main.mjs
@@ -28,3 +28,8 @@ document.querySelector('#start-sendonly').addEventListener('click', async () =>
   document.querySelector('#sendonly-local-video').srcObject = mediaStream
   await sendonly.connect(mediaStream)
 })
+
+document.querySelector('#stop-sendonly').addEventListener('click', async () => {
+  document.querySelector('#sendonly-local-video').srcObject = null
+  await sendonly.disconnect()
+})
diff --git a/examples/spotlight_sendrecv/main.mjs b/examples/spotlight_sendrecv/main.mjs
@@ -77,6 +77,7 @@ sendrecv2.on('track', (event) => {
 sendrecv2.on('removetrack', (event) => {
   const remoteVideo = document.querySelector(`#sendrecv2-remotevideo-${event.target.id}`)
   if (remoteVideo) {
+    remoteVideo.srcObject = null
     document.querySelector('#sendrecv2-remote-videos').removeChild(remoteVideo)
   }
 })
@@ -94,15 +95,13 @@ document.querySelector('#start-sendrecv2').addEventListener('click', async () =>
   document.querySelector('#sendrecv2-local-video').srcObject = mediaStream
   await sendrecv2.connect(mediaStream)
 })
-document.querySelector('#stop-sendrecv1').addEventListener('click', () => {
-  sendrecv1.disconnect().then(() => {
-    document.querySelector('#sendrecv1-local-video').srcObject = null
-    document.querySelector('#sendrecv1-remote-videos').innerHTML = null
-  })
+document.querySelector('#stop-sendrecv1').addEventListener('click', async () => {
+  await sendrecv1.disconnect()
+  document.querySelector('#sendrecv1-local-video').srcObject = null
+  document.querySelector('#sendrecv1-remote-videos').innerHTML = null
 })
-document.querySelector('#stop-sendrecv2').addEventListener('click', () => {
-  sendrecv2.disconnect().then(() => {
-    document.querySelector('#sendrecv2-local-video').srcObject = null
-    document.querySelector('#sendrecv2-remote-videos').innerHTML = null
-  })
+document.querySelector('#stop-sendrecv2').addEventListener('click', async () => {
+  sendrecv2.disconnect()
+  document.querySelector('#sendrecv2-local-video').srcObject = null
+  document.querySelector('#sendrecv2-remote-videos').innerHTML = null
 })