@rocicorp/zero 0.25.10-canary.1 → 0.25.10-canary.6

package/out/zero/package.json.js

@@ -1,4 +1,4 @@
-const version = "0.25.10-canary.1";
+const version = "0.25.10-canary.6";
 const packageJson = {
   version
 };

package/out/zero-cache/src/custom/fetch.d.ts

@@ -15,6 +15,7 @@ import { type ShardID } from '../types/shards.ts';
 export declare function compileUrlPattern(pattern: string): URLPattern;
 export type HeaderOptions = {
     apiKey?: string | undefined;
+    customHeaders?: Record<string, string> | undefined;
     token?: string | undefined;
     cookie?: string | undefined;
 };

package/out/zero-cache/src/custom/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/custom/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC3D,OAAO,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAC,KAAK,IAAI,EAAC,MAAM,+BAA+B,CAAC;AAMxD,OAAO,EAAiB,KAAK,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAIhE;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAQ7D;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,KAAK,QAAQ,EACb,IAAI,UAAU,EACd,OAAO,QAAQ,KACd,OAAO,CAAC,MAAM,GAAG,SAAS,CAe5B,CAAC;AAEF,wBAAsB,kBAAkB,CAAC,UAAU,SAAS,IAAI,EAC9D,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,MAAM,GAAG,WAAW,EAC5B,EAAE,EAAE,UAAU,EACd,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,OAAO,EAClB,kBAAkB,EAAE,UAAU,EAAE,EAChC,KAAK,EAAE,OAAO,EACd,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,iBAAiB,sEAkKxB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,QAAQ,CACtB,GAAG,EAAE,MAAM,EACX,kBAAkB,EAAE,UAAU,EAAE,GAC/B,OAAO,CAOT"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/custom/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC3D,OAAO,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAC,KAAK,IAAI,EAAC,MAAM,+BAA+B,CAAC;AAMxD,OAAO,EAAiB,KAAK,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAIhE;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAQ7D;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IACnD,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,KAAK,QAAQ,EACb,IAAI,UAAU,EACd,OAAO,QAAQ,KACd,OAAO,CAAC,MAAM,GAAG,SAAS,CAe5B,CAAC;AAEF,wBAAsB,kBAAkB,CAAC,UAAU,SAAS,IAAI,EAC9D,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,MAAM,GAAG,WAAW,EAC5B,EAAE,EAAE,UAAU,EACd,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,OAAO,EAClB,kBAAkB,EAAE,UAAU,EAAE,EAChC,KAAK,EAAE,OAAO,EACd,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,iBAAiB,sEAqKxB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,QAAQ,CACtB,GAAG,EAAE,MAAM,EACX,kBAAkB,EAAE,UAAU,EAAE,GAC/B,OAAO,CAOT"}

package/out/zero-cache/src/custom/fetch.js

@@ -60,6 +60,9 @@ async function fetchFromAPIServer(validator, source, lc, url, isUserUrl, allowed
   if (headerOptions.apiKey) {
     headers["X-Api-Key"] = headerOptions.apiKey;
   }
+  if (headerOptions.customHeaders) {
+    Object.assign(headers, headerOptions.customHeaders);
+  }
   if (headerOptions.token) {
     headers["Authorization"] = `Bearer ${headerOptions.token}`;
   }

package/out/zero-cache/src/custom/fetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.js","sources":["../../../../../zero-cache/src/custom/fetch.ts"],"sourcesContent":["import type {LogContext, LogLevel} from '@rocicorp/logger';\nimport 'urlpattern-polyfill';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {getErrorMessage} from '../../../shared/src/error.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {type Type} from '../../../shared/src/valita.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport {ErrorOrigin} from '../../../zero-protocol/src/error-origin.ts';\nimport {ErrorReason} from '../../../zero-protocol/src/error-reason.ts';\nimport {isProtocolError} from '../../../zero-protocol/src/error.ts';\nimport {ProtocolErrorWithLevel} from '../types/error-with-level.ts';\nimport {upstreamSchema, type ShardID} from '../types/shards.ts';\n\nconst reservedParams = ['schema', 'appID'];\n\n/**\n * Compiles and validates a URLPattern from configuration.\n *\n * Patterns must be full URLs (e.g., \"https://api.example.com/endpoint\").\n * URLPattern automatically sets search and hash to wildcard ('*'),\n * which means query parameters and fragments are ignored during matching.\n *\n * @throws Error if the pattern is an invalid URLPattern\n */\nexport function compileUrlPattern(pattern: string): URLPattern {\n  try {\n    return new URLPattern(pattern);\n  } catch (e) {\n    throw new Error(\n      `Invalid URLPattern in URL configuration: \"${pattern}\". Error: ${e instanceof Error ? e.message : String(e)}`,\n    );\n  }\n}\n\nexport type HeaderOptions = {\n  apiKey?: string | undefined;\n  token?: string | undefined;\n  cookie?: string | undefined;\n};\n\nexport const getBodyPreview = async (\n  res: Response,\n  lc: LogContext,\n  level: LogLevel,\n): Promise<string | undefined> => {\n  try {\n    const body = await res.clone().text();\n    if (body.length > 512) {\n      return body.slice(0, 512) + '...';\n    }\n    return body;\n  } catch (e) {\n    lc[level]?.('failed to get body preview', {\n      url: res.url,\n      error: e instanceof Error ? e.message : String(e),\n    });\n  }\n\n  return undefined;\n};\n\nexport async function fetchFromAPIServer<TValidator extends Type>(\n  validator: TValidator,\n  source: 'push' | 'transform',\n  lc: LogContext,\n  url: string,\n  isUserUrl: boolean,\n  allowedUrlPatterns: URLPattern[],\n  shard: ShardID,\n  headerOptions: HeaderOptions,\n  body: ReadonlyJSONValue,\n) {\n  lc.debug?.('fetchFromAPIServer called', {\n    url,\n  });\n\n  if (!urlMatch(url, allowedUrlPatterns)) {\n    throw new ProtocolErrorWithLevel(\n      source === 'push'\n        ? {\n            kind: ErrorKind.PushFailed,\n            origin: ErrorOrigin.ZeroCache,\n            reason: ErrorReason.Internal,\n            message: `URL \"${url}\" is not allowed by the ZERO_MUTATE_URL configuration`,\n            mutationIDs: [],\n          }\n        : {\n            kind: ErrorKind.TransformFailed,\n            origin: ErrorOrigin.ZeroCache,\n            reason: ErrorReason.Internal,\n            message: `URL \"${url}\" is not allowed by the ZERO_QUERY_URL configuration`,\n            queryIDs: [],\n          },\n    );\n  }\n  const headers: Record<string, string> = {\n    'Content-Type': 'application/json',\n  };\n\n  if (headerOptions.apiKey) {\n    headers['X-Api-Key'] = headerOptions.apiKey;\n  }\n  if (headerOptions.token) {\n    headers['Authorization'] = `Bearer ${headerOptions.token}`;\n  }\n  if (headerOptions.cookie) {\n    headers['Cookie'] = headerOptions.cookie;\n  }\n\n  const urlObj = new URL(url);\n  const params = new URLSearchParams(urlObj.search);\n\n  for (const reserved of reservedParams) {\n    assert(\n      !params.has(reserved),\n      `The push URL cannot contain the reserved query param \"${reserved}\"`,\n    );\n  }\n\n  params.append('schema', upstreamSchema(shard));\n  params.append('appID', shard.appID);\n\n  urlObj.search = params.toString();\n\n  const finalUrl = urlObj.toString();\n\n  // Errors from a user-specified url are treated 4xx errors\n  // (e.g. bad request) as they are developer driven and should not\n  // trigger error-log based alerts.\n  const errLevel: LogLevel = isUserUrl ? 'warn' : 'error';\n  try {\n    const response = await fetch(finalUrl, {\n      method: 'POST',\n      headers,\n      body: JSON.stringify(body),\n    });\n\n    if (!response.ok) {\n      const bodyPreview = await getBodyPreview(response, lc, errLevel);\n\n      // Bad Gateway or Gateway Timeout indicate the server was not reached\n      const level =\n        response.status === 502 || response.status === 504 ? errLevel : 'info';\n      lc[level]?.('fetch from API server returned non-OK status', {\n        url: finalUrl,\n        status: response.status,\n        bodyPreview,\n      });\n\n      throw new ProtocolErrorWithLevel(\n        source === 'push'\n          ? {\n              kind: ErrorKind.PushFailed,\n              origin: ErrorOrigin.ZeroCache,\n              reason: ErrorReason.HTTP,\n              status: response.status,\n              bodyPreview,\n              message: `Fetch from API server returned non-OK status ${response.status}`,\n              mutationIDs: [],\n            }\n          : {\n              kind: ErrorKind.TransformFailed,\n              origin: ErrorOrigin.ZeroCache,\n              reason: ErrorReason.HTTP,\n              status: response.status,\n              bodyPreview,\n              message: `Fetch from API server returned non-OK status ${response.status}`,\n              queryIDs: [],\n            },\n      );\n    }\n\n    try {\n      const json = await response.json();\n\n      return validator.parse(json);\n    } catch (error) {\n      lc[errLevel]?.('failed to parse response', {\n        url: finalUrl,\n        error,\n      });\n\n      throw new ProtocolErrorWithLevel(\n        source === 'push'\n          ? {\n              kind: ErrorKind.PushFailed,\n              origin: ErrorOrigin.ZeroCache,\n              reason: ErrorReason.Parse,\n              message: `Failed to parse response from API server: ${getErrorMessage(error)}`,\n              mutationIDs: [],\n            }\n          : {\n              kind: ErrorKind.TransformFailed,\n              origin: ErrorOrigin.ZeroCache,\n              reason: ErrorReason.Parse,\n              message: `Failed to parse response from API server: ${getErrorMessage(error)}`,\n              queryIDs: [],\n            },\n        'error',\n        {cause: error},\n      );\n    }\n  } catch (error) {\n    if (isProtocolError(error)) {\n      throw error;\n    }\n\n    lc[errLevel]?.('failed to fetch from API server with unknown error', {\n      url: finalUrl,\n      error,\n    });\n\n    throw new ProtocolErrorWithLevel(\n      source === 'push'\n        ? {\n            kind: ErrorKind.PushFailed,\n            origin: ErrorOrigin.ZeroCache,\n            reason: ErrorReason.Internal,\n            message: `Fetch from API server failed with unknown error: ${getErrorMessage(error)}`,\n            mutationIDs: [],\n          }\n        : {\n            kind: ErrorKind.TransformFailed,\n            origin: ErrorOrigin.ZeroCache,\n            reason: ErrorReason.Internal,\n            message: `Fetch from API server failed with unknown error: ${getErrorMessage(error)}`,\n            queryIDs: [],\n          },\n      'error',\n      {cause: error},\n    );\n  }\n}\n\n/**\n * Returns true if the url matches one of the allowedUrlPatterns.\n *\n * URLPattern automatically ignores query parameters and hash fragments during matching\n * because it sets search and hash to wildcard ('*') by default.\n *\n * Example URLPattern patterns:\n * - \"https://api.example.com/endpoint\" - Exact match for a specific URL\n * - \"https://*.example.com/endpoint\" - Matches any single subdomain (e.g., \"https://api.example.com/endpoint\")\n * - \"https://*.*.example.com/endpoint\" - Matches two subdomains (e.g., \"https://api.v1.example.com/endpoint\")\n * - \"https://api.example.com/*\" - Matches any path under /\n * - \"https://api.example.com/:version/endpoint\" - Matches with named parameter (e.g., \"https://api.example.com/v1/endpoint\")\n */\nexport function urlMatch(\n  url: string,\n  allowedUrlPatterns: URLPattern[],\n): boolean {\n  for (const pattern of allowedUrlPatterns) {\n    if (pattern.test(url)) {\n      return true;\n    }\n  }\n  return false;\n}\n"],"names":["ErrorKind.PushFailed","ErrorOrigin.ZeroCache","ErrorReason.Internal","ErrorKind.TransformFailed","ErrorReason.HTTP","ErrorReason.Parse"],"mappings":"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"}
+{"version":3,"file":"fetch.js","sources":["../../../../../zero-cache/src/custom/fetch.ts"],"sourcesContent":["import type {LogContext, LogLevel} from '@rocicorp/logger';\nimport 'urlpattern-polyfill';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {getErrorMessage} from '../../../shared/src/error.ts';\nimport type {ReadonlyJSONValue} from '../../../shared/src/json.ts';\nimport {type Type} from '../../../shared/src/valita.ts';\nimport {ErrorKind} from '../../../zero-protocol/src/error-kind.ts';\nimport {ErrorOrigin} from '../../../zero-protocol/src/error-origin.ts';\nimport {ErrorReason} from '../../../zero-protocol/src/error-reason.ts';\nimport {isProtocolError} from '../../../zero-protocol/src/error.ts';\nimport {ProtocolErrorWithLevel} from '../types/error-with-level.ts';\nimport {upstreamSchema, type ShardID} from '../types/shards.ts';\n\nconst reservedParams = ['schema', 'appID'];\n\n/**\n * Compiles and validates a URLPattern from configuration.\n *\n * Patterns must be full URLs (e.g., \"https://api.example.com/endpoint\").\n * URLPattern automatically sets search and hash to wildcard ('*'),\n * which means query parameters and fragments are ignored during matching.\n *\n * @throws Error if the pattern is an invalid URLPattern\n */\nexport function compileUrlPattern(pattern: string): URLPattern {\n  try {\n    return new URLPattern(pattern);\n  } catch (e) {\n    throw new Error(\n      `Invalid URLPattern in URL configuration: \"${pattern}\". Error: ${e instanceof Error ? e.message : String(e)}`,\n    );\n  }\n}\n\nexport type HeaderOptions = {\n  apiKey?: string | undefined;\n  customHeaders?: Record<string, string> | undefined;\n  token?: string | undefined;\n  cookie?: string | undefined;\n};\n\nexport const getBodyPreview = async (\n  res: Response,\n  lc: LogContext,\n  level: LogLevel,\n): Promise<string | undefined> => {\n  try {\n    const body = await res.clone().text();\n    if (body.length > 512) {\n      return body.slice(0, 512) + '...';\n    }\n    return body;\n  } catch (e) {\n    lc[level]?.('failed to get body preview', {\n      url: res.url,\n      error: e instanceof Error ? e.message : String(e),\n    });\n  }\n\n  return undefined;\n};\n\nexport async function fetchFromAPIServer<TValidator extends Type>(\n  validator: TValidator,\n  source: 'push' | 'transform',\n  lc: LogContext,\n  url: string,\n  isUserUrl: boolean,\n  allowedUrlPatterns: URLPattern[],\n  shard: ShardID,\n  headerOptions: HeaderOptions,\n  body: ReadonlyJSONValue,\n) {\n  lc.debug?.('fetchFromAPIServer called', {\n    url,\n  });\n\n  if (!urlMatch(url, allowedUrlPatterns)) {\n    throw new ProtocolErrorWithLevel(\n      source === 'push'\n        ? {\n            kind: ErrorKind.PushFailed,\n            origin: ErrorOrigin.ZeroCache,\n            reason: ErrorReason.Internal,\n            message: `URL \"${url}\" is not allowed by the ZERO_MUTATE_URL configuration`,\n            mutationIDs: [],\n          }\n        : {\n            kind: ErrorKind.TransformFailed,\n            origin: ErrorOrigin.ZeroCache,\n            reason: ErrorReason.Internal,\n            message: `URL \"${url}\" is not allowed by the ZERO_QUERY_URL configuration`,\n            queryIDs: [],\n          },\n    );\n  }\n  const headers: Record<string, string> = {\n    'Content-Type': 'application/json',\n  };\n\n  if (headerOptions.apiKey) {\n    headers['X-Api-Key'] = headerOptions.apiKey;\n  }\n  if (headerOptions.customHeaders) {\n    Object.assign(headers, headerOptions.customHeaders);\n  }\n  if (headerOptions.token) {\n    headers['Authorization'] = `Bearer ${headerOptions.token}`;\n  }\n  if (headerOptions.cookie) {\n    headers['Cookie'] = headerOptions.cookie;\n  }\n\n  const urlObj = new URL(url);\n  const params = new URLSearchParams(urlObj.search);\n\n  for (const reserved of reservedParams) {\n    assert(\n      !params.has(reserved),\n      `The push URL cannot contain the reserved query param \"${reserved}\"`,\n    );\n  }\n\n  params.append('schema', upstreamSchema(shard));\n  params.append('appID', shard.appID);\n\n  urlObj.search = params.toString();\n\n  const finalUrl = urlObj.toString();\n\n  // Errors from a user-specified url are treated 4xx errors\n  // (e.g. bad request) as they are developer driven and should not\n  // trigger error-log based alerts.\n  const errLevel: LogLevel = isUserUrl ? 'warn' : 'error';\n  try {\n    const response = await fetch(finalUrl, {\n      method: 'POST',\n      headers,\n      body: JSON.stringify(body),\n    });\n\n    if (!response.ok) {\n      const bodyPreview = await getBodyPreview(response, lc, errLevel);\n\n      // Bad Gateway or Gateway Timeout indicate the server was not reached\n      const level =\n        response.status === 502 || response.status === 504 ? errLevel : 'info';\n      lc[level]?.('fetch from API server returned non-OK status', {\n        url: finalUrl,\n        status: response.status,\n        bodyPreview,\n      });\n\n      throw new ProtocolErrorWithLevel(\n        source === 'push'\n          ? {\n              kind: ErrorKind.PushFailed,\n              origin: ErrorOrigin.ZeroCache,\n              reason: ErrorReason.HTTP,\n              status: response.status,\n              bodyPreview,\n              message: `Fetch from API server returned non-OK status ${response.status}`,\n              mutationIDs: [],\n            }\n          : {\n              kind: ErrorKind.TransformFailed,\n              origin: ErrorOrigin.ZeroCache,\n              reason: ErrorReason.HTTP,\n              status: response.status,\n              bodyPreview,\n              message: `Fetch from API server returned non-OK status ${response.status}`,\n              queryIDs: [],\n            },\n      );\n    }\n\n    try {\n      const json = await response.json();\n\n      return validator.parse(json);\n    } catch (error) {\n      lc[errLevel]?.('failed to parse response', {\n        url: finalUrl,\n        error,\n      });\n\n      throw new ProtocolErrorWithLevel(\n        source === 'push'\n          ? {\n              kind: ErrorKind.PushFailed,\n              origin: ErrorOrigin.ZeroCache,\n              reason: ErrorReason.Parse,\n              message: `Failed to parse response from API server: ${getErrorMessage(error)}`,\n              mutationIDs: [],\n            }\n          : {\n              kind: ErrorKind.TransformFailed,\n              origin: ErrorOrigin.ZeroCache,\n              reason: ErrorReason.Parse,\n              message: `Failed to parse response from API server: ${getErrorMessage(error)}`,\n              queryIDs: [],\n            },\n        'error',\n        {cause: error},\n      );\n    }\n  } catch (error) {\n    if (isProtocolError(error)) {\n      throw error;\n    }\n\n    lc[errLevel]?.('failed to fetch from API server with unknown error', {\n      url: finalUrl,\n      error,\n    });\n\n    throw new ProtocolErrorWithLevel(\n      source === 'push'\n        ? {\n            kind: ErrorKind.PushFailed,\n            origin: ErrorOrigin.ZeroCache,\n            reason: ErrorReason.Internal,\n            message: `Fetch from API server failed with unknown error: ${getErrorMessage(error)}`,\n            mutationIDs: [],\n          }\n        : {\n            kind: ErrorKind.TransformFailed,\n            origin: ErrorOrigin.ZeroCache,\n            reason: ErrorReason.Internal,\n            message: `Fetch from API server failed with unknown error: ${getErrorMessage(error)}`,\n            queryIDs: [],\n          },\n      'error',\n      {cause: error},\n    );\n  }\n}\n\n/**\n * Returns true if the url matches one of the allowedUrlPatterns.\n *\n * URLPattern automatically ignores query parameters and hash fragments during matching\n * because it sets search and hash to wildcard ('*') by default.\n *\n * Example URLPattern patterns:\n * - \"https://api.example.com/endpoint\" - Exact match for a specific URL\n * - \"https://*.example.com/endpoint\" - Matches any single subdomain (e.g., \"https://api.example.com/endpoint\")\n * - \"https://*.*.example.com/endpoint\" - Matches two subdomains (e.g., \"https://api.v1.example.com/endpoint\")\n * - \"https://api.example.com/*\" - Matches any path under /\n * - \"https://api.example.com/:version/endpoint\" - Matches with named parameter (e.g., \"https://api.example.com/v1/endpoint\")\n */\nexport function urlMatch(\n  url: string,\n  allowedUrlPatterns: URLPattern[],\n): boolean {\n  for (const pattern of allowedUrlPatterns) {\n    if (pattern.test(url)) {\n      return true;\n    }\n  }\n  return false;\n}\n"],"names":["ErrorKind.PushFailed","ErrorOrigin.ZeroCache","ErrorReason.Internal","ErrorKind.TransformFailed","ErrorReason.HTTP","ErrorReason.Parse"],"mappings":"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"}

package/out/zero-cache/src/services/mutagen/pusher.d.ts

@@ -9,7 +9,7 @@ import type { HandlerResult, StreamResult } from '../../workers/connection.ts';
 import type { RefCountedService, Service } from '../service.ts';
 export interface Pusher extends RefCountedService {
     readonly pushURL: string | undefined;
-    initConnection(clientID: string, wsID: string, userPushURL: string | undefined): Source<Downstream>;
+    initConnection(clientID: string, wsID: string, userPushURL: string | undefined, userPushHeaders: Record<string, string> | undefined): Source<Downstream>;
     enqueuePush(clientID: string, push: PushBody, auth: string | undefined, httpCookie: string | undefined): HandlerResult;
     ackMutationResponses(upToID: MutationID): Promise<void>;
 }
@@ -34,7 +34,7 @@ export declare class PusherService implements Service, Pusher {
         url: string[];
     }, lc: LogContext, clientGroupID: string);
     get pushURL(): string | undefined;
-    initConnection(clientID: string, wsID: string, userPushURL: string | undefined): Subscription<["deleteClients", {
+    initConnection(clientID: string, wsID: string, userPushURL: string | undefined, userPushHeaders: Record<string, string> | undefined): Subscription<["deleteClients", {
         readonly clientIDs?: readonly string[] | undefined;
         readonly clientGroupIDs?: readonly string[] | undefined;
     }] | ["connected", {

package/out/zero-cache/src/services/mutagen/pusher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pusher.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/mutagen/pusher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pusher.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/mutagen/pusher.ts"],"names":[],"mappings":"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"}

package/out/zero-cache/src/services/mutagen/pusher.js

@@ -42,8 +42,13 @@ class PusherService {
   get pushURL() {
     return this.#pusher.pushURL[0];
   }
-  initConnection(clientID, wsID, userPushURL) {
-    return this.#pusher.initConnection(clientID, wsID, userPushURL);
+  initConnection(clientID, wsID, userPushURL, userPushHeaders) {
+    return this.#pusher.initConnection(
+      clientID,
+      wsID,
+      userPushURL,
+      userPushHeaders
+    );
   }
   enqueuePush(clientID, push, auth, httpCookie) {
     if (!this.#pushConfig.forwardCookies) {
@@ -99,6 +104,7 @@ class PushWorker {
   #config;
   #clients;
   #userPushURL;
+  #userPushHeaders;
   #customMutations = getOrCreateCounter(
     "mutation",
     "custom",
@@ -125,7 +131,7 @@ class PushWorker {
    * Returns a new downstream stream if the clientID,wsID pair has not been seen before.
    * If a clientID already exists with a different wsID, that client's downstream is cancelled.
    */
-  initConnection(clientID, wsID, userPushURL) {
+  initConnection(clientID, wsID, userPushURL, userPushHeaders) {
     const existing = this.#clients.get(clientID);
     if (existing && existing.wsID === wsID) {
       throw new Error("Connection was already initialized");
@@ -135,6 +141,7 @@ class PushWorker {
     }
     if (this.#userPushURL === void 0) {
       this.#userPushURL = userPushURL;
+      this.#userPushHeaders = userPushHeaders;
     } else {
       if (this.#userPushURL !== userPushURL) {
         this.#lc.warn?.(
@@ -300,6 +307,7 @@ class PushWorker {
         },
         {
           apiKey: this.#apiKey,
+          customHeaders: this.#userPushHeaders,
           token: entry.auth,
           cookie: entry.httpCookie
         },

package/out/zero-cache/src/services/mutagen/pusher.js.map

@@ -1 +1 @@
-{"version":3,"file":"pusher.js","sources":["../../../../../../zero-cache/src/services/mutagen/pusher.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {groupBy} from '../../../../shared/src/arrays.ts';\nimport {assert, unreachable} from '../../../../shared/src/asserts.ts';\nimport {getErrorMessage} from '../../../../shared/src/error.ts';\nimport {must} from '../../../../shared/src/must.ts';\nimport {Queue} from '../../../../shared/src/queue.ts';\nimport type {Downstream} from '../../../../zero-protocol/src/down.ts';\nimport {ErrorKind} from '../../../../zero-protocol/src/error-kind.ts';\nimport {ErrorOrigin} from '../../../../zero-protocol/src/error-origin.ts';\nimport {ErrorReason} from '../../../../zero-protocol/src/error-reason.ts';\nimport {\n  isProtocolError,\n  type PushFailedBody,\n} from '../../../../zero-protocol/src/error.ts';\nimport {\n  pushResponseSchema,\n  type MutationID,\n  type PushBody,\n  type PushResponse,\n} from '../../../../zero-protocol/src/push.ts';\nimport {type ZeroConfig} from '../../config/zero-config.ts';\nimport {compileUrlPattern, fetchFromAPIServer} from '../../custom/fetch.ts';\nimport {getOrCreateCounter} from '../../observability/metrics.ts';\nimport {recordMutation} from '../../server/anonymous-otel-start.ts';\nimport {ProtocolErrorWithLevel} from '../../types/error-with-level.ts';\nimport type {PostgresDB} from '../../types/pg.ts';\nimport {upstreamSchema} from '../../types/shards.ts';\nimport type {Source} from '../../types/streams.ts';\nimport {Subscription} from '../../types/subscription.ts';\nimport type {HandlerResult, StreamResult} from '../../workers/connection.ts';\nimport type {RefCountedService, Service} from '../service.ts';\n\nexport interface Pusher extends RefCountedService {\n  readonly pushURL: string | undefined;\n\n  initConnection(\n    clientID: string,\n    wsID: string,\n    userPushURL: string | undefined,\n  ): Source<Downstream>;\n  enqueuePush(\n    clientID: string,\n    push: PushBody,\n    auth: string | undefined,\n    httpCookie: string | undefined,\n  ): HandlerResult;\n  ackMutationResponses(upToID: MutationID): Promise<void>;\n}\n\ntype Config = Pick<ZeroConfig, 'app' | 'shard'>;\n\n/**\n * Receives push messages from zero-client and forwards\n * them the the user's API server.\n *\n * If the user's API server is taking too long to process\n * the push, the PusherService will add the push to a queue\n * and send pushes in bulk the next time the user's API server\n * is available.\n *\n * - One PusherService exists per client group.\n * - Mutations for a given client are always sent in-order\n * - Mutations for different clients in the same group may be interleaved\n */\nexport class PusherService implements Service, Pusher {\n  readonly id: string;\n  readonly #pusher: PushWorker;\n  readonly #queue: Queue<PusherEntryOrStop>;\n  readonly #pushConfig: ZeroConfig['push'] & {url: string[]};\n  readonly #upstream: PostgresDB;\n  readonly #config: Config;\n  #stopped: Promise<void> | undefined;\n  #refCount = 0;\n  #isStopped = false;\n\n  constructor(\n    upstream: PostgresDB,\n    appConfig: Config,\n    pushConfig: ZeroConfig['push'] & {url: string[]},\n    lc: LogContext,\n    clientGroupID: string,\n  ) {\n    this.#config = appConfig;\n    this.#upstream = upstream;\n    this.#queue = new Queue();\n    this.#pusher = new PushWorker(\n      appConfig,\n      lc,\n      pushConfig.url,\n      pushConfig.apiKey,\n      this.#queue,\n    );\n    this.id = clientGroupID;\n    this.#pushConfig = pushConfig;\n  }\n\n  get pushURL(): string | undefined {\n    return this.#pusher.pushURL[0];\n  }\n\n  initConnection(\n    clientID: string,\n    wsID: string,\n    userPushURL: string | undefined,\n  ) {\n    return this.#pusher.initConnection(clientID, wsID, userPushURL);\n  }\n\n  enqueuePush(\n    clientID: string,\n    push: PushBody,\n    auth: string | undefined,\n    httpCookie: string | undefined,\n  ): Exclude<HandlerResult, StreamResult> {\n    if (!this.#pushConfig.forwardCookies) {\n      httpCookie = undefined; // remove cookies if not forwarded\n    }\n    this.#queue.enqueue({push, auth, clientID, httpCookie});\n\n    return {\n      type: 'ok',\n    };\n  }\n\n  async ackMutationResponses(upToID: MutationID) {\n    // delete the relevant rows from the `mutations` table\n    const sql = this.#upstream;\n    await sql`DELETE FROM ${sql(\n      upstreamSchema({\n        appID: this.#config.app.id,\n        shardNum: this.#config.shard.num,\n      }),\n    )}.mutations WHERE \"clientGroupID\" = ${this.id} AND \"clientID\" = ${upToID.clientID} AND \"mutationID\" <= ${upToID.id}`;\n  }\n\n  ref() {\n    assert(!this.#isStopped, 'PusherService is already stopped');\n    ++this.#refCount;\n  }\n\n  unref() {\n    assert(!this.#isStopped, 'PusherService is already stopped');\n    --this.#refCount;\n    if (this.#refCount <= 0) {\n      void this.stop();\n    }\n  }\n\n  hasRefs(): boolean {\n    return this.#refCount > 0;\n  }\n\n  run(): Promise<void> {\n    this.#stopped = this.#pusher.run();\n    return this.#stopped;\n  }\n\n  stop(): Promise<void> {\n    if (this.#isStopped) {\n      return must(this.#stopped, 'Stop was called before `run`');\n    }\n    this.#isStopped = true;\n    this.#queue.enqueue('stop');\n    return must(this.#stopped, 'Stop was called before `run`');\n  }\n}\n\ntype PusherEntry = {\n  push: PushBody;\n  auth: string | undefined;\n  httpCookie: string | undefined;\n  clientID: string;\n};\ntype PusherEntryOrStop = PusherEntry | 'stop';\n\n/**\n * Awaits items in the queue then drains and sends them all\n * to the user's API server.\n */\nclass PushWorker {\n  readonly #pushURLs: string[];\n  readonly #pushURLPatterns: URLPattern[];\n  readonly #apiKey: string | undefined;\n  readonly #queue: Queue<PusherEntryOrStop>;\n  readonly #lc: LogContext;\n  readonly #config: Config;\n  readonly #clients: Map<\n    string,\n    {\n      wsID: string;\n      downstream: Subscription<Downstream>;\n    }\n  >;\n  #userPushURL?: string | undefined;\n\n  readonly #customMutations = getOrCreateCounter(\n    'mutation',\n    'custom',\n    'Number of custom mutations processed',\n  );\n  readonly #pushes = getOrCreateCounter(\n    'mutation',\n    'pushes',\n    'Number of pushes processed by the pusher',\n  );\n\n  constructor(\n    config: Config,\n    lc: LogContext,\n    pushURL: string[],\n    apiKey: string | undefined,\n    queue: Queue<PusherEntryOrStop>,\n  ) {\n    this.#pushURLs = pushURL;\n    this.#lc = lc.withContext('component', 'pusher');\n    this.#pushURLPatterns = pushURL.map(compileUrlPattern);\n    this.#apiKey = apiKey;\n    this.#queue = queue;\n    this.#config = config;\n    this.#clients = new Map();\n  }\n\n  get pushURL() {\n    return this.#pushURLs;\n  }\n\n  /**\n   * Returns a new downstream stream if the clientID,wsID pair has not been seen before.\n   * If a clientID already exists with a different wsID, that client's downstream is cancelled.\n   */\n  initConnection(\n    clientID: string,\n    wsID: string,\n    userPushURL: string | undefined,\n  ) {\n    const existing = this.#clients.get(clientID);\n    if (existing && existing.wsID === wsID) {\n      // already initialized for this socket\n      throw new Error('Connection was already initialized');\n    }\n\n    // client is back on a new connection\n    if (existing) {\n      existing.downstream.cancel();\n    }\n\n    // Handle client group level URL parameters\n    if (this.#userPushURL === undefined) {\n      // First client in the group - store its URL\n      this.#userPushURL = userPushURL;\n    } else {\n      // Validate that subsequent clients have compatible parameters\n      if (this.#userPushURL !== userPushURL) {\n        this.#lc.warn?.(\n          'Client provided different mutate parameters than client group',\n          {\n            clientID,\n            clientURL: userPushURL,\n            clientGroupURL: this.#userPushURL,\n          },\n        );\n      }\n    }\n\n    const downstream = Subscription.create<Downstream>({\n      cleanup: () => {\n        this.#clients.delete(clientID);\n      },\n    });\n    this.#clients.set(clientID, {wsID, downstream});\n    return downstream;\n  }\n\n  async run() {\n    for (;;) {\n      const task = await this.#queue.dequeue();\n      const rest = this.#queue.drain();\n      const [pushes, terminate] = combinePushes([task, ...rest]);\n      for (const push of pushes) {\n        const response = await this.#processPush(push);\n        await this.#fanOutResponses(response);\n      }\n\n      if (terminate) {\n        break;\n      }\n    }\n  }\n\n  /**\n   * 1. If the entire `push` fails, we send the error to relevant clients.\n   * 2. If the push succeeds, we look for any mutation failure that should cause the connection to terminate\n   *  and terminate the connection for those clients.\n   */\n  #fanOutResponses(response: PushResponse) {\n    const connectionTerminations: (() => void)[] = [];\n\n    // if the entire push failed, send that to the client.\n    if ('kind' in response || 'error' in response) {\n      this.#lc.warn?.(\n        'The server behind ZERO_MUTATE_URL returned a push error.',\n        response,\n      );\n      const groupedMutationIDs = groupBy(\n        response.mutationIDs ?? [],\n        m => m.clientID,\n      );\n      for (const [clientID, mutationIDs] of groupedMutationIDs) {\n        const client = this.#clients.get(clientID);\n        if (!client) {\n          continue;\n        }\n\n        // We do not resolve mutations on the client if the push fails\n        // as those mutations will be retried.\n        if ('error' in response) {\n          // This error code path will eventually be removed when we\n          // no longer support the legacy push error format.\n          const pushFailedBody: PushFailedBody =\n            response.error === 'http'\n              ? {\n                  kind: ErrorKind.PushFailed,\n                  origin: ErrorOrigin.ZeroCache,\n                  reason: ErrorReason.HTTP,\n                  status: response.status,\n                  bodyPreview: response.details,\n                  mutationIDs,\n                  message: `Fetch from API server returned non-OK status ${response.status}`,\n                }\n              : response.error === 'unsupportedPushVersion'\n                ? {\n                    kind: ErrorKind.PushFailed,\n                    origin: ErrorOrigin.Server,\n                    reason: ErrorReason.UnsupportedPushVersion,\n                    mutationIDs,\n                    message: `Unsupported push version`,\n                  }\n                : {\n                    kind: ErrorKind.PushFailed,\n                    origin: ErrorOrigin.Server,\n                    reason: ErrorReason.Internal,\n                    mutationIDs,\n                    message:\n                      response.error === 'zeroPusher'\n                        ? response.details\n                        : response.error === 'unsupportedSchemaVersion'\n                          ? 'Unsupported schema version'\n                          : 'An unknown error occurred while pushing to the API server',\n                  };\n\n          this.#failDownstream(client.downstream, pushFailedBody);\n        } else if ('kind' in response) {\n          this.#failDownstream(client.downstream, response);\n        } else {\n          unreachable(response);\n        }\n      }\n    } else {\n      // Look for mutations results that should cause us to terminate the connection\n      const groupedMutations = groupBy(response.mutations, m => m.id.clientID);\n      for (const [clientID, mutations] of groupedMutations) {\n        const client = this.#clients.get(clientID);\n        if (!client) {\n          continue;\n        }\n\n        let failure: PushFailedBody | undefined;\n        let i = 0;\n        for (; i < mutations.length; i++) {\n          const m = mutations[i];\n          if ('error' in m.result) {\n            this.#lc.warn?.(\n              'The server behind ZERO_MUTATE_URL returned a mutation error.',\n              m.result,\n            );\n          }\n          // This error code path will eventually be removed,\n          // keeping this for backwards compatibility, but the server\n          // should now return a PushFailedBody with the mutationIDs\n          if ('error' in m.result && m.result.error === 'oooMutation') {\n            failure = {\n              kind: ErrorKind.PushFailed,\n              origin: ErrorOrigin.Server,\n              reason: ErrorReason.OutOfOrderMutation,\n              message: 'mutation was out of order',\n              details: m.result.details,\n              mutationIDs: mutations.map(m => ({\n                clientID: m.id.clientID,\n                id: m.id.id,\n              })),\n            };\n            break;\n          }\n        }\n\n        if (failure && i < mutations.length - 1) {\n          this.#lc.warn?.(\n            'push-response contains mutations after a mutation which should fatal the connection',\n          );\n        }\n\n        if (failure) {\n          connectionTerminations.push(() =>\n            this.#failDownstream(client.downstream, failure),\n          );\n        }\n      }\n    }\n\n    connectionTerminations.forEach(cb => cb());\n  }\n\n  async #processPush(entry: PusherEntry): Promise<PushResponse> {\n    this.#customMutations.add(entry.push.mutations.length, {\n      clientGroupID: entry.push.clientGroupID,\n    });\n    this.#pushes.add(1, {\n      clientGroupID: entry.push.clientGroupID,\n    });\n\n    // Record custom mutations for telemetry\n    recordMutation('custom', entry.push.mutations.length);\n\n    const url =\n      this.#userPushURL ??\n      must(this.#pushURLs[0], 'ZERO_MUTATE_URL is not set');\n\n    this.#lc.debug?.(\n      'pushing to',\n      url,\n      'with',\n      entry.push.mutations.length,\n      'mutations',\n    );\n\n    let mutationIDs: MutationID[] = [];\n\n    try {\n      mutationIDs = entry.push.mutations.map(m => ({\n        id: m.id,\n        clientID: m.clientID,\n      }));\n\n      return await fetchFromAPIServer(\n        pushResponseSchema,\n        'push',\n        this.#lc,\n        url,\n        url === this.#userPushURL,\n        this.#pushURLPatterns,\n        {\n          appID: this.#config.app.id,\n          shardNum: this.#config.shard.num,\n        },\n        {\n          apiKey: this.#apiKey,\n          token: entry.auth,\n          cookie: entry.httpCookie,\n        },\n        entry.push,\n      );\n    } catch (e) {\n      if (isProtocolError(e) && e.errorBody.kind === ErrorKind.PushFailed) {\n        return {\n          ...e.errorBody,\n          mutationIDs,\n        } as const satisfies PushFailedBody;\n      }\n\n      return {\n        kind: ErrorKind.PushFailed,\n        origin: ErrorOrigin.ZeroCache,\n        reason: ErrorReason.Internal,\n        message: `Failed to push: ${getErrorMessage(e)}`,\n        mutationIDs,\n      } as const satisfies PushFailedBody;\n    }\n  }\n\n  #failDownstream(\n    downstream: Subscription<Downstream>,\n    errorBody: PushFailedBody,\n  ): void {\n    const logLevel = errorBody.origin === ErrorOrigin.Server ? 'warn' : 'error';\n    downstream.fail(new ProtocolErrorWithLevel(errorBody, logLevel));\n  }\n}\n\n/**\n * Pushes for different clientIDs could theoretically be interleaved.\n *\n * In order to do efficient batching to the user's API server,\n * we collect all pushes for the same clientID into a single push.\n */\nexport function combinePushes(\n  entries: readonly (PusherEntryOrStop | undefined)[],\n): [PusherEntry[], boolean] {\n  const pushesByClientID = new Map<string, PusherEntry[]>();\n\n  function collect() {\n    const ret: PusherEntry[] = [];\n    for (const entries of pushesByClientID.values()) {\n      const composite: PusherEntry = {\n        ...entries[0],\n        push: {\n          ...entries[0].push,\n          mutations: [],\n        },\n      };\n      ret.push(composite);\n      for (const entry of entries) {\n        assertAreCompatiblePushes(composite, entry);\n        composite.push.mutations.push(...entry.push.mutations);\n      }\n    }\n    return ret;\n  }\n\n  for (const entry of entries) {\n    if (entry === 'stop' || entry === undefined) {\n      return [collect(), true];\n    }\n\n    const {clientID} = entry;\n    const existing = pushesByClientID.get(clientID);\n    if (existing) {\n      existing.push(entry);\n    } else {\n      pushesByClientID.set(clientID, [entry]);\n    }\n  }\n\n  return [collect(), false] as const;\n}\n\n// These invariants should always be true for a given clientID.\n// If they are not, we have a bug in the code somewhere.\nfunction assertAreCompatiblePushes(left: PusherEntry, right: PusherEntry) {\n  assert(\n    left.clientID === right.clientID,\n    'clientID must be the same for all pushes',\n  );\n  assert(\n    left.auth === right.auth,\n    'auth must be the same for all pushes with the same clientID',\n  );\n  assert(\n    left.push.schemaVersion === right.push.schemaVersion,\n    'schemaVersion must be the same for all pushes with the same clientID',\n  );\n  assert(\n    left.push.pushVersion === right.push.pushVersion,\n    'pushVersion must be the same for all pushes with the same clientID',\n  );\n  assert(\n    left.httpCookie === right.httpCookie,\n    'httpCookie must be the same for all pushes with the same clientID',\n  );\n}\n"],"names":["ErrorKind.PushFailed","ErrorOrigin.ZeroCache","ErrorReason.HTTP","ErrorOrigin.Server","ErrorReason.UnsupportedPushVersion","ErrorReason.Internal","ErrorReason.OutOfOrderMutation","m","entries"],"mappings":"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"}
+{"version":3,"file":"pusher.js","sources":["../../../../../../zero-cache/src/services/mutagen/pusher.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {groupBy} from '../../../../shared/src/arrays.ts';\nimport {assert, unreachable} from '../../../../shared/src/asserts.ts';\nimport {getErrorMessage} from '../../../../shared/src/error.ts';\nimport {must} from '../../../../shared/src/must.ts';\nimport {Queue} from '../../../../shared/src/queue.ts';\nimport type {Downstream} from '../../../../zero-protocol/src/down.ts';\nimport {ErrorKind} from '../../../../zero-protocol/src/error-kind.ts';\nimport {ErrorOrigin} from '../../../../zero-protocol/src/error-origin.ts';\nimport {ErrorReason} from '../../../../zero-protocol/src/error-reason.ts';\nimport {\n  isProtocolError,\n  type PushFailedBody,\n} from '../../../../zero-protocol/src/error.ts';\nimport {\n  pushResponseSchema,\n  type MutationID,\n  type PushBody,\n  type PushResponse,\n} from '../../../../zero-protocol/src/push.ts';\nimport {type ZeroConfig} from '../../config/zero-config.ts';\nimport {compileUrlPattern, fetchFromAPIServer} from '../../custom/fetch.ts';\nimport {getOrCreateCounter} from '../../observability/metrics.ts';\nimport {recordMutation} from '../../server/anonymous-otel-start.ts';\nimport {ProtocolErrorWithLevel} from '../../types/error-with-level.ts';\nimport type {PostgresDB} from '../../types/pg.ts';\nimport {upstreamSchema} from '../../types/shards.ts';\nimport type {Source} from '../../types/streams.ts';\nimport {Subscription} from '../../types/subscription.ts';\nimport type {HandlerResult, StreamResult} from '../../workers/connection.ts';\nimport type {RefCountedService, Service} from '../service.ts';\n\nexport interface Pusher extends RefCountedService {\n  readonly pushURL: string | undefined;\n\n  initConnection(\n    clientID: string,\n    wsID: string,\n    userPushURL: string | undefined,\n    userPushHeaders: Record<string, string> | undefined,\n  ): Source<Downstream>;\n  enqueuePush(\n    clientID: string,\n    push: PushBody,\n    auth: string | undefined,\n    httpCookie: string | undefined,\n  ): HandlerResult;\n  ackMutationResponses(upToID: MutationID): Promise<void>;\n}\n\ntype Config = Pick<ZeroConfig, 'app' | 'shard'>;\n\n/**\n * Receives push messages from zero-client and forwards\n * them the the user's API server.\n *\n * If the user's API server is taking too long to process\n * the push, the PusherService will add the push to a queue\n * and send pushes in bulk the next time the user's API server\n * is available.\n *\n * - One PusherService exists per client group.\n * - Mutations for a given client are always sent in-order\n * - Mutations for different clients in the same group may be interleaved\n */\nexport class PusherService implements Service, Pusher {\n  readonly id: string;\n  readonly #pusher: PushWorker;\n  readonly #queue: Queue<PusherEntryOrStop>;\n  readonly #pushConfig: ZeroConfig['push'] & {url: string[]};\n  readonly #upstream: PostgresDB;\n  readonly #config: Config;\n  #stopped: Promise<void> | undefined;\n  #refCount = 0;\n  #isStopped = false;\n\n  constructor(\n    upstream: PostgresDB,\n    appConfig: Config,\n    pushConfig: ZeroConfig['push'] & {url: string[]},\n    lc: LogContext,\n    clientGroupID: string,\n  ) {\n    this.#config = appConfig;\n    this.#upstream = upstream;\n    this.#queue = new Queue();\n    this.#pusher = new PushWorker(\n      appConfig,\n      lc,\n      pushConfig.url,\n      pushConfig.apiKey,\n      this.#queue,\n    );\n    this.id = clientGroupID;\n    this.#pushConfig = pushConfig;\n  }\n\n  get pushURL(): string | undefined {\n    return this.#pusher.pushURL[0];\n  }\n\n  initConnection(\n    clientID: string,\n    wsID: string,\n    userPushURL: string | undefined,\n    userPushHeaders: Record<string, string> | undefined,\n  ) {\n    return this.#pusher.initConnection(\n      clientID,\n      wsID,\n      userPushURL,\n      userPushHeaders,\n    );\n  }\n\n  enqueuePush(\n    clientID: string,\n    push: PushBody,\n    auth: string | undefined,\n    httpCookie: string | undefined,\n  ): Exclude<HandlerResult, StreamResult> {\n    if (!this.#pushConfig.forwardCookies) {\n      httpCookie = undefined; // remove cookies if not forwarded\n    }\n    this.#queue.enqueue({push, auth, clientID, httpCookie});\n\n    return {\n      type: 'ok',\n    };\n  }\n\n  async ackMutationResponses(upToID: MutationID) {\n    // delete the relevant rows from the `mutations` table\n    const sql = this.#upstream;\n    await sql`DELETE FROM ${sql(\n      upstreamSchema({\n        appID: this.#config.app.id,\n        shardNum: this.#config.shard.num,\n      }),\n    )}.mutations WHERE \"clientGroupID\" = ${this.id} AND \"clientID\" = ${upToID.clientID} AND \"mutationID\" <= ${upToID.id}`;\n  }\n\n  ref() {\n    assert(!this.#isStopped, 'PusherService is already stopped');\n    ++this.#refCount;\n  }\n\n  unref() {\n    assert(!this.#isStopped, 'PusherService is already stopped');\n    --this.#refCount;\n    if (this.#refCount <= 0) {\n      void this.stop();\n    }\n  }\n\n  hasRefs(): boolean {\n    return this.#refCount > 0;\n  }\n\n  run(): Promise<void> {\n    this.#stopped = this.#pusher.run();\n    return this.#stopped;\n  }\n\n  stop(): Promise<void> {\n    if (this.#isStopped) {\n      return must(this.#stopped, 'Stop was called before `run`');\n    }\n    this.#isStopped = true;\n    this.#queue.enqueue('stop');\n    return must(this.#stopped, 'Stop was called before `run`');\n  }\n}\n\ntype PusherEntry = {\n  push: PushBody;\n  auth: string | undefined;\n  httpCookie: string | undefined;\n  clientID: string;\n};\ntype PusherEntryOrStop = PusherEntry | 'stop';\n\n/**\n * Awaits items in the queue then drains and sends them all\n * to the user's API server.\n */\nclass PushWorker {\n  readonly #pushURLs: string[];\n  readonly #pushURLPatterns: URLPattern[];\n  readonly #apiKey: string | undefined;\n  readonly #queue: Queue<PusherEntryOrStop>;\n  readonly #lc: LogContext;\n  readonly #config: Config;\n  readonly #clients: Map<\n    string,\n    {\n      wsID: string;\n      downstream: Subscription<Downstream>;\n    }\n  >;\n  #userPushURL?: string | undefined;\n  #userPushHeaders?: Record<string, string> | undefined;\n\n  readonly #customMutations = getOrCreateCounter(\n    'mutation',\n    'custom',\n    'Number of custom mutations processed',\n  );\n  readonly #pushes = getOrCreateCounter(\n    'mutation',\n    'pushes',\n    'Number of pushes processed by the pusher',\n  );\n\n  constructor(\n    config: Config,\n    lc: LogContext,\n    pushURL: string[],\n    apiKey: string | undefined,\n    queue: Queue<PusherEntryOrStop>,\n  ) {\n    this.#pushURLs = pushURL;\n    this.#lc = lc.withContext('component', 'pusher');\n    this.#pushURLPatterns = pushURL.map(compileUrlPattern);\n    this.#apiKey = apiKey;\n    this.#queue = queue;\n    this.#config = config;\n    this.#clients = new Map();\n  }\n\n  get pushURL() {\n    return this.#pushURLs;\n  }\n\n  /**\n   * Returns a new downstream stream if the clientID,wsID pair has not been seen before.\n   * If a clientID already exists with a different wsID, that client's downstream is cancelled.\n   */\n  initConnection(\n    clientID: string,\n    wsID: string,\n    userPushURL: string | undefined,\n    userPushHeaders: Record<string, string> | undefined,\n  ) {\n    const existing = this.#clients.get(clientID);\n    if (existing && existing.wsID === wsID) {\n      // already initialized for this socket\n      throw new Error('Connection was already initialized');\n    }\n\n    // client is back on a new connection\n    if (existing) {\n      existing.downstream.cancel();\n    }\n\n    // Handle client group level URL parameters\n    if (this.#userPushURL === undefined) {\n      // First client in the group - store its URL and headers\n      this.#userPushURL = userPushURL;\n      this.#userPushHeaders = userPushHeaders;\n    } else {\n      // Validate that subsequent clients have compatible parameters\n      if (this.#userPushURL !== userPushURL) {\n        this.#lc.warn?.(\n          'Client provided different mutate parameters than client group',\n          {\n            clientID,\n            clientURL: userPushURL,\n            clientGroupURL: this.#userPushURL,\n          },\n        );\n      }\n    }\n\n    const downstream = Subscription.create<Downstream>({\n      cleanup: () => {\n        this.#clients.delete(clientID);\n      },\n    });\n    this.#clients.set(clientID, {wsID, downstream});\n    return downstream;\n  }\n\n  async run() {\n    for (;;) {\n      const task = await this.#queue.dequeue();\n      const rest = this.#queue.drain();\n      const [pushes, terminate] = combinePushes([task, ...rest]);\n      for (const push of pushes) {\n        const response = await this.#processPush(push);\n        await this.#fanOutResponses(response);\n      }\n\n      if (terminate) {\n        break;\n      }\n    }\n  }\n\n  /**\n   * 1. If the entire `push` fails, we send the error to relevant clients.\n   * 2. If the push succeeds, we look for any mutation failure that should cause the connection to terminate\n   *  and terminate the connection for those clients.\n   */\n  #fanOutResponses(response: PushResponse) {\n    const connectionTerminations: (() => void)[] = [];\n\n    // if the entire push failed, send that to the client.\n    if ('kind' in response || 'error' in response) {\n      this.#lc.warn?.(\n        'The server behind ZERO_MUTATE_URL returned a push error.',\n        response,\n      );\n      const groupedMutationIDs = groupBy(\n        response.mutationIDs ?? [],\n        m => m.clientID,\n      );\n      for (const [clientID, mutationIDs] of groupedMutationIDs) {\n        const client = this.#clients.get(clientID);\n        if (!client) {\n          continue;\n        }\n\n        // We do not resolve mutations on the client if the push fails\n        // as those mutations will be retried.\n        if ('error' in response) {\n          // This error code path will eventually be removed when we\n          // no longer support the legacy push error format.\n          const pushFailedBody: PushFailedBody =\n            response.error === 'http'\n              ? {\n                  kind: ErrorKind.PushFailed,\n                  origin: ErrorOrigin.ZeroCache,\n                  reason: ErrorReason.HTTP,\n                  status: response.status,\n                  bodyPreview: response.details,\n                  mutationIDs,\n                  message: `Fetch from API server returned non-OK status ${response.status}`,\n                }\n              : response.error === 'unsupportedPushVersion'\n                ? {\n                    kind: ErrorKind.PushFailed,\n                    origin: ErrorOrigin.Server,\n                    reason: ErrorReason.UnsupportedPushVersion,\n                    mutationIDs,\n                    message: `Unsupported push version`,\n                  }\n                : {\n                    kind: ErrorKind.PushFailed,\n                    origin: ErrorOrigin.Server,\n                    reason: ErrorReason.Internal,\n                    mutationIDs,\n                    message:\n                      response.error === 'zeroPusher'\n                        ? response.details\n                        : response.error === 'unsupportedSchemaVersion'\n                          ? 'Unsupported schema version'\n                          : 'An unknown error occurred while pushing to the API server',\n                  };\n\n          this.#failDownstream(client.downstream, pushFailedBody);\n        } else if ('kind' in response) {\n          this.#failDownstream(client.downstream, response);\n        } else {\n          unreachable(response);\n        }\n      }\n    } else {\n      // Look for mutations results that should cause us to terminate the connection\n      const groupedMutations = groupBy(response.mutations, m => m.id.clientID);\n      for (const [clientID, mutations] of groupedMutations) {\n        const client = this.#clients.get(clientID);\n        if (!client) {\n          continue;\n        }\n\n        let failure: PushFailedBody | undefined;\n        let i = 0;\n        for (; i < mutations.length; i++) {\n          const m = mutations[i];\n          if ('error' in m.result) {\n            this.#lc.warn?.(\n              'The server behind ZERO_MUTATE_URL returned a mutation error.',\n              m.result,\n            );\n          }\n          // This error code path will eventually be removed,\n          // keeping this for backwards compatibility, but the server\n          // should now return a PushFailedBody with the mutationIDs\n          if ('error' in m.result && m.result.error === 'oooMutation') {\n            failure = {\n              kind: ErrorKind.PushFailed,\n              origin: ErrorOrigin.Server,\n              reason: ErrorReason.OutOfOrderMutation,\n              message: 'mutation was out of order',\n              details: m.result.details,\n              mutationIDs: mutations.map(m => ({\n                clientID: m.id.clientID,\n                id: m.id.id,\n              })),\n            };\n            break;\n          }\n        }\n\n        if (failure && i < mutations.length - 1) {\n          this.#lc.warn?.(\n            'push-response contains mutations after a mutation which should fatal the connection',\n          );\n        }\n\n        if (failure) {\n          connectionTerminations.push(() =>\n            this.#failDownstream(client.downstream, failure),\n          );\n        }\n      }\n    }\n\n    connectionTerminations.forEach(cb => cb());\n  }\n\n  async #processPush(entry: PusherEntry): Promise<PushResponse> {\n    this.#customMutations.add(entry.push.mutations.length, {\n      clientGroupID: entry.push.clientGroupID,\n    });\n    this.#pushes.add(1, {\n      clientGroupID: entry.push.clientGroupID,\n    });\n\n    // Record custom mutations for telemetry\n    recordMutation('custom', entry.push.mutations.length);\n\n    const url =\n      this.#userPushURL ??\n      must(this.#pushURLs[0], 'ZERO_MUTATE_URL is not set');\n\n    this.#lc.debug?.(\n      'pushing to',\n      url,\n      'with',\n      entry.push.mutations.length,\n      'mutations',\n    );\n\n    let mutationIDs: MutationID[] = [];\n\n    try {\n      mutationIDs = entry.push.mutations.map(m => ({\n        id: m.id,\n        clientID: m.clientID,\n      }));\n\n      return await fetchFromAPIServer(\n        pushResponseSchema,\n        'push',\n        this.#lc,\n        url,\n        url === this.#userPushURL,\n        this.#pushURLPatterns,\n        {\n          appID: this.#config.app.id,\n          shardNum: this.#config.shard.num,\n        },\n        {\n          apiKey: this.#apiKey,\n          customHeaders: this.#userPushHeaders,\n          token: entry.auth,\n          cookie: entry.httpCookie,\n        },\n        entry.push,\n      );\n    } catch (e) {\n      if (isProtocolError(e) && e.errorBody.kind === ErrorKind.PushFailed) {\n        return {\n          ...e.errorBody,\n          mutationIDs,\n        } as const satisfies PushFailedBody;\n      }\n\n      return {\n        kind: ErrorKind.PushFailed,\n        origin: ErrorOrigin.ZeroCache,\n        reason: ErrorReason.Internal,\n        message: `Failed to push: ${getErrorMessage(e)}`,\n        mutationIDs,\n      } as const satisfies PushFailedBody;\n    }\n  }\n\n  #failDownstream(\n    downstream: Subscription<Downstream>,\n    errorBody: PushFailedBody,\n  ): void {\n    const logLevel = errorBody.origin === ErrorOrigin.Server ? 'warn' : 'error';\n    downstream.fail(new ProtocolErrorWithLevel(errorBody, logLevel));\n  }\n}\n\n/**\n * Pushes for different clientIDs could theoretically be interleaved.\n *\n * In order to do efficient batching to the user's API server,\n * we collect all pushes for the same clientID into a single push.\n */\nexport function combinePushes(\n  entries: readonly (PusherEntryOrStop | undefined)[],\n): [PusherEntry[], boolean] {\n  const pushesByClientID = new Map<string, PusherEntry[]>();\n\n  function collect() {\n    const ret: PusherEntry[] = [];\n    for (const entries of pushesByClientID.values()) {\n      const composite: PusherEntry = {\n        ...entries[0],\n        push: {\n          ...entries[0].push,\n          mutations: [],\n        },\n      };\n      ret.push(composite);\n      for (const entry of entries) {\n        assertAreCompatiblePushes(composite, entry);\n        composite.push.mutations.push(...entry.push.mutations);\n      }\n    }\n    return ret;\n  }\n\n  for (const entry of entries) {\n    if (entry === 'stop' || entry === undefined) {\n      return [collect(), true];\n    }\n\n    const {clientID} = entry;\n    const existing = pushesByClientID.get(clientID);\n    if (existing) {\n      existing.push(entry);\n    } else {\n      pushesByClientID.set(clientID, [entry]);\n    }\n  }\n\n  return [collect(), false] as const;\n}\n\n// These invariants should always be true for a given clientID.\n// If they are not, we have a bug in the code somewhere.\nfunction assertAreCompatiblePushes(left: PusherEntry, right: PusherEntry) {\n  assert(\n    left.clientID === right.clientID,\n    'clientID must be the same for all pushes',\n  );\n  assert(\n    left.auth === right.auth,\n    'auth must be the same for all pushes with the same clientID',\n  );\n  assert(\n    left.push.schemaVersion === right.push.schemaVersion,\n    'schemaVersion must be the same for all pushes with the same clientID',\n  );\n  assert(\n    left.push.pushVersion === right.push.pushVersion,\n    'pushVersion must be the same for all pushes with the same clientID',\n  );\n  assert(\n    left.httpCookie === right.httpCookie,\n    'httpCookie must be the same for all pushes with the same clientID',\n  );\n}\n"],"names":["ErrorKind.PushFailed","ErrorOrigin.ZeroCache","ErrorReason.HTTP","ErrorOrigin.Server","ErrorReason.UnsupportedPushVersion","ErrorReason.Internal","ErrorReason.OutOfOrderMutation","m","entries"],"mappings":"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"}

package/out/zero-cache/src/services/view-syncer/view-syncer.d.ts

@@ -55,6 +55,7 @@ export declare class ViewSyncerService implements ViewSyncer, ActivityBasedServi
     #private;
     readonly id: string;
     userQueryURL?: string | undefined;
+    userQueryHeaders?: Record<string, string> | undefined;
     constructor(config: NormalizedZeroConfig, lc: LogContext, shard: ShardID, taskID: string, clientGroupID: string, cvrDb: PostgresDB, upstreamDb: PostgresDB | undefined, pipelineDriver: PipelineDriver, versionChanges: Subscription<ReplicaState>, drainCoordinator: DrainCoordinator, slowHydrateThreshold: number, inspectorDelegate: InspectorDelegate, customQueryTransformer: CustomQueryTransformer | undefined, keepaliveMs?: number, setTimeoutFn?: SetTimeout);
     readyState(): Promise<'initialized' | 'draining'>;
     run(): Promise<void>;

package/out/zero-cache/src/services/view-syncer/view-syncer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-syncer.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/view-syncer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"view-syncer.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/view-syncer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,MAAM,CAAC;AAcrC,OAAO,KAAK,EAAC,2BAA2B,EAAC,MAAM,yDAAyD,CAAC;AACzG,OAAO,KAAK,EAEV,qBAAqB,EACtB,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,iDAAiD,CAAC;AAC1F,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,uCAAuC,CAAC;AAOtE,OAAO,KAAK,EAEV,gBAAgB,EACjB,MAAM,6CAA6C,CAAC;AAMrD,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAEpE,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,yCAAyC,CAAC;AAOpF,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,oCAAoC,CAAC;AAK1E,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAElD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAE9D,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAiBxD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AAE7D,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;AAuBzD,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,kBAAkB;IAClB,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC,CAAC;AAMF,MAAM,WAAW,UAAU;IACzB,cAAc,CACZ,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,qBAAqB,GACzB,MAAM,CAAC,UAAU,CAAC,CAAC;IAEtB,oBAAoB,CAClB,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,2BAA2B,GAC/B,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrE;AAQD,KAAK,UAAU,GAAG,CAChB,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,EAChC,KAAK,CAAC,EAAE,MAAM,KACX,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;AAEnC;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,QAAS,CAAC;AAEzC;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC,qBAAa,iBAAkB,YAAW,UAAU,EAAE,oBAAoB;;IACxE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAUpB,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;gBAoHpD,MAAM,EAAE,oBAAoB,EAC5B,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,UAAU,EACjB,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,YAAY,CAAC,YAAY,CAAC,EAC1C,gBAAgB,EAAE,gBAAgB,EAClC,oBAAoB,EAAE,MAAM,EAC5B,iBAAiB,EAAE,iBAAiB,EACpC,sBAAsB,EAAE,sBAAsB,GAAG,SAAS,EAC1D,WAAW,SAAuB,EAClC,YAAY,GAAE,UAAwC;IA4FxD,UAAU,IAAI,OAAO,CAAC,aAAa,GAAG,UAAU,CAAC;IAO3C,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAiH1B;;;;;;;;OAQG;IACH,SAAS,IAAI,OAAO;IAwEpB,cAAc,CACZ,GAAG,EAAE,WAAW,EAChB,qBAAqB,EAAE,qBAAqB,GAC3C,MAAM,CAAC,UAAU,CAAC;IAwHf,oBAAoB,CACxB,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,2BAA2B,GAC/B,OAAO,CAAC,IAAI,CAAC;IAIV,aAAa,CACjB,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,oBAAoB,GACxB,OAAO,CAAC,IAAI,CAAC;IAyuChB,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BnE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBrB;;;OAGG;IACH,eAAe;CAGhB;AAuED,wBAAgB,SAAS,CACvB,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,SAAS,GAAG,SAAS,EACpC,QAAQ,EAAE,SAAS,GAAG,SAAS,yBAkDhC;AAyCD,qBAAa,cAAc;;IAInB,KAAK;IAOX,oBAAoB;IAMd,YAAY,CAAC,cAAc,CAAC,EAAE,MAAM;IAW1C,UAAU;IAWV,sCAAsC;IACtC,IAAI,IAAI,MAAM;IAKd;;;OAGG;IACH,YAAY,IAAI,MAAM;CAKvB"}

package/out/zero-cache/src/services/view-syncer/view-syncer.js

@@ -58,6 +58,7 @@ class ViewSyncerService {
   #slowHydrateThreshold;
   #queryConfig;
   userQueryURL;
+  userQueryHeaders;
   // The ViewSyncerService is only started in response to a connection,
   // so #lastConnectTime is always initialized to now(). This is necessary
   // to handle race conditions in which, e.g. the replica is ready and the
@@ -185,6 +186,7 @@ class ViewSyncerService {
   #getHeaderOptions(forwardCookie) {
     return {
       apiKey: this.#queryConfig.apiKey,
+      customHeaders: this.userQueryHeaders,
       token: this.#authData?.raw,
       cookie: forwardCookie ? this.#httpCookie : void 0
     };
@@ -388,9 +390,10 @@ class ViewSyncerService {
         `Picked auth token: ${JSON.stringify(this.#authData?.decoded)}`
       );
       this.#httpCookie = httpCookie;
-      const [, { userQueryURL }] = initConnectionMessage;
+      const [, { userQueryURL, userQueryHeaders }] = initConnectionMessage;
       if (this.userQueryURL === void 0) {
         this.userQueryURL = userQueryURL;
+        this.userQueryHeaders = userQueryHeaders;
       } else {
         if (this.userQueryURL !== userQueryURL) {
           this.#lc.warn?.(