matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-25 05:23:13 +03:00
Code Activity

Revert "Ignore party ID if opponent is v0"

Browse Source
This commit is contained in:
David Baker
2020-12-21 13:48:06 +00:00
committed by GitHub
parent ef392785e8
commit 7046fa3224
5 changed files with 8 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spec/unit/webrtc/call.spec.ts
View File

@@ -142,7 +142,7 @@ describe('Call', function() {
await call.onAnswerReceived({
getContent: () => {
return {
version: 1,
version: 0,
call_id: call.callId,
party_id: 'the_correct_party_id',
answer: {
@@ -156,7 +156,7 @@ describe('Call', function() {
call.onRemoteIceCandidatesReceived({
getContent: () => {
return {
version: 1,
version: 0,
call_id: call.callId,
party_id: 'the_correct_party_id',
candidates: [
@@ -173,7 +173,7 @@ describe('Call', function() {
call.onRemoteIceCandidatesReceived({
getContent: () => {
return {
version: 1,
version: 0,
call_id: call.callId,
party_id: 'some_other_party_id',
candidates: [

1
src/@types/event.ts
View File

@@ -48,7 +48,6 @@ export enum EventType {
CallReject = "m.call.reject",
CallSelectAnswer = "m.call.select_answer",
CallNegotiate = "m.call.negotiate",
CallReplaces = "m.call.replaces",
KeyVerificationRequest = "m.key.verification.request",
KeyVerificationStart = "m.key.verification.start",
KeyVerificationCancel = "m.key.verification.cancel",

12
src/client.js
View File

@@ -180,9 +180,6 @@ function keyFromRecoverySession(session, decryptionKey) {
* @param {boolean} [opts.forceTURN]
* Optional. Whether relaying calls through a TURN server should be forced.
*
* @param {boolean} [opts.supportsTransfer]
* Optional. True to advertise support for call transfers to other parties on Matrix calls.
*
* @param {boolean} [opts.fallbackICEServerAllowed]
* Optional. Whether to allow a fallback ICE server should be used for negotiating a
* WebRTC connection if the homeserver doesn't provide any servers. Defaults to false.
@@ -367,7 +364,6 @@ export function MatrixClient(opts) {
this._cryptoCallbacks = opts.cryptoCallbacks || {};
this._forceTURN = opts.forceTURN || false;
this._supportsTransfer = opts.supportsTransfer || false;
this._fallbackICEServerAllowed = opts.fallbackICEServerAllowed || false;
// List of which rooms have encryption enabled: separate from crypto because
@@ -700,14 +696,6 @@ MatrixClient.prototype.setForceTURN = function(forceTURN) {
this._forceTURN = forceTURN;
};
/**
* Set whether to advertise trabsfer support to other parties on Matrix calls.
* @param {bool} supportsTransfer True to advertise the 'm.call.transeree' capability
*/
MatrixClient.prototype.setSupportsTransfer = function(supportsTransfer) {
this._supportsTransfer = supportsTransfer;
};
/**
* Get the current sync state.
* @return {?string} the sync state, which may be null.

1
src/matrix.ts
View File

@@ -142,7 +142,6 @@ export interface ICreateClientOpts {
unstableClientRelationAggregation?: boolean;
verificationMethods?: Array<any>;
forceTURN?: boolean;
supportsTransfer?: boolean,
fallbackICEServerAllowed?: boolean;
cryptoCallbacks?: ICryptoCallbacks;
}

66
src/webrtc/call.ts
View File

@@ -27,7 +27,6 @@ import * as utils from '../utils';
import MatrixEvent from '../models/event';
import {EventType} from '../@types/event';
import { RoomMember } from '../models/room-member';
import { randomString } from '../randomstring';
// events: hangup, error(err), replaced(call), state(state, oldState)
@@ -61,10 +60,6 @@ interface TurnServer {
ttl?: number,
}
interface CallCapabilities {
'm.call.transferee': boolean,
}
export enum CallState {
Fledgling = 'fledgling',
InviteSent = 'invite_sent',
@@ -199,10 +194,6 @@ export class CallError extends Error {
}
}
function genCallID() {
return Date.now() + randomString(16);
}
/**
* Construct a new Matrix Call.
* @constructor
@@ -249,7 +240,6 @@ export class MatrixCall extends EventEmitter {
// The party ID of the other side: undefined if we haven't chosen a partner
// yet, null if we have but they didn't send a party ID.
private opponentPartyId: string;
private opponentCaps: CallCapabilities;
private inviteTimeout: NodeJS.Timeout; // in the browser it's 'number'
// The logic of when & if a call is on hold is nontrivial and explained in is*OnHold
@@ -285,7 +275,7 @@ export class MatrixCall extends EventEmitter {
utils.checkObjectHasKeys(server, ["urls"]);
}
this.callId = genCallID();
this.callId = "c" + new Date().getTime() + Math.random();
this.state = CallState.Fledgling;
// A queue for candidates waiting to go out.
@@ -368,10 +358,6 @@ export class MatrixCall extends EventEmitter {
return this.opponentMember;
}
opponentCanBeTransferred() {
return Boolean(this.opponentCaps && this.opponentCaps["m.call.transferee"]);
}
/**
* Retrieve the local <code>&lt;video&gt;</code> DOM element.
* @return {Element} The dom element
@@ -483,11 +469,7 @@ export class MatrixCall extends EventEmitter {
this.setState(CallState.Ringing);
this.opponentVersion = this.msg.version;
if (this.opponentVersion !== 0) {
// ignore party ID in v0 calls: party ID isn't a thing until v1
this.opponentPartyId = this.msg.party_id || null;
}
this.opponentCaps = this.msg.capabilities || {};
this.opponentPartyId = this.msg.party_id || null;
this.opponentMember = event.sender;
if (event.getLocalAge()) {
@@ -797,14 +779,7 @@ export class MatrixCall extends EventEmitter {
// required to still be sent for backwards compat
type: this.peerConn.localDescription.type,
},
} as any;
if (this.client._supportsTransfer) {
answerContent.capabilities = {
'm.call.transferee': true,
}
}
};
// We have just taken the local description from the peerconnection which will
// contain all the local candidates added so far, so we can discard any candidates
// we had queued up because they'll be in the answer.
@@ -984,10 +959,7 @@ export class MatrixCall extends EventEmitter {
}
this.opponentVersion = event.getContent().version;
if (this.opponentVersion !== 0) {
this.opponentPartyId = event.getContent().party_id || null;
}
this.opponentCaps = event.getContent().capabilities || {};
this.opponentPartyId = event.getContent().party_id || null;
this.opponentMember = event.sender;
this.setState(CallState.Connecting);
@@ -1130,13 +1102,7 @@ export class MatrixCall extends EventEmitter {
const content = {
[keyName]: this.peerConn.localDescription,
lifetime: CALL_TIMEOUT_MS,
} as any;
if (this.client._supportsTransfer) {
content.capabilities = {
'm.call.transferee': true,
}
}
};
// Get rid of any candidates waiting to be sent: they'll be included in the local
// description we just got and will send in the offer.
@@ -1413,28 +1379,6 @@ export class MatrixCall extends EventEmitter {
}
}
async transfer(targetUserId: string, targetRoomId?: string) {
// Fetch the target user's global profile info: their room avatar / displayname
// could be different in whatever room we shae with them.
const profileInfo = await this.client.getProfileInfo(targetUserId);
const replacementId = genCallID();
const body = {
replacement_id: genCallID(),
target_user: {
id: targetUserId,
display_name: profileInfo.display_name,
avatar_url: profileInfo.avatar_url,
},
create_call: replacementId,
} as any;
if (targetRoomId) body.target_room = targetRoomId;
return this.sendVoipEvent(EventType.CallReplaces, body);
}
private async terminate(hangupParty: CallParty, hangupReason: CallErrorCode, shouldEmit: boolean) {
if (this.callHasEnded()) return;