ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use cws(uws) for Socket.IO engine

merge-requests/54/head
Moe 2019-02-24 18:47:39 -08:00
parent 490ac88b00
commit 9a71cd9c95
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
camera.js
View File

@ -8,7 +8,7 @@
// If you like what I am doing here and want me to continue please consider donating :) // If you like what I am doing here and want me to continue please consider donating :)
// PayPal : paypal@m03.ca // PayPal : paypal@m03.ca
// //
var io = new (require('socket.io'))() var io = new (require('socket.io'))
//library loader //library loader
var loadLib = function(lib){ var loadLib = function(lib){
return require(__dirname+'/libs/'+lib+'.js') return require(__dirname+'/libs/'+lib+'.js')
@ -22,7 +22,7 @@ var config = loadLib('config')(s)
//language loader //language loader
var lang = loadLib('language')(s,config) var lang = loadLib('language')(s,config)
//code test module //code test module
loadLib('codeTester')(s,config,lang,io) loadLib('codeTester')(s,config,lang)
//basic functions //basic functions
loadLib('basic')(s,config) loadLib('basic')(s,config)
//video processing engine //video processing engine

2
libs/codeTester.js
View File

@ -1,6 +1,6 @@
var fs = require('fs'); var fs = require('fs');
var execSync = require('child_process').execSync; var execSync = require('child_process').execSync;
module.exports = function(s,config,lang,io){ module.exports = function(s,config,lang){
var onFFmpegLoaded = function(ffmpeg){ var onFFmpegLoaded = function(ffmpeg){
if(process.argv[2] && process.argv[2].indexOf('test') > -1){ if(process.argv[2] && process.argv[2].indexOf('test') > -1){
config.testMode = true config.testMode = true

8
libs/webServer.js
View File

@ -50,6 +50,8 @@ module.exports = function(s,config,lang,io){
if(config.renderPaths.grid === undefined){config.renderPaths.grid='pages/grid'} if(config.renderPaths.grid === undefined){config.renderPaths.grid='pages/grid'}
//slick.js (cycle) page //slick.js (cycle) page
if(config.renderPaths.cycle === undefined){config.renderPaths.cycle='pages/cycle'} if(config.renderPaths.cycle === undefined){config.renderPaths.cycle='pages/cycle'}
// Use uws/cws
if(config.useUWebsocketJs === undefined){config.useUWebsocketJs=true}
//SSL options //SSL options
if(config.ssl&&config.ssl.key&&config.ssl.cert){ if(config.ssl&&config.ssl.key&&config.ssl.cert){
config.ssl.key=fs.readFileSync(s.checkRelativePath(config.ssl.key),'utf8') config.ssl.key=fs.readFileSync(s.checkRelativePath(config.ssl.key),'utf8')
@ -111,5 +113,11 @@ module.exports = function(s,config,lang,io){
path:s.checkCorrectPathEnding(config.webPaths.super)+'socket.io', path:s.checkCorrectPathEnding(config.webPaths.super)+'socket.io',
transports: ['websocket'] transports: ['websocket']
}) })
if(config.useUWebsocketJs === true){
io.engine.ws = new (require('cws').Server)({
noServer: true,
perMessageDeflate: false
})
}
return app return app
} }

1
package.json
View File

@ -24,6 +24,7 @@
"body-parser": "^1.18.3", "body-parser": "^1.18.3",
"circular-json": "0.3.1", "circular-json": "0.3.1",
"connection-tester": "^0.1.1", "connection-tester": "^0.1.1",
"cws": "^1.0.0",
"discord.js": "^11.3.2", "discord.js": "^11.3.2",
"ejs": "^2.5.5", "ejs": "^2.5.5",
"express": "^4.16.4", "express": "^4.16.4",