From 0f9f37754616168d670088c97c5c59186c022c15 Mon Sep 17 00:00:00 2001 From: spiduler Date: Thu, 8 Oct 2020 20:08:54 +0900 Subject: [PATCH] spiduler - crawling service gateway --- app/services.js | 8 +++---- index.js | 52 ++++++++++++++++++++------------------------ package.json | 2 +- restart.sh | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ start.sh | 3 +++ 5 files changed, 90 insertions(+), 33 deletions(-) create mode 100644 restart.sh create mode 100644 start.sh diff --git a/app/services.js b/app/services.js index bcf9514..a646a31 100644 --- a/app/services.js +++ b/app/services.js @@ -3,14 +3,14 @@ var uuid = require('node-uuid'), accessTokens = {}, tokenHeartbeats = {}, clients = { - 'F8Nbz9gGUvLgdn8T': { + '7tmK4rF8As8CtRw5': { id: '1', - secret: 'Fesmx7hHCCMx7Cby7FhV2fAtf2NYEFzP5fCKuwEEdpf8hpnsnnQn9qYhNHt6SsDD', + secret: 'cgzLcVFku5zEvXkCKNZsAbxXQENFqPDx2kfjnMGd3m9BczehmFt2pw9r9MdASSFt', grantTypes: ['client_credentials'] }, - 'dev52VrnSufxEyKT': { + 'devLdadSKsTP92JJ': { id: '2', - secret: 'nK2jnqhdWnrmAFDw9zWVueAqUQvSxmAyjf2Sz7ZrmYVSH5GSxER4rPQCuBUewF', + secret: 'ngKRm8aDHq4g7pskRTyPwFTrsE7Kf8feVpBvE5SjYwXUhyGKKa4NeqYWwNjFWtv7', grantTypes: ['client_credentials'] } }; diff --git a/index.js b/index.js index eb86afb..2d07a76 100644 --- a/index.js +++ b/index.js @@ -13,18 +13,25 @@ var proxy = require('express-http-proxy'), const services = require('./app/services'); const adapter = new FileSync(__dirname + '/storage/db.json') const db = low(adapter) +db.get('authCodes').value().forEach(codeData => { + codeData.expiresDate = function () { + var d = new Date(); + d.setDate(d.getDate() + 2); + return d; + }(); + services.authorizationService.saveAuthorizationCode(codeData, function (n, codeData) { + // console.log(codeData) + }) +}); + +const app = express() +app.use(expressLogging(logger)); +app.listen(port, () => { + console.log("Server running on port " + port); +}); + + -db.get('authCodes').value() - .forEach(codeData => { - codeData.expiresDate = function () { - var d = new Date(); - d.setDate(d.getDate() + 2); - return d; - }(); - services.authorizationService.saveAuthorizationCode(codeData, function (n, codeData) { - // console.log(codeData) - }) - }); var OAuthServer = require('simple-oauth-server'), oauthServer = new OAuthServer( @@ -82,13 +89,6 @@ function heartbeat(request, response) { response.json({ code: updated ? 200 : 400, data: updated }); } -cron.schedule('0 * * * * *', () => { - services.flushExpiredTokens(300); -}); - - -const app = express() -app.use(expressLogging(logger)); const proxyFilter = function (req, res) { return req.hostname == hostname ? true : new Promise(function (resolve) { resolve(function () { @@ -111,21 +111,18 @@ const proxyFilter = function (req, res) { }); } - -app.use('/api/v1/headless', proxy('127.0.0.1:32101', { +app.use('/api/v1/headless', proxy('spiduler-headless:32101', { filter: proxyFilter })); -app.use('/api/v1/spider', proxy('127.0.0.1:32102', { +app.use('/api/v1/spider', proxy('spiduler-spider:32102', { filter: proxyFilter })); -app.use('/api/v1/spiduler', proxy('127.0.0.1:32103', { +app.use('/api/v1/spiduler', proxy('spiduler-schedule:32103', { filter: proxyFilter })); - - app.get('/oauth/authorize', authorize) app.get('/api/v1/oauth/token', grantToken) @@ -133,7 +130,6 @@ app.get('/oauth/token', grantToken) app.get('/api/test', apiEndpoint) - - -app.listen(port) -console.log('Server starting port ' + port) \ No newline at end of file +// cron.schedule('0 * * * * *', () => { +// services.flushExpiredTokens(300); +// }); diff --git a/package.json b/package.json index 099f612..5946826 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "cm-auth", + "name": "spd-app-gateway", "version": "1.0.0", "description": "", "main": "index.js", diff --git a/restart.sh b/restart.sh new file mode 100644 index 0000000..c861457 --- /dev/null +++ b/restart.sh @@ -0,0 +1,58 @@ +#!/bin/bash + +# npmInstall="n" + +# while getopts ":e:n:r:q:" opt; do +# case $opt in +# e) env="$OPTARG" +# ;; +# n) npmInstall="$OPTARG" +# ;; +# r) redis="$OPTARG" +# ;; +# q) quix24Gateway="$OPTARG" +# ;; +# \?) echo "Invalid option -$OPTARG" >&2 +# ;; +# esac +# done + +# cd /var/www/spiduler + +# if [ $npmInstall == "y" ] +# then +# npm --prefix /var/www/spiduler/spd-app-gateway install +# npm --prefix /var/www/spiduler/spd-app-headless install +# npm --prefix /var/www/spiduler/spd-app-spider install +# npm --prefix /var/www/spiduler/spd-app-spiduler install +# fi +# forever stopall +# forever cleanlogs +# forever --uid SPD-gateway start spd-app-gateway --env $env --redis $redis +# forever --uid SPD-headless start --killSignal=SIGTERM spd-app-headless --env $env +# forever --uid SPD-spider start spd-app-spider --env $env --redis $redis +# forever --uid SPD-spiduler start spd-app-spiduler --env $env --redis $redis --quix24 $quix24Gateway + + + +# docker run -d --net spiduler --net-alias spiduler-chrome --name spiduler-chrome -v /var/www/cafemaster/endpoint/spiduler:/var/www/spiduler selenium/standalone-chrome +# docker run -d --net spiduler --net-alias spiduler-gateway --name spiduler-gateway -v /var/www/cafemaster/endpoint/spiduler/spd-app-gateway:/var/www/app ibpcorp/node:lts-alpine +# docker run -d --net spiduler --net-alias spiduler-nginx --name spiduler-nginx -p 32100:80 -p 449 -v /var/www/cafemaster/endpoint/spiduler/spd-app-spiduler/docker/nginx/spiduler.conf:/etc/nginx/conf.d/default.conf nginx:alpine +# docker run -d --net spiduler --net-alias spiduler-headless --name spiduler-headless -v /var/www/cafemaster/endpoint/spiduler/spd-app-headless:/var/www/app ibpcorp/node:lts-alpine +# docker run -d --net spiduler --net-alias spiduler-spider --name spiduler-spider -v /var/www/cafemaster/endpoint/spiduler/spd-app-spider:/var/www/app ibpcorp/node:lts-alpine +# docker run -d --net spiduler --net-alias spiduler-schedule --name spiduler-schedule -v /var/www/cafemaster/endpoint/spiduler/spd-app-spiduler:/var/www/app ibpcorp/node:lts-alpine + +git -C spd-app-gateway pull origin master +git -C spd-app-headless pull origin master +git -C spd-app-spider pull origin master +git -C spd-app-spiduler pull origin master + +docker restart $(docker ps -a --filter "name=spiduler-*" --format "{{.Names}}") +docker ps -a --filter "name=spiduler-*" --format "table {{.Names}}\t{{.Status}}" + +# cd spd-app-spiduler/docker +# docker-compose -f docker-compose-dev.yml up + + + + diff --git a/start.sh b/start.sh new file mode 100644 index 0000000..471fa92 --- /dev/null +++ b/start.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +node /var/www/spiduler/spd-app-gateway --env development --redis 127.0.0.1:49023 --mongo 127.0.0.1:49024 --gateway spiduler-nginx:80 --quix24 soluitons-ibpcorp.de:31000 \ No newline at end of file