update tsrest code (#5755)

* doc

* update tsrest code

Author: c121914yu

document/content/docs/upgrading/4-13/4132.mdx

@@ -16,4 +16,8 @@ description: 'FastGPT V4.13.1 更新说明'
 
 ## 🔨 插件更新
 
-1. Perplexity search 工具。
+1. Perplexity search 工具。
+2. Base64转文件工具。
+3. MiniMax TTS 文件生成工具。
+4. Openrouter nano banana 绘图工具。
+5. 系统工具支持配置是否需要在 Worker 中运行。

document/data/doc-last-modified.json

@@ -101,7 +101,7 @@
   "document/content/docs/protocol/terms.en.mdx": "2025-08-03T22:37:45+08:00",
   "document/content/docs/protocol/terms.mdx": "2025-08-03T22:37:45+08:00",
   "document/content/docs/toc.en.mdx": "2025-08-04T13:42:36+08:00",
-  "document/content/docs/toc.mdx": "2025-09-29T11:34:11+08:00",
+  "document/content/docs/toc.mdx": "2025-10-09T15:10:19+08:00",
   "document/content/docs/upgrading/4-10/4100.mdx": "2025-08-02T19:38:37+08:00",
   "document/content/docs/upgrading/4-10/4101.mdx": "2025-09-08T20:07:20+08:00",
   "document/content/docs/upgrading/4-11/4110.mdx": "2025-08-05T23:20:39+08:00",
@@ -113,6 +113,7 @@
   "document/content/docs/upgrading/4-12/4124.mdx": "2025-09-17T22:29:56+08:00",
   "document/content/docs/upgrading/4-13/4130.mdx": "2025-09-30T16:00:10+08:00",
   "document/content/docs/upgrading/4-13/4131.mdx": "2025-09-30T15:47:06+08:00",
+  "document/content/docs/upgrading/4-13/4132.mdx": "2025-10-09T15:10:19+08:00",
   "document/content/docs/upgrading/4-8/40.mdx": "2025-08-02T19:38:37+08:00",
   "document/content/docs/upgrading/4-8/41.mdx": "2025-08-02T19:38:37+08:00",
   "document/content/docs/upgrading/4-8/42.mdx": "2025-08-02T19:38:37+08:00",

packages/global/common/tsRest/fastgpt/client.ts

@@ -1,172 +1,13 @@
-import { contract } from './contracts';
-import { initClient, tsRestFetchApi } from '@ts-rest/core';
-import { TOKEN_ERROR_CODE } from '../../error/errorCode';
-import { getNanoid } from '../../string/tools';
-import { type ApiFetcherArgs } from '@ts-rest/core';
-import { AnyResponseSchema } from '../../type';
-import { ZodError } from 'zod';
-import { getWebReqUrl } from '../../../../web/common/system/utils';
-
-export const client = initClient(contract, {
-  baseUrl: getWebReqUrl('/api'),
-  throwOnUnknownStatus: true,
-  validateResponse: false,
-  credentials: 'include',
-  baseHeaders: {
-    'Content-Type': 'application/json;charset=utf-8'
-  },
-  api: async (args: BeforeFetchOptions) => {
-    const prepare = beforeFetch(args);
-    const response = await tsRestFetchApi(args);
-    return afterFetch(response, prepare);
-  }
-});
-
-const WHITE_LIST = ['/chat/share', '/chat', '/login'];
-async function isTokenExpired() {
-  if (WHITE_LIST.includes(window.location.pathname)) return;
-
-  await client.support.user.account.logout();
-  const lastRoute = encodeURIComponent(location.pathname + location.search);
-  window.location.replace(getWebReqUrl(`/login?lastRoute=${lastRoute}`));
-}
-
-export function checkBusinessCode(code: number) {
-  if (code in TOKEN_ERROR_CODE) {
-    isTokenExpired();
-    return;
-  }
-}
-
-type Item = { id: string; controller: AbortController };
-const queue = new Map<string, Item[]>();
-function checkMaxRequestLimitation(options: { url: string; max: number }): {
-  id: string;
-  signal: AbortSignal;
-  release: () => void;
-} {
-  const { url, max } = options;
-  const id = getNanoid();
-  const controller = new AbortController();
-  const item = queue.get(url);
-
-  const current = item ?? [];
-  if (current.length >= max) {
-    const first = current.shift()!;
-    first.controller.abort();
-  }
-  current.push({ id, controller });
-  if (!item) queue.set(url, current);
-
-  const release = () => {
-    const item = queue.get(url);
-    if (!item) return;
-
-    const index = item.findIndex((item) => item.id === id);
-    if (index !== -1) {
-      item.splice(index, 1);
-    }
-
-    if (item.length <= 0) {
-      queue.delete(url);
-    }
-  };
-
-  return { id, signal: controller.signal, release };
-}
-
-function checkHttpStatus(status: number): status is 200 {
-  if (status !== 200) return false;
-  return true;
-}
-
-type BeforeFetchOptions = ApiFetcherArgs & { max?: number };
-function beforeFetch(options: BeforeFetchOptions):
-  | {
-      limit: { id: string; url: string; release: () => void };
-    }
-  | undefined {
-  const { max, ...args } = options;
-  if (!max || max <= 0) return;
-
-  const { id, signal, release } = checkMaxRequestLimitation({ url: args.path, max });
-  args.fetchOptions ??= {};
-  args.fetchOptions.signal = signal;
-
-  return {
-    limit: { id, url: args.path, release }
-  };
+import { initClient } from '@ts-rest/core';
+import { fastgptContract } from './contracts';
+
+export function createFastGPTClient(options: {
+  baseUrl: string;
+  baseHeaders?: Record<string, string>;
+  api?: any;
+  credentials?: RequestCredentials;
+  throwOnUnknownStatus?: boolean;
+  validateResponse?: boolean;
+}) {
+  return initClient(fastgptContract, options);
 }
-
-function afterFetch(
-  response: Awaited<ReturnType<typeof tsRestFetchApi>>,
-  prepare?: ReturnType<typeof beforeFetch>
-) {
-  if (checkHttpStatus(response.status)) {
-    try {
-      const body = AnyResponseSchema.parse(response.body);
-
-      response.body = body.data;
-
-      if (prepare?.limit) {
-        prepare.limit.release();
-      }
-
-      return response;
-    } catch (error) {
-      if (error instanceof ZodError) {
-        throw new Error(error.message);
-      }
-
-      throw new Error('Unknown error while intercept response');
-    }
-  } else {
-    throw new Error(`HTTP error, status: ${response.status}`);
-  }
-}
-
-type Client = typeof client;
-type U<T> = { [K in keyof T]: T[K] extends (...args: any[]) => any ? T[K] : U<T[K]> }[keyof T];
-export type Endpoints = U<Client>;
-type _Options<T extends Endpoints> = NonNullable<Parameters<T>[0]>;
-type ExtractBodySchema<T extends Endpoints> = 'body' extends keyof _Options<T>
-  ? _Options<T>['body']
-  : never;
-type ExtractQuerySchema<T extends Endpoints> = 'query' extends keyof _Options<T>
-  ? _Options<T>['query']
-  : never;
-export type Params<T extends Endpoints> = (ExtractBodySchema<T> extends never
-  ? {}
-  : ExtractBodySchema<T>) &
-  (ExtractQuerySchema<T> extends never ? {} : ExtractQuerySchema<T>);
-export type Options<T extends Endpoints> = Omit<_Options<T>, 'body' | 'query'>;
-type Body<T extends Endpoints> = Extract<Awaited<ReturnType<T>>, { status: 200 }>['body'];
-type RestAPIResult<T extends Endpoints> = Body<T>;
-
-const call = async <T extends Endpoints>(
-  api: T,
-  options: _Options<T>
-): Promise<RestAPIResult<T>> => {
-  const res = await api(options as any);
-
-  if (res.status !== 200) {
-    throw new Error(`Unexpected status: ${res.status}`);
-  }
-
-  return res.body as RestAPIResult<T>;
-};
-
-export const RestAPI = <T extends Endpoints>(
-  endpoint: T,
-  transform?: (params: Params<T>) => {
-    body?: ExtractBodySchema<T> extends never ? any : ExtractBodySchema<T>;
-    query?: ExtractQuerySchema<T> extends never ? any : ExtractQuerySchema<T>;
-  }
-) => {
-  return (params?: Params<T>, options?: Options<T>) => {
-    const transformedData = params && transform ? transform(params) : {};
-    const finalOptions = { ...options, ...transformedData } as _Options<T>;
-
-    return call(endpoint, finalOptions);
-  };
-};

packages/global/common/tsRest/fastgpt/contracts/chat/setting/index.ts

@@ -1,5 +1,6 @@
 import { settingContract } from './setting';
-import { c } from '../../../init';
+import { initContract } from '@ts-rest/core';
+const c = initContract();
 
 export const chatContract = c.router({
   setting: settingContract

packages/global/common/tsRest/fastgpt/contracts/chat/index.ts renamed to packages/global/common/tsRest/fastgpt/contracts/core/chat/index.ts

@@ -1,12 +1,14 @@
-import { ObjectIdSchema } from '../../../../../../type';
+import z from 'zod';
 import {
-  ChatFavouriteAppResponseItemSchema,
-  ChatFavouriteAppUpdateSchema
-} from '../../../../../../../core/chat/favouriteApp/type';
-import { c } from '../../../../../init';
-import { z } from 'zod';
+  ChatSettingResponseSchema,
+  ChatSettingSchema
+} from '../../../../../../core/chat/setting/type';
+import { ChatFavouriteAppResponseItemSchema } from '../../../../../../core/chat/favouriteApp/type';
+import { ObjectIdSchema } from '../../../../../type';
+import { initContract } from '@ts-rest/core';
 
-export const favouriteContract = c.router({
+const c = initContract();
+const favouriteContract = c.router({
   list: {
     path: '/proApi/core/chat/setting/favourite/list',
     method: 'GET',
@@ -23,37 +25,39 @@ export const favouriteContract = c.router({
     description: '获取精选应用列表',
     summary: '获取精选应用列表'
   },
-
   update: {
     path: '/proApi/core/chat/setting/favourite/update',
     method: 'PUT',
-    body: ChatFavouriteAppUpdateSchema,
+    body: z.array(
+      z.object({
+        appId: z.string(),
+        order: z.number()
+      })
+    ),
     responses: {
-      200: c.type<void>()
+      200: z.void()
     },
     metadata: {
       tags: ['chat']
     },
     description: '更新精选应用',
     summary: '更新精选应用'
   },
-
   delete: {
     path: '/proApi/core/chat/setting/favourite/delete',
     method: 'DELETE',
     query: z.object({
       id: ObjectIdSchema
     }),
     responses: {
-      200: c.type<void>()
+      200: z.void()
     },
     metadata: {
       tags: ['chat']
     },
     description: '删除精选应用',
     summary: '删除精选应用'
   },
-
   order: {
     path: '/proApi/core/chat/setting/favourite/order',
     method: 'PUT',
@@ -64,15 +68,14 @@ export const favouriteContract = c.router({
       })
     ),
     responses: {
-      200: c.type<void>()
+      200: z.void()
     },
     metadata: {
       tags: ['chat']
     },
     description: '更新精选应用顺序',
     summary: '更新精选应用顺序'
   },
-
   tags: {
     path: '/proApi/core/chat/setting/favourite/tags',
     method: 'PUT',
@@ -83,7 +86,7 @@ export const favouriteContract = c.router({
       })
     ),
     responses: {
-      200: c.type<void>()
+      200: z.void()
     },
     metadata: {
       tags: ['chat']
@@ -92,3 +95,33 @@ export const favouriteContract = c.router({
     summary: '更新精选应用标签'
   }
 });
+
+export const settingContract = c.router({
+  favourite: favouriteContract,
+
+  detail: {
+    path: '/proApi/core/chat/setting/detail',
+    method: 'GET',
+    responses: {
+      200: ChatSettingResponseSchema
+    },
+    metadata: {
+      tags: ['chat']
+    },
+    description: '获取聊天设置',
+    summary: '获取聊天设置'
+  },
+  update: {
+    path: '/proApi/core/chat/setting/update',
+    method: 'PUT',
+    body: ChatSettingSchema.partial(),
+    responses: {
+      200: z.void()
+    },
+    metadata: {
+      tags: ['chat']
+    },
+    description: '更新聊天设置',
+    summary: '更新聊天设置'
+  }
+});

packages/global/common/tsRest/fastgpt/contracts/chat/setting/favourite/index.ts renamed to packages/global/common/tsRest/fastgpt/contracts/core/chat/setting.ts

@@ -0,0 +1,7 @@
+import { initContract } from '@ts-rest/core';
+import { chatContract } from './chat';
+const c = initContract();
+
+export const coreContract = c.router({
+  chat: chatContract
+});