@tool-bridge/server 0.16.0 → 0.17.0

package/dist/{mem0-D2FGGOIY.js → mem0-D2FPLYDX.js}

@@ -1,118 +1,99 @@
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import {
+  asJsonObject,
+  compactDefined,
+  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/mem0/api.ts
 var SERVICE = "mem0";
 var API_BASE = "https://api.mem0.ai";
-function text(value) {
-  if (typeof value !== "string") return void 0;
-  const trimmed = value.trim();
-  return trimmed === "" ? void 0 : trimmed;
-}
-function record(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
-function compact(input) {
-  return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== void 0));
-}
+var http = createProviderHttpClient({ baseUrl: `${API_BASE}/`, service: SERVICE });
 function requireText(value, field) {
-  const result = text(value);
+  const result = trimmedText(value);
   if (result === void 0) throw new TBError("invalid_argument", `${field} \u662F\u5FC5\u586B\u7684`);
   return result;
 }
-function errorMessage(body, status) {
-  if (body === "") return `Mem0 \u8FD4\u56DE HTTP ${status}`;
-  let payload;
-  try {
-    payload = record(JSON.parse(body));
-  } catch {
-    return body;
-  }
-  if (payload === void 0) return body;
+function errorMessage(value, status) {
+  if (typeof value === "string") return value === "" ? `Mem0 \u8FD4\u56DE HTTP ${status}` : value;
+  const payload = asJsonObject(value);
+  if (payload === void 0) return `Mem0 \u8FD4\u56DE HTTP ${status}`;
   const detail = payload.detail;
   if (typeof detail === "string" && detail !== "") return detail;
   if (Array.isArray(detail)) {
-    const parts = detail.map((item) => typeof record(item)?.msg === "string" ? record(item)?.msg : void 0).filter((item) => item !== void 0 && item !== "");
+    const parts = detail.map((item) => typeof asJsonObject(item)?.msg === "string" ? asJsonObject(item)?.msg : void 0).filter((item) => item !== void 0 && item !== "");
     if (parts.length > 0) return parts.join("; ");
   }
   if (typeof payload.message === "string" && payload.message !== "") return payload.message;
   if (typeof payload.error === "string" && payload.error !== "") return payload.error;
-  return body;
-}
-function buildUrl(path, query) {
-  const url = new URL(`${API_BASE}${path}`);
-  for (const [key, value] of Object.entries(query ?? {})) {
-    if (value === void 0) continue;
-    url.searchParams.set(key, String(value));
-  }
-  return url.toString();
+  return `Mem0 \u8FD4\u56DE HTTP ${status}`;
 }
-function rawRequest(ctx, input) {
-  const headers = {
-    // Token 而非 Bearer —— Mem0 用的是 DRF 的 TokenAuthentication。
-    authorization: `Token ${requireApiKey(ctx, SERVICE)}`,
-    accept: "application/json"
-  };
-  if (input.body !== void 0) headers["content-type"] = "application/json";
-  return guardedFetch(buildUrl(input.path, input.query), {
+function execute(ctx, input) {
+  return http.request({
+    path: input.path,
     method: input.method ?? "GET",
-    headers,
-    body: input.body === void 0 ? void 0 : JSON.stringify(input.body)
+    query: Object.entries(input.query ?? {}),
+    headers: {
+      accept: "application/json",
+      // Token 而非 Bearer —— Mem0 用的是 DRF 的 TokenAuthentication。
+      authorization: `Token ${requireApiKey(ctx, SERVICE)}`
+    },
+    ...input.body === void 0 ? {} : { json: input.body },
+    invalidJson: "text",
+    mapError: ({ data, status }) => upstreamError(status, errorMessage(data, status))
   });
 }
 async function request(ctx, input) {
-  const response = await rawRequest(ctx, input);
-  const body = await response.text();
-  if (!response.ok) throw upstreamError(response.status, errorMessage(body, response.status));
-  if (response.status === 204 || body === "") return {};
-  try {
-    return JSON.parse(body);
-  } catch {
-    return { raw: body };
+  const result = await execute(ctx, input);
+  if (result.bodyKind === "empty") return {};
+  if (result.bodyKind === "invalid-json" || result.bodyKind === "text") {
+    return { raw: result.data };
   }
+  return result.data;
 }
 function addMemories(input, ctx) {
-  const memory = text(input.memory);
+  const memory = trimmedText(input.memory);
   if (memory === void 0 && !Array.isArray(input.messages)) {
     throw new TBError("invalid_argument", "\u5FC5\u987B\u63D0\u4F9B memory \u6216 messages");
   }
   return request(ctx, {
     method: "POST",
     path: "/v1/memories/",
-    body: compact({
+    body: compactDefined({
       memory,
       messages: input.messages,
-      user_id: text(input.user_id),
-      agent_id: text(input.agent_id),
-      app_id: text(input.app_id),
-      run_id: text(input.run_id),
-      org_id: text(input.org_id),
-      project_id: text(input.project_id),
-      metadata: record(input.metadata),
-      custom_categories: record(input.custom_categories),
+      user_id: trimmedText(input.user_id),
+      agent_id: trimmedText(input.agent_id),
+      app_id: trimmedText(input.app_id),
+      run_id: trimmedText(input.run_id),
+      org_id: trimmedText(input.org_id),
+      project_id: trimmedText(input.project_id),
+      metadata: asJsonObject(input.metadata),
+      custom_categories: asJsonObject(input.custom_categories),
       enable_graph: input.enable_graph,
       infer: input.infer,
       async_mode: input.async_mode,
-      output_format: text(input.output_format),
-      version: text(input.version),
-      custom_instructions: text(input.custom_instructions),
+      output_format: trimmedText(input.output_format),
+      version: trimmedText(input.version),
+      custom_instructions: trimmedText(input.custom_instructions),
       immutable: input.immutable,
       timestamp: input.timestamp,
-      expiration_date: text(input.expiration_date),
-      includes: text(input.includes),
-      excludes: text(input.excludes)
+      expiration_date: trimmedText(input.expiration_date),
+      includes: trimmedText(input.includes),
+      excludes: trimmedText(input.excludes)
     })
   });
 }
@@ -120,12 +101,12 @@ function getMemories(input, ctx) {
   return request(ctx, {
     method: "POST",
     path: "/v2/memories/",
-    body: compact({
-      filters: record(input.filters),
+    body: compactDefined({
+      filters: asJsonObject(input.filters),
       page: input.page,
       page_size: input.page_size,
-      org_id: text(input.org_id),
-      project_id: text(input.project_id)
+      org_id: trimmedText(input.org_id),
+      project_id: trimmedText(input.project_id)
     })
   });
 }
@@ -133,17 +114,17 @@ function searchMemories(input, ctx) {
   return request(ctx, {
     method: "POST",
     path: "/v2/memories/search/",
-    body: compact({
+    body: compactDefined({
       query: requireText(input.query, "query"),
-      filters: record(input.filters),
+      filters: asJsonObject(input.filters),
       top_k: input.top_k,
       rerank: input.rerank,
       threshold: input.threshold,
       fields: input.fields,
       keyword_search: input.keyword_search,
       filter_memories: input.filter_memories,
-      org_id: text(input.org_id),
-      project_id: text(input.project_id)
+      org_id: trimmedText(input.org_id),
+      project_id: trimmedText(input.project_id)
     })
   });
 }
@@ -153,35 +134,28 @@ function getMemory(input, ctx) {
 }
 function updateMemory(input, ctx) {
   const memoryId = requireText(input.memory_id, "memory_id");
-  const value = text(input.text);
-  const metadata = record(input.metadata);
+  const value = trimmedText(input.text);
+  const metadata = asJsonObject(input.metadata);
   if (value === void 0 && metadata === void 0) {
     throw new TBError("invalid_argument", "\u5FC5\u987B\u63D0\u4F9B text \u6216 metadata");
   }
   return request(ctx, {
     method: "PUT",
     path: `/v1/memories/${encodeURIComponent(memoryId)}/`,
-    body: compact({ text: value, metadata })
+    body: compactDefined({ text: value, metadata })
   });
 }
 async function deleteMemory(input, ctx) {
   const memoryId = requireText(input.memory_id, "memory_id");
-  const response = await rawRequest(ctx, {
+  const result = await execute(ctx, {
     method: "DELETE",
     path: `/v1/memories/${encodeURIComponent(memoryId)}/`
   });
-  const body = await response.text();
-  if (!response.ok) throw upstreamError(response.status, errorMessage(body, response.status));
-  let payload;
-  try {
-    payload = body === "" ? void 0 : record(JSON.parse(body));
-  } catch {
-    payload = void 0;
-  }
+  const payload = result.bodyKind === "json" ? asJsonObject(result.data) : void 0;
   return {
     memory_id: memoryId,
     deleted: true,
-    message: text(payload?.message) ?? "Memory deleted successfully!"
+    message: trimmedText(payload?.message) ?? "Memory deleted successfully!"
   };
 }
 function getMemoryHistory(input, ctx) {
@@ -192,9 +166,9 @@ function getEvents(input, ctx) {
   return request(ctx, {
     path: "/v1/events/",
     query: {
-      event_type: text(input.event_type),
-      start_date: text(input.start_date),
-      end_date: text(input.end_date),
+      event_type: trimmedText(input.event_type),
+      start_date: trimmedText(input.start_date),
+      end_date: trimmedText(input.end_date),
       page: input.page,
       page_size: input.page_size
     }
@@ -205,8 +179,8 @@ function getEvent(input, ctx) {
   return request(ctx, { path: `/v1/event/${encodeURIComponent(eventId)}/` });
 }
 function getUsers(input, ctx) {
-  const orgId = text(input.org_id);
-  const projectId = text(input.project_id);
+  const orgId = trimmedText(input.org_id);
+  const projectId = trimmedText(input.project_id);
   if (orgId === void 0 !== (projectId === void 0)) {
     throw new TBError("invalid_argument", "org_id \u4E0E project_id \u5FC5\u987B\u540C\u65F6\u63D0\u4F9B\u6216\u540C\u65F6\u7701\u7565");
   }

package/dist/{memos-4OVIGFPH.js → memos-76PTWV5V.js}

@@ -1,24 +1,35 @@
+import {
+  bytesToBase64,
+  readBoundedResponseBytes
+} from "./chunk-LMLX3DJF.js";
+import {
+  createProviderHttpClient
+} from "./chunk-WW2IMPQK.js";
+import {
+  asJsonObject,
+  compactDefined,
+  trimmedText
+} from "./chunk-JXHMDBAY.js";
 import {
   createProviderPlugin,
   requireApiKey,
   upstreamError
-} from "./chunk-VK3V2WTY.js";
+} from "./chunk-YASUMV2K.js";
 import {
   assertPublicHttpUrl,
   guardedFetch
-} from "./chunk-2O27H4Y2.js";
-import "./chunk-GKX72JMJ.js";
+} from "./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/memos/api.ts
 var SERVICE = "memos";
 var API_SUFFIX = "/api/v1";
 var ATTACHMENT_MAX_BYTES = 20 * 1024 * 1024;
-var BASE64_CHUNK = 8192;
+var http = createProviderHttpClient({ service: SERVICE });
 var UPDATE_MASKS = [
   ["content", "content"],
   ["visibility", "visibility"],
@@ -27,29 +38,16 @@ var UPDATE_MASKS = [
   ["createTime", "create_time"],
   ["location", "location"]
 ];
-function record(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
-function text(value) {
-  if (typeof value !== "string") return void 0;
-  const trimmed = value.trim();
-  return trimmed === "" ? void 0 : trimmed;
-}
 function requireText(value, field) {
-  const result = text(value);
+  const result = trimmedText(value);
   if (result === void 0) throw new TBError("invalid_argument", `${field} is required.`);
   return result;
 }
-function compact(input) {
-  return Object.fromEntries(
-    Object.entries(input).filter(([, value]) => value !== void 0)
-  );
-}
 function responseError(message) {
   return new TBError("unavailable", message, { retryable: true });
 }
 function requireResponseObject(value, operation) {
-  const object = record(value);
+  const object = asJsonObject(value);
   if (object === void 0) throw responseError(`Memos ${operation} response did not include an object`);
   return object;
 }
@@ -63,7 +61,7 @@ function configError(message) {
 function resolveBaseUrl(ctx) {
   const configured = ctx.config?.baseUrl;
   if (configured !== void 0 && typeof configured !== "string") throw configError("\u5FC5\u987B\u662F\u5B57\u7B26\u4E32");
-  const candidate = text(configured);
+  const candidate = trimmedText(configured);
   if (candidate === void 0) {
     throw configError(
       "\u662F\u5FC5\u914D\u9879:\u7ED9\u6302\u8F7D\u8282\u70B9\u914D providerConfig.baseUrl \u6307\u5411\u4F60\u7684 Memos \u5B9E\u4F8B(\u5982 https://memos.example.com)\u3002Memos \u53EA\u6709\u81EA\u5EFA\u5B9E\u4F8B,\u6CA1\u6709\u516C\u5171\u7F3A\u7701\u5730\u5740"
@@ -96,86 +94,34 @@ function resourcePath(name, collection) {
   }
   return `/${collection}/${encodeURIComponent(id)}`;
 }
-function readPayload(response, body) {
-  if (body.trim() === "") return null;
-  try {
-    return JSON.parse(body);
-  } catch {
-    if (response.ok) throw responseError("Memos returned invalid JSON");
-    return body;
-  }
-}
 function errorMessage(payload) {
-  const direct = text(payload);
+  const direct = trimmedText(payload);
   if (direct !== void 0) return direct;
-  return text(record(payload)?.message) ?? "Memos request failed";
+  return trimmedText(asJsonObject(payload)?.message) ?? "Memos request failed";
 }
 async function request(target, input) {
-  const url = new URL(`${target.baseUrl}${input.path}`);
-  for (const [key, value] of Object.entries(input.query ?? {})) {
-    if (value !== void 0) url.searchParams.set(key, String(value));
-  }
-  let response;
-  let payload;
-  try {
-    response = await guardedFetch(url.toString(), {
-      method: input.method ?? "GET",
-      headers: {
-        accept: "application/json",
-        authorization: `Bearer ${target.apiKey}`,
-        ...input.body === void 0 ? {} : { "content-type": "application/json" }
-      },
-      body: input.body === void 0 ? void 0 : JSON.stringify(input.body)
-    });
-    payload = readPayload(response, await response.text());
-  } catch (error) {
-    if (error instanceof TBError) throw error;
-    const detail = error instanceof Error ? error.message : "unknown network error";
-    throw upstreamError(502, `Memos ${input.path} request failed: ${detail}`);
-  }
-  if (!response.ok) throw upstreamError(response.status, errorMessage(payload));
-  return payload;
+  const result = await http.request({
+    baseUrl: `${target.baseUrl}/`,
+    path: input.path,
+    method: input.method ?? "GET",
+    query: Object.entries(input.query ?? {}),
+    headers: { accept: "application/json", authorization: `Bearer ${target.apiKey}` },
+    ...input.body === void 0 ? {} : { json: input.body },
+    invalidJsonMessage: "Memos returned invalid JSON",
+    mapError: ({ data, status }) => upstreamError(status, errorMessage(data)),
+    mapTransportError: ({ message }) => upstreamError(
+      502,
+      `Memos ${input.path} request failed: ${message ?? "unknown network error"}`
+    )
+  });
+  return result.data === void 0 ? null : result.data;
 }
 async function readBoundedBytes(response) {
   const tooLarge = () => new TBError(
     "invalid_argument",
     `fileUrl \u6307\u5411\u7684\u6587\u4EF6\u8D85\u8FC7 ${ATTACHMENT_MAX_BYTES} \u5B57\u8282\u7684\u4E0A\u9650`
   );
-  const declared = Number(response.headers.get("content-length"));
-  if (Number.isFinite(declared) && declared > ATTACHMENT_MAX_BYTES) throw tooLarge();
-  const body = response.body;
-  if (body === null) {
-    const bytes2 = new Uint8Array(await response.arrayBuffer());
-    if (bytes2.byteLength > ATTACHMENT_MAX_BYTES) throw tooLarge();
-    return bytes2;
-  }
-  const reader = body.getReader();
-  const chunks = [];
-  let total = 0;
-  for (; ; ) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    total += value.byteLength;
-    if (total > ATTACHMENT_MAX_BYTES) {
-      await reader.cancel();
-      throw tooLarge();
-    }
-    chunks.push(value);
-  }
-  const bytes = new Uint8Array(total);
-  let offset = 0;
-  for (const chunk of chunks) {
-    bytes.set(chunk, offset);
-    offset += chunk.byteLength;
-  }
-  return bytes;
-}
-function base64(bytes) {
-  let binary = "";
-  for (let offset = 0; offset < bytes.length; offset += BASE64_CHUNK) {
-    binary += String.fromCharCode(...bytes.subarray(offset, offset + BASE64_CHUNK));
-  }
-  return btoa(binary);
+  return readBoundedResponseBytes(response, { maxBytes: ATTACHMENT_MAX_BYTES, tooLarge });
 }
 async function downloadAttachment(fileUrl, declaredType) {
   let response;
@@ -188,7 +134,7 @@ async function downloadAttachment(fileUrl, declaredType) {
   }
   if (!response.ok) throw upstreamError(502, `failed to fetch fileUrl: ${response.status}`);
   const bytes = await readBoundedBytes(response);
-  const responseType = text(response.headers.get("content-type")?.split(";", 1)[0]);
+  const responseType = trimmedText(response.headers.get("content-type")?.split(";", 1)[0]);
   return { bytes, mimeType: declaredType ?? responseType ?? "application/octet-stream" };
 }
 async function createMemo(input, ctx) {
@@ -196,11 +142,11 @@ async function createMemo(input, ctx) {
     method: "POST",
     path: "/memos",
     // memoId 是**query** 参数而不是 body 字段(Memos 的 AIP 风格:资源 id 走 query)。
-    query: compact({ memoId: text(input.memoId) }),
-    body: compact({
+    query: compactDefined({ memoId: trimmedText(input.memoId) }),
+    body: compactDefined({
       content: input.content,
-      visibility: text(input.visibility),
-      createTime: text(input.createTime),
+      visibility: trimmedText(input.visibility),
+      createTime: trimmedText(input.createTime),
       pinned: input.pinned,
       location: input.location
     })
@@ -210,19 +156,19 @@ async function createMemo(input, ctx) {
 async function listMemos(input, ctx) {
   const payload = requireResponseObject(await request(resolveTarget(ctx), {
     path: "/memos",
-    query: compact({
+    query: compactDefined({
       pageSize: input.pageSize,
-      pageToken: text(input.pageToken),
-      state: text(input.state),
-      orderBy: text(input.orderBy),
-      filter: text(input.filter),
+      pageToken: trimmedText(input.pageToken),
+      state: trimmedText(input.state),
+      orderBy: trimmedText(input.orderBy),
+      filter: trimmedText(input.filter),
       showDeleted: input.showDeleted
     })
   }), "list memos");
   return {
     // 一页都没有时 Memos 干脆不给 `memos` 键,补成空数组;非数组则是上游坏了。
     memos: requireResponseObjects(payload.memos ?? [], "list memos"),
-    nextPageToken: text(payload.nextPageToken) ?? null
+    nextPageToken: trimmedText(payload.nextPageToken) ?? null
   };
 }
 async function getMemo(input, ctx) {
@@ -240,7 +186,7 @@ async function updateMemo(input, ctx) {
     method: "PATCH",
     path: resourcePath(name, "memos"),
     query: { updateMask: updateMask.join(",") },
-    body: compact({
+    body: compactDefined({
       name,
       content: input.content,
       visibility: input.visibility,
@@ -257,22 +203,22 @@ async function deleteMemo(input, ctx) {
   await request(resolveTarget(ctx), {
     method: "DELETE",
     path: resourcePath(name, "memos"),
-    query: compact({ force: input.force })
+    query: compactDefined({ force: input.force })
   });
   return { deleted: true, name };
 }
 async function uploadAttachment(input, ctx) {
   const target = resolveTarget(ctx);
-  const source = await downloadAttachment(requireText(input.fileUrl, "fileUrl"), text(input.type));
+  const source = await downloadAttachment(requireText(input.fileUrl, "fileUrl"), trimmedText(input.type));
   const payload = await request(target, {
     method: "POST",
     path: "/attachments",
-    query: compact({ attachmentId: text(input.attachmentId) }),
-    body: compact({
+    query: compactDefined({ attachmentId: trimmedText(input.attachmentId) }),
+    body: compactDefined({
       filename: requireText(input.filename, "filename"),
-      content: base64(source.bytes),
+      content: bytesToBase64(source.bytes),
       type: source.mimeType,
-      memo: text(input.memo)
+      memo: trimmedText(input.memo)
     })
   });
   return { attachment: requireResponseObject(payload, "upload attachment") };
@@ -280,16 +226,16 @@ async function uploadAttachment(input, ctx) {
 async function listAttachments(input, ctx) {
   const payload = requireResponseObject(await request(resolveTarget(ctx), {
     path: "/attachments",
-    query: compact({
+    query: compactDefined({
       pageSize: input.pageSize,
-      pageToken: text(input.pageToken),
-      filter: text(input.filter),
-      orderBy: text(input.orderBy)
+      pageToken: trimmedText(input.pageToken),
+      filter: trimmedText(input.filter),
+      orderBy: trimmedText(input.orderBy)
     })
   }), "list attachments");
   return {
     attachments: requireResponseObjects(payload.attachments ?? [], "list attachments"),
-    nextPageToken: text(payload.nextPageToken) ?? null
+    nextPageToken: trimmedText(payload.nextPageToken) ?? null
   };
 }
 async function getAttachment(input, ctx) {
@@ -306,11 +252,11 @@ async function listMemoAttachments(input, ctx) {
   const name = requireText(input.name, "name");
   const payload = requireResponseObject(await request(resolveTarget(ctx), {
     path: `${resourcePath(name, "memos")}/attachments`,
-    query: compact({ pageSize: input.pageSize, pageToken: text(input.pageToken) })
+    query: compactDefined({ pageSize: input.pageSize, pageToken: trimmedText(input.pageToken) })
   }), "list memo attachments");
   return {
     attachments: requireResponseObjects(payload.attachments ?? [], "list memo attachments"),
-    nextPageToken: text(payload.nextPageToken) ?? null
+    nextPageToken: trimmedText(payload.nextPageToken) ?? null
   };
 }
 async function setMemoAttachments(input, ctx) {
@@ -331,23 +277,23 @@ async function getCurrentUser(_input, ctx) {
 async function listUsers(input, ctx) {
   const payload = requireResponseObject(await request(resolveTarget(ctx), {
     path: "/users",
-    query: compact({
+    query: compactDefined({
       pageSize: input.pageSize,
-      pageToken: text(input.pageToken),
-      filter: text(input.filter),
+      pageToken: trimmedText(input.pageToken),
+      filter: trimmedText(input.filter),
       showDeleted: input.showDeleted
     })
   }), "list users");
   return {
     users: requireResponseObjects(payload.users ?? [], "list users"),
-    nextPageToken: text(payload.nextPageToken) ?? null
+    nextPageToken: trimmedText(payload.nextPageToken) ?? null
   };
 }
 async function getUser(input, ctx) {
   const path = resourcePath(requireText(input.name, "name"), "users");
   const payload = await request(resolveTarget(ctx), {
     path,
-    query: compact({ readMask: text(input.readMask) })
+    query: compactDefined({ readMask: trimmedText(input.readMask) })
   });
   return { user: requireResponseObject(payload, "get user") };
 }