4.6.4-alpha (#569)

packages/global/common/error/code/outLink.ts

@@ -4,7 +4,9 @@ import { ErrType } from '../errorCode';
 export enum OutLinkErrEnum {
   unExist = 'unExist',
   unAuthLink = 'unAuthLink',
-  linkUnInvalid = 'linkUnInvalid'
+  linkUnInvalid = 'linkUnInvalid',
+
+  unAuthUser = 'unAuthUser'
 }
 const errList = [
   {
@@ -19,6 +21,10 @@ const errList = [
     code: 501,
     statusText: OutLinkErrEnum.linkUnInvalid,
     message: '分享链接无效'
+  },
+  {
+    statusText: OutLinkErrEnum.unAuthUser,
+    message: '身份校验失败'
   }
 ];
 export default errList.reduce((acc, cur, index) => {

packages/global/core/chat/api.d.ts

@@ -1,33 +0,0 @@
-import { ModuleItemType } from '../module/type';
-import { AdminFbkType, ChatItemType, moduleDispatchResType } from './type';
-
-export type UpdateHistoryProps = {
-  chatId: string;
-  customTitle?: string;
-  top?: boolean;
-};
-
-export type AdminUpdateFeedbackParams = AdminFbkType & {
-  chatItemId: string;
-};
-
-export type InitChatResponse = {
-  chatId: string;
-  appId: string;
-  app: {
-    userGuideModule?: ModuleItemType;
-    chatModels?: string[];
-    name: string;
-    avatar: string;
-    intro: string;
-    canUse?: boolean;
-  };
-  title: string;
-  variables: Record<string, any>;
-  history: ChatItemType[];
-};
-
-export type ChatHistoryItemResType = moduleDispatchResType & {
-  moduleType: `${FlowNodeTypeEnum}`;
-  moduleName: string;
-};

packages/global/core/chat/constants.ts

@@ -44,6 +44,12 @@ export const ChatSourceMap = {
   }
 };
 
+export enum ChatStatusEnum {
+  loading = 'loading',
+  running = 'running',
+  finish = 'finish'
+}
+
 export const HUMAN_ICON = `/icon/human.svg`;
 export const LOGO_ICON = `/icon/logo.svg`;
 

packages/global/core/chat/type.d.ts

@@ -1,6 +1,6 @@
 import { ClassifyQuestionAgentItemType } from '../module/type';
 import { SearchDataResponseItemType } from '../dataset/type';
-import { ChatRoleEnum, ChatSourceEnum } from './constants';
+import { ChatRoleEnum, ChatSourceEnum, ChatStatusEnum } from './constants';
 import { FlowNodeTypeEnum } from '../module/node/constant';
 import { ModuleOutputKeyEnum } from '../module/constants';
 import { AppSchema } from '../app/type';
@@ -20,7 +20,7 @@ export type ChatSchema = {
   variables: Record<string, any>;
   source: `${ChatSourceEnum}`;
   shareId?: string;
-  isInit: boolean;
+  outLinkUid?: string;
   content: ChatItemType[];
 };
 
@@ -51,6 +51,7 @@ export type AdminFbkType = {
   a?: string;
 };
 
+/* --------- chat item ---------- */
 export type ChatItemType = {
   dataId?: string;
   obj: ChatItemSchema['obj'];
@@ -61,11 +62,12 @@ export type ChatItemType = {
 };
 
 export type ChatSiteItemType = ChatItemType & {
-  status: 'loading' | 'running' | 'finish';
+  status: `${ChatStatusEnum}`;
   moduleName?: string;
   ttsBuffer?: Uint8Array;
 };
 
+/* ---------- history ------------- */
 export type HistoryItemType = {
   chatId: string;
   updateTime: Date;
@@ -77,10 +79,10 @@ export type ChatHistoryItemType = HistoryItemType & {
   top: boolean;
 };
 
-// response data
+/* ------- response data ------------ */
 export type moduleDispatchResType = {
   moduleLogo?: string;
-  price: number;
+  price?: number;
   runningTime?: number;
   tokens?: number;
   model?: string;
@@ -112,3 +114,8 @@ export type moduleDispatchResType = {
   // plugin output
   pluginOutput?: Record<string, any>;
 };
+
+export type ChatHistoryItemResType = moduleDispatchResType & {
+  moduleType: `${FlowNodeTypeEnum}`;
+  moduleName: string;
+};

packages/global/core/dataset/api.d.ts

@@ -6,9 +6,9 @@ import type { LLMModelItemType } from '../ai/model.d';
 export type DatasetUpdateBody = {
   id: string;
   parentId?: string;
-  tags?: string[];
   name?: string;
   avatar?: string;
+  intro?: string;
   permission?: DatasetSchemaType['permission'];
   agentModel?: LLMModelItemType;
   websiteConfig?: DatasetSchemaType['websiteConfig'];

packages/global/support/outLink/api.d.ts

@@ -1,27 +1,12 @@
 import type { HistoryItemType, ChatSiteItemType } from '../../core/chat/type.d';
-import type { InitChatResponse } from '../../core/chat/api.d';
 import { OutLinkSchema } from '@fastgpt/global/support/outLink/type';
 
-export type InitShareChatResponse = {
-  userAvatar: string;
-  app: InitChatResponse['app'];
-};
-
-/* one page type */
-export type ShareChatType = InitShareChatResponse & {
-  history: ShareChatHistoryItemType;
-};
-
-/* history list item type */
-export type ShareChatHistoryItemType = HistoryItemType & {
-  shareId: string;
-  variables?: Record<string, any>;
-  chats: ChatSiteItemType[];
-};
-
-export type AuthLinkChatProps = { ip?: string | null; authToken?: string; question: string };
-export type AuthLinkLimitProps = AuthLinkChatProps & { outLink: OutLinkSchema };
-export type AuthShareChatInitProps = {
-  authToken?: string;
+export type AuthOutLinkInitProps = {
+  outLinkUid: string;
   tokenUrl?: string;
 };
+export type AuthOutLinkChatProps = { ip?: string | null; outLinkUid: string; question: string };
+export type AuthOutLinkLimitProps = AuthOutLinkChatProps & { outLink: OutLinkSchema };
+export type AuthOutLinkResponse = {
+  uid: string;
+};

packages/global/support/outLink/type.d.ts

@@ -3,7 +3,6 @@ import { OutLinkTypeEnum } from './constant';
 export type OutLinkSchema = {
   _id: string;
   shareId: string;
-  userId: string;
   teamId: string;
   tmbId: string;
   appId: string;

packages/global/support/user/team/constant.ts

@@ -45,4 +45,4 @@ export const TeamMemberStatusMap = {
     color: 'red.600'
   }
 };
-export const leaveStatus = { $ne: TeamMemberStatusEnum.leave };
+export const notLeaveStatus = { $ne: TeamMemberStatusEnum.leave };

packages/global/support/user/team/type.d.ts

@@ -1,5 +1,5 @@
-import { UserModelSchema } from '../type';
-import { TeamMemberRoleEnum, TeamMemberStatusEnum } from './constant';
+import type { UserModelSchema } from '../type';
+import type { TeamMemberRoleEnum, TeamMemberStatusEnum } from './constant';
 
 export type TeamSchema = {
   _id: string;
@@ -22,6 +22,16 @@ export type TeamMemberSchema = {
   defaultTeam: boolean;
 };
 
+export type TeamMemberWithUserSchema = TeamMemberSchema & {
+  userId: UserModelSchema;
+};
+export type TeamMemberWithTeamSchema = TeamMemberSchema & {
+  teamId: TeamSchema;
+};
+export type TeamMemberWithTeamAndUserSchema = TeamMemberWithTeamSchema & {
+  userId: UserModelSchema;
+};
+
 export type TeamItemType = {
   userId: string;
   teamId: string;