Skip to content

Commit

Permalink
Merge pull request #2993 from Bilb/fix-calls
Browse files Browse the repository at this point in the history
fix: disable frigg&fenrir turn servers for now
  • Loading branch information
Bilb committed Dec 7, 2023
2 parents 173d01c + ee8ec7b commit 97dbe5b
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 23 deletions.
4 changes: 4 additions & 0 deletions actions/setup_and_build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ runs:
with:
node-version-file: '.nvmrc'

- uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Cache Desktop node_modules
id: cache-desktop-modules
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "session-desktop",
"productName": "Session",
"description": "Private messaging from your desktop",
"version": "1.11.4",
"version": "1.11.5",
"license": "GPL-3.0",
"author": {
"name": "Oxen Labs",
Expand Down
39 changes: 20 additions & 19 deletions ts/session/utils/calling/CallManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,34 @@ import { v4 as uuidv4 } from 'uuid';

import { MessageUtils, ToastUtils, UserUtils } from '..';
import { SignalService } from '../../../protobuf';
import { openConversationWithMessages } from '../../../state/ducks/conversations';
import {
CallStatusEnum,
answerCall,
callConnected,
callReconnecting,
CallStatusEnum,
endCall,
incomingCall,
setFullScreenCall,
startingCallWith,
} from '../../../state/ducks/call';
import { openConversationWithMessages } from '../../../state/ducks/conversations';
import { getConversationController } from '../../conversations';
import { CallMessage } from '../../messages/outgoing/controlMessage/CallMessage';
import { ed25519Str } from '../../onions/onionPath';
import { PubKey } from '../../types';

import { getIsRinging } from '../RingingManager';
import { getBlackSilenceMediaStream } from './Silence';
import { getMessageQueue } from '../..';
import { MessageSender } from '../../sending';
import { DURATION } from '../../constants';
import { Data } from '../../../data/data';
import { getCallMediaPermissionsSettings } from '../../../components/settings/SessionSettings';
import { PnServer } from '../../apis/push_notification_api';
import { Data } from '../../../data/data';
import { approveConvoAndSendResponse } from '../../../interactions/conversationInteractions';
import { READ_MESSAGE_STATE } from '../../../models/conversationAttributes';
import { PnServer } from '../../apis/push_notification_api';
import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime';
import { SnodeNamespaces } from '../../apis/snode_api/namespaces';
import { READ_MESSAGE_STATE } from '../../../models/conversationAttributes';
import { DURATION } from '../../constants';
import { MessageSender } from '../../sending';
import { getIsRinging } from '../RingingManager';
import { getBlackSilenceMediaStream } from './Silence';

export type InputItem = { deviceId: string; label: string };

Expand Down Expand Up @@ -137,16 +137,17 @@ const iceServersFullArray = [
username: 'session202111',
credential: '053c268164bc7bd7',
},
{
urls: 'turn:fenrir.getsession.org',
username: 'session202111',
credential: '053c268164bc7bd7',
},
{
urls: 'turn:frigg.getsession.org',
username: 'session202111',
credential: '053c268164bc7bd7',
},
// excluding those two (fenrir & frigg) as they are TCP only for now
// {
// urls: 'turn:fenrir.getsession.org',
// username: 'session202111',
// credential: '053c268164bc7bd7',
// },
// {
// urls: 'turn:frigg.getsession.org',
// username: 'session202111',
// credential: '053c268164bc7bd7',
// },
{
urls: 'turn:angus.getsession.org',
username: 'session202111',
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -640,9 +640,9 @@
reselect "^4.1.5"

"@signalapp/better-sqlite3@^8.4.3":
version "8.4.3"
resolved "https://registry.yarnpkg.com/@signalapp/better-sqlite3/-/better-sqlite3-8.4.3.tgz#7ffa8d03d2a12543247936bfb7b9f74cdbc6fe9b"
integrity sha512-6HaN8a90fWHBPIIZRRmSG7wc3BPczLx3Mb9MJ8wsatYqf8C1+2NdFae5AzII8Oe9YE9SSHzCjdPd8ST1m9+Qag==
version "8.5.2"
resolved "https://registry.yarnpkg.com/@signalapp/better-sqlite3/-/better-sqlite3-8.5.2.tgz#910669f44e76a46d06df45fabefcd3ac2e7c4cce"
integrity sha512-t7XalDxuRP115EratM6i1kbvIXJvzETcl8wqnt3NlWZdzil7kelS/RYz+PE1G+z8ZwtFyn/ViAFMt76AsArifw==
dependencies:
bindings "^1.5.0"
tar "^6.1.0"
Expand Down

0 comments on commit 97dbe5b

Please sign in to comment.