From 3c7d6ebf712c37d8cea3686f5403116d2adcec31 Mon Sep 17 00:00:00 2001 From: niutech Date: Mon, 18 Dec 2017 20:18:53 +0100 Subject: [PATCH] Add file system cache --- package-lock.json | 142 +++++++++++++++++++++++++++++++++++++++++++++- package.json | 4 +- src/compress.js | 35 ++++++++---- 3 files changed, 169 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index ccea0711..830b97f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "bandwidth-hero-proxy", - "version": "1.0.1", + "version": "1.0.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -24,6 +24,11 @@ "json-schema-traverse": "0.3.1" } }, + "any-promise": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz", + "integrity": "sha1-gwtoCqflbzNFHUsEnzvYBESY7ic=" + }, "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -34,6 +39,11 @@ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" }, + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -44,6 +54,11 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, "basic-auth": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz", @@ -78,11 +93,54 @@ "type-is": "1.6.15" } }, + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, "bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" }, + "cache-manager": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/cache-manager/-/cache-manager-2.6.0.tgz", + "integrity": "sha1-EFDY2alFKoCgz1Zy8TlNMe89QQk=", + "requires": { + "async": "1.5.2", + "lru-cache": "4.0.0" + } + }, + "cache-manager-fs-binary": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/cache-manager-fs-binary/-/cache-manager-fs-binary-1.0.4.tgz", + "integrity": "sha1-7/0HWWZkSdvwFGB6SOolNsvetXY=", + "requires": { + "async": "1.5.2", + "cache-manager": "1.5.0", + "extend": "3.0.1", + "fs-promise": "0.3.1", + "glob": "7.1.2", + "streamifier": "0.1.1", + "uuid": "2.0.3" + }, + "dependencies": { + "cache-manager": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/cache-manager/-/cache-manager-1.5.0.tgz", + "integrity": "sha1-UpIUvaV/oZUU0QbwcPq7FsMZCBE=", + "requires": { + "async": "1.5.2", + "lru-cache": "4.0.0" + } + } + } + }, "caw": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz", @@ -153,6 +211,11 @@ "delayed-stream": "1.0.0" } }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, "config-chain": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz", @@ -358,6 +421,19 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, + "fs-promise": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/fs-promise/-/fs-promise-0.3.1.tgz", + "integrity": "sha1-vzQFA2jyTW3J38ZoirXOrY+GhCo=", + "requires": { + "any-promise": "0.1.0" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, "get-proxy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz", @@ -381,6 +457,19 @@ } } }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, "handle-thing": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz", @@ -443,6 +532,15 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", @@ -536,6 +634,15 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" }, + "lru-cache": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz", + "integrity": "sha1-tcvwFVbBaWb+vlTO7A+03JDfbCg=", + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -579,6 +686,14 @@ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz", "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=" }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "1.1.8" + } + }, "minimist": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", @@ -670,6 +785,11 @@ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=" }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, "path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -704,6 +824,11 @@ "ipaddr.js": "1.5.2" } }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" + }, "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", @@ -1024,6 +1149,11 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=" }, + "streamifier": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/streamifier/-/streamifier-0.1.1.tgz", + "integrity": "sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=" + }, "string_decoder": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", @@ -1099,6 +1229,11 @@ "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" }, + "uuid": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", + "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=" + }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -1133,6 +1268,11 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" } } } diff --git a/package.json b/package.json index c671d4c9..e9466cd1 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "bandwidth-hero-proxy", "main": "server.js", "private": true, - "version": "1.0.2", + "version": "1.0.3", "description": "Data compression service that converts images to low-res WebP or JPEG on the fly. Used in Bandwidth-Hero browser extension.", "author": "Anatoliy Yastreb", "license": "MIT", @@ -11,6 +11,8 @@ }, "dependencies": { "basic-auth": "^2.0.0", + "cache-manager": "^2.6.0", + "cache-manager-fs-binary": "^1.0.4", "express": "4.16.2", "lodash": "^4.17.4", "request": "^2.83.0", diff --git a/src/compress.js b/src/compress.js index 8aa544aa..6bba026e 100644 --- a/src/compress.js +++ b/src/compress.js @@ -1,10 +1,23 @@ const sharp = require('sharp') const redirect = require('./redirect') +const cacheMgr = require('cache-manager') +const cacheStore = require('cache-manager-fs-binary') +const cache = cacheMgr.caching({ + store: cacheStore, + options: { + ttl: 604800, //7d + maxsize: 1073741824, //1GB + path: './cache', + preventfill: true + } +}) function compress(req, res, input) { const format = req.params.webp ? 'webp' : 'jpeg' + const key = req.params.url || '' - sharp(input) + cache.wrap(key, (callback) => { + sharp(input) .grayscale(req.params.grayscale) .toFormat(format, { quality: req.params.quality, @@ -12,16 +25,18 @@ function compress(req, res, input) { optimizeScans: true }) .toBuffer((err, output, info) => { - if (err || !info || res.headersSent) return redirect(req, res) - - res.setHeader('content-type', `image/${format}`) - res.setHeader('content-length', info.size) - res.setHeader('x-original-size', req.params.originSize) - res.setHeader('x-bytes-saved', req.params.originSize - info.size) - res.status(200) - res.write(output) - res.end() + callback(err, {binary: {output: output}, info: info}) }) + }, (err, obj) => { + if (err || !obj || !obj.info || res.headersSent) return redirect(req, res) + res.setHeader('content-type', `image/${format}`) + res.setHeader('content-length', obj.info.size) + res.setHeader('x-original-size', req.params.originSize) + res.setHeader('x-bytes-saved', req.params.originSize - obj.info.size) + res.status(200) + res.write(obj.binary.output) + res.end() + }) } module.exports = compress