midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve typing

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-05-13 16:12:09 +02:00
parent 7151173ea5
commit 80d4bf0ccf
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Utils.ts
View file

@ -1011,11 +1011,11 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
}) })
} }
public static async downloadJsonCached( public static async downloadJsonCached<T = object | []>(
url: string, url: string,
maxCacheTimeMs: number, maxCacheTimeMs: number,
headers?: Record<string, string> headers?: Record<string, string>
): Promise<object> { ): Promise<T> {
const result = await Utils.downloadJsonCachedAdvanced(url, maxCacheTimeMs, headers) const result = await Utils.downloadJsonCachedAdvanced(url, maxCacheTimeMs, headers)
if (result["content"]) { if (result["content"]) {
return result["content"] return result["content"]
@ -1023,11 +1023,11 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
throw result["error"] throw result["error"]
} }
public static async downloadJsonCachedAdvanced( public static async downloadJsonCachedAdvanced<T = object | []>(
url: string, url: string,
maxCacheTimeMs: number, maxCacheTimeMs: number,
headers?: Record<string, string> headers?: Record<string, string>
): Promise<{ content: object | [] } | { error: string; url: string; statuscode?: number }> { ): Promise<{ content: T } | { error: string; url: string; statuscode?: number }> {
const cached = Utils._download_cache.get(url) const cached = Utils._download_cache.get(url)
if (cached !== undefined) { if (cached !== undefined) {
if (new Date().getTime() - cached.timestamp <= maxCacheTimeMs) { if (new Date().getTime() - cached.timestamp <= maxCacheTimeMs) {
@ -1042,10 +1042,10 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
Utils._download_cache.set(url, { promise, timestamp: new Date().getTime() }) Utils._download_cache.set(url, { promise, timestamp: new Date().getTime() })
return await promise return await promise
} }
public static async downloadJson( public static async downloadJson<T = object | []>(
url: string, url: string,
headers?: Record<string, string> headers?: Record<string, string>
): Promise<object | []> ): Promise<T>
public static async downloadJson<T>( public static async downloadJson<T>(
url: string, url: string,
headers?: Record<string, string> headers?: Record<string, string>