From 3cd274b06dc8a39e028ccdc059aa598df7711eac Mon Sep 17 00:00:00 2001 From: Takeshi NAMAO Date: Thu, 7 Dec 2023 16:46:51 +0900 Subject: [PATCH 1/3] =?UTF-8?q?sora-js-sdk=20=E3=82=92=202023.2.0-canary.1?= =?UTF-8?q?5=20=E3=81=AB=E4=B8=8A=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f4ec7cc5..8a69d49a 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "redux": "4.2.1", "redux-logger": "3.0.6", "redux-thunk": "2.4.2", - "sora-js-sdk": "2023.2.0-canary.14" + "sora-js-sdk": "2023.2.0-canary.15" }, "devDependencies": { "@biomejs/biome": "1.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6d1d1b9f..14d79902 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -48,8 +48,8 @@ dependencies: specifier: 2.4.2 version: 2.4.2(redux@4.2.1) sora-js-sdk: - specifier: 2023.2.0-canary.14 - version: 2023.2.0-canary.14 + specifier: 2023.2.0-canary.15 + version: 2023.2.0-canary.15 devDependencies: '@biomejs/biome': @@ -2922,8 +2922,8 @@ packages: engines: {node: '>=14.16'} dev: true - /sora-js-sdk@2023.2.0-canary.14: - resolution: {integrity: sha512-EzyeZobLwfSKkh/fYG0BISEOYDWMGvC97eM475cli7dRDEX3bMCfabRPPm0ZRvY24GYpHDSt7dCNOuzm1ssz9w==} + /sora-js-sdk@2023.2.0-canary.15: + resolution: {integrity: sha512-bDMlROU68a5PAwW5gZ5oIrasUA8ICRVR9I48c+fKolr8CPlyqd21MMpTjhaEcL/rW7aXXJGyojmdRRePM+iWIA==} engines: {node: '>=18'} dev: false From 696d300f6b22d1d216a2617920a952c0ac99e966 Mon Sep 17 00:00:00 2001 From: Takeshi NAMAO Date: Thu, 7 Dec 2023 18:02:57 +0900 Subject: [PATCH 2/3] =?UTF-8?q?type:=20offer=20=E3=81=A7=E3=82=BB=E3=83=83?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=20ID=20=E3=82=92=E5=8F=96=E5=BE=97?= =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=81=9F=E5=A0=B4=E5=90=88=E3=81=AF=E3=81=9D?= =?UTF-8?q?=E3=82=8C=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=AB=E4=BD=BF=E7=94=A8?= =?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/app/actions.ts | 1 - src/app/slice.ts | 10 ++++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/app/actions.ts b/src/app/actions.ts index 1e6eed1a..252ad1a1 100644 --- a/src/app/actions.ts +++ b/src/app/actions.ts @@ -902,7 +902,6 @@ function setSoraCallbacks( fakeContents.worker.postMessage({ type: 'stop' }) } dispatch(slice.actions.setSora(null)) - dispatch(slice.actions.setSoraSessionId(null)) dispatch(slice.actions.setSoraConnectionStatus('disconnected')) dispatch(slice.actions.setLocalMediaStream(null)) dispatch(slice.actions.removeAllRemoteMediaStreams()) diff --git a/src/app/slice.ts b/src/app/slice.ts index 1021c36b..1aed016e 100644 --- a/src/app/slice.ts +++ b/src/app/slice.ts @@ -371,14 +371,20 @@ export const slice = createSlice({ if (state.soraContents.sora) { state.soraContents.connectionId = state.soraContents.sora.connectionId state.soraContents.clientId = state.soraContents.sora.clientId + if (state.soraContents.sessionId === null) { + state.soraContents.sessionId = state.soraContents.sora.sessionId + } } else { state.soraContents.connectionId = null state.soraContents.clientId = null + state.soraContents.sessionId = null state.soraContents.datachannels = [] } }, - setSoraSessionId: (state, action: PayloadAction) => { - state.soraContents.sessionId = action.payload + setSoraSessionId: (state, action: PayloadAction) => { + if (state.soraContents.sessionId === null) { + state.soraContents.sessionId = action.payload + } }, setSoraConnectionStatus: ( state, From e513ae1ff8ecc6eac96a4bb97887188cf3e82aeb Mon Sep 17 00:00:00 2001 From: Takeshi NAMAO Date: Thu, 7 Dec 2023 18:06:17 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E3=81=AB=E3=82=BB=E3=83=83=E3=82=B7=E3=83=A7=E3=83=B3=20ID=20?= =?UTF-8?q?=E3=81=AE=E5=8F=96=E5=BE=97=E3=81=AE=E8=A9=B3=E7=B4=B0=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E8=A8=98=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 24804666..d481b5be 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,6 +16,8 @@ - [ADD] コネクション ID とクライアント ID の表示にラベルを追加する - @tnamao - [ADD] Sora 接続後にセッション ID の表示を追加する + - Sora 2023.2.0 以降は sora-js-sdk が `type: offer` から取得したセッション ID を表示に使用する + - それ以外の場合は notify の `connection.created` イベントで取得したセッション ID を表示に使用する - @tnamao - [FIX] `audio` `video` がともに無効な状態で Sora への接続時に getUserMedia を呼び出してしまう問題を修正する - @tnamao @@ -57,7 +59,7 @@ - @voluntas - [CHANGE] 一時的に ; ありにする - @voluntas -- [UPDATE] sora-js-sdk のバージョンを 2023.2.0-canary.14 に上げる +- [UPDATE] sora-js-sdk のバージョンを 2023.2.0-canary.15 に上げる - @voluntas - [UPDATE] @shiguredo/virtual-background のバージョンを 2023.2.0 に上げる - @sile