Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-10-16 23:45:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch JS SDK back to develop

Browse Source 
The js-sdk at this commit also renamed MatrixRTCSession.leaveRoomSession to leave, which the SDK follows.

(cherry picked from commit 405348945febc1df10edf9c00748f1edd6b39e71)
This commit is contained in:
Johannes Marbach
2026-10-13 13:00:58 +02:00
committed by Timo K.
parent 799619557b
commit 7685947a69
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pnpm-lock.yaml
Generated
+10 -10
View File
@@ -192,10 +192,10 @@ importers:
version: 1.9.2 version: 1.9.2
matrix-js-sdk: matrix-js-sdk:
specifier: github:matrix-org/matrix-js-sdk#develop specifier: github:matrix-org/matrix-js-sdk#develop
version: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/fa4772a4ddd335a5a8bfbf8bb21df49b70f7a999 version: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/4df2f2bfb5826c25f05d9535a8556acecaf2e570
matrix-widget-api: matrix-widget-api:
specifier: ^1.18.0 specifier: ^1.18.0
version: 1.19.0 version: 1.20.0
node-stdlib-browser: node-stdlib-browser:
specifier: ^1.3.1 specifier: ^1.3.1
version: 1.3.1 version: 1.3.1
@@ -4673,13 +4673,13 @@ packages:
matrix-events-sdk@0.0.1: matrix-events-sdk@0.0.1:
resolution: {integrity: sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==} resolution: {integrity: sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==}
matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/fa4772a4ddd335a5a8bfbf8bb21df49b70f7a999: matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/4df2f2bfb5826c25f05d9535a8556acecaf2e570:
resolution: {gitHosted: true, integrity: sha512-qF8++74MX36KS1KEw6Lc8HHXgZ6nHD1oUU4yBZUj5vVPvZTIspk1lOGztkFmizE5vmLAHd5tdadL9Xu1Asy4bA==, tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/fa4772a4ddd335a5a8bfbf8bb21df49b70f7a999} resolution: {gitHosted: true, integrity: sha512-b1o6ywaPY9jakj+3GIgx3samM9AbqohzPQ5nZKbyOGYB16IHQtNMyjEo/PY0fW/s0uwBVApEHNb/MMtN40c/rQ==, tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/4df2f2bfb5826c25f05d9535a8556acecaf2e570}
version: 42.3.0 version: 43.0.0
engines: {node: '>=22.0.0'} engines: {node: '>=22.0.0'}
matrix-widget-api@1.19.0: matrix-widget-api@1.20.0:
resolution: {integrity: sha512-Qe7L6G1mQJphBC47/Bzp5ljPIK1UARgLiuGgS+/KmEs/eaNHkQ3+ArD0/0kvMV+d6kCGAZ9OKRqsnuPjizI+tw==} resolution: {integrity: sha512-qwFP37rgns7mPesM5/vvZgknzb+kvyRB5BISv5sCuBxsGMceMr+Kogf7OkjRxBXdMCPBFuf6gIuYRe5S+lpzQw==}
md5.js@1.3.5: md5.js@1.3.5:
resolution: {integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==} resolution: {integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==}
@@ -10227,7 +10227,7 @@ snapshots:
matrix-events-sdk@0.0.1: {} matrix-events-sdk@0.0.1: {}
matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/fa4772a4ddd335a5a8bfbf8bb21df49b70f7a999: matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/4df2f2bfb5826c25f05d9535a8556acecaf2e570:
dependencies: dependencies:
'@babel/runtime': 8.0.0 '@babel/runtime': 8.0.0
'@matrix-org/matrix-sdk-crypto-wasm': 18.9.0 '@matrix-org/matrix-sdk-crypto-wasm': 18.9.0
@@ -10236,12 +10236,12 @@ snapshots:
content-type: 3.1.1 content-type: 3.1.1
loglevel: 1.9.2 loglevel: 1.9.2
matrix-events-sdk: 0.0.1 matrix-events-sdk: 0.0.1
matrix-widget-api: 1.19.0 matrix-widget-api: 1.20.0
p-retry: 8.0.1 p-retry: 8.0.1
sdp-transform: 3.0.0 sdp-transform: 3.0.0
unhomoglyph: 1.0.6 unhomoglyph: 1.0.6
matrix-widget-api@1.19.0: matrix-widget-api@1.20.0:
dependencies: dependencies:
'@types/events': 3.0.3 '@types/events': 3.0.3
events: 3.3.0 events: 3.3.0
sdk/src/matrixrtc/LocalMembership.test.ts
+1 -1
View File
@@ -136,7 +136,7 @@ function setup(preparedTransportWithErrors$?: Observable<PreparedTransport>): {
joinMatrixRTC, joinMatrixRTC,
membershipManagerError$, membershipManagerError$,
matrixRTCSession: { matrixRTCSession: {
leaveRoomSession: vi.fn(async () => Promise.resolve(true)), leave: vi.fn(async () => Promise.resolve(true)),
}, },
delayId$, delayId$,
timings: defaultSessionTimings, timings: defaultSessionTimings,
sdk/src/matrixrtc/LocalMembership.ts
+2 -2
View File
@@ -66,7 +66,7 @@ interface Props {
) => void; ) => void;
/** The membership manager giving up on keeping the membership alive. */ /** The membership manager giving up on keeping the membership alive. */
membershipManagerError$: Observable<unknown>; membershipManagerError$: Observable<unknown>;
matrixRTCSession: Pick<JsSdkRTCSession, "leaveRoomSession">; matrixRTCSession: Pick<JsSdkRTCSession, "leave">;
/** The id of the delayed leave event, for the backend to take over. */ /** The id of the delayed leave event, for the backend to take over. */
delayId$: Behavior<string | null>; delayId$: Behavior<string | null>;
timings: SessionTimings; timings: SessionTimings;
@@ -129,7 +129,7 @@ export function createLocalMembership$({
} }
return Promise.resolve(async (): Promise<void> => { return Promise.resolve(async (): Promise<void> => {
try { try {
await matrixRTCSession.leaveRoomSession(1000); await matrixRTCSession.leave(1000);
} catch (e) { } catch (e) {
logger.error("Failed to leave the session", e); logger.error("Failed to leave the session", e);
} }
sdk/src/utils/test.ts
+1 -1
View File
@@ -257,7 +257,7 @@ export class MockRTCSession extends TypedEventEmitter<
counters: {}, counters: {},
}; };
public leaveRoomSession: ReturnType<typeof vitest.fn> = vitest public leave: ReturnType<typeof vitest.fn> = vitest
.fn() .fn()
.mockResolvedValue(undefined); .mockResolvedValue(undefined);