@tool-bridge/server 0.20.0 → 0.21.1

package/dist/{v2ex-24KMSWS7.js → v2ex-RHJ234PZ.js}

@@ -1,6 +1,7 @@
 import {
-  createProviderHttpClient
-} from "./chunk-6X55ALDX.js";
+  createAuthedClient
+} from "./chunk-XYBU3WZH.js";
+import "./chunk-E6JCVKW6.js";
 import {
   asJsonObject,
   trimmedText
@@ -9,12 +10,12 @@ import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-6ANLYNFB.js";
-import "./chunk-3WL6EXYX.js";
+} from "./chunk-ATK45BXV.js";
+import "./chunk-U7B6DS2O.js";
 import {
   TBError,
   external_exports
-} from "./chunk-WIGQCP6O.js";
+} from "./chunk-UZM2RXZH.js";
 import "./chunk-U67V476Y.js";
 
 // ../plugins/src/v2ex/api.ts
@@ -22,8 +23,6 @@ var SERVICE = "v2ex";
 var API_BASE = "https://www.v2ex.com/api/v2";
 var LEGACY_API_BASE = "https://www.v2ex.com/api";
 var REQUEST_TIMEOUT_MS = 3e4;
-var v2Http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
-var legacyHttp = createProviderHttpClient({ baseUrl: `${LEGACY_API_BASE}/`, service: SERVICE });
 function invalidResponse(message) {
   return new TBError("unavailable", message, { retryable: true });
 }
@@ -49,35 +48,53 @@ function errorMessage(payload) {
 function envelopeError(payload) {
   return new TBError("invalid_argument", errorMessage(payload) ?? "V2EX request failed");
 }
-async function send(client, request2, label) {
-  const response = await client.request({
+var v2Http = createAuthedClient({
+  baseUrl: `${API_BASE}/`,
+  service: SERVICE,
+  auth: { kind: "bearer" },
+  headers: { accept: "application/json" },
+  mapError: ({ data, status }) => upstreamError(status, errorMessage(data) ?? "V2EX request failed")
+});
+var legacyHttp = createAuthedClient({
+  baseUrl: `${LEGACY_API_BASE}/`,
+  service: SERVICE,
+  // legacy API **不带 Authorization** —— 上游这条路径压根不调 `buildV2exHeaders`,加上 Bearer
+  // 也没用。但仍然先 `requireApiKey`:上游整个 provider 的 authType 是 `api_key`,没配凭证时
+  // 连 context 都建不起来,这两个 action 一样调不通。这里保留那道闸 —— 否则"配了才能用"
+  // 会因为迁移悄悄变成"这两个不用配",挂载语义就不一致了。
+  auth: {
+    kind: "custom",
+    headers: (ctx) => {
+      requireApiKey(ctx, SERVICE);
+      return {};
+    }
+  },
+  headers: { accept: "application/json" },
+  mapError: ({ data, status }) => upstreamError(status, errorMessage(data) ?? "V2EX request failed")
+});
+async function send(client, ctx, request2, label) {
+  const response = await client.request(ctx, {
     ...request2,
     timeoutMs: REQUEST_TIMEOUT_MS,
     invalidJson: "text",
-    mapError: ({ data, status }) => upstreamError(status, errorMessage(data) ?? "V2EX request failed"),
     mapTransportError: ({ kind, message }) => kind === "timeout" ? upstreamError(504, `${label} request timed out after ${REQUEST_TIMEOUT_MS / 1e3} seconds`) : upstreamError(502, message === void 0 ? `${label} request failed` : `${label} request failed: ${message}`)
   });
   return response.bodyKind === "empty" ? null : response.data;
 }
 async function request(ctx, options) {
-  const headers = {
-    accept: "application/json",
-    authorization: `Bearer ${requireApiKey(ctx, SERVICE)}`
-  };
-  return send(v2Http, {
+  return send(v2Http, ctx, {
     method: options.method,
     path: options.path,
     // 上游连**空串**也当作"没给",不只是 undefined/null。
     query: Object.entries(options.query ?? {}).filter(([, value]) => value !== void 0 && value !== ""),
-    headers,
     ...options.body === void 0 ? {} : { json: options.body }
   }, `V2EX ${options.path}`);
 }
 async function legacyRequest(ctx, path) {
-  requireApiKey(ctx, SERVICE);
   const payload = await send(
     legacyHttp,
-    { method: "GET", path, headers: { accept: "application/json" } },
+    ctx,
+    { method: "GET", path },
     `V2EX legacy ${path}`
   );
   if (!Array.isArray(payload)) {

package/dist/{vercel-B45LPF6I.js → vercel-AS6NCIC7.js}

@@ -1,6 +1,7 @@
 import {
-  createProviderHttpClient
-} from "./chunk-6X55ALDX.js";
+  createAuthedClient
+} from "./chunk-XYBU3WZH.js";
+import "./chunk-E6JCVKW6.js";
 import {
   asJsonObject,
   booleanValue,
@@ -9,21 +10,30 @@ import {
   trimmedText
 } from "./chunk-JXHMDBAY.js";
 import {
-  createProviderPlugin,
-  requireApiKey,
-  upstreamError
-} from "./chunk-6ANLYNFB.js";
-import "./chunk-3WL6EXYX.js";
+  createProviderPlugin
+} from "./chunk-ATK45BXV.js";
+import "./chunk-U7B6DS2O.js";
 import {
   TBError,
   external_exports
-} from "./chunk-WIGQCP6O.js";
+} from "./chunk-UZM2RXZH.js";
 import "./chunk-U67V476Y.js";
 
 // ../plugins/src/vercel/api.ts
 var SERVICE = "vercel";
 var API_BASE = "https://api.vercel.com";
-var http = createProviderHttpClient({ baseUrl: API_BASE, service: SERVICE });
+var http = createAuthedClient({
+  baseUrl: API_BASE,
+  service: SERVICE,
+  auth: { kind: "bearer" },
+  // 错误体形如 `{ error: { code, message } }`,少数端点直接把 code/message 放在顶层。
+  // 两者都拿不到时:JSON 体不回显原文(那是整个错误 body,可能带上游内部细节),
+  // 非 JSON 体(HTML 错误页之类)才把原文当消息用 —— 这是上游 readVercelError 的兜底。
+  errorMessage: {
+    keys: ["error.message", "message"],
+    fallback: (status) => `Vercel \u8FD4\u56DE HTTP ${status}`
+  }
+});
 function stringArray(value) {
   return Array.isArray(value) ? value.filter((item) => typeof item === "string") : void 0;
 }
@@ -55,20 +65,13 @@ function arrayPayload(payload, key) {
 }
 async function request(ctx, input) {
   const hasBody = input.body !== void 0;
-  const { data } = await http.request({
+  const { data } = await http.request(ctx, {
     path: input.path,
     method: input.method ?? "GET",
     // 上游 `queryParams` 连空串一起跳过。
     query: Object.entries(input.query ?? {}).filter(([, value]) => value !== void 0 && value !== ""),
-    headers: { authorization: `Bearer ${requireApiKey(ctx, SERVICE)}` },
     ...hasBody ? { json: input.body } : {},
-    invalidJsonMessage: "Vercel \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94",
-    mapError: ({ bodyKind, data: payload, status }) => {
-      const body = asJsonObject(payload) ?? {};
-      const error = asJsonObject(body.error) ?? {};
-      const message = trimmedText(error.message) ?? trimmedText(body.message) ?? (bodyKind === "invalid-json" || bodyKind === "text" ? trimmedText(payload) : void 0) ?? `Vercel \u8FD4\u56DE HTTP ${status}`;
-      return upstreamError(status, message);
-    }
+    invalidJsonMessage: "Vercel \u8FD4\u56DE\u4E86\u975E JSON \u54CD\u5E94"
   });
   return data ?? {};
 }

package/dist/{wolfram_alpha_api-DKJWVR6G.js → wolfram_alpha_api-3G4PUJWB.js}

@@ -1,6 +1,6 @@
 import {
   createProviderHttpClient
-} from "./chunk-6X55ALDX.js";
+} from "./chunk-E6JCVKW6.js";
 import {
   asJsonObject,
   trimmedText
@@ -9,12 +9,12 @@ import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-6ANLYNFB.js";
-import "./chunk-3WL6EXYX.js";
+} from "./chunk-ATK45BXV.js";
+import "./chunk-U7B6DS2O.js";
 import {
   TBError,
   external_exports
-} from "./chunk-WIGQCP6O.js";
+} from "./chunk-UZM2RXZH.js";
 import "./chunk-U67V476Y.js";
 
 // ../plugins/src/wolfram_alpha_api/api.ts

package/dist/{wordpress-XYFSDZXY.js → wordpress-KNDAAUV7.js}

@@ -1,6 +1,7 @@
 import {
-  createProviderHttpClient
-} from "./chunk-6X55ALDX.js";
+  createAuthedClient
+} from "./chunk-XYBU3WZH.js";
+import "./chunk-E6JCVKW6.js";
 import {
   asJsonObject,
   compactDefined,
@@ -10,14 +11,14 @@ import {
   createProviderPlugin,
   requireCredential,
   upstreamError
-} from "./chunk-6ANLYNFB.js";
+} from "./chunk-ATK45BXV.js";
 import {
   assertPublicHttpUrl
-} from "./chunk-3WL6EXYX.js";
+} from "./chunk-U7B6DS2O.js";
 import {
   TBError,
   external_exports
-} from "./chunk-WIGQCP6O.js";
+} from "./chunk-UZM2RXZH.js";
 import "./chunk-U67V476Y.js";
 
 // ../plugins/src/wordpress/api.ts
@@ -25,7 +26,6 @@ var SERVICE = "wordpress";
 var API_PATH = "wp-json/wp/v2";
 var REST_ROOT_SUFFIXES = ["/wp-json/wp/v2", "/wp-json"];
 var CURRENT_USER_PATH = "/users/me";
-var http = createProviderHttpClient({ service: SERVICE });
 function requireRecord(value, message) {
   const result = asJsonObject(value);
   if (result === void 0) throw upstreamError(502, message);
@@ -90,24 +90,28 @@ function errorMessage(payload, context) {
 function jsonPayload(data, bodyKind) {
   return bodyKind === "json" ? data : null;
 }
+var http = createAuthedClient({
+  service: SERVICE,
+  auth: { kind: "custom", headers: (ctx) => ({ authorization: basicAuthHeader(ctx) }) },
+  headers: { accept: "application/json" },
+  mapError: (context) => upstreamError(
+    context.status || 502,
+    errorMessage(jsonPayload(context.data, context.bodyKind), context)
+  ),
+  mapTransportError: ({ message }) => upstreamError(
+    502,
+    message === void 0 ? "WordPress request failed" : `WordPress request failed: ${message}`
+  )
+});
 async function requestResponse(ctx, options) {
-  return http.request({
+  return http.request(ctx, {
     baseUrl: `${apiBaseUrl(ctx)}/`,
     path: options.path,
     method: options.method ?? "GET",
     query: queryPairs(options.query),
-    headers: { accept: "application/json", authorization: basicAuthHeader(ctx) },
     ...options.body === void 0 ? {} : { json: options.body },
     // 上游 response.json().catch(() => null)：成功或错误上的非 JSON 都按 null。
-    invalidJson: "text",
-    mapError: (context) => upstreamError(
-      context.status || 502,
-      errorMessage(jsonPayload(context.data, context.bodyKind), context)
-    ),
-    mapTransportError: ({ message }) => upstreamError(
-      502,
-      message === void 0 ? "WordPress request failed" : `WordPress request failed: ${message}`
-    )
+    invalidJson: "text"
   });
 }
 async function requestObject(ctx, options) {

package/dist/{workos-BEM7EPHM.js → workos-R6UITSJ7.js}

@@ -1,25 +1,24 @@
 import {
-  createProviderHttpClient
-} from "./chunk-6X55ALDX.js";
+  createAuthedClient
+} from "./chunk-XYBU3WZH.js";
+import "./chunk-E6JCVKW6.js";
 import {
   compactDefined
 } from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
-  requireApiKey,
   upstreamError
-} from "./chunk-6ANLYNFB.js";
-import "./chunk-3WL6EXYX.js";
+} from "./chunk-ATK45BXV.js";
+import "./chunk-U7B6DS2O.js";
 import {
   TBError,
   external_exports
-} from "./chunk-WIGQCP6O.js";
+} from "./chunk-UZM2RXZH.js";
 import "./chunk-U67V476Y.js";
 
 // ../plugins/src/workos/api.ts
 var SERVICE = "workos";
 var API_BASE = "https://api.workos.com";
-var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 function errorMessage(payload, status) {
   const error = payload.error;
   if (error !== null && typeof error === "object" && !Array.isArray(error)) {
@@ -31,32 +30,32 @@ function errorMessage(payload, status) {
   }
   return `WorkOS \u8FD4\u56DE HTTP ${status}`;
 }
+var http = createAuthedClient({
+  baseUrl: `${API_BASE}/`,
+  service: SERVICE,
+  auth: { kind: "bearer" },
+  headers: { accept: "application/json" },
+  mapError: ({ bodyKind, data, status }) => {
+    if (bodyKind === "invalid-json") {
+      return new TBError("unavailable", "WorkOS \u8FD4\u56DE\u4E86\u975E\u6CD5 JSON", { retryable: true });
+    }
+    const payload = bodyKind === "empty" ? {} : data !== null && typeof data === "object" && !Array.isArray(data) ? data : void 0;
+    return payload === void 0 ? new TBError("unavailable", "WorkOS \u8FD4\u56DE\u7684\u4E0D\u662F JSON \u5BF9\u8C61", { retryable: true }) : upstreamError(status, errorMessage(payload, status));
+  },
+  mapTransportError: ({ message }) => new TBError(
+    "unavailable",
+    message === void 0 ? "WorkOS \u8BF7\u6C42\u5931\u8D25" : `WorkOS \u8BF7\u6C42\u5931\u8D25: ${message}`,
+    { retryable: true }
+  )
+});
 async function request(ctx, input) {
-  const apiKey = requireApiKey(ctx, SERVICE);
-  const headers = {
-    accept: "application/json",
-    authorization: `Bearer ${apiKey}`
-  };
-  const response = await http.request({
+  const response = await http.request(ctx, {
     method: input.method,
     path: input.path,
     // 多值过滤是重复同名键(与 Render 的逗号拼接不同)。
     query: Object.entries(input.query ?? {}),
-    headers,
     ...input.body === void 0 ? {} : { json: input.body },
-    invalidJsonMessage: "WorkOS \u8FD4\u56DE\u4E86\u975E\u6CD5 JSON",
-    mapError: ({ bodyKind, data, status }) => {
-      if (bodyKind === "invalid-json") {
-        return new TBError("unavailable", "WorkOS \u8FD4\u56DE\u4E86\u975E\u6CD5 JSON", { retryable: true });
-      }
-      const payload2 = bodyKind === "empty" ? {} : data !== null && typeof data === "object" && !Array.isArray(data) ? data : void 0;
-      return payload2 === void 0 ? new TBError("unavailable", "WorkOS \u8FD4\u56DE\u7684\u4E0D\u662F JSON \u5BF9\u8C61", { retryable: true }) : upstreamError(status, errorMessage(payload2, status));
-    },
-    mapTransportError: ({ message }) => new TBError(
-      "unavailable",
-      message === void 0 ? "WorkOS \u8BF7\u6C42\u5931\u8D25" : `WorkOS \u8BF7\u6C42\u5931\u8D25: ${message}`,
-      { retryable: true }
-    )
+    invalidJsonMessage: "WorkOS \u8FD4\u56DE\u4E86\u975E\u6CD5 JSON"
   });
   const payload = response.bodyKind === "empty" ? {} : response.data !== null && typeof response.data === "object" && !Array.isArray(response.data) ? response.data : void 0;
   if (payload === void 0) {

package/dist/{zhihu-CFHZ4NC7.js → zhihu-AGK4HILK.js}

@@ -1,26 +1,25 @@
 import {
-  createProviderHttpClient
-} from "./chunk-6X55ALDX.js";
+  createAuthedClient
+} from "./chunk-XYBU3WZH.js";
+import "./chunk-E6JCVKW6.js";
 import {
   asJsonObject,
   trimmedText
 } from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
-  requireApiKey,
   upstreamError
-} from "./chunk-6ANLYNFB.js";
-import "./chunk-3WL6EXYX.js";
+} from "./chunk-ATK45BXV.js";
+import "./chunk-U7B6DS2O.js";
 import {
   TBError,
   external_exports
-} from "./chunk-WIGQCP6O.js";
+} from "./chunk-UZM2RXZH.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,
@@ -34,25 +33,26 @@ function errorMessage(payload) {
   const nested = asJsonObject(record.error);
   return trimmedText(record.Message) ?? trimmedText(record.msg) ?? trimmedText(record.message) ?? trimmedText(nested?.message);
 }
+var http = createAuthedClient({
+  baseUrl: `${API_BASE}/`,
+  service: SERVICE,
+  auth: { kind: "bearer" },
+  // 上游对 GET 也发 content-type。无 body 时它没有意义,但照搬以免改变打给上游的请求形状。
+  headers: { "content-type": "application/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,
+    message === void 0 ? "\u77E5\u4E4E\u8BF7\u6C42\u5931\u8D25" : `\u77E5\u4E4E\u8BF7\u6C42\u5931\u8D25: ${message}`
+  )
+});
 async function request(ctx, input) {
-  const apiKey = requireApiKey(ctx, SERVICE);
-  const response = await http.request({
+  const response = await http.request(ctx, {
     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))
-    },
+    headers: { "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,
-      message === void 0 ? "\u77E5\u4E4E\u8BF7\u6C42\u5931\u8D25" : `\u77E5\u4E4E\u8BF7\u6C42\u5931\u8D25: ${message}`
-    )
+    invalidJsonMessage: "\u77E5\u4E4E\u8FD4\u56DE\u4E86\u975E\u6CD5 JSON"
   });
   const payload = response.bodyKind === "empty" ? {} : response.data;
   const code = asJsonObject(payload)?.Code;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tool-bridge/server",
-  "version": "0.20.0",
+  "version": "0.21.1",
   "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.26.0"
+    "@tool-bridge/dashboard": "0.27.1"
   },
   "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/plugins": "0.1.0",
-    "@tool-bridge/app": "0.19.0",
-    "@tool-bridge/core": "0.1.0"
+    "@tool-bridge/app": "0.20.1",
+    "@tool-bridge/core": "0.1.0",
+    "@tool-bridge/plugins": "0.1.0"
   },
   "repository": {
     "type": "git",