refactor: Integrity handling

getIntegrity tests still need to be updated

Author: matz3

packages/fs/lib/Resource.js

@@ -554,15 +554,15 @@ class Resource {
 
 		switch (this.#contentType) {
 		case CONTENT_TYPES.BUFFER:
-			this.#integrity = ssri.fromData(this.#content, SSRI_OPTIONS);
+			this.#integrity = ssri.fromData(this.#content, SSRI_OPTIONS).toString();
 			break;
 		case CONTENT_TYPES.FACTORY:
-			this.#integrity = await ssri.fromStream(this.#createStreamFactory(), SSRI_OPTIONS);
+			this.#integrity = (await ssri.fromStream(this.#createStreamFactory(), SSRI_OPTIONS)).toString();
 			break;
 		case CONTENT_TYPES.STREAM:
 			// To be discussed: Should we read the stream into a buffer here (using #getBufferFromStream) to avoid
 			// draining it?
-			this.#integrity = ssri.fromData(await this.#getBufferFromStream(this.#content), SSRI_OPTIONS);
+			this.#integrity = ssri.fromData(await this.#getBufferFromStream(this.#content), SSRI_OPTIONS).toString();
 			break;
 		case CONTENT_TYPES.DRAINED_STREAM:
 			throw new Error(`Unexpected error: Content of Resource ${this.#path} is flagged as drained.`);

packages/project/lib/build/cache/CacheManager.js

@@ -87,10 +87,10 @@ export default class CacheManager {
 			log.info(`Integrity mismatch for cache entry ` +
 				`${cacheKey}: expected ${integrity}, got ${result.integrity}`);
 
-			const res = await cacache.get.byDigest(this.#casDir, result.integrity);
+			const res = await cacache.get.byDigest(this.#casDir, integrity);
 			if (res) {
 				log.info(`Updating cache entry with expectation...`);
-				await this.writeStage(buildSignature, stageId, resourcePath, res.data);
+				await this.writeStage(buildSignature, stageId, resourcePath, res);
 				return await this.getResourcePathForStage(buildSignature, stageId, resourcePath, integrity);
 			}
 		}