mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update to RingRTC v2.36.0

Browse source
This commit is contained in:
Jim Gustafson 2024-01-09 15:36:10 -08:00 committed by Scott Nonnenberg
parent 038194c946
commit 861f35aa53
5 changed files with 13 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -97,7 +97,7 @@
"@react-spring/web": "9.5.5",
"@signalapp/better-sqlite3": "8.6.0",
"@signalapp/libsignal-client": "0.36.0",
"@signalapp/ringrtc": "2.35.0",
"@signalapp/ringrtc": "2.36.0",
"@signalapp/windows-dummy-keystroke": "1.0.0",
"@types/fabric": "4.5.3",
"backbone": "1.4.0",

22
protos/SignalService.proto
View file

@ -54,8 +54,6 @@ message Content {
optional EditMessage editMessage = 11;
}
// Everything in CallingMessage must be kept in sync with RingRTC (ringrtc-node).
// Whenever you change this, make sure you change textsecure.d.ts and RingRTC.
message CallingMessage {
message Offer {
enum Type {
@ -64,27 +62,22 @@ message CallingMessage {
}
optional uint64 callId = 1;
// Legacy/deprecated; replaced by 'opaque'
optional string sdp = 2;
reserved /* sdp */ 2;
optional Type type = 3;
optional bytes opaque = 4;
}
message Answer {
optional uint64 callId = 1;
// Legacy/deprecated; replaced by 'opaque'
optional string sdp = 2;
reserved /* sdp */ 2;
optional bytes opaque = 3;
}
message IceCandidate {
optional uint64 callId = 1;
// Legacy/deprecated; remove when old clients are gone.
optional string mid = 2;
// Legacy/deprecated; remove when old clients are gone.
optional uint32 line = 3;
// Legacy/deprecated; replaced by 'opaque'
optional string sdp = 4;
reserved /* mid */ 2;
reserved /* line */ 3;
reserved /* sdp */ 4;
optional bytes opaque = 5;
}
@ -119,10 +112,11 @@ message CallingMessage {
optional Offer offer = 1;
optional Answer answer = 2;
repeated IceCandidate iceCandidates = 3;
optional Hangup legacyHangup = 4;
reserved /* legacyHangup */ 4;
optional Busy busy = 5;
reserved /* profileKey */ 6;
optional Hangup hangup = 7;
optional bool supportsMultiRing = 8;
reserved /* multiRing */ 8;
optional uint32 destinationDeviceId = 9;
optional Opaque opaque = 10;
}

11
ts/services/calling.ts
View file

@ -238,10 +238,8 @@ function protoToCallingMessage({
offer,
answer,
iceCandidates,
legacyHangup,
busy,
hangup,
supportsMultiRing,
destinationDeviceId,
opaque,
}: Proto.ICallingMessage): CallingMessage {
@ -273,14 +271,6 @@ function protoToCallingMessage({
? new AnswerMessage(answer.callId, Buffer.from(answer.opaque))
: undefined,
iceCandidates: newIceCandidates.length > 0 ? newIceCandidates : undefined,
legacyHangup:
legacyHangup && legacyHangup.callId
? new HangupMessage(
legacyHangup.callId,
dropNull(legacyHangup.type) as number,
legacyHangup.deviceId || 0
)
: undefined,
busy: busy && busy.callId ? new BusyMessage(busy.callId) : undefined,
hangup:
hangup && hangup.callId
@ -290,7 +280,6 @@ function protoToCallingMessage({
hangup.deviceId || 0
)
: undefined,
supportsMultiRing: dropNull(supportsMultiRing),
destinationDeviceId: dropNull(destinationDeviceId),
opaque: opaque
? {

10
ts/util/callingMessageToProto.ts
View file

@ -13,10 +13,8 @@ export function callingMessageToProto(
offer,
answer,
iceCandidates,
legacyHangup,
busy,
hangup,
supportsMultiRing,
destinationDeviceId,
opaque,
}: CallingMessage,
@ -61,13 +59,6 @@ export function callingMessageToProto(
};
})
: undefined,
legacyHangup: legacyHangup
? {
...legacyHangup,
callId: Long.fromValue(legacyHangup.callId),
type: legacyHangup.type as number,
}
: undefined,
busy: busy
? {
...busy,
@ -81,7 +72,6 @@ export function callingMessageToProto(
type: hangup.type as number,
}
: undefined,
supportsMultiRing,
destinationDeviceId,
opaque: opaqueField,
};

8
yarn.lock
View file

@ -3986,10 +3986,10 @@
ws "^8.4.2"
zod "^3.20.2"
"@signalapp/ringrtc@2.35.0":
version "2.35.0"
resolved "https://registry.yarnpkg.com/@signalapp/ringrtc/-/ringrtc-2.35.0.tgz#ca9c5fd660fa370720b85f784fc287acbbc6e68f"
integrity sha512-PXy+Io24UhGJQYivayVwIwgAT4A1g88JDxvzz5PNddlpHmSSRoBnH57fcZ1ElHTkqrcNb+V4Tch6SAuYupucow==
"@signalapp/ringrtc@2.36.0":
version "2.36.0"
resolved "https://registry.yarnpkg.com/@signalapp/ringrtc/-/ringrtc-2.36.0.tgz#67d1b48bd4c1ea31c155ea14a0bd28f04e46eff5"
integrity sha512-KDQYkSjXQMDoXt+4qSIXyAbWGbb6vV7OjFCDCmSwEmZJ7/XSr4XtQXtnspF8WrxeMVAFqJqpZho7iOy40u565A==
dependencies:
https-proxy-agent "7.0.1"
tar "^6.1.0"