From 2198266457e283062ec849a70740b892b33f555e Mon Sep 17 00:00:00 2001
From: Johan Nyman <johan@nytamin.se>
Date: Wed, 20 Dec 2023 09:11:52 +0100
Subject: [PATCH] fix: better handling of when source isStable

---
 .../src/worker/accessorHandlers/http.ts       | 20 ++++++-------------
 shared/packages/worker/src/worker/worker.ts   | 11 +++-------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/shared/packages/worker/src/worker/accessorHandlers/http.ts b/shared/packages/worker/src/worker/accessorHandlers/http.ts
index 4c76d843..f42b1ede 100644
--- a/shared/packages/worker/src/worker/accessorHandlers/http.ts
+++ b/shared/packages/worker/src/worker/accessorHandlers/http.ts
@@ -97,18 +97,6 @@ export class HTTPAccessorHandle<Metadata> extends GenericAccessorHandle<Metadata
 		return { success: true }
 	}
 	async getPackageActualVersion(): Promise<Expectation.Version.HTTPFile> {
-		if (this.accessor.isStable) {
-			// We assume the it is stable, so we won't even check the headers:
-			return {
-				type: Expectation.Version.Type.HTTP_FILE,
-
-				contentType: '',
-				contentLength: 0,
-				modified: 0,
-				etags: [`stable:${this.fullUrl}`],
-			}
-		}
-
 		const header = await this.fetchHeader()
 
 		return this.convertHeadersToVersion(header.headers)
@@ -259,7 +247,10 @@ export class HTTPAccessorHandle<Metadata> extends GenericAccessorHandle<Metadata
 		}
 	}
 	private async fetchHeader() {
-		const { headers, status, statusText } = await this.worker.cacheTemporaryData(
+		const ttl = this.accessor.isStable
+			? 1000 * 60 * 60 * 24 // 1 day
+			: 1000 // a second
+		const { headers, status, statusText } = await this.worker.cacheData(
 			this.type,
 			this.fullUrl,
 			async () => {
@@ -281,7 +272,8 @@ export class HTTPAccessorHandle<Metadata> extends GenericAccessorHandle<Metadata
 					status: response.status,
 					statusText: response.statusText,
 				}
-			}
+			},
+			ttl
 		)
 
 		return {
diff --git a/shared/packages/worker/src/worker/worker.ts b/shared/packages/worker/src/worker/worker.ts
index ebe4da62..eb84a569 100644
--- a/shared/packages/worker/src/worker/worker.ts
+++ b/shared/packages/worker/src/worker/worker.ts
@@ -165,16 +165,11 @@ export abstract class GenericWorker {
 		}
 	}
 	/**
-	 * Store and access temporary data. Useful to debounce / rate limit external calls
+	 * Store and access data. Useful to debounce / rate limit external calls
 	 * @example
 	 * const data = await this.worker.cacheTemporaryData(this.type, url, () => getData(url))
 	 * */
-	public async cacheTemporaryData<T>(
-		accessorType: string,
-		key: string,
-		cb: () => Promise<T>,
-		ttl = 1000
-	): Promise<T> {
+	public async cacheData<T>(accessorType: string, key: string, cb: () => Promise<T>, ttl = 1000): Promise<T> {
 		// Check if data is in cache:
 		if (!this._accessorTemporaryCache[accessorType]) this._accessorTemporaryCache[accessorType] = {}
 		const cache = this._accessorTemporaryCache[accessorType]
@@ -192,7 +187,7 @@ export abstract class GenericWorker {
 			this._accessorTemporaryCacheCleanupTimeout = setTimeout(() => {
 				this._accessorTemporaryCacheCleanupTimeout = undefined
 				this._accessorTemporaryCacheCleanup()
-			}, ttl + 1)
+			}, 1000)
 		}
 		return data
 	}