Fix ESLint errors
This commit is contained in:
parent
f0b4bb7341
commit
1dbda38995
12 changed files with 151 additions and 156 deletions
|
@ -1,6 +1,6 @@
|
|||
const convict = require('convict');
|
||||
|
||||
let conf = convict({
|
||||
const conf = convict({
|
||||
bitly_key: {
|
||||
format: String,
|
||||
default: 'localhost',
|
||||
|
@ -32,7 +32,7 @@ let conf = convict({
|
|||
// Perform validation
|
||||
conf.validate({ allowed: 'strict' });
|
||||
|
||||
let props = conf.getProperties();
|
||||
const props = conf.getProperties();
|
||||
module.exports = props;
|
||||
|
||||
module.exports.notLocalHost =
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
const conf = require('./config.js');
|
||||
|
||||
let notLocalHost = conf.notLocalHost;
|
||||
const notLocalHost = conf.notLocalHost;
|
||||
|
||||
const mozlog = require('mozlog') ({
|
||||
const mozlog = require('mozlog')({
|
||||
app: 'FirefoxFileshare',
|
||||
level: notLocalHost ? 'INFO' : 'verbose',
|
||||
fmt: notLocalHost ? 'heka' : 'pretty',
|
||||
debug: !notLocalHost
|
||||
})
|
||||
});
|
||||
|
||||
module.exports = mozlog;
|
||||
module.exports = mozlog;
|
||||
|
|
|
@ -2,20 +2,16 @@ const express = require('express');
|
|||
const exphbs = require('express-handlebars');
|
||||
const busboy = require('connect-busboy');
|
||||
const path = require('path');
|
||||
const fs = require('fs-extra');
|
||||
const bodyParser = require('body-parser');
|
||||
const crypto = require('crypto');
|
||||
const stream = require('stream');
|
||||
const fetch = require('node-fetch');
|
||||
const bytes = require('bytes');
|
||||
const conf = require('./config.js');
|
||||
const storage = require('./storage.js');
|
||||
|
||||
let notLocalHost = conf.notLocalHost;
|
||||
const notLocalHost = conf.notLocalHost;
|
||||
|
||||
const mozlog = require('./log.js');
|
||||
|
||||
let log = mozlog('portal.server');
|
||||
const log = mozlog('portal.server');
|
||||
|
||||
const app = express();
|
||||
|
||||
|
@ -32,14 +28,14 @@ app.get('/', (req, res) => {
|
|||
});
|
||||
|
||||
app.get('/exists/:id', (req, res) => {
|
||||
let id = req.params.id;
|
||||
const id = req.params.id;
|
||||
storage.exists(id).then(doesExist => {
|
||||
res.sendStatus(doesExist ? 200 : 404);
|
||||
});
|
||||
});
|
||||
|
||||
app.get('/download/:id', (req, res) => {
|
||||
let id = req.params.id;
|
||||
const id = req.params.id;
|
||||
storage.filename(id).then(filename => {
|
||||
storage
|
||||
.length(id)
|
||||
|
@ -56,7 +52,7 @@ app.get('/download/:id', (req, res) => {
|
|||
});
|
||||
|
||||
app.get('/assets/download/:id', (req, res) => {
|
||||
let id = req.params.id;
|
||||
const id = req.params.id;
|
||||
if (!validateID(id)) {
|
||||
res.sendStatus(404);
|
||||
return;
|
||||
|
@ -71,7 +67,7 @@ app.get('/assets/download/:id', (req, res) => {
|
|||
'Content-Type': 'application/octet-stream',
|
||||
'Content-Length': contentLength
|
||||
});
|
||||
let file_stream = storage.get(id);
|
||||
const file_stream = storage.get(id);
|
||||
|
||||
file_stream.on(notLocalHost ? 'finish' : 'close', () => {
|
||||
storage.forceDelete(id).then(err => {
|
||||
|
@ -90,14 +86,14 @@ app.get('/assets/download/:id', (req, res) => {
|
|||
});
|
||||
|
||||
app.post('/delete/:id', (req, res) => {
|
||||
let id = req.params.id;
|
||||
const id = req.params.id;
|
||||
|
||||
if (!validateID(id)) {
|
||||
res.send(404);
|
||||
return;
|
||||
}
|
||||
|
||||
let delete_token = req.body.delete_token;
|
||||
const delete_token = req.body.delete_token;
|
||||
|
||||
if (!delete_token) {
|
||||
res.sendStatus(404);
|
||||
|
@ -125,7 +121,7 @@ app.post('/upload/:id', (req, res, next) => {
|
|||
log.info('Uploading:', req.params.id);
|
||||
|
||||
const protocol = notLocalHost ? 'https' : req.protocol;
|
||||
let url = `${protocol}://${req.get('host')}/download/${req.params.id}/`;
|
||||
const url = `${protocol}://${req.get('host')}/download/${req.params.id}/`;
|
||||
|
||||
storage.set(req.params.id, file, filename, url).then(linkAndID => {
|
||||
res.json(linkAndID);
|
||||
|
@ -133,10 +129,10 @@ app.post('/upload/:id', (req, res, next) => {
|
|||
});
|
||||
});
|
||||
|
||||
let server = app.listen(conf.listen_port, () => {
|
||||
app.listen(conf.listen_port, () => {
|
||||
log.info('startServer:', `Portal app listening on port ${conf.listen_port}!`);
|
||||
});
|
||||
|
||||
let validateID = route_id => {
|
||||
const validateID = route_id => {
|
||||
return route_id.match(/^[0-9a-fA-F]{32}$/) !== null;
|
||||
};
|
||||
|
|
|
@ -7,11 +7,11 @@ const path = require('path');
|
|||
const fetch = require('node-fetch');
|
||||
const crypto = require('crypto');
|
||||
|
||||
let notLocalHost = conf.notLocalHost;
|
||||
const notLocalHost = conf.notLocalHost;
|
||||
|
||||
const mozlog = require('./log.js');
|
||||
|
||||
let log = mozlog('portal.storage');
|
||||
const log = mozlog('portal.storage');
|
||||
|
||||
const redis = require('redis');
|
||||
const redis_client = redis.createClient({
|
||||
|
@ -67,7 +67,7 @@ function exists(id) {
|
|||
function localLength(id) {
|
||||
return new Promise((resolve, reject) => {
|
||||
try {
|
||||
resolve(fs.statSync(__dirname + '/../static/' + id).size);
|
||||
resolve(fs.statSync(path.join(__dirname, '../static', id)).size);
|
||||
} catch (err) {
|
||||
reject();
|
||||
}
|
||||
|
@ -75,15 +75,15 @@ function localLength(id) {
|
|||
}
|
||||
|
||||
function localGet(id) {
|
||||
return fs.createReadStream(__dirname + '/../static/' + id);
|
||||
return fs.createReadStream(path.join(__dirname, '../static', id));
|
||||
}
|
||||
|
||||
function localSet(id, file, filename, url) {
|
||||
return new Promise((resolve, reject) => {
|
||||
fstream = fs.createWriteStream(__dirname + '/../static/' + id);
|
||||
const fstream = fs.createWriteStream(path.join(__dirname, '../static', id));
|
||||
file.pipe(fstream);
|
||||
fstream.on('close', () => {
|
||||
let uuid = crypto.randomBytes(10).toString('hex');
|
||||
const uuid = crypto.randomBytes(10).toString('hex');
|
||||
|
||||
redis_client.hmset([id, 'filename', filename, 'delete', uuid]);
|
||||
redis_client.expire(id, 86400000);
|
||||
|
@ -105,7 +105,7 @@ function localDelete(id, delete_token) {
|
|||
reject();
|
||||
} else {
|
||||
redis_client.del(id);
|
||||
resolve(fs.unlinkSync(__dirname + '/../static/' + id));
|
||||
resolve(fs.unlinkSync(path.join(__dirname, '../static', id)));
|
||||
}
|
||||
});
|
||||
});
|
||||
|
@ -114,12 +114,12 @@ function localDelete(id, delete_token) {
|
|||
function localForceDelete(id) {
|
||||
return new Promise((resolve, reject) => {
|
||||
redis_client.del(id);
|
||||
resolve(fs.unlinkSync(__dirname + '/../static/' + id));
|
||||
resolve(fs.unlinkSync(path.join(__dirname, '../static', id)));
|
||||
});
|
||||
}
|
||||
|
||||
function awsLength(id) {
|
||||
let params = {
|
||||
const params = {
|
||||
Bucket: conf.s3_bucket,
|
||||
Key: id
|
||||
};
|
||||
|
@ -135,7 +135,7 @@ function awsLength(id) {
|
|||
}
|
||||
|
||||
function awsGet(id) {
|
||||
let params = {
|
||||
const params = {
|
||||
Bucket: conf.s3_bucket,
|
||||
Key: id
|
||||
};
|
||||
|
@ -144,19 +144,19 @@ function awsGet(id) {
|
|||
}
|
||||
|
||||
function awsSet(id, file, filename, url) {
|
||||
let params = {
|
||||
const params = {
|
||||
Bucket: conf.s3_bucket,
|
||||
Key: id,
|
||||
Body: file
|
||||
};
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
s3.upload(params, function(err, data) {
|
||||
s3.upload(params, function(err, _data) {
|
||||
if (err) {
|
||||
log.info('awsUploadError:', err.stack); // an error occurred
|
||||
reject();
|
||||
} else {
|
||||
let uuid = crypto.randomBytes(10).toString('hex');
|
||||
const uuid = crypto.randomBytes(10).toString('hex');
|
||||
|
||||
redis_client.hmset([id, 'filename', filename, 'delete', uuid]);
|
||||
|
||||
|
@ -197,12 +197,12 @@ function awsDelete(id, delete_token) {
|
|||
reject();
|
||||
} else {
|
||||
redis_client.del(id);
|
||||
let params = {
|
||||
const params = {
|
||||
Bucket: conf.s3_bucket,
|
||||
Key: id
|
||||
};
|
||||
|
||||
s3.deleteObject(params, function(err, data) {
|
||||
s3.deleteObject(params, function(err, _data) {
|
||||
resolve(err);
|
||||
});
|
||||
}
|
||||
|
@ -213,12 +213,12 @@ function awsDelete(id, delete_token) {
|
|||
function awsForceDelete(id) {
|
||||
return new Promise((resolve, reject) => {
|
||||
redis_client.del(id);
|
||||
let params = {
|
||||
const params = {
|
||||
Bucket: conf.s3_bucket,
|
||||
Key: id
|
||||
};
|
||||
|
||||
s3.deleteObject(params, function(err, data) {
|
||||
s3.deleteObject(params, function(err, _data) {
|
||||
resolve(err);
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue