Skip to content

Support keyless startup with no caching support #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
avaer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support keyless startup with no caching support #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion aws.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ const AWS = require('aws-sdk');
const fs = require('fs');

let accessKeyId, secretAccessKey;
let hasCacheSupport = false;
if (fs.existsSync('./config.json')){
console.log('reading secrets from config.json...');
accessKeyId = require('./config.json').accessKeyId;
secretAccessKey = require('./config.json').secretAccessKey;
if (accessKeyId && secretAccessKey) {
console.log('read secrets from config.json ok');
hasCacheSupport = true;
} else {
throw new Error('read secrets from config.json failed');
}
Expand All @@ -18,8 +20,9 @@ if (fs.existsSync('./config.json')){
secretAccessKey = process.env.secretAccessKey;
if (accessKeyId && secretAccessKey) {
console.log('read secrets from env ok');
hasCacheSupport = true;
} else {
throw new Error('read secrets from env failed');
console.warn('read secrets from env failed');
}
}

Expand Down Expand Up @@ -96,6 +99,7 @@ const deleteObject = (bucket, key) => {
} */

module.exports = {
hasCacheSupport,
getObject,
putObject,
deleteObject,
Expand Down
4 changes: 2 additions & 2 deletions routes/preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const http = require('http');
const mime = require('mime');
const fetch = require('node-fetch');

const {getObject, putObject, deleteObject} = require('../aws.js');
const {hasCacheSupport, getObject, putObject, deleteObject} = require('../aws.js');
const browserManager = require('../browser-manager.js');
const {renderTimeout} = require('../constants.js');

Expand Down Expand Up @@ -143,7 +143,7 @@ const _handlePreviewRequest = async (req, res) => {
}
})();
const {query = {}} = u;
const cache = !query['nocache'];
const cache = hasCacheSupport && !query['nocache'];
if (spec) {
const {url, hash, ext, type, height, width} = spec;
const key = `${hash}/${ext}/${type}`;
Expand Down