Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use webtorrent-hybrid for server webtorrents

master
Torjus 2018-07-31 12:33:24 +02:00
parent f6ca837646
commit 31a0017e70
4 changed files with 928 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/components/FileSharing/FileEntry.jsx
View File

@ -148,7 +148,7 @@ class FileEntry extends Component
export const FileEntryProps = { export const FileEntryProps = {
data : PropTypes.shape({ data : PropTypes.shape({
name : PropTypes.string.isRequired, name : PropTypes.string.isRequired,
picture : PropTypes.string.isRequired, picture : PropTypes.string,
file : PropTypes.shape({ file : PropTypes.shape({
magnet : PropTypes.string.isRequired magnet : PropTypes.string.isRequired
}).isRequired, }).isRequired,

2
server/lib/Room.js
View File

@ -2,7 +2,7 @@
const EventEmitter = require('events').EventEmitter; const EventEmitter = require('events').EventEmitter;
const protooServer = require('protoo-server'); const protooServer = require('protoo-server');
const WebTorrent = require('webtorrent'); const WebTorrent = require('webtorrent-hybrid');
const Logger = require('./Logger'); const Logger = require('./Logger');
const config = require('../config'); const config = require('../config');

994
server/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
server/package.json
View File

@ -14,7 +14,7 @@
"mediasoup": "^2.1.0", "mediasoup": "^2.1.0",
"passport-dataporten": "^1.3.0", "passport-dataporten": "^1.3.0",
"protoo-server": "^2.0.7", "protoo-server": "^2.0.7",
"webtorrent": "^0.101.2" "webtorrent-hybrid": "^1.0.6"
}, },
"devDependencies": { "devDependencies": {
"gulp": "^4.0.0", "gulp": "^4.0.0",