Check whether cache entry has contents as part of validity (cache files may have been purged)

Author: zachleat

src/AssetCache.js

@@ -5,11 +5,9 @@ const { DateCompare } = require("@11ty/eleventy-utils");
 
 const FileCache = require("./FileCache.js");
 const Sources = require("./Sources.js");
-const DirectoryManager = require("./DirectoryManager.js");
 
 const debugUtil = require("debug");
 const debug = debugUtil("Eleventy:Fetch");
-const debugAssets = debugUtil("Eleventy:Assets");
 
 class AssetCache {
 	#source;
@@ -19,7 +17,6 @@ class AssetCache {
 	#cacheDirectory;
 	#cacheLocationDirty = false;
 	#directoryManager;
-	#rawContents = {};
 
 	constructor(source, cacheDirectory, options = {}) {
 		if(!Sources.isValidSource(source)) {
@@ -227,12 +224,15 @@ class AssetCache {
 	}
 
 	isCacheValid(duration = this.duration) {
-		if (!this.cachedObject || !this.cachedObject.cachedAt) {
-			// not cached
+		if(!this.cachedObject || !this.cachedObject?.cachedAt) {
 			return false;
 		}
 
-		return DateCompare.isTimestampWithinDuration(this.cachedObject.cachedAt, duration);
+		if(DateCompare.isTimestampWithinDuration(this.cachedObject?.cachedAt, duration)) {
+			return this.cache.hasContents(); // check file system to make files haven’t been purged.
+		}
+
+		return false;
 	}
 
 	get cachedObject() {

src/FileCache.js

@@ -131,6 +131,18 @@ class FileCache {
 		return Buffer.from(rawData.contents);
 	}
 
+	hasContents() {
+		if(this.#contents) {
+			return true;
+		}
+		if(!this.isSideLoaded() && this.get()?.data) {
+			return true;
+		} else if(this.get()?.contents) {
+			return true;
+		}
+		return existsCache.exists(this.contentsPath);
+	}
+
 	getContents() {
 		if(this.#contents) {
 			return this.#contents;