OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Server: handle tls websockets

pull/15/head
Chocobozzz 2016-10-17 21:10:29 +02:00
parent 7a2c9a8e55
commit 25cad91992
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/initializers/constants.js
View File

@ -44,6 +44,7 @@ const CONFIG = {
}, },
WEBSERVER: { WEBSERVER: {
SCHEME: config.get('webserver.https') === true ? 'https' : 'http', SCHEME: config.get('webserver.https') === true ? 'https' : 'http',
WS: config.get('webserver.https') === true ? 'wss' : 'ws',
HOST: config.get('webserver.host'), HOST: config.get('webserver.host'),
PORT: config.get('webserver.port') PORT: config.get('webserver.port')
} }

17
server/models/video.js
View File

@ -1,6 +1,5 @@
'use strict' 'use strict'
const config = require('config')
const createTorrent = require('create-torrent') const createTorrent = require('create-torrent')
const ffmpeg = require('fluent-ffmpeg') const ffmpeg = require('fluent-ffmpeg')
const fs = require('fs') const fs = require('fs')
@ -16,11 +15,6 @@ const logger = require('../helpers/logger')
const modelUtils = require('./utils') const modelUtils = require('./utils')
const utils = require('../helpers/utils') const utils = require('../helpers/utils')
const http = config.get('webserver.https') === true ? 'https' : 'http'
const host = config.get('webserver.host')
const port = config.get('webserver.port')
const webseedBaseUrl = http + '://' + host + ':' + port + constants.STATIC_PATHS.WEBSEED
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// TODO: add indexes on searchable columns // TODO: add indexes on searchable columns
@ -106,7 +100,16 @@ VideoSchema.pre('save', function (next) {
tasks.push( tasks.push(
// TODO: refractoring // TODO: refractoring
function (callback) { function (callback) {
createTorrent(videoPath, { announceList: [ [ 'ws://' + host + ':' + port + '/tracker/socket' ] ], urlList: [ webseedBaseUrl + video.filename ] }, function (err, torrent) { const options = {
announceList: [
[ constants.CONFIG.WEBSERVER.WS + '://' + constants.CONFIG.WEBSERVER.HOST + ':' + constants.CONFIG.WEBSERVER.PORT + '/tracker/socket' ]
],
urlList: [
constants.CONFIG.WEBSERVER.URL + constants.STATIC_PATHS.WEBSEED + video.filename
]
}
createTorrent(videoPath, options, function (err, torrent) {
if (err) return callback(err) if (err) return callback(err)
fs.writeFile(constants.CONFIG.STORAGE.TORRENTS_DIR + video.filename + '.torrent', torrent, function (err) { fs.writeFile(constants.CONFIG.STORAGE.TORRENTS_DIR + video.filename + '.torrent', torrent, function (err) {