diff --git a/Makefile b/Makefile index 5220d19..d734a00 100644 --- a/Makefile +++ b/Makefile @@ -1,89 +1,58 @@ -API = git@git.lavid.ufpb.br:wikilibras-api -BLUE = \33[34;5m -DONE = [$(GREEN)Finalizado$(NONE)] -FAIL = [$(RED)Falhou$(NONE)] Codigo: $$? -GREEN = \33[32;5m -MAIN = libras.py -MODULE = wikilibras-api -NONE = \33[m -RED = \33[31;5m -WHITE = \33[37;5m +LOG=server.log +SERVER=server.js + +.PHONY: help install list run start stop + +install: .update .blender .nodejs .npm .mongodb + @echo "\33[31;5mO computador deve ser reiniciado para concluir o processo\33[0m" + +.update: + @sudo apt-get update + +.blender: + @sudo apt-get -y install blender + +.nodejs: + @sudo apt-get -y install nodejs + @sudo ln -sf "/usr/bin/nodejs" "/usr/bin/node" + +.npm: + @sudo apt-get update + @sudo apt-get -y install gcc make build-essential npm + @sudo rm -rf "./node_modules" + @sudo ln -sf "$$HOME" "wikilibras_server" + @sudo npm cache clean + @sudo npm install -g forever node-gyp + @sudo npm link forever node-gyp + @sudo npm install + +.mongodb: + @sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 + @echo "deb http://repo.mongodb.org/apt/ubuntu "$$(lsb_release -sc)"/mongodb-org/3.0 multiverse" | sudo tee "/etc/apt/sources.list.d/mongodb-org-3.0.list" + @sudo apt-get update + @sudo apt-get install -y mongodb-org + @sudo rm "/etc/apt/sources.list.d/mongodb-org-3.0.list" + +help: + @echo "" + @echo " \33[33;5m Apenas uma instancia da API deve ser executada\33[0m" + @echo "" + @echo " \33[32;5m help \33[0m \33[34;5m exibe essa ajuda \33[0m" + @echo " \33[32;5m install \33[0m \33[34;5m instala todas as dependencias da API \33[0m" + @echo " \33[32;5m list \33[0m \33[34;5m lista a API se estiver ativa em background \33[0m" + @echo " \33[32;5m run \33[0m \33[34;5m conecta o servidor js ao MongoDB para testes \33[0m" + @echo " \33[32;5m start \33[0m \33[34;5m inicia uma instancia da API em background \33[0m" + @echo " \33[32;5m stop \33[0m \33[34;5m finaliza a API instanciada no background \33[0m" + @echo "" -__default__: install - -git-clone: - @input="";\ - while [ "$$input" != "s" ] && [ "$$input" != "n" ];\ - do\ - echo -n "$(GREEN)Clonar $(BLUE)$(API)$(GREEN)?$(NONE) (s/n): ";\ - read input;\ - input="`echo $$input | tr [:upper:] [:lower:]`";\ - done;\ - if [ "$$input" = "s" ];\ - then\ - git clone $(API);\ - else\ - exit 0;\ - fi\ - && echo "$(DONE)" || { echo "$(FAIL)"; exit $$?; } - -mongodb: - @sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10;\ - echo "deb http://repo.mongodb.org/apt/ubuntu "$$(lsb_release -sc)"/mongodb-org/3.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.0.list;\ - sudo apt-get -qq update;\ - sudo apt-get install -y mongodb-org;\ - sudo rm -rf /etc/apt/sources.list.d/mongodb-org*;\ - sudo apt-get -qq update;\ - #sudo service mongod stop;\ - #sudo service mongod start;\ - #sudo service mongod restart;\ - -install: mongodb - @input="";\ - while [ "$$input" != "s" ] && [ "$$input" != "n" ];\ - do\ - echo -n "$(GREEN)Instalar o modulo Forever?$(NONE) (s/n): ";\ - read input;\ - input="`echo $$input | tr [:upper:] [:lower:]`";\ - done;\ - if [ "$$input" = "s" ];\ - then\ - sudo echo -n;\ - echo "$(BLUE)Aguarde...$(NONE)";\ - sudo apt-get -qq update;\ - sudo apt-get install -y npm nodejs;\ - sudo ln -sf /usr/bin/nodejs /usr/bin/node;\ - sudo rm -rf ./node_modules;\ - sudo npm cache clean;\ - ln -sf $$HOME wikilibras_server;\ - sudo npm install -g forever;\ - sudo chmod 777 -R ./;\ - else\ - exit 0;\ - fi\ - && echo "$(DONE)" || { echo "$(FAIL)"; exit $$?; } - -sym_link: - @ln -sf $$HOME ./wikilibras_server\ - && echo "$(DONE)" || { echo "$(FAIL)"; exit $$?; } - -node: - @node server.js || { echo "$(FAIL)"; exit $$?; } +list: + @forever list run: - @forever start server.js || { echo "$(FAIL)"; exit $$?; } + @nodejs $(SERVER) -stop: - @forever stop server.js || { echo "$(FAIL)"; exit $$?; } +start: + @forever start --spinSleepTime 1000 --minUptime 1000 -a -l $(LOG) -o $(LOG) -e $(LOG) $(SERVER) -list: - @forever list - @exit 0;\ - port=`grep -w 'port' -f ./helpers/properties.js`;\ - while(true);\ - do\ - echo "$(GREEN)Host: `hostname -i | awk '{print $1}'`$(NONE)";\ - echo "$(GREEN)Port: $$port$(NONE)";\ - echo "$(RED)Stop: CTRL + C$(NONE)"\ - && forever list || { echo "$(FAIL)"; exit $$?; };\ - done +stop: + @forever stop $(SERVER) diff --git a/package.json b/package.json index e0883ae..875b061 100644 --- a/package.json +++ b/package.json @@ -9,11 +9,12 @@ }, "author": "LAViD", "license": "MIT", + "private": true, "dependencies": { "body-parser": "^1.9.2", "express": "~3.5.1", "mkdirp": "^0.5.0", - "mongoose": "^3.8.16", + "mongoose": "~3.8.x", "node-uuid": "^1.4.1", "python-shell": "0.0.3" } diff --git a/server.js b/server.js index e8d1893..d06fd50 100644 --- a/server.js +++ b/server.js @@ -24,7 +24,10 @@ var Sign = require('./db/schemas/sinal').init(mongoose); var API = require('./db/api'); app.use(express.static(path.join(__dirname, '/public'))); -app.use(express.bodyParser({ keepExtensions: true })); + +// deprecated: app.use(express.bodyParser({ keepExtensions: true })); +app.use(express.urlencoded({ keepExtensions: true })) +app.use(express.json()) app.get('/', function(req, res) { res.send(200, { 'status': 'server is running!' }); -- libgit2 0.21.2