refactor: Move all cache timestamp utilities into their new module

Author: kellnerd

harmonizer/timestamp.ts

@@ -1,11 +1,22 @@
 import { isDefined } from '@/utils/predicate.ts';
+import { assert } from 'std/assert/assert.ts';
 import type { ReleaseInfo } from './types.ts';
 
+/** Asserts that the given number is a valid timestamp. */
+export function assertTimestamp(ts: number) {
+	assert(Number.isSafeInteger(ts) && ts >= 0, 'Timestamp has to be a non-negative integer');
+}
+
 /** Formats the given timestamp as ISO YYYY-MM-DD date. */
 export function formatTimestampAsISODate(unixSeconds: number): string {
 	return new Date(unixSeconds * 1000).toISOString().substring(0, 10);
 }
 
+/** Formats the given timestamp as ISO YYYY-MM-DDTHH:mm:ssZ string. */
+export function formatTimestampAsISOString(unixSeconds: number): string {
+	return new Date(unixSeconds * 1000).toISOString().replace('.000', '');
+}
+
 /** Returns the date and time when the whole data from all providers was cached (in seconds since the UNIX epoch). */
 export function getMaxCacheTimestamp(info: ReleaseInfo): number | undefined {
 	const cacheTimestamps = info.providers.map((provider) => provider.cacheTime).filter(isDefined);

server/components/ProviderList.tsx

@@ -1,6 +1,6 @@
 import { ProviderIcon } from './ProviderIcon.tsx';
 
-import { formatTimestampAsISOString } from '@/utils/time.ts';
+import { formatTimestampAsISOString } from '@/harmonizer/timestamp.ts';
 import type { ProviderInfo } from '@/harmonizer/types.ts';
 
 export function ProviderList({ providers }: { providers: ProviderInfo[] }) {

server/permalink.ts

@@ -1,3 +1,4 @@
+import { getMaxCacheTimestamp } from '@/harmonizer/timestamp.ts';
 import type { ReleaseInfo } from '@/harmonizer/types.ts';
 import { isDefined } from '@/utils/predicate.ts';
 
@@ -9,7 +10,6 @@ export function encodeReleaseLookupState(info: ReleaseInfo): URLSearchParams {
 	);
 	const providersUsedAsTemplate = info.providers.filter((provider) => provider.isTemplate);
 	const usedRegion = info.providers.map((provider) => provider.lookup.region).find(isDefined);
-	const cacheTimestamps = info.providers.map((provider) => provider.cacheTime).filter(isDefined);
 
 	// Add provider IDs for all providers which were looked up by ID or URL.
 	const state = new URLSearchParams(
@@ -41,8 +41,8 @@ export function encodeReleaseLookupState(info: ReleaseInfo): URLSearchParams {
 	}
 
 	// Maximum timestamp can be used to load the latest snapshot up to this timestamp for each provider.
-	const maxTimestamp = Math.max(...cacheTimestamps);
-	if (Number.isSafeInteger(maxTimestamp)) {
+	const maxTimestamp = getMaxCacheTimestamp(info);
+	if (maxTimestamp) {
 		state.append('ts', maxTimestamp.toFixed(0));
 	}
 

server/state.ts

@@ -1,10 +1,10 @@
 import type { ReleaseLookupParameters } from '@/lookup.ts';
+import { assertTimestamp } from '@/harmonizer/timestamp.ts';
 import type { CountryCode, ProviderNameAndId, ReleaseOptions } from '@/harmonizer/types.ts';
 import { providers } from '@/providers/mod.ts';
 import { ensureValidGTIN } from '@/utils/gtin.ts';
 import { isNotEmpty } from '@/utils/predicate.ts';
 import { assertCountryCode } from '@/utils/regions.ts';
-import { assertTimestamp } from '@/utils/time.ts';
 import { getCookies } from 'std/http/cookie.ts';
 
 /** Default regions which will be used for lookups if no regions could be obtained otherwise. */

utils/time.ts

@@ -1,5 +1,4 @@
-import { assert } from 'std/assert/assert.ts';
-
+/** Formats milliseconds as colon-separated duration string. */
 export function formatDuration(ms: number | undefined, { showMs }: {
 	showMs?: boolean;
 } = {}): string | undefined {
@@ -36,15 +35,6 @@ export function formatDuration(ms: number | undefined, { showMs }: {
 	return duration;
 }
 
-export function formatTimestampAsISOString(unixSeconds: number): string {
-	return new Date(unixSeconds * 1000).toISOString().replace('.000', '');
-}
-
-/** Asserts that the given number is a valid timestamp. */
-export function assertTimestamp(ts: number) {
-	assert(Number.isSafeInteger(ts) && ts >= 0, 'Timestamp has to be a non-negative integer');
-}
-
 /** Converts an ISO-8601 duration (e.g. PT41M5S) to milliseconds. */
 export function parseISODuration(duration: string): number {
 	const match = duration.match(/PT(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?/);