update files

This commit is contained in:
nuintun 2015-12-03 10:19:09 +08:00
parent d5c9496df7
commit f4d4451eeb
4 changed files with 204 additions and 143 deletions

View File

@ -4,8 +4,6 @@
'use strict';
var ipc = require('ipc-main');
var spawn = require('child_process').spawn;
/**
@ -71,64 +69,5 @@ function normalizeExecArgs(command, options){
};
}
var emulators = {};
module.exports = Emulator;
module.exports = {
Emulator: Emulator,
start: function (){
ipc.on('emulator', function (event, project, action){
var key = project.name + '-' + project.command.name;
var emulator = emulators[key];
switch (action) {
case 'start':
if (!emulator) {
var stream;
var env = {};
Object.keys(process.env).forEach(function (key){
env[key] = process.env[key];
});
project.env.forEach(function (item){
env[item.name] = item.value;
});
emulator = new Emulator({
env: env,
cwd: project.path,
command: project.command.value
});
stream = emulator.start();
stream.stdout.on('data', function (data){
event.sender.send('emulator', 'data', project, data);
});
stream.stderr.on('error', function (error){
event.sender.send('emulator', 'error', project, error);
emulator.stop();
delete emulators[key];
});
stream.on('close', function (signal){
event.sender.send('emulator', 'close', project, signal);
delete emulators[key];
});
emulators[key] = emulator;
}
break;
case 'stop':
if (emulator) {
emulator.stop();
}
break;
}
});
}
};

70
bin/thread.js Normal file
View File

@ -0,0 +1,70 @@
/**
* Created by nuintun on 2015/12/3.
*/
'use strict';
var cluster = require('cluster');
var ipc = require('ipc-main');
// cache
var workers = {};
/**
* killWorker
* @param name
*/
function killWorker(name){
var worker = workers[name];
if (worker && !worker.isDead()) {
worker.kill('SIGTERM');
delete workers[name];
}
}
module.exports = {
start: function (){
ipc.on('emulator', function (event, project, action){
var key = project.name + '-' + project.command.name;
var worker = workers[key];
switch (action) {
case 'start':
if (!worker) {
var env = {};
Object.keys(process.env).forEach(function (key){
env[key] = process.env[key];
});
project.env.forEach(function (item){
env[item.name] = item.value;
});
worker = cluster.fork(env);
worker.on('message', function (message){
event.sender.send('emulator', message.event, message.project, message.data);
});
worker.on('error', function (){
killWorker(project.name);
});
delete project.env;
worker.send(project);
workers[project.name] = worker;
}
break;
case 'stop':
killWorker(project.name);
break;
}
});
}
};

47
main.js
View File

@ -4,6 +4,9 @@
'use strict';
var cluster = require('cluster');
if (cluster.isMaster) {
// node module
var path = require('path');
// module to control application life
@ -16,7 +19,7 @@ var BrowserWindow = require('browser-window');
var windowControl = require('./bin/window-control');
var openDirectory = require('./bin/open-directory');
var AppConfigure = require('./bin/app-configure');
var emulator = require('./bin/emulator');
var thread = require('./bin/thread');
// keep a global reference of the window object, if you don't, the window will
// be closed automatically when the javascript object is GCed
@ -90,5 +93,45 @@ app.on('ready', function (){
new AppConfigure(mainWindow, mainTray);
// emulator start
emulator.start();
thread.start();
});
} else {
var Emulator = require('./bin/emulator');
process.on('message', function (project){
var stream;
var emulator = new Emulator({
cwd: project.path,
command: project.command.value
});
stream = emulator.start();
stream.stdout.on('data', function (data){
process.send({
event: 'data',
project: project,
data: data.toString()
});
});
stream.stderr.on('error', function (error){
emulator.stop();
process.send({
event: 'error',
project: project,
data: error.toString()
});
});
stream.on('close', function (signal){
emulator.stop();
process.send({
event: 'close',
project: project,
data: signal.toString()
});
});
});
}

View File

@ -143,10 +143,19 @@ module.exports = Vue.component('app-main', {
},
methods: {
exec: function (name, command){
var project = this.project;
var runtime = AppRuntime[project.name];
runtime.worker.port.postMessage({
action: 'write',
name: project.name,
data: '\u001b[32m执行命令\u001b[0m: \u001b[35m' + name + '\u001b[0m\r\n'
});
ipc.send('emulator', {
name: this.project.name,
path: this.project.path,
env: util.normalize(this.project.env),
name: project.name,
path: project.path,
env: util.normalize(project.env),
command: {
name: name,
value: command
@ -202,7 +211,7 @@ module.exports = Vue.component('app-main', {
data = data.toString();
break;
case 'error':
data = '\u001b[31m发生错误 \u001b[0m' + data.toString();
data = '\u001b[31m发生错误: \u001b[0m' + data.toString();
break;
case 'close':
data = '\u001b[32m命令执行完成\u001b[0m';