Resolve content type and size from cache entry #2

Author: julianrubisch

index.js

@@ -42,6 +42,10 @@ function makeAssetCachePath(cacheDir, cacheKey) {
   };
 }
 
+function makeAssetCacheName(contentType, contentLength) {
+  return Buffer.from(`${contentType}:${contentLength}`).toString("base64");
+}
+
 const middleWare = (module.exports = function(options) {
   return async function(req, res, next) {
     options = options || {};
@@ -62,15 +66,20 @@ const middleWare = (module.exports = function(options) {
       middleWare.makeDirIfNotExists(path.join(options.cacheDir, dir1, dir2));
 
       if (fs.existsSync(assetCachePath)) {
-        const response = await fetch(res.locals.fetchUrl, { method: "HEAD" });
-
-        res.locals.contentLength = response.headers.get("content-length");
-        res.locals.contentType = response.headers.get("content-type");
-
         if (options.logger)
           options.logger.debug(`Reading buffer from path ${assetCachePath}`);
 
-        res.locals.buffer = fs.readFileSync(assetCachePath);
+        const firstFile = fs.readdirSync(assetCachePath)[0];
+        const decodedFileName = Buffer.from("firstFile", "base64").toString(
+          "ascii"
+        );
+
+        const [contentType, contentLength] = decodedFileName.split(":");
+
+        res.locals.contentLength = contentLength;
+        res.locals.contentType = contentType;
+
+        res.locals.buffer = fs.readFileSync(`${assetCachePath}/${firstFile}`);
       } else {
         const blob = await (await fetch(res.locals.fetchUrl)).blob();
 
@@ -82,7 +91,13 @@ const middleWare = (module.exports = function(options) {
         res.locals.contentType = blob.type;
         res.locals.contentLength = blob.size;
 
-        fs.writeFileSync(assetCachePath, res.locals.buffer);
+        fs.writeFileSync(
+          `${assetCachePath}/${middleWare.makeAssetCacheName(
+            blob.type,
+            blob.size
+          )}`,
+          res.locals.buffer
+        );
       }
 
       next();
@@ -105,3 +120,4 @@ const middleWare = (module.exports = function(options) {
 
 middleWare.makeAssetCachePath = makeAssetCachePath;
 middleWare.makeDirIfNotExists = makeDirIfNotExists;
+middleWare.makeAssetCacheName = makeAssetCacheName;

test/test.js

@@ -53,7 +53,7 @@ describe("Middleware", function() {
 
       expect(this.nextSpy).to.have.been.calledOnce;
       expect(writeSpy).to.have.been.calledWith(
-        "./a1/b2/0123456789abcdef",
+        "./a1/b2/0123456789abcdef/dW5kZWZpbmVkOnVuZGVmaW5lZA==",
         Buffer.from([])
       );
     });
@@ -65,6 +65,10 @@ describe("Middleware", function() {
         .stub(fs, "existsSync")
         .withArgs("./a1/b2/0123456789abcdef")
         .returns(true);
+      sinon
+        .stub(fs, "readdirSync")
+        .withArgs("./a1/b2/0123456789abcdef")
+        .returns(["dW5kZWZpbmVkOnVuZGVmaW5lZA=="]);
       const mw = middleware({ cacheDir: "." });
 
       await mw(
@@ -75,7 +79,9 @@ describe("Middleware", function() {
 
       expect(this.nextSpy).to.have.been.calledOnce;
       expect(readSpy)
-        .to.have.been.calledWith("./a1/b2/0123456789abcdef")
+        .to.have.been.calledWith(
+          "./a1/b2/0123456789abcdef/dW5kZWZpbmVkOnVuZGVmaW5lZA=="
+        )
         .and.returned(Buffer.from([]));
     });
 
@@ -127,4 +133,10 @@ describe("Middleware", function() {
       this.makePathSpy.resetHistory();
     });
   });
+
+  describe("asset cache name generation", function() {
+    expect(middleware.makeAssetCacheName("image/png", "4096")).to.equal(
+      "aW1hZ2UvcG5nOjQwOTY="
+    );
+  });
 });