OpenNeo/impress-2020
OpenNeo/impress-2020
1
0
Fork 0
Code Pull requests Activity

oops, assetProxy more things for animate-test.html

Browse source
This commit is contained in:
Emi Matchu 2020-09-21 07:07:47 -07:00
parent 99204a011e
commit 7f2660554e
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
api/assetProxy.js
View file

@ -6,7 +6,7 @@ const streamPipeline = util.promisify(stream.pipeline);
const VALID_URL_PATTERNS = [ const VALID_URL_PATTERNS = [
/^http:\/\/images\.neopets\.com\/items\/[a-zA-Z0-9_ -]+\.gif$/, /^http:\/\/images\.neopets\.com\/items\/[a-zA-Z0-9_ -]+\.gif$/,
/^http:\/\/images\.neopets\.com\/cp\/(bio|items)\/data\/[0-9]{3}\/[0-9]{3}\/[0-9]{3}\/[a-f0-9_]+\/[a-zA-Z0-9_\/]+\.(svg|png)$/, /^http:\/\/images\.neopets\.com\/cp\/(bio|items)\/data\/[0-9]{3}\/[0-9]{3}\/[0-9]{3}\/[a-f0-9_]+\/[a-zA-Z0-9_\-\/]+\.(svg|png|js)$/,
/^http:\/\/images\.neopets\.com\/cp\/(bio|items)\/swf\/[0-9]{3}\/[0-9]{3}\/[0-9]{3}\/[a-f0-9_]+\.swf$/, /^http:\/\/images\.neopets\.com\/cp\/(bio|items)\/swf\/[0-9]{3}\/[0-9]{3}\/[0-9]{3}\/[a-f0-9_]+\.swf$/,
]; ];
@ -36,12 +36,20 @@ export default async (req, res) => {
res.status(proxyRes.status); res.status(proxyRes.status);
res.setHeader("Content-Length", proxyRes.headers.get("Content-Length"));
res.setHeader("Content-Type", proxyRes.headers.get("Content-Type"));
res.setHeader("Cache-Control", proxyRes.headers.get("Cache-Control")); res.setHeader("Cache-Control", proxyRes.headers.get("Cache-Control"));
res.setHeader("ETag", proxyRes.headers.get("ETag")); res.setHeader("ETag", proxyRes.headers.get("ETag"));
res.setHeader("Last-Modified", proxyRes.headers.get("Last-Modified")); res.setHeader("Last-Modified", proxyRes.headers.get("Last-Modified"));
streamPipeline(proxyRes.body, res); if (!proxyRes.headers.get("Content-Encoding")) {
// If the content is not encoded (I think their images generally aren't?),
// stream the body directly, to speed things up a bit.
res.setHeader("Content-Length", proxyRes.headers.get("Content-Length"));
res.setHeader("Content-Type", proxyRes.headers.get("Content-Type"));
await streamPipeline(proxyRes.body, res);
} else {
// Otherwise, I don't immediately know how to stream encoded content, so,
// let's just await the full body and send it the normal way.
const buffer = await proxyRes.buffer();
res.send(buffer);
}
}; };

7
public/animate-test.html
View file

@ -1,9 +1,10 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<!-- NOTE: These are the non-minified, for debugging. --> <script src="https://code.createjs.com/1.0.0/easeljs.min.js"></script>
<script src="http://images.neopets.com/js/createjs.js"></script> <script src="https://code.createjs.com/1.0.0/tweenjs.min.js"></script>
<script src="http://images.neopets.com/cp/items/data/000/000/564/564507_fc3216b9b8/all-item_foreground_lower.js"></script> <script src="https://code.createjs.com/1.0.0/preloadjs.min.js"></script>
<script src="/api/assetProxy?url=http://images.neopets.com/cp/items/data/000/000/564/564507_fc3216b9b8/all-item_foreground_lower.js"></script>
</head> </head>
<body> <body>
<div style="display: flex; justify-content: center;"> <div style="display: flex; justify-content: center;">