LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

changed ../config to @config

Browse source
This commit is contained in:
bill bittner 2018-06-05 18:35:19 -07:00
parent 6851ace4dd
commit 7ee0b14a09
2 changed files with 73 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
index.js
View file

@ -1,4 +1,4 @@
// app dependencies
// load modules
const express = require('express');
const bodyParser = require('body-parser');
const expressHandlebars = require('express-handlebars');
@ -7,90 +7,73 @@ const helmet = require('helmet');
const cookieSession = require('cookie-session');
const http = require('http');
const logger = require('winston');
const requestLogger = require('./server/middleware/requestLogger.js');
const Path = require('path');
const loggerConfig = require('./config/loggerConfig.js');
const mysqlConfig = require('./config/mysqlConfig.js');
const siteConfig = require('./config/siteConfig.js');
const slackConfig = require('./config/slackConfig.js');
// load local modules
const requestLogger = require('./server/middleware/requestLogger.js');
const siteConfig = require('@config/siteConfig.js');
const createDatabaseIfNotExists = require('./server/models/utils/createDatabaseIfNotExists.js');
const { getWalletBalance } = require('./server/lbrynet/index');
function Server () {
this.configureLogger = loggerConfig.update;
this.configureMysql = mysqlConfig.update;
this.configureSite = siteConfig.update;
this.configureSlack = slackConfig.update;
this.createApp = () => {
// create an Express application
const app = express();
/* create app */
// create an Express application
const app = express();
// trust the proxy to get ip address for us
app.enable('trust proxy');
// trust the proxy to get ip address for us
app.enable('trust proxy');
/* add middleware */
// set HTTP headers to protect against well-known web vulnerabilties
app.use(helmet());
// 'express.static' to serve static files from public directory
const publicPath = Path.resolve(process.cwd(), 'public');
app.use(express.static(publicPath));
logger.info(`serving static files from default static path at ${publicPath}.`);
// 'body parser' for parsing application/json
app.use(bodyParser.json());
// 'body parser' for parsing application/x-www-form-urlencoded
app.use(bodyParser.urlencoded({ extended: true }));
// add custom middleware (note: build out to accept dynamically use what is in server/middleware/
app.use(requestLogger);
// configure passport
const speechPassport = require('./server/speechPassport/index');
// initialize passport
const sessionKey = siteConfig.auth.sessionKey;
app.use(cookieSession({
/* add middleware */
// set HTTP headers to protect against well-known web vulnerabilties
app.use(helmet());
// 'express.static' to serve static files from public directory
const publicPath = Path.resolve(process.cwd(), 'public');
app.use(express.static(publicPath));
logger.info(`serving static files from default static path at ${publicPath}.`);
// 'body parser' for parsing application/json
app.use(bodyParser.json());
// 'body parser' for parsing application/x-www-form-urlencoded
app.use(bodyParser.urlencoded({ extended: true }));
// add custom middleware (note: build out to accept dynamically use what is in server/middleware/
app.use(requestLogger);
// configure passport
const speechPassport = require('./server/speechPassport/index');
// initialize passport
const sessionKey = siteConfig.auth.sessionKey;
app.use(cookieSession({
name : 'session',
keys : [sessionKey],
}));
app.use(speechPassport.initialize());
app.use(speechPassport.session());
// configure handlebars & register it with express app
const hbs = expressHandlebars.create({
}));
app.use(speechPassport.initialize());
app.use(speechPassport.session());
// configure handlebars & register it with express app
const hbs = expressHandlebars.create({
defaultLayout: 'embed',
handlebars : Handlebars,
});
app.engine('handlebars', hbs.engine);
app.set('view engine', 'handlebars');
});
app.engine('handlebars', hbs.engine);
app.set('view engine', 'handlebars');
// set the routes on the app
require('./server/routes/auth/index')(app);
require('./server/routes/api/index')(app);
require('./server/routes/pages/index')(app);
require('./server/routes/assets/index')(app);
require('./server/routes/fallback/index')(app);
// set the routes on the app
require('./server/routes/auth/index')(app);
require('./server/routes/api/index')(app);
require('./server/routes/pages/index')(app);
require('./server/routes/assets/index')(app);
require('./server/routes/fallback/index')(app);
/* create server */
const server = http.Server(app);
this.app = app;
};
this.initialize = () => {
this.createApp();
this.server = http.Server(this.app);
};
this.start = () => {
const db = require('./server/models/index');
const PORT = siteConfig.details.port;
// sync sequelize
createDatabaseIfNotExists()
/* start the server */
const db = require('./server/models/index');
const PORT = siteConfig.details.port;
const startServer = () => {
return createDatabaseIfNotExists()
.then(() => {
return getWalletBalance();
})
.then(balance => {
logger.info('starting LBC balance:', balance);
db.sequelize.sync();
this.server.listen(PORT, () => {
server.listen(PORT, () => {
logger.info(`Server is listening on PORT ${PORT}`);
});
})
@ -102,7 +85,6 @@ function Server () {
}
logger.error(error);
});
};
};
module.exports = Server;
module.exports = startServer;

4
test/end-to-end/end-to-end.tests.js
View file

@ -1,8 +1,8 @@
const chai = require('chai');
const expect = chai.expect;
const chaiHttp = require('chai-http');
const { details: { host } } = require('../../config/siteConfig.js');
const { testChannel, testChannelId, testChannelPassword } = require('../../devConfig/testingConfig.js');
const { details: { host } } = require('@config/siteConfig.js');
const { testChannel, testChannelId, testChannelPassword } = require('@devConfig/testingConfig.js');
const requestTimeout = 20000;
const publishTimeout = 120000;
const fs = require('fs');