@tool-bridge/server 0.16.0 → 0.19.0

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import * as z from './v4/classic/external.cjs';
 import * as http from 'node:http';
 import { Sql } from 'postgres';
 import { Hono } from 'hono';
@@ -530,6 +530,50 @@ interface ContextProvider {
     write?(path: string, entry: ContextEntryInput): Promise<ContextEntryMeta>;
 }
 
+/**
+ * Tool Layer 的中立类型。
+ *
+ * `ToolSpec` 是**上游工具的中立形状**:mcp(`tools/list` 的 `Tool`)与 http
+ * (`HttpToolDef`)都归一到它,虚拟化(virtualize.ts)与 `~help` 派生(mcpSchema.ts)
+ * 只认 `ToolSpec`,不感知上游是 mcp 还是 http。它把 `ToolMeta`+`ToolDef`
+ * 合并为一个形状:`description` 可缺省(上游可能不带),另携 `confirm`(危险工具二次确认)。
+ */
+/** 上游工具的中立形状(mcp/http 归一目标)。 */
+interface ToolSpec {
+    /** 危险操作二次确认;进 `~help` 的 confirm 行。 */
+    confirm?: boolean;
+    /** 一句话描述;进 `~help` 的 `h` 行。上游可能不带 → 可缺省。 */
+    description?: string;
+    /** 副作用标记(read/write/destructive);进 `~help` 的 effect 行。 */
+    effect?: string;
+    /** JSON Schema;`~help` 的 body 数据源。 */
+    inputSchema?: unknown;
+    /** 工具名(虚拟化前为上游原名,虚拟化后为对外虚拟名)。 */
+    name: string;
+    /**
+     * 返回值的 JSON Schema(可选)。与 `inputSchema` 对称,同为裸 JSON Schema。
+     *
+     * 来源:MCP 上游的 `Tool.outputSchema`、plugin 作者在 `OperationSpec.outputSchema` 里的声明。
+     * 去处:工具级全量 `~help`(JSON 的 `outputSchema` / DSL 的 `result` 行)与 MCP consumer 端点。
+     * 索引形态的 `~help` 不含它(同 inputSchema,两级披露)。
+     */
+    outputSchema?: unknown;
+}
+/**
+ * 工具调用结果。`isError:true` 是**工具业务级错误**(上游 HTTP 200
+ * 正常返回、内容为错),按内容协商渲染——**不是** TBError(传输/协议错误才归一为
+ * TBError,见 upstreamError.ts)。
+ */
+interface ToolResult {
+    /** markdown 文本或结构化 JSON(按内容协商输出)。 */
+    content: string | unknown;
+    /** MCP 等上游的原生多模态 content blocks;HTBP 渲染仍使用归一后的 content。 */
+    contentBlocks?: unknown[];
+    isError?: boolean;
+    /** MCP 上游返回的结构化结果;consumer endpoint 转发时保留。 */
+    structuredContent?: Record<string, unknown>;
+}
+
 /**
  * DeviceFrame:设备 WS 帧协议的类型与编解码。
  *
@@ -588,51 +632,23 @@ type DeviceCallResult = {
     ok: false;
 };
 
-/**
- * Tool Layer 的中立类型。
- *
- * `ToolSpec` 是**上游工具的中立形状**:mcp(`tools/list` 的 `Tool`)与 http
- * (`HttpToolDef`)都归一到它,虚拟化(virtualize.ts)与 `~help` 派生(mcpSchema.ts)
- * 只认 `ToolSpec`,不感知上游是 mcp 还是 http。它把 `ToolMeta`+`ToolDef`
- * 合并为一个形状:`description` 可缺省(上游可能不带),另携 `confirm`(危险工具二次确认)。
- */
-/** 上游工具的中立形状(mcp/http 归一目标)。 */
-interface ToolSpec {
-    /** 危险操作二次确认;进 `~help` 的 confirm 行。 */
-    confirm?: boolean;
-    /** 一句话描述;进 `~help` 的 `h` 行。上游可能不带 → 可缺省。 */
-    description?: string;
-    /** 副作用标记(read/write/destructive);进 `~help` 的 effect 行。 */
-    effect?: string;
-    /** JSON Schema;`~help` 的 body 数据源。 */
-    inputSchema?: unknown;
-    /** 工具名(虚拟化前为上游原名,虚拟化后为对外虚拟名)。 */
-    name: string;
-    /**
-     * 返回值的 JSON Schema(可选)。与 `inputSchema` 对称,同为裸 JSON Schema。
-     *
-     * 来源:MCP 上游的 `Tool.outputSchema`、plugin 作者在 `OperationSpec.outputSchema` 里的声明。
-     * 去处:工具级全量 `~help`(JSON 的 `outputSchema` / DSL 的 `result` 行)与 MCP consumer 端点。
-     * 索引形态的 `~help` 不含它(同 inputSchema,两级披露)。
-     */
-    outputSchema?: unknown;
-}
-/**
- * 工具调用结果。`isError:true` 是**工具业务级错误**(上游 HTTP 200
- * 正常返回、内容为错),按内容协商渲染——**不是** TBError(传输/协议错误才归一为
- * TBError,见 upstreamError.ts)。
- */
-interface ToolResult {
-    /** markdown 文本或结构化 JSON(按内容协商输出)。 */
-    content: string | unknown;
-    /** MCP 等上游的原生多模态 content blocks;HTBP 渲染仍使用归一后的 content。 */
-    contentBlocks?: unknown[];
-    isError?: boolean;
-    /** MCP 上游返回的结构化结果;consumer endpoint 转发时保留。 */
-    structuredContent?: Record<string, unknown>;
+interface RuntimeRemoteSettings {
+    allowInsecure: boolean;
+    allowlist: string[];
+    federatedSearch?: {
+        maxConcurrency?: number;
+        maxResponseBodyBytes?: number;
+        maxSources?: number;
+        minChildWorkMs?: number;
+        perHopReturnReserveMs?: number;
+        sessionTtlMs?: number;
+        totalDeadlineMs?: number;
+    };
+    instanceId?: string;
+    maxHops: number;
 }
 
-type SearchCapability = 'search' | 'search:semantic';
+type SearchCapability = 'search' | 'search:federated' | 'search:semantic';
 /** 全局工具搜索的完整结果；只在权限和可见性候选筛选后 hydrate。 */
 interface ToolSearchHit {
     path: TreePath;
@@ -640,26 +656,48 @@ interface ToolSearchHit {
 }
 /** adapter 返回的轻量候选；resumeOffset 仅在当前请求内传递，不暴露给协议调用方。 */
 interface ToolSearchCandidate {
+    /** 命中的原始 logical terms / 全部原始 logical terms；不按派生 unit 重复计数。 */
+    coverage: number;
+    matchedTermCount: number;
     name: string;
     path: TreePath;
     ref: string;
     resumeOffset: number;
     revision: number;
+    /** 仅供宿主在 canonical hydration 提前截页时续签同一搜索约束，不进入 wire。 */
+    searchOptionsFingerprint?: string;
+    totalTermCount: number;
 }
+type ToolSearchEffect = 'destructive' | 'read' | 'unknown' | 'write';
+type ToolSearchMatching = 'all' | 'best';
 interface ToolSearchOptions {
     cursor?: string;
+    effects?: ToolSearchEffect[];
     limit?: number;
+    matching?: ToolSearchMatching;
+    minCoverage?: number;
     mode?: 'keyword' | 'semantic';
+    pathPrefix?: TreePath;
+}
+/** 会改变候选集合或分页档位的规范化约束；cursor 必须绑定其完整指纹。 */
+interface NormalizedToolSearchOptions {
+    effects?: ToolSearchEffect[];
+    matching: ToolSearchMatching;
+    minCoverage?: number;
+    pathPrefix?: TreePath;
 }
 /** 宿主提供的全局工具索引；权限和虚拟化仍由 gateway 处理。 */
 interface SearchIndex {
     readonly capabilities: readonly SearchCapability[];
     cursorFor(query: string, candidate: ToolSearchCandidate, mode?: 'keyword' | 'semantic'): Promise<string>;
+    /** 联邦 continuation 的 topology binding；不实现的自定义 adapter 只能提供 local search。 */
+    revision?(): Promise<number | string>;
     search(query: string, opts?: ToolSearchOptions): Promise<Page<ToolSearchCandidate>>;
 }
 /** 索引持久层使用的轻量记录；完整 ToolSpec 只保留摘要，不进入派生数据库。 */
 interface SerializedToolSearchRecord {
     description: string;
+    effect: ToolSearchEffect;
     feedback: string;
     name: string;
     path: TreePath;
@@ -745,7 +783,7 @@ interface SqlSearchDialect {
      * 把已 normalize 的 query 变成候选查询语句(含排序与分页)。三后端共用查询单元
      * 展开和评分形态，方言只选择占位符语法与 LIKE/ILIKE。
      */
-    candidateStatement(query: string, limit: number, offset: number): SqlSearchStatement;
+    candidateStatement(query: string, limit: number, offset: number, constraints?: NormalizedToolSearchOptions): SqlSearchStatement;
     /** 建表(幂等),元素不带尾分号。 */
     readonly schemaStatements: readonly string[];
     /** 编排直接下发的固定语句。 */
@@ -786,6 +824,7 @@ declare class SqlSearchIndex implements MutableSearchIndex {
     private meta;
     private snapshotDigests;
     initialized(): Promise<boolean>;
+    revision(): Promise<number>;
     replace(path: TreePath, tools: readonly ToolSpec[], opts?: {
         feedback?: string;
     }): Promise<void>;
@@ -851,18 +890,30 @@ interface RemoteSettings {
     allowInsecure: boolean;
     /** baseUrl 的 host 后缀白名单;空数组 = 拒一切 remote。 */
     allowlist: string[];
+    /** 联邦 search 的部署级硬上限；客户端与下游 header 只能进一步收紧。 */
+    federatedSearch?: Partial<FederatedSearchSettings>;
     /** 本实例 X-TB-Via 标识;缺省用**入站请求 host** 派生(跨实例联邦须显式配置才能可靠去环)。 */
     instanceId?: string;
     /** X-TB-Via 跳数上限(缺省 4,由宿主适配层落默认)。 */
     maxHops: number;
 }
+interface FederatedSearchSettings {
+    maxConcurrency: number;
+    maxResponseBodyBytes: number;
+    maxSources: number;
+    minChildWorkMs: number;
+    perHopReturnReserveMs: number;
+    sessionTtlMs: number;
+    totalDeadlineMs: number;
+}
 
 /**
  * 宿主注入面与请求期公共类型。
  *
- * 这里只放形状:五个注入点(state / objects / secrets / device / search)、进程内
- * Provider 钩子与解析后的部署配置。行为实现分散在 paths/federation/deviceNodes/
- * toolNodes/contextNodes/helpModel 与 routes/*,装配在 tbApp.ts。
+ * 这里只放形状:五个数据/设备注入点(state / objects / secrets / device / search)、
+ * Provider OAuth 安全出站通道、进程内 Provider 钩子与解析后的部署配置。行为实现
+ * 分散在 paths/federation/deviceNodes/toolNodes/contextNodes/helpModel 与 routes/*,
+ * 装配在 tbApp.ts。
  */
 
 /** 帧协议 call 转发的入参(id 由调用点生成,幂等键)。 */
@@ -901,7 +952,7 @@ interface ReadinessReport {
     ready: boolean;
 }
 /**
- * tb app 的宿主注入面(五注入点 + 解析后的部署配置)。
+ * tb app 的宿主注入面(数据/设备五注入点 + 安全出站通道 + 解析后的部署配置)。
  * 核心业务逻辑零分叉:Workers 适配层(app.ts)与 SDK(packages/sdk)都注入此形状。
  */
 interface TbAppDeps {
@@ -941,6 +992,12 @@ interface TbAppDeps {
      * 那个插件解析不出 export;反之则解析得出但调不动(unavailable)。宿主该两者同源装配。
      */
     pluginCatalog?: BuiltinCatalog;
+    /**
+     * Provider OAuth 令牌端点的宿主出站通道。必须由宿主显式注入；缺省时 OAuth
+     * 发起、回调兑换与 access-token 解析全部 fail closed，绝不回退到全局 fetch。
+     * 标准宿主注入逐跳校验且拒绝跨源 body 重定向的 guarded fetch。
+     */
+    providerOAuthFetch?: typeof fetch;
     /**
      * 后端连通性探测(GET /readyz;k8s readiness)。宿主注入闭包,自行探测其长连接
      * 后端(PG 池 / Redis)并叠加 draining 状态。缺省 → /readyz 恒 200:请求期绑定
@@ -1003,7 +1060,7 @@ declare function createTbApp(deps: TbAppDeps): Hono<{
  * Node 宿主的 env 配置面。变量名与语义对齐 CF 宿主(gateway/src/app.ts 的 Env),
  * 仅新增宿主形态相关的 TB_PORT / TB_HOST / TB_DATA_DIR / TB_UI_DIR / TB_DATABASE_URL。
  * 端口额外兜底平台注入的 PORT(PaaS 通行约定)。
- * 解析函数镜像 app.ts 的 allowInsecure / remoteSettingsFromEnv / positiveIntEnv。
+ * Node/Workers 共用字段由 core runtimeEnv Zod schema 解析，本文件只保留 Node 宿主字段。
  */
 
 interface ServerConfig {
@@ -1066,12 +1123,7 @@ interface ServerConfig {
     redisUrl?: string;
     refThresholdBytes?: number;
     refTtlSec?: number;
-    remote: {
-        allowInsecure: boolean;
-        allowlist: string[];
-        instanceId?: string;
-        maxHops: number;
-    };
+    remote: RuntimeRemoteSettings;
     /**
      * 本副本标识(TB_REPLICA_ID),路由表的 value。缺省用 hostname —— 容器平台上
      * 每个副本的 hostname 天然唯一;同机多进程需显式区分。

package/dist/index.js

@@ -12,9 +12,10 @@ import {
   configFromEnv,
   createDataObjectStore,
   createTbServer
-} from "./chunk-BB6ZLMTU.js";
-import "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-CLEZ6YQ6.js";
+import "./chunk-SWBNHIO4.js";
+import "./chunk-OKRZPQ3R.js";
+import "./chunk-U67V476Y.js";
 export {
   DEVICE_FORWARD_TIMEOUT_MS,
   DEVICE_ROUTE_TTL_SEC,

package/dist/{ip2proxy-DAYO7EKZ.js → ip2proxy-OBCG6X6J.js}

@@ -1,17 +1,18 @@
+import {
+  createProviderHttpClient
+} from "./chunk-VLOIDU5U.js";
+import "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
-import {
-  guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} from "./chunk-B4P6YZFS.js";
+import "./chunk-SWBNHIO4.js";
 import {
   TBError,
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-OKRZPQ3R.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/ip2proxy/schema.ts
 var lookupIpInput = external_exports.strictObject({
@@ -48,55 +49,47 @@ var ip2proxyActions = {
 // ../plugins/src/ip2proxy/api.ts
 var SERVICE = "ip2proxy";
 var API_BASE = "https://api.ip2proxy.com";
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 var DEFAULT_PACKAGE = "PX1";
-async function readPayload(response) {
-  const body = await response.text();
-  if (body === "") return null;
-  try {
-    return JSON.parse(body);
-  } catch {
-    return body;
-  }
-}
 function payloadError(payload) {
   if (payload === null || typeof payload !== "object" || Array.isArray(payload)) return void 0;
   const message = payload.response;
   if (typeof message !== "string" || message === "" || message === "OK") return void 0;
   return message;
 }
+function classifiedPayloadError(message) {
+  const lower = message.toLowerCase();
+  return upstreamError(lower.includes("api key") || lower.includes("credit") ? 401 : 502, message);
+}
 async function lookupIp(input, ctx) {
   if (input.ip === void 0 || input.ip === "") {
     throw new TBError("invalid_argument", "ip \u4E0D\u80FD\u4E3A\u7A7A");
   }
-  const url = new URL("/", API_BASE);
-  url.searchParams.set("key", requireApiKey(ctx, SERVICE));
-  url.searchParams.set("format", "json");
-  url.searchParams.set("ip", input.ip);
-  url.searchParams.set("package", input.package ?? DEFAULT_PACKAGE);
-  let response;
-  let payload;
-  try {
-    response = await guardedFetch(url.toString(), {
-      method: "GET",
-      headers: { accept: "application/json" }
-    });
-    payload = await readPayload(response);
-  } catch (error) {
-    throw new TBError(
+  const result = await http.request({
+    path: "/",
+    method: "GET",
+    query: [
+      ["key", requireApiKey(ctx, SERVICE)],
+      ["format", "json"],
+      ["ip", input.ip],
+      ["package", input.package ?? DEFAULT_PACKAGE]
+    ],
+    headers: { accept: "application/json" },
+    invalidJson: "text",
+    mapError: ({ data: payload2, status, statusText }) => {
+      const failure2 = payloadError(payload2);
+      if (failure2 !== void 0) return classifiedPayloadError(failure2);
+      return upstreamError(status || 500, statusText || "IP2Proxy request failed");
+    },
+    mapTransportError: ({ message }) => new TBError(
       "unavailable",
-      error instanceof Error ? `IP2Proxy \u8BF7\u6C42\u5931\u8D25: ${error.message}` : "IP2Proxy \u8BF7\u6C42\u5931\u8D25",
+      message === void 0 ? "IP2Proxy \u8BF7\u6C42\u5931\u8D25" : `IP2Proxy \u8BF7\u6C42\u5931\u8D25: ${message}`,
       { retryable: true }
-    );
-  }
+    )
+  });
+  const payload = result.bodyKind === "empty" ? null : result.data;
   const failure = payloadError(payload);
-  if (failure !== void 0) {
-    const lower = failure.toLowerCase();
-    const credentialIssue = lower.includes("api key") || lower.includes("credit");
-    throw upstreamError(credentialIssue ? 401 : 502, failure);
-  }
-  if (!response.ok) {
-    throw upstreamError(response.status || 500, response.statusText || "IP2Proxy request failed");
-  }
+  if (failure !== void 0) throw classifiedPayloadError(failure);
   if (payload === null || typeof payload !== "object" || Array.isArray(payload)) {
     throw new TBError("unavailable", "IP2Proxy \u8FD4\u56DE\u7684\u4E0D\u662F JSON \u5BF9\u8C61", { retryable: true });
   }

package/dist/{ipgeolocation_io-XD4PSLII.js → ipgeolocation_io-NHH3DTQW.js}

@@ -1,25 +1,25 @@
+import {
+  createProviderHttpClient
+} from "./chunk-VLOIDU5U.js";
+import {
+  asJsonObject
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
-import {
-  guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} from "./chunk-B4P6YZFS.js";
+import "./chunk-SWBNHIO4.js";
 import {
-  TBError,
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-OKRZPQ3R.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/ipgeolocation_io/api.ts
 var SERVICE = "ipgeolocation_io";
 var API_BASE = "https://api.ipgeolocation.io/";
 var REQUEST_TIMEOUT_MS = 3e4;
-function toRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
+var http = createProviderHttpClient({ baseUrl: API_BASE, service: SERVICE });
 function nullableString(value) {
   if (typeof value === "string") return value;
   if (typeof value === "number" || typeof value === "boolean") return String(value);
@@ -39,47 +39,27 @@ function nullableInteger(value) {
 }
 function errorMessage(payload, status) {
   if (typeof payload === "string" && payload.trim() !== "") return payload;
-  const record = toRecord(payload);
+  const record = asJsonObject(payload);
   const message = record?.message ?? record?.error;
   if (typeof message === "string" && message.trim() !== "") return message;
   return `IPGeolocation.io request failed with status ${status}`;
 }
-async function readPayload(response) {
-  const body = await response.text();
-  if (body.trim() === "") return null;
-  try {
-    return JSON.parse(body);
-  } catch {
-    throw upstreamError(502, "IPGeolocation.io returned invalid JSON");
-  }
-}
 async function request(ctx, path, params) {
-  const url = new URL(path, API_BASE);
-  url.searchParams.set("apiKey", requireApiKey(ctx, SERVICE));
-  for (const [key, value] of Object.entries(params)) {
-    if (value !== void 0) url.searchParams.set(key, value);
-  }
-  let response;
-  try {
-    response = await guardedFetch(url.toString(), {
-      method: "GET",
-      headers: { accept: "application/json" },
-      signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
-    });
-  } catch (error) {
-    if (error instanceof TBError) throw error;
-    if (error instanceof Error && error.name === "TimeoutError") {
-      throw upstreamError(504, "IPGeolocation.io request timed out");
-    }
-    throw error;
-  }
-  const payload = await readPayload(response);
-  if (!response.ok) {
-    const status = response.status;
-    const normalized = status === 429 || status === 401 || status === 403 ? status : status >= 400 && status < 500 ? 400 : status || 500;
-    throw upstreamError(normalized, errorMessage(payload, status));
-  }
-  const record = toRecord(payload);
+  const { data: payload } = await http.request({
+    path,
+    method: "GET",
+    query: [["apiKey", requireApiKey(ctx, SERVICE)], ...Object.entries(params)],
+    headers: { accept: "application/json" },
+    timeoutMs: REQUEST_TIMEOUT_MS,
+    invalidJsonMessage: "IPGeolocation.io returned invalid JSON",
+    mapError: ({ bodyKind, data, status }) => {
+      if (bodyKind === "invalid-json") return upstreamError(502, "IPGeolocation.io returned invalid JSON");
+      const normalized = status === 429 || status === 401 || status === 403 ? status : status >= 400 && status < 500 ? 400 : status || 500;
+      return upstreamError(normalized, errorMessage(data, status));
+    },
+    mapTransportError: ({ kind }) => kind === "timeout" ? upstreamError(504, "IPGeolocation.io request timed out") : upstreamError(502, "IPGeolocation.io request failed")
+  });
+  const record = asJsonObject(payload);
   if (record === void 0) throw upstreamError(502, "IPGeolocation.io returned an invalid payload");
   return record;
 }
@@ -106,7 +86,7 @@ async function lookupIp(input, ctx) {
     excludes: joinList(input.excludes),
     include: includes.length > 0 ? includes.join(",") : void 0
   });
-  const location = toRecord(payload.location) ?? payload;
+  const location = asJsonObject(payload.location) ?? payload;
   return {
     geolocation: {
       ip: nullableString(payload.ip),
@@ -122,17 +102,17 @@ async function lookupIp(input, ctx) {
       zipcode: nullableString(location.zipcode),
       latitude: nullableNumber(location.latitude),
       longitude: nullableNumber(location.longitude),
-      callingCode: nullableString(toRecord(payload.country_metadata)?.calling_code),
+      callingCode: nullableString(asJsonObject(payload.country_metadata)?.calling_code),
       countryFlag: nullableString(location.country_flag),
-      countryMetadata: toRecord(payload.country_metadata) ?? null,
-      network: toRecord(payload.network) ?? null,
-      asn: toRecord(payload.asn) ?? null,
-      company: toRecord(payload.company) ?? null,
-      timeZone: toRecord(payload.time_zone) ?? null,
-      currency: toRecord(payload.currency) ?? null,
-      security: toRecord(payload.security) ?? null,
-      abuse: toRecord(payload.abuse) ?? null,
-      userAgent: toRecord(payload.user_agent) ?? null,
+      countryMetadata: asJsonObject(payload.country_metadata) ?? null,
+      network: asJsonObject(payload.network) ?? null,
+      asn: asJsonObject(payload.asn) ?? null,
+      company: asJsonObject(payload.company) ?? null,
+      timeZone: asJsonObject(payload.time_zone) ?? null,
+      currency: asJsonObject(payload.currency) ?? null,
+      security: asJsonObject(payload.security) ?? null,
+      abuse: asJsonObject(payload.abuse) ?? null,
+      userAgent: asJsonObject(payload.user_agent) ?? null,
       raw: payload
     }
   };
@@ -163,7 +143,7 @@ async function getTimezone(input, ctx) {
       yearAbbr: nullableString(payload.year_abbr),
       isDst: typeof payload.is_dst === "boolean" ? payload.is_dst : null,
       dstSavings: nullableInteger(payload.dst_savings),
-      geo: toRecord(payload.geo) ?? null,
+      geo: asJsonObject(payload.geo) ?? null,
       raw: payload
     }
   };
@@ -178,7 +158,7 @@ async function getAstronomy(input, ctx) {
   });
   return {
     astronomy: {
-      location: toRecord(payload.location) ?? null,
+      location: asJsonObject(payload.location) ?? null,
       date: nullableString(payload.date),
       currentTime: nullableString(payload.current_time),
       sunrise: nullableString(payload.sunrise),

package/dist/{ipqualityscore-K27QEAWK.js → ipqualityscore-7POMCBEC.js}

@@ -1,21 +1,23 @@
+import {
+  createProviderHttpClient
+} from "./chunk-VLOIDU5U.js";
+import "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
-import {
-  guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} from "./chunk-B4P6YZFS.js";
+import "./chunk-SWBNHIO4.js";
 import {
   TBError,
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-OKRZPQ3R.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/ipqualityscore/api.ts
 var SERVICE = "ipqualityscore";
 var API_BASE = "https://www.ipqualityscore.com";
+var http = createProviderHttpClient({ baseUrl: API_BASE, service: SERVICE });
 var IP_LITERAL = external_exports.union([external_exports.ipv4(), external_exports.ipv6()]);
 function optionalText(value) {
   return value?.trim() || void 0;
@@ -32,55 +34,41 @@ function messageOf(payload) {
   const pick = (value) => typeof value === "string" ? optionalText(value) : void 0;
   return pick(record.message) ?? pick(record.error);
 }
-function ipqsError(response, payload) {
-  const message = messageOf(payload) ?? optionalText(response.statusText) ?? `IPQualityScore request failed with ${response.status}`;
+function ipqsError(status, statusText, payload) {
+  const message = messageOf(payload) ?? optionalText(statusText) ?? `IPQualityScore request failed with ${status}`;
   const lower = message.toLowerCase();
-  if (response.status === 429 || response.status === 402 || lower.includes("insufficient credits")) {
+  if (status === 429 || status === 402 || lower.includes("insufficient credits")) {
     return upstreamError(429, message);
   }
-  if (lower.includes("invalid api key") || lower.includes("api key") || response.status === 401 || response.status === 403) {
+  if (lower.includes("invalid api key") || lower.includes("api key") || status === 401 || status === 403) {
     return upstreamError(401, message);
   }
-  if (response.status === 400 || lower.includes("invalid ip") || lower.includes("invalid email") || lower.includes("invalid phone") || lower.includes("invalid url")) {
+  if (status === 400 || lower.includes("invalid ip") || lower.includes("invalid email") || lower.includes("invalid phone") || lower.includes("invalid url")) {
     return upstreamError(400, message);
   }
-  return upstreamError(response.status >= 400 ? response.status : 502, message);
-}
-async function readPayload(response) {
-  const body = await response.text();
-  if (body === "") return null;
-  try {
-    return JSON.parse(body);
-  } catch {
-    return body;
-  }
+  return upstreamError(status >= 400 ? status : 502, message);
 }
 async function request(ctx, family, value, query = []) {
-  const path = `/api/json/${family}/${encodeURIComponent(requireApiKey(ctx, SERVICE))}/${encodeURIComponent(value)}`;
-  const url = new URL(path, API_BASE);
-  for (const [key, queryValue] of query) {
-    if (queryValue !== void 0) url.searchParams.append(key, queryValue);
-  }
-  let response;
-  let payload;
-  try {
-    response = await guardedFetch(url.toString(), {
-      method: "GET",
-      headers: { accept: "application/json" }
-    });
-    payload = await readPayload(response);
-  } catch (error) {
-    throw new TBError(
+  const apiKey = requireApiKey(ctx, SERVICE);
+  const result = await http.request({
+    path: `/api/json/${family}/${encodeURIComponent(apiKey)}/${encodeURIComponent(value)}`,
+    method: "GET",
+    query,
+    headers: { accept: "application/json" },
+    invalidJson: "text",
+    sensitiveValues: [apiKey],
+    mapError: ({ data, status, statusText }) => ipqsError(status, statusText, data),
+    mapTransportError: ({ message }) => new TBError(
       "unavailable",
-      error instanceof Error ? `IPQualityScore \u8BF7\u6C42\u5931\u8D25: ${error.message}` : "IPQualityScore \u8BF7\u6C42\u5931\u8D25",
+      message === void 0 ? "IPQualityScore \u8BF7\u6C42\u5931\u8D25" : `IPQualityScore \u8BF7\u6C42\u5931\u8D25: ${message}`,
       { retryable: true }
-    );
-  }
-  if (!response.ok) throw ipqsError(response, payload);
+    )
+  });
+  const payload = result.bodyKind === "empty" ? null : result.data;
   if (payload === null || typeof payload !== "object" || Array.isArray(payload)) {
     throw new TBError("unavailable", `IPQualityScore \u5BF9 ${family} \u7684\u54CD\u5E94\u4E0D\u662F JSON \u5BF9\u8C61`, { retryable: true });
   }
-  if (payload.success === false) throw ipqsError(response, payload);
+  if (payload.success === false) throw ipqsError(result.status, result.statusText, payload);
   return payload;
 }
 async function checkIpReputation(input, ctx) {