Refactor directories

This commit is contained in:
Zalmoxisus
2016-08-17 12:35:42 +03:00
parent 105e1a5612
commit 0fb42d9f75
7 changed files with 8 additions and 9 deletions

View File

@ -1,13 +0,0 @@
module.exports = function getOptions(argv) {
return {
host: argv.hostname || process.env.npm_package_remotedev_hostname || null,
port: Number(argv.port || process.env.npm_package_remotedev_port) || 8000,
protocol: argv.protocol || process.env.npm_package_remotedev_protocol || 'http',
protocolOptions: !(argv.protocol === 'https') ? null : {
key: argv.key || process.env.npm_package_remotedev_key || null,
cert: argv.cert || process.env.npm_package_remotedev_cert || null,
passphrase: argv.passphrase || process.env.npm_package_remotedev_passphrase || null
},
logLevel: argv.logLevel || 3
};
}

View File

@ -8,11 +8,11 @@ var endFlag = '/* ' + name + ' end */';
var serverFlags = {
'react-native': {
'0.0.1': ' _server(argv, config, resolve, reject);',
'0.31.0': " runServer(args, config, () => console.log('\\nReact packager ready.\\n'));",
'0.31.0': " runServer(args, config, () => console.log('\\nReact packager ready.\\n'));"
},
'react-native-desktop': {
'0.0.1': ' _server(argv, config, resolve, reject);',
},
'0.0.1': ' _server(argv, config, resolve, reject);'
}
};
function getModuleVersion(modulePath) {

View File

@ -3,8 +3,8 @@ var fs = require('fs');
var path = require('path');
var argv = require('minimist')(process.argv.slice(2));
var chalk = require('chalk');
var getOptions = require('./getOptions');
var injectServer = require('./injectServer');
var getOptions = require('./../lib/getOptions');
function readFile(filePath) {
return fs.readFileSync(path.resolve(process.cwd(), filePath), 'utf-8');

View File

@ -1,9 +1,8 @@
var assign = require('object-assign');
var repeat = require('repeat-string');
var getOptions = require('./getOptions');
var getOptions = require('./../lib/getOptions');
var getPort = require('getport');
var LOG_LEVEL_NONE = 0;
var LOG_LEVEL_ERROR = 1;
var LOG_LEVEL_WARN = 2;
@ -12,7 +11,7 @@ var LOG_LEVEL_INFO = 3;
module.exports = function(argv) {
var SocketCluster = require('socketcluster').SocketCluster;
var options = assign(getOptions(argv), {
workerController: __dirname + '/worker.js',
workerController: __dirname + '/../lib/worker.js',
allowClientPublish: false
});
var port = options.port;

View File

@ -1,60 +0,0 @@
var path = require('path');
var app = require('express')();
var bodyParser = require('body-parser');
var cors = require('cors');
module.exports.run = function(worker) {
var httpServer = worker.httpServer;
var scServer = worker.scServer;
httpServer.on('request', app);
app.set('view engine', 'ejs');
app.set('views', path.resolve(__dirname, '..', 'views'));
app.get('/', function(req, res) {
res.render('index', { port: worker.options.port });
});
app.use(cors({ methods: 'POST' }));
app.use(bodyParser.json());
app.post('/', function(req, res) {
if (!req.body) return res.status(404).end();
scServer.exchange.publish('log', req.body);
res.send('OK');
});
scServer.addMiddleware(scServer.MIDDLEWARE_EMIT, function (req, next) {
var channel = req.event;
var data = req.data;
if (channel.substr(0, 3) === 'sc-' || channel === 'respond' || channel === 'log') {
scServer.exchange.publish(channel, data);
} else if (channel === 'log-noid') {
scServer.exchange.publish('log', { id: req.socket.id, data: data });
}
next();
});
scServer.on('connection', function(socket) {
var channelToWatch, channelToEmit;
socket.on('login', function (credentials, respond) {
if (credentials === 'master') {
channelToWatch = 'respond'; channelToEmit = 'log';
} else {
channelToWatch = 'log'; channelToEmit = 'respond';
}
worker.exchange.subscribe('sc-' + socket.id).watch(function(msg) {
socket.emit(channelToWatch, msg);
});
respond(null, channelToWatch);
});
socket.on('disconnect', function() {
var channel = worker.exchange.channel('sc-' + socket.id);
channel.unsubscribe(); channel.destroy();
scServer.exchange.publish(
channelToEmit,
{ id: socket.id, type: 'DISCONNECTED' }
);
});
});
};