Avoid cache on local Gateway check

loicknuchel · loicknuchel · commit e5d150cfc5cb · 2025-02-10T18:17:07.000+01:00
diff --git a/frontend/ts-src/services/backend.ts b/frontend/ts-src/services/backend.ts
@@ -189,12 +189,13 @@ export class Backend {
 
     private gatewayPost = async <Body, Response>(path: string, body: Body, zod: ZodType<Response>): Promise<Response> => {
         const gateway_local = 'http://localhost:4177'
-        return Http.getJson(`${gateway_local}/ping`, GatewayPing).then(_ => {
+        const now = Date.now()
+        return Http.getJson(`${gateway_local}/ping?time=${now}`, GatewayPing, {cache: 'no-store'}).then(_ => {
             return Http.postJson(`${gateway_local}/gateway${path}`, body, zod)
                 .catch(err => Promise.reject(`Local gateway: ${errorToString(err)}`))
         }, _ => {
             const gateway_remote = window.gateway_url || ''
-            return Http.getJson(`${gateway_remote}/ping`, GatewayPing)
+            return Http.getJson(`${gateway_remote}/ping?time=${now}`, GatewayPing, {cache: 'no-store'})
                 .then(_ => Http.postJson(`${gateway_remote}/gateway${path}`, body, zod))
                 .catch(err => Promise.reject(`${gateway_remote.includes('azimutt.app') ? 'Azimutt gateway' : 'Custom gateway'}: ${errorToString(err)}, forgot to start the local gateway? (npx azimutt@latest gateway)`))
         })
diff --git a/frontend/ts-src/utils/http.ts b/frontend/ts-src/utils/http.ts
@@ -2,7 +2,7 @@ import {ZodType} from "zod";
 import {zodParse} from "@azimutt/models";
 import * as Json from "./json";
 
-export const getJson = <Response>(url: string, zod: ZodType<Response>): Promise<Response> => customFetch('GET', url, undefined, zod)
+export const getJson = <Response>(url: string, zod: ZodType<Response>, headers?: RequestInit): Promise<Response> => customFetch('GET', url, undefined, zod, headers)
 export const postJson = <Body, Response>(url: string, body: Body, zod: ZodType<Response>): Promise<Response> => customFetch('POST', url, body, zod)
 export const postNoContent = <Body>(url: string, body: Body): Promise<void> => customFetch('POST', url, body)
 export const postMultipart = <Response>(url: string, body: FormData, zod: ZodType<Response>): Promise<Response> => customFetch('POST', url, body, zod)
@@ -12,9 +12,10 @@ export const deleteNoContent = (url: string): Promise<void> => customFetch('DELE
 
 type Method = 'GET' | 'POST' | 'PUT' | 'DELETE'
 
-function customFetch<Body, Response>(method: Method, path: string, body?: Body, zod?: ZodType<Response>): Promise<Response> {
+function customFetch<Body, Response>(method: Method, path: string, body?: Body, zod?: ZodType<Response>, headers?: RequestInit): Promise<Response> {
     const url = path.startsWith('http') ? path : `${window.location.origin}${path}`
-    let opts: RequestInit = path.startsWith('http') ? {method} : {method, credentials: 'include'}
+    let opts: RequestInit = headers ? headers : {}
+    opts = path.startsWith('http') ? {...opts, method} : {...opts, method, credentials: 'include'}
     if (body instanceof FormData) {
         opts = {...opts, body: body}
     } else if (typeof body === 'object' && body !== null) {
