@cloudflare/workers-utils 0.22.1 → 0.23.1

package/dist/index.mjs

@@ -1,8 +1,7 @@
-export { assertNever, constructWranglerConfig, getTodaysCompatDate, isCompatDate, mapWorkerMetadataBindings } from './chunk-UFU4JGIG.mjs';
+export { assertNever, constructWranglerConfig, getTodaysCompatDate, isCompatDate, mapWorkerMetadataBindings } from './chunk-J6D57QVQ.mjs';
 export { MetricsRegistry } from './chunk-O4YGOZSW.mjs';
-import { isDirectory, UserError, isRedirectedRawConfig, dedent, configFileName, formatConfigSnippet, FatalError, removeDirSync, ParseError, parseJSON, APIError, readFileSync as readFileSync$1, parseTOML, modify, applyEdits, format, dist_default, parseJSONC } from './chunk-GMTGAG26.mjs';
-export { APIError, CommandLineArgsError, DeprecationError, FatalError, JsonFriendlyFatalError, MissingConfigError, ParseError, UserError, configFileName, configFormat, createFatalError, experimental_readRawConfig, findWranglerConfig, formatConfigSnippet, indexLocation, isDirectory, isRedirectedConfig, parseByteSize, parseHumanDuration, parseJSON, parseJSONC, parseNonHyphenedUuid, parsePackageJSON, parseTOML, readFileSync, readFileSyncToBuffer, removeDir, removeDirSync, resolveWranglerConfigPath, searchLocation } from './chunk-GMTGAG26.mjs';
-export { ENVIRONMENT_TAG_PREFIX, INHERIT_SYMBOL, JSON_CONFIG_FORMATS, PATH_TO_DEPLOY_CONFIG, SERVICE_TAG_PREFIX } from './chunk-OZQVB3L3.mjs';
+import { isDirectory, UserError, isRedirectedRawConfig, dedent, configFileName, formatConfigSnippet, FatalError, removeDirSync, ParseError, parseJSON, APIError, readFileSync as readFileSync$1, parseTOML, modify, applyEdits, format, dist_default, parseJSONC } from './chunk-ULVYGN52.mjs';
+export { APIError, CommandLineArgsError, DeprecationError, ENVIRONMENT_TAG_PREFIX, FatalError, INHERIT_SYMBOL, JSON_CONFIG_FORMATS, JsonFriendlyFatalError, MissingConfigError, PATH_TO_DEPLOY_CONFIG, ParseError, SERVICE_TAG_PREFIX, UserError, configFileName, configFormat, createFatalError, experimental_readRawConfig, findWranglerConfig, formatConfigSnippet, indexLocation, isDirectory, isRedirectedConfig, parseByteSize, parseHumanDuration, parseJSON, parseJSONC, parseNonHyphenedUuid, parsePackageJSON, parseTOML, readFileSync, readFileSyncToBuffer, removeDir, removeDirSync, resolveWranglerConfigPath, searchLocation } from './chunk-ULVYGN52.mjs';
 import { __commonJS, __name, __require, __export, __toESM, __reExport } from './chunk-DCOBXSFB.mjs';
 import fs2, { accessSync, constants, writeFileSync, renameSync, existsSync, unlinkSync, mkdirSync, chmodSync, readFileSync } from 'node:fs';
 import assert from 'node:assert';
@@ -13,6 +12,7 @@ import { createHash } from 'node:crypto';
 import { fetch, Headers, FormData, Response } from 'undici';
 import { URLSearchParams } from 'node:url';
 import * as timersPromises from 'node:timers/promises';
+import { setTimeout as setTimeout$1 } from 'node:timers/promises';
 
 // ../../node_modules/.pnpm/xdg-app-paths@8.3.0/node_modules/xdg-app-paths/dist/cjs/lib/XDGAppPaths.js
 var require_XDGAppPaths = __commonJS({
@@ -1911,7 +1911,7 @@ var defaultWranglerConfig = {
   vectorize: [],
   ai_search_namespaces: [],
   ai_search: [],
-  web_search: void 0,
+  websearch: void 0,
   agent_memory: [],
   hyperdrive: [],
   workflows: [],
@@ -5930,14 +5930,24 @@ __reExport(mod_esm_exports, __toESM(require_mod_cjs3(), 1));
 var mod_esm_default = import_mod_cjs.default;
 
 // src/global-wrangler-config-path.ts
+function getGlobalConfigPath({
+  appName = "wrangler",
+  leadingDot = true,
+  useLegacyHomeDir = true
+} = {}) {
+  const dirName = `${leadingDot ? "." : ""}${appName}`;
+  const configDir = mod_esm_default(dirName).config();
+  if (useLegacyHomeDir) {
+    const legacyConfigDir = path3.join(os.homedir(), dirName);
+    if (isDirectory(legacyConfigDir)) {
+      return legacyConfigDir;
+    }
+  }
+  return configDir;
+}
+__name(getGlobalConfigPath, "getGlobalConfigPath");
 function getGlobalWranglerConfigPath() {
-  const configDir = mod_esm_default(".wrangler").config();
-  const legacyConfigDir = path3.join(os.homedir(), ".wrangler");
-  if (isDirectory(legacyConfigDir)) {
-    return legacyConfigDir;
-  } else {
-    return configDir;
-  }
+  return getGlobalConfigPath();
 }
 __name(getGlobalWranglerConfigPath, "getGlobalWranglerConfigPath");
 
@@ -6588,7 +6598,7 @@ var friendlyBindingNames = {
   vectorize: "Vectorize Index",
   ai_search_namespaces: "AI Search Namespace",
   ai_search: "AI Search Instance",
-  web_search: "Web Search",
+  websearch: "Web Search",
   agent_memory: "Agent Memory",
   hyperdrive: "Hyperdrive Config",
   r2_buckets: "R2 Bucket",
@@ -6642,7 +6652,7 @@ var bindingTypeFriendlyNames = {
   vectorize: "Vectorize Index",
   ai_search_namespace: "AI Search Namespace",
   ai_search: "AI Search Instance",
-  web_search: "Web Search",
+  websearch: "Web Search",
   agent_memory: "Agent Memory",
   hyperdrive: "Hyperdrive Config",
   service: "Worker",
@@ -7314,8 +7324,8 @@ function normalizeAndValidateRoute(diagnostics, topLevelEnv, rawEnv) {
   );
 }
 __name(normalizeAndValidateRoute, "normalizeAndValidateRoute");
-function validateRoutes(diagnostics, topLevelEnv, rawEnv) {
-  return inheritable(
+function validateRoutes(diagnostics, topLevelEnv, rawEnv, envName) {
+  const result = inheritable(
     diagnostics,
     topLevelEnv,
     rawEnv,
@@ -7323,6 +7333,18 @@ function validateRoutes(diagnostics, topLevelEnv, rawEnv) {
     all(isRouteArray, isMutuallyExclusiveWith(rawEnv, "route")),
     void 0
   );
+  if (topLevelEnv !== void 0 && envName !== void 0 && rawEnv.routes === void 0) {
+    const customDomainRoutes = topLevelEnv.routes?.filter(
+      (r2) => typeof r2 === "object" && r2 !== null && r2.custom_domain === true
+    );
+    if (customDomainRoutes && customDomainRoutes.length > 0) {
+      const customDomains = customDomainRoutes.map((r2) => r2.pattern).join(", ");
+      diagnostics.warnings.push(
+        `The "env.${envName}" environment inherits the top-level \`routes\` configuration, which includes the custom domain(s): ${customDomains}. Deploying this environment will reassign these custom domains away from the top-level Worker. Add \`"routes": []\` to "env.${envName}" to prevent inheritance, or copy the route configuration from the top level to hide this warning.`
+      );
+    }
+  }
+  return result;
 }
 __name(validateRoutes, "validateRoutes");
 function normalizeAndValidatePlacement(diagnostics, topLevelEnv, rawEnv) {
@@ -7538,7 +7560,12 @@ function normalizeAndValidateEnvironment(diagnostics, configPath, rawEnv, isDisp
     void 0,
     void 0
   );
-  const routes = validateRoutes(diagnostics, topLevelEnv, rawEnv);
+  const routes = validateRoutes(
+    diagnostics,
+    topLevelEnv,
+    rawEnv,
+    topLevelEnv === void 0 ? void 0 : envName
+  );
   const workers_dev = inheritable(
     diagnostics,
     topLevelEnv,
@@ -7838,13 +7865,13 @@ function normalizeAndValidateEnvironment(diagnostics, configPath, rawEnv, isDisp
       validateBindingArray(envName, validateAISearchBinding),
       []
     ),
-    web_search: notInheritable(
+    websearch: notInheritable(
       diagnostics,
       topLevelEnv,
       rawConfig,
       rawEnv,
       envName,
-      "web_search",
+      "websearch",
       validateNamedSimpleBinding(envName),
       void 0
     ),
@@ -8941,7 +8968,7 @@ var validateUnsafeBinding = /* @__PURE__ */ __name((diagnostics, field, value) =
       "ai",
       "ai_search_namespace",
       "ai_search",
-      "web_search",
+      "websearch",
       "agent_memory",
       "kv_namespace",
       "durable_object_namespace",
@@ -9752,12 +9779,21 @@ var validateD1Binding = /* @__PURE__ */ __name((diagnostics, field, value) => {
   if (!isRemoteValid(value, field, diagnostics)) {
     isValid2 = false;
   }
+  if (!isOptionalProperty(value, "migrations_pattern", "string")) {
+    diagnostics.errors.push(
+      `"${field}" bindings should, optionally, have a string "migrations_pattern" field but got ${JSON.stringify(
+        value
+      )}.`
+    );
+    isValid2 = false;
+  }
   validateAdditionalProperties(diagnostics, field, Object.keys(value), [
     "binding",
     "database_id",
     "database_internal_env",
     "database_name",
     "migrations_dir",
+    "migrations_pattern",
     "migrations_table",
     "preview_database_id",
     "remote"
@@ -11350,7 +11386,7 @@ var BINDING_LOCAL_SUPPORT = {
   flagship: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
   vpc_service: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
   vpc_network: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
-  web_search: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
+  websearch: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator",
   agent_memory: "DO-NOT-USE-this-resource-will-never-have-a-local-simulator"
 };
 function getBindingLocalSupport(type) {
@@ -12331,7 +12367,7 @@ __name(maybeThrowFriendlyError, "maybeThrowFriendlyError");
 function logHeaders(headers, logger) {
   const clone = cloneHeaders(headers);
   clone.delete("Authorization");
-  logger.debugWithSanitization(
+  logger.debugWithSanitization?.(
     "HEADERS:",
     JSON.stringify(Object.fromEntries(clone), null, 2)
   );
@@ -12352,11 +12388,11 @@ async function performApiFetchBase(complianceConfig, resource, init = {}, userAg
   logger.debug(
     `-- START CF API REQUEST: ${method} ${getCloudflareApiBaseUrl(complianceConfig)}${resource}`
   );
-  logger.debugWithSanitization("QUERY STRING:", queryString);
+  logger.debugWithSanitization?.("QUERY STRING:", queryString);
   logHeaders(headers, logger);
-  logger.debugWithSanitization("INIT:", JSON.stringify({ ...init }, null, 2));
+  logger.debugWithSanitization?.("INIT:", JSON.stringify({ ...init }, null, 2));
   if (init.body instanceof FormData) {
-    logger.debugWithSanitization(
+    logger.debugWithSanitization?.(
       "BODY:",
       await new Response(init.body).text(),
       null,
@@ -12394,7 +12430,7 @@ async function fetchInternalBase(complianceConfig, resource, init = {}, userAgen
     response.status
   );
   logHeaders(response.headers, logger);
-  logger.debugWithSanitization("RESPONSE:", jsonText);
+  logger.debugWithSanitization?.("RESPONSE:", jsonText);
   logger.debug("-- END CF API RESPONSE");
   if (!jsonText && (response.status === 204 || response.status === 205)) {
     return {
@@ -12633,6 +12669,27 @@ function throwWAFBlockError(headers, method, resource, status, statusText) {
   });
 }
 __name(throwWAFBlockError, "throwWAFBlockError");
+async function fetchKVGetValueBase(complianceConfig, accountId, namespaceId, key, userAgent, logger, credentials) {
+  const headers = new Headers();
+  addAuthorizationHeader(headers, credentials);
+  headers.set("User-Agent", userAgent);
+  maybeAddTraceHeader(headers);
+  const resource = `${getCloudflareApiBaseUrl(complianceConfig)}/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${key}`;
+  logger.debug(`-- START CF API REQUEST: GET ${resource}`);
+  logger.debug("-- END CF API REQUEST");
+  const response = await fetch(resource, {
+    method: "GET",
+    headers
+  });
+  if (response.ok) {
+    return await response.arrayBuffer();
+  } else {
+    throw new Error(
+      `Failed to fetch ${resource} - ${response.status}: ${response.statusText}`
+    );
+  }
+}
+__name(fetchKVGetValueBase, "fetchKVGetValueBase");
 function hasCursor(result_info) {
   const cursor = result_info?.cursor;
   return cursor !== void 0 && cursor !== null && cursor !== "";
@@ -12680,6 +12737,87 @@ async function fetchLatestNpmVersion(name, version) {
   return { status: "update-available", latest: result.latest };
 }
 __name(fetchLatestNpmVersion, "fetchLatestNpmVersion");
+
+// src/logger.ts
+var LOGGER_LEVELS = {
+  none: -1,
+  error: 0,
+  warn: 1,
+  info: 2,
+  log: 3,
+  debug: 4
+};
+var MAX_ATTEMPTS = 3;
+async function retryOnAPIFailure(action, logger, backoff = 0, attempts = MAX_ATTEMPTS, abortSignal) {
+  try {
+    return await action();
+  } catch (err) {
+    if (err instanceof APIError) {
+      if (!err.isRetryable()) {
+        throw err;
+      }
+    } else if (err instanceof DOMException && err.name === "TimeoutError") ; else if (!(err instanceof TypeError)) {
+      throw err;
+    }
+    logger.debug(`Retrying API call after error...`);
+    logger.debug(err);
+    if (attempts <= 1) {
+      throw err;
+    }
+    await setTimeout$1(backoff, void 0, { signal: abortSignal });
+    return retryOnAPIFailure(
+      action,
+      logger,
+      backoff + 1e3,
+      attempts - 1,
+      abortSignal
+    );
+  }
+}
+__name(retryOnAPIFailure, "retryOnAPIFailure");
+
+// src/format-time.ts
+function formatTime(duration) {
+  return `(${(duration / 1e3).toFixed(2)} sec)`;
+}
+__name(formatTime, "formatTime");
+
+// src/route-utils.ts
+function getHostFromRoute(route) {
+  let host;
+  if (typeof route === "string") {
+    host = getHostFromUrl(route);
+  } else if (typeof route === "object") {
+    host = getHostFromUrl(route.pattern);
+    if (host === void 0 && "zone_name" in route) {
+      host = getHostFromUrl(route.zone_name);
+    }
+  }
+  return host;
+}
+__name(getHostFromRoute, "getHostFromRoute");
+function getZoneFromRoute(route) {
+  if (typeof route === "object" && "zone_name" in route && route.zone_name) {
+    return route.zone_name;
+  }
+  return getHostFromRoute(route);
+}
+__name(getZoneFromRoute, "getZoneFromRoute");
+function getHostFromUrl(urlLike) {
+  if (urlLike.startsWith("*/") || urlLike.startsWith("http://*/") || urlLike.startsWith("https://*/")) {
+    return void 0;
+  }
+  urlLike = urlLike.replace(/\*(\.)?/g, "");
+  if (!(urlLike.startsWith("http://") || urlLike.startsWith("https://"))) {
+    urlLike = "http://" + urlLike;
+  }
+  try {
+    return new URL(urlLike).host;
+  } catch {
+    return void 0;
+  }
+}
+__name(getHostFromUrl, "getHostFromUrl");
 /*! Bundled license information:
 
 deep-extend/lib/deep-extend.js:
@@ -12714,4 +12852,4 @@ safe-buffer/index.js:
   (*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> *)
 */
 
-export { COMPLIANCE_REGION_CONFIG_PUBLIC, COMPLIANCE_REGION_CONFIG_UNKNOWN, Diagnostics, PatchConfigError, addAuthorizationHeader, bucketFormatMessage, defaultWranglerConfig, experimental_patchConfig, extractAccountTag, extractWAFBlockRayId, fetchInternalBase, fetchLatestNpmVersion, fetchListResultBase, fetchResultBase, friendlyBindingNames, getBindingLocalSupport, getBindingTypeFriendlyName, getBooleanEnvironmentVariableFactory, getBrowserRenderingHeadfulFromEnv, getBuildConditionsFromEnv, getBuildPlatformFromEnv, getC3CommandFromEnv, getCIGeneratePreviewAlias, getCIMatchTag, getCIOverrideName, getCIOverrideNetworkModeHost, getCfFetchEnabledFromEnv, getCfFetchPathFromEnv, getCloudflareApiBaseUrl, getCloudflareApiEnvironmentFromEnv, getCloudflareComplianceRegion, getCloudflareEnv, getCloudflareIncludeProcessEnvFromEnv, getCloudflareLoadDevVarsFromDotEnv, getCloudflaredPathFromEnv, getComplianceRegionSubdomain, getD1ExtraLocationChoices, getDisableConfigWatching, getDockerPath, getEnvironmentVariableFactory, getGlobalWranglerConfigPath, getLocalExplorerEnabledFromEnv, getOpenNextDeployFromEnv, getOutputFileDirectoryFromEnv, getOutputFilePathFromEnv, getRegistryPath, getSanitizeLogs, getSubdomainMixedStateCheckDisabled, getTraceHeader, getWorkersCIBranchName, getWranglerCacheDirFromEnv, getWranglerHiddenDirPath, getWranglerHideBanner, getWranglerSendErrorReportsFromEnv, getWranglerSendMetricsFromEnv, getWranglerTmpDir, hasCursor, hasMorePages, hasProperty, isDockerfile, isOptionalProperty, isPagesConfig, isRequiredProperty, isValidR2BucketName, isWAFBlockResponse, maybeAddTraceHeader, normalizeAndValidateConfig, performApiFetchBase, renderError, spawnCloudflared, startTunnel, sweepStaleWranglerTmpDirs, throwFetchError, truncate, validatePagesConfig };
+export { COMPLIANCE_REGION_CONFIG_PUBLIC, COMPLIANCE_REGION_CONFIG_UNKNOWN, Diagnostics, LOGGER_LEVELS, PatchConfigError, addAuthorizationHeader, bucketFormatMessage, defaultWranglerConfig, experimental_patchConfig, extractAccountTag, extractWAFBlockRayId, fetchInternalBase, fetchKVGetValueBase, fetchLatestNpmVersion, fetchListResultBase, fetchResultBase, formatTime, friendlyBindingNames, getBindingLocalSupport, getBindingTypeFriendlyName, getBooleanEnvironmentVariableFactory, getBrowserRenderingHeadfulFromEnv, getBuildConditionsFromEnv, getBuildPlatformFromEnv, getC3CommandFromEnv, getCIGeneratePreviewAlias, getCIMatchTag, getCIOverrideName, getCIOverrideNetworkModeHost, getCfFetchEnabledFromEnv, getCfFetchPathFromEnv, getCloudflareApiBaseUrl, getCloudflareApiEnvironmentFromEnv, getCloudflareComplianceRegion, getCloudflareEnv, getCloudflareIncludeProcessEnvFromEnv, getCloudflareLoadDevVarsFromDotEnv, getCloudflaredPathFromEnv, getComplianceRegionSubdomain, getD1ExtraLocationChoices, getDisableConfigWatching, getDockerPath, getEnvironmentVariableFactory, getGlobalConfigPath, getGlobalWranglerConfigPath, getHostFromRoute, getHostFromUrl, getLocalExplorerEnabledFromEnv, getOpenNextDeployFromEnv, getOutputFileDirectoryFromEnv, getOutputFilePathFromEnv, getRegistryPath, getSanitizeLogs, getSubdomainMixedStateCheckDisabled, getTraceHeader, getWorkersCIBranchName, getWranglerCacheDirFromEnv, getWranglerHiddenDirPath, getWranglerHideBanner, getWranglerSendErrorReportsFromEnv, getWranglerSendMetricsFromEnv, getWranglerTmpDir, getZoneFromRoute, hasCursor, hasMorePages, hasProperty, isDockerfile, isOptionalProperty, isPagesConfig, isRequiredProperty, isValidR2BucketName, isWAFBlockResponse, maybeAddTraceHeader, normalizeAndValidateConfig, performApiFetchBase, renderError, retryOnAPIFailure, spawnCloudflared, startTunnel, sweepStaleWranglerTmpDirs, throwFetchError, truncate, validatePagesConfig };