@nickyzj2023/utils 1.0.76 → 1.0.77

package/README.md

@@ -1,3 +1,5 @@
+# utils
+
 男生自用全新前端工具库，0依赖
 
 ## 安装到你的项目里
@@ -21,9 +23,11 @@ import { fetcher, to } from "@nickyzj2023/utils";
 
 const api = fetcher("https://api.example.com");
 
-const [error, data] = await to(api.get<Blog>("/blogs/hello-world"));
+const [error, data] = await to(
+  api.get<Blog>("/blogs/hello-world")
+);
 if (error) {
-  console.error(error);
+  console.log(error);
   return;
 }
 

package/dist/index.d.mts

@@ -4,10 +4,19 @@ declare namespace AI {
     baseUrl: string; /** 不传则自动使用{baseUrl}/models接口的第一个模型 */
     model?: string;
     apiKey?: string; /** POST /chat/completions时注入自定义请求体 */
-    customBody?: Record<string, any>; /** 模型支持的消息输入类型，如果填了，则会在调用chatCompletions前校验上下文，含有不支持的输入时抑制请求 */
-    inputs?: ["text" | "image" | "video" | "audio" | "file"]; /** 模型的最大上下文（输入+输出），如果填了，则会在调用chatCompletions后选择性调用compact（当前上下文>最大上下文*80%时） */
+    customBody?: Record<string, any>;
+    /**
+     * 模型支持的消息输入类型
+     * @default ["text"]
+     * @remarks 会在调用chatCompletions前校验上下文，含有不支持的输入时抑制请求 */
+    inputs?: InputType[];
+    /**
+     * 模型的最大上下文（输入+输出）
+     * @default 128000
+     * @remarks 会在调用chatCompletions后智能调用compact（如当前上下文>最大上下文*80%时），可以在chatCompletions里自定义compact执行时机 */
     context?: number;
   };
+  type InputType = "text" | "image" | "video" | "audio" | "file";
   type Message = {
     role: "system" | "user" | "assistant" | "tool" | "function"; /** OpenRouter的思考内容字段，其他供应商的会尽可能合并到该字段内 */
     reasoning?: string | null;
@@ -70,6 +79,12 @@ declare namespace AI {
 //#endregion
 //#region src/ai/chatCompletions/types.d.ts
 declare namespace ChatCompletions {
+  /** chatCompletions的第三个参数 */
+  type Options = {
+    stream?: boolean;
+    tools?: AI.ToolDefinition[]; /** 工具运行结束后（无论成功失败）的回调，可用于打印日志 */
+    onToolHandled?: (name: string, args: string, result: any) => void;
+  };
   /** 非流式POST /chat/completions的响应结果 */
   type NonStreamResponse = {
     id: string;
@@ -175,14 +190,10 @@ declare namespace ChatCompletions {
  *   }
  * }
  */
-declare function chatCompletions(model: AI.Model, messages: AI.Message[], options: {
+declare function chatCompletions(model: AI.Model, messages: AI.Message[], options: ChatCompletions.Options & {
   stream: true;
-  tools?: AI.ToolDefinition[];
 }): Promise<AsyncGenerator<ChatCompletions.StreamChunk>>;
-declare function chatCompletions(model: AI.Model, messages: AI.Message[], options?: {
-  stream?: boolean;
-  tools?: AI.ToolDefinition[];
-}): Promise<ChatCompletions.NonStreamResult>;
+declare function chatCompletions(model: AI.Model, messages: AI.Message[], options?: ChatCompletions.Options): Promise<ChatCompletions.NonStreamResult>;
 //#endregion
 //#region src/ai/helper.d.ts
 /**

package/dist/index.mjs

@@ -2,6 +2,6 @@ const e=e=>e==null,t=e=>e?.constructor===Object,n=e=>e==null||typeof e!=`object`
 `)),a=r?a.replace(/\r?\n/g,` `):a.replace(/\r?\n/g,`\\n`),a=a.replace(/\s+/g,` `).trim(),n>0&&a.length>n?`${a.slice(0,n)}...`:a},h=e=>{if(e instanceof Error)return e.message;if(typeof e==`string`)return e;if(t(e)){let t=e.message||e.msg;if(t)return t;for(let t of Object.values(e)){let e=h(t);if(e)return e}}return JSON.stringify(e,null,2)},g={parse:e=>{let t=new URLSearchParams(e),n={};for(let[e,r]of t)Number.isNaN(Number(r))?n[e]=r:n[e]=Number(r);return n},stringify:(e,t)=>{let{addQueryPrefix:n=!1}=t??{},r=new URLSearchParams(e).toString();return r?n?`?${r}`:r:``}},_=(n=``,r={})=>{let i=async(i,o={})=>{let s=new URL(n?`${n}${i}`:i),{params:c,parser:l,...u}=a(r,o);t(c)&&Object.entries(c).forEach(([t,n])=>{e(n)||s.searchParams.append(t,n.toString())}),(t(u.body)||Array.isArray(u.body))&&(u.body=JSON.stringify(u.body),u.headers={...u.headers,"Content-Type":`application/json`});let d=await fetch(s,u);if(!d.ok){let e=d.statusText||await d.text();try{e=h(JSON.parse(e))}catch{}throw Error(e)}return await(l?.(d)??d.json())};return{get:(e,t)=>i(e,{...t,method:`GET`}),post:(e,t,n)=>i(e,{...n,method:`POST`,body:t}),put:(e,t,n)=>i(e,{...n,method:`PUT`,body:t}),delete:(e,t)=>i(e,{...t,method:`DELETE`})}},v=async e=>{try{return[null,await e]}catch(e){return[e,void 0]}},y=async e=>{let[t,n]=await v(fetch(e,{method:`HEAD`,redirect:`manual`}));return t?e:n.headers.get(`location`)||e},b=e=>{let t=new Uint8Array(e),n=``;for(let e=0;e<t.byteLength;e++)n+=String.fromCharCode(t[e]);return btoa(n)},x=async(e,t={})=>{let{quality:n=.92,compressor:r,fetcher:i=fetch}=t;if(!e.startsWith(`http`))throw Error(`图片地址必须以http或https开头`);let a=await i(e);if(!a.ok)throw Error(`获取图片失败: ${a.statusText}`);let o=a.headers.get(`Content-Type`)||`image/jpeg`,s=await a.arrayBuffer();if(o!==`image/jpeg`&&o!==`image/png`)return`data:${o};base64,${b(s)}`;if(r)return await r(s,o,n);if(typeof OffscreenCanvas<`u`){let e=null;try{let t=new Blob([s],{type:o});e=await createImageBitmap(t);let r=new OffscreenCanvas(e.width,e.height),i=r.getContext(`2d`);if(!i)throw Error(`无法获取 OffscreenCanvas context`);return i.drawImage(e,0,0),e.close(),e=null,`data:${o};base64,${b(await(await r.convertToBlob({type:o,quality:n})).arrayBuffer())}`}catch{return e?.close(),`data:${o};base64,${b(s)}`}}return`data:${o};base64,${b(s)}`};async function*S(e){let t=e.body?.getReader();if(!t)return;let n=new TextDecoder,r=``;try{for(;;){let{value:e,done:i}=await t.read();if(i)break;r+=n.decode(e,{stream:!0});let a=r.split(`
 
 `);r=a.pop()||``;for(let e of a){let t=e.split(`
-`);for(let e of t){if(!e.startsWith(`data:`))continue;let t=e.replace(/^data:\s*/,``).trim();try{yield JSON.parse(t)}catch{yield t}}}}}finally{t.releaseLock()}}const C=e=>e,w=(e,t,n,r)=>{let i=[];return{type:`function`,function:{name:e,description:t,parameters:{type:`object`,properties:l(n,e=>e===`required`?(i.push(e),!1):!0),required:i}},handler:r}},T=async e=>{let t=(await _(e).get(`/v1/models`)).data[0]?.id;if(!t)throw Error(`无法从/models获取模型名称`);return t},E=e=>[c(e,[`type`,`function`]),c(e,[`handler`])],D=async(e,t,n)=>{let r=t.find(t=>t.function.name===e.function.name)?.handler;if(!r)return`没有找到工具“${e.function.name}”的处理函数`;try{let t=await r(JSON.parse(e.function.arguments),n);return typeof t==`string`?t:JSON.stringify(t)}catch(t){if(t instanceof Error&&t.name===e.function.name)throw t;return`工具“${e.function.name}”处理失败：${h(t)}`}},O=e=>e.reasoning||e.reasoning_content,k=e=>typeof e==`string`?e:e.filter(e=>e.type===`text`).map(e=>e.text).join(`
-`),A=async(e,t,n=[])=>{for(;;){let{choices:r,usage:i,...a}=await e.post(`/chat/completions`,{}),{message:o}=r?.[0]??{};if(!o)throw Error(`模型没有回复任何内容`);t.push(o);let{content:s=``,tool_calls:c=[],...l}=o,u=O(o);if(c.length>0&&n.length>0){for(let e of c){let r=await D(e,n,{messages:t});t.push({role:`tool`,content:r,tool_call_id:e.id})}continue}return{content:k(s),reasoning:u,usage:i,...a,...l}}},j=async function*(e,t,n=[]){for(;;){let r=new Map,i=``,a=null,o,s=await e.post(`/chat/completions`,{stream:!0},{parser:async e=>e});for await(let e of S(s)){e.usage&&(o=e.usage);let t=e.choices?.[0];if(!t)continue;let{delta:n}=t,{content:s,tool_calls:c}=n,l=O(n);if(l&&(yield{reasoning:l}),s&&(i+=s,yield{content:s}),c)for(let e of c){let t=r.get(e.index)??{id:``,type:`function`,function:{name:``,arguments:``}};e.id&&(t.id=e.id),e.function?.name&&(t.function.name+=e.function.name),e.function?.arguments&&(t.function.arguments+=e.function.arguments),r.set(e.index,t)}t.finish_reason&&(a=t.finish_reason)}let c=Array.from(r.values());if(a===`tool_calls`&&c.length>0&&n.length>0){t.push({role:`assistant`,content:i,tool_calls:c});for(let e of c){let r=await D(e,n,{messages:t});t.push({role:`tool`,content:r,tool_call_id:e.id})}continue}t.push({role:`assistant`,content:i}),o&&(yield{usage:o});break}};async function M(e,t,n){let{baseUrl:r,apiKey:i=``,model:a,...o}=e,{stream:s,tools:c=[]}=n??{},l=_(r,{headers:{Authorization:`Bearer ${i}`},body:{model:a??await T(r),messages:t,tools:c?.map(e=>E(e)[0]),...o.customBody}});return(s?j:A)(l,t,c)}function N(e={},t=0){let{withTime:n=!0,withFileName:r=!0}=e;return(...e)=>{let i=[];if(n&&i.push(`[${new Date().toLocaleTimeString()}]`),r){let{stack:e}=Error(),n=(e?.split(`
-`)[2+t]?.trim())?.match(/^at\s+(?:.*?\s*\()?(.*?):(\d+)(?::(\d+))?\)?/);if(n?.[1]){let e=n[1].split(/[/\\]/).pop();i.push(`[${e}:${n[2]}]`)}}i.push(...e),console.log(...i)}}function P(e,...n){if(t(e)&&(`withTime`in e||`withFileName`in e))return N(e,0);N({},1)(e,...n)}const F=async(e,t)=>{let{maxRetries:n=5,shouldStop:r}=t??{},i;for(let t=0;t<n;t++)if(i=await e(t),r?.(i)===!0)return i;if(!r)return i;throw Error(`超过了最大循环次数（${n}）且未满足停止执行条件`)},I=(e,t=-1)=>{let n=new Map,r=(...r)=>{let i=JSON.stringify(r),a=Date.now(),o=n.get(i);if(o&&a<o.expiresAt)return o.value;let s=t===-1?1/0:a+t*1e3,c=e.apply({setTtl:e=>{s=a+e*1e3}},r);if(c instanceof Promise){let e=c.then(e=>(n.set(i,{value:e,expiresAt:s}),e));return n.set(i,{value:e,expiresAt:s}),e}return n.set(i,{value:c,expiresAt:s}),c};return r.clear=()=>n.clear(),r.updateTtl=e=>{t=e;let r=Date.now(),i=r+e*1e3;for(let[e,t]of n.entries())t.expiresAt>r&&(t.expiresAt=i,n.set(e,t))},r},L=(e,t)=>Math.floor(Math.random()*(t-e+1))+e,R=(e,t=300)=>{let n=null;return(...r)=>{n&&clearTimeout(n),n=setTimeout(()=>{e(...r)},t)}};var z=class{queue;constructor(){this.queue=Promise.resolve()}waitInQueue(){let e,t=new Promise(t=>{e=t}),n=this.queue.then(()=>e);return this.queue=t,n}};const B=async(e=150)=>new Promise(t=>{setTimeout(t,e)}),V=(e,t=300)=>{let n=null;return function(...r){n||=setTimeout(()=>{n=null,e.apply(this,r)},t)}};export{z as LockQueue,d as camelToSnake,f as capitalize,M as chatCompletions,m as compactStr,R as debounce,p as decapitalize,C as defineModel,w as defineTool,h as extractErrorMessage,_ as fetcher,T as getModelName,y as getRealURL,x as imageUrlToBase64,e as isNil,t as isObject,n as isPrimitive,P as logger,F as loopUntil,r as mapKeys,i as mapValues,a as mergeObjects,o as omit,s as omitBy,S as parseSSE,c as pick,l as pickBy,g as qs,L as randomInt,B as sleep,u as snakeToCamel,V as throttle,v as to,I as withCache};
+`);for(let e of t){if(!e.startsWith(`data:`))continue;let t=e.replace(/^data:\s*/,``).trim();try{yield JSON.parse(t)}catch{yield t}}}}}finally{t.releaseLock()}}const C=e=>({inputs:[`text`],context:128e3,...e}),w=(e,t,n,r)=>{let i=[];return{type:`function`,function:{name:e,description:t,parameters:{type:`object`,properties:l(n,e=>e===`required`?(i.push(e),!1):!0),required:i}},handler:r}},T=async e=>{let t=(await _(e).get(`/v1/models`)).data[0]?.id;if(!t)throw Error(`无法从/models获取模型名称`);return t},E=e=>[c(e,[`type`,`function`]),c(e,[`handler`])],D=async(e,t,n)=>{let r=t.find(t=>t.function.name===e.function.name)?.handler;if(!r)return`没有找到工具“${e.function.name}”的处理函数`;try{let t=await r(JSON.parse(e.function.arguments),n);return typeof t==`string`?t:JSON.stringify(t)}catch(t){if(t instanceof Error&&t.name===e.function.name)throw t;return`工具“${e.function.name}”处理失败：${h(t)}`}},O=e=>e.reasoning||e.reasoning_content,k=e=>typeof e==`string`?e:e.filter(e=>e.type===`text`).map(e=>e.text).join(`
+`),A=e=>{switch(e.type){case`text`:return`text`;case`image_url`:return`image`;case`input_audio`:return`audio`;case`video_url`:return`video`}},j=(e,t)=>{let{inputs:n=[`text`]}=e;return t.some(e=>{let{content:t}=e;if(typeof t!=`string`){if(Array.isArray(t))for(let e of t){let t=A(e);return!t||!n.includes(t)}return!0}})},M=async(e,t,n=[],r)=>{let{onToolHandled:i}=r??{};for(;;){let{choices:r,usage:a,...o}=await e.post(`/chat/completions`,{}),{message:s}=r?.[0]??{};if(!s)throw Error(`模型没有回复任何内容`);t.push(s);let{content:c=``,tool_calls:l=[],...u}=s,d=O(s);if(l.length>0&&n.length>0){for(let e of l){let r=await D(e,n,{messages:t});t.push({role:`tool`,content:r,tool_call_id:e.id}),i?.(e.function.name,e.function.arguments,r)}continue}return{content:k(c),reasoning:d,usage:a,...o,...u}}},N=async function*(e,t,n=[],r){let{onToolHandled:i}=r??{};for(;;){let r=new Map,a=``,o=null,s,c=await e.post(`/chat/completions`,{stream:!0},{parser:async e=>e});for await(let e of S(c)){e.usage&&(s=e.usage);let t=e.choices?.[0];if(!t)continue;let{delta:n}=t,{content:i,tool_calls:c}=n,l=O(n);if(l&&(yield{reasoning:l}),i&&(a+=i,yield{content:i}),c)for(let e of c){let t=r.get(e.index)??{id:``,type:`function`,function:{name:``,arguments:``}};e.id&&(t.id=e.id),e.function?.name&&(t.function.name+=e.function.name),e.function?.arguments&&(t.function.arguments+=e.function.arguments),r.set(e.index,t)}t.finish_reason&&(o=t.finish_reason)}let l=Array.from(r.values());if(o===`tool_calls`&&l.length>0&&n.length>0){t.push({role:`assistant`,content:a,tool_calls:l});for(let e of l){let r=await D(e,n,{messages:t});t.push({role:`tool`,content:r,tool_call_id:e.id}),i?.(e.function.name,e.function.arguments,r)}continue}t.push({role:`assistant`,content:a}),s&&(yield{usage:s});break}};async function P(e,t,n){let{baseUrl:r,apiKey:i=``,model:a,customBody:o,inputs:s,...c}=e,{stream:l,tools:u=[],...d}=n??{};if(j(e,t))throw Error(`当前上下文含有模型不支持的输入类型`);let f=_(r,{headers:{Authorization:`Bearer ${i}`},body:{model:a??await T(r),messages:t,tools:u?.map(e=>E(e)[0]),...o}});return(l?N:M)(f,t,u,{...d,...c})}function F(e={},t=0){let{withTime:n=!0,withFileName:r=!0}=e;return(...e)=>{let i=[];if(n&&i.push(`[${new Date().toLocaleTimeString()}]`),r){let{stack:e}=Error(),n=(e?.split(`
+`)[2+t]?.trim())?.match(/^at\s+(?:.*?\s*\()?(.*?):(\d+)(?::(\d+))?\)?/);if(n?.[1]){let e=n[1].split(/[/\\]/).pop();i.push(`[${e}:${n[2]}]`)}}i.push(...e),console.log(...i)}}function I(e,...n){if(t(e)&&(`withTime`in e||`withFileName`in e))return F(e,0);F({},1)(e,...n)}const L=async(e,t)=>{let{maxRetries:n=5,shouldStop:r}=t??{},i;for(let t=0;t<n;t++)if(i=await e(t),r?.(i)===!0)return i;if(!r)return i;throw Error(`超过了最大循环次数（${n}）且未满足停止执行条件`)},R=(e,t=-1)=>{let n=new Map,r=(...r)=>{let i=JSON.stringify(r),a=Date.now(),o=n.get(i);if(o&&a<o.expiresAt)return o.value;let s=t===-1?1/0:a+t*1e3,c=e.apply({setTtl:e=>{s=a+e*1e3}},r);if(c instanceof Promise){let e=c.then(e=>(n.set(i,{value:e,expiresAt:s}),e));return n.set(i,{value:e,expiresAt:s}),e}return n.set(i,{value:c,expiresAt:s}),c};return r.clear=()=>n.clear(),r.updateTtl=e=>{t=e;let r=Date.now(),i=r+e*1e3;for(let[e,t]of n.entries())t.expiresAt>r&&(t.expiresAt=i,n.set(e,t))},r},z=(e,t)=>Math.floor(Math.random()*(t-e+1))+e,B=(e,t=300)=>{let n=null;return(...r)=>{n&&clearTimeout(n),n=setTimeout(()=>{e(...r)},t)}};var V=class{queue;constructor(){this.queue=Promise.resolve()}waitInQueue(){let e,t=new Promise(t=>{e=t}),n=this.queue.then(()=>e);return this.queue=t,n}};const H=async(e=150)=>new Promise(t=>{setTimeout(t,e)}),U=(e,t=300)=>{let n=null;return function(...r){n||=setTimeout(()=>{n=null,e.apply(this,r)},t)}};export{V as LockQueue,d as camelToSnake,f as capitalize,P as chatCompletions,m as compactStr,B as debounce,p as decapitalize,C as defineModel,w as defineTool,h as extractErrorMessage,_ as fetcher,T as getModelName,y as getRealURL,x as imageUrlToBase64,e as isNil,t as isObject,n as isPrimitive,I as logger,L as loopUntil,r as mapKeys,i as mapValues,a as mergeObjects,o as omit,s as omitBy,S as parseSSE,c as pick,l as pickBy,g as qs,z as randomInt,H as sleep,u as snakeToCamel,U as throttle,v as to,R as withCache};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nickyzj2023/utils",
-	"version": "1.0.76",
+	"version": "1.0.77",
 	"type": "module",
 	"main": "dist/index.mjs",
 	"module": "dist/index.mjs",