@lgriffin/esi.ts 10.0.0 → 10.2.1

package/dist/index.mjs

@@ -9,39 +9,6 @@ import {
   isSsoError,
   isTokenRevoked
 } from "./chunk-R7D7M2LQ.mjs";
-import {
-  CircuitBreaker,
-  CircuitOpenError,
-  EsiError,
-  EsiValidationError,
-  TimeoutError,
-  buildError,
-  createDefaultLogger,
-  getLogger,
-  isCircuitOpen,
-  isEsiError,
-  isForbidden,
-  isNotFound,
-  isRateLimited,
-  isRetryable,
-  isServerError,
-  isTimeout,
-  isUnauthorized,
-  isValidationError,
-  logDebug,
-  logDebug2,
-  logError,
-  logError2,
-  logFatal,
-  logInfo,
-  logInfo2,
-  logTrace,
-  logWarn,
-  logWarn2,
-  sanitizeUrl,
-  setLogger,
-  toPinoLogger
-} from "./chunk-7A72QFDF.mjs";
 import {
   AccessListSchema,
   AgentResearchSchema,
@@ -207,6 +174,39 @@ import {
   WarSchema,
   schemas_exports
 } from "./chunk-VZS32UQ3.mjs";
+import {
+  CircuitBreaker,
+  CircuitOpenError,
+  EsiError,
+  EsiValidationError,
+  TimeoutError,
+  buildError,
+  createDefaultLogger,
+  getLogger,
+  isCircuitOpen,
+  isEsiError,
+  isForbidden,
+  isNotFound,
+  isRateLimited,
+  isRetryable,
+  isServerError,
+  isTimeout,
+  isUnauthorized,
+  isValidationError,
+  logDebug,
+  logDebug2,
+  logError,
+  logError2,
+  logFatal,
+  logInfo,
+  logInfo2,
+  logTrace,
+  logWarn,
+  logWarn2,
+  sanitizeUrl,
+  setLogger,
+  toPinoLogger
+} from "./chunk-4W66ONJI.mjs";
 import "./chunk-JIW4BXLP.mjs";
 
 // src/core/middleware/Middleware.ts
@@ -428,17 +428,23 @@ var ApiClient = class {
 
 // src/core/cache/cacheKey.ts
 import { createHash } from "crypto";
-function buildCacheKey(url, client, requiresAuth = false) {
-  if (!requiresAuth) return url;
+function scopeToIdentity(key, client, requiresAuth) {
+  if (!requiresAuth) return key;
   const authHeader = client.getAuthorizationHeader();
-  if (!authHeader) return url;
+  if (!authHeader) return key;
   const hash = createHash("sha256").update(authHeader).digest("hex").slice(0, 16);
-  return `${hash}:${url}`;
+  return `${hash}:${key}`;
+}
+function buildCacheKey(url, client, requiresAuth = false) {
+  return scopeToIdentity(url, client, requiresAuth);
+}
+function buildDedupeKey(endpoint, client, requiresAuth = false) {
+  return scopeToIdentity(endpoint, client, requiresAuth);
 }
 
 // src/core/constants.ts
 var PACKAGE_NAME = "esi.ts";
-var PACKAGE_VERSION = "10.0.0";
+var PACKAGE_VERSION = "10.2.1";
 var USER_AGENT = `${PACKAGE_NAME}/${PACKAGE_VERSION}`;
 var COMPATIBILITY_DATE = "2026-05-19";
 
@@ -503,6 +509,8 @@ var esiCacheTtls = {
   "GET:alliances/{alliance_id}/contacts/labels": 300,
   "GET:alliances/{alliance_id}/corporations": 3600,
   "GET:characters/{character_id}": 86400,
+  "GET:characters/{character_id}/access-lists": 300,
+  "GET:characters/{character_id}/access-lists/{access_list_id}": 300,
   "GET:characters/{character_id}/agents_research": 3600,
   "GET:characters/{character_id}/assets": 3600,
   "GET:characters/{character_id}/attributes": 120,
@@ -533,6 +541,8 @@ var esiCacheTtls = {
   "GET:characters/{character_id}/mail/labels": 30,
   "GET:characters/{character_id}/mail/lists": 120,
   "GET:characters/{character_id}/medals": 3600,
+  "GET:characters/{character_id}/mercenary-tactical-operations": 300,
+  "GET:characters/{character_id}/mercenary-tactical-operations/{operation_id}": 300,
   "GET:characters/{character_id}/mining": 600,
   "GET:characters/{character_id}/notifications": 600,
   "GET:characters/{character_id}/notifications/contacts": 600,
@@ -547,6 +557,8 @@ var esiCacheTtls = {
   "GET:characters/{character_id}/skillqueue": 60,
   "GET:characters/{character_id}/skills": 60,
   "GET:characters/{character_id}/standings": 3600,
+  "GET:characters/{character_id}/structures/mercenary-dens": 3600,
+  "GET:characters/{character_id}/structures/mercenary-dens/{mercenary_den_id}": 3600,
   "GET:characters/{character_id}/titles": 3600,
   "GET:characters/{character_id}/wallet": 120,
   "GET:characters/{character_id}/wallet/journal": 3600,
@@ -591,6 +603,10 @@ var esiCacheTtls = {
   "GET:corporations/{corporation_id}/starbases": 3600,
   "GET:corporations/{corporation_id}/starbases/{starbase_id}": 3600,
   "GET:corporations/{corporation_id}/structures": 3600,
+  "GET:corporations/{corporation_id}/structures/skyhooks": 3600,
+  "GET:corporations/{corporation_id}/structures/skyhooks/{skyhook_id}": 3600,
+  "GET:corporations/{corporation_id}/structures/sovereignty-hubs": 3600,
+  "GET:corporations/{corporation_id}/structures/sovereignty-hubs/{sovereignty_hub_id}": 3600,
   "GET:corporations/{corporation_id}/titles": 3600,
   "GET:corporations/{corporation_id}/wallets": 300,
   "GET:corporations/{corporation_id}/wallets/{division}/journal": 3600,
@@ -611,9 +627,9 @@ var esiCacheTtls = {
   "GET:markets/structures/{structure_id}": 300,
   "GET:meta/changelog": 600,
   "GET:meta/compatibility-dates": 600,
+  "GET:skyhooks/raidable": 300,
   "GET:sovereignty/campaigns": 5,
-  "GET:sovereignty/map": 3600,
-  "GET:sovereignty/structures": 120,
+  "GET:sovereignty/systems": 300,
   "GET:status": 30,
   "GET:universe/schematics/{schematic_id}": 3600,
   "GET:universe/structures": 3600,
@@ -662,6 +678,10 @@ function trySpecAwareCacheHit(client, url, method, templatePath, resolveCache2,
   }
   return null;
 }
+function hasCachedEntry(client, url, resolveCache2, requiresAuth = false) {
+  const cache = resolveCache2(client);
+  return !!cache && cache.has(buildCacheKey(url, client, requiresAuth));
+}
 function tryStaleCacheResponse(client, url, parsed, resolveCache2, requiresAuth = false) {
   const cache = resolveCache2(client);
   if (!cache) return null;
@@ -677,10 +697,40 @@ function tryStaleCacheResponse(client, url, parsed, resolveCache2, requiresAuth
     cacheHitType: "stale-on-error"
   };
 }
-function cacheResponse(client, url, method, endpoint, parsed, data, useETag, resolveCache2, templatePath, requiresAuth = false) {
+var RECENT_WRITES = 64;
+var writeLogs = /* @__PURE__ */ new WeakMap();
+function writeLogFor(cache) {
+  let log = writeLogs.get(cache);
+  if (!log) {
+    log = { generation: 0, recent: [] };
+    writeLogs.set(cache, log);
+  }
+  return log;
+}
+function currentWriteGeneration(client, resolveCache2) {
+  const cache = resolveCache2(client);
+  return cache ? writeLogFor(cache).generation : 0;
+}
+function invalidatedSince(cache, generation, key) {
+  const log = writeLogFor(cache);
+  if (log.generation === generation) return false;
+  if (log.generation - generation > log.recent.length) return true;
+  return log.recent.some(
+    (write) => write.generation > generation && key.includes(write.path)
+  );
+}
+function cacheResponse(client, url, method, endpoint, parsed, data, useETag, resolveCache2, templatePath, requiresAuth = false, sentAtWriteGeneration) {
   const cache = resolveCache2(client);
   if (useETag && method === "GET" && cache && parsed.etag) {
     const key = buildCacheKey(url, client, requiresAuth);
+    if (sentAtWriteGeneration !== void 0 && invalidatedSince(cache, sentAtWriteGeneration, key)) {
+      logDebug2(
+        client,
+        `Not caching ${url}: a write invalidated it while the request was in flight`,
+        { method }
+      );
+      return;
+    }
     const headerTtl = parseCacheControlTtl(parsed.raw);
     const specTtlMs = templatePath ? lookupSpecTtl(method, templatePath) : void 0;
     const freshnessTtl = specTtlMs ?? headerTtl;
@@ -710,9 +760,16 @@ function evictRejectedResponse(client, endpoint, requiresAuth, resolveCache2) {
   }
 }
 function invalidateAfterWrite(client, method, endpoint, resolveCache2) {
+  if (method === "GET") return;
+  const path2 = endpoint.split("?")[0];
+  client.getDeduplicator()?.detachByPath?.(path2);
   const cache = resolveCache2(client);
-  if (method !== "GET" && cache) {
-    cache.deleteByPath(endpoint.split("?")[0]);
+  if (cache) {
+    cache.deleteByPath(path2);
+    const log = writeLogFor(cache);
+    log.generation += 1;
+    log.recent.push({ generation: log.generation, path: path2 });
+    if (log.recent.length > RECENT_WRITES) log.recent.shift();
   }
 }
 
@@ -729,10 +786,14 @@ var STATUS_MESSAGES = {
   422: "Unprocessable Entity",
   429: "Too many requests",
   500: "Internal server error",
+  502: "Bad Gateway",
   503: "Service Unavailable",
   504: "Gateway Timeout",
   520: "Internal server error, did the request terminate too soon?"
 };
+function statusMessage(response) {
+  return STATUS_MESSAGES[response.status] || response.statusText || `HTTP ${response.status}`;
+}
 function handleEarlyStatus(client, status, url, parsed, useETag, resolveCache2, requiresAuth = false) {
   if (status === 201) {
     return { headers: parsed.raw, body: void 0, status: 201 };
@@ -751,7 +812,11 @@ function handleEarlyStatus(client, status, url, parsed, useETag, resolveCache2,
           status,
           cacheHitType: "etag-304"
         });
-        const headers = { ...cachedEntry.headers, ...parsed.raw };
+        const headers = {
+          ...cachedEntry.headers,
+          ...parsed.raw
+        };
+        if ("etag" in parsed.raw) headers["etag"] = cachedEntry.etag;
         cache.set(
           key,
           cachedEntry.etag,
@@ -790,8 +855,8 @@ async function readEsiErrorReason(response) {
   }
 }
 function handleErrorResponse(client, response, url, parsed, useETag, resolveCache2, requiresAuth = false, esiReason) {
-  const statusMessage = STATUS_MESSAGES[response.status] || response.statusText;
-  const errorMessage = esiReason ? `${statusMessage}: ${esiReason}` : statusMessage;
+  const text = statusMessage(response);
+  const errorMessage = esiReason ? `${text}: ${esiReason}` : text;
   if (response.status >= 500 && useETag) {
     const staleResult = tryStaleCacheResponse(
       client,
@@ -839,7 +904,7 @@ function wrapError(error, client) {
 
 // src/core/util/retry.ts
 function retryDelay(attempt, baseMs, maxMs) {
-  const exponential = baseMs * Math.pow(2, attempt);
+  const exponential = baseMs === 0 ? 0 : baseMs * Math.pow(2, attempt);
   const jitter = exponential * (0.75 + Math.random() * 0.5);
   return Math.min(jitter, maxMs);
 }
@@ -1045,7 +1110,7 @@ function handleCursorPagination(parsed, data) {
   };
   return { headers: parsed.raw, body: data, status: 200, cursors };
 }
-async function handleOffsetPagination(client, endpoint, method, requiresAuth, parsed, data, body, url, useETag, pageFetch, resolveCache2, templatePath) {
+async function handleOffsetPagination(client, endpoint, method, requiresAuth, parsed, data, body, url, useETag, pageFetch, resolveCache2, templatePath, sentAtWriteGeneration) {
   const totalPages = parsed.xPages;
   if (totalPages <= 1) {
     return { headers: parsed.raw, body: data, status: 200 };
@@ -1081,7 +1146,9 @@ async function handleOffsetPagination(client, endpoint, method, requiresAuth, pa
       allData,
       useETag,
       resolveCache2,
-      templatePath
+      templatePath,
+      requiresAuth,
+      sentAtWriteGeneration
     );
     return { headers: parsed.raw, body: allData, status: 200 };
   } catch (paginationError) {
@@ -1186,6 +1253,17 @@ function networkError(err, url) {
     { cause: err }
   );
 }
+async function bufferBody(response) {
+  if (typeof response.text !== "function") return;
+  const text = await response.text();
+  Object.defineProperties(response, {
+    text: { value: () => Promise.resolve(text), configurable: true },
+    json: {
+      value: () => Promise.resolve(text).then((t) => JSON.parse(t)),
+      configurable: true
+    }
+  });
+}
 async function executeSingleFetch(client, endpoint, method, body, requiresAuth, useETag, resolveCache2, resolveRateLimiter2, resolveCircuitBreaker2, requestTimeout, templatePath) {
   const rawUrl = `${client.getLink()}/${endpoint}`;
   const builtHeaders = buildRequestHeaders(
@@ -1226,6 +1304,7 @@ async function executeSingleFetch(client, endpoint, method, body, requiresAuth,
     let response;
     try {
       response = await client.getFetch()(url, options);
+      await bufferBody(response);
     } catch (err) {
       clearTimeout(timer);
       if (cb) {
@@ -1295,11 +1374,11 @@ async function fetchOnePage(client, endpoint, method, body, requiresAuth, useETa
     templatePath
   );
   if (!response.ok) {
-    const statusMessage = STATUS_MESSAGES[response.status] || response.statusText;
+    const text = statusMessage(response);
     const reason = await readEsiErrorReason(response);
     throw new EsiError(
       response.status,
-      reason ? `${statusMessage}: ${reason}` : statusMessage,
+      reason ? `${text}: ${reason}` : text,
       url,
       parsed.requestId ?? void 0
     );
@@ -1324,6 +1403,13 @@ var executeRequest = async (client, endpoint, method, body, requiresAuth = false
     );
   };
   try {
+    const writeGeneration = currentWriteGeneration(client, resolveCache);
+    const revalidating = useETag && method === "GET" && hasCachedEntry(
+      client,
+      `${client.getLink()}/${endpoint}`,
+      resolveCache,
+      requiresAuth
+    );
     const { response, parsed, url } = await executeSingleFetch(
       client,
       endpoint,
@@ -1349,6 +1435,18 @@ var executeRequest = async (client, endpoint, method, body, requiresAuth = false
       }
       return finish({ headers: parsed.raw, body: data2, status: 201 });
     }
+    if (response.status === 304 && revalidating && !hasCachedEntry(client, url, resolveCache, requiresAuth)) {
+      return await executeRequest(
+        client,
+        endpoint,
+        method,
+        body,
+        requiresAuth,
+        useETag,
+        requestTimeout,
+        templatePath
+      );
+    }
     const earlyResult = handleEarlyStatus(
       client,
       response.status,
@@ -1373,18 +1471,21 @@ var executeRequest = async (client, endpoint, method, body, requiresAuth = false
       return finish(staleOrThrow);
     }
     const data = await parseJsonBody(client, response, url);
-    cacheResponse(
-      client,
-      url,
-      method,
-      endpoint,
-      parsed,
-      data,
-      useETag,
-      resolveCache,
-      templatePath,
-      requiresAuth
-    );
+    if (parsed.xPages <= 1 || parsed.hasCursorPagination) {
+      cacheResponse(
+        client,
+        url,
+        method,
+        endpoint,
+        parsed,
+        data,
+        useETag,
+        resolveCache,
+        templatePath,
+        requiresAuth,
+        writeGeneration
+      );
+    }
     const cursorResult = handleCursorPagination(parsed, data);
     if (cursorResult) return finish(cursorResult);
     const pageFetch = async (paginatedEndpoint) => {
@@ -1415,7 +1516,8 @@ var executeRequest = async (client, endpoint, method, body, requiresAuth = false
       useETag,
       pageFetch,
       resolveCache,
-      templatePath
+      templatePath,
+      writeGeneration
     );
     return finish(paginatedResult);
   } catch (error) {
@@ -1452,24 +1554,26 @@ var handleSinglePageRequest = async (client, endpoint, method, body, requiresAut
 var handleRequest = async (client, endpoint, method, body, requiresAuth = false, useETag = true, templatePath, requestTimeout) => {
   const rawUrl = `${client.getLink()}/${endpoint}`;
   const startTime = Date.now();
-  const specHit = trySpecAwareCacheHit(
-    client,
-    rawUrl,
-    method,
-    templatePath,
-    resolveCache,
-    requiresAuth
-  );
-  if (specHit) {
-    return applyResponseInterceptors(
+  const specCacheHit = () => {
+    const hit = trySpecAwareCacheHit(
       client,
-      specHit,
+      rawUrl,
+      method,
+      templatePath,
+      resolveCache,
+      requiresAuth
+    );
+    return hit ? applyResponseInterceptors(
+      client,
+      hit,
       rawUrl,
       endpoint,
       method,
       startTime
-    );
-  }
+    ) : null;
+  };
+  const specHit = specCacheHit();
+  if (specHit) return specHit;
   const doExecute = () => executeRequest(
     client,
     endpoint,
@@ -1482,7 +1586,16 @@ var handleRequest = async (client, endpoint, method, body, requiresAuth = false,
   );
   const dedup = client.getDeduplicator();
   const canDedup = dedup && method === "GET" && !body;
-  const operation = () => canDedup ? dedup.dedupe(endpoint, doExecute) : doExecute();
+  let attempted = false;
+  const operation = () => {
+    const retryHit = attempted ? specCacheHit() : null;
+    attempted = true;
+    if (retryHit) return retryHit;
+    return canDedup ? dedup.dedupe(
+      buildDedupeKey(endpoint, client, requiresAuth),
+      doExecute
+    ) : doExecute();
+  };
   const retryStrategy = resolveRetryStrategy(client);
   return retryStrategy.execute(operation, {
     client,
@@ -1831,7 +1944,6 @@ async function fetchAllPages(client, endpoint, method, requiresAuth = false, bod
   );
   const totalPages = parseInt(firstResponse.headers["x-pages"] || "1", 10);
   const result = extractArray(firstBody);
-  if (totalPages <= 1) return result;
   const remaining = Array.from({ length: totalPages - 1 }, (_, i) => i + 2);
   for (let i = 0; i < remaining.length; i += concurrency) {
     const batch = remaining.slice(i, i + concurrency);
@@ -7680,6 +7792,8 @@ var ETagCacheManager = class {
 var esiRateLimitGroups = {
   "GET:alliances/{alliance_id}/contacts": { group: "alliance-social", maxTokens: 300, windowSizeMs: 9e5 },
   "GET:alliances/{alliance_id}/contacts/labels": { group: "alliance-social", maxTokens: 300, windowSizeMs: 9e5 },
+  "GET:characters/{character_id}/access-lists": { group: "char-access", maxTokens: 600, windowSizeMs: 9e5 },
+  "GET:characters/{character_id}/access-lists/{access_list_id}": { group: "char-access", maxTokens: 600, windowSizeMs: 9e5 },
   "GET:characters/{character_id}/agents_research": { group: "char-industry", maxTokens: 600, windowSizeMs: 9e5 },
   "GET:characters/{character_id}/assets": { group: "char-asset", maxTokens: 1800, windowSizeMs: 9e5 },
   "POST:characters/{character_id}/assets/locations": { group: "char-asset", maxTokens: 1800, windowSizeMs: 9e5 },
@@ -7723,6 +7837,8 @@ var esiRateLimitGroups = {
   "DELETE:characters/{character_id}/mail/labels/{label_id}": { group: "char-social", maxTokens: 600, windowSizeMs: 9e5 },
   "GET:characters/{character_id}/mail/lists": { group: "char-social", maxTokens: 600, windowSizeMs: 9e5 },
   "GET:characters/{character_id}/medals": { group: "char-detail", maxTokens: 600, windowSizeMs: 9e5 },
+  "GET:characters/{character_id}/mercenary-tactical-operations": { group: "char-activity", maxTokens: 150, windowSizeMs: 9e5 },
+  "GET:characters/{character_id}/mercenary-tactical-operations/{operation_id}": { group: "char-activity", maxTokens: 150, windowSizeMs: 9e5 },
   "GET:characters/{character_id}/mining": { group: "char-industry", maxTokens: 600, windowSizeMs: 9e5 },
   "GET:characters/{character_id}/notifications": { group: "char-notification", maxTokens: 15, windowSizeMs: 9e5 },
   "GET:characters/{character_id}/notifications/contacts": { group: "char-social", maxTokens: 600, windowSizeMs: 9e5 },
@@ -7735,6 +7851,8 @@ var esiRateLimitGroups = {
   "GET:characters/{character_id}/skillqueue": { group: "char-detail", maxTokens: 600, windowSizeMs: 9e5 },
   "GET:characters/{character_id}/skills": { group: "char-detail", maxTokens: 600, windowSizeMs: 9e5 },
   "GET:characters/{character_id}/standings": { group: "char-social", maxTokens: 600, windowSizeMs: 9e5 },
+  "GET:characters/{character_id}/structures/mercenary-dens": { group: "char-structure", maxTokens: 30, windowSizeMs: 9e5 },
+  "GET:characters/{character_id}/structures/mercenary-dens/{mercenary_den_id}": { group: "char-structure", maxTokens: 30, windowSizeMs: 9e5 },
   "GET:characters/{character_id}/titles": { group: "char-detail", maxTokens: 600, windowSizeMs: 9e5 },
   "GET:characters/{character_id}/wallet": { group: "char-wallet", maxTokens: 150, windowSizeMs: 9e5 },
   "GET:characters/{character_id}/wallet/journal": { group: "char-wallet", maxTokens: 150, windowSizeMs: 9e5 },
@@ -7777,6 +7895,10 @@ var esiRateLimitGroups = {
   "GET:corporations/{corporation_id}/starbases": { group: "corp-structure", maxTokens: 300, windowSizeMs: 9e5 },
   "GET:corporations/{corporation_id}/starbases/{starbase_id}": { group: "corp-structure", maxTokens: 300, windowSizeMs: 9e5 },
   "GET:corporations/{corporation_id}/structures": { group: "corp-structure", maxTokens: 300, windowSizeMs: 9e5 },
+  "GET:corporations/{corporation_id}/structures/skyhooks": { group: "corp-structure", maxTokens: 300, windowSizeMs: 9e5 },
+  "GET:corporations/{corporation_id}/structures/skyhooks/{skyhook_id}": { group: "corp-structure", maxTokens: 300, windowSizeMs: 9e5 },
+  "GET:corporations/{corporation_id}/structures/sovereignty-hubs": { group: "corp-structure", maxTokens: 300, windowSizeMs: 9e5 },
+  "GET:corporations/{corporation_id}/structures/sovereignty-hubs/{sovereignty_hub_id}": { group: "corp-structure", maxTokens: 300, windowSizeMs: 9e5 },
   "GET:corporations/{corporation_id}/titles": { group: "corp-detail", maxTokens: 300, windowSizeMs: 9e5 },
   "GET:corporations/{corporation_id}/wallets": { group: "corp-wallet", maxTokens: 300, windowSizeMs: 9e5 },
   "GET:corporations/{corporation_id}/wallets/{division}/journal": { group: "corp-wallet", maxTokens: 300, windowSizeMs: 9e5 },
@@ -7812,9 +7934,9 @@ var esiRateLimitGroups = {
   "GET:meta/compatibility-dates": { group: "meta", maxTokens: 150, windowSizeMs: 9e5 },
   "GET:meta/status": { group: "meta", maxTokens: 150, windowSizeMs: 9e5 },
   "POST:route/{origin_system_id}/{destination_system_id}": { group: "routes", maxTokens: 3600, windowSizeMs: 9e5 },
+  "GET:skyhooks/raidable": { group: "activity", maxTokens: 30, windowSizeMs: 9e5 },
   "GET:sovereignty/campaigns": { group: "sovereignty", maxTokens: 600, windowSizeMs: 9e5 },
-  "GET:sovereignty/map": { group: "sovereignty", maxTokens: 600, windowSizeMs: 9e5 },
-  "GET:sovereignty/structures": { group: "sovereignty", maxTokens: 600, windowSizeMs: 9e5 },
+  "GET:sovereignty/systems": { group: "sovereignty", maxTokens: 600, windowSizeMs: 9e5 },
   "GET:status": { group: "status", maxTokens: 600, windowSizeMs: 9e5 },
   "POST:ui/autopilot/waypoint": { group: "ui", maxTokens: 900, windowSizeMs: 9e5 },
   "POST:ui/openwindow/contract": { group: "ui", maxTokens: 900, windowSizeMs: 9e5 },
@@ -7834,8 +7956,19 @@ function getTokenCost(statusCode) {
   if (statusCode >= 500 && statusCode < 600) return 0;
   return 2;
 }
+function retryAfterDeadline(value, now) {
+  const trimmed = value.trim();
+  if (/^\d+$/.test(trimmed)) return now + parseInt(trimmed, 10) * 1e3;
+  if (!/[A-Za-z]/.test(trimmed)) return void 0;
+  const date = Date.parse(trimmed);
+  return Number.isNaN(date) ? void 0 : date;
+}
 var DEFAULT_WINDOW_MS = 9e5;
-var DEFAULT_ERROR_LIMIT = { remain: 100, reset: 0 };
+var DEFAULT_ERROR_LIMIT = {
+  remain: 100,
+  reset: 0,
+  exhaustedUntil: 0
+};
 var RateLimiter = class _RateLimiter {
   minDelayMs;
   decelerationThreshold;
@@ -7957,6 +8090,7 @@ var RateLimiter = class _RateLimiter {
   }
   updateFromResponse(headers, statusCode, templatePath, method, requestHeaders) {
     if (this.isTestMode) return;
+    const now = Date.now();
     const responseGroup = headers["x-ratelimit-group"] || void 0;
     const bucket = this.getBucket(
       templatePath,
@@ -7973,23 +8107,30 @@ var RateLimiter = class _RateLimiter {
     if ("x-ratelimit-used" in headers) {
       bucket.used = parseInt(headers["x-ratelimit-used"], 10);
     }
-    bucket.lastUpdated = Date.now();
+    bucket.lastUpdated = now;
     if ("retry-after" in headers) {
-      const retrySeconds = parseInt(headers["retry-after"], 10);
-      bucket.blockedUntil = Date.now() + retrySeconds * 1e3;
+      const until = retryAfterDeadline(headers["retry-after"], now);
+      if (until !== void 0) bucket.blockedUntil = until;
     }
     if (statusCode === 420 || statusCode === 429) {
-      if (bucket.blockedUntil <= Date.now()) {
-        bucket.blockedUntil = Date.now() + 6e4;
+      if (bucket.blockedUntil <= now) {
+        bucket.blockedUntil = now + 6e4;
       }
     }
     const errorLimit = this.resolveErrorLimit(requestHeaders);
-    if ("x-esi-error-limit-remain" in headers) {
-      errorLimit.remain = parseInt(headers["x-esi-error-limit-remain"], 10);
+    const reportedRemain = "x-esi-error-limit-remain" in headers ? parseInt(headers["x-esi-error-limit-remain"], 10) : void 0;
+    if (reportedRemain !== void 0 && reportedRemain > 0 && errorLimit.remain <= 0 && now < errorLimit.exhaustedUntil) {
+      return;
+    }
+    if (reportedRemain !== void 0) {
+      errorLimit.remain = reportedRemain;
     }
     if ("x-esi-error-limit-reset" in headers) {
       errorLimit.reset = parseInt(headers["x-esi-error-limit-reset"], 10);
     }
+    if (reportedRemain !== void 0 && reportedRemain <= 0) {
+      errorLimit.exhaustedUntil = now + errorLimit.reset * 1e3;
+    }
   }
   updateRateLimitInfo(headers) {
     this.updateFromResponse(headers, 200);
@@ -8203,6 +8344,32 @@ var RequestDeduplicator = class {
     this.inflight.set(key, promise);
     return promise;
   }
+  /**
+   * Drop the in-flight entries whose key contains `pathSegment`, so a call
+   * made after a write cannot join a request sent before it.
+   *
+   * The requests themselves keep running and whoever already joined them still
+   * gets their answer. Only the map entry goes, which is what new callers look
+   * in. Matching is `includes`, the same rule ETagCacheManager.deleteByPath
+   * uses, so one written path invalidates the cache and detaches the reads of
+   * it by the same test.
+   */
+  detachByPath(pathSegment) {
+    let count = 0;
+    for (const key of this.inflight.keys()) {
+      if (key.includes(pathSegment)) {
+        this.inflight.delete(key);
+        count += 1;
+      }
+    }
+    if (count > 0 && this.client) {
+      logDebug2(
+        this.client,
+        `[Dedup] Detached ${count} in-flight request(s) matching ${pathSegment} after a write`
+      );
+    }
+    return count;
+  }
   get pending() {
     return this.inflight.size;
   }
@@ -8852,6 +9019,8 @@ var ApiClientBuilder = class {
 var esiEndpointScopes = {
   "GET:alliances/{alliance_id}/contacts": ["esi-alliances.read_contacts.v1"],
   "GET:alliances/{alliance_id}/contacts/labels": ["esi-alliances.read_contacts.v1"],
+  "GET:characters/{character_id}/access-lists": ["esi-access.read_lists.v1"],
+  "GET:characters/{character_id}/access-lists/{access_list_id}": ["esi-access.read_lists.v1"],
   "GET:characters/{character_id}/agents_research": ["esi-characters.read_agents_research.v1"],
   "GET:characters/{character_id}/assets": ["esi-assets.read_assets.v1"],
   "POST:characters/{character_id}/assets/locations": ["esi-assets.read_assets.v1"],
@@ -8895,6 +9064,8 @@ var esiEndpointScopes = {
   "DELETE:characters/{character_id}/mail/labels/{label_id}": ["esi-mail.organize_mail.v1"],
   "GET:characters/{character_id}/mail/lists": ["esi-mail.read_mail.v1"],
   "GET:characters/{character_id}/medals": ["esi-characters.read_medals.v1"],
+  "GET:characters/{character_id}/mercenary-tactical-operations": ["esi-activities.read_character.v1"],
+  "GET:characters/{character_id}/mercenary-tactical-operations/{operation_id}": ["esi-activities.read_character.v1"],
   "GET:characters/{character_id}/mining": ["esi-industry.read_character_mining.v1"],
   "GET:characters/{character_id}/notifications": ["esi-characters.read_notifications.v1"],
   "GET:characters/{character_id}/notifications/contacts": ["esi-characters.read_notifications.v1"],
@@ -8909,6 +9080,8 @@ var esiEndpointScopes = {
   "GET:characters/{character_id}/skillqueue": ["esi-skills.read_skillqueue.v1"],
   "GET:characters/{character_id}/skills": ["esi-skills.read_skills.v1"],
   "GET:characters/{character_id}/standings": ["esi-characters.read_standings.v1"],
+  "GET:characters/{character_id}/structures/mercenary-dens": ["esi-structures.read_character.v1"],
+  "GET:characters/{character_id}/structures/mercenary-dens/{mercenary_den_id}": ["esi-structures.read_character.v1"],
   "GET:characters/{character_id}/titles": ["esi-characters.read_titles.v1"],
   "GET:characters/{character_id}/wallet": ["esi-wallet.read_character_wallet.v1"],
   "GET:characters/{character_id}/wallet/journal": ["esi-wallet.read_character_wallet.v1"],
@@ -8953,6 +9126,10 @@ var esiEndpointScopes = {
   "GET:corporations/{corporation_id}/starbases": ["esi-corporations.read_starbases.v1"],
   "GET:corporations/{corporation_id}/starbases/{starbase_id}": ["esi-corporations.read_starbases.v1"],
   "GET:corporations/{corporation_id}/structures": ["esi-corporations.read_structures.v1"],
+  "GET:corporations/{corporation_id}/structures/skyhooks": ["esi-structures.read_corporation.v1"],
+  "GET:corporations/{corporation_id}/structures/skyhooks/{skyhook_id}": ["esi-structures.read_corporation.v1"],
+  "GET:corporations/{corporation_id}/structures/sovereignty-hubs": ["esi-structures.read_corporation.v1"],
+  "GET:corporations/{corporation_id}/structures/sovereignty-hubs/{sovereignty_hub_id}": ["esi-structures.read_corporation.v1"],
   "GET:corporations/{corporation_id}/titles": ["esi-corporations.read_titles.v1"],
   "GET:corporations/{corporation_id}/wallets": ["esi-wallet.read_corporation_wallets.v1"],
   "GET:corporations/{corporation_id}/wallets/{division}/journal": ["esi-wallet.read_corporation_wallets.v1"],
@@ -9189,7 +9366,7 @@ function resolveLimit(requested) {
 }
 async function runWithConcurrency(items, worker, options = {}) {
   const limit = resolveLimit(options.concurrency);
-  const results = new Array(items.length);
+  const results = [];
   let nextIndex = 0;
   let completed = 0;
   async function runOne() {