@tool-bridge/server 0.16.0 → 0.17.0

package/dist/{zhihu-BKZIB3WA.js → zhihu-CIXKCHIU.js}

@@ -1,83 +1,61 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import {
+  asJsonObject,
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
-import {
-  guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} from "./chunk-YASUMV2K.js";
+import "./chunk-U5UHT7CX.js";
 import {
   TBError,
   external_exports
-} from "./chunk-YB2FLNWI.js";
-import "./chunk-MLKGABMK.js";
+} from "./chunk-RVWZN3CI.js";
+import "./chunk-U67V476Y.js";
 
 // ../plugins/src/zhihu/api.ts
 var SERVICE = "zhihu";
 var API_BASE = "https://developer.zhihu.com";
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 var CODE_STATUS = {
   10001: 400,
   20001: 401,
   30001: 429
 };
-function asRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
-function optionalText(value) {
-  if (typeof value !== "string") return void 0;
-  const trimmed = value.trim();
-  return trimmed === "" ? void 0 : trimmed;
-}
 function errorMessage(payload) {
-  const direct = optionalText(payload);
+  const direct = trimmedText(payload);
   if (direct !== void 0) return direct;
-  const record = asRecord(payload);
+  const record = asJsonObject(payload);
   if (record === void 0) return void 0;
-  const nested = asRecord(record.error);
-  return optionalText(record.Message) ?? optionalText(record.msg) ?? optionalText(record.message) ?? optionalText(nested?.message);
-}
-async function readPayload(response) {
-  const text = await response.text();
-  if (text === "") return {};
-  try {
-    return JSON.parse(text);
-  } catch {
-    throw upstreamError(502, "\u77E5\u4E4E\u8FD4\u56DE\u4E86\u975E\u6CD5 JSON");
-  }
+  const nested = asJsonObject(record.error);
+  return trimmedText(record.Message) ?? trimmedText(record.msg) ?? trimmedText(record.message) ?? trimmedText(nested?.message);
 }
 async function request(ctx, input) {
   const apiKey = requireApiKey(ctx, SERVICE);
-  const url = new URL(input.path, API_BASE);
-  for (const [key, value] of Object.entries(input.query ?? {})) {
-    if (value !== void 0) url.searchParams.set(key, String(value));
-  }
-  let response;
-  try {
-    response = await guardedFetch(url.toString(), {
-      method: input.method ?? "GET",
-      headers: {
-        "authorization": `Bearer ${apiKey}`,
-        // 上游对 GET 也发这个头。无 body 时它没有意义,但照搬以免改变打给上游的请求形状。
-        "content-type": "application/json",
-        "x-request-timestamp": String(Math.floor(Date.now() / 1e3))
-      },
-      ...input.body === void 0 ? {} : { body: JSON.stringify(input.body) }
-    });
-  } catch (error) {
-    throw upstreamError(
+  const response = await http.request({
+    method: input.method ?? "GET",
+    path: input.path,
+    query: Object.entries(input.query ?? {}).map(([key, value]) => [key, value === void 0 ? void 0 : String(value)]),
+    headers: {
+      "authorization": `Bearer ${apiKey}`,
+      // 上游对 GET 也发这个头。无 body 时它没有意义,但照搬以免改变打给上游的请求形状。
+      "content-type": "application/json",
+      "x-request-timestamp": String(Math.floor(Date.now() / 1e3))
+    },
+    ...input.body === void 0 ? {} : { json: input.body },
+    invalidJsonMessage: "\u77E5\u4E4E\u8FD4\u56DE\u4E86\u975E\u6CD5 JSON",
+    mapError: ({ bodyKind, data, status }) => bodyKind === "invalid-json" ? upstreamError(502, "\u77E5\u4E4E\u8FD4\u56DE\u4E86\u975E\u6CD5 JSON") : upstreamError(status, errorMessage(data) ?? `\u77E5\u4E4E\u8BF7\u6C42\u5931\u8D25(HTTP ${status})`),
+    mapTransportError: ({ message }) => upstreamError(
       502,
-      error instanceof Error ? `\u77E5\u4E4E\u8BF7\u6C42\u5931\u8D25: ${error.message}` : "\u77E5\u4E4E\u8BF7\u6C42\u5931\u8D25"
-    );
-  }
-  const payload = await readPayload(response);
-  if (!response.ok) {
-    throw upstreamError(
-      response.status,
-      errorMessage(payload) ?? `\u77E5\u4E4E\u8BF7\u6C42\u5931\u8D25(HTTP ${response.status})`
-    );
-  }
-  const code = asRecord(payload)?.Code;
+      message === void 0 ? "\u77E5\u4E4E\u8BF7\u6C42\u5931\u8D25" : `\u77E5\u4E4E\u8BF7\u6C42\u5931\u8D25: ${message}`
+    )
+  });
+  const payload = response.bodyKind === "empty" ? {} : response.data;
+  const code = asJsonObject(payload)?.Code;
   if (typeof code === "number" && Number.isFinite(code) && code !== 0) {
     throw upstreamError(
       CODE_STATUS[code] ?? 502,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tool-bridge/server",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "tool-bridge self-hosted server: run the HTBP gateway on Node with SQLite or PostgreSQL persistence, filesystem object storage and WebSocket device channel — single container via docker run",
   "type": "module",
   "license": "MIT",
@@ -40,7 +40,7 @@
     "ioredis": "^6.0.0",
     "postgres": "^3.4.9",
     "ws": "8.21.0",
-    "@tool-bridge/dashboard": "0.22.0"
+    "@tool-bridge/dashboard": "0.23.0"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",
@@ -49,9 +49,9 @@
     "tsup": "^8.5.1",
     "tsx": "^4.23.0",
     "vitest": "^4.1.10",
-    "@tool-bridge/app": "0.15.0",
-    "@tool-bridge/core": "0.1.0",
-    "@tool-bridge/plugins": "0.1.0"
+    "@tool-bridge/app": "0.16.0",
+    "@tool-bridge/plugins": "0.1.0",
+    "@tool-bridge/core": "0.1.0"
   },
   "repository": {
     "type": "git",

package/dist/chunk-2O27H4Y2.js

@@ -1,183 +0,0 @@
-import {
-  TBError
-} from "./chunk-YB2FLNWI.js";
-
-// ../plugins/src/_runtime/ipPolicy.ts
-function parseIpv4(value) {
-  const parts = value.split(".");
-  if (parts.length !== 4) return void 0;
-  let result = 0;
-  for (const part of parts) {
-    if (!/^\d{1,3}$/.test(part) || part.length > 1 && part.startsWith("0")) return void 0;
-    const octet = Number(part);
-    if (octet > 255) return void 0;
-    result = result << 8 | octet;
-  }
-  return result >>> 0;
-}
-function parseIpv6(value) {
-  let text = value;
-  if (text.startsWith("[") && text.endsWith("]")) text = text.slice(1, -1);
-  const zone = text.indexOf("%");
-  if (zone !== -1) text = text.slice(0, zone);
-  if (!text.includes(":")) return void 0;
-  const halves = text.split("::");
-  if (halves.length > 2) return void 0;
-  const expand = (part) => {
-    if (part === "") return [];
-    const groups2 = [];
-    const chunks = part.split(":");
-    for (let i = 0; i < chunks.length; i += 1) {
-      const chunk = chunks[i];
-      if (i === chunks.length - 1 && chunk.includes(".")) {
-        const v4 = parseIpv4(chunk);
-        if (v4 === void 0) return void 0;
-        groups2.push(v4 >>> 16 & 65535, v4 & 65535);
-        continue;
-      }
-      if (!/^[0-9a-fA-F]{1,4}$/.test(chunk)) return void 0;
-      groups2.push(Number.parseInt(chunk, 16));
-    }
-    return groups2;
-  };
-  const head = expand(halves[0] ?? "");
-  const tail = halves.length === 2 ? expand(halves[1] ?? "") : [];
-  if (head === void 0 || tail === void 0) return void 0;
-  const missing = 8 - head.length - tail.length;
-  if (halves.length === 2 ? missing < 0 : missing !== 0) return void 0;
-  const groups = [...head, ...Array.from({ length: halves.length === 2 ? missing : 0 }, () => 0), ...tail];
-  if (groups.length !== 8) return void 0;
-  const bytes = new Uint8Array(16);
-  groups.forEach((group, i) => {
-    bytes[i * 2] = group >>> 8 & 255;
-    bytes[i * 2 + 1] = group & 255;
-  });
-  return bytes;
-}
-function classifyIpv4(value) {
-  const a = value >>> 24 & 255;
-  const b = value >>> 16 & 255;
-  const c = value >>> 8 & 255;
-  if (a === 0) return "blocked";
-  if (a === 10) return "blocked";
-  if (a === 127) return "blocked";
-  if (a === 169 && b === 254) return "blocked";
-  if (a === 172 && b >= 16 && b <= 31) return "blocked";
-  if (a === 192 && b === 0 && c === 0) return "blocked";
-  if (a === 192 && b === 0 && c === 2) return "blocked";
-  if (a === 192 && b === 168) return "blocked";
-  if (a === 198 && (b === 18 || b === 19)) return "blocked";
-  if (a === 198 && b === 51 && c === 100) return "blocked";
-  if (a === 203 && b === 0 && c === 113) return "blocked";
-  if (a === 100 && b >= 64 && b <= 127) return "blocked";
-  if (a >= 224) return "blocked";
-  return "public";
-}
-function classifyIpv6(bytes) {
-  const isZero = bytes.every((byte) => byte === 0);
-  if (isZero) return "blocked";
-  if (bytes.slice(0, 15).every((byte) => byte === 0) && bytes[15] === 1) return "blocked";
-  const v4Mapped = bytes.slice(0, 10).every((byte) => byte === 0) && (bytes[10] === 255 && bytes[11] === 255 || bytes[10] === 0 && bytes[11] === 0);
-  if (v4Mapped) {
-    const v4 = (bytes[12] << 24 | bytes[13] << 16 | bytes[14] << 8 | bytes[15]) >>> 0;
-    return classifyIpv4(v4);
-  }
-  const first = bytes[0];
-  if ((first & 254) === 252) return "blocked";
-  if (first === 254 && (bytes[1] & 192) === 128) return "blocked";
-  if (first === 255) return "blocked";
-  if (first === 32 && bytes[1] === 1 && bytes[2] === 13 && bytes[3] === 184) return "blocked";
-  return "public";
-}
-function isIpAddress(value) {
-  return parseIpv4(value) !== void 0 || parseIpv6(value) !== void 0;
-}
-function classifyIpAddress(address) {
-  const v4 = parseIpv4(address);
-  if (v4 !== void 0) return classifyIpv4(v4);
-  const v6 = parseIpv6(address);
-  if (v6 !== void 0) return classifyIpv6(v6);
-  return "blocked";
-}
-
-// ../plugins/src/_runtime/guardedFetch.ts
-var MAX_REDIRECTS = 5;
-var CROSS_ORIGIN_STRIPPED_HEADERS = [
-  "authorization",
-  "cookie",
-  "proxy-authorization"
-  // 各家自定义的密钥头没有统一命名,凡是名字里带 key/token/secret 的一律剥掉:
-  // 宁可让跨源跳转少带一个无关头,也不能漏带走一个凭证。
-];
-function looksLikeCredentialHeader(name) {
-  return /(?:^|-)(?:api[-_]?key|key|token|secret|auth)(?:$|-)/i.test(name);
-}
-function stripCredentials(headers, sensitiveHeaders) {
-  const next = new Headers(headers);
-  for (const [name] of headers) {
-    if (CROSS_ORIGIN_STRIPPED_HEADERS.includes(name.toLowerCase()) || looksLikeCredentialHeader(name) || sensitiveHeaders.has(name.toLowerCase())) {
-      next.delete(name);
-    }
-  }
-  return next;
-}
-var EgressBlockedError = class extends TBError {
-  constructor(message) {
-    super("invalid_argument", message);
-    this.name = "EgressBlockedError";
-  }
-};
-function assertPublicHttpUrl(value) {
-  let url;
-  try {
-    url = value instanceof URL ? value : new URL(value);
-  } catch {
-    throw new EgressBlockedError(`\u51FA\u7AD9\u76EE\u6807\u4E0D\u662F\u5408\u6CD5 URL: ${String(value)}`);
-  }
-  if (url.protocol !== "https:" && url.protocol !== "http:") {
-    throw new EgressBlockedError(`\u51FA\u7AD9\u76EE\u6807\u534F\u8BAE\u4E0D\u88AB\u5141\u8BB8: ${url.protocol}`);
-  }
-  const hostname = url.hostname.startsWith("[") && url.hostname.endsWith("]") ? url.hostname.slice(1, -1) : url.hostname;
-  if (hostname === "") throw new EgressBlockedError("\u51FA\u7AD9\u76EE\u6807\u7F3A\u5C11\u4E3B\u673A\u540D");
-  if (isIpAddress(hostname) && classifyIpAddress(hostname) === "blocked") {
-    throw new EgressBlockedError("\u51FA\u7AD9\u76EE\u6807\u6307\u5411\u79C1\u6709\u6216\u4FDD\u7559\u5730\u5740");
-  }
-  return url;
-}
-function createGuardedFetch(options = {}) {
-  const crossOriginRedirect = options.crossOriginRedirect ?? "follow";
-  const maxRedirects = options.maxRedirects ?? MAX_REDIRECTS;
-  const sensitiveHeaders = new Set(
-    (options.sensitiveHeaders ?? []).map((name) => name.toLowerCase())
-  );
-  return async function guardedFetch2(input, init) {
-    const transport = options.fetch ?? globalThis.fetch;
-    const initial = input instanceof Request ? input.url : String(input);
-    let url = assertPublicHttpUrl(initial);
-    let request = input instanceof Request ? new Request(url, new Request(input, init)) : new Request(url, { ...init, redirect: "manual" });
-    for (let hop = 0; ; hop += 1) {
-      const response = await transport(new Request(request, { redirect: "manual" }));
-      const location = response.headers.get("location");
-      if (response.status < 300 || response.status > 399 || location === null) return response;
-      if (hop >= maxRedirects) {
-        throw new EgressBlockedError(`\u51FA\u7AD9\u91CD\u5B9A\u5411\u8D85\u8FC7 ${maxRedirects} \u8DF3`);
-      }
-      const previousOrigin = new URL(request.url).origin;
-      url = assertPublicHttpUrl(new URL(location, url));
-      const crossesOrigin = url.origin !== previousOrigin;
-      if (crossesOrigin && crossOriginRedirect === "error") {
-        throw new EgressBlockedError("\u643A\u5E26\u654F\u611F\u4FE1\u606F\u7684\u51FA\u7AD9\u8BF7\u6C42\u4E0D\u5141\u8BB8\u8DE8\u6E90\u91CD\u5B9A\u5411");
-      }
-      const headers = !crossesOrigin ? request.headers : stripCredentials(request.headers, sensitiveHeaders);
-      const downgrade = response.status === 303 || (response.status === 301 || response.status === 302) && request.method !== "GET";
-      request = downgrade ? new Request(url, { method: "GET", headers, redirect: "manual" }) : new Request(url, { ...request, headers, redirect: "manual" });
-    }
-  };
-}
-var guardedFetch = createGuardedFetch();
-
-export {
-  assertPublicHttpUrl,
-  createGuardedFetch,
-  guardedFetch
-};